2343 files changed, 54128 insertions, 152692 deletions

diff --git a/.gitignore b/.gitignore
index 5fa883862..233e153a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/build
 #
 # NOTE! Don't add files that are generated in specific
 # subdirectories here. Add them in the ".gitignore" file
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..17b79c515
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,233 @@
+# Copyright 2010-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.
+
+########################################################################
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+    message(FATAL_ERROR "Prevented in-tree built. This is bad practice.")
+endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+
+########################################################################
+# Project setup
+########################################################################
+cmake_minimum_required(VERSION 2.6)
+project(gnuradio CXX C)
+enable_testing()
+
+#select the release build type by default to get optimization flags
+if(NOT CMAKE_BUILD_TYPE)
+   set(CMAKE_BUILD_TYPE "Release")
+   message(STATUS "Build type not specified: defaulting to release.")
+endif(NOT CMAKE_BUILD_TYPE)
+set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
+
+include(GrVersion) #setup version info
+
+########################################################################
+# Import executables from a native build (for cross compiling)
+# http://www.vtk.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build
+########################################################################
+if(IMPORT_EXECUTABLES)
+    include(${IMPORT_EXECUTABLES})
+endif(IMPORT_EXECUTABLES)
+
+#set file that the native build will fill with exports
+set(EXPORT_FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake)
+file(WRITE ${EXPORT_FILE}) #blank the file (subdirs will append)
+
+########################################################################
+# Compiler specific setup
+########################################################################
+include(GrMiscUtils) #compiler flag check
+
+if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
+    #http://gcc.gnu.org/wiki/Visibility
+    GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN)
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCXX)
+    GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-Wsign-compare HAVE_SIGN_COMPARE)
+endif(CMAKE_COMPILER_IS_GNUCXX)
+
+if(MSVC)
+    include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) #missing headers
+    add_definitions(-D_WIN32_WINNT=0x0501) #minimum version required is windows xp
+    add_definitions(-DNOMINMAX) #disables stupidity and enables std::min and std::max
+    add_definitions( #stop all kinds of compatibility warnings
+        -D_SCL_SECURE_NO_WARNINGS
+        -D_CRT_SECURE_NO_WARNINGS
+        -D_CRT_SECURE_NO_DEPRECATE
+        -D_CRT_NONSTDC_NO_DEPRECATE
+    )
+    add_definitions(-DHAVE_CONFIG_H)
+    add_definitions(/MP) #build with multiple processors
+endif(MSVC)
+
+########################################################################
+# Install directories
+########################################################################
+include(GrPlatform) #define LIB_SUFFIX
+set(GR_RUNTIME_DIR      bin)
+set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
+set(GR_INCLUDE_DIR      include)
+set(GR_DATA_DIR         share)
+set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
+set(GR_DOC_DIR          ${GR_DATA_DIR}/doc)
+set(GR_PKG_DOC_DIR      ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}-${DOCVER})
+set(GR_CONF_DIR         etc)
+set(GR_PKG_CONF_DIR     ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d)
+set(GR_LIBEXEC_DIR      libexec)
+set(GR_PKG_LIBEXEC_DIR  ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
+set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
+
+########################################################################
+# Variables replaced when configuring the package config files
+########################################################################
+file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}"           prefix)
+file(TO_NATIVE_PATH "\${prefix}"                        exec_prefix)
+file(TO_NATIVE_PATH "\${exec_prefix}/${GR_LIBRARY_DIR}" libdir)
+file(TO_NATIVE_PATH "\${prefix}/${GR_INCLUDE_DIR}"      includedir)
+
+########################################################################
+# Create uninstall target
+########################################################################
+configure_file(
+    ${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
+@ONLY)
+
+add_custom_target(uninstall
+    ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
+)
+
+########################################################################
+# Enable python component
+########################################################################
+find_package(PythonLibs)
+find_package(SWIG)
+include(GrComponent)
+GR_REGISTER_COMPONENT("python-support" ENABLE_PYTHON
+    PYTHONLIBS_FOUND
+    SWIG_FOUND
+)
+
+find_package(CppUnit)
+GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING
+    CPPUNIT_FOUND
+)
+
+########################################################################
+# Add optional dlls specified in DLL_PATHS
+########################################################################
+foreach(path ${DLL_PATHS})
+    file(GLOB _dlls "${path}/*.dll")
+    list(APPEND ALL_DLL_FILES ${_dlls})
+endforeach(path)
+if(DEFINED ALL_DLL_FILES)
+    include(GrPackage)
+    CPACK_COMPONENT("extra_dlls"
+        DISPLAY_NAME "Extra DLLs"
+        DESCRIPTION  "Extra DLLs for runtime dependency requirements"
+    )
+    message(STATUS "")
+    message(STATUS "Including the following dlls into the install:")
+    foreach(_dll ${ALL_DLL_FILES})
+        message(STATUS "  ${_dll}")
+    endforeach(_dll)
+    install(FILES ${ALL_DLL_FILES} DESTINATION ${GR_RUNTIME_DIR} COMPONENT "extra_dlls")
+endif()
+
+########################################################################
+# Setup volk as a subproject
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("volk" ENABLE_VOLK)
+
+set(VOLK_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/volk/include
+    ${CMAKE_CURRENT_BINARY_DIR}/volk/include
+)
+
+if(ENABLE_VOLK)
+
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_VOLK_DESCRIPTION "Vector optimized library of kernels")
+
+CPACK_COMPONENT("volk_runtime"
+    GROUP        "Volk"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Dynamic link libraries"
+)
+
+CPACK_COMPONENT("volk_devel"
+    GROUP        "Volk"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+)
+
+
+add_subdirectory(volk)
+endif(ENABLE_VOLK)
+
+########################################################################
+# Distribute the README file
+########################################################################
+install(
+    FILES README README.hacking
+    DESTINATION ${GR_PKG_DOC_DIR}
+    COMPONENT "docs"
+)
+
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(gruel)
+add_subdirectory(gnuradio-core)
+add_subdirectory(grc)
+
+add_subdirectory(gr-atsc)
+add_subdirectory(gr-audio)
+add_subdirectory(gr-comedi)
+add_subdirectory(gr-digital)
+add_subdirectory(gr-noaa)
+add_subdirectory(gr-pager)
+add_subdirectory(gr-qtgui)
+add_subdirectory(gr-trellis)
+add_subdirectory(gr-uhd)
+add_subdirectory(gr-shd)
+add_subdirectory(gr-utils)
+add_subdirectory(gr-video-sdl)
+add_subdirectory(gr-vocoder)
+add_subdirectory(gr-wxgui)
+add_subdirectory(gnuradio-examples/grc)
+add_subdirectory(gnuradio-examples/python)
+add_subdirectory(docs)
+
+#finalize cpack after subdirs processed
+include(GrPackage)
+CPACK_FINALIZE()
+
+########################################################################
+# Print summary
+########################################################################
+GR_PRINT_COMPONENT_SUMMARY()
+message(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "Building for version: ${VERSION} / ${LIBVER}")
diff --git a/Makefile.am b/Makefile.am
index 5891c2c89..417f659c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,6 @@ include $(top_srcdir)/Makefile.common
 EXTRA_DIST += \
 	bootstrap \
 	configure \
-	configure-cell-cross \
 	config.h.in \
 	run_tests.sh.in \
 	Makefile.swig \
diff --git a/Makefile.common b/Makefile.common
index 20b8a78cf..a4d5817ff 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -56,20 +56,6 @@ guiledir = $(prefix)/share/guile/site
 grpythondir = $(pythondir)/gnuradio
 grpyexecdir = $(pyexecdir)/gnuradio
 
-# Install the non-gnuradio usrp stuff in the appropriate subdirectory
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/usrpm
-
-usrppythondir = $(pythondir)/usrpm
-usrppyexecdir = $(pyexecdir)/usrpm
-
-# gcell includes
-gcellincludedir = $(includedir)/gcell
-gcellspuincludedir = $(includedir)/gcell/spu
-
-# Cell spu libs
-libspudir = $(libdir)spu
-
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
 STD_DEFINES_AND_INCLUDES = $(DEFINES) $(GNURADIO_INCLUDES) \
@@ -95,20 +81,13 @@ GRUEL_LA = @gruel_LA@
 VOLK_INCLUDES = @volk_INCLUDES@
 VOLK_LA = @volk_LA@
 
-# How to link in the USRP library from inside the tree
-USRP_INCLUDES = @usrp_INCLUDES@
-USRP_LA = @usrp_LA@
-
-# How to link the gcell library from inside the tree (the PPU part)
-GCELL_INCLUDES = @gcell_INCLUDES@
-GCELL_LA = @gcell_LA@
-
-# How to link the gcell library from inside the tree (the SPU part)
-GCELL_SPU_INCLUDES = @gcell_spu_INCLUDES@
-GCELL_SPU_LA = @gcell_spu_LA@
+# GR-DIGITAL includes and libraries
+GR_DIGITAL_INCLUDES = @gr_digital_INCLUDES@
+GR_DIGITAL_LA = @gr_digital_LA@
 
-# libtool aware wrapper for ppu-embedspu
-GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/lib/runtime/gcell-embedspu-libtool
+# GR-QTGUI includes and libraries
+GR_QTGUI_INCLUDES = @gr_qtgui_INCLUDES@
+GR_QTGUI_LA = @gr_qtgui_LA@
 
 # Fix for BSD make not defining $(RM).  We define it now in configure.ac
 # using AM_PATH_PROG, but now here have to add a -f to be like GNU make
diff --git a/Makefile.common.spu b/Makefile.common.spu
deleted file mode 100644
index 32681293e..000000000
--- a/Makefile.common.spu
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-# We're abusing automake, getting it to generate code for two
-# architectures under the same tree.  If you've got a better way to do
-# this, please let us know
-
-AR=spu-ar
-RANLIB=spu-ranlib
-CC=spu-gcc
-CCAS = spu-gcc
-LD=spu-ld
-
-C_WARNINGS = \
-  -Wall -Wextra -Wstrict-prototypes -Werror-implicit-function-declaration
-
-# Need to override user stuff even though it gives a warning.
-# (Otherwise these contain PPE related info.)
-
-CPPFLAGS=
-LDFLAGS=
-CFLAGS=
-
-AM_CFLAGS = -O3 -g --std=gnu99 -fstrict-aliasing $(C_WARNINGS)
-
-
diff --git a/Makefile.swig b/Makefile.swig
index 2ed69c6c7..87e918c35 100644
--- a/Makefile.swig
+++ b/Makefile.swig
@@ -169,6 +169,7 @@ gnuradio/%.scm : %.i
 ## Rule that (re)generates Makefile.swig.gen using TOP_SWIG_IFILES and
 ## Makefile.swig.gen.t
 ##
+
 ## Create $(srcdir)/Makefile.swig.gen, containing all of the rules
 ## for running SWIG to generate or re-generate outputs.  SWIG file
 ## names are to be defined in TOP_SWIG_IFILES, and must include the
diff --git a/Makefile.swig.gen.t b/Makefile.swig.gen.t
index 4d37e0e21..0410413ed 100644
--- a/Makefile.swig.gen.t
+++ b/Makefile.swig.gen.t
@@ -105,7 +105,7 @@ _@NAME@_la_CXXFLAGS =			\
 	$(@NAME@_la_swig_cxxflags)
 
 python/@NAME@.cc: @NAME@.py
-@NAME@.py: @NAME@.i
+@NAME@.py: @NAME@.i 
 
 # Include the python dependencies for this file
 -include python/@NAME@.d
diff --git a/README b/README
index 069d32024..296b0cec1 100644
--- a/README
+++ b/README
@@ -22,22 +22,26 @@
 Welcome to GNU Radio!
 
 
-Please see http://gnuradio.org/trac for the wiki, bug tracking,
-and source code viewer.  If you've got questions about GNU Radio, please
-subscribe to the discuss-gnuradio mailing list and post your questions
-there.  http://gnuradio.org/trac/wiki/MailingLists
+Please see http://gnuradio.org for the wiki, bug tracking,
+and source code viewer.  
+
+If you've got questions about GNU Radio, please subscribe to the
+discuss-gnuradio mailing list and post your questions there.
+http://gnuradio.org/redmine/projects/gnuradio/wiki/MailingLists
+
 There is also a "Build Guide" in the wiki that contains OS specific
-recommendations.  See http://gnuradio.org/trac/wiki/BuildGuide
+recommendations:
+http://gnuradio.org/redmine/projects/gnuradio/wiki/BuildGuide
 
 
-The bleeding edge code can be found in our subversion repository at
-http://gnuradio.org/svn.  To checkout the latest, use this
-command:
+The bleeding edge code can be found in our git repository at
+http://gnuradio.org/git/gnuradio.git/. To checkout the latest, use
+this command:
 
-  $ svn co http://gnuradio.org/svn/gnuradio/trunk gnuradio
+  $ git clone git://gnuradio.org/gnuradio
 
-For information about subversion, please see:
-  http://subversion.tigris.org/
+For information about using Git, please see:
+http://gnuradio.org/redmine/projects/gnuradio/wiki/DevelopingWithGit
 
 
 How to Build GNU Radio:
@@ -61,18 +65,21 @@ How to Build GNU Radio:
       On systems using pkgsrc (e.g. NetBSD and Dragonfly), build
       meta-packages/gnuradio, which will build a previous release and
       force installation of the dependencies.  Then pkg_delete the
-      gnuradio and usrp packages, which will leave the dependencies.
-      (This should also work on OSX.)
+      gnuradio package, which will leave the dependencies.  (This
+      should also work on OSX.)
 
-      See the wiki at http://gnuradio.org/trac/wiki for details.
+      See the wiki at http://gnuradio.org for details.
 
 
-  (2) do the "usual dance"
+  (2) Building from cmake:
+
+      $ mkdir $(builddir)
+      $ cd $(builddir)
+      $ cmake [OPTIONS] $(srcdir)
+      $ make
+      $ make test
+      $ sudo make instal
 
-      $ ./bootstrap        # not reqd when building from the tarball
-      $ ./configure
-      $ make && make check
-      $ sudo make install
 
 
 That's it!
@@ -153,7 +160,8 @@ floating point version which we use.  You should also use either the
 --enable-3dnow or --enable-sse options if you're on an Athlon or Pentium
 respectively.
 
-[FIXME: GNU/Linux packages of single-precision fftw are typically called ??]
+GNU/Linux packages of single-precision fftw are typically called
+fftw3f.
 
 In systems using pkgsrc, install math/fftwf, which provides the
 single-precision libraries.
@@ -192,11 +200,7 @@ As of repository version 4045, gnuradio requires version 1.3.31 or newer.
 
 (9) SDCC: Small Device C Compiler.  http://sdcc.sourceforge.net/
 
-Use version 2.4.0 or later.
-
-This includes a C compiler and linker for the 8051.  It's required to
-build the firmware for the USRP.  If you don't have a USRP, don't
-worry about it.
+--> Not required as of v3.5
 
 
 (10) Guile 1.6 or 1.8 
diff --git a/README-win32-mingw-short.txt b/README-win32-mingw-short.txt
index 88338e3b7..9001e9f15 100644
--- a/README-win32-mingw-short.txt
+++ b/README-win32-mingw-short.txt
@@ -86,7 +86,7 @@ make
 make install
 
 Now you have a working gnuradio-core
-Now you can go on building and installing gr-audio-windows and windows usrp and wxgui
+Now you can go on building and installing gr-audio-windows and windows and wxgui
 remember that all gnuradio and python dlls need to be on your path to use gnuradio
 The gnuradio dlls are installed at
 /c/Python24/Lib/site-packages:/c/Python24/Lib/site-packages/gnuradio:/c/Python24/Lib/site-packages/gnuradio/gr
diff --git a/README.hacking b/README.hacking
index ff01a0a53..de6358abf 100644
--- a/README.hacking
+++ b/README.hacking
@@ -92,8 +92,6 @@ These are the current package prefixes:
     atsc_	Code related to the Advanced Television
 	       	Standards Committee HDTV implementation
 
-    usrp_	Universal Software Radio Peripheral
-
     qa_		Quality Assurance.  Test code.
 
 
@@ -220,32 +218,6 @@ into the help string using the "... [default=%default]" syntax.
 
 ** Mandatory options by gr_block
 
-*** USRP source
-
-Any program using a USRP source (usrp.source_*) shall include:
-
-  add_option("", "--which-usrp", type="intx", default=0,
-	     help="select which USRP to use [default=%default]")
-
-  add_option("-R", "--rx-subdev-spec", type="subdev", default=(0, 0),
-             help="select USRP Rx side A or B [default=A]")
-
-You are free to change the default if it makes sense in your application.
-
-
-*** USRP sink
-
-Any program using a USRP sink (usrp.sink_*) shall include:
-
-  add_option("", "--which-usrp", type="intx", default=0,
-	     help="select which USRP to use [default=%default]")
-
-  add_option("-T", "--tx-subdev-spec", type="subdev", default=(0, 0),
-             help="select USRP Tx side A or B [default=A]")
-
-You are free to change the default if it makes sense in your application.
-
-
 *** Audio source
 
 Any program using an audio source shall include:
diff --git a/README.ps3 b/README.ps3
deleted file mode 100644
index 3d41fe3f5..000000000
--- a/README.ps3
+++ /dev/null
@@ -1,9 +0,0 @@
-GNU Radio may be compiled natively on the Sony PlayStation 3 if you're
-extremely patient.  It takes a _long_ time because there's only 256MB
-of RAM on board and you'll be doing a lot of paging.
-
-However, it is possible to cross compile GNU Radio -- from say a big
-x86_64 box running Fedora 7 -- and generate code for the PS3.
-
-Detailed instructions may be found at
-http://gnuradio.org/trac/wiki/CrossCompilingForCell
diff --git a/bootstrap b/bootstrap
index be511806f..b40afb20c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -30,5 +30,4 @@ automake --add-missing -Wno-portability -Wno-override -Wnone
 #automake --add-missing -Wno-portability
 
 # Run bootstrap in any subprojects
-(cd usrp2/firmware ; ./bootstrap)
 (cd volk ; ./bootstrap)
diff --git a/cmake/Modules/CMakeMacroLibtoolFile.cmake b/cmake/Modules/CMakeMacroLibtoolFile.cmake
new file mode 100644
index 000000000..a9e7f4bcb
--- /dev/null
+++ b/cmake/Modules/CMakeMacroLibtoolFile.cmake
@@ -0,0 +1,57 @@
+#http://www.vtk.org/Wiki/CMakeMacroLibtoolFile
+#This macro creates a libtool .la file for shared libraries or plugins. The first parameter is the target name of the library, the second parameter is the directory where it will be installed to. E.g. for a KDE 3.x module named "kfoo" the usage would be as follows:
+
+#The macro GET_TARGET_PROPERTY_WITH_DEFAULT is helpful to handle properties with default values.
+
+#ADD_LIBRARY(foo SHARED kfoo1.cpp kfoo2.cpp)
+#CREATE_LIBTOOL_FILE(foo /lib/kde3)
+
+ MACRO(GET_TARGET_PROPERTY_WITH_DEFAULT _variable _target _property _default_value)
+   GET_TARGET_PROPERTY (${_variable} ${_target} ${_property})
+   IF (${_variable} MATCHES NOTFOUND)
+     SET (${_variable} ${_default_value})
+   ENDIF (${_variable} MATCHES NOTFOUND)
+ ENDMACRO (GET_TARGET_PROPERTY_WITH_DEFAULT)
+
+ MACRO(CREATE_LIBTOOL_FILE _target _install_DIR)
+   GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_static_lib ${_target} STATIC_LIB "")
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dependency_libs ${_target} LT_DEPENDENCY_LIBS "")
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_current ${_target} LT_VERSION_CURRENT 0)
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_age ${_target} LT_VERSION_AGE 0)
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_revision ${_target} LT_VERSION_REVISION 0)
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_installed ${_target} LT_INSTALLED yes)
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK yes)
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "")
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "")
+   GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
+   GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
+   SET(_laname ${CMAKE_CURRENT_BINARY_DIR}/${_laname}.la)
+   FILE(WRITE ${_laname} "# ${_laname} - a libtool library file\n")
+   FILE(WRITE ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n")
+   FILE(WRITE ${_laname} "\n# Please DO NOT delete this file!\n# It is necessary for linking the library with libtool.\n\n" )
+   FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n")
+   FILE(APPEND ${_laname} "dlname='${_soname}'\n\n")
+   FILE(APPEND ${_laname} "# Names of this library.\n")
+   FILE(APPEND ${_laname} "library_names='${_soname}.${_target_current}.${_target_age}.${_target_revision} ${_soname}.${_target_current} ${_soname}'\n\n")
+   FILE(APPEND ${_laname} "# The name of the static archive.\n")
+   FILE(APPEND ${_laname} "old_library='${_target_static_lib}'\n\n")
+   FILE(APPEND ${_laname} "# Libraries that this one depends upon.\n")
+   FILE(APPEND ${_laname} "dependency_libs='${_target_dependency_libs}'\n\n")
+   FILE(APPEND ${_laname} "# Names of additional weak libraries provided by this library\n")
+   FILE(APPEND ${_laname} "weak_library_names=\n\n")
+   FILE(APPEND ${_laname} "# Version information for ${_laname}.\n")
+   FILE(APPEND ${_laname} "current=${_target_current}\n")
+   FILE(APPEND ${_laname} "age=${_target_age}\n")
+   FILE(APPEND ${_laname} "revision=${_target_revision}\n\n")
+   FILE(APPEND ${_laname} "# Is this an already installed library?\n")
+   FILE(APPEND ${_laname} "installed=${_target_installed}\n\n")
+   FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\n")
+   FILE(APPEND ${_laname} "shouldnotlink=${_target_shouldnotlink}\n\n")
+   FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\n")
+   FILE(APPEND ${_laname} "dlopen='${_target_dlopen}'\n")
+   FILE(APPEND ${_laname} "dlpreopen='${_target_dlpreopen}'\n\n")
+   FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
+   FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}${_install_DIR}'\n")
+   INSTALL( FILES ${_laname} DESTINATION ${CMAKE_INSTALL_PREFIX}${_install_DIR})
+ ENDMACRO(CREATE_LIBTOOL_FILE)
diff --git a/cmake/Modules/CMakeParseArgumentsCopy.cmake b/cmake/Modules/CMakeParseArgumentsCopy.cmake
new file mode 100644
index 000000000..7ce4c49ae
--- /dev/null
+++ b/cmake/Modules/CMakeParseArgumentsCopy.cmake
@@ -0,0 +1,138 @@
+# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...)
+#
+# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions for
+# parsing the arguments given to that macro or function.
+# It processes the arguments and defines a set of variables which hold the
+# values of the respective options.
+#
+# The <options> argument contains all options for the respective macro,
+# i.e. keywords which can be used when calling the macro without any value
+# following, like e.g. the OPTIONAL keyword of the install() command.
+#
+# The <one_value_keywords> argument contains all keywords for this macro
+# which are followed by one value, like e.g. DESTINATION keyword of the
+# install() command.
+#
+# The <multi_value_keywords> argument contains all keywords for this macro
+# which can be followed by more than one value, like e.g. the TARGETS or
+# FILES keywords of the install() command.
+#
+# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
+# keywords listed in <options>, <one_value_keywords> and
+# <multi_value_keywords> a variable composed of the given <prefix>
+# followed by "_" and the name of the respective keyword.
+# These variables will then hold the respective value from the argument list.
+# For the <options> keywords this will be TRUE or FALSE.
+#
+# All remaining arguments are collected in a variable
+# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see whether
+# your macro was called with unrecognized parameters.
+#
+# As an example here a my_install() macro, which takes similar arguments as the
+# real install() command:
+#
+#   function(MY_INSTALL)
+#     set(options OPTIONAL FAST)
+#     set(oneValueArgs DESTINATION RENAME)
+#     set(multiValueArgs TARGETS CONFIGURATIONS)
+#     cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+#     ...
+#
+# Assume my_install() has been called like this:
+#   my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub)
+#
+# After the cmake_parse_arguments() call the macro will have set the following
+# variables:
+#   MY_INSTALL_OPTIONAL = TRUE
+#   MY_INSTALL_FAST = FALSE (this option was not used when calling my_install()
+#   MY_INSTALL_DESTINATION = "bin"
+#   MY_INSTALL_RENAME = "" (was not used)
+#   MY_INSTALL_TARGETS = "foo;bar"
+#   MY_INSTALL_CONFIGURATIONS = "" (was not used)
+#   MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
+#
+# You can the continue and process these variables.
+#
+# Keywords terminate lists of values, e.g. if directly after a one_value_keyword
+# another recognized keyword follows, this is interpreted as the beginning of
+# the new option.
+# E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in
+# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would
+# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
+
+#=============================================================================
+# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+
+if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
+  return()
+endif()
+set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
+
+
+function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
+  # first set all result variables to empty/FALSE
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames})
+    set(${prefix}_${arg_name})
+  endforeach(arg_name)
+
+  foreach(option ${_optionNames})
+    set(${prefix}_${option} FALSE)
+  endforeach(option)
+
+  set(${prefix}_UNPARSED_ARGUMENTS)
+
+  set(insideValues FALSE)
+  set(currentArgName)
+
+  # now iterate over all arguments and fill the result variables
+  foreach(currentArg ${ARGN})
+    list(FIND _optionNames "${currentArg}" optionIndex)  # ... then this marks the end of the arguments belonging to this keyword
+    list(FIND _singleArgNames "${currentArg}" singleArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+    list(FIND _multiArgNames "${currentArg}" multiArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+
+    if(${optionIndex} EQUAL -1  AND  ${singleArgIndex} EQUAL -1  AND  ${multiArgIndex} EQUAL -1)
+      if(insideValues)
+        if("${insideValues}" STREQUAL "SINGLE")
+          set(${prefix}_${currentArgName} ${currentArg})
+          set(insideValues FALSE)
+        elseif("${insideValues}" STREQUAL "MULTI")
+          list(APPEND ${prefix}_${currentArgName} ${currentArg})
+        endif()
+      else(insideValues)
+        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
+      endif(insideValues)
+    else()
+      if(NOT ${optionIndex} EQUAL -1)
+        set(${prefix}_${currentArg} TRUE)
+        set(insideValues FALSE)
+      elseif(NOT ${singleArgIndex} EQUAL -1)
+        set(currentArgName ${currentArg})
+        set(${prefix}_${currentArgName})
+        set(insideValues "SINGLE")
+      elseif(NOT ${multiArgIndex} EQUAL -1)
+        set(currentArgName ${currentArg})
+        set(${prefix}_${currentArgName})
+        set(insideValues "MULTI")
+      endif()
+    endif()
+
+  endforeach(currentArg)
+
+  # propagate the result variables to the caller:
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
+    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE)
+  endforeach(arg_name)
+  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)
+
+endfunction(CMAKE_PARSE_ARGUMENTS _options _singleArgs _multiArgs)
diff --git a/cmake/Modules/FindALSA.cmake b/cmake/Modules/FindALSA.cmake
new file mode 100644
index 000000000..e3e6624ff
--- /dev/null
+++ b/cmake/Modules/FindALSA.cmake
@@ -0,0 +1,36 @@
+# - Try to find ALSA
+# Once done, this will define
+#
+#  ALSA_FOUND - system has ALSA (GL and GLU)
+#  ALSA_INCLUDE_DIRS - the ALSA include directories
+#  ALSA_LIBRARIES - link these to use ALSA
+#  ALSA_GL_LIBRARY - only GL
+#  ALSA_GLU_LIBRARY - only GLU
+#
+# See documentation on how to write CMake scripts at
+# http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
+
+include(LibFindMacros)
+
+libfind_pkg_check_modules(ALSA_PKGCONF alsa)
+
+find_path(ALSA_INCLUDE_DIR
+  NAMES alsa/version.h
+  PATHS ${ALSA_PKGCONF_INCLUDE_DIRS}
+)
+
+find_library(ALSA_LIBRARY
+  NAMES asound
+  PATHS ${ALSA_PKGCONF_LIBRARY_DIRS}
+)
+
+# Extract the version number
+IF(ALSA_INCLUDE_DIR)
+file(READ "${ALSA_INCLUDE_DIR}/alsa/version.h" _ALSA_VERSION_H_CONTENTS)
+string(REGEX REPLACE ".*#define SND_LIB_VERSION_STR[ \t]*\"([^\n]*)\".*" "\\1" ALSA_VERSION "${_ALSA_VERSION_H_CONTENTS}")
+ENDIF(ALSA_INCLUDE_DIR)
+
+set(ALSA_PROCESS_INCLUDES ALSA_INCLUDE_DIR)
+set(ALSA_PROCESS_LIBS ALSA_LIBRARY)
+libfind_process(ALSA)
+
diff --git a/cmake/Modules/FindCppUnit.cmake b/cmake/Modules/FindCppUnit.cmake
new file mode 100644
index 000000000..a936bc546
--- /dev/null
+++ b/cmake/Modules/FindCppUnit.cmake
@@ -0,0 +1,36 @@
+# http://www.cmake.org/pipermail/cmake/2006-October/011446.html
+# Modified to use pkg config and use standard var names
+
+#
+# Find the CppUnit includes and library
+#
+# This module defines
+# CPPUNIT_INCLUDE_DIR, where to find tiff.h, etc.
+# CPPUNIT_LIBRARIES, the libraries to link against to use CppUnit.
+# CPPUNIT_FOUND, If false, do not try to use CppUnit.
+
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(PC_CPPUNIT "cppunit" QUIET)
+
+FIND_PATH(CPPUNIT_INCLUDE_DIRS
+    NAMES cppunit/TestCase.h
+    HINTS ${PC_CPPUNIT_INCLUDE_DIRS}
+    PATHS
+    /usr/local/include
+    /usr/include
+)
+
+FIND_LIBRARY(CPPUNIT_LIBRARIES
+    NAMES cppunit
+    HINTS ${PC_CPPUNIT_LIBRARIES}
+    PATHS
+    ${CPPUNIT_INCLUDE_DIRS}/../lib
+    /usr/local/lib
+    /usr/lib
+)
+
+LIST(APPEND CPPUNIT_LIBRARIES ${CMAKE_DL_LIBS})
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPPUNIT DEFAULT_MSG CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
+MARK_AS_ADVANCED(CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
diff --git a/cmake/Modules/FindFFTW3f.cmake b/cmake/Modules/FindFFTW3f.cmake
new file mode 100644
index 000000000..e8b581aed
--- /dev/null
+++ b/cmake/Modules/FindFFTW3f.cmake
@@ -0,0 +1,29 @@
+# http://tim.klingt.org/code/projects/supernova/repository/revisions/d336dd6f400e381bcfd720e96139656de0c53b6a/entry/cmake_modules/FindFFTW3f.cmake
+# Modified to use pkg config and use standard var names
+
+# Find single-precision (float) version of FFTW3
+
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(PC_FFTW3F "fftw3f >= 3.0" QUIET)
+
+FIND_PATH(
+    FFTW3F_INCLUDE_DIRS
+    NAMES fftw3.h
+    HINTS $ENV{FFTW3_DIR}/include
+        ${PC_FFTW3F_INCLUDE_DIRS}
+    PATHS /usr/local/include
+          /usr/include
+)
+
+FIND_LIBRARY(
+    FFTW3F_LIBRARIES
+    NAMES fftw3f libfftw3f
+    HINTS $ENV{FFTW3_DIR}/lib
+        ${PC_FFTW3F_LIBRARIES}
+    PATHS /usr/local/lib
+          /usr/lib
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFTW3F DEFAULT_MSG FFTW3F_LIBRARIES FFTW3F_INCLUDE_DIRS)
+MARK_AS_ADVANCED(FFTW3F_LIBRARIES FFTW3F_INCLUDE_DIRS)
diff --git a/cmake/Modules/FindGSL.cmake b/cmake/Modules/FindGSL.cmake
new file mode 100644
index 000000000..6d7155284
--- /dev/null
+++ b/cmake/Modules/FindGSL.cmake
@@ -0,0 +1,146 @@
+# Try to find gnu scientific library GSL
+# See
+# http://www.gnu.org/software/gsl/  and
+# http://gnuwin32.sourceforge.net/packages/gsl.htm
+#
+# Based on a script of Felix Woelk and Jan Woetzel
+# (www.mip.informatik.uni-kiel.de)
+#
+# It defines the following variables:
+#  GSL_FOUND - system has GSL lib
+#  GSL_INCLUDE_DIRS - where to find headers
+#  GSL_LIBRARIES - full path to the libraries
+#  GSL_LIBRARY_DIRS, the directory where the PLplot library is found.
+
+#  CMAKE_GSL_CXX_FLAGS  = Unix compiler flags for GSL, essentially "`gsl-config --cxxflags`"
+#  GSL_LINK_DIRECTORIES = link directories, useful for rpath on Unix
+#  GSL_EXE_LINKER_FLAGS = rpath on Unix
+
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(GSL "gsl >= 1.10")
+IF(NOT GSL_FOUND)
+
+set( GSL_FOUND OFF )
+set( GSL_CBLAS_FOUND OFF )
+
+# Windows, but not for Cygwin and MSys where gsl-config is available
+if( WIN32 AND NOT CYGWIN AND NOT MSYS )
+	# look for headers
+  find_path( GSL_INCLUDE_DIRS
+    NAMES gsl/gsl_cdf.h gsl/gsl_randist.h
+    )
+  if( GSL_INCLUDE_DIRS )
+  	# look for gsl library
+    find_library( GSL_LIBRARY
+      NAMES gsl
+    )
+    if( GSL_LIBRARY )
+      set( GSL_INCLUDE_DIRS ${GSL_INCLUDE_DIR} )
+      get_filename_component( GSL_LIBRARY_DIRS ${GSL_LIBRARY} PATH )
+      set( GSL_FOUND ON )
+    endif( GSL_LIBRARY )
+
+		# look for gsl cblas library
+    find_library( GSL_CBLAS_LIBRARY
+        NAMES gslcblas
+      )
+    if( GSL_CBLAS_LIBRARY )
+      set( GSL_CBLAS_FOUND ON )
+    endif( GSL_CBLAS_LIBRARY )
+
+    set( GSL_LIBRARIES ${GSL_LIBRARY} ${GSL_CBLAS_LIBRARY} )
+  endif( GSL_INCLUDE_DIRS )
+
+  mark_as_advanced(
+    GSL_INCLUDE_DIRS
+    GSL_LIBRARIES
+    GSL_CBLAS_LIBRARIES
+  )
+else( WIN32 AND NOT CYGWIN AND NOT MSYS )
+  if( UNIX OR MSYS )
+		find_program( GSL_CONFIG_EXECUTABLE gsl-config
+			/usr/bin/
+			/usr/local/bin
+		)
+
+		if( GSL_CONFIG_EXECUTABLE )
+			set( GSL_FOUND ON )
+
+      # run the gsl-config program to get cxxflags
+      execute_process(
+        COMMAND sh "${GSL_CONFIG_EXECUTABLE}" --cflags
+        OUTPUT_VARIABLE GSL_CFLAGS
+        RESULT_VARIABLE RET
+        ERROR_QUIET
+        )
+      if( RET EQUAL 0 )
+        string( STRIP "${GSL_CFLAGS}" GSL_CFLAGS )
+        separate_arguments( GSL_CFLAGS )
+
+        # parse definitions from cflags; drop -D* from CFLAGS
+        string( REGEX MATCHALL "-D[^;]+"
+          GSL_DEFINITIONS  "${GSL_CFLAGS}" )
+        string( REGEX REPLACE "-D[^;]+;" ""
+          GSL_CFLAGS "${GSL_CFLAGS}" )
+
+        # parse include dirs from cflags; drop -I prefix
+        string( REGEX MATCHALL "-I[^;]+"
+          GSL_INCLUDE_DIRS "${GSL_CFLAGS}" )
+        string( REPLACE "-I" ""
+          GSL_INCLUDE_DIRS "${GSL_INCLUDE_DIRS}")
+        string( REGEX REPLACE "-I[^;]+;" ""
+          GSL_CFLAGS "${GSL_CFLAGS}")
+
+        message("GSL_DEFINITIONS=${GSL_DEFINITIONS}")
+        message("GSL_INCLUDE_DIRS=${GSL_INCLUDE_DIRS}")
+        message("GSL_CFLAGS=${GSL_CFLAGS}")
+      else( RET EQUAL 0 )
+        set( GSL_FOUND FALSE )
+      endif( RET EQUAL 0 )
+
+      # run the gsl-config program to get the libs
+      execute_process(
+        COMMAND sh "${GSL_CONFIG_EXECUTABLE}" --libs
+        OUTPUT_VARIABLE GSL_LIBRARIES
+        RESULT_VARIABLE RET
+        ERROR_QUIET
+        )
+      if( RET EQUAL 0 )
+        string(STRIP "${GSL_LIBRARIES}" GSL_LIBRARIES )
+        separate_arguments( GSL_LIBRARIES )
+
+        # extract linkdirs (-L) for rpath (i.e., LINK_DIRECTORIES)
+        string( REGEX MATCHALL "-L[^;]+"
+          GSL_LIBRARY_DIRS "${GSL_LIBRARIES}" )
+        string( REPLACE "-L" ""
+          GSL_LIBRARY_DIRS "${GSL_LIBRARY_DIRS}" )
+      else( RET EQUAL 0 )
+        set( GSL_FOUND FALSE )
+      endif( RET EQUAL 0 )
+
+			MARK_AS_ADVANCED(
+				GSL_CFLAGS
+			)
+			message( STATUS "Using GSL from ${GSL_PREFIX}" )
+		else( GSL_CONFIG_EXECUTABLE )
+			message( STATUS "FindGSL: gsl-config not found.")
+		endif( GSL_CONFIG_EXECUTABLE )
+	endif( UNIX OR MSYS )
+endif( WIN32 AND NOT CYGWIN AND NOT MSYS )
+
+if( GSL_FOUND )
+  if( NOT GSL_FIND_QUIETLY )
+    message( STATUS "FindGSL: Found both GSL headers and library" )
+  endif( NOT GSL_FIND_QUIETLY )
+else( GSL_FOUND )
+  if( GSL_FIND_REQUIRED )
+    message( FATAL_ERROR "FindGSL: Could not find GSL headers or library" )
+  endif( GSL_FIND_REQUIRED )
+endif( GSL_FOUND )
+
+#needed for gsl windows port but safe to always define
+LIST(APPEND GSL_DEFINITIONS "-DGSL_DLL")
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSL DEFAULT_MSG GSL_LIBRARIES GSL_INCLUDE_DIRS)
+ENDIF(NOT GSL_FOUND)
diff --git a/cmake/Modules/FindGit.cmake b/cmake/Modules/FindGit.cmake
new file mode 100644
index 000000000..2d8214287
--- /dev/null
+++ b/cmake/Modules/FindGit.cmake
@@ -0,0 +1,46 @@
+# The module defines the following variables:
+#   GIT_EXECUTABLE - path to git command line client
+#   GIT_FOUND - true if the command line client was found
+# Example usage:
+#   find_package(Git)
+#   if(GIT_FOUND)
+#     message("git found: ${GIT_EXECUTABLE}")
+#   endif()
+
+#=============================================================================
+# Copyright 2010 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# Look for 'git' or 'eg' (easy git)
+#
+set(git_names git eg)
+
+# Prefer .cmd variants on Windows unless running in a Makefile
+# in the MSYS shell.
+#
+if(WIN32)
+  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
+    set(git_names git.cmd git eg.cmd eg)
+  endif()
+endif()
+
+find_program(GIT_EXECUTABLE
+  NAMES ${git_names}
+  DOC "git command line client"
+  )
+mark_as_advanced(GIT_EXECUTABLE)
+
+# Handle the QUIETLY and REQUIRED arguments and set GIT_FOUND to TRUE if
+# all listed variables are TRUE
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Git DEFAULT_MSG GIT_EXECUTABLE)
diff --git a/cmake/Modules/FindJack.cmake b/cmake/Modules/FindJack.cmake
new file mode 100644
index 000000000..44417deb3
--- /dev/null
+++ b/cmake/Modules/FindJack.cmake
@@ -0,0 +1,87 @@
+# - Try to find jack-2.6
+# Once done this will define
+#
+#  JACK_FOUND - system has jack
+#  JACK_INCLUDE_DIRS - the jack include directory
+#  JACK_LIBRARIES - Link these to use jack
+#  JACK_DEFINITIONS - Compiler switches required for using jack
+#
+#  Copyright (c) 2008 Andreas Schneider <mail@cynapses.org>
+#  Modified for other libraries by Lasse Kärkkäinen <tronic>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+if (JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
+  # in cache already
+  set(JACK_FOUND TRUE)
+else (JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
+  # use pkg-config to get the directories and then use these values
+  # in the FIND_PATH() and FIND_LIBRARY() calls
+  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    include(UsePkgConfig)
+    pkgconfig(jack _JACK_INCLUDEDIR _JACK_LIBDIR _JACK_LDFLAGS _JACK_CFLAGS)
+  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    find_package(PkgConfig)
+    if (PKG_CONFIG_FOUND)
+      pkg_check_modules(_JACK jack)
+    endif (PKG_CONFIG_FOUND)
+  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+  find_path(JACK_INCLUDE_DIR
+    NAMES
+      jack/jack.h
+    PATHS
+      ${_JACK_INCLUDEDIR}
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+  )
+  
+  find_library(JACK_LIBRARY
+    NAMES
+      jack
+    PATHS
+      ${_JACK_LIBDIR}
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+  )
+
+  if (JACK_LIBRARY)
+    set(JACK_FOUND TRUE)
+  endif (JACK_LIBRARY)
+
+  set(JACK_INCLUDE_DIRS
+    ${JACK_INCLUDE_DIR}
+  )
+
+  if (JACK_FOUND)
+    set(JACK_LIBRARIES
+      ${JACK_LIBRARIES}
+      ${JACK_LIBRARY}
+    )
+  endif (JACK_FOUND)
+
+  if (JACK_INCLUDE_DIRS AND JACK_LIBRARIES)
+     set(JACK_FOUND TRUE)
+  endif (JACK_INCLUDE_DIRS AND JACK_LIBRARIES)
+
+  if (JACK_FOUND)
+    if (NOT JACK_FIND_QUIETLY)
+      message(STATUS "Found jack: ${JACK_LIBRARY}")
+    endif (NOT JACK_FIND_QUIETLY)
+  else (JACK_FOUND)
+    if (JACK_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find JACK")
+    endif (JACK_FIND_REQUIRED)
+  endif (JACK_FOUND)
+
+  # show the JACK_INCLUDE_DIRS and JACK_LIBRARIES variables only in the advanced view
+  mark_as_advanced(JACK_INCLUDE_DIRS JACK_LIBRARIES)
+
+endif (JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
+
diff --git a/cmake/Modules/FindOSS.cmake b/cmake/Modules/FindOSS.cmake
new file mode 100644
index 000000000..105b3ec9c
--- /dev/null
+++ b/cmake/Modules/FindOSS.cmake
@@ -0,0 +1,46 @@
+# - Find Oss
+# Find Oss headers and libraries.
+#
+#  OSS_INCLUDE_DIR  -  where to find soundcard.h, etc.
+#  OSS_FOUND        - True if Oss found.
+
+
+FIND_PATH(LINUX_OSS_INCLUDE_DIR "linux/soundcard.h"
+  "/usr/include" "/usr/local/include"
+)
+
+FIND_PATH(SYS_OSS_INCLUDE_DIR "sys/soundcard.h"
+  "/usr/include" "/usr/local/include"
+)
+
+FIND_PATH(MACHINE_OSS_INCLUDE_DIR "machine/soundcard.h"
+  "/usr/include" "/usr/local/include"
+)
+
+SET(OSS_FOUND FALSE)
+
+IF(LINUX_OSS_INCLUDE_DIR)
+	SET(OSS_FOUND TRUE)
+	SET(OSS_INCLUDE_DIR ${LINUX_OSS_INCLUDE_DIR})
+	SET(HAVE_LINUX_SOUNDCARD_H 1)
+ENDIF()
+
+IF(SYS_OSS_INCLUDE_DIR)
+	SET(OSS_FOUND TRUE)
+	SET(OSS_INCLUDE_DIR ${SYS_OSS_INCLUDE_DIR})
+	SET(HAVE_SYS_SOUNDCARD_H 1)
+ENDIF()
+
+IF(MACHINE_OSS_INCLUDE_DIR)
+	SET(OSS_FOUND TRUE)
+	SET(OSS_INCLUDE_DIR ${MACHINE_OSS_INCLUDE_DIR})
+	SET(HAVE_MACHINE_SOUNDCARD_H 1)
+ENDIF()
+
+MARK_AS_ADVANCED (
+	OSS_FOUND
+	OSS_INCLUDE_DIR
+	LINUX_OSS_INCLUDE_DIR
+	SYS_OSS_INCLUDE_DIR
+	MACHINE_OSS_INCLUDE_DIR
+) 
diff --git a/cmake/Modules/FindPortaudio.cmake b/cmake/Modules/FindPortaudio.cmake
new file mode 100644
index 000000000..158e20ee5
--- /dev/null
+++ b/cmake/Modules/FindPortaudio.cmake
@@ -0,0 +1,107 @@
+# - Try to find Portaudio
+# Once done this will define
+#
+#  PORTAUDIO_FOUND - system has Portaudio
+#  PORTAUDIO_INCLUDE_DIRS - the Portaudio include directory
+#  PORTAUDIO_LIBRARIES - Link these to use Portaudio
+#  PORTAUDIO_DEFINITIONS - Compiler switches required for using Portaudio
+#  PORTAUDIO_VERSION - Portaudio version
+#
+#  Copyright (c) 2006 Andreas Schneider <mail@cynapses.org>
+#
+# Redistribution and use is allowed according to the terms of the New BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
+  # in cache already
+  set(PORTAUDIO_FOUND TRUE)
+else (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
+  if (NOT WIN32)
+   include(FindPkgConfig)
+   pkg_check_modules(PORTAUDIO2 portaudio-2.0)
+  endif (NOT WIN32)
+
+  if (PORTAUDIO2_FOUND)
+    set(PORTAUDIO_INCLUDE_DIRS
+      ${PORTAUDIO2_INCLUDE_DIRS}
+    )
+    if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+      set(PORTAUDIO_LIBRARIES "${PORTAUDIO2_LIBRARY_DIRS}/lib${PORTAUDIO2_LIBRARIES}.dylib")
+    else (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+      set(PORTAUDIO_LIBRARIES
+        ${PORTAUDIO2_LIBRARIES}
+      )
+    endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(PORTAUDIO_VERSION
+      19
+    )
+    set(PORTAUDIO_FOUND TRUE)
+  else (PORTAUDIO2_FOUND)
+    find_path(PORTAUDIO_INCLUDE_DIR
+      NAMES
+        portaudio.h
+      PATHS
+        /usr/include
+        /usr/local/include
+        /opt/local/include
+        /sw/include
+    )
+   
+    find_library(PORTAUDIO_LIBRARY
+      NAMES
+        portaudio
+      PATHS
+        /usr/lib
+        /usr/local/lib
+        /opt/local/lib
+        /sw/lib
+    )
+   
+    find_path(PORTAUDIO_LIBRARY_DIR
+      NAMES
+        portaudio
+      PATHS
+        /usr/lib
+        /usr/local/lib
+        /opt/local/lib
+        /sw/lib
+    )
+   
+    set(PORTAUDIO_INCLUDE_DIRS
+      ${PORTAUDIO_INCLUDE_DIR}
+    )
+    set(PORTAUDIO_LIBRARIES
+      ${PORTAUDIO_LIBRARY}
+    )
+   
+    set(PORTAUDIO_LIBRARY_DIRS
+      ${PORTAUDIO_LIBRARY_DIR}
+    )
+   
+    set(PORTAUDIO_VERSION
+      18
+    )
+   
+    if (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES)
+       set(PORTAUDIO_FOUND TRUE)
+    endif (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES)
+   
+    if (PORTAUDIO_FOUND)
+      if (NOT Portaudio_FIND_QUIETLY)
+        message(STATUS "Found Portaudio: ${PORTAUDIO_LIBRARIES}")
+      endif (NOT Portaudio_FIND_QUIETLY)
+    else (PORTAUDIO_FOUND)
+      if (Portaudio_FIND_REQUIRED)
+        message(FATAL_ERROR "Could not find Portaudio")
+      endif (Portaudio_FIND_REQUIRED)
+    endif (PORTAUDIO_FOUND)
+  endif (PORTAUDIO2_FOUND)
+
+
+  # show the PORTAUDIO_INCLUDE_DIRS and PORTAUDIO_LIBRARIES variables only in the advanced view
+  mark_as_advanced(PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES)
+
+endif (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
+
diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake
new file mode 100644
index 000000000..698edc8b9
--- /dev/null
+++ b/cmake/Modules/FindQwt.cmake
@@ -0,0 +1,13 @@
+# - try to find Qwt libraries and include files
+# QWT_INCLUDE_DIR where to find qwt_plot.h, etc.
+# QWT_LIBRARIES libraries to link against
+# QWT_FOUND If false, do not try to use Qwt
+
+find_path ( QWT_INCLUDE_DIRS qwt_plot.h /usr/include/qwt-qt4 /usr/include/qwt )
+	  
+find_library ( QWT_LIBRARIES NAMES qwt-qt4 qwt)
+
+# handle the QUIETLY and REQUIRED arguments and set QWT_FOUND to TRUE if 
+# all listed variables are TRUE
+include ( FindPackageHandleStandardArgs )
+find_package_handle_standard_args( Qwt DEFAULT_MSG QWT_LIBRARIES QWT_INCLUDE_DIRS )
diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake
new file mode 100644
index 000000000..0f0cc601b
--- /dev/null
+++ b/cmake/Modules/FindUHD.cmake
@@ -0,0 +1,28 @@
+########################################################################
+# Find the library for the USRP Hardware Driver
+########################################################################
+
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(PC_UHD uhd QUIET)
+
+FIND_PATH(
+    UHD_INCLUDE_DIRS
+    NAMES uhd/config.hpp
+    HINTS $ENV{UHD_DIR}/include
+        ${PC_UHD_INCLUDE_DIRS}
+    PATHS /usr/local/include
+          /usr/include
+)
+
+FIND_LIBRARY(
+    UHD_LIBRARIES
+    NAMES uhd
+    HINTS $ENV{UHD_DIR}/lib
+        ${PC_UHD_LIBRARIES}
+    PATHS /usr/local/lib
+          /usr/lib
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(UHD DEFAULT_MSG UHD_LIBRARIES UHD_INCLUDE_DIRS)
+MARK_AS_ADVANCED(UHD_LIBRARIES UHD_INCLUDE_DIRS)
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake
new file mode 100644
index 000000000..36890014d
--- /dev/null
+++ b/cmake/Modules/GrBoost.cmake
@@ -0,0 +1,62 @@
+# Copyright 2010-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.
+
+if(DEFINED __INCLUDED_GR_BOOST_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_BOOST_CMAKE TRUE)
+
+########################################################################
+# Setup Boost and handle some system specific things
+########################################################################
+
+set(BOOST_REQUIRED_COMPONENTS
+    date_time
+    program_options
+    filesystem
+    system
+    thread
+)
+
+if(UNIX AND EXISTS "/usr/lib64")
+    list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
+endif(UNIX AND EXISTS "/usr/lib64")
+
+if(MSVC)
+    if (NOT DEFINED BOOST_ALL_DYN_LINK)
+        set(BOOST_ALL_DYN_LINK TRUE)
+    endif()
+    set(BOOST_ALL_DYN_LINK "${BOOST_ALL_DYN_LINK}" CACHE BOOL "boost enable dynamic linking")
+    if(BOOST_ALL_DYN_LINK)
+        add_definitions(-DBOOST_ALL_DYN_LINK) #setup boost auto-linking in msvc
+    else(BOOST_ALL_DYN_LINK)
+        unset(BOOST_REQUIRED_COMPONENTS) #empty components list for static link
+    endif(BOOST_ALL_DYN_LINK)
+endif(MSVC)
+
+set(Boost_ADDITIONAL_VERSIONS
+    "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39"
+    "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44"
+    "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49"
+    "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54"
+    "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59"
+    "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
+    "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
+)
+find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
diff --git a/cmake/Modules/GrComponent.cmake b/cmake/Modules/GrComponent.cmake
new file mode 100644
index 000000000..d45b8003c
--- /dev/null
+++ b/cmake/Modules/GrComponent.cmake
@@ -0,0 +1,114 @@
+# Copyright 2010-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.
+
+if(DEFINED __INCLUDED_GR_COMPONENT_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_COMPONENT_CMAKE TRUE)
+
+set(_gr_enabled_components "" CACHE INTERNAL "" FORCE)
+set(_gr_disabled_components "" CACHE INTERNAL "" FORCE)
+
+if(NOT DEFINED ENABLE_DEFAULT)
+    set(ENABLE_DEFAULT ON)
+    message(STATUS "")
+    message(STATUS "The build system will automatically enable all components.")
+    message(STATUS "Use -DENABLE_DEFAULT=OFF to disable components by default.")
+endif()
+
+########################################################################
+# Register a component into the system
+# - name: canonical component name
+# - var: variable for enabled status
+# - argn: list of dependencies
+########################################################################
+function(GR_REGISTER_COMPONENT name var)
+    include(CMakeDependentOption)
+    message(STATUS "")
+    message(STATUS "Configuring ${name} support...")
+    foreach(dep ${ARGN})
+        message(STATUS "  Dependency ${dep} = ${${dep}}")
+    endforeach(dep)
+
+    #if the user set the var to force, we note this
+    if("${${var}}" STREQUAL "FORCE")
+        set(${var} ON)
+        set(var_force TRUE)
+    else()
+        set(var_force FALSE)
+    endif()
+
+    #rewrite the dependency list so that deps that are also components use the cached version
+    unset(comp_deps)
+    foreach(dep ${ARGN})
+        list(FIND _gr_enabled_components ${dep} dep_enb_index)
+        list(FIND _gr_disabled_components ${dep} dep_dis_index)
+        if (${dep_enb_index} EQUAL -1 AND ${dep_dis_index} EQUAL -1)
+            list(APPEND comp_deps ${dep})
+        else()
+            list(APPEND comp_deps ${dep}_cached) #is a component, use cached version
+        endif()
+    endforeach(dep)
+
+    #setup the dependent option for this component
+    CMAKE_DEPENDENT_OPTION(${var} "enable ${name} support" ${ENABLE_DEFAULT} "${comp_deps}" OFF)
+    set(${var}_cached "${${var}}" CACHE INTERNAL "" FORCE)
+
+    #force was specified, but the dependencies were not met
+    if(NOT ${var} AND var_force)
+        message(FATAL_ERROR "user force-enabled ${name} but configuration checked failed")
+    endif()
+
+    #append the component into one of the lists
+    if(${var})
+        message(STATUS "  Enabling ${name} support.")
+        list(APPEND _gr_enabled_components ${name})
+    else(${var})
+        message(STATUS "  Disabling ${name} support.")
+        list(APPEND _gr_disabled_components ${name})
+    endif(${var})
+    message(STATUS "  Override with -D${var}=ON/OFF")
+
+    #make components lists into global variables
+    set(_gr_enabled_components ${_gr_enabled_components} CACHE INTERNAL "" FORCE)
+    set(_gr_disabled_components ${_gr_disabled_components} CACHE INTERNAL "" FORCE)
+endfunction(GR_REGISTER_COMPONENT)
+
+########################################################################
+# Print the registered component summary
+########################################################################
+function(GR_PRINT_COMPONENT_SUMMARY)
+    message(STATUS "")
+    message(STATUS "######################################################")
+    message(STATUS "# Gnuradio enabled components                         ")
+    message(STATUS "######################################################")
+    foreach(comp ${_gr_enabled_components})
+        message(STATUS "  * ${comp}")
+    endforeach(comp)
+
+    message(STATUS "")
+    message(STATUS "######################################################")
+    message(STATUS "# Gnuradio disabled components                        ")
+    message(STATUS "######################################################")
+    foreach(comp ${_gr_disabled_components})
+        message(STATUS "  * ${comp}")
+    endforeach(comp)
+
+    message(STATUS "")
+endfunction(GR_PRINT_COMPONENT_SUMMARY)
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake
new file mode 100644
index 000000000..9d947e9a5
--- /dev/null
+++ b/cmake/Modules/GrMiscUtils.cmake
@@ -0,0 +1,155 @@
+# Copyright 2010-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.
+
+if(DEFINED __INCLUDED_GR_MISC_UTILS_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_MISC_UTILS_CMAKE TRUE)
+
+########################################################################
+# Set global variable macro.
+# Used for subdirectories to export settings.
+# Example: include and library paths.
+########################################################################
+function(GR_SET_GLOBAL var)
+    set(${var} ${ARGN} CACHE INTERNAL "" FORCE)
+endfunction(GR_SET_GLOBAL)
+
+########################################################################
+# Set the pre-processor definition if the condition is true.
+#  - def the pre-processor definition to set and condition name
+########################################################################
+function(GR_ADD_COND_DEF def)
+    if(${def})
+        add_definitions(-D${def})
+    endif(${def})
+endfunction(GR_ADD_COND_DEF)
+
+########################################################################
+# Check for a header and conditionally set a compile define.
+#  - hdr the relative path to the header file
+#  - def the pre-processor definition to set
+########################################################################
+function(GR_CHECK_HDR_N_DEF hdr def)
+    include(CheckIncludeFileCXX)
+    CHECK_INCLUDE_FILE_CXX(${hdr} ${def})
+    GR_ADD_COND_DEF(${def})
+endfunction(GR_CHECK_HDR_N_DEF)
+
+########################################################################
+# Include subdirectory macro.
+# Sets the CMake directory variables,
+# includes the subdirectory CMakeLists.txt,
+# resets the CMake directory variables.
+#
+# This macro includes subdirectories rather than adding them
+# so that the subdirectory can affect variables in the level above.
+# This provides a work-around for the lack of convenience libraries.
+# This way a subdirectory can append to the list of library sources.
+########################################################################
+macro(GR_INCLUDE_SUBDIRECTORY subdir)
+    #insert the current directories on the front of the list
+    list(INSERT _cmake_source_dirs 0 ${CMAKE_CURRENT_SOURCE_DIR})
+    list(INSERT _cmake_binary_dirs 0 ${CMAKE_CURRENT_BINARY_DIR})
+
+    #set the current directories to the names of the subdirs
+    set(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
+    set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${subdir})
+
+    #include the subdirectory CMakeLists to run it
+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
+
+    #reset the value of the current directories
+    list(GET _cmake_source_dirs 0 CMAKE_CURRENT_SOURCE_DIR)
+    list(GET _cmake_binary_dirs 0 CMAKE_CURRENT_BINARY_DIR)
+
+    #pop the subdir names of the front of the list
+    list(REMOVE_AT _cmake_source_dirs 0)
+    list(REMOVE_AT _cmake_binary_dirs 0)
+endmacro(GR_INCLUDE_SUBDIRECTORY)
+
+########################################################################
+# Check if a compiler flag works and conditionally set a compile define.
+#  - flag the compiler flag to check for
+#  - have the variable to set with result
+########################################################################
+macro(GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE flag have)
+    include(CheckCXXCompilerFlag)
+    CHECK_CXX_COMPILER_FLAG(${flag} ${have})
+    if(${have})
+        add_definitions(${flag})
+    endif(${have})
+endmacro(GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE)
+
+########################################################################
+# Do standard things to the library target
+# - set target properties
+# - make install rules
+# Also handle gnuradio custom naming conventions w/ extras mode.
+########################################################################
+function(GR_LIBRARY_FOO target)
+    #parse the arguments for component names
+    include(CMakeParseArgumentsCopy)
+    CMAKE_PARSE_ARGUMENTS(GR_LIBRARY "" "RUNTIME_COMPONENT;DEVEL_COMPONENT" "" ${ARGN})
+
+    #set additional target properties
+    set_target_properties(${target} PROPERTIES SOVERSION ${LIBVER})
+
+    #install the generated files like so...
+    install(TARGETS ${target}
+        LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .so/.dylib file
+        ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_DEVEL_COMPONENT}   # .lib file
+        RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .dll file
+    )
+
+    #extras mode enabled automatically on linux
+    if(NOT DEFINED LIBRARY_EXTRAS)
+        set(LIBRARY_EXTRAS ${LINUX})
+    endif()
+
+    #special extras mode to enable alternative naming conventions
+    if(LIBRARY_EXTRAS)
+
+        #create .la file before changing props
+        include(CMakeMacroLibtoolFile)
+        CREATE_LIBTOOL_FILE(${target} /${GR_LIBRARY_DIR})
+
+        #give the library a special name with ultra-zero soversion
+        set_target_properties(${target} PROPERTIES LIBRARY_OUTPUT_NAME ${target}-${LIBVER} SOVERSION "0.0.0")
+        set(target_name lib${target}-${LIBVER}.so.0.0.0)
+
+        #custom command to generate symlinks
+        add_custom_command(
+            TARGET ${target}
+            POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so
+            COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} ${CMAKE_CURRENT_BINARY_DIR}/lib${target}-${LIBVER}.so.0
+        )
+
+        #and install the extra symlinks
+        install(
+            FILES
+            ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so
+            ${CMAKE_CURRENT_BINARY_DIR}/lib${target}-${LIBVER}.so.0
+            DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT}
+        )
+
+    endif(LIBRARY_EXTRAS)
+endfunction(GR_LIBRARY_FOO)
diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake
new file mode 100644
index 000000000..d398d7265
--- /dev/null
+++ b/cmake/Modules/GrPackage.cmake
@@ -0,0 +1,133 @@
+# 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.
+
+if(DEFINED __INCLUDED_GR_PACKAGE_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_PACKAGE_CMAKE TRUE)
+
+include(GrVersion) #sets version information
+include(GrPlatform) #sets platform information
+
+#set the cpack generator based on the platform type
+if(CPACK_GENERATOR)
+    #already set by user
+elseif(APPLE)
+    set(CPACK_GENERATOR PackageMaker)
+elseif(WIN32)
+    set(CPACK_GENERATOR NSIS)
+elseif(DEBIAN)
+    set(CPACK_GENERATOR DEB)
+elseif(REDHAT)
+    set(CPACK_GENERATOR RPM)
+else()
+    set(CPACK_GENERATOR TGZ)
+endif()
+
+########################################################################
+# CPACK_SET - set a global variable and record the variable name
+########################################################################
+function(CPACK_SET var)
+    set(${var} ${ARGN} CACHE INTERNAL "")
+    list(APPEND _cpack_vars ${var})
+    list(REMOVE_DUPLICATES _cpack_vars)
+    set(_cpack_vars ${_cpack_vars} CACHE INTERNAL "")
+endfunction(CPACK_SET)
+
+########################################################################
+# CPACK_FINALIZE - include cpack and the unset all the cpack variables
+########################################################################
+function(CPACK_FINALIZE)
+    include(CPack) #finalize the cpack settings configured throughout the build system
+    foreach(var ${_cpack_vars})
+        unset(${var} CACHE)
+    endforeach(var)
+    unset(_cpack_vars CACHE)
+endfunction(CPACK_FINALIZE)
+
+########################################################################
+# CPACK_COMPONENT - convenience function to create a cpack component
+#
+# Usage: CPACK_COMPONENT(
+#   name
+#   [GROUP group]
+#   [DISPLAY_NAME display_name]
+#   [DESCRIPTION description]
+#   [DEPENDS depends]
+# )
+########################################################################
+function(CPACK_COMPONENT name)
+    include(CMakeParseArgumentsCopy)
+    set(_options GROUP DISPLAY_NAME DESCRIPTION DEPENDS)
+    CMAKE_PARSE_ARGUMENTS(CPACK_COMPONENT "" "${_options}" "" ${ARGN})
+
+    string(TOUPPER "${name}" name_upper)
+    foreach(_option ${_options})
+        if(CPACK_COMPONENT_${_option})
+            CPACK_SET(CPACK_COMPONENT_${name_upper}_${_option} "${CPACK_COMPONENT_${_option}}")
+        endif()
+    endforeach(_option)
+
+    CPACK_SET(CPACK_COMPONENTS_ALL "${CPACK_COMPONENTS_ALL};${name}")
+
+endfunction(CPACK_COMPONENT)
+
+########################################################################
+# Setup CPack
+########################################################################
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GNU Radio")
+set(CPACK_PACKAGE_VENDOR              "Free Software Foundation, Inc.")
+set(CPACK_PACKAGE_CONTACT             "Discuss-gnuradio@gnu.org")
+set(CPACK_PACKAGE_VERSION ${VERSION})
+set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/README)
+set(CPACK_RESOURCE_FILE_README ${CMAKE_SOURCE_DIR}/README)
+set(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README)
+if(${CPACK_GENERATOR} STREQUAL NSIS)
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}")
+endif()
+
+########################################################################
+# DEB package specific
+########################################################################
+set(CPACK_DEBIAN_PACKAGE_DEPENDS
+    "libboost-all-dev"
+    "libfftw3-3"
+    "python"
+    "python-numpy"
+    "libqt4-core"
+    "libqwt5-qt4"
+    "python-qt4"
+    "python-gtk2"
+    "python-lxml"
+    "python-Cheetah"
+)
+string(REPLACE ";" ", " CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}")
+set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_SOURCE_DIR}/debian/postinst ${CMAKE_SOURCE_DIR}/debian/prerm)
+
+########################################################################
+# RPM package specific
+########################################################################
+set(CPACK_RPM_PACKAGE_REQUIRES "boost-devel") #TODO other packages
+
+########################################################################
+# NSIS package specific
+########################################################################
+set(CPACK_NSIS_MODIFY_PATH ON)
+
+set(HLKM_ENV "\\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"")
diff --git a/cmake/Modules/GrPlatform.cmake b/cmake/Modules/GrPlatform.cmake
new file mode 100644
index 000000000..ce2e15fef
--- /dev/null
+++ b/cmake/Modules/GrPlatform.cmake
@@ -0,0 +1,46 @@
+# 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.
+
+if(DEFINED __INCLUDED_GR_PLATFORM_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_PLATFORM_CMAKE TRUE)
+
+########################################################################
+# Setup additional defines for OS types
+########################################################################
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(LINUX TRUE)
+endif()
+
+if(LINUX AND EXISTS "/etc/debian_version")
+    set(DEBIAN TRUE)
+endif()
+
+if(LINUX AND EXISTS "/etc/redhat-release")
+    set(REDHAT TRUE)
+endif()
+
+########################################################################
+# when the library suffix should be 64 (applies to redhat linux family)
+########################################################################
+if(NOT DEFINED LIB_SUFFIX AND REDHAT AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$")
+    set(LIB_SUFFIX 64)
+endif()
+set(LIB_SUFFIX ${LIB_SUFFIX} CACHE STRING "lib directory suffix")
diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake
new file mode 100644
index 000000000..10e93ed75
--- /dev/null
+++ b/cmake/Modules/GrPython.cmake
@@ -0,0 +1,193 @@
+# Copyright 2010-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.
+
+if(DEFINED __INCLUDED_GR_PYTHON_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_PYTHON_CMAKE TRUE)
+
+########################################################################
+# Setup the python interpreter:
+# This allows the user to specify a specific interpreter,
+# or finds the interpreter via the built-in cmake module.
+########################################################################
+#this allows the user to override PYTHON_EXECUTABLE
+if(PYTHON_EXECUTABLE)
+
+    set(PYTHONINTERP_FOUND TRUE)
+
+#otherwise if not set, try to automatically find it
+else(PYTHON_EXECUTABLE)
+
+    #use the built-in find script
+    find_package(PythonInterp)
+
+    #and if that fails use the find program routine
+    if(NOT PYTHONINTERP_FOUND)
+        find_program(PYTHON_EXECUTABLE NAMES python python2.7 python2.6 python2.5)
+        if(PYTHON_EXECUTABLE)
+            set(PYTHONINTERP_FOUND TRUE)
+        endif(PYTHON_EXECUTABLE)
+    endif(NOT PYTHONINTERP_FOUND)
+
+endif(PYTHON_EXECUTABLE)
+
+#make the path to the executable appear in the cmake gui
+set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "python interpreter")
+
+#make sure we can use -B with python (introduced in 2.6)
+if(PYTHON_EXECUTABLE)
+    execute_process(
+        COMMAND ${PYTHON_EXECUTABLE} -B -c ""
+        OUTPUT_QUIET ERROR_QUIET
+        RESULT_VARIABLE PYTHON_HAS_DASH_B_RESULT
+    )
+    if(PYTHON_HAS_DASH_B_RESULT EQUAL 0)
+        set(PYTHON_DASH_B "-B")
+    endif()
+endif(PYTHON_EXECUTABLE)
+
+########################################################################
+# Check for the existence of a python module:
+# - desc a string description of the check
+# - mod the name of the module to import
+# - cmd an additional command to run
+# - have the result variable to set
+########################################################################
+macro(GR_PYTHON_CHECK_MODULE desc mod cmd have)
+    message(STATUS "")
+    message(STATUS "Python checking for ${desc}")
+    execute_process(
+        COMMAND ${PYTHON_EXECUTABLE} -c "
+#########################################
+try: import ${mod}
+except: exit(-1)
+try: assert ${cmd}
+except: exit(-1)
+#########################################"
+        RESULT_VARIABLE ${have}
+    )
+    if(${have} EQUAL 0)
+        message(STATUS "Python checking for ${desc} - found")
+        set(${have} TRUE)
+    else(${have} EQUAL 0)
+        message(STATUS "Python checking for ${desc} - not found")
+        set(${have} FALSE)
+    endif(${have} EQUAL 0)
+endmacro(GR_PYTHON_CHECK_MODULE)
+
+########################################################################
+# Sets the python installation directory GR_PYTHON_DIR
+########################################################################
+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
+from distutils import sysconfig
+print sysconfig.get_python_lib(plat_specific=True, prefix='')
+" OUTPUT_VARIABLE GR_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+file(TO_CMAKE_PATH ${GR_PYTHON_DIR} GR_PYTHON_DIR)
+
+########################################################################
+# Create an always-built target with a unique name
+# Usage: GR_UNIQUE_TARGET(<description> <dependencies list>)
+########################################################################
+function(GR_UNIQUE_TARGET desc)
+    file(RELATIVE_PATH reldir ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import re, hashlib
+unique = hashlib.md5('${reldir}${ARGN}').hexdigest()[:5]
+print(re.sub('\\W', '_', '${desc} ${reldir} ' + unique))"
+    OUTPUT_VARIABLE _target OUTPUT_STRIP_TRAILING_WHITESPACE)
+    add_custom_target(${_target} ALL DEPENDS ${ARGN})
+endfunction(GR_UNIQUE_TARGET)
+
+########################################################################
+# Install python sources (also builds and installs byte-compiled python)
+########################################################################
+function(GR_PYTHON_INSTALL)
+    include(CMakeParseArgumentsCopy)
+    CMAKE_PARSE_ARGUMENTS(GR_PYTHON_INSTALL "" "DESTINATION;COMPONENT" "FILES;PROGRAMS" ${ARGN})
+
+    ####################################################################
+    if(GR_PYTHON_INSTALL_FILES)
+    ####################################################################
+        install(${ARGN}) #installs regular python files
+
+        foreach(pyfile ${GR_PYTHON_INSTALL_FILES})
+            get_filename_component(pyfile_name ${pyfile} NAME)
+            get_filename_component(pyfile ${pyfile} ABSOLUTE)
+            string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" pycfile "${pyfile}c")
+            list(APPEND python_install_gen_targets ${pycfile})
+
+            get_filename_component(pycfile_path ${pycfile} PATH)
+            file(MAKE_DIRECTORY ${pycfile_path})
+
+            #create a command to generate the byte-compiled pyc file
+            add_custom_command(
+                OUTPUT ${pycfile} DEPENDS ${pyfile}
+                COMMAND ${PYTHON_EXECUTABLE} -c
+                \"import py_compile\; py_compile.compile(file='${pyfile}', cfile='${pycfile}', doraise=True)\"
+                COMMENT "Byte-compiling ${pyfile_name}"
+            )
+            install(FILES ${pycfile}
+                DESTINATION ${GR_PYTHON_INSTALL_DESTINATION}
+                COMPONENT ${GR_PYTHON_INSTALL_COMPONENT}
+            )
+        endforeach(pyfile)
+
+	# Creates .pyo files
+	install(CODE "MESSAGE(\"-- Optimizing: ${CMAKE_INSTALL_PREFIX}/${GR_PYTHON_INSTALL_DESTINATION}\")")
+	install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m compileall -q ${CMAKE_INSTALL_PREFIX}/${GR_PYTHON_INSTALL_DESTINATION})")
+	
+    ####################################################################
+    elseif(GR_PYTHON_INSTALL_PROGRAMS)
+    ####################################################################
+        file(TO_NATIVE_PATH ${PYTHON_EXECUTABLE} pyexe_native)
+
+        foreach(pyfile ${GR_PYTHON_INSTALL_PROGRAMS})
+            get_filename_component(pyfile_name ${pyfile} NAME)
+            get_filename_component(pyfile ${pyfile} ABSOLUTE)
+            string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" pyexefile "${pyfile}.exe")
+            list(APPEND python_install_gen_targets ${pyexefile})
+
+            get_filename_component(pyexefile_path ${pyexefile} PATH)
+            file(MAKE_DIRECTORY ${pyexefile_path})
+
+            add_custom_command(
+                OUTPUT ${pyexefile} DEPENDS ${pyfile}
+                COMMAND ${PYTHON_EXECUTABLE} -c
+                \"open('${pyexefile}', 'w').write('\#!${pyexe_native}\\n'+open('${pyfile}').read())\"
+                COMMENT "Shebangin ${pyfile_name}"
+            )
+
+            #on windows, python files need an extension to execute
+            get_filename_component(pyfile_ext ${pyfile} EXT)
+            if(WIN32 AND NOT pyfile_ext)
+                set(pyfile_name "${pyfile_name}.py")
+            endif()
+
+            install(PROGRAMS ${pyexefile} RENAME ${pyfile_name}
+                DESTINATION ${GR_PYTHON_INSTALL_DESTINATION}
+                COMPONENT ${GR_PYTHON_INSTALL_COMPONENT}
+            )
+        endforeach(pyfile)
+
+    endif()
+
+    GR_UNIQUE_TARGET("pygen" ${python_install_gen_targets})
+
+endfunction(GR_PYTHON_INSTALL)
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake
new file mode 100644
index 000000000..7f2018b53
--- /dev/null
+++ b/cmake/Modules/GrSwig.cmake
@@ -0,0 +1,140 @@
+# Copyright 2010-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.
+
+if(DEFINED __INCLUDED_GR_SWIG_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_SWIG_CMAKE TRUE)
+
+include(GrPython)
+
+########################################################################
+# Build a swig target for the common gnuradio use case. Usage:
+# GR_SWIG_MAKE(target ifile ifile ifile...)
+#
+# Set the following variables before calling:
+#   - GR_SWIG_FLAGS
+#   - GR_SWIG_INCLUDE_DIRS
+#   - GR_SWIG_LIBRARIES
+#   - GR_SWIG_SOURCE_DEPS
+#   - GR_SWIG_TARGET_DEPS
+########################################################################
+macro(GR_SWIG_MAKE name)
+    set(ifiles ${ARGN})
+
+    #determine include dependencies for swig file
+    execute_process(
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/get_swig_deps.py
+        "${ifiles}" "${GR_SWIG_INCLUDE_DIRS}"
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        OUTPUT_VARIABLE SWIG_MODULE_${name}_EXTRA_DEPS
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
+    #append the specified include directories
+    include_directories(${GR_SWIG_INCLUDE_DIRS})
+    list(APPEND SWIG_MODULE_${name}_EXTRA_DEPS ${GR_SWIG_SOURCE_DEPS})
+
+    find_package(PythonLibs)
+    include_directories(${PYTHON_INCLUDE_DIRS})
+
+    #setup the swig flags with flags and include directories
+    set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -module ${name} ${GR_SWIG_FLAGS})
+    foreach(dir ${GR_SWIG_INCLUDE_DIRS})
+        list(APPEND CMAKE_SWIG_FLAGS "-I${dir}")
+    endforeach(dir)
+
+    #set the C++ property on the swig .i file so it builds
+    set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON)
+
+    #setup the actual swig library target to be built
+    include(UseSWIG)
+    SWIG_ADD_MODULE(${name} python ${ifiles})
+    SWIG_LINK_LIBRARIES(${name} ${PYTHON_LIBRARIES} ${GR_SWIG_LIBRARIES})
+    if(GR_SWIG_TARGET_DEPS)
+        add_dependencies(${SWIG_MODULE_${name}_REAL_NAME} ${GR_SWIG_TARGET_DEPS})
+    endif(GR_SWIG_TARGET_DEPS)
+
+endmacro(GR_SWIG_MAKE)
+
+########################################################################
+# Install swig targets generated by GR_SWIG_MAKE. Usage:
+# GR_SWIG_INSTALL(
+#   TARGETS target target target...
+#   [DESTINATION destination]
+#   [COMPONENT component]
+# )
+########################################################################
+macro(GR_SWIG_INSTALL)
+
+  include(CMakeMacroLibtoolFile)
+    include(CMakeParseArgumentsCopy)
+    CMAKE_PARSE_ARGUMENTS(GR_SWIG_INSTALL "" "DESTINATION;COMPONENT" "TARGETS" ${ARGN})
+
+    foreach(name ${GR_SWIG_INSTALL_TARGETS})
+        install(TARGETS ${SWIG_MODULE_${name}_REAL_NAME}
+            DESTINATION ${GR_SWIG_INSTALL_DESTINATION}
+            COMPONENT ${GR_SWIG_INSTALL_COMPONENT}
+        )
+
+        include(GrPython)
+        GR_PYTHON_INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.py
+            DESTINATION ${GR_SWIG_INSTALL_DESTINATION}
+            COMPONENT ${GR_SWIG_INSTALL_COMPONENT}
+        )
+
+        CREATE_LIBTOOL_FILE(${SWIG_MODULE_${name}_REAL_NAME} /${GR_SWIG_INSTALL_DESTINATION})
+
+    endforeach(name)
+
+endmacro(GR_SWIG_INSTALL)
+
+########################################################################
+# Generate a python file that can determine swig dependencies.
+# Used by the make macro above to determine extra dependencies.
+# When you build C++, CMake figures out the header dependencies.
+# This code essentially performs that logic for swig includes.
+########################################################################
+file(WRITE ${CMAKE_BINARY_DIR}/get_swig_deps.py "
+
+import os, sys, re
+
+include_matcher = re.compile('[#|%]include\\s*[<|\"](.*)[>|\"]')
+include_dirs = sys.argv[2].split(';')
+
+def get_swig_incs(file_path):
+    file_contents = open(file_path, 'r').read()
+    return include_matcher.findall(file_contents, re.MULTILINE)
+
+def get_swig_deps(file_path, level):
+    deps = [file_path]
+    if level == 0: return deps
+    for inc_file in get_swig_incs(file_path):
+        for inc_dir in include_dirs:
+            inc_path = os.path.join(inc_dir, inc_file)
+            if not os.path.exists(inc_path): continue
+            deps.extend(get_swig_deps(inc_path, level-1))
+    return deps
+
+if __name__ == '__main__':
+    ifiles = sys.argv[1].split(';')
+    deps = sum([get_swig_deps(ifile, 3) for ifile in ifiles], [])
+    #sys.stderr.write(';'.join(set(deps)) + '\\n\\n')
+    print(';'.join(set(deps)))
+")
diff --git a/cmake/Modules/GrTest.cmake b/cmake/Modules/GrTest.cmake
new file mode 100644
index 000000000..bbb525dcc
--- /dev/null
+++ b/cmake/Modules/GrTest.cmake
@@ -0,0 +1,137 @@
+# Copyright 2010-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.
+
+if(DEFINED __INCLUDED_GR_TEST_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_TEST_CMAKE TRUE)
+
+########################################################################
+# Add a unit test and setup the environment for a unit test.
+# Takes the same arguments as the ADD_TEST function.
+#
+# Before calling set the following variables:
+# GR_TEST_TARGET_DEPS  - built targets for the library path
+# GR_TEST_LIBRARY_DIRS - directories for the library path
+# GR_TEST_PYTHON_DIRS  - directories for the python path
+########################################################################
+function(GR_ADD_TEST test_name)
+
+        #Ensure that the build exe also appears in the PATH.
+        list(APPEND GR_TEST_TARGET_DEPS ${ARGN})
+
+        #In the land of windows, all libraries must be in the PATH.
+        #Since the dependent libraries are not yet installed,
+        #we must manually set them in the PATH to run tests.
+        #The following appends the path of a target dependency.
+        foreach(target ${GR_TEST_TARGET_DEPS})
+            get_target_property(location ${target} LOCATION)
+            if(location)
+                get_filename_component(path ${location} PATH)
+                string(REGEX REPLACE "\\$\\(.*\\)" ${CMAKE_BUILD_TYPE} path ${path})
+                list(APPEND GR_TEST_LIBRARY_DIRS ${path})
+            endif(location)
+        endforeach(target)
+
+    if(WIN32)
+        #SWIG generates the python library files into a subdirectory.
+        #Therefore, we must append this subdirectory into PYTHONPATH.
+        #Only do this for the python directories matching the following:
+        foreach(pydir ${GR_TEST_PYTHON_DIRS})
+            get_filename_component(name ${pydir} NAME)
+            if(name MATCHES "^(swig|lib|src)$")
+                list(APPEND GR_TEST_PYTHON_DIRS ${pydir}/${CMAKE_BUILD_TYPE})
+            endif()
+        endforeach(pydir)
+    endif(WIN32)
+
+    file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} srcdir)
+    file(TO_NATIVE_PATH "${GR_TEST_LIBRARY_DIRS}" libpath) #ok to use on dir list?
+    file(TO_NATIVE_PATH "${GR_TEST_PYTHON_DIRS}" pypath) #ok to use on dir list?
+
+    set(environs "GR_DONT_LOAD_PREFS=1" "srcdir=${srcdir}")
+
+    #http://www.cmake.org/pipermail/cmake/2009-May/029464.html
+    #Replaced this add test + set environs code with the shell script generation.
+    #Its nicer to be able to manually run the shell script to diagnose problems.
+    #ADD_TEST(${ARGV})
+    #SET_TESTS_PROPERTIES(${test_name} PROPERTIES ENVIRONMENT "${environs}")
+
+    if(UNIX)
+        set(LD_PATH_VAR "LD_LIBRARY_PATH")
+        if(APPLE)
+            set(LD_PATH_VAR "DYLD_LIBRARY_PATH")
+        endif()
+
+        set(binpath "${CMAKE_CURRENT_BINARY_DIR}:$PATH")
+        list(APPEND libpath "$${LD_PATH_VAR}")
+        list(APPEND pypath "$PYTHONPATH")
+
+        #replace list separator with the path separator
+        string(REPLACE ";" ":" libpath "${libpath}")
+        string(REPLACE ";" ":" pypath "${pypath}")
+        list(APPEND environs "PATH=${binpath}" "${LD_PATH_VAR}=${libpath}" "PYTHONPATH=${pypath}")
+
+        #generate a bat file that sets the environment and runs the test
+        find_program(SHELL sh)
+        set(sh_file ${CMAKE_CURRENT_BINARY_DIR}/${test_name}_test.sh)
+        file(WRITE ${sh_file} "#!${SHELL}\n")
+        #each line sets an environment variable
+        foreach(environ ${environs})
+            file(APPEND ${sh_file} "export ${environ}\n")
+        endforeach(environ)
+        #load the command to run with its arguments
+        foreach(arg ${ARGN})
+            file(APPEND ${sh_file} "${arg} ")
+        endforeach(arg)
+        file(APPEND ${sh_file} "\n")
+
+        #make the shell file executable
+        execute_process(COMMAND chmod +x ${sh_file})
+
+        add_test(${test_name} ${SHELL} ${sh_file})
+
+    endif(UNIX)
+
+    if(WIN32)
+        list(APPEND libpath ${DLL_PATHS} "%PATH%")
+        list(APPEND pypath "%PYTHONPATH%")
+
+        #replace list separator with the path separator (escaped)
+        string(REPLACE ";" "\\;" libpath "${libpath}")
+        string(REPLACE ";" "\\;" pypath "${pypath}")
+        list(APPEND environs "PATH=${libpath}" "PYTHONPATH=${pypath}")
+
+        #generate a bat file that sets the environment and runs the test
+        set(bat_file ${CMAKE_CURRENT_BINARY_DIR}/${test_name}_test.bat)
+        file(WRITE ${bat_file} "@echo off\n")
+        #each line sets an environment variable
+        foreach(environ ${environs})
+            file(APPEND ${bat_file} "SET ${environ}\n")
+        endforeach(environ)
+        #load the command to run with its arguments
+        foreach(arg ${ARGN})
+            file(APPEND ${bat_file} "${arg} ")
+        endforeach(arg)
+        file(APPEND ${bat_file} "\n")
+
+        add_test(${test_name} ${bat_file})
+    endif(WIN32)
+
+endfunction(GR_ADD_TEST)
diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake
new file mode 100644
index 000000000..666c6f126
--- /dev/null
+++ b/cmake/Modules/GrVersion.cmake
@@ -0,0 +1,87 @@
+# 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.
+
+if(DEFINED __INCLUDED_GR_VERSION_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_VERSION_CMAKE TRUE)
+
+########################################################################
+# Extract variables from version.sh
+########################################################################
+include(GrPython)
+message(STATUS "Extracting version information from version.sh...")
+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "print open('${CMAKE_SOURCE_DIR}/version.sh').read().replace('=', ';').replace('\\n', ';')"
+    OUTPUT_VARIABLE VERSION_INFO OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+include(CMakeParseArgumentsCopy)
+CMAKE_PARSE_ARGUMENTS(VERSION_INFO "" "MAJOR_VERSION;API_COMPAT;MINOR_VERSION;MAINT_VERSION" "" ${VERSION_INFO})
+
+#eventually, replace version.sh and fill in the variables below
+set(MAJOR_VERSION ${VERSION_INFO_MAJOR_VERSION})
+set(API_COMPAT    ${VERSION_INFO_API_COMPAT})
+set(MINOR_VERSION ${VERSION_INFO_MINOR_VERSION})
+set(MAINT_VERSION ${VERSION_INFO_MAINT_VERSION})
+
+########################################################################
+# Extract the version string from git describe.
+########################################################################
+find_package(Git)
+
+#if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+#    message(STATUS "Extracting version information from git describe...")
+#    execute_process(
+#        COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=8
+#        OUTPUT_VARIABLE GIT_DESCRIBE OUTPUT_STRIP_TRAILING_WHITESPACE
+#        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+#    )
+#else()
+#    set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}.x-xxx-xunknown")
+#endif()
+
+########################################################################
+# Use the logic below to set the version constants
+########################################################################
+if("${MINOR_VERSION}" STREQUAL "git")
+    # VERSION: 3.3git-xxx-gxxxxxxxx
+    # DOCVER:  3.3git
+    # LIBVER:  3.3git
+    set(VERSION "${GIT_DESCRIBE}")
+    set(DOCVER  "${MAJOR_VERSION}.${API_COMPAT}${MINOR_VERSION}")
+    set(LIBVER  "${MAJOR_VERSION}.${API_COMPAT}${MINOR_VERSION}")
+elseif("${MAINT_VERSION}" STREQUAL "git")
+    # VERSION: 3.3.1git-xxx-gxxxxxxxx
+    # DOCVER:  3.3.1git
+    # LIBVER:  3.3.1git
+    set(VERSION "${GIT_DESCRIBE}")
+    set(DOCVER  "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}${MAINT_VERSION}")
+    set(LIBVER  "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}${MAINT_VERSION}")
+else()
+    # This is a numbered release.
+    # VERSION: 3.3.1{.x}
+    # DOCVER:  3.3.1{.x}
+    # LIBVER:  3.3.1{.x}
+    if("${MAINT_VERSION}" STREQUAL "0")
+        set(VERSION "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}")
+    else()
+        set(VERSION "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}.${MAINT_VERSION}")
+    endif()
+    set(DOCVER "${VERSION}")
+    set(LIBVER "${VERSION}")
+endif()
diff --git a/cmake/Modules/LibFindMacros.cmake b/cmake/Modules/LibFindMacros.cmake
new file mode 100644
index 000000000..69975c51b
--- /dev/null
+++ b/cmake/Modules/LibFindMacros.cmake
@@ -0,0 +1,99 @@
+# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
+# used for the current package. For this to work, the first parameter must be the
+# prefix of the current package, then the prefix of the new package etc, which are
+# passed to find_package.
+macro (libfind_package PREFIX)
+  set (LIBFIND_PACKAGE_ARGS ${ARGN})
+  if (${PREFIX}_FIND_QUIETLY)
+    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} QUIET)
+  endif (${PREFIX}_FIND_QUIETLY)
+  if (${PREFIX}_FIND_REQUIRED)
+    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
+  endif (${PREFIX}_FIND_REQUIRED)
+  find_package(${LIBFIND_PACKAGE_ARGS})
+endmacro (libfind_package)
+
+# CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
+# where they added pkg_check_modules. Consequently I need to support both in my scripts
+# to avoid those deprecated warnings. Here's a helper that does just that.
+# Works identically to pkg_check_modules, except that no checks are needed prior to use.
+macro (libfind_pkg_check_modules PREFIX PKGNAME)
+  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    include(UsePkgConfig)
+    pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
+  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    find_package(PkgConfig)
+    if (PKG_CONFIG_FOUND)
+      pkg_check_modules(${PREFIX} ${PKGNAME})
+    endif (PKG_CONFIG_FOUND)
+  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+endmacro (libfind_pkg_check_modules)
+
+# Do the final processing once the paths have been detected.
+# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
+# all the variables, each of which contain one include directory.
+# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
+# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
+# Also handles errors in case library detection was required, etc.
+macro (libfind_process PREFIX)
+  # Skip processing if already processed during this run
+  if (NOT ${PREFIX}_FOUND)
+    # Start with the assumption that the library was found
+    set (${PREFIX}_FOUND TRUE)
+
+    # Process all includes and set _FOUND to false if any are missing
+    foreach (i ${${PREFIX}_PROCESS_INCLUDES})
+      if (${i})
+        set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
+        mark_as_advanced(${i})
+      else (${i})
+        set (${PREFIX}_FOUND FALSE)
+      endif (${i})
+    endforeach (i)
+
+    # Process all libraries and set _FOUND to false if any are missing
+    foreach (i ${${PREFIX}_PROCESS_LIBS})
+      if (${i})
+        set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
+        mark_as_advanced(${i})
+      else (${i})
+        set (${PREFIX}_FOUND FALSE)
+      endif (${i})
+    endforeach (i)
+
+    # Print message and/or exit on fatal error
+    if (${PREFIX}_FOUND)
+      if (NOT ${PREFIX}_FIND_QUIETLY)
+        message (STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
+      endif (NOT ${PREFIX}_FIND_QUIETLY)
+    else (${PREFIX}_FOUND)
+      if (${PREFIX}_FIND_REQUIRED)
+        foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
+          message("${i}=${${i}}")
+        endforeach (i)
+        message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
+      endif (${PREFIX}_FIND_REQUIRED)
+    endif (${PREFIX}_FOUND)
+  endif (NOT ${PREFIX}_FOUND)
+endmacro (libfind_process)
+
+macro(libfind_library PREFIX basename)
+  set(TMP "")
+  if(MSVC80)
+    set(TMP -vc80)
+  endif(MSVC80)
+  if(MSVC90)
+    set(TMP -vc90)
+  endif(MSVC90)
+  set(${PREFIX}_LIBNAMES ${basename}${TMP})
+  if(${ARGC} GREATER 2)
+    set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
+    string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
+    set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
+  endif(${ARGC} GREATER 2)
+  find_library(${PREFIX}_LIBRARY
+    NAMES ${${PREFIX}_LIBNAMES}
+    PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
+  )
+endmacro(libfind_library)
+
diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
new file mode 100644
index 000000000..6031a6ca9
--- /dev/null
+++ b/cmake/cmake_uninstall.cmake.in
@@ -0,0 +1,23 @@
+# http://www.vtk.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F
+
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+  IF(EXISTS "$ENV{DESTDIR}${file}")
+    EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    IF(NOT "${rm_retval}" STREQUAL 0)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+    ENDIF(NOT "${rm_retval}" STREQUAL 0)
+  ELSE(EXISTS "$ENV{DESTDIR}${file}")
+    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)
diff --git a/cmake/msvc/config.h b/cmake/msvc/config.h
new file mode 100644
index 000000000..71e94c832
--- /dev/null
+++ b/cmake/msvc/config.h
@@ -0,0 +1,55 @@
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_CONFIG_H_ // [
+#define _MSC_CONFIG_H_
+
+////////////////////////////////////////////////////////////////////////
+// enable inline functions for C code
+////////////////////////////////////////////////////////////////////////
+#ifndef __cplusplus
+#  define inline __inline
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// signed size_t
+////////////////////////////////////////////////////////////////////////
+#include <stddef.h>
+typedef ptrdiff_t ssize_t;
+
+////////////////////////////////////////////////////////////////////////
+// rint functions
+////////////////////////////////////////////////////////////////////////
+static inline long lrint(double x){return (long)(x > 0.0 ? x + 0.5 : x - 0.5);}
+static inline long lrintf(float x){return (long)(x > 0.0f ? x + 0.5f : x - 0.5f);}
+static inline double rint(double x){return (double)lrint(x);}
+static inline float rintf(float x){return (float)lrintf(x);}
+
+////////////////////////////////////////////////////////////////////////
+// math constants
+////////////////////////////////////////////////////////////////////////
+#define INFINITY HUGE_VAL
+
+# define M_E		2.7182818284590452354	/* e */
+# define M_LOG2E	1.4426950408889634074	/* log_2 e */
+# define M_LOG10E	0.43429448190325182765	/* log_10 e */
+# define M_LN2		0.69314718055994530942	/* log_e 2 */
+# define M_LN10		2.30258509299404568402	/* log_e 10 */
+# define M_PI		3.14159265358979323846	/* pi */
+# define M_PI_2		1.57079632679489661923	/* pi/2 */
+# define M_PI_4		0.78539816339744830962	/* pi/4 */
+# define M_1_PI		0.31830988618379067154	/* 1/pi */
+# define M_2_PI		0.63661977236758134308	/* 2/pi */
+# define M_2_SQRTPI	1.12837916709551257390	/* 2/sqrt(pi) */
+# define M_SQRT2	1.41421356237309504880	/* sqrt(2) */
+# define M_SQRT1_2	0.70710678118654752440	/* 1/sqrt(2) */
+
+////////////////////////////////////////////////////////////////////////
+// random and srandom
+////////////////////////////////////////////////////////////////////////
+#include <stdlib.h>
+static inline long int random (void) { return rand(); }
+static inline void srandom (unsigned int seed) { srand(seed); }
+
+#endif // _MSC_CONFIG_H_ ]
diff --git a/cmake/msvc/inttypes.h b/cmake/msvc/inttypes.h
new file mode 100644
index 000000000..1c2baa82e
--- /dev/null
+++ b/cmake/msvc/inttypes.h
@@ -0,0 +1,301 @@
+// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_INTTYPES_H_ // [
+#define _MSC_INTTYPES_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <stdint.h>
+
+// 7.8 Format conversion of integer types
+
+typedef struct {
+   intmax_t quot;
+   intmax_t rem;
+} imaxdiv_t;
+
+// 7.8.1 Macros for format specifiers
+
+// The fprintf macros for signed integers are:
+#define PRId8       "d"
+#define PRIi8       "i"
+#define PRIdLEAST8  "d"
+#define PRIiLEAST8  "i"
+#define PRIdFAST8   "d"
+#define PRIiFAST8   "i"
+
+#define PRId16       "hd"
+#define PRIi16       "hi"
+#define PRIdLEAST16  "hd"
+#define PRIiLEAST16  "hi"
+#define PRIdFAST16   "hd"
+#define PRIiFAST16   "hi"
+
+#define PRId32       "I32d"
+#define PRIi32       "I32i"
+#define PRIdLEAST32  "I32d"
+#define PRIiLEAST32  "I32i"
+#define PRIdFAST32   "I32d"
+#define PRIiFAST32   "I32i"
+
+#define PRId64       "I64d"
+#define PRIi64       "I64i"
+#define PRIdLEAST64  "I64d"
+#define PRIiLEAST64  "I64i"
+#define PRIdFAST64   "I64d"
+#define PRIiFAST64   "I64i"
+
+#define PRIdMAX     "I64d"
+#define PRIiMAX     "I64i"
+
+#define PRIdPTR     "Id"
+#define PRIiPTR     "Ii"
+
+// The fprintf macros for unsigned integers are:
+#define PRIo8       "o"
+#define PRIu8       "u"
+#define PRIx8       "x"
+#define PRIX8       "X"
+#define PRIoLEAST8  "o"
+#define PRIuLEAST8  "u"
+#define PRIxLEAST8  "x"
+#define PRIXLEAST8  "X"
+#define PRIoFAST8   "o"
+#define PRIuFAST8   "u"
+#define PRIxFAST8   "x"
+#define PRIXFAST8   "X"
+
+#define PRIo16       "ho"
+#define PRIu16       "hu"
+#define PRIx16       "hx"
+#define PRIX16       "hX"
+#define PRIoLEAST16  "ho"
+#define PRIuLEAST16  "hu"
+#define PRIxLEAST16  "hx"
+#define PRIXLEAST16  "hX"
+#define PRIoFAST16   "ho"
+#define PRIuFAST16   "hu"
+#define PRIxFAST16   "hx"
+#define PRIXFAST16   "hX"
+
+#define PRIo32       "I32o"
+#define PRIu32       "I32u"
+#define PRIx32       "I32x"
+#define PRIX32       "I32X"
+#define PRIoLEAST32  "I32o"
+#define PRIuLEAST32  "I32u"
+#define PRIxLEAST32  "I32x"
+#define PRIXLEAST32  "I32X"
+#define PRIoFAST32   "I32o"
+#define PRIuFAST32   "I32u"
+#define PRIxFAST32   "I32x"
+#define PRIXFAST32   "I32X"
+
+#define PRIo64       "I64o"
+#define PRIu64       "I64u"
+#define PRIx64       "I64x"
+#define PRIX64       "I64X"
+#define PRIoLEAST64  "I64o"
+#define PRIuLEAST64  "I64u"
+#define PRIxLEAST64  "I64x"
+#define PRIXLEAST64  "I64X"
+#define PRIoFAST64   "I64o"
+#define PRIuFAST64   "I64u"
+#define PRIxFAST64   "I64x"
+#define PRIXFAST64   "I64X"
+
+#define PRIoMAX     "I64o"
+#define PRIuMAX     "I64u"
+#define PRIxMAX     "I64x"
+#define PRIXMAX     "I64X"
+
+#define PRIoPTR     "Io"
+#define PRIuPTR     "Iu"
+#define PRIxPTR     "Ix"
+#define PRIXPTR     "IX"
+
+// The fscanf macros for signed integers are:
+#define SCNd8       "d"
+#define SCNi8       "i"
+#define SCNdLEAST8  "d"
+#define SCNiLEAST8  "i"
+#define SCNdFAST8   "d"
+#define SCNiFAST8   "i"
+
+#define SCNd16       "hd"
+#define SCNi16       "hi"
+#define SCNdLEAST16  "hd"
+#define SCNiLEAST16  "hi"
+#define SCNdFAST16   "hd"
+#define SCNiFAST16   "hi"
+
+#define SCNd32       "ld"
+#define SCNi32       "li"
+#define SCNdLEAST32  "ld"
+#define SCNiLEAST32  "li"
+#define SCNdFAST32   "ld"
+#define SCNiFAST32   "li"
+
+#define SCNd64       "I64d"
+#define SCNi64       "I64i"
+#define SCNdLEAST64  "I64d"
+#define SCNiLEAST64  "I64i"
+#define SCNdFAST64   "I64d"
+#define SCNiFAST64   "I64i"
+
+#define SCNdMAX     "I64d"
+#define SCNiMAX     "I64i"
+
+#ifdef _WIN64 // [
+#  define SCNdPTR     "I64d"
+#  define SCNiPTR     "I64i"
+#else  // _WIN64 ][
+#  define SCNdPTR     "ld"
+#  define SCNiPTR     "li"
+#endif  // _WIN64 ]
+
+// The fscanf macros for unsigned integers are:
+#define SCNo8       "o"
+#define SCNu8       "u"
+#define SCNx8       "x"
+#define SCNX8       "X"
+#define SCNoLEAST8  "o"
+#define SCNuLEAST8  "u"
+#define SCNxLEAST8  "x"
+#define SCNXLEAST8  "X"
+#define SCNoFAST8   "o"
+#define SCNuFAST8   "u"
+#define SCNxFAST8   "x"
+#define SCNXFAST8   "X"
+
+#define SCNo16       "ho"
+#define SCNu16       "hu"
+#define SCNx16       "hx"
+#define SCNX16       "hX"
+#define SCNoLEAST16  "ho"
+#define SCNuLEAST16  "hu"
+#define SCNxLEAST16  "hx"
+#define SCNXLEAST16  "hX"
+#define SCNoFAST16   "ho"
+#define SCNuFAST16   "hu"
+#define SCNxFAST16   "hx"
+#define SCNXFAST16   "hX"
+
+#define SCNo32       "lo"
+#define SCNu32       "lu"
+#define SCNx32       "lx"
+#define SCNX32       "lX"
+#define SCNoLEAST32  "lo"
+#define SCNuLEAST32  "lu"
+#define SCNxLEAST32  "lx"
+#define SCNXLEAST32  "lX"
+#define SCNoFAST32   "lo"
+#define SCNuFAST32   "lu"
+#define SCNxFAST32   "lx"
+#define SCNXFAST32   "lX"
+
+#define SCNo64       "I64o"
+#define SCNu64       "I64u"
+#define SCNx64       "I64x"
+#define SCNX64       "I64X"
+#define SCNoLEAST64  "I64o"
+#define SCNuLEAST64  "I64u"
+#define SCNxLEAST64  "I64x"
+#define SCNXLEAST64  "I64X"
+#define SCNoFAST64   "I64o"
+#define SCNuFAST64   "I64u"
+#define SCNxFAST64   "I64x"
+#define SCNXFAST64   "I64X"
+
+#define SCNoMAX     "I64o"
+#define SCNuMAX     "I64u"
+#define SCNxMAX     "I64x"
+#define SCNXMAX     "I64X"
+
+#ifdef _WIN64 // [
+#  define SCNoPTR     "I64o"
+#  define SCNuPTR     "I64u"
+#  define SCNxPTR     "I64x"
+#  define SCNXPTR     "I64X"
+#else  // _WIN64 ][
+#  define SCNoPTR     "lo"
+#  define SCNuPTR     "lu"
+#  define SCNxPTR     "lx"
+#  define SCNXPTR     "lX"
+#endif  // _WIN64 ]
+
+// 7.8.2 Functions for greatest-width integer types
+
+// 7.8.2.1 The imaxabs function
+#define imaxabs _abs64
+
+// 7.8.2.2 The imaxdiv function
+
+// This is modified version of div() function from Microsoft's div.c found
+// in %MSVC.NET%\crt\src\div.c
+#ifdef STATIC_IMAXDIV // [
+static
+#else // STATIC_IMAXDIV ][
+_inline
+#endif // STATIC_IMAXDIV ]
+imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
+{
+   imaxdiv_t result;
+
+   result.quot = numer / denom;
+   result.rem = numer % denom;
+
+   if (numer < 0 && result.rem > 0) {
+      // did division wrong; must fix up
+      ++result.quot;
+      result.rem -= denom;
+   }
+
+   return result;
+}
+
+// 7.8.2.3 The strtoimax and strtoumax functions
+#define strtoimax _strtoi64
+#define strtoumax _strtoui64
+
+// 7.8.2.4 The wcstoimax and wcstoumax functions
+#define wcstoimax _wcstoi64
+#define wcstoumax _wcstoui64
+
+
+#endif // _MSC_INTTYPES_H_ ]
diff --git a/cmake/msvc/stdint.h b/cmake/msvc/stdint.h
new file mode 100644
index 000000000..ab6d37e11
--- /dev/null
+++ b/cmake/msvc/stdint.h
@@ -0,0 +1,251 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006-2008 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
+// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#ifdef __cplusplus
+extern "C" {
+#endif
+#  include <wchar.h>
+#ifdef __cplusplus
+}
+#endif
+
+// Define _W64 macros to mark types changing their size, like intptr_t.
+#ifndef _W64
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#     define _W64 __w64
+#  else
+#     define _W64
+#  endif
+#endif
+
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+
+// Visual Studio 6 and Embedded Visual C++ 4 doesn't
+// realize that, e.g. char has the same size as __int8
+// so we give up on __intX for them.
+#if (_MSC_VER < 1300)
+   typedef signed char       int8_t;
+   typedef signed short      int16_t;
+   typedef signed int        int32_t;
+   typedef unsigned char     uint8_t;
+   typedef unsigned short    uint16_t;
+   typedef unsigned int      uint32_t;
+#else
+   typedef signed __int8     int8_t;
+   typedef signed __int16    int16_t;
+   typedef signed __int32    int32_t;
+   typedef unsigned __int8   uint8_t;
+   typedef unsigned __int16  uint16_t;
+   typedef unsigned __int32  uint32_t;
+#endif
+typedef signed __int64       int64_t;
+typedef unsigned __int64     uint64_t;
+
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef signed __int64    intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef _W64 signed int   intptr_t;
+   typedef _W64 unsigned int uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#ifndef INTMAX_C
+#define INTMAX_C   INT64_C
+#endif
+#ifndef UINTMAX_C
+#define UINTMAX_C  UINT64_C
+#endif
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+
+#endif // _MSC_STDINT_H_ ]
diff --git a/cmake/msvc/sys/time.h b/cmake/msvc/sys/time.h
new file mode 100644
index 000000000..998b5d7bb
--- /dev/null
+++ b/cmake/msvc/sys/time.h
@@ -0,0 +1,69 @@
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_SYS_TIME_H_
+#define _MSC_SYS_TIME_H_
+
+//http://social.msdn.microsoft.com/Forums/en/vcgeneral/thread/430449b3-f6dd-4e18-84de-eebd26a8d668
+#include < time.h >
+#include <windows.h> //I've ommited this line.
+#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
+#else
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
+#endif
+
+struct timespec {
+
+time_t tv_sec; /* Seconds since 00:00:00 GMT, */
+
+/* 1 January 1970 */
+
+long tv_nsec; /* Additional nanoseconds since */
+
+/* tv_sec */
+
+};
+
+struct timezone 
+{
+  int  tz_minuteswest; /* minutes W of Greenwich */
+  int  tz_dsttime;     /* type of dst correction */
+};
+ 
+static inline int gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+  FILETIME ft;
+  unsigned __int64 tmpres = 0;
+  static int tzflag;
+ 
+  if (NULL != tv)
+  {
+    GetSystemTimeAsFileTime(&ft);
+ 
+    tmpres |= ft.dwHighDateTime;
+    tmpres <<= 32;
+    tmpres |= ft.dwLowDateTime;
+ 
+    /*converting file time to unix epoch*/
+    tmpres -= DELTA_EPOCH_IN_MICROSECS; 
+    tv->tv_sec = (long)(tmpres / 1000000UL);
+    tv->tv_usec = (long)(tmpres % 1000000UL);
+  }
+ 
+  if (NULL != tz)
+  {
+    if (!tzflag)
+    {
+      _tzset();
+      tzflag++;
+    }
+    tz->tz_minuteswest = _timezone / 60;
+    tz->tz_dsttime = _daylight;
+  }
+ 
+  return 0;
+}
+
+#endif //_MSC_SYS_TIME_H_
diff --git a/cmake/msvc/unistd.h b/cmake/msvc/unistd.h
new file mode 100644
index 000000000..de412e42a
--- /dev/null
+++ b/cmake/msvc/unistd.h
@@ -0,0 +1,10 @@
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_UNISTD_H_ // [
+#define _MSC_UNISTD_H_
+
+#include <process.h>
+
+#endif // _MSC_UNISTD_H_ ]
diff --git a/config/Makefile.am b/config/Makefile.am
index ba3026cd9..003a0f6ae 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -46,35 +46,23 @@ m4macros = \
 	cppunit.m4 \
 	grc_build.m4 \
 	grc_docs.m4 \
-	grc_gcell.m4 \
 	grc_gnuradio_core.m4 \
 	grc_gnuradio_examples.m4 \
 	grc_grc.m4 \
 	grc_gr_atsc.m4 \
 	grc_gr_audio.m4 \
 	grc_gr_comedi.m4 \
-	grc_gr_gcell.m4 \
-	grc_gr_gpio.m4 \
-	grc_gr_gsm_fr_vocoder.m4 \
 	grc_gr_noaa.m4 \
-	grc_gr_radar_mono.m4 \
-	grc_gr_radio_astronomy.m4 \
-	grc_gr_sounder.m4 \
 	grc_gr_trellis.m4 \
-	grc_gr_usrp.m4 \
 	grc_gr_video_sdl.m4 \
+	grc_gr_vocoder.m4 \
 	grc_gr_wxgui.m4 \
 	grc_gruel.m4 \
 	gr_check_createfilemapping.m4 \
 	gr_check_mc4020.m4 \
 	gr_check_shm_open.m4 \
-	gr_check_usrp.m4 \
-	grc_usrp.m4 \
-	grc_usrp2.m4 \
-	grc_gr_msdd6000.m4 \
 	gr_doxygen.m4 \
 	gr_fortran.m4 \
-	gr_gcell.m4 \
 	gr_git.m4 \
 	gr_gprof.m4 \
 	gr_lib64.m4 \
@@ -98,9 +86,6 @@ m4macros = \
 	mkstemp.m4 \
 	onceonly.m4 \
 	pkg.m4 \
-	sdl.m4 \
-	usrp_fusb_tech.m4 \
-	usrp_libusb.m4 \
-	usrp_sdcc.m4
+	sdl.m4
 
 EXTRA_DIST += $(m4macros)
diff --git a/config/gr_gcell.m4 b/config/gr_gcell.m4
deleted file mode 100644
index 0b8b97802..000000000
--- a/config/gr_gcell.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-AC_DEFUN([GR_GCELL],[
-  passed=yes
-  PKG_CHECK_MODULES(GCELL, gcell >= 3.1, [],
-    [passed=no; AC_MSG_RESULT([gcell not found])])
-  PKG_CHECK_MODULES(GCELL_SPU, gcell_spu >= 3.1, [],
-    [passed=no; AC_MSG_RESULT([gcell_spu not found])])
-
-  GCELL_EMBEDSPU_LIBTOOL=
-  if test $passed = yes; then
-    GCELL_EMBEDSPU_LIBTOOL=`$PKG_CONFIG --variable=gcell_embedspu_libtool gcell 2>/dev/null`
-    AC_DEFINE(HAVE_GCELL,[1],[Define if you have gcell installed])
-  fi
-  AC_SUBST([GCELL_EMBEDSPU_LIBTOOL])
-
-  AM_CONDITIONAL([HAVE_GCELL], [test "$passed" = "yes"])
-])
diff --git a/config/gr_python.m4 b/config/gr_python.m4
index 7aef1662e..d89f4c504 100644
--- a/config/gr_python.m4
+++ b/config/gr_python.m4
@@ -49,6 +49,22 @@ AC_DEFUN([PYTHON_DEVEL],[
 		    if  (echo $pyexecdir | grep -q lib64); then
 			    pythondir="$pyexecdir"
 		    fi
+	    else
+		# Let Python tell us where the install directory is;
+		# i.e., don't trust AM_PATH_PYTHON
+		python_cmd='
+import distutils.sysconfig
+import os
+path = distutils.sysconfig.get_python_lib()
+pypath = distutils.sysconfig.get_config_var("exec_prefix")
+path = path.split(pypath)[[1]]
+if os.sep == "\\":
+  path = path.replace("\\", "/")
+print path
+'
+		pyexecdir=$prefix`$PYTHON -c "$python_cmd"`
+		pythondir=$pyexecdir
+		
 	    fi
 
 	    # Check for Python include path
diff --git a/config/gr_qwtplot3d.m4 b/config/gr_qwtplot3d.m4
deleted file mode 100644
index 758dfbc3e..000000000
--- a/config/gr_qwtplot3d.m4
+++ /dev/null
@@ -1,151 +0,0 @@
-dnl
-dnl Copyright 2008 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.
-dnl
-
-dnl Configure paths for library qwtplot3d.
-dnl
-dnl GR_QWTPLOT3D([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-dnl Test for library qwtplot3d, set QWTPLOT3D_CFLAGS and QWTPLOT3D_LIBS if found. Assumes 
-dnl QT_CFLAGS and QT_LIBS have already been correctly set.
-dnl
-
-AC_DEFUN([GR_QWTPLOT3D],
-[
-    dnl QWTPLOT3D Library Version
-
-    dnl Save the environment
-    AC_LANG_PUSH(C++)
-    qwtplot3d_save_CPPFLAGS="$CPPFLAGS"
-    qwtplot3d_save_LIBS="$LIBS"
-    libqwtplot3d_ok=yes
-
-    dnl Allow user to specify where QWTPLOT3D files are
-    AC_ARG_WITH([qwtplot3d-libdir],
-		[  --with-qwtplot3d-libdir=path  Prefix where QWTPLOT3D library is installed (optional)],
-		[qwtplot3d_libdir="$withval"], [qwtplot3d_libdir=""])
-
-    AC_ARG_WITH([qwtplot3d-incdir],
-		[  --with-qwtplot3d-incdir=path  Prefix where QWTPLOT3D include files are (optional)],
-		[qwtplot3d_incdir="$withval"], [qwtplot3d_incdir=""])
-
-    AC_ARG_WITH([qwtplot3d-lib],
-		[  --with-qwtplot3d-lib=library  QWT Plot3D library name (optional)],
-		[qwtplot3d_lib="$withval"], [qwtplot3d_lib=""])
-
-
-    dnl Check for presence of header files
-    dnl if not user-specified, try the first include dir (Ubuntu), then
-    dnl try the second include dir (Fedora)
-    CPPFLAGS="$CPPFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS $QWT_CFLAGS"
-
-    dnl if not set by user
-    if test "$qwtplot3d_incdir" = "" ; then
-        dnl check qwtplot3d/qwtplot3d.h (as in Fedora)
-        AC_CHECK_HEADER(
-            [qwtplot3d/qwt3d_plot.h],
-	    [qwtplot3d_qwtplot3d_h=yes],
-            [qwtplot3d_qwtplot3d_h=no]
-        )
-        dnl If it was found, set the flags and move on
-        if test "$qwtplot3d_qwtplot3d_h" = "yes" ; then
-            QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I/usr/include/qwtplot3d"
-        else
-            dnl otherwise, check qwtplot3d-qt4/qwtplot3d.h (as in Ubuntu)
-            AC_CHECK_HEADER(
-                [qwtplot3d-qt4/qwt3d_plot.h],
-                [qwtplot3d_qt4_qwtplot3d_h=yes],
-                [qwtplot3d_qt4_qwtplot3d_h=no]
-            )
-            dnl if it was found, set the flags and move on
-            if test "$qwtplot3d_qt4_qwtplot3d_h" = "yes" ; then
-                QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I/usr/include/qwtplot3d-qt4"
-            else
-                dnl otherwise, qwtplot3d.h wasn't found, so set the flag to no
-                libqwtplot3d_ok=no
-            fi
-        fi
-    else
-	dnl Using the user-specified include directory
-	QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I$qwtplot3d_incdir"
-        AC_CHECK_HEADER(
-            [$qwtplot3d_incdir/qwt3d_plot.h],
-	    [],
-	    [libqwtplot3d_ok=no])
-    fi
-
-    dnl Don't bother going on if we can't find the headers
-    if test "$libqwtplot3d_ok" = "yes" ; then
-
-        dnl Check for QWTPLOT3D library (qwtplot3d or qwtplot3d-qt4)
-
-        dnl User-defined QWTPLOT3D library path
-        if test "$qwtplot3d_libdir" != "" ; then
-            QWTPLOT3D_LIBS="-L$qwtplot3d_libdir $QWTPLOT3D_LIBS"
-        fi
-
-        dnl temporarily set these so the AC_CHECK_LIB works
-        CPPFLAGS="$CPPFLAGS $QWTPLOT3D_CFLAGS"
-        LIBS="$qwtplot3d_save_LIBS $QT_LIBS $QWTPLOT3D_LIBS -lqwtplot3d-qt4"
-
-        dnl If the user specified a qwtplot3d library name, use it here
-        if test "$qwtplot3d_lib" != "" ; then
-            AC_CHECK_LIB([$qwtplot3d_lib], [main], [libqwtplot3d_ok=yes], [libqwtplot3d_ok=no])
-
-        else            
-            dnl Check for 'main' in libqwtplot3d-qt4
-            AC_CHECK_LIB([qwtplot3d-qt4], [main], [libqwtplot3d_ok=yes], [libqwtplot3d_ok=no])
-
-            dnl If library found properly, set the flag and move on
-            if test "$libqwtplot3d_ok" = "yes" ; then
-                QWTPLOT3D_LIBS="$QWTPLOT3D_LIBS -lqwtplot3d-qt4"
-            else
-                dnl Otherwise, check for 'main' in libqwtplot3d
-                LIBS="$qwtplot3d_save_LIBS $QT_LIBS $QWTPLOT3D_LIBS -lqwtplot3d"
-                AC_CHECK_LIB([qwtplot3d], [main], [libqwtplot3d_ok=yes], [libqwtplot3d_ok=no])
-                if test "$libqwtplot3d_ok" = "yes" ; then
-                    QWTPLOT3D_LIBS="$QWTPLOT3D_LIBS -lqwtplot3d"
-                else
-                    AC_MSG_RESULT([Could not link to libqwtplot3d.so])
-                fi
-            fi
-        fi
-    else
-        AC_MSG_RESULT([Could not find qwtplot3d headers])
-    fi
-
-    dnl Restore saved variables
-    LIBS="$qwtplot3d_save_LIBS"
-    CPPFLAGS="$qwtplot3d_save_CPPFLAGS"
-    AC_LANG_POP
-
-    dnl Execute user actions
-    if test "x$libqwtplot3d_ok" = "xyes" ; then
-	ifelse([$1], , :, [$1])
-    else
-	QWTPLOT3D_CFLAGS=""
-	QWTPLOT3D_LIBDIRS=""
-	ifelse([$2], , :, [$2])
-    fi
-
-    dnl Export our variables
-    AC_SUBST(QWTPLOT3D_CFLAGS)
-    AC_SUBST(QWTPLOT3D_LIBS)
-])
diff --git a/config/grc_gcell.m4 b/config/grc_gcell.m4
deleted file mode 100644
index b94deb4db..000000000
--- a/config/grc_gcell.m4
+++ /dev/null
@@ -1,77 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,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_GCELL],[
-    GRC_ENABLE(gcell)
-    dnl GRC_WITH(gcell)
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed = yes; then
-	dnl Don't build gcell if host_cpu isn't powerpc
-	AC_MSG_CHECKING([whether host_cpu is powerpc*])
-	case "$host_cpu" in
-	    powerpc*)
-		AC_MSG_RESULT(yes)
-	        ;;
-            *)
-	        passed=no
-		AC_MSG_RESULT(no)
-		;;
-	esac
-
-        dnl Don't build gcell if we can't find spu-gcc.
-	AC_CHECK_PROG([SPU_GCC_PROG],[spu-gcc],[yes],[no])
-	if test $SPU_GCC_PROG = no; then
-            passed=no
-        fi
-    fi
-
-    if test $passed != with; then
-	dnl how and where to find INCLUDES and LA
-	gcell_INCLUDES="-I\${abs_top_srcdir}/gcell/include"
-        gcell_LA="\${abs_top_builddir}/gcell/lib/libgcell.la"
-	gcell_spu_INCLUDES="-I\${abs_top_srcdir}/gcell/include"
-	gcell_spu_LA="\${abs_top_builddir}/gcell/lib/spu/libgcell_spu.a"
-	AC_SUBST(gcell_spu_INCLUDES)
-	AC_SUBST(gcell_spu_LA)
-
-    fi
-
-    AC_CONFIG_FILES([ \
-        gcell/Makefile \
-        gcell/gcell.pc \
-        gcell/gcell_spu.pc \
-	gcell/include/Makefile \
-        gcell/include/gcell/Makefile \
-        gcell/include/gcell/spu/Makefile \
-        gcell/lib/Makefile \
-        gcell/lib/spu/Makefile \
-        gcell/lib/general/Makefile \
-        gcell/lib/wrapper/Makefile \
-        gcell/lib/runtime/Makefile \
-        gcell/apps/Makefile \
-	gcell/apps/spu/Makefile \
-	gcell/ibm/Makefile \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gcell)
-])
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
index 15086be0f..229efbd01 100644
--- a/config/grc_gnuradio_core.m4
+++ b/config/grc_gnuradio_core.m4
@@ -86,7 +86,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
 	gnuradio-core/src/guile/gr-run-waveform-script \
         gnuradio-core/src/lib/Makefile \
         gnuradio-core/src/lib/filter/Makefile \
-        gnuradio-core/src/lib/g72x/Makefile \
         gnuradio-core/src/lib/general/Makefile \
         gnuradio-core/src/lib/general/gr_constants.cc \
         gnuradio-core/src/lib/gengen/Makefile \
@@ -106,7 +105,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
         gnuradio-core/src/python/gnuradio/gr/run_tests \
         gnuradio-core/src/python/gnuradio/gru/Makefile \
         gnuradio-core/src/python/gnuradio/gruimpl/Makefile \
-        gnuradio-core/src/python/gnuradio/vocoder/Makefile \
         gnuradio-core/src/tests/Makefile \
         gnuradio-core/src/utils/Makefile \
     ])
@@ -117,6 +115,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
 	[
 	  chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests
 	  chmod +x gnuradio-core/src/guile/run_guile_tests
-	])
+	]) \
     ])
+
 ])
diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4
index 349ecd3d7..e60442170 100644
--- a/config/grc_gnuradio_examples.m4
+++ b/config/grc_gnuradio_examples.m4
@@ -28,21 +28,10 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
         gnuradio-examples/Makefile \
 	gnuradio-examples/python/Makefile \
 	gnuradio-examples/grc/Makefile \
-	gnuradio-examples/python/apps/hf_explorer/Makefile \
-   	gnuradio-examples/python/apps/hf_radio/Makefile \
-   	gnuradio-examples/python/apps/Makefile \
-   	gnuradio-examples/python/digital/Makefile \
-   	gnuradio-examples/python/digital_voice/Makefile \
-	gnuradio-examples/python/digital-bert/Makefile \
    	gnuradio-examples/python/mp-sched/Makefile \
-   	gnuradio-examples/python/multi-antenna/Makefile \
-   	gnuradio-examples/python/multi_usrp/Makefile \
    	gnuradio-examples/python/network/Makefile \
-   	gnuradio-examples/python/ofdm/Makefile \
    	gnuradio-examples/python/pfb/Makefile \
    	gnuradio-examples/python/tags/Makefile \
-   	gnuradio-examples/python/usrp/Makefile \
-	gnuradio-examples/python/usrp2/Makefile \
 	gnuradio-examples/waveforms/Makefile \
     ])
 
diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4
index 92a0440d0..0e881671a 100644
--- a/config/grc_gr_audio.m4
+++ b/config/grc_gr_audio.m4
@@ -108,6 +108,7 @@ AC_DEFUN([GRC_GR_AUDIO],[
         gr-audio/include/Makefile \
         gr-audio/lib/Makefile \
         gr-audio/swig/Makefile \
+	gr-audio/doc/Makefile \
         gr-audio/gnuradio-audio.pc \
     ])
 
diff --git a/config/grc_gr_cvsd_vocoder.m4 b/config/grc_gr_cvsd_vocoder.m4
deleted file mode 100644
index ddf6f9b2f..000000000
--- a/config/grc_gr_cvsd_vocoder.m4
+++ /dev/null
@@ -1,39 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 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_CVSD_VOCODER],[
-    GRC_ENABLE(gr-cvsd-vocoder)
-
-    dnl Don't do gr-cvsd-vocoder if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-cvsd-vocoder, gnuradio-core)
-
-    AC_CONFIG_FILES([\
-        gr-cvsd-vocoder/Makefile \
-	gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc \
-        gr-cvsd-vocoder/src/Makefile \
-        gr-cvsd-vocoder/src/lib/Makefile \
-        gr-cvsd-vocoder/src/python/Makefile \
-        gr-cvsd-vocoder/src/python/run_tests \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-cvsd-vocoder,[
-        dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_cvsd], [chmod +x gr-cvsd-vocoder/src/python/run_tests])
-    ])
-])
diff --git a/config/grc_gr_digital.m4 b/config/grc_gr_digital.m4
new file mode 100644
index 000000000..9beb59d4b
--- /dev/null
+++ b/config/grc_gr_digital.m4
@@ -0,0 +1,63 @@
+dnl Copyright 2011 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_DIGITAL],[
+    GRC_ENABLE(gr-digital)
+
+    dnl Don't do gr-digital if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-digital, gnuradio-core)
+
+    if test $passed != with; then
+	dnl how and where to find INCLUDES and LA and such
+        gr_digital_INCLUDES="\
+-I\${abs_top_srcdir}/gr-digital/include \
+-I\${abs_top_srcdir}/gr-digital/swig"
+        gr_digital_LA="\${abs_top_builddir}/gr-digital/lib/libgnuradio-digital.la"
+	gr_digital_LIBDIRPATH="\${abs_top_builddir}/gr-digital/lib:\${abs_top_builddir}/gr-digital/lib/.libs"
+	gr_digital_SWIGDIRPATH="\${abs_top_builddir}/gr-digtial/lib/swig:\${abs_top_builddir}/gr-digital/swig/.libs:\${abs_top_srcdir}/gr-digital/swig"
+	gr_digital_PYDIRPATH="\${abs_top_srcdir}/gr-digital/python"
+    fi
+
+    AC_SUBST(gr_digital_I)
+    AC_SUBST(gr_digital_SWIGDIRPATH)
+    AC_SUBST(gr_digital_PYDIRPATH)
+
+    AC_CONFIG_FILES([\
+        gr-digital/Makefile \
+	gr-digital/gnuradio-digital.pc \
+	gr-digital/apps/Makefile \
+	gr-digital/grc/Makefile \
+        gr-digital/include/Makefile \
+        gr-digital/lib/Makefile \
+	gr-digital/python/Makefile \
+	gr-digital/python/run_tests \
+	gr-digital/python/utils/Makefile \
+	gr-digital/swig/Makefile \
+	gr-digital/swig/run_guile_tests \
+	gr-digital/examples/Makefile \
+	gr-digital/doc/Makefile \
+    ])
+
+    GRC_BUILD_CONDITIONAL(gr-digital,[
+        dnl run_tests is created from run_tests.in.  Make it executable.
+        AC_CONFIG_COMMANDS([run_tests_digital],
+			   [chmod +x gr-digital/python/run_tests
+			    chmod +x gr-digital/swig/run_guile_tests])
+    ])
+])
diff --git a/config/grc_gr_gcell.m4 b/config/grc_gr_gcell.m4
deleted file mode 100644
index 476de364f..000000000
--- a/config/grc_gr_gcell.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 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_GCELL],[
-    GRC_ENABLE(gr-gcell)
-
-    dnl Don't do gr-gcell if gcell or gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-gcell, gcell)
-    GRC_CHECK_DEPENDENCY(gr-gcell, gnuradio-core)
-
-    AC_CONFIG_FILES([ \
-        gr-gcell/Makefile \
-        gr-gcell/src/Makefile \
-        gr-gcell/src/examples/Makefile \
-        gr-gcell/src/run_tests \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-gcell,[
-	dnl run_tests is created from run_tests.in.  Make it executable.
-	AC_CONFIG_COMMANDS([run_tests_gcell], [chmod +x gr-gcell/src/run_tests])
-    ])
-])
diff --git a/config/grc_gr_gpio.m4 b/config/grc_gr_gpio.m4
deleted file mode 100644
index 26c04b95c..000000000
--- a/config/grc_gr_gpio.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl Copyright 2007,2008,2009 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_GPIO],[
-    GRC_ENABLE(gr-gpio)
-
-    dnl Don't do gr-gpio if usrp skipped
-    GRC_CHECK_DEPENDENCY(gr-gpio, usrp)
-
-    AC_CONFIG_FILES([ \
-        gr-gpio/Makefile \
-        gr-gpio/src/Makefile \
-        gr-gpio/src/fpga/Makefile \
-        gr-gpio/src/fpga/include/Makefile \
-        gr-gpio/src/fpga/top/Makefile \
-        gr-gpio/src/fpga/lib/Makefile \
-	gr-gpio/src/fpga/rbf/Makefile \
-        gr-gpio/src/python/Makefile
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-gpio)
-])
diff --git a/config/grc_gr_gsm_fr_vocoder.m4 b/config/grc_gr_gsm_fr_vocoder.m4
deleted file mode 100644
index a93d4edb7..000000000
--- a/config/grc_gr_gsm_fr_vocoder.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 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_GSM_FR_VOCODER],[
-    GRC_ENABLE(gr-gsm-fr-vocoder)
-
-    dnl Don't do gr-gsm-fr-vocoder if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-gsm-fr-vocoder, gnuradio-core)
-
-    AC_CONFIG_FILES([\
-        gr-gsm-fr-vocoder/Makefile \
-	gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc \
-        gr-gsm-fr-vocoder/src/Makefile \
-        gr-gsm-fr-vocoder/src/lib/Makefile \
-        gr-gsm-fr-vocoder/src/lib/gsm/Makefile \
-        gr-gsm-fr-vocoder/src/python/Makefile \
-        gr-gsm-fr-vocoder/src/python/run_tests \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-gsm-fr-vocoder,[
-        dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_gsm], [chmod +x gr-gsm-fr-vocoder/src/python/run_tests])
-    ])
-])
diff --git a/config/grc_gr_msdd6000.m4 b/config/grc_gr_msdd6000.m4
deleted file mode 100644
index 0c6fc320e..000000000
--- a/config/grc_gr_msdd6000.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 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_MSDD6000],[
-    GRC_ENABLE([gr-msdd6000])
-
-    AC_CONFIG_FILES([\
-	gr-msdd6000/Makefile \
-	gr-msdd6000/gnuradio-msdd6000.pc \
-	gr-msdd6000/src/Makefile
-    ])
-
-    dnl Don't do gr-msdd6000 if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-msdd6000, gnuradio-core)
-
-    AC_CHECK_HEADERS(netinet/in.h arpa/inet.h sys/socket.h netdb.h, [], [passed=no])
-
-    GRC_BUILD_CONDITIONAL([gr-msdd6000],[
-        dnl run_tests is created from run_tests.in.  Make it executable.
-	dnl AC_CONFIG_COMMANDS([run_tests_msdd6000], [chmod +x gr-msdd6000/src/run_tests])
-    ])
-])
diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4
index ddb7c7ca9..d9e0fcbe9 100644
--- a/config/grc_gr_qtgui.m4
+++ b/config/grc_gr_qtgui.m4
@@ -51,8 +51,6 @@ AC_DEFUN([GRC_GR_QTGUI],[
 	    [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore >= 4.4.])])
         PKG_CHECK_MODULES(QTGUI, QtGui >= 4.4, [],
 	    [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui >= 4..])])
-        PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.4, [],
-	    [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL >- 4.4.])])
 	
         dnl Fetch QWT variables
         GR_QWT([], [passed=no])
@@ -60,7 +58,7 @@ AC_DEFUN([GRC_GR_QTGUI],[
 	dnl Export the include dirs and libraries (note: QTOPENGL_LIBS includes links
 	dnl to QtCore and QtGui libraries)
 	QT_INCLUDES="$QWT_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
-	QT_LIBS="$QWT_LIBS $QTOPENGL_LIBS"
+	QT_LIBS="$QWT_LIBS"
 
         dnl Build an includes variable specifically for running qmake by extracting
         dnl all includes from the QWT, without the -I;
@@ -72,6 +70,14 @@ AC_DEFUN([GRC_GR_QTGUI],[
 	QT_MOC_EXEC=`pkg-config --variable=moc_location QtCore`
 	QT_UIC_EXEC=`pkg-config --variable=uic_location QtCore`
 
+        gr_qtgui_INCLUDES="\
+-I\${abs_top_srcdir}/gr-qtgui/include \
+-I\${abs_top_srcdir}/gr-qtgui/swig"
+        gr_qtgui_LA="\${abs_top_builddir}/gr-qtgui/lib/libgnuradio-qtgui.la"
+	gr_qtgui_LIBDIRPATH="\${abs_top_builddir}/gr-qtgui/lib:\${abs_top_builddir}/gr-qtgui/lib/.libs"
+	gr_qtgui_SWIGDIRPATH="\${abs_top_builddir}/gr-digtial/lib/swig:\${abs_top_builddir}/gr-qtgui/swig/.libs:\${abs_top_srcdir}/gr-qtgui/swig"
+	gr_qtgui_PYDIRPATH="\${abs_top_srcdir}/gr-qtgui/python"
+
         AC_SUBST(QMAKE_INCLUDES)
         AC_SUBST(QT_INCLUDES)
 	AC_SUBST(QT_LIBS)
@@ -83,11 +89,14 @@ AC_DEFUN([GRC_GR_QTGUI],[
         gr-qtgui/Makefile \
 	gr-qtgui/gnuradio-qtgui.pc \
         gr-qtgui/apps/Makefile \
+        gr-qtgui/examples/Makefile \
         gr-qtgui/grc/Makefile \
+	gr-qtgui/include/Makefile \
         gr-qtgui/lib/Makefile \
         gr-qtgui/python/Makefile \
         gr-qtgui/python/run_tests \
         gr-qtgui/swig/Makefile \
+	gr-qtgui/doc/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-qtgui,[
diff --git a/config/grc_gr_radar_mono.m4 b/config/grc_gr_radar_mono.m4
deleted file mode 100644
index bf8e2dac4..000000000
--- a/config/grc_gr_radar_mono.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-dnl Copyright 2007,2008 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_RADAR_MONO],[
-    GRC_ENABLE(gr-radar-mono)
-
-    dnl Don't do gr-radar-mono if usrp or gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-radar-mono, usrp)
-    GRC_CHECK_DEPENDENCY(gr-radar-mono, gnuradio-core)
-
-    AC_CONFIG_FILES([ \
-        gr-radar-mono/Makefile \
-        gr-radar-mono/doc/Makefile \
-        gr-radar-mono/src/Makefile \
-        gr-radar-mono/src/fpga/Makefile \
-        gr-radar-mono/src/fpga/top/Makefile \
-        gr-radar-mono/src/fpga/lib/Makefile \
-        gr-radar-mono/src/fpga/models/Makefile \
-        gr-radar-mono/src/fpga/tb/Makefile \
-        gr-radar-mono/src/lib/Makefile \
-        gr-radar-mono/src/python/Makefile \
-        gr-radar-mono/src/python/run_tests
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-radar-mono,[
-	dnl run_tests is created from run_tests.in.  Make it executable.
-	AC_CONFIG_COMMANDS([run_tests_radar_mono], [chmod +x gr-radar-mono/src/python/run_tests])
-    ])
-])
diff --git a/config/grc_gr_radio_astronomy.m4 b/config/grc_gr_radio_astronomy.m4
deleted file mode 100644
index 0affe5d78..000000000
--- a/config/grc_gr_radio_astronomy.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 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_RADIO_ASTRONOMY],[
-    GRC_ENABLE(gr-radio-astronomy)
-
-    dnl Don't do gr-radio-astronomy if gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-radio-astronomy, gnuradio-core)
-
-    AC_CONFIG_FILES([\
-        gr-radio-astronomy/Makefile \
-        gr-radio-astronomy/src/Makefile \
-        gr-radio-astronomy/src/lib/Makefile \
-        gr-radio-astronomy/src/python/Makefile \
-        gr-radio-astronomy/src/python/run_tests \
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-radio-astronomy,[
-        dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_astronomy], [chmod +x gr-radio-astronomy/src/python/run_tests])
-    ])
-])
diff --git a/config/grc_gr_sounder.m4 b/config/grc_gr_sounder.m4
deleted file mode 100644
index 672d13ab1..000000000
--- a/config/grc_gr_sounder.m4
+++ /dev/null
@@ -1,44 +0,0 @@
-dnl Copyright 2007,2008 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_SOUNDER],[
-    GRC_ENABLE(gr-sounder)
-
-    dnl Don't do gr-sounder if usrp or gnuradio-core skipped
-    GRC_CHECK_DEPENDENCY(gr-sounder, usrp)
-    GRC_CHECK_DEPENDENCY(gr-sounder, gnuradio-core)
-
-    AC_CONFIG_FILES([ \
-        gr-sounder/Makefile \
-        gr-sounder/doc/Makefile \
-        gr-sounder/src/Makefile \
-        gr-sounder/src/fpga/Makefile \
-        gr-sounder/src/fpga/top/Makefile \
-        gr-sounder/src/fpga/lib/Makefile \
-        gr-sounder/src/fpga/tb/Makefile \
-        gr-sounder/src/lib/Makefile \
-        gr-sounder/src/python/Makefile \
-        gr-sounder/src/python/run_tests
-    ])
-
-    GRC_BUILD_CONDITIONAL(gr-sounder,[
-	dnl run_tests is created from run_tests.in.  Make it executable.
-	AC_CONFIG_COMMANDS([run_tests_sounder], [chmod +x gr-sounder/src/python/run_tests])
-    ])
-])
diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4
index 5d11acc22..57c75bf51 100644
--- a/config/grc_gr_trellis.m4
+++ b/config/grc_gr_trellis.m4
@@ -22,6 +22,7 @@ AC_DEFUN([GRC_GR_TRELLIS],[
 
     dnl Don't do gr-trellis if gnuradio-core skipped
     GRC_CHECK_DEPENDENCY(gr-trellis, gnuradio-core)
+    GRC_CHECK_DEPENDENCY(gr-trellis, gr-digital)
 
     AC_CONFIG_FILES([\
         gr-trellis/Makefile \
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4
index 111b0ae43..11956b91a 100644
--- a/config/grc_gr_uhd.m4
+++ b/config/grc_gr_uhd.m4
@@ -49,6 +49,10 @@ AC_DEFUN([GRC_GR_UHD],[
         gr-uhd/swig/run_tests \
         gr-uhd/swig/run_guile_tests \
         gr-uhd/apps/Makefile \
+        gr-uhd/apps/hf_explorer/Makefile \
+        gr-uhd/apps/hf_radio/Makefile \
+	gr-uhd/examples/Makefile \
+	gr-uhd/doc/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-uhd,[
diff --git a/config/grc_gr_utils.m4 b/config/grc_gr_utils.m4
index 7fe07d854..cb71ad18b 100644
--- a/config/grc_gr_utils.m4
+++ b/config/grc_gr_utils.m4
@@ -20,9 +20,8 @@
 AC_DEFUN([GRC_GR_UTILS],[
     GRC_ENABLE(gr-utils)
 
-    dnl Don't do gr-utils if gnuradio-core, usrp, or gr-wxgui skipped
+    dnl Don't do gr-utils if gnuradio-core or gr-wxgui skipped
     GRC_CHECK_DEPENDENCY(gr-utils, gnuradio-core)
-    GRC_CHECK_DEPENDENCY(gr-utils, usrp)
     GRC_CHECK_DEPENDENCY(gr-utils, gr-wxgui)
 
     AC_CONFIG_FILES([ \
diff --git a/config/grc_gr_vocoder.m4 b/config/grc_gr_vocoder.m4
new file mode 100644
index 000000000..df75656fe
--- /dev/null
+++ b/config/grc_gr_vocoder.m4
@@ -0,0 +1,49 @@
+dnl Copyright 2011 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_VOCODER],[
+    GRC_ENABLE(gr-vocoder)
+
+    dnl Don't do gr-vocoder if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-fr-vocoder, gnuradio-core)
+
+    AC_CONFIG_FILES([\
+        gr-vocoder/Makefile \
+	gr-vocoder/gnuradio-vocoder.pc \
+        gr-vocoder/apps/Makefile \
+        gr-vocoder/doc/Makefile \
+        gr-vocoder/examples/Makefile \
+        gr-vocoder/grc/Makefile \
+        gr-vocoder/include/Makefile \
+        gr-vocoder/lib/Makefile \
+	gr-vocoder/lib/codec2/Makefile \
+	gr-vocoder/lib/g7xx/Makefile \
+	gr-vocoder/lib/gsm/Makefile \
+        gr-vocoder/python/Makefile \
+	gr-vocoder/python/run_tests \
+	gr-vocoder/swig/Makefile \
+	gr-vocoder/swig/run_guile_tests \
+    ])
+
+    GRC_BUILD_CONDITIONAL(gr-vocoder,[
+        dnl run_tests is created from run_tests.in.  Make it executable.
+        AC_CONFIG_COMMANDS([run_tests_vocoder], [chmod +x gr-vocoder/python/run_tests])
+	AC_CONFIG_COMMANDS([run_tests_vocoder_guile], [chmod +x gr-vocoder/swig/run_guile_tests])
+    ])
+])
diff --git a/configure-cell-cross b/configure-cell-cross
deleted file mode 100755
index fd03588fb..000000000
--- a/configure-cell-cross
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-#
-# Before trying to use this script, please follow the instructions at
-# http://gnuradio.org/trac/wiki/CrossCompilingForCell
-#
-
-scriptdir=`dirname $0`
-
-prefix=
-for arg in "$@"
-do
-  case $arg in
-    --prefix=*)
-      prefix=${arg#--prefix=}
-      ;;
-    --help)
-      $scriptdir/configure --help
-      exit
-      ;;
-  esac
-done
-
-if test x$prefix = x
-then
-  echo "usage: $0 --prefix=PREFIX [configure options...]" 1>&2
-  exit 1
-fi
-
-
-arch=ppu
-cell_root=/mnt/cell-root
-python_version=2.5
-compiler_includes="-isystem ${cell_root}/usr/include"
-
-# check for 4.3 versions of cross-compilers and use them if we've got them
-if which ppu32-gcc43 >/dev/null 2>&1; then
-  ppu32_gcc=ppu32-gcc43
-else
-  ppu32_gcc=ppu32-gcc
-fi
-
-if which ppu32-g++43 >/dev/null 2>&1; then
-  ppu32_gxx=ppu32-g++43
-else
-  ppu32_gxx=ppu32-g++
-fi
-
-$scriptdir/configure			    \
-    CC=${ppu32_gcc}                         \
-    CXX=${ppu32_gxx}                        \
-    AR=${arch}-ar                           \
-    NM=${arch}-nm                           \
-    RANLIB=${arch}-ranlib                   \
-    STRIP=${arch}-strip                     \
-    F77=false                               \
-    CPPFLAGS="$compiler_includes"							\
-    LDFLAGS="-L${cell_root}/lib -L${cell_root}/usr/lib"                                 \
-    PYTHON_CPPFLAGS=-I${cell_root}/usr/include/python${python_version}                  \
-    PKG_CONFIG_PATH=${cell_root}/usr/lib/pkgconfig:${cell_root}/usr/local/lib/pkgconfig \
-    --host=powerpc64-unknown-linux-gnu							\
-    --with-pythondir=$prefix/lib/python${python_version}/site-packages			\
-    --disable-gr-video-sdl \
-    --disable-gr-audio-portaudio \
-    --disable-gr-audio-jack \
-    --disable-usrp2-firmware \
-    "$@"
-
-
-# Hack the libtool script so that it doesn't code an --rpath flag into anything
-
-#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
diff --git a/configure.ac b/configure.ac
index ca95005a6..432c398d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -350,29 +350,18 @@ AC_ARG_ENABLE(
 build_dirs="config"
 GRC_GRUEL                       dnl must come first
 GRC_VOLK
-GRC_GCELL
 GRC_GNURADIO_CORE
-GRC_USRP
-GRC_USRP2
-GRC_GR_USRP			dnl this must come after GRC_USRP
-GRC_GR_USRP2
-GRC_GR_GCELL			dnl this must come after GRC_GCELL and GRC_GNURADIO_CORE
-GRC_GR_MSDD6000	
+GRC_GR_DIGITAL
 GRC_GR_AUDIO
+GRC_GR_VOCODER
 GRC_GR_ATSC
 GRC_GR_COMEDI
-GRC_GR_CVSD_VOCODER
-GRC_GR_GPIO
-GRC_GR_GSM_FR_VOCODER
 GRC_GR_NOAA
 GRC_GR_PAGER
-GRC_GR_RADAR_MONO
-GRC_GR_RADIO_ASTRONOMY
 GRC_GR_TRELLIS
 GRC_GR_VIDEO_SDL
 GRC_GR_WXGUI
 GRC_GR_QTGUI
-GRC_GR_SOUNDER			dnl this must come after GRC_USRP
 GRC_GR_UTILS                    dnl this must come after GRC_GR_WXGUI
 GRC_GNURADIO_EXAMPLES		dnl must come after all GRC_GR_*
 GRC_GRC
diff --git a/debian/postinst b/debian/postinst
new file mode 100755
index 000000000..66a0f75c1
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/libexec/gnuradio/grc_setup_freedesktop install
diff --git a/debian/prerm b/debian/prerm
new file mode 100755
index 000000000..edc1e1e48
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/libexec/gnuradio/grc_setup_freedesktop uninstall
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
new file mode 100644
index 000000000..45f9b0102
--- /dev/null
+++ b/docs/CMakeLists.txt
@@ -0,0 +1,50 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+find_package(Doxygen)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("doxygen" ENABLE_DOXYGEN DOXYGEN_FOUND)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_DOXYGEN)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_COMPONENT("docs"
+    DISPLAY_NAME "Documentation"
+    DESCRIPTION  "Doxygen generated documentation"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(doxygen)
+
+endif(ENABLE_DOXYGEN)
diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt
new file mode 100644
index 000000000..532b09d7f
--- /dev/null
+++ b/docs/doxygen/CMakeLists.txt
@@ -0,0 +1,52 @@
+# 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.
+
+########################################################################
+# Create the doxygen configuration file
+########################################################################
+file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} top_srcdir)
+file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} top_builddir)
+file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} abs_top_srcdir)
+file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} abs_top_builddir)
+
+set(HAVE_DOT ${DOXYGEN_DOT_FOUND})
+set(enable_html_docs YES)
+set(enable_latex_docs NO)
+set(enable_xml_docs YES)
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
+    ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+@ONLY)
+
+set(BUILT_DIRS ${CMAKE_CURRENT_BINARY_DIR}/xml ${CMAKE_CURRENT_BINARY_DIR}/html)
+
+########################################################################
+# Make and install doxygen docs
+########################################################################
+add_custom_command(
+    OUTPUT ${BUILT_DIRS}
+    COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "Generating documentation with doxygen"
+)
+
+add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS})
+
+install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR} COMPONENT "docs")
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in
index 1f544e5bd..d5614d90c 100644
--- a/docs/doxygen/Doxyfile.in
+++ b/docs/doxygen/Doxyfile.in
@@ -587,7 +587,6 @@ EXCLUDE                = @abs_top_builddir@/docs/doxygen/html \
                          @abs_top_builddir@/docs/doxygen/xml-swig \
                          @abs_top_builddir@/docs/doxygen/other/doxypy.py \
                          @abs_top_builddir@/dtools \
-                         @abs_top_srcdir@/gcell/ibm \
                          @abs_top_builddir@/gnuradio-core/src/lib/bug_work_around_6.cc \
                          @abs_top_builddir@/gnuradio-core/src/lib/filter/assembly.h \
                          @abs_top_builddir@/gnuradio-core/src/lib/filter/generate_all.py \
@@ -626,49 +625,22 @@ EXCLUDE                = @abs_top_builddir@/docs/doxygen/html \
                          @abs_top_builddir@/gr-audio-alsa/src/audio-alsa.py \
                          @abs_top_builddir@/gr-audio-oss/src/audio_oss.py \
                          @abs_top_builddir@/gr-audio-osx/src/test_audio_loop.py \
-                         @abs_top_builddir@/gr-cvsd-vocoder/src/lib/cvsd_vocoder.py \
-                         @abs_top_builddir@/gr-cvsd-vocoder/src/python/encdec.py \
                          @abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm \
                          @abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.py \
                          @abs_top_builddir@/gr-gsm-fr-vocoder/src/python/encdec.py \
                          @abs_top_builddir@/gr-howto-write-a-block \
-                         @abs_top_builddir@/gr-msdd6000/src/msdd.py \
                          @abs_top_builddir@/gr-pager/src/pager_swig.py \
                          @abs_top_builddir@/gr-qtgui \
-                         @abs_top_builddir@/gr-radar-mono/src/python/usrp_radar_mono.py \
-                         @abs_top_builddir@/gr-radio-astronomy/src/lib/ra.py \
-                         @abs_top_builddir@/gr-radio-astronomy/src/python \
-                         @abs_top_builddir@/gr-sounder/src/python/usrp_sounder.py \
                          @abs_top_builddir@/gr-trellis/doc \
                          @abs_top_builddir@/gr-trellis/src/lib/generate_all.py \
                          @abs_top_builddir@/gr-trellis/src/lib/generate_trellis.py \
                          @abs_top_builddir@/gr-trellis/src/lib/trellis.py \
-                         @abs_top_builddir@/gr-usrp/src/usrp1.py \
-                         @abs_top_builddir@/gr-usrp2/src/usrp2.py \
                          @abs_top_builddir@/gr-video-sdl/src/video_sdl.py \
                          @abs_top_builddir@/gr-wxgui/src/python \
                          @abs_top_builddir@/grc \
-                         @abs_top_builddir@/usrp/doc \
-                         @abs_top_builddir@/usrp/firmware \
-                         @abs_top_builddir@/usrp/fpga \
-                         @abs_top_builddir@/usrp/host/apps \
-                         @abs_top_builddir@/usrp/host/apps-inband \
-                         @abs_top_builddir@/usrp/host/lib/inband \
-                         @abs_top_builddir@/usrp/host/lib/legacy/ad9862.h \
-                         @abs_top_builddir@/usrp/host/lib/legacy/check_data.py \
-                         @abs_top_builddir@/usrp/host/lib/legacy/circular_buffer.h \
-                         @abs_top_builddir@/usrp/host/lib/legacy/circular_linked_list.h \
-                         @abs_top_builddir@/usrp/host/lib/legacy/db_wbx.h \
-                         @abs_top_builddir@/usrp/host/lib/legacy/db_wbx.cc \
-                         @abs_top_builddir@/usrp/host/lib/legacy/dump_data.py \
-                         @abs_top_builddir@/usrp/host/lib/legacy/gen_usrp_dbid.py \
-                         @abs_top_builddir@/usrp/host/lib/legacy/usrp_dbid.py \
-                         @abs_top_builddir@/usrp/host/misc \
-                         @abs_top_builddir@/usrp/host/swig \
-                         @abs_top_builddir@/usrp2/firmware \
-                         @abs_top_srcdir@/usrp2/firmware \
-                         @abs_top_builddir@/usrp2/fpga \
-                         @abs_top_srcdir@/usrp2/fpga
+			 @abs_top_builddir@/_CPack_Packages \
+                         @abs_top_srcdir@/cmake \
+			 @abs_top_srcdir@/gr-qtgui/lib
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
@@ -701,7 +673,6 @@ EXCLUDE_PATTERNS       = */.deps/* \
 
 EXCLUDE_SYMBOLS        = ad9862 \
                          numpy \
-                         usrpm \
                          *swig* \
                          *Swig* \
                          *my_top_block* \
@@ -745,7 +716,7 @@ EXAMPLE_RECURSIVE      = NO
 # directories that contain image that are included in the documentation (see 
 # the \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             = @abs_top_srcdir@/docs/doxygen/images/
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should 
 # invoke to filter for each input file. Doxygen will invoke the filter program 
@@ -1308,7 +1279,7 @@ SEARCH_INCLUDES        = YES
 # contain include files that are not input files but should be processed by 
 # the preprocessor.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           = @abs_top_builddir@/gruel/src/lib/pmt/
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
 # patterns (like *.h and *.hpp) to filter out the header-files in the 
diff --git a/docs/doxygen/Makefile.am b/docs/doxygen/Makefile.am
index 3a67fb6d4..f763f6f79 100644
--- a/docs/doxygen/Makefile.am
+++ b/docs/doxygen/Makefile.am
@@ -34,6 +34,8 @@ docs: prep html/index.html
 html/index.html:
 	@DOXYGEN@
 
+EXTRA_DIST = images/gnuradio-logo.png
+
 prep:
 	$(MKDIR_P) html
 	$(MKDIR_P) xml
diff --git a/docs/doxygen/images/gnuradio-logo.png b/docs/doxygen/images/gnuradio-logo.png
new file mode 100644
index 000000000..ec4db23fc
--- /dev/null
+++ b/docs/doxygen/images/gnuradio-logo.png
diff --git a/docs/doxygen/other/build_guide.dox b/docs/doxygen/other/build_guide.dox
new file mode 100644
index 000000000..207f553a1
--- /dev/null
+++ b/docs/doxygen/other/build_guide.dox
@@ -0,0 +1,135 @@
+/*! \page page_build Build Instructions and Information
+
+\section dependencies Dependencies
+
+The list of GNU Radio dependencies and the minimum required versions,
+if any, to build the various GNU Radio components.
+
+Most of these components do not need to be individually compiled or
+installed. Instead, rely on your operating system's package manager or
+binary installation process (the <b>apt-get</b> system in Debian and
+Ubuntu, <b>yum</b> in RedHat and Fedora, etc.). GNU Radio tries to keep an
+up-to-date build guide for the majority of the supported operating
+systems on gnuradio.org
+(http://gnuradio.org/redmine/projects/gnuradio/wiki/BuildGuide).
+
+Not all dependencies are required for all components, and not all
+components are required for a given installation. The list of required
+components is determined by what the user requires from GNU Radio. If,
+for example, you do not use any Comedi-based hardware, do not worry
+about building gr-comedi.
+
+\subsection dep_global Global Dependencies
+\li git                      http://code.google.com/p/msysgit
+\li cmake                    http://www.cmake.org/cmake/resources/software.html
+\li boost       (>= 1.35)    http://www.boostpro.com/download
+\li cppunit     (>= 1.9.14)  http://gaiacrtn.free.fr/cppunit/index.html
+\li fftw3f      (>= 3.0)     http://www.fftw.org/install/windows.html
+\li gsl	        (>= 1.10)    http://gnuwin32.sourceforge.net/packages/gsl.htm
+
+\subsection dep_python Python Wrappers
+\li python      (>= 2.5)     http://www.python.org/download/
+\li swig        (>= 1.3.31)  http://www.swig.org/download.html
+\li numpy       (>= 1.1.0)   http://sourceforge.net/projects/numpy/files/NumPy/
+
+\subsection dep_docs docs: Building the documentation
+\li doxygen     (>= 1.5)     http://www.stack.nl/~dimitri/doxygen/download.html
+
+\subsection dep_grc grc: The GNU Radio Companion
+\li Cheetah     (>= 2.0)     http://www.cheetahtemplate.org/
+\li pygtk       (>= 2.10)    http://www.pygtk.org/downloads.html
+
+\subsection dep_gr_qtgui gr-qtgui: The QT-based Graphical User Interface
+\li qt	        (>= 4.4)     http://qt.nokia.com/downloads/
+\li qwt         (>= 5.2)     http://sourceforge.net/projects/qwt/
+\li pyqt        (>= 4.4)     http://www.riverbankcomputing.co.uk/software/pyqt/download
+\li pyqwt       (>= 5.2)     http://pyqwt.sourceforge.net/download.html
+
+\subsection dep_gr_wxgui gr-wxgui: The WX-based Graphical User Interface
+\li wxpython    (>= 2.8)     http://www.wxpython.org/
+\li python-lxml (>= 1.3.6)   http://lxml.de/
+
+\subsection dep_gr_audio gr-audio: Audio Subsystems (system/OS dependent)
+\li audio-alsa  (>= 0.9)     http://www.alsa-project.org
+\li audio-jack  (>= 0.8)     http://jackaudio.org/
+\li portaduio   (>= 19)      http://www.portaudio.com/
+\li audio-oss   (>= 1.0)     http://www.opensound.com/oss.html
+\li audio-osx
+\li audio-windows
+
+\subsection dep_uhd uhd: The Ettus USRP Hardware Driver Interface
+\li uhd         (>= 3.0.0)   http://code.ettus.com/redmine/ettus/projects/uhd/wiki
+
+\subsection dep_shd shd: The Symplex Hardware Driver Interface
+\li shd         (>= 3.0.0)   
+
+\subsection dep_gr_video_sdl gr-video-sdl: PAL and NTSC display
+\li SDL	        (>= 1.2.0)   http://www.libsdl.org/download-1.2.php
+
+\subsection dep_gr_comedi gr-comedi: Comedi hardware interface
+\li comedilib   (>= 0.8)     http://www.comedi.org/
+
+
+
+\section build_gr_cmake Building GNU Radio
+
+GNU Radio is built using the Cmake build system
+(http://www.cmake.org/). The standard build method is as follows:
+
+\code
+$ mkdir $(builddir)
+$ cd $(builddir)
+$ cmake [OPTIONS] $(srcdir)
+$ make
+$ make test
+$ sudo make install
+\endcode
+
+The \$(builddir) is the directory in which the code is built. This
+<b>cannot</b> be the same path as where the source code resides. Often,
+\$(builddir) is \$(srcdir)/build.
+
+Options can be used to specify where to find various library or
+include file dependencies that are not automatically being found
+(-DCMAKE_PREFIX_PATH) or set the prefix
+(-DCMAKE_INSTALL_PREFIX=(dir)).
+
+Components can also be enabled and disabled through the options. For a
+component named *gr-comp*, the option to disable would look like:
+-DENABLE_GR_COMP=off. The "off" could also be "false" or "no", and
+cmake is not case sensitive about these options. Similarly, "true",
+"on", or "yes" will turn this component on. All components are enabled
+by default.
+
+
+\subsection build_gr_cmake_e100 Building for the E100
+
+To build GNU Radio on the Ettus Research E100 embedded platforms,
+Cmake has to know that the processors uses the NEON extensions. Use
+the
+
+\code
+cmake -DCMAKE_CXX_FLAGS:STRING="-mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -g" \
+      -DCMAKE_C_FLAGS:STRING="-mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -g" \
+       <gr_source_dir>
+\endcode
+
+
+\section build_old_autotools Building Using Old Autotools Method
+
+As of version 3.5, we have moved to using Cmake as the default,
+preferred build system. If for some reason, Cmake fails on your
+system, GNU Radio still includes the old autotools build process as a
+parallel build method. To build:
+
+\code
+$ cd $(srcdir)
+$ ./bootstrap   // only if not building from a tarball
+$ cd $(builddir)
+$ $(srcdir)/configure [options]
+$ make [-jN]
+$ make check
+$ sudo make install
+\endcode
+
+*/
diff --git a/docs/doxygen/other/group_defs.dox b/docs/doxygen/other/group_defs.dox
index 6f2e1ac7f..b0b1994ff 100644
--- a/docs/doxygen/other/group_defs.dox
+++ b/docs/doxygen/other/group_defs.dox
@@ -27,6 +27,11 @@
 /*! \defgroup misc_blk Miscellaneous Blocks		*/
 /*! \defgroup slicedice_blk Slicing and Dicing Streams  */
 /*! \defgroup vocoder_blk Voice Encoders and Decoders	*/
+/*! \defgroup digital Digital Modulation Blocks		*/
+/*! \defgroup qtgui_blk QT Graphical Interfaces		*/
+/*! \defgroup uhd_blk UHD Interface  			*/
+/*! \defgroup audio_blk Audio Interface  		*/
+/*! \defgroup pfb_blk Polyphase Filterbank  		*/
 
 /*! 
  * \defgroup base_blk Base classes for GR Blocks
@@ -63,15 +68,4 @@
 
 /*! @} */
 
-/*! \defgroup usrp USRP					*/
-/*! \defgroup usrp2 USRP2				*/
-
-/*! 
- * \defgroup gcell gcell: Cell Broadband Engine SPE Scheduler & RPC Mechanism
- *
- * For additional information please see the 
- * <a href="http://gnuradio.org/trac/wiki/Gcell">gcell wiki page</a>
- * and <a href="http://comsec.com/papers/gcell-sdrf-2008.pdf">gcell-sdrf-2008.pdf</a>.
- */
-
 /*! \defgroup hardware Misc Hardware Control		*/
diff --git a/docs/doxygen/other/main_page.dox b/docs/doxygen/other/main_page.dox
index 43fcbf67a..0caa0b20f 100644
--- a/docs/doxygen/other/main_page.dox
+++ b/docs/doxygen/other/main_page.dox
@@ -1,12 +1,41 @@
 /*! \mainpage
 
+\image html gnuradio-logo.png
+
 Welcome to GNU Radio!
 
-For a list of all GNU Radio C++ blocks, please see <a href="modules.html">C++ Blocks</a>.
+For details about GNU Radio and using it, please see the <a
+href="http://gnuradio.org" target="_blank"><b>main project page</b></a>.
+
+Other information about the project and discussion about GNU Radio,
+software radio, and communication theory in general can be found at
+the <a href="http://gnuradio.squarespace.com" target="_blank"><b>GNU Radio blog</b></a>.
+
+
+\section build Building GNU Radio
+
+See the \ref page_build page for details about the project's
+dependencies and build process.
+
+
+\section blocks GNU Radio Blocks
+
+GNU Radio uses discrete signal processing blocks that are connected
+together to perform your signal processing application. This manual
+contain a list of all GNU Radio <a href="modules.html"><b>C++ Blocks</b></a>.
 
 Please note that at this time, we haven't found an acceptable way to
 provide unified documentation for the C++ parts of the system and the
 parts written in Python (mostly hierarchical blocks).  Until this gets
 worked out, please bear with us, or better yet, solve it for us!
 
+
+\section toc Manual Contents
+More details on packages in GNU Radio:
+\li \ref page_audio
+\li \ref page_digital
+\li \ref page_qtgui
+\li \ref page_uhd
+\li \ref page_vocoder
+\li \ref page_pfb
 */
diff --git a/docs/doxygen/other/pfb_intro.dox b/docs/doxygen/other/pfb_intro.dox
new file mode 100644
index 000000000..8b82d96d7
--- /dev/null
+++ b/docs/doxygen/other/pfb_intro.dox
@@ -0,0 +1,82 @@
+/*! \page page_pfb Polyphase Filterbanks
+
+\section Introduction
+
+Polyphase filterbanks (PFB) are a very powerful set of filtering tools
+that can efficiently perform many multi-rate signal processing
+tasks. GNU Radio has a set of polyphase filterbank blocks to be used
+in all sorts of applications. These blocks and their documentation can
+be found in \ref pfb_blk.
+
+\section Usage
+
+See the documentation for the individual blocks for details about what
+they can do and how they should be used. Furthermore, there are
+examples for these blocks in <b>gnuradio-examples/python/pfb</b>.
+
+The main issue when using the PFB blocks is defining the prototype
+filter, which is passed to all of the blocks as a vector of \p
+taps. The taps from the prototype filter which get partitioned among
+the \p N channels of the channelizer.
+
+An example of creating a set of filter taps for a PFB channelizer is
+found on line 49 of <b>gnuradio-examples/python/pfb/channelizer.py</b>
+and reproduced below. Notice that the sample rate is the sample rate
+at the input to the channelizer while the bandwidth and transition
+width are defined for the channel bandwidths. This makes a fairly long
+filter that is then split up between the \p N channels of the PFB.
+
+\code
+    self._fs = 9000          # input sample rate
+    self._M = 9              # Number of channels to channelize
+
+    self._taps = gr.firdes.low_pass_2(1, self._fs, 475.50, 50,
+                                      attenuation_dB=100,
+				      window=gr.firdes.WIN_BLACKMAN_hARRIS)
+\endcode
+
+In this example, the signal into the channelizer is sampled at 9 ksps
+(complex, so 9 kHz of bandwidth). The filter uses 9 channels, so each
+output channel will have a bandwidth and sample rate of 1 kHz. We want
+to pass most of the channel, so we define the channel bandwidth to be
+a low pass filter with a bandwidth of 475.5 Hz and a transition
+bandwidth of 50 Hz, but we have defined this using a sample rate of
+the original 9 kHz. The prototype filter has 819 taps to be divided up
+between the 9 channels, so each channel uses 91 taps. This is probably
+over-kill for a channelizer, and we could reduce the amount of taps
+per channel to a couple of dozen with no ill effects.
+
+The basic rule when defining a set of taps for a PFB block is to think
+about the filter running at the highest rate it will see while the
+bandwidth is defined for the size of the channels. In the channelizer
+case, the highest rate is defined as the rate of the incoming signal,
+but in other PFB blocks, this is not so obvious.
+
+Two very useful blocks to use are the arbitrary resampler and the
+clock synchronizer (for PAM signals). These PFBs are defined with a
+set number of filters based on the fidelity required from them, not
+the rate changes. By default, the \p filter_size is set to 32 for
+these blocks, which is a reasonable default for most tasks. Because
+the PFB uses this number of filters in the filterbank, the maximum
+rate of the bank is defined from this (see the theory of a polyphase
+interpolator for a justification of this). So the prototype filter is
+defined to use a sample rate of \p filter_size times the signal's
+sampling rate.
+
+A helpful wrapper for the arbitrary resampler is found in
+<b>gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py</b>,
+which is exposed in Python as <b>blks2.pfb_arb_resampler_ccf</b> and
+<b>blks2.pfb_arb_resampler_fff</b>. This block is set up so that the
+user only needs to pass it the real number \p rate as the resampling
+rate. With just this information, this hierarchical block
+automatically creates a filter that fully passes the signal bandwidth
+being resampled but does not pass any out-of-band noise. See the code
+for this block for details of how the filter is constructed.
+
+Of course, a user can create his or her own taps and use them in the
+arbitrary resampler for more specific requirements. Some of the UHD
+examples (<b>gr-uhd/examples</b>) use this ability to create a
+received matched filter or channel filter that also resamples the
+signal.
+
+*/
diff --git a/dtools/bin/tweak-cell-for-cross-compiling b/dtools/bin/tweak-cell-for-cross-compiling
deleted file mode 100755
index e63700420..000000000
--- a/dtools/bin/tweak-cell-for-cross-compiling
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/usr/bin/env python
-
-"""
-This should only be run on a native Cell machine.  E.g., ps3, qs21, etc.
-
-It makes a few modifications to the file system and some pseudo shared libs
-so that cross compiling from a build machine over NFS works.  The changes
-do not harm local compilation.
-
-We create a symlink from /mnt/cell-root that points to /
-This allows the local and build machine to access the root filesystem
-using a common name, /mnt/cell-root.  This is required because
-configure hardcodes absolute paths into the generated Makefiles.
-
-There are some .so files that aren't really shared libraries, but rather are
-ascii linker scripts containing instructions to the linker.  Most of them
-contain a GROUP directive that includes hard-coded paths relative to /.
-We modify those files such that the hard-coded paths are relative to /mnt/cell-root
-instead of /.  This allows them to work locally and while cross compiling over NFS.
-
-E.g., /usr/lib/libc.so originally contains:
-
-    /* GNU ld script
-       Use the shared library, but some functions are only in
-       the static library, so try that secondarily.  */
-    OUTPUT_FORMAT(elf32-powerpc)
-    GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )
-
-We modify it such that it reads:
-
-    /* GNU ld script
-       Use the shared library, but some functions are only in
-       the static library, so try that secondarily.  */
-    OUTPUT_FORMAT(elf32-powerpc)
-    GROUP ( /mnt/cell-root/lib/libc.so.6 /mnt/cell-root/usr/lib/libc_nonshared.a  AS_NEEDED ( /mnt/cell-root/lib/ld.so.1 ) )
-
-We backup <foo>.so to <foo>.so.original
-
-"""
-
-import os
-import os.path
-import sys
-import shutil
-import re
-
-cell_root_path = '/mnt/cell-root'
-
-def ensure_cell():
-    s = open('/proc/cpuinfo','r').read()
-    if s.find('Cell Broadband Engine') == -1:
-        sys.stderr.write('This program should only be run on Cell machines.\n')
-        raise SystemExit, 1
-
-def make_symlinks():
-    create_symlink_if_reqd(cell_root_path, "..")
-    create_symlink_if_reqd("/opt/cell/toolchain", "../../usr")
-    create_symlink_if_reqd("/opt/cell/sysroot", "../..")
-
-def symlink_exists_and_is_ok(path, contents):
-    return (os.path.islink(path) and os.readlink(path) == contents)
-
-def create_symlink_if_reqd(path, contents):
-    if symlink_exists_and_is_ok(path, contents):
-        return
-
-    if os.path.islink(path):
-        # Is a symlink but points wrong place
-        os.remove(path)
-        os.symlink(contents, path)
-        return
-
-    if os.path.isdir(path):
-        # if it's empty we'll remove it and create the link
-        try:
-            os.rmdir(path)
-        except:
-            # directory wasn't empty
-            sys.stderr.write("There's already something at %s.\n" % (path,))
-            sys.stderr.write("Please remove it or move it out of the way and try again.\n")
-            raise SystemExit, 1
-        os.symlink(contents, path)
-        return
-        
-    if os.path.exists(path):
-        # There's something here, return an error
-        sys.stderr.write("There's already something at %s.\n" % (path,))
-        sys.stderr.write("Please remove it or move it out of the way and try again.\n")
-        raise SystemExit, 1
-
-    # nothing there; go ahead and create the symlink
-    os.symlink(contents, path)
-
-
-def find_ascii_shared_libs():
-    cmd = "find /lib /lib64 /usr/lib /usr/lib64 -name '*.so' -type f -print 2>/dev/null | xargs file | grep -v ELF | cut -d: -f 1"
-    pipe = os.popen(cmd, 'r')
-    filenames = pipe.read().splitlines()
-    return filenames
-
-
-def make_backup_copy(src):
-    dst = src + '.original'
-    if not os.path.exists(dst):
-        shutil.copy2(src, dst)
-
-
-def edit_file(name):
-    def replace_group_body(mo):
-        pat = ' /(?!' + cell_root_path[1:] + ')'  # negative lookahead assertion
-        new = re.sub(pat, ' ' + cell_root_path + '/', mo.group(2))
-        return mo.group(1) + new + mo.group(3)
-        
-    f = open(name,'r')
-    s = f.read()
-    f.close()
-    
-    pat = re.compile(r'^( *GROUP *\()(.*)(\) *)$', re.M)
-    t = pat.sub(replace_group_body, s)
-
-    f = open(name,'w')
-    f.write(t)
-    f.close()
-
-
-def edit_ascii_shared_libs():
-    print "Please be patient, this takes awhile..."
-    filenames = find_ascii_shared_libs()
-    for f in filenames:
-        make_backup_copy(f)
-        edit_file(f)
-
-
-def main():
-    ensure_cell()
-    make_symlinks()
-    edit_ascii_shared_libs()
-
-
-if __name__ == '__main__':
-    main()
-    
-
diff --git a/gcell/.gitignore b/gcell/.gitignore
deleted file mode 100644
index a55308950..000000000
--- a/gcell/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/gcell.pc
-/gcell_spu.pc
diff --git a/gcell/Makefile.am b/gcell/Makefile.am
deleted file mode 100644
index fe222e5fb..000000000
--- a/gcell/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = include lib apps ibm
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-	gcell.pc \
-	gcell_spu.pc
diff --git a/gcell/apps/.gitignore b/gcell/apps/.gitignore
deleted file mode 100644
index b80e1a92c..000000000
--- a/gcell/apps/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/test_all
-/benchmark_nop
-/benchmark_dma
-/benchmark_roundtrip
diff --git a/gcell/apps/Makefile.am b/gcell/apps/Makefile.am
deleted file mode 100644
index c3a2092a3..000000000
--- a/gcell/apps/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright 2007,2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = spu .
-
-AM_CPPFLAGS = $(DEFINES) $(GCELL_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
-
-GCELL_QA_LA = $(top_builddir)/gcell/lib/libgcell-qa.la
-
-TESTS = test_all
-
-
-bin_PROGRAMS = \
-	test_all \
-	benchmark_dma \
-	benchmark_nop \
-	benchmark_roundtrip
-
-
-test_all_SOURCES = test_all.cc
-test_all_LDADD = $(GCELL_QA_LA) $(GCELL_LA)
-
-benchmark_dma_SOURCES = benchmark_dma.cc
-benchmark_dma_LDADD = spu/benchmark_procs $(GCELL_LA)
-
-benchmark_nop_SOURCES = benchmark_nop.cc
-benchmark_nop_LDADD = spu/benchmark_procs $(GCELL_LA)
-
-benchmark_roundtrip_SOURCES = benchmark_roundtrip.cc
-benchmark_roundtrip_LDADD = spu/benchmark_procs $(GCELL_LA)
diff --git a/gcell/apps/benchmark_dma.cc b/gcell/apps/benchmark_dma.cc
deleted file mode 100644
index bc3b3f328..000000000
--- a/gcell/apps/benchmark_dma.cc
+++ /dev/null
@@ -1,275 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#if defined(HAVE_CONFIG_H)
-#include <config.h>
-#endif
-#include <gcell/gc_job_manager.h>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <getopt.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <boost/scoped_array.hpp>
-#include <assert.h>
-
-// handle to embedded SPU executable that contains benchmark routines
-// (The name of the variable (benchmark_procs) is the name of the spu executable.)
-extern spe_program_handle_t benchmark_procs;
-
-static gc_proc_id_t gcp_benchmark_udelay = GCP_UNKNOWN_PROC;
-
-#define	BENCHMARK_PUT		0x1
-#define	BENCHMARK_GET		0x2
-#define	BENCHMARK_GET_PUT	(BENCHMARK_PUT|BENCHMARK_GET)
-
-
-#if 0
-static bool
-power_of_2_p(unsigned long x)
-{
-  int nbits = sizeof(x) * 8;
-  for (int i = 0; i < nbits; i++)
-    if (x == (1UL << i))
-      return true;
-
-  return false;
-}
-#endif
-
-static void
-init_jd(gc_job_desc *jd, unsigned int usecs,
-	unsigned char *getbuf, unsigned char *putbuf, size_t buflen,
-	int getput_mask)
-{
-  jd->proc_id = gcp_benchmark_udelay;
-  jd->input.nargs = 1;
-  jd->input.arg[0].u32 = usecs;
-  jd->output.nargs = 0;
-
-  switch(getput_mask & BENCHMARK_GET_PUT){
-
-  case BENCHMARK_GET:
-    jd->eaa.nargs = 1;
-    jd->eaa.arg[0].direction = GCJD_DMA_GET;
-    jd->eaa.arg[0].ea_addr = ptr_to_ea(getbuf);
-    jd->eaa.arg[0].get_size = buflen;
-    break;
-
-  case BENCHMARK_PUT:
-    jd->eaa.nargs = 1;
-    jd->eaa.arg[0].direction = GCJD_DMA_PUT;
-    jd->eaa.arg[0].ea_addr = ptr_to_ea(putbuf);
-    jd->eaa.arg[0].put_size = buflen;
-    break;
-    
-  case BENCHMARK_GET_PUT:
-    jd->eaa.nargs = 2;
-    jd->eaa.arg[0].direction = GCJD_DMA_GET;
-    jd->eaa.arg[0].ea_addr = ptr_to_ea(getbuf);
-    jd->eaa.arg[0].get_size = buflen;
-    jd->eaa.arg[1].direction = GCJD_DMA_PUT;
-    jd->eaa.arg[1].ea_addr = ptr_to_ea(putbuf);
-    jd->eaa.arg[1].put_size = buflen;
-    break;
-  }
-}
-
-static void
-run_test(unsigned int nspes, unsigned int usecs, unsigned int dma_size, int getput_mask)
-{
-  using namespace boost::posix_time;
-
-  static const int64_t TOTAL_SIZE_DMA = 5LL << 30;
-  static const int NJDS = 64;
-  unsigned int njobs = (unsigned int)(TOTAL_SIZE_DMA / dma_size);
-  //unsigned int njobs = NJDS * 16;
-  unsigned int nsubmitted = 0;
-  unsigned int ncompleted = 0;
-  gc_job_desc *all_jds[NJDS];
-  gc_job_desc *jds[2][NJDS];
-  unsigned int njds[2];
-  unsigned int ci;		// current index
-  bool done[NJDS];
-  
-  static const unsigned int BUFSIZE = (32 << 10) * NJDS;
-  unsigned char *getbuf = new unsigned char[BUFSIZE];
-  boost::scoped_array<unsigned char> _getbuf(getbuf);
-  unsigned char *putbuf = new unsigned char[BUFSIZE];
-  boost::scoped_array<unsigned char> _putbuf(putbuf);
-  int gbi = 0;
-
-  // touch all pages to force allocation now
-  for (unsigned int i = 0; i < BUFSIZE; i += 4096){
-    getbuf[i] = 0;
-    putbuf[i] = 0;
-  }
-
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&benchmark_procs);
-  opts.nspes = nspes;
-  //opts.enable_logging = true;
-  //opts.log2_nlog_entries = 13;
-  gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
-
-  if ((gcp_benchmark_udelay = mgr->lookup_proc("benchmark_udelay")) == GCP_UNKNOWN_PROC){
-    fprintf(stderr, "lookup_proc: failed to find \"benchmark_udelay\"\n");
-    return;
-  }
-
-  // allocate and init all job descriptors
-  for (int i = 0; i < NJDS; i++){
-    if (gbi + dma_size > BUFSIZE)
-      gbi = 0;
-
-    all_jds[i] = mgr->alloc_job_desc();
-    if (all_jds[i] == 0){
-      fprintf(stderr, "alloc_job_desc() returned 0\n");
-      return;
-    }
-    init_jd(all_jds[i], usecs, &getbuf[gbi], &putbuf[gbi], dma_size, getput_mask);
-    gbi += dma_size;
-  }
-
-  for (int iter = 0; iter < 1; iter++){
-
-    ptime t_start(microsec_clock::universal_time());
-
-    nsubmitted = 0;
-    ncompleted = 0;
-
-    ci = 0;
-    njds[0] = 0;
-    njds[1] = 0;
-  
-    // submit the first batch
-    for (int i = 0; i < NJDS; i++){
-      if (mgr->submit_job(all_jds[i])){
-	jds[ci][njds[ci]++] = all_jds[i];
-	nsubmitted++;
-      }
-      else {
-	printf("submit_job(jds[%d]) failed, status = %d\n",
-	       i, all_jds[i]->status);
-      }
-    }
-  
-    while (ncompleted < njobs){
-      njds[ci^1] = 0;
-      int n = mgr->wait_jobs(njds[ci], jds[ci], done, GC_WAIT_ANY);
-      // printf("%2d\n", n);
-      if (n < 0){
-	fprintf(stderr, "mgr->wait_jobs failed\n");
-	break;
-      }
-      for (unsigned int i = 0; i < njds[ci]; i++){
-	if (!done[i]){	// remember for next iteration
-	  jds[ci^1][njds[ci^1]++] = jds[ci][i];
-	}
-	else {
-	  ncompleted++;
-	  if (jds[ci][i]->status != JS_OK){
-	    printf("js_status = %d, job_id = %d, ncompleted = %d\n",
-		   jds[ci][i]->status, jds[ci][i]->sys.job_id, ncompleted);
-	  }
-	  if (nsubmitted < njobs){		    // submit another one
-	    if (mgr->submit_job(jds[ci][i])){
-	      jds[ci^1][njds[ci^1]++] = jds[ci][i];  // remember for next iter
-	      nsubmitted++;
-	    }
-	    else {
-	      printf("submit_job(jds[%d]) failed, status = %d\n",
-		     i, jds[ci][i]->status);
-	    }
-	  }
-	}
-      }
-      ci ^= 1;	// toggle current
-    }
-
-    // stop timing
-    ptime t_stop(microsec_clock::universal_time());
-
-    double delta = (t_stop - t_start).total_microseconds() * 1e-6;
-    printf("nspes: %2d  udelay: %4d  elapsed_time: %7.3f  dma_size: %5d  dma_throughput: %7.3e\n",
-	   mgr->nspes(), usecs, delta, dma_size,
-	   (double) njobs * dma_size / delta * (getput_mask == BENCHMARK_GET_PUT ? 2.0 : 1.0));
-
-  }
-}
-
-static void
-usage()
-{
-  fprintf(stderr, "usage: benchmark_dma [-p] [-g] [-n <nspes>] [-u <udelay>] [-s <dma_size>]\n");
-  fprintf(stderr, "  you must specify one or both of -p (put) and -g (get)\n");
-}
-
-
-int
-main(int argc, char **argv)
-{
-  unsigned int nspes = 0;
-  unsigned int usecs = 0;
-  unsigned int dma_size = 32 << 10;
-  int getput_mask = 0;
-  int ch;
-
-  while ((ch = getopt(argc, argv, "n:u:s:pg")) != EOF){
-    switch(ch){
-    case 'n':
-      nspes = strtol(optarg, 0, 0);
-      break;
-
-    case 'u':
-      usecs = strtol(optarg, 0, 0);
-      break;
-
-    case 's':
-      dma_size = strtol(optarg, 0, 0);
-      if (dma_size == 0){
-	fprintf(stderr, "-s <dma_size> must be > 0\n");
-	return 1;
-      }
-      break;
-
-    case 'p':
-      getput_mask |= BENCHMARK_PUT;
-      break;
-
-    case 'g':
-      getput_mask |= BENCHMARK_GET;
-      break;
-      
-    case '?':
-    default:
-      usage();
-      return 1;
-    }
-  }
-
-  if (getput_mask == 0){
-    usage();
-    return 1;
-  }
-
-  run_test(nspes, usecs, dma_size, getput_mask);
-  return 0;
-}
diff --git a/gcell/apps/benchmark_nop.cc b/gcell/apps/benchmark_nop.cc
deleted file mode 100644
index a27373db4..000000000
--- a/gcell/apps/benchmark_nop.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#if defined(HAVE_CONFIG_H)
-#include <config.h>
-#endif
-#include <gcell/gc_job_manager.h>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <getopt.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-// handle to embedded SPU executable that contains benchmark routines
-// (The name of the variable (benchmark_procs) is the name of the spu executable.)
-extern spe_program_handle_t benchmark_procs;
-
-static gc_proc_id_t gcp_benchmark_udelay = GCP_UNKNOWN_PROC;
-
-static void
-init_jd(gc_job_desc *jd, unsigned int usecs)
-{
-  jd->proc_id = gcp_benchmark_udelay;
-  jd->input.nargs = 1;
-  jd->input.arg[0].u32 = usecs;
-  jd->output.nargs = 0;
-  jd->eaa.nargs = 0;
-}
-
-static void
-run_test(unsigned int nspes, unsigned int usecs, int njobs)
-{
-  using namespace boost::posix_time;
-
-  static const int NJDS = 64;
-  int nsubmitted = 0;
-  int ncompleted = 0;
-  gc_job_desc *all_jds[NJDS];
-  gc_job_desc *jds[2][NJDS];
-  unsigned int njds[2];
-  unsigned int ci;		// current index
-  bool done[NJDS];
-  
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&benchmark_procs);
-  opts.nspes = nspes;
-  opts.gang_schedule = true;
-  gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
-
-  if ((gcp_benchmark_udelay = mgr->lookup_proc("benchmark_udelay")) == GCP_UNKNOWN_PROC){
-    fprintf(stderr, "lookup_proc: failed to find \"benchmark_udelay\"\n");
-    return;
-  }
-
-  // allocate and init all job descriptors
-  for (int i = 0; i < NJDS; i++){
-    all_jds[i] = mgr->alloc_job_desc();
-    init_jd(all_jds[i], usecs);
-  }
-
-  ptime t_start(microsec_clock::universal_time());
-
-  ci = 0;
-  njds[0] = 0;
-  njds[1] = 0;
-  
-  // submit the first batch
-  for (int i = 0; i < NJDS; i++){
-    if (mgr->submit_job(all_jds[i])){
-      jds[ci][njds[ci]++] = all_jds[i];
-      nsubmitted++;
-    }
-    else {
-      printf("submit_job(jds[%d]) failed, status = %d\n",
-	     i, all_jds[i]->status);
-    }
-  }
-  
-  while (ncompleted < njobs){
-    njds[ci^1] = 0;
-    int n = mgr->wait_jobs(njds[ci], jds[ci], done, GC_WAIT_ANY);
-    // printf("%2d\n", n);
-    if (n < 0){
-      fprintf(stderr, "mgr->wait_jobs failed\n");
-      break;
-    }
-    for (unsigned int i = 0; i < njds[ci]; i++){
-      if (!done[i]){	// remember for next iteration
-	jds[ci^1][njds[ci^1]++] = jds[ci][i];
-      }
-      else {
-	ncompleted++;
-	// printf("ncompleted = %7d\n", ncompleted);
-	if (nsubmitted < njobs){		    // submit another one
-	  if (mgr->submit_job(jds[ci][i])){
-	    jds[ci^1][njds[ci^1]++] = jds[ci][i];  // remember for next iter
-	    nsubmitted++;
-	  }
-	  else {
-	    printf("submit_job(jds[%d]) failed, status = %d\n",
-		   i, jds[ci][i]->status);
-	  }
-	}
-      }
-    }
-    ci ^= 1;	// toggle current
-  }
-
-  // stop timing
-  ptime t_stop(microsec_clock::universal_time());
-  double delta = (t_stop - t_start).total_microseconds() * 1e-6;
-  printf("nspes: %2d  udelay: %4d  elapsed_time: %7.3f  njobs: %g  speedup: %6.3f\n",
-	 mgr->nspes(), usecs, delta, (double) njobs,
-	 njobs * usecs * 1e-6 / delta);
-}
-
-int
-main(int argc, char **argv)
-{
-  unsigned int nspes = 0;
-  unsigned int usecs = 0;
-  int njobs = 500000;
-  int ch;
-
-  while ((ch = getopt(argc, argv, "n:u:N:")) != EOF){
-    switch(ch){
-    case 'n':
-      nspes = strtol(optarg, 0, 0);
-      break;
-
-    case 'u':
-      usecs = strtol(optarg, 0, 0);
-      break;
-
-    case 'N':
-      njobs = strtol(optarg, 0, 0);
-      break;
-
-    case '?':
-    default:
-      fprintf(stderr, "usage: benchmark_nop [-n <nspes>] [-u <udelay>] [-N <njobs>]\n");
-      return 1;
-    }
-  }
-
-  run_test(nspes, usecs, njobs);
-  return 0;
-}
diff --git a/gcell/apps/benchmark_roundtrip.cc b/gcell/apps/benchmark_roundtrip.cc
deleted file mode 100644
index b994182a8..000000000
--- a/gcell/apps/benchmark_roundtrip.cc
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#if defined(HAVE_CONFIG_H)
-#include <config.h>
-#endif
-#include <gcell/gc_job_manager.h>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <getopt.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <boost/scoped_array.hpp>
-#include <assert.h>
-
-// handle to embedded SPU executable that contains benchmark routines
-// (The name of the variable (benchmark_procs) is the name of the spu executable.)
-extern spe_program_handle_t benchmark_procs;
-
-static gc_proc_id_t gcp_benchmark_udelay = GCP_UNKNOWN_PROC;
-
-#define	BENCHMARK_PUT		0x1
-#define	BENCHMARK_GET		0x2
-#define	BENCHMARK_GET_PUT	(BENCHMARK_PUT|BENCHMARK_GET)
-
-
-#if 0
-static bool
-power_of_2_p(unsigned long x)
-{
-  int nbits = sizeof(x) * 8;
-  for (int i = 0; i < nbits; i++)
-    if (x == (1UL << i))
-      return true;
-
-  return false;
-}
-#endif
-
-static void
-init_jd(gc_job_desc *jd, unsigned int usecs,
-	unsigned char *getbuf, unsigned char *putbuf, size_t buflen,
-	int getput_mask)
-{
-  jd->proc_id = gcp_benchmark_udelay;
-  jd->input.nargs = 1;
-  jd->input.arg[0].u32 = usecs;
-  jd->output.nargs = 0;
-
-  switch(getput_mask & BENCHMARK_GET_PUT){
-
-  case BENCHMARK_GET:
-    jd->eaa.nargs = 1;
-    jd->eaa.arg[0].direction = GCJD_DMA_GET;
-    jd->eaa.arg[0].ea_addr = ptr_to_ea(getbuf);
-    jd->eaa.arg[0].get_size = buflen;
-    break;
-
-  case BENCHMARK_PUT:
-    jd->eaa.nargs = 1;
-    jd->eaa.arg[0].direction = GCJD_DMA_PUT;
-    jd->eaa.arg[0].ea_addr = ptr_to_ea(putbuf);
-    jd->eaa.arg[0].put_size = buflen;
-    break;
-    
-  case BENCHMARK_GET_PUT:
-    jd->eaa.nargs = 2;
-    jd->eaa.arg[0].direction = GCJD_DMA_GET;
-    jd->eaa.arg[0].ea_addr = ptr_to_ea(getbuf);
-    jd->eaa.arg[0].get_size = buflen;
-    jd->eaa.arg[1].direction = GCJD_DMA_PUT;
-    jd->eaa.arg[1].ea_addr = ptr_to_ea(putbuf);
-    jd->eaa.arg[1].put_size = buflen;
-    break;
-  }
-}
-
-static void
-run_test(unsigned int nspes, unsigned int usecs, unsigned int dma_size,
-	 int getput_mask, int njobs_at_once)
-{
-  using namespace boost::posix_time;
-
-  int NJDS = njobs_at_once;
-  gc_job_desc *all_jds[NJDS];
-  bool done[NJDS];
-  
-  static const unsigned int BUFSIZE = (32 << 10) * NJDS;
-  unsigned char *getbuf = new unsigned char[BUFSIZE];
-  boost::scoped_array<unsigned char> _getbuf(getbuf);
-  unsigned char *putbuf = new unsigned char[BUFSIZE];
-  boost::scoped_array<unsigned char> _putbuf(putbuf);
-  int gbi = 0;
-
-  // touch all pages to force allocation now
-  for (unsigned int i = 0; i < BUFSIZE; i += 4096){
-    getbuf[i] = 0;
-    putbuf[i] = 0;
-  }
-
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&benchmark_procs);
-  opts.nspes = nspes;
-  //opts.enable_logging = true;
-  //opts.log2_nlog_entries = 13;
-  gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
-
-  if ((gcp_benchmark_udelay = mgr->lookup_proc("benchmark_udelay")) == GCP_UNKNOWN_PROC){
-    fprintf(stderr, "lookup_proc: failed to find \"benchmark_udelay\"\n");
-    return;
-  }
-
-  // allocate and init all job descriptors
-  for (int i = 0; i < NJDS; i++){
-    if (gbi + dma_size > BUFSIZE)
-      gbi = 0;
-
-    all_jds[i] = mgr->alloc_job_desc();
-    if (all_jds[i] == 0){
-      fprintf(stderr, "alloc_job_desc() returned 0\n");
-      return;
-    }
-    init_jd(all_jds[i], usecs, &getbuf[gbi], &putbuf[gbi], dma_size, getput_mask);
-    gbi += dma_size;
-  }
-
-  int niter = 100000;
-  ptime t_start(microsec_clock::universal_time());
-
-  for (int iter = 0; iter < niter; iter++){
-
-    // submit the jobs
-    for (int i = 0; i < NJDS; i++){
-      if (!mgr->submit_job(all_jds[i])){
-	printf("submit_job(jds[%d]) failed, status = %d\n",
-	       i, all_jds[i]->status);
-      }
-    }
-  
-    int n = mgr->wait_jobs(NJDS, all_jds, done, GC_WAIT_ALL);
-    if (n < 0){
-      fprintf(stderr, "mgr->wait_jobs failed\n");
-      break;
-    }
-    if (n != NJDS){
-      fprintf(stderr, "mgr->wait_jobs returned short count.  Expected %d, got %d\n",
-	      NJDS, n);
-    }
-  }
-
-  // stop timing
-  ptime t_stop(microsec_clock::universal_time());
-  double delta = (t_stop - t_start).total_microseconds() * 1e-6;
-  printf("nspes: %2d  udelay: %4d  elapsed_time: %7.3f  dma_size: %5d  dma_throughput: %7.3e  round_trip: %gus\n",
-	 mgr->nspes(), usecs, delta, dma_size,
-	 (double) NJDS * niter * dma_size / delta * (getput_mask == BENCHMARK_GET_PUT ? 2.0 : 1.0),
-	 delta / niter * 1e6);
-}
-
-static void
-usage()
-{
-  fprintf(stderr, "usage: benchmark_dma [-p] [-g] [-n <nspes>] [-u <udelay>] [-s <dma_size>] [-N <njobs_at_a_time>]\n");
-  fprintf(stderr, "  you must specify one or both of -p (put) and -g (get)\n");
-}
-
-
-int
-main(int argc, char **argv)
-{
-  unsigned int nspes = 0;
-  unsigned int usecs = 0;
-  unsigned int dma_size = 32 << 10;
-  int njobs_at_once = -1;
-  int getput_mask = 0;
-  int ch;
-
-  while ((ch = getopt(argc, argv, "n:u:s:pgN:")) != EOF){
-    switch(ch){
-    case 'n':
-      nspes = strtol(optarg, 0, 0);
-      break;
-
-    case 'u':
-      usecs = strtol(optarg, 0, 0);
-      break;
-
-    case 'N':
-      njobs_at_once = strtol(optarg, 0, 0);
-      break;
-
-    case 's':
-      dma_size = strtol(optarg, 0, 0);
-      if (dma_size == 0){
-	fprintf(stderr, "-s <dma_size> must be > 0\n");
-	return 1;
-      }
-      break;
-
-    case 'p':
-      getput_mask |= BENCHMARK_PUT;
-      break;
-
-    case 'g':
-      getput_mask |= BENCHMARK_GET;
-      break;
-      
-    case '?':
-    default:
-      usage();
-      return 1;
-    }
-  }
-
-  if (njobs_at_once < 0)
-    njobs_at_once = nspes;
-
-  if (getput_mask == 0){
-    usage();
-    return 1;
-  }
-
-  run_test(nspes, usecs, dma_size, getput_mask, njobs_at_once);
-  return 0;
-}
diff --git a/gcell/apps/gen_script.py b/gcell/apps/gen_script.py
deleted file mode 100755
index 2ad0fb78e..000000000
--- a/gcell/apps/gen_script.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import time
-import os
-
-from optparse import OptionParser
-
-
-def get_svn_rev():
-    try:
-        f = os.popen("svn info", "r")
-        lines = f.readlines()
-        f.close()
-    except:
-        return "unk"
-
-    svn_rev = "unk"
-    for l in lines:
-        if l.startswith('Revision:'):
-            t = l.rstrip()
-            svn_rev = t.split()[-1]
-    return svn_rev
-    
-def is_ps3():
-    try:
-        f = open("/proc/cpuinfo")
-        s = f.read()
-    except:
-        return False
-
-    return s.find('PS3') != -1
-
-
-def main():
-
-    def make_fname(suffix):
-        return basename + '.' + suffix
-
-    max_spes_default = 16
-    if is_ps3():
-        max_spes_default = 6
-        
-    parser = OptionParser()
-    parser.add_option("-m", "--max-spes", type="int", default=max_spes_default,
-                      metavar="NSPES",
-                      help="maximum number of SPEs to use [default=%default]")
-    parser.add_option("", "--min-spes", type="int", default=1,
-                      metavar="NSPES",
-                      help="minimum number of SPEs to use [default=%default]")
-    parser.add_option("-p", "--oprofile", action="store_true", default=False,
-                      help="emit oprofile commands")
-    parser.add_option("-t", "--tag", default=None,
-                      help="additional goodie in generated filenames")
-    (options, args) = parser.parse_args()
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
-
-    #FIXME to use git now
-    svn_rev = get_svn_rev()
-
-    os.environ['TZ'] = 'PST8PDT'        # always pacific
-    time.tzset()
-
-    tag = ''
-    if options.tag:
-        tag = '-' + options.tag
-        
-    basename = 'R-%s%s-%s' % (svn_rev, tag, time.strftime('%Y%m%d-%H%M'))
-
-    base_njobs = int(500e3)
-    njobs = {
-         1 : base_njobs,
-        10 : base_njobs,
-        50 : base_njobs,
-       100 : base_njobs, 
-       200 : int(base_njobs/2),
-       250 : int(base_njobs/2.5),
-       300 : int(base_njobs/3),
-       400 : int(base_njobs/4),
-       500 : int(base_njobs/5)
-        }
-
-    
-    f_results = make_fname('results')
-    f_opreport = make_fname('opreport')
-    f_avg = make_fname('avg')
-    f_png = make_fname('png')
-
-    f = sys.stdout
-    f.write("#!/bin/bash\n")
-
-    if options.oprofile:
-        f.write("opcontrol --stop\n")
-        f.write("opcontrol --reset\n")
-        f.write("opcontrol --start\n")
-
-    f.write("(\n")
-
-    for udelay in (10, 50, 100, 200, 300):
-        for nspes in range(options.min_spes, options.max_spes+1):
-            cmd = "./benchmark_nop -n %d -u %d -N %d\n" % (nspes, udelay, njobs[udelay])
-            f.write(cmd)
-            f.write(cmd)
-
-    f.write(") | tee %s\n" % (f_results,))
-
-    if options.oprofile:
-        f.write("opcontrol --dump\n")
-        f.write("opcontrol --stop\n")
-        f.write("opreport -l | head -100 > %s\n" % (f_opreport,))
-
-    f.write("./split_and_avg_results.py %s > %s\n" % (f_results, f_avg))
-    f.write("./plot_speedup.py %s -o %s\n" % (f_avg, f_png))
-
-
-if __name__ == '__main__':
-    main()
diff --git a/gcell/apps/plot_speedup.py b/gcell/apps/plot_speedup.py
deleted file mode 100755
index 37822a73f..000000000
--- a/gcell/apps/plot_speedup.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env python
-
-from optparse import OptionParser
-from pylab import *
-from pprint import pprint
-import os.path
-
-
-def add_entry(d, nspes, speedup, work_incr):
-    if d.has_key(work_incr):
-        d[work_incr].append((nspes, speedup))
-    else:
-        d[work_incr] = [(nspes, speedup)]
-    
-def parse_file(f):
-    d = {}
-    for line in f:
-        items = [float(x) for x in line.split()]
-        # print "items =", items
-        nspes = items[0]
-        work_incr = int(1e6 * items[1])
-        speedup = items[4]
-        add_entry(d, nspes, speedup, work_incr)
-    return d
-
-
-class plot_data(object):
-    def __init__(self, filenames, output_filename):
-        self.fig = figure(1, figsize=(8, 6), facecolor='w')
-        self.sp = self.fig.add_subplot(1,1,1)
-        self.sp.set_xlabel("nspes", fontweight="bold")
-        self.sp.set_ylabel("speedup", fontweight="bold")
-        self.sp.grid(True)
-        # print 'rcParams["legend.fontsize"] =', rcParams["legend.fontsize"]
-        rcParams["legend.fontsize"] = 10
-
-
-        self.markers = {
-              5 : 'x',
-             10 : 'o',
-             50 : 's',
-            100 : '^',
-            200 : 'D',
-            300 : 'v',
-            400 : '>',
-            500 : 'h'
-            }
-        
-        if len(filenames) == 1:
-            f = filenames[0]
-            d = parse_file(open(f))
-            self.make_single_plot(d, f)
-            
-        else:
-            for f in filenames:
-                d = parse_file(open(f))
-                self.make_plot(d, f, f == filenames[0])
-
-        if output_filename:
-            savefig(output_filename)
-        else:
-            show()
-
-
-    def make_single_plot(self, d, filename):
-        def style(k):
-            return self.markers[k]
-
-        tag, ext = os.path.splitext(os.path.basename(filename))
-        title(tag)
-        keys = d.keys()
-        keys.sort()
-        keys.reverse()
-        for k in keys:
-            vlist = d[k]         # list of 2-tuples
-            xs = [v[0] for v in vlist]
-            ys = [v[1] for v in vlist]
-            plot(xs, ys, style(k), label="%d us" % (k,))
-
-        x = legend(loc=2)
-
-    def make_plot(self, d, filename, first):
-        def style(k):
-            if first:
-                return self.markers[k]
-            else:
-                return 'k' + self.markers[k]
-
-        tag, ext = os.path.splitext(os.path.basename(filename))
-        keys = d.keys()
-        keys.sort()
-        keys.reverse()
-        for k in keys:
-            vlist = d[k]         # list of 2-tuples
-            xs = [v[0] for v in vlist]
-            ys = [v[1] for v in vlist]
-            plot(xs, ys, style(k), label="%s %d us" % (tag, k))
-
-        x = legend(loc=2)
-
-def main():
-    usage="%prog: [options] input_filename..."
-    description = "Plot R*.avg files from benchmark_nop.py"
-    parser = OptionParser(usage=usage, description=description)
-    parser.add_option('-o', '--output', default=None,  metavar="FILE",
-                      help="generate .png file")
-    (options, args) = parser.parse_args()
-    if len(args) < 1:
-        parser.print_help()
-        raise SystemExit, 1
-
-    filenames = args
-    dc = plot_data(filenames, options.output)
-
-
-        
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
-
diff --git a/gcell/apps/results-071223 b/gcell/apps/results-071223
deleted file mode 100644
index 271617121..000000000
--- a/gcell/apps/results-071223
+++ /dev/null
@@ -1,126 +0,0 @@
-nspes:  1  udelay:    1  elapsed_time:  26.117  njobs: 1e+06  us/job:  26.117
-nspes:  1  udelay:    1  elapsed_time:  26.058  njobs: 1e+06  us/job:  26.058
-nspes:  1  udelay:    1  elapsed_time:  26.737  njobs: 1e+06  us/job:  26.737
-nspes:  2  udelay:    1  elapsed_time:  23.585  njobs: 1e+06  us/job:  23.585
-nspes:  2  udelay:    1  elapsed_time:  21.958  njobs: 1e+06  us/job:  21.958
-nspes:  2  udelay:    1  elapsed_time:  21.034  njobs: 1e+06  us/job:  21.034
-nspes:  3  udelay:    1  elapsed_time:  25.819  njobs: 1e+06  us/job:  25.819
-nspes:  3  udelay:    1  elapsed_time:  23.719  njobs: 1e+06  us/job:  23.719
-nspes:  3  udelay:    1  elapsed_time:  21.711  njobs: 1e+06  us/job:  21.711
-nspes:  4  udelay:    1  elapsed_time:  20.210  njobs: 1e+06  us/job:  20.210
-nspes:  4  udelay:    1  elapsed_time:  20.558  njobs: 1e+06  us/job:  20.558
-nspes:  4  udelay:    1  elapsed_time:  20.957  njobs: 1e+06  us/job:  20.957
-nspes:  5  udelay:    1  elapsed_time:  24.571  njobs: 1e+06  us/job:  24.571
-nspes:  5  udelay:    1  elapsed_time:  20.207  njobs: 1e+06  us/job:  20.207
-nspes:  5  udelay:    1  elapsed_time:  21.976  njobs: 1e+06  us/job:  21.976
-nspes:  6  udelay:    1  elapsed_time:  22.601  njobs: 1e+06  us/job:  22.601
-nspes:  6  udelay:    1  elapsed_time:  18.794  njobs: 1e+06  us/job:  18.794
-nspes:  6  udelay:    1  elapsed_time:  19.755  njobs: 1e+06  us/job:  19.755
-nspes:  1  udelay:    5  elapsed_time:  28.047  njobs: 1e+06  us/job:  28.047
-nspes:  1  udelay:    5  elapsed_time:  27.265  njobs: 1e+06  us/job:  27.265
-nspes:  1  udelay:    5  elapsed_time:  27.555  njobs: 1e+06  us/job:  27.555
-nspes:  2  udelay:    5  elapsed_time:  21.130  njobs: 1e+06  us/job:  21.130
-nspes:  2  udelay:    5  elapsed_time:  21.067  njobs: 1e+06  us/job:  21.067
-nspes:  2  udelay:    5  elapsed_time:  21.607  njobs: 1e+06  us/job:  21.607
-nspes:  3  udelay:    5  elapsed_time:  23.712  njobs: 1e+06  us/job:  23.712
-nspes:  3  udelay:    5  elapsed_time:  23.658  njobs: 1e+06  us/job:  23.658
-nspes:  3  udelay:    5  elapsed_time:  25.277  njobs: 1e+06  us/job:  25.277
-nspes:  4  udelay:    5  elapsed_time:  22.264  njobs: 1e+06  us/job:  22.264
-nspes:  4  udelay:    5  elapsed_time:  20.970  njobs: 1e+06  us/job:  20.970
-nspes:  4  udelay:    5  elapsed_time:  21.533  njobs: 1e+06  us/job:  21.533
-nspes:  5  udelay:    5  elapsed_time:  21.504  njobs: 1e+06  us/job:  21.504
-nspes:  5  udelay:    5  elapsed_time:  21.956  njobs: 1e+06  us/job:  21.956
-nspes:  5  udelay:    5  elapsed_time:  21.333  njobs: 1e+06  us/job:  21.333
-nspes:  6  udelay:    5  elapsed_time:  20.639  njobs: 1e+06  us/job:  20.639
-nspes:  6  udelay:    5  elapsed_time:  23.022  njobs: 1e+06  us/job:  23.022
-nspes:  6  udelay:    5  elapsed_time:  22.453  njobs: 1e+06  us/job:  22.453
-nspes:  1  udelay:   10  elapsed_time:  27.780  njobs: 1e+06  us/job:  27.780
-nspes:  1  udelay:   10  elapsed_time:  27.683  njobs: 1e+06  us/job:  27.683
-nspes:  1  udelay:   10  elapsed_time:  26.803  njobs: 1e+06  us/job:  26.803
-nspes:  2  udelay:   10  elapsed_time:  20.878  njobs: 1e+06  us/job:  20.878
-nspes:  2  udelay:   10  elapsed_time:  22.430  njobs: 1e+06  us/job:  22.430
-nspes:  2  udelay:   10  elapsed_time:  20.952  njobs: 1e+06  us/job:  20.952
-nspes:  3  udelay:   10  elapsed_time:  22.752  njobs: 1e+06  us/job:  22.752
-nspes:  3  udelay:   10  elapsed_time:  24.294  njobs: 1e+06  us/job:  24.294
-nspes:  3  udelay:   10  elapsed_time:  23.935  njobs: 1e+06  us/job:  23.935
-nspes:  4  udelay:   10  elapsed_time:  20.437  njobs: 1e+06  us/job:  20.437
-nspes:  4  udelay:   10  elapsed_time:  21.498  njobs: 1e+06  us/job:  21.498
-nspes:  4  udelay:   10  elapsed_time:  20.521  njobs: 1e+06  us/job:  20.521
-nspes:  5  udelay:   10  elapsed_time:  22.704  njobs: 1e+06  us/job:  22.704
-nspes:  5  udelay:   10  elapsed_time:  21.106  njobs: 1e+06  us/job:  21.106
-nspes:  5  udelay:   10  elapsed_time:  22.800  njobs: 1e+06  us/job:  22.800
-nspes:  6  udelay:   10  elapsed_time:  21.098  njobs: 1e+06  us/job:  21.098
-nspes:  6  udelay:   10  elapsed_time:  22.749  njobs: 1e+06  us/job:  22.749
-nspes:  6  udelay:   10  elapsed_time:  19.651  njobs: 1e+06  us/job:  19.651
-nspes:  1  udelay:   50  elapsed_time:  54.621  njobs: 1e+06  us/job:  54.621
-nspes:  1  udelay:   50  elapsed_time:  54.548  njobs: 1e+06  us/job:  54.548
-nspes:  1  udelay:   50  elapsed_time:  54.641  njobs: 1e+06  us/job:  54.641
-nspes:  2  udelay:   50  elapsed_time:  30.837  njobs: 1e+06  us/job:  30.837
-nspes:  2  udelay:   50  elapsed_time:  30.933  njobs: 1e+06  us/job:  30.933
-nspes:  2  udelay:   50  elapsed_time:  30.044  njobs: 1e+06  us/job:  30.044
-nspes:  3  udelay:   50  elapsed_time:  24.170  njobs: 1e+06  us/job:  24.170
-nspes:  3  udelay:   50  elapsed_time:  23.798  njobs: 1e+06  us/job:  23.798
-nspes:  3  udelay:   50  elapsed_time:  23.515  njobs: 1e+06  us/job:  23.515
-nspes:  4  udelay:   50  elapsed_time:  23.011  njobs: 1e+06  us/job:  23.011
-nspes:  4  udelay:   50  elapsed_time:  21.382  njobs: 1e+06  us/job:  21.382
-nspes:  4  udelay:   50  elapsed_time:  20.531  njobs: 1e+06  us/job:  20.531
-nspes:  5  udelay:   50  elapsed_time:  24.157  njobs: 1e+06  us/job:  24.157
-nspes:  5  udelay:   50  elapsed_time:  21.119  njobs: 1e+06  us/job:  21.119
-nspes:  5  udelay:   50  elapsed_time:  22.055  njobs: 1e+06  us/job:  22.055
-nspes:  6  udelay:   50  elapsed_time:  19.136  njobs: 1e+06  us/job:  19.136
-nspes:  6  udelay:   50  elapsed_time:  20.607  njobs: 1e+06  us/job:  20.607
-nspes:  6  udelay:   50  elapsed_time:  20.527  njobs: 1e+06  us/job:  20.527
-nspes:  1  udelay:  100  elapsed_time: 107.531  njobs: 1e+06  us/job: 107.531
-nspes:  1  udelay:  100  elapsed_time: 107.607  njobs: 1e+06  us/job: 107.607
-nspes:  1  udelay:  100  elapsed_time: 107.532  njobs: 1e+06  us/job: 107.532
-nspes:  2  udelay:  100  elapsed_time:  53.950  njobs: 1e+06  us/job:  53.950
-nspes:  2  udelay:  100  elapsed_time:  53.920  njobs: 1e+06  us/job:  53.920
-nspes:  2  udelay:  100  elapsed_time:  54.232  njobs: 1e+06  us/job:  54.232
-nspes:  3  udelay:  100  elapsed_time:  37.987  njobs: 1e+06  us/job:  37.987
-nspes:  3  udelay:  100  elapsed_time:  38.778  njobs: 1e+06  us/job:  38.778
-nspes:  3  udelay:  100  elapsed_time:  39.042  njobs: 1e+06  us/job:  39.042
-nspes:  4  udelay:  100  elapsed_time:  31.192  njobs: 1e+06  us/job:  31.192
-nspes:  4  udelay:  100  elapsed_time:  31.090  njobs: 1e+06  us/job:  31.090
-nspes:  4  udelay:  100  elapsed_time:  31.472  njobs: 1e+06  us/job:  31.472
-nspes:  5  udelay:  100  elapsed_time:  28.490  njobs: 1e+06  us/job:  28.490
-nspes:  5  udelay:  100  elapsed_time:  27.574  njobs: 1e+06  us/job:  27.574
-nspes:  5  udelay:  100  elapsed_time:  27.013  njobs: 1e+06  us/job:  27.013
-nspes:  6  udelay:  100  elapsed_time:  26.635  njobs: 1e+06  us/job:  26.635
-nspes:  6  udelay:  100  elapsed_time:  24.036  njobs: 1e+06  us/job:  24.036
-nspes:  6  udelay:  100  elapsed_time:  26.174  njobs: 1e+06  us/job:  26.174
-nspes:  1  udelay:  300  elapsed_time: 320.618  njobs: 1e+06  us/job: 320.618
-nspes:  1  udelay:  300  elapsed_time: 320.635  njobs: 1e+06  us/job: 320.635
-nspes:  1  udelay:  300  elapsed_time: 320.699  njobs: 1e+06  us/job: 320.699
-nspes:  2  udelay:  300  elapsed_time: 160.314  njobs: 1e+06  us/job: 160.314
-nspes:  2  udelay:  300  elapsed_time: 160.340  njobs: 1e+06  us/job: 160.340
-nspes:  2  udelay:  300  elapsed_time: 160.312  njobs: 1e+06  us/job: 160.312
-nspes:  3  udelay:  300  elapsed_time: 106.878  njobs: 1e+06  us/job: 106.878
-nspes:  3  udelay:  300  elapsed_time: 106.875  njobs: 1e+06  us/job: 106.875
-nspes:  3  udelay:  300  elapsed_time: 106.871  njobs: 1e+06  us/job: 106.871
-nspes:  4  udelay:  300  elapsed_time:  80.158  njobs: 1e+06  us/job:  80.158
-nspes:  4  udelay:  300  elapsed_time:  80.163  njobs: 1e+06  us/job:  80.163
-nspes:  4  udelay:  300  elapsed_time:  80.154  njobs: 1e+06  us/job:  80.154
-nspes:  5  udelay:  300  elapsed_time:  64.156  njobs: 1e+06  us/job:  64.156
-nspes:  5  udelay:  300  elapsed_time:  64.250  njobs: 1e+06  us/job:  64.250
-nspes:  5  udelay:  300  elapsed_time:  64.158  njobs: 1e+06  us/job:  64.158
-nspes:  6  udelay:  300  elapsed_time:  53.633  njobs: 1e+06  us/job:  53.633
-nspes:  6  udelay:  300  elapsed_time:  53.541  njobs: 1e+06  us/job:  53.541
-nspes:  6  udelay:  300  elapsed_time:  53.617  njobs: 1e+06  us/job:  53.617
-nspes:  1  udelay:  500  elapsed_time: 533.638  njobs: 1e+06  us/job: 533.638
-nspes:  1  udelay:  500  elapsed_time: 533.649  njobs: 1e+06  us/job: 533.649
-nspes:  1  udelay:  500  elapsed_time: 533.618  njobs: 1e+06  us/job: 533.618
-nspes:  2  udelay:  500  elapsed_time: 266.810  njobs: 1e+06  us/job: 266.810
-nspes:  2  udelay:  500  elapsed_time: 266.814  njobs: 1e+06  us/job: 266.814
-nspes:  2  udelay:  500  elapsed_time: 266.893  njobs: 1e+06  us/job: 266.893
-nspes:  3  udelay:  500  elapsed_time: 177.875  njobs: 1e+06  us/job: 177.875
-nspes:  3  udelay:  500  elapsed_time: 177.878  njobs: 1e+06  us/job: 177.878
-nspes:  3  udelay:  500  elapsed_time: 177.875  njobs: 1e+06  us/job: 177.875
-nspes:  4  udelay:  500  elapsed_time: 133.417  njobs: 1e+06  us/job: 133.417
-nspes:  4  udelay:  500  elapsed_time: 133.483  njobs: 1e+06  us/job: 133.483
-nspes:  4  udelay:  500  elapsed_time: 133.407  njobs: 1e+06  us/job: 133.407
-nspes:  5  udelay:  500  elapsed_time: 106.723  njobs: 1e+06  us/job: 106.723
-nspes:  5  udelay:  500  elapsed_time: 106.728  njobs: 1e+06  us/job: 106.728
-nspes:  5  udelay:  500  elapsed_time: 106.722  njobs: 1e+06  us/job: 106.722
-nspes:  6  udelay:  500  elapsed_time:  88.943  njobs: 1e+06  us/job:  88.943
-nspes:  6  udelay:  500  elapsed_time:  88.941  njobs: 1e+06  us/job:  88.941
-nspes:  6  udelay:  500  elapsed_time:  88.944  njobs: 1e+06  us/job:  88.944
diff --git a/gcell/apps/split_and_avg_results.py b/gcell/apps/split_and_avg_results.py
deleted file mode 100755
index 8a750fac9..000000000
--- a/gcell/apps/split_and_avg_results.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-"""
-input file looks like this:
-
-nspes:  1  udelay:   10  elapsed_time:   6.842  njobs: 500000  speedup:  0.731
-nspes:  2  udelay:   10  elapsed_time:   4.093  njobs: 500000  speedup:  1.221
-"""
-
-import sys
-from optparse import OptionParser
-from pprint import pprint
-
-class data(object):
-    def __init__(self, nspes, work_per_job, elapsed_time, njobs):
-        self.nspes = nspes
-        self.work_per_job = work_per_job  # seconds
-        self.elapsed_time = elapsed_time  # seconds
-        self.njobs = njobs
-        self.speedup = work_per_job * njobs / elapsed_time
-
-    def __repr__(self):
-        return "<data nspes=%d work_per_job=%s elapsed_time=%s njobs=%s speedup=%s>" % (
-            self.nspes, (self.work_per_job),
-            (self.elapsed_time),
-            (self.njobs),
-            (self.speedup))
-
-def cmp_data(x, y):
-    t = x.nspes - y.nspes
-    if t == 0:
-        t = x.work_per_job - y.work_per_job
-        if t < 0:
-            return -1
-        elif t > 0:
-            return +1
-        else:
-            return 0
-    return t
-
-def main():
-    usage = "usage: %prog [options] input_filename"
-    parser = OptionParser(usage=usage)
-    (options, args) = parser.parse_args()
-    if len(args) != 1:
-        parser.print_help()
-        raise SystemExit, 1
-    input_filename = args[0]
-
-    
-    m = {}
-    for line in open(input_filename, "r"):
-        s = line.split()
-        nspes = int(s[1])
-        work_per_job = int(s[3]) * 1e-6
-        elapsed_time = float(s[5])
-        njobs = float(s[7])
-        d = data(nspes, work_per_job, elapsed_time, njobs)
-
-        # collect lists that have the same values for nspes and work_per_job
-        # so we can generate an average elapsed_time from all observations
-        key = (nspes, work_per_job)
-        v = m.get(key, [])
-        v.append(d)
-        m[key] = v
-
-    r = []
-    for k, v in m.iteritems():
-        total_elapsed_time = sum([x.elapsed_time for x in v])
-        r.append(data(v[0].nspes,
-                      v[0].work_per_job,
-                      total_elapsed_time/len(v),
-                      v[0].njobs))
-
-    r.sort(cmp_data)
-
-    #pprint(r)
-    for t in r:
-        print t.nspes, t.work_per_job, t.elapsed_time, t.njobs, t.speedup
-
-if __name__ == '__main__':
-    main()
diff --git a/gcell/apps/spu/.gitignore b/gcell/apps/spu/.gitignore
deleted file mode 100644
index c50e521a3..000000000
--- a/gcell/apps/spu/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/*.a
-/*.la
-/*.lo
-/.deps
-/.libs
-/benchmark_procs
diff --git a/gcell/apps/spu/Makefile.am b/gcell/apps/spu/Makefile.am
deleted file mode 100644
index c07a2c398..000000000
--- a/gcell/apps/spu/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-
-include $(top_srcdir)/Makefile.common.spu
-
-AM_CPPFLAGS = $(GCELL_SPU_INCLUDES)
-
-# SPU executables
-
-noinst_PROGRAMS = \
-	benchmark_procs
-
-benchmark_procs_SOURCES = benchmark_procs.c
-benchmark_procs_LDADD = $(GCELL_SPU_LA)
-benchmark_procs_DEPENDENCIES = $(GCELL_SPU_LA)
-
diff --git a/gcell/apps/spu/benchmark_procs.c b/gcell/apps/spu/benchmark_procs.c
deleted file mode 100644
index fbc703349..000000000
--- a/gcell/apps/spu/benchmark_procs.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/gc_declare_proc.h>
-#include <gcell/spu/gc_delay.h>
-#include <string.h>
-
-static void
-benchmark_udelay(const gc_job_direct_args_t *input,
-		 gc_job_direct_args_t *output _UNUSED,
-		 const gc_job_ea_args_t *eaa _UNUSED)
-{
-  gc_udelay(input->arg[0].u32);
-}
-
-GC_DECLARE_PROC(benchmark_udelay, "benchmark_udelay");
-
-
-
-static void
-benchmark_put_zeros(const gc_job_direct_args_t *input _UNUSED,
-		    gc_job_direct_args_t *output _UNUSED,
-		    const gc_job_ea_args_t *eaa)
-{
-  for (unsigned int i = 0; i < eaa->nargs; i++){
-    if (eaa->arg[i].direction == GCJD_DMA_PUT)
-      memset(eaa->arg[i].ls_addr, 0, eaa->arg[i].put_size);
-  }
-}
-
-GC_DECLARE_PROC(benchmark_put_zeros, "benchmark_put_zeros");
-
-
-static void
-benchmark_copy(const gc_job_direct_args_t *input _UNUSED,
-	       gc_job_direct_args_t *output,
-	       const gc_job_ea_args_t *eaa)
-{
-  if (eaa->nargs != 2
-      || eaa->arg[0].direction != GCJD_DMA_PUT
-      || eaa->arg[1].direction != GCJD_DMA_GET){
-    output->arg[0].s32 = -1;
-    return;
-  }
-
-  output->arg[0].s32 = 0;
-  unsigned n = eaa->arg[0].put_size;
-  if (eaa->arg[1].get_size < n)
-    n = eaa->arg[1].get_size;
-  
-  memcpy(eaa->arg[0].ls_addr, eaa->arg[1].ls_addr, n);
-}
-
-GC_DECLARE_PROC(benchmark_copy, "benchmark_copy");
diff --git a/gcell/apps/test_all.cc b/gcell/apps/test_all.cc
deleted file mode 100644
index fc3afd8ca..000000000
--- a/gcell/apps/test_all.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2010,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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <cppunit/TextTestRunner.h>
-#include <cppunit/XmlOutputter.h>
-
-#include <gr_unittests.h>
-#include "../lib/runtime/qa_gcell_runtime.h"
-#include "../lib/wrapper/qa_gcell_wrapper.h"
-
-int 
-main(int argc, char **argv)
-{
-  CppUnit::TextTestRunner runner;
-  std::ofstream xmlfile(get_unittest_path("gcell_all.xml").c_str());
-  CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile);
-
-  runner.addTest(qa_gcell_runtime::suite());
-  runner.addTest(qa_gcell_wrapper::suite());
-  runner.setOutputter(xmlout);
-  
-  bool was_successful = runner.run("", false);
-
-  return was_successful ? 0 : 1;
-}
diff --git a/gcell/gcell.pc.in b/gcell/gcell.pc.in
deleted file mode 100644
index 1a3cd9c26..000000000
--- a/gcell/gcell.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-gcell_embedspu_libtool=@bindir@/gcell-embedspu-libtool
-
-Name: gcell
-Description: The GNU Radio SPE scheduler and RPC mechanism
-Requires:
-Version: @LIBVER@
-Libs: -L${libdir} -lgcell
-Cflags: -I${includedir} @DEFINES@
diff --git a/gcell/gcell_spu.pc.in b/gcell/gcell_spu.pc.in
deleted file mode 100644
index b59043b9b..000000000
--- a/gcell/gcell_spu.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@spu
-includedir=@includedir@
-
-Name: gcell_spu
-Description: The GNU Radio SPE scheduler and RPC mechanism (SPU components)
-Requires: 
-Version: @VERSION@
-Libs: -L${libdir} -lgcell_spu
-Cflags: -I${includedir}
diff --git a/gcell/ibm/Makefile.am b/gcell/ibm/Makefile.am
deleted file mode 100644
index 6438c7331..000000000
--- a/gcell/ibm/Makefile.am
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += \
-	./README \
-	./sync/ppu_source/atomic_add.h \
-	./sync/ppu_source/atomic_add_return.h \
-	./sync/ppu_source/atomic_dec_and_test.h \
-	./sync/ppu_source/atomic_dec.h \
-	./sync/ppu_source/atomic_dec_if_positive.h \
-	./sync/ppu_source/atomic_dec_return.h \
-	./sync/ppu_source/atomic.h \
-	./sync/ppu_source/atomic_inc.h \
-	./sync/ppu_source/atomic_inc_return.h \
-	./sync/ppu_source/atomic_read.h \
-	./sync/ppu_source/atomic_set.h \
-	./sync/ppu_source/atomic_sub_and_test.h \
-	./sync/ppu_source/atomic_sub.h \
-	./sync/ppu_source/atomic_sub_return.h \
-	./sync/ppu_source/complete_all.h \
-	./sync/ppu_source/complete.h \
-	./sync/ppu_source/completion.h \
-	./sync/ppu_source/cond_broadcast.h \
-	./sync/ppu_source/cond.h \
-	./sync/ppu_source/cond_init.h \
-	./sync/ppu_source/cond_signal.h \
-	./sync/ppu_source/cond_wait.h \
-	./sync/ppu_source/init_completion.h \
-	./sync/ppu_source/libsync.h \
-	./sync/ppu_source/mutex.h \
-	./sync/ppu_source/mutex_init.h \
-	./sync/ppu_source/mutex_lock.h \
-	./sync/ppu_source/mutex_trylock.h \
-	./sync/ppu_source/mutex_unlock.h \
-	./sync/ppu_source/pdt_libsync_config.xml \
-	./sync/ppu_source/pdt_libsync.xml \
-	./sync/ppu_source/sync_utils.h \
-	./sync/ppu_source/trace_libsync.h \
-	./sync/ppu_source/wait_for_completion.h \
-	./sync/spu_source/atomic_add.h \
-	./sync/spu_source/atomic_add_return.h \
-	./sync/spu_source/atomic_dec_and_test.h \
-	./sync/spu_source/atomic_dec.h \
-	./sync/spu_source/atomic_dec_if_positive.h \
-	./sync/spu_source/atomic_dec_return.h \
-	./sync/spu_source/atomic.h \
-	./sync/spu_source/atomic_inc.h \
-	./sync/spu_source/atomic_inc_return.h \
-	./sync/spu_source/atomic_read.h \
-	./sync/spu_source/atomic_set.h \
-	./sync/spu_source/atomic_sub_and_test.h \
-	./sync/spu_source/atomic_sub.h \
-	./sync/spu_source/atomic_sub_return.h \
-	./sync/spu_source/complete_all.h \
-	./sync/spu_source/complete.h \
-	./sync/spu_source/completion.h \
-	./sync/spu_source/cond_broadcast.h \
-	./sync/spu_source/cond.h \
-	./sync/spu_source/cond_init.h \
-	./sync/spu_source/cond_signal.h \
-	./sync/spu_source/cond_wait.h \
-	./sync/spu_source/init_completion.h \
-	./sync/spu_source/libsync.h \
-	./sync/spu_source/mutex.h \
-	./sync/spu_source/mutex_init.h \
-	./sync/spu_source/mutex_lock.h \
-	./sync/spu_source/mutex_trylock.h \
-	./sync/spu_source/mutex_unlock.h \
-	./sync/spu_source/read_lock.h \
-	./sync/spu_source/read_trylock.h \
-	./sync/spu_source/read_unlock.h \
-	./sync/spu_source/rwlock_init.h \
-	./sync/spu_source/sync_irq.h \
-	./sync/spu_source/sync_utils.h \
-	./sync/spu_source/trace_libsync.h \
-	./sync/spu_source/wait_for_completion.h \
-	./sync/spu_source/write_lock.h \
-	./sync/spu_source/write_trylock.h \
-	./sync/spu_source/write_unlock.h
diff --git a/gcell/ibm/README b/gcell/ibm/README
deleted file mode 100644
index 9420fcc46..000000000
--- a/gcell/ibm/README
+++ /dev/null
@@ -1,10 +0,0 @@
-This directory and below contains code from IBM licensed under the
-"Modified BSD license."  It was extracted unmodified from the IBM Cell
-SDK 3.0 library source tarball, lib_source.tar, typically found in
-/opt/cell/sdk/src/lib_source.tar.
-
-We've done this because this code doesn't come unpacked in the native
-(cell) installation of the SDK 3.0, and thus we can't just add a
--I/path/to/this/stuff in our Makefiles.  If this changes, we'll delete
-this code from here, and fix our Makefiles.  In the meanwhile, this
-reduces the probability of build problems.
diff --git a/gcell/ibm/sync/ppu_source/atomic.h b/gcell/ibm/sync/ppu_source/atomic.h
deleted file mode 100644
index 105f7bf37..000000000
--- a/gcell/ibm/sync/ppu_source/atomic.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-/*
- * atomic.h - PPE atomic SHM counter operations.
- *
- * Interfaces patterned after, and hopefully compatible
- * with PowerPC64-Linux atomic counter operations.  Uses
- * 32b values for various counters.
- */
-#ifndef _PPU_ATOMIC_H_
-#define _PPU_ATOMIC_H_
-
-#include <ppu_intrinsics.h>
-#include "sync_utils.h"
-
-typedef unsigned int atomic_t __attribute__ ((aligned (128))); 
-
-
-/* atomic_ea_t is a 64bit effective address  that points to 
- * an atomic_t variable 
- */
-typedef unsigned long long atomic_ea_t;
-
-/**
- * ASSUMPTIONS:
- * On the PPE, the size of a reservation granule is 128 bytes
- * (a cache-line), so when a programmer puts a reservation on an
- * address, that whole cacheline is reserved. Therefore both
- * the PPE and SPE can participate in an atomic operation as long as
- * lwarx and getllar operate on the same cacheline. 
- */ 
-
-
-/*
- * atomically loads and replaces the value v with val. 
- * Returns the old value at v
- */ 
-static __inline int _atomic_replace(atomic_ea_t v, int val)
-{
-  int old;
-  void *p;
-
-  SYNC_ULL_TO_PTR(v, p);
-
-  do {
-    old = (int)__lwarx(p);
-  } while (__stwcx(p, (unsigned int)val) == 0);
-
-  return old;
-}
-
-
-/*
- * atomically loads the value at v, adds val, replaces the
- * value at v with the sum. Returns the old value at v
- */ 
-static __inline int _atomic_modify(atomic_ea_t v, int val)
-{
-  int oldval, newval;
-  void *p;
-
-  SYNC_ULL_TO_PTR(v, p);
-
-  do {
-    oldval = (int)__lwarx(p);
-    newval = oldval + val;
-  } while (__stwcx(p, (unsigned int)newval) == 0);
-
-  return oldval;
-}
-
-
-#endif /* _PPU_ATOMIC_H_ */
-
diff --git a/gcell/ibm/sync/ppu_source/atomic_add.h b/gcell/ibm/sync/ppu_source/atomic_add.h
deleted file mode 100644
index dd7a5b25a..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_add.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_ADD_H_
-#define _PPU_ATOMIC_ADD_H_
-
-#include "sync_utils.h"
-#include "atomic.h"
-
-/**
- * atomic_add - atomically add to a counter.
- * @v: handle to effective address of counter.
- * @a: value to be added.
- * 
- * Atomically add a value to a counter in system memory. 
- * The only restriction is that @v must be word aligned.
- */
-static __inline void _atomic_add(int a, atomic_ea_t v)
-{
-  _atomic_modify (v, a);
-}
-
-
-
-#endif /* _PPU_ATOMIC_ADD_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_add_return.h b/gcell/ibm/sync/ppu_source/atomic_add_return.h
deleted file mode 100644
index 0fe127565..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_add_return.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_ADD_RETURN_H_
-#define _PPU_ATOMIC_ADD_RETURN_H_
-
-#include "sync_utils.h"
-#include "atomic.h"
-
-/**
- * atomic_add_return - atomically add to a counter and return previous value.
- * @v: handle to effective address of counter.
- * @a: value to be added.
- *
- * Atomically add a value to a counter in system memory.
- * The only restriction is that @v must be word aligned.
- *
- * This routine implements the "fetch and add" primitive
- * that is described in "Book I PowerPC User Instruction
- * Set Architecture" 
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_add_return(int a, atomic_ea_t v)
-{
-  return _atomic_modify (v, a);
-}
-
-
-#endif /* _PPU_ATOMIC_ADD_RETURN_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_dec.h b/gcell/ibm/sync/ppu_source/atomic_dec.h
deleted file mode 100644
index 4f82f04e0..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_dec.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_DEC_H_
-#define _PPU_ATOMIC_DEC_H_
-
-#include "sync_utils.h"
-#include "atomic.h"
-
-/**
- * atomic_dec - atomically decrement a counter.
- * @v: handle to effective address of location to be modified.
- *
- * Atomically decrement a counter in system memory. The only
- * restriction is that @v must be word aligned.
- */
-static __inline void _atomic_dec(atomic_ea_t v)
-{
-  _atomic_modify (v, -1);
-}
-
-
-#endif /* _PPU_ATOMIC_DEC_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_dec_and_test.h b/gcell/ibm/sync/ppu_source/atomic_dec_and_test.h
deleted file mode 100644
index 5093d4059..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_dec_and_test.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_DEC_AND_TEST_H_
-#define _PPU_ATOMIC_DEC_AND_TEST_H_
-
-#include "sync_utils.h"
-#include "atomic.h"
-
-/**
- * atomic_dec_and_test - atomically decrement and test if previous==0.
- * @v: handle to effective address of counter.
- *
- * Atomically decrement a counter in system memory and test 
- * if previous==0.  The only restriction is that @v must be 
- * word aligned.
- *
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_dec_and_test(atomic_ea_t v)
-{
-  return (_atomic_modify(v, -1) == 0) ? 1 : 0;
-}
-
-
-#endif /* _PPU_ATOMIC_DEC_AND_TEST_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_dec_if_positive.h b/gcell/ibm/sync/ppu_source/atomic_dec_if_positive.h
deleted file mode 100644
index c4d113bfd..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_dec_if_positive.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_DEC_IF_POSITIVE_H_
-#define _PPU_ATOMIC_DEC_IF_POSITIVE_H_
-
-#include <ppu_intrinsics.h>
-#include "sync_utils.h"
-#include "atomic.h"
-
-/*
- * atomic_dec_if_positive - atomically decrement if counter is positive.
- *
- *  v: handle to effective address of counter.
- * 
- * Atomically decrement a counter if its value is positive.
- * The only restriction is that v must be word aligned.
- *
- *
- * Returns the old value of the counter, minus 1.
- */
-static __inline int _atomic_dec_if_positive(atomic_ea_t v)
-{
-  int ret;
-  int tmp;
-  void *p;
-
-  SYNC_ULL_TO_PTR(v, p);
-
-  do {
-    tmp = (int)__lwarx(p);
-    ret = tmp - 1;
-    tmp = (tmp > 0) ? ret : tmp; 
-  } while (__stwcx(p, (unsigned)tmp) == 0);
-
-  return ret;
-}
-
-#endif /* _PPU_ATOMIC_DEC_IF_POSITIVE_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_dec_return.h b/gcell/ibm/sync/ppu_source/atomic_dec_return.h
deleted file mode 100644
index cd87893fa..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_dec_return.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_DEC_RETURN_H_
-#define _PPU_ATOMIC_DEC_RETURN_H_
-
-#include "sync_utils.h"
-#include "atomic.h"
-
-/**
- * atomic_dec_return - atomically decrement a counter and return previous value.
- * @v: handle to effective address of counter.
- *
- * Atomically decrement a counter in system memory and return its
- * previous value. The only restriction is that @v must be word 
- * aligned.
- *
- * This routine implements the "fetch and decrement"
- * primitive that is described in "Book I PowerPC User
- * Instruction Set Architecture".
- *
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_dec_return(atomic_ea_t v)
-{
-  return _atomic_modify (v, -1);
-}
-
-
-
-#endif /* _PPU_ATOMIC_DEC_RETURN_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_inc.h b/gcell/ibm/sync/ppu_source/atomic_inc.h
deleted file mode 100644
index 714aecbc0..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_inc.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_INC_H_
-#define _PPU_ATOMIC_INC_H_
-
-#include "sync_utils.h"
-#include "atomic.h"
-
-/**
- * atomic_inc - atomically increment a counter in system memory.
- * @v: handle to effective address of counter.
- *
- * Atomically increment a counter in system memory.
- * The only restriction is that @v must be word aligned.
- */
-static __inline void _atomic_inc(atomic_ea_t v)
-{
-  _atomic_modify (v, 1); 
-}
-
-#endif /* _PPU_ATOMIC_INC_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_inc_return.h b/gcell/ibm/sync/ppu_source/atomic_inc_return.h
deleted file mode 100644
index 95178f50d..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_inc_return.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_INC_RETURN_H_
-#define _PPU_ATOMIC_INC_RETURN_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-
-/**
- * atomic_inc_return - atomically increment a counter and return previous.
- * @v: handle to effective address of counter.
- *
- * Atomically increment a counter in system memory.
- * The only restriction is that @v must be word aligned.
- *
- * This routine implements the "fetch and increment"
- * primitive that is described in "Book I PowerPC User
- * Instruction Set Architecture" 
- *
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_inc_return(atomic_ea_t v)
-{
-  return _atomic_modify (v, 1);
-}
-
-#endif /* _PPU_ATOMIC_INC_RETURN_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_read.h b/gcell/ibm/sync/ppu_source/atomic_read.h
deleted file mode 100644
index 258fd516c..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_read.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_READ_H_
-#define _PPU_ATOMIC_READ_H_
-
-#include "sync_utils.h"
-#include "atomic.h"
-
-/*
- * On PowerPC architecture, if v is a word_aligned address, then
- * a load of that address is guaranteed to be atomic.  An atomic
- * read operation is simply a load.
- */ 
-static __inline int _atomic_read(atomic_ea_t v)
-{
-  volatile int *p;
-
-  SYNC_ULL_TO_PTR(v, p);
-
-  return (*p);
-}
-
-
-#endif /* _PPU_ATOMIC_READ_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_set.h b/gcell/ibm/sync/ppu_source/atomic_set.h
deleted file mode 100644
index e624af40d..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_set.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_SET_H_
-#define _PPU_ATOMIC_SET_H_
-
-#include "sync_utils.h"
-#include "atomic.h"
-
-/**
- * atomic_set - atomically set a counter in system memory.
- * @v: this is a 64bit address that points to an atomic_t 
- * 
- * Atomically set a counter to a given value. The only 
- * restriction is that @v must be word aligned.
- *
- * This routine implements the "fetch and store" 
- * primitive that is described in "Book I PowerPC User 
- * Instruction Set Architecture"
- *
- * Returns the previous value from system memory.
- */
-static __inline void _atomic_set(atomic_ea_t v, int val)
-{
-  _atomic_replace (v, val);
-}
-
-
-#endif /* _PPU_ATOMIC_SET_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_sub.h b/gcell/ibm/sync/ppu_source/atomic_sub.h
deleted file mode 100644
index b8d35975a..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_sub.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_SUB_H_
-#define _PPU_ATOMIC_SUB_H_
-
-#include "sync_utils.h"
-#include "atomic.h"
-
-/**
- * atomic_sub - atomically subtract from a counter.
- * @v: handle to effective address of counter.
- * @a: value to be subtracted.
- *
- * Atomically subtract a value from a counter in system memory.
- * The only restriction is that @v must be word aligned.
- */
-static __inline void _atomic_sub(int a, atomic_ea_t v)
-{
-  _atomic_modify (v, -a);
-}
-
-
-#endif /* _PPU_ATOMIC_SUB_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_sub_and_test.h b/gcell/ibm/sync/ppu_source/atomic_sub_and_test.h
deleted file mode 100644
index 37ba58896..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_sub_and_test.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_SUB_AND_TEST_H_
-#define _PPU_ATOMIC_SUB_AND_TEST_H_
-
-#include "sync_utils.h"
-#include "atomic.h"
-
-/**
- * atomic_sub_and_test - atomically subtract and test if previous==0.
- * @v: handle to effective address of counter.
- * @a: value to be subtracted.
- *
- * Atomically subtract a value from a counter in system memory
- * and test if previous==0.  The only restriction is that @v 
- * must be word aligned.
- *
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_sub_and_test(int a, atomic_ea_t v)
-{
-  return (_atomic_modify(v, -a) == 0) ? 1 : 0;
-}
-
-#endif /* _PPU_ATOMIC_SUB_AND_TEST_H_ */
diff --git a/gcell/ibm/sync/ppu_source/atomic_sub_return.h b/gcell/ibm/sync/ppu_source/atomic_sub_return.h
deleted file mode 100644
index 084bfa6b1..000000000
--- a/gcell/ibm/sync/ppu_source/atomic_sub_return.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_ATOMIC_SUB_RETURN_H_
-#define _PPU_ATOMIC_SUB_RETURN_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-
-/**
- * atomic_sub_return - atomically subtract from a counter & return previous.
- * @v: handle to effective address of counter.
- * @a: value to be subtracted.
- *
- * Atomically subtract a value from a counter in system memory.
- * The only restriction is that @v must be word aligned.
- *
- * Returns the previous value from system memory.
- */
-
-
-static __inline int _atomic_sub_return(int a, atomic_ea_t v)
-{
-  return _atomic_modify (v, -a);
-}
-
-#endif /* _PPU_ATOMIC_SUB_RETURN_H_ */
diff --git a/gcell/ibm/sync/ppu_source/complete.h b/gcell/ibm/sync/ppu_source/complete.h
deleted file mode 100644
index 8633463f7..000000000
--- a/gcell/ibm/sync/ppu_source/complete.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_COMPLETE_H_
-#define _PPU_COMPLETE_H_
-
-#include <ppu_intrinsics.h>
-#include "sync_utils.h"
-#include "completion.h"
-
-
-static __inline void _complete (completion_ea_t comp)
-{
-  unsigned int old;
-  void *p;
-
-  SYNC_ULL_TO_PTR(comp, p);
-
-  do {
-    old = __lwarx(p);
-  } while (__stwcx(p, (unsigned int)1) == 0);
-}
-
-#endif /* _PPU_COMPLETE_H_ */
diff --git a/gcell/ibm/sync/ppu_source/complete_all.h b/gcell/ibm/sync/ppu_source/complete_all.h
deleted file mode 100644
index c12eb7f03..000000000
--- a/gcell/ibm/sync/ppu_source/complete_all.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_COMPLETE_ALL_H_
-#define _PPU_COMPLETE_ALL_H_
-
-#include <ppu_intrinsics.h>
-#include "sync_utils.h"
-#include "completion.h"
-
-/**
- * complete_all - indicate that a completion is true.
- * @completion: handle to effective address of completion variable.
- *
- * Indicate that all are completed is true by storing 
- * MAX_THREADS_WAITING to the completionition variable.
- */
-
-static __inline void _complete_all(completion_ea_t comp)
-{
-  unsigned int old;
-  unsigned int val = MAX_THREADS_WAITING;
-
-  void *p;
-
-  SYNC_ULL_TO_PTR(comp, p);
-
-  do {
-    old = __lwarx(p);
-  } while (__stwcx(p, val) == 0);
-}
-
-#endif /* _PPU_COMPLETE_ALL_H_ */
diff --git a/gcell/ibm/sync/ppu_source/completion.h b/gcell/ibm/sync/ppu_source/completion.h
deleted file mode 100644
index b74bdaae7..000000000
--- a/gcell/ibm/sync/ppu_source/completion.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-
-#ifndef _PPU_COMPLETION_H_
-#define _PPU_COMPLETION_H_
-
-
-#define MAX_THREADS_WAITING   32000 
-
-typedef unsigned long long completion_ea_t;
-
-#endif /* _PPU_COMPLETION_H_ */
diff --git a/gcell/ibm/sync/ppu_source/cond.h b/gcell/ibm/sync/ppu_source/cond.h
deleted file mode 100644
index 9a38f71a4..000000000
--- a/gcell/ibm/sync/ppu_source/cond.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_COND_VAR_H_
-#define _PPU_COND_VAR_H_
-
-#include <mutex.h>
-#include <sync_utils.h>
-
-
-typedef struct
-{
-  short num_threads_signal;       /* the number of threads that are going to be waken up.
-                                 There are 3 values possible for this parameter, 0, 1, 
-                                 or num_threads_waiting*/
-  short num_threads_waiting;      /* the number of threads that are waiting to be awaken */ 
-} condition_variable_t __attribute__ ((aligned (16)));  
-
-typedef unsigned long long cond_ea_t;         /* a system memory 64 bit address that points to
-                                 * a valid condition_variable_t */
-
-typedef union {
-    unsigned long long ull;  
-    unsigned int ui[2];
-} val64;
-
-
-#endif /* _PPU_COND_VAR_H_ */
diff --git a/gcell/ibm/sync/ppu_source/cond_broadcast.h b/gcell/ibm/sync/ppu_source/cond_broadcast.h
deleted file mode 100644
index b93bf7b37..000000000
--- a/gcell/ibm/sync/ppu_source/cond_broadcast.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_COND_BROADCAST_H_
-#define _PPU_COND_BROADCAST_H_
-
-#include <ppu_intrinsics.h>
-#include "sync_utils.h"
-#include "cond.h"
-
-/**
- * cond_broadcast - indicate that a condition is true.
- * @cond: handle to effective address of condition variable.
- */
-static __inline void _cond_broadcast (cond_ea_t cond)
-{
-  unsigned int val;
-  void *p;
-
-  SYNC_ULL_TO_PTR(cond, p);
-  
-  do {
-    val = __lwarx(p);
-
-    /* Copy the waiting count (low halfword) to
-     * the signaled count (high halfword)
-     */
-    val = (val & 0xFFFF) | ((val+1) << 16);
-    
-  } while (__stwcx(p, val) == 0);
-}
-
-#endif /* _PPU_COND_BROADCAST_H_ */
diff --git a/gcell/ibm/sync/ppu_source/cond_init.h b/gcell/ibm/sync/ppu_source/cond_init.h
deleted file mode 100644
index 0dfbd6349..000000000
--- a/gcell/ibm/sync/ppu_source/cond_init.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_COND_INIT_H_
-#define _PPU_COND_INIT_H_
-
-#include "sync_utils.h"
-#include "cond.h"
-
-/**
- * cond_init - initialize condition variable.
- * @cond: handle to effective address of condition variable.
- *
- * Only one thread initializes a condition variable. Usually, the 
- * PPE thread initializes a condidtion variable 
- *
- * Description: Initialize a cond variable to false.
- */
-static __inline void _cond_init (cond_ea_t  cond)
-{
-  volatile unsigned int *p;
-
-  SYNC_ULL_TO_PTR(cond, p);
-
-  *p = 0;
-}
-
-
-#endif /* _PPU_COND_INIT_H_ */
diff --git a/gcell/ibm/sync/ppu_source/cond_signal.h b/gcell/ibm/sync/ppu_source/cond_signal.h
deleted file mode 100644
index dd4874827..000000000
--- a/gcell/ibm/sync/ppu_source/cond_signal.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_COND_SIGNAL_H_
-#define _PPU_COND_SIGNAL_H_
-
-#include <ppu_intrinsics.h>
-#include "sync_utils.h"
-#include "cond.h"
-
-/*
- * _cond_signal: signaling any of the waiting threads to wake up.
- */ 
-static __inline void _cond_signal (cond_ea_t cond)
-{
-  unsigned int val, waiting, signaled;
-  void *p;
-
-  SYNC_ULL_TO_PTR(cond, p);
-  
-  do {
-    val = __lwarx(p);
-
-    waiting = val & 0xFFFF;
-    signaled = val >> 16;
-    
-    /* If no other party is waiting. Don't send a signal.
-     * Otherwise, increment the signaled halfword.
-     */
-    if (waiting == signaled) break;
-    val = ((val+1) << 16) | waiting;
-
-  } while (__stwcx(p, val) == 0);
-}
-
-
-#endif /* _PPU_COND_SIGNAL_H_ */
diff --git a/gcell/ibm/sync/ppu_source/cond_wait.h b/gcell/ibm/sync/ppu_source/cond_wait.h
deleted file mode 100644
index ed5fbecb1..000000000
--- a/gcell/ibm/sync/ppu_source/cond_wait.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_COND_WAIT_H_
-#define _PPU_COND_WAIT_H_
-
-#include <ppu_intrinsics.h>
-#include "sync_utils.h"
-#include "mutex_lock.h"
-#include "mutex_unlock.h"
-#include "cond.h"
-
-static __inline void _cond_wait (cond_ea_t cond, mutex_ea_t  mutex)
-{
-  int delta, cur_delta;
-  unsigned int val, cond_val, signaled_cnt;
-  void *p;
-
-
-  SYNC_ULL_TO_PTR(cond, p);
-
-  /* Atomically signal we have entered the condition wait by incrementing
-   * the waiting count.
-   */
-  do {
-    val = __lwarx(p);
-    val = (val & ~0xFFFF) | ((val+1) & 0xFFFF);
-  } while (__stwcx(p, val) == 0);
-
-
-  /* Release the lock
-   */
-  _mutex_unlock (mutex);
-
-  /* Determine the signal count needed for this 
-   * participant to be signaled.
-   */
-
-  signaled_cnt = val >> 16;
-  delta = (int)(val & 0xFFFF) - (int)signaled_cnt;
-  if (delta < 0) delta = -delta;
-
-  /* Wait until the signaled count reaches the count
-   * previously determined.
-   */
-  do {
-    cond_val = __lwarx(p);
-
-    cur_delta = (int)(cond_val >> 16) - signaled_cnt;
-    if (cur_delta < 0) cur_delta = -cur_delta;
-   
-  } while (cur_delta < delta);
-
-  /* Relock the mutex 
-   */
-  _mutex_lock (mutex);
-}
-
-#endif /* _PPU_COND_WAIT_H_ */
diff --git a/gcell/ibm/sync/ppu_source/init_completion.h b/gcell/ibm/sync/ppu_source/init_completion.h
deleted file mode 100644
index 8e7081111..000000000
--- a/gcell/ibm/sync/ppu_source/init_completion.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_INIT_COMPLETION_H_
-#define _PPU_INIT_COMPLETION_H_
-
-#include "sync_utils.h"
-#include "completion.h"
-
-/**
- * completion_init - initialize completion variable.
- * @completion: handle to effective address of completion variable.
- *
- * Description: Initialize a completion variable to 0.
- */
-static __inline void _init_completion(completion_ea_t comp)
-{
-  volatile unsigned int *p;
-
-  SYNC_ULL_TO_PTR(comp, p);
-
-  *p = 0;
-}
-
-
-#endif /* _PPU_INIT_COMPLETION_H_ */
diff --git a/gcell/ibm/sync/ppu_source/libsync.h b/gcell/ibm/sync/ppu_source/libsync.h
deleted file mode 100644
index bd2e04347..000000000
--- a/gcell/ibm/sync/ppu_source/libsync.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_LIBSYNC_H_
-#define _PPU_LIBSYNC_H_
-
-#include "sync_utils.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef unsigned long long atomic_ea_t;
-
-extern void atomic_set(atomic_ea_t v, int val);
-extern void atomic_add(int a, atomic_ea_t v);
-extern void atomic_sub(int a, atomic_ea_t v);
-extern void atomic_inc(atomic_ea_t v);
-extern void atomic_dec(atomic_ea_t v);
-
-extern int atomic_read(atomic_ea_t v);
-extern int atomic_add_return(int a, atomic_ea_t v);
-extern int atomic_sub_return(int a, atomic_ea_t v);
-extern int atomic_inc_return(atomic_ea_t v);
-extern int atomic_dec_return(atomic_ea_t v);
-extern int atomic_sub_and_test(int a, atomic_ea_t v);
-extern int atomic_dec_and_test(atomic_ea_t v);
-extern int atomic_dec_if_positive(atomic_ea_t v);
-
-typedef unsigned long long mutex_ea_t;
-void mutex_init(mutex_ea_t lock);
-
-void mutex_lock(mutex_ea_t lock);
-int mutex_trylock(mutex_ea_t ea);
-void mutex_unlock(mutex_ea_t lock);
-
-typedef struct
-{
-  int num_threads_signal;       /* the number of threads that are going to be waken up.
-                                 There are 3 values possible for this parameter, 0, 1, 
-                                 or num_threads_waiting*/
-  int num_threads_waiting;      /* the number of threads that are waiting to be awaken */ 
-} condition_variable_t __attribute__ ((aligned (16)));  
-
-typedef unsigned long long cond_ea_t;         /* a system memory 64 bit address that points to
-                                 * a valid condition_variable_t */
-
-typedef union {
-    unsigned long long ull;  
-    unsigned int ui[2];
-} val64;
-
-
-void cond_init (cond_ea_t  cond);
-void cond_signal (cond_ea_t cond);
-void cond_broadcast (cond_ea_t cond);
-void cond_wait (cond_ea_t cond, mutex_ea_t  mutex);
-
-
-#define MAX_THREADS_WAITING   32000 
-
-typedef unsigned long long completion_ea_t;
-
-extern void init_completion(completion_ea_t comp);
-extern void wait_for_completion(completion_ea_t comp);
-/*
-extern void wait_for_completion_irq(completion_ea_t comp);
-extern void wait_for_completion_irqsave(completion_ea_t comp);
-*/
-extern void complete_all(completion_ea_t comp);
-extern void complete (completion_ea_t comp);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PPU_LIBSYNC_H_ */
diff --git a/gcell/ibm/sync/ppu_source/mutex.h b/gcell/ibm/sync/ppu_source/mutex.h
deleted file mode 100644
index 364bb2249..000000000
--- a/gcell/ibm/sync/ppu_source/mutex.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_MUTEX_H_
-#define _PPU_MUTEX_H_           1
-
-typedef unsigned long long mutex_ea_t;
-
-#endif /* _PPU_MUTEX_H_ */
diff --git a/gcell/ibm/sync/ppu_source/mutex_init.h b/gcell/ibm/sync/ppu_source/mutex_init.h
deleted file mode 100644
index 105dc2c57..000000000
--- a/gcell/ibm/sync/ppu_source/mutex_init.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_MUTEX_INIT_H_
-#define _PPU_MUTEX_INIT_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-#include "trace_libsync.h"
-
-/***************************************************************************/
-/**
- * mutex_init - initialize the mutex by setting the value 
- * to 0.
- * @lock: handle to effective address of lock variable.
- *
- * Description: Initialize a mutex.
- */
-static __inline void _mutex_init(mutex_ea_t lock)
-{
-  volatile unsigned int *p;
-
-  SYNC_ULL_TO_PTR(lock, p);
-
-  *p = 0;
-
-  TRACE_MUTEX_INIT(lock);
-}
-
-#endif /* _PPU_MUTEX_INIT_H_ */
diff --git a/gcell/ibm/sync/ppu_source/mutex_lock.h b/gcell/ibm/sync/ppu_source/mutex_lock.h
deleted file mode 100644
index 75240a141..000000000
--- a/gcell/ibm/sync/ppu_source/mutex_lock.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_MUTEX_LOCK_H_
-#define _PPU_MUTEX_LOCK_H_
-
-#include <ppu_intrinsics.h>
-#include "sync_utils.h"
-#include "mutex.h"
-#include "trace_libsync.h"
-
-/* function:	_mutex_lock
- *
- * Aquire a lock at a location in system memory by waiting for the
- * value to become zero, then atomically storing 1. 
- */
-static __inline void _mutex_lock (mutex_ea_t lock)
-{
-  unsigned int done = 0;
-  void *p;
-#ifdef LIBSYNC_TRACE
-  unsigned int miss = 0;
-#endif /* LIBSYNC_TRACE */
-
-  TRACE_MUTEX_LOCK_ENTRY(interval);
-
-  SYNC_ULL_TO_PTR(lock, p);
-
-  do {
-    if (__lwarx(p) == 0) done = __stwcx(p, (unsigned int) 1);
-#ifdef LIBSYNC_TRACE
-    /* if we missed the lock, note it.. */
-    if (done == 0) miss = 1;
-#endif
-  } while (done == 0);
-  __isync();
-
-  TRACE_MUTEX_LOCK_EXIT(interval, lock, miss);
-}
-
-#endif /* _PPU_MUTEX_LOCK_H_ */
diff --git a/gcell/ibm/sync/ppu_source/mutex_trylock.h b/gcell/ibm/sync/ppu_source/mutex_trylock.h
deleted file mode 100644
index 445196c74..000000000
--- a/gcell/ibm/sync/ppu_source/mutex_trylock.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_MUTEX_TRYLOCK_H_
-#define _PPU_MUTEX_TRYLOCK_H_
-
-#include <ppu_intrinsics.h>
-#include "sync_utils.h"
-#include "mutex.h"
-#include "trace_libsync.h"
-
-/**
- * mutex_trylock - acquire a lock, or return immediately.
- * @lock: handle to effective address of lock variable.
- *
- * Description: Acquire a lock, or return immediately 
- * without polling for availability.
- *
- * Context: The application should not call this interface 
- * from a tight loop!!  Use spin_lock() instead.
- *
- * Attempt to immediately aquire a lock at a location in system memory,
- * and return 1 if the lock was aquired or 0 otherwise.
- */
-static __inline int _mutex_trylock (mutex_ea_t lock)
-{
-  int val;
-  int ret = 0;
-  void *p;
-
-  SYNC_ULL_TO_PTR(lock, p);
-
-  do {
-    val = (int)__lwarx(p);
-    if (val) break;
-  } while ((ret = __stwcx(p, (unsigned int)1)) == 0);
-  __isync();
-
-  TRACE_MUTEX_TRYLOCK(lock,ret);
-
-  return (ret);
-}
-
-#endif /* _PPU_MUTEX_TRYLOCK_H_ */
diff --git a/gcell/ibm/sync/ppu_source/mutex_unlock.h b/gcell/ibm/sync/ppu_source/mutex_unlock.h
deleted file mode 100644
index e5255be02..000000000
--- a/gcell/ibm/sync/ppu_source/mutex_unlock.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_MUTEX_UNLOCK_H_
-#define _PPU_MUTEX_UNLOCK_H_
-
-#include "mutex.h"
-#include "atomic.h"
-#include "trace_libsync.h"
-
-/* function:	_mutex_unlock
- *
- * Release a lock held at address 'lock' in system memory.
- * For the PU, this routine is the same _unlock, and is 
- * provided here as a simple convenience for programmers 
- * (to match the interfaces that are supported on the SPU).
- * All I need to do is a store since store is an atomic operation by itself 
- */
-static __inline void _mutex_unlock (mutex_ea_t lock)
-{
-  _atomic_replace ((atomic_ea_t)lock, 0);
-
-  TRACE_MUTEX_UNLOCK(lock); 
-}
-
-
-#endif /* _PPU_MUTEX_UNLOCK_H_ */
diff --git a/gcell/ibm/sync/ppu_source/pdt_libsync.xml b/gcell/ibm/sync/ppu_source/pdt_libsync.xml
deleted file mode 100644
index d9ea2ce9f..000000000
--- a/gcell/ibm/sync/ppu_source/pdt_libsync.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<pdtGroup name="LIBSYNC" id="0x03" version="3.0">
-	<!-- PPE events -->
-	<subGroup  name="PPE_MUTEX" id="0xFE03">
-		<recordType name="PPE_MUTEX_INIT" description="PPE: mutex lock init" id="0x0003" type="event">
-			<include href="/usr/share/pdt/config/pdt_ppe_event_header.xml"/>
-			<physicalField name="lock"  description="Lock address" type="long" toString="0x%x" visible="true"/>
-			<physicalField name="empty3"   description="empty slot 3" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty4"   description="empty slot 4" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty5"   description="empty slot 5" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty6"   description="empty slot 6" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty7"   description="empty slot 7" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty8"   description="empty slot 8" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty9"   description="empty slot 9" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty10"   description="empty slot 10" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty11"   description="empty slot 11" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty12"   description="empty slot 12" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty13"   description="empty slot 13" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty14"   description="empty slot 14" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty15"   description="empty slot 15" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty16"   description="empty slot 16" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty17"   description="empty slot 17" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty18"   description="empty slot 18" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty19"   description="empty slot 19" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty20"   description="empty slot 20" type="int" toString="0x%x" visible="false"/>
-		</recordType>	
-		<recordType name="PPE_MUTEX_LOCK" description="PPE: acquire a mutex lock" id="0x0103"  type="interval">
-			<include href="/usr/share/pdt/config/pdt_ppe_event_header.xml"/>
-			<physicalField name="lock" description="Lock address" type="long" toString="0x%x" visible="true"/>
-			<physicalField name="miss"   description="Missed" type="int" toString="0x%x" visible="true"/>
-			<physicalField name="empty4"   description="empty slot 4" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty5"   description="empty slot 5" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty6"   description="empty slot 6" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty7"   description="empty slot 7" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty8"   description="empty slot 8" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty9"   description="empty slot 9" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty10"   description="empty slot 10" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty11"   description="empty slot 11" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty12"   description="empty slot 12" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty13"   description="empty slot 13" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty14"   description="empty slot 14" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty15"   description="empty slot 15" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty16"   description="empty slot 16" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty17"   description="empty slot 17" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty18"   description="empty slot 18" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty19"   description="empty slot 19" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty20"   description="empty slot 20" type="int" toString="0x%x" visible="false"/>
-		</recordType>
-		<recordType name="PPE_MUTEX_TRYLOCK" description="PPE: try to acquire a lock" id="0x0203"  type="event">
-			<include href="/usr/share/pdt/config/pdt_ppe_event_header.xml"/>
-			<physicalField name="lock" description="Lock address" type="long" toString="0x%x" visible="true"/>
-			<physicalField  name="ret" description="Try lock return code" type="int" toString="0x%x" visible="true"/>
-			<physicalField name="empty4"   description="empty slot 4" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty5"   description="empty slot 5" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty6"   description="empty slot 6" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty7"   description="empty slot 7" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty8"   description="empty slot 8" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty9"   description="empty slot 9" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty10"   description="empty slot 10" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty11"   description="empty slot 11" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty12"   description="empty slot 12" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty13"   description="empty slot 13" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty14"   description="empty slot 14" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty15"   description="empty slot 15" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty16"   description="empty slot 16" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty17"   description="empty slot 17" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty18"   description="empty slot 18" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty19"   description="empty slot 19" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty20"   description="empty slot 20" type="int" toString="0x%x" visible="false"/>
-		</recordType>	
-		<recordType name="PPE_MUTEX_UNLOCK" description="PPE: unlock a mutex lock" id="0x0303"  type="event">
-			<include href="/usr/share/pdt/config/pdt_ppe_event_header.xml"/>
-			<physicalField  name="lock" description="Lock address" type="long" toString="0x%x" visible="true"/>
-			<physicalField name="empty3"   description="empty slot 3" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty4"   description="empty slot 4" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty5"   description="empty slot 5" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty6"   description="empty slot 6" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty7"   description="empty slot 7" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty8"   description="empty slot 8" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty9"   description="empty slot 9" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty10"   description="empty slot 10" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty11"   description="empty slot 11" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty12"   description="empty slot 12" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty13"   description="empty slot 13" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty14"   description="empty slot 14" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty15"   description="empty slot 15" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty16"   description="empty slot 16" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty17"   description="empty slot 17" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty18"   description="empty slot 18" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty19"   description="empty slot 19" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty20"   description="empty slot 20" type="int" toString="0x%x" visible="false"/>
-		</recordType>
-	</subGroup>
-	<!-- SPE events -->
-	<subGroup  name="SPE_MUTEX" id="0xFD03">
-		<recordType name="SPE_MUTEX_INIT" description="SPE: mutex lock init" id="0x0403"  type="event">
-			<include href="/usr/share/pdt/config/pdt_spe_event_header.xml"/>
-			<physicalField  name="lock"  description="Lock address" type="long" toString="0x%x" visible="true"/>
-			<physicalField name="empty3"   description="empty slot 3" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty4"   description="empty slot 4" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty5"   description="empty slot 5" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty6"   description="empty slot 6" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty7"   description="empty slot 7" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty8"   description="empty slot 8" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty9"   description="empty slot 9" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty10"   description="empty slot 10" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty11"   description="empty slot 11" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty12"   description="empty slot 12" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty13"   description="empty slot 13" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty14"   description="empty slot 14" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty15"   description="empty slot 15" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty16"   description="empty slot 16" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty17"   description="empty slot 17" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty18"   description="empty slot 18" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty19"   description="empty slot 19" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty20"   description="empty slot 20" type="int" toString="0x%x" visible="false"/>
-		</recordType>	
-		<recordType name="SPE_MUTEX_LOCK" description="SPE: acquire a mutex lock" id="0x0503"  type="interval">
-			<include href="/usr/share/pdt/config/pdt_spe_event_header.xml"/>
-			<physicalField name="lock" description="Lock address" type="long" toString="0x%x" visible="true"/>
-			<physicalField name="miss"   description="Missed" type="int" toString="0x%x" visible="true"/>
-			<physicalField name="empty4"   description="empty slot 4" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty5"   description="empty slot 5" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty6"   description="empty slot 6" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty7"   description="empty slot 7" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty8"   description="empty slot 8" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty9"   description="empty slot 9" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty10"   description="empty slot 10" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty11"   description="empty slot 11" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty12"   description="empty slot 12" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty13"   description="empty slot 13" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty14"   description="empty slot 14" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty15"   description="empty slot 15" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty16"   description="empty slot 16" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty17"   description="empty slot 17" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty18"   description="empty slot 18" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty19"   description="empty slot 19" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty20"   description="empty slot 20" type="int" toString="0x%x" visible="false"/>
-		</recordType>
-		<recordType name="SPE_MUTEX_TRYLOCK" description="SPE: try to acquire a mutex lock" id="0x0603"  type="event">
-			<include href="/usr/share/pdt/config/pdt_spe_event_header.xml"/>
-			<physicalField  name="lock" description="Lock address" type="long" toString="0x%x" visible="true"/>
-			<physicalField  name="ret_val" description="Try lock return code" type="int" toString="0x%x" visible="true"/>
-			<physicalField name="empty4"   description="empty slot 4" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty5"   description="empty slot 5" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty6"   description="empty slot 6" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty7"   description="empty slot 7" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty8"   description="empty slot 8" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty9"   description="empty slot 9" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty10"   description="empty slot 10" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty11"   description="empty slot 11" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty12"   description="empty slot 12" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty13"   description="empty slot 13" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty14"   description="empty slot 14" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty15"   description="empty slot 15" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty16"   description="empty slot 16" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty17"   description="empty slot 17" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty18"   description="empty slot 18" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty19"   description="empty slot 19" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty20"   description="empty slot 20" type="int" toString="0x%x" visible="false"/>
-		</recordType>	
-		<recordType name="SPE_MUTEX_UNLOCK" description="SPE: unlock a mutex lock" id="0x0703"  type="event">
-			<include href="/usr/share/pdt/config/pdt_spe_event_header.xml"/>
-			<physicalField  name="lock" description="Lock address" type="long" toString="0x%x" visible="true"/>
-			<physicalField name="empty3"   description="empty slot 3" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty4"   description="empty slot 4" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty5"   description="empty slot 5" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty6"   description="empty slot 6" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty7"   description="empty slot 7" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty8"   description="empty slot 8" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty9"   description="empty slot 9" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty10"   description="empty slot 10" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty11"   description="empty slot 11" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty12"   description="empty slot 12" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty13"   description="empty slot 13" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty14"   description="empty slot 14" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty15"   description="empty slot 15" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty16"   description="empty slot 16" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty17"   description="empty slot 17" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty18"   description="empty slot 18" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty19"   description="empty slot 19" type="int" toString="0x%x" visible="false"/>
-			<physicalField name="empty20"   description="empty slot 20" type="int" toString="0x%x" visible="false"/>
-		</recordType>	
-	</subGroup>
-</pdtGroup>
diff --git a/gcell/ibm/sync/ppu_source/pdt_libsync_config.xml b/gcell/ibm/sync/ppu_source/pdt_libsync_config.xml
deleted file mode 100644
index a0b848d84..000000000
--- a/gcell/ibm/sync/ppu_source/pdt_libsync_config.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<pdt_configuration application_name="libsync" output_dir="." version="3.0">
-	<groups>
-		<group name="GENERAL" description="General event types" id="0x00">
-			<view yStart="0.0" yEnd="0.2" color="0x0000FF"/>
-			<include href="/usr/share/pdt/config/pdt_general.xml"/>
-		</group>
-		<group name="LIBSPE2" description="CBE libspe 2.0 event types" id="0x01">
-			<view yStart="0.2" yEnd="0.4" color="0x00FFFF"/>
-			<include href="/usr/share/pdt/config/pdt_libspe2.xml"/>
-		</group>
-		<group name="MFCIO" description="SPE MFCIO event types" id="0x02">
-			<view yStart="0.4" yEnd="0.6" color="0x00FF80"/>
-			<include href="/usr/share/pdt/config/pdt_mfcio.xml"/>
-		</group>
-		<group name="LIBSYNC" description="General event types" id="0x03">
-			<view yStart="0.6" yEnd="0.8" color="0xFFFF00"/>			
-			<include href="/usr/share/pdt/config/pdt_libsync.xml"/>
-		</group>
-	</groups>
-<configuration name="CBE">
-<host name="none"/>
-<groupsControl>
-	<group name="GENERAL" active="true">		
-		<profile active="false"/>
-		<!--  The GENERAL group of events are always active-->
-	</group> 
-	<group name="LIBSPE2" active="true">
-	</group>
-	<group name="LIBSYNC" active="true">			
-		<sub_group name="PPE_MUTEX" active="true">
-			<event name="PPE_MUTEX_INIT" active="true"/>
-			<event name="PPE_MUTEX_LOCK" active="true"/>
-			<event name="PPE_MUTEX_TRYLOCK" active="true"/>
-			<event name="PPE_MUTEX_UNLOCK" active="true"/>
-		</sub_group>
-	</group>
-</groupsControl>
-</configuration>
-<!-- -->
-<!-- SPEs configuration - this section is read with the CBE configuration -->
-<!-- -->
-<configuration name="SPE">
-<host name="CBE"/>
-<groupsControl>
-	<group name="GENERAL" active="true">			
-		<profile active="false"/>
-		<!--  The GENERAL group of events are always active-->
-	</group>
-	<group name="MFCIO" active="true">
-	</group>
-	<group name="LIBSYNC" active="true">			
-		<sub_group name="SPE_MUTEX" active="true">
-			<event name="SPE_MUTEX_INIT" active="true"/>
-			<event name="SPE_MUTEX_LOCK" active="true"/>
-			<event name="SPE_MUTEX_TRYLOCK" active="true"/>
-			<event name="SPE_MUTEX_UNLOCK" active="true"/>
-		</sub_group>
-	</group>			
-</groupsControl>
-</configuration>
-</pdt_configuration>
diff --git a/gcell/ibm/sync/ppu_source/sync_utils.h b/gcell/ibm/sync/ppu_source/sync_utils.h
deleted file mode 100644
index c7120a3cc..000000000
--- a/gcell/ibm/sync/ppu_source/sync_utils.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _PPU_SYNC_UTILS_H_
-#define _PPU_SYNC_UTILS_H_      1
-
-/* SYNC_ULL_TO_PTR - convert a 64-bit unsigned long long to a void 
- *                   pointer.
- */
-#ifdef __powerpc64__
-
-#define SYNC_ULL_TO_PTR(_ull, _ptr) {		\
-  union {					\
-    void *ptr;					\
-    unsigned long long ull;			\
-  } _x;						\
-						\
-  _x.ull = _ull;				\
-  _ptr = _x.ptr;				\
-}
-
-#else
-
-#define SYNC_ULL_TO_PTR(_ull, _ptr) {		\
-  union {					\
-    void *ptr[2];				\
-    unsigned long long ull;			\
-  } _x;						\
-						\
-  _x.ull = _ull;				\
-  _ptr = _x.ptr[1];				\
-}
-
-#endif
-
-#endif /* _PPU_SYNC_UTILS_H_ */
diff --git a/gcell/ibm/sync/ppu_source/trace_libsync.h b/gcell/ibm/sync/ppu_source/trace_libsync.h
deleted file mode 100644
index 6d6f036e5..000000000
--- a/gcell/ibm/sync/ppu_source/trace_libsync.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2007                                               */
-/* International Business Machines Corporation                     */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef __LIBSYNC_PPU_TRACEHOOKS_H__
-#define __LIBSYNC_PPU_TRACEHOOKS_H__
-
-#ifdef LIBSYNC_TRACE
-
-#include <trace_events.h>
-
-/*
- *  last parameter in the trace_even and trace_interval_entry call is
- *   the stack level to report the PC in the trace record. so 0 means
- *   the PC of the current frame, 1 means the PC of the caller, etc.
- *   there's a dilemma here - these macros are included in the inline
- *   _mutex calls which get called from the (created during build)
- *   mutex functions in the mutex .c files. in that case, the level
- *   should be 1 - we don't want the PC of where in the mutex function
- *   the trace call is happening, we want the PC of whomever is calling
- *   the mutex function.
- *
- *   but.. an app can call the inline functions - it can #include the
- *   appropriate libsync mutex .h files, and call the inlined _mutex
- *   function in their code. in that case, the appropriate level for the
- *   trace calls would be 0 - the user would want to know where in their
- *   code the call to the _mutex function is.
- *
- *   so, we'll assume _LEVEL of 0 which is what the inline funtions need.
- *   when we build the files for libsync, we'll do a -D_LEVEL=1 
- */
-#ifndef _LEVEL
-#define _LEVEL 0
-#endif
-
-
-#define TRACE_EVENT_MUTEX_INIT 0x0003
-
-#define TRACE_MUTEX_INIT(lock) { \
-  trace_payload_t payload; \
-  payload.dword[0]=(uint64_t)lock; \
-  trace_event(TRACE_EVENT_MUTEX_INIT, 1, &payload, "Event=%d, lock=0x%x",_LEVEL); \
-}
-
-#define TRACE_EVENT_MUTEX_LOCK 0x0103
-
-#define TRACE_MUTEX_LOCK_ENTRY(_INTERVAL) \
-trace_interval_p _INTERVAL = trace_interval_entry(TRACE_EVENT_MUTEX_LOCK, _LEVEL)
-
-#define TRACE_MUTEX_LOCK_EXIT(_INTERVAL,lock,miss) { \
-  trace_payload_t payload; \
-  payload.dword[0]=(uint64_t)lock; \
-  payload.word[2]=(uint32_t)miss; \
-  trace_interval_exit(_INTERVAL, 2,  &payload, "Event=%d, lock=0x%x, miss=0x%x"); \
-}
-
-#define TRACE_EVENT_MUTEX_TRYLOCK 0x0203
-
-#define TRACE_MUTEX_TRYLOCK(lock,ret) { \
-  trace_payload_t payload; \
-  payload.dword[0]=(uint64_t)lock; \
-  payload.word[2]=(uint32_t)ret; \
-  trace_event(TRACE_EVENT_MUTEX_TRYLOCK, 2, &payload, "Event=%d, lock=0x%x, ret=0x%x", _LEVEL); \
-}
-
-#define TRACE_EVENT_MUTEX_UNLOCK 0x0303
-
-#define TRACE_MUTEX_UNLOCK(lock) { \
-  trace_payload_t payload; \
-  payload.dword[0]=(uint64_t)lock; \
-  trace_event(TRACE_EVENT_MUTEX_UNLOCK, 1, &payload, "Event=%d, lock=0x%x", _LEVEL); \
-}
-
-#else /* LIBSYNC_TRACE */
-
-#define TRACE_MUTEX_INIT(lock)
-#define TRACE_MUTEX_LOCK_ENTRY(_INTERVAL)
-#define TRACE_MUTEX_LOCK_EXIT(_INTERVAL,lock,miss)
-#define TRACE_MUTEX_TRYLOCK(lock,ret_val)
-#define TRACE_MUTEX_UNLOCK(lock)
-
-#endif /* LIBSYNC_TRACE */
-
-#endif  /* __LIBSYNC_PPU_TRACEHOOKS_H__ */
diff --git a/gcell/ibm/sync/ppu_source/wait_for_completion.h b/gcell/ibm/sync/ppu_source/wait_for_completion.h
deleted file mode 100644
index f2b04275a..000000000
--- a/gcell/ibm/sync/ppu_source/wait_for_completion.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-
-#ifndef _PPU_WAIT_FOR_COMPLETION_H_
-#define _PPU_WAIT_FOR_COMPLETION_H_
-
-#include <ppu_intrinsics.h>
-#include "sync_utils.h"
-#include "completion.h"
-
-
-/**
- * completion_wait - wait until a completion is broadcast.
- * @comp: handle to effective address of completion variable.
- *
- * Description: Wait until another processor or device signals
- * that a completionition is 'true'.  The only restriction here is 
- * that @comp must be a word aligned address.
- *
- * Beware: This function hot polls waiting for completion.
- */
-static __inline void _wait_for_completion(completion_ea_t comp)
-{
-  int val;
-  void *p;
-
-  SYNC_ULL_TO_PTR(comp, p);
-
-  do {
-    val = (int)__lwarx(p);
-    if (val != 1) val = (int)__stwcx(p, (unsigned int)0);
-  } while (val == 0);
-  __isync();
-}
-
-
-#endif /* _PPU_WAIT_FOR_COMPLETION_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic.h b/gcell/ibm/sync/spu_source/atomic.h
deleted file mode 100644
index 951c26e3f..000000000
--- a/gcell/ibm/sync/spu_source/atomic.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-/*
- * atomic.h - SPU atomic SHM counter operations.
- *
- * Interfaces patterned after, and hopefully compatible
- * with PowerPC64-Linux atomic counter operations.  Uses
- * 32b values for various counters.
- */
-#ifndef _SPU_ATOMIC_H_
-#define _SPU_ATOMIC_H_
-
-#include <sync_utils.h>
-#include <spu_mfcio.h>
-
-
-/* atomic_eaddr_t is a 64bit effective address 
- * that points to an atomic_t variable */
-typedef unsigned long long atomic_ea_t;
-
-#define DECL_ATOMIC_VARS()                              \
-    char _tmp[256];                                 	\
-    char *tmp = (char *) ALIGN(_tmp, 128);		\
-    volatile s32 *buf = (volatile s32 *) &tmp[0];       \
-    u32 size = 128, tagid = 0;                          \
-    s32 ret_val;                                	\
-    u32 offset;                                         \
-    addr64 ea64
-
-/* __atomic_op                                              
-*    Internal routine to acquire lock line reservation
-*    then conditionally modify the counter variable 
-*    pointed to by 'v'.  The 'replace' flag indicates 
-*    whether or not this is to be an arithmetic R-M-W
-*    or a simple replace operation.
-*/
-#define ATOMIC_OP(__v, __val, __replace, __final_val)           \
-{                                                               \
-    char __tmp[256];                                            \
-    char *_tmp = (char *) ALIGN(__tmp, 128);		        \
-    volatile s32 *_buf = (volatile s32 *) &_tmp[0];             \
-    u32 _size = 128, _tagid = 0;                                \
-    s32 _status, _ret_val;                                      \
-    u32 _offset;                                                \
-    addr64 _ea64;                                               \
-                                                                \
-    _ea64.ull = ALIGN128_EA(__v);                               \
-    _offset = OFFSET128_EA_U32(__v);                            \
-    do {                                                        \
-	MFC_DMA(_buf, _ea64, _size, _tagid, MFC_GETLLAR_CMD);   \
-        spu_readch (MFC_RdAtomicStat);                          \
-                                                                \
-	_ret_val = _buf[_offset];                                \
-	_buf[_offset] = (__replace) ? __val : _ret_val + __val;    \
-	MFC_DMA(_buf, _ea64, _size, _tagid, MFC_PUTLLC_CMD);    \
-	_status = spu_readch(MFC_RdAtomicStat);                  \
-    } while (_status != 0);                                     \
-                                                                \
-    __final_val = _ret_val;                                     \
-}                                                               
-
-#endif /* _SPU_ATOMIC_H_ */
-
diff --git a/gcell/ibm/sync/spu_source/atomic_add.h b/gcell/ibm/sync/spu_source/atomic_add.h
deleted file mode 100644
index 7606ae05b..000000000
--- a/gcell/ibm/sync/spu_source/atomic_add.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_ADD_H_
-#define _SPU_ATOMIC_ADD_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-/**
- * atomic_add - atomically add to a counter.
- * @v: handle to effective address of counter.
- * @a: value to be added.
- * 
- * Atomically add a value to a counter in system memory. 
- * The only restriction is that @v must be word aligned.
- */
-static __inline void _atomic_add(int a, atomic_ea_t v)
-{
-    int ret_val;
-    ATOMIC_OP (v, a, 0, ret_val);
-}
-
-
-#endif /* _SPU_ATOMIC_ADD_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_add_return.h b/gcell/ibm/sync/spu_source/atomic_add_return.h
deleted file mode 100644
index 35f07adf6..000000000
--- a/gcell/ibm/sync/spu_source/atomic_add_return.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_ADD_RETURN_H_
-#define _SPU_ATOMIC_ADD_RETURN_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-/**
- * atomic_add_return - atomically add to a counter and return previous value.
- * @v: handle to effective address of counter.
- * @a: value to be added.
- *
- * Atomically add a value to a counter in system memory.
- * The only restriction is that @v must be word aligned.
- *
- * This routine implements the "fetch and add" primitive
- * that is described in "Book I PowerPC User Instruction
- * Set Architecture", but uses MFC lock line reservation
- * operations instead of lwarx/stwcx.
- *
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_add_return(int a, atomic_ea_t v)
-{
-    int ret_val;
-    ATOMIC_OP(v, a, 0, ret_val);
-    return ret_val;
-}
-
-
-#endif /* _SPU_ATOMIC_ADD_RETURN_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_dec.h b/gcell/ibm/sync/spu_source/atomic_dec.h
deleted file mode 100644
index 30ca7c514..000000000
--- a/gcell/ibm/sync/spu_source/atomic_dec.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_DEC_H_
-#define _SPU_ATOMIC_DEC_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-/**
- * atomic_dec - atomically decrement a counter.
- * @v: handle to effective address of location to be modified.
- *
- * Atomically decrement a counter in system memory. The only
- * restriction is that @v must be word aligned.
- */
-static __inline void _atomic_dec(atomic_ea_t v)
-{    
-    int ret_val;
-    ATOMIC_OP (v, -1, 0, ret_val);
-}
-
-
-#endif /* _SPU_ATOMIC_DEC_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_dec_and_test.h b/gcell/ibm/sync/spu_source/atomic_dec_and_test.h
deleted file mode 100644
index b3c829820..000000000
--- a/gcell/ibm/sync/spu_source/atomic_dec_and_test.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_DEC_AND_TEST_H_
-#define _SPU_ATOMIC_DEC_AND_TEST_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-/**
- * atomic_dec_and_test - atomically decrement and test if previous==0.
- * @v: handle to effective address of counter.
- *
- * Atomically decrement a counter in system memory and test 
- * if previous==0.  The only restriction is that @v must be 
- * word aligned.
- *
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_dec_and_test(atomic_ea_t v)
-{
-    int ret_val;
-    ATOMIC_OP(v, -1, 0, ret_val);
-    return (ret_val == 0) ? 1 : 0;
-}
-
-#endif /* _SPU_ATOMIC_DEC_AND_TEST_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_dec_if_positive.h b/gcell/ibm/sync/spu_source/atomic_dec_if_positive.h
deleted file mode 100644
index 2a01ec307..000000000
--- a/gcell/ibm/sync/spu_source/atomic_dec_if_positive.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_DEC_IF_POSITIVE_H_
-#define _SPU_ATOMIC_DEC_IF_POSITIVE_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-/**
- * atomic_dec_if_positive - atomically decrement if counter is positive.
- * @v: handle to effective address of counter.
- * 
- * Atomically decrement a counter if its value is positive.
- * The only restriction is that @v must be word aligned.
- *
-*
- * Returns the old value of the counter, minus 1.
- */
-static __inline int _atomic_dec_if_positive(atomic_ea_t v)
-{
-    DECL_ATOMIC_VARS();
-    s32 status;
-
-    ea64.ull = ALIGN128_EA(v);
-    offset = OFFSET128_EA_U32(v);
-    do {
-	MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);
-	spu_readch(MFC_RdAtomicStat);
-
-	ret_val = buf[offset] - 1;
-	if (likely(ret_val >= 0)) {
-	    buf[offset] = ret_val;
-	    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);
-	    status = spu_readch(MFC_RdAtomicStat);
-	} else {
-	    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);
-	    spu_readch(MFC_RdAtomicStat);
-	    status = 0;
-	    break;
-	}
-    } while (status != 0);
-
-    return ret_val;
-}
-
-
-
-#endif /* _SPU_ATOMIC_DEC_IF_POSITIVE_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_dec_return.h b/gcell/ibm/sync/spu_source/atomic_dec_return.h
deleted file mode 100644
index 45effb689..000000000
--- a/gcell/ibm/sync/spu_source/atomic_dec_return.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_DEC_RETURN_H_
-#define _SPU_ATOMIC_DEC_RETURN_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-/**
- * atomic_dec_return - atomically decrement a counter and return previous value.
- * @v: handle to effective address of counter.
- *
- * Atomically decrement a counter in system memory and return its
- * previous value. The only restriction is that @v must be word 
- * aligned.
- *
- * This routine implements the "fetch and decrement"
- * primitive that is described in "Book I PowerPC User
- * Instruction Set Architecture", but uses MFC lock line
- * reservation operations instead of lwarx/stwcx.
- *
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_dec_return(atomic_ea_t v)
-{
-    int ret_val;
-    ATOMIC_OP(v, -1, 0, ret_val);
-    return ret_val;
-}
-
-
-#endif /* _SPU_ATOMIC_DEC_RETURN_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_inc.h b/gcell/ibm/sync/spu_source/atomic_inc.h
deleted file mode 100644
index 6800efea3..000000000
--- a/gcell/ibm/sync/spu_source/atomic_inc.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_INC_H_
-#define _SPU_ATOMIC_INC_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-/**
- * atomic_inc - atomically increment a counter in system memory.
- * @v: handle to effective address of counter.
- *
- * Atomically increment a counter in system memory.
- * The only restriction is that @v must be word aligned.
- */
-static __inline void _atomic_inc(atomic_ea_t v)
-{
-    int ret_val;
-    ATOMIC_OP (v, 1, 0, ret_val);
-}
-
-
-#endif /* _SPU_ATOMIC_INC_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_inc_return.h b/gcell/ibm/sync/spu_source/atomic_inc_return.h
deleted file mode 100644
index 89361a0a1..000000000
--- a/gcell/ibm/sync/spu_source/atomic_inc_return.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_INC_RETURN_H_
-#define _SPU_ATOMIC_INC_RETURN_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-
-/**
- * atomic_inc_return - atomically increment a counter and return previous.
- * @v: handle to effective address of counter.
- *
- * Atomically increment a counter in system memory.
- * The only restriction is that @v must be word aligned.
- *
- * This routine implements the "fetch and increment"
- * primitive that is described in "Book I PowerPC User
- * Instruction Set Architecture", but uses MFC lock line
- * reservation operations instead of lwarx/stwcx.
- *
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_inc_return(atomic_ea_t v)
-{
-    int ret_val;
-    ATOMIC_OP(v, 1, 0, ret_val);
-    return ret_val;
-}
-
-
-#endif /* _SPU_ATOMIC_INC_RETURN_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_read.h b/gcell/ibm/sync/spu_source/atomic_read.h
deleted file mode 100644
index 711a0ad26..000000000
--- a/gcell/ibm/sync/spu_source/atomic_read.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_READ_H_
-#define _SPU_ATOMIC_READ_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-/**
- * atomic_read - read an atomic counter.
- * @v: handle to effective address of counter.
- *
- * Read the current value of an atomic counter.
- */
-static __inline int _atomic_read(atomic_ea_t v)
-{
-    DECL_ATOMIC_VARS();
-
-    /* reserve a tag for use */
-    tagid = mfc_tag_reserve();
-
-    u32 oldtmask, tagmask = 1 << (tagid & 31);
-
-    ea64.ull = ALIGN128_EA(v);
-    offset = OFFSET128_EA_U32(v);
-
-    MFC_DMA(buf, ea64, size, tagid & 31, MFC_GET_CMD);
-    oldtmask = spu_readch(MFC_RdTagMask);
-    spu_writech(MFC_WrTagMask, tagmask);
-    spu_writech(MFC_WrTagUpdate, MFC_TAG_UPDATE_ANY);
-    spu_readch(MFC_RdTagStat);
-    spu_writech(MFC_WrTagMask, oldtmask);
-
-    mfc_tag_release (tagid);
-    ret_val =  buf[offset];
-    return ret_val;
-}
-
-
-#endif /* _SPU_ATOMIC_READ_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_set.h b/gcell/ibm/sync/spu_source/atomic_set.h
deleted file mode 100644
index 261d28a3d..000000000
--- a/gcell/ibm/sync/spu_source/atomic_set.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_SET_H_
-#define _SPU_ATOMIC_SET_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-/**
- * atomic_set - atomically set a counter in system memory.
- * @v: handle to effective address of counter.
- * 
- * Atomically set a counter to a given value. The only 
- * restriction is that @v must be word aligned.
- *
- * This routine implements the "fetch and store" 
- * primitive that is described in "Book I PowerPC User 
- * Instruction Set Architecture", but uses MFC lock line
- * reservation operations instead of lwarx/stwcx. 
- *
- * Returns the previous value from system memory.
- */
-static __inline void _atomic_set(atomic_ea_t v, int val)
-{
-    int ret_val;
-    ATOMIC_OP(v, val, 1, ret_val);
-}
-
-
-#endif /* _SPU_ATOMIC_SET_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_sub.h b/gcell/ibm/sync/spu_source/atomic_sub.h
deleted file mode 100644
index f366e1dee..000000000
--- a/gcell/ibm/sync/spu_source/atomic_sub.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_SUB_H_
-#define _SPU_ATOMIC_SUB_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-/**
- * atomic_sub - atomically subtract from a counter.
- * @v: handle to effective address of counter.
- * @a: value to be subtracted.
- *
- * Atomically subtract a value from a counter in system memory.
- * The only restriction is that @v must be word aligned.
- */
-static __inline void _atomic_sub(int a, atomic_ea_t v)
-{
-    int ret_val;
-
-    ATOMIC_OP (v, -a, 0, ret_val);
-}
-
-
-
-#endif /* _SPU_ATOMIC_SUB_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_sub_and_test.h b/gcell/ibm/sync/spu_source/atomic_sub_and_test.h
deleted file mode 100644
index fe5824a43..000000000
--- a/gcell/ibm/sync/spu_source/atomic_sub_and_test.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_SUB_AND_TEST_H_
-#define _SPU_ATOMIC_SUB_AND_TEST_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-/**
- * atomic_sub_and_test - atomically subtract and test if previous==0.
- * @v: handle to effective address of counter.
- * @a: value to be subtracted.
- *
- * Atomically subtract a value from a counter in system memory
- * and test if previous==0.  The only restriction is that @v 
- * must be word aligned.
- *
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_sub_and_test(int a, atomic_ea_t v)
-{
-    int ret_val;
-    ATOMIC_OP(v, -a, 0, ret_val);
-    return (ret_val == 0) ? 1 : 0;
-}
-
-
-#endif /* _SPU_ATOMIC_SUB_AND_TEST_H_ */
diff --git a/gcell/ibm/sync/spu_source/atomic_sub_return.h b/gcell/ibm/sync/spu_source/atomic_sub_return.h
deleted file mode 100644
index 5dbed5b85..000000000
--- a/gcell/ibm/sync/spu_source/atomic_sub_return.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_ATOMIC_SUB_RETURN_H_
-#define _SPU_ATOMIC_SUB_RETURN_H_
-
-#include <sync_utils.h>
-#include <atomic.h>
-
-
-/**
- * atomic_sub_return - atomically subtract from a counter & return previous.
- * @v: handle to effective address of counter.
- * @a: value to be subtracted.
- *
- * Atomically subtract a value from a counter in system memory.
- * The only restriction is that @v must be word aligned.
- *
- * Returns the previous value from system memory.
- */
-static __inline int _atomic_sub_return(int a, atomic_ea_t v)
-{
-    int ret_val;
-    ATOMIC_OP(v, -a, 0, ret_val);
-    return ret_val;
-    //return __atomic_op(v, -a, 0);
-}
-
-
-
-
-#endif /* _SPU_ATOMIC_SUB_RETURN_H_ */
diff --git a/gcell/ibm/sync/spu_source/complete.h b/gcell/ibm/sync/spu_source/complete.h
deleted file mode 100644
index 6a7808650..000000000
--- a/gcell/ibm/sync/spu_source/complete.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_COMPLETE_H_
-#define _SPU_COMPLETE_H_
-
-#include "sync_utils.h"
-#include <spu_mfcio.h>
-#include "completion.h"
-
-static __inline void _complete(completion_ea_t completion)
-{
-    DECL_COMPLETION_VARS();
-
-    ea64.ull = ALIGN128_EA(completion);
-    offset = OFFSET128_EA_U32(completion);
-    MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);
-    spu_readch(MFC_RdAtomicStat);
-
-    /* set the completionition variable to exactly one so
-     * only one thread can be awaken */
-    buf[offset] = 1;
-    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLUC_CMD);
-    spu_readch(MFC_RdAtomicStat);
-}
-
-
-
-
-#endif /* _SPU_COMPLETE_H_ */
diff --git a/gcell/ibm/sync/spu_source/complete_all.h b/gcell/ibm/sync/spu_source/complete_all.h
deleted file mode 100644
index 5f9c3dcfa..000000000
--- a/gcell/ibm/sync/spu_source/complete_all.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_COMPLETE_ALL_H_
-#define _SPU_COMPLETE_ALL_H_
-
-#include "sync_utils.h"
-#include <spu_mfcio.h>
-#include "completion.h"
-
-/**
- * completion_broadcast - indicate that a completion is true.
- * @completion: handle to effective address of completion variable.
- *
- * Indicate that a completionition is true by storing '1' to the
- * completionition variable.
- */
-static __inline void _complete_all(completion_ea_t completion)
-{
-    DECL_COMPLETION_VARS();
-
-    ea64.ull = ALIGN128_EA(completion);
-    offset = OFFSET128_EA_U32(completion);
-    MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);
-    spu_readch(MFC_RdAtomicStat);
-
-    /* set the completionition variable to the count. So that
-     * all the threads  */
-    buf[offset] = MAX_THREADS_WAITING;
-    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLUC_CMD);
-    spu_readch(MFC_RdAtomicStat);
-}
-
-
-
-
-#endif /* _SPU_COMPLETE_ALL_H_ */
diff --git a/gcell/ibm/sync/spu_source/completion.h b/gcell/ibm/sync/spu_source/completion.h
deleted file mode 100644
index 4a302d25c..000000000
--- a/gcell/ibm/sync/spu_source/completion.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-/*
- * cond.h - simple condition wait & broadcast operations.
- *
- * Interrupt aware versions of the routines are supported.
- * Applications should call either '_irq' or '_irqsave'
- * forms of the functions when interrupts are enabled.
- */
-
-#ifndef __SPU_COMPLETION_H__
-#define __SPU_COMPLETION_H__
-
-#include "sync_utils.h"
-
-#define MAX_THREADS_WAITING   32000 
-typedef unsigned long long completion_ea_t;
-
-
-#define DECL_COMPLETION_VARS()                                \
-    char _tmp[256];                                     \
-    char *tmp = (char *) ALIGN(_tmp, 128);              \
-    volatile s32 *buf = (volatile s32 *) &tmp[0];       \
-    u32 size = 128, tagid = 0;                          \
-    u32 offset;                                         \
-    addr64 ea64
-
-
-
-#endif /* __SPU_COMPLETION_H__ */
diff --git a/gcell/ibm/sync/spu_source/cond.h b/gcell/ibm/sync/spu_source/cond.h
deleted file mode 100644
index ceb3285d9..000000000
--- a/gcell/ibm/sync/spu_source/cond.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_COND_VAR_H_
-#define _SPU_COND_VAR_H_
-
-#include "sync_utils.h"
-typedef struct
-{
-  int num_threads_signal;       /* the number of threads that are going to be waken up.
-                                 There are 3 values possible for this parameter, 0, 1, 
-                                 or num_threads_waiting*/
-  int num_threads_waiting;      /* the number of threads that are waiting to be awaken */ 
-} condition_variable_t __attribute__ ((aligned (128)));  
-
-typedef eaddr_t cond_ea_t;         /* a system memory 64 bit address that points to
-                                 * a valid condition_variable_t */
-
-
-
-
-#define DECL_COND_VARS()                                \
-    char _tmp[256];                                     \
-    char *tmp = (char *) ALIGN(_tmp, 128);              \
-    volatile s32 *buf = (volatile s32 *) &tmp[0];       \
-    u32 size = 128, tagid = 0;                          \
-    s32 status, ret_val;                                \
-    u32 offset;                                         \
-    addr64 ea64;                                        \
-    condition_variable_t cond_var
-
-#endif /* _SPU_COND_VAR_H_ */
diff --git a/gcell/ibm/sync/spu_source/cond_broadcast.h b/gcell/ibm/sync/spu_source/cond_broadcast.h
deleted file mode 100644
index 15a1da330..000000000
--- a/gcell/ibm/sync/spu_source/cond_broadcast.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_COND_BROADCAST_H_
-#define _SPU_COND_BROADCAST_H_
-
-#include "sync_utils.h"
-#include "cond.h"
-#include <spu_mfcio.h>
-
-/**
- * cond_broadcast - indicate that a condition is true.
- * @cond: handle to effective address of condition variable.
- */
-static __inline void _cond_broadcast(cond_ea_t cond)
-{
-    char _tmp[256];                                     
-    char *tmp = (char *) ALIGN(_tmp, 128);              
-    volatile unsigned short *buf = (volatile unsigned short *) &tmp[0];       
-    unsigned int size = 128, tagid = 0;                          
-    u32 offset;                                         
-    addr64 ea64;          
-
-    ea64.ull = ALIGN128_EA(cond);
-    offset = OFFSET128_EA_U16(cond);
-    MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);
-    spu_readch(MFC_RdAtomicStat);
-
-    /* set the condition variable to the count. So that
-     * all the threads  */
-    buf[offset] = buf[offset + 1];
-    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLUC_CMD);
-    spu_readch(MFC_RdAtomicStat);
-}
-
-#endif /* _SPU_COND_BROADCAST_H_ */
diff --git a/gcell/ibm/sync/spu_source/cond_init.h b/gcell/ibm/sync/spu_source/cond_init.h
deleted file mode 100644
index 7202e5352..000000000
--- a/gcell/ibm/sync/spu_source/cond_init.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_COND_INIT_H_
-#define _SPU_COND_INIT_H_
-
-#include "sync_utils.h"
-#include "cond.h"
-#include <spu_mfcio.h>
-
-
-/**
- * cond_init - initialize condition variable.
- * @cond: handle to effective address of condition variable.
- *
- *
- * Conditional Variable - is a synchronization device that allows 
- * SPE and PPE threads to suspend execution and relinquish the 
- * processors until some predicate on shared data is satisfied. 
- * The basic operations on conditions are: signal the condition
- * (when the predicate becomes true), and wait for the condition,
- * suspending the thread execution until anoter thread signals the
- * condition
- *
- * A condition variable must always be associated with a mutex, to
- * avoid the race condition where a thread prepares to wait on a 
- * condition variable and another thread signals the condition just
- * before the first thread actually waits on it.
- *
- * cond_init initializes the condition variable cond. 
- *
- * cond_signal restarts one of the threads that are waiting on the
- * condition variable cond. If no threads are waiting on cond, nothing
- * happens. If several threads are waiting on cond, exactly one
- * is restarted, but it is not specified which
- *
- * cond_broadcast restarts all the threads that are waiting on the 
- * condition variable cond. Nothing happens if no threads are waiting
- * on cond
- *
- * cond_wait atomically unlocks the mutex and waits for the condition
- * variable cond to be signaled. The mutex must be lock locked by 
- * the calling thread on the entrance to cond_wait. Before returning
- * to the calling thread, cond_wait re-acquires mutex. 
- *
- * Only one thread initializes a condition variable. Usually, the 
- * PPE thread initializes a condidtion variable, however, a cond_init
- * function is provided here for completeness
- *
- * Description: Initialize a cond variable to false.
- */
-static __inline void _cond_init(cond_ea_t cond )
-{
-    char _tmp[256];                                     
-    char *tmp = (char *) ALIGN(_tmp, 128);              
-    volatile unsigned short *buf = (volatile unsigned short *) &tmp[0];       
-    unsigned int size = 128, tagid;                          
-    unsigned int offset;           
-    addr64 ea64;
-    unsigned int oldtmask;
-    unsigned int tagmask;    
-
-    tagid = mfc_tag_reserve(); 
-
-    tagmask = 1 << (tagid & 31);
-
-    ea64.ull = ALIGN128_EA(cond);
-    offset = OFFSET128_EA_U16(cond);
-
-    MFC_DMA(buf, ea64, size, tagid & 31, MFC_GET_CMD);
-    oldtmask = spu_readch(MFC_RdTagMask);
-    spu_writech(MFC_WrTagMask, tagmask);
-    spu_writech(MFC_WrTagUpdate, MFC_TAG_UPDATE_ANY);
-    spu_readch(MFC_RdTagStat);
-
-    /* this is still just one word. since buf is of type
-     * short, we fit both counts into one word. */
-    buf[offset] = 0;
-    buf[offset+1] = 0;
-    MFC_DMA(buf, ea64, size, (tagid & 31), MFC_PUT_CMD);
-    spu_writech(MFC_WrTagMask, tagmask);
-    spu_writech(MFC_WrTagUpdate, MFC_TAG_UPDATE_ANY);
-    spu_readch(MFC_RdTagStat);
-    spu_writech(MFC_WrTagMask, oldtmask);
-    mfc_tag_release (tagid);
-}
-
-
-
-#endif /* _SPU_COND_INIT_H_ */
diff --git a/gcell/ibm/sync/spu_source/cond_signal.h b/gcell/ibm/sync/spu_source/cond_signal.h
deleted file mode 100644
index a035d2875..000000000
--- a/gcell/ibm/sync/spu_source/cond_signal.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_COND_SIGNAL_H_
-#define _SPU_COND_SIGNAL_H_
-#include <stdio.h>
-#include "sync_utils.h"
-#include "cond.h"
-#include "atomic.h"
-#include <spu_mfcio.h>
-
-/*
- * _cond_signal: signalling any of the waiting threads to wake up.
- */ 
-static __inline void _cond_signal(cond_ea_t cond)
-{
-    char _tmp[256];                                     
-    char *tmp = (char *) ALIGN(_tmp, 128);              
-    volatile unsigned short *buf = (volatile unsigned short *) &tmp[0];       
-    unsigned int size = 128, tagid = 0;                          
-    u32 offset;                                         
-    addr64 ea64;                                      
-    int status;
-
-    ea64.ull = ALIGN128_EA(cond);
-    offset = OFFSET128_EA_U16(cond);
-
-    do {
-      MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);
-      (void)spu_readch(MFC_RdAtomicStat);
-
-      /* Check for waiting threads.
-       */
-      if (buf[offset] != buf[offset+1]) {
-	/* Increment the signaled count to release the next waiting
-	 * thread.
-	 */
-	buf[offset]++;
-
-	MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);
-	status = spu_readch(MFC_RdAtomicStat);
-      } else {
-	/* Nobody is waiting, do nothing.
-	 */
-	status = 0;
-      }
-    } while (status);
-}
-
-
-#endif /* _SPU_COND_SIGNAL_H_ */
diff --git a/gcell/ibm/sync/spu_source/cond_wait.h b/gcell/ibm/sync/spu_source/cond_wait.h
deleted file mode 100644
index cf4b880f5..000000000
--- a/gcell/ibm/sync/spu_source/cond_wait.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_COND_WAIT_H_
-#define _SPU_COND_WAIT_H_
-#include <stdio.h>
-#include "sync_irq.h"
-#include "sync_utils.h"
-#include "mutex_lock.h"
-#include "mutex_unlock.h"
-#include "cond.h"
-#include <spu_mfcio.h>
-
-static __inline void _cond_wait (cond_ea_t cond, mutex_ea_t  mutex)
-{
-    char _tmp[256];                                     
-    char *tmp = (char *) ALIGN(_tmp, 128);              
-    volatile signed short *buf = (volatile signed short *) &tmp[0];       
-    unsigned int size = 128, tagid = 0;                          
-    int status;                                
-    unsigned int offset;                                         
-    addr64 ea64;  
-    signed short delta, cur_delta, signaled_cnt;
-
-    ea64.ull = ALIGN128_EA(cond);
-    offset = OFFSET128_EA_U16(cond);
-
-    /* increment the waiting halfword of the condition variable.
-     */
-    do {
-      MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);
-      (void)spu_readch(MFC_RdAtomicStat);
-
-      buf[offset+1]++;
-      
-      MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);
-      status = spu_readch(MFC_RdAtomicStat); 
-    } while (status);
-
-    _mutex_unlock(mutex);
-
-    /* keep track of the change in count needed to be signaled. This 
-     * is delta.
-     */
-    signaled_cnt = buf[offset];
-    delta = buf[offset+1] - signaled_cnt;
-    if (delta < 0) delta = -delta;
-
-    while (1) {
-      MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);
-      (void)spu_readch(MFC_RdAtomicStat);
-
-      cur_delta = buf[offset] - signaled_cnt;
-      if (cur_delta < 0) cur_delta = -cur_delta;
-
-
-      if (cur_delta >= delta) {
-	/* the counts indicate that this thread has been signaled.
-	 */
-	break;
-      } 
-    } 
-    _mutex_lock (mutex);
-}
-
-#endif /* _SPU_COND_WAIT_H_ */
diff --git a/gcell/ibm/sync/spu_source/init_completion.h b/gcell/ibm/sync/spu_source/init_completion.h
deleted file mode 100644
index bf93e72af..000000000
--- a/gcell/ibm/sync/spu_source/init_completion.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_INIT_COMPLETION_H_
-#define _SPU_INIT_COMPLETION_H_
-
-#include "sync_utils.h"
-#include <spu_mfcio.h>
-#include "completion.h"
-
-/**
- * completion_init - initialize completion variable.
- * @completion: handle to effective address of completion variable.
- *
- * Description: Initialize a completion variable to false.
- */
-static __inline void _init_completion(completion_ea_t completion)
-{
-    DECL_COMPLETION_VARS();
-    u32 oldtmask, tagmask;
-   
-    tagid = mfc_tag_reserve();
-    tagmask = 1 << (tagid & 31);
-
-    ea64.ull = ALIGN128_EA(completion);
-    offset = OFFSET128_EA_U32(completion);
-
-    MFC_DMA(buf, ea64, size, tagid & 31, MFC_GET_CMD);
-    oldtmask = spu_readch(MFC_RdTagMask);
-    spu_writech(MFC_WrTagMask, tagmask);
-    spu_writech(MFC_WrTagUpdate, MFC_TAG_UPDATE_ANY);
-    spu_readch(MFC_RdTagStat);
-
-    buf[offset] = 0;
-    MFC_DMA(buf, ea64, size, tagid & 31, MFC_PUT_CMD);
-    spu_writech(MFC_WrTagMask, tagmask);
-    spu_writech(MFC_WrTagUpdate, MFC_TAG_UPDATE_ANY);
-    spu_readch(MFC_RdTagStat);
-    spu_writech(MFC_WrTagMask, oldtmask);
-    mfc_tag_release(tagid);
-}
-
-
-
-#endif /* _SPU_INIT_COMPLETION_H_ */
diff --git a/gcell/ibm/sync/spu_source/libsync.h b/gcell/ibm/sync/spu_source/libsync.h
deleted file mode 100644
index 48cc722bd..000000000
--- a/gcell/ibm/sync/spu_source/libsync.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_LIB_SYNC_H_
-#define _SPU_LIB_SYNC_H_
-#include "sync_utils.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef unsigned long long atomic_ea_t;
-
-extern void atomic_set(atomic_ea_t v, int val);
-extern void atomic_add(int a, atomic_ea_t v);
-extern void atomic_sub(int a, atomic_ea_t v);
-extern void atomic_inc(atomic_ea_t v);
-extern void atomic_dec(atomic_ea_t v);
-
-extern int atomic_read(atomic_ea_t v);
-extern int atomic_add_return(int a, atomic_ea_t v);
-extern int atomic_sub_return(int a, atomic_ea_t v);
-extern int atomic_inc_return(atomic_ea_t v);
-extern int atomic_dec_return(atomic_ea_t v);
-extern int atomic_sub_and_test(int a, atomic_ea_t v);
-extern int atomic_dec_and_test(atomic_ea_t v);
-extern int atomic_dec_if_positive(atomic_ea_t v);
-
-typedef unsigned long long mutex_ea_t;
-
-extern void mutex_init(mutex_ea_t lock);
-extern void mutex_lock(mutex_ea_t lock);
-extern int mutex_trylock(mutex_ea_t ea);
-extern void mutex_unlock(mutex_ea_t lock);
-
-
-typedef struct
-{
-  int num_threads_signal;       /* the number of threads that are going to be waken up.
-				 * There are 3 values possible for this parameter, 0, 1, 
-                                 * or num_threads_waiting
-				 */
-  int num_threads_waiting;      /* the number of threads that are waiting to be awaken 
-				 */ 
-} condition_variable_t __attribute__ ((aligned (128)));  
-
-typedef eaddr_t cond_ea_t;	/* a system memory 64 bit address that points to
-				 * a valid condition_variable_t 
-				 */
-
-
-extern void cond_init (cond_ea_t  cond);
-extern void cond_signal (cond_ea_t cond);
-extern void cond_broadcast (cond_ea_t cond);
-extern void cond_wait (cond_ea_t cond, mutex_ea_t  mutex);
-
-typedef unsigned long long completion_ea_t;
-
-extern void init_completion(completion_ea_t completion);
-extern void wait_for_completion(completion_ea_t completion);
-extern void complete(completion_ea_t completion);
-extern void complete_all(completion_ea_t completion);
-
-#ifdef __SPU__
-  /* Function only implemented for the SPU
-   */
-  extern void read_lock(eaddr_t ea);
-  extern void read_unlock(eaddr_t ea);
-  extern int  read_trylock(eaddr_t ea);
-  extern void write_lock(eaddr_t ea);
-  extern void write_unlock(eaddr_t ea);
-  extern int  write_trylock(eaddr_t ea);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SPU_LIB_SYNC_H_ */
diff --git a/gcell/ibm/sync/spu_source/mutex.h b/gcell/ibm/sync/spu_source/mutex.h
deleted file mode 100644
index 37f2b4d62..000000000
--- a/gcell/ibm/sync/spu_source/mutex.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_MUTEX_H_
-#define _SPU_MUTEX_H_           1
-
-#include "sync_utils.h"
-#include "sync_irq.h"
-#include <spu_mfcio.h>
-
-typedef eaddr_t mutex_ea_t;
-
-#define DECL_MUTEX_VARS()                               \
-    char _tmp[256];                                     \
-    char *tmp = (char *) ALIGN(_tmp, 128);              \
-    volatile s32 *buf = (volatile s32 *) &tmp[0];       \
-    u32 size = 128, tagid = 0;                          \
-    u32 offset;                                         \
-    addr64 ea64
-
-/* RAW_TEST_AND_SET
- *    Macro implementing the test and set primitive.
- *
- *    RAW_TEST_AND_SET(==, 1)	used by spin_try_lock()
- *    RAW_TEST_AND_SET(>=, 1)	used by read_try_lock()
- *    RAW_TEST_AND_SET(==, -1)	used by write_try_lock()
- */
-#define RAW_TEST_AND_SET(_RELOP_, _val)				\
-    ea64.ull = ALIGN128_EA(ea);					\
-    offset = OFFSET128_EA_U32(ea);				\
-    do {							\
-        MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);	\
-        spu_readch(MFC_RdAtomicStat);				\
-        SET_HIT;						\
-        if (likely(buf[offset] _RELOP_ 0)) {			\
-            buf[offset] += _val;				\
-	    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);	\
-            status = spu_readch(MFC_RdAtomicStat);		\
-            ret_val = 1;					\
-        } else {						\
-	    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);	\
-            spu_readch(MFC_RdAtomicStat);			\
-            status = ret_val = 0;				\
-            break;						\
-        }							\
-    } while (status != 0)
-
-/* RAW_SPINLOCK
- *    Macro implementing the spinlock primitive.
- *
- *    RAW_SPINLOCK(==, 1)	used by spin_lock()
- *    RAW_SPINLOCK(>=, 1)	used by read_lock()
- *    RAW_SPINLOCK(==, -1)	used by write_lock()
- */
-
-
-#define RAW_SPINLOCK(_RELOP_, _val) 				\
-    ea64.ull = ALIGN128_EA(ea);					\
-    offset = OFFSET128_EA_U32(ea);				\
-    do {							\
-        MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);	\
-        spu_readch(MFC_RdAtomicStat);				\
-        SET_HIT;						\
-        status = 1;						\
-        if (likely(buf[offset] _RELOP_ 0)) {			\
-            buf[offset] += _val;				\
-	    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);	\
-            status = spu_readch(MFC_RdAtomicStat);		\
-        }							\
-    } while (status != 0);
-
-
-static inline void _lock_init(eaddr_t ea)
-{
-    DECL_MUTEX_VARS();
-    u32 oldtmask, tagmask;
-  
-    tagid = mfc_tag_reserve(); 
-   
-    tagmask = 1 << (tagid & 31);
-
-    /* __lock_init
-     *    Internal routine to initialize a spinlock or
-     *    reader/writer lock.
-     */
-    ea64.ull = ALIGN128_EA(ea);
-    offset = OFFSET128_EA_U32(ea);
-    MFC_DMA(buf, ea64, size, tagid & 31, MFC_GET_CMD);
-    oldtmask = spu_readch(MFC_RdTagMask);
-    spu_writech(MFC_WrTagMask, tagmask);
-    spu_writech(MFC_WrTagUpdate, MFC_TAG_UPDATE_ANY);
-    spu_readch(MFC_RdTagStat);
-
-    buf[offset] = 0;
-    MFC_DMA(buf, ea64, size, tagid & 31, MFC_PUT_CMD);
-    spu_writech(MFC_WrTagMask, tagmask);
-    spu_writech(MFC_WrTagUpdate, MFC_TAG_UPDATE_ANY);
-    spu_readch(MFC_RdTagStat);
-    spu_writech(MFC_WrTagMask, oldtmask);
-    mfc_tag_release(tagid);
-}
-
-static inline void _spin_lock(eaddr_t ea)
-{
-    DECL_MUTEX_VARS();
-    s32 status;
-
-    /* _spin_lock
-     *    Internal routine to acquire spinlock.
-     */
-/* non trace - no hit/miss indicator */
-#define SET_HIT
-    RAW_SPINLOCK(==, 1);
-}
-
-#ifdef LIBSYNC_TRACE
-static inline s32 _spin_lock_trace(eaddr_t ea)
-{
-    DECL_MUTEX_VARS();
-    s32 status = 0;
-/* trace - need hit/miss indicator */
-#undef SET_HIT
-#define SET_HIT	if (status == 0) hit = buf[offset]
-    s32 hit;
-
-    hit = 0;
-    /* _spin_lock_trace for trace
-     *    Internal routine to acquire spinlock.
-     */
-    RAW_SPINLOCK(==, 1);
-
-    return hit;
-
-#undef SET_HIT
-#define SET_HIT
-}
-
-#endif /* LIBSYNC_TRACE */
-
-
-#endif /* SPU_MUTEX_H */
diff --git a/gcell/ibm/sync/spu_source/mutex_init.h b/gcell/ibm/sync/spu_source/mutex_init.h
deleted file mode 100644
index 9bddb1456..000000000
--- a/gcell/ibm/sync/spu_source/mutex_init.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_MUTEX_INIT_H_
-#define _SPU_MUTEX_INIT_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-#include "trace_libsync.h"
-
-/***************************************************************************/
-/**
- * mutex_init - initialize the mutex by setting the value 
- * to 0.
- * @lock: handle to effective address of lock variable.
- *
- * Description: Initialize a mutex.
- */
-static __inline void _mutex_init(mutex_ea_t lock)
-{
-   _lock_init(lock);
-
-   TRACE_MUTEX_INIT(lock);
-}
-
-
-#endif /* _SPU_MUTEX_INIT_H_ */
diff --git a/gcell/ibm/sync/spu_source/mutex_lock.h b/gcell/ibm/sync/spu_source/mutex_lock.h
deleted file mode 100644
index 63bdbc36a..000000000
--- a/gcell/ibm/sync/spu_source/mutex_lock.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_MUTEX_LOCK_H_
-#define _SPU_MUTEX_LOCK_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-#include "trace_libsync.h"
-
-static __inline void _mutex_lock(mutex_ea_t ea)
-{
-
-#ifdef LIBSYNC_TRACE
-   s32 miss = 0;
-
-   TRACE_MUTEX_LOCK_ENTRY(interval);
-   miss = _spin_lock_trace(ea);
-   TRACE_MUTEX_LOCK_EXIT(interval, ea, miss);
-
-#else /* LIBSYNC_TRACE */
-
-   _spin_lock(ea);
-
-#endif /* LIBSYNC_TRACE */
-
-}
-
-#endif /* _SPU_MUTEX_LOCK_H_ */
diff --git a/gcell/ibm/sync/spu_source/mutex_trylock.h b/gcell/ibm/sync/spu_source/mutex_trylock.h
deleted file mode 100644
index 3c8df4662..000000000
--- a/gcell/ibm/sync/spu_source/mutex_trylock.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_MUTEX_TRYLOCK_H_
-#define _SPU_MUTEX_TRYLOCK_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-#include "trace_libsync.h"
-
-/**
- * mutex_trylock - acquire a lock, or return immediately.
- * @ea: handle to effective address of lock variable.
- *
- * Description: Acquire a lock, or return immediately 
- * without polling for availability.
- *
- * Context: The application should not call this interface 
- * from a tight loop!!  Use spin_lock() instead.
- */
-static __inline int _mutex_trylock(mutex_ea_t ea)
-{
-    DECL_MUTEX_VARS();
-    s32 status, ret_val;
-
-    RAW_TEST_AND_SET(==, 1);
-
-    TRACE_MUTEX_TRYLOCK(ea, ret_val);
-
-    return ret_val;
-}
-
-#endif /* _SPU_MUTEX_TRYLOCK_H_ */
diff --git a/gcell/ibm/sync/spu_source/mutex_unlock.h b/gcell/ibm/sync/spu_source/mutex_unlock.h
deleted file mode 100644
index 87d6bbaef..000000000
--- a/gcell/ibm/sync/spu_source/mutex_unlock.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_MUTEX_UNLOCK_H_
-#define _SPU_MUTEX_UNLOCK_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-#include "atomic.h"
-#include "trace_libsync.h"
-
-static __inline void _mutex_unlock(mutex_ea_t ea)
-{
-    int ret_val;
-
-    ATOMIC_OP((atomic_ea_t)ea, 0, 1, ret_val);
-
-    TRACE_MUTEX_UNLOCK(ea);
-}
-
-
-#endif /* _SPU_MUTEX_UNLOCK_H_ */
diff --git a/gcell/ibm/sync/spu_source/read_lock.h b/gcell/ibm/sync/spu_source/read_lock.h
deleted file mode 100644
index 0e1d97182..000000000
--- a/gcell/ibm/sync/spu_source/read_lock.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_READ_LOCK_H_
-#define _SPU_READ_LOCK_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-
-/**
- * read_lock - acquire reader lock, or spin until available.
- * @ea: handle to effective address of lock variable.
- *
- * Description: Acquire a non-exclusive reader lock, or spin 
- * until available.  The only restriction here is that @ea
- * must be word aligned.
- *
- * Context: This routine should not be called if SPU 
- * asynchronous interrupts are enabled.
- */
-static __inline void _read_lock(eaddr_t ea)
-{
-    DECL_MUTEX_VARS();
-    s32 status;
-
-    RAW_SPINLOCK(>=, 1);
-}
-
-#endif /* _SPU_READ_LOCK_H_ */
diff --git a/gcell/ibm/sync/spu_source/read_trylock.h b/gcell/ibm/sync/spu_source/read_trylock.h
deleted file mode 100644
index d03278351..000000000
--- a/gcell/ibm/sync/spu_source/read_trylock.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_READ_TRYLOCK_H_
-#define _SPU_READ_TRYLOCK_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-
-/**
- * read_trylock - acquire a reader lock, or return immediately.
- * @ea: handle to effective address of lock variable.
- *
- * Acquire a non-exclusive reader lock, or return
- * immediately.  The only restriction here is that
- * @ea must be word aligned.
- *
- * Returns 1 on success, or 0 on failure.
- *
- * Context: The application should not call this interface 
- * from a tight loop!!  Use read_lock() instead.
- */
-static __inline int _read_trylock(eaddr_t ea)
-{
-    DECL_MUTEX_VARS();
-    s32 status, ret_val;
-
-    RAW_TEST_AND_SET(>=, 1);
-
-    return ret_val;
-}
-
-
-#endif /* _SPU_READ_TRYLOCK_H_ */
diff --git a/gcell/ibm/sync/spu_source/read_unlock.h b/gcell/ibm/sync/spu_source/read_unlock.h
deleted file mode 100644
index f011550e5..000000000
--- a/gcell/ibm/sync/spu_source/read_unlock.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_READ_UNLOCK_H_
-#define _SPU_READ_UNLOCK_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-#include <spu_mfcio.h>
-
-
-/**
- * read_unlock - release reader lock.
- * @ea: handle to effective address of lock variable.
- * 
- * Description: Release a reader lock.  The only restriction 
- * here is that @ea must be word aligned.
- *
- * Context: This routine should be used when interrupts
- * do not need to be re-enabled --either because interrupts
- * are not being used, or because the application will take
- * steps to re-enable them later.
- */
-static __inline void _read_unlock(eaddr_t ea)
-{
-    DECL_MUTEX_VARS();
-    s32 status;
-
-    /* _read_unlock
-     *
-     *    Reader locks must use PUTLLC when releasing, instead of
-     *    the more traditional PUTLLUC because of the non-exclusive
-     *    nature of the lock.  The reason for this is that other
-     *    readers may have incremented the counter, and we don't
-     *    want to corrupt it by blindly issuing PUTLLUC!!
-     */
-    ea64.ull = ALIGN128_EA(ea);
-    offset = OFFSET128_EA_U32(ea);
-    do {
-        MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);
-        spu_readch(MFC_RdAtomicStat);
-
-        buf[offset] -= 1;
-        MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);
-        status = spu_readch(MFC_RdAtomicStat);
-    } while (status != 0);
-
-}
-
-
-#endif /* _SPU_READ_UNLOCK_H_ */
diff --git a/gcell/ibm/sync/spu_source/rwlock_init.h b/gcell/ibm/sync/spu_source/rwlock_init.h
deleted file mode 100644
index 6b05533bb..000000000
--- a/gcell/ibm/sync/spu_source/rwlock_init.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_RWLOCK_INIT_H_
-#define _SPU_RWLOCK_INIT_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-
-/**
- * rwlock_init - initialize a reader/writer lock.
- * @ea: handle to effective address of lock variable.
- *
- * Description: Initialize a reader/writer lock.
- */
-static __inline void _rwlock_init(eaddr_t rwlock)
-{
-    _lock_init(rwlock);
-}
-
-
-
-#endif /* _SPU_RWLOCK_INIT_H_ */
diff --git a/gcell/ibm/sync/spu_source/sync_irq.h b/gcell/ibm/sync/spu_source/sync_irq.h
deleted file mode 100644
index feae65e50..000000000
--- a/gcell/ibm/sync/spu_source/sync_irq.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-/*
- * irq.h - SPU interrupt management facilities.
- * 
- * These utilities help an "interrupt aware" library to manage
- * state of SPU interrupts.  
- */
-
-#ifndef __SPU_IRQ_H__
-#define __SPU_IRQ_H__
-
-#include <spu_intrinsics.h>
-#include "sync_utils.h"
-
-static inline u32 irq_mask(u32 newmask)
-{
-    u32 old, tmp = 0;
-
-    /* irq_mask
-     *    Set the interrupt mask to the newmask value,
-     *    and return its previous setting.  Will
-     *    detect and discard potential phantom
-     *    events.
-     */
-
-    old = spu_readch(SPU_RdEventMask);
-    spu_writech(SPU_WrEventMask, tmp);
-    if (spu_readchcnt(SPU_RdEventStat)) {
-        tmp = spu_readch(SPU_RdEventStat);
-        spu_writech(SPU_WrEventAck, tmp);
-    }
-    spu_writech(SPU_WrEventMask, newmask);
-
-    return old;
-}
-
-#endif /* __SPU_IRQ_H__ */
diff --git a/gcell/ibm/sync/spu_source/sync_utils.h b/gcell/ibm/sync/spu_source/sync_utils.h
deleted file mode 100644
index 516b41f74..000000000
--- a/gcell/ibm/sync/spu_source/sync_utils.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-/*
- * sync_utils.h - SPU sync-library internal utilities.
- *
- * These utilities are used internally by the SPU sync library.
- */
-#ifndef __SPU_SYNC_UTILS_H__
-#define __SPU_SYNC_UTILS_H__
-
-#include <spu_intrinsics.h>
-
-typedef unsigned int u32;
-typedef signed int s32;
-typedef unsigned long long u64;
-typedef unsigned long long eaddr_t;
-
-
-typedef union {
-    u64 ull;  
-    u32 ui[2];
-} addr64;
-
-#ifndef likely
-#define likely(_c)     \
-    __builtin_expect((_c), 1)
-#define unlikely(_c)    \
-    __builtin_expect((_c), 0)
-#endif
-
-#define ALLOCA(_nbytes, _size)    \
-    alloca((_nbytes) + (_size)-1)
-
-#define ALIGN(_ptr, _size)       \
-    ((((u32) _ptr) + (_size)-1) & ~((_size)-1))
-
-#define ALIGN128_EA(_ull)	\
-    ((_ull) & ~(127ULL))
-/*
-#define OFFSET128_EA(_ull, _type) \
-    (((_ull) & 127ULL) / sizeof(_type))
-    */
-
-#define OFFSET128_EA_U32(_ull) \
-    (((_ull) & 127ULL) >> 2)
-
-#define OFFSET128_EA_U16(_ull) \
-    (((_ull) & 127ULL) >> 1)
-
-#define MFC_DMA(_ls, _ea, _sz, _tg, _cmd) \
-    spu_mfcdma64(_ls, _ea.ui[0], _ea.ui[1], _sz, _tg, _cmd)
-
-#define MFC_SYNC() {				\
-    u32 _tagid = 0;				\
-    spu_writech(mfc_tag_id, _tagid);		\
-    spu_writech(mfc_cmd_queue, MFC_SYNC_CMD);	\
-}
-
-#define MFC_EIEIO() {				\
-    u32 _tagid = 0;				\
-    spu_writech(mfc_tag_id, _tagid);		\
-    spu_writech(mfc_cmd_queue, MFC_EIEIO_CMD);	\
-}
-
-#endif /* __SPU_SYNC_UTILS_H__ */
diff --git a/gcell/ibm/sync/spu_source/trace_libsync.h b/gcell/ibm/sync/spu_source/trace_libsync.h
deleted file mode 100644
index 47887c9dc..000000000
--- a/gcell/ibm/sync/spu_source/trace_libsync.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2007                                               */
-/* International Business Machines Corporation                     */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef __LIBSYNC_SPU_TRACEHOOKS_H__
-#define __LIBSYNC_SPU_TRACEHOOKS_H__
-
-#ifdef LIBSYNC_TRACE
-
-#include <trace_events.h>
-
-/*
- *  last parameter in the trace_even and trace_interval_entry call is
- *   the stack level to report the PC in the trace record. so 0 means
- *   the PC of the current frame, 1 means the PC of the caller, etc.
- *   there's a dilemma here - these macros are included in the inline
- *   _mutex calls which get called from the (created during build)
- *   mutex functions in the mutex .c files. in that case, the level
- *   should be 1 - we don't want the PC of where in the mutex function
- *   the trace call is happening, we want the PC of whomever is calling
- *   the mutex function.
- *
- *   but.. an app can call the inline functions - it can #include the
- *   appropriate libsync mutex .h files, and call the inlined _mutex
- *   function in their code. in that case, the appropriate level for the
- *   trace calls would be 0 - the user would want to know where in their
- *   code the call to the _mutex function is.
- *
- *   so, we'll assume _LEVEL of 0 which is what the inline funtions need.
- *   when we build the files for libsync, we'll do a -D_LEVEL=1 
- */
-#ifndef _LEVEL
-#define _LEVEL 0
-#endif
-
-
-#define TRACE_EVENT_MUTEX_INIT 0x0403
-
-#define TRACE_MUTEX_INIT(lock) { \
-  trace_payload_t payload; \
-  payload.dword[0]=(unsigned long)lock; \
-  trace_event(TRACE_EVENT_MUTEX_INIT, 1, &payload, "Event=%d, lock=0x%x", _LEVEL); \
-}
-
-#define TRACE_EVENT_MUTEX_LOCK 0x0503
-
-#define TRACE_MUTEX_LOCK_ENTRY(_INTERVAL) \
-trace_interval_p _INTERVAL = trace_interval_entry(TRACE_EVENT_MUTEX_LOCK, _LEVEL)
-
-#define TRACE_MUTEX_LOCK_EXIT(_INTERVAL,lock,miss) { \
-  trace_payload_t payload; \
-  payload.dword[0]=(unsigned long)lock; \
-  payload.word[2]=(unsigned int)miss; \
-  trace_interval_exit(_INTERVAL, 2,  &payload, "Event=%d, lock=0x%x, miss=0x%x"); \
-}
-
-#define TRACE_EVENT_MUTEX_TRYLOCK 0x0603
-
-#define TRACE_MUTEX_TRYLOCK(lock,ret_val) { \
-  trace_payload_t payload; \
-  payload.dword[0]=(unsigned long)lock; \
-  payload.word[2]=(unsigned int)ret_val; \
-  trace_event(TRACE_EVENT_MUTEX_TRYLOCK, 2, &payload, "Event=%d, lock=0x%x, ret_val=0x%x", _LEVEL); \
-}
-
-#define TRACE_EVENT_MUTEX_UNLOCK 0x0703
-
-#define TRACE_MUTEX_UNLOCK(lock) { \
-  trace_payload_t payload; \
-  payload.dword[0]=(unsigned long)lock; \
-  trace_event(TRACE_EVENT_MUTEX_UNLOCK, 1, &payload, "Event=%d, lock=0x%x", _LEVEL); \
-}
-
-#else /* LIBSYNC_TRACE */
-
-#define TRACE_MUTEX_INIT(lock) 
-#define TRACE_MUTEX_LOCK_ENTRY(_INTERVAL) 
-#define TRACE_MUTEX_LOCK_EXIT(_INTERVAL,lock,miss)
-#define TRACE_MUTEX_TRYLOCK(lock,ret_val)
-#define TRACE_MUTEX_UNLOCK(lock) 
-
-#endif /* LIBSYNC_TRACE */
-
-#endif  /* __LIBSYNC_SPU_TRACEHOOKS_H__ */
diff --git a/gcell/ibm/sync/spu_source/wait_for_completion.h b/gcell/ibm/sync/spu_source/wait_for_completion.h
deleted file mode 100644
index ea7bdbe6d..000000000
--- a/gcell/ibm/sync/spu_source/wait_for_completion.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_WAIT_FOR_COMPLETION_H_
-#define _SPU_WAIT_FOR_COMPLETION_H_
-
-#include "sync_utils.h"
-#include <spu_mfcio.h>
-#include "sync_irq.h"
-#include "completion.h"
-
-/* _wait_for_completion 
- *    Internal routine to wait for completion to
- *    become true (!0).  When completion is false,
- *    uses lock line reservation lost event to 
- *    sleep until the variable has been changed.
- */
-static __inline void _wait_for_completion(completion_ea_t completion)
-{
-    DECL_COMPLETION_VARS();
-    s32 status;
-
-    status = 1;
-
-    ea64.ull = ALIGN128_EA(completion);
-    offset = OFFSET128_EA_U32(completion);
-    do {
-        MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);
-        spu_readch(MFC_RdAtomicStat);
-        /* if the completion variable has been set elsewhere
-         * (a signal or broadcast function has been called 
-         * then we get out of the loop, and reset the variable */
-        if (likely(buf[offset] != 0)) {
-            /* decrement the variable */
-            buf[offset]--;
-            MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLC_CMD);
-            spu_readch(MFC_RdAtomicStat);
-            status = 0;
-        }
-    } while (status != 0);
-}
-
-
-
-#endif /* _SPU_WAIT_FOR_COMPLETION_H_ */
diff --git a/gcell/ibm/sync/spu_source/write_lock.h b/gcell/ibm/sync/spu_source/write_lock.h
deleted file mode 100644
index 7af5175f0..000000000
--- a/gcell/ibm/sync/spu_source/write_lock.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_WRITE_LOCK_H_
-#define _SPU_WRITE_LOCK_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-
-/**
- * write_lock - acquire writer lock, or spin until available.
- * @ea: handle to effective address of lock variable.
- *
- * Description: Acquire an exclusive writer lock, 
- * or spin until available.  The only restriction 
- * here is that @ea must be word aligned.
- *
- * Context: This routine should not be called if SPU 
- * asynchronous interrupts are enabled.
- */
-static __inline void _write_lock(eaddr_t ea)
-{
-    DECL_MUTEX_VARS();
-    s32 status;
-
-    RAW_SPINLOCK(==, -1);
-}
-
-
-#endif /* _SPU_WRITE_LOCK_H_ */
diff --git a/gcell/ibm/sync/spu_source/write_trylock.h b/gcell/ibm/sync/spu_source/write_trylock.h
deleted file mode 100644
index b3799b37e..000000000
--- a/gcell/ibm/sync/spu_source/write_trylock.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_WRITE_TRYLOCK_H_
-#define _SPU_WRITE_TRYLOCK_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-
-/**
- * write_trylock - acquire a writer lock, or return immediately.
- * @ea: handle to effective address of lock variable.
- *
- * Try to acquire an exclusive writer lock, or return
- * immediately.  The only restriction here is that @ea
- * must be word aligned.
- *
- * Returns 1 on success, or 0 on failure.
- *
- * Caution:
- * The application should not call this interface from a tight
- * loop!!  Use write_lock() instead.
- */
-static __inline int _write_trylock(eaddr_t ea)
-{
-    DECL_MUTEX_VARS();
-    s32 status, ret_val;
-
-    RAW_TEST_AND_SET(==, -1);
-
-    return ret_val;
-}
-
-
-#endif /* _SPU_WRITE_TRYLOCK_H_ */
diff --git a/gcell/ibm/sync/spu_source/write_unlock.h b/gcell/ibm/sync/spu_source/write_unlock.h
deleted file mode 100644
index 25b24e181..000000000
--- a/gcell/ibm/sync/spu_source/write_unlock.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _SPU_WRITE_UNLOCK_H_
-#define _SPU_WRITE_UNLOCK_H_
-
-#include "sync_utils.h"
-#include "mutex.h"
-#include <spu_mfcio.h>
-
-/**
- * write_unlock - release writer lock.
- * @rwlock: handle to effective address of lock variable.
- *
- * Release a single writer lock.
- */
-static __inline void _write_unlock(eaddr_t rwlock)
-{
-    DECL_MUTEX_VARS();
-
-    ea64.ull = ALIGN128_EA(rwlock);
-    offset = OFFSET128_EA_U32(rwlock);
-    MFC_DMA(buf, ea64, size, tagid, MFC_GETLLAR_CMD);
-    spu_readch(MFC_RdAtomicStat);
-
-    buf[offset] = 0;
-    MFC_DMA(buf, ea64, size, tagid, MFC_PUTLLUC_CMD);
-    spu_readch(MFC_RdAtomicStat);
-}
-
-
-#endif /* _SPU_WRITE_UNLOCK_H_ */
diff --git a/gcell/include/Makefile.am b/gcell/include/Makefile.am
deleted file mode 100644
index c96c6f0a3..000000000
--- a/gcell/include/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = gcell
-
diff --git a/gcell/include/gcell/Makefile.am b/gcell/include/gcell/Makefile.am
deleted file mode 100644
index 03255e516..000000000
--- a/gcell/include/gcell/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = spu
-
-gcellinclude_HEADERS = \
-	compiler.h \
-	gc_aligned_alloc.h \
-	gc_atomic.h \
-	gc_cdefs.h \
-	gc_declare_proc.h \
-	gc_job_manager.h \
-	gc_jd_queue_data.h \
-	gc_jd_queue.h \
-	gc_jd_stack.h \
-	gc_job_desc.h \
-	gc_job_desc_private.h \
-	gc_logging.h \
-	gc_mbox.h \
-	gc_spu_args.h \
-	gc_types.h \
-	gcp_fft_1d_r2.h \
-	memory_barrier.h
diff --git a/gcell/include/gcell/compiler.h b/gcell/include/gcell/compiler.h
deleted file mode 100644
index d1adcd129..000000000
--- a/gcell/include/gcell/compiler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GCELL_COMPILER_H
-#define INCLUDED_GCELL_COMPILER_H
-
-/*!
- * \brief Compiler specific hackery.  These are for GCC.
- */
-
-#define _AL8   __attribute__((aligned (8)))
-#define _AL16  __attribute__((aligned (16)))
-#define _AL128 __attribute__((aligned (128)))
-
-#define _UNUSED __attribute__((unused))
-
-#ifndef likely
-#define likely(x)       __builtin_expect(!!(x), 1)
-#define unlikely(x)     __builtin_expect(!!(x), 0)
-#endif
-
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER)  __builtin_offsetof (TYPE, MEMBER)
-#endif
-
-
-#endif /* INCLUDED_GCELL_COMPILER_H */
diff --git a/gcell/include/gcell/gc_aligned_alloc.h b/gcell/include/gcell/gc_aligned_alloc.h
deleted file mode 100644
index bdc21c278..000000000
--- a/gcell/include/gcell/gc_aligned_alloc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GC_ALIGNED_ALLOC_H
-#define INCLUDED_GC_ALIGNED_ALLOC_H
-
-#include <boost/shared_ptr.hpp>
-
-/*!
- * \brief Return pointer to chunk of storage of size size bytes.
- * The allocation will be aligned to an \p alignment boundary.
- *
- * \param size is the number of bytes to allocate
- * \param alignment is the minimum storage alignment in bytes; must be a power of 2.
- *
- * Throws if can't allocate memory.  The storage should be freed
- * with "free" when done.  The memory is initialized to zero.
- */
-void *
-gc_aligned_alloc(size_t size, size_t alignment = 128);
-
-/*!
- * \brief Return boost::shared_ptr to chunk of storage of size size bytes.
- * The allocation will be aligned to an \p alignment boundary.
- *
- * \param size is the number of bytes to allocate
- * \param alignment is the minimum storage alignment in bytes; must be a power of 2.
- *
- * Throws if can't allocate memory.  The storage should be freed
- * with "free" when done.  The memory is initialized to zero.
- */
-boost::shared_ptr<void>
-gc_aligned_alloc_sptr(size_t size, size_t alignment = 128);
-
-#endif /* INCLUDED_GC_ALIGNED_ALLOC_H */
diff --git a/gcell/include/gcell/gc_atomic.h b/gcell/include/gcell/gc_atomic.h
deleted file mode 100644
index 51d38af48..000000000
--- a/gcell/include/gcell/gc_atomic.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GCELL_GC_ATOMIC_H
-#define INCLUDED_GCELL_GC_ATOMIC_H
-
-#include <stdint.h>
-
-typedef uint32_t	gc_atomic_t;
-
-
-#endif /* INCLUDED_GCELL_GC_ATOMIC_H */
diff --git a/gcell/include/gcell/gc_cdefs.h b/gcell/include/gcell/gc_cdefs.h
deleted file mode 100644
index 0c5fc4ad8..000000000
--- a/gcell/include/gcell/gc_cdefs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GCELL_GC_CDEFS_H
-#define INCLUDED_GCELL_GC_CDEFS_H
-
-/* C++ needs to know that types and declarations are C, not C++.  */
-#ifdef	__cplusplus
-# define __GC_BEGIN_DECLS	extern "C" {
-# define __GC_END_DECLS	}
-#else
-# define __GC_BEGIN_DECLS
-# define __GC_END_DECLS
-#endif
-
-#endif /* INCLUDED_GCELL_GC_CDEFS_H */
diff --git a/gcell/include/gcell/gc_declare_proc.h b/gcell/include/gcell/gc_declare_proc.h
deleted file mode 100644
index ba77e0fb0..000000000
--- a/gcell/include/gcell/gc_declare_proc.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GCELL_GC_DECLARE_PROC_H
-#define INCLUDED_GCELL_GC_DECLARE_PROC_H
-
-#include <stdint.h>
-#include <gcell/gc_job_desc.h>
-
-/*
- * This is C, not C++ code...
- *
- * ...and is used by both PPE and SPE code
- */
-__GC_BEGIN_DECLS
-
-#define GC_PROC_DEF_SECTION ".gcell.proc_def"
-
-typedef struct gc_proc_def {
-#if defined(__SPU__)
-  gc_spu_proc_t	proc;
-#else
-  uint32_t	proc;
-#endif
-  char		name[28];
-} _AL16 gc_proc_def_t;
-
-
-#if defined(__SPU__)
-/*!
- * \brief Tell gcell about a SPU procedure
- *
- * \param _proc_   pointer to function (gc_spu_proc_t)
- * \param _name_   the name of the procedure ("quoted string")
- *
- * This macro registers the given procedure with the gcell runtime.
- * From the PPE, use gc_job_manager::lookup_proc to map \p _name_ to a gc_proc_id_t
- */
-#define GC_DECLARE_PROC(_proc_, _name_) \
-static struct gc_proc_def \
-  _GCPD_ ## _proc_ __attribute__((section(GC_PROC_DEF_SECTION), used)) = \
-  { _proc_, _name_ }
-#endif
-
-__GC_END_DECLS
-
-#endif /* INCLUDED_GCELL_GC_DECLARE_PROC_H */
diff --git a/gcell/include/gcell/gc_jd_queue.h b/gcell/include/gcell/gc_jd_queue.h
deleted file mode 100644
index 50777a394..000000000
--- a/gcell/include/gcell/gc_jd_queue.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GCELL_GC_JD_QUEUE_H
-#define INCLUDED_GCELL_GC_JD_QUEUE_H
-
-#include <gcell/gc_jd_queue_data.h>
-
-__GC_BEGIN_DECLS
-
-/*!
- * \brief Initialize the queue to empty.
- */
-void 
-gc_jd_queue_init(gc_jd_queue_t *q);
-  
-
-/*!
- * \brief Add \p item to the tail of \p q.
- */
-void 
-gc_jd_queue_enqueue(gc_jd_queue_t *q, gc_job_desc_t *item);
-
-
-/*!
- * \brief Remove and return item at head of queue, or 0 if queue is empty
- */
-gc_job_desc_t *
-gc_jd_queue_dequeue(gc_jd_queue_t *q);
-
-__GC_END_DECLS
-
-
-#endif /* INCLUDED_GCELL_GC_JD_QUEUE_H */
diff --git a/gcell/include/gcell/gc_jd_queue_data.h b/gcell/include/gcell/gc_jd_queue_data.h
deleted file mode 100644
index 819b3712e..000000000
--- a/gcell/include/gcell/gc_jd_queue_data.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GCELL_GC_JD_QUEUE_DATA_H
-#define INCLUDED_GCELL_GC_JD_QUEUE_DATA_H
-
-#include <gcell/gc_types.h>
-#include <gcell/gc_job_desc.h>
-
-__GC_BEGIN_DECLS
-
-/*!
- * \brief (Lock free someday...) queue for job descriptors
- *
- * This is the main data structure shared between PPEs and SPEs.
- * It is used to enqueue work for SPEs.  SPEs or PPEs may enqueue
- * work.  SPE's dequeue from here.
- *
- * FIXME make it lock free ;)  For now, use a spin lock.
- *
- * (Fills a single cache line)
- */
-typedef struct gc_jd_queue
-{
-  gc_eaddr_t	head  _AL16;
-  gc_eaddr_t	tail  _AL16;
-  uint32_t	mutex _AL16;		// libsync mutex (spin lock)
-} _AL128 gc_jd_queue_t;
-
-__GC_END_DECLS
-
-#endif /* INCLUDED_GCELL_GC_JD_QUEUE_DATA_H */
-
-
diff --git a/gcell/include/gcell/gc_jd_stack.h b/gcell/include/gcell/gc_jd_stack.h
deleted file mode 100644
index 9eab4e402..000000000
--- a/gcell/include/gcell/gc_jd_stack.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GCELL_GC_JD_STACK_H
-#define INCLUDED_GCELL_GC_JD_STACK_H
-
-#include <gcell/gc_types.h>
-#include <gcell/gc_job_desc.h>
-
-__GC_BEGIN_DECLS
-
-/*!
- * \brief Lock free stack for job descriptors (used for free list)
- *
- * This is aligned to a cache line, and fills the cache line,
- * to avoid inadvertently losing reservations created with
- * the load-and-reserve instructions.
- */
-
-typedef struct gc_jd_stack
-{
-  gc_eaddr_t	top;
-
-  // pad out to a full cache line
-  uint8_t	_pad[128 - sizeof(gc_eaddr_t)];
-} _AL128 gc_jd_stack_t;
-
-
-/*!
- * \brief Initialize the stack to empty.
- */
-void 
-gc_jd_stack_init(gc_jd_stack_t *stack);
-  
-
-/*!
- * \brief Add \p item to the top of \p stack.
- */
-void 
-gc_jd_stack_push(gc_jd_stack_t *stack, gc_job_desc_t *item);
-
-
-/*!
- * \brief pop and return top item on stack, or 0 if stack is empty
- */
-gc_job_desc_t *
-gc_jd_stack_pop(gc_jd_stack_t *stack);
-
-__GC_END_DECLS
-
-
-#endif /* INCLUDED_GCELL_GC_JD_STACK_H */
diff --git a/gcell/include/gcell/gc_job_desc.h b/gcell/include/gcell/gc_job_desc.h
deleted file mode 100644
index 7dc9d182c..000000000
--- a/gcell/include/gcell/gc_job_desc.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GCELL_GC_JOB_DESC_H
-#define INCLUDED_GCELL_GC_JOB_DESC_H
-
-/*!
- * This file contains the structures that are used to describe how to
- * call "jobs" that execute on the SPEs.  A "job" is a task, or piece of
- * work that you want to run on an SPE.
- *
- * There is code running in the SPE that knows how to interpret
- * these job descriptions. Thus, in most cases, the overhead
- * of invoking these is very low.
- *
- * The whole "job idea" is SPE centric.  At first pass,
- * the PPE will be constructing jobs and enqueing them.
- * However, there is nothing in the implementation that
- * prohibits SPEs from creating their own jobs in the
- * future.  Also, there is nothing prohibiting SPE-to-SPE
- * DMA's.
- *
- * SPE's dequeue and "pull" jobs to themselves, do the work, then
- * notify the entity that submitted the job.
- */
-
-#include <gcell/gc_types.h>
-#include <gcell/gc_job_desc_private.h>
-
-/*
- * This is C, not C++ code...
- *
- * ...and is used by both PPE and SPE code
- */
-__GC_BEGIN_DECLS
-
-
-//! opaque ID that specifies which code to invoke on the SPE
-typedef uint32_t gc_proc_id_t;
-#define GCP_UNKNOWN_PROC ((gc_proc_id_t) -1)
-
-
-//! final job status
-typedef enum {
-  JS_OK,
-  JS_SHUTTING_DOWN,	    // job mananger is shutting down
-  JS_TOO_MANY_CLIENTS,	    // too many client threads
-  JS_UNKNOWN_PROC,	    // didn't recognize the procedure ID
-  JS_BAD_DIRECTION,	    // EA arg has invalid direction
-  JS_BAD_EAH,		    // not all EA args have the same high 32 address bits
-  JS_BAD_N_DIRECT,	    // too many direct args
-  JS_BAD_N_EA,		    // too many EA args
-  JS_ARGS_TOO_LONG,  	    // total length of EA args exceeds limit
-  JS_BAD_JUJU,	    	    // misc problem: you're having a bad day
-  JS_BAD_JOB_DESC,	    // gc_job_desc was not allocated using mgr->alloc_job_desc()
-
-} gc_job_status_t;
-
-#define MAX_ARGS_DIRECT  8  // maximum number of args passed using "direct" method
-#define MAX_ARGS_EA	 8  // maximum number of args passed via EA memory (dma)
-
-/*
- * We support two classes of arguments,
- *   "direct", which are contained in the gc_job_desc_args and
- *   "EA", which are copied in/out according to info in gc_job_desc_args
- */
-
-/*!
- * \brief Tag type of "direct" argument
- */
-typedef enum {
-  GCT_S32,
-  GCT_U32,
-  GCT_S64,
-  GCT_U64,
-  GCT_FLOAT,
-  GCT_DOUBLE,
-  GCT_FLT_CMPLX,
-  GCT_DBL_CMPLX,
-  GCT_EADDR,
-
-} gc_tag_t;
-
-
-/*!
- * \brief union for passing "direct" argument
- */
-typedef union gc_arg_union
-{
-  int32_t	 s32;
-  uint32_t	 u32;
-  int64_t	 s64;
-  uint64_t	 u64;
-  float		 f;
-  double	 d;
-  //float complex  cf;	//  64-bits (C99)
-  //double complex cd;  // 128-bits (C99)
-  gc_eaddr_t	 ea;	//  64-bits
-} _AL8 gc_arg_union_t;
-
-
-/*!
- * \brief "direct" input or output arguments
- */
-typedef struct gc_job_direct_args
-{
-  uint32_t	  nargs;		        // # of "direct" args
-  gc_tag_t	  tag[MAX_ARGS_DIRECT] _AL16;   // type of direct arg[i]
-  gc_arg_union_t  arg[MAX_ARGS_DIRECT] _AL16;   // direct argument values
-
-} _AL16 gc_job_direct_args_t;
-
-
-// specifies direction for args passed in EA memory
-
-#define GCJD_DMA_GET		0x01		// in to SPE
-#define	GCJD_DMA_PUT		0x02		// out from SPE
-
-/*!
- * \brief Description of args passed in EA memory.
- * These are DMA'd between EA and LS as specified.
- */
-typedef struct gc_job_ea_arg {
-  //! EA address of buffer
-  gc_eaddr_t     ea_addr;	
-
-  //! GC_JD_DMA_* get arg or put arg
-  uint32_t	 direction;
-
-  //! number of bytes to get
-  uint32_t	 get_size;	   
-
-  //! number of bytes to put
-  uint32_t	 put_size;
-
-#if defined(__SPU__)
-  //! local store address (filled in by SPU runtime)
-  void		*ls_addr;
-  uint32_t	 _pad[2];
-#else
-  uint32_t       _pad[3];
-#endif
-
-} _AL16 gc_job_ea_arg_t;
-
-
-typedef struct gc_job_ea_args {
-  uint32_t		nargs;
-  gc_job_ea_arg_t	arg[MAX_ARGS_EA];
-
-} _AL16 gc_job_ea_args_t;
-
-
-/*!
- * \brief "job description" that is DMA'd to/from the SPE.
- * \ingroup gcell
- */
-typedef struct gc_job_desc
-{
-  gc_job_desc_private_t sys;	  // internals
-  gc_job_status_t   	status;	  // what happened (output)
-  gc_proc_id_t          proc_id;  // specifies which procedure to run
-  gc_job_direct_args_t	input;	  // direct args to SPE
-  gc_job_direct_args_t	output;	  // direct args from SPE
-  gc_job_ea_args_t	eaa;	  // args passed via EA memory
-
-} _AL128 gc_job_desc_t;
-
-
-/*!
- * type of procedure invoked on spu
- */
-typedef void (*gc_spu_proc_t)(const gc_job_direct_args_t *input,
-			      gc_job_direct_args_t *output,
-			      const gc_job_ea_args_t *eaa);
-
-#if !defined(__SPU__)
-
-static inline gc_job_desc_t *
-ea_to_jdp(gc_eaddr_t ea)
-{
-  return (gc_job_desc_t *) ea_to_ptr(ea);
-}
-
-static inline gc_eaddr_t
-jdp_to_ea(gc_job_desc_t *item)
-{
-  return ptr_to_ea(item);
-}
-
-#endif
-
-
-__GC_END_DECLS
-
-#endif /* INCLUDED_GCELL_GC_JOB_DESC_H */
diff --git a/gcell/include/gcell/gc_job_desc_private.h b/gcell/include/gcell/gc_job_desc_private.h
deleted file mode 100644
index fa831a88e..000000000
--- a/gcell/include/gcell/gc_job_desc_private.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GCELL_GC_JOB_DESC_PRIVATE_H
-#define INCLUDED_GCELL_GC_JOB_DESC_PRIVATE_H
-
-// #include <libsync.h>
-
-/*!
- * \brief Implementation details we'd like to hide from the user.
- */
-typedef struct gc_job_desc_private
-{
-  gc_eaddr_t	next;		    // used to implement job queue and free list
-  uint16_t	job_id;
-  uint16_t	client_id;
-  uint32_t	direction_union;    // union of all gc_job_ea_arg.direction fields
-} gc_job_desc_private_t;
-
-#endif /* INCLUDED_GCELL_GC_JOB_PRIVATE_H */
-
diff --git a/gcell/include/gcell/gc_job_manager.h b/gcell/include/gcell/gc_job_manager.h
deleted file mode 100644
index 8e5de5217..000000000
--- a/gcell/include/gcell/gc_job_manager.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GC_JOB_MANAGER_H
-#define INCLUDED_GC_JOB_MANAGER_H
-
-#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
-#include <vector>
-#include <string>
-#include <stdexcept>
-#include <libspe2.h>
-#include "gc_job_desc.h"
-
-class gc_job_manager;
-typedef boost::shared_ptr<gc_job_manager> gc_job_manager_sptr;
-typedef boost::shared_ptr<spe_program_handle_t> spe_program_handle_sptr;
-typedef boost::shared_ptr<gc_job_desc> gc_job_desc_sptr;
-
-/*!
- * \brief Return a boost::shared_ptr to an spe_program_handle_t
- *
- * \param filename is the name of the SPE ELF executable to open.
- *
- * Calls spe_image_open to open the file.  If successful returns a
- * boost::shared_ptr that will call spe_image_close when it's time to
- * free the object.
- *
- * Returns the equivalent of the NULL pointer if the file cannot be
- * opened, or if it's not an SPE ELF object file.
- *
- * \sa gc_program_handle_from_address
- */
-spe_program_handle_sptr 
-gc_program_handle_from_filename(const std::string &filename);
-
-/*!
- * \brief Return a boost::shared_ptr to an spe_program_handle_t
- *
- * \param handle is a non-zero pointer to an embedded SPE image.
- *
- * If successful returns a boost::shared_ptr that does nothing when
- * it's time to free the object.
- *
- * \sa gc_program_handle_from_filename
- */
-spe_program_handle_sptr 
-gc_program_handle_from_address(spe_program_handle_t *handle);
-
-/*!
- * \brief map gc_job_status_t into a string
- */
-const std::string
-gc_job_status_string(gc_job_status_t status);
-
-/*
- * \brief Options that configure the job_manager.
- * The default values are reasonable.
- */
-struct gc_jm_options {
-  unsigned int max_jobs;	    // max # of job descriptors in system
-  unsigned int max_client_threads;  // max # of client threads of job manager
-  unsigned int nspes;		    // how many SPEs shall we use? 0 -> all of them
-  bool gang_schedule;		    // shall we gang schedule?
-  bool use_affinity;		    // shall we try for affinity (FIXME not implmented)
-  bool enable_logging;		    // shall we log SPE events?
-  uint32_t log2_nlog_entries;    	   // log2 of number of log entries (default is 12 == 4k)
-  spe_program_handle_sptr program_handle;  // program to load into SPEs
-
-  gc_jm_options() :
-    max_jobs(0), max_client_threads(0), nspes(0),
-    gang_schedule(false), use_affinity(false),
-    enable_logging(false), log2_nlog_entries(12)
-  {
-  }
-
-  gc_jm_options(spe_program_handle_sptr program_handle_,
-		unsigned int nspes_ = 0) :
-    max_jobs(0), max_client_threads(0), nspes(nspes_),
-    gang_schedule(false), use_affinity(false),
-    enable_logging(false), log2_nlog_entries(12),
-    program_handle(program_handle_)
-  {
-  }
-};
-
-enum gc_wait_mode {
-  GC_WAIT_ANY,
-  GC_WAIT_ALL,
-};
-
-/*
- * exception classes
- */
-class gc_exception : public std::runtime_error
-{
-public:
-  gc_exception(const std::string &msg);
-};
-
-class gc_unknown_proc : public gc_exception
-{
-public:
-  gc_unknown_proc(const std::string &msg);
-};
-
-class gc_bad_alloc : public gc_exception
-{
-public:
-  gc_bad_alloc(const std::string &msg);
-};
-
-class gc_bad_align : public gc_exception
-{
-public:
-  gc_bad_align(const std::string &msg);
-};
-
-class gc_bad_submit : public gc_exception
-{
-public:
-  gc_bad_submit(const std::string &name, gc_job_status_t status);
-};
-
-/*
- * \brief Create an instance of the job manager
- */
-gc_job_manager_sptr
-gc_make_job_manager(const gc_jm_options *options = 0);
-
-
-/*!
- * \brief Abstract class that manages SPE jobs.
- * \ingroup gcell
- *
- * There is typically a single instance derived from this class.
- * It is safe to call its methods from any thread.
- */
-class gc_job_manager : boost::noncopyable
-{
-public:
-  gc_job_manager(const gc_jm_options *options = 0); 
-
-  virtual ~gc_job_manager();
-
-  /*!
-   * Stop accepting new jobs.  Wait for existing jobs to complete.
-   * Return all managed SPE's to the system.
-   */
-  virtual bool shutdown() = 0;
-
-  /*!
-   * \brief Return number of SPE's currently allocated to job manager.
-   */
-  virtual int nspes() const = 0;
-
-  /*!
-   * \brief Return a pointer to a properly aligned job descriptor,
-   * or throws gc_bad_alloc if there are none available.
-   */
-  virtual gc_job_desc *alloc_job_desc() = 0;
-
-  /*
-   *! Free a job descriptor previously allocated with alloc_job_desc()
-   *
-   * \param[in] jd pointer to job descriptor to free.
-   */
-  virtual void free_job_desc(gc_job_desc *jd) = 0;
-
-  /*!
-   * \brief Submit a job for asynchronous processing on an SPE.
-   *
-   * \param[in] jd pointer to job description
-   *
-   * The caller must not read or write the job description
-   * or any of the memory associated with any indirect arguments
-   * until after calling wait_job.
-   *
-   * \returns true iff the job was successfully enqueued.
-   * If submit_job returns false, check jd->status for additional info.
-   */
-  virtual bool submit_job(gc_job_desc *jd) = 0;
-
-  /*!
-   * \brief Wait for job to complete.
-   *
-   * A thread may only wait for jobs which it submitted.
-   *
-   * \returns true if sucessful, else false.
-   */
-  virtual bool 
-  wait_job(gc_job_desc *jd) = 0;
-
-  /*!
-   * \brief wait for 1 or more jobs to complete.
-   *
-   * \param[in] njobs is the length of arrays \p jd and \p done.
-   * \param[in] jd are the jobs that are to be waited for.
-   * \param[out] done indicates whether the corresponding job is complete.
-   * \param[in] mode indicates whether to wait for ALL or ANY of the jobs
-   *   in \p jd to complete.
-   *
-   * A thread may only wait for jobs which it submitted.
-   *
-   * \returns number of jobs completed, or -1 if error.
-   * The caller must examine the status field of each job to confirm
-   * successful completion of the job.
-   */
-  virtual int
-  wait_jobs(unsigned int njobs,
-	    gc_job_desc *jd[], bool done[], gc_wait_mode mode) = 0;
-
-  /*!
-   * Return the maximum number of bytes of EA arguments that may be
-   * copied to or from the SPE in a single job.  The limit applies
-   * independently to the "get" and "put" args.  
-   * \sa gc_job_desc_t, gc_job_ea_args_t
-   */
-  virtual int ea_args_maxsize() = 0;
-
-  /*!
-   * Return gc_proc_id_t associated with spu procedure \p proc_name if one
-   * exists, otherwise throws gc_unknown_proc.
-   */
-  virtual gc_proc_id_t lookup_proc(const std::string &proc_name) = 0;
-  
-  /*!
-   * Return a vector of all known spu procedure names.
-   */
-  virtual std::vector<std::string> proc_names() = 0;
-
-  virtual void set_debug(int debug);
-  virtual int debug();
-
-  /* ----- static methods ----- */
-
-  /*!
-   * \brief Set the singleton gc_job_manager instance.
-   * \param mgr is the job manager instance.
-   *
-   * The singleton is weakly held, thus the caller must maintain
-   * a reference to the mgr for the duration.  (If we held the
-   * manager strongly, the destructor would never be called, and the
-   * resources (SPEs) would not be returned.)  Bottom line: the
-   * caller is responsible for life-time management.
-   */
-  static void set_singleton(gc_job_manager_sptr mgr);
-
-  /*!
-   * \brief Retrieve the singleton gc_job_manager instance.
-   *
-   * Returns the singleton gc_job_manager instance or raises
-   * boost::bad_weak_ptr if the singleton is empty.
-   */
-  static gc_job_manager_sptr singleton();
-
-  /*!
-   * \brief return a boost::shared_ptr to a job descriptor.
-   */
-  static gc_job_desc_sptr make_jd_sptr(gc_job_manager_sptr mgr, gc_job_desc *jd);
-
-  /*!
-   * \brief allocate a job descriptor and return a boost::shared_ptr to it.
-   */
-  static gc_job_desc_sptr alloc_job_desc(gc_job_manager_sptr mgr);
-};
-
-
-#endif /* INCLUDED_GC_JOB_MANAGER_H */
diff --git a/gcell/include/gcell/gc_logging.h b/gcell/include/gcell/gc_logging.h
deleted file mode 100644
index 9cc6fa77b..000000000
--- a/gcell/include/gcell/gc_logging.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GCELL_GC_LOGGING_H
-#define INCLUDED_GCELL_GC_LOGGING_H
-
-#include <gcell/gc_types.h>
-#include <string.h>
-
-__GC_BEGIN_DECLS
-
-typedef struct gc_log {
-  gc_eaddr_t   	base;		// gc_log_entry_t * (16 byte aligned)
-  uint32_t	nentries;	// number of entries (power-of-2)
-} gc_log_t;
-
-typedef struct gc_log_entry {
-  uint32_t	seqno;		// monotonic sequence number
-  uint32_t	timestamp;	// decrementer value (wraps every 53s on PS3)
-  uint16_t	subsystem;	// 0 to 255 reserved for system, user gets 256 and up
-  uint16_t	event;
-  uint32_t	info[5];
-} _AL16 gc_log_entry_t;
-
-#define	GCL_SS_SYS	0	// lowest system reserved subsystem
-#define	GCL_SS_USER   256	// lowest user reserved subsystem
-
-
-/*
- * The resulting log files can be displayed using using:
- *
- *  $ od -t x4 -w32 spu_log.00 | less
- */
-
-
-#if defined(__SPU__)
-
-/*!
- * System fills in seqno and timestamp.  User is responsible for the rest.
- */
-
-void _gc_log_write(gc_log_entry_t entry);
-
-#ifdef ENABLE_GC_LOGGING
-#define gc_log_write(entry) _gc_log_write(entry)
-#else
-#define gc_log_write(entry) do { } while (0)
-#endif
-
-inline static void
-gc_log_write0(int subsystem, int event)
-{
-  gc_log_entry_t e;
-  e.subsystem = subsystem;
-  e.event = event;
-  e.info[0] = 0;
-  e.info[1] = 0;
-  e.info[2] = 0;
-  e.info[3] = 0;
-  e.info[4] = 0;
-  gc_log_write(e);
-}
-
-inline static void
-gc_log_write1(int subsystem, int event,
-	      uint32_t info0)
-{
-  gc_log_entry_t e;
-  e.subsystem = subsystem;
-  e.event = event;
-  e.info[0] = info0;
-  e.info[1] = 0;
-  e.info[2] = 0;
-  e.info[3] = 0;
-  e.info[4] = 0;
-  gc_log_write(e);
-}
-
-inline static void
-gc_log_write2(int subsystem, int event,
-	      uint32_t info0, uint32_t info1)
-{
-  gc_log_entry_t e;
-  e.subsystem = subsystem;
-  e.event = event;
-  e.info[0] = info0;
-  e.info[1] = info1;
-  e.info[2] = 0;
-  e.info[3] = 0;
-  e.info[4] = 0;
-  gc_log_write(e);
-}
-
-inline static void
-gc_log_write3(int subsystem, int event,
-	      uint32_t info0, uint32_t info1, uint32_t info2)
-{
-  gc_log_entry_t e;
-  e.subsystem = subsystem;
-  e.event = event;
-  e.info[0] = info0;
-  e.info[1] = info1;
-  e.info[2] = info2;
-  e.info[3] = 0;
-  e.info[4] = 0;
-  gc_log_write(e);
-}
-
-inline static void
-gc_log_write4(int subsystem, int event,
-	      uint32_t info0, uint32_t info1, uint32_t info2, uint32_t info3)
-{
-  gc_log_entry_t e;
-  e.subsystem = subsystem;
-  e.event = event;
-  e.info[0] = info0;
-  e.info[1] = info1;
-  e.info[2] = info2;
-  e.info[3] = info3;
-  e.info[4] = 0;
-  gc_log_write(e);
-}
-
-inline static void
-gc_log_write5(int subsystem, int event,
-	      uint32_t info0, uint32_t info1, uint32_t info2, uint32_t info3, uint32_t info4)
-{
-  gc_log_entry_t e;
-  e.subsystem = subsystem;
-  e.event = event;
-  e.info[0] = info0;
-  e.info[1] = info1;
-  e.info[2] = info2;
-  e.info[3] = info3;
-  e.info[4] = info4;
-  gc_log_write(e);
-}
-
-/*!
- * One time initialization called by system runtime
- */
-void
-_gc_log_init(gc_log_t log_info);
-
-#endif
-
-__GC_END_DECLS
-
-#endif /* INCLUDED_GCELL_GC_LOGGING_H */
diff --git a/gcell/include/gcell/gc_mbox.h b/gcell/include/gcell/gc_mbox.h
deleted file mode 100644
index 9793401f1..000000000
--- a/gcell/include/gcell/gc_mbox.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GCELL_GC_MBOX_H
-#define INCLUDED_GCELL_GC_MBOX_H
-
-/*
- * The PPE and SPE exchange a few 32-bit messages via mailboxes.
- * All have a 4 bit opcode in the high bits.
- *
- *      3                   2                   1
- *    1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *   |  op   |                        arg                            |
- *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- */
-
-#define MK_MBOX_MSG(cmd, args) ((((cmd) & 0xf) << 28) | ((args) & 0x0fffffff))
-#define MBOX_MSG_OP(msg)  (((msg) >> 28) & 0xf)
-#define	MBOX_MSG_ARG(msg) ((msg) & 0x0fffffff)
-
-// PPE to SPE (sent via SPE Read Inbound Mailbox)
-
-#define OP_EXIT			0x0	// exit now
-#define	OP_GET_SPU_BUFSIZE	0x1 
-#define	OP_CHECK_QUEUE		0x2
-
-// SPE to PPE (sent via SPE Write Outbound Interrupt Mailbox)
-
-#define OP_JOBS_DONE		0x3	// arg is 0 or 1, indicating which
-					//   gc_completion_info_t contains the info
-#define	OP_SPU_BUFSIZE	        0x4	// arg is max number of bytes
-
-
-#endif /* INCLUDED_GCELL_GC_MBOX_H */
diff --git a/gcell/include/gcell/gc_spu_args.h b/gcell/include/gcell/gc_spu_args.h
deleted file mode 100644
index 3719bac22..000000000
--- a/gcell/include/gcell/gc_spu_args.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GCELL_GC_SPU_ARGS_H
-#define INCLUDED_GCELL_GC_SPU_ARGS_H
-
-#include <gcell/gc_types.h>
-#include <gcell/gc_logging.h>
-
-// args passed to SPE at initialization time
-
-typedef struct gc_spu_args {
-  gc_eaddr_t	queue;		// address of job queue (gc_jd_queue_t *)
-  gc_eaddr_t	comp_info[2]; 	// completion info (gc_comp_info_t *)
-  uint32_t	spu_idx;	// which spu we are: [0,nspus-1]
-  uint32_t	nspus;		// number of spus we're using
-  uint32_t	proc_def_ls_addr;  // LS addr of proc_def table
-  uint32_t	nproc_defs;	   // number of proc_defs in table
-  gc_log_t	log;		   // logging info
-} _AL16 gc_spu_args_t;
-
-
-#define	GC_CI_NJOBS	62	// makes gc_comp_info 1 cache line long
-
-/*!
- * \brief Used to return info to PPE on which jobs are completed.
- *
- * When each SPE is initalized, it is passed EA pointers to two of
- * these structures.  The SPE uses these to communicate which jobs
- * that it has worked on are complete.  The SPE notifies the PPE by
- * sending an OP_JOBS_DONE message (see gc_mbox.h) with an argument of
- * 0 or 1, indicating which of the two comp_info's to examine.  The
- * SPE sets the in_use flag to 1 before DMA'ing to the PPE.  When the
- * PPE is done with the structure, it must clear the in_use field to
- * let the SPE know it can begin using it again.
- */
-typedef struct gc_comp_info {
-  uint16_t	in_use;		// set by SPE, cleared by PPE when it's finished
-  uint16_t	ncomplete;	// number of valid job_id's
-  uint16_t	job_id[GC_CI_NJOBS];	// job_id's of completed jobs
-} _AL128 gc_comp_info_t;
-
-#endif /* INCLUDED_GCELL_GC_SPU_ARGS_H */
diff --git a/gcell/include/gcell/gc_types.h b/gcell/include/gcell/gc_types.h
deleted file mode 100644
index b75bcd8d7..000000000
--- a/gcell/include/gcell/gc_types.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GCELL_GC_TYPES_H
-#define INCLUDED_GCELL_GC_TYPES_H
-
-#include <stdint.h>
-#include <gcell/gc_cdefs.h>
-#include <gcell/compiler.h>
-
-__GC_BEGIN_DECLS
-
-#ifndef __cplusplus
-typedef int bool;
-#define true  1
-#define false 0
-#endif
-
-/*!
- * \brief 64-bit integer type representing an effective address (EA)
- *
- * This type is always 64-bits, regardless of whether we're
- * running in 32 or 64-bit mode.
- */
-typedef uint64_t	gc_eaddr_t;
-
-#if !defined(__SPU__)
-static inline void *
-ea_to_ptr(gc_eaddr_t ea)
-{
-  // in 32-bit mode we're tossing the top 32-bits.
-  return (void *) (uintptr_t) ea;
-}
-
-static inline gc_eaddr_t
-ptr_to_ea(void *p)
-{
-  // two steps to avoid compiler warning in 32-bit mode.
-  return (gc_eaddr_t) (uintptr_t) p;
-}
-#endif
-
-__GC_END_DECLS
-
-#endif /* INCLUDED_GCELL_GC_TYPES_H */
diff --git a/gcell/include/gcell/gcp_fft_1d_r2.h b/gcell/include/gcell/gcp_fft_1d_r2.h
deleted file mode 100644
index c1d331833..000000000
--- a/gcell/include/gcell/gcp_fft_1d_r2.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GCP_FFT_1D_R2_H
-#define INCLUDED_GCP_FFT_1D_R2_H
-
-#include <gcell/gc_job_manager.h>
-#include <complex>
-
-/*!
- * \brief Submit a job that computes the forward or inverse FFT.
- *
- * \param mgr is the job manager instance
- * \param log2_fft_length is the log2 of the fft_length (4 <= x <= 12).
- * \param forward is true to compute the forward transform, else the inverse.
- * \param shift indicates if an "fftshift" should be applied to the output data
- * \param out is the fft_length output from FFT (must be 16-byte aligned).
- * \param in is the fft_length input to FFT (must be 16-byte aligned).
- * \param twiddle is fft_length/4 twiddle factor input to FFT (must be 16-byte aligned).
- * \param window is the window to be applied to the input data.
- *    The window length must be either 0 or fft_length (must be 16-byte aligned).
- *
- * Returns a shared_ptr to a job descriptor which should be passed to wait_job*.
- * Throws an exception in the event of a problem.
- * This uses the FFTW conventions for scaling.  That is, neither the forward nor inverse
- * are scaled by 1/fft_length.
- */
-gc_job_desc_sptr
-gcp_fft_1d_r2_submit(gc_job_manager_sptr mgr,
-		     unsigned int log2_fft_length,
-		     bool forward,
-		     bool shift,
-		     std::complex<float> *out,
-		     const std::complex<float> *in,
-		     const std::complex<float> *twiddle,
-		     const float *window);
-
-/*!
- * \brief Compute twiddle factors 
- *
- * \param log2_fft_length is the log2 of the fft_length.
- * \param W is fft_length/4 twiddle factor output (must be 16-byte aligned).
- */
-void
-gcp_fft_1d_r2_twiddle(unsigned int log2_fft_length, std::complex<float> *W);
-
-#endif /* INCLUDED_GCP_FFT_1D_R2_H */
diff --git a/gcell/include/gcell/memory_barrier.h b/gcell/include/gcell/memory_barrier.h
deleted file mode 100644
index 4a1f87000..000000000
--- a/gcell/include/gcell/memory_barrier.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GCELL_MEMORY_BARRIER_H
-#define INCLUDED_GCELL_MEMORY_BARRIER_H
-
-/*
- * powerpc memory barriers
- *
- * The sync instruction guarantees that all memory accesses initiated
- * by this processor have been performed (with respect to all other
- * mechanisms that access memory).  The eieio instruction is a barrier
- * providing an ordering (separately) for (a) cacheable stores and (b)
- * loads and stores to non-cacheable memory (e.g. I/O devices).
- *
- * smp_mb() prevents loads and stores being reordered across this point.
- * smp_rmb() prevents loads being reordered across this point.
- * smp_wmb() prevents stores being reordered across this point.
- *
- * We have to use the sync instructions for smp_mb(), since lwsync
- * doesn't order loads with respect to previous stores.  Lwsync is
- * fine for smp_rmb(), though.  For smp_wmb(), we use eieio since it
- * is only used to order updates to system memory.
- *
- * For details, see "PowerPC Virtual Environment Architecture, Book
- * II".  Especially Chapter 1, "Storage Model" and Chapter 3, "Storage
- * Control Instructions." (site:ibm.com)
- */
-
-static inline void smp_mb(void)
-{
-  __asm__ volatile ("sync" : : : "memory");
-}
-
-static inline void smp_rmb(void)
-{
-  __asm__ volatile ("lwsync" : : : "memory");
-}
-
-static inline void smp_wmb(void)
-{
-  __asm__ volatile ("eieio" : : : "memory");
-}
-
-
-#endif /* INCLUDED_GCELL_MEMORY_BARRIER_H */
diff --git a/gcell/include/gcell/spu/.gitignore b/gcell/include/gcell/spu/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/gcell/include/gcell/spu/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gcell/include/gcell/spu/Makefile.am b/gcell/include/gcell/spu/Makefile.am
deleted file mode 100644
index 58816819d..000000000
--- a/gcell/include/gcell/spu/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-gcellspuinclude_HEADERS = \
-	fft_1d.h \
-	fft_1d_r2.h \
-	gc_delay.h \
-	gc_jd_queue.h \
-	gc_random.h \
-	gc_spu_macs.h \
-	libfft.h
diff --git a/gcell/include/gcell/spu/fft_1d.h b/gcell/include/gcell/spu/fft_1d.h
deleted file mode 100644
index 355b84bf1..000000000
--- a/gcell/include/gcell/spu/fft_1d.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _FFT_1D_H_
-#define _FFT_1D_H_	1
-
-#include <spu_intrinsics.h>
-
-/* BIT_SWAP - swaps up to 16 bits of the integer _i according to the 
- *            pattern specified by _pat.
- */
-#define BIT_SWAP(_i, _pat)	  spu_extract(spu_gather(spu_shuffle(spu_maskb(_i), _pat, _pat)), 0)
-
-
-#ifndef MAX_FFT_1D_SIZE
-#define MAX_FFT_1D_SIZE	8192
-#endif
-
-#ifndef INV_SQRT_2
-#define INV_SQRT_2	0.7071067811865
-#endif
-
-
-/* The following macro, FFT_1D_BUTTERFLY, performs a 4 way SIMD basic butterfly 
- * operation. The inputs are in parallel arrays (seperate real and imaginary
- * vectors). 
- * 
- *          p --------------------------> P = p + q*Wi
- *                        \      /
- *                         \    /
- *                          \  /
- *                           \/
- *                           /\
- *                          /  \
- *                         /    \
- *               ____     /      \
- *          q --| Wi |-----------------> Q = p - q*Wi
- *               ----
- */
-
-#define FFT_1D_BUTTERFLY(_P_re, _P_im, _Q_re, _Q_im, _p_re, _p_im, _q_re, _q_im, _W_re, _W_im) {	\
-  vector float _qw_re, _qw_im;										\
-													\
-  _qw_re = spu_msub(_q_re, _W_re, spu_mul(_q_im, _W_im));						\
-  _qw_im = spu_madd(_q_re, _W_im, spu_mul(_q_im, _W_re));						\
-  _P_re  = spu_add(_p_re, _qw_re);									\
-  _P_im  = spu_add(_p_im, _qw_im);									\
-  _Q_re  = spu_sub(_p_re, _qw_re);									\
-  _Q_im  = spu_sub(_p_im, _qw_im);									\
-}
-
-
-/* FFT_1D_BUTTERFLY_HI is equivalent to FFT_1D_BUTTERFLY with twiddle factors (W_im, -W_re)
- */
-#define FFT_1D_BUTTERFLY_HI(_P_re, _P_im, _Q_re, _Q_im, _p_re, _p_im, _q_re, _q_im, _W_re, _W_im) {	\
-  vector float _qw_re, _qw_im;										\
-													\
-  _qw_re = spu_madd(_q_re, _W_im, spu_mul(_q_im, _W_re));						\
-  _qw_im = spu_msub(_q_im, _W_im, spu_mul(_q_re, _W_re));						\
-  _P_re  = spu_add(_p_re, _qw_re);									\
-  _P_im  = spu_add(_p_im, _qw_im);									\
-  _Q_re  = spu_sub(_p_re, _qw_re);									\
-  _Q_im  = spu_sub(_p_im, _qw_im);									\
-}
-
-#endif /* _FFT_1D_H_ */
diff --git a/gcell/include/gcell/spu/fft_1d_r2.h b/gcell/include/gcell/spu/fft_1d_r2.h
deleted file mode 100644
index a51cbc341..000000000
--- a/gcell/include/gcell/spu/fft_1d_r2.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-#ifndef _FFT_1D_R2_H_
-#define _FFT_1D_R2_H_	1
-
-#include "fft_1d.h"
-
-/* fft_1d_r2
- * ---------
- * Performs a single precision, complex Fast Fourier Transform using 
- * the DFT (Discrete Fourier Transform) with radix-2 decimation in time. 
- * The input <in> is an array of complex numbers of length (1<<log2_size)
- * entries. The result is returned in the array of complex numbers specified
- * by <out>. Note: This routine can support an in-place transformation
- * by specifying <in> and <out> to be the same array.
- *
- * This implementation utilizes the Cooley-Tukey algorithm consisting 
- * of <log2_size> stages. The basic operation is the butterfly.
- *
- *          p --------------------------> P = p + q*Wi
- *                        \      /
- *                         \    /
- *                          \  /
- *                           \/
- *                           /\
- *                          /  \
- *                         /    \
- *               ____     /      \
- *          q --| Wi |-----------------> Q = p - q*Wi
- *               ----
- *
- * This routine also requires pre-computed twiddle values, W. W is an
- * array of single precision complex numbers of length 1<<(log2_size-2) 
- * and is computed as follows:
- *
- *	for (i=0; i<n/4; i++)
- *	    W[i].real =  cos(i * 2*PI/n);
- *	    W[i].imag = -sin(i * 2*PI/n);
- *      }
- *
- * This array actually only contains the first half of the twiddle
- * factors. Due for symmetry, the second half of the twiddle factors
- * are implied and equal:
- *
- *	for (i=0; i<n/4; i++)
- *	    W[i+n/4].real =  W[i].imag =  sin(i * 2*PI/n);
- *	    W[i+n/4].imag = -W[i].real = -cos(i * 2*PI/n);
- *      }
- *
- * Further symmetry allows one to generate the twiddle factor table 
- * using half the number of trig computations as follows:
- *
- *      W[0].real = 1.0;
- *      W[0].imag = 0.0;
- *	for (i=1; i<n/4; i++)
- *	    W[i].real =  cos(i * 2*PI/n);
- *	    W[n/4 - i].imag = -W[i].real;
- *      }
- *
- * The complex numbers are packed into quadwords as follows:
- *
- *    quadword			      complex
- *  array element                   array elements
- *             -----------------------------------------------------
- *       i    |  real 2*i   |  imag 2*i  | real 2*i+1  | imag 2*i+1 | 
- *             -----------------------------------------------------
- *
- */
-
-
-static __inline void _fft_1d_r2(vector float *out, vector float *in, vector float *W, int log2_size)
-{
-  int i, j, k;
-  int stage, offset;
-  int i_rev;
-  int n, n_2, n_4, n_8, n_16, n_3_16;
-  int w_stride, w_2stride, w_3stride, w_4stride;
-  int stride, stride_2, stride_4, stride_3_4;
-  vector float *W0, *W1, *W2, *W3;
-  vector float *re0, *re1, *re2, *re3;
-  vector float *im0, *im1, *im2, *im3;
-  vector float *in0, *in1, *in2, *in3, *in4, *in5, *in6, *in7;
-  vector float *out0, *out1, *out2, *out3;
-  vector float tmp0, tmp1;
-  vector float w0_re, w0_im, w1_re, w1_im;
-  vector float w0, w1, w2, w3;
-  vector float src_lo0, src_lo1, src_lo2, src_lo3;
-  vector float src_hi0, src_hi1, src_hi2, src_hi3;
-  vector float dst_lo0, dst_lo1, dst_lo2, dst_lo3;
-  vector float dst_hi0, dst_hi1, dst_hi2, dst_hi3;
-  vector float out_re_lo0, out_re_lo1, out_re_lo2, out_re_lo3;
-  vector float out_im_lo0, out_im_lo1, out_im_lo2, out_im_lo3;
-  vector float out_re_hi0, out_re_hi1, out_re_hi2, out_re_hi3;
-  vector float out_im_hi0, out_im_hi1, out_im_hi2, out_im_hi3;
-  vector float re_lo0,  re_lo1,  re_lo2,  re_lo3;
-  vector float im_lo0,  im_lo1,  im_lo2,  im_lo3;
-  vector float re_hi0,  re_hi1,  re_hi2,  re_hi3;
-  vector float im_hi0,  im_hi1,  im_hi2,  im_hi3;
-  vector float pq_lo0,  pq_lo1,  pq_lo2,  pq_lo3;
-  vector float pq_hi0,  pq_hi1,  pq_hi2,  pq_hi3;
-  vector float re[MAX_FFT_1D_SIZE/4], im[MAX_FFT_1D_SIZE/4];	/* real & imaginary working arrays */
-  vector float ppmm = (vector float) { 1.0f,  1.0f, -1.0f, -1.0f};
-  vector float pmmp = (vector float) { 1.0f, -1.0f, -1.0f,  1.0f};
-  vector unsigned char reverse;
-  vector unsigned char shuf_lo = (vector unsigned char) {
-					     0,  1, 2, 3,  4, 5, 6, 7,
-					     16,17,18,19, 20,21,22,23};
-  vector unsigned char shuf_hi = (vector unsigned char) {
-					     8,  9,10,11, 12,13,14,15,
-					     24,25,26,27, 28,29,30,31};
-  vector unsigned char shuf_0202 = (vector unsigned char) {
-					       0, 1, 2, 3,  8, 9,10,11,
-					       0, 1, 2, 3,  8, 9,10,11};
-  vector unsigned char shuf_1313 = (vector unsigned char) {
-					       4, 5, 6, 7, 12,13,14,15,
-					       4, 5, 6, 7, 12,13,14,15};
-  vector unsigned char shuf_0303 = (vector unsigned char) { 
-					       0, 1, 2, 3, 12,13,14,15,
-					       0, 1, 2, 3, 12,13,14,15};
-  vector unsigned char shuf_1212 = (vector unsigned char) {
-					       4, 5, 6, 7,  8, 9,10,11,
-					       4, 5, 6, 7,  8, 9,10,11};
-  vector unsigned char shuf_0415 = (vector unsigned char) {
-					       0, 1, 2, 3, 16,17,18,19,
-					       4, 5, 6, 7, 20,21,22,23};
-  vector unsigned char shuf_2637 = (vector unsigned char) {
-					       8, 9,10,11, 24,25,26,27,
-					       12,13,14,15,28,29,30,31};
-  vector unsigned char shuf_0246 = (vector unsigned char) {
-					       0, 1, 2, 3,  8, 9,10,11,
-					       16,17,18,19,24,25,26,27};
-  vector unsigned char shuf_1357 = (vector unsigned char) {
-					       4, 5, 6, 7, 12,13,14,15,
-					       20,21,22,23,28,29,30,31};
-  
-  n = 1 << log2_size;
-  n_2  = n >> 1;
-  n_4  = n >> 2;
-  n_8  = n >> 3;
-  n_16 = n >> 4;
-
-  n_3_16 = n_8 + n_16;
-
-  /* Compute a byte reverse shuffle pattern to be used to produce
-   * an address bit swap.
-   */
-  reverse = spu_or(spu_slqwbyte(spu_splats((unsigned char)0x80), log2_size),
-		   spu_rlmaskqwbyte(((vec_uchar16){15,14,13,12, 11,10,9,8, 
-					 	    7, 6, 5, 4,  3, 2,1,0}),
-				    log2_size-16));
-
-  /* Perform the first 3 stages of the FFT. These stages differs from 
-   * other stages in that the inputs are unscrambled and the data is 
-   * reformated into parallel arrays (ie, seperate real and imaginary
-   * arrays). The term "unscramble" means the bit address reverse the 
-   * data array. In addition, the first three stages have simple twiddle
-   * weighting factors.
-   *		stage 1: (1, 0)
-   *            stage 2: (1, 0) and (0, -1)
-   *		stage 3: (1, 0), (0.707, -0.707), (0, -1), (-0.707, -0.707)
-   *
-   * The arrays are processed as two halves, simultaneously. The lo (first 
-   * half) and hi (second half). This is done because the scramble 
-   * shares source value between each half of the output arrays.
-   */
-  i = 0;
-  i_rev = 0;
-
-  in0 = in;
-  in1 = in + n_8;
-  in2 = in + n_16;
-  in3 = in + n_3_16;  
-
-  in4 = in  + n_4;
-  in5 = in1 + n_4;
-  in6 = in2 + n_4;
-  in7 = in3 + n_4;
-
-  re0 = re;
-  re1 = re + n_8;
-  im0 = im;
-  im1 = im + n_8;
-
-  w0_re = (vector float) { 1.0f,  INV_SQRT_2,  0.0f, -INV_SQRT_2};
-  w0_im = (vector float) { 0.0f, -INV_SQRT_2, -1.0f, -INV_SQRT_2};
-      
-  do {
-    src_lo0 = in0[i_rev];
-    src_lo1 = in1[i_rev];
-    src_lo2 = in2[i_rev];
-    src_lo3 = in3[i_rev];
-
-    src_hi0 = in4[i_rev];
-    src_hi1 = in5[i_rev];
-    src_hi2 = in6[i_rev];
-    src_hi3 = in7[i_rev];
-
-    /* Perform scramble.
-     */
-    dst_lo0 = spu_shuffle(src_lo0, src_hi0, shuf_lo);
-    dst_hi0 = spu_shuffle(src_lo0, src_hi0, shuf_hi);
-    dst_lo1 = spu_shuffle(src_lo1, src_hi1, shuf_lo);
-    dst_hi1 = spu_shuffle(src_lo1, src_hi1, shuf_hi);
-    dst_lo2 = spu_shuffle(src_lo2, src_hi2, shuf_lo);
-    dst_hi2 = spu_shuffle(src_lo2, src_hi2, shuf_hi);
-    dst_lo3 = spu_shuffle(src_lo3, src_hi3, shuf_lo);
-    dst_hi3 = spu_shuffle(src_lo3, src_hi3, shuf_hi);
-
-    /* Perform the stage 1 butterfly. The multiplier constant, ppmm,
-     * is used to control the sign of the operands since a single
-     * quadword contains both of P and Q valule of the butterfly.
-     */
-    pq_lo0 = spu_madd(ppmm, dst_lo0, spu_rlqwbyte(dst_lo0, 8));
-    pq_hi0 = spu_madd(ppmm, dst_hi0, spu_rlqwbyte(dst_hi0, 8));
-    pq_lo1 = spu_madd(ppmm, dst_lo1, spu_rlqwbyte(dst_lo1, 8));
-    pq_hi1 = spu_madd(ppmm, dst_hi1, spu_rlqwbyte(dst_hi1, 8));
-    pq_lo2 = spu_madd(ppmm, dst_lo2, spu_rlqwbyte(dst_lo2, 8));
-    pq_hi2 = spu_madd(ppmm, dst_hi2, spu_rlqwbyte(dst_hi2, 8));
-    pq_lo3 = spu_madd(ppmm, dst_lo3, spu_rlqwbyte(dst_lo3, 8));
-    pq_hi3 = spu_madd(ppmm, dst_hi3, spu_rlqwbyte(dst_hi3, 8));
-
-    /* Perfrom the stage 2 butterfly. For this stage, the 
-     * inputs pq are still interleaved (p.real, p.imag, q.real, 
-     * q.imag), so we must first re-order the data into 
-     * parallel arrays as well as perform the reorder 
-     * associated with the twiddle W[n/4], which equals
-     * (0, -1). 
-     *
-     *	ie. (A, B) * (0, -1) => (B, -A)
-     */
-    re_lo0 = spu_madd(ppmm, 
-		      spu_shuffle(pq_lo1, pq_lo1, shuf_0303),
-		      spu_shuffle(pq_lo0, pq_lo0, shuf_0202));
-    im_lo0 = spu_madd(pmmp, 
-		      spu_shuffle(pq_lo1, pq_lo1, shuf_1212),
-		      spu_shuffle(pq_lo0, pq_lo0, shuf_1313));
-
-    re_lo1 = spu_madd(ppmm, 
-		      spu_shuffle(pq_lo3, pq_lo3, shuf_0303),
-		      spu_shuffle(pq_lo2, pq_lo2, shuf_0202));
-    im_lo1 = spu_madd(pmmp, 
-		      spu_shuffle(pq_lo3, pq_lo3, shuf_1212),
-		      spu_shuffle(pq_lo2, pq_lo2, shuf_1313));
-
-
-    re_hi0 = spu_madd(ppmm, 
-		      spu_shuffle(pq_hi1, pq_hi1, shuf_0303),
-		      spu_shuffle(pq_hi0, pq_hi0, shuf_0202));
-    im_hi0 = spu_madd(pmmp, 
-		       spu_shuffle(pq_hi1, pq_hi1, shuf_1212),
-		       spu_shuffle(pq_hi0, pq_hi0, shuf_1313));
-
-    re_hi1 = spu_madd(ppmm, 
-		      spu_shuffle(pq_hi3, pq_hi3, shuf_0303),
-		      spu_shuffle(pq_hi2, pq_hi2, shuf_0202));
-    im_hi1 = spu_madd(pmmp, 
-		      spu_shuffle(pq_hi3, pq_hi3, shuf_1212),
-		      spu_shuffle(pq_hi2, pq_hi2, shuf_1313));
-
-
-    /* Perform stage 3 butterfly.
-     */
-    FFT_1D_BUTTERFLY(re0[0], im0[0], re0[1], im0[1], re_lo0, im_lo0, re_lo1, im_lo1, w0_re, w0_im);
-    FFT_1D_BUTTERFLY(re1[0], im1[0], re1[1], im1[1], re_hi0, im_hi0, re_hi1, im_hi1, w0_re, w0_im);
-
-    re0 += 2;
-    re1 += 2;
-    im0 += 2; 
-    im1 += 2;
-    
-    i += 8;
-    i_rev = BIT_SWAP(i, reverse) / 2;
-  } while (i < n_2);
-
-  /* Process stages 4 to log2_size-2
-   */
-  for (stage=4, stride=4; stage<log2_size-1; stage++, stride += stride) {
-    w_stride  = n_2 >> stage;
-    w_2stride = n   >> stage;
-    w_3stride = w_stride +  w_2stride;
-    w_4stride = w_2stride + w_2stride;
-
-    W0 = W;
-    W1 = W + w_stride;
-    W2 = W + w_2stride;
-    W3 = W + w_3stride;
-
-    stride_2 = stride >> 1;
-    stride_4 = stride >> 2;
-    stride_3_4 = stride_2 + stride_4;
-
-    re0 = re;              im0 = im;
-    re1 = re + stride_2;   im1 = im + stride_2;   
-    re2 = re + stride_4;   im2 = im + stride_4;   
-    re3 = re + stride_3_4; im3 = im + stride_3_4;   
-
-    for (i=0, offset=0; i<stride_4; i++, offset += w_4stride) {
-      /* Compute the twiddle factors
-       */
-      w0 = W0[offset];
-      w1 = W1[offset];
-      w2 = W2[offset];
-      w3 = W3[offset];
-
-      tmp0 = spu_shuffle(w0, w2, shuf_0415);
-      tmp1 = spu_shuffle(w1, w3, shuf_0415);
-
-      w0_re = spu_shuffle(tmp0, tmp1, shuf_0415);
-      w0_im = spu_shuffle(tmp0, tmp1, shuf_2637);
-
-      j = i;
-      k = i + stride;
-      do {
-	re_lo0 = re0[j]; im_lo0 = im0[j];
-	re_lo1 = re1[j]; im_lo1 = im1[j];
-
-	re_hi0 = re2[j]; im_hi0 = im2[j];
-	re_hi1 = re3[j]; im_hi1 = im3[j];
-
-	re_lo2 = re0[k]; im_lo2 = im0[k];
-	re_lo3 = re1[k]; im_lo3 = im1[k];
-
-	re_hi2 = re2[k]; im_hi2 = im2[k];
-	re_hi3 = re3[k]; im_hi3 = im3[k];
-
-	FFT_1D_BUTTERFLY   (re0[j], im0[j], re1[j], im1[j], re_lo0, im_lo0, re_lo1, im_lo1, w0_re, w0_im);
-	FFT_1D_BUTTERFLY_HI(re2[j], im2[j], re3[j], im3[j], re_hi0, im_hi0, re_hi1, im_hi1, w0_re, w0_im);
-
-	FFT_1D_BUTTERFLY   (re0[k], im0[k], re1[k], im1[k], re_lo2, im_lo2, re_lo3, im_lo3, w0_re, w0_im);
-	FFT_1D_BUTTERFLY_HI(re2[k], im2[k], re3[k], im3[k], re_hi2, im_hi2, re_hi3, im_hi3, w0_re, w0_im);
-
-	j += 2 * stride;
-	k += 2 * stride;
-      } while (j < n_4);
-    }
-  }
-
-  /* Process stage log2_size-1. This is identical to the stage processing above
-   * except for this stage the inner loop is only executed once so it is removed
-   * entirely.
-   */
-  w_stride  = n_2 >> stage;
-  w_2stride = n   >> stage;
-  w_3stride = w_stride +  w_2stride;
-  w_4stride = w_2stride + w_2stride;
-
-  stride_2 = stride >> 1;
-  stride_4 = stride >> 2;
-
-  stride_3_4 = stride_2 + stride_4;
-
-  re0 = re;              im0 = im;
-  re1 = re + stride_2;   im1 = im + stride_2;   
-  re2 = re + stride_4;   im2 = im + stride_4;   
-  re3 = re + stride_3_4; im3 = im + stride_3_4;   
-
-  for (i=0, offset=0; i<stride_4; i++, offset += w_4stride) {
-    /* Compute the twiddle factors
-     */
-    w0 = W[offset];
-    w1 = W[offset + w_stride];
-    w2 = W[offset + w_2stride];
-    w3 = W[offset + w_3stride];
-
-    tmp0 = spu_shuffle(w0, w2, shuf_0415);
-    tmp1 = spu_shuffle(w1, w3, shuf_0415);
-
-    w0_re = spu_shuffle(tmp0, tmp1, shuf_0415);
-    w0_im = spu_shuffle(tmp0, tmp1, shuf_2637);
-
-    j = i;
-    k = i + stride;
-
-    re_lo0 = re0[j]; im_lo0 = im0[j];
-    re_lo1 = re1[j]; im_lo1 = im1[j];
-
-    re_hi0 = re2[j]; im_hi0 = im2[j];
-    re_hi1 = re3[j]; im_hi1 = im3[j];
-
-    re_lo2 = re0[k]; im_lo2 = im0[k];
-    re_lo3 = re1[k]; im_lo3 = im1[k];
-
-    re_hi2 = re2[k]; im_hi2 = im2[k];
-    re_hi3 = re3[k]; im_hi3 = im3[k];
-      
-    FFT_1D_BUTTERFLY   (re0[j], im0[j], re1[j], im1[j], re_lo0, im_lo0, re_lo1, im_lo1, w0_re, w0_im);
-    FFT_1D_BUTTERFLY_HI(re2[j], im2[j], re3[j], im3[j], re_hi0, im_hi0, re_hi1, im_hi1, w0_re, w0_im);
-
-    FFT_1D_BUTTERFLY   (re0[k], im0[k], re1[k], im1[k], re_lo2, im_lo2, re_lo3, im_lo3, w0_re, w0_im);
-    FFT_1D_BUTTERFLY_HI(re2[k], im2[k], re3[k], im3[k], re_hi2, im_hi2, re_hi3, im_hi3, w0_re, w0_im);
-  }
-
-
-  /* Process the final stage (stage log2_size). For this stage, 
-   * reformat the data from parallel arrays back into 
-   * interleaved arrays,storing the result into <in>.
-   *
-   * This loop has been manually unrolled by 2 to improve 
-   * dual issue rates and reduce stalls. This unrolling
-   * forces a minimum FFT size of 32.
-   */
-  re0 = re;
-  re1 = re + n_8;
-  re2 = re + n_16;
-  re3 = re + n_3_16;
-
-  im0 = im;
-  im1 = im + n_8;
-  im2 = im + n_16;
-  im3 = im + n_3_16;
-
-  out0 = out;
-  out1 = out + n_4;
-  out2 = out + n_8;
-  out3 = out1 + n_8;
-
-  i = n_16;
-
-  do {
-    /* Fetch the twiddle factors
-     */
-    w0 = W[0];
-    w1 = W[1];
-    w2 = W[2];
-    w3 = W[3];
-
-    W += 4;
-
-    w0_re = spu_shuffle(w0, w1, shuf_0246);
-    w0_im = spu_shuffle(w0, w1, shuf_1357);
-    w1_re = spu_shuffle(w2, w3, shuf_0246);
-    w1_im = spu_shuffle(w2, w3, shuf_1357);
-
-    /* Fetch the butterfly inputs, reals and imaginaries
-     */
-    re_lo0 = re0[0]; im_lo0 = im0[0];
-    re_lo1 = re1[0]; im_lo1 = im1[0];
-    re_lo2 = re0[1]; im_lo2 = im0[1];
-    re_lo3 = re1[1]; im_lo3 = im1[1];
-
-    re_hi0 = re2[0]; im_hi0 = im2[0];
-    re_hi1 = re3[0]; im_hi1 = im3[0];
-    re_hi2 = re2[1]; im_hi2 = im2[1];
-    re_hi3 = re3[1]; im_hi3 = im3[1];
-
-    re0 += 2; im0 += 2;
-    re1 += 2; im1 += 2;
-    re2 += 2; im2 += 2;
-    re3 += 2; im3 += 2;
-
-    /* Perform the butterflys
-     */
-    FFT_1D_BUTTERFLY   (out_re_lo0, out_im_lo0, out_re_lo1, out_im_lo1, re_lo0, im_lo0, re_lo1, im_lo1, w0_re, w0_im);
-    FFT_1D_BUTTERFLY   (out_re_lo2, out_im_lo2, out_re_lo3, out_im_lo3, re_lo2, im_lo2, re_lo3, im_lo3, w1_re, w1_im);
-
-    FFT_1D_BUTTERFLY_HI(out_re_hi0, out_im_hi0, out_re_hi1, out_im_hi1, re_hi0, im_hi0, re_hi1, im_hi1, w0_re, w0_im);
-    FFT_1D_BUTTERFLY_HI(out_re_hi2, out_im_hi2, out_re_hi3, out_im_hi3, re_hi2, im_hi2, re_hi3, im_hi3, w1_re, w1_im);
-
-    /* Interleave the results and store them into the output buffers (ie,
-     * the original input buffers.
-     */
-    out0[0] = spu_shuffle(out_re_lo0, out_im_lo0, shuf_0415);
-    out0[1] = spu_shuffle(out_re_lo0, out_im_lo0, shuf_2637);
-    out0[2] = spu_shuffle(out_re_lo2, out_im_lo2, shuf_0415);
-    out0[3] = spu_shuffle(out_re_lo2, out_im_lo2, shuf_2637);
-
-    out1[0] = spu_shuffle(out_re_lo1, out_im_lo1, shuf_0415);
-    out1[1] = spu_shuffle(out_re_lo1, out_im_lo1, shuf_2637);
-    out1[2] = spu_shuffle(out_re_lo3, out_im_lo3, shuf_0415);
-    out1[3] = spu_shuffle(out_re_lo3, out_im_lo3, shuf_2637);
-
-    out2[0] = spu_shuffle(out_re_hi0, out_im_hi0, shuf_0415);
-    out2[1] = spu_shuffle(out_re_hi0, out_im_hi0, shuf_2637);
-    out2[2] = spu_shuffle(out_re_hi2, out_im_hi2, shuf_0415);
-    out2[3] = spu_shuffle(out_re_hi2, out_im_hi2, shuf_2637);
-
-    out3[0] = spu_shuffle(out_re_hi1, out_im_hi1, shuf_0415);
-    out3[1] = spu_shuffle(out_re_hi1, out_im_hi1, shuf_2637);
-    out3[2] = spu_shuffle(out_re_hi3, out_im_hi3, shuf_0415);
-    out3[3] = spu_shuffle(out_re_hi3, out_im_hi3, shuf_2637);
-
-    out0 += 4;
-    out1 += 4;
-    out2 += 4;
-    out3 += 4;
-
-    i -= 2;
-  } while (i);
-}
-
-#endif /* _FFT_1D_R2_H_ */
diff --git a/gcell/include/gcell/spu/gc_delay.h b/gcell/include/gcell/spu/gc_delay.h
deleted file mode 100644
index e995b3a94..000000000
--- a/gcell/include/gcell/spu/gc_delay.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GCELL_SPU_GC_DELAY_H
-#define INCLUDED_GCELL_SPU_GC_DELAY_H
-
-void gc_udelay(unsigned int usecs);
-void gc_cdelay(unsigned int cpu_cycles);
-
-#endif /* INCLUDED_GCELL_SPU_GC_DELAY_H */
diff --git a/gcell/include/gcell/spu/gc_jd_queue.h b/gcell/include/gcell/spu/gc_jd_queue.h
deleted file mode 100644
index c2300478c..000000000
--- a/gcell/include/gcell/spu/gc_jd_queue.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GCELL_SPU_GC_JD_QUEUE_H
-#define INCLUDED_GCELL_SPU_GC_JD_QUEUE_H
-
-#include <gcell/gc_jd_queue_data.h>
-
-/*
- * Declarations for SPU side of job queue interface
- */
-
-__GC_BEGIN_DECLS
-
-typedef enum {
-  GCQ_OK,		// Got an item
-  GCQ_EMPTY,		// Q is empty
-  GCQ_LOCKED,		// Somebody else has the queue locked
-} gc_dequeue_status_t;
-
-/*!
- * \brief Remove and return item at head of queue.
- *
- * \param[in]  q is EA address of queue structure.
- * \param[out] item_ea is EA address of item at head of queue.
- * \param[in]  jd_tag is the tag to use to get the LS copy of the item.
- * \param[out] item is local store copy of item at head of queue.
- * \returns false if the queue is empty, otherwise returns true
- *   and sets \p item_ea and DMA's job descriptor into \p item
- *
- * If return is not GCQ_OK, we're holding a lock-line reservation that
- * covers the queue.
- */
-gc_dequeue_status_t
-gc_jd_queue_dequeue(gc_eaddr_t q, gc_eaddr_t *item_ea,
-		    int jd_tag, gc_job_desc_t *item);
-
-__GC_END_DECLS
-
-
-#endif /* INCLUDED_GCELL_SPU_GC_JD_QUEUE_H */
diff --git a/gcell/include/gcell/spu/gc_random.h b/gcell/include/gcell/spu/gc_random.h
deleted file mode 100644
index f51b187d4..000000000
--- a/gcell/include/gcell/spu/gc_random.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GCELL_SPU_GC_RANDOM_H
-#define INCLUDED_GCELL_SPU_GC_RANDOM_H
-
-/*!
- * \brief Return a uniformly distributed value in the range [0, 1.0)
- * (Linear congruential generator. YMMV. Caveat emptor.)
- */
-
-float gc_uniform_deviate(void);
-void gc_set_seed(int seed);
-
-#endif /* INCLUDED_GCELL_SPU_GC_RANDOM_H */
diff --git a/gcell/include/gcell/spu/gc_spu_macs.h b/gcell/include/gcell/spu/gc_spu_macs.h
deleted file mode 100644
index 0d7dc9978..000000000
--- a/gcell/include/gcell/spu/gc_spu_macs.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/* -*- asm -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GC_SPU_MACS_H
-#define INCLUDED_GC_SPU_MACS_H
-
-/*
- * This file contains a set of macros that are generally useful when
- * coding in SPU assembler
- *
- * Note that the multi-instruction macros in here may overwrite
- * registers 77, 78, and 79 without warning.
- */
-
-/*
- * defines for all registers
- */
-#define r0	$0
-#define r1	$1
-#define r2	$2
-#define r3	$3
-#define r4	$4
-#define r5	$5
-#define r6	$6
-#define r7	$7
-#define r8	$8
-#define r9	$9
-#define r10	$10
-#define r11	$11
-#define r12	$12
-#define r13	$13
-#define r14	$14
-#define r15	$15
-#define r16	$16
-#define r17	$17
-#define r18	$18
-#define r19	$19
-#define r20	$20
-#define r21	$21
-#define r22	$22
-#define r23	$23
-#define r24	$24
-#define r25	$25
-#define r26	$26
-#define r27	$27
-#define r28	$28
-#define r29	$29
-#define r30	$30
-#define r31	$31
-#define r32	$32
-#define r33	$33
-#define r34	$34
-#define r35	$35
-#define r36	$36
-#define r37	$37
-#define r38	$38
-#define r39	$39
-#define r40	$40
-#define r41	$41
-#define r42	$42
-#define r43	$43
-#define r44	$44
-#define r45	$45
-#define r46	$46
-#define r47	$47
-#define r48	$48
-#define r49	$49
-#define r50	$50
-#define r51	$51
-#define r52	$52
-#define r53	$53
-#define r54	$54
-#define r55	$55
-#define r56	$56
-#define r57	$57
-#define r58	$58
-#define r59	$59
-#define r60	$60
-#define r61	$61
-#define r62	$62
-#define r63	$63
-#define r64	$64
-#define r65	$65
-#define r66	$66
-#define r67	$67
-#define r68	$68
-#define r69	$69
-#define r70	$70
-#define r71	$71
-#define r72	$72
-#define r73	$73
-#define r74	$74
-#define r75	$75
-#define r76	$76
-#define r77	$77
-#define r78	$78
-#define r79	$79
-#define r80	$80
-#define r81	$81
-#define r82	$82
-#define r83	$83
-#define r84	$84
-#define r85	$85
-#define r86	$86
-#define r87	$87
-#define r88	$88
-#define r89	$89
-#define r90	$90
-#define r91	$91
-#define r92	$92
-#define r93	$93
-#define r94	$94
-#define r95	$95
-#define r96	$96
-#define r97	$97
-#define r98	$98
-#define r99	$99
-#define r100	$100
-#define r101	$101
-#define r102	$102
-#define r103	$103
-#define r104	$104
-#define r105	$105
-#define r106	$106
-#define r107	$107
-#define r108	$108
-#define r109	$109
-#define r110	$110
-#define r111	$111
-#define r112	$112
-#define r113	$113
-#define r114	$114
-#define r115	$115
-#define r116	$116
-#define r117	$117
-#define r118	$118
-#define r119	$119
-#define r120	$120
-#define r121	$121
-#define r122	$122
-#define r123	$123
-#define r124	$124
-#define r125	$125
-#define r126	$126
-#define r127	$127
-
-
-#define	lr	r0	// link register
-#define	sp	r1	// stack pointer
-                        // r2 is environment pointer for langs that need it (ALGOL)
-
-#define	retval	r3	// return values are passed in regs starting at r3
-
-#define	arg1	r3	// args are passed in regs starting at r3
-#define	arg2	r4
-#define	arg3	r5
-#define	arg4	r6
-#define	arg5	r7
-#define	arg6	r8
-#define	arg7	r9
-#define	arg8	r10
-#define	arg9	r11
-#define	arg10	r12
-
-//  r3 -  r74 are volatile (caller saves)
-// r74 -  r79 are volatile (scratch regs possibly destroyed by fct prolog/epilog)
-// r80 - r127 are non-volatile (callee-saves)
-
-// scratch registers reserved for use by the macros in this file.
-
-#define _gc_t0	r79
-#define	_gc_t1	r78
-#define	_gc_t2	r77
-
-/*
- * ----------------------------------------------------------------
- * 		    	    pseudo ops
- * ----------------------------------------------------------------
- */
-#define PROC_ENTRY(name)		\
-        .text;				\
-	.p2align 4;			\
-	.global	name;			\
-	.type	name, @function;	\
-name:
-
-/*
- * ----------------------------------------------------------------
- * 		    aliases for common operations
- * ----------------------------------------------------------------
- */
-
-// Move register (even pipe, 2 cycles)
-#define MR(rt, ra) 			or	rt, ra, ra;
-
-// Move register (odd pipe, 4 cycles)
-#define	LMR(rt, ra) 			rotqbyi	rt, ra, 0;
-
-// return
-#define	RETURN() 			bi	lr;
-
-// hint for a return
-#define	HINT_RETURN(ret_label)		hbr	ret_label, lr;
-
-// return if zero
-#define BRZ_RETURN(rt)			biz	rt, lr;
-
-// return if not zero
-#define BRNZ_RETURN(rt)			binz	rt, lr;
-
-// return if halfword zero
-#define	BRHZ_RETURN(rt)			bihz	rt, lr;
-
-// return if halfword not zero
-#define BRHNZ_RETURN(rt)		bihnz	rt, lr;
-
-
-/*
- * ----------------------------------------------------------------
- * modulo like things for constant moduli that are powers of 2
- * ----------------------------------------------------------------
- */
-
-// rt = ra & (pow2 - 1)
-#define MODULO(rt, ra, pow2) \
-	andi	rt, ra, (pow2)-1;
-
-// rt = pow2 - (ra & (pow2 - 1))
-#define MODULO_NEG(rt, ra, pow2) \
-	andi	rt, ra, (pow2)-1;	      	\
-	sfi	rt, rt, (pow2);
-
-// rt = ra & -(pow2)
-#define	ROUND_DOWN(rt, ra, pow2) \
-	andi	rt, ra, -(pow2);
-
-// rt = (ra + (pow2 - 1)) & -(pow2)
-#define ROUND_UP(rt, ra, pow2) \
-	ai	rt, ra, (pow2)-1;	      	\
-	andi	rt, rt, -(pow2);
-
-/*
- * ----------------------------------------------------------------
- * Splat - replicate a particular slot into all slots
- * Altivec analogs...
- * ----------------------------------------------------------------
- */
-
-// replicate byte from slot s [0,15]
-#define VSPLTB(rt, ra, s) \
-	ilh	_gc_t0, (s)*0x0101;	        \
-	shufb	rt, ra, ra, _gc_t0;
-
-// replicate halfword from slot s [0,7]
-#define	VSPLTH(rt, ra, s) \
-	ilh	_gc_t0, 2*(s)*0x0101 + 0x0001; 	\
-	shufb	rt, ra, ra, _gc_t0;
-
-// replicate word from slot s [0,3]
-#define VSPLTW(rt, ra, s) \
-	iluh	_gc_t0, 4*(s)*0x0101 + 0x0001;	\
-	iohl	_gc_t0, 4*(s)*0x0101 + 0x0203;	\
-	shufb	rt, ra, ra, _gc_t0;
-	
-// replicate double from slot s [0,1]
-#define	VSPLTD(rt, ra, s) \
-	/* sp is always 16-byte aligned */ \
-	cdd	_gc_t0, 8(sp);		/* 0x10111213 14151617 00010203 04050607 */ \
-	rotqbyi	rt, ra, ra, (s) << 3;	/* rotate double into preferred slot 	 */ \
-	shufb	rt, rt, rt, _gc_t0;
-
-/*
- * ----------------------------------------------------------------
- * lots of min/max variations...
- *
- * On a slot by slot basis, compute the min or max
- *
- * U - unsigned, else signed
- * B,H,{} - byte, halfword, word
- * F float
- * ----------------------------------------------------------------
- */
-
-#define MIN_SELB(rt, ra, rb, rc)	selb	rt, ra, rb, rc;
-#define MAX_SELB(rt, ra, rb, rc)	selb	rt, rb, ra, rc;
-	
-	// words
-
-#define MIN(rt, ra, rb) \
-	cgt	_gc_t0, ra, rb; \
-	MIN_SELB(rt, ra, rb, _gc_t0)
-	
-#define	MAX(rt, ra, rb) \
-	cgt	_gc_t0, ra, rb; \
-	MAX_SELB(rt, ra, rb, _gc_t0)
-
-#define UMIN(rt, ra, rb) \
-	clgt	_gc_t0, ra, rb; \
-	MIN_SELB(rt, ra, rb, _gc_t0)
-	
-#define	UMAX(rt, ra, rb) \
-	clgt	_gc_t0, ra, rb; \
-	MAX_SELB(rt, ra, rb, _gc_t0)
-
-	// bytes
-	
-#define MINB(rt, ra, rb) \
-	cgtb	_gc_t0, ra, rb; \
-	MIN_SELB(rt, ra, rb, _gc_t0)
-	
-#define	MAXB(rt, ra, rb) \
-	cgtb	_gc_t0, ra, rb; \
-	MAX_SELB(rt, ra, rb, _gc_t0)
-
-#define UMINB(rt, ra, rb) \
-	clgtb	_gc_t0, ra, rb; \
-	MIN_SELB(rt, ra, rb, _gc_t0)
-	
-#define	UMAXB(rt, ra, rb) \
-	clgtb	_gc_t0, ra, rb; \
-	MAX_SELB(rt, ra, rb, _gc_t0)
-
-	// halfwords
-	
-#define MINH(rt, ra, rb) \
-	cgth	_gc_t0, ra, rb; \
-	MIN_SELB(rt, ra, rb, _gc_t0)
-	
-#define	MAXH(rt, ra, rb) \
-	cgth	_gc_t0, ra, rb; \
-	MAX_SELB(rt, ra, rb, _gc_t0)
-
-#define UMINH(rt, ra, rb) \
-	clgth	_gc_t0, ra, rb; \
-	MIN_SELB(rt, ra, rb, _gc_t0)
-	
-#define	UMAXH(rt, ra, rb) \
-	clgth	_gc_t0, ra, rb; \
-	MAX_SELB(rt, ra, rb, _gc_t0)
-
-	// floats
-	
-#define FMIN(rt, ra, rb) \
-	fcgt	_gc_t0, ra, rb; \
-	MIN_SELB(rt, ra, rb, _gc_t0)
-	
-#define	FMAX(rt, ra, rb) \
-	fcgt	_gc_t0, ra, rb; \
-	MAX_SELB(rt, ra, rb, _gc_t0)
-
-// Ignoring the sign, select the values with the minimum magnitude
-#define FMINMAG(rt, ra, rb) \
-	fcmgt	_gc_t0, ra, rb; \
-	MIN_SELB(rt, ra, rb, _gc_t0)
-	
-// Ignoring the sign, select the values with the maximum magnitude
-#define	FMAXMAG(rt, ra, rb) \
-	fcmgt	_gc_t0, ra, rb; \
-	MAX_SELB(rt, ra, rb, _gc_t0)
-
-
-#endif /* INCLUDED_GC_SPU_MACS_H */
diff --git a/gcell/include/gcell/spu/libfft.h b/gcell/include/gcell/spu/libfft.h
deleted file mode 100644
index dd387be0c..000000000
--- a/gcell/include/gcell/spu/libfft.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* --------------------------------------------------------------  */
-/* (C)Copyright 2008 Free Software Foundation, Inc.                */
-/* (C)Copyright 2001,2007,                                         */
-/* International Business Machines Corporation,                    */
-/* Sony Computer Entertainment, Incorporated,                      */
-/* Toshiba Corporation,                                            */
-/*                                                                 */
-/* All Rights Reserved.                                            */
-/*                                                                 */
-/* Redistribution and use in source and binary forms, with or      */
-/* without modification, are permitted provided that the           */
-/* following conditions are met:                                   */
-/*                                                                 */
-/* - Redistributions of source code must retain the above copyright*/
-/*   notice, this list of conditions and the following disclaimer. */
-/*                                                                 */
-/* - Redistributions in binary form must reproduce the above       */
-/*   copyright notice, this list of conditions and the following   */
-/*   disclaimer in the documentation and/or other materials        */
-/*   provided with the distribution.                               */
-/*                                                                 */
-/* - Neither the name of IBM Corporation nor the names of its      */
-/*   contributors may be used to endorse or promote products       */
-/*   derived from this software without specific prior written     */
-/*   permission.                                                   */
-/*                                                                 */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND          */
-/* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,     */
-/* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF        */
-/* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        */
-/* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            */
-/* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,    */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT    */
-/* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;    */
-/* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)        */
-/* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN       */
-/* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR    */
-/* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  */
-/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              */
-/* --------------------------------------------------------------  */
-/* PROLOG END TAG zYx                                              */
-
-#ifndef INCLUDED_LIBFFT_H
-#define INCLUDED_LIBFFT_H
-
-// must be defined before inclusion of fft_1d_r2.h
-#define MAX_FFT_1D_SIZE 4096
-
-/* fft_1d_r2
- * ---------
- * Performs a single precision, complex Fast Fourier Transform using 
- * the DFT (Discrete Fourier Transform) with radix-2 decimation in time. 
- * The input <in> is an array of complex numbers of length (1<<log2_size)
- * entries. The result is returned in the array of complex numbers specified
- * by <out>. Note: This routine can support an in-place transformation
- * by specifying <in> and <out> to be the same array.
- *
- * This implementation utilizes the Cooley-Tukey algorithm consisting 
- * of <log2_size> stages. The basic operation is the butterfly.
- *
- *          p --------------------------> P = p + q*Wi
- *                        \      /
- *                         \    /
- *                          \  /
- *                           \/
- *                           /\
- *                          /  \
- *                         /    \
- *               ____     /      \
- *          q --| Wi |-----------------> Q = p - q*Wi
- *               ----
- *
- * This routine also requires pre-computed twiddle values, W. W is an
- * array of single precision complex numbers of length 1<<(log2_size-2) 
- * and is computed as follows:
- *
- *	for (i=0; i<n/4; i++)
- *	    W[i].real =  cos(i * 2*PI/n);
- *	    W[i].imag = -sin(i * 2*PI/n);
- *      }
- *
- * This array actually only contains the first half of the twiddle
- * factors. Due for symmetry, the second half of the twiddle factors
- * are implied and equal:
- *
- *	for (i=0; i<n/4; i++)
- *	    W[i+n/4].real =  W[i].imag =  sin(i * 2*PI/n);
- *	    W[i+n/4].imag = -W[i].real = -cos(i * 2*PI/n);
- *      }
- *
- * Further symmetry allows one to generate the twiddle factor table 
- * using half the number of trig computations as follows:
- *
- *      W[0].real = 1.0;
- *      W[0].imag = 0.0;
- *	for (i=1; i<n/4; i++)
- *	    W[i].real =  cos(i * 2*PI/n);
- *	    W[n/4 - i].imag = -W[i].real;
- *      }
- *
- * The complex numbers are packed into quadwords as follows:
- *
- *    quadword			      complex
- *  array element                   array elements
- *             -----------------------------------------------------
- *       i    |  real 2*i   |  imag 2*i  | real 2*i+1  | imag 2*i+1 | 
- *             -----------------------------------------------------
- *
- */
-
-void fft_1d_r2(vector float *out, vector float *in, vector float *W, int log2_size);
-
-#endif /* INCLUDED_LIBFFT_H */
diff --git a/gcell/lib/Makefile.am b/gcell/lib/Makefile.am
deleted file mode 100644
index 7a727ea84..000000000
--- a/gcell/lib/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = spu runtime general wrapper .
-
-# generate libgcell.la from the convenience libraries in subdirs
-
-lib_LTLIBRARIES = libgcell.la libgcell-qa.la
-
-libgcell_la_SOURCES = 
-libgcell_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-libgcell_qa_la_SOURCES = 
-libgcell_qa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-libgcell_la_LIBADD = \
-	runtime/libruntime.la \
-	wrapper/libwrapper.la \
-	-lspe2 \
-	$(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
-
-libgcell_qa_la_LIBADD = \
-	runtime/libruntime-qa.la \
-	wrapper/libwrapper-qa.la \
-	$(CPPUNIT_LIBS)
diff --git a/gcell/lib/general/.gitignore b/gcell/lib/general/.gitignore
deleted file mode 100644
index 3531485fb..000000000
--- a/gcell/lib/general/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.a
-/*.o
diff --git a/gcell/lib/general/Makefile.am b/gcell/lib/general/Makefile.am
deleted file mode 100644
index bd5a4de62..000000000
--- a/gcell/lib/general/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-
diff --git a/gcell/lib/general/spu/.gitignore b/gcell/lib/general/spu/.gitignore
deleted file mode 100644
index 3531485fb..000000000
--- a/gcell/lib/general/spu/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.a
-/*.o
diff --git a/gcell/lib/general/spu/fft_1d_r2.c b/gcell/lib/general/spu/fft_1d_r2.c
deleted file mode 100644
index 0a87e74a8..000000000
--- a/gcell/lib/general/spu/fft_1d_r2.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/spu/libfft.h>
-#include <gcell/spu/fft_1d_r2.h>
-#include <assert.h>
-
-/*
- * invoke the inline version
- */
-void 
-fft_1d_r2(vector float *out, vector float *in, vector float *W, int log2_size)
-{
-  assert((1 << log2_size) <= MAX_FFT_1D_SIZE);
-
-  _fft_1d_r2(out, in, W, log2_size);
-}
diff --git a/gcell/lib/general/spu/memset.S b/gcell/lib/general/spu/memset.S
deleted file mode 100644
index 39eabce02..000000000
--- a/gcell/lib/general/spu/memset.S
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- asm -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/spu/gc_spu_macs.h>
-
-	.file "memset.S"
-
-	/*
-	 * Computes this, only a lot faster...
-	 *
-	 *	void *
-	 *	memset(void *pv, int c, size_t n)
-	 *	{
-	 *	  unsigned char *p = (unsigned char *) pv;
-	 *	  size_t i;
-	 *	  for (i = 0; i < n; i++)
-	 *	    p[i] = c;
-	 *	
-	 *	  return pv;
-	 *	}
-	 */
-	
-#define	p_arg	arg1	// we're going to clobber arg1 w/ the return value
-#define	c	arg2	// the constant we're writing
-#define	n	arg3	// how many bytes to write
-
-#define	p	r13	// where we're writing
-#define	t0	r14
-#define t1	r15
-#define	mask	r16
-#define	old	r17
-#define an	r18	// aligned n (n rounded down to mod 16 boundary)
-#define	next_p	r19
-#define	cond1	r20
-#define	cond2	r21				
-#define m	r22
-#define r	r23
-	
-	PROC_ENTRY(memset)
-	
-	// Hint the return from do_head, in case we go that way.
-	// There's pretty much nothing to can do to hint the branch to it.
-	hbrr	do_head_br, head_complete
-	
-	MR(p, p_arg)	// leaves p, the return value, in the correct reg (r3)
-	BRZ_RETURN(n)
-
-	MODULO(t0, p, 16)	// is p%16 == 0?
-	VSPLTB(c, c, 3)		// splat byte in preferred slot of c into all slots
-	brnz	t0, do_head	// no, handle it
-head_complete:
-
-	/*
-	 * preconditions:	
-	 *   p%16 == 0, n > 0
-	 */
-	hbrr	middle_loop_br, middle_loop
-	
-	ROUND_DOWN(an, n, 16)	// an is "aligned n"
-	MODULO(n, n, 16)	// what's left over in the last quad
-	brz	an, do_tail	// no whole quad words; skip to tail
-	clgti	t0, an, 127	// an >= 128?
-	brz	t0, middle2	// nope, go handle the cases between 0 and 112
-
-	/*
-	 * 128 bytes / iteration
-	 */
-	.p2align 4
-middle_loop:
-	ai	an, an, -128
-	  stqd	c,  0*16(p)
-	ai	next_p, p, 128
-	  stqd	c,  1*16(p)
-	cgti	cond1, an, 127
-	  stqd	c,  2*16(p)
-
-	  stqd	c,  3*16(p)
-	  stqd	c,  4*16(p)
-	  stqd	c,  5*16(p)
-	  stqd	c,  6*16(p)
-	
-	MR(p, next_p)
-	  stqd	c,  7*16-128(next_p)
-	or	cond2, n, an
-middle_loop_br:
-	  brnz	cond1, middle_loop
-	
-	/*
-	 * if an and n are both zero, return now 
-	 */
-	BRZ_RETURN(cond2)
-
-	/*
-	 * otherwise handle last of full quad words 
-	 *
-	 *   0 <= an < 128, p%16 == 0
-	 */
-middle2:
-	/*
-	 * if an == 0, go handle the final non-full quadword
-	 */
-	brz	an, do_tail
-	hbrr	middle2_loop_br, middle2_loop
-	
-	.p2align 3
-middle2_loop:	
-	ai	next_p, p, 16
-	  stqd	c, 0(p)
-	ai	an, an, -16
-	  LMR(p, next_p)
-middle2_loop_br:
-	  brnz	an, middle2_loop
-	
-	/* We're done with the full quadwords. */
-	
-	/*
-	 * Handle the final partial quadword.
-	 * We'll be modifying only the left hand portion of the quad.
-	 *
-	 * preconditions:
-	 *   an == 0, 0 <= n < 16, p%16 == 0
-	 */
-do_tail:
-	HINT_RETURN(do_tail_ret)
-	il	mask, -1
-	sfi	t1, n, 16		// t1 = 16 - n
-	lqd	old, 0(p)
-	shlqby  mask, mask, t1
-	selb	t0, old, c, mask
-	stqd	t0, 0(p)
-do_tail_ret:	
-	RETURN()
-
-	/*
-	 * ----------------------------------------------------------------
-	 * Handle the first partial quadword
-	 *
-	 * preconditions:
-	 *   p%16 != 0
-	 *
-         * postconditions:
-         *   p%16 == 0 or n == 0
-         *
-         *        |-- m --|
-         *     +----------------+----------------+
-         *     |  ////////      |                |
-         *     +----------------+----------------+
-         *        |----- r -----|
-         *        p
-         * ----------------------------------------------------------------
-	 */
-do_head:
-	lqd	old, 0(p)
-	MODULO_NEG(r, p, 16)
-	il	mask, -1
-	UMIN(m, r, n)
-	shlqby	mask, mask, m	// 1's in the top, m*8 0's in the bottom
-	MR(t1, p)
-	sf	t0, m, r	// t0 = r - m
-	a	p, p, m		// p += m
-	rotqby	mask, mask, t0	// rotate 0's to the right place	
-	sf	n, m, n		// n -= m
-	selb	t0, c, old, mask // merge
-	stqd	t0, 0(t1)
-	BRZ_RETURN(n)
-do_head_br:
-	br	head_complete
diff --git a/gcell/lib/general/spu/qa_memset.c b/gcell/lib/general/spu/qa_memset.c
deleted file mode 100644
index e51b02c9a..000000000
--- a/gcell/lib/general/spu/qa_memset.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/gc_declare_proc.h>
-#include <spu_intrinsics.h>
-#include <spu_mfcio.h>
-#include <string.h>
-#include <stdio.h>
-
-
-#define MAX_QA_BYTES  1024
-#define	MAX_OFFSET    32
-#define	ALIGNMENT     16
-#define	K	      0xA5
-
-// FIXME should be passed at gcell init time
-//static const int TIMEBASE = 79800000; // ps3
-static const int TIMEBASE = 26666666; // qs21
-
-typedef void* (*memset_fptr)(void *s, int val, size_t n);
-
-void *
-memset_ref(void *sv, int c, size_t n)
-{
-  unsigned char *s = (unsigned char *) sv;
-  size_t i;
-  for (i = 0; i < n; i++)
-    s[i] = c;
-
-  return sv;
-}
-
-static bool
-check_before(unsigned char *buf, size_t len, size_t offset)
-{
-  unsigned char *p = buf + sizeof(vector unsigned char) + offset;
-  bool ok = true;
-  int i;
-
-  for (i = -16; i < 0; i++){
-    unsigned char expected = (&p[i] - buf) & 0xff;
-    if (p[i] != expected){
-      printf("b:memset(%p, 0x%x, %zu) <offset %2zd> [%3d] expected %02x, got %02x\n",
-	     p, K, len, offset, i, K, p[i]);
-      ok = false;
-    }
-  }
-  return ok;
-}
-
-static bool
-check_middle(unsigned char *buf, size_t len, size_t offset)
-{
-  unsigned char *p = buf + sizeof(vector unsigned char) + offset;
-  bool ok = true;
-  size_t i;
-
-  for (i = 0; i < len; i++){
-    unsigned char expected = K;
-    if (p[i] != expected){
-      printf("m:memset(%p, 0x%x, %zu) <offset %2zd> [%3zd] expected %02x, got %02x\n",
-	     p, K, len, offset, i, expected, p[i]);
-      ok = false;
-    }
-  }
-  return ok;
-}
-
-static bool
-check_after(unsigned char *buf, size_t len, size_t offset)
-{
-  unsigned char *p = buf + sizeof(vector unsigned char) + offset;
-  bool ok = true;
-  size_t i;
-
-  for (i = len; i < len + 16; i++){
-    unsigned char expected = (&p[i] - buf) & 0xff;
-    if (p[i] != expected){
-      printf("a:memset(%p, 0x%x, %zu) <offset %2zd> [%3zd] expected %02x, got %02x\n",
-	     p, K, len, offset, i, expected, p[i]);
-      ok = false;
-    }
-  }
-  return ok;
-}
-
-
-static bool
-test_memset_aux(memset_fptr f,
-		unsigned char *buf, size_t buflen, size_t len, size_t offset)
-{
-  size_t i;
-
-  // init buffer to non-zero known state
-  for (i = 0; i < buflen; i++)
-    buf[i] = i;
-  
-  // Our working buffer.  Starts 16 bytes + offset into buf.
-  // We offset by 16 so that we can see if data before is getting damaged.
-  unsigned char *p = buf + sizeof(vector unsigned char) + offset;
-
-  (*f)(p, K, len);
-
-  bool ok = true;
-  ok &= check_before(buf, len, offset);
-  ok &= check_middle(buf, len, offset);
-  ok &= check_after(buf, len, offset);
-
-  return ok;
-}
-
-bool
-test_memset(memset_fptr f)
-{
-  size_t BUFLEN = MAX_QA_BYTES + 2*sizeof(vector unsigned char) + MAX_OFFSET;
-  unsigned char unaligned_buf[BUFLEN + ALIGNMENT -1];
-  unsigned char *aligned_buf =
-    (unsigned char *)((((intptr_t) unaligned_buf) + ALIGNMENT - 1) & -ALIGNMENT);
-
-  // printf("unaligned = %p\n", unaligned_buf);
-  // printf("aligned   = %p\n", aligned_buf);
-
-  size_t len;
-  size_t offset;
-  bool ok = true;
-
-  for (len = 0; len < MAX_QA_BYTES; len++){
-    for (offset = 0; offset <= MAX_OFFSET; offset++){
-      ok &= test_memset_aux(f, aligned_buf, BUFLEN, len, offset);
-    }
-  }
-
-  return ok;
-}
-
-// returns bytes/s
-float
-benchmark_memset(memset_fptr f, bool aligned)
-{
-  static const int SIZE = 32768;
-  unsigned char buf[SIZE];
-  uint32_t	t0, t1;
-  int		nbytes;
-
-  spu_write_decrementer(0xffffffff);
-
-  if (aligned){
-    nbytes = SIZE;
-    t0 = spu_read_decrementer();
-    (*f)(buf, 0x55, nbytes);
-    (*f)(buf, 0x55, nbytes);
-    (*f)(buf, 0x55, nbytes);
-    (*f)(buf, 0x55, nbytes);
-    t1 = spu_read_decrementer();
-  }
-  else {
-    nbytes = SIZE - 2;
-    t0 = spu_read_decrementer();
-    (*f)(buf + 1, 0x55, nbytes);
-    (*f)(buf + 1, 0x55, nbytes);
-    (*f)(buf + 1, 0x55, nbytes);
-    (*f)(buf + 1, 0x55, nbytes);
-    t1 = spu_read_decrementer();
-  }
-
-  //printf("delta ticks: %d\n", t0 - t1);
-  return (float) nbytes * 4 / ((t0 - t1) * 1.0/TIMEBASE);
-}
-
-/*
- * Implement the standard QA stub.
- * No input arguments, 1 bool output.
- */
-static void
-gcs_qa_memset(const gc_job_direct_args_t *input _UNUSED,
-	      gc_job_direct_args_t *output,
-	      const gc_job_ea_args_t *eaa _UNUSED)
-{
-  bool ok = test_memset(memset);
-  output->arg[0].u32 = ok;
-}
-
-GC_DECLARE_PROC(gcs_qa_memset, "qa_memset");
diff --git a/gcell/lib/runtime/.gitignore b/gcell/lib/runtime/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/gcell/lib/runtime/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gcell/lib/runtime/Makefile.am b/gcell/lib/runtime/Makefile.am
deleted file mode 100644
index 3ce637636..000000000
--- a/gcell/lib/runtime/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright 2007,2008,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-IBM_PPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/ibm/sync/ppu_source
-
-
-AM_CPPFLAGS = $(DEFINES) $(GCELL_INCLUDES) $(IBM_PPU_SYNC_INCLUDES) \
-	$(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
-
-
-dist_bin_SCRIPTS = gcell-embedspu-libtool
-
-noinst_LTLIBRARIES = libruntime.la libruntime-qa.la
-
-libruntime_la_SOURCES = \
-	gc_aligned_alloc.cc \
-	gc_job_manager.cc \
-	gc_job_manager_impl.cc \
-	gc_jd_queue.c \
-	gc_jd_stack.c \
-	gc_proc_def_utils.cc
-
-libruntime_qa_la_SOURCES = \
-	qa_gcell_runtime.cc \
-	qa_jd_queue.cc \
-	qa_jd_stack.cc \
-	qa_job_manager.cc
-
-
-noinst_HEADERS = \
-	gc_client_thread_info.h \
-	gc_job_manager_impl.h \
-	gc_proc_def_utils.h \
-	qa_jd_queue.h \
-	qa_jd_stack.h \
-	qa_job_manager.h \
-	qa_gcell_runtime.h
-
-# generate a libtool.lo that contains an embeded SPU executable
-gcell_runtime_qa.lo: ../spu/gcell_runtime_qa
-	$(GCELL_EMBEDSPU_LIBTOOL) $< $@
-
-libruntime_qa_la_LIBADD = \
-	gcell_runtime_qa.lo \
-	libruntime.la
-
-CLEANFILES = gcell_runtime_qa.lo
diff --git a/gcell/lib/runtime/gc_aligned_alloc.cc b/gcell/lib/runtime/gc_aligned_alloc.cc
deleted file mode 100644
index 905154e3d..000000000
--- a/gcell/lib/runtime/gc_aligned_alloc.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gcell/gc_aligned_alloc.h>
-#include <stdlib.h>
-#include <stdexcept>
-#include <string.h>
-
-// custom deleter of anything that can be freed with "free"
-class free_deleter {
-public:
-  void operator()(void *p) {
-    free(p);
-  }
-};
-
-void *
-gc_aligned_alloc(size_t size, size_t alignment)
-{
-  void *p = 0;
-  if (posix_memalign(&p, alignment, size) != 0){
-    perror("posix_memalign");
-    throw std::runtime_error("memory");
-  }
-  memset(p, 0, size);		// zero the memory
-  return p;
-}
-
-boost::shared_ptr<void>
-gc_aligned_alloc_sptr(size_t size, size_t alignment)
-{
-  return boost::shared_ptr<void>(gc_aligned_alloc(size, alignment),
-				 free_deleter());
-}
diff --git a/gcell/lib/runtime/gc_client_thread_info.h b/gcell/lib/runtime/gc_client_thread_info.h
deleted file mode 100644
index e49c07097..000000000
--- a/gcell/lib/runtime/gc_client_thread_info.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GC_CLIENT_THREAD_INFO_H
-#define INCLUDED_GC_CLIENT_THREAD_INFO_H
-
-#include <boost/thread.hpp>
-#include <boost/utility.hpp>
-
-enum gc_ct_state {
-  CT_NOT_WAITING,
-  CT_WAIT_ALL,
-  CT_WAIT_ANY,
-};
-
-/*
- * \brief per client-thread data used by gc_job_manager
- *
- * "Client threads" are any threads that invoke methods on
- * gc_job_manager.  We use pthread_set_specific to store a pointer to
- * one of these for each thread that comes our way.
- */
-class gc_client_thread_info : boost::noncopyable {
-public:
-  gc_client_thread_info() :
-    d_free(1), d_cond(), d_state(CT_NOT_WAITING),
-    d_jobs_done(0), d_njobs_waiting_for(0),
-    d_jobs_waiting_for(0){ }
-
-  ~gc_client_thread_info() {
-    d_free = 1;
-    d_state = CT_NOT_WAITING;
-    d_jobs_done = 0;
-    d_njobs_waiting_for = 0;
-    d_jobs_waiting_for = 0;
-  }
-
-  //! is this cti free? (1->free, 0->in use)
-  uint32_t	  d_free;
-
-  //! which client info are we?
-  uint16_t	  d_client_id;
-
-  //! hold this mutex to manipulate anything below here
-  boost::mutex	  d_mutex;
-
-  //! signaled by event handler to wake client thread up
-  boost::condition_variable d_cond;
-
-  //! Is this client waiting?
-  gc_ct_state	  d_state;
-  
-  //! Jobs that have finished and not yet been waited for (bitvector)
-  unsigned long	 *d_jobs_done;
-
-  //! # of jobs we're waiting for
-  unsigned int    d_njobs_waiting_for;
-
-  //! Jobs that client thread is waiting for
-  gc_job_desc	 **d_jobs_waiting_for;
-
-};
-
-#endif /* INCLUDED_GC_CLIENT_THREAD_INFO_H */
diff --git a/gcell/lib/runtime/gc_jd_queue.c b/gcell/lib/runtime/gc_jd_queue.c
deleted file mode 100644
index aeabd305a..000000000
--- a/gcell/lib/runtime/gc_jd_queue.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/gc_jd_queue.h>
-#include <gcell/memory_barrier.h>
-#include <mutex_init.h>
-#include <mutex_lock.h>
-#include <mutex_unlock.h>
-
-void 
-gc_jd_queue_init(gc_jd_queue_t *q)
-{
-  _mutex_init(ptr_to_ea(&q->mutex));
-  q->head = 0;
-  q->tail = 0;
-  smp_wmb();
-}
-  
-void
-gc_jd_queue_enqueue(gc_jd_queue_t *q, gc_job_desc_t *item)
-{
-  item->sys.next = 0;
-  _mutex_lock(ptr_to_ea(&q->mutex));
-  smp_rmb();		// import barrier
-
-  if (q->tail == 0){    // currently empty
-    q->tail = q->head = jdp_to_ea(item);
-  }
-  else {		// not empty, append
-    ea_to_jdp(q->tail)->sys.next = jdp_to_ea(item);
-    q->tail = jdp_to_ea(item);
-  }
-
-  smp_wmb();		// orders stores above before clearing of mutex
-  _mutex_unlock(ptr_to_ea(&q->mutex));
-}
-
-gc_job_desc_t *
-gc_jd_queue_dequeue(gc_jd_queue_t *q)
-{
-  _mutex_lock(ptr_to_ea(&q->mutex));
-  smp_rmb();		// import barrier
-  
-  gc_eaddr_t item_ea = q->head;
-  if (item_ea == 0){	// empty
-    _mutex_unlock(ptr_to_ea(&q->mutex));
-    return 0;
-  }
-
-  q->head = ea_to_jdp(item_ea)->sys.next;
-  if (q->head == 0)	// now emtpy
-    q->tail = 0;
-
-  gc_job_desc_t *item = ea_to_jdp(item_ea);
-  item->sys.next = 0;
-
-  smp_wmb();		// orders stores above before clearing of mutex
-  _mutex_unlock(ptr_to_ea(&q->mutex));
-  return item;
-}
diff --git a/gcell/lib/runtime/gc_jd_stack.c b/gcell/lib/runtime/gc_jd_stack.c
deleted file mode 100644
index 4d865acf0..000000000
--- a/gcell/lib/runtime/gc_jd_stack.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/gc_jd_stack.h>
-#include <gcell/memory_barrier.h>
-
-/*
- * begin extract from ppu_intrinics.h
- * FIXME handle this a different way
- */
-
-#if !defined(__PPU__) && !defined(__ppc__) && !defined(__ppc64__)
-    && !defined(__GNUC__)
-  #error ppu_intrinsics.h included on wrong platform/compiler
-#endif
-
-#define __lwarx(base) __extension__		\
-  ({unsigned int result;	       		\
-    typedef  struct {char a[4];} wordsize;	\
-    wordsize *ptrp = (wordsize*)(base);		\
-  __asm__ volatile ("lwarx %0,%y1"		\
-	   : "=r" (result)			\
-	   : "Z" (*ptrp));			\
-  result; })
-
-#ifdef __powerpc64__
-#define __ldarx(base) __extension__			\
-  ({unsigned long long result;	       			\
-    typedef  struct {char a[8];} doublewordsize;	\
-    doublewordsize *ptrp = (doublewordsize*)(base);	\
-  __asm__ volatile ("ldarx %0,%y1"		       	\
-	   : "=r" (result)				\
-	   : "Z" (*ptrp));				\
-  result; })
-#endif /* __powerpc64__ */
-
-#define __stwcx(base, value) __extension__	\
-  ({unsigned int result;			\
-    typedef  struct {char a[4];} wordsize;	\
-    wordsize *ptrp = (wordsize*)(base);		\
-  __asm__ volatile ("stwcx. %2,%y1\n"		\
-	   "\tmfocrf %0,0x80"			\
-	   : "=r" (result),			\
-	     "=Z" (*ptrp)			\
-	   : "r" (value));			\
-  ((result & 0x20000000) >> 29); })
-
-
-#ifdef __powerpc64__
-#define __stdcx(base, value) __extension__		\
-  ({unsigned long long result;				\
-    typedef  struct {char a[8];} doublewordsize;	\
-    doublewordsize *ptrp = (doublewordsize*)(base);	\
-  __asm__ volatile ("stdcx. %2,%y1\n"			\
-	   "\tmfocrf %0,0x80"				\
-	   : "=r" (result),				\
-	     "=Z" (*ptrp)				\
-	   : "r" (value));				\
-  ((result & 0x20000000) >> 29); })
-#endif /* __powerpc64__ */
-
-
-/*
- * --- end extract from ppu_intrinics.h --
- */
-
-
-void 
-gc_jd_stack_init(gc_jd_stack_t *stack)
-{
-  stack->top = 0;
-}
-  
-
-#ifdef __powerpc64__  // 64-bit mode
-
-void 
-gc_jd_stack_push(gc_jd_stack_t *stack, gc_job_desc_t *item)
-{
-  gc_eaddr_t	top;
-  gc_eaddr_t	item_ea = ptr_to_ea(item);
-  unsigned int	done;
-
-  do {
-    top = __ldarx(&stack->top);
-    item->sys.next = top;
-    smp_wmb();	      // order store of item->next before store of stack->top
-    done = __stdcx(&stack->top, item_ea);
-  } while (unlikely(done == 0));
-}
-
-gc_job_desc_t *
-gc_jd_stack_pop(gc_jd_stack_t *stack)
-{
-  gc_eaddr_t	s;
-  gc_eaddr_t	t;
-  unsigned int	done;
-
-  do {
-    s  = __ldarx(&stack->top);
-    if (s == 0)			/* stack's empty */
-      return 0;
-    t = ((gc_job_desc_t *) ea_to_ptr(s))->sys.next;
-    done = __stdcx(&stack->top, t);
-  } while (unlikely(done == 0));
-
-  return ea_to_ptr(s);
-}
-
-#else  // 32-bit mode
-
-/*
- * In 32-bit mode, gc_eaddr's will have the top 32-bits zero.
- * The ldarx/stdcx instructions aren't available in 32-bit mode,
- * thus we use lwarx/stwcx on the low 32-bits of the 64-bit addresses.
- * Since we're big-endian, the low 32-bits are at word offset 1.
- */
-void 
-gc_jd_stack_push(gc_jd_stack_t *stack, gc_job_desc_t *item)
-{
-  gc_eaddr_t	top;
-  unsigned int	done;
-
-  do {
-    top = __lwarx((int32_t *)(&stack->top) + 1);
-    item->sys.next = top;
-    smp_wmb();	      // order store of item->sys.next before store of stack->top
-    done = __stwcx((int32_t *)(&stack->top) + 1, item);
-  } while (unlikely(done == 0));
-}
-
-gc_job_desc_t *
-gc_jd_stack_pop(gc_jd_stack_t *stack)
-{
-  gc_eaddr_t	s;
-  gc_eaddr_t	t;
-  unsigned int	done;
-
-  do {
-    s  = __lwarx((int32_t *)(&stack->top) + 1);
-    if (s == 0)			/* stack's empty */
-      return 0;
-    t = ((gc_job_desc_t *) ea_to_ptr(s))->sys.next;
-    done = __stwcx((int32_t *)(&stack->top) + 1, (uint32_t) t);
-  } while (unlikely(done == 0));
-
-  return ea_to_ptr(s);
-}
-
-#endif
diff --git a/gcell/lib/runtime/gc_job_manager.cc b/gcell/lib/runtime/gc_job_manager.cc
deleted file mode 100644
index d96bc5381..000000000
--- a/gcell/lib/runtime/gc_job_manager.cc
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gcell/gc_job_manager.h>
-#include "gc_job_manager_impl.h"
-#include <boost/weak_ptr.hpp>
-#include <stdio.h>
-
-
-static boost::weak_ptr<gc_job_manager> s_singleton;
-
-
-// custom deleter of gc_job_desc allocated via alloc_job_desc_sptr
-class job_desc_deleter {
-  gc_job_manager_sptr	d_mgr;
-public:
-  job_desc_deleter(gc_job_manager_sptr mgr) : d_mgr(mgr) {}
-
-  void operator()(gc_job_desc *jd) {
-    d_mgr->free_job_desc(jd);
-  }
-};
-
-
-
-gc_job_manager_sptr
-gc_make_job_manager(const gc_jm_options *options)
-{
-  return gc_job_manager_sptr(new gc_job_manager_impl(options));
-}
-
-gc_job_manager::gc_job_manager(const gc_jm_options *options)
-{
-  // nop
-}
-
-gc_job_manager::~gc_job_manager()
-{
-  // nop
-}
-
-void
-gc_job_manager::set_debug(int debug)
-{
-  // nop
-}
-
-int
-gc_job_manager::debug()
-{
-  return 0;
-}
-
-void 
-gc_job_manager::set_singleton(gc_job_manager_sptr mgr)
-{
-  s_singleton = mgr;
-}
-
-gc_job_manager_sptr 
-gc_job_manager::singleton()
-{
-  return gc_job_manager_sptr(s_singleton);
-}
-
-gc_job_desc_sptr 
-gc_job_manager::make_jd_sptr(gc_job_manager_sptr mgr, gc_job_desc *jd)
-{
-  return gc_job_desc_sptr(jd, job_desc_deleter(mgr));
-}
-
-gc_job_desc_sptr 
-gc_job_manager::alloc_job_desc(gc_job_manager_sptr mgr)
-{
-  return make_jd_sptr(mgr, mgr->alloc_job_desc());
-}
-
-
-// ------------------------------------------------------------------------
-
-
-// custom deleter
-class spe_program_handle_deleter {
-public:
-  void operator()(spe_program_handle_t *program) {
-    if (program){
-      int r = spe_image_close(program);
-      if (r != 0){
-	perror("spe_image_close");
-      }
-    }
-  }
-};
-
-// nop custom deleter
-class nop_spe_program_handle_deleter {
-public:
-  void operator()(spe_program_handle_t *program) {
-  }
-};
-
-spe_program_handle_sptr 
-gc_program_handle_from_filename(const std::string &filename)
-{
-  return spe_program_handle_sptr(spe_image_open(filename.c_str()),
-				 spe_program_handle_deleter());
-}
-
-
-spe_program_handle_sptr 
-gc_program_handle_from_address(spe_program_handle_t *handle)
-{
-  return spe_program_handle_sptr(handle, nop_spe_program_handle_deleter());
-}
-
-const std::string
-gc_job_status_string(gc_job_status_t status)
-{
-  switch(status){
-  case JS_OK:			return "JS_OK";
-  case JS_SHUTTING_DOWN:	return "JS_SHUTTING_DOWN";
-  case JS_TOO_MANY_CLIENTS:	return "JS_TOO_MANY_CLIENTS";
-  case JS_UNKNOWN_PROC:		return "JS_UNKNOWN_PROC";
-  case JS_BAD_DIRECTION:	return "JS_BAD_DIRECTION";
-  case JS_BAD_EAH:		return "JS_BAD_EAH";
-  case JS_BAD_N_DIRECT:		return "JS_BAD_N_DIRECT";
-  case JS_BAD_N_EA:		return "JS_BAD_N_EA";
-  case JS_ARGS_TOO_LONG:	return "JS_ARGS_TOO_LONG";
-  case JS_BAD_JUJU:		return "JS_BAD_JUJU";
-  case JS_BAD_JOB_DESC:		return "JS_BAD_JOB_DESC";
-  default:
-    char buf[100];
-    snprintf(buf, sizeof(buf), "unknown gc_job_status_t (%d)\n", status);
-    return buf;
-  }
-}
-
-/*
- * exception classes
- */
-
-gc_exception::gc_exception(const std::string &msg)
-  : runtime_error(msg)
-{
-}
-
-gc_unknown_proc::gc_unknown_proc(const std::string &msg)
-  : gc_exception("gc_unknown_proc: " + msg)
-{
-}
-
-gc_bad_alloc::gc_bad_alloc(const std::string &msg)
-  : gc_exception("gc_bad_alloc: " + msg)
-{
-}
-
-gc_bad_align::gc_bad_align(const std::string &msg)
-  : gc_exception("gc_bad_align: " + msg)
-{
-}
-
-gc_bad_submit::gc_bad_submit(const std::string &name, gc_job_status_t status)
-  : gc_exception("gc_bad_submit(" + name + "): " + gc_job_status_string(status))
-{
-}
diff --git a/gcell/lib/runtime/gc_job_manager_impl.cc b/gcell/lib/runtime/gc_job_manager_impl.cc
deleted file mode 100644
index 58597cf27..000000000
--- a/gcell/lib/runtime/gc_job_manager_impl.cc
+++ /dev/null
@@ -1,1404 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "gc_job_manager_impl.h"
-#include <gcell/gc_mbox.h>
-#include <gcell/gc_aligned_alloc.h>
-#include <gcell/memory_barrier.h>
-#include <gc_proc_def_utils.h>
-#include <atomic_dec_if_positive.h>
-#include <stdio.h>
-#include <stdexcept>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <sched.h>
-
-typedef boost::unique_lock<boost::mutex> scoped_lock;
-
-#define __nop() __asm__ volatile ("ori 0,0,0" : : : "memory")
-#define __cctpl() __asm__ volatile ("or 1,1,1" : : : "memory")
-#define __cctpm() __asm__ volatile ("or 2,2,2" : : : "memory")
-#define __cctph() __asm__ volatile ("or 3,3,3" : : : "memory")
-#define __db8cyc() __asm__ volatile ("or 28,28,28" : : : "memory")
-#define __db10cyc() __asm__ volatile ("or 29,29,29" : : : "memory")
-#define __db12cyc() __asm__ volatile ("or 30,30,30" : : : "memory")
-#define __db16cyc() __asm__ volatile ("or 31,31,31" : : : "memory")
-
-
-#if 1
-#define CCTPL() __cctpl()
-#define CCTPM() __cctpm()
-#else
-#define CCTPL() (void) 0
-#define CCTPM() (void) 0
-#endif
-
-static const size_t CACHE_LINE_SIZE = 128;
-
-static const unsigned int DEFAULT_MAX_JOBS = 128;
-static const unsigned int DEFAULT_MAX_CLIENT_THREADS = 64;
-
-// FIXME this really depends on the SPU code...
-static const unsigned int MAX_TOTAL_INDIRECT_LENGTH = 16 * 1024;
-
-
-static bool          s_key_initialized = false;
-static pthread_key_t s_client_key;
-
-static int s_worker_debug = 0;
-
-// custom deleter of gang_contexts for use with boost::shared_ptr
-class gang_deleter {
-public:
-  void operator()(spe_gang_context_ptr_t ctx) {
-    if (ctx){
-      int r = spe_gang_context_destroy(ctx);
-      if (r != 0){
-	perror("spe_gang_context_destroy");
-      }
-    }
-  }
-};
-
-
-// custom deleter of anything that can be freed with "free"
-class free_deleter {
-public:
-  void operator()(void *p) {
-    free(p);
-  }
-};
-
-
-/*
- * Called when client thread is destroyed.
- * We mark our client info free.
- */
-static void
-client_key_destructor(void *p)
-{
-  ((gc_client_thread_info *) p)->d_free = 1;
-}
-
-static bool
-is_power_of_2(uint32_t x)
-{
-  return (x != 0) && !(x & (x - 1));
-}
-
-////////////////////////////////////////////////////////////////////////
-
-
-gc_job_manager_impl::gc_job_manager_impl(const gc_jm_options *options)
-  : d_debug(0), d_spu_args(0),
-    d_eh_cond(), d_eh_thread(0), d_eh_state(EHS_INIT),
-    d_shutdown_requested(false),
-    d_jc_cond(), d_jc_thread(0), d_jc_state(JCS_INIT), d_jc_njobs_active(0),
-    d_ntell(0), d_tell_start(0),
-    d_client_thread(0), d_ea_args_maxsize(0),
-    d_proc_def(0), d_proc_def_ls_addr(0), d_nproc_defs(0)
-{
-  if (!s_key_initialized){
-    int r = pthread_key_create(&s_client_key, client_key_destructor);
-    if (r != 0)
-      throw std::runtime_error("pthread_key_create");
-    s_key_initialized = true;
-  }
-
-  // ensure it's zero
-  pthread_setspecific(s_client_key, 0);
-
-  if (options != 0)
-    d_options = *options;
-
-  // provide the real default for those indicated with a zero
-  if (d_options.max_jobs == 0)
-    d_options.max_jobs = DEFAULT_MAX_JOBS;
-  if (d_options.max_client_threads == 0)
-    d_options.max_client_threads = DEFAULT_MAX_CLIENT_THREADS;
-
-  if (!d_options.program_handle){
-    fprintf(stderr, "gc_job_manager: options->program_handle must be non-zero\n");
-    throw std::runtime_error("gc_job_manager: options->program_handle must be non-zero");
-  }
-
-  int ncpu_nodes = spe_cpu_info_get(SPE_COUNT_PHYSICAL_CPU_NODES, -1);
-  int nusable_spes = spe_cpu_info_get(SPE_COUNT_USABLE_SPES, -1);
-
-  if (debug()){
-    printf("cpu_nodes = %d\n", ncpu_nodes);
-    for (int i = 0; i < ncpu_nodes; i++){
-      printf("node[%d].physical_spes = %2d\n", i,
-	     spe_cpu_info_get(SPE_COUNT_PHYSICAL_SPES, i));
-      printf("node[%d].usable_spes   = %2d\n", i,
-	     spe_cpu_info_get(SPE_COUNT_USABLE_SPES, i));
-    }
-  }
-
-  // clamp nspes
-  d_options.nspes = std::min(d_options.nspes, (unsigned int) MAX_SPES);
-  nusable_spes = std::min(nusable_spes, (int) MAX_SPES);
-
-  //
-  // sanity check requested number of spes.
-  //
-  if (d_options.nspes == 0)	// use all of them
-    d_options.nspes = nusable_spes;
-  else {
-    if (d_options.nspes > (unsigned int) nusable_spes){
-      fprintf(stderr,
-	      "gc_job_manager: warning: caller requested %d spes.  There are only %d available.\n",
-	      d_options.nspes, nusable_spes);
-      if (d_options.gang_schedule){
-	// If we're gang scheduling we'll never get scheduled if we
-	// ask for more than are available.
-	throw std::out_of_range("gang_scheduling: not enough spes available");
-      }
-      else {	// FIXME clamp to usable.  problem on PS3 when overcommited
-	fprintf(stderr, "gc_job_manager: clamping nspes to %d\n", nusable_spes);
-	d_options.nspes = nusable_spes;
-      }
-    }
-  }
-
-  if (d_options.use_affinity){
-    printf("gc_job_manager: warning: affinity request was ignored\n");
-  }
-
-  if (d_options.gang_schedule){
-    d_gang = spe_gang_context_sptr(spe_gang_context_create(0), gang_deleter());
-    if (!d_gang){
-      perror("gc_job_manager_impl[spe_gang_context_create]");
-      throw std::runtime_error("spe_gang_context_create");
-    }
-  }
-
-  d_ntell = std::min(d_options.nspes, 2U);
-
-  // ----------------------------------------------------------------
-  // initalize the job queue
-  
-  d_queue = (gc_jd_queue_t *) gc_aligned_alloc(sizeof(gc_jd_queue_t), CACHE_LINE_SIZE);
-  _d_queue_boost =
-    boost::shared_ptr<void>((void *) d_queue, free_deleter());
-  gc_jd_queue_init(d_queue);
-
-
-  // ----------------------------------------------------------------
-  // create the spe contexts
-
-  // 1 spu_arg struct for each SPE
-  assert(sizeof(gc_spu_args_t) % 16 == 0);
-  d_spu_args =
-    (gc_spu_args_t *) gc_aligned_alloc(MAX_SPES * sizeof(gc_spu_args_t), 16);
-  _d_spu_args_boost =
-    boost::shared_ptr<void>((void *) d_spu_args, free_deleter());
-
-  // 2 completion info structs for each SPE (we double buffer them)
-  assert(sizeof(gc_comp_info_t) % CACHE_LINE_SIZE == 0);
-  d_comp_info =
-    (gc_comp_info_t *) gc_aligned_alloc(2 * MAX_SPES * sizeof(gc_comp_info_t),
-					CACHE_LINE_SIZE);
-  _d_comp_info_boost =
-    boost::shared_ptr<void>((void *) d_comp_info, free_deleter());
-
-
-  // get a handle to the spe program
-
-  spe_program_handle_t *spe_image = d_options.program_handle.get();
-
-  // fish proc_def table out of SPE ELF file
-
-  if (!gcpd_find_table(spe_image, &d_proc_def, &d_nproc_defs, &d_proc_def_ls_addr)){
-    fprintf(stderr, "gc_job_manager_impl: couldn't find gc_proc_defs in SPE ELF file.\n");
-    throw std::runtime_error("no gc_proc_defs");
-  }
-  // fprintf(stderr, "d_proc_def_ls_addr = 0x%0x\n", d_proc_def_ls_addr);
-
-  int spe_flags = (SPE_EVENTS_ENABLE
-		   | SPE_MAP_PS
-		   | SPE_CFG_SIGNOTIFY1_OR
-		   | SPE_CFG_SIGNOTIFY2_OR);
-  
-  for (unsigned int i = 0; i < d_options.nspes; i++){
-    // FIXME affinity stuff goes here
-    d_worker[i].spe_ctx = spe_context_create(spe_flags, d_gang.get());;
-    if (d_worker[i].spe_ctx == 0){
-      perror("spe_context_create");
-      throw std::runtime_error("spe_context_create");
-    }
-
-    d_worker[i].spe_ctrl = 
-      (spe_spu_control_area_t *)spe_ps_area_get(d_worker[i].spe_ctx, SPE_CONTROL_AREA);
-    if (d_worker[i].spe_ctrl == 0){
-      perror("spe_ps_area_get(SPE_CONTROL_AREA)");
-      throw std::runtime_error("spe_ps_area_get(SPE_CONTROL_AREA)");
-    }
-
-    d_worker[i].spe_idx = i;
-    d_worker[i].spu_args = &d_spu_args[i];
-    d_worker[i].spu_args->queue = ptr_to_ea(d_queue);
-    d_worker[i].spu_args->comp_info[0] = ptr_to_ea(&d_comp_info[2*i+0]);
-    d_worker[i].spu_args->comp_info[1] = ptr_to_ea(&d_comp_info[2*i+1]);
-    d_worker[i].spu_args->spu_idx = i;
-    d_worker[i].spu_args->nspus = d_options.nspes;
-    d_worker[i].spu_args->proc_def_ls_addr = d_proc_def_ls_addr;
-    d_worker[i].spu_args->nproc_defs = d_nproc_defs;
-    d_worker[i].spu_args->log.base = 0;
-    d_worker[i].spu_args->log.nentries = 0;
-    d_worker[i].state = WS_INIT;
-
-    int r = spe_program_load(d_worker[i].spe_ctx, spe_image);
-    if (r != 0){
-      perror("spe_program_load");
-      throw std::runtime_error("spe_program_load");
-    }
-  }
-
-  setup_logfiles();
-
-  // ----------------------------------------------------------------
-  // initalize the free list of job descriptors
-  
-  d_free_list = (gc_jd_stack_t *) gc_aligned_alloc(sizeof(gc_jd_stack_t), CACHE_LINE_SIZE);
-  // This ensures that the memory associated with d_free_list is
-  // automatically freed in the destructor or if an exception occurs
-  // here in the constructor.
-  _d_free_list_boost =
-    boost::shared_ptr<void>((void *) d_free_list, free_deleter());
-  gc_jd_stack_init(d_free_list);
-
-  if (debug()){
-    printf("sizeof(d_jd[0]) = %d (0x%x)\n", sizeof(d_jd[0]), sizeof(d_jd[0]));
-    printf("max_jobs = %u\n", d_options.max_jobs);
-  }
-
-  // Initialize the array of job descriptors.
-  d_jd = (gc_job_desc_t *) gc_aligned_alloc(sizeof(d_jd[0]) * d_options.max_jobs, CACHE_LINE_SIZE);
-  _d_jd_boost = boost::shared_ptr<void>((void *) d_jd, free_deleter());
-
-
-  // set unique job_id
-  for (int i = 0; i < (int) d_options.max_jobs; i++)
-    d_jd[i].sys.job_id = i;
-
-  // push them onto the free list
-  for (int i = d_options.max_jobs - 1; i >= 0; i--)
-    free_job_desc(&d_jd[i]);
-
-  // ----------------------------------------------------------------
-  // initialize d_client_thread
-
-  {
-    gc_client_thread_info_sa cti(
-         new gc_client_thread_info[d_options.max_client_threads]);
-
-    d_client_thread.swap(cti);
-
-    for (unsigned int i = 0; i < d_options.max_client_threads; i++)
-      d_client_thread[i].d_client_id = i;
-  }
-
-  // ----------------------------------------------------------------
-  // initialize bitvectors
-
-  // initialize d_bvlen, the number of longs in job related bitvectors.
-  int bits_per_long = sizeof(unsigned long) * 8;
-  d_bvlen = (d_options.max_jobs + bits_per_long - 1) / bits_per_long;
-
-  // allocate all bitvectors in a single cache-aligned chunk
-  size_t nlongs = d_bvlen * d_options.max_client_threads;
-  void *p = gc_aligned_alloc(nlongs * sizeof(unsigned long), CACHE_LINE_SIZE);
-  _d_all_bitvectors = boost::shared_ptr<void>(p, free_deleter());
-
-  // Now point the gc_client_thread_info bitvectors into this storage
-  unsigned long *v = (unsigned long *) p;
-
-  for (unsigned int i = 0; i < d_options.max_client_threads; i++, v += d_bvlen)
-    d_client_thread[i].d_jobs_done = v;
-
-
-  // ----------------------------------------------------------------
-  // create the spe event handler & worker (SPE) threads
-
-  create_event_handler();
-}
-
-////////////////////////////////////////////////////////////////////////
-
-gc_job_manager_impl::~gc_job_manager_impl()
-{
-  shutdown();
-
-  d_jd = 0;		// handled via _d_jd_boost
-  d_free_list = 0;	// handled via _d_free_list_boost
-  d_queue = 0;		// handled via _d_queue_boost
-
-  // clear cti, since we've deleted the underlying data
-  pthread_setspecific(s_client_key, 0);
-
-  unmap_logfiles();
-}
-
-bool
-gc_job_manager_impl::shutdown()
-{
-  scoped_lock 	l(d_eh_mutex);
-
-  {
-    scoped_lock 	l2(d_jc_mutex);
-    d_shutdown_requested = true;	// set flag for event handler thread
-    d_jc_cond.notify_one();			// wake up job completer
-  }
-
-  // should only happens during early QA code
-  if (d_eh_thread == 0 && d_eh_state == EHS_INIT)
-    return false;
-
-  while (d_eh_state != EHS_DEAD)	// wait for it to finish
-    d_eh_cond.wait(l);
-
-  return true;
-}
-
-int
-gc_job_manager_impl::nspes() const
-{
-  return d_options.nspes;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void
-gc_job_manager_impl::bv_zero(unsigned long *bv)
-{
-  memset(bv, 0, sizeof(unsigned long) * d_bvlen);
-}
-
-inline void
-gc_job_manager_impl::bv_clr(unsigned long *bv, unsigned int bitno)
-{
-  unsigned int wi = bitno / (sizeof (unsigned long) * 8);
-  unsigned int bi = bitno & ((sizeof (unsigned long) * 8) - 1);
-  bv[wi] &= ~(1UL << bi);
-}
-
-inline void
-gc_job_manager_impl::bv_set(unsigned long *bv, unsigned int bitno)
-{
-  unsigned int wi = bitno / (sizeof (unsigned long) * 8);
-  unsigned int bi = bitno & ((sizeof (unsigned long) * 8) - 1);
-  bv[wi] |= (1UL << bi);
-}
-
-inline bool
-gc_job_manager_impl::bv_isset(unsigned long *bv, unsigned int bitno)
-{
-  unsigned int wi = bitno / (sizeof (unsigned long) * 8);
-  unsigned int bi = bitno & ((sizeof (unsigned long) * 8) - 1);
-  return (bv[wi] & (1UL << bi)) != 0;
-}
-
-inline bool
-gc_job_manager_impl::bv_isclr(unsigned long *bv, unsigned int bitno)
-{
-  unsigned int wi = bitno / (sizeof (unsigned long) * 8);
-  unsigned int bi = bitno & ((sizeof (unsigned long) * 8) - 1);
-  return (bv[wi] & (1UL << bi)) == 0;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-gc_job_desc *
-gc_job_manager_impl::alloc_job_desc()
-{
-  // stack is lock free, and safe to call from any thread
-  gc_job_desc *jd = gc_jd_stack_pop(d_free_list);
-  if (jd == 0)
-    throw gc_bad_alloc("alloc_job_desc: none available");
-
-  return jd;
-}
-
-void
-gc_job_manager_impl::free_job_desc(gc_job_desc *jd)
-{
-  // stack is lock free, thus safe to call from any thread
-  if (jd != 0)
-    gc_jd_stack_push(d_free_list, jd);
-}
-
-////////////////////////////////////////////////////////////////////////
-
-
-inline bool
-gc_job_manager_impl::incr_njobs_active()
-{
-  scoped_lock	l(d_jc_mutex);
-
-  if (d_shutdown_requested)
-    return false;
-
-  if (d_jc_njobs_active++ == 0)	// signal on 0 to 1 transition
-    d_jc_cond.notify_one();
-
-  return true;
-}
-
-inline void
-gc_job_manager_impl::decr_njobs_active(int n)
-{
-  scoped_lock	l(d_jc_mutex);
-  d_jc_njobs_active -= n;
-}
-
-
-/*
- * We check as much as we can here on the PPE side, so that the SPE
- * doesn't have to.
- */
-static bool
-check_direct_args(gc_job_desc *jd, gc_job_direct_args *args)
-{
-  if (args->nargs > MAX_ARGS_DIRECT){
-    jd->status = JS_BAD_N_DIRECT;
-    return false;
-  }
-
-  return true;
-}
-
-static bool
-check_ea_args(gc_job_desc *jd, gc_job_ea_args *p)
-{
-  if (p->nargs > MAX_ARGS_EA){
-    jd->status = JS_BAD_N_EA;
-    return false;
-  }
-
-  uint32_t dir_union = 0;
-
-  for (unsigned int i = 0; i < p->nargs; i++){
-    dir_union |= p->arg[i].direction;
-    switch(p->arg[i].direction){
-    case GCJD_DMA_GET:
-    case GCJD_DMA_PUT:
-      break;
-
-    default:
-      jd->status = JS_BAD_DIRECTION;
-      return false;
-    }
-  }
-
-  if (p->nargs > 1){
-    unsigned int common_eah = (p->arg[0].ea_addr) >> 32;
-    for (unsigned int i = 1; i < p->nargs; i++){
-      if ((p->arg[i].ea_addr >> 32) != common_eah){
-	jd->status = JS_BAD_EAH;
-	return false;
-      }
-    }
-  }
-
-  jd->sys.direction_union = dir_union;
-  return true;
-}
-
-bool
-gc_job_manager_impl::submit_job(gc_job_desc *jd)
-{
-  // Ensure it's one of our job descriptors
-
-  if (jd < d_jd || jd >= &d_jd[d_options.max_jobs]){
-    jd->status = JS_BAD_JOB_DESC;
-    return false;
-  }
-
-  // Ensure we've got a client_thread_info assigned to this thread.
-  
-  gc_client_thread_info *cti =
-    (gc_client_thread_info *) pthread_getspecific(s_client_key);
-  if (unlikely(cti == 0)){
-    if ((cti = alloc_cti()) == 0){
-      fprintf(stderr, "gc_job_manager_impl::submit_job: Too many client threads.\n");
-      jd->status = JS_TOO_MANY_CLIENTS;
-      return false;
-    }
-    int r = pthread_setspecific(s_client_key, cti);
-    if (r != 0){
-      jd->status = JS_BAD_JUJU;
-      fprintf(stderr, "pthread_setspecific failed (return = %d)\n", r);
-      return false;
-    }
-  }
-
-  if (jd->proc_id == GCP_UNKNOWN_PROC){
-    jd->status = JS_UNKNOWN_PROC;
-    return false;
-  }
-
-  if (!check_direct_args(jd, &jd->input))
-    return false;
-
-  if (!check_direct_args(jd, &jd->output))
-    return false;
-
-  if (!check_ea_args(jd, &jd->eaa))
-    return false;
-
-  jd->status = JS_OK;
-  jd->sys.client_id = cti->d_client_id;
-
-  if (!incr_njobs_active()){
-    jd->status = JS_SHUTTING_DOWN;
-    return false;
-  }
-  
-  gc_jd_queue_enqueue(d_queue, jd);
-  // tell_spes_to_check_queue();
-  return true;
-}
-
-bool
-gc_job_manager_impl::wait_job(gc_job_desc *jd)
-{
-  bool done;
-  return wait_jobs(1, &jd, &done, GC_WAIT_ANY) == 1 && jd->status == JS_OK;
-}
-
-int
-gc_job_manager_impl::wait_jobs(unsigned int njobs,
-			       gc_job_desc *jd[],
-			       bool done[],
-			       gc_wait_mode mode)
-{
-  unsigned int i;
-
-  gc_client_thread_info *cti =
-    (gc_client_thread_info *) pthread_getspecific(s_client_key);
-  if (unlikely(cti == 0))
-    return -1;
-
-  for (i = 0; i < njobs; i++){
-    done[i] = false;
-    if (unlikely(jd[i]->sys.client_id != cti->d_client_id)){
-      fprintf(stderr, "gc_job_manager_impl::wait_jobs: can't wait for a job you didn't submit\n");
-      return -1;
-    }
-  }
-
-  {
-    scoped_lock	l(cti->d_mutex);
-
-    // setup info for event handler
-    cti->d_state = (mode == GC_WAIT_ANY) ? CT_WAIT_ANY : CT_WAIT_ALL;
-    cti->d_njobs_waiting_for = njobs;
-    cti->d_jobs_waiting_for = jd;
-    assert(cti->d_jobs_done != 0);
-
-    unsigned int ndone = 0;
-
-    // wait for jobs to complete
-    
-    while (1){
-      ndone = 0;
-      for (i= 0; i < njobs; i++){
-	if (done[i])
-	  ndone++;
-	else if (bv_isset(cti->d_jobs_done, jd[i]->sys.job_id)){
-	  bv_clr(cti->d_jobs_done, jd[i]->sys.job_id);
-	  done[i] = true;
-	  ndone++;
-	}
-      }
-
-      if (mode == GC_WAIT_ANY && ndone > 0)
-	break;
-
-      if (mode == GC_WAIT_ALL && ndone == njobs)
-	break;
-
-      // FIXME what happens when somebody calls shutdown?
-
-      cti->d_cond.wait(l);	// wait for event handler to wake us up
-    }
-
-    cti->d_state = CT_NOT_WAITING;  
-    cti->d_njobs_waiting_for = 0;	// tidy up (not reqd)
-    cti->d_jobs_waiting_for = 0;	// tidy up (not reqd)
-    return ndone;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-bool
-gc_job_manager_impl::send_all_spes(uint32_t msg)
-{
-  bool ok = true;
-
-  for (unsigned int i = 0; i < d_options.nspes; i++)
-    ok &= send_spe(i, msg);
-
-  return ok;
-}
-
-bool
-gc_job_manager_impl::send_spe(unsigned int spe, uint32_t msg)
-{
-  if (spe >= d_options.nspes)
-    return false;
-
-  int r = spe_in_mbox_write(d_worker[spe].spe_ctx, &msg, 1,
-			    SPE_MBOX_ALL_BLOCKING);
-  if (r < 0){
-    perror("spe_in_mbox_write");
-    return false;
-  }
-
-  return r == 1;
-}
-
-void 
-gc_job_manager_impl::tell_spes_to_check_queue()
-{
-  int nspes = d_options.nspes;
-
-  for (int i = 0, ntold = 0; ntold < d_ntell && i < nspes ; ++i){
-    volatile spe_spu_control_area_t *spe_ctrl = d_worker[d_tell_start].spe_ctrl;
-    int nfree = (spe_ctrl->SPU_Mbox_Stat >> 8) & 0xFF;
-    if (nfree == 4){
-      spe_ctrl->SPU_In_Mbox = MK_MBOX_MSG(OP_CHECK_QUEUE, 0);
-      ntold++;
-    }
-
-    unsigned int t = d_tell_start + 1;
-    if (t >= d_options.nspes)
-      t = 0;
-    d_tell_start = t;
-  }
-}
-
-
-////////////////////////////////////////////////////////////////////////
-
-static void
-pthread_create_failure_msg(int r, const char *which)
-{
-  char buf[256];
-  const char *s = 0;
-
-  switch (r){
-  case EAGAIN: s = "EAGAIN"; break;
-  case EINVAL: s = "EINVAL"; break;
-  case EPERM:  s = "EPERM";  break;
-  default:
-    snprintf(buf, sizeof(buf), "Unknown error %d", r);
-    s = buf;
-    break;
-  }
-  fprintf(stderr, "pthread_create[%s] failed: %s\n", which, s);
-}
-
-
-static bool
-start_thread(pthread_t *thread,
-	     void *(*start_routine)(void *),  void *arg,
-	     const char *msg)
-{
-  pthread_attr_t attr;
-  pthread_attr_init(&attr);
-  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
-  // FIXME save sigprocmask
-  // FIXME set sigprocmask
-
-  int r = pthread_create(thread, &attr, start_routine, arg);
-    
-  // FIXME restore sigprocmask
-
-  if (r != 0){
-    pthread_create_failure_msg(r, msg);
-    return false;
-  }
-  return true;
-}
-
-
-////////////////////////////////////////////////////////////////////////
-
-static void *start_worker(void *arg);
-
-static void *
-start_event_handler(void *arg)
-{
-  gc_job_manager_impl *p = (gc_job_manager_impl *) arg;
-  p->event_handler_loop();
-  return 0;
-}
-
-static void *
-start_job_completer(void *arg)
-{
-  gc_job_manager_impl *p = (gc_job_manager_impl *) arg;
-  p->job_completer_loop();
-  return 0;
-}
-
-void
-gc_job_manager_impl::create_event_handler()
-{
-  // create the SPE event handler and register our interest in events
-
-  d_spe_event_handler.ptr = spe_event_handler_create();
-  if (d_spe_event_handler.ptr == 0){
-    perror("spe_event_handler_create");
-    throw std::runtime_error("spe_event_handler_create");
-  }
-
-  for (unsigned int i = 0; i < d_options.nspes; i++){
-    spe_event_unit_t	eu;
-    memset(&eu, 0, sizeof(eu));
-    eu.events = SPE_EVENT_OUT_INTR_MBOX | SPE_EVENT_SPE_STOPPED;
-    eu.spe = d_worker[i].spe_ctx;
-    eu.data.u32 = i;	// set in events returned by spe_event_wait
-
-    if (spe_event_handler_register(d_spe_event_handler.ptr, &eu) != 0){
-      perror("spe_event_handler_register");
-      throw std::runtime_error("spe_event_handler_register");
-    }
-  }
-
-  // create the event handling thread
-
-  if (!start_thread(&d_eh_thread, start_event_handler, this, "event_handler")){
-    throw std::runtime_error("pthread_create");
-  }
-
-  // create the job completion thread
-
-  if (!start_thread(&d_jc_thread, start_job_completer, this, "job_completer")){
-    throw std::runtime_error("pthread_create");
-  }
-
-  // create the SPE worker threads
-
-  bool ok = true;
-  for (unsigned int i = 0; ok && i < d_options.nspes; i++){
-    char name[256];
-    snprintf(name, sizeof(name), "worker[%d]", i);
-    ok &= start_thread(&d_worker[i].thread, start_worker,
-		       &d_worker[i], name);
-  }
-
-  if (!ok){
-    //
-    // FIXME Clean up the mess.  Need to terminate event handler and all workers.
-    //
-    // this should cause the workers to exit, unless they're seriously broken
-    send_all_spes(MK_MBOX_MSG(OP_EXIT, 0));
-
-    shutdown();
-
-    throw std::runtime_error("pthread_create");
-  }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void
-gc_job_manager_impl::set_eh_state(evt_handler_state s)
-{
-  scoped_lock	l(d_eh_mutex);
-  d_eh_state = s;
-  d_eh_cond.notify_all();
-}
-
-void
-gc_job_manager_impl::set_ea_args_maxsize(int maxsize)
-{
-  scoped_lock	l(d_eh_mutex);
-  d_ea_args_maxsize = maxsize;
-  d_eh_cond.notify_all();
-}
-
-void
-gc_job_manager_impl::print_event(spe_event_unit_t *evt)
-{
-  printf("evt: spe = %d events = (0x%x)", evt->data.u32, evt->events);
-
-  if (evt->events & SPE_EVENT_OUT_INTR_MBOX)
-    printf(" OUT_INTR_MBOX");
-  
-  if (evt->events & SPE_EVENT_IN_MBOX)
-    printf(" IN_MBOX");
-  
-  if (evt->events & SPE_EVENT_TAG_GROUP)
-    printf(" TAG_GROUP");
-  
-  if (evt->events & SPE_EVENT_SPE_STOPPED)
-    printf(" SPE_STOPPED");
-
-  printf("\n");
-}
-
-struct job_client_info {
-  uint16_t	job_id;
-  uint16_t	client_id;
-};
-
-static int
-compare_jci_clients(const void *va, const void *vb)
-{
-  const job_client_info *a = (job_client_info *) va;
-  const job_client_info *b = (job_client_info *) vb;
-
-  return a->client_id - b->client_id;
-}
-
-void
-gc_job_manager_impl::notify_clients_jobs_are_done(unsigned int spe_num,
-						  unsigned int completion_info_idx)
-{
-  const char *msg = "gc_job_manager_impl::notify_client_job_is_done (INTERNAL ERROR)";
-
-  smp_rmb();  // order reads so we know that data sent from SPE is here
-
-  gc_comp_info_t *ci = &d_comp_info[2 * spe_num + (completion_info_idx & 0x1)];
-
-  if (ci->ncomplete == 0){	// never happens, but ensures code below is correct
-    ci->in_use = 0;
-    return;
-  }
-
-  decr_njobs_active(ci->ncomplete);
-
-  if (0){
-    static int total_jobs;
-    static int total_msgs;
-    total_msgs++;
-    total_jobs += ci->ncomplete;
-    printf("ppe:     tj = %6d  tm = %6d\n", total_jobs, total_msgs);
-  }
-
-  job_client_info gci[GC_CI_NJOBS];
-
-  /*
-   * Make one pass through and sanity check everything while filling in gci
-   */
-  for (unsigned int i = 0; i < ci->ncomplete; i++){
-    unsigned int job_id = ci->job_id[i];
-
-    if (job_id >= d_options.max_jobs){
-      // internal error, shouldn't happen
-      fprintf(stderr,"%s: invalid job_id = %d\n", msg, job_id);
-      ci->in_use = 0;		// clear flag so SPE knows we're done with it
-      return;
-    }
-    gc_job_desc *jd = &d_jd[job_id];
-
-    if (jd->sys.client_id >= d_options.max_client_threads){
-      // internal error, shouldn't happen
-      fprintf(stderr, "%s: invalid client_id = %d\n", msg, jd->sys.client_id);
-      ci->in_use = 0;		// clear flag so SPE knows we're done with it
-      return;
-    }
-
-    gci[i].job_id = job_id;
-    gci[i].client_id = jd->sys.client_id;
-  }
-
-  // sort by client_id so we only have to lock & signal once / client
-
-  if (ci->ncomplete > 1)
-    qsort(gci, ci->ncomplete, sizeof(gci[0]), compare_jci_clients);
-
-  // "wind-in" 
-
-  gc_client_thread_info *last_cti = &d_client_thread[gci[0].client_id];
-  last_cti->d_mutex.lock();
-  bv_set(last_cti->d_jobs_done, gci[0].job_id);  // mark job done
-
-  for (unsigned int i = 1; i < ci->ncomplete; i++){
-
-    gc_client_thread_info *cti = &d_client_thread[gci[i].client_id];
-
-    if (cti != last_cti){	// new client?
-
-      // yes.  signal old client, unlock old, lock new
-
-      // FIXME we could distinguish between CT_WAIT_ALL & CT_WAIT_ANY
-
-      if (last_cti->d_state == CT_WAIT_ANY || last_cti->d_state == CT_WAIT_ALL)
-	last_cti->d_cond.notify_one();	// wake client thread up
-
-      last_cti->d_mutex.unlock();
-      cti->d_mutex.lock();
-      last_cti = cti;
-    }
-
-    // mark job done
-    bv_set(cti->d_jobs_done, gci[i].job_id);
-  }
-
-  // "wind-out"
-
-  if (last_cti->d_state == CT_WAIT_ANY || last_cti->d_state == CT_WAIT_ALL)
-    last_cti->d_cond.notify_one();	// wake client thread up
-  last_cti->d_mutex.unlock();
-
-  ci->in_use = 0;		// clear flag so SPE knows we're done with it
-}
-
-void
-gc_job_manager_impl::handle_event(spe_event_unit_t *evt)
-{
-  // print_event(evt);
-
-  int spe_num = evt->data.u32;
-
-  // only a single event type can be signaled at a time
-  
-  if (evt->events == SPE_EVENT_OUT_INTR_MBOX) { // SPE sent us 1 or more msgs
-    static const int NMSGS = 32;
-    unsigned int msg[NMSGS];
-    int n = spe_out_intr_mbox_read(evt->spe, msg, NMSGS, SPE_MBOX_ANY_BLOCKING);
-    // printf("spe_out_intr_mbox_read = %d\n", n);
-    if (n < 0){
-      perror("spe_out_intr_mbox_read");
-    }
-    else {
-      for (int i = 0; i < n; i++){
-	switch(MBOX_MSG_OP(msg[i])){
-#if 0
-	case OP_JOBS_DONE:
-	  if (debug())
-	    printf("eh: job_done (0x%08x) from spu[%d]\n", msg[i], spe_num);
-	  notify_clients_jobs_are_done(spe_num, MBOX_MSG_ARG(msg[i]));
-	  break;
-#endif
-	case OP_SPU_BUFSIZE:
-	  set_ea_args_maxsize(MBOX_MSG_ARG(msg[i]));
-	  break;
-
-	case OP_EXIT:
-	default:
-	  printf("eh: Unexpected msg (0x%08x) from spu[%d]\n", msg[i], spe_num);
-	  break;
-	}
-      }
-    }
-  }
-  else if (evt->events == SPE_EVENT_SPE_STOPPED){ // the SPE stopped
-    spe_stop_info_t si;
-    int r = spe_stop_info_read(evt->spe, &si);
-    if (r < 0){
-      perror("spe_stop_info_read");
-    }
-    else {
-      switch (si.stop_reason){
-      case SPE_EXIT:
-	if (debug()){
-	  printf("eh: spu[%d] SPE_EXIT w/ exit_code = %d\n",
-		 spe_num, si.result.spe_exit_code);
-	}
-	break;
-      case SPE_STOP_AND_SIGNAL:
-	printf("eh: spu[%d] SPE_STOP_AND_SIGNAL w/ spe_signal_code = 0x%x\n",
-	       spe_num, si.result.spe_signal_code);
-	break;
-      case SPE_RUNTIME_ERROR:
-	printf("eh: spu[%d] SPE_RUNTIME_ERROR w/ spe_runtime_error = 0x%x\n",
-	       spe_num, si.result.spe_runtime_error);
-	break;
-      case SPE_RUNTIME_EXCEPTION:
-	printf("eh: spu[%d] SPE_RUNTIME_EXCEPTION w/ spe_runtime_exception = 0x%x\n",
-	       spe_num, si.result.spe_runtime_exception);
-	break;
-      case SPE_RUNTIME_FATAL:
-	printf("eh: spu[%d] SPE_RUNTIME_FATAL w/ spe_runtime_fatal = 0x%x\n",
-	       spe_num, si.result.spe_runtime_fatal);
-	break;
-      case SPE_CALLBACK_ERROR:
-	printf("eh: spu[%d] SPE_CALLBACK_ERROR w/ spe_callback_error = 0x%x\n",
-	       spe_num, si.result.spe_callback_error);
-	break;
-      case SPE_ISOLATION_ERROR:
-	printf("eh: spu[%d] SPE_ISOLATION_ERROR w/ spe_isolation_error = 0x%x\n",
-	       spe_num, si.result.spe_isolation_error);
-	break;
-      default:
-	printf("eh: spu[%d] UNKNOWN STOP REASON (%d) w/ spu_status = 0x%x\n",
-	       spe_num, si.stop_reason, si.spu_status);
-	break;
-      }
-    }
-  }
-#if 0 // not enabled
-  else if (evt->events == SPE_EVENT_IN_MBOX){	 // there's room to write to SPE
-    // spe_in_mbox_write (ignore)
-  }
-  else if (evt->events == SPE_EVENT_TAG_GROUP){	 // our DMA completed
-    // spe_mfcio_tag_status_read
-  }
-#endif
-  else {
-    fprintf(stderr, "handle_event: unexpected evt->events = 0x%x\n", evt->events);
-    return;
-  }
-}
-
-//
-// This is the "main program" of the event handling thread
-//
-void
-gc_job_manager_impl::event_handler_loop()
-{
-  static const int MAX_EVENTS = 16;
-  static const int TIMEOUT = 20;	// how long to block in milliseconds
-
-  spe_event_unit_t events[MAX_EVENTS];
-
-  if (d_debug)
-    printf("event_handler_loop: starting\n");
-
-  set_eh_state(EHS_RUNNING);
-
-  // ask the first spe for its max bufsize
-  send_spe(0, MK_MBOX_MSG(OP_GET_SPU_BUFSIZE, 0));
-
-  while (1){
-    switch(d_eh_state){
-
-    case EHS_RUNNING:      		// normal stuff
-      if (d_shutdown_requested) {
-	set_eh_state(EHS_SHUTTING_DOWN);
-      }
-      break;
-
-    case EHS_SHUTTING_DOWN:
-      if (d_jc_state == JCS_DEAD){
-	send_all_spes(MK_MBOX_MSG(OP_EXIT, 0));
-	set_eh_state(EHS_WAITING_FOR_WORKERS_TO_DIE);
-      }
-      break;
-
-    case EHS_WAITING_FOR_WORKERS_TO_DIE:
-      {
-	bool all_dead = true;
-	for (unsigned int i = 0; i < d_options.nspes; i++)
-	  all_dead &= d_worker[i].state == WS_DEAD;
-
-	if (all_dead){
-	  set_eh_state(EHS_DEAD);
-	  if (d_debug)
-	    printf("event_handler_loop: exiting\n");
-	  return;
-	}
-      }
-      break;
-
-    default:
-      set_eh_state(EHS_DEAD);
-      printf("event_handler_loop(default): exiting\n");
-      return;
-    }
-
-    // block waiting for events...
-    int nevents = spe_event_wait(d_spe_event_handler.ptr,
-				 events, MAX_EVENTS, TIMEOUT);
-    if (nevents < 0){
-      perror("spe_wait_event");
-      // FIXME bail?
-    }
-    for (int i = 0; i < nevents; i++){
-      handle_event(&events[i]);
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void
-gc_job_manager_impl::poll_for_job_completion()
-{
-  static const int niter = 10000;
-
-  CCTPL();		// change current (h/w) thread priority to low
-
-  for (int n = 0; n < niter; n++){
-
-    for (unsigned int spe_num = 0; spe_num < d_options.nspes; spe_num++){
-      volatile spe_spu_control_area_t *spe_ctrl = d_worker[spe_num].spe_ctrl;
-      int nentries = spe_ctrl->SPU_Mbox_Stat & 0xFF;
-      while (nentries-- > 0){
-	unsigned int msg = spe_ctrl->SPU_Out_Mbox;
-	switch(MBOX_MSG_OP(msg)){
-	case OP_JOBS_DONE:
-	  if (debug())
-	    printf("jc: job_done (0x%08x) from spu[%d]\n", msg, spe_num);
-
-	  CCTPM();		// change current thread priority to medium
-	  notify_clients_jobs_are_done(spe_num, MBOX_MSG_ARG(msg));
-	  CCTPL();
-	  break;
-
-	default:
-	  printf("jc: Unexpected msg (0x%08x) from spu[%d]\n", msg, spe_num);
-	  break;
-	}
-      }
-    }
-  }
-  CCTPM();
-}
-
-//
-// This is the "main program" of the job completer thread
-//
-void
-gc_job_manager_impl::job_completer_loop()
-{
-  d_jc_state = JCS_RUNNING;
-
-  while (1){
-    {
-      scoped_lock l(d_jc_mutex);
-      if (d_jc_njobs_active == 0){
-	if (d_shutdown_requested){
-	  d_jc_state = JCS_DEAD;
-	  return;
-	}
-	d_jc_cond.wait(l);
-      }
-    }
-
-    poll_for_job_completion();
-  }
-}
-
-////////////////////////////////////////////////////////////////////////
-// this is the top of the SPE worker threads
-
-static void *
-start_worker(void *arg)
-{
-  worker_ctx *w = (worker_ctx *) arg;
-  spe_stop_info_t	si;
-
-  w->state = WS_RUNNING;
-  if (s_worker_debug)
-    printf("worker[%d]: WS_RUNNING\n", w->spe_idx);
-
-  unsigned int entry = SPE_DEFAULT_ENTRY;
-  int r = spe_context_run(w->spe_ctx,  &entry, 0, w->spu_args, 0, &si);
-
-  if (r < 0){			// error
-    char buf[64];
-    snprintf(buf, sizeof(buf), "worker[%d]: spe_context_run", w->spe_idx);
-    perror(buf);
-  }
-  else if (r == 0){
-    // spe program called exit.
-    if (s_worker_debug)
-      printf("worker[%d]: SPE_EXIT w/ exit_code = %d\n",
-	     w->spe_idx, si.result.spe_exit_code);
-  }
-  else {
-    // called stop_and_signal
-    //
-    // I'm not sure we'll ever get here.  I think the event
-    // handler will catch this...
-    printf("worker[%d]: SPE_STOP_AND_SIGNAL w/ spe_signal_code = 0x%x\n",
-	   w->spe_idx, si.result.spe_signal_code);
-  }
-
-  // in any event, we're committing suicide now ;)
-  if (s_worker_debug)
-    printf("worker[%d]: WS_DEAD\n", w->spe_idx);
-
-  w->state = WS_DEAD;
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-gc_client_thread_info *
-gc_job_manager_impl::alloc_cti()
-{
-  for (unsigned int i = 0; i < d_options.max_client_threads; i++){
-    if (d_client_thread[i].d_free){
-      // try to atomically grab it
-      if (_atomic_dec_if_positive(ptr_to_ea(&d_client_thread[i].d_free)) == 0){
-	// got it...
-	gc_client_thread_info *cti = &d_client_thread[i];
-	cti->d_state = CT_NOT_WAITING;
-	bv_zero(cti->d_jobs_done);
-	cti->d_njobs_waiting_for = 0;
-	cti->d_jobs_waiting_for = 0;
-	
-	return cti;
-      }
-    }
-  }
-  return 0;
-}
-
-void
-gc_job_manager_impl::free_cti(gc_client_thread_info *cti)
-{
-  assert((size_t) (cti - d_client_thread.get()) < d_options.max_client_threads);
-  cti->d_free = 1;
-}
-
-int
-gc_job_manager_impl::ea_args_maxsize()
-{
-  scoped_lock	l(d_eh_mutex);
-
-  while (d_ea_args_maxsize == 0)	// wait for it to be initialized
-    d_eh_cond.wait(l);
-
-  return d_ea_args_maxsize;
-}
-
-void
-gc_job_manager_impl::set_debug(int debug)
-{
-  d_debug = debug;
-  s_worker_debug = debug;
-}
-
-int
-gc_job_manager_impl::debug()
-{
-  return d_debug;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void
-gc_job_manager_impl::setup_logfiles()
-{
-  if (!d_options.enable_logging)
-    return;
-
-  if (d_options.log2_nlog_entries == 0)
-    d_options.log2_nlog_entries = 12;
-
-  // must end up a multiple of the page size
-
-  size_t pagesize = getpagesize();
-  size_t s = (1 << d_options.log2_nlog_entries) * sizeof(gc_log_entry_t);
-  s = ((s + pagesize - 1) / pagesize) * pagesize;
-  size_t nentries = s / sizeof(gc_log_entry_t);
-  assert(is_power_of_2(nentries));
-
-  for (unsigned int i = 0; i < d_options.nspes; i++){
-    char filename[100];
-    snprintf(filename, sizeof(filename), "spu_log.%02d", i);
-    int fd = open(filename, O_CREAT|O_TRUNC|O_RDWR, 0664);
-    if (fd == -1){
-      perror(filename);
-      return;
-    }
-    lseek(fd, s - 1, SEEK_SET);
-    write(fd, "\0", 1);
-    void *p = mmap(0, s, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
-    if (p == MAP_FAILED){
-      perror("gc_job_manager_impl::setup_logfiles: mmap");
-      close(fd);
-      return;
-    }
-    close(fd);
-    memset(p, 0, s);
-    d_spu_args[i].log.base = ptr_to_ea(p);
-    d_spu_args[i].log.nentries = nentries;
-  }
-}
-
-void
-gc_job_manager_impl::sync_logfiles()
-{
-  for (unsigned int i = 0; i < d_options.nspes; i++){
-    if (d_spu_args[i].log.base)
-      msync(ea_to_ptr(d_spu_args[i].log.base),
-	    d_spu_args[i].log.nentries * sizeof(gc_log_entry_t),
-	    MS_ASYNC);
-  }
-}
-
-void
-gc_job_manager_impl::unmap_logfiles()
-{
-  for (unsigned int i = 0; i < d_options.nspes; i++){
-    if (d_spu_args[i].log.base)
-      munmap(ea_to_ptr(d_spu_args[i].log.base),
-	     d_spu_args[i].log.nentries * sizeof(gc_log_entry_t));
-  }
-}
-
-////////////////////////////////////////////////////////////////////////
-//
-// lookup proc names in d_proc_def table
-
-gc_proc_id_t 
-gc_job_manager_impl::lookup_proc(const std::string &proc_name)
-{
-  for (int i = 0; i < d_nproc_defs; i++)
-    if (proc_name == d_proc_def[i].name)
-      return i;
-
-  throw gc_unknown_proc(proc_name);
-}
-
-std::vector<std::string>
-gc_job_manager_impl::proc_names()
-{
-  std::vector<std::string> r;
-  for (int i = 0; i < d_nproc_defs; i++)
-    r.push_back(d_proc_def[i].name);
-
-  return r;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-worker_ctx::~worker_ctx()
-{
-  if (spe_ctx){
-    int r = spe_context_destroy(spe_ctx);
-    if (r != 0){
-      perror("spe_context_destroy");
-    }
-    spe_ctx = 0;
-  }
-  state = WS_FREE;
-}
diff --git a/gcell/lib/runtime/gc_job_manager_impl.h b/gcell/lib/runtime/gc_job_manager_impl.h
deleted file mode 100644
index 640fdfe79..000000000
--- a/gcell/lib/runtime/gc_job_manager_impl.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_GC_JOB_MANAGER_IMPL_H
-#define INCLUDED_GC_JOB_MANAGER_IMPL_H
-
-#include <gcell/gc_job_manager.h>
-#include <gcell/gc_jd_stack.h>
-#include <gcell/gc_jd_queue.h>
-#include <gcell/gc_spu_args.h>
-#include "gc_client_thread_info.h"
-#include <libspe2.h>
-#include <vector>
-#include <boost/scoped_array.hpp>
-
-typedef boost::shared_ptr<spe_gang_context> spe_gang_context_sptr;
-typedef boost::shared_ptr<spe_program_handle_t> spe_program_handle_sptr;
-typedef boost::scoped_array<gc_client_thread_info> gc_client_thread_info_sa;
-
-
-enum worker_state {
-  WS_FREE,	// not in use
-  WS_INIT,	// allocated and being initialized
-  WS_RUNNING,	// the thread is running
-  WS_DEAD,	// the thread is dead
-};
-
-struct worker_ctx {
-  volatile worker_state	  state;
-  unsigned int		  spe_idx;  	// [0, nspes-1]
-  spe_context_ptr_t	  spe_ctx;
-  spe_spu_control_area_t *spe_ctrl;
-  pthread_t		  thread;
-  gc_spu_args_t		 *spu_args;	// pointer to 16-byte aligned struct
-
-  worker_ctx()
-    : state(WS_FREE), spe_idx(0), spe_ctx(0), spe_ctrl(0),
-      thread(0), spu_args(0) {}
-  ~worker_ctx();
-};
-
-enum evt_handler_state {
-  EHS_INIT,		// being initialized
-  EHS_RUNNING,		// thread is running
-  EHS_SHUTTING_DOWN,	// in process of shutting down everything
-  EHS_WAITING_FOR_WORKERS_TO_DIE,
-  EHS_DEAD,		// thread is dead
-};
-
-enum job_completer_state {
-  JCS_INIT,		// being initialized
-  JCS_RUNNING,		// thread is running
-  JCS_DEAD,		// thread is dead
-};
-
-struct spe_event_handler {
-  spe_event_handler_ptr_t	ptr;
-
-  spe_event_handler() : ptr(0) {}
-  ~spe_event_handler(){
-    if (ptr){
-      if (spe_event_handler_destroy(ptr) != 0){
-	perror("spe_event_handler_destroy");
-      }
-    }
-  }
-};
-
-
-/*!
- * \brief Concrete class that manages SPE jobs.
- *
- * This class contains all the implementation details.
- */
-class gc_job_manager_impl : public gc_job_manager
-{
-  enum { MAX_SPES =  16 };
-
-  int			  d_debug;
-  gc_jm_options		  d_options;
-  spe_program_handle_sptr d_spe_image;
-  spe_gang_context_sptr   d_gang;		// boost::shared_ptr
-
-  worker_ctx 		 d_worker[MAX_SPES];	// SPE ctx, thread, etc
-  gc_spu_args_t		*d_spu_args;		// 16-byte aligned structs
-  boost::shared_ptr<void> _d_spu_args_boost;	// hack for automatic storage mgmt
-
-  gc_comp_info_t	*d_comp_info;		// 128-byte aligned structs
-  boost::shared_ptr<void> _d_comp_info_boost;	// hack for automatic storage mgmt
-
-  // used to coordinate communication w/ the event handling thread
-  boost::mutex		 d_eh_mutex;
-  boost::condition_variable d_eh_cond;
-  pthread_t		 d_eh_thread;		// the event handler thread
-  volatile evt_handler_state	d_eh_state;
-  volatile bool		 	d_shutdown_requested;
-  spe_event_handler	 d_spe_event_handler;
-  
-  // used to coordinate communication w/ the job completer thread
-  boost::mutex		 d_jc_mutex;
-  boost::condition_variable d_jc_cond;
-  pthread_t		 d_jc_thread;		// the job completion thread
-  volatile job_completer_state	d_jc_state;
-  int		      	 d_jc_njobs_active;	// # of jobs submitted but not yet reaped
-
-  // round robin notification of spes
-  int			 d_ntell;		// # of spes to tell
-  unsigned int		 d_tell_start;		// which one to start with
-
-  // All of the job descriptors are hung off of here.
-  // We allocate them all in a single cache aligned chunk.
-  gc_job_desc_t		*d_jd;			// [options.max_jobs]
-  boost::shared_ptr<void> _d_jd_boost;		// hack for automatic storage mgmt
-
-  gc_client_thread_info_sa d_client_thread;	// [options.max_client_threads]
-
-  // We use bitvectors to represent the completing state of a job.  Each
-  // bitvector is d_bvlen longs in length.
-  int			 d_bvlen;		// bit vector length in longs
-
-  // This contains the storage for all the bitvectors used by the job
-  // manager.  There's 1 for each client thread, in the d_jobs_done
-  // field.  We allocate them all in a single cache aligned chunk.
-  boost::shared_ptr<void> _d_all_bitvectors;	// hack for automatic storage mgmt
-
-  // Lock free stack where we keep track of the free job descriptors.
-  gc_jd_stack_t		*d_free_list;		// stack of free job descriptors
-  boost::shared_ptr<void> _d_free_list_boost;	// hack for automatic storage mgmt
-
-  // The PPE inserts jobs here; SPEs pull jobs from here.
-  gc_jd_queue_t	 	*d_queue;		// job queue
-  boost::shared_ptr<void> _d_queue_boost;	// hack for automatic storage mgmt
-
-  int			 d_ea_args_maxsize;
-
-  struct gc_proc_def	*d_proc_def;		// the SPE procedure table
-  uint32_t		 d_proc_def_ls_addr;	// the LS address of the table
-  int			 d_nproc_defs;		// number of proc_defs in table
-
-  gc_client_thread_info *alloc_cti();
-  void free_cti(gc_client_thread_info *cti);
-
-  void create_event_handler();
-  void set_eh_state(evt_handler_state s);
-  void set_ea_args_maxsize(int maxsize);
-
-  void notify_clients_jobs_are_done(unsigned int spe_num,
-				    unsigned int completion_info_idx);
-
-public:
-  void event_handler_loop();	// really private
-  void job_completer_loop();	// really private
-
-private:
-  bool send_all_spes(uint32_t msg);
-  bool send_spe(unsigned int spe, uint32_t msg);
-  void print_event(spe_event_unit_t *evt);
-  void handle_event(spe_event_unit_t *evt);
-  bool incr_njobs_active();
-  void decr_njobs_active(int n);
-  void tell_spes_to_check_queue();
-  void poll_for_job_completion();
-
-  // bitvector ops
-  void bv_zero(unsigned long *bv);
-  void bv_clr(unsigned long *bv, unsigned int bitno);
-  void bv_set(unsigned long *bv, unsigned int bitno);
-  bool bv_isset(unsigned long *bv, unsigned int bitno);
-  bool bv_isclr(unsigned long *bv, unsigned int bitno);
-
-  void setup_logfiles();
-  void sync_logfiles();
-  void unmap_logfiles();
-
-  friend gc_job_manager_sptr gc_make_job_manager(const gc_jm_options *options);
-  
-  gc_job_manager_impl(const gc_jm_options *options = 0);
-
-public:
-  virtual ~gc_job_manager_impl();
-
-  /*!
-   * Stop accepting new jobs.  Wait for existing jobs to complete.
-   * Return all managed SPE's to the system.
-   */
-  virtual bool shutdown();
-
-  /*!
-   * \brief Return number of SPE's currently allocated to job manager.
-   */
-  virtual int nspes() const;
-
-  /*!
-   * \brief Return a pointer to a properly aligned job descriptor,
-   * or zero if none are available.
-   */
-  virtual gc_job_desc *alloc_job_desc();
-
-  /*
-   *! Return a job descriptor previously allocated with alloc_job_desc()
-   *
-   * \param[in] jd pointer to job descriptor to free.
-   */
-  virtual void free_job_desc(gc_job_desc *jd);
-
-  /*!
-   * \brief Submit a job for asynchronous processing on an SPE.
-   *
-   * \param[in] jd pointer to job description
-   *
-   * The caller must not read or write the job description
-   * or any of the memory associated with any indirect arguments
-   * until after calling wait_job.
-   *
-   * \returns true iff the job was successfully enqueued.
-   * If submit_job returns false, check jd->status for additional info.
-   */
-  virtual bool submit_job(gc_job_desc *jd);
-
-  /*!
-   * \brief Wait for job to complete.
-   *
-   * A thread may only wait for jobs which it submitted.
-   *
-   * \returns true if sucessful, else false.
-   */
-  virtual bool 
-  wait_job(gc_job_desc *jd);
-
-  /*!
-   * \brief wait for 1 or more jobs to complete.
-   *
-   * \param[in] njobs is the length of arrays \p jd and \p done.
-   * \param[in] jd are the jobs that are to be waited for.
-   * \param[out] done indicates whether the corresponding job is complete.
-   * \param[in] mode indicates whether to wait for ALL or ANY of the jobs
-   *   in \p jd to complete.
-   *
-   * A thread may only wait for jobs which it submitted.
-   *
-   * \returns number of jobs completed, or -1 if error.
-   */
-  virtual int
-  wait_jobs(unsigned int njobs,
-	    gc_job_desc *jd[], bool done[], gc_wait_mode mode);
-
-  virtual int ea_args_maxsize();
-
-  virtual gc_proc_id_t lookup_proc(const std::string &name);
-  virtual std::vector<std::string> proc_names();
-
-  virtual void set_debug(int debug);
-  virtual int debug();
-};
-
-#endif /* INCLUDED_GC_JOB_MANAGER_IMPL_H */
diff --git a/gcell/lib/runtime/gc_proc_def_utils.cc b/gcell/lib/runtime/gc_proc_def_utils.cc
deleted file mode 100644
index 0250d677a..000000000
--- a/gcell/lib/runtime/gc_proc_def_utils.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gc_proc_def_utils.h>
-#include <gcell/gc_declare_proc.h>
-#include <elf.h>
-#include <stdio.h>
-#include <string.h>
-
-static const unsigned char expected[EI_PAD] = {
-  ELFMAG0,
-  ELFMAG1,
-  ELFMAG2,
-  ELFMAG3,
-  ELFCLASS32,
-  ELFDATA2MSB,
-  EV_CURRENT,
-  ELFOSABI_SYSV,
-  0
-};
-
-
-/*
- * Basically we're going to find the GC_PROC_DEF_SECTION section
- * in the ELF file and return a pointer to it.  The only things in that
- * section are gc_proc_def's
- */
-bool 
-gcpd_find_table(spe_program_handle_t *handle,
-		struct gc_proc_def **table, int *nentries, uint32_t *ls_addr)
-{
-  if (!handle || !table || !nentries)
-    return false;
-
-  *table = 0;
-  *nentries = 0;
-  
-  Elf32_Ehdr *ehdr = (Elf32_Ehdr *)handle->elf_image;
-  if (!ehdr){
-    fprintf(stderr, "gcpd: No ELF image has been loaded\n");
-    return false;
-  }
-
-  // quick check that we're looking at a SPE EXEC object
-
-  if (memcmp(ehdr->e_ident, expected, EI_PAD) != 0){
-    fprintf(stderr, "gcpd: invalid ELF header\n");
-    return false;
-  }
-
-  if (ehdr->e_machine != 0x17){		// confirm machine type (EM_SPU)
-    fprintf(stderr, "gcpd: not an SPE ELF object\n");
-    return false;
-  }
-
-  if (ehdr->e_type != ET_EXEC){
-    fprintf(stderr, "gcpd: invalid SPE ELF type.\n");
-    fprintf(stderr, "gcpd: SPE type %d != %d\n", ehdr->e_type, ET_EXEC);
-    return false;
-  }
-
-  // find the section header table
-
-  Elf32_Shdr *shdr;
-  Elf32_Shdr *sh;
-
-  if (ehdr->e_shentsize != sizeof (*shdr)){
-    fprintf(stderr, "gcpd: invalid section header format.\n");
-    return false;
-  }
-
-  if (ehdr->e_shnum == 0){
-    fprintf(stderr, "gcpd: no section headers in file.\n");
-    return false;
-  }
-
-  shdr = (Elf32_Shdr *) ((char *)ehdr + ehdr->e_shoff);
-  char *str_table = (char *)ehdr + shdr[ehdr->e_shstrndx].sh_offset;
-
-  // traverse the sections looking for GC_PROC_DEF_SECTION
-  
-  for (sh = shdr; sh < &shdr[ehdr->e_shnum]; sh++){
-    if (0){
-      fprintf(stderr, "section name: %s (start: 0x%04x, size: 0x%04x)\n",
-	      str_table + sh->sh_name, sh->sh_offset, sh->sh_size);
-    }
-
-    if (strcmp(GC_PROC_DEF_SECTION, str_table+sh->sh_name) == 0){
-      *table = (struct gc_proc_def *)((char *)ehdr + sh->sh_offset);
-      if (sh->sh_size % (sizeof(struct gc_proc_def)) != 0){
-	fprintf(stderr, "gcpd: %s section has invalid format\n", GC_PROC_DEF_SECTION);
-	return false;
-      }
-      *nentries = sh->sh_size / sizeof(struct gc_proc_def);
-      *ls_addr = sh->sh_addr;
-      return true;
-    }
-  }
-
-  return false;
-}
diff --git a/gcell/lib/runtime/gc_proc_def_utils.h b/gcell/lib/runtime/gc_proc_def_utils.h
deleted file mode 100644
index 79c9b51aa..000000000
--- a/gcell/lib/runtime/gc_proc_def_utils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GC_PROC_DEF_UTILS_H
-#define INCLUDED_GC_PROC_DEF_UTILS_H
-
-#include <gcell/gc_declare_proc.h>
-#include <libspe2.h>
-
-/*!
- * \brief find the gc_proc_def table in the SPE program
- *
- * \param[in]  program is the handle to the loaded SPE program
- * \param[out] table points to the table, if it's found
- * \param[out] nentries is set to the number of entries in the table.
- * \param[out] ls_addr is set to the Local Store address of the table
- *
- * \returns true if successful, else false
- */
-bool
-gcpd_find_table(spe_program_handle_t *program,
-		struct gc_proc_def **table, int *nentries, uint32_t *ls_addr);
-
-
-#endif /* INCLUDED_GC_PROC_DEF_UTILS_H */
diff --git a/gcell/lib/runtime/gcell-embedspu-libtool b/gcell/lib/runtime/gcell-embedspu-libtool
deleted file mode 100755
index c206086a4..000000000
--- a/gcell/lib/runtime/gcell-embedspu-libtool
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-#
-# Take a spu executable and turn into into a libtool compatible .lo (and .o) file.
-# This is needed when you want to embed a SPU executable into a shared library.
-#
-# The symbol assigned to the embedded executable is the basename of the
-# output file with an _spx appended.  E.g., if the output filename is
-# my_spe_tricks.lo the symbol name is my_spe_tricks_spx.
-# ("_spx" stands for SPE executable)
-
-if [ $# -ne 2 ]; then
-  echo "usage: gcell-embedspu-libtool spu_executable output_file.lo " 1>&2
-  exit 1
-fi
-
-spu_executable=$1
-lo_file=$2
-symbol_name=${lo_file%%.lo}_spx
-
-# try to make .libs in case it's not there
-mkdir .libs >/dev/null 2>/dev/null
-
-# generate the .o file that wraps the SPU executable
-ppu-embedspu -m32 -fpic ${symbol_name} ${spu_executable} .libs/${symbol_name}.o
-
-# generate the .lo libtool file that points at all the right places
-rm -f $lo_file
-cat >$lo_file.new <<EOF
-# $lo_file - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-pic_object='.libs/${symbol_name}.o'
-non_pic_object=none
-EOF
-
-mv $lo_file.new $lo_file
-
diff --git a/gcell/lib/runtime/qa_gcell_runtime.cc b/gcell/lib/runtime/qa_gcell_runtime.cc
deleted file mode 100644
index fef9a7fb4..000000000
--- a/gcell/lib/runtime/qa_gcell_runtime.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/*
- * This class gathers together all the test cases for the lib
- * directory into a single test suite.  As you create new test cases,
- * add them here.
- */
-
-#include <qa_gcell_runtime.h>
-#include <qa_jd_stack.h>
-#include <qa_jd_queue.h>
-#include <qa_job_manager.h>
-
-CppUnit::TestSuite *
-qa_gcell_runtime::suite()
-{
-  CppUnit::TestSuite	*s = new CppUnit::TestSuite("runtime");
-
-  s->addTest(qa_jd_stack::suite());
-  s->addTest(qa_jd_queue::suite());
-  s->addTest(qa_job_manager::suite());
-
-  return s;
-}
diff --git a/gcell/lib/runtime/qa_gcell_runtime.h b/gcell/lib/runtime/qa_gcell_runtime.h
deleted file mode 100644
index 36180c919..000000000
--- a/gcell/lib/runtime/qa_gcell_runtime.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_QA_GCELL_RUNTIME_H
-#define INCLUDED_QA_GCELL_RUNTIME_H
-
-#include <cppunit/TestSuite.h>
-
-//! collect all the tests for the runtime directory
-
-class qa_gcell_runtime {
-public:
-  //! return suite of tests
-  static CppUnit::TestSuite *suite();
-};
-
-
-#endif /* INCLUDED_QA_GCELL_RUNTIME_H */
diff --git a/gcell/lib/runtime/qa_jd_queue.cc b/gcell/lib/runtime/qa_jd_queue.cc
deleted file mode 100644
index 35ab9d82f..000000000
--- a/gcell/lib/runtime/qa_jd_queue.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "qa_jd_queue.h"
-#include <cppunit/TestAssert.h>
-#include <gcell/gc_jd_queue.h>
-#include <stdio.h>
-
-
-
-static const int NJDS = 16;
-static gc_jd_queue_t queue;
-static gc_job_desc_t jds[NJDS];
-
-// no brainer, single threaded basic checkout
-void
-qa_jd_queue::t1()
-{
-  // N.B., queue allocated stuff doesn't obey ((aligned (N))) attributes
-  //const int NJDS = 8;
-  //gc_jd_queue_t queue;
-  //gc_job_desc_t jds[NJDS];
-
-  //printf("&queue   = %p\n", &queue);
-  //printf("&jds[0] = %p\n", &jds[0]);
-  //printf("&jds[1] = %p\n", &jds[1]);
-
-  CPPUNIT_ASSERT(((uintptr_t) &queue & 0x7f) == 0);
-  CPPUNIT_ASSERT(((uintptr_t) &jds[0] & 0x7f) == 0);
-  CPPUNIT_ASSERT(((uintptr_t) &jds[1] & 0x7f) == 0);
-
-  gc_jd_queue_init(&queue);
-
-  CPPUNIT_ASSERT(gc_jd_queue_dequeue(&queue) == 0);
-
-  gc_jd_queue_enqueue(&queue, &jds[0]);
-  CPPUNIT_ASSERT_EQUAL(&jds[0], gc_jd_queue_dequeue(&queue));
-
-  CPPUNIT_ASSERT(gc_jd_queue_dequeue(&queue) == 0);
-
-  for (int i = 0; i < NJDS; i++)
-    gc_jd_queue_enqueue(&queue, &jds[i]);
-
-  for (int i = 0; i < NJDS; i++)
-    CPPUNIT_ASSERT_EQUAL(&jds[i], gc_jd_queue_dequeue(&queue));
-
-  CPPUNIT_ASSERT(gc_jd_queue_dequeue(&queue) == 0);
-}
-
-// FIXME multithreaded (running on PPE)
-void
-qa_jd_queue::t2()
-{
-}
-
-// FIXME multithreaded (running on PPE & SPE)
-void
-qa_jd_queue::t3()
-{
-}
diff --git a/gcell/lib/runtime/qa_jd_queue.h b/gcell/lib/runtime/qa_jd_queue.h
deleted file mode 100644
index 5e1aab84f..000000000
--- a/gcell/lib/runtime/qa_jd_queue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_QA_JD_QUEUE_H
-#define INCLUDED_QA_JD_QUEUE_H
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_jd_queue : public CppUnit::TestCase {
-
-  CPPUNIT_TEST_SUITE(qa_jd_queue);
-  CPPUNIT_TEST(t1);
-  CPPUNIT_TEST(t2);
-  CPPUNIT_TEST(t3);
-  CPPUNIT_TEST_SUITE_END();
-
- private:
-  void t1();
-  void t2();
-  void t3();
-};
-
-
-#endif /* INCLUDED_QA_JD_QUEUE_H */
diff --git a/gcell/lib/runtime/qa_jd_stack.cc b/gcell/lib/runtime/qa_jd_stack.cc
deleted file mode 100644
index ce4ce2d0d..000000000
--- a/gcell/lib/runtime/qa_jd_stack.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "qa_jd_stack.h"
-#include <cppunit/TestAssert.h>
-#include <gcell/gc_jd_stack.h>
-#include <stdio.h>
-
-
-
-static const int NJDS = 8;
-static gc_jd_stack_t stack;
-static gc_job_desc_t jds[NJDS];
-
-// no brainer, single threaded basic checkout
-void
-qa_jd_stack::t1()
-{
-  // N.B., stack allocated stuff doesn't obey ((aligned (N))) attributes
-  //const int NJDS = 8;
-  //gc_jd_stack_t stack;
-  //gc_job_desc_t jds[NJDS];
-
-  //printf("&stack   = %p\n", &stack);
-  //printf("&jds[0] = %p\n", &jds[0]);
-  //printf("&jds[1] = %p\n", &jds[1]);
-
-  CPPUNIT_ASSERT(((uintptr_t) &stack & 0x7f) == 0);
-  CPPUNIT_ASSERT(((uintptr_t) &jds[0] & 0x7f) == 0);
-  CPPUNIT_ASSERT(((uintptr_t) &jds[1] & 0x7f) == 0);
-
-  gc_jd_stack_init(&stack);
-
-  CPPUNIT_ASSERT(gc_jd_stack_pop(&stack) == 0);
-
-  for (int i = 0; i < NJDS; i++)
-    gc_jd_stack_push(&stack, &jds[i]);
-
-  for (int i = 0; i < NJDS; i++)
-    CPPUNIT_ASSERT_EQUAL(&jds[NJDS - i - 1], gc_jd_stack_pop(&stack));
-
-  CPPUNIT_ASSERT(gc_jd_stack_pop(&stack) == 0);
-}
-
-// FIXME multithreaded (running on PPE)
-void
-qa_jd_stack::t2()
-{
-}
diff --git a/gcell/lib/runtime/qa_jd_stack.h b/gcell/lib/runtime/qa_jd_stack.h
deleted file mode 100644
index 1546bbf9f..000000000
--- a/gcell/lib/runtime/qa_jd_stack.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_QA_JD_STACK_H
-#define INCLUDED_QA_JD_STACK_H
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_jd_stack : public CppUnit::TestCase {
-
-  CPPUNIT_TEST_SUITE(qa_jd_stack);
-  CPPUNIT_TEST(t1);
-  CPPUNIT_TEST(t2);
-  CPPUNIT_TEST_SUITE_END();
-
- private:
-  void t1();
-  void t2();
-
-};
-
-
-
-#endif /* INCLUDED_QA_JD_STACK_H */
diff --git a/gcell/lib/runtime/qa_job_manager.cc b/gcell/lib/runtime/qa_job_manager.cc
deleted file mode 100644
index 45cf26cfc..000000000
--- a/gcell/lib/runtime/qa_job_manager.cc
+++ /dev/null
@@ -1,790 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "qa_job_manager.h"
-#include <cppunit/TestAssert.h>
-#include <gcell/gc_job_manager.h>
-#include <stdexcept>
-#include <stdio.h>
-#include <time.h>
-#include <errno.h>
-#include <string.h>
-
-#include <malloc.h>
-
-// handle to embedded SPU executable w/ QA routines
-extern spe_program_handle_t gcell_runtime_qa_spx;
-
-#if 0
-static void
-gc_msleep(unsigned long millisecs)
-{
-  int r;
-  struct timespec tv;
-  tv.tv_sec = millisecs / 1000;
-  tv.tv_nsec = (millisecs - (tv.tv_sec * 1000)) * 1000000;
-  
-  while (1){
-    r = nanosleep(&tv, &tv);
-    if (r == 0)
-      return;
-    if (r == -1 && errno == EINTR)
-      continue;
-    perror("nanosleep");
-    return;
-  }
-}
-#endif
-
-void
-qa_job_manager::leak_check(test_t t, const std::string &name)
-{
-  struct mallinfo before, after;
-
-  before = mallinfo();
-  (this->*t)();
-  after = mallinfo();
-
-  size_t delta = after.uordblks - before.uordblks;
-  if (delta != 0){
-    std::cout << name << " leaked memory\n";
-    printf("  before.uordblks = %6d\n", before.uordblks);
-    printf("  after.uordblks  = %6d\n",  after.uordblks);
-    printf("  delta = %d\n", after.uordblks - before.uordblks);
-  }
-}
-
-void
-qa_job_manager::t0()
-{
-  //leak_check(&qa_job_manager::t1_body, "t1-0");
-}
-
-void
-qa_job_manager::t1()
-{
-  t1_body();		// leaks 800 bytes first time, could be one-time inits
-  leak_check(&qa_job_manager::t1_body, "t1");
-}
-
-void
-qa_job_manager::t2()
-{
-  leak_check(&qa_job_manager::t2_body, "t2");
-}
-
-void
-qa_job_manager::t3()
-{
-  t3_body();		// leaks first time only, could be cppunit
-  leak_check(&qa_job_manager::t3_body, "t3");
-}
-
-void
-qa_job_manager::t4()
-{
-  leak_check(&qa_job_manager::t4_body, "t4");
-}
-
-void
-qa_job_manager::t5()
-{
-  leak_check(&qa_job_manager::t5_body, "t5");
-}
-
-void
-qa_job_manager::t6()
-{
-  leak_check(&qa_job_manager::t6_body, "t6");
-}
-
-void
-qa_job_manager::t7()
-{
-  leak_check(&qa_job_manager::t7_body, "t7");
-}
-
-void
-qa_job_manager::t8()
-{
-  leak_check(&qa_job_manager::t8_body, "t8");
-}
-
-void
-qa_job_manager::t9()
-{
-  leak_check(&qa_job_manager::t9_body, "t9");
-}
-
-void
-qa_job_manager::t10()
-{
-  leak_check(&qa_job_manager::t10_body, "t10");
-}
-
-void
-qa_job_manager::t11()
-{
-  leak_check(&qa_job_manager::t11_body, "t11");
-}
-
-void
-qa_job_manager::t12()
-{
-  leak_check(&qa_job_manager::t12_body, "t12");
-}
-
-void
-qa_job_manager::t13()
-{
-  leak_check(&qa_job_manager::t13_body, "t13");
-}
-
-void
-qa_job_manager::t14()
-{
-  leak_check(&qa_job_manager::t14_body, "t14");
-}
-
-void
-qa_job_manager::t15()
-{
-  leak_check(&qa_job_manager::t15_body, "t15");
-}
-
-// ----------------------------------------------------------------
-
-void
-qa_job_manager::t1_body()
-{
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  mgr = gc_make_job_manager(&opts);
-}
-
-void
-qa_job_manager::t2_body()
-{
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 100;
-  opts.gang_schedule = false;
-  mgr = gc_make_job_manager(&opts);
-}
-
-void
-qa_job_manager::t3_body()
-{
-  // This leaks memory the first time it's invoked, but I'm not sure
-  // if it's us or the underlying exception handling mechanism, or
-  // cppunit.  cppunit is the prime suspect.
-
-#if 0
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 100;
-  opts.gang_schedule = true;
-  CPPUNIT_ASSERT_THROW(mgr = gc_make_job_manager(&opts), std::out_of_range);
-#endif
-}
-
-static void
-init_jd(gc_job_desc *jd, gc_proc_id_t proc_id)
-{
-  jd->proc_id = proc_id;
-  jd->input.nargs = 0;
-  jd->output.nargs = 0;
-  jd->eaa.nargs = 0;
-}
-
-void
-qa_job_manager::t4_body()
-{
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;
-  mgr = gc_make_job_manager(&opts);
-  //mgr->set_debug(-1);
-  static const int NJOBS = 32;
-  gc_job_desc *jds[NJOBS];
-  bool done[NJOBS];
-
-  gc_proc_id_t gcp_no_such;
-  CPPUNIT_ASSERT_THROW(gcp_no_such = mgr->lookup_proc("--no-such-proc-name--"), gc_unknown_proc);
-
-  gc_proc_id_t gcp_qa_nop = mgr->lookup_proc("qa_nop");
-  CPPUNIT_ASSERT(gcp_qa_nop != GCP_UNKNOWN_PROC);
-
-  for (int i = 0; i < NJOBS; i++){
-    jds[i] = mgr->alloc_job_desc();
-    init_jd(jds[i], gcp_qa_nop);
-  }
-
-  for (int i = 0; i < NJOBS; i++){
-    if (!mgr->submit_job(jds[i])){
-      printf("%d: submit_job(jds[%d]) failed, status = %d\n",
-	     __LINE__, i, jds[i]->status);
-    }
-  }
-
-  int n = mgr->wait_jobs(NJOBS, jds, done, GC_WAIT_ALL);
-  CPPUNIT_ASSERT_EQUAL(NJOBS, n);
-
-  for (int i = 0; i < NJOBS; i++){
-    mgr->free_job_desc(jds[i]);
-  }
-}
-
-void
-qa_job_manager::t5_body()
-{
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 0;	// use them all
-  mgr = gc_make_job_manager(&opts);
-  //mgr->set_debug(-1);
-  static const int NJOBS = 32;
-  gc_job_desc *jds[NJOBS];
-  bool done[NJOBS];
-
-  gc_proc_id_t gcp_qa_nop = mgr->lookup_proc("qa_nop");
-
-  for (int i = 0; i < NJOBS; i++){
-    jds[i] = mgr->alloc_job_desc();
-    init_jd(jds[i], gcp_qa_nop);
-  }
-
-  for (int i = 0; i < NJOBS; i++){
-    if (!mgr->submit_job(jds[i])){
-      printf("%d: submit_job(jds[%d]) failed, status = %d\n",
-	     __LINE__, i, jds[i]->status);
-    }
-  }
-
-  int n = mgr->wait_jobs(NJOBS, jds, done, GC_WAIT_ALL);
-  CPPUNIT_ASSERT_EQUAL(NJOBS, n);
-
-  for (int i = 0; i < NJOBS; i++){
-    mgr->free_job_desc(jds[i]);
-  }
-}
-
-void
-qa_job_manager::t6_body()
-{
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;	
-  mgr = gc_make_job_manager(&opts);
-  gc_proc_id_t gcp_qa_nop = mgr->lookup_proc("qa_nop");
-  gc_job_desc *jd = mgr->alloc_job_desc();
-
-  
-  // test for success with gcp_qa_nop procedure
-  init_jd(jd, gcp_qa_nop);
-  if (!mgr->submit_job(jd)){
-    printf("%d: submit_job(jd) failed, status = %d\n", __LINE__, jd->status);
-  }
-  else {
-    mgr->wait_job(jd);
-    CPPUNIT_ASSERT_EQUAL(JS_OK, jd->status);
-  }
-
-  // test for JS_UNKNOWN_PROC with bogus procedure
-  init_jd(jd, -2);
-  if (!mgr->submit_job(jd)){
-    printf("%d: submit_job(jd) failed, status = %d\n", __LINE__, jd->status);
-  }
-  else {
-    mgr->wait_job(jd);
-    CPPUNIT_ASSERT_EQUAL(JS_UNKNOWN_PROC, jd->status);
-  }
-
-  mgr->free_job_desc(jd);
-}
-
-static int
-sum_shorts(short *p, int nshorts)
-{
-  int total = 0;
-  for (int i = 0; i < nshorts; i++)
-    total += p[i];
-
-  return total;
-}
-
-static void
-test_sum_shorts(gc_job_manager_sptr mgr, short *buf, int nshorts)
-{
-  gc_job_desc *jd = mgr->alloc_job_desc();
-  gc_proc_id_t gcp_qa_sum_shorts = mgr->lookup_proc("qa_sum_shorts");
-
-  init_jd(jd, gcp_qa_sum_shorts);
-  jd->eaa.nargs = 1;
-  jd->eaa.arg[0].ea_addr = ptr_to_ea(buf);
-  jd->eaa.arg[0].direction = GCJD_DMA_GET;
-  jd->eaa.arg[0].get_size = nshorts * sizeof(short);
-  
-
-  if (!mgr->submit_job(jd)){
-    printf("%d: submit_job(jd) failed, status = %d\n", __LINE__, jd->status);
-  }
-  else {
-    mgr->wait_job(jd);
-    CPPUNIT_ASSERT_EQUAL(JS_OK, jd->status);
-    int expected = sum_shorts(buf, nshorts);
-    int actual = jd->output.arg[0].s32;
-    CPPUNIT_ASSERT_EQUAL(expected, actual);
-  }
-
-  mgr->free_job_desc(jd);
-}
-
-static const int NS = 32768;
-static short short_buf[NS] _AL128;	// for known alignment
-
-//
-// test all "get" alignments and sizes
-//
-void
-qa_job_manager::t7_body()
-{
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;
-  mgr = gc_make_job_manager(&opts);
-
-  int ea_args_maxsize = mgr->ea_args_maxsize();
-
-  for (int i = 0; i < NS; i++)	// init buffer with known qty
-    short_buf[i] = 0x1234 + i;
-  
-  for (int offset = 0; offset <= 128; offset++){
-    for (int len = 0; len <= 128; len++){
-      test_sum_shorts(mgr, &short_buf[offset], len);
-    }
-  }
-
-  // confirm maximum length
-  for (int offset = 0; offset <= 64; offset++){
-    test_sum_shorts(mgr, &short_buf[offset], ea_args_maxsize/sizeof(short));
-  }
-}
-
-//
-// test "get" args too long
-//
-void
-qa_job_manager::t8_body()
-{
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;
-  mgr = gc_make_job_manager(&opts);
-  gc_job_desc *jd = mgr->alloc_job_desc();
-  gc_proc_id_t gcp_qa_sum_shorts = mgr->lookup_proc("qa_sum_shorts");
-
-  init_jd(jd, gcp_qa_sum_shorts);
-  jd->eaa.nargs = 1;
-  jd->eaa.arg[0].ea_addr = 0;
-  jd->eaa.arg[0].direction = GCJD_DMA_GET;
-  jd->eaa.arg[0].get_size = 1 << 20;
-
-  if (!mgr->submit_job(jd)){
-    printf("%d: submit_job(jd) failed, status = %d\n", __LINE__, jd->status);
-  }
-  else {
-    mgr->wait_job(jd);
-    CPPUNIT_ASSERT_EQUAL(JS_ARGS_TOO_LONG, jd->status);
-  }
-
-  mgr->free_job_desc(jd);
-}
-
-//
-// test MAX_ARGS_EA "get" case
-//
-void
-qa_job_manager::t9_body()
-{
-  static const int N = 127;
-  static const int M = 201;
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;
-  mgr = gc_make_job_manager(&opts);
-  gc_job_desc *jd = mgr->alloc_job_desc();
-  gc_proc_id_t gcp_qa_sum_shorts = mgr->lookup_proc("qa_sum_shorts");
-
-  init_jd(jd, gcp_qa_sum_shorts);
-  jd->eaa.nargs = MAX_ARGS_EA;
-  for (int i = 0; i < MAX_ARGS_EA; i++){
-    jd->eaa.arg[i].direction = GCJD_DMA_GET;
-    jd->eaa.arg[i].ea_addr = ptr_to_ea(&short_buf[i * M]);
-    jd->eaa.arg[i].get_size = N * sizeof(short);
-  }
-
-  if (!mgr->submit_job(jd)){
-    printf("%d: submit_job(jd) failed, status = %d\n", __LINE__, jd->status);
-  }
-  else {
-    mgr->wait_job(jd);
-    CPPUNIT_ASSERT_EQUAL(JS_OK, jd->status);
-    for (int i = 0; i < MAX_ARGS_EA; i++){
-      int expected = sum_shorts(&short_buf[i * M], N);
-      int actual = jd->output.arg[i].s32;
-      CPPUNIT_ASSERT_EQUAL(expected, actual);
-    }
-  }
-
-  mgr->free_job_desc(jd);
-}
-
-static bool
-confirm_const(const unsigned char *buf, size_t len, unsigned char v)
-{
-  bool ok = true;
-
-  for (size_t i = 0; i < len; i++){
-    if (buf[i] != v){
-      ok = false;
-      printf("confirm_const: buf[%6d] = 0x%02x, expected = 0x%02x\n",
-	     i, buf[i], v);
-    }
-  }
-
-  return ok;
-}
-
-static bool
-confirm_seq(const unsigned char *buf, size_t len, unsigned char v)
-{
-  bool ok = true;
-
-  for (size_t i = 0; i < len; i++, v++){
-    if (buf[i] != v){
-      ok = false;
-      printf("confirm_seq: buf[%6d] = 0x%02x, expected = 0x%02x\n",
-	     i, buf[i], v);
-    }
-  }
-
-  return ok;
-}
-
-static void
-test_put_seq(gc_job_manager_sptr mgr, int offset, int len, int starting_val)
-{
-  gc_job_desc *jd = mgr->alloc_job_desc();
-  gc_proc_id_t gcp_qa_put_seq = mgr->lookup_proc("qa_put_seq");
-
-  unsigned char *buf = (unsigned char *) short_buf;
-  size_t buf_len = sizeof(short_buf);
-  memset(buf, 0xff, buf_len);
-
-  // two cache lines into the buffer, so we can check before and after
-  int fixed_offset = 256;
-
-  init_jd(jd, gcp_qa_put_seq);
-  jd->input.nargs = 1;
-  jd->input.arg[0].s32 = starting_val;
-  jd->eaa.nargs = 1;
-  jd->eaa.arg[0].ea_addr = ptr_to_ea(buf + fixed_offset + offset);
-  jd->eaa.arg[0].direction = GCJD_DMA_PUT;
-  jd->eaa.arg[0].put_size = len;
-
-  if (!mgr->submit_job(jd)){
-    printf("%d: submit_job(jd) failed, status = %d\n", __LINE__, jd->status);
-  }
-  else {
-    mgr->wait_job(jd);
-    CPPUNIT_ASSERT_EQUAL(JS_OK, jd->status);
-    
-    // check before
-    CPPUNIT_ASSERT(confirm_const(&buf[0], fixed_offset + offset, 0xff)); 
-
-    // check sequence
-    CPPUNIT_ASSERT(confirm_seq(&buf[fixed_offset + offset], len, starting_val));
-
-    // check after
-    CPPUNIT_ASSERT(confirm_const(&buf[fixed_offset + offset + len],
-				 buf_len - fixed_offset - offset - len, 0xff));
-  }
-  mgr->free_job_desc(jd);
-}
-
-//
-// Test all "put" alignments and sizes
-//
-void
-qa_job_manager::t10_body()
-{
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;
-  mgr = gc_make_job_manager(&opts);
-
-  int starting_val = 13;
-
-  for (int offset = 0; offset <= 128; offset++){
-    for (int len = 0; len <= 128; len++){
-      test_put_seq(mgr, offset, len, starting_val++);
-    }
-  }
-
-  int ea_args_maxsize = mgr->ea_args_maxsize();
-
-  // confirm maximum length
-  for (int offset = 0; offset <= 64; offset++){
-    test_put_seq(mgr, offset, ea_args_maxsize, starting_val++);
-  }
-}
-
-//
-// test "put" args too long
-//
-void
-qa_job_manager::t11_body()
-{
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;
-  mgr = gc_make_job_manager(&opts);
-  gc_job_desc *jd = mgr->alloc_job_desc();
-  gc_proc_id_t gcp_qa_put_seq = mgr->lookup_proc("qa_put_seq");
-
-  init_jd(jd, gcp_qa_put_seq);
-  jd->input.nargs = 1;
-  jd->input.arg[0].s32 = 0;
-  jd->eaa.nargs = 1;
-  jd->eaa.arg[0].ea_addr = 0;
-  jd->eaa.arg[0].direction = GCJD_DMA_PUT;
-  jd->eaa.arg[0].put_size = 1 << 20;
-
-  if (!mgr->submit_job(jd)){
-    printf("%d: submit_job(jd) failed, status = %d\n", __LINE__, jd->status);
-  }
-  else {
-    mgr->wait_job(jd);
-    CPPUNIT_ASSERT_EQUAL(JS_ARGS_TOO_LONG, jd->status);
-  }
-
-  mgr->free_job_desc(jd);
-}
-
-//
-// test MAX_ARGS_EA "put" case
-//
-void
-qa_job_manager::t12_body()
-{
-  static const int N = 127;
-  static const int M = 201;
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;
-  mgr = gc_make_job_manager(&opts);
-  gc_job_desc *jd = mgr->alloc_job_desc();
-  gc_proc_id_t gcp_qa_put_seq = mgr->lookup_proc("qa_put_seq");
-
-  unsigned char *buf = (unsigned char *) short_buf;
-  size_t buf_len = sizeof(short_buf);
-  memset(buf, 0xff, buf_len);
-
-  // two cache lines into the buffer, so we can check before and after
-  int fixed_offset = 256;
-
-  int starting_val = 13;
-
-  init_jd(jd, gcp_qa_put_seq);
-  jd->input.nargs = 1;
-  jd->input.arg[0].s32 = starting_val;
-  jd->eaa.nargs = MAX_ARGS_EA;
-  for (int i = 0; i < MAX_ARGS_EA; i++){
-    jd->eaa.arg[i].direction = GCJD_DMA_PUT;
-    jd->eaa.arg[i].ea_addr = ptr_to_ea(&buf[i * M + fixed_offset]);
-    jd->eaa.arg[i].put_size = N;
-  }
-
-  if (!mgr->submit_job(jd)){
-    printf("%d: submit_job(jd) failed, status = %d\n", __LINE__, jd->status);
-  }
-  else {
-    mgr->wait_job(jd);
-    CPPUNIT_ASSERT_EQUAL(JS_OK, jd->status);
-    for (int i = 0; i < MAX_ARGS_EA; i++){
-      CPPUNIT_ASSERT(confirm_seq(&buf[i * M + fixed_offset], N, starting_val));
-      starting_val += N;
-    }
-  }
-
-  mgr->free_job_desc(jd);
-}
-
-//
-// test qa_copy primitive
-//
-void
-qa_job_manager::t13_body()
-{
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;
-  mgr = gc_make_job_manager(&opts);
-
-  memset(short_buf, 0, sizeof(short_buf));
-  for (int i = 0; i < NS/2; i++)	// init buffer with known qty
-    short_buf[i] = 0x1234 + i;
-
-  int nshorts = NS/2;
-
-  gc_job_desc *jd = mgr->alloc_job_desc();
-  gc_proc_id_t gcp_qa_copy = mgr->lookup_proc("qa_copy");
-
-#if 0
-  printf("gcq_qa_copy = %d\n", gcp_qa_copy);
-  std::vector<std::string> procs = mgr->proc_names();
-  for (unsigned int i = 0; i < procs.size(); ++i)
-    std::cout << procs[i] << std::endl;
-#endif
-
-  init_jd(jd, gcp_qa_copy);
-  jd->eaa.nargs = 2;
-  jd->eaa.arg[0].ea_addr = ptr_to_ea(&short_buf[nshorts]);
-  jd->eaa.arg[0].direction = GCJD_DMA_PUT;
-  jd->eaa.arg[0].put_size = nshorts * sizeof(short);
-  
-  jd->eaa.arg[1].ea_addr = ptr_to_ea(&short_buf[0]);
-  jd->eaa.arg[1].direction = GCJD_DMA_GET;
-  jd->eaa.arg[1].get_size = nshorts * sizeof(short);
-  
-
-  if (!mgr->submit_job(jd)){
-    printf("%d: submit_job(jd) failed, status = %d\n", __LINE__, jd->status);
-  }
-  else {
-    mgr->wait_job(jd);
-    CPPUNIT_ASSERT_EQUAL(JS_OK, jd->status);
-    CPPUNIT_ASSERT_EQUAL(0, jd->output.arg[0].s32);
-
-    bool ok = true;
-    for (int i = 0; i < nshorts; i++){
-      if (short_buf[i] != short_buf[i + nshorts])
-	ok = false;
-    }
-    CPPUNIT_ASSERT(ok);
-  }
-  mgr->free_job_desc(jd);
-}
-
-/*
- * Parallel submission of NJOBS "put" jobs will test double buffered puts.
- */
-void
-qa_job_manager::t14_body()
-{
-  //return;
-
-  //static const int NJOBS = 64;
-  static const int NJOBS = 128;
-  static const int LEN_PER_JOB = 1021;
-  unsigned char    buf[NJOBS * LEN_PER_JOB];
-  gc_job_desc_t	  *jd[NJOBS];
-  bool		   done[NJOBS];
-
-  static const int STARTING_VAL = 13;
-
-  memset(buf, 0xff, LEN_PER_JOB * NJOBS);
-
-  gc_job_manager_sptr mgr;
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;
-  mgr = gc_make_job_manager(&opts);
-
-
-  gc_proc_id_t gcp_qa_put_seq = mgr->lookup_proc("qa_put_seq");
-
-  // do all the initialization up front
-
-  for (int i = 0, val = STARTING_VAL; i < NJOBS; i++, val += 3){
-    jd[i] = mgr->alloc_job_desc();
-    init_jd(jd[i], gcp_qa_put_seq);
-    jd[i]->input.nargs = 1;
-    jd[i]->input.arg[0].s32 = val;
-    jd[i]->eaa.nargs = 1;
-    jd[i]->eaa.arg[0].ea_addr = ptr_to_ea(&buf[i * LEN_PER_JOB]);
-    jd[i]->eaa.arg[0].direction = GCJD_DMA_PUT;
-    jd[i]->eaa.arg[0].put_size = LEN_PER_JOB;
-  }
-
-  // submit them all
-
-  for (int i = 0; i < NJOBS; i++){
-    if (!mgr->submit_job(jd[i])){
-      printf("%d: submit_job(jd[%2d]) failed, status = %d\n", __LINE__, i, jd[i]->status);
-    }
-  }
-
-  // wait for them all
-
-  int n = mgr->wait_jobs(NJOBS, jd, done, GC_WAIT_ALL);
-  CPPUNIT_ASSERT_EQUAL(NJOBS, n);
-
-  // check results
-
-  for (int i = 0, val = STARTING_VAL; i < NJOBS; i++, val += 3){
-    CPPUNIT_ASSERT_EQUAL(JS_OK, jd[i]->status);
-    CPPUNIT_ASSERT(confirm_seq(&buf[i * LEN_PER_JOB], LEN_PER_JOB, val));
-  }
-  
-  // cleanup
-  for (int i = 0; i < NJOBS; i++)
-    mgr->free_job_desc(jd[i]);
-}
-
-void
-qa_job_manager::t15_body()
-{
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_runtime_qa_spx);
-  opts.nspes = 1;
-  gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
-
-  gc_job_manager::set_singleton(mgr);
-
-  CPPUNIT_ASSERT(gc_job_manager::singleton());
-  mgr.reset();
-  CPPUNIT_ASSERT_THROW(gc_job_manager::singleton(), boost::bad_weak_ptr);
-}
diff --git a/gcell/lib/runtime/qa_job_manager.h b/gcell/lib/runtime/qa_job_manager.h
deleted file mode 100644
index ab3325b73..000000000
--- a/gcell/lib/runtime/qa_job_manager.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_QA_JOB_MANAGER_H
-#define INCLUDED_QA_JOB_MANAGER_H
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_job_manager;
-typedef void (qa_job_manager::*test_t)();
-
-
-class qa_job_manager : public CppUnit::TestCase {
-
-  CPPUNIT_TEST_SUITE(qa_job_manager);
-  CPPUNIT_TEST(t0);
-  CPPUNIT_TEST(t1);
-  CPPUNIT_TEST(t2);
-  CPPUNIT_TEST(t3);
-  CPPUNIT_TEST(t4);
-  CPPUNIT_TEST(t5);
-  CPPUNIT_TEST(t6);
-  CPPUNIT_TEST(t7);
-  CPPUNIT_TEST(t8);
-  CPPUNIT_TEST(t9);
-  CPPUNIT_TEST(t10);
-  CPPUNIT_TEST(t11);
-  CPPUNIT_TEST(t12);
-  CPPUNIT_TEST(t13);
-  CPPUNIT_TEST(t14);
-  CPPUNIT_TEST(t15);
-  CPPUNIT_TEST_SUITE_END();
-
- private:
-  void leak_check(test_t t, const std::string &name);
-
-  void t0();
-  void t1();
-  void t1_body();
-  void t2();
-  void t2_body();
-  void t3();
-  void t3_body();
-  void t4();
-  void t4_body();
-  void t5();
-  void t5_body();
-  void t6();
-  void t6_body();
-  void t7();
-  void t7_body();
-  void t8();
-  void t8_body();
-  void t9();
-  void t9_body();
-  void t10();
-  void t10_body();
-  void t11();
-  void t11_body();
-  void t12();
-  void t12_body();
-  void t13();
-  void t13_body();
-  void t14();
-  void t14_body();
-  void t15();
-  void t15_body();
-
-};
-
-#endif /* INCLUDED_QA_JOB_MANAGER_H */
diff --git a/gcell/lib/runtime/spu/.gitignore b/gcell/lib/runtime/spu/.gitignore
deleted file mode 100644
index 36b575570..000000000
--- a/gcell/lib/runtime/spu/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/Makefile
-/Makefile.in
-/*.a
-/*.la
-/*.lo
-/.deps
-/.libs
-/test_spu
-/gcell_spu_main
-/gcell_qa
diff --git a/gcell/lib/runtime/spu/gc_delay.c b/gcell/lib/runtime/spu/gc_delay.c
deleted file mode 100644
index 4d58935aa..000000000
--- a/gcell/lib/runtime/spu/gc_delay.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/spu/gc_delay.h>
-#include <gcell/compiler.h>
-
-inline static void
-gc_udelay_1us(void)
-{
-  unsigned int i = 158;
-
-  do {  // 20 clocks per iteration of the loop
-    asm ("nop $127; nop $127; nop $127; nop $127; nop $127");
-    asm ("nop $127; nop $127; nop $127; nop $127; nop $127");
-    asm ("nop $127; nop $127; nop $127; nop $127; nop $127");
-    asm ("nop $127; nop $127");
-  } while(--i != 0);
-}
-
-void
-gc_udelay(unsigned int usecs)
-{
-  unsigned int i;
-  for (i = 0; i < usecs; i++)
-    gc_udelay_1us();
-}
-
-void
-gc_cdelay(unsigned int cpu_cycles)
-{
-  if (cpu_cycles < 40)	// roughly the amount of overhead
-    return;
-  
-  cpu_cycles >>= 2;	// about 4 cycles / loop
-
-  while (cpu_cycles-- != 0){
-    asm ("nop $127");	// keeps compiler from removing the loop
-  }
-}
-
diff --git a/gcell/lib/runtime/spu/gc_logging.c b/gcell/lib/runtime/spu/gc_logging.c
deleted file mode 100644
index 48b7e5f25..000000000
--- a/gcell/lib/runtime/spu/gc_logging.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/gc_logging.h>
-#include <gcell/gc_spu_args.h>
-#include <spu_intrinsics.h>
-#include <spu_mfcio.h>
-
-static gc_eaddr_t     log_base_ea;	// base address of log entries in EA
-static uint32_t	      log_idx_mask;	// nentries - 1
-static uint32_t	      log_idx;		// current log entry index
-static uint32_t	      log_seqno;
-
-static int 	      log_tags;		// two consecutive tags
-static int	      tmp_buffer_busy;	// bitmask: buffer busy state
-static int	      tmp_buffer_idx;	// 0 or 1
-static gc_log_entry_t tmp_buffer[2];
-
-void
-_gc_log_init(gc_log_t info)
-{
-  spu_write_decrementer(~0);
-
-  log_base_ea = info.base;
-  log_idx_mask = info.nentries - 1;
-  log_idx = 0;
-  log_seqno = 0;
-
-  log_tags = mfc_multi_tag_reserve(2);
-  tmp_buffer_busy = 0;
-  tmp_buffer_idx = 0;
-
-  gc_log_write0(GCL_SS_SYS, 0);
-}
-
-void
-_gc_log_write(gc_log_entry_t entry)
-{
-  if (log_base_ea == 0)
-    return;
-
-  entry.seqno = log_seqno++;
-  entry.timestamp = spu_read_decrementer();
-
-  if (tmp_buffer_busy & (1 << tmp_buffer_idx)){
-    mfc_write_tag_mask(1 << (log_tags + tmp_buffer_idx));
-    mfc_read_tag_status_all();
-  }
-
-  tmp_buffer[tmp_buffer_idx] = entry;	// save local copy
-
-  mfc_put(&tmp_buffer[tmp_buffer_idx],
-	  log_base_ea + log_idx * sizeof(entry), sizeof(entry),
-	  log_tags + tmp_buffer_idx, 0, 0);
-
-  tmp_buffer_busy |= (1 << tmp_buffer_idx);
-  tmp_buffer_idx ^= 0x1;
-  log_idx = (log_idx + 1) & log_idx_mask;
-}
diff --git a/gcell/lib/runtime/spu/gc_main.c b/gcell/lib/runtime/spu/gc_main.c
deleted file mode 100644
index ba56e40f6..000000000
--- a/gcell/lib/runtime/spu/gc_main.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-// #define ENABLE_GC_LOGGING 	// define to enable logging
-
-#include <spu_intrinsics.h>
-#include <spu_mfcio.h>
-#include <sync_utils.h>
-#include "gc_spu_config.h"
-#include "spu_buffers.h"
-#include <gcell/gc_spu_args.h>
-#include <gcell/gc_job_desc.h>
-#include <gcell/gc_mbox.h>
-#include <gcell/gc_declare_proc.h>
-#include <gcell/spu/gc_jd_queue.h>
-#include <gcell/spu/gc_random.h>
-#include <gcell/spu/gc_delay.h>
-
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
-
-
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
-//! round x down to p2 boundary (p2 must be a power-of-2)
-#define ROUND_DN(x, p2) ((x) & ~((p2)-1))
-
-//! round x up to p2 boundary (p2 must be a power-of-2)
-#define ROUND_UP(x, p2) (((x)+((p2)-1)) & ~((p2)-1))
-
-
-//#define OUT_MBOX_CHANNEL SPU_WrOutIntrMbox
-#define OUT_MBOX_CHANNEL SPU_WrOutMbox
-
-#define	CHECK_QUEUE_ON_MSG	0	// define to 0 or 1
-#define USE_LLR_LOST_EVENT	0	// define to 0 or 1
-
-int			gc_sys_tag;	// tag for misc DMA operations
-static gc_spu_args_t	spu_args;
-
-static struct gc_proc_def *gc_proc_def;	// procedure entry points
-
-// ------------------------------------------------------------------------
-
-// state for DMA'ing arguments in and out
-
-static int get_tag;		// 1 tag for job arg gets
-static int put_tags;		// 2 tags for job arg puts
-
-static int pb_idx = 0;		// current put buffer index (0 or 1)
-
-// bitmask (bit per put buffer): bit is set if DMA is started but not complete
-static int put_in_progress = 0;
-#define PBI_MASK(_pbi_) (1 << (_pbi_))
-
-// ------------------------------------------------------------------------
-
-// our working copy of the completion info
-static gc_comp_info_t	comp_info = {  
-  .in_use = 1,
-  .ncomplete = 0
-};
-
-static int ci_idx = 0;		// index of current comp_info
-static int ci_tags;		// two consecutive dma tags
-
-// ------------------------------------------------------------------------
-
-/*
- * Wait until EA copy of comp_info[idx].in_use is 0
- */
-static void
-wait_for_ppe_to_be_done_with_comp_info(int idx)
-{
-  char _tmp[256];
-  char *buf = (char *) ALIGN(_tmp, 128);	// get cache-aligned buffer
-  gc_comp_info_t *p = (gc_comp_info_t *) buf;
-
-  assert(sizeof(gc_comp_info_t) == 128);
-
-  do {
-    mfc_get(buf, spu_args.comp_info[idx], 128, gc_sys_tag, 0, 0);
-    mfc_write_tag_mask(1 << gc_sys_tag);
-    mfc_read_tag_status_all();
-    if (p->in_use == 0)
-      return;
-
-    gc_udelay(1);
-
-  } while (1);
-}
-
-static void
-flush_completion_info(void)
-{
-  // events: 0x3X
-
-  static int total_complete = 0;
-
-  if (comp_info.ncomplete == 0)
-    return;
-  
-  // ensure that PPE is done with the buffer we're about to overwrite
-  wait_for_ppe_to_be_done_with_comp_info(ci_idx);
-
-  // dma the comp_info out to PPE
-  int tag = ci_tags + ci_idx;
-  mfc_put(&comp_info, spu_args.comp_info[ci_idx], sizeof(gc_comp_info_t), tag, 0, 0);
-
-  // we need to wait for the completion info to finish, as well as
-  // any EA argument puts.
-
-  int tag_mask = 1 << tag;		// the comp_info tag
-  if (put_in_progress & PBI_MASK(0))
-    tag_mask |= (1 << (put_tags + 0));
-  if (put_in_progress & PBI_MASK(1))
-    tag_mask |= (1 << (put_tags + 1));
-
-  gc_log_write2(GCL_SS_SYS, 0x30, put_in_progress, tag_mask);
-
-  mfc_write_tag_mask(tag_mask);		// the tags we're interested in
-  mfc_read_tag_status_all();		// wait for DMA to complete
-  put_in_progress = 0;			// mark them all complete
-
-  total_complete += comp_info.ncomplete;
-  gc_log_write4(GCL_SS_SYS, 0x31,
-		put_in_progress, ci_idx, comp_info.ncomplete, total_complete);
-
-  // send PPE a message
-  spu_writech(OUT_MBOX_CHANNEL, MK_MBOX_MSG(OP_JOBS_DONE, ci_idx));
-
-  ci_idx ^= 0x1;	// switch buffers
-  comp_info.in_use = 1;
-  comp_info.ncomplete = 0;
-}
-
-// ------------------------------------------------------------------------
-
-
-static unsigned int backoff;		// current backoff value in clock cycles
-static unsigned int _backoff_start;
-static unsigned int _backoff_cap;
-
-/*
- * For 3.2 GHz SPE
- *
- * 10	 1023 cycles    320 ns
- * 11    2047 cycle     640 ns
- * 12    4095 cycles    1.3 us
- * 13    8191 cycles    2.6 us
- * 14   16383 cycles    5.1 us
- * 15   32767 cycles   10.2 us
- * 16                  20.4 us
- * 17                  40.8 us
- * 18                  81.9 us
- * 19                 163.8 us
- * 20                 327.7 us
- * 21                 655.4 us
- */
-static unsigned char log2_backoff_start[16] = {
-// 1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16
-// -------------------------------------------------------------
-//12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 16, 16
-  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11
-};
-  
-static unsigned char log2_backoff_cap[16] = {
-// 1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16
-// -------------------------------------------------------------
-//17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 20, 20, 20, 21, 21
-  13, 14, 14, 14, 14, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16
-};
-  
-static void
-backoff_init(void)
-{
-  _backoff_cap   = (1 << (log2_backoff_cap[(spu_args.nspus - 1) & 0xf])) - 1;
-  _backoff_start = (1 << (log2_backoff_start[(spu_args.nspus - 1) & 0xf])) - 1;
-  
-  backoff = _backoff_start;
-}
-
-#if !CHECK_QUEUE_ON_MSG
-
-static void 
-backoff_reset(void)
-{
-  backoff = _backoff_start;
-}
-
-
-#define RANDOM_WEIGHT	0.2
-
-static void
-backoff_delay(void)
-{
-  gc_cdelay(backoff);
-
-  // capped exponential backoff
-  backoff = ((backoff << 1) + 1);
-  if (backoff > _backoff_cap)
-    backoff = _backoff_cap;
-
-  // plus some randomness
-  float r = (RANDOM_WEIGHT * (2.0 * (gc_uniform_deviate() - 0.5)));
-  backoff = backoff * (1.0 + r);
-}
-
-#endif	// !CHECK_QUEUE_ON_MSG
-
-// ------------------------------------------------------------------------
-
-static inline unsigned int
-make_mask(int nbits)
-{
-  return ~(~0 << nbits);
-}
-
-static unsigned int   dc_work;
-static int            dc_put_tag;
-static unsigned char *dc_ls_base;
-static gc_eaddr_t     dc_ea_base;
-
-// divide and conquer
-static void
-d_and_c(unsigned int offset, unsigned int len)
-{
-  unsigned int mask = make_mask(len) << offset;
-  unsigned int t = mask & dc_work;
-  if (t == 0)		// nothing to do
-    return;
-  if (t == mask){	// got a match, generate dma
-    mfc_put(dc_ls_base + offset, dc_ea_base + offset, len, dc_put_tag, 0, 0);
-  }
-  else {		// bisect
-    len >>= 1;
-    d_and_c(offset, len);
-    d_and_c(offset + len, len);
-  }
-}
-
-// Handle the nasty case of a dma xfer that's less than 16 bytes long.
-// len is guaranteed to be in [1, 15]
-
-static void
-handle_slow_and_tedious_dma(gc_eaddr_t ea, unsigned char *ls,
-			    unsigned int len, int put_tag)
-{
-  // Set up for divide and conquer
-  unsigned int alignment = ((uintptr_t) ls) & 0x7;
-  dc_work = make_mask(len) << alignment;
-  dc_ls_base = (unsigned char *) ROUND_DN((uintptr_t) ls, 8);
-  dc_ea_base = ROUND_DN(ea, (gc_eaddr_t) 8);
-  dc_put_tag = put_tag;
-
-  d_and_c( 0, 8);
-  d_and_c( 8, 8);
-  d_and_c(16, 8);
-}
-
-
-static void
-process_job(gc_eaddr_t jd_ea, gc_job_desc_t *jd)
-{
-  // events: 0x2X
-
-  jd->status = JS_OK;	// assume success
-
-  if (jd->proc_id >= spu_args.nproc_defs)
-    jd->status = JS_UNKNOWN_PROC;
-    
-  else {
-  
-    if (jd->eaa.nargs == 0)
-      (*gc_proc_def[jd->proc_id].proc)(&jd->input, &jd->output, &jd->eaa);
-
-    else {	// handle EA args that must be DMA'd in/out
-
-      gc_job_ea_args_t *eaa = &jd->eaa;
-
-      int NELMS =
-	MAX(MAX_ARGS_EA,
-	    (GC_SPU_BUFSIZE + MFC_MAX_DMA_SIZE - 1) / MFC_MAX_DMA_SIZE);
-
-      mfc_list_element_t  dma_get_list[NELMS];
-      //mfc_list_element_t  dma_put_list[NELMS];
-      
-      memset(dma_get_list, 0, sizeof(dma_get_list));
-      //memset(dma_put_list, 0, sizeof(dma_put_list));
-
-      int gli = 0;	// get list index
-      //int pli = 0;	// put list index
-
-      unsigned char *get_base = _gci_getbuf[0];
-      unsigned char *get_t = get_base;
-      unsigned int   total_get_dma_len = 0;
-
-      unsigned char *put_base = _gci_putbuf[pb_idx];
-      unsigned char *put_t = put_base;
-      unsigned int   total_put_alloc = 0;
-      int	     put_tag = put_tags + pb_idx;
-
-      // Do we have any "put" args?  If so ensure that previous
-      // dma from this buffer is complete
-
-      gc_log_write2(GCL_SS_SYS, 0x24, put_in_progress, jd->sys.direction_union);
-
-      if ((jd->sys.direction_union & GCJD_DMA_PUT)
-	  && (put_in_progress & PBI_MASK(pb_idx))){
-
-	gc_log_write2(GCL_SS_SYS, 0x25, put_in_progress, 1 << put_tag);
-
-	mfc_write_tag_mask(1 << put_tag);	// the tag we're interested in
-	mfc_read_tag_status_all();		// wait for DMA to complete
-	put_in_progress &= ~(PBI_MASK(pb_idx));
-
-	gc_log_write1(GCL_SS_SYS, 0x26, put_in_progress);
-      }
-
-
-      // for now, all EA's must have the same high 32-bits
-      gc_eaddr_t common_ea = eaa->arg[0].ea_addr;
-
-
-      // assign LS addresses for buffers
-      
-      for (unsigned int i = 0; i < eaa->nargs; i++){
-
-	gc_eaddr_t  	ea_base = 0;
-	unsigned char  *ls_base;
-	int	  	offset;
-	unsigned int	dma_len;
-
-	if (eaa->arg[i].direction == GCJD_DMA_GET){
-	  ea_base = ROUND_DN(eaa->arg[i].ea_addr, (gc_eaddr_t) CACHE_LINE_SIZE);
-	  offset = eaa->arg[i].ea_addr & (CACHE_LINE_SIZE-1);
-	  dma_len = ROUND_UP(eaa->arg[i].get_size + offset, CACHE_LINE_SIZE);
-	  total_get_dma_len += dma_len;
-
-	  if (total_get_dma_len > GC_SPU_BUFSIZE){
-	    jd->status = JS_ARGS_TOO_LONG;
-	    goto wrap_up;
-	  }
-
-	  ls_base = get_t;
-	  get_t += dma_len;
-	  eaa->arg[i].ls_addr = ls_base + offset;
-
-	  if (0){
-	    assert((mfc_ea2l(eaa->arg[i].ea_addr) & 0x7f) == ((intptr_t)eaa->arg[i].ls_addr & 0x7f));
-	    assert((ea_base & 0x7f) == 0);
-	    assert(((intptr_t)ls_base & 0x7f) == 0);
-	    assert((dma_len & 0x7f) == 0);
-	    assert((eaa->arg[i].get_size <= dma_len)
-		   && dma_len <= (eaa->arg[i].get_size + offset + CACHE_LINE_SIZE - 1));
-	  }
-
-	  // add to dma get list 
-	  // FIXME (someday) the dma list is where the JS_BAD_EAH limitation comes from
-
-	  while (dma_len != 0){
-	    int n = MIN(dma_len, MFC_MAX_DMA_SIZE);
-	    dma_get_list[gli].size = n;
-	    dma_get_list[gli].eal = mfc_ea2l(ea_base);
-	    dma_len -= n;
-	    ea_base += n;
-	    gli++;
-	  }
-	}
-
-	else if (eaa->arg[i].direction == GCJD_DMA_PUT){
-	  //
-	  // This case is a trickier than the PUT case since we can't
-	  // write outside of the bounds of the user provided buffer.
-	  // We still align the buffers to 128-bytes for good performance
-	  // in the middle portion of the xfers.
-	  //
-	  ea_base = ROUND_DN(eaa->arg[i].ea_addr, (gc_eaddr_t) CACHE_LINE_SIZE);
-	  offset = eaa->arg[i].ea_addr & (CACHE_LINE_SIZE-1);
-
-	  uint32_t ls_alloc_len =
-	    ROUND_UP(eaa->arg[i].put_size + offset, CACHE_LINE_SIZE);
-
-	  total_put_alloc += ls_alloc_len;
-
-	  if (total_put_alloc > GC_SPU_BUFSIZE){
-	    jd->status = JS_ARGS_TOO_LONG;
-	    goto wrap_up;
-	  }
-
-	  ls_base = put_t;
-	  put_t += ls_alloc_len;
-	  eaa->arg[i].ls_addr = ls_base + offset;
-
-	  if (1){
-	    assert((mfc_ea2l(eaa->arg[i].ea_addr) & 0x7f)
-		   == ((intptr_t)eaa->arg[i].ls_addr & 0x7f));
-	    assert((ea_base & 0x7f) == 0);
-	    assert(((intptr_t)ls_base & 0x7f) == 0);
-	  }
-	}
-
-	else
-	  assert(0);
-      }
-
-      // fire off the dma to fetch the args and wait for it to complete
-      mfc_getl(get_base, common_ea, dma_get_list, gli*sizeof(dma_get_list[0]), get_tag, 0, 0);
-      mfc_write_tag_mask(1 << get_tag);		// the tag we're interested in
-      mfc_read_tag_status_all();		// wait for DMA to complete
-
-      // do the work
-      (*gc_proc_def[jd->proc_id].proc)(&jd->input, &jd->output, &jd->eaa);
-
-
-      // Do we have any "put" args?  If so copy them out
-      if (jd->sys.direction_union & GCJD_DMA_PUT){
-
-	// Do the copy out using single DMA xfers.  The LS ranges
-	// aren't generally contiguous.
-	
-	bool started_dma = false;
-
-	for (unsigned int i = 0; i < eaa->nargs; i++){
-	  if (eaa->arg[i].direction == GCJD_DMA_PUT && eaa->arg[i].put_size != 0){
-	    
-	    started_dma = true;
-
-	    gc_eaddr_t       ea;
-	    unsigned char   *ls;
-	    unsigned int     len;
-
-	    ea = eaa->arg[i].ea_addr;
-	    ls = (unsigned char *) eaa->arg[i].ls_addr;
-	    len = eaa->arg[i].put_size;
-
-	    if (len < 16)
-	      handle_slow_and_tedious_dma(ea, ls, len, put_tag);
-	    
-	    else {
-	      if ((ea & 0xf) != 0){
-
-		// printf("1:  ea = 0x%x  len = %5d\n", (int) ea, len);
-		
-		// handle the "pre-multiple-of-16" portion
-		// do 1, 2, 4, or 8 byte xfers as required
-
-		if (ea & 0x1){				// do a 1-byte xfer
-		  mfc_put(ls, ea, 1, put_tag, 0, 0);
-		  ea += 1;
-		  ls += 1;
-		  len -= 1;
-		}
-		if (ea & 0x2){				// do a 2-byte xfer
-		  mfc_put(ls, ea, 2, put_tag, 0, 0);
-		  ea += 2;
-		  ls += 2;
-		  len -= 2;
-		}
-		if (ea & 0x4){				// do a 4-byte xfer
-		  mfc_put(ls, ea, 4, put_tag, 0, 0);
-		  ea += 4;
-		  ls += 4;
-		  len -= 4;
-		}
-		if (ea & 0x8){				// do an 8-byte xfer
-		  mfc_put(ls, ea, 8, put_tag, 0, 0);
-		  ea += 8;
-		  ls += 8;
-		  len -= 8;
-		}
-	      }
-
-	      if (1){
-		// printf("2:  ea = 0x%x  len = %5d\n", (int) ea, len);
-		assert((ea & 0xf) == 0);
-		assert((((intptr_t) ls) & 0xf) == 0);
-	      }
-
-	      // handle the "multiple-of-16" portion
-
-	      int aligned_len = ROUND_DN(len, 16);
-	      len = len & (16 - 1);
-
-	      while (aligned_len != 0){
-		int dma_len = MIN(aligned_len, MFC_MAX_DMA_SIZE);
-		mfc_put(ls, ea, dma_len, put_tag, 0, 0);
-		ea += dma_len;
-		ls += dma_len;
-		aligned_len -= dma_len;
-	      }
-
-	      if (1){
-		// printf("3:  ea = 0x%x  len = %5d\n", (int)ea, len);
-		assert((ea & 0xf) == 0);
-		assert((((intptr_t) ls) & 0xf) == 0);
-	      }
-
-	      // handle "post-multiple-of-16" portion
-
-	      if (len != 0){
-
-		if (len >= 8){				// do an 8-byte xfer
-		  mfc_put(ls, ea, 8, put_tag, 0, 0);
-		  ea += 8;
-		  ls += 8;
-		  len -= 8;
-		}
-		if (len >= 4){				// do a 4-byte xfer
-		  mfc_put(ls, ea, 4, put_tag, 0, 0);
-		  ea += 4;
-		  ls += 4;
-		  len -= 4;
-		}
-		if (len >= 2){				// do a 2-byte xfer
-		  mfc_put(ls, ea, 2, put_tag, 0, 0);
-		  ea += 2;
-		  ls += 2;
-		  len -= 2;
-		}
-		if (len >= 1){				// do a 1-byte xfer
-		  mfc_put(ls, ea, 1, put_tag, 0, 0);
-		  ea += 1;
-		  ls += 1;
-		  len -= 1;
-		}
-		if (1)
-		  assert(len == 0);
-	      }
-	    }
-	  }
-	}
-	if (started_dma){
-	  put_in_progress |= PBI_MASK(pb_idx);		// note it's running
-	  gc_log_write2(GCL_SS_SYS, 0x27, put_in_progress, pb_idx);
-	  pb_idx ^= 1;					// toggle current buffer
-	}
-      }
-    }
-  }
-
- wrap_up:;	// semicolon creates null statement for C99 compliance
-
-  // Copy job descriptor back out to EA.
-  // (The dma will be waited on in flush_completion_info)
-  int tag = ci_tags + ci_idx;			// use the current completion tag
-  mfc_put(jd, jd_ea, sizeof(*jd), tag, 0, 0);
-
-  // Tell PPE we're done with the job.
-  //
-  // We queue these up until we run out of room, or until we can send
-  // the info to the PPE w/o blocking.  The blocking check is in
-  // main_loop
-
-  comp_info.job_id[comp_info.ncomplete++] = jd->sys.job_id;
-
-  if (comp_info.ncomplete == GC_CI_NJOBS){
-    gc_log_write0(GCL_SS_SYS, 0x28);
-    flush_completion_info();
-  }
-}
-
-static void
-main_loop(void)
-{
-  // events: 0x1X
-
-  static gc_job_desc_t	jd;	// static gets us proper alignment
-  gc_eaddr_t		jd_ea;
-  int			total_jobs = 0;
-
-#if (USE_LLR_LOST_EVENT)
-  // setup events
-  spu_writech(SPU_WrEventMask, MFC_LLR_LOST_EVENT);
-
-  // prime the pump
-  while (gc_jd_queue_dequeue(spu_args.queue, &jd_ea, ci_tags + ci_idx, &jd))
-    process_job(jd_ea, &jd);
-  // we're now holding a lock-line reservation
-#endif
-
-  while (1){
-
-#if !CHECK_QUEUE_ON_MSG
-#if (USE_LLR_LOST_EVENT)
-
-    if (unlikely(spu_readchcnt(SPU_RdEventStat))){
-      //
-      // execute standard event handling prologue
-      //
-      int status = spu_readch(SPU_RdEventStat);
-      int mask = spu_readch(SPU_RdEventMask);
-      spu_writech(SPU_WrEventMask, mask & ~status);	// disable active events
-      spu_writech(SPU_WrEventAck, status);		// ack active events
-
-      // execute per-event actions
-
-      if (status & MFC_LLR_LOST_EVENT){
-	//
-	// We've lost a line reservation.  This is most likely caused
-	// by somebody doing something to the queue.  Go look and see
-	// if there's anything for us.
-	//
-	while (gc_jd_queue_dequeue(spu_args.queue, &jd_ea, ci_tags + ci_idx, &jd) == GCQ_OK)
-	  process_job(jd_ea, &jd);
-      }
-
-      //
-      // execute standard event handling epilogue
-      //
-      spu_writech(SPU_WrEventMask, mask);	// restore event mask
-    }
-
-#else
-
-    // try to get a job from the job queue 
-    if (gc_jd_queue_dequeue(spu_args.queue, &jd_ea, ci_tags + ci_idx, &jd) == GCQ_OK){
-      total_jobs++;
-      gc_log_write2(GCL_SS_SYS, 0x10, jd.sys.job_id, total_jobs);
-
-      process_job(jd_ea, &jd); 
-
-      gc_log_write2(GCL_SS_SYS, 0x11, jd.sys.job_id, total_jobs);
-      backoff_reset(); 
-    }
-    else
-      backoff_delay();
-
-#endif
-#endif
-
-    // any msgs for us?
-
-    if (unlikely(spu_readchcnt(SPU_RdInMbox))){
-      int msg = spu_readch(SPU_RdInMbox);
-      // printf("spu[%d] mbox_msg: 0x%08x\n", spu_args.spu_idx, msg);
-#if CHECK_QUEUE_ON_MSG
-      if (MBOX_MSG_OP(msg) == OP_CHECK_QUEUE){
-
-	while (1){
-	  //int delay = (int)(3200.0 * gc_uniform_deviate());	// uniformly in [0, 1.0us]
-	  //gc_cdelay(delay);
-
-	  gc_dequeue_status_t s =
-	    gc_jd_queue_dequeue(spu_args.queue, &jd_ea, ci_tags + ci_idx, &jd);
-
-	  if (s == GCQ_OK){
-	    total_jobs++;
-	    gc_log_write2(GCL_SS_SYS, 0x10, jd.sys.job_id, total_jobs);
-
-	    process_job(jd_ea, &jd); 
-
-	    gc_log_write2(GCL_SS_SYS, 0x11, jd.sys.job_id, total_jobs);
-	  }
-	  else if (s == GCQ_EMPTY){
-	    break;
-	  }
-	  else {	// GCQ_LOCKED -- keep trying
-	  }
-	}
-      }
-      else 
-#endif
-      if (MBOX_MSG_OP(msg) == OP_EXIT){
-	flush_completion_info();
-	return;
-      }
-      else if (MBOX_MSG_OP(msg) == OP_GET_SPU_BUFSIZE){
-	spu_writech(SPU_WrOutIntrMbox, MK_MBOX_MSG(OP_SPU_BUFSIZE, GC_SPU_BUFSIZE_BASE));
-      }
-    }
-
-    // If we've got job completion info for the PPE and we can send a
-    // message without blocking, do it.
-
-    if (comp_info.ncomplete != 0 && spu_readchcnt(OUT_MBOX_CHANNEL) != 0){
-      gc_log_write0(GCL_SS_SYS, 0x12);
-      flush_completion_info();
-    }
-  }
-}
-
-
-int
-main(unsigned long long spe_id __attribute__((unused)),
-     unsigned long long argp,
-     unsigned long long envp __attribute__((unused)))
-{
-  gc_sys_tag = mfc_tag_reserve();	// allocate a tag for our misc DMA operations
-  get_tag  = mfc_tag_reserve();
-  ci_tags  = mfc_multi_tag_reserve(2);
-  put_tags = mfc_multi_tag_reserve(2);
-
-  // dma the args in
-  mfc_get(&spu_args, argp, sizeof(spu_args), gc_sys_tag, 0, 0);
-  mfc_write_tag_mask(1 << gc_sys_tag);	// the tag we're interested in
-  mfc_read_tag_status_all();		// wait for DMA to complete
-
-  // initialize pointer to procedure entry table
-  gc_proc_def = (gc_proc_def_t *) spu_args.proc_def_ls_addr;
-
-  gc_set_seed(spu_args.spu_idx);
-
-  // initialize logging
-  _gc_log_init(spu_args.log);
-
-  backoff_init();		// initialize backoff parameters
-
-  main_loop();
-  return 0;
-}
diff --git a/gcell/lib/runtime/spu/gc_random.c b/gcell/lib/runtime/spu/gc_random.c
deleted file mode 100644
index ae2fde875..000000000
--- a/gcell/lib/runtime/spu/gc_random.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#include <gcell/spu/gc_random.h>
-
-static int last_val = 0;
-
-# define M  259200	// values from Numerical Recipes in C, 1988
-# define A    7141
-# define C   54773
-
-void 
-gc_set_seed(int seed)
-{
-  last_val = ((unsigned int) seed) % M;
-}
-
-/*
- * Return a uniformly distributed value in the range [0, 1.0)
- * (Linear congruential generator. YMMV. Caveat emptor.)
- */
-float
-gc_uniform_deviate(void)
-{
-  last_val = (last_val * A + C) % M;
-  return (float) last_val * (1.0f / (float) M);
-}
diff --git a/gcell/lib/runtime/spu/gc_spu_config.h b/gcell/lib/runtime/spu/gc_spu_config.h
deleted file mode 100644
index 6320e6dbe..000000000
--- a/gcell/lib/runtime/spu/gc_spu_config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_GCELL_GC_SPU_CONFIG_H
-#define INCLUDED_GCELL_GC_SPU_CONFIG_H
-
-#include <gcell/gc_job_desc.h>
-
-#define CACHE_LINE_SIZE	     128	      // in bytes
-
-#if 1
-# define	GC_SPU_BUFSIZE_BASE  (40 * 1024)      //  must be multiple of CACHE_LINE_SIZE
-#else
-# define	GC_SPU_BUFSIZE_BASE  (20 * 1024)      //  must be multiple of CACHE_LINE_SIZE
-#endif
-
-#define	GC_SPU_BUFSIZE (GC_SPU_BUFSIZE_BASE + MAX_ARGS_EA * CACHE_LINE_SIZE)
-
-#define NGETBUFS	1	// gets are single buffered
-#define NPUTBUFS	2	// puts are double buffered
-
-#endif /* INCLUDED_GCELL_GC_SPU_CONFIG_H */
diff --git a/gcell/lib/runtime/spu/gc_spu_jd_queue.c b/gcell/lib/runtime/spu/gc_spu_jd_queue.c
deleted file mode 100644
index 91bb5bc7e..000000000
--- a/gcell/lib/runtime/spu/gc_spu_jd_queue.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/spu/gc_jd_queue.h>
-#include <gcell/spu/gc_delay.h>
-#include <gcell/spu/gc_random.h>
-#include "mutex_lock.h"
-#include "mutex_unlock.h"
-
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
-extern int gc_sys_tag;
-
-// keep track of stats
-int jdq_ok;
-int jdq_empty;
-int jdq_locked;
-
-
-#define	INITIAL_BACKOFF	   32.0
-#define MAX_BACKOFF	 8192.0		/* 2.6us */
-#define	RANDOM_WEIGHT	    0.2
-
-static float
-next_backoff(float backoff)
-{
-  // exponential with random
-  float t = backoff * 2.0;
-  if (t > MAX_BACKOFF)
-    t = MAX_BACKOFF;
-
-  float r = (RANDOM_WEIGHT * (2.0 * (gc_uniform_deviate() - 0.5)));
-  t = t * (1.0 + r);
-
-  return t;
-}
-
-gc_dequeue_status_t
-gc_jd_queue_dequeue(gc_eaddr_t q, gc_eaddr_t *item_ea,
-		    int jd_tag, gc_job_desc_t *item)
-{
-  int	status;
-  char 	_tmp[256];
-  gc_jd_queue_t *local_q =
-    (gc_jd_queue_t *) ALIGN(_tmp, 128);		// get cache-aligned buffer
-  
-  float backoff = next_backoff(INITIAL_BACKOFF);
-
-  do {
-    // Copy the queue structure in and get a lock line reservation.
-    // (The structure is 128-byte aligned and completely fills a cache-line)
-
-    mfc_getllar(local_q, q, 0, 0);
-    spu_readch(MFC_RdAtomicStat);
-
-    if (local_q->mutex != 0){		// somebody else has it locked
-      jdq_locked++;
-      return GCQ_LOCKED;
-    }
-
-    if (local_q->head == 0){		// the queue is empty
-      jdq_empty++;
-      return GCQ_EMPTY;
-    }
-
-    // Try to acquire the lock
-
-    local_q->mutex = 1;
-    mfc_putllc(local_q, q, 0, 0);
-    status = spu_readch(MFC_RdAtomicStat);
-
-    if (status != 0){
-      gc_cdelay((int) backoff);
-      backoff = next_backoff(backoff);
-    }
-
-  } while (status != 0);
-
-  // we're now holding the lock
-    
-  // copy in job descriptor at head of queue
-  *item_ea = local_q->head;
-  
-  // We must use the fence with the jd_tag to ensure that any
-  // previously initiated put of a job desc is locally ordered before
-  // the get of the new one.
-  mfc_getf(item, local_q->head, sizeof(gc_job_desc_t), jd_tag, 0, 0);
-  mfc_write_tag_mask(1 << jd_tag);	// the tag we're interested in
-  mfc_read_tag_status_all();		// wait for DMA to complete
-
-  local_q->head = item->sys.next;
-  item->sys.next = 0;
-  if (local_q->head == 0)		// now empty?
-    local_q->tail = 0;
-
-  // Copy the queue struct back out and unlock the mutex in one fell swoop.
-  // We use the unconditional put since it's faster and we own the lock.
-
-  local_q->mutex = 0;
-  mfc_putlluc(local_q, q, 0, 0);
-  spu_readch(MFC_RdAtomicStat);
-
-  jdq_ok++;
-  return GCQ_OK;
-}
diff --git a/gcell/lib/runtime/spu/gcell_runtime_qa.c b/gcell/lib/runtime/spu/gcell_runtime_qa.c
deleted file mode 100644
index 47a4b5b5b..000000000
--- a/gcell/lib/runtime/spu/gcell_runtime_qa.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/gc_declare_proc.h>
-#include <gcell/spu/gc_delay.h>
-#include <string.h>
-
-
-static void
-qa_nop(const gc_job_direct_args_t *input _UNUSED,
-       gc_job_direct_args_t *output _UNUSED,
-       const gc_job_ea_args_t *eaa _UNUSED)
-{
-}
-
-GC_DECLARE_PROC(qa_nop, "qa_nop");
-
-static int
-sum_shorts(short *p, int nshorts)
-{
-  int total = 0;
-  for (int i = 0; i < nshorts; i++)
-    total += p[i];
-
-  return total;
-}
-
-static void
-qa_sum_shorts(const gc_job_direct_args_t *input _UNUSED,
-	      gc_job_direct_args_t *output,
-	      const gc_job_ea_args_t *eaa)
-{
-  for (unsigned int i = 0; i < eaa->nargs; i++){
-    short *p = eaa->arg[i].ls_addr;
-    int n = eaa->arg[i].get_size / sizeof(short);
-    output->arg[i].s32 = sum_shorts(p, n);
-    //printf("qa_sum_shorts(%p, %d) = %d\n",  p, n, output->arg[i].s32);
-  }
-}
-
-GC_DECLARE_PROC(qa_sum_shorts, "qa_sum_shorts");
-
-static void
-write_seq(unsigned char *p, int nbytes, int counter)
-{
-  for (int i = 0; i < nbytes; i++)
-    p[i] = counter++;
-}
-
-static void
-qa_put_seq(const gc_job_direct_args_t *input,
-	   gc_job_direct_args_t *output _UNUSED,
-	   const gc_job_ea_args_t *eaa)
-{
-  int counter = input->arg[0].s32;
-
-  for (unsigned int i = 0; i < eaa->nargs; i++){
-    unsigned char *p = eaa->arg[i].ls_addr;
-    int n = eaa->arg[i].put_size;
-    write_seq(p, n, counter);
-    counter += n;
-  }
-}
-
-GC_DECLARE_PROC(qa_put_seq, "qa_put_seq");
-
-static void
-qa_copy(const gc_job_direct_args_t *input _UNUSED,
-	gc_job_direct_args_t *output,
-	const gc_job_ea_args_t *eaa)
-{
-  if (eaa->nargs != 2
-      || eaa->arg[0].direction != GCJD_DMA_PUT
-      || eaa->arg[1].direction != GCJD_DMA_GET){
-    output->arg[0].s32 = -1;
-    return;
-  }
-
-  output->arg[0].s32 = 0;
-  unsigned n = eaa->arg[0].put_size;
-  if (eaa->arg[1].get_size < n)
-    n = eaa->arg[1].get_size;
-  
-  memcpy(eaa->arg[0].ls_addr, eaa->arg[1].ls_addr, n);
-}
-
-GC_DECLARE_PROC(qa_copy, "qa_copy");
diff --git a/gcell/lib/runtime/spu/spu_buffers.c b/gcell/lib/runtime/spu/spu_buffers.c
deleted file mode 100644
index 29ae99d9f..000000000
--- a/gcell/lib/runtime/spu/spu_buffers.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "spu_buffers.h"
-#include <gcell/compiler.h>
-
-static unsigned char _getbuf[NGETBUFS][GC_SPU_BUFSIZE] _AL128;
-static unsigned char _putbuf[NPUTBUFS][GC_SPU_BUFSIZE] _AL128;
-
-unsigned char *_gci_getbuf[NGETBUFS] = {
-  _getbuf[0]
-};
-
-unsigned char *_gci_putbuf[NPUTBUFS] = {
-  _putbuf[0],
-  _putbuf[1]
-};
diff --git a/gcell/lib/runtime/spu/spu_buffers.h b/gcell/lib/runtime/spu/spu_buffers.h
deleted file mode 100644
index 24811dc38..000000000
--- a/gcell/lib/runtime/spu/spu_buffers.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_SPU_BUFFERS_H
-#define INCLUDED_SPU_BUFFERS_H
-
-#include "gc_spu_config.h"
-
-//! pointer to input buffer
-extern unsigned char *_gci_getbuf[NGETBUFS];
-
-//! pointers to output buffers
-extern unsigned char *_gci_putbuf[NPUTBUFS];
-
-#endif /* INCLUDED_SPU_BUFFERS_H */
diff --git a/gcell/lib/spu/.gitignore b/gcell/lib/spu/.gitignore
deleted file mode 100644
index 547d22090..000000000
--- a/gcell/lib/spu/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.a
-/*.o
-/gcell_general_qa
-/gcell_runtime_qa
-/gcell_all
diff --git a/gcell/lib/spu/Makefile.am b/gcell/lib/spu/Makefile.am
deleted file mode 100644
index 5afa40e36..000000000
--- a/gcell/lib/spu/Makefile.am
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-# We're building a single .a file from files in several
-# subdirectories.  We use the "single Makefile, multiple subdirectory"
-# automake alternative. We're doing this because we're faking out
-# automake and getting it to build for 2 architectures at the same
-# time, the PPE (powerpc64) and the SPE.  The easiest way to handle
-# the SPE was to just build a static library using automake's built in
-# rules, since trying to get libtool to handle two architectures in
-# the same tree seemed untenable.
-
-include $(top_srcdir)/Makefile.common.spu
-
-IBM_SPU_SYNC_INCLUDES = -I$(top_srcdir)/gcell/ibm/sync/spu_source
-AM_CPPFLAGS = $(GCELL_SPU_INCLUDES) $(IBM_SPU_SYNC_INCLUDES)
-
-libspu_LIBRARIES = libgcell_spu.a
-
-# ----------------------------------------------------------------
-# files in the lib/runtime/spu directory
-
-runtime_srcdir = $(srcdir)/../runtime/spu
-
-runtime_spu_sources = \
-	$(runtime_srcdir)/gc_delay.c \
-	$(runtime_srcdir)/gc_spu_jd_queue.c \
-	$(runtime_srcdir)/spu_buffers.c \
-	$(runtime_srcdir)/gc_logging.c \
-	$(runtime_srcdir)/gc_main.c \
-	$(runtime_srcdir)/gc_random.c
-
-
-runtime_spu_headers =
-
-runtime_spu_noinst_headers = \
-	$(runtime_srcdir)/gc_spu_config.h \
-	$(runtime_srcdir)/spu_buffers.h 
-
-# ----------------------------------------------------------------
-# files in the lib/general/spu directory
-
-general_srcdir = $(srcdir)/../general/spu
-
-general_spu_sources = \
-	$(general_srcdir)/fft_1d_r2.c \
-	$(general_srcdir)/memset.S
-
-general_spu_headers =
-# These now live in include/gcell/spu
-#general_spu_headers = \
-#	$(general_srcdir)/gc_spu_macs.h \
-#	$(general_srcdir)/libfft.h
-
-general_spu_noinst_headers =
-# As do these
-#general_spu_noinst_headers = \
-#	$(general_srcdir)/fft_1d.h \
-#	$(general_srcdir)/fft_1d_r2.h
-
-# The QA code for (usually) non-PPE visible support routines in lib/general/spu
-general_spu_qa_sources = \
-	$(general_srcdir)/qa_memset.c
-
-# ----------------------------------------------------------------
-# files in the lib/wrapper/spu directory
-
-wrapper_srcdir = $(srcdir)/../wrapper/spu
-
-wrapper_spu_sources = \
-	$(wrapper_srcdir)/gcs_fft_1d_r2.c
-
-wrapper_spu_headers =
-
-wrapper_spu_noinst_headers =
-
-# ----------------------------------------------------------------
-# build the library from the files in the three directories
-
-libgcell_spu_a_SOURCES = \
-	$(runtime_spu_sources) \
-	$(general_spu_sources) \
-	$(wrapper_spu_sources)
-
-gcellspuinclude_HEADERS = \
-	$(runtime_spu_headers) \
-	$(general_spu_headers) \
-	$(wrapper_spu_headers)
-
-noinst_HEADERS = \
-	$(runtime_spu_noinst_headers) \
-	$(general_spu_noinst_headers) \
-	$(wrapper_spu_noinst_headers)
-
-# ----------------------------------------------------------------
-# build some SPU executables
-
-libspu_PROGRAMS = \
-	gcell_all
-
-noinst_PROGRAMS = \
-	gcell_runtime_qa \
-	gcell_general_qa
-
-#
-# All known non-QA gcell procs (at least until they get too big).
-#
-gcell_all_SOURCES = $(wrapper_spu_sources)
-gcell_all_LDADD = libgcell_spu.a
-
-#
-# The QA code required for testing the runtime.
-#
-gcell_runtime_qa_SOURCES = $(runtime_srcdir)/gcell_runtime_qa.c
-gcell_runtime_qa_LDADD = libgcell_spu.a
-
-#
-# The QA code required for testing the SPE support routines in lib/general/spu
-#
-gcell_general_qa_SOURCES = $(general_spu_qa_sources)
-gcell_general_qa_LDADD = libgcell_spu.a
diff --git a/gcell/lib/wrapper/.gitignore b/gcell/lib/wrapper/.gitignore
deleted file mode 100644
index 3531485fb..000000000
--- a/gcell/lib/wrapper/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.a
-/*.o
diff --git a/gcell/lib/wrapper/Makefile.am b/gcell/lib/wrapper/Makefile.am
deleted file mode 100644
index 5ec7e5615..000000000
--- a/gcell/lib/wrapper/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright 2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-# $(WITH_INCLUDES) must _always_ be last
-AM_CPPFLAGS = $(DEFINES) $(GCELL_INCLUDES) $(FFTW3F_CPPFLAGS) $(WITH_INCLUDES)
-
-noinst_LTLIBRARIES = libwrapper.la libwrapper-qa.la
-
-#
-# generate libtool.lo's that contain embedded SPU executables
-#
-gcell_all.lo: ../spu/gcell_all
-	$(GCELL_EMBEDSPU_LIBTOOL) $< $@ 
-
-gcell_general_qa.lo: ../spu/gcell_general_qa
-	$(GCELL_EMBEDSPU_LIBTOOL) $< $@
-
-
-
-# The primary library
-
-libwrapper_la_SOURCES = \
-	gcp_fft_1d_r2.cc
-
-libwrapper_la_LIBADD = \
-	gcell_all.lo
-
-
-# The QA library
-
-libwrapper_qa_la_SOURCES = \
-	qa_gcell_general.cc \
-	qa_gcell_wrapper.cc
-
-# FFTW now depends on gcell, don't create circular dependency :-)
-#	qa_gcp_fft_1d_r2.cc
-
-libwrapper_qa_la_LIBADD = \
-	gcell_general_qa.lo
-
-#	-lfftw3f
-
-# Headers
-
-# Moved to include/gcell
-#gcellinclude_HEADERS = \
-#	gcp_fft_1d_r2.h
-
-noinst_HEADERS = \
-	qa_gcell_general.h \
-	qa_gcell_wrapper.h \
-	qa_gcp_fft_1d_r2.h
-
-
-CLEANFILES = gcell_all.lo gcell_general_qa.lo
-
diff --git a/gcell/lib/wrapper/gcp_fft_1d_r2.cc b/gcell/lib/wrapper/gcp_fft_1d_r2.cc
deleted file mode 100644
index 9e7e00f49..000000000
--- a/gcell/lib/wrapper/gcp_fft_1d_r2.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gcell/gcp_fft_1d_r2.h>
-#include <stdint.h>
-#include <stdexcept>
-#include <math.h>
-
-static void
-init_jd(gc_job_desc *jd,
-	gc_proc_id_t proc_id,
-	unsigned log2_fft_length,
-	bool shift,
-	std::complex<float> *out,
-	const std::complex<float> *in,
-	const std::complex<float> *twiddle,
-	const float *window)
-{
-  jd->proc_id = proc_id;
-  jd->input.nargs = 2;
-  jd->output.nargs = 0;
-  jd->eaa.nargs = 4;
-
-  jd->input.arg[0].u32 = log2_fft_length;
-  jd->input.arg[1].u32 = shift;
-  unsigned int fft_length = 1 << log2_fft_length;
-
-  jd->eaa.arg[0].ea_addr = ptr_to_ea(out);
-  jd->eaa.arg[0].direction = GCJD_DMA_PUT;
-  jd->eaa.arg[0].put_size = sizeof(std::complex<float>) * fft_length;
-
-  jd->eaa.arg[1].ea_addr = ptr_to_ea(const_cast<std::complex<float>*>(in));
-  jd->eaa.arg[1].direction = GCJD_DMA_GET;
-  jd->eaa.arg[1].get_size = sizeof(std::complex<float>) * fft_length;
-
-  jd->eaa.arg[2].ea_addr = ptr_to_ea(const_cast<std::complex<float>*>(twiddle));
-  jd->eaa.arg[2].direction = GCJD_DMA_GET;
-  jd->eaa.arg[2].get_size = sizeof(std::complex<float>) * fft_length / 4;
-
-  jd->eaa.arg[3].ea_addr = ptr_to_ea(const_cast<float*>(window));
-  jd->eaa.arg[3].direction = GCJD_DMA_GET;
-  if (window == 0)
-    jd->eaa.arg[3].get_size = 0;
-  else
-    jd->eaa.arg[3].get_size = sizeof(float) * fft_length;
-}
-
-  
-gc_job_desc_sptr
-gcp_fft_1d_r2_submit(gc_job_manager_sptr mgr,
-		     unsigned int log2_fft_length,
-		     bool forward,
-		     bool shift,
-		     std::complex<float> *out,
-		     const std::complex<float> *in,
-		     const std::complex<float> *twiddle,
-		     const float *window)
-{
-  unsigned int fft_length = 1 << log2_fft_length;
-  if (fft_length > 4096)
-    throw std::invalid_argument("fft_length > 4096");
-
-  if ((intptr_t)out & 0xf)
-    throw gc_bad_align("out");
-  if ((intptr_t)in & 0xf)
-    throw gc_bad_align("in");
-  if ((intptr_t)twiddle & 0xf)
-    throw gc_bad_align("twiddle");
-  if ((intptr_t)window & 0xf)
-    throw gc_bad_align("window");
-
-  std::string proc_name;
-  if (forward)
-    proc_name = "fwd_fft_1d_r2";
-  else
-    proc_name = "inv_fft_1d_r2";
-
-  gc_proc_id_t fft_id = mgr->lookup_proc(proc_name);
-  gc_job_desc_sptr jd = gc_job_manager::alloc_job_desc(mgr);
-  init_jd(jd.get(), fft_id, log2_fft_length, shift, out, in, twiddle, window);
-  if (!mgr->submit_job(jd.get())){
-    gc_job_status_t s = jd->status;
-    throw gc_bad_submit(proc_name, s);
-  }
-  return jd;
-}
-
-void
-gcp_fft_1d_r2_twiddle(unsigned int log2_fft_length, std::complex<float> *twiddle)
-{
-  unsigned int n = 1 << log2_fft_length;
-
-  twiddle[0].real() = 1.0;
-  twiddle[0].imag() = 0.0;
-  for (unsigned i=1; i < n/4; i++){
-    twiddle[i].real() =  cos(i * 2*M_PI/n);
-    twiddle[n/4 - i].imag() = -twiddle[i].real();
-  }
-}
diff --git a/gcell/lib/wrapper/qa_gcell_general.cc b/gcell/lib/wrapper/qa_gcell_general.cc
deleted file mode 100644
index af9719812..000000000
--- a/gcell/lib/wrapper/qa_gcell_general.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "qa_gcell_general.h"
-#include <cppunit/TestAssert.h>
-
-#include <stdio.h>
-#include <stdlib.h>	// random, posix_memalign
-#include <algorithm>
-#include <string.h>
-#include <gcell/gc_job_manager.h>
-
-
-// handle to embedded SPU executable
-extern spe_program_handle_t gcell_general_qa_spx;
-
-gc_job_desc_sptr
-gcp_qa_general_submit(gc_job_manager_sptr mgr, const std::string &proc_name)
-{
-  gc_proc_id_t proc_id = mgr->lookup_proc(proc_name);
-  gc_job_desc_sptr jd = gc_job_manager::alloc_job_desc(mgr);
-
-  jd->proc_id = proc_id;
-  jd->input.nargs = 0;
-  jd->output.nargs = 1;
-  jd->eaa.nargs = 0;
-
-  if (!mgr->submit_job(jd.get())){
-    gc_job_status_t s = jd->status;
-    throw gc_bad_submit(proc_name, s);
-  }
-  return jd;
-}
-
-
-bool
-qa_gcell_general::generic_test_body(const std::string &proc_name)
-{
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_general_qa_spx);
-  opts.nspes = 1;
-  gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
-
-  gc_job_desc_sptr jd = gcp_qa_general_submit(mgr, proc_name);
-  if (!mgr->wait_job(jd.get())){
-    fprintf(stderr, "wait_job for %s failed: %s\n",
-	    proc_name.c_str(),
-	    gc_job_status_string(jd->status).c_str());
-    CPPUNIT_ASSERT(0);
-  }
-
-  return jd->output.arg[0].u32;		// bool result from SPE code
-}
-
-/*
- * ------------------------------------------------------------------------
- *		    Add more calls to SPE QA code here...
- * ------------------------------------------------------------------------
- */
-void
-qa_gcell_general::test_memset()
-{
-  CPPUNIT_ASSERT(generic_test_body("qa_memset"));
-}
-
diff --git a/gcell/lib/wrapper/qa_gcell_general.h b/gcell/lib/wrapper/qa_gcell_general.h
deleted file mode 100644
index f1e64e717..000000000
--- a/gcell/lib/wrapper/qa_gcell_general.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_QA_GCELL_GENERAL_H
-#define INCLUDED_QA_GCELL_GENERAL_H
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-
-class qa_gcell_general : public CppUnit::TestCase {
-
-  CPPUNIT_TEST_SUITE(qa_gcell_general);
-  CPPUNIT_TEST(test_memset);
-  CPPUNIT_TEST_SUITE_END();
-
- private:
-  void test_memset();
-
-  bool generic_test_body(const std::string &proc_name);
-};
-
-#endif /* INCLUDED_QA_GCELL_GENERAL_H */
diff --git a/gcell/lib/wrapper/qa_gcell_wrapper.cc b/gcell/lib/wrapper/qa_gcell_wrapper.cc
deleted file mode 100644
index ccfd2fdee..000000000
--- a/gcell/lib/wrapper/qa_gcell_wrapper.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/*
- * This class gathers together all the test cases for the lib/wrapper
- * directory into a single test suite.  As you create new test cases,
- * add them here.
- */
-
-#include <qa_gcell_wrapper.h>
-#include <qa_gcell_general.h>
-//#include <qa_gcp_fft_1d_r2.h>
-
-CppUnit::TestSuite *
-qa_gcell_wrapper::suite()
-{
-  CppUnit::TestSuite	*s = new CppUnit::TestSuite("wrapper");
-
-  s->addTest(qa_gcell_general::suite());
-  //s->addTest(qa_gcp_fft_1d_r2::suite());
-
-  return s;
-}
diff --git a/gcell/lib/wrapper/qa_gcell_wrapper.h b/gcell/lib/wrapper/qa_gcell_wrapper.h
deleted file mode 100644
index cb29db883..000000000
--- a/gcell/lib/wrapper/qa_gcell_wrapper.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_QA_GCELL_WRAPPER_H
-#define INCLUDED_QA_GCELL_WRAPPER_H
-
-#include <cppunit/TestSuite.h>
-
-//! collect all the tests for the wrapper directory
-
-class qa_gcell_wrapper {
-public:
-  //! return suite of tests
-  static CppUnit::TestSuite *suite();
-};
-
-
-#endif /* INCLUDED_QA_GCELL_WRAPPER_H */
diff --git a/gcell/lib/wrapper/qa_gcp_fft_1d_r2.cc b/gcell/lib/wrapper/qa_gcp_fft_1d_r2.cc
deleted file mode 100644
index 742c624dc..000000000
--- a/gcell/lib/wrapper/qa_gcp_fft_1d_r2.cc
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "qa_gcp_fft_1d_r2.h"
-#include <cppunit/TestAssert.h>
-#include <gcell/gcp_fft_1d_r2.h>
-#include <fftw3.h>
-#include <stdio.h>
-#include <stdlib.h>	// random, posix_memalign
-#include <algorithm>
-#include <string.h>
-
-typedef boost::shared_ptr<void> void_sptr;
-
-// handle to embedded SPU executable
-extern spe_program_handle_t gcell_all_spx;
-
-/*
- * Return pointer to cache-aligned chunk of storage of size size bytes.
- * Throw if can't allocate memory.  The storage should be freed
- * with "free" when done.  The memory is initialized to zero.
- */
-static void *
-aligned_alloc(size_t size, size_t alignment = 128)
-{
-  void *p = 0;
-  if (posix_memalign(&p, alignment, size) != 0){
-    perror("posix_memalign");
-    throw std::runtime_error("memory");
-  }
-  memset(p, 0, size);		// zero the memory
-  return p;
-}
-
-class free_deleter {
-public:
-  void operator()(void *p) {
-    free(p);
-  }
-};
-
-static boost::shared_ptr<void>
-aligned_alloc_sptr(size_t size, size_t alignment = 128)
-{
-  return boost::shared_ptr<void>(aligned_alloc(size, alignment), free_deleter());
-}
-
-// test forward FFT
-void
-qa_gcp_fft_1d_r2::t1()
-{
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_all_spx);
-  opts.nspes = 1;
-  gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
-
-#if 1
-  for (int log2_fft_size = 5; log2_fft_size <= 12; log2_fft_size++){
-    test(mgr, log2_fft_size, true);
-  }
-#else
-  test(mgr, 5, true);
-#endif
-}
-
-// test inverse FFT
-void
-qa_gcp_fft_1d_r2::t2()
-{
-  gc_jm_options opts;
-  opts.program_handle = gc_program_handle_from_address(&gcell_all_spx);
-  opts.nspes = 1;
-  gc_job_manager_sptr mgr = gc_make_job_manager(&opts);
-
-#if 1
-  for (int log2_fft_size = 5; log2_fft_size <= 12; log2_fft_size++){
-    test(mgr, log2_fft_size, false);
-  }
-#else
-  test(mgr, 5, false);
-#endif
-}
-
-void
-qa_gcp_fft_1d_r2::t3()
-{
-  // FIXME Test fwd and inv with windowing option
-}
-
-void
-qa_gcp_fft_1d_r2::t4()
-{
-  // FIXME Test fwd and inv with shift option
-}
-
-static inline float
-abs_diff(std::complex<float> x, std::complex<float> y)
-{
-  return std::max(std::abs(x.real()-y.real()),
-		  std::abs(x.imag()-y.imag()));
-}
-
-static float
-float_abs_rel_error(float ref, float actual)
-{
-  float delta = ref - actual;
-  if (std::abs(ref) < 1e-18)
-    ref = 1e-18;
-  return std::abs(delta/ref);
-}
-
-static float
-abs_rel_error(std::complex<float> ref, std::complex<float> actual)
-{
-  return std::max(float_abs_rel_error(ref.real(), actual.real()),
-		  float_abs_rel_error(ref.imag(), actual.imag()));
-}
-
-void 
-qa_gcp_fft_1d_r2::test(gc_job_manager_sptr mgr, int log2_fft_size, bool forward)
-{
-  int fft_size = 1 << log2_fft_size;
-
-  // allocate aligned buffers with boost shared_ptr's
-  void_sptr fftw_in_void = aligned_alloc_sptr(fft_size * sizeof(std::complex<float>), 128);
-  void_sptr fftw_out_void = aligned_alloc_sptr(fft_size * sizeof(std::complex<float>), 128);
-  void_sptr cell_in_void = aligned_alloc_sptr(fft_size * sizeof(std::complex<float>), 128);
-  void_sptr cell_out_void = aligned_alloc_sptr(fft_size * sizeof(std::complex<float>), 128);
-  void_sptr cell_twiddle_void = aligned_alloc_sptr(fft_size/4 * sizeof(std::complex<float>), 128);
-
-  // cast them to the type we really want
-  std::complex<float> *fftw_in = (std::complex<float> *) fftw_in_void.get();
-  std::complex<float> *fftw_out = (std::complex<float> *) fftw_out_void.get();
-  std::complex<float> *cell_in = (std::complex<float> *) cell_in_void.get();
-  std::complex<float> *cell_out = (std::complex<float> *) cell_out_void.get();
-  std::complex<float> *cell_twiddle = (std::complex<float> *) cell_twiddle_void.get();
-
-  gcp_fft_1d_r2_twiddle(log2_fft_size, cell_twiddle);
-
-  srandom(1);		// we want reproducibility
-
-  // initialize the input buffers
-  for (int i = 0; i < fft_size; i++){
-    std::complex<float> t((float) (random() & 0xfffff), (float) (random() & 0xfffff));
-    fftw_in[i] = t;
-    cell_in[i] = t;
-  }
-
-  // ------------------------------------------------------------------------
-  // compute the reference answer
-  fftwf_plan plan = fftwf_plan_dft_1d (fft_size,
-				       reinterpret_cast<fftwf_complex *>(fftw_in), 
-				       reinterpret_cast<fftwf_complex *>(fftw_out),
-				       forward ? FFTW_FORWARD : FFTW_BACKWARD,
-				       FFTW_ESTIMATE);
-  if (plan == 0){
-    fprintf(stderr, "qa_gcp_fft_1d_r2: error creating FFTW plan\n");
-    throw std::runtime_error ("fftwf_plan_dft_r2c_1d failed");
-  }
-  
-  fftwf_execute(plan);
-  fftwf_destroy_plan(plan);
-
-  // ------------------------------------------------------------------------
-  // compute the answer on the cell
-  gc_job_desc_sptr jd = gcp_fft_1d_r2_submit(mgr, log2_fft_size, forward, false,
-					     cell_out, cell_in, cell_twiddle, 0);
-  if (!mgr->wait_job(jd.get())){
-    fprintf(stderr, "wait_job failed: %s\n", gc_job_status_string(jd->status).c_str());
-    CPPUNIT_ASSERT(0);
-  }
-
-  // ------------------------------------------------------------------------
-  // compute the maximum of the relative error
-  float max_rel = 0.0;
-  for (int i = 0; i < fft_size; i++){
-    max_rel = std::max(max_rel, abs_rel_error(fftw_out[i], cell_out[i]));
-    if (0)
-      printf("(%16.3f, %16.3fj)  (%16.3f, %16.3fj)  (%16.3f, %16.3fj)\n",
-	     fftw_out[i].real(), fftw_out[i].imag(),
-	     cell_out[i].real(), cell_out[i].imag(),
-	     fftw_out[i].real() - cell_out[i].real(),
-	     fftw_out[i].imag() - cell_out[i].imag());
-  }
-
-  fprintf(stdout, "%s fft_size = %4d  max_rel_error = %e\n",
-	  forward ? "fwd" : "rev", fft_size, max_rel);
-
-  CPPUNIT_ASSERT(max_rel <= 5e-3);
-}
diff --git a/gcell/lib/wrapper/qa_gcp_fft_1d_r2.h b/gcell/lib/wrapper/qa_gcp_fft_1d_r2.h
deleted file mode 100644
index 339ddd25a..000000000
--- a/gcell/lib/wrapper/qa_gcp_fft_1d_r2.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_QA_GCP_FFT_1D_R2_H
-#define INCLUDED_QA_GCP_FFT_1D_R2_H
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestCase.h>
-#include <gcell/gc_job_manager.h>
-
-class qa_gcp_fft_1d_r2 : public CppUnit::TestCase {
-
-  CPPUNIT_TEST_SUITE(qa_gcp_fft_1d_r2);
-  CPPUNIT_TEST(t1);
-  CPPUNIT_TEST(t2);
-  CPPUNIT_TEST(t3);
-  CPPUNIT_TEST(t4);
-  CPPUNIT_TEST_SUITE_END();
-
- private:
-  void t1();
-  void t2();
-  void t3();
-  void t4();
-
-  void test(gc_job_manager_sptr mgr, int log2_fft_size, bool forward);
-};
-
-
-
-#endif /* INCLUDED_QA_GCP_FFT_1D_R2_H */
diff --git a/gcell/lib/wrapper/spu/.gitignore b/gcell/lib/wrapper/spu/.gitignore
deleted file mode 100644
index 3531485fb..000000000
--- a/gcell/lib/wrapper/spu/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.a
-/*.o
diff --git a/gcell/lib/wrapper/spu/gcs_fft_1d_r2.c b/gcell/lib/wrapper/spu/gcs_fft_1d_r2.c
deleted file mode 100644
index 582757ab0..000000000
--- a/gcell/lib/wrapper/spu/gcs_fft_1d_r2.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <gcell/gc_declare_proc.h>
-#include <gcell/spu/libfft.h>
-#include <assert.h>
-
-/*
- * v is really vector complex<float>
- */
-static void
-conjugate_vector(vector float *v, int nelements)
-{
-  vector float k = {1, -1, 1, -1};
-  int i;
-  for (i = 0; i < nelements; i++)
-    v[i] *= k;
-}
-
-static void
-gcs_fwd_fft_1d_r2(const gc_job_direct_args_t *input,
-		  gc_job_direct_args_t *output __attribute__((unused)),
-		  const gc_job_ea_args_t *eaa)
-{
-  vector float *out = (vector float *) eaa->arg[0].ls_addr;	// complex
-  vector float *in = (vector float *) eaa->arg[1].ls_addr;	// complex
-  vector float *twiddle = (vector float *) eaa->arg[2].ls_addr;	// complex
-  vector float *window = (vector float *) eaa->arg[3].ls_addr;	// float
-
-  int log2_fft_length = input->arg[0].u32;
-  int shift = input->arg[1].u32;	// non-zero if we should apply fftshift
-
-  if (eaa->arg[3].get_size){	// apply window
-    // FIXME pointwise multiply in *= window
-    assert(0);
-  }
-
-  fft_1d_r2(out, in, twiddle, log2_fft_length);
-
-  if (shift){
-    // FIXME apply "fftshift" to output data in-place
-    assert(0);
-  }
-}
-
-GC_DECLARE_PROC(gcs_fwd_fft_1d_r2, "fwd_fft_1d_r2");
-
-static void
-gcs_inv_fft_1d_r2(const gc_job_direct_args_t *input,
-		  gc_job_direct_args_t *output __attribute__((unused)),
-		  const gc_job_ea_args_t *eaa)
-{
-  vector float *out = (vector float *) eaa->arg[0].ls_addr;	// complex
-  vector float *in = (vector float *) eaa->arg[1].ls_addr;	// complex
-  vector float *twiddle = (vector float *) eaa->arg[2].ls_addr;	// complex
-  vector float *window = (vector float *) eaa->arg[3].ls_addr;	// float
-
-  int log2_fft_length = input->arg[0].u32;
-  int shift = input->arg[1].u32;	// non-zero if we should apply fftshift
-
-  if (eaa->arg[3].get_size){	// apply window
-    // FIXME pointwise multiply in *= window
-    assert(0);
-  }
-
-  if (shift){
-    // FIXME apply "fftshift" to input data in-place
-    assert(0);
-  }
-
-  conjugate_vector(in, 1 << (log2_fft_length - 1));
-  fft_1d_r2(out, in, twiddle, log2_fft_length);
-  conjugate_vector(out, 1 << (log2_fft_length - 1));
-}
-
-GC_DECLARE_PROC(gcs_inv_fft_1d_r2, "inv_fft_1d_r2");
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
new file mode 100644
index 000000000..1d609a283
--- /dev/null
+++ b/gnuradio-core/CMakeLists.txt
@@ -0,0 +1,146 @@
+# Copyright 2010-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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+find_package(GSL)
+
+find_package(FFTW3f)
+
+include(GrPython) #used for code generation
+
+get_filename_component(GR_CORE_PYTHONPATH
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/python ABSOLUTE
+)
+GR_SET_GLOBAL(GR_CORE_PYTHONPATH ${GR_CORE_PYTHONPATH})
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gnuradio-core" ENABLE_GR_CORE
+    ENABLE_GRUEL
+    ENABLE_VOLK
+    Boost_FOUND
+    GSL_FOUND
+    FFTW3F_FOUND
+    PYTHONINTERP_FOUND
+)
+
+include(GrMiscUtils)
+GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS
+    ${GRUEL_INCLUDE_DIRS} #headers depend on gruel
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/runtime
+    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/general
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/general
+    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/gengen
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/gengen
+    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/filter
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/filter
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/missing
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/reed-solomon
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/viterbi
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/io
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/g72x
+    ${CMAKE_CURRENT_BINARY_DIR}/src/lib/swig
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier
+)
+
+GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS
+    ${CMAKE_SOURCE_DIR}/gruel/src/swig
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_CORE)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_CORE_DESCRIPTION "GNU Radio Core Library")
+
+CPACK_COMPONENT("core_runtime"
+    GROUP        "Core"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "gruel_runtime"
+)
+
+CPACK_COMPONENT("core_devel"
+    GROUP        "Core"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "gruel_devel"
+)
+
+CPACK_COMPONENT("core_python"
+    GROUP        "Core"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "gruel_python;core_runtime"
+)
+
+CPACK_COMPONENT("core_swig"
+    GROUP        "Core"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "gruel_swig;core_python;core_devel"
+)
+
+install(
+    FILES gnuradio-core.conf
+    DESTINATION ${GR_PKG_CONF_DIR}
+    COMPONENT "core_runtime"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(src/lib)
+if(ENABLE_TESTING)
+    add_subdirectory(src/tests)
+endif(ENABLE_TESTING)
+if(ENABLE_PYTHON)
+    add_subdirectory(src/lib/swig)
+    add_subdirectory(src/python/gnuradio)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-core.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "core_devel"
+)
+
+endif(ENABLE_GR_CORE)
diff --git a/gnuradio-core/src/guile/tests/filter_ctors.test b/gnuradio-core/src/guile/tests/filter_ctors.test
index 4dd0bc187..fe1d9421d 100644
--- a/gnuradio-core/src/guile/tests/filter_ctors.test
+++ b/gnuradio-core/src/guile/tests/filter_ctors.test
@@ -36,9 +36,6 @@
 ;; gr_adaptive_fir_ccf(char *name, int decimation, const std::vector<float> &taps);
 ;; (pass-if (true? (gr:adaptive-fir-ccf "foo" 0 #(1.0 2.0 3.0 4.0))))
 
-;;; ./filter/gr_cma_equalizer_cc.h
-(pass-if (true? (gr:cma-equalizer-cc 0 0 0)))
-
 ;;; ./filter/gr_fft_filter_ccc.h
 (pass-if (true? (gr:fft-filter-ccc 0 #(1+3i 23+5i))))
 
diff --git a/gnuradio-core/src/guile/tests/general_ctors.test b/gnuradio-core/src/guile/tests/general_ctors.test
index 244249dd8..ca4d60460 100644
--- a/gnuradio-core/src/guile/tests/general_ctors.test
+++ b/gnuradio-core/src/guile/tests/general_ctors.test
@@ -71,9 +71,6 @@
 ;;; ./general/gr_bin_statistics_f.h WONTFIX: requires gr_feval_dd & swig directors
 ;;;(pass-if (true? (gr:bin-statistics-f 1 (gr:msg-queue) 0 0 0)))
 
-;;; ./general/gr_binary_slicer_fb.h
-(pass-if (true? (gr:binary-slicer-fb)))
-
 ;;; ./general/gr_bytes_to_syms.h
 (pass-if (true? (gr:bytes-to-syms)))
 
@@ -86,14 +83,6 @@
 ;;; ./general/gr_check_lfsr_32k_s.h
 (pass-if (true? (gr:check-lfsr-32k-s)))
 
-;;; ./general/gr_clock_recovery_mm_cc.h
-(pass-if (true? (gr:clock-recovery-mm-cc 1 1 1 1 1)))
-(pass-if-throw "confirm throw gr:clock-recovery-mm-cc" #t (true? (gr:clock-recovery-mm-cc -1 1 1 1 1)))
-
-;;; ./general/gr_clock_recovery_mm_ff.h
-(pass-if (true? (gr:clock-recovery-mm-ff 1 1 1 1 1)))
-(pass-if-throw "confirm throw gr:clock-recovery-mm-ff" #t (true? (gr:clock-recovery-mm-ff -1 1 1 1 1)))
-
 ;;; ./general/gr_complex_to_interleaved_short.h
 (pass-if (true? (gr:complex-to-interleaved-short)))
 
@@ -108,22 +97,9 @@
 ;;; ./general/gr_conjugate_cc.h
 (pass-if (true? (gr:conjugate-cc)))
 
-;;; ./general/gr_constellation_decoder_cb.h
-(pass-if (true? (gr:constellation-decoder-cb #(2+3i 23+5i) #(0 1))))
-
 ;;; ./general/gr_copy.h
 (pass-if (true? (gr:copy 1)))
 
-;;; ./general/gr_correlate_access_code_bb.h
-(pass-if (true? (gr:correlate-access-code-bb "foo" 0)))
-(pass-if-throw "confirm throw correlate-access-code-bb" #t
-  (true? (gr:correlate-access-code-bb
-	  "00000000000000000000000000000000000000000000000000000000000000000" 0)))
-
-;;; ./general/gr_costas_loop_cc.h
-(pass-if (true? (gr:costas-loop-cc 0 0 0 0 2)))
-(pass-if-throw "confirm throw gr:costas-loop-cc" #t (true? (gr:costas-loop-cc 0 0 0 0 3)))
-
 ;;; ./general/gr_cpfsk_bc.h
 (pass-if (true? (gr:cpfsk-bc 1 1 1)))
 
@@ -171,9 +147,6 @@
 (pass-if (true? (gr:fft-vfc 4 #t #(1.0 2.0 3.0 4.0))))
 (pass-if-throw "confirm throw gr:fft-vfc" #t (true? (gr:fft-vfc 4 #f #(1.0 2.0 3.0 4.0))))
 
-;;; ./general/gr_fll_band_edge_cc.h
-(pass-if (true? (gr:fll-band-edge-cc 0 0 0 0 0)))
-
 ;; ;;; ./general/gr_float_to_char.h
 (pass-if (true? (gr:float-to-char)))
 
@@ -221,18 +194,9 @@
 ;;; ./general/gr_lfsr_32k_source_s.h
 (pass-if (true? (gr:lfsr-32k-source-s)))
 
-;;; ./general/gr_lms_dfe_cc.h
-(pass-if (true? (gr:lms-dfe-ff 1 1 1 1)))
-
-;;; ./general/gr_lms_dfe_ff.h
-(pass-if (true? (gr:lms-dfe-ff 1 1 1 1)))
-
 ;;; ./general/gr_map_bb.h
 (pass-if (true? (gr:map-bb #(1 2))))
 
-;;; ./general/gr_mpsk_receiver_cc.h
-(pass-if (true? (gr:mpsk-receiver-cc 1 1 1 1 1 1 1 1 1 1 1)))
-
 ;;; ./general/gr_nlog10_ff.h
 (pass-if (true? (gr:nlog10-ff 1 1 1)))
 
@@ -245,28 +209,6 @@
 ;;; ./general/gr_null_source.h
 (pass-if (true? (gr:null-source 1)))
 
-;;; ./general/gr_ofdm_cyclic_prefixer.h
-(pass-if (true? (gr:ofdm-cyclic-prefixer 1 1)))
-
-;;; ./general/gr_ofdm_frame_acquisition.h
-(pass-if (true? (gr:ofdm-frame-acquisition 1 1 1 #(1+3i 23+5i) 1)))
-
-;;; ./general/gr_ofdm_frame_sink.h
-(pass-if (true? (gr:ofdm-frame-sink #(1+3i 23+5i) #(0 1) (gr:msg-queue) 128 0.25 0)))
-
-;;; ./general/gr_ofdm_insert_preamble.h FIXME: "Wrong type argument in position ~A: ~S"
-;;;                                     WONTFIX: Need vector<vector<complex<float>>>
-;;(pass-if (true? (gr:ofdm-insert-preamble 2 #(#(1+3i 23+5i) #(1+3i 23+5i)))))
-
-;;; ./general/gr_ofdm_mapper_bcv.h
-(pass-if (true? (gr:ofdm-mapper-bcv #(0+1i 0-1i) 1 100 128)))
-(pass-if-throw "confirm throw gr:ofdm-mapper-bcv" #t
-  (true? (gr:ofdm-mapper-bcv #(0+1i 0-1i) 1 10 128)))
-
-
-;;; ./general/gr_ofdm_sampler.h
-(pass-if (true? (gr:ofdm-sampler 1 1 1)))
-
 ;;; ./general/gr_pa_2x2_phase_combiner.h
 (pass-if (true? (gr:pa-2x2-phase-combiner)))
 
@@ -280,13 +222,13 @@
 (pass-if (true? (gr:phase-modulator-fc 0)))
 
 ;;; ./general/gr_pll_carriertracking_cc.h
-(pass-if (true? (gr:pll-carriertracking-cc 0 0 0 0)))
+(pass-if (true? (gr:pll-carriertracking-cc 0 0 0)))
 
 ;;; ./general/gr_pll_freqdet_cf.h
-(pass-if (true? (gr:pll-freqdet-cf 0 0 0 0)))
+(pass-if (true? (gr:pll-freqdet-cf 0 0 0)))
 
 ;;; ./general/gr_pll_refout_cc.h
-(pass-if (true? (gr:pll-refout-cc 0 0 0 0)))
+(pass-if (true? (gr:pll-refout-cc 0 0 0)))
 
 ;;; ./general/gr_pn_correlator_cc.h
 (pass-if (true? (gr:pn-correlator-cc 1 1 1)))
diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt
new file mode 100644
index 000000000..52339fc6c
--- /dev/null
+++ b/gnuradio-core/src/lib/CMakeLists.txt
@@ -0,0 +1,99 @@
+# Copyright 2010-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.
+
+########################################################################
+# Setup compatibility checks and defines
+########################################################################
+include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)
+
+########################################################################
+# Include subdirs rather to populate to the sources lists.
+########################################################################
+GR_INCLUDE_SUBDIRECTORY(missing)
+GR_INCLUDE_SUBDIRECTORY(runtime)
+GR_INCLUDE_SUBDIRECTORY(filter)
+GR_INCLUDE_SUBDIRECTORY(viterbi)
+GR_INCLUDE_SUBDIRECTORY(general)
+GR_INCLUDE_SUBDIRECTORY(gengen)
+GR_INCLUDE_SUBDIRECTORY(reed-solomon)
+GR_INCLUDE_SUBDIRECTORY(io)
+GR_INCLUDE_SUBDIRECTORY(hier)
+
+list(APPEND gnuradio_core_sources bug_work_around_6.cc)
+list(APPEND test_gnuradio_core_sources bug_work_around_6.cc)
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(${GNURADIO_CORE_INCLUDE_DIRS})
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+add_definitions(${GSL_DEFINITIONS})
+include_directories(${GSL_INCLUDE_DIRS})
+link_directories(${GSL_LIBRARY_DIRS})
+
+include_directories(${FFTW3F_INCLUDE_DIRS})
+link_directories(${FFTW3F_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gnuradio_core_libs
+    gruel
+    ${Boost_LIBRARIES}
+    ${GSL_LIBRARIES}
+    ${FFTW3F_LIBRARIES}
+)
+
+#need to link with librt on ubuntu 11.10 for shm_*
+if(LINUX)
+    list(APPEND gnuradio_core_libs rt)
+endif()
+
+add_library(gnuradio-core SHARED ${gnuradio_core_sources})
+target_link_libraries(gnuradio-core ${gnuradio_core_libs})
+GR_LIBRARY_FOO(gnuradio-core RUNTIME_COMPONENT "core_runtime" DEVEL_COMPONENT "core_devel")
+#avoid fftw and gsl link in dependent libraries:
+set_target_properties(gnuradio-core PROPERTIES LINK_INTERFACE_LIBRARIES "gruel")
+
+########################################################################
+# Setup executables
+########################################################################
+add_executable(gnuradio-config-info gnuradio-config-info.cc)
+target_link_libraries(gnuradio-config-info gnuradio-core ${Boost_LIBRARIES})
+install(
+    TARGETS gnuradio-config-info
+    DESTINATION ${GR_RUNTIME_DIR}
+    COMPONENT "core_runtime"
+)
+
+########################################################################
+# Setup tests
+########################################################################
+if(ENABLE_TESTING)
+
+include_directories(${CPPUNIT_INCLUDE_DIRS})
+link_directories(${CPPUNIT_LIBRARY_DIRS})
+
+add_library(test-gnuradio-core SHARED ${test_gnuradio_core_sources})
+target_link_libraries(test-gnuradio-core gnuradio-core ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES})
+
+endif(ENABLE_TESTING)
diff --git a/gnuradio-core/src/lib/ConfigChecks.cmake b/gnuradio-core/src/lib/ConfigChecks.cmake
new file mode 100644
index 000000000..30a1011e4
--- /dev/null
+++ b/gnuradio-core/src/lib/ConfigChecks.cmake
@@ -0,0 +1,212 @@
+# Copyright 2010-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.
+
+########################################################################
+INCLUDE(GrMiscUtils)
+INCLUDE(CheckCXXSourceCompiles)
+
+IF(MSVC) #add this directory for our provided headers
+LIST(APPEND CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/msvc)
+ENDIF(MSVC)
+
+GR_CHECK_HDR_N_DEF(netdb.h HAVE_NETDB_H)
+GR_CHECK_HDR_N_DEF(sys/time.h HAVE_SYS_TIME_H)
+GR_CHECK_HDR_N_DEF(sys/types.h HAVE_SYS_TYPES_H)
+GR_CHECK_HDR_N_DEF(sys/select.h HAVE_SYS_SELECT_H)
+GR_CHECK_HDR_N_DEF(sys/socket.h HAVE_SYS_SOCKET_H)
+GR_CHECK_HDR_N_DEF(io.h HAVE_IO_H)
+GR_CHECK_HDR_N_DEF(sys/mman.h HAVE_SYS_MMAN_H)
+GR_CHECK_HDR_N_DEF(sys/ipc.h HAVE_SYS_IPC_H)
+GR_CHECK_HDR_N_DEF(sys/shm.h HAVE_SYS_SHM_H)
+GR_CHECK_HDR_N_DEF(signal.h HAVE_SIGNAL_H)
+GR_CHECK_HDR_N_DEF(netinet/in.h HAVE_NETINET_IN_H)
+GR_CHECK_HDR_N_DEF(arpa/inet.h HAVE_ARPA_INET_H)
+GR_CHECK_HDR_N_DEF(byteswap.h HAVE_BYTESWAP_H)
+GR_CHECK_HDR_N_DEF(linux/ppdev.h HAVE_LINUX_PPDEV_H)
+GR_CHECK_HDR_N_DEF(dev/ppbus/ppi.h HAVE_DEV_PPBUS_PPI_H)
+GR_CHECK_HDR_N_DEF(unistd.h HAVE_UNISTD_H)
+GR_CHECK_HDR_N_DEF(malloc.h HAVE_MALLOC_H)
+
+
+########################################################################
+CHECK_CXX_SOURCE_COMPILES("
+    #include <stdio.h>
+    int main(){snprintf(0, 0, 0); return 0;}
+    " HAVE_SNPRINTF
+)
+GR_ADD_COND_DEF(HAVE_SNPRINTF)
+
+########################################################################
+CHECK_CXX_SOURCE_COMPILES("
+    #include <signal.h>
+    int main(){sigaction(0, 0, 0); return 0;}
+    " HAVE_SIGACTION
+)
+GR_ADD_COND_DEF(HAVE_SIGACTION)
+
+########################################################################
+CHECK_CXX_SOURCE_COMPILES("
+    #include <sys/select.h>
+    int main(){select(0, 0, 0, 0, 0); return 0;}
+    " HAVE_SELECT
+)
+GR_ADD_COND_DEF(HAVE_SELECT)
+
+
+########################################################################
+CHECK_CXX_SOURCE_COMPILES("
+    #include <unistd.h>
+    int main(){sysconf(0); return 0;}
+    " HAVE_SYSCONF
+)
+GR_ADD_COND_DEF(HAVE_SYSCONF)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include <unistd.h>
+    int main(){getpagesize(); return 0;}
+    " HAVE_GETPAGESIZE
+)
+GR_ADD_COND_DEF(HAVE_GETPAGESIZE)
+
+
+########################################################################
+CHECK_CXX_SOURCE_COMPILES("
+    #include <Winbase.h>
+    int main(){Sleep(0); return 0;}
+    " HAVE_SSLEEP
+)
+GR_ADD_COND_DEF(HAVE_SSLEEP)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include <time.h>
+    int main(){nanosleep(0, 0); return 0;}
+    " HAVE_NANOSLEEP
+)
+GR_ADD_COND_DEF(HAVE_NANOSLEEP)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include <sys/time.h>
+    int main(){gettimeofday(0, 0); return 0;}
+    " HAVE_GETTIMEOFDAY
+)
+GR_ADD_COND_DEF(HAVE_GETTIMEOFDAY)
+
+########################################################################
+CHECK_CXX_SOURCE_COMPILES("
+    #include <stdlib.h>
+    int main(){posix_memalign(0, 0, 0); return 0;}
+    " HAVE_POSIX_MEMALIGN
+)
+GR_ADD_COND_DEF(HAVE_POSIX_MEMALIGN)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include <malloc.h>
+    int main(){valloc(0); return 0;}
+    " HAVE_VALLOC
+)
+GR_ADD_COND_DEF(HAVE_VALLOC)
+
+ADD_DEFINITIONS(-DALIGNED_MALLOC=0)
+
+########################################################################
+SET(CMAKE_REQUIRED_LIBRARIES -lpthread)
+CHECK_CXX_SOURCE_COMPILES("
+    #include <signal.h>
+    int main(){pthread_sigmask(0, 0, 0); return 0;}
+    " HAVE_PTHREAD_SIGMASK
+)
+GR_ADD_COND_DEF(HAVE_PTHREAD_SIGMASK)
+SET(CMAKE_REQUIRED_LIBRARIES)
+
+########################################################################
+CHECK_CXX_SOURCE_COMPILES("
+    #include <windows.h>
+    int main(){
+        HANDLE handle;
+        int size;
+        LPCTSTR lpName;
+        handle = CreateFileMapping(
+                         INVALID_HANDLE_VALUE,    // use paging file
+                         NULL,                    // default security
+                         PAGE_READWRITE,          // read/write access
+                         0,                       // max. object size
+                         size,                    // buffer size
+                         lpName);                 // name of mapping object
+        return 0;
+    } " HAVE_CREATEFILEMAPPING
+)
+GR_ADD_COND_DEF(HAVE_CREATEFILEMAPPING)
+
+########################################################################
+CHECK_INCLUDE_FILE_CXX(windows.h HAVE_WINDOWS_H)
+IF(HAVE_WINDOWS_H)
+    ADD_DEFINITIONS(-DHAVE_WINDOWS_H -DUSING_WINSOCK)
+    MESSAGE(STATUS "Adding windows libs to gnuradio core libs...")
+    LIST(APPEND gnuradio_core_libs WS2_32.lib WSock32.lib)
+ENDIF(HAVE_WINDOWS_H)
+
+########################################################################
+SET(CMAKE_REQUIRED_LIBRARIES -lrt)
+CHECK_CXX_SOURCE_COMPILES("
+    #include <sys/types.h>
+    #include <sys/mman.h>
+    int main(){shm_open(0, 0, 0); return 0;}
+    " HAVE_SHM_OPEN
+)
+GR_ADD_COND_DEF(HAVE_SHM_OPEN)
+SET(CMAKE_REQUIRED_LIBRARIES)
+
+########################################################################
+CHECK_CXX_SOURCE_COMPILES("
+    #define _GNU_SOURCE
+    #include <math.h>
+    int main(){double x, sin, cos; sincos(x, &sin, &cos); return 0;}
+    " HAVE_SINCOS
+)
+GR_ADD_COND_DEF(HAVE_SINCOS)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #define _GNU_SOURCE
+    #include <math.h>
+    int main(){float x, sin, cos; sincosf(x, &sin, &cos); return 0;}
+    " HAVE_SINCOSF
+)
+GR_ADD_COND_DEF(HAVE_SINCOSF)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include <math.h>
+    int main(){sinf(0); return 0;}
+    " HAVE_SINF
+)
+GR_ADD_COND_DEF(HAVE_SINF)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include <math.h>
+    int main(){cosf(0); return 0;}
+    " HAVE_COSF
+)
+GR_ADD_COND_DEF(HAVE_COSF)
+
+########################################################################
+CHECK_CXX_SOURCE_COMPILES("
+    #include <sys/mman.h>
+    int main(){mmap(0, 0, 0, 0, 0, 0); return 0;}
+    " HAVE_MMAP
+)
+GR_ADD_COND_DEF(HAVE_MMAP)
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index db2482479..fc1b7917b 100644
--- a/gnuradio-core/src/lib/Makefile.am
+++ b/gnuradio-core/src/lib/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common
 ## Process this file with automake to produce Makefile.in
 
 # We've got to build . before swig
-SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io hier . swig
+SUBDIRS = missing runtime filter viterbi general gengen reed-solomon io hier . swig
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
@@ -42,7 +42,6 @@ libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \
 
 libgnuradio_core_la_LIBADD  = 		\
 	filter/libfilter.la		\
-	g72x/libccitt.la		\
 	viterbi/libviterbi.la		\
 	general/libgeneral.la		\
 	gengen/libgengen.la		\
diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt
new file mode 100644
index 000000000..ce7e387c2
--- /dev/null
+++ b/gnuradio-core/src/lib/filter/CMakeLists.txt
@@ -0,0 +1,351 @@
+# Copyright 2010-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.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+
+#set the C language property on the assembly files so the compiler will pick them up
+file(GLOB gr_core_filter_asms ${CMAKE_CURRENT_SOURCE_DIR}/*.S)
+foreach(gr_core_filter_asm ${gr_core_filter_asms})
+    set_property(SOURCE ${gr_core_filter_asm} PROPERTY LANGUAGE C)
+endforeach(gr_core_filter_asm)
+
+#detect 32 or 64 bit compiler
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86|x86_64)$")
+    include(CheckTypeSize)
+    check_type_size("void*" SIZEOF_VOID_P BUILTIN_TYPES_ONLY)
+    if (${SIZEOF_VOID_P} EQUAL 8)
+        set(CMAKE_SYSTEM_PROCESSOR_x86 64)
+    else()
+        set(CMAKE_SYSTEM_PROCESSOR_x86 32)
+    endif()
+endif()
+
+########################################################################
+# Generate the makefile.gen, then extract its sources:
+# This is a round-about way to extract the sources,
+# but it requires minimum changed to the python utils.
+#
+# The recommended way to do this:
+#   - Make a generation macro that registers the sources command.
+#   - List the generation macro with each templated source file.
+#   - Create a python script (very generic) to perform generation.
+#   - This way the targets would depend only on their sources.
+########################################################################
+execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -c "
+import os, sys
+sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${CMAKE_CURRENT_SOURCE_DIR}')
+os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
+os.environ['gendir'] = '${CMAKE_CURRENT_BINARY_DIR}'
+os.environ['do_makefile'] = '1'
+os.environ['do_sources'] = '0'
+from generate_all import generate_all
+generate_all()
+    " WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+macro(FILTER_GEN_EXTRACT outvar ext)
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; print ';'.join(
+        map(lambda x: os.path.join('${CMAKE_CURRENT_BINARY_DIR}', x.replace('\\\\', '').strip()),
+        filter(lambda f: '${ext}' in f, open('${CMAKE_CURRENT_BINARY_DIR}/Makefile.gen').readlines()
+    )))" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE ${outvar})
+    file(TO_CMAKE_PATH "${${outvar}}" ${outvar})
+endmacro(FILTER_GEN_EXTRACT)
+
+FILTER_GEN_EXTRACT(generated_filter_sources ".cc")
+FILTER_GEN_EXTRACT(generated_filter_includes ".h")
+FILTER_GEN_EXTRACT(generated_filter_swigs ".i")
+
+#TODO simplify this list with a triple-threat for loop
+set(generated_filter_deps
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_all.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_gr_fir_XXX.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_gr_fir_filter_XXX.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_gr_interp_fir_filter_XXX.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_gr_rational_resampler_base_XXX.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_gr_fir_sysconfig.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_gr_fir_sysconfig_generic.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_gr_fir_util.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_gr_freq_xlating_fir_filter_XXX.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_gri_fir_filter_with_buffer_XXX.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/generate_utils.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_XXX.cc.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_XXX.h.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_XXX_generic.cc.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_XXX_generic.h.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_filter_XXX.cc.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_filter_XXX.h.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_filter_XXX.i.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_interp_fir_filter_XXX.cc.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_interp_fir_filter_XXX.h.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_interp_fir_filter_XXX.i.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_rational_resampler_base_XXX.cc.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_rational_resampler_base_XXX.h.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_rational_resampler_base_XXX.i.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_freq_xlating_fir_filter_XXX.cc.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_freq_xlating_fir_filter_XXX.h.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_freq_xlating_fir_filter_XXX.i.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_fir_filter_with_buffer_XXX.cc.t
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_fir_filter_with_buffer_XXX.h.t
+)
+
+add_custom_command(
+    OUTPUT
+        ${generated_filter_sources}
+        ${generated_filter_includes}
+        ${generated_filter_swigs}
+    DEPENDS ${generated_filter_deps}
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -c
+    "import os, sys;sys.path.append('${GR_CORE_PYTHONPATH}');sys.path.append('${CMAKE_CURRENT_SOURCE_DIR}');os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}';from generate_all import generate_all;generate_all()"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMENT "generating filter files"
+    VERBATIM
+)
+
+add_custom_target(filter_generated DEPENDS
+    ${generated_filter_sources}
+    ${generated_filter_includes}
+    ${generated_filter_swigs}
+)
+
+########################################################################
+# Add target specific files
+# May VOLK put a rest to all the insanity below.
+########################################################################
+if(MSVC)
+    list(APPEND gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_generic.cc
+    )
+    list(APPEND test_gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_generic.cc
+    )
+else(MSVC)
+if(CMAKE_SYSTEM_PROCESSOR_x86)
+    list(APPEND gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_cpu_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_ccc_simd.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_ccc_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_fff_simd.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_fff_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_fsf_simd.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_fsf_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_scc_simd.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_scc_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_fcc_simd.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_fcc_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_ccf_simd.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_ccf_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/sse_debug.c
+    )
+    list(APPEND test_gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/qa_float_dotprod_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/qa_complex_dotprod_x86.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/qa_ccomplex_dotprod_x86.cc
+    )
+endif()
+
+if(CMAKE_SYSTEM_PROCESSOR_x86 AND "${CMAKE_SYSTEM_PROCESSOR_x86}" STREQUAL "64")
+    list(APPEND gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_sse64.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_3dnow64.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_3dnowext64.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_3dnow64.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_sse64.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/ccomplex_dotprod_3dnowext64.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/ccomplex_dotprod_3dnow64.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/ccomplex_dotprod_sse64.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/fcomplex_dotprod_3dnow64.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/fcomplex_dotprod_sse64.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/short_dotprod_mmx64.S
+    )
+elseif(CMAKE_SYSTEM_PROCESSOR_x86 AND "${CMAKE_SYSTEM_PROCESSOR_x86}" STREQUAL "32")
+    list(APPEND gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_sse.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_3dnow.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_3dnowext.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_3dnow.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_sse.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/ccomplex_dotprod_3dnowext.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/ccomplex_dotprod_3dnow.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/ccomplex_dotprod_sse.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/fcomplex_dotprod_3dnow.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/fcomplex_dotprod_sse.S
+        ${CMAKE_CURRENT_SOURCE_DIR}/short_dotprod_mmx.S
+    )
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+    list(APPEND gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_powerpc.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_powerpc.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_cpu_powerpc.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_fff_altivec.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_altivec.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/dotprod_fff_altivec.c
+    )
+    list(APPEND test_gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_powerpc.cc
+    )
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+    list(APPEND gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_armv7_a.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_armv7_a.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_cpu_armv7_a.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_fff_armv7_a.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/dotprod_fff_armv7_a.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/dotprod_ccf_armv7_a.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_ccf_armv7_a.cc
+    )
+    list(APPEND test_gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_armv7_a.cc
+    )
+else()
+    list(APPEND gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_generic.cc
+    )
+    list(APPEND test_gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_generic.cc
+    )
+endif()
+endif(MSVC)
+
+########################################################################
+# Append gnuradio-core library sources
+########################################################################
+list(APPEND gnuradio_core_sources
+    ${generated_filter_sources}
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_fft_filter_fff_generic.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_fft_filter_ccc_generic.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sincos.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_goertzel.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_mmse_fir_interpolator.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_mmse_fir_interpolator_cc.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_generic.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ccomplex_dotprod_generic.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_generic.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/short_dotprod_generic.c
+)
+
+########################################################################
+# Append gnuradio-core test sources
+########################################################################
+list(APPEND test_gnuradio_core_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_filter.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fir_ccf.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fir_fcc.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fir_fff.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fir_ccc.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fir_scc.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_rotator.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gri_mmse_fir_interpolator.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gri_mmse_fir_interpolator_cc.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gri_fir_filter_with_buffer_ccf.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gri_fir_filter_with_buffer_ccc.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gri_fir_filter_with_buffer_fcc.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gri_fir_filter_with_buffer_fff.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gri_fir_filter_with_buffer_fsf.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gri_fir_filter_with_buffer_scc.cc
+)
+
+########################################################################
+# Install runtime headers
+########################################################################
+install(FILES
+    ${generated_filter_includes}
+    ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_generic.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/complex_dotprod_x86.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/fcomplex_dotprod_x86.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ccomplex_dotprod_generic.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ccomplex_dotprod_x86.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_generic.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/float_dotprod_x86.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_altivec.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_cpu.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_fft_filter_fff_generic.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_fft_filter_ccc_generic.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_x86.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_powerpc.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_rotator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sincos.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_single_pole_iir.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vec_types.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_goertzel.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_iir.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_mmse_fir_interpolator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_mmse_fir_interpolator_cc.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_filter.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/short_dotprod_generic.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/short_dotprod_x86.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sse_debug.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "core_devel"
+)
+
+########################################################################
+# Install swig headers
+########################################################################
+if(ENABLE_PYTHON)
+install(FILES
+    ${generated_filter_swigs}
+    ${CMAKE_CURRENT_SOURCE_DIR}/filter.i
+    ${CMAKE_CURRENT_BINARY_DIR}/filter_generated.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "core_swig"
+)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Handle triple-threat files that have cc, h, and i
+########################################################################
+set(gr_core_filter_triple_threats
+    gr_adaptive_fir_ccc
+    gr_adaptive_fir_ccf
+    gr_dc_blocker_cc
+    gr_dc_blocker_ff
+    gr_fft_filter_ccc
+    gr_fft_filter_fff
+    gr_filter_delay_fc
+    gr_fractional_interpolator_ff
+    gr_fractional_interpolator_cc
+    gr_goertzel_fc
+    gr_hilbert_fc
+    gr_iir_filter_ffd
+    gr_single_pole_iir_filter_ff
+    gr_single_pole_iir_filter_cc
+    gr_pfb_channelizer_ccf
+    gr_pfb_synthesis_filterbank_ccf
+    gr_pfb_decimator_ccf
+    gr_pfb_interpolator_ccf
+    gr_pfb_arb_resampler_ccf
+    gr_pfb_arb_resampler_fff
+    gr_pfb_clock_sync_ccf
+    gr_pfb_clock_sync_fff
+)
+
+foreach(file_tt ${gr_core_filter_triple_threats})
+    list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.cc)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_devel")
+    if(ENABLE_PYTHON)
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "core_swig")
+    endif(ENABLE_PYTHON)
+endforeach(file_tt ${gr_core_filter_triple_threats})
diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am
index 0314079a2..c314431bf 100644
--- a/gnuradio-core/src/lib/filter/Makefile.am
+++ b/gnuradio-core/src/lib/filter/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2002,2004,2005,2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc.
+# Copyright 2001,2002,2004-2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -188,8 +188,8 @@ EXTRA_DIST += \
 # work around automake deficiency
 libfilter_la_common_SOURCES = 		\
 	$(GENERATED_CC)			\
+	gr_adaptive_fir_ccc.cc		\
 	gr_adaptive_fir_ccf.cc		\
-	gr_cma_equalizer_cc.cc		\
 	gri_fft_filter_fff_generic.cc	\
 	gri_fft_filter_ccc_generic.cc	\
 	gr_fft_filter_ccc.cc		\
@@ -215,6 +215,7 @@ libfilter_la_common_SOURCES = 		\
 	gr_pfb_decimator_ccf.cc		\
 	gr_pfb_interpolator_ccf.cc	\
 	gr_pfb_arb_resampler_ccf.cc	\
+	gr_pfb_arb_resampler_fff.cc	\
 	gr_pfb_clock_sync_ccf.cc	\
 	gr_pfb_clock_sync_fff.cc	\
 	gr_dc_blocker_cc.cc		\
@@ -272,9 +273,9 @@ grinclude_HEADERS = 			\
 	ccomplex_dotprod_x86.h		\
 	float_dotprod_generic.h		\
 	float_dotprod_x86.h		\
+	gr_adaptive_fir_ccc.h		\
 	gr_adaptive_fir_ccf.h		\
 	gr_altivec.h			\
-	gr_cma_equalizer_cc.h		\
 	gr_cpu.h			\
 	gri_fft_filter_fff_generic.h	\
 	gri_fft_filter_ccc_generic.h	\
@@ -307,6 +308,7 @@ grinclude_HEADERS = 			\
 	gr_pfb_decimator_ccf.h		\
 	gr_pfb_interpolator_ccf.h	\
 	gr_pfb_arb_resampler_ccf.h	\
+	gr_pfb_arb_resampler_fff.h	\
 	gr_pfb_clock_sync_ccf.h		\
 	gr_pfb_clock_sync_fff.h		\
 	gr_dc_blocker_cc.h		\
@@ -357,8 +359,8 @@ noinst_HEADERS = 			\
 swiginclude_HEADERS =			\
 	filter.i			\
 	filter_generated.i		\
+	gr_adaptive_fir_ccc.i		\
 	gr_adaptive_fir_ccf.i		\
-	gr_cma_equalizer_cc.i		\
 	gr_fft_filter_ccc.i		\
 	gr_fft_filter_fff.i		\
 	gr_filter_delay_fc.i		\
@@ -374,6 +376,7 @@ swiginclude_HEADERS =			\
 	gr_pfb_decimator_ccf.i		\
 	gr_pfb_interpolator_ccf.i	\
 	gr_pfb_arb_resampler_ccf.i	\
+	gr_pfb_arb_resampler_fff.i	\
 	gr_pfb_clock_sync_ccf.i		\
 	gr_pfb_clock_sync_fff.i		\
 	gr_dc_blocker_cc.i		\
diff --git a/gnuradio-core/src/lib/filter/ccomplex_dotprod_generic.h b/gnuradio-core/src/lib/filter/ccomplex_dotprod_generic.h
index 4637dc706..c03743776 100644
--- a/gnuradio-core/src/lib/filter/ccomplex_dotprod_generic.h
+++ b/gnuradio-core/src/lib/filter/ccomplex_dotprod_generic.h
@@ -23,7 +23,9 @@
 #ifndef _CCOMPLEX_DOTPROD_GENERIC_H_
 #define _CCOMPLEX_DOTPROD_GENERIC_H_
 
-void
+#include <gr_core_api.h>
+
+GR_CORE_API void
 ccomplex_dotprod_generic (const float *input,
 		       const float *taps, unsigned n_2_ccomplex_blocks,
 		       float *result);
diff --git a/gnuradio-core/src/lib/filter/complex_dotprod_generic.h b/gnuradio-core/src/lib/filter/complex_dotprod_generic.h
index 75d18e7f1..aed82179e 100644
--- a/gnuradio-core/src/lib/filter/complex_dotprod_generic.h
+++ b/gnuradio-core/src/lib/filter/complex_dotprod_generic.h
@@ -23,7 +23,9 @@
 #ifndef _COMPLEX_DOTPROD_GENERIC_H_
 #define _COMPLEX_DOTPROD_GENERIC_H_
 
-void
+#include <gr_core_api.h>
+
+GR_CORE_API void
 complex_dotprod_generic (const short *input,
 		       const float *taps, unsigned n_2_complex_blocks,
 		       float *result);
diff --git a/gnuradio-core/src/lib/filter/dotprod_fff_altivec.h b/gnuradio-core/src/lib/filter/dotprod_fff_altivec.h
index d9ee52cf0..af9210382 100644
--- a/gnuradio-core/src/lib/filter/dotprod_fff_altivec.h
+++ b/gnuradio-core/src/lib/filter/dotprod_fff_altivec.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_DOTPROD_FFF_ALTIVEC_H
 #define INCLUDED_DOTPROD_FFF_ALTIVEC_H
 
+#include <gr_core_api.h>
 #include <stddef.h>
 
 #ifdef __cplusplus
diff --git a/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.h b/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.h
index e72621a0d..667ee5fb6 100644
--- a/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.h
+++ b/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_DOTPROD_FFF_ARMV7_A_H
 #define INCLUDED_DOTPROD_FFF_ARMV7_A_H
 
+#include <gr_core_api.h>
 #include <stddef.h>
 
 #ifdef __cplusplus
diff --git a/gnuradio-core/src/lib/filter/filter.i b/gnuradio-core/src/lib/filter/filter.i
index 58bb4f0d5..8c3bb9eb6 100644
--- a/gnuradio-core/src/lib/filter/filter.i
+++ b/gnuradio-core/src/lib/filter/filter.i
@@ -31,12 +31,12 @@
 #include <gr_fractional_interpolator_ff.h>
 #include <gr_fractional_interpolator_cc.h>
 #include <gr_goertzel_fc.h>
-#include <gr_cma_equalizer_cc.h>
 #include <gr_pfb_channelizer_ccf.h>
 #include <gr_pfb_synthesis_filterbank_ccf.h>
 #include <gr_pfb_decimator_ccf.h>
 #include <gr_pfb_interpolator_ccf.h>
 #include <gr_pfb_arb_resampler_ccf.h>
+#include <gr_pfb_arb_resampler_fff.h>
 #include <gr_pfb_clock_sync_ccf.h>
 #include <gr_pfb_clock_sync_fff.h>
 #include <gr_dc_blocker_cc.h>
@@ -53,12 +53,12 @@
 %include "gr_fractional_interpolator_ff.i"
 %include "gr_fractional_interpolator_cc.i"
 %include "gr_goertzel_fc.i"
-%include "gr_cma_equalizer_cc.i"
 %include "gr_pfb_channelizer_ccf.i"
 %include "gr_pfb_synthesis_filterbank_ccf.i"
 %include "gr_pfb_decimator_ccf.i"
 %include "gr_pfb_interpolator_ccf.i"
 %include "gr_pfb_arb_resampler_ccf.i"
+%include "gr_pfb_arb_resampler_fff.i"
 %include "gr_pfb_decimator_ccf.i"
 %include "gr_pfb_interpolator_ccf.i"
 %include "gr_pfb_arb_resampler_ccf.i"
diff --git a/gnuradio-core/src/lib/filter/generate_gr_fir_util.py b/gnuradio-core/src/lib/filter/generate_gr_fir_util.py
index 4f5f5ce06..06001695e 100755
--- a/gnuradio-core/src/lib/filter/generate_gr_fir_util.py
+++ b/gnuradio-core/src/lib/filter/generate_gr_fir_util.py
@@ -25,7 +25,7 @@ from generate_utils import *
 def make_info_struct (out, sig):
     out.write (
 '''
-struct gr_fir_%s_info {
+struct GR_CORE_API gr_fir_%s_info {
   const char    *name;             // implementation name, e.g., "generic", "SSE", "3DNow!"
   gr_fir_%s	*(*create)(const std::vector<%s> &taps);
 };
@@ -74,6 +74,7 @@ def make_gr_fir_util_h ():
  * 'i' (short)
  */
 
+#include <gr_core_api.h>
 #include <gr_types.h>
 
 ''')
@@ -87,7 +88,7 @@ def make_gr_fir_util_h ():
         make_info_struct (out, sig)
 
     out.write ('''
-struct gr_fir_util {
+struct GR_CORE_API gr_fir_util {
 
   // create a fast version of gr_fir_XXX.
 
diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc
new file mode 100644
index 000000000..3fed74641
--- /dev/null
+++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.cc
@@ -0,0 +1,88 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_adaptive_fir_ccc.h>
+#include <gr_io_signature.h>
+
+gr_adaptive_fir_ccc::gr_adaptive_fir_ccc(const char *name, int decimation,
+					 const std::vector<gr_complex> &taps)
+  : gr_sync_decimator (name,
+		       gr_make_io_signature (1, 1, sizeof(gr_complex)),
+		       gr_make_io_signature (1, 1, sizeof(gr_complex)),
+		       decimation),
+    d_updated(false), d_taps(taps)
+{
+  set_history(d_taps.size());
+}
+
+void
+gr_adaptive_fir_ccc::set_taps(const std::vector<gr_complex> &taps)
+{
+  d_new_taps = taps;
+  d_updated = true;
+}
+
+gr_complex
+gr_adaptive_fir_ccc::filter(gr_complex *x)
+{
+  // Generic dot product of d_taps[] and in[]
+  gr_complex acc(0.0, 0.0);
+  int l = d_taps.size();
+  for (int k = 0; k < l; k++)
+    acc += d_taps[l-k-1] * x[k];
+  return acc;
+}
+
+int
+gr_adaptive_fir_ccc::work(int noutput_items,
+			  gr_vector_const_void_star &input_items,
+			  gr_vector_void_star &output_items)
+{
+  gr_complex *in = (gr_complex *)input_items[0];
+  gr_complex *out = (gr_complex *)output_items[0];
+
+  if (d_updated) {
+    d_taps = d_new_taps;
+    set_history(d_taps.size());
+    d_updated = false;
+    return 0;		     // history requirements may have changed.
+  }
+  
+  int j = 0, k, l = d_taps.size();
+  for (int i = 0; i < noutput_items; i++) {
+    out[i] = filter(&in[j]);
+    
+    // Adjust taps
+    d_error = error(out[i]);
+    for (k = 0; k < l; k++) {
+      update_tap(d_taps[l-k-1], in[j+k]);
+    }
+
+    j += decimation();
+  }
+
+  return noutput_items;
+}
diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.h b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.h
new file mode 100644
index 000000000..aa5422a07
--- /dev/null
+++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.h
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * 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_ADAPTIVE_FIR_CCC_H
+#define	INCLUDED_GR_ADAPTIVE_FIR_CCC_H
+
+#include <gr_core_api.h>
+#include <gr_sync_decimator.h>
+
+/*!
+ * \brief Adaptive FIR filter with gr_complex input, gr_complex output and float taps
+ * \ingroup filter_blk
+ */
+class GR_CORE_API gr_adaptive_fir_ccc : public gr_sync_decimator
+{
+private:
+  std::vector<gr_complex>  d_new_taps;
+  bool                     d_updated;
+
+protected:
+  gr_complex	           d_error;
+  std::vector<gr_complex>  d_taps;
+
+  // Override to calculate error signal per output
+  virtual gr_complex error(const gr_complex &out) = 0; 
+
+  // Override to calculate new weight from old, corresponding input
+  virtual void update_tap(gr_complex &tap, const gr_complex &in) = 0;
+
+  gr_complex filter(gr_complex *x);
+
+  gr_adaptive_fir_ccc(const char *name, int decimation,
+		      const std::vector<gr_complex> &taps);
+
+public:
+  void set_taps(const std::vector<gr_complex> &taps);
+
+  int work(int noutput_items,
+           gr_vector_const_void_star &input_items,
+           gr_vector_void_star &output_items);
+};
+
+#endif
diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.i b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.i
new file mode 100644
index 000000000..7e9a3fac3
--- /dev/null
+++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.i
@@ -0,0 +1,31 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+class gr_adaptive_fir_ccc : public gr_sync_decimator
+{
+protected:
+  gr_adaptive_fir_ccc(char *name, int decimation,
+		      const std::vector<gr_complex> &taps);
+
+public:
+  void set_taps(const std::vector<gr_complex> &taps);
+};
diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
index f860f4faa..87854201c 100644
--- a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_ADAPTIVE_FIR_CCF_H
 #define	INCLUDED_GR_ADAPTIVE_FIR_CCF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 /*!
  * \brief Adaptive FIR filter with gr_complex input, gr_complex output and float taps
  * \ingroup filter_blk
  */
-class gr_adaptive_fir_ccf : public gr_sync_decimator
+class GR_CORE_API gr_adaptive_fir_ccf : public gr_sync_decimator
 {
 private:
   std::vector<float>  d_new_taps;
diff --git a/gnuradio-core/src/lib/filter/gr_altivec.h b/gnuradio-core/src/lib/filter/gr_altivec.h
index c0d7cfb34..eb941ce42 100644
--- a/gnuradio-core/src/lib/filter/gr_altivec.h
+++ b/gnuradio-core/src/lib/filter/gr_altivec.h
@@ -29,6 +29,7 @@
  * (included below)
  */
 
+#include <gr_core_api.h>
 #include <altivec.h>
 #undef bool		// repair namespace pollution
 #undef vector		// repair namespace pollution
@@ -55,8 +56,8 @@ union v_float_u {
   float		f[FLOATS_PER_VEC];
 };
 
-void gr_print_vector_float(FILE *fp, vec_float4 v);
-void gr_pvf(FILE *fp, const char *label, vec_float4 v);
+GR_CORE_API void gr_print_vector_float(FILE *fp, vec_float4 v);
+GR_CORE_API void gr_pvf(FILE *fp, const char *label, vec_float4 v);
 
 static inline float
 horizontal_add_f(vec_float4 v)
diff --git a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.h b/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.h
deleted file mode 100644
index c78047c16..000000000
--- a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.h
+++ /dev/null
@@ -1,62 +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_GR_CMA_EQUALIZER_CC_H
-#define	INCLUDED_GR_CMA_EQUALIZER_CC_H
-
-#include <gr_adaptive_fir_ccf.h>
-
-class gr_cma_equalizer_cc;
-typedef boost::shared_ptr<gr_cma_equalizer_cc> gr_cma_equalizer_cc_sptr;
-
-gr_cma_equalizer_cc_sptr 
-gr_make_cma_equalizer_cc(int num_taps, float modulus, float mu);
-
-/*!
- * \brief Implements constant modulus adaptive filter on complex stream
- * \ingroup eq_blk
- */
-class gr_cma_equalizer_cc : public gr_adaptive_fir_ccf
-{
-private:
-  float d_modulus;
-  float d_mu;
-  
-  friend gr_cma_equalizer_cc_sptr gr_make_cma_equalizer_cc(int num_taps, float modulus, float mu);
-  gr_cma_equalizer_cc(int num_taps, float modulus, float mu);
-
-protected:
-
-  virtual float error(const gr_complex &out) 
-  { 
-    return (d_modulus - norm(out)); 
-  }
-
-  virtual void update_tap(float &tap, const gr_complex &in) 
-  {
-    tap += d_mu*d_error*abs(in);
-  }
-  
-public:
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/filter/gr_cpu.h b/gnuradio-core/src/lib/filter/gr_cpu.h
index 01d719020..149404082 100644
--- a/gnuradio-core/src/lib/filter/gr_cpu.h
+++ b/gnuradio-core/src/lib/filter/gr_cpu.h
@@ -23,7 +23,9 @@
 #ifndef _GR_CPU_H_
 #define _GR_CPU_H_
 
-struct gr_cpu {
+#include <gr_core_api.h>
+
+struct GR_CORE_API gr_cpu {
   static bool has_mmx ();
   static bool has_sse ();
   static bool has_sse2 ();
@@ -37,4 +39,4 @@ struct gr_cpu {
   static bool has_armv7_a ();
 };
 
-#endif /* _GR_CPU_H_ */
+#endif /* _GR_CPU_H_ */
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
index d299cc7ef..cb449f3ec 100644
--- a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
+++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
@@ -24,21 +24,37 @@
 #ifndef INCLUDED_GR_DC_BLOCKER_CC_H
 #define	INCLUDED_GR_DC_BLOCKER_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <deque>
 
+class GR_CORE_API moving_averager_c
+{
+public:
+  moving_averager_c(int D);
+  ~moving_averager_c();
+
+  gr_complex filter(gr_complex x);
+  gr_complex delayed_sig() { return d_out; }
+
+private:
+  int d_length;
+  gr_complex d_out, d_out_d1, d_out_d2;
+  std::deque<gr_complex> d_delay_line;
+};
+
 class gr_dc_blocker_cc;
 typedef boost::shared_ptr<gr_dc_blocker_cc> gr_dc_blocker_cc_sptr;
-gr_dc_blocker_cc_sptr gr_make_dc_blocker_cc (int D=32, bool long_form=true);
+GR_CORE_API gr_dc_blocker_cc_sptr gr_make_dc_blocker_cc (int D=32, bool long_form=true);
 
 /*!
  * \class gr_dc_blocker_cc
- * \brief a computationally efficient controllabel DC blocker
+ * \brief a computationally efficient controllable DC blocker
  *
  * \ingroup filter_blk
  * 
  * This block implements a computationally efficient DC blocker that produces
- * a tigher notch filter around DC for a smaller group delay than an
+ * a tighter notch filter around DC for a smaller group delay than an
  * equivalent FIR filter or using a single pole IIR filter (though the IIR
  * filter is computationally cheaper).
  *
@@ -57,22 +73,7 @@ gr_dc_blocker_cc_sptr gr_make_dc_blocker_cc (int D=32, bool long_form=true);
  *    <B><EM>R. Yates, "DC Blocker Algorithms," IEEE Signal Processing Magazine,
  *        Mar. 2008, pp 132-134.</EM></B>
  */
-class moving_averager_c
-{
-public:
-  moving_averager_c(int D);
-  ~moving_averager_c();
-
-  gr_complex filter(gr_complex x);
-  gr_complex delayed_sig() { return d_out; }
-
-private:
-  int d_length;
-  gr_complex d_out, d_out_d1, d_out_d2;
-  std::deque<gr_complex> d_delay_line;
-};
-
-class gr_dc_blocker_cc : public gr_sync_block
+class GR_CORE_API gr_dc_blocker_cc : public gr_sync_block
 {
  private:
   /*!
@@ -80,7 +81,7 @@ class gr_dc_blocker_cc : public gr_sync_block
    * \param D          (int) the length of the delay line
    * \param long_form  (bool) whether to use long (true, default) or short form
    */
-  friend gr_dc_blocker_cc_sptr gr_make_dc_blocker_cc (int D, bool long_form);
+  friend GR_CORE_API gr_dc_blocker_cc_sptr gr_make_dc_blocker_cc (int D, bool long_form);
 
   int d_length;
   bool d_long_form;
diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
index 8ffb6cf6f..a7e8f1c27 100644
--- a/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
+++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
@@ -24,21 +24,38 @@
 #ifndef INCLUDED_GR_DC_BLOCKER_FF_H
 #define	INCLUDED_GR_DC_BLOCKER_FF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <deque>
 
+class GR_CORE_API moving_averager_f
+{
+public:
+  moving_averager_f(int D);
+  ~moving_averager_f();
+
+  float filter(float x);
+  float delayed_sig() { return d_out; }
+
+private:
+  int d_length;
+  float d_out, d_out_d1, d_out_d2;
+  std::deque<float> d_delay_line;
+};
+
+
 class gr_dc_blocker_ff;
 typedef boost::shared_ptr<gr_dc_blocker_ff> gr_dc_blocker_ff_sptr;
-gr_dc_blocker_ff_sptr gr_make_dc_blocker_ff (int D=32, bool long_form=true);
+GR_CORE_API gr_dc_blocker_ff_sptr gr_make_dc_blocker_ff (int D=32, bool long_form=true);
 
 /*!
  * \class gr_dc_blocker_ff
- * \brief a computationally efficient controllabel DC blocker
+ * \brief a computationally efficient controllable DC blocker
  *
  * \ingroup filter_blk
  * 
  * This block implements a computationally efficient DC blocker that produces
- * a tigher notch filter around DC for a smaller group delay than an
+ * a tighter notch filter around DC for a smaller group delay than an
  * equivalent FIR filter or using a single pole IIR filter (though the IIR
  * filter is computationally cheaper).
  *
@@ -57,22 +74,7 @@ gr_dc_blocker_ff_sptr gr_make_dc_blocker_ff (int D=32, bool long_form=true);
  *    <B><EM>R. Yates, "DC Blocker Algorithms," IEEE Signal Processing Magazine,
  *        Mar. 2008, pp 132-134.</EM></B>
  */
-class moving_averager_f
-{
-public:
-  moving_averager_f(int D);
-  ~moving_averager_f();
-
-  float filter(float x);
-  float delayed_sig() { return d_out; }
-
-private:
-  int d_length;
-  float d_out, d_out_d1, d_out_d2;
-  std::deque<float> d_delay_line;
-};
-
-class gr_dc_blocker_ff : public gr_sync_block
+class GR_CORE_API gr_dc_blocker_ff : public gr_sync_block
 {
  private:
   /*!
@@ -80,7 +82,7 @@ class gr_dc_blocker_ff : public gr_sync_block
    * \param D          (int) the length of the delay line
    * \param long_form  (bool) whether to use long (true, default) or short form
    */
-  friend gr_dc_blocker_ff_sptr gr_make_dc_blocker_ff (int D, bool long_form);
+  friend GR_CORE_API gr_dc_blocker_ff_sptr gr_make_dc_blocker_ff (int D, bool long_form);
 
   int d_length;
   bool d_long_form;
diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h
index 68b19e775..721a44a83 100644
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h
@@ -22,11 +22,12 @@
 #ifndef INCLUDED_GR_FFT_FILTER_CCC_H
 #define INCLUDED_GR_FFT_FILTER_CCC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 class gr_fft_filter_ccc;
 typedef boost::shared_ptr<gr_fft_filter_ccc> gr_fft_filter_ccc_sptr;
-gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector<gr_complex> &taps);
+GR_CORE_API gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector<gr_complex> &taps);
 
 //class gri_fft_filter_ccc_sse;
 class gri_fft_filter_ccc_generic;
@@ -35,10 +36,10 @@ class gri_fft_filter_ccc_generic;
  * \brief Fast FFT filter with gr_complex input, gr_complex output and gr_complex taps
  * \ingroup filter_blk
  */
-class gr_fft_filter_ccc : public gr_sync_decimator
+class GR_CORE_API gr_fft_filter_ccc : public gr_sync_decimator
 {
  private:
-  friend gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector<gr_complex> &taps);
+  friend GR_CORE_API gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector<gr_complex> &taps);
 
   int			   d_nsamples;
   bool			   d_updated;
diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h
index 6eaa21500..b0dc74883 100644
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h
@@ -22,11 +22,12 @@
 #ifndef INCLUDED_GR_FFT_FILTER_FFF_H
 #define INCLUDED_GR_FFT_FILTER_FFF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 class gr_fft_filter_fff;
 typedef boost::shared_ptr<gr_fft_filter_fff> gr_fft_filter_fff_sptr;
-gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps);
+GR_CORE_API gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps);
 
 class gri_fft_filter_fff_generic;
 //class gri_fft_filter_fff_sse;
@@ -35,10 +36,10 @@ class gri_fft_filter_fff_generic;
  * \brief Fast FFT filter with float input, float output and float taps
  * \ingroup filter_blk
  */
-class gr_fft_filter_fff : public gr_sync_decimator
+class GR_CORE_API gr_fft_filter_fff : public gr_sync_decimator
 {
  private:
-  friend gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps);
+  friend GR_CORE_API gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps);
 
   int			   d_nsamples;
   bool			   d_updated;
diff --git a/gnuradio-core/src/lib/filter/gr_filter_delay_fc.h b/gnuradio-core/src/lib/filter/gr_filter_delay_fc.h
index 946edf2c7..e09e4f0df 100644
--- a/gnuradio-core/src/lib/filter/gr_filter_delay_fc.h
+++ b/gnuradio-core/src/lib/filter/gr_filter_delay_fc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_FILTER_DELAY_FC_H
 #define INCLUDED_GR_FILTER_DELAY_FC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_io_signature.h>
 #include <gr_types.h>
@@ -31,7 +32,7 @@ class gr_filter_delay_fc;
 typedef boost::shared_ptr<gr_filter_delay_fc> gr_filter_delay_fc_sptr;
 
 // public constructor
-gr_filter_delay_fc_sptr gr_make_filter_delay_fc (const std::vector<float> &taps);
+GR_CORE_API gr_filter_delay_fc_sptr gr_make_filter_delay_fc (const std::vector<float> &taps);
 
 class gr_fir_fff;
 
@@ -50,7 +51,7 @@ class gr_fir_fff;
  * before initializing this block.
  *
  */
-class gr_filter_delay_fc : public gr_sync_block
+class GR_CORE_API gr_filter_delay_fc : public gr_sync_block
 {
  public:
   ~gr_filter_delay_fc ();
@@ -66,7 +67,7 @@ class gr_filter_delay_fc : public gr_sync_block
   unsigned int  d_delay;
   gr_fir_fff	*d_fir;
 
-  friend gr_filter_delay_fc_sptr gr_make_filter_delay_fc (const std::vector<float> &taps);
+  friend GR_CORE_API gr_filter_delay_fc_sptr gr_make_filter_delay_fc (const std::vector<float> &taps);
 };
 
 #endif /* INCLUDED_GR_FILTER_DELAY_FC_H */
diff --git a/gnuradio-core/src/lib/filter/gr_fir_XXX.h.t b/gnuradio-core/src/lib/filter/gr_fir_XXX.h.t
index eeee716ec..f6019ea40 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_XXX.h.t
+++ b/gnuradio-core/src/lib/filter/gr_fir_XXX.h.t
@@ -29,6 +29,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <vector>
 @VRCOMPLEX_INCLUDE@
 #include <gr_reverse.h>
@@ -44,7 +45,7 @@
  * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int)
  */
 
-class @FIR_TYPE@ {
+class GR_CORE_API @FIR_TYPE@ {
 
 protected:
   std::vector<@TAP_TYPE@>	d_taps;		// reversed taps
diff --git a/gnuradio-core/src/lib/filter/gr_fir_XXX_generic.h.t b/gnuradio-core/src/lib/filter/gr_fir_XXX_generic.h.t
index fc0f4f8b2..b3594b7ad 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_XXX_generic.h.t
+++ b/gnuradio-core/src/lib/filter/gr_fir_XXX_generic.h.t
@@ -22,6 +22,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <@FIR_TYPE@.h>
 
 /*!
@@ -32,7 +33,7 @@
  * I,O,T are elements of the set 's' (short), 'f' (float), 'c' (gr_complex), 'i' (int)
  */
 
-class @FIR_TYPE@_generic : public @FIR_TYPE@ {
+class GR_CORE_API @FIR_TYPE@_generic : public @FIR_TYPE@ {
 
 public:
 
diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccc_simd.h b/gnuradio-core/src/lib/filter/gr_fir_ccc_simd.h
index 14ff1e6b1..af61ce274 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_ccc_simd.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_ccc_simd.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_FIR_CCC_SIMD_H
 #define INCLUDED_GR_FIR_CCC_SIMD_H
 
+#include <gr_core_api.h>
 #include <gr_fir_ccc_generic.h>
 
 /*!
@@ -32,7 +33,7 @@
  * subclasses.
  */
 
-class gr_fir_ccc_simd : public gr_fir_ccc_generic
+class GR_CORE_API gr_fir_ccc_simd : public gr_fir_ccc_generic
 {
 protected:
   typedef void (*ccomplex_dotprod_t)(const float *input,
diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccc_x86.h b/gnuradio-core/src/lib/filter/gr_fir_ccc_x86.h
index 06d6b616c..262cc80e3 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_ccc_x86.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_ccc_x86.h
@@ -23,19 +23,20 @@
 #ifndef INCLUDED_GR_FIR_CCC_X86_H
 #define INCLUDED_GR_FIR_CCC_X86_H
 
+#include <gr_core_api.h>
 #include <gr_fir_ccc_simd.h>
 
 /*!
  * \brief 3DNow! version of gr_fir_ccc
  */
-class gr_fir_ccc_3dnow : public gr_fir_ccc_simd
+class GR_CORE_API gr_fir_ccc_3dnow : public gr_fir_ccc_simd
 {
 public:
   gr_fir_ccc_3dnow ();
   gr_fir_ccc_3dnow (const std::vector<gr_complex> &taps);
 };
 
-class gr_fir_ccc_3dnowext : public gr_fir_ccc_simd
+class GR_CORE_API gr_fir_ccc_3dnowext : public gr_fir_ccc_simd
 {
 public:
   gr_fir_ccc_3dnowext ();
@@ -45,7 +46,7 @@ public:
 /*!
  * \brief SSE version of gr_fir_ccc
  */
-class gr_fir_ccc_sse : public gr_fir_ccc_simd
+class GR_CORE_API gr_fir_ccc_sse : public gr_fir_ccc_simd
 {
 public:
   gr_fir_ccc_sse ();
diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccf_simd.h b/gnuradio-core/src/lib/filter/gr_fir_ccf_simd.h
index ebc6a1bc0..31d70288e 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_ccf_simd.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_ccf_simd.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_FIR_CCF_SIMD_H
 #define INCLUDED_GR_FIR_CCF_SIMD_H
 
+#include <gr_core_api.h>
 #include <gr_fir_ccf_generic.h>
 
 
@@ -33,7 +34,7 @@
  * subclasses.
  */
 
-class gr_fir_ccf_simd : public gr_fir_ccf_generic
+class GR_CORE_API gr_fir_ccf_simd : public gr_fir_ccf_generic
 {
 protected:
   typedef void (*fcomplex_dotprod_t)(const float *taps,
diff --git a/gnuradio-core/src/lib/filter/gr_fir_ccf_x86.h b/gnuradio-core/src/lib/filter/gr_fir_ccf_x86.h
index 7f936546f..38d82060c 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_ccf_x86.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_ccf_x86.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_FIR_CCF_X86_H
 #define INCLUDED_GR_FIR_CCF_X86_H
 
+#include <gr_core_api.h>
 #include <gr_fir_ccf_simd.h>
 
 /*!
  * \brief 3DNow! version of gr_fir_ccf
  * \ingroup filter_primitive
  */
-class gr_fir_ccf_3dnow : public gr_fir_ccf_simd
+class GR_CORE_API gr_fir_ccf_3dnow : public gr_fir_ccf_simd
 {
 public:
   gr_fir_ccf_3dnow ();
@@ -40,7 +41,7 @@ public:
  * \brief SSE version of gr_fir_ccf
  * \ingroup filter_primitive
  */
-class gr_fir_ccf_sse : public gr_fir_ccf_simd
+class GR_CORE_API gr_fir_ccf_sse : public gr_fir_ccf_simd
 {
 public:
   gr_fir_ccf_sse ();
diff --git a/gnuradio-core/src/lib/filter/gr_fir_fcc_simd.h b/gnuradio-core/src/lib/filter/gr_fir_fcc_simd.h
index e2ed8bcae..7be3776e3 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_fcc_simd.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_fcc_simd.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_FIR_FCC_SIMD_H
 #define INCLUDED_GR_FIR_FCC_SIMD_H
 
+#include <gr_core_api.h>
 #include <gr_fir_fcc_generic.h>
 
 
@@ -33,7 +34,7 @@
  * subclasses.
  */
 
-class gr_fir_fcc_simd : public gr_fir_fcc_generic
+class GR_CORE_API gr_fir_fcc_simd : public gr_fir_fcc_generic
 {
 protected:
   typedef void (*fcomplex_dotprod_t)(const float *input,
diff --git a/gnuradio-core/src/lib/filter/gr_fir_fcc_x86.h b/gnuradio-core/src/lib/filter/gr_fir_fcc_x86.h
index 49386c35d..98ace66de 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_fcc_x86.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_fcc_x86.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_FIR_FCC_X86_H
 #define INCLUDED_GR_FIR_FCC_X86_H
 
+#include <gr_core_api.h>
 #include <gr_fir_fcc_simd.h>
 
 /*!
  * \brief 3DNow! version of gr_fir_fcc
  * \ingroup filter_primitive
  */
-class gr_fir_fcc_3dnow : public gr_fir_fcc_simd
+class GR_CORE_API gr_fir_fcc_3dnow : public gr_fir_fcc_simd
 {
 public:
   gr_fir_fcc_3dnow ();
@@ -40,7 +41,7 @@ public:
  * \brief SSE version of gr_fir_fcc
  * \ingroup filter_blk
  */
-class gr_fir_fcc_sse : public gr_fir_fcc_simd
+class GR_CORE_API gr_fir_fcc_sse : public gr_fir_fcc_simd
 {
 public:
   gr_fir_fcc_sse ();
diff --git a/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.h b/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.h
index 1694f5524..29bb3a899 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_fff_altivec.h
@@ -21,12 +21,13 @@
 #ifndef INCLUDED_GR_FIR_FFF_ALTIVEC_H
 #define INCLUDED_GR_FIR_FFF_ALTIVEC_H
 
+#include <gr_core_api.h>
 #include <gr_fir_fff_generic.h>
 
 /*!
  * \brief altivec version of gr_fir_fff
  */
-class gr_fir_fff_altivec : public gr_fir_fff_generic
+class GR_CORE_API gr_fir_fff_altivec : public gr_fir_fff_generic
 {
 protected:
 
diff --git a/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.h b/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.h
index d6097cf50..5c80c930f 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_fff_armv7_a.h
@@ -21,12 +21,13 @@
 #ifndef INCLUDED_GR_FIR_FFF_ARMV7_A_H
 #define INCLUDED_GR_FIR_FFF_ARMV7_A_H
 
+#include <gr_core_api.h>
 #include <gr_fir_fff_generic.h>
 
 /*!
  * \brief armv7_a using NEON coprocessor version of gr_fir_fff
  */
-class gr_fir_fff_armv7_a : public gr_fir_fff_generic
+class GR_CORE_API gr_fir_fff_armv7_a : public gr_fir_fff_generic
 {
 protected:
 
diff --git a/gnuradio-core/src/lib/filter/gr_fir_fff_simd.h b/gnuradio-core/src/lib/filter/gr_fir_fff_simd.h
index 82d3e3b99..781e4e7b9 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_fff_simd.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_fff_simd.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_FIR_FFF_SIMD_H
 #define INCLUDED_GR_FIR_FFF_SIMD_H
 
+#include <gr_core_api.h>
 #include <gr_fir_fff_generic.h>
 
 /*!
@@ -32,7 +33,7 @@
  * subclasses.
  */
 
-class gr_fir_fff_simd : public gr_fir_fff_generic
+class GR_CORE_API gr_fir_fff_simd : public gr_fir_fff_generic
 {
 protected:
   typedef float (*float_dotprod_t)(const float *input,
diff --git a/gnuradio-core/src/lib/filter/gr_fir_fff_x86.h b/gnuradio-core/src/lib/filter/gr_fir_fff_x86.h
index c288035ba..4e2f33181 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_fff_x86.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_fff_x86.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FIR_FFF_X86_H
 #define INCLUDED_GR_FIR_FFF_X86_H
 
+#include <gr_core_api.h>
 #include <gr_fir_fff_simd.h>
 
 /*!
  * \brief 3DNow! version of gr_fir_fff
  */
-class gr_fir_fff_3dnow : public gr_fir_fff_simd
+class GR_CORE_API gr_fir_fff_3dnow : public gr_fir_fff_simd
 {
 public:
   gr_fir_fff_3dnow ();
@@ -38,7 +39,7 @@ public:
 /*!
  * \brief SSE version of gr_fir_fff
  */
-class gr_fir_fff_sse : public gr_fir_fff_simd
+class GR_CORE_API gr_fir_fff_sse : public gr_fir_fff_simd
 {
 public:
   gr_fir_fff_sse ();
diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_XXX.h.t b/gnuradio-core/src/lib/filter/gr_fir_filter_XXX.h.t
index f2e56c901..db0625504 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_filter_XXX.h.t
+++ b/gnuradio-core/src/lib/filter/gr_fir_filter_XXX.h.t
@@ -28,11 +28,12 @@
 #ifndef @GUARD_NAME@
 #define	@GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
-@SPTR_NAME@ gr_make_@BASE_NAME@ (int decimation, const std::vector<@TAP_TYPE@> &taps);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (int decimation, const std::vector<@TAP_TYPE@> &taps);
 
 class @FIR_TYPE@;
 
@@ -40,10 +41,10 @@ class @FIR_TYPE@;
  * \brief FIR filter with @I_TYPE@ input, @O_TYPE@ output and @TAP_TYPE@ taps
  * \ingroup filter_blk
  */
-class @NAME@ : public gr_sync_decimator
+class GR_CORE_API @NAME@ : public gr_sync_decimator
 {
  private:
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (int decimation, const std::vector<@TAP_TYPE@> &taps);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (int decimation, const std::vector<@TAP_TYPE@> &taps);
 
   @FIR_TYPE@		*d_fir;
   std::vector<@TAP_TYPE@>	d_new_taps;
diff --git a/gnuradio-core/src/lib/filter/gr_fir_fsf_simd.h b/gnuradio-core/src/lib/filter/gr_fir_fsf_simd.h
index ad689407d..6fcb6bd35 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_fsf_simd.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_fsf_simd.h
@@ -22,6 +22,7 @@
 #ifndef _GR_FIR_FSF_SIMD_H_
 #define _GR_FIR_FSF_SIMD_H_
 
+#include <gr_core_api.h>
 #include <gr_fir_fsf_generic.h>
 
 /*!
@@ -32,7 +33,7 @@
  * subclasses.
  */
 
-class gr_fir_fsf_simd : public gr_fir_fsf_generic
+class GR_CORE_API gr_fir_fsf_simd : public gr_fir_fsf_generic
 {
 protected:
   typedef float (*float_dotprod_t)(const float *input,
diff --git a/gnuradio-core/src/lib/filter/gr_fir_fsf_x86.h b/gnuradio-core/src/lib/filter/gr_fir_fsf_x86.h
index 78fdf73c0..0e11059b3 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_fsf_x86.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_fsf_x86.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_FIR_FSF_X86_H
 #define INCLUDED_GR_FIR_FSF_X86_H
 
+#include <gr_core_api.h>
 #include <gr_fir_fsf_simd.h>
 
 /*!
  * \brief 3DNow! version of gr_fir_fsf
  * \ingroup filter_primitive
  */
-class gr_fir_fsf_3dnow : public gr_fir_fsf_simd
+class GR_CORE_API gr_fir_fsf_3dnow : public gr_fir_fsf_simd
 {
 public:
   gr_fir_fsf_3dnow ();
@@ -40,7 +41,7 @@ public:
  * \brief SSE version of gr_fir_fsf
  * \ingroup filter_primitive
  */
-class gr_fir_fsf_sse : public gr_fir_fsf_simd
+class GR_CORE_API gr_fir_fsf_sse : public gr_fir_fsf_simd
 {
 public:
   gr_fir_fsf_sse ();
diff --git a/gnuradio-core/src/lib/filter/gr_fir_scc_simd.h b/gnuradio-core/src/lib/filter/gr_fir_scc_simd.h
index 2af45c8f4..9dced1578 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_scc_simd.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_scc_simd.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_FIR_SCC_SIMD_H
 #define INCLUDED_GR_FIR_SCC_SIMD_H
 
+#include <gr_core_api.h>
 #include <gr_fir_scc_generic.h>
 
 
@@ -32,7 +33,7 @@
  * This base class handles alignment issues common to SSE and 3DNOW
  * subclasses.
  */
-class gr_fir_scc_simd : public gr_fir_scc_generic
+class GR_CORE_API gr_fir_scc_simd : public gr_fir_scc_generic
 {
 protected:
   typedef void (*complex_dotprod_t)(const short *input,
diff --git a/gnuradio-core/src/lib/filter/gr_fir_scc_x86.h b/gnuradio-core/src/lib/filter/gr_fir_scc_x86.h
index 0cb5e3f7c..484bdc5a0 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_scc_x86.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_scc_x86.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FIR_SCC_X86_H
 #define INCLUDED_GR_FIR_SCC_X86_H
 
+#include <gr_core_api.h>
 #include <gr_fir_scc_simd.h>
 
 /*!
  * \brief 3DNow! version of gr_fir_scc
  */
-class gr_fir_scc_3dnow : public gr_fir_scc_simd
+class GR_CORE_API gr_fir_scc_3dnow : public gr_fir_scc_simd
 {
 public:
   gr_fir_scc_3dnow ();
@@ -38,7 +39,7 @@ public:
 /*!
  * \brief 3DNow! Ext version of gr_fir_scc
  */
-class gr_fir_scc_3dnowext : public gr_fir_scc_simd
+class GR_CORE_API gr_fir_scc_3dnowext : public gr_fir_scc_simd
 {
 public:
   gr_fir_scc_3dnowext ();
@@ -48,7 +49,7 @@ public:
 /*!
  * \brief SSE version of gr_fir_scc
  */
-class gr_fir_scc_sse : public gr_fir_scc_simd
+class GR_CORE_API gr_fir_scc_sse : public gr_fir_scc_simd
 {
 public:
   gr_fir_scc_sse ();
diff --git a/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.h b/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.h
index c77b81026..69ee46019 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_sysconfig_armv7_a.h
@@ -22,9 +22,10 @@
 #ifndef INCLUDED_GR_FIR_SYSCONFIG_ARMV7_A_H
 #define INCLUDED_GR_FIR_SYSCONFIG_ARMV7_A_H
 
+#include <gr_core_api.h>
 #include <gr_fir_sysconfig_generic.h>
 
-class gr_fir_sysconfig_armv7_a : public gr_fir_sysconfig_generic {
+class GR_CORE_API gr_fir_sysconfig_armv7_a : public gr_fir_sysconfig_generic {
 public:
   virtual gr_fir_ccf *create_gr_fir_ccf (const std::vector<float> &taps);
   virtual gr_fir_fcc *create_gr_fir_fcc (const std::vector<gr_complex> &taps);
diff --git a/gnuradio-core/src/lib/filter/gr_fir_sysconfig_powerpc.h b/gnuradio-core/src/lib/filter/gr_fir_sysconfig_powerpc.h
index 9c31cdf1b..d6be7653f 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_sysconfig_powerpc.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_sysconfig_powerpc.h
@@ -22,9 +22,10 @@
 #ifndef INCLUDED_GR_FIR_SYSCONFIG_POWERPC_H
 #define INCLUDED_GR_FIR_SYSCONFIG_POWERPC_H
 
+#include <gr_core_api.h>
 #include <gr_fir_sysconfig_generic.h>
 
-class gr_fir_sysconfig_powerpc : public gr_fir_sysconfig_generic {
+class GR_CORE_API gr_fir_sysconfig_powerpc : public gr_fir_sysconfig_generic {
 public:
   virtual gr_fir_ccf *create_gr_fir_ccf (const std::vector<float> &taps);
   virtual gr_fir_fcc *create_gr_fir_fcc (const std::vector<gr_complex> &taps);
diff --git a/gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.h b/gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.h
index a4d0f92b0..49899d895 100644
--- a/gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.h
+++ b/gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.h
@@ -22,9 +22,10 @@
 #ifndef INCLUDED_GR_FIR_SYSCONFIG_X86_H
 #define INCLUDED_GR_FIR_SYSCONFIG_X86_H
 
+#include <gr_core_api.h>
 #include <gr_fir_sysconfig_generic.h>
 
-class gr_fir_sysconfig_x86 : public gr_fir_sysconfig_generic {
+class GR_CORE_API gr_fir_sysconfig_x86 : public gr_fir_sysconfig_generic {
 public:
   virtual gr_fir_ccf *create_gr_fir_ccf (const std::vector<float> &taps);
   virtual gr_fir_fcc *create_gr_fir_fcc (const std::vector<gr_complex> &taps);
diff --git a/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h b/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
index c8378c43e..29c67895a 100644
--- a/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
+++ b/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_FRACTIONAL_INTERPOLATOR_CC_H
 #define	INCLUDED_GR_FRACTIONAL_INTERPOLATOR_CC_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 class gri_mmse_fir_interpolator_cc;
@@ -31,13 +32,13 @@ class gr_fractional_interpolator_cc;
 typedef boost::shared_ptr<gr_fractional_interpolator_cc> gr_fractional_interpolator_cc_sptr;
 
 // public constructor
-gr_fractional_interpolator_cc_sptr gr_make_fractional_interpolator_cc (float phase_shift, float interp_ratio);
+GR_CORE_API gr_fractional_interpolator_cc_sptr gr_make_fractional_interpolator_cc (float phase_shift, float interp_ratio);
 
 /*!
  * \brief Interpolating mmse filter with gr_complex input, gr_complex output
  * \ingroup filter_blk
  */
-class gr_fractional_interpolator_cc : public gr_block
+class GR_CORE_API gr_fractional_interpolator_cc : public gr_block
 {
 public:
   ~gr_fractional_interpolator_cc ();
@@ -60,7 +61,7 @@ private:
   float 			d_mu_inc;
   gri_mmse_fir_interpolator_cc 	*d_interp;
 
-  friend gr_fractional_interpolator_cc_sptr
+  friend GR_CORE_API gr_fractional_interpolator_cc_sptr
   gr_make_fractional_interpolator_cc (float phase_shift, float interp_ratio);
 };
 
diff --git a/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h b/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h
index f50129289..7e000a6d1 100644
--- a/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h
+++ b/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_FRACTIONAL_INTERPOLATOR_FF_H
 #define	INCLUDED_GR_FRACTIONAL_INTERPOLATOR_FF_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 class gri_mmse_fir_interpolator;
@@ -31,13 +32,13 @@ class gr_fractional_interpolator_ff;
 typedef boost::shared_ptr<gr_fractional_interpolator_ff> gr_fractional_interpolator_ff_sptr;
 
 // public constructor
-gr_fractional_interpolator_ff_sptr gr_make_fractional_interpolator_ff (float phase_shift, float interp_ratio);
+GR_CORE_API gr_fractional_interpolator_ff_sptr gr_make_fractional_interpolator_ff (float phase_shift, float interp_ratio);
 
 /*!
  * \brief Interpolating mmse filter with float input, float output
  * \ingroup filter_blk
  */
-class gr_fractional_interpolator_ff : public gr_block
+class GR_CORE_API gr_fractional_interpolator_ff : public gr_block
 {
 public:
   ~gr_fractional_interpolator_ff ();
@@ -60,7 +61,7 @@ private:
   float 			d_mu_inc;
   gri_mmse_fir_interpolator 	*d_interp;
 
-  friend gr_fractional_interpolator_ff_sptr
+  friend GR_CORE_API gr_fractional_interpolator_ff_sptr
   gr_make_fractional_interpolator_ff (float phase_shift, float interp_ratio);
 };
 
diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_XXX.h.t b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_XXX.h.t
index 1205e8a08..bb05c138b 100644
--- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_XXX.h.t
+++ b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_XXX.h.t
@@ -29,6 +29,7 @@
 #ifndef @GUARD_NAME@
 #define	@GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 #include <gr_rotator.h>
 
@@ -40,7 +41,7 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  * translation that shifts center_freq down to zero Hz.  The frequency 
  * translation logically comes before the filtering operation.
  */
-@SPTR_NAME@ 
+GR_CORE_API @SPTR_NAME@ 
 gr_make_@BASE_NAME@ (int decimation, const std::vector<@TAP_TYPE@> &taps,
 		     double center_freq, double sampling_freq);
 
@@ -60,7 +61,7 @@ class @FIR_TYPE@;
  * Uses a single input array to produce a single output array.
  * Additional inputs and/or outputs are ignored.
  */
-class @NAME@ : public gr_sync_decimator
+class GR_CORE_API @NAME@ : public gr_sync_decimator
 {
  public:
   virtual ~@NAME@ ();
@@ -73,7 +74,7 @@ class @NAME@ : public gr_sync_decimator
 	    gr_vector_void_star &output_items);
 
  private:
-  friend @SPTR_NAME@ 
+  friend GR_CORE_API @SPTR_NAME@ 
   gr_make_@BASE_NAME@ (int decimation, const std::vector<@TAP_TYPE@> &taps,
 		       double center_freq, double sampling_freq);
 
diff --git a/gnuradio-core/src/lib/filter/gr_goertzel_fc.h b/gnuradio-core/src/lib/filter/gr_goertzel_fc.h
index c60b63d88..6b5d8527c 100644
--- a/gnuradio-core/src/lib/filter/gr_goertzel_fc.h
+++ b/gnuradio-core/src/lib/filter/gr_goertzel_fc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_GOERTZEL_FC_H
 #define INCLUDED_GR_GOERTZEL_FC_H
 
+#include <gr_core_api.h>
 #include <gri_goertzel.h>
 #include <gr_sync_decimator.h>
 
@@ -30,16 +31,16 @@ class gr_goertzel_fc;
 typedef boost::shared_ptr<gr_goertzel_fc> gr_goertzel_fc_sptr;
 
 // public constructor
-gr_goertzel_fc_sptr gr_make_goertzel_fc(int rate, int len, float freq);
+GR_CORE_API gr_goertzel_fc_sptr gr_make_goertzel_fc(int rate, int len, float freq);
 
 /*!
  * \brief Goertzel single-bin DFT calculation.
  * \ingroup dft_blk
  */
-class gr_goertzel_fc : public gr_sync_decimator
+class GR_CORE_API gr_goertzel_fc : public gr_sync_decimator
 {
 private:
-  friend gr_goertzel_fc_sptr gr_make_goertzel_fc (int rate, int len, float freq);
+  friend GR_CORE_API gr_goertzel_fc_sptr gr_make_goertzel_fc (int rate, int len, float freq);
 
   gr_goertzel_fc(int rate, int len, float freq);
   gri_goertzel d_goertzel;
diff --git a/gnuradio-core/src/lib/filter/gr_hilbert_fc.h b/gnuradio-core/src/lib/filter/gr_hilbert_fc.h
index adcac7793..ba73324ee 100644
--- a/gnuradio-core/src/lib/filter/gr_hilbert_fc.h
+++ b/gnuradio-core/src/lib/filter/gr_hilbert_fc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_HILBERT_FC_H
 #define INCLUDED_GR_HILBERT_FC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_io_signature.h>
 #include <gr_types.h>
@@ -31,7 +32,7 @@ class gr_hilbert_fc;
 typedef boost::shared_ptr<gr_hilbert_fc> gr_hilbert_fc_sptr;
 
 // public constructor
-gr_hilbert_fc_sptr gr_make_hilbert_fc (unsigned int ntaps);
+GR_CORE_API gr_hilbert_fc_sptr gr_make_hilbert_fc (unsigned int ntaps);
 
 
 class gr_fir_fff;
@@ -44,7 +45,7 @@ class gr_fir_fff;
  * imaginary output is hilbert filtered (90 degree phase shift)
  * version of input.
  */
-class gr_hilbert_fc : public gr_sync_block
+class GR_CORE_API gr_hilbert_fc : public gr_sync_block
 {
  public:
   ~gr_hilbert_fc ();
@@ -60,7 +61,7 @@ class gr_hilbert_fc : public gr_sync_block
   unsigned int	 d_ntaps;
   gr_fir_fff	*d_hilb;
 
-  friend gr_hilbert_fc_sptr gr_make_hilbert_fc (unsigned int ntaps);
+  friend GR_CORE_API gr_hilbert_fc_sptr gr_make_hilbert_fc (unsigned int ntaps);
 };
 
 
diff --git a/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h b/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h
index 0382646f1..386d056e5 100644
--- a/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h
+++ b/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_IIR_FILTER_FFD_H
 #define	INCLUDED_GR_IIR_FILTER_FFD_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gri_iir.h>
 #include <stdexcept>
 
 class gr_iir_filter_ffd;
 typedef boost::shared_ptr<gr_iir_filter_ffd> gr_iir_filter_ffd_sptr;
-gr_iir_filter_ffd_sptr 
+GR_CORE_API gr_iir_filter_ffd_sptr 
 gr_make_iir_filter_ffd (const std::vector<double> &fftaps,
 			const std::vector<double> &fbtaps) throw (std::invalid_argument);
 
@@ -56,10 +57,10 @@ gr_make_iir_filter_ffd (const std::vector<double> &fftaps,
  * Note that some texts define the system function with a + in the denominator.
  * If you're using that convention, you'll need to negate the feedback taps.
  */
-class gr_iir_filter_ffd : public gr_sync_block
+class GR_CORE_API gr_iir_filter_ffd : public gr_sync_block
 {
  private:
-  friend gr_iir_filter_ffd_sptr 
+  friend GR_CORE_API gr_iir_filter_ffd_sptr 
   gr_make_iir_filter_ffd (const std::vector<double> &fftaps,
 			  const std::vector<double> &fbtaps) throw (std::invalid_argument);
 
diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_XXX.h.t b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_XXX.h.t
index 790e0b908..4a3590fc7 100644
--- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_XXX.h.t
+++ b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_XXX.h.t
@@ -28,11 +28,12 @@
 #ifndef @GUARD_NAME@
 #define	@GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
-@SPTR_NAME@ gr_make_@BASE_NAME@ (unsigned interpolation, const std::vector<@TAP_TYPE@> &taps);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (unsigned interpolation, const std::vector<@TAP_TYPE@> &taps);
 
 class @FIR_TYPE@;
 
@@ -40,10 +41,10 @@ class @FIR_TYPE@;
  * \brief Interpolating FIR filter with @I_TYPE@ input, @O_TYPE@ output and @TAP_TYPE@ taps
  * \ingroup filter_blk
  */
-class @NAME@ : public gr_sync_interpolator
+class GR_CORE_API @NAME@ : public gr_sync_interpolator
 {
  private:
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (unsigned interpolation, const std::vector<@TAP_TYPE@> &taps);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (unsigned interpolation, const std::vector<@TAP_TYPE@> &taps);
 
   std::vector<@TAP_TYPE@>	d_new_taps;
   bool			d_updated;
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h
index 2c36c95f9..749db937e 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h
@@ -24,11 +24,12 @@
 #ifndef INCLUDED_GR_PFB_ARB_RESAMPLER_CCF_H
 #define	INCLUDED_GR_PFB_ARB_RESAMPLER_CCF_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 class gr_pfb_arb_resampler_ccf;
 typedef boost::shared_ptr<gr_pfb_arb_resampler_ccf> gr_pfb_arb_resampler_ccf_sptr;
-gr_pfb_arb_resampler_ccf_sptr gr_make_pfb_arb_resampler_ccf (float rate,
+GR_CORE_API gr_pfb_arb_resampler_ccf_sptr gr_make_pfb_arb_resampler_ccf (float rate,
 							     const std::vector<float> &taps,
 							     unsigned int filter_size=32);
 
@@ -41,6 +42,7 @@ class gr_fir_ccf;
  *        gr_complex input, gr_complex output and float taps
  *
  * \ingroup filter_blk
+ * \ingroup pfb_blk
  * 
  * This block takes in a signal stream and performs arbitrary
  * resampling. The resampling rate can be any real
@@ -95,7 +97,7 @@ class gr_fir_ccf;
  *       Systems", Upper Saddle River, NJ: Prentice Hall, Inc. 2004.</EM></B>
  */
 
-class gr_pfb_arb_resampler_ccf : public gr_block
+class GR_CORE_API gr_pfb_arb_resampler_ccf : public gr_block
 {
  private:
   /*!
@@ -107,7 +109,7 @@ class gr_pfb_arb_resampler_ccf : public gr_block
                                        related to quantization noise introduced during the resampling.
 				       Defaults to 32 filters.
    */
-  friend gr_pfb_arb_resampler_ccf_sptr gr_make_pfb_arb_resampler_ccf (float rate,
+  friend GR_CORE_API gr_pfb_arb_resampler_ccf_sptr gr_make_pfb_arb_resampler_ccf (float rate,
 								      const std::vector<float> &taps,
 								      unsigned int filter_size);
 
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.cc b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.cc
new file mode 100644
index 000000000..9035e67f4
--- /dev/null
+++ b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.cc
@@ -0,0 +1,209 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009-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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_pfb_arb_resampler_fff.h>
+#include <gr_fir_fff.h>
+#include <gr_fir_util.h>
+#include <gr_io_signature.h>
+#include <cstdio>
+
+gr_pfb_arb_resampler_fff_sptr gr_make_pfb_arb_resampler_fff (float rate, 
+							     const std::vector<float> &taps,
+							     unsigned int filter_size)
+{
+  return gnuradio::get_initial_sptr(new gr_pfb_arb_resampler_fff (rate, taps,
+								  filter_size));
+}
+
+
+gr_pfb_arb_resampler_fff::gr_pfb_arb_resampler_fff (float rate, 
+						    const std::vector<float> &taps,
+						    unsigned int filter_size)
+  : gr_block ("pfb_arb_resampler_fff",
+	      gr_make_io_signature (1, 1, sizeof(float)),
+	      gr_make_io_signature (1, 1, sizeof(float))),
+    d_updated (false)
+{
+  d_acc = 0; // start accumulator at 0
+
+  /* The number of filters is specified by the user as the filter size;
+     this is also the interpolation rate of the filter. We use it and the
+     rate provided to determine the decimation rate. This acts as a
+     rational resampler. The flt_rate is calculated as the residual
+     between the integer decimation rate and the real decimation rate and
+     will be used to determine to interpolation point of the resampling
+     process.
+  */
+  d_int_rate = filter_size;
+  set_rate(rate);
+
+  // Store the last filter between calls to work
+  d_last_filter = 0;
+
+  d_start_index = 0;
+  
+  d_filters = std::vector<gr_fir_fff*>(d_int_rate);
+  d_diff_filters = std::vector<gr_fir_fff*>(d_int_rate);
+
+  // Create an FIR filter for each channel and zero out the taps
+  std::vector<float> vtaps(0, d_int_rate);
+  for(unsigned int i = 0; i < d_int_rate; i++) {
+    d_filters[i] = gr_fir_util::create_gr_fir_fff(vtaps);
+    d_diff_filters[i] = gr_fir_util::create_gr_fir_fff(vtaps);
+  }
+
+  // Now, actually set the filters' taps
+  std::vector<float> dtaps;
+  create_diff_taps(taps, dtaps);
+  create_taps(taps, d_taps, d_filters);
+  create_taps(dtaps, d_dtaps, d_diff_filters);
+}
+
+gr_pfb_arb_resampler_fff::~gr_pfb_arb_resampler_fff ()
+{
+  for(unsigned int i = 0; i < d_int_rate; i++) {
+    delete d_filters[i];
+  }
+}
+
+void
+gr_pfb_arb_resampler_fff::create_taps (const std::vector<float> &newtaps,
+				       std::vector< std::vector<float> > &ourtaps,
+				       std::vector<gr_fir_fff*> &ourfilter)
+{
+  unsigned int ntaps = newtaps.size();
+  d_taps_per_filter = (unsigned int)ceil((double)ntaps/(double)d_int_rate);
+
+  // Create d_numchan vectors to store each channel's taps
+  ourtaps.resize(d_int_rate);
+  
+  // Make a vector of the taps plus fill it out with 0's to fill
+  // each polyphase filter with exactly d_taps_per_filter
+  std::vector<float> tmp_taps;
+  tmp_taps = newtaps;
+  while((float)(tmp_taps.size()) < d_int_rate*d_taps_per_filter) {
+    tmp_taps.push_back(0.0);
+  }
+  
+  // Partition the filter
+  for(unsigned int i = 0; i < d_int_rate; i++) {
+    // Each channel uses all d_taps_per_filter with 0's if not enough taps to fill out
+    ourtaps[d_int_rate-1-i] = std::vector<float>(d_taps_per_filter, 0);
+    for(unsigned int j = 0; j < d_taps_per_filter; j++) {
+      ourtaps[d_int_rate - 1 - i][j] = tmp_taps[i + j*d_int_rate];
+    }
+    
+    // Build a filter for each channel and add it's taps to it
+    ourfilter[i]->set_taps(ourtaps[d_int_rate-1-i]);
+  }
+
+  // Set the history to ensure enough input items for each filter
+  set_history (d_taps_per_filter + 1);
+
+  d_updated = true;
+}
+
+void
+gr_pfb_arb_resampler_fff::create_diff_taps(const std::vector<float> &newtaps,
+					   std::vector<float> &difftaps)
+{
+  // Calculate the differential taps (derivative filter) by taking the difference
+  // between two taps. Duplicate the last one to make both filters the same length.
+  float tap;
+  difftaps.clear();
+  for(unsigned int i = 0; i < newtaps.size()-1; i++) {
+    tap = newtaps[i+1] - newtaps[i];
+    difftaps.push_back(tap);
+  }
+  difftaps.push_back(tap);
+}
+
+void
+gr_pfb_arb_resampler_fff::print_taps()
+{
+  unsigned int i, j;
+  for(i = 0; i < d_int_rate; i++) {
+    printf("filter[%d]: [", i);
+    for(j = 0; j < d_taps_per_filter; j++) {
+      printf(" %.4e", d_taps[i][j]);
+    }
+    printf("]\n");
+  }
+}
+
+int
+gr_pfb_arb_resampler_fff::general_work (int noutput_items,
+					gr_vector_int &ninput_items,
+					gr_vector_const_void_star &input_items,
+					gr_vector_void_star &output_items)
+{
+  float *in = (float *) input_items[0];
+  float *out = (float *) output_items[0];
+
+  if (d_updated) {
+    d_updated = false;
+    return 0;		     // history requirements may have changed.
+  }
+
+  int i = 0, count = d_start_index;
+  unsigned int j;
+  float o0, o1;
+
+  // Restore the last filter position
+  j = d_last_filter;
+
+  // produce output as long as we can and there are enough input samples
+  int max_input = ninput_items[0]-(int)d_taps_per_filter;
+  while((i < noutput_items) && (count < max_input)) {
+    // start j by wrapping around mod the number of channels
+    while((j < d_int_rate) && (i < noutput_items)) {
+      // Take the current filter and derivative filter output
+      o0 = d_filters[j]->filter(&in[count]);
+      o1 = d_diff_filters[j]->filter(&in[count]);
+
+      out[i] = o0 + o1*d_acc;     // linearly interpolate between samples
+      i++;
+
+      // Adjust accumulator and index into filterbank
+      d_acc += d_flt_rate;
+      j += d_dec_rate + (int)floor(d_acc);
+      d_acc = fmodf(d_acc, 1.0);
+    }
+    if(i < noutput_items) {              // keep state for next entry
+      float ss = (int)(j / d_int_rate);  // number of items to skip ahead by
+      count += ss;                       // we have fully consumed another input
+      j = j % d_int_rate;                // roll filter around
+    }
+  }
+
+  // Store the current filter position and start of next sample
+  d_last_filter = j;
+  d_start_index = std::max(0, count - ninput_items[0]);
+
+  // consume all we've processed but no more than we can
+  consume_each(std::min(count, ninput_items[0]));
+  return i;
+}
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h
new file mode 100644
index 000000000..7fef06143
--- /dev/null
+++ b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h
@@ -0,0 +1,178 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009-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_PFB_ARB_RESAMPLER_FFF_H
+#define	INCLUDED_GR_PFB_ARB_RESAMPLER_FFF_H
+
+#include <gr_core_api.h>
+#include <gr_block.h>
+
+class gr_pfb_arb_resampler_fff;
+typedef boost::shared_ptr<gr_pfb_arb_resampler_fff> gr_pfb_arb_resampler_fff_sptr;
+GR_CORE_API gr_pfb_arb_resampler_fff_sptr gr_make_pfb_arb_resampler_fff (float rate,
+							     const std::vector<float> &taps,
+							     unsigned int filter_size=32);
+
+class gr_fir_fff;
+
+/*!
+ * \class gr_pfb_arb_resampler_fff
+ *
+ * \brief Polyphase filterbank arbitrary resampler with 
+ *        float input, float output and float taps
+ *
+ * \ingroup filter_blk
+ * \ingroup pfb_blk
+ * 
+ * This block takes in a signal stream and performs arbitrary
+ * resampling. The resampling rate can be any real
+ * number <EM>r</EM>. The resampling is done by constructing
+ * <EM>N</EM> filters where <EM>N</EM> is the interpolation rate.  We
+ * then calculate <EM>D</EM> where <EM>D = floor(N/r)</EM>.
+ *
+ * Using <EM>N</EM> and <EM>D</EM>, we can perform rational resampling
+ * where <EM>N/D</EM> is a rational number close to the input rate
+ * <EM>r</EM> where we have <EM>N</EM> filters and we cycle through
+ * them as a polyphase filterbank with a stride of <EM>D</EM> so that
+ * <EM>i+1 = (i + D) % N</EM>.
+ *
+ * To get the arbitrary rate, we want to interpolate between two
+ * points. For each value out, we take an output from the current
+ * filter, <EM>i</EM>, and the next filter <EM>i+1</EM> and then
+ * linearly interpolate between the two based on the real resampling
+ * rate we want.
+ *
+ * The linear interpolation only provides us with an approximation to
+ * the real sampling rate specified. The error is a quantization error
+ * between the two filters we used as our interpolation points.  To
+ * this end, the number of filters, <EM>N</EM>, used determines the
+ * quantization error; the larger <EM>N</EM>, the smaller the
+ * noise. You can design for a specified noise floor by setting the
+ * filter size (parameters <EM>filter_size</EM>). The size defaults to
+ * 32 filters, which is about as good as most implementations need.
+ *
+ * The trick with designing this filter is in how to specify the taps
+ * of the prototype filter. Like the PFB interpolator, the taps are
+ * specified using the interpolated filter rate. In this case, that
+ * rate is the input sample rate multiplied by the number of filters
+ * in the filterbank, which is also the interpolation rate. All other
+ * values should be relative to this rate.
+ *
+ * For example, for a 32-filter arbitrary resampler and using the
+ * GNU Radio's firdes utility to build the filter, we build a low-pass
+ * filter with a sampling rate of <EM>fs</EM>, a 3-dB bandwidth of
+ * <EM>BW</EM> and a transition bandwidth of <EM>TB</EM>. We can also
+ * specify the out-of-band attenuation to use, <EM>ATT</EM>, and the
+ * filter window function (a Blackman-harris window in this case). The
+ * first input is the gain of the filter, which we specify here as the
+ * interpolation rate (<EM>32</EM>).
+ *
+ *      <B><EM>self._taps = gr.firdes.low_pass_2(32, 32*fs, BW, TB, 
+ *           attenuation_dB=ATT, window=gr.firdes.WIN_BLACKMAN_hARRIS)</EM></B>
+ *
+ * The theory behind this block can be found in Chapter 7.5 of 
+ * the following book.
+ *
+ *    <B><EM>f. harris, "Multirate Signal Processing for Communication 
+ *       Systems", Upper Saddle River, NJ: Prentice Hall, Inc. 2004.</EM></B>
+ */
+
+class GR_CORE_API gr_pfb_arb_resampler_fff : public gr_block
+{
+ private:
+  /*!
+   * Build the polyphase filterbank arbitray resampler.
+   * \param rate  (float) Specifies the resampling rate to use
+   * \param taps  (vector/list of floats) The prototype filter to populate the filterbank. The taps
+   *                                      should be generated at the filter_size sampling rate.
+   * \param filter_size (unsigned int) The number of filters in the filter bank. This is directly
+                                       related to quantization noise introduced during the resampling.
+				       Defaults to 32 filters.
+   */
+  friend GR_CORE_API gr_pfb_arb_resampler_fff_sptr gr_make_pfb_arb_resampler_fff (float rate,
+								      const std::vector<float> &taps,
+								      unsigned int filter_size);
+
+  std::vector<gr_fir_fff*> d_filters;
+  std::vector<gr_fir_fff*> d_diff_filters;
+  std::vector< std::vector<float> > d_taps;
+  std::vector< std::vector<float> > d_dtaps;
+  unsigned int             d_int_rate;          // the number of filters (interpolation rate)
+  unsigned int             d_dec_rate;          // the stride through the filters (decimation rate)
+  float                    d_flt_rate;          // residual rate for the linear interpolation
+  float                    d_acc;
+  unsigned int             d_last_filter;
+  int                      d_start_index;
+  unsigned int             d_taps_per_filter;
+  bool			   d_updated;
+
+  /*!
+   * Build the polyphase filterbank arbitray resampler.
+   * \param rate  (float) Specifies the resampling rate to use
+   * \param taps  (vector/list of floats) The prototype filter to populate the filterbank. The taps
+   *                                      should be generated at the filter_size sampling rate.
+   * \param filter_size (unsigned int) The number of filters in the filter bank. This is directly
+                                       related to quantization noise introduced during the resampling.
+				       Defaults to 32 filters.
+   */
+  gr_pfb_arb_resampler_fff (float rate, 
+			    const std::vector<float> &taps,
+			    unsigned int filter_size);
+
+  void create_diff_taps(const std::vector<float> &newtaps,
+			std::vector<float> &difftaps);
+
+  /*!
+   * Resets the filterbank's filter taps with the new prototype filter
+   * \param newtaps    (vector of floats) The prototype filter to populate the filterbank. 
+   *                   The taps should be generated at the interpolated sampling rate.
+   * \param ourtaps    (vector of floats) Reference to our internal member of holding the taps.
+   * \param ourfilter  (vector of filters) Reference to our internal filter to set the taps for.
+   */
+  void create_taps (const std::vector<float> &newtaps,
+		    std::vector< std::vector<float> > &ourtaps,
+		    std::vector<gr_fir_fff*> &ourfilter);
+
+  
+public:
+  ~gr_pfb_arb_resampler_fff ();
+
+  // FIXME: See about a set_taps function during runtime.
+
+  /*!
+   * Print all of the filterbank taps to screen.
+   */
+  void print_taps();
+  void set_rate (float rate) { 
+    d_dec_rate = (unsigned int)floor(d_int_rate/rate);
+    d_flt_rate = (d_int_rate/rate) - d_dec_rate;
+    set_relative_rate(rate);
+  }
+
+  int general_work (int noutput_items,
+		    gr_vector_int &ninput_items,
+		    gr_vector_const_void_star &input_items,
+		    gr_vector_void_star &output_items);
+};
+
+#endif
diff --git a/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.i b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.i
index c9c792c8a..8c1db22c3 100644
--- a/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.i
+++ b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009 Free Software Foundation, Inc.
+ * Copyright 2009,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,22 +20,23 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,fll_band_edge_cc);
+GR_SWIG_BLOCK_MAGIC(gr,pfb_arb_resampler_fff);
 
-gr_fll_band_edge_cc_sptr gr_make_fll_band_edge_cc (float samps_per_sym, float rolloff,
-						   int filter_size, float alpha, float beta);
+gr_pfb_arb_resampler_fff_sptr gr_make_pfb_arb_resampler_fff (float rate,
+							     const std::vector<float> &taps,
+							     unsigned int filter_size=32);
 
-class gr_fll_band_edge_cc : public gr_sync_block
+class gr_pfb_arb_resampler_fff : public gr_block
 {
  private:
-  gr_fll_band_edge_cc (float samps_per_sym, float rolloff,
-		       int filter_size, float alpha, float beta);
+  gr_pfb_arb_resampler_fff (float rate,
+			    const std::vector<float> &taps,
+			    unsigned int filter_size);
 
  public:
-  ~gr_fll_band_edge_cc ();
+  ~gr_pfb_arb_resampler_fff ();
 
-  void set_alpha (float alpha);
-  void set_beta (float beta);
-  void design_filter(float samps_per_sym, float rolloff, int filter_size);
+  //void set_taps (const std::vector<float> &taps);
   void print_taps();
+  void set_rate (float rate);
 };
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.h
index 751673bc7..8fd5c4f78 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.h
@@ -24,11 +24,12 @@
 #ifndef INCLUDED_GR_PFB_CHANNELIZER_CCF_H
 #define	INCLUDED_GR_PFB_CHANNELIZER_CCF_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 class gr_pfb_channelizer_ccf;
 typedef boost::shared_ptr<gr_pfb_channelizer_ccf> gr_pfb_channelizer_ccf_sptr;
-gr_pfb_channelizer_ccf_sptr gr_make_pfb_channelizer_ccf (unsigned int numchans, 
+GR_CORE_API gr_pfb_channelizer_ccf_sptr gr_make_pfb_channelizer_ccf (unsigned int numchans, 
 							 const std::vector<float> &taps,
 							 float oversample_rate=1);
 
@@ -43,6 +44,7 @@ class gri_fft_complex;
  *        gr_complex input, gr_complex output and float taps
  *
  * \ingroup filter_blk
+ * \ingroup pfb_blk
  *
  * This block takes in complex inputs and channelizes it to <EM>M</EM>
  * channels of equal bandwidth. Each of the resulting channels is
@@ -110,7 +112,7 @@ class gri_fft_complex;
  *
  */
 
-class gr_pfb_channelizer_ccf : public gr_block
+class GR_CORE_API gr_pfb_channelizer_ccf : public gr_block
 {
  private:
   /*!
@@ -130,7 +132,7 @@ class gr_pfb_channelizer_ccf : public gr_block
    *				      sample rate of a 6/1 oversample ratio is 6000 Hz, or
    *				      6 times the normal 1000 Hz.
    */
-  friend gr_pfb_channelizer_ccf_sptr gr_make_pfb_channelizer_ccf (unsigned int numchans,
+  friend GR_CORE_API gr_pfb_channelizer_ccf_sptr gr_make_pfb_channelizer_ccf (unsigned int numchans,
 								  const std::vector<float> &taps,
 								  float oversample_rate);
 
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc
index 937899c0d..633c5be07 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc
+++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009,2010 Free Software Foundation, Inc.
+ * Copyright 2009-2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -33,39 +33,47 @@
 #include <gr_io_signature.h>
 #include <gr_math.h>
 
-gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, float gain,
+gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, float loop_bw,
 						       const std::vector<float> &taps,
 						       unsigned int filter_size,
 						       float init_phase,
-						       float max_rate_deviation)
+						       float max_rate_deviation,
+						       int osps)
 {
-  return gnuradio::get_initial_sptr(new gr_pfb_clock_sync_ccf (sps, gain, taps,
-								filter_size,
-								init_phase,
-								max_rate_deviation));
+  return gnuradio::get_initial_sptr(new gr_pfb_clock_sync_ccf (sps, loop_bw, taps,
+							       filter_size,
+							       init_phase,
+							       max_rate_deviation,
+							       osps));
 }
 
 static int ios[] = {sizeof(gr_complex), sizeof(float), sizeof(float), sizeof(float)};
 static std::vector<int> iosig(ios, ios+sizeof(ios)/sizeof(int));
-gr_pfb_clock_sync_ccf::gr_pfb_clock_sync_ccf (double sps, float gain,
+gr_pfb_clock_sync_ccf::gr_pfb_clock_sync_ccf (double sps, float loop_bw,
 					      const std::vector<float> &taps,
 					      unsigned int filter_size,
 					      float init_phase,
-					      float max_rate_deviation)
+					      float max_rate_deviation,
+					      int osps)
   : gr_block ("pfb_clock_sync_ccf",
 	      gr_make_io_signature (1, 1, sizeof(gr_complex)),
 	      gr_make_io_signaturev (1, 4, iosig)),
     d_updated (false), d_nfilters(filter_size),
-    d_max_dev(max_rate_deviation)
+    d_max_dev(max_rate_deviation),
+    d_osps(osps), d_error(0)
 {
   d_nfilters = filter_size;
   d_sps = floor(sps);
 
+  // Set the damping factor for a critically damped system
+  d_damping = sqrtf(2.0f)/2.0f;
+  
+  // Set the bandwidth, which will then call update_gains()
+  set_loop_bandwidth(loop_bw);
+  
   // Store the last filter between calls to work
   // The accumulator keeps track of overflow to increment the stride correctly.
   // set it here to the fractional difference based on the initial phaes
-  set_alpha(gain);
-  set_beta(0.25*gain*gain);
   d_k = init_phase;
   d_rate = (sps-floor(sps))*(double)d_nfilters;
   d_rate_i = (int)floor(d_rate);
@@ -103,6 +111,100 @@ gr_pfb_clock_sync_ccf::check_topology(int ninputs, int noutputs)
   return noutputs == 1 || noutputs == 4;
 }
 
+
+
+/*******************************************************************
+    SET FUNCTIONS
+*******************************************************************/
+
+
+void
+gr_pfb_clock_sync_ccf::set_loop_bandwidth(float bw) 
+{
+  if(bw < 0) {
+    throw std::out_of_range ("gr_pfb_clock_sync_cc: invalid bandwidth. Must be >= 0.");
+  }
+  
+  d_loop_bw = bw;
+  update_gains();
+}
+
+void
+gr_pfb_clock_sync_ccf::set_damping_factor(float df) 
+{
+  if(df < 0 || df > 1.0) {
+    throw std::out_of_range ("gr_pfb_clock_sync_cc: invalid damping factor. Must be in [0,1].");
+  }
+  
+  d_damping = df;
+  update_gains();
+}
+
+void
+gr_pfb_clock_sync_ccf::set_alpha(float alpha)
+{
+  if(alpha < 0 || alpha > 1.0) {
+    throw std::out_of_range ("gr_pfb_clock_sync_cc: invalid alpha. Must be in [0,1].");
+  }
+  d_alpha = alpha;
+}
+
+void
+gr_pfb_clock_sync_ccf::set_beta(float beta)
+{
+  if(beta < 0 || beta > 1.0) {
+    throw std::out_of_range ("gr_pfb_clock_sync_cc: invalid beta. Must be in [0,1].");
+  }
+  d_beta = beta;
+}
+
+/*******************************************************************
+    GET FUNCTIONS
+*******************************************************************/
+
+
+float
+gr_pfb_clock_sync_ccf::get_loop_bandwidth() const
+{
+  return d_loop_bw;
+}
+
+float
+gr_pfb_clock_sync_ccf::get_damping_factor() const
+{
+  return d_damping;
+}
+
+float
+gr_pfb_clock_sync_ccf::get_alpha() const
+{
+  return d_alpha;
+}
+
+float
+gr_pfb_clock_sync_ccf::get_beta() const
+{
+  return d_beta;
+}
+
+float
+gr_pfb_clock_sync_ccf::get_clock_rate() const
+{
+  return d_rate_f;
+}
+
+/*******************************************************************
+*******************************************************************/
+
+void
+gr_pfb_clock_sync_ccf::update_gains()
+{
+  float denom = (1.0 + 2.0*d_damping*d_loop_bw + d_loop_bw*d_loop_bw);
+  d_alpha = (4*d_damping*d_loop_bw) / denom;
+  d_beta = (4*d_loop_bw*d_loop_bw) / denom;
+}
+
+
 void
 gr_pfb_clock_sync_ccf::set_taps (const std::vector<float> &newtaps,
 				 std::vector< std::vector<float> > &ourtaps,
@@ -127,13 +229,16 @@ gr_pfb_clock_sync_ccf::set_taps (const std::vector<float> &newtaps,
   // Partition the filter
   for(i = 0; i < d_nfilters; i++) {
     // Each channel uses all d_taps_per_filter with 0's if not enough taps to fill out
-    ourtaps[d_nfilters-1-i] = std::vector<float>(d_taps_per_filter, 0);
+    //ourtaps[d_nfilters-1-i] = std::vector<float>(d_taps_per_filter, 0);
+    ourtaps[i] = std::vector<float>(d_taps_per_filter, 0);
     for(j = 0; j < d_taps_per_filter; j++) {
-      ourtaps[d_nfilters - 1 - i][j] = tmp_taps[i + j*d_nfilters];
+      //ourtaps[d_nfilters - 1 - i][j] = tmp_taps[i + j*d_nfilters];
+      ourtaps[i][j] = tmp_taps[i + j*d_nfilters];
     }
     
     // Build a filter for each channel and add it's taps to it
-    ourfilter[i]->set_taps(ourtaps[d_nfilters-1-i]);
+    //ourfilter[i]->set_taps(ourtaps[d_nfilters-1-i]);
+    ourfilter[i]->set_taps(ourtaps[i]);
   }
 
   // Set the history to ensure enough input items for each filter
@@ -146,58 +251,84 @@ void
 gr_pfb_clock_sync_ccf::create_diff_taps(const std::vector<float> &newtaps,
 					std::vector<float> &difftaps)
 {
-  float maxtap = 1e-20;
-  difftaps.clear();
-  difftaps.push_back(0); //newtaps[0]);
-  for(unsigned int i = 1; i < newtaps.size()-1; i++) {
-    float tap = newtaps[i+1] - newtaps[i-1];
-    difftaps.push_back(tap);
-    if(tap > maxtap) {
-      maxtap = tap;
+  std::vector<float> diff_filter(3);
+  diff_filter[0] = -1;
+  diff_filter[1] = 0;
+  diff_filter[2] = 1;
+
+  float pwr = 0;
+  difftaps.push_back(0);
+  for(unsigned int i = 0; i < newtaps.size()-2; i++) {
+    float tap = 0;
+    for(int j = 0; j < 3; j++) {
+      tap += diff_filter[j]*newtaps[i+j];
+      pwr += fabsf(tap);
     }
+    difftaps.push_back(tap);
   }
-  difftaps.push_back(0);//-newtaps[newtaps.size()-1]);
+  difftaps.push_back(0);
 
-  // Scale the differential taps; helps scale error term to better update state
-  // FIXME: should this be scaled this way or use the same gain as the taps?
   for(unsigned int i = 0; i < difftaps.size(); i++) {
-    difftaps[i] /= maxtap;
+    difftaps[i] *= pwr;
   }
 }
 
-void
-gr_pfb_clock_sync_ccf::print_taps()
+std::string
+gr_pfb_clock_sync_ccf::get_taps_as_string()
 {
   int i, j;
-  printf("[ ");
+  std::stringstream str;
+  str.precision(4);
+  str.setf(std::ios::scientific);
+
+  str << "[ ";
   for(i = 0; i < d_nfilters; i++) {
-    printf("[%.4e, ", d_taps[i][0]);
+    str << "[" << d_taps[i][0] << ", ";
     for(j = 1; j < d_taps_per_filter-1; j++) {
-      printf("%.4e,", d_taps[i][j]);
+      str << d_taps[i][j] << ", ";
     }
-    printf("%.4e],", d_taps[i][j]);
+    str << d_taps[i][j] << "],";
   }
-  printf(" ]\n");
+  str << " ]" << std::endl;
+  
+  return str.str();
 }
 
-void
-gr_pfb_clock_sync_ccf::print_diff_taps()
+std::string
+gr_pfb_clock_sync_ccf::get_diff_taps_as_string()
 {
   int i, j;
-  printf("[ ");
+  std::stringstream str;
+  str.precision(4);
+  str.setf(std::ios::scientific);
+
+  str << "[ ";
   for(i = 0; i < d_nfilters; i++) {
-    printf("[%.4e, ", d_dtaps[i][0]);
+    str << "[" << d_dtaps[i][0] << ", ";
     for(j = 1; j < d_taps_per_filter-1; j++) {
-      printf("%.4e,", d_dtaps[i][j]);
+      str << d_dtaps[i][j] << ", ";
     }
-    printf("%.4e],", d_dtaps[i][j]);
+    str << d_dtaps[i][j] << "],";
   }
-  printf(" ]\n");
+  str << " ]" << std::endl;
+
+  return str.str();
 }
 
+std::vector< std::vector<float> > 
+gr_pfb_clock_sync_ccf::get_taps()
+{
+  return d_taps;
+}
+
+std::vector< std::vector<float> > 
+gr_pfb_clock_sync_ccf::get_diff_taps()
+{
+  return d_dtaps;
+}
 
 std::vector<float>
-gr_pfb_clock_sync_ccf::channel_taps(int channel)
+gr_pfb_clock_sync_ccf::get_channel_taps(int channel)
 {
   std::vector<float> taps;
   for(int i = 0; i < d_taps_per_filter; i++) {
@@ -207,7 +338,7 @@ gr_pfb_clock_sync_ccf::channel_taps(int channel)
 }
 
 std::vector<float>
-gr_pfb_clock_sync_ccf::diff_channel_taps(int channel)
+gr_pfb_clock_sync_ccf::get_diff_channel_taps(int channel)
 {
   std::vector<float> taps;
   for(int i = 0; i < d_taps_per_filter; i++) {
@@ -226,7 +357,7 @@ gr_pfb_clock_sync_ccf::general_work (int noutput_items,
   gr_complex *in = (gr_complex *) input_items[0];
   gr_complex *out = (gr_complex *) output_items[0];
 
-  float *err = 0, *outrate = 0, *outk = 0;
+  float *err = NULL, *outrate = NULL, *outk = NULL;
   if(output_items.size() == 4) {
     err = (float *) output_items[1];
     outrate = (float*)output_items[2];
@@ -239,50 +370,56 @@ gr_pfb_clock_sync_ccf::general_work (int noutput_items,
   }
 
   // We need this many to process one output
-  int nrequired = ninput_items[0] - d_taps_per_filter;
+  int nrequired = ninput_items[0] - d_taps_per_filter - d_osps;
 
   int i = 0, count = 0;
-  float error, error_r, error_i;
+  float error_r, error_i;
 
   // produce output as long as we can and there are enough input samples
-  while((i < noutput_items) && (count < nrequired)) {
-    d_filtnum = (int)floor(d_k);
-
-    // Keep the current filter number in [0, d_nfilters]
-    // If we've run beyond the last filter, wrap around and go to next sample
-    // If we've go below 0, wrap around and go to previous sample
-    while(d_filtnum >= d_nfilters) {
-      d_k -= d_nfilters;
-      d_filtnum -= d_nfilters;
-      count += 1;
-    }
-    while(d_filtnum < 0) {
-      d_k += d_nfilters;
-      d_filtnum += d_nfilters;
-      count -= 1;
+  while((i < noutput_items-d_osps) && (count < nrequired)) {
+    for(int k = 0; k < d_osps; k++) {
+      d_filtnum = (int)floor(d_k);
+      
+      // Keep the current filter number in [0, d_nfilters]
+      // If we've run beyond the last filter, wrap around and go to next sample
+      // If we've go below 0, wrap around and go to previous sample
+      while(d_filtnum >= d_nfilters) {
+	d_k -= d_nfilters;
+	d_filtnum -= d_nfilters;
+	count += 1;
+      }
+      while(d_filtnum < 0) {
+	d_k += d_nfilters;
+	d_filtnum += d_nfilters;
+	count -= 1;
+      }
+      
+      out[i+k] = d_filters[d_filtnum]->filter(&in[count+k]);
+      d_k = d_k + d_rate_i + d_rate_f; // update phase
+
+      if(output_items.size() == 4) {
+	err[i] = d_error;
+	outrate[i] = d_rate_f;
+	outk[i] = d_k;
+      }
     }
 
-    out[i] = d_filters[d_filtnum]->filter(&in[count]);
+    // Update the phase and rate estimates for this symbol
     gr_complex diff = d_diff_filters[d_filtnum]->filter(&in[count]);
-    error_r  = out[i].real() * diff.real();
-    error_i  = out[i].imag() * diff.imag();
-    error = (error_i + error_r) / 2.0;       // average error from I&Q channel
-
-    // Run the control loop to update the current phase (k) and tracking rate
-    d_k = d_k + d_alpha*error + d_rate_i + d_rate_f;
-    d_rate_f = d_rate_f + d_beta*error;
+    error_r = out[i].real() * diff.real();
+    error_i = out[i].imag() * diff.imag();
+    d_error = (error_i + error_r) / 2.0;       // average error from I&Q channel
+    
+    // Run the control loop to update the current phase (k) and
+    // tracking rate estimates based on the error value
+    d_rate_f = d_rate_f + d_beta*d_error;
+    d_k = d_k + d_alpha*d_error; 
     
     // Keep our rate within a good range
     d_rate_f = gr_branchless_clip(d_rate_f, d_max_dev);
 
-    i++;
+    i+=d_osps;
     count += (int)floor(d_sps);
-
-    if(output_items.size() == 4) {
-      err[i] = error;
-      outrate[i] = d_rate_f;
-      outk[i] = d_k;
-    }
   }
   consume_each(count);
 
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
index 684ac85ce..514f580ba 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
@@ -24,15 +24,17 @@
 #ifndef INCLUDED_GR_PFB_CLOCK_SYNC_CCF_H
 #define	INCLUDED_GR_PFB_CLOCK_SYNC_CCF_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 class gr_pfb_clock_sync_ccf;
 typedef boost::shared_ptr<gr_pfb_clock_sync_ccf> gr_pfb_clock_sync_ccf_sptr;
-gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, float gain,
+GR_CORE_API gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, float loop_bw,
 						       const std::vector<float> &taps,
 						       unsigned int filter_size=32,
 						       float init_phase=0,
-						       float max_rate_deviation=1.5);
+						       float max_rate_deviation=1.5,
+						       int osps=1);
 
 class gr_fir_ccf;
 
@@ -42,126 +44,158 @@ class gr_fir_ccf;
  * \brief Timing synchronizer using polyphase filterbanks
  *
  * \ingroup filter_blk
+ * \ingroup pfb_blk
  * 
- * This block performs timing synchronization for PAM signals by minimizing the
- * derivative of the filtered signal, which in turn maximizes the SNR and 
- * minimizes ISI.
+ * This block performs timing synchronization for PAM signals by
+ * minimizing the derivative of the filtered signal, which in turn
+ * maximizes the SNR and minimizes ISI.
  *
- * This approach works by setting up two filterbanks; one filterbanke contains the 
- * signal's pulse shaping matched filter (such as a root raised cosine filter),
- * where each branch of the filterbank contains a different phase of the filter.
- * The second filterbank contains the derivatives of the filters in the first 
- * filterbank. Thinking of this in the time domain, the first filterbank contains
- * filters that have a sinc shape to them. We want to align the output signal to
- * be sampled at exactly the peak of the sinc shape. The derivative of the sinc
- * contains a zero at the maximum point of the sinc (sinc(0) = 1, sinc(0)' = 0).
- * Furthermore, the region around the zero point is relatively linear. We make
- * use of this fact to generate the error signal.
+ * This approach works by setting up two filterbanks; one filterbank
+ * contains the signal's pulse shaping matched filter (such as a root
+ * raised cosine filter), where each branch of the filterbank contains
+ * a different phase of the filter.  The second filterbank contains
+ * the derivatives of the filters in the first filterbank. Thinking of
+ * this in the time domain, the first filterbank contains filters that
+ * have a sinc shape to them. We want to align the output signal to be
+ * sampled at exactly the peak of the sinc shape. The derivative of
+ * the sinc contains a zero at the maximum point of the sinc (sinc(0)
+ * = 1, sinc(0)' = 0).  Furthermore, the region around the zero point
+ * is relatively linear. We make use of this fact to generate the
+ * error signal.
  *
- * If the signal out of the derivative filters is d_i[n] for the ith filter, and
- * the output of the matched filter is x_i[n], we calculate the error as:
- *    e[n] = (Re{x_i[n]} * Re{d_i[n]} + Im{x_i[n]} * Im{d_i[n]}) / 2.0
- * This equation averages the error in the real and imaginary parts. There are two
- * reasons we multiply by the signal itself. First, if the symbol could be positive
- * or negative going, but we want the error term to always tell us to go in the 
- * same direction depending on which side of the zero point we are on. The sign of
- * x_i[n] adjusts the error term to do this. Second, the magnitude of x_i[n] scales
- * the error term depending on the symbol's amplitude, so larger signals give us
- * a stronger error term because we have more confidence in that symbol's value.
- * Using the magnitude of x_i[n] instead of just the sign is especially good for
- * signals with low SNR.
+ * If the signal out of the derivative filters is d_i[n] for the ith
+ * filter, and the output of the matched filter is x_i[n], we
+ * calculate the error as: e[n] = (Re{x_i[n]} * Re{d_i[n]} +
+ * Im{x_i[n]} * Im{d_i[n]}) / 2.0 This equation averages the error in
+ * the real and imaginary parts. There are two reasons we multiply by
+ * the signal itself. First, if the symbol could be positive or
+ * negative going, but we want the error term to always tell us to go
+ * in the same direction depending on which side of the zero point we
+ * are on. The sign of x_i[n] adjusts the error term to do
+ * this. Second, the magnitude of x_i[n] scales the error term
+ * depending on the symbol's amplitude, so larger signals give us a
+ * stronger error term because we have more confidence in that
+ * symbol's value.  Using the magnitude of x_i[n] instead of just the
+ * sign is especially good for signals with low SNR.
  *
- * The error signal, e[n], gives us a value proportional to how far away from the zero
- * point we are in the derivative signal. We want to drive this value to zero, so we
- * set up a second order loop. We have two variables for this loop; d_k is the filter
- * number in the filterbank we are on and d_rate is the rate which we travel through
- * the filters in the steady state. That is, due to the natural clock differences between
- * the transmitter and receiver, d_rate represents that difference and would traverse
- * the filter phase paths to keep the receiver locked. Thinking of this as a second-order
- * PLL, the d_rate is the frequency and d_k is the phase. So we update d_rate and d_k
- * using the standard loop equations based on two error signals, d_alpha and d_beta.
- * We have these two values set based on each other for a critically damped system, so in
- * the block constructor, we just ask for "gain," which is d_alpha while d_beta is
- * equal to (gain^2)/4.
+ * The error signal, e[n], gives us a value proportional to how far
+ * away from the zero point we are in the derivative signal. We want
+ * to drive this value to zero, so we set up a second order loop. We
+ * have two variables for this loop; d_k is the filter number in the
+ * filterbank we are on and d_rate is the rate which we travel through
+ * the filters in the steady state. That is, due to the natural clock
+ * differences between the transmitter and receiver, d_rate represents
+ * that difference and would traverse the filter phase paths to keep
+ * the receiver locked. Thinking of this as a second-order PLL, the
+ * d_rate is the frequency and d_k is the phase. So we update d_rate
+ * and d_k using the standard loop equations based on two error
+ * signals, d_alpha and d_beta.  We have these two values set based on
+ * each other for a critically damped system, so in the block
+ * constructor, we just ask for "gain," which is d_alpha while d_beta
+ * is equal to (gain^2)/4.
  *
- * The clock sync block needs to know the number of samples per symbol (sps), because it
- * only returns a single point representing the sample. The sps can be any positive real
- * number and does not need to be an integer. The filter taps must also be specified. The
- * taps are generated by first conceiving of the prototype filter that would be the signal's
- * matched filter. Then interpolate this by the number of filters in the filterbank. These
- * are then distributed among all of the filters. So if the prototype filter was to have
- * 45 taps in it, then each path of the filterbank will also have 45 taps. This is easily
- * done by building the filter with the sample rate multiplied by the number of filters
- * to use.
+ * The clock sync block needs to know the number of samples per symbol
+ * (sps), because it only returns a single point representing the
+ * symbol. The sps can be any positive real number and does not need
+ * to be an integer. The filter taps must also be specified. The taps
+ * are generated by first conceiving of the prototype filter that
+ * would be the signal's matched filter. Then interpolate this by the
+ * number of filters in the filterbank. These are then distributed
+ * among all of the filters. So if the prototype filter was to have 45
+ * taps in it, then each path of the filterbank will also have 45
+ * taps. This is easily done by building the filter with the sample
+ * rate multiplied by the number of filters to use.
  *
- * The number of filters can also be set and defaults to 32. With 32 filters, you get a
- * good enough resolution in the phase to produce very small, almost unnoticeable, ISI.
- * Going to 64 filters can reduce this more, but after that there is very little gained
- * for the extra complexity.
+ * The number of filters can also be set and defaults to 32. With 32
+ * filters, you get a good enough resolution in the phase to produce
+ * very small, almost unnoticeable, ISI.  Going to 64 filters can
+ * reduce this more, but after that there is very little gained for
+ * the extra complexity.
  *
- * The initial phase is another settable parameter and refers to the filter path the
- * algorithm initially looks at (i.e., d_k starts at init_phase). This value defaults 
- * to zero, but it might be useful to start at a different phase offset, such as the mid-
- * point of the filters.
+ * The initial phase is another settable parameter and refers to the
+ * filter path the algorithm initially looks at (i.e., d_k starts at
+ * init_phase). This value defaults to zero, but it might be useful to
+ * start at a different phase offset, such as the mid- point of the
+ * filters.
  *
- * The final parameter is the max_rate_devitation, which defaults to 1.5. This is how far
- * we allow d_rate to swing, positive or negative, from 0. Constraining the rate can help
- * keep the algorithm from walking too far away to lock during times when there is no signal.
+ * The final parameter is the max_rate_devitation, which defaults to
+ * 1.5. This is how far we allow d_rate to swing, positive or
+ * negative, from 0. Constraining the rate can help keep the algorithm
+ * from walking too far away to lock during times when there is no
+ * signal.
  *
  */
 
-class gr_pfb_clock_sync_ccf : public gr_block
+class GR_CORE_API gr_pfb_clock_sync_ccf : public gr_block
 {
  private:
   /*!
    * Build the polyphase filterbank timing synchronizer.
    * \param sps (double) The number of samples per symbol in the incoming signal
-   * \param gain (float) The alpha gain of the control loop; beta = (gain^2)/4 by default.
+   * \param loop_bw (float) The bandwidth of the control loop; set's alpha and beta.
    * \param taps (vector<int>) The filter taps.
    * \param filter_size (uint) The number of filters in the filterbank (default = 32).
    * \param init_phase (float) The initial phase to look at, or which filter to start 
    *                           with (default = 0).
    * \param max_rate_deviation (float) Distance from 0 d_rate can get (default = 1.5).
+   * \param osps (int) The number of output samples per symbol (default=1).
    *
    */
-  friend gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, float gain,
+  friend GR_CORE_API gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, float loop_bw,
 								const std::vector<float> &taps,
 								unsigned int filter_size,
 								float init_phase,
-								float max_rate_deviation);
-
-  bool			   d_updated;
-  double                   d_sps;
-  double                   d_sample_num;
-  float                    d_alpha;
-  float                    d_beta;
-  int                      d_nfilters;
-  std::vector<gr_fir_ccf*> d_filters;
-  std::vector<gr_fir_ccf*> d_diff_filters;
+								float max_rate_deviation,
+								int osps);
+
+  bool			            d_updated;
+  double                            d_sps;
+  double                            d_sample_num;
+  float                             d_loop_bw;
+  float                             d_damping;
+  float                             d_alpha;
+  float                             d_beta;
+
+  int                               d_nfilters;
+  int                               d_taps_per_filter;
+  std::vector<gr_fir_ccf*>          d_filters;
+  std::vector<gr_fir_ccf*>          d_diff_filters;
   std::vector< std::vector<float> > d_taps;
   std::vector< std::vector<float> > d_dtaps;
-  float                    d_k;
-  float                    d_rate;
-  float                    d_rate_i;
-  float                    d_rate_f;
-  float                    d_max_dev;
-  int                      d_filtnum;
-  int                      d_taps_per_filter;
+
+  float                             d_k;
+  float                             d_rate;
+  float                             d_rate_i;
+  float                             d_rate_f;
+  float                             d_max_dev;
+  int                               d_filtnum;
+  int                               d_osps;
+  float                             d_error;
 
   /*!
    * Build the polyphase filterbank timing synchronizer.
    */
-  gr_pfb_clock_sync_ccf (double sps, float gain,
+  gr_pfb_clock_sync_ccf (double sps, float loop_bw,
 			 const std::vector<float> &taps,
 			 unsigned int filter_size,
 			 float init_phase,
-			 float max_rate_deviation);
+			 float max_rate_deviation,
+			 int osps);
   
   void create_diff_taps(const std::vector<float> &newtaps,
 			std::vector<float> &difftaps);
 
 public:
   ~gr_pfb_clock_sync_ccf ();
+
+  /*! \brief update the system gains from omega and eta
+   *
+   *  This function updates the system gains based on the loop
+   *  bandwidth and damping factor of the system.
+   *  These two factors can be set separately through their own
+   *  set functions.
+   */
+  void update_gains();
   
   /*!
    * Resets the filterbank's filter taps with the new prototype filter
@@ -171,40 +205,97 @@ public:
 		 std::vector<gr_fir_ccf*> &ourfilter);
 
   /*!
-   * Returns the taps of the matched filter
+   * Returns all of the taps of the matched filter
    */
-  std::vector<float> channel_taps(int channel);
+  std::vector< std::vector<float> > get_taps();
 
   /*!
-   * Returns the taps in the derivative filter
+   * Returns all of the taps of the derivative filter
    */
-  std::vector<float> diff_channel_taps(int channel);
+  std::vector< std::vector<float> > get_diff_taps();
 
   /*!
-   * Print all of the filterbank taps to screen.
+   * Returns the taps of the matched filter for a particular channel
    */
-  void print_taps();
+  std::vector<float> get_channel_taps(int channel);
 
   /*!
-   * Print all of the filterbank taps of the derivative filter to screen.
+   * Returns the taps in the derivative filter for a particular channel
    */
-  void print_diff_taps();
+  std::vector<float> get_diff_channel_taps(int channel);
 
   /*!
-   * Set the gain value alpha for the control loop
-   */  
-  void set_alpha(float alpha)
-  {
-    d_alpha = alpha;
-  }
+   * Return the taps as a formatted string for printing
+   */
+  std::string get_taps_as_string();
 
   /*!
-   * Set the gain value beta for the control loop
-   */  
-  void set_beta(float beta)
-  {
-    d_beta = beta;
-  }
+   * Return the derivative filter taps as a formatted string for printing
+   */
+  std::string get_diff_taps_as_string();
+
+
+  /*******************************************************************
+    SET FUNCTIONS
+  *******************************************************************/
+  
+
+  /*!
+   * \brief Set the loop bandwidth
+   *
+   * Set the loop filter's bandwidth to \p bw. This should be between 
+   * 2*pi/200 and 2*pi/100  (in rads/samp). It must also be a positive
+   * number.
+   *
+   * When a new damping factor is set, the gains, alpha and beta, of the loop
+   * are recalculated by a call to update_gains().
+   *
+   * \param bw    (float) new bandwidth
+   *
+   */
+  void set_loop_bandwidth(float bw);
+
+  /*!
+   * \brief Set the loop damping factor
+   *
+   * Set the loop filter's damping factor to \p df. The damping factor
+   * should be sqrt(2)/2.0 for critically damped systems.
+   * Set it to anything else only if you know what you are doing. It must
+   * be a number between 0 and 1.
+   *
+   * When a new damping factor is set, the gains, alpha and beta, of the loop
+   * are recalculated by a call to update_gains().
+   *
+   * \param df    (float) new damping factor
+   *
+   */
+  void set_damping_factor(float df);
+
+  /*!
+   * \brief Set the loop gain alpha
+   *
+   * Set's the loop filter's alpha gain parameter.
+   *
+   * This value should really only be set by adjusting the loop bandwidth
+   * and damping factor.
+   *
+   * \param alpha    (float) new alpha gain
+   *
+   */
+  void set_alpha(float alpha);
+
+  /*!
+   * \brief Set the loop gain beta
+   *
+   * Set's the loop filter's beta gain parameter.
+   *
+   * This value should really only be set by adjusting the loop bandwidth
+   * and damping factor.
+   *
+   * \param beta    (float) new beta gain
+   *
+   */
+  void set_beta(float beta);
 
   /*!
    * Set the maximum deviation from 0 d_rate can have
@@ -214,6 +305,38 @@ public:
     d_max_dev = m;
   }
   
+  /*******************************************************************
+    GET FUNCTIONS
+  *******************************************************************/
+
+  /*!
+   * \brief Returns the loop bandwidth
+   */
+  float get_loop_bandwidth() const;
+
+  /*!
+   * \brief Returns the loop damping factor
+   */
+  float get_damping_factor() const;
+
+  /*!
+   * \brief Returns the loop gain alpha
+   */
+  float get_alpha() const;
+
+  /*!
+   * \brief Returns the loop gain beta
+   */
+  float get_beta() const;
+
+  /*!
+   * \brief Returns the current clock rate
+   */
+  float get_clock_rate() const;
+
+  /*******************************************************************
+  *******************************************************************/
+
   bool check_topology(int ninputs, int noutputs);
 
   int general_work (int noutput_items,
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.i b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.i
index 197984287..92ad1661a 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.i
+++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.i
@@ -22,20 +22,22 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,pfb_clock_sync_ccf);
 
-gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, float gain,
+gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, float loop_bw,
 						       const std::vector<float> &taps,
 						       unsigned int filter_size=32,
 						       float init_phase=0,
-						       float max_rate_deviation=1.5);
+						       float max_rate_deviation=1.5,
+						       int osps=1);
 
 class gr_pfb_clock_sync_ccf : public gr_block
 {
  private:
-  gr_pfb_clock_sync_ccf (double sps, float gain,
+  gr_pfb_clock_sync_ccf (double sps, float loop_bw,
 			 const std::vector<float> &taps,
 			 unsigned int filter_size,
 			 float init_phase,
-			 float max_rate_deviation);
+			 float max_rate_deviation,
+			 int osps);
 
  public:
   ~gr_pfb_clock_sync_ccf ();
@@ -44,11 +46,22 @@ class gr_pfb_clock_sync_ccf : public gr_block
 		 std::vector< std::vector<float> > &ourtaps,
 		 std::vector<gr_fir_ccf*> &ourfilter);
 
-  std::vector<float> channel_taps(int channel);
-  std::vector<float> diff_channel_taps(int channel);
-  void print_taps();
-  void print_diff_taps();
+  std::vector< std::vector<float> > get_taps();
+  std::vector< std::vector<float> > get_diff_taps();
+  std::vector<float> get_channel_taps(int channel);
+  std::vector<float> get_diff_channel_taps(int channel);
+  std::string get_taps_as_string();
+  std::string get_diff_taps_as_string();
+
+  void set_loop_bandwidth(float bw);
+  void set_damping_factor(float df);
   void set_alpha(float alpha);
   void set_beta(float beta);
   void set_max_rate_deviation(float m);
+
+  float get_loop_bandwidth() const;
+  float get_damping_factor() const;
+  float get_alpha() const;
+  float get_beta() const;
+  float get_clock_rate() const;
 };
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_fff.h b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_fff.h
index fa1279a7c..447d3e59d 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_fff.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_fff.h
@@ -24,11 +24,12 @@
 #ifndef INCLUDED_GR_PFB_CLOCK_SYNC_FFF_H
 #define	INCLUDED_GR_PFB_CLOCK_SYNC_FFF_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 class gr_pfb_clock_sync_fff;
 typedef boost::shared_ptr<gr_pfb_clock_sync_fff> gr_pfb_clock_sync_fff_sptr;
-gr_pfb_clock_sync_fff_sptr gr_make_pfb_clock_sync_fff (double sps, float gain,
+GR_CORE_API gr_pfb_clock_sync_fff_sptr gr_make_pfb_clock_sync_fff (double sps, float gain,
 						       const std::vector<float> &taps,
 						       unsigned int filter_size=32,
 						       float init_phase=0,
@@ -42,75 +43,89 @@ class gr_fir_fff;
  * \brief Timing synchronizer using polyphase filterbanks
  *
  * \ingroup filter_blk
+ * \ingroup pfb_blk
  * 
- * This block performs timing synchronization for PAM signals by minimizing the
- * derivative of the filtered signal, which in turn maximizes the SNR and 
- * minimizes ISI.
+ * This block performs timing synchronization for PAM signals by
+ * minimizing the derivative of the filtered signal, which in turn
+ * maximizes the SNR and minimizes ISI.
  *
- * This approach works by setting up two filterbanks; one filterbanke contains the 
- * signal's pulse shaping matched filter (such as a root raised cosine filter),
- * where each branch of the filterbank contains a different phase of the filter.
- * The second filterbank contains the derivatives of the filters in the first 
- * filterbank. Thinking of this in the time domain, the first filterbank contains
- * filters that have a sinc shape to them. We want to align the output signal to
- * be sampled at exactly the peak of the sinc shape. The derivative of the sinc
- * contains a zero at the maximum point of the sinc (sinc(0) = 1, sinc(0)' = 0).
- * Furthermore, the region around the zero point is relatively linear. We make
- * use of this fact to generate the error signal.
+ * This approach works by setting up two filterbanks; one filterbanke
+ * contains the signal's pulse shaping matched filter (such as a root
+ * raised cosine filter), where each branch of the filterbank contains
+ * a different phase of the filter.  The second filterbank contains
+ * the derivatives of the filters in the first filterbank. Thinking of
+ * this in the time domain, the first filterbank contains filters that
+ * have a sinc shape to them. We want to align the output signal to be
+ * sampled at exactly the peak of the sinc shape. The derivative of
+ * the sinc contains a zero at the maximum point of the sinc (sinc(0)
+ * = 1, sinc(0)' = 0).  Furthermore, the region around the zero point
+ * is relatively linear. We make use of this fact to generate the
+ * error signal.
  *
- * If the signal out of the derivative filters is d_i[n] for the ith filter, and
- * the output of the matched filter is x_i[n], we calculate the error as:
- *    e[n] = (Re{x_i[n]} * Re{d_i[n]} + Im{x_i[n]} * Im{d_i[n]}) / 2.0
- * This equation averages the error in the real and imaginary parts. There are two
- * reasons we multiply by the signal itself. First, if the symbol could be positive
- * or negative going, but we want the error term to always tell us to go in the 
- * same direction depending on which side of the zero point we are on. The sign of
- * x_i[n] adjusts the error term to do this. Second, the magnitude of x_i[n] scales
- * the error term depending on the symbol's amplitude, so larger signals give us
- * a stronger error term because we have more confidence in that symbol's value.
- * Using the magnitude of x_i[n] instead of just the sign is especially good for
- * signals with low SNR.
+ * If the signal out of the derivative filters is d_i[n] for the ith
+ * filter, and the output of the matched filter is x_i[n], we
+ * calculate the error as: e[n] = (Re{x_i[n]} * Re{d_i[n]} +
+ * Im{x_i[n]} * Im{d_i[n]}) / 2.0 This equation averages the error in
+ * the real and imaginary parts. There are two reasons we multiply by
+ * the signal itself. First, if the symbol could be positive or
+ * negative going, but we want the error term to always tell us to go
+ * in the same direction depending on which side of the zero point we
+ * are on. The sign of x_i[n] adjusts the error term to do
+ * this. Second, the magnitude of x_i[n] scales the error term
+ * depending on the symbol's amplitude, so larger signals give us a
+ * stronger error term because we have more confidence in that
+ * symbol's value.  Using the magnitude of x_i[n] instead of just the
+ * sign is especially good for signals with low SNR.
  *
- * The error signal, e[n], gives us a value proportional to how far away from the zero
- * point we are in the derivative signal. We want to drive this value to zero, so we
- * set up a second order loop. We have two variables for this loop; d_k is the filter
- * number in the filterbank we are on and d_rate is the rate which we travel through
- * the filters in the steady state. That is, due to the natural clock differences between
- * the transmitter and receiver, d_rate represents that difference and would traverse
- * the filter phase paths to keep the receiver locked. Thinking of this as a second-order
- * PLL, the d_rate is the frequency and d_k is the phase. So we update d_rate and d_k
- * using the standard loop equations based on two error signals, d_alpha and d_beta.
- * We have these two values set based on each other for a critically damped system, so in
- * the block constructor, we just ask for "gain," which is d_alpha while d_beta is
- * equal to (gain^2)/4.
+ * The error signal, e[n], gives us a value proportional to how far
+ * away from the zero point we are in the derivative signal. We want
+ * to drive this value to zero, so we set up a second order loop. We
+ * have two variables for this loop; d_k is the filter number in the
+ * filterbank we are on and d_rate is the rate which we travel through
+ * the filters in the steady state. That is, due to the natural clock
+ * differences between the transmitter and receiver, d_rate represents
+ * that difference and would traverse the filter phase paths to keep
+ * the receiver locked. Thinking of this as a second-order PLL, the
+ * d_rate is the frequency and d_k is the phase. So we update d_rate
+ * and d_k using the standard loop equations based on two error
+ * signals, d_alpha and d_beta.  We have these two values set based on
+ * each other for a critically damped system, so in the block
+ * constructor, we just ask for "gain," which is d_alpha while d_beta
+ * is equal to (gain^2)/4.
  *
- * The clock sync block needs to know the number of samples per second (sps), because it
- * only returns a single point representing the sample. The sps can be any positive real
- * number and does not need to be an integer. The filter taps must also be specified. The
- * taps are generated by first conceiving of the prototype filter that would be the signal's
- * matched filter. Then interpolate this by the number of filters in the filterbank. These
- * are then distributed among all of the filters. So if the prototype filter was to have
- * 45 taps in it, then each path of the filterbank will also have 45 taps. This is easily
- * done by building the filter with the sample rate multiplied by the number of filters
- * to use.
+ * The clock sync block needs to know the number of samples per second
+ * (sps), because it only returns a single point representing the
+ * sample. The sps can be any positive real number and does not need
+ * to be an integer. The filter taps must also be specified. The taps
+ * are generated by first conceiving of the prototype filter that
+ * would be the signal's matched filter. Then interpolate this by the
+ * number of filters in the filterbank. These are then distributed
+ * among all of the filters. So if the prototype filter was to have 45
+ * taps in it, then each path of the filterbank will also have 45
+ * taps. This is easily done by building the filter with the sample
+ * rate multiplied by the number of filters to use.
  *
- * The number of filters can also be set and defaults to 32. With 32 filters, you get a
- * good enough resolution in the phase to produce very small, almost unnoticeable, ISI.
- * Going to 64 filters can reduce this more, but after that there is very little gained
- * for the extra complexity.
+ * The number of filters can also be set and defaults to 32. With 32
+ * filters, you get a good enough resolution in the phase to produce
+ * very small, almost unnoticeable, ISI.  Going to 64 filters can
+ * reduce this more, but after that there is very little gained for
+ * the extra complexity.
  *
- * The initial phase is another settable parameter and refers to the filter path the
- * algorithm initially looks at (i.e., d_k starts at init_phase). This value defaults 
- * to zero, but it might be useful to start at a different phase offset, such as the mid-
- * point of the filters.
+ * The initial phase is another settable parameter and refers to the
+ * filter path the algorithm initially looks at (i.e., d_k starts at
+ * init_phase). This value defaults to zero, but it might be useful to
+ * start at a different phase offset, such as the mid- point of the
+ * filters.
  *
- * The final parameter is the max_rate_devitation, which defaults to 1.5. This is how far
- * we allow d_rate to swing, positive or negative, from 0. Constraining the rate can help
- * keep the algorithm from walking too far away to lock during times when there is no signal.
+ * The final parameter is the max_rate_devitation, which defaults to
+ * 1.5. This is how far we allow d_rate to swing, positive or
+ * negative, from 0. Constraining the rate can help keep the algorithm
+ * from walking too far away to lock during times when there is no
+ * signal.
  *
  */
 
-class gr_pfb_clock_sync_fff : public gr_block
+class GR_CORE_API gr_pfb_clock_sync_fff : public gr_block
 {
  private:
   /*!
@@ -124,7 +139,7 @@ class gr_pfb_clock_sync_fff : public gr_block
    * \param max_rate_deviation (float) Distance from 0 d_rate can get (default = 1.5).
    *
    */
-  friend gr_pfb_clock_sync_fff_sptr gr_make_pfb_clock_sync_fff (double sps, float gain,
+  friend GR_CORE_API gr_pfb_clock_sync_fff_sptr gr_make_pfb_clock_sync_fff (double sps, float gain,
 								const std::vector<float> &taps,
 								unsigned int filter_size,
 								float init_phase,
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h
index 200adee3d..0ae054685 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h
@@ -24,11 +24,12 @@
 #ifndef INCLUDED_GR_PFB_DECIMATOR_CCF_H
 #define	INCLUDED_GR_PFB_DECIMATOR_CCF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_pfb_decimator_ccf;
 typedef boost::shared_ptr<gr_pfb_decimator_ccf> gr_pfb_decimator_ccf_sptr;
-gr_pfb_decimator_ccf_sptr gr_make_pfb_decimator_ccf (unsigned int decim, 
+GR_CORE_API gr_pfb_decimator_ccf_sptr gr_make_pfb_decimator_ccf (unsigned int decim, 
 						     const std::vector<float> &taps,
 						     unsigned int channel=0);
 
@@ -41,6 +42,7 @@ class gri_fft_complex;
  *        input, gr_complex output and float taps
  *
  * \ingroup filter_blk
+ * \ingroup pfb_blk
  * 
  * This block takes in a signal stream and performs interger down-
  * sampling (decimation) with a polyphase filterbank. The first input
@@ -92,7 +94,7 @@ class gri_fft_complex;
  *       Systems," Upper Saddle River, NJ: Prentice Hall, Inc. 2004.</EM></B>
  */
 
-class gr_pfb_decimator_ccf : public gr_sync_block
+class GR_CORE_API gr_pfb_decimator_ccf : public gr_sync_block
 {
  private:
   /*!
@@ -101,7 +103,7 @@ class gr_pfb_decimator_ccf : public gr_sync_block
    * \param taps    (vector/list of floats) The prototype filter to populate the filterbank.
    * \param channel (unsigned integer) Selects the channel to return [default=0].
    */
-  friend gr_pfb_decimator_ccf_sptr gr_make_pfb_decimator_ccf (unsigned int decim,
+  friend GR_CORE_API gr_pfb_decimator_ccf_sptr gr_make_pfb_decimator_ccf (unsigned int decim,
 							      const std::vector<float> &taps,
 							      unsigned int channel);
 
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_interpolator_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_interpolator_ccf.h
index d2efc591a..6885881e9 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_interpolator_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_interpolator_ccf.h
@@ -24,11 +24,12 @@
 #ifndef INCLUDED_GR_PFB_INTERPOLATOR_CCF_H
 #define	INCLUDED_GR_PFB_INTERPOLATOR_CCF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_pfb_interpolator_ccf;
 typedef boost::shared_ptr<gr_pfb_interpolator_ccf> gr_pfb_interpolator_ccf_sptr;
-gr_pfb_interpolator_ccf_sptr gr_make_pfb_interpolator_ccf (unsigned int interp, 
+GR_CORE_API gr_pfb_interpolator_ccf_sptr gr_make_pfb_interpolator_ccf (unsigned int interp, 
 							   const std::vector<float> &taps);
 
 class gr_fir_ccf;
@@ -39,6 +40,7 @@ class gr_fir_ccf;
  * gr_complex output and float taps
  *
  * \ingroup filter_blk
+ * \ingroup pfb_blk
  * 
  * This block takes in a signal stream and performs interger up-
  * sampling (interpolation) with a polyphase filterbank. The first
@@ -79,7 +81,7 @@ class gr_fir_ccf;
  *       Inc. 2004.</EM></B>
  */
 
-class gr_pfb_interpolator_ccf : public gr_sync_interpolator
+class GR_CORE_API gr_pfb_interpolator_ccf : public gr_sync_interpolator
 {
  private:
   /*!
@@ -88,7 +90,7 @@ class gr_pfb_interpolator_ccf : public gr_sync_interpolator
    * \param taps    (vector/list of floats) The prototype filter to populate the filterbank. The taps
    *                                        should be generated at the interpolated sampling rate.
    */
-  friend gr_pfb_interpolator_ccf_sptr gr_make_pfb_interpolator_ccf (unsigned int interp,
+  friend GR_CORE_API gr_pfb_interpolator_ccf_sptr gr_make_pfb_interpolator_ccf (unsigned int interp,
 								    const std::vector<float> &taps);
 
   std::vector<gr_fir_ccf*> d_filters;
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.h
index f5b1cbb94..1f772b1dd 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.h
@@ -24,12 +24,13 @@
 #ifndef INCLUDED_GR_PFB_SYNTHESIS_FILTERBANK_CCF_H
 #define	INCLUDED_GR_PFB_SYNTHESIS_FILTERBANK_CCF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 #include <gri_fir_filter_with_buffer_ccf.h>
 
 class gr_pfb_synthesis_filterbank_ccf;
 typedef boost::shared_ptr<gr_pfb_synthesis_filterbank_ccf> gr_pfb_synthesis_filterbank_ccf_sptr;
-gr_pfb_synthesis_filterbank_ccf_sptr gr_make_pfb_synthesis_filterbank_ccf 
+GR_CORE_API gr_pfb_synthesis_filterbank_ccf_sptr gr_make_pfb_synthesis_filterbank_ccf 
     (unsigned int numchans, const std::vector<float> &taps);
 
 class gri_fft_complex;
@@ -42,9 +43,10 @@ class gri_fft_complex;
  *        gr_complex input, gr_complex output and float taps
  *
  * \ingroup filter_blk
+ * \ingroup pfb_blk
  */
 
-class gr_pfb_synthesis_filterbank_ccf : public gr_sync_interpolator
+class GR_CORE_API gr_pfb_synthesis_filterbank_ccf : public gr_sync_interpolator
 {
  private:
   /*!
@@ -54,7 +56,7 @@ class gr_pfb_synthesis_filterbank_ccf : public gr_sync_interpolator
    * \param taps    (vector/list of floats) The prototype filter to
                     populate the filterbank.
    */
-  friend gr_pfb_synthesis_filterbank_ccf_sptr gr_make_pfb_synthesis_filterbank_ccf 
+  friend GR_CORE_API gr_pfb_synthesis_filterbank_ccf_sptr gr_make_pfb_synthesis_filterbank_ccf 
       (unsigned int numchans, const std::vector<float> &taps);
 
   bool			   d_updated;
diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_XXX.h.t b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_XXX.h.t
index 983b350fa..8f50acc72 100644
--- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_XXX.h.t
+++ b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_XXX.h.t
@@ -29,11 +29,12 @@
 #ifndef @GUARD_NAME@
 #define	@GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
-@SPTR_NAME@
+GR_CORE_API @SPTR_NAME@
 gr_make_@BASE_NAME@ (unsigned interpolation,
 		     unsigned decimation,
 		     const std::vector<@TAP_TYPE@> &taps);
@@ -44,7 +45,7 @@ class @FIR_TYPE@;
  * \brief Rational Resampling Polyphase FIR filter with @I_TYPE@ input, @O_TYPE@ output and @TAP_TYPE@ taps
  * \ingroup filter_blk
  */
-class @NAME@ : public gr_block
+class GR_CORE_API @NAME@ : public gr_block
 {
  private:
   unsigned 			d_history;
@@ -54,7 +55,7 @@ class @NAME@ : public gr_block
   bool				d_updated;
   std::vector<@FIR_TYPE@ *> d_firs;
 
-  friend @SPTR_NAME@ 
+  friend GR_CORE_API @SPTR_NAME@ 
   gr_make_@BASE_NAME@ (unsigned interpolation, unsigned decimation, const std::vector<@TAP_TYPE@> &taps);
 
 
diff --git a/gnuradio-core/src/lib/filter/gr_rotator.h b/gnuradio-core/src/lib/filter/gr_rotator.h
index cb8f21a40..23c7a2830 100644
--- a/gnuradio-core/src/lib/filter/gr_rotator.h
+++ b/gnuradio-core/src/lib/filter/gr_rotator.h
@@ -23,9 +23,10 @@
 #ifndef _GR_ROTATOR_H_
 #define _GR_ROTATOR_H_
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 
-class gr_rotator {
+class GR_CORE_API gr_rotator {
   gr_complex	d_phase;
   gr_complex	d_phase_incr;
   unsigned int	d_counter;
diff --git a/gnuradio-core/src/lib/filter/gr_sincos.h b/gnuradio-core/src/lib/filter/gr_sincos.h
index a8e267951..3d5c99083 100644
--- a/gnuradio-core/src/lib/filter/gr_sincos.h
+++ b/gnuradio-core/src/lib/filter/gr_sincos.h
@@ -23,14 +23,16 @@
 #ifndef INCLUDED_GR_SINCOS_H
 #define INCLUDED_GR_SINCOS_H
 
+#include <gr_core_api.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
   
 // compute sine and cosine at the same time
 
-void gr_sincos (double x, double *sin, double *cos);
-void gr_sincosf (float x, float *sin, float *cos);
+GR_CORE_API void gr_sincos (double x, double *sin, double *cos);
+GR_CORE_API void gr_sincosf (float x, float *sin, float *cos);
 
 #ifdef __cplusplus
 };
diff --git a/gnuradio-core/src/lib/filter/gr_single_pole_iir.h b/gnuradio-core/src/lib/filter/gr_single_pole_iir.h
index 8781065d4..fb52e29e9 100644
--- a/gnuradio-core/src/lib/filter/gr_single_pole_iir.h
+++ b/gnuradio-core/src/lib/filter/gr_single_pole_iir.h
@@ -22,6 +22,7 @@
 #ifndef _GR_SINGLE_POLE_IIR_H_
 #define _GR_SINGLE_POLE_IIR_H_
 
+#include <gr_core_api.h>
 #include <stdexcept>
 #include <gr_complex.h>
 /*!
diff --git a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h
index 1f1073424..3ce468db2 100644
--- a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h
+++ b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_SINGLE_POLE_IIR_FILTER_CC_H
 #define	INCLUDED_GR_SINGLE_POLE_IIR_FILTER_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_single_pole_iir.h>
 #include <gr_complex.h>
@@ -31,7 +32,7 @@
 class gr_single_pole_iir_filter_cc;
 typedef boost::shared_ptr<gr_single_pole_iir_filter_cc> gr_single_pole_iir_filter_cc_sptr;
 
-gr_single_pole_iir_filter_cc_sptr 
+GR_CORE_API gr_single_pole_iir_filter_cc_sptr 
 gr_make_single_pole_iir_filter_cc (double alpha, unsigned int vlen=1);
 
 /*!
@@ -53,10 +54,10 @@ gr_make_single_pole_iir_filter_cc (double alpha, unsigned int vlen=1);
  * Note that some texts define the system function with a + in the denominator.
  * If you're using that convention, you'll need to negate the feedback tap.
  */
-class gr_single_pole_iir_filter_cc : public gr_sync_block
+class GR_CORE_API gr_single_pole_iir_filter_cc : public gr_sync_block
 {
  private:
-  friend gr_single_pole_iir_filter_cc_sptr 
+  friend GR_CORE_API gr_single_pole_iir_filter_cc_sptr 
   gr_make_single_pole_iir_filter_cc (double alpha, unsigned int vlen);
 
   unsigned int			        		d_vlen;
diff --git a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h
index f676e94bc..d376587df 100644
--- a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h
+++ b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_SINGLE_POLE_IIR_FILTER_FF_H
 #define	INCLUDED_GR_SINGLE_POLE_IIR_FILTER_FF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_single_pole_iir.h>
 #include <stdexcept>
@@ -30,7 +31,7 @@
 class gr_single_pole_iir_filter_ff;
 typedef boost::shared_ptr<gr_single_pole_iir_filter_ff> gr_single_pole_iir_filter_ff_sptr;
 
-gr_single_pole_iir_filter_ff_sptr 
+GR_CORE_API gr_single_pole_iir_filter_ff_sptr 
 gr_make_single_pole_iir_filter_ff (double alpha, unsigned int vlen=1);
 
 /*!
@@ -52,10 +53,10 @@ gr_make_single_pole_iir_filter_ff (double alpha, unsigned int vlen=1);
  * Note that some texts define the system function with a + in the denominator.
  * If you're using that convention, you'll need to negate the feedback tap.
  */
-class gr_single_pole_iir_filter_ff : public gr_sync_block
+class GR_CORE_API gr_single_pole_iir_filter_ff : public gr_sync_block
 {
  private:
-  friend gr_single_pole_iir_filter_ff_sptr 
+  friend GR_CORE_API gr_single_pole_iir_filter_ff_sptr 
   gr_make_single_pole_iir_filter_ff (double alpha, unsigned int vlen);
 
   unsigned int			        		d_vlen;
diff --git a/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.h b/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.h
index 3cd9105c7..4db7ba50f 100644
--- a/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.h
+++ b/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GRI_FFT_FILTER_CCC_GENERIC_H
 #define INCLUDED_GRI_FFT_FILTER_CCC_GENERIC_H
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 #include <vector>
 
@@ -32,7 +33,7 @@ class gri_fft_complex;
  * \brief Fast FFT filter with gr_complex input, gr_complex output and gr_complex taps
  * \ingroup filter_blk
  */
-class gri_fft_filter_ccc_generic
+class GR_CORE_API gri_fft_filter_ccc_generic
 {
  private:
   int			   d_ntaps;
diff --git a/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_sse.h b/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_sse.h
index d1c54f01f..6c96152c0 100644
--- a/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_sse.h
+++ b/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_sse.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GRI_FFT_FILTER_CCC_SSE_H
 #define INCLUDED_GRI_FFT_FILTER_CCC_SSE_H
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 #include <vector>
 
@@ -32,7 +33,7 @@ class gri_fft_complex;
  * \brief Fast FFT filter with gr_complex input, gr_complex output and gr_complex taps
  * \ingroup filter_blk
  */
-class gri_fft_filter_ccc_sse
+class GR_CORE_API gri_fft_filter_ccc_sse
 {
  private:
   int			   d_ntaps;
diff --git a/gnuradio-core/src/lib/filter/gri_fft_filter_fff_generic.h b/gnuradio-core/src/lib/filter/gri_fft_filter_fff_generic.h
index 6c31632d5..86658043a 100644
--- a/gnuradio-core/src/lib/filter/gri_fft_filter_fff_generic.h
+++ b/gnuradio-core/src/lib/filter/gri_fft_filter_fff_generic.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GRI_FFT_FILTER_FFF_GENERIC_H
 #define INCLUDED_GRI_FFT_FILTER_FFF_GENERIC_H
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 #include <vector>
 
 class gri_fft_real_fwd;
 class gri_fft_real_rev;
 
-class gri_fft_filter_fff_generic
+class GR_CORE_API gri_fft_filter_fff_generic
 {
  private:
   int			   d_ntaps;
diff --git a/gnuradio-core/src/lib/filter/gri_fft_filter_fff_sse.h b/gnuradio-core/src/lib/filter/gri_fft_filter_fff_sse.h
index 8258bb824..bd87358e2 100644
--- a/gnuradio-core/src/lib/filter/gri_fft_filter_fff_sse.h
+++ b/gnuradio-core/src/lib/filter/gri_fft_filter_fff_sse.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GRI_FFT_FILTER_FFF_SSE_H
 #define INCLUDED_GRI_FFT_FILTER_FFF_SSE_H
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 #include <vector>
 
 class gri_fft_real_fwd;
 class gri_fft_real_rev;
 
-class gri_fft_filter_fff_sse
+class GR_CORE_API gri_fft_filter_fff_sse
 {
  private:
   int			   d_ntaps;
diff --git a/gnuradio-core/src/lib/filter/gri_fir_filter_with_buffer_XXX.h.t b/gnuradio-core/src/lib/filter/gri_fir_filter_with_buffer_XXX.h.t
index 23d64b65d..f209a8849 100644
--- a/gnuradio-core/src/lib/filter/gri_fir_filter_with_buffer_XXX.h.t
+++ b/gnuradio-core/src/lib/filter/gri_fir_filter_with_buffer_XXX.h.t
@@ -29,6 +29,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <vector>
 #include <gr_types.h>
 #include <gr_reverse.h>
@@ -42,7 +43,7 @@
  * 
  */
 
-class @NAME@ {
+class GR_CORE_API @NAME@ {
 
 protected:
   std::vector<@TAP_TYPE@>	d_taps;		// reversed taps
diff --git a/gnuradio-core/src/lib/filter/gri_goertzel.h b/gnuradio-core/src/lib/filter/gri_goertzel.h
index e062f000e..6fb64b942 100644
--- a/gnuradio-core/src/lib/filter/gri_goertzel.h
+++ b/gnuradio-core/src/lib/filter/gri_goertzel.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GRI_GOERTZEL_H
 #define INCLUDED_GRI_GOERTZEL_H
 
+#include <gr_core_api.h>
 #include <gr_types.h>
 
 /*!
  * \brief Implements Goertzel single-bin DFT calculation
  * \ingroup misc
  */
-class gri_goertzel
+class GR_CORE_API gri_goertzel
 {
 public:
   gri_goertzel() {}
diff --git a/gnuradio-core/src/lib/filter/gri_iir.h b/gnuradio-core/src/lib/filter/gri_iir.h
index 5bc67df53..ddd8f9b81 100644
--- a/gnuradio-core/src/lib/filter/gri_iir.h
+++ b/gnuradio-core/src/lib/filter/gri_iir.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GRI_IIR_H
 #define INCLUDED_GRI_IIR_H
 
+#include <gr_core_api.h>
 #include <vector>
 #include <stdexcept>
 
diff --git a/gnuradio-core/src/lib/filter/gri_mmse_fir_interpolator.h b/gnuradio-core/src/lib/filter/gri_mmse_fir_interpolator.h
index 616520ad6..b2832b3f6 100644
--- a/gnuradio-core/src/lib/filter/gri_mmse_fir_interpolator.h
+++ b/gnuradio-core/src/lib/filter/gri_mmse_fir_interpolator.h
@@ -22,6 +22,7 @@
 #ifndef _GRI_MMSE_FIR_INTERPOLATOR_H_
 #define _GRI_MMSE_FIR_INTERPOLATOR_H_
 
+#include <gr_core_api.h>
 #include <vector>
 
 class gr_fir_fff;
@@ -39,7 +40,7 @@ class gr_fir_fff;
  * method to 32nd's of a sample.
  */
 
-class gri_mmse_fir_interpolator {
+class GR_CORE_API gri_mmse_fir_interpolator {
 public:
   gri_mmse_fir_interpolator ();
   ~gri_mmse_fir_interpolator ();
diff --git a/gnuradio-core/src/lib/filter/gri_mmse_fir_interpolator_cc.h b/gnuradio-core/src/lib/filter/gri_mmse_fir_interpolator_cc.h
index daf8b19b8..2feef114b 100644
--- a/gnuradio-core/src/lib/filter/gri_mmse_fir_interpolator_cc.h
+++ b/gnuradio-core/src/lib/filter/gri_mmse_fir_interpolator_cc.h
@@ -22,6 +22,7 @@
 #ifndef _GRI_MMSE_FIR_INTERPOLATOR_CC_H_
 #define _GRI_MMSE_FIR_INTERPOLATOR_CC_H_
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 #include <vector>
 
@@ -40,7 +41,7 @@ class gr_fir_ccf;
  * method to 32nd's of a sample.
  */
 
-class gri_mmse_fir_interpolator_cc {
+class GR_CORE_API gri_mmse_fir_interpolator_cc {
 public:
   gri_mmse_fir_interpolator_cc ();
   ~gri_mmse_fir_interpolator_cc ();
diff --git a/gnuradio-core/src/lib/filter/qa_filter.h b/gnuradio-core/src/lib/filter/qa_filter.h
index a51a88238..a10782068 100644
--- a/gnuradio-core/src/lib/filter/qa_filter.h
+++ b/gnuradio-core/src/lib/filter/qa_filter.h
@@ -23,11 +23,12 @@
 #ifndef _QA_FILTER_H_
 #define _QA_FILTER_H_
 
+#include <gruel/attributes.h>
 #include <cppunit/TestSuite.h>
 
 //! collect all the tests for the gr directory
 
-class qa_filter {
+class __GR_ATTR_EXPORT qa_filter {
  public:
   //! return suite of tests for all of gr directory
   static CppUnit::TestSuite *suite ();
diff --git a/gnuradio-core/src/lib/g72x/.gitignore b/gnuradio-core/src/lib/g72x/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/gnuradio-core/src/lib/g72x/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
new file mode 100644
index 000000000..6ecaa930a
--- /dev/null
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -0,0 +1,299 @@
+# Copyright 2010-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.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+
+########################################################################
+# Handle the generated sine table
+########################################################################
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen_sine_table.py
+    COMMAND ${PYTHON_EXECUTABLE}
+        ${CMAKE_CURRENT_SOURCE_DIR}/gen_sine_table.py >
+        ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
+)
+
+include(AddFileDependencies)
+ADD_FILE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sine_table.h
+)
+
+########################################################################
+# Handle the generated constants
+########################################################################
+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+    "import time;print time.strftime('%a, %d %b %Y %H:%M:%S', time.gmtime())"
+    OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+message(STATUS "Loading build date ${BUILD_DATE} into gr_constants...")
+
+message(STATUS "Loading version ${VERSION} into gr_constants...")
+
+file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}"     SYSCONFDIR)
+file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_PKG_CONF_DIR}" GR_PREFSDIR)
+
+#double escape for windows backslash path separators
+string(REPLACE "\\" "\\\\" prefix ${prefix})
+string(REPLACE "\\" "\\\\" SYSCONFDIR ${SYSCONFDIR})
+string(REPLACE "\\" "\\\\" GR_PREFSDIR ${GR_PREFSDIR})
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.cc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc
+@ONLY)
+
+list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_BINARY_DIR}/gr_constants.cc)
+
+########################################################################
+# Append gnuradio-core library sources
+########################################################################
+list(APPEND gnuradio_core_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_circular_file.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_count_bits.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fast_atan2f.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fft_vcc_fftw.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_misc.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_random.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_reverse.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_add_const_ss_generic.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_char_to_float.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_control_loop.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_debugger_hook.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_fft.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_float_to_char.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_float_to_int.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_float_to_short.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_float_to_uchar.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_glfsr.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_interleaved_short_to_complex.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_int_to_float.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_short_to_float.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_uchar_to_float.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/malloc16.c
+)
+
+########################################################################
+# Append gnuradio-core test sources
+########################################################################
+list(APPEND test_gnuradio_core_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_general.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_circular_file.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_cpm.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_firdes.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fxpt.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fxpt_nco.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_fxpt_vco.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_math.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gri_lfsr.cc
+)
+
+########################################################################
+# Install runtime headers
+########################################################################
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_core_api.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_circular_file.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_count_bits.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_expj.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fft_vcc_fftw.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt_nco.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_fxpt_vco.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_log2_const.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_math.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_misc.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_nco.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_random.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_reverse.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_simple_framer_sync.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_test_types.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vco.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_add_const_ss.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_agc_cc.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_agc_ff.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_agc2_cc.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_agc2_ff.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_char_to_float.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_control_loop.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_debugger_hook.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_fft.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_float_to_char.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_float_to_int.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_float_to_short.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_float_to_uchar.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_lfsr.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_glfsr.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_interleaved_short_to_complex.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_lfsr_15_1_0.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_lfsr_32k.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_int_to_float.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_short_to_float.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_uchar_to_float.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/malloc16.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/random.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "core_devel"
+)
+
+########################################################################
+# Install swig headers
+########################################################################
+if(ENABLE_PYTHON)
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/general.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_constants.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_agc_cc.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_agc_ff.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_agc2_cc.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_agc2_ff.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_control_loop.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "core_swig"
+)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Handle triple-threat files that have cc, h, and i
+########################################################################
+set(gr_core_general_triple_threats
+    complex_vec_test
+    gr_additive_scrambler_bb
+    gr_agc_cc
+    gr_agc_ff
+    gr_agc2_cc
+    gr_agc2_ff
+    gr_align_on_samplenumbers_ss
+    gr_bin_statistics_f
+    gr_bytes_to_syms
+    gr_char_to_float
+    gr_check_counting_s
+    gr_check_lfsr_32k_s
+    gr_complex_to_interleaved_short
+    gr_complex_to_xxx
+    gr_conjugate_cc
+    gr_copy
+    gr_cpfsk_bc
+    gr_cpm
+    gr_ctcss_squelch_ff
+    gr_decode_ccsds_27_fb
+    gr_diff_decoder_bb
+    gr_diff_encoder_bb
+    gr_diff_phasor_cc
+    gr_dpll_bb
+    gr_deinterleave
+    gr_delay
+    gr_encode_ccsds_27_bb
+    gr_fake_channel_coder_pp
+    gr_feedforward_agc_cc
+    gr_feval
+    gr_fft_vcc
+    gr_fft_vfc
+    gr_firdes
+    gr_float_to_char
+    gr_float_to_complex
+    gr_float_to_int
+    gr_float_to_short
+    gr_float_to_uchar
+    gr_fmdet_cf
+    gr_frequency_modulator_fc
+    gr_framer_sink_1
+    gr_glfsr_source_b
+    gr_glfsr_source_f
+    gr_head
+    gr_int_to_float
+    gr_interleave
+    gr_interleaved_short_to_complex
+    gr_iqcomp_cc
+    gr_keep_one_in_n
+    gr_kludge_copy
+    gr_lfsr_32k_source_s
+    gr_map_bb
+    gr_nlog10_ff
+    gr_nop
+    gr_null_sink
+    gr_null_source
+    gr_pa_2x2_phase_combiner
+    gr_packet_sink
+    gr_peak_detector2_fb
+    gr_phase_modulator_fc
+    gr_pll_carriertracking_cc
+    gr_pll_freqdet_cf
+    gr_pll_refout_cc
+    gr_pn_correlator_cc
+    gr_prefs
+    gr_probe_avg_mag_sqrd_c
+    gr_probe_avg_mag_sqrd_cf
+    gr_probe_avg_mag_sqrd_f
+    gr_probe_signal_f
+    gr_pwr_squelch_cc
+    gr_pwr_squelch_ff
+    gr_quadrature_demod_cf
+    gr_rail_ff
+    gr_regenerate_bb
+    gr_remez
+    gr_rms_cf
+    gr_rms_ff
+    gr_repeat
+    gr_short_to_float
+    gr_simple_correlator
+    gr_simple_framer
+    gr_simple_squelch_cc
+    gr_skiphead
+    gr_squash_ff
+    gr_squelch_base_cc
+    gr_squelch_base_ff
+    gr_stream_mux
+    gr_stream_to_streams
+    gr_stream_to_vector
+    gr_streams_to_stream
+    gr_streams_to_vector
+    gr_stretch_ff
+    gr_test
+    gr_threshold_ff
+    gr_throttle
+    gr_transcendental
+    gr_uchar_to_float
+    gr_vco_f
+    gr_vector_to_stream
+    gr_vector_to_streams
+    gr_unpack_k_bits_bb
+    gr_wavelet_ff
+    gr_wvps_ff
+    gr_descrambler_bb
+    gr_scrambler_bb
+    gr_probe_mpsk_snr_c
+    gr_probe_density_b
+    gr_annotator_alltoall
+    gr_annotator_1to1
+    gr_burst_tagger
+    gr_correlate_access_code_tag_bb
+)
+
+foreach(file_tt ${gr_core_general_triple_threats})
+    list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.cc)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_devel")
+    if(ENABLE_PYTHON)
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "core_swig")
+    endif(ENABLE_PYTHON)
+endforeach(file_tt ${gr_core_general_triple_threats})
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index 007bedc00..0122932cf 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -44,24 +44,18 @@ libgeneral_la_SOURCES = 		\
 	gr_agc2_ff.cc                	\
 	gr_align_on_samplenumbers_ss.cc	\
 	gr_bin_statistics_f.cc		\
-	gr_binary_slicer_fb.cc		\
 	gr_bytes_to_syms.cc		\
 	gr_char_to_float.cc		\
 	gr_check_counting_s.cc		\
 	gr_check_lfsr_32k_s.cc		\
 	gr_circular_file.cc		\
-	gr_clock_recovery_mm_cc.cc	\
-	gr_clock_recovery_mm_ff.cc	\
 	gr_complex_to_interleaved_short.cc \
 	gr_complex_to_xxx.cc		\
 	gr_conjugate_cc.cc		\
 	gr_copy.cc			\
-	gr_constellation_decoder_cb.cc	\
-	gr_correlate_access_code_bb.cc	\
-	gr_costas_loop_cc.cc		\
 	gr_count_bits.cc		\
 	gr_cpfsk_bc.cc			\
-	gr_crc32.cc			\
+	gr_cpm.cc			\
 	gr_ctcss_squelch_ff.cc		\
 	gr_decode_ccsds_27_fb.cc	\
 	gr_deinterleave.cc		\
@@ -79,9 +73,9 @@ libgeneral_la_SOURCES = 		\
 	gr_fft_vcc_fftw.cc		\
 	gr_fft_vfc.cc			\
 	gr_firdes.cc			\
-	gr_fll_band_edge_cc.cc		\
 	gr_float_to_char.cc		\
 	gr_float_to_complex.cc		\
+	gr_float_to_int.cc		\
 	gr_float_to_short.cc		\
 	gr_float_to_uchar.cc		\
 	gr_fmdet_cf.cc			\
@@ -97,22 +91,12 @@ libgeneral_la_SOURCES = 		\
 	gr_keep_one_in_n.cc		\
 	gr_kludge_copy.cc		\
 	gr_lfsr_32k_source_s.cc		\
-	gr_lms_dfe_cc.cc		\
-	gr_lms_dfe_ff.cc		\
 	gr_map_bb.cc			\
 	gr_misc.cc			\
-	gr_mpsk_receiver_cc.cc		\
 	gr_nlog10_ff.cc			\
 	gr_nop.cc			\
 	gr_null_sink.cc			\
 	gr_null_source.cc		\
-	gr_ofdm_frame_acquisition.cc	\
-        gr_ofdm_cyclic_prefixer.cc      \
-        gr_ofdm_demapper_vcb.cc         \
-        gr_ofdm_mapper_bcv.cc           \
-	gr_ofdm_frame_sink.cc		\
-	gr_ofdm_insert_preamble.cc	\
-        gr_ofdm_sampler.cc              \
 	gr_pa_2x2_phase_combiner.cc	\
 	gr_packet_sink.cc		\
 	gr_peak_detector2_fb.cc		\
@@ -165,13 +149,16 @@ libgeneral_la_SOURCES = 		\
 	gr_wvps_ff.cc			\
 	gri_add_const_ss_generic.cc	\
 	gri_char_to_float.cc		\
+	gri_control_loop.cc		\
 	gri_debugger_hook.cc		\
 	gri_fft.cc			\
 	gri_float_to_char.cc		\
+	gri_float_to_int.cc		\
 	gri_float_to_short.cc		\
 	gri_float_to_uchar.cc		\
 	gri_glfsr.cc			\
 	gri_interleaved_short_to_complex.cc \
+	gri_int_to_float.cc		\
 	gri_short_to_float.cc		\
 	gri_uchar_to_float.cc		\
 	malloc16.c			\
@@ -188,6 +175,7 @@ libgeneral_la_SOURCES = 		\
 libgeneral_qa_la_SOURCES = 		\
 	qa_general.cc			\
 	qa_gr_circular_file.cc		\
+	qa_gr_cpm.cc			\
 	qa_gr_firdes.cc			\
 	qa_gr_fxpt.cc			\
 	qa_gr_fxpt_nco.cc		\
@@ -196,6 +184,7 @@ libgeneral_qa_la_SOURCES = 		\
 	qa_gri_lfsr.cc
 
 grinclude_HEADERS = 			\
+	gr_core_api.h			\
 	complex_vec_test.h		\
 	gr_additive_scrambler_bb.h	\
 	gr_agc_cc.h                 	\
@@ -204,24 +193,18 @@ grinclude_HEADERS = 			\
 	gr_agc2_ff.h                	\
 	gr_align_on_samplenumbers_ss.h	\
 	gr_bin_statistics_f.h		\
-	gr_binary_slicer_fb.h		\
 	gr_bytes_to_syms.h		\
 	gr_char_to_float.h		\
 	gr_check_counting_s.h		\
 	gr_check_lfsr_32k_s.h		\
 	gr_circular_file.h		\
-	gr_clock_recovery_mm_cc.h	\
-	gr_clock_recovery_mm_ff.h	\
 	gr_complex_to_interleaved_short.h \
 	gr_complex_to_xxx.h		\
 	gr_conjugate_cc.h		\
-	gr_constellation_decoder_cb.h	\
 	gr_copy.h			\
-	gr_correlate_access_code_bb.h	\
-	gr_costas_loop_cc.h		\
 	gr_count_bits.h			\
 	gr_cpfsk_bc.h			\
-	gr_crc32.h			\
+	gr_cpm.h			\
 	gr_ctcss_squelch_ff.h		\
 	gr_decode_ccsds_27_fb.h		\
 	gr_diff_decoder_bb.h		\
@@ -239,9 +222,9 @@ grinclude_HEADERS = 			\
 	gr_fft_vcc_fftw.h		\
 	gr_fft_vfc.h			\
 	gr_firdes.h			\
-	gr_fll_band_edge_cc.h		\
 	gr_float_to_char.h		\
 	gr_float_to_complex.h		\
+	gr_float_to_int.h		\
 	gr_float_to_short.h		\
 	gr_float_to_uchar.h		\
 	gr_fmdet_cf.h			\
@@ -259,25 +242,15 @@ grinclude_HEADERS = 			\
 	gr_keep_one_in_n.h		\
 	gr_kludge_copy.h		\
 	gr_lfsr_32k_source_s.h		\
-	gr_lms_dfe_cc.h			\
-	gr_lms_dfe_ff.h			\
 	gr_log2_const.h			\
 	gr_map_bb.h			\
 	gr_math.h			\
 	gr_misc.h			\
-	gr_mpsk_receiver_cc.h		\
 	gr_nco.h			\
 	gr_nlog10_ff.h			\
 	gr_nop.h			\
 	gr_null_sink.h			\
 	gr_null_source.h		\
-	gr_ofdm_frame_acquisition.h	\
-        gr_ofdm_cyclic_prefixer.h       \
-        gr_ofdm_demapper_vcb.h          \
-        gr_ofdm_mapper_bcv.h            \
-        gr_ofdm_frame_sink.h		\
-	gr_ofdm_insert_preamble.h	\
-	gr_ofdm_sampler.h               \
 	gr_pa_2x2_phase_combiner.h	\
 	gr_packet_sink.h		\
 	gr_peak_detector2_fb.h		\
@@ -337,14 +310,17 @@ grinclude_HEADERS = 			\
 	gri_agc2_cc.h			\
 	gri_agc2_ff.h			\
 	gri_char_to_float.h		\
+	gri_control_loop.h		\
 	gri_debugger_hook.h		\
 	gri_fft.h			\
 	gri_float_to_char.h		\
+	gri_float_to_int.h		\
 	gri_float_to_short.h		\
 	gri_float_to_uchar.h		\
 	gri_lfsr.h			\
 	gri_glfsr.h			\
 	gri_interleaved_short_to_complex.h \
+	gri_int_to_float.h		\
 	gri_lfsr_15_1_0.h		\
 	gri_lfsr_32k.h			\
 	gri_short_to_float.h		\
@@ -364,6 +340,7 @@ grinclude_HEADERS = 			\
 noinst_HEADERS = 			\
 	qa_general.h			\
 	qa_gr_circular_file.h		\
+	qa_gr_cpm.h			\
 	qa_gr_firdes.h			\
 	qa_gr_fxpt.h			\
 	qa_gr_fxpt_nco.h		\
@@ -382,22 +359,16 @@ swiginclude_HEADERS =			\
 	gr_agc2_ff.i                 	\
 	gr_align_on_samplenumbers_ss.i	\
 	gr_bin_statistics_f.i		\
-	gr_binary_slicer_fb.i		\
 	gr_bytes_to_syms.i		\
 	gr_char_to_float.i		\
 	gr_check_counting_s.i		\
 	gr_check_lfsr_32k_s.i		\
-	gr_clock_recovery_mm_cc.i	\
-	gr_clock_recovery_mm_ff.i	\
 	gr_complex_to_interleaved_short.i \
 	gr_complex_to_xxx.i		\
 	gr_conjugate_cc.i		\
-	gr_constellation_decoder_cb.i	\
 	gr_copy.i			\
-	gr_correlate_access_code_bb.i	\
-	gr_costas_loop_cc.i		\
 	gr_cpfsk_bc.i			\
-	gr_crc32.i			\
+	gr_cpm.i			\
 	gr_ctcss_squelch_ff.i		\
 	gr_decode_ccsds_27_fb.i		\
 	gr_diff_decoder_bb.i		\
@@ -413,9 +384,9 @@ swiginclude_HEADERS =			\
 	gr_fft_vcc.i			\
 	gr_fft_vfc.i			\
 	gr_firdes.i			\
-	gr_fll_band_edge_cc.i		\
 	gr_float_to_char.i		\
 	gr_float_to_complex.i		\
+	gr_float_to_int.i		\
 	gr_float_to_short.i		\
 	gr_float_to_uchar.i		\
 	gr_fmdet_cf.i			\
@@ -431,21 +402,11 @@ swiginclude_HEADERS =			\
 	gr_keep_one_in_n.i		\
 	gr_kludge_copy.i		\
 	gr_lfsr_32k_source_s.i		\
-	gr_lms_dfe_cc.i			\
-	gr_lms_dfe_ff.i			\
 	gr_map_bb.i			\
-	gr_mpsk_receiver_cc.i		\
 	gr_nlog10_ff.i			\
 	gr_nop.i			\
 	gr_null_sink.i			\
 	gr_null_source.i		\
-	gr_ofdm_frame_acquisition.i	\
-        gr_ofdm_cyclic_prefixer.i       \
-        gr_ofdm_demapper_vcb.i          \
-        gr_ofdm_mapper_bcv.i            \
-        gr_ofdm_frame_sink.i		\
-	gr_ofdm_insert_preamble.i	\
-	gr_ofdm_sampler.i               \
 	gr_pa_2x2_phase_combiner.i	\
 	gr_packet_sink.i		\
 	gr_peak_detector2_fb.i		\
@@ -498,6 +459,7 @@ swiginclude_HEADERS =			\
 	gri_agc_ff.i			\
 	gri_agc2_cc.i			\
 	gri_agc2_ff.i			\
+	gri_control_loop.i		\
 	gr_descrambler_bb.i		\
 	gr_scrambler_bb.i		\
 	gr_probe_mpsk_snr_c.i		\
diff --git a/gnuradio-core/src/lib/general/complex_vec_test.h b/gnuradio-core/src/lib/general/complex_vec_test.h
index d13dedf63..be4de41fb 100644
--- a/gnuradio-core/src/lib/general/complex_vec_test.h
+++ b/gnuradio-core/src/lib/general/complex_vec_test.h
@@ -1,27 +1,28 @@
+#include <gr_core_api.h>
 #include <vector>
 #include <complex>
 
-std::vector<std::complex<float> >
+GR_CORE_API std::vector<std::complex<float> >
 complex_vec_test0();
 
-std::vector<std::complex<float> >
+GR_CORE_API std::vector<std::complex<float> >
 complex_vec_test1(const std::vector<std::complex<float> > &input);
 
-std::complex<float>
+GR_CORE_API std::complex<float>
 complex_scalar_test0();
 
-std::complex<float>
+GR_CORE_API std::complex<float>
 complex_scalar_test1(std::complex<float> input);
 
-std::vector<int>
+GR_CORE_API std::vector<int>
 int_vec_test0();
 
-std::vector<int>
+GR_CORE_API std::vector<int>
 int_vec_test1(const std::vector<int> &input);
 
-std::vector<float>
+GR_CORE_API std::vector<float>
 float_vec_test0();
 
-std::vector<float>
+GR_CORE_API std::vector<float>
 float_vec_test1(const std::vector<float> &input);
 
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index beedeb0a9..5a701bf80 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
+ * Copyright 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,6 +22,7 @@
 
 %{
 
+#include <gri_control_loop.h>
 #include <gr_nop.h>
 #include <gr_null_sink.h>
 #include <gr_null_source.h>
@@ -38,6 +39,7 @@
 #include <gr_keep_one_in_n.h>
 #include <gr_fft_vcc.h>
 #include <gr_fft_vfc.h>
+#include <gr_float_to_int.h>
 #include <gr_float_to_short.h>
 #include <gr_float_to_char.h>
 #include <gr_float_to_uchar.h>
@@ -70,7 +72,6 @@
 #include <gr_fake_channel_coder_pp.h>
 #include <gr_throttle.h>
 #include <gr_transcendental.h>
-#include <gr_mpsk_receiver_cc.h>
 #include <gr_stream_mux.h>
 #include <gr_stream_to_streams.h>
 #include <gr_streams_to_stream.h>
@@ -78,13 +79,8 @@
 #include <gr_vector_to_streams.h>
 #include <gr_conjugate_cc.h>
 #include <gr_vco_f.h>
-#include <gr_crc32.h>
 #include <gr_threshold_ff.h>
-#include <gr_clock_recovery_mm_ff.h>
-#include <gr_clock_recovery_mm_cc.h>
 #include <gr_packet_sink.h>
-#include <gr_lms_dfe_cc.h>
-#include <gr_lms_dfe_ff.h>
 #include <gr_dpll_bb.h>
 #include <gr_fmdet_cf.h>
 #include <gr_pll_freqdet_cf.h>
@@ -95,14 +91,7 @@
 #include <gr_probe_avg_mag_sqrd_cf.h>
 #include <gr_probe_avg_mag_sqrd_f.h>
 #include <gr_probe_signal_f.h>
-#include <gr_ofdm_frame_acquisition.h>
-#include <gr_ofdm_cyclic_prefixer.h>
-#include <gr_ofdm_mapper_bcv.h>
-#include <gr_ofdm_frame_sink.h>
-#include <gr_ofdm_insert_preamble.h>
-#include <gr_ofdm_sampler.h>
 #include <gr_regenerate_bb.h>
-#include <gr_costas_loop_cc.h>
 #include <gr_pa_2x2_phase_combiner.h>
 #include <gr_kludge_copy.h>
 #include <gr_prefs.h>
@@ -110,10 +99,7 @@
 #include <gr_test_types.h>
 #include <gr_test.h>
 #include <gr_unpack_k_bits_bb.h>
-#include <gr_correlate_access_code_bb.h>
 #include <gr_diff_phasor_cc.h>
-#include <gr_constellation_decoder_cb.h>
-#include <gr_binary_slicer_fb.h>
 #include <gr_diff_encoder_bb.h>
 #include <gr_diff_decoder_bb.h>
 #include <gr_framer_sink_1.h>
@@ -141,15 +127,16 @@
 #include <gr_wavelet_ff.h>
 #include <gr_wvps_ff.h>
 #include <gr_copy.h>
-#include <gr_fll_band_edge_cc.h>
 #include <gr_additive_scrambler_bb.h>
 #include <complex_vec_test.h>
 #include <gr_annotator_alltoall.h>
 #include <gr_annotator_1to1.h>
 #include <gr_burst_tagger.h>
+#include <gr_cpm.h>
 #include <gr_correlate_access_code_tag_bb.h>
 %}
 
+%include "gri_control_loop.i"
 %include "gr_nop.i"
 %include "gr_null_sink.i"
 %include "gr_null_source.i"
@@ -166,6 +153,7 @@
 %include "gr_keep_one_in_n.i"
 %include "gr_fft_vcc.i"
 %include "gr_fft_vfc.i"
+%include "gr_float_to_int.i"
 %include "gr_float_to_short.i"
 %include "gr_float_to_char.i"
 %include "gr_float_to_uchar.i"
@@ -198,7 +186,6 @@
 %include "gr_fake_channel_coder_pp.i"
 %include "gr_throttle.i"
 %include "gr_transcendental.i"
-%include "gr_mpsk_receiver_cc.i"
 %include "gr_stream_mux.i"
 %include "gr_stream_to_streams.i"
 %include "gr_streams_to_stream.i"
@@ -206,13 +193,8 @@
 %include "gr_vector_to_streams.i"
 %include "gr_conjugate_cc.i"
 %include "gr_vco_f.i"
-%include "gr_crc32.i"
 %include "gr_threshold_ff.i"
-%include "gr_clock_recovery_mm_ff.i"
-%include "gr_clock_recovery_mm_cc.i"
 %include "gr_packet_sink.i"
-%include "gr_lms_dfe_cc.i"
-%include "gr_lms_dfe_ff.i"
 %include "gr_dpll_bb.i"
 %include "gr_fmdet_cf.i"
 %include "gr_pll_freqdet_cf.i"
@@ -223,14 +205,7 @@
 %include "gr_probe_avg_mag_sqrd_cf.i"
 %include "gr_probe_avg_mag_sqrd_f.i"
 %include "gr_probe_signal_f.i"
-%include "gr_ofdm_frame_acquisition.i"
-%include "gr_ofdm_cyclic_prefixer.i"
-%include "gr_ofdm_mapper_bcv.i"
-%include "gr_ofdm_frame_sink.i"
-%include "gr_ofdm_insert_preamble.i"
-%include "gr_ofdm_sampler.i"
 %include "gr_regenerate_bb.i"
-%include "gr_costas_loop_cc.i"
 %include "gr_pa_2x2_phase_combiner.i"
 %include "gr_kludge_copy.i"
 %include "gr_prefs.i"
@@ -238,10 +213,7 @@
 %include "gr_test_types.h"
 %include "gr_test.i"
 %include "gr_unpack_k_bits_bb.i"
-%include "gr_correlate_access_code_bb.i"
 %include "gr_diff_phasor_cc.i"
-%include "gr_constellation_decoder_cb.i"
-%include "gr_binary_slicer_fb.i"
 %include "gr_diff_encoder_bb.i"
 %include "gr_diff_decoder_bb.i"
 %include "gr_framer_sink_1.i"
@@ -269,10 +241,10 @@
 %include "gr_wavelet_ff.i"
 %include "gr_wvps_ff.i"
 %include "gr_copy.i"
-%include "gr_fll_band_edge_cc.i"
 %include "gr_additive_scrambler_bb.i"
 %include "complex_vec_test.i"
 %include "gr_annotator_alltoall.i"
 %include "gr_annotator_1to1.i"
 %include "gr_burst_tagger.i"
+%include "gr_cpm.i"
 %include "gr_correlate_access_code_tag_bb.i"
diff --git a/gnuradio-core/src/lib/general/gr_additive_scrambler_bb.h b/gnuradio-core/src/lib/general/gr_additive_scrambler_bb.h
index 6c9493050..4c7c8f87e 100644
--- a/gnuradio-core/src/lib/general/gr_additive_scrambler_bb.h
+++ b/gnuradio-core/src/lib/general/gr_additive_scrambler_bb.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_GR_ADDITIVE_SCRAMBLER_BB_H
 #define INCLUDED_GR_ADDITIVE_SCRAMBLER_BB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include "gri_lfsr.h"
 
 class gr_additive_scrambler_bb;
 typedef boost::shared_ptr<gr_additive_scrambler_bb> gr_additive_scrambler_bb_sptr;
 
-gr_additive_scrambler_bb_sptr gr_make_additive_scrambler_bb(int mask, int seed, int len, int count=0);
+GR_CORE_API gr_additive_scrambler_bb_sptr gr_make_additive_scrambler_bb(int mask, int seed, int len, int count=0);
 
 /*!
  * Scramble an input stream using an LFSR.  This block works on the LSB only
@@ -48,9 +49,9 @@ gr_additive_scrambler_bb_sptr gr_make_additive_scrambler_bb(int mask, int seed,
  * \ingroup coding_blk
  */
 
-class gr_additive_scrambler_bb : public gr_sync_block
+class GR_CORE_API gr_additive_scrambler_bb : public gr_sync_block
 {
-  friend gr_additive_scrambler_bb_sptr gr_make_additive_scrambler_bb(int mask, int seed, int len, int count);
+  friend GR_CORE_API gr_additive_scrambler_bb_sptr gr_make_additive_scrambler_bb(int mask, int seed, int len, int count);
 
   gri_lfsr d_lfsr;
   int      d_count;
diff --git a/gnuradio-core/src/lib/general/gr_agc2_cc.h b/gnuradio-core/src/lib/general/gr_agc2_cc.h
index 0eb20afb9..6127c3aa7 100644
--- a/gnuradio-core/src/lib/general/gr_agc2_cc.h
+++ b/gnuradio-core/src/lib/general/gr_agc2_cc.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_AGC2_CC_H
 #define INCLUDED_GR_AGC2_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gri_agc2_cc.h>
 
 class gr_agc2_cc;
 typedef boost::shared_ptr<gr_agc2_cc> gr_agc2_cc_sptr;
 
-gr_agc2_cc_sptr
+GR_CORE_API gr_agc2_cc_sptr
 gr_make_agc2_cc (float attack_rate = 1e-1, float decay_rate = 1e-2, float reference = 1.0, 
 		 float gain = 1.0, float max_gain = 0.0);
 /*!
@@ -39,9 +40,9 @@ gr_make_agc2_cc (float attack_rate = 1e-1, float decay_rate = 1e-2, float refere
  * For Power the absolute value of the complex number is used.
  */
 
-class gr_agc2_cc : public gr_sync_block, public gri_agc2_cc
+class GR_CORE_API gr_agc2_cc : public gr_sync_block, public gri_agc2_cc
 {
-  friend gr_agc2_cc_sptr gr_make_agc2_cc (float attack_rate, float decay_rate, float reference, 
+  friend GR_CORE_API gr_agc2_cc_sptr gr_make_agc2_cc (float attack_rate, float decay_rate, float reference, 
 					  float gain, float max_gain);
   gr_agc2_cc (float attack_rate, float decay_rate, float reference, 
 	      float gain, float max_gain);
diff --git a/gnuradio-core/src/lib/general/gr_agc2_ff.h b/gnuradio-core/src/lib/general/gr_agc2_ff.h
index ef470765f..269d940d4 100644
--- a/gnuradio-core/src/lib/general/gr_agc2_ff.h
+++ b/gnuradio-core/src/lib/general/gr_agc2_ff.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_AGC2_FF_H
 #define INCLUDED_GR_AGC2_FF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gri_agc2_ff.h>
 class gr_agc2_ff;
 typedef boost::shared_ptr<gr_agc2_ff> gr_agc2_ff_sptr;
 
-gr_agc2_ff_sptr
+GR_CORE_API gr_agc2_ff_sptr
 gr_make_agc2_ff (float attack_rate = 1e-1, float decay_rate = 1e-2, float reference = 1.0, 
 		 float gain = 1.0, float max_gain = 0.0);
 /*!
@@ -38,9 +39,9 @@ gr_make_agc2_ff (float attack_rate = 1e-1, float decay_rate = 1e-2, float refere
  * Power is approximated by absolute value
  */
 
-class gr_agc2_ff : public gr_sync_block, public gri_agc2_ff
+class GR_CORE_API gr_agc2_ff : public gr_sync_block, public gri_agc2_ff
 {
-  friend gr_agc2_ff_sptr gr_make_agc2_ff (float attack_rate, float decay_rate,
+  friend GR_CORE_API gr_agc2_ff_sptr gr_make_agc2_ff (float attack_rate, float decay_rate,
 					  float reference, float gain, float max_gain);
   gr_agc2_ff (float attack_rate, float decay_rate, float reference, float gain, float max_gain);
 
diff --git a/gnuradio-core/src/lib/general/gr_agc_cc.h b/gnuradio-core/src/lib/general/gr_agc_cc.h
index 43a5de6c7..f348fff91 100644
--- a/gnuradio-core/src/lib/general/gr_agc_cc.h
+++ b/gnuradio-core/src/lib/general/gr_agc_cc.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_AGC_CC_H
 #define INCLUDED_GR_AGC_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gri_agc_cc.h>
 class gr_agc_cc;
 typedef boost::shared_ptr<gr_agc_cc> gr_agc_cc_sptr;
 
-gr_agc_cc_sptr
+GR_CORE_API gr_agc_cc_sptr
 gr_make_agc_cc (float rate = 1e-4, float reference = 1.0, 
 		float gain = 1.0, float max_gain = 0.0);
 /*!
@@ -38,9 +39,9 @@ gr_make_agc_cc (float rate = 1e-4, float reference = 1.0,
  * For Power the absolute value of the complex number is used.
  */
 
-class gr_agc_cc : public gr_sync_block, public gri_agc_cc
+class GR_CORE_API gr_agc_cc : public gr_sync_block, public gri_agc_cc
 {
-  friend gr_agc_cc_sptr gr_make_agc_cc (float rate, float reference, 
+  friend GR_CORE_API gr_agc_cc_sptr gr_make_agc_cc (float rate, float reference, 
 					float gain, float max_gain);
   gr_agc_cc (float rate, float reference, 
 	     float gain, float max_gain);
diff --git a/gnuradio-core/src/lib/general/gr_agc_ff.h b/gnuradio-core/src/lib/general/gr_agc_ff.h
index 7cb167fca..94db9eef5 100644
--- a/gnuradio-core/src/lib/general/gr_agc_ff.h
+++ b/gnuradio-core/src/lib/general/gr_agc_ff.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_AGC_FF_H
 #define INCLUDED_GR_AGC_FF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gri_agc_ff.h>
 class gr_agc_ff;
 typedef boost::shared_ptr<gr_agc_ff> gr_agc_ff_sptr;
 
-gr_agc_ff_sptr
+GR_CORE_API gr_agc_ff_sptr
 gr_make_agc_ff (float rate = 1e-4, float reference = 1.0, 
 		float gain = 1.0, float max_gain = 0.0);
 
@@ -39,9 +40,9 @@ gr_make_agc_ff (float rate = 1e-4, float reference = 1.0,
  * Power is approximated by absolute value
  */
 
-class gr_agc_ff : public gr_sync_block, public gri_agc_ff
+class GR_CORE_API gr_agc_ff : public gr_sync_block, public gri_agc_ff
 {
-  friend gr_agc_ff_sptr gr_make_agc_ff (float rate, float reference, 
+  friend GR_CORE_API gr_agc_ff_sptr gr_make_agc_ff (float rate, float reference, 
 					float gain, float max_gain);
   gr_agc_ff (float rate, float reference, float gain, float max_gain);
 
diff --git a/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h b/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h
index 5038e168b..61f70ee96 100644
--- a/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h
+++ b/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_ALIGN_ON_SAMPLE_NUMBERS_SS_H
 #define INCLUDED_GR_ALIGN_ON_SAMPLE_NUMBERS_SS_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 /*!
@@ -45,19 +46,19 @@
 class gr_align_on_samplenumbers_ss;
 typedef boost::shared_ptr<gr_align_on_samplenumbers_ss> gr_align_on_samplenumbers_ss_sptr;
 
-gr_align_on_samplenumbers_ss_sptr gr_make_align_on_samplenumbers_ss (int nchan=2, int align_interval=128);
+GR_CORE_API gr_align_on_samplenumbers_ss_sptr gr_make_align_on_samplenumbers_ss (int nchan=2, int align_interval=128);
 
 
 
 
-class gr_align_on_samplenumbers_ss : public gr_block
+class GR_CORE_API gr_align_on_samplenumbers_ss : public gr_block
 {
   int  d_align_interval;
   int  d_sample_counter;
   int  d_nchan;
   bool d_in_presync;
   unsigned int d_ninputs;
-  class align_state {
+  class GR_CORE_API align_state {
       public:
         unsigned int ucounter_end;
         unsigned int ucounter_begin;
@@ -72,7 +73,7 @@ class gr_align_on_samplenumbers_ss : public gr_block
       };
   std::vector<align_state>   d_state;
     
-  friend gr_align_on_samplenumbers_ss_sptr gr_make_align_on_samplenumbers_ss (int nchan,int align_interval);
+  friend GR_CORE_API gr_align_on_samplenumbers_ss_sptr gr_make_align_on_samplenumbers_ss (int nchan,int align_interval);
   gr_align_on_samplenumbers_ss (int nchan,int align_interval);
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_annotator_1to1.cc b/gnuradio-core/src/lib/general/gr_annotator_1to1.cc
index 511b356e5..d12bfbf04 100644
--- a/gnuradio-core/src/lib/general/gr_annotator_1to1.cc
+++ b/gnuradio-core/src/lib/general/gr_annotator_1to1.cc
@@ -69,10 +69,10 @@ gr_annotator_1to1::work (int noutput_items,
   for(int i = 0; i < ninputs; i++) {
     abs_N = nitems_read(i);
 
-    std::vector<pmt::pmt_t> all_tags;
+    std::vector<gr_tag_t> all_tags;
     get_tags_in_range(all_tags, i, abs_N, abs_N + noutput_items);
 
-    std::vector<pmt::pmt_t>::iterator itr;
+    std::vector<gr_tag_t>::iterator itr;
     for(itr = all_tags.begin(); itr != all_tags.end(); itr++) {
       d_stored_tags.push_back(*itr);
     }
diff --git a/gnuradio-core/src/lib/general/gr_annotator_1to1.h b/gnuradio-core/src/lib/general/gr_annotator_1to1.h
index 4abc5b051..a62720224 100644
--- a/gnuradio-core/src/lib/general/gr_annotator_1to1.h
+++ b/gnuradio-core/src/lib/general/gr_annotator_1to1.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_ANNOTATOR_1TO1_H
 #define	INCLUDED_GR_ANNOTATOR_1TO1_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_annotator_1to1;
 typedef boost::shared_ptr<gr_annotator_1to1> gr_annotator_1to1_sptr;
 
 // public constructor
-gr_annotator_1to1_sptr 
+GR_CORE_API gr_annotator_1to1_sptr 
 gr_make_annotator_1to1 (int when, size_t sizeof_stream_item);
 
 /*!
@@ -45,7 +46,7 @@ gr_make_annotator_1to1 (int when, size_t sizeof_stream_item);
  *
  * This block is only meant for testing and showing how to use the tags.
  */
-class gr_annotator_1to1 : public gr_sync_block
+class GR_CORE_API gr_annotator_1to1 : public gr_sync_block
 {
  public:
   ~gr_annotator_1to1 ();
@@ -53,7 +54,7 @@ class gr_annotator_1to1 : public gr_sync_block
 	    gr_vector_const_void_star &input_items,
 	    gr_vector_void_star &output_items);
 
-  std::vector<pmt::pmt_t> data() const
+  std::vector<gr_tag_t> data() const
   {
     return d_stored_tags;
   }
@@ -65,9 +66,9 @@ protected:
   size_t d_itemsize;
   uint64_t d_when;
   uint64_t d_tag_counter;
-  std::vector<pmt::pmt_t> d_stored_tags;
+  std::vector<gr_tag_t> d_stored_tags;
 
-  friend gr_annotator_1to1_sptr
+  friend GR_CORE_API gr_annotator_1to1_sptr
   gr_make_annotator_1to1 (int when, size_t sizeof_stream_item);
 };
 
diff --git a/gnuradio-core/src/lib/general/gr_annotator_1to1.i b/gnuradio-core/src/lib/general/gr_annotator_1to1.i
index f29ecbf53..2c8149a3c 100644
--- a/gnuradio-core/src/lib/general/gr_annotator_1to1.i
+++ b/gnuradio-core/src/lib/general/gr_annotator_1to1.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
  * 
@@ -22,15 +22,4 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,annotator_1to1);
 
-gr_annotator_1to1_sptr gr_make_annotator_1to1 (int when,
-					       size_t sizeof_stream_item);
-
-class gr_annotator_1to1 : public gr_sync_block
-{
-public:
-  std::vector<pmt::pmt_t> data() const;
-  
-private:
-  gr_annotator_1to1 (int when, size_t sizeof_stream_item);
-};
-
+%include <gr_annotator_1to1.h>
diff --git a/gnuradio-core/src/lib/general/gr_annotator_alltoall.cc b/gnuradio-core/src/lib/general/gr_annotator_alltoall.cc
index 344fd088b..dd31bff78 100644
--- a/gnuradio-core/src/lib/general/gr_annotator_alltoall.cc
+++ b/gnuradio-core/src/lib/general/gr_annotator_alltoall.cc
@@ -70,10 +70,10 @@ gr_annotator_alltoall::work (int noutput_items,
     abs_N = nitems_read(i);
     end_N = abs_N + (uint64_t)(noutput_items);
 
-    std::vector<pmt::pmt_t> all_tags;
+    std::vector<gr_tag_t> all_tags;
     get_tags_in_range(all_tags, i, abs_N, end_N);
 
-    std::vector<pmt::pmt_t>::iterator itr;
+    std::vector<gr_tag_t>::iterator itr;
     for(itr = all_tags.begin(); itr != all_tags.end(); itr++) {
       d_stored_tags.push_back(*itr);
     }
diff --git a/gnuradio-core/src/lib/general/gr_annotator_alltoall.h b/gnuradio-core/src/lib/general/gr_annotator_alltoall.h
index e1e51ebf3..fe8b736c2 100644
--- a/gnuradio-core/src/lib/general/gr_annotator_alltoall.h
+++ b/gnuradio-core/src/lib/general/gr_annotator_alltoall.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_ANNOTATOR_ALLTOALL_H
 #define	INCLUDED_GR_ANNOTATOR_ALLTOALL_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_annotator_alltoall;
 typedef boost::shared_ptr<gr_annotator_alltoall> gr_annotator_alltoall_sptr;
 
 // public constructor
-gr_annotator_alltoall_sptr 
+GR_CORE_API gr_annotator_alltoall_sptr 
 gr_make_annotator_alltoall (int when, size_t sizeof_stream_item);
 
 /*!
@@ -45,7 +46,7 @@ gr_make_annotator_alltoall (int when, size_t sizeof_stream_item);
  *
  * This block is only meant for testing and showing how to use the tags.
  */
-class gr_annotator_alltoall : public gr_sync_block
+class GR_CORE_API gr_annotator_alltoall : public gr_sync_block
 {
  public:
   ~gr_annotator_alltoall ();
@@ -54,7 +55,7 @@ class gr_annotator_alltoall : public gr_sync_block
 	    gr_vector_const_void_star &input_items,
 	    gr_vector_void_star &output_items);
   
-  std::vector<pmt::pmt_t> data() const
+  std::vector<gr_tag_t> data() const
   {
     return d_stored_tags;
   }
@@ -66,9 +67,9 @@ protected:
   size_t d_itemsize;
   uint64_t d_when;
   uint64_t d_tag_counter;
-  std::vector<pmt::pmt_t> d_stored_tags;
+  std::vector<gr_tag_t> d_stored_tags;
 
-  friend gr_annotator_alltoall_sptr
+  friend GR_CORE_API gr_annotator_alltoall_sptr
   gr_make_annotator_alltoall (int when, size_t sizeof_stream_item);
 };
 
diff --git a/gnuradio-core/src/lib/general/gr_annotator_alltoall.i b/gnuradio-core/src/lib/general/gr_annotator_alltoall.i
index f9bf6dd9a..49bd1e446 100644
--- a/gnuradio-core/src/lib/general/gr_annotator_alltoall.i
+++ b/gnuradio-core/src/lib/general/gr_annotator_alltoall.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
  * 
@@ -22,15 +22,4 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,annotator_alltoall);
 
-gr_annotator_alltoall_sptr gr_make_annotator_alltoall (int when,
-						       size_t sizeof_stream_item);
-
-class gr_annotator_alltoall : public gr_sync_block
-{
-public:
-  std::vector<pmt::pmt_t> data() const;
-  
-private:
-  gr_annotator_alltoall (int when, size_t sizeof_stream_item);
-};
-
+%include <gr_annotator_alltoall.h>
diff --git a/gnuradio-core/src/lib/general/gr_bin_statistics_f.h b/gnuradio-core/src/lib/general/gr_bin_statistics_f.h
index d8c4c2fae..f7eea7d5f 100644
--- a/gnuradio-core/src/lib/general/gr_bin_statistics_f.h
+++ b/gnuradio-core/src/lib/general/gr_bin_statistics_f.h
@@ -24,6 +24,7 @@
 #define INCLUDED_GR_BIN_STATISTICS_F_H
 
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_feval.h>
 #include <gr_message.h>
@@ -33,7 +34,7 @@ class gr_bin_statistics_f;
 typedef boost::shared_ptr<gr_bin_statistics_f> gr_bin_statistics_f_sptr;
 
 
-gr_bin_statistics_f_sptr
+GR_CORE_API gr_bin_statistics_f_sptr
 gr_make_bin_statistics_f(unsigned int vlen,	// vector length
 			 gr_msg_queue_sptr msgq,
 			 gr_feval_dd *tune,	// callback
@@ -44,9 +45,9 @@ gr_make_bin_statistics_f(unsigned int vlen,	// vector length
  * \brief control scanning and record frequency domain statistics
  * \ingroup sink_blk
  */
-class gr_bin_statistics_f : public gr_sync_block
+class GR_CORE_API gr_bin_statistics_f : public gr_sync_block
 {
-  friend gr_bin_statistics_f_sptr
+  friend GR_CORE_API gr_bin_statistics_f_sptr
   gr_make_bin_statistics_f(unsigned int vlen,	   // vector length
 			   gr_msg_queue_sptr msgq,
 			   gr_feval_dd *tune,      // callback
diff --git a/gnuradio-core/src/lib/general/gr_burst_tagger.h b/gnuradio-core/src/lib/general/gr_burst_tagger.h
index 8f814bea0..7547ba9cc 100644
--- a/gnuradio-core/src/lib/general/gr_burst_tagger.h
+++ b/gnuradio-core/src/lib/general/gr_burst_tagger.h
@@ -23,26 +23,27 @@
 #ifndef INCLUDED_GR_BURST_TAGGER_H
 #define INCLUDED_GR_BURST_TAGGER_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_burst_tagger;
 typedef boost::shared_ptr<gr_burst_tagger> gr_burst_tagger_sptr;
 
-gr_burst_tagger_sptr gr_make_burst_tagger(size_t itemsize);
+GR_CORE_API gr_burst_tagger_sptr gr_make_burst_tagger(size_t itemsize);
 
 /*!
  * \brief output[i] = input[i]
  * \ingroup misc_blk
  *
  */
-class gr_burst_tagger : public gr_sync_block
+class GR_CORE_API gr_burst_tagger : public gr_sync_block
 {
   size_t		d_itemsize;
   bool                  d_state;
   pmt::pmt_t            d_key;
   pmt::pmt_t            d_id;
 
-  friend gr_burst_tagger_sptr gr_make_burst_tagger(size_t itemsize);
+  friend GR_CORE_API gr_burst_tagger_sptr gr_make_burst_tagger(size_t itemsize);
   gr_burst_tagger(size_t itemsize);
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_bytes_to_syms.h b/gnuradio-core/src/lib/general/gr_bytes_to_syms.h
index 1531de02a..33b98d4fd 100644
--- a/gnuradio-core/src/lib/general/gr_bytes_to_syms.h
+++ b/gnuradio-core/src/lib/general/gr_bytes_to_syms.h
@@ -22,12 +22,13 @@
 #ifndef INCLUDED_GR_BYTES_TO_SYMS_H
 #define INCLUDED_GR_BYTES_TO_SYMS_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_bytes_to_syms;
 typedef boost::shared_ptr<gr_bytes_to_syms> gr_bytes_to_syms_sptr;
 
-gr_bytes_to_syms_sptr gr_make_bytes_to_syms ();
+GR_CORE_API gr_bytes_to_syms_sptr gr_make_bytes_to_syms ();
 
 /*!
  * \brief Convert stream of bytes to stream of +/- 1 symbols
@@ -45,9 +46,9 @@ gr_bytes_to_syms_sptr gr_make_bytes_to_syms ();
  * \sa gr_packed_to_unpacked_bb, gr_unpacked_to_packed_bb,
  * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc.
  */
-class gr_bytes_to_syms : public gr_sync_interpolator
+class GR_CORE_API gr_bytes_to_syms : public gr_sync_interpolator
 {
-  friend gr_bytes_to_syms_sptr gr_make_bytes_to_syms ();
+  friend GR_CORE_API gr_bytes_to_syms_sptr gr_make_bytes_to_syms ();
 
   gr_bytes_to_syms ();
 
diff --git a/gnuradio-core/src/lib/general/gr_char_to_float.h b/gnuradio-core/src/lib/general/gr_char_to_float.h
index 482e479d6..b20d2066f 100644
--- a/gnuradio-core/src/lib/general/gr_char_to_float.h
+++ b/gnuradio-core/src/lib/general/gr_char_to_float.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_CHAR_TO_FLOAT_H
 #define INCLUDED_GR_CHAR_TO_FLOAT_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_char_to_float;
 typedef boost::shared_ptr<gr_char_to_float> gr_char_to_float_sptr;
 
-gr_char_to_float_sptr
+GR_CORE_API gr_char_to_float_sptr
 gr_make_char_to_float ();
 
 /*!
@@ -36,9 +37,9 @@ gr_make_char_to_float ();
  * \ingroup converter_blk
  */
 
-class gr_char_to_float : public gr_sync_block
+class GR_CORE_API gr_char_to_float : public gr_sync_block
 {
-  friend gr_char_to_float_sptr gr_make_char_to_float ();
+  friend GR_CORE_API gr_char_to_float_sptr gr_make_char_to_float ();
   gr_char_to_float ();
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_check_counting_s.h b/gnuradio-core/src/lib/general/gr_check_counting_s.h
index da35ab8e2..cd4dcb24e 100644
--- a/gnuradio-core/src/lib/general/gr_check_counting_s.h
+++ b/gnuradio-core/src/lib/general/gr_check_counting_s.h
@@ -22,12 +22,13 @@
 #ifndef INCLUDED_GR_CHECK_COUNTING_S_H
 #define INCLUDED_GR_CHECK_COUNTING_S_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_check_counting_s;
 typedef boost::shared_ptr<gr_check_counting_s> gr_check_counting_s_sptr;
 
-gr_check_counting_s_sptr gr_make_check_counting_s (bool do_32bit=false);
+GR_CORE_API gr_check_counting_s_sptr gr_make_check_counting_s (bool do_32bit=false);
 
 /*!
  * \brief sink that checks if its input stream consists of a counting sequence.
@@ -36,9 +37,9 @@ gr_check_counting_s_sptr gr_make_check_counting_s (bool do_32bit=false);
  *
  * This sink is typically used to test the USRP "Counting Mode" or "Counting mode 32 bit".
  */
-class gr_check_counting_s : public gr_sync_block
+class GR_CORE_API gr_check_counting_s : public gr_sync_block
 {
-  friend gr_check_counting_s_sptr gr_make_check_counting_s (bool do_32bit);
+  friend GR_CORE_API gr_check_counting_s_sptr gr_make_check_counting_s (bool do_32bit);
 
   enum state {
     SEARCHING,    // searching for synchronization
diff --git a/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h b/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h
index e2bff46d2..939675db8 100644
--- a/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h
+++ b/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_CHECK_LFSR_32K_S_H
 #define INCLUDED_GR_CHECK_LFSR_32K_S_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gri_lfsr_32k.h>
 
@@ -29,7 +30,7 @@
 class gr_check_lfsr_32k_s;
 typedef boost::shared_ptr<gr_check_lfsr_32k_s> gr_check_lfsr_32k_s_sptr;
 
-gr_check_lfsr_32k_s_sptr gr_make_check_lfsr_32k_s ();
+GR_CORE_API gr_check_lfsr_32k_s_sptr gr_make_check_lfsr_32k_s ();
 
 /*!
  * \brief sink that checks if its input stream consists of a lfsr_32k sequence.
@@ -38,9 +39,9 @@ gr_check_lfsr_32k_s_sptr gr_make_check_lfsr_32k_s ();
  * This sink is typically used along with gr_lfsr_32k_source_s to test
  * the USRP using its digital loopback mode.
  */
-class gr_check_lfsr_32k_s : public gr_sync_block
+class GR_CORE_API gr_check_lfsr_32k_s : public gr_sync_block
 {
-  friend gr_check_lfsr_32k_s_sptr gr_make_check_lfsr_32k_s ();
+  friend GR_CORE_API gr_check_lfsr_32k_s_sptr gr_make_check_lfsr_32k_s ();
 
   enum state {
     SEARCHING,		// searching for synchronization
diff --git a/gnuradio-core/src/lib/general/gr_circular_file.h b/gnuradio-core/src/lib/general/gr_circular_file.h
index 70f4b4b11..3d3f33a8d 100644
--- a/gnuradio-core/src/lib/general/gr_circular_file.h
+++ b/gnuradio-core/src/lib/general/gr_circular_file.h
@@ -23,6 +23,8 @@
 #ifndef _GR_CIRCULAR_FILE_H_
 #define _GR_CIRCULAR_FILE_H_
 
+#include <gr_core_api.h>
+
 /*
  * writes input data into a circular buffer on disk.
  *
@@ -35,7 +37,7 @@
  *		      current start of data
  *
  */
-class gr_circular_file {
+class GR_CORE_API gr_circular_file {
   int		 d_fd;
   int		*d_header;
   unsigned char	*d_buffer;
@@ -55,4 +57,4 @@ public:
   void reset_read_pointer ();
 };
 
-#endif /* _GR_CIRCULAR_FILE_H_ */
+#endif /* _GR_CIRCULAR_FILE_H_ */
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.h b/gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.h
index 0a91eddd6..a3e2d38ad 100644
--- a/gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.h
+++ b/gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_COMPLEX_TO_INTERLEAVED_SHORT_H
 #define INCLUDED_GR_COMPLEX_TO_INTERLEAVED_SHORT_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_complex_to_interleaved_short;
 typedef boost::shared_ptr<gr_complex_to_interleaved_short>
   gr_complex_to_interleaved_short_sptr;
 
-gr_complex_to_interleaved_short_sptr
+GR_CORE_API gr_complex_to_interleaved_short_sptr
 gr_make_complex_to_interleaved_short ();
 
 /*!
@@ -37,9 +38,9 @@ gr_make_complex_to_interleaved_short ();
  * \ingroup converter_blk
  */
 
-class gr_complex_to_interleaved_short : public gr_sync_interpolator
+class GR_CORE_API gr_complex_to_interleaved_short : public gr_sync_interpolator
 {
-  friend gr_complex_to_interleaved_short_sptr gr_make_complex_to_interleaved_short ();
+  friend GR_CORE_API gr_complex_to_interleaved_short_sptr gr_make_complex_to_interleaved_short ();
   gr_complex_to_interleaved_short ();
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_complex_to_xxx.h b/gnuradio-core/src/lib/general/gr_complex_to_xxx.h
index 1851c67d9..166403259 100644
--- a/gnuradio-core/src/lib/general/gr_complex_to_xxx.h
+++ b/gnuradio-core/src/lib/general/gr_complex_to_xxx.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_COMPLEX_TO_XXX_H
 #define INCLUDED_GR_COMPLEX_TO_XXX_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_complex.h>
 
@@ -40,21 +41,21 @@ typedef boost::shared_ptr<gr_complex_to_mag> gr_complex_to_mag_sptr;
 typedef boost::shared_ptr<gr_complex_to_mag_squared> gr_complex_to_mag_squared_sptr;
 typedef boost::shared_ptr<gr_complex_to_arg> gr_complex_to_arg_sptr;
 
-gr_complex_to_float_sptr gr_make_complex_to_float (unsigned int vlen=1);
-gr_complex_to_real_sptr gr_make_complex_to_real (unsigned int vlen=1);
-gr_complex_to_imag_sptr gr_make_complex_to_imag (unsigned int vlen=1);
-gr_complex_to_mag_sptr gr_make_complex_to_mag (unsigned int vlen=1);
-gr_complex_to_mag_squared_sptr gr_make_complex_to_mag_squared (unsigned int vlen=1);
-gr_complex_to_arg_sptr gr_make_complex_to_arg (unsigned int vlen=1);
+GR_CORE_API gr_complex_to_float_sptr gr_make_complex_to_float (unsigned int vlen=1);
+GR_CORE_API gr_complex_to_real_sptr gr_make_complex_to_real (unsigned int vlen=1);
+GR_CORE_API gr_complex_to_imag_sptr gr_make_complex_to_imag (unsigned int vlen=1);
+GR_CORE_API gr_complex_to_mag_sptr gr_make_complex_to_mag (unsigned int vlen=1);
+GR_CORE_API gr_complex_to_mag_squared_sptr gr_make_complex_to_mag_squared (unsigned int vlen=1);
+GR_CORE_API gr_complex_to_arg_sptr gr_make_complex_to_arg (unsigned int vlen=1);
 
 /*!
  * \brief convert a stream of gr_complex to 1 or 2 streams of float
  * \ingroup converter_blk
  * \param vlen	vector len (default 1)
  */
-class gr_complex_to_float : public gr_sync_block
+class GR_CORE_API gr_complex_to_float : public gr_sync_block
 {
-  friend gr_complex_to_float_sptr gr_make_complex_to_float (unsigned int vlen);
+  friend GR_CORE_API gr_complex_to_float_sptr gr_make_complex_to_float (unsigned int vlen);
   gr_complex_to_float (unsigned int vlen);
 
   unsigned int	d_vlen;
@@ -70,9 +71,9 @@ class gr_complex_to_float : public gr_sync_block
  * \ingroup converter_blk
  * \param vlen	vector len (default 1)
  */
-class gr_complex_to_real : public gr_sync_block
+class GR_CORE_API gr_complex_to_real : public gr_sync_block
 {
-  friend gr_complex_to_real_sptr gr_make_complex_to_real (unsigned int vlen);
+  friend GR_CORE_API gr_complex_to_real_sptr gr_make_complex_to_real (unsigned int vlen);
   gr_complex_to_real (unsigned int vlen);
 
   unsigned int	d_vlen;
@@ -88,9 +89,9 @@ class gr_complex_to_real : public gr_sync_block
  * \ingroup converter_blk
  * \param vlen	vector len (default 1)
  */
-class gr_complex_to_imag : public gr_sync_block
+class GR_CORE_API gr_complex_to_imag : public gr_sync_block
 {
-  friend gr_complex_to_imag_sptr gr_make_complex_to_imag (unsigned int vlen);
+  friend GR_CORE_API gr_complex_to_imag_sptr gr_make_complex_to_imag (unsigned int vlen);
   gr_complex_to_imag (unsigned int vlen);
 
   unsigned int	d_vlen;
@@ -106,9 +107,9 @@ class gr_complex_to_imag : public gr_sync_block
  * \ingroup converter_blk
  * \param vlen	vector len (default 1)
  */
-class gr_complex_to_mag : public gr_sync_block
+class GR_CORE_API gr_complex_to_mag : public gr_sync_block
 {
-  friend gr_complex_to_mag_sptr gr_make_complex_to_mag (unsigned int vlen);
+  friend GR_CORE_API gr_complex_to_mag_sptr gr_make_complex_to_mag (unsigned int vlen);
   gr_complex_to_mag (unsigned int vlen);
 
   unsigned int	d_vlen;
@@ -124,9 +125,9 @@ class gr_complex_to_mag : public gr_sync_block
  * \ingroup converter_blk
  * \param vlen	vector len (default 1)
  */
-class gr_complex_to_mag_squared : public gr_sync_block
+class GR_CORE_API gr_complex_to_mag_squared : public gr_sync_block
 {
-  friend gr_complex_to_mag_squared_sptr gr_make_complex_to_mag_squared (unsigned int vlen);
+  friend GR_CORE_API gr_complex_to_mag_squared_sptr gr_make_complex_to_mag_squared (unsigned int vlen);
   gr_complex_to_mag_squared (unsigned int vlen);
 
   unsigned int	d_vlen;
@@ -142,9 +143,9 @@ class gr_complex_to_mag_squared : public gr_sync_block
  * \ingroup converter_blk
  * \param vlen	vector len (default 1)
  */
-class gr_complex_to_arg : public gr_sync_block
+class GR_CORE_API gr_complex_to_arg : public gr_sync_block
 {
-  friend gr_complex_to_arg_sptr gr_make_complex_to_arg (unsigned int vlen);
+  friend GR_CORE_API gr_complex_to_arg_sptr gr_make_complex_to_arg (unsigned int vlen);
   gr_complex_to_arg (unsigned int vlen);
 
   unsigned int	d_vlen;
diff --git a/gnuradio-core/src/lib/general/gr_conjugate_cc.h b/gnuradio-core/src/lib/general/gr_conjugate_cc.h
index 783019adb..16e76e153 100644
--- a/gnuradio-core/src/lib/general/gr_conjugate_cc.h
+++ b/gnuradio-core/src/lib/general/gr_conjugate_cc.h
@@ -25,20 +25,21 @@
 #ifndef INCLUDED_GR_CONJUGATE_CC_H
 #define INCLUDED_GR_CONJUGATE_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_conjugate_cc;
 typedef boost::shared_ptr<gr_conjugate_cc> gr_conjugate_cc_sptr;
 
-gr_conjugate_cc_sptr gr_make_conjugate_cc ();
+GR_CORE_API gr_conjugate_cc_sptr gr_make_conjugate_cc ();
 
 /*!
  * \brief output = complex conjugate of input
  * \ingroup math_blk
  */
-class gr_conjugate_cc : public gr_sync_block
+class GR_CORE_API gr_conjugate_cc : public gr_sync_block
 {
-  friend gr_conjugate_cc_sptr gr_make_conjugate_cc ();
+  friend GR_CORE_API gr_conjugate_cc_sptr gr_make_conjugate_cc ();
 
   gr_conjugate_cc ();
 
diff --git a/gnuradio-core/src/lib/general/gr_constants.h b/gnuradio-core/src/lib/general/gr_constants.h
index 449d41c17..3d21fe1d6 100644
--- a/gnuradio-core/src/lib/general/gr_constants.h
+++ b/gnuradio-core/src/lib/general/gr_constants.h
@@ -22,31 +22,32 @@
 #ifndef INCLUDED_GR_CONSTANTS_H
 #define INCLUDED_GR_CONSTANTS_H
 
+#include <gr_core_api.h>
 #include <string>
 
 /*!
  * \brief return ./configure --prefix argument.  Typically /usr/local
  */
-const std::string gr_prefix();
+GR_CORE_API const std::string gr_prefix();
 
 /*!
  * \brief return ./configure --sysconfdir argument.  Typically $prefix/etc or /etc
  */
-const std::string gr_sysconfdir();
+GR_CORE_API const std::string gr_sysconfdir();
 
 /*!
  * \brief return preferences file directory.  Typically $sysconfdir/etc/conf.d
  */
-const std::string gr_prefsdir();
+GR_CORE_API const std::string gr_prefsdir();
 
 /*!
  * \brief return date/time of build, as set when 'bootstrap' is run
  */
-const std::string gr_build_date();
+GR_CORE_API const std::string gr_build_date();
 
 /*!
  * \brief return version string defined in configure.ac
  */
-const std::string gr_version();
+GR_CORE_API const std::string gr_version();
 
 #endif /* INCLUDED_GR_CONSTANTS_H */
diff --git a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc b/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc
deleted file mode 100644
index 5b87f1430..000000000
--- a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc
+++ /dev/null
@@ -1,114 +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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_constellation_decoder_cb.h>
-#include <gr_io_signature.h>
-#include <stdexcept>
-
-#include <cstdio>
-#include <iostream>
-using std::cout;
-using std::endl;
-
-static const bool compute_EVM = false;
-
-gr_constellation_decoder_cb_sptr
-gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-				  const std::vector<unsigned char> &sym_value_out)
-{
-  return gr_constellation_decoder_cb_sptr 
-		(new gr_constellation_decoder_cb(sym_position, sym_value_out));
-}
-
-gr_constellation_decoder_cb::
-gr_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-			     const std::vector<unsigned char> &sym_value_out)
-  : gr_sync_block ("constellation_decoder_cb",
-		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
-		   gr_make_io_signature (1, 1, sizeof (unsigned char)))	
-{
-  if (!set_constellation(sym_position,sym_value_out))
-    throw std::invalid_argument("constellation_decoder_cb");
-}
-
-
-gr_constellation_decoder_cb::~gr_constellation_decoder_cb(){}
-
-
-bool
-gr_constellation_decoder_cb::set_constellation(const std::vector<gr_complex> &sym_position, 
-			                       const std::vector<unsigned char> &sym_value_out)
-{
-  if (sym_position.size() != sym_value_out.size())
-    return false;
-
-  if (sym_position.size()<1)
-    return false;
-
-  d_sym_position  = sym_position;
-  d_sym_value_out = sym_value_out;	
-  return true;
-}
-
-
-int
-gr_constellation_decoder_cb::work(int noutput_items,
-				  gr_vector_const_void_star &input_items,
-				  gr_vector_void_star &output_items)
-{
-  gr_complex const *in = (const gr_complex *) input_items[0];
-  unsigned char *out = (unsigned char *) output_items[0];
-  unsigned int table_size = d_sym_value_out.size();
-  unsigned int min_index = 0;
-  float min_euclid_dist = 0;
-  float euclid_dist = 0;
-  double total_error = 0;
-    
-  for(int i = 0; i < noutput_items; i++){
-    min_euclid_dist = norm(in[i] - d_sym_position[0]); 
-    min_index = 0; 
-    for (unsigned int j = 1; j < table_size; j++){
-      euclid_dist = norm(in[i] - d_sym_position[j]);
-      if (euclid_dist < min_euclid_dist){
-	min_euclid_dist = euclid_dist;
-	min_index = j;
-      }
-    }
-
-    out[i] = d_sym_value_out[min_index];
-
-    if (compute_EVM)
-      total_error += sqrtf(min_euclid_dist);
-  }
-
-  if (compute_EVM){
-    double mean = total_error / noutput_items;
-    double rms = sqrt(mean * mean);
-    fprintf(stderr, "EVM = %8.4f\n", rms);
-  }
-
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h b/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h
deleted file mode 100644
index fd7079c12..000000000
--- a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h
+++ /dev/null
@@ -1,65 +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_GR_CONSTELLATION_DECODER_CB_H
-#define INCLUDED_GR_CONSTELLATION_DECODER_CB_H
-
-#include <gr_sync_block.h>
-#include <vector>
-
-class gr_constellation_decoder_cb;
-typedef boost::shared_ptr<gr_constellation_decoder_cb> gr_constellation_decoder_cb_sptr;
-
-gr_constellation_decoder_cb_sptr 
-	gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position,
-					  const std::vector<unsigned char> &sym_value_out);
-
-/*!
- * \brief Constellation Decoder
- * \ingroup coding_blk
- *
- */
-class gr_constellation_decoder_cb : public gr_sync_block
-{
-
- private:
-  std::vector<gr_complex> d_sym_position;
-  std::vector<unsigned char> d_sym_value_out;
-
-  friend gr_constellation_decoder_cb_sptr 
-		gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 						          const std::vector<unsigned char> &sym_value_out);
-  
-  gr_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-                               const std::vector<unsigned char> &sym_value_out);  //constructor
-
- public:
-  bool set_constellation(const std::vector<gr_complex> &sym_position, 
-                        const std::vector<unsigned char> &sym_value_out);
-
-  ~gr_constellation_decoder_cb();	//destructor
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.i b/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.i
deleted file mode 100644
index 8d9c9b56e..000000000
--- a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.i
+++ /dev/null
@@ -1,43 +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.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,constellation_decoder_cb)
-
-gr_constellation_decoder_cb_sptr 
-	gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-                                          const std::vector<unsigned char> &sym_value_out);
-
-class gr_constellation_decoder_cb : public gr_sync_block
-{
- private:
-  gr_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-                               const std::vector<unsigned char> &sym_value_out);
-
-  friend gr_constellation_decoder_cb_sptr 
-  	gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 	
-                                          const std::vector<unsigned char> &sym_value_out);
-
- public:
-  int set_constellation(const std::vector<gr_complex> &sym_position, 
-                        const std::vector<unsigned char> &sym_value_out);
-  ~gr_constellation_decoder_cb();
-};
diff --git a/gnuradio-core/src/lib/general/gr_copy.h b/gnuradio-core/src/lib/general/gr_copy.h
index d99aef8b7..7fb13bf68 100644
--- a/gnuradio-core/src/lib/general/gr_copy.h
+++ b/gnuradio-core/src/lib/general/gr_copy.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_COPY_H
 #define INCLUDED_GR_COPY_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 class gr_copy;
 typedef boost::shared_ptr<gr_copy> gr_copy_sptr;
 
-gr_copy_sptr gr_make_copy(size_t itemsize);
+GR_CORE_API gr_copy_sptr gr_make_copy(size_t itemsize);
 
 /*!
  * \brief output[i] = input[i]
@@ -38,12 +39,12 @@ gr_copy_sptr gr_make_copy(size_t itemsize);
  * When disabled, this block drops its input on the floor.
  *
  */
-class gr_copy : public gr_block
+class GR_CORE_API gr_copy : public gr_block
 {
   size_t		d_itemsize;
   bool			d_enabled;
 
-  friend gr_copy_sptr gr_make_copy(size_t itemsize);
+  friend GR_CORE_API gr_copy_sptr gr_make_copy(size_t itemsize);
   gr_copy(size_t itemsize);
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_core_api.h b/gnuradio-core/src/lib/general/gr_core_api.h
new file mode 100644
index 000000000..74c802857
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_core_api.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-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_CORE_API_H
+#define INCLUDED_GR_CORE_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_core_EXPORTS
+#  define GR_CORE_API __GR_ATTR_EXPORT
+#else
+#  define GR_CORE_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_GR_CORE_API_H */
diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h
index 1067bbc56..e543f5cfb 100644
--- a/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h
+++ b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_gr_correlate_access_code_tag_bb_H
 #define INCLUDED_gr_correlate_access_code_tag_bb_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <string>
 
@@ -34,7 +35,7 @@ typedef boost::shared_ptr<gr_correlate_access_code_tag_bb> gr_correlate_access_c
  * \param threshold maximum number of bits that may be wrong
  * \param tag_name key of the tag inserted into the tag stream
  */
-gr_correlate_access_code_tag_bb_sptr 
+GR_CORE_API gr_correlate_access_code_tag_bb_sptr 
 gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold,
 				      const std::string &tag_name);
 
@@ -49,9 +50,9 @@ gr_make_correlate_access_code_tag_bb (const std::string &access_code, int thresh
  * name [tag_name], specified in the constructor. Used for searching
  * an input data stream for preambles, etc.
  */
-class gr_correlate_access_code_tag_bb : public gr_sync_block
+class GR_CORE_API gr_correlate_access_code_tag_bb : public gr_sync_block
 {
-  friend gr_correlate_access_code_tag_bb_sptr 
+  friend GR_CORE_API gr_correlate_access_code_tag_bb_sptr 
   gr_make_correlate_access_code_tag_bb (const std::string &access_code, int threshold,
 					const std::string &tag_name);
  private:
diff --git a/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc b/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
deleted file mode 100644
index f3bfd0951..000000000
--- a/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_costas_loop_cc.h>
-#include <gr_io_signature.h>
-#include <gr_expj.h>
-#include <gr_sincos.h>
-#include <math.h>
-
-#define M_TWOPI (2*M_PI)
-
-gr_costas_loop_cc_sptr
-gr_make_costas_loop_cc (float alpha, float beta,
-			float max_freq, float min_freq,
-			int order
-			) throw (std::invalid_argument)
-{
-  return gnuradio::get_initial_sptr(new gr_costas_loop_cc (alpha, beta,
-							max_freq, min_freq,
-							order));
-}
-
-gr_costas_loop_cc::gr_costas_loop_cc (float alpha, float beta,
-				      float max_freq, float min_freq,
-				      int order
-				      ) throw (std::invalid_argument)
-  : gr_sync_block ("costas_loop_cc",
-		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
-		   gr_make_io_signature (1, 2, sizeof (gr_complex))),
-    d_alpha(alpha), d_beta(beta), 
-    d_max_freq(max_freq), d_min_freq(min_freq),
-    d_phase(0), d_freq((max_freq+min_freq)/2),
-    d_order(order), d_phase_detector(0)
-{
-  switch(d_order) {
-  case 2:
-    d_phase_detector = &gr_costas_loop_cc::phase_detector_2;
-    break;
-
-  case 4:
-    d_phase_detector = &gr_costas_loop_cc::phase_detector_4;
-    break;
-
-  default: 
-    throw std::invalid_argument("order must be 2 or 4");
-    break;
-  }
-}
-
-
-float
-gr_costas_loop_cc::phase_detector_4(gr_complex sample) const
-{
-
-  return ((sample.real()>0 ? 1.0 : -1.0) * sample.imag() -
-	  (sample.imag()>0 ? 1.0 : -1.0) * sample.real());
-}
-
-float
-gr_costas_loop_cc::phase_detector_2(gr_complex sample) const
-{
-  return (sample.real()*sample.imag());
-}
-
-void
-gr_costas_loop_cc::set_alpha(float alpha)
-{
-  d_alpha = alpha;
-}
-
-void
-gr_costas_loop_cc::set_beta(float beta)
-{
-  d_beta = beta;
-}
-
-int
-gr_costas_loop_cc::work (int noutput_items,
-			 gr_vector_const_void_star &input_items,
-			 gr_vector_void_star &output_items)
-{
-  const gr_complex *iptr = (gr_complex *) input_items[0];
-  gr_complex *optr = (gr_complex *) output_items[0];
-  gr_complex *foptr = (gr_complex *) output_items[1];
-
-  bool write_foptr = output_items.size() >= 2;
-
-  float error;
-  gr_complex nco_out;
-  
-  if (write_foptr) {
-
-    for (int i = 0; i < noutput_items; i++){
-      nco_out = gr_expj(-d_phase);
-      optr[i] = iptr[i] * nco_out;
-      
-      error = (*this.*d_phase_detector)(optr[i]);
-      if (error > 1)
-	error = 1;
-      else if (error < -1)
-	error = -1;
-      
-      d_freq = d_freq + d_beta * error;
-      d_phase = d_phase + d_freq + d_alpha * error;
-      
-      while(d_phase>M_TWOPI)
-	d_phase -= M_TWOPI;
-      while(d_phase<-M_TWOPI)
-	d_phase += M_TWOPI;
-      
-      if (d_freq > d_max_freq)
-	d_freq = d_max_freq;
-      else if (d_freq < d_min_freq)
-	d_freq = d_min_freq;
-      
-      foptr[i] = gr_complex(d_freq,0);
-    } 
-  } else {
-    for (int i = 0; i < noutput_items; i++){
-      nco_out = gr_expj(-d_phase);
-      optr[i] = iptr[i] * nco_out;
-      
-      error = (*this.*d_phase_detector)(optr[i]);
-      if (error > 1)
-	error = 1;
-      else if (error < -1)
-	error = -1;
-      
-      d_freq = d_freq + d_beta * error;
-      d_phase = d_phase + d_freq + d_alpha * error;
-      
-      while(d_phase>M_TWOPI)
-	d_phase -= M_TWOPI;
-      while(d_phase<-M_TWOPI)
-	d_phase += M_TWOPI;
-      
-      if (d_freq > d_max_freq)
-	d_freq = d_max_freq;
-      else if (d_freq < d_min_freq)
-	d_freq = d_min_freq;
-      
-    }
-  }
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_count_bits.h b/gnuradio-core/src/lib/general/gr_count_bits.h
index a8b52d3ac..f0cec2a11 100644
--- a/gnuradio-core/src/lib/general/gr_count_bits.h
+++ b/gnuradio-core/src/lib/general/gr_count_bits.h
@@ -23,9 +23,11 @@
 #ifndef _GR_COUNT_BITS_H_
 #define _GR_COUNT_BITS_H_
 
-unsigned int gr_count_bits8(unsigned int x);	// return number of set bits in the low  8 bits of x
-unsigned int gr_count_bits16(unsigned int x);	// return number of set bits in the low 16 bits of x
-unsigned int gr_count_bits32(unsigned int x);	// return number of set bits in the low 32 bits of x
-unsigned int gr_count_bits64(unsigned long long int x);
+#include <gr_core_api.h>
+
+GR_CORE_API unsigned int gr_count_bits8(unsigned int x);	// return number of set bits in the low  8 bits of x
+GR_CORE_API unsigned int gr_count_bits16(unsigned int x);	// return number of set bits in the low 16 bits of x
+GR_CORE_API unsigned int gr_count_bits32(unsigned int x);	// return number of set bits in the low 32 bits of x
+GR_CORE_API unsigned int gr_count_bits64(unsigned long long int x);
 
 #endif /* _GR_COUNT_BITS_H_ */
diff --git a/gnuradio-core/src/lib/general/gr_cpfsk_bc.h b/gnuradio-core/src/lib/general/gr_cpfsk_bc.h
index 29bcfed65..4afba4fb4 100644
--- a/gnuradio-core/src/lib/general/gr_cpfsk_bc.h
+++ b/gnuradio-core/src/lib/general/gr_cpfsk_bc.h
@@ -20,13 +20,14 @@
 #ifndef INCLUDED_GR_CPFSK_BC_H
 #define INCLUDED_GR_CPFSK_BC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_cpfsk_bc;
 
 typedef boost::shared_ptr<gr_cpfsk_bc> gr_cpfsk_bc_sptr;
 
-gr_cpfsk_bc_sptr gr_make_cpfsk_bc(float k, float ampl, int samples_per_sym);
+GR_CORE_API gr_cpfsk_bc_sptr gr_make_cpfsk_bc(float k, float ampl, int samples_per_sym);
 
 /*!
  * \brief Perform continuous phase 2-level frequency shift keying modulation 
@@ -38,10 +39,10 @@ gr_cpfsk_bc_sptr gr_make_cpfsk_bc(float k, float ampl, int samples_per_sym);
  * \param samples_per_sym	number of output samples per input bit
  */
 
-class gr_cpfsk_bc : public gr_sync_interpolator
+class GR_CORE_API gr_cpfsk_bc : public gr_sync_interpolator
 {
 private:
-  friend gr_cpfsk_bc_sptr gr_make_cpfsk_bc(float k, float ampl, int samples_per_sym);
+  friend GR_CORE_API gr_cpfsk_bc_sptr gr_make_cpfsk_bc(float k, float ampl, int samples_per_sym);
 
   gr_cpfsk_bc(float k, float ampl, int samples_per_sym);
 
diff --git a/gnuradio-core/src/lib/general/gr_cpm.cc b/gnuradio-core/src/lib/general/gr_cpm.cc
new file mode 100644
index 000000000..94a428c58
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_cpm.cc
@@ -0,0 +1,218 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 Free Software Foundation, Inc.
+ * 
+ * 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.
+ */
+
+// Calculate the taps for the CPM phase responses
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <cmath>
+#include <cfloat>
+#include <gr_cpm.h>
+
+//gives us erf on compilers without it
+#include <boost/math/special_functions/erf.hpp>
+namespace bm = boost::math;
+
+#ifndef M_TWOPI
+#  define M_TWOPI (2*M_PI)
+#endif
+
+//! Normalised sinc function, sinc(x)=sin(pi*x)/pi*x
+inline double
+sinc(double x)
+{
+	if (x == 0) {
+		return 1.0;
+	}
+
+	return sin(M_PI * x) / (M_PI * x);
+}
+
+
+//! Taps for L-RC CPM (Raised cosine of length L symbols)
+std::vector<float>
+generate_cpm_lrc_taps(unsigned samples_per_sym, unsigned L)
+{
+	std::vector<float> taps(samples_per_sym * L, 1.0/L/samples_per_sym);
+	for (unsigned i = 0; i < samples_per_sym * L; i++) {
+		taps[i] *= 1 - cos(M_TWOPI * i / L / samples_per_sym);
+	}
+
+	return taps;
+}
+
+
+/*! Taps for L-SRC CPM (Spectral raised cosine of length L symbols).
+ *
+ * L-SRC has a time-continuous phase response function of
+ *
+ * g(t) = 1/LT * sinc(2t/LT) * cos(beta * 2pi t / LT) / (1 - (4beta / LT * t)^2)
+ *
+ * which is the Fourier transform of a cos-rolloff function with rolloff
+ * beta, and looks like a sinc-function, multiplied with a rolloff term.
+ * We return the main lobe of the sinc, i.e., everything between the
+ * zero crossings.
+ * The time-discrete IR is thus
+ *
+ * g(k) = 1/Ls * sinc(2k/Ls) * cos(beta * pi k / Ls) / (1 - (4beta / Ls * k)^2)
+ * where k = 0...Ls-1
+ * and s = samples per symbol.
+ */
+std::vector<float>
+generate_cpm_lsrc_taps(unsigned samples_per_sym, unsigned L, double beta)
+{
+	double Ls = (double) L * samples_per_sym;
+	std::vector<double> taps_d(L * samples_per_sym, 0.0);
+	std::vector<float> taps(L * samples_per_sym, 0.0);
+
+	double sum = 0;
+	for (unsigned i = 0; i < samples_per_sym * L; i++) {
+		double k =  i - Ls/2; // Causal to acausal
+
+		taps_d[i] = 1.0 / Ls * sinc(2.0 * k / Ls);
+
+		// For k = +/-Ls/4*beta, the rolloff term's cos-function becomes zero
+		// and the whole thing converges to PI/4 (to prove this, use de
+		// l'hopital's rule).
+		if (fabs(fabs(k) - Ls/4/beta) < 2*DBL_EPSILON) {
+			taps_d[i] *= M_PI_4;
+		} else {
+			double tmp = 4.0 * beta * k / Ls;
+			taps_d[i] *= cos(beta * M_TWOPI * k / Ls) / (1 - tmp * tmp);
+		}
+		sum += taps_d[i];
+	}
+	for (unsigned i = 0; i < samples_per_sym * L; i++) {
+		taps[i] = (float) taps_d[i] / sum;
+	}
+
+	return taps;
+}
+
+
+//! Taps for L-REC CPM (Rectangular pulse shape of length L symbols)
+std::vector<float>
+generate_cpm_lrec_taps(unsigned samples_per_sym, unsigned L)
+{
+	return std::vector<float>(samples_per_sym * L, 1.0/L/samples_per_sym);
+}
+
+
+//! Helper function for TFM
+double tfm_g0(double k, double sps)
+{
+	if (fabs(k) < 2 * DBL_EPSILON) {
+		return 1.145393004159143; // 1 + pi^2/48 / sqrt(2)
+	}
+
+	const double pi2_24 = 0.411233516712057; // pi^2/24
+	double f = M_PI * k / sps;
+	return sinc(k/sps) - pi2_24 * (2 * sin(f) - 2*f*cos(f) - f*f*sin(f)) / (f*f*f);
+}
+
+
+//! Taps for TFM CPM (Tamed frequency modulation)
+//
+// See [2, Chapter 2.7.2].
+//
+// [2]: Anderson, Aulin and Sundberg; Digital Phase Modulation
+std::vector<float>
+generate_cpm_tfm_taps(unsigned sps, unsigned L)
+{
+	unsigned causal_shift = sps * L / 2;
+	std::vector<double> taps_d(sps * L, 0.0);
+	std::vector<float> taps(sps * L, 0.0);
+
+	double sum = 0;
+	for (unsigned i = 0; i < sps * L; i++) {
+		double k = (double)(((int)i) - ((int)causal_shift)); // Causal to acausal
+
+		taps_d[i] =     tfm_g0(k - sps, sps) +
+		            2 * tfm_g0(k,       sps) +
+		                tfm_g0(k + sps, sps);
+		sum += taps_d[i];
+	}
+	for (unsigned i = 0; i < sps * L; i++) {
+		taps[i] = (float) taps_d[i] / sum;
+	}
+
+	return taps;
+}
+
+
+//! Taps for Gaussian CPM. Phase response is truncated after \p L symbols.
+//  \p bt sets the 3dB-time-bandwidth product.
+//
+// Note: for h = 0.5, this is the phase response for GMSK.
+//
+// This C99-compatible formula for the taps is taken straight
+// from [1, Chapter 9.2.3].
+// A version in Q-notation can be found in [2, Chapter 2.7.2].
+//
+// [1]: Karl-Dirk Kammeyer; Nachrichtenübertragung, 4th Edition.
+// [2]: Anderson, Aulin and Sundberg; Digital Phase Modulation
+//
+std::vector<float>
+generate_cpm_gaussian_taps(unsigned samples_per_sym, unsigned L, double bt)
+{
+	double Ls = (double) L * samples_per_sym;
+	std::vector<double> taps_d(L * samples_per_sym, 0.0);
+	std::vector<float> taps(L * samples_per_sym, 0.0);
+
+	// alpha = sqrt(2/ln(2)) * pi * BT
+	double alpha = 5.336446256636997 * bt;
+	for (unsigned i = 0; i < samples_per_sym * L; i++) {
+		double k =  i - Ls/2; // Causal to acausal
+		taps_d[i] = (bm::erf(alpha * (k / samples_per_sym + 0.5)) -
+		             bm::erf(alpha * (k / samples_per_sym - 0.5)))
+			        * 0.5 / samples_per_sym;
+		taps[i] = (float) taps_d[i];
+	}
+
+	return taps;
+}
+
+
+std::vector<float>
+gr_cpm::phase_response(cpm_type type, unsigned samples_per_sym, unsigned L, double beta)
+{
+	switch (type) {
+		case LRC:
+			return generate_cpm_lrc_taps(samples_per_sym, L);
+
+		case LSRC:
+			return generate_cpm_lsrc_taps(samples_per_sym, L, beta);
+
+		case LREC:
+			return generate_cpm_lrec_taps(samples_per_sym, L);
+
+		case TFM:
+			return generate_cpm_tfm_taps(samples_per_sym, L);
+
+		case GAUSSIAN:
+			return generate_cpm_gaussian_taps(samples_per_sym, L, beta);
+
+		default:
+			return generate_cpm_lrec_taps(samples_per_sym, 1);
+	}
+}
+
diff --git a/gnuradio-core/src/lib/general/gr_cpm.h b/gnuradio-core/src/lib/general/gr_cpm.h
new file mode 100644
index 000000000..ef2ff8414
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_cpm.h
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 Free Software Foundation, Inc.
+ *
+ * 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_CPM_H
+#define INCLUDED_GR_CPM_H
+
+#include <gr_core_api.h>
+#include <vector>
+
+class GR_CORE_API gr_cpm
+{
+ public:
+	enum cpm_type {
+	 LRC,
+	 LSRC,
+	 LREC,
+	 TFM,
+	 GAUSSIAN,
+	 GENERIC = 999
+	};
+
+    /*! \brief Return the taps for an interpolating FIR filter (gr_interp_fir_filter_fff).
+	 *
+	 * These taps represent the phase response \f$g(k)\f$ for use in a CPM modulator,
+	 * see also gr_cpmmod_bc.
+	 *
+	 * \param type The CPM type (Rectangular, Raised Cosine, Spectral Raised Cosine,
+	 *             Tamed FM or Gaussian).
+	 * \param samples_per_sym Samples per symbol.
+	 * \param L The length of the phase response in symbols.
+	 * \param beta For Spectral Raised Cosine, this is the rolloff factor. For Gaussian
+	 *             phase responses, this the 3dB-time-bandwidth product. For all other
+	 *             cases, it is ignored.
+	 *
+	 * Output: returns a vector of length \a K = \p samples_per_sym x \p L.
+	 *         This can be used directly in an interpolating FIR filter such as
+	 *         gr_interp_fir_filter_fff with interpolation factor \p samples_per_sym.
+	 *
+	 * All phase responses are normalised s.t. \f$ \sum_{k=0}^{K-1} g(k) = 1\f$; this will cause
+	 * a maximum phase change of \f$ h \cdot \pi\f$ between two symbols, where \a h is the
+	 * modulation index.
+	 *
+	 * The following phase responses can be generated:
+	 * - LREC: Rectangular phase response.
+	 * - LRC: Raised cosine phase response, looks like 1 - cos(x).
+	 * - LSRC: Spectral raised cosine. This requires a rolloff factor beta.
+	 *         The phase response is the Fourier transform of raised cosine
+	 *         function.
+	 * - TFM: Tamed frequency modulation. This scheme minimizes phase change for
+	 *        rapidly varying input symbols.
+	 * - GAUSSIAN: A Gaussian phase response. For a modulation index h = 1/2, this
+	 *             results in GMSK.
+	 *
+	 * A short description of all these phase responses can be found in [1].
+	 *
+	 * [1]: Anderson, Aulin and Sundberg; Digital Phase Modulation
+     */
+	static std::vector<float>
+	phase_response(cpm_type type, unsigned samples_per_sym, unsigned L, double beta=0.3);
+};
+
+#endif /* INCLUDED_GR_CPM_H */
+
diff --git a/gnuradio-core/src/lib/general/gr_cpm.i b/gnuradio-core/src/lib/general/gr_cpm.i
new file mode 100644
index 000000000..f01aba34e
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_cpm.i
@@ -0,0 +1,40 @@
+/* -*- C++ -*- */
+/*
+ * Copyright 2010 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.
+ */
+
+%rename(cpm) gr_cpm;
+
+class gr_cpm
+{
+ public:
+	enum cpm_type {
+	 LRC,
+	 LSRC,
+	 LREC,
+	 TFM,
+	 GAUSSIAN,
+	 GENERIC = 999
+	};
+
+	static std::vector<float>
+	phase_response(cpm_type type, unsigned samples_per_sym, unsigned L, double beta=0.3);
+};
+
diff --git a/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h b/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h
index 49df785ff..664c40846 100644
--- a/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h
+++ b/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h
@@ -23,20 +23,21 @@
 #ifndef INCLUDED_GR_CTCSS_SQUELCH_FF_H
 #define INCLUDED_GR_CTCSS_SQUELCH_FF_H
 
+#include <gr_core_api.h>
 #include <gr_squelch_base_ff.h>
 #include <gri_goertzel.h>
 
 class gr_ctcss_squelch_ff;
 typedef boost::shared_ptr<gr_ctcss_squelch_ff> gr_ctcss_squelch_ff_sptr;
 
-gr_ctcss_squelch_ff_sptr 
+GR_CORE_API gr_ctcss_squelch_ff_sptr 
 gr_make_ctcss_squelch_ff(int rate, float freq, float level=0.01, int len=0, int ramp=0, bool gate=false);
 
 /*!
  * \brief gate or zero output if ctcss tone not present
  * \ingroup level_blk
  */
-class gr_ctcss_squelch_ff : public gr_squelch_base_ff
+class GR_CORE_API gr_ctcss_squelch_ff : public gr_squelch_base_ff
 {
 private:
   float d_freq;
@@ -48,7 +49,7 @@ private:
   gri_goertzel d_goertzel_c;
   gri_goertzel d_goertzel_r;
 
-  friend gr_ctcss_squelch_ff_sptr gr_make_ctcss_squelch_ff(int rate, float freq, float level, int len, int ramp, bool gate);
+  friend GR_CORE_API gr_ctcss_squelch_ff_sptr gr_make_ctcss_squelch_ff(int rate, float freq, float level, int len, int ramp, bool gate);
   gr_ctcss_squelch_ff(int rate, float freq, float level, int len, int ramp, bool gate);
 
   int find_tone(float freq);
diff --git a/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.h b/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.h
index 50a6c9d89..3db250101 100644
--- a/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.h
+++ b/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.h
@@ -20,17 +20,18 @@
 #ifndef INCLUDED_GR_DECODE_CCSDS_27_FB_H
 #define INCLUDED_GR_DECODE_CCSDS_27_FB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 extern "C" {
-#include "../viterbi/viterbi.h"
+#include <viterbi.h>
 }
 
 class gr_decode_ccsds_27_fb;
 
 typedef boost::shared_ptr<gr_decode_ccsds_27_fb> gr_decode_ccsds_27_fb_sptr;
 
-gr_decode_ccsds_27_fb_sptr gr_make_decode_ccsds_27_fb();
+GR_CORE_API gr_decode_ccsds_27_fb_sptr gr_make_decode_ccsds_27_fb();
 
 /*! \brief A rate 1/2, k=7 convolutional decoder for the CCSDS standard
  * \ingroup ecc
@@ -51,10 +52,10 @@ gr_decode_ccsds_27_fb_sptr gr_make_decode_ccsds_27_fb();
  * from the corresponding inputs.
  */
 
-class gr_decode_ccsds_27_fb : public gr_sync_decimator
+class GR_CORE_API gr_decode_ccsds_27_fb : public gr_sync_decimator
 {
 private:
-  friend gr_decode_ccsds_27_fb_sptr gr_make_decode_ccsds_27_fb();
+  friend GR_CORE_API gr_decode_ccsds_27_fb_sptr gr_make_decode_ccsds_27_fb();
 
   gr_decode_ccsds_27_fb();
 
diff --git a/gnuradio-core/src/lib/general/gr_deinterleave.h b/gnuradio-core/src/lib/general/gr_deinterleave.h
index 59c310bdc..3dd913911 100644
--- a/gnuradio-core/src/lib/general/gr_deinterleave.h
+++ b/gnuradio-core/src/lib/general/gr_deinterleave.h
@@ -23,20 +23,21 @@
 #ifndef INCLUDED_GR_DEINTERLEAVE_H
 #define INCLUDED_GR_DEINTERLEAVE_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 class gr_deinterleave;
 typedef boost::shared_ptr<gr_deinterleave> gr_deinterleave_sptr;
 
-gr_deinterleave_sptr gr_make_deinterleave (size_t itemsize);
+GR_CORE_API gr_deinterleave_sptr gr_make_deinterleave (size_t itemsize);
 
 /*!
  * \brief deinterleave a single input into N outputs
  * \ingroup slicedice_blk
  */
-class gr_deinterleave : public gr_sync_decimator
+class GR_CORE_API gr_deinterleave : public gr_sync_decimator
 {
-  friend gr_deinterleave_sptr gr_make_deinterleave (size_t itemsize);
+  friend GR_CORE_API gr_deinterleave_sptr gr_make_deinterleave (size_t itemsize);
 
   size_t	d_itemsize;
 
diff --git a/gnuradio-core/src/lib/general/gr_delay.h b/gnuradio-core/src/lib/general/gr_delay.h
index d7e8252a2..14de9af1f 100644
--- a/gnuradio-core/src/lib/general/gr_delay.h
+++ b/gnuradio-core/src/lib/general/gr_delay.h
@@ -23,20 +23,21 @@
 #ifndef INCLUDED_GR_DELAY_H
 #define INCLUDED_GR_DELAY_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_delay;
 typedef boost::shared_ptr<gr_delay> gr_delay_sptr;
 
-gr_delay_sptr gr_make_delay (size_t itemsize, int delay);
+GR_CORE_API gr_delay_sptr gr_make_delay (size_t itemsize, int delay);
 
 /*!
  * \brief delay the input by a certain number of samples
  * \ingroup misc_blk
  */
-class gr_delay : public gr_sync_block
+class GR_CORE_API gr_delay : public gr_sync_block
 {
-  friend gr_delay_sptr gr_make_delay (size_t itemsize, int delay);
+  friend GR_CORE_API gr_delay_sptr gr_make_delay (size_t itemsize, int delay);
 
   gr_delay (size_t itemsize, int delay);
 
diff --git a/gnuradio-core/src/lib/general/gr_descrambler_bb.h b/gnuradio-core/src/lib/general/gr_descrambler_bb.h
index 19787690c..d7a49b5f1 100644
--- a/gnuradio-core/src/lib/general/gr_descrambler_bb.h
+++ b/gnuradio-core/src/lib/general/gr_descrambler_bb.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_GR_DESCRAMBLER_BB_H
 #define INCLUDED_GR_DESCRAMBLER_BB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include "gri_lfsr.h"
 
 class gr_descrambler_bb;
 typedef boost::shared_ptr<gr_descrambler_bb> gr_descrambler_bb_sptr;
 
-gr_descrambler_bb_sptr gr_make_descrambler_bb(int mask, int seed, int len);
+GR_CORE_API gr_descrambler_bb_sptr gr_make_descrambler_bb(int mask, int seed, int len);
 
 /*!
  * Descramble an input stream using an LFSR.  This block works on the LSB only
@@ -42,9 +43,9 @@ gr_descrambler_bb_sptr gr_make_descrambler_bb(int mask, int seed, int len);
  * \ingroup coding_blk
  */
 
-class gr_descrambler_bb : public gr_sync_block
+class GR_CORE_API gr_descrambler_bb : public gr_sync_block
 {
-  friend gr_descrambler_bb_sptr gr_make_descrambler_bb(int mask, int seed, int len);
+  friend GR_CORE_API gr_descrambler_bb_sptr gr_make_descrambler_bb(int mask, int seed, int len);
 
   gri_lfsr d_lfsr;
 
diff --git a/gnuradio-core/src/lib/general/gr_diff_decoder_bb.h b/gnuradio-core/src/lib/general/gr_diff_decoder_bb.h
index 6fd08ec4b..0337c3dbd 100644
--- a/gnuradio-core/src/lib/general/gr_diff_decoder_bb.h
+++ b/gnuradio-core/src/lib/general/gr_diff_decoder_bb.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_DIFF_DECODER_BB_H
 #define INCLUDED_GR_DIFF_DECODER_BB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_diff_decoder_bb;
 typedef boost::shared_ptr<gr_diff_decoder_bb> gr_diff_decoder_bb_sptr;
 
-gr_diff_decoder_bb_sptr gr_make_diff_decoder_bb (unsigned int modulus);
+GR_CORE_API gr_diff_decoder_bb_sptr gr_make_diff_decoder_bb (unsigned int modulus);
 
 /*!
  * \brief y[0] = (x[0] - x[-1]) % M
@@ -36,9 +37,9 @@ gr_diff_decoder_bb_sptr gr_make_diff_decoder_bb (unsigned int modulus);
  *
  * Differential decoder
  */
-class gr_diff_decoder_bb : public gr_sync_block
+class GR_CORE_API gr_diff_decoder_bb : public gr_sync_block
 {
-  friend gr_diff_decoder_bb_sptr gr_make_diff_decoder_bb (unsigned int modulus);
+  friend GR_CORE_API gr_diff_decoder_bb_sptr gr_make_diff_decoder_bb (unsigned int modulus);
   gr_diff_decoder_bb(unsigned int modulus);
 
   unsigned int	d_modulus;
diff --git a/gnuradio-core/src/lib/general/gr_diff_encoder_bb.h b/gnuradio-core/src/lib/general/gr_diff_encoder_bb.h
index 50aff73cf..c99e226da 100644
--- a/gnuradio-core/src/lib/general/gr_diff_encoder_bb.h
+++ b/gnuradio-core/src/lib/general/gr_diff_encoder_bb.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_DIFF_ENCODER_BB_H
 #define INCLUDED_GR_DIFF_ENCODER_BB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_diff_encoder_bb;
 typedef boost::shared_ptr<gr_diff_encoder_bb> gr_diff_encoder_bb_sptr;
 
-gr_diff_encoder_bb_sptr gr_make_diff_encoder_bb (unsigned int modulus);
+GR_CORE_API gr_diff_encoder_bb_sptr gr_make_diff_encoder_bb (unsigned int modulus);
 
 /*!
  * \brief y[0] = (x[0] + y[-1]) % M
@@ -36,9 +37,9 @@ gr_diff_encoder_bb_sptr gr_make_diff_encoder_bb (unsigned int modulus);
  *
  * Differential encoder
  */
-class gr_diff_encoder_bb : public gr_sync_block
+class GR_CORE_API gr_diff_encoder_bb : public gr_sync_block
 {
-  friend gr_diff_encoder_bb_sptr gr_make_diff_encoder_bb (unsigned int modulus);
+  friend GR_CORE_API gr_diff_encoder_bb_sptr gr_make_diff_encoder_bb (unsigned int modulus);
   gr_diff_encoder_bb(unsigned int modulus);
 
   unsigned int	d_last_out;
diff --git a/gnuradio-core/src/lib/general/gr_diff_phasor_cc.h b/gnuradio-core/src/lib/general/gr_diff_phasor_cc.h
index 1070ba183..8af2699a7 100644
--- a/gnuradio-core/src/lib/general/gr_diff_phasor_cc.h
+++ b/gnuradio-core/src/lib/general/gr_diff_phasor_cc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_DIFF_PHASOR_CC_H
 #define INCLUDED_GR_DIFF_PHASOR_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 /*!
@@ -32,12 +33,12 @@
 class gr_diff_phasor_cc;
 typedef boost::shared_ptr<gr_diff_phasor_cc> gr_diff_phasor_cc_sptr;
 
-gr_diff_phasor_cc_sptr gr_make_diff_phasor_cc ();
+GR_CORE_API gr_diff_phasor_cc_sptr gr_make_diff_phasor_cc ();
 
 
-class gr_diff_phasor_cc : public gr_sync_block
+class GR_CORE_API gr_diff_phasor_cc : public gr_sync_block
 {
-  friend gr_diff_phasor_cc_sptr gr_make_diff_phasor_cc ();
+  friend GR_CORE_API gr_diff_phasor_cc_sptr gr_make_diff_phasor_cc ();
 
   gr_diff_phasor_cc ();  //constructor
 
diff --git a/gnuradio-core/src/lib/general/gr_dpll_bb.h b/gnuradio-core/src/lib/general/gr_dpll_bb.h
index e6b5fc0fa..8e748dddb 100644
--- a/gnuradio-core/src/lib/general/gr_dpll_bb.h
+++ b/gnuradio-core/src/lib/general/gr_dpll_bb.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_DPLL_BB_H
 #define INCLUDED_GR_DPLL_BB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_dpll_bb;
 typedef boost::shared_ptr<gr_dpll_bb> gr_dpll_bb_sptr;
 
-gr_dpll_bb_sptr gr_make_dpll_bb (float period, float gain);
+GR_CORE_API gr_dpll_bb_sptr gr_make_dpll_bb (float period, float gain);
 
 /*!
  * \brief Detect the peak of a signal
@@ -37,9 +38,9 @@ gr_dpll_bb_sptr gr_make_dpll_bb (float period, float gain);
  * If a peak is detected, this block outputs a 1, 
  * or it outputs 0's.
  */
-class gr_dpll_bb : public gr_sync_block
+class GR_CORE_API gr_dpll_bb : public gr_sync_block
 {
-  friend gr_dpll_bb_sptr gr_make_dpll_bb (float period, float gain);
+  friend GR_CORE_API gr_dpll_bb_sptr gr_make_dpll_bb (float period, float gain);
 
   gr_dpll_bb (float period, float gain);
 
diff --git a/gnuradio-core/src/lib/general/gr_encode_ccsds_27_bb.h b/gnuradio-core/src/lib/general/gr_encode_ccsds_27_bb.h
index 86832ee05..e24ae9151 100644
--- a/gnuradio-core/src/lib/general/gr_encode_ccsds_27_bb.h
+++ b/gnuradio-core/src/lib/general/gr_encode_ccsds_27_bb.h
@@ -20,13 +20,14 @@
 #ifndef INCLUDED_GR_ENCODE_CCSDS_27_BB_H
 #define INCLUDED_GR_ENCODE_CCSDS_27_BB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_encode_ccsds_27_bb;
 
 typedef boost::shared_ptr<gr_encode_ccsds_27_bb> gr_encode_ccsds_27_bb_sptr;
 
-gr_encode_ccsds_27_bb_sptr gr_make_encode_ccsds_27_bb();
+GR_CORE_API gr_encode_ccsds_27_bb_sptr gr_make_encode_ccsds_27_bb();
 
 /*! \brief A rate 1/2, k=7 convolutional encoder for the CCSDS standard
  * \ingroup ecc
@@ -44,10 +45,10 @@ gr_encode_ccsds_27_bb_sptr gr_make_encode_ccsds_27_bb();
  * There is no provision to "flush" the encoder.
  */
 
-class gr_encode_ccsds_27_bb : public gr_sync_interpolator
+class GR_CORE_API gr_encode_ccsds_27_bb : public gr_sync_interpolator
 {
 private:
-  friend gr_encode_ccsds_27_bb_sptr gr_make_encode_ccsds_27_bb();
+  friend GR_CORE_API gr_encode_ccsds_27_bb_sptr gr_make_encode_ccsds_27_bb();
 
   gr_encode_ccsds_27_bb();
   unsigned char d_encstate;
diff --git a/gnuradio-core/src/lib/general/gr_expj.h b/gnuradio-core/src/lib/general/gr_expj.h
index 7adf3a0c6..6f1d56eb3 100644
--- a/gnuradio-core/src/lib/general/gr_expj.h
+++ b/gnuradio-core/src/lib/general/gr_expj.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_EXPJ_H
 #define INCLUDED_GR_EXPJ_H
 
+#include <gr_core_api.h>
 #include <gr_sincos.h>
 #include <gr_types.h>
 
diff --git a/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.h b/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.h
index 480fb8e78..2560c6105 100644
--- a/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.h
+++ b/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FAKE_CHANNEL_CODER_PP_H
 #define INCLUDED_GR_FAKE_CHANNEL_CODER_PP_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_fake_channel_encoder_pp;
 typedef boost::shared_ptr<gr_fake_channel_encoder_pp> gr_fake_channel_encoder_pp_sptr;
 
-gr_fake_channel_encoder_pp_sptr
+GR_CORE_API gr_fake_channel_encoder_pp_sptr
 gr_make_fake_channel_encoder_pp(int input_vlen, int output_vlen);
 
 /*!
@@ -37,14 +38,14 @@ gr_make_fake_channel_encoder_pp(int input_vlen, int output_vlen);
  *
  * input: stream of byte vectors; output: stream of byte vectors
  */
-class gr_fake_channel_encoder_pp : public gr_sync_block
+class GR_CORE_API gr_fake_channel_encoder_pp : public gr_sync_block
 {
   int	d_input_vlen;
   int	d_output_vlen;
   
   gr_fake_channel_encoder_pp(int input_vlen, int output_vlen);
 
-  friend gr_fake_channel_encoder_pp_sptr
+  friend GR_CORE_API gr_fake_channel_encoder_pp_sptr
          gr_make_fake_channel_encoder_pp(int input_vlen, int output_vlen);
   
 public:
@@ -60,7 +61,7 @@ public:
 class gr_fake_channel_decoder_pp;
 typedef boost::shared_ptr<gr_fake_channel_decoder_pp> gr_fake_channel_decoder_pp_sptr;
 
-gr_fake_channel_decoder_pp_sptr
+GR_CORE_API gr_fake_channel_decoder_pp_sptr
 gr_make_fake_channel_decoder_pp(int input_vlen, int output_vlen);
 
 /*!
@@ -69,14 +70,14 @@ gr_make_fake_channel_decoder_pp(int input_vlen, int output_vlen);
  *
  * input: stream of byte vectors; output: stream of byte vectors
  */
-class gr_fake_channel_decoder_pp : public gr_sync_block
+class GR_CORE_API gr_fake_channel_decoder_pp : public gr_sync_block
 {
   int	d_input_vlen;
   int	d_output_vlen;
   
   gr_fake_channel_decoder_pp(int input_vlen, int output_vlen);
 
-  friend gr_fake_channel_decoder_pp_sptr
+  friend GR_CORE_API gr_fake_channel_decoder_pp_sptr
          gr_make_fake_channel_decoder_pp(int input_vlen, int output_vlen);
   
 public:
diff --git a/gnuradio-core/src/lib/general/gr_feedforward_agc_cc.h b/gnuradio-core/src/lib/general/gr_feedforward_agc_cc.h
index 8c600d3d1..a97dbd958 100644
--- a/gnuradio-core/src/lib/general/gr_feedforward_agc_cc.h
+++ b/gnuradio-core/src/lib/general/gr_feedforward_agc_cc.h
@@ -23,21 +23,22 @@
 #ifndef INCLUDED_GR_FEEDFORWARD_AGC_CC_H
 #define INCLUDED_GR_FEEDFORWARD_AGC_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_feedforward_agc_cc;
 typedef boost::shared_ptr<gr_feedforward_agc_cc> gr_feedforward_agc_cc_sptr;
 
-gr_feedforward_agc_cc_sptr
+GR_CORE_API gr_feedforward_agc_cc_sptr
 gr_make_feedforward_agc_cc(int nsamples, float reference = 1.0);
 
 /*!
  * \brief Non-causal AGC which computes required gain based on max absolute value over nsamples
  * \ingroup level_blk
  */
-class gr_feedforward_agc_cc : public gr_sync_block
+class GR_CORE_API gr_feedforward_agc_cc : public gr_sync_block
 {
-  friend gr_feedforward_agc_cc_sptr 
+  friend GR_CORE_API gr_feedforward_agc_cc_sptr 
   gr_make_feedforward_agc_cc(int nsamples, float reference);
   
   int		d_nsamples;
diff --git a/gnuradio-core/src/lib/general/gr_feval.h b/gnuradio-core/src/lib/general/gr_feval.h
index cc4209af0..a0e448ebf 100644
--- a/gnuradio-core/src/lib/general/gr_feval.h
+++ b/gnuradio-core/src/lib/general/gr_feval.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_FEVAL_H
 #define INCLUDED_GR_FEVAL_H
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 
 /*!
@@ -37,7 +38,7 @@
  * Use calleval to invoke eval (this kludge is required to allow a
  * python specific "shim" to be inserted.
  */
-class gr_feval_dd
+class GR_CORE_API gr_feval_dd
 {
 protected:
   /*!
@@ -65,7 +66,7 @@ public:
  * Use calleval to invoke eval (this kludge is required to allow a
  * python specific "shim" to be inserted.
  */
-class gr_feval_cc
+class GR_CORE_API gr_feval_cc
 {
 protected:
   /*!
@@ -93,7 +94,7 @@ public:
  * Use calleval to invoke eval (this kludge is required to allow a
  * python specific "shim" to be inserted.
  */
-class gr_feval_ll
+class GR_CORE_API gr_feval_ll
 {
 protected:
   /*!
@@ -121,7 +122,7 @@ public:
  * Use calleval to invoke eval (this kludge is required to allow a
  * python specific "shim" to be inserted.
  */
-class gr_feval
+class GR_CORE_API gr_feval
 {
 protected:
   /*!
@@ -139,9 +140,9 @@ public:
 /*!
  * \brief trivial examples / test cases showing C++ calling Python code
  */
-double     gr_feval_dd_example(gr_feval_dd *f, double x);
-gr_complex gr_feval_cc_example(gr_feval_cc *f, gr_complex x);
-long       gr_feval_ll_example(gr_feval_ll *f, long x);
-void       gr_feval_example(gr_feval *f);
+GR_CORE_API double     gr_feval_dd_example(gr_feval_dd *f, double x);
+GR_CORE_API gr_complex gr_feval_cc_example(gr_feval_cc *f, gr_complex x);
+GR_CORE_API long       gr_feval_ll_example(gr_feval_ll *f, long x);
+GR_CORE_API void       gr_feval_example(gr_feval *f);
 
 #endif /* INCLUDED_GR_FEVAL_H */
diff --git a/gnuradio-core/src/lib/general/gr_fft_vcc.h b/gnuradio-core/src/lib/general/gr_fft_vcc.h
index 2ab9241ec..a7c8e1162 100644
--- a/gnuradio-core/src/lib/general/gr_fft_vcc.h
+++ b/gnuradio-core/src/lib/general/gr_fft_vcc.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FFT_VCC_H
 #define INCLUDED_GR_FFT_VCC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_fft_vcc;
 typedef boost::shared_ptr<gr_fft_vcc> gr_fft_vcc_sptr;
 
-gr_fft_vcc_sptr
+GR_CORE_API gr_fft_vcc_sptr
 gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> &window, bool shift=false);
 
 /*!
@@ -37,10 +38,10 @@ gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> &window, b
  *
  * Abstract base class
  */
-class gr_fft_vcc : public gr_sync_block
+class GR_CORE_API gr_fft_vcc : public gr_sync_block
 {
 protected:
-  friend gr_fft_vcc_sptr
+  friend GR_CORE_API gr_fft_vcc_sptr
   gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> &window, bool shift);
 
   unsigned int	       d_fft_size;
diff --git a/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h b/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
index c026162ee..8535d133c 100644
--- a/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
+++ b/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
@@ -23,11 +23,12 @@
 #ifndef INCLUDED_GR_FFT_VCC_FFTW_H
 #define INCLUDED_GR_FFT_VCC_FFTW_H
 
+#include <gr_core_api.h>
 #include <gr_fft_vcc.h>
 
 class gri_fft_complex;
 
-gr_fft_vcc_sptr
+GR_CORE_API gr_fft_vcc_sptr
 gr_make_fft_vcc_fftw (int fft_size, bool forward, const std::vector<float> &window, bool shift=false);
 
 /*!
@@ -36,9 +37,9 @@ gr_make_fft_vcc_fftw (int fft_size, bool forward, const std::vector<float> &wind
  *
  * Concrete class that uses FFTW.
  */
-class gr_fft_vcc_fftw : public gr_fft_vcc
+class GR_CORE_API gr_fft_vcc_fftw : public gr_fft_vcc
 {
-  friend gr_fft_vcc_sptr
+  friend GR_CORE_API gr_fft_vcc_sptr
   gr_make_fft_vcc_fftw (int fft_size, bool forward, const std::vector<float> &window, bool shift);
 
   gri_fft_complex *d_fft;
diff --git a/gnuradio-core/src/lib/general/gr_fft_vfc.h b/gnuradio-core/src/lib/general/gr_fft_vfc.h
index 074574477..6cf6b9037 100644
--- a/gnuradio-core/src/lib/general/gr_fft_vfc.h
+++ b/gnuradio-core/src/lib/general/gr_fft_vfc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_FFT_VFC_H
 #define INCLUDED_GR_FFT_VFC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gri_fft_complex;
@@ -30,7 +31,7 @@ class gri_fft_complex;
 class gr_fft_vfc;
 typedef boost::shared_ptr<gr_fft_vfc> gr_fft_vfc_sptr;
 
-gr_fft_vfc_sptr
+GR_CORE_API gr_fft_vfc_sptr
 gr_make_fft_vfc (int fft_size, bool forward, const std::vector<float> &window);
 
 /*!
@@ -38,9 +39,9 @@ gr_make_fft_vfc (int fft_size, bool forward, const std::vector<float> &window);
  * \ingroup dft_blk
  */
 
-class gr_fft_vfc : public gr_sync_block
+class GR_CORE_API gr_fft_vfc : public gr_sync_block
 {
-  friend gr_fft_vfc_sptr
+  friend GR_CORE_API gr_fft_vfc_sptr
   gr_make_fft_vfc (int fft_size, bool forward, const std::vector<float>  &window);
 
   unsigned int  d_fft_size;
diff --git a/gnuradio-core/src/lib/general/gr_firdes.h b/gnuradio-core/src/lib/general/gr_firdes.h
index de775bd07..83fa7e119 100644
--- a/gnuradio-core/src/lib/general/gr_firdes.h
+++ b/gnuradio-core/src/lib/general/gr_firdes.h
@@ -23,6 +23,7 @@
 #ifndef _GR_FIRDES_H_
 #define _GR_FIRDES_H_
 
+#include <gr_core_api.h>
 #include <vector>
 #include <cmath>
 #include <gr_complex.h>
@@ -32,7 +33,7 @@
  * \ingroup filter_design
  */
 
-class gr_firdes {
+class GR_CORE_API gr_firdes {
  public:
 
   enum win_type {
diff --git a/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.cc b/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.cc
deleted file mode 100644
index c32398e6d..000000000
--- a/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.cc
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_fll_band_edge_cc.h>
-#include <gr_fir_ccc.h>
-#include <gr_fir_util.h>
-#include <gri_fft.h>
-#include <gr_io_signature.h>
-#include <gr_expj.h>
-#include <gr_math.h>
-#include <cstdio>
-
-#define M_TWOPI (2*M_PI)
-
-float sinc(float x)
-{
-  if(x == 0)
-    return 1;
-  else
-    return sin(M_PI*x)/(M_PI*x);
-}
-  
-
-
-gr_fll_band_edge_cc_sptr gr_make_fll_band_edge_cc (float samps_per_sym, float rolloff,
-						   int filter_size, float gain_alpha, float gain_beta)
-{
-  return gnuradio::get_initial_sptr(new gr_fll_band_edge_cc (samps_per_sym, rolloff,
-							    filter_size, gain_alpha, gain_beta));
-}
-
-
-static int ios[] = {sizeof(gr_complex), sizeof(float), sizeof(float), sizeof(gr_complex)};
-static std::vector<int> iosig(ios, ios+sizeof(ios)/sizeof(int));
-gr_fll_band_edge_cc::gr_fll_band_edge_cc (float samps_per_sym, float rolloff,
-					  int filter_size, float alpha, float beta)
-  : gr_sync_block ("fll_band_edge_cc",
-		   gr_make_io_signature (1, 1, sizeof(gr_complex)),
-		   gr_make_io_signaturev (1, 4, iosig)),
-    d_alpha(alpha), d_beta(beta), d_updated (false)
-{
-  // base this on the number of samples per symbol
-  d_max_freq =  M_TWOPI * (2.0/samps_per_sym);
-  d_min_freq = -M_TWOPI * (2.0/samps_per_sym);
-
-  d_freq = 0;
-  d_phase = 0;
-
-  set_alpha(alpha);
-
-  design_filter(samps_per_sym, rolloff, filter_size);
-}
-
-gr_fll_band_edge_cc::~gr_fll_band_edge_cc ()
-{
-  delete d_filter_lower;
-  delete d_filter_upper;
-}
-
-void
-gr_fll_band_edge_cc::set_alpha(float alpha) 
-{ 
-  //float eta = sqrt(2.0)/2.0;
-  //float theta = alpha;
-  //d_alpha = (4*eta*theta) / (1.0 + 2.0*eta*theta + theta*theta);
-  //d_beta = (4*theta*theta) / (1.0 + 2.0*eta*theta + theta*theta);
-  d_alpha = alpha;
-}
-
-void
-gr_fll_band_edge_cc::design_filter(float samps_per_sym, float rolloff, int filter_size)
-{
-  int M = rint(filter_size / samps_per_sym);
-  float power = 0;
-  std::vector<float> bb_taps;
-  for(int i = 0; i < filter_size; i++) {
-    float k = -M + i*2.0/samps_per_sym;
-    float tap = sinc(rolloff*k - 0.5) + sinc(rolloff*k + 0.5);
-    power += tap;
-
-    bb_taps.push_back(tap);
-  }
-
-  int N = (bb_taps.size() - 1.0)/2.0;
-  std::vector<gr_complex> taps_lower;
-  std::vector<gr_complex> taps_upper;
-  for(unsigned int i = 0; i < bb_taps.size(); i++) {
-    float tap = bb_taps[i] / power;
-
-    float k = (-N + (int)i)/(2.0*samps_per_sym);
-    
-    gr_complex t1 = tap * gr_expj(-2*M_PI*(1+rolloff)*k);
-    gr_complex t2 = tap * gr_expj(2*M_PI*(1+rolloff)*k);
-
-    taps_lower.push_back(t1);
-    taps_upper.push_back(t2);
-  }
-
-  std::vector<gr_complex> vtaps(0, taps_lower.size());
-  d_filter_upper = gr_fir_util::create_gr_fir_ccc(vtaps);
-  d_filter_lower = gr_fir_util::create_gr_fir_ccc(vtaps);
-
-  d_filter_lower->set_taps(taps_lower);
-  d_filter_upper->set_taps(taps_upper);
-
-  d_updated = true;
-
-  // Set the history to ensure enough input items for each filter
-  set_history(filter_size+1);
-
-}
-
-void
-gr_fll_band_edge_cc::print_taps()
-{
-  unsigned int i;
-  std::vector<gr_complex> taps_upper = d_filter_upper->get_taps();
-  std::vector<gr_complex> taps_lower = d_filter_lower->get_taps();
-
-  printf("Upper Band-edge: [");
-  for(i = 0; i < taps_upper.size(); i++) {
-    printf(" %.4e + %.4ej,", taps_upper[i].real(), taps_upper[i].imag());
-  }
-  printf("]\n\n");
-
-  printf("Lower Band-edge: [");
-  for(i = 0; i < taps_lower.size(); i++) {
-    printf(" %.4e + %.4ej,", taps_lower[i].real(), taps_lower[i].imag());
-  }
-  printf("]\n\n");
-}
-
-int
-gr_fll_band_edge_cc::work (int noutput_items,
-			   gr_vector_const_void_star &input_items,
-			   gr_vector_void_star &output_items)
-{
-  const gr_complex *in  = (const gr_complex *) input_items[0];
-  gr_complex *out = (gr_complex *) output_items[0];
-
-  float *frq = NULL;
-  float *phs = NULL;
-  gr_complex *err = NULL;
-  if(output_items.size() > 2) {
-    frq = (float *) output_items[1];
-    phs = (float *) output_items[2];
-    err = (gr_complex *) output_items[3];
-  }
-
-  if (d_updated) {
-    d_updated = false;
-    return 0;		     // history requirements may have changed.
-  }
-
-  int i;
-  gr_complex nco_out;
-  gr_complex out_upper, out_lower;
-  float error;
-  float avg_k = 0.1;
-  for(i = 0; i < noutput_items; i++) {
-    nco_out = gr_expj(d_phase);
-    out[i] = in[i] * nco_out;
-
-    out_upper = (d_filter_upper->filter(&out[i]));
-    out_lower = (d_filter_lower->filter(&out[i]));
-    error = -real((out_upper + out_lower) * conj(out_upper - out_lower));
-    d_error = avg_k*error + avg_k*d_error;  // average error
-
-    d_freq = d_freq + d_beta * d_error;
-    d_phase = d_phase + d_freq + d_alpha * d_error;
-
-    if(d_phase > M_PI)
-      d_phase -= M_TWOPI;
-    else if(d_phase < -M_PI)
-      d_phase += M_TWOPI;
-
-    if (d_freq > d_max_freq)
-      d_freq = d_max_freq;
-    else if (d_freq < d_min_freq)
-      d_freq = d_min_freq;
-
-    if(output_items.size() > 2) {
-      frq[i] = d_freq;
-      phs[i] = d_phase;
-      err[i] = d_error;
-    }
-  }
-
-
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.h b/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.h
deleted file mode 100644
index db060793e..000000000
--- a/gnuradio-core/src/lib/general/gr_fll_band_edge_cc.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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_FLL_BAND_EDGE_CC_H
-#define	INCLUDED_GR_FLL_BAND_EDGE_CC_H
-
-#include <gr_sync_block.h>
-
-class gr_fll_band_edge_cc;
-typedef boost::shared_ptr<gr_fll_band_edge_cc> gr_fll_band_edge_cc_sptr;
-gr_fll_band_edge_cc_sptr gr_make_fll_band_edge_cc (float samps_per_sym, float rolloff,
-						   int filter_size, float alpha, float beta);
-
-class gr_fir_ccc;
-class gri_fft_complex;
-
-/*!
- * \class gr_fll_band_edge_cc
- * \brief Frequency Lock Loop using band-edge filters
- *
- * \ingroup general
- *
- * The frequency lock loop derives a band-edge filter that covers the upper and lower bandwidths
- * of a digitally-modulated signal. The bandwidth range is determined by the excess bandwidth
- * (e.g., rolloff factor) of the modulated signal. The placement in frequency of the band-edges
- * is determined by the oversampling ratio (number of samples per symbol) and the excess bandwidth.
- * The size of the filters should be fairly large so as to average over a number of symbols.
- *
- * The FLL works by filtering the upper and lower band edges into x_u(t) and x_l(t), respectively.
- * These are combined to form cc(t) = x_u(t) + x_l(t) and ss(t) = x_u(t) - x_l(t). Combining
- * these to form the signal e(t) = Re{cc(t) \\times ss(t)^*} (where ^* is the complex conjugate)
- * provides an error signal at the DC term that is directly proportional to the carrier frequency.
- * We then make a second-order loop using the error signal that is the running average of e(t).
- *
- * In theory, the band-edge filter is the derivative of the matched filter in frequency, 
- * (H_be(f) = \\frac{H(f)}{df}. In practice, this comes down to a quarter sine wave at the point
- * of the matched filter's rolloff (if it's a raised-cosine, the derivative of a cosine is a sine).
- * Extend this sine by another quarter wave to make a half wave around the band-edges is equivalent
- * in time to the sum of two sinc functions. The baseband filter fot the band edges is therefore
- * derived from this sum of sincs. The band edge filters are then just the baseband signal
- * modulated to the correct place in frequency. All of these calculations are done in the
- * 'design_filter' function.
- *
- * Note: We use FIR filters here because the filters have to have a flat phase response over the
- * entire frequency range to allow their comparisons to be valid.
- */
-
-class gr_fll_band_edge_cc : public gr_sync_block
-{
- private:
-  /*!
-   * Build the FLL
-   * \param samps_per_sym    (float) Number of samples per symbol of signal
-   * \param rolloff          (float) Rolloff factor of signal
-   * \param filter_size      (int)   Size (in taps) of the filter
-   * \param alpha            (float) Loop gain 1
-   * \param beta             (float) Loop gain 2
-   */
-  friend gr_fll_band_edge_cc_sptr gr_make_fll_band_edge_cc (float samps_per_sym, float rolloff,
-							    int filter_size, float alpha, float beta);
-
-  float                   d_alpha;
-  float                   d_beta;
-  float                   d_max_freq;
-  float                   d_min_freq;
-
-  gr_fir_ccc*             d_filter_upper;
-  gr_fir_ccc*             d_filter_lower;
-  bool			  d_updated;
-  float                   d_error;
-  float                   d_freq;
-  float                   d_phase;
-
-  /*!
-   * Build the FLL
-   * \param samps_per_sym (float) number of samples per symbol
-   * \param rolloff (float) Rolloff (excess bandwidth) of signal filter
-   * \param filter_size (int) number of filter taps to generate
-   * \param alpha (float) Alpha gain in the control loop
-   * \param beta  (float) Beta gain in the control loop
-   */
-  gr_fll_band_edge_cc(float samps_per_sym, float rolloff,
-		      int filter_size, float alpha, float beta);
-
-public:
-  ~gr_fll_band_edge_cc ();
-  
-  /*!
-   * Design the band-edge filter based on the number of samples per symbol,
-   * filter rolloff factor, and the filter size
-   * \param samps_per_sym    (float) Number of samples per symbol of signal
-   * \param rolloff          (float) Rolloff factor of signal
-   * \param filter_size      (int)   Size (in taps) of the filter
-   */
-  void design_filter(float samps_per_sym, float rolloff, int filter_size);
-
-  /*!
-   * Set the alpha gainvalue
-   * \param alpha    (float) new gain value
-   */
-  void set_alpha(float alpha);
-
-  /*!
-   * Set the beta gain value
-   * \param beta    (float) new gain value
-   */
-  void set_beta(float beta) { d_beta = beta; }
-
-  /*!
-   * Print the taps to screen.
-   */
-  void print_taps();
-   
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_float_to_char.h b/gnuradio-core/src/lib/general/gr_float_to_char.h
index e65072bf0..434e2e9d0 100644
--- a/gnuradio-core/src/lib/general/gr_float_to_char.h
+++ b/gnuradio-core/src/lib/general/gr_float_to_char.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FLOAT_TO_CHAR_H
 #define INCLUDED_GR_FLOAT_TO_CHAR_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_float_to_char;
 typedef boost::shared_ptr<gr_float_to_char> gr_float_to_char_sptr;
 
-gr_float_to_char_sptr
+GR_CORE_API gr_float_to_char_sptr
 gr_make_float_to_char ();
 
 /*!
@@ -36,9 +37,9 @@ gr_make_float_to_char ();
  * \ingroup converter_blk
  */
 
-class gr_float_to_char : public gr_sync_block
+class GR_CORE_API gr_float_to_char : public gr_sync_block
 {
-  friend gr_float_to_char_sptr gr_make_float_to_char ();
+  friend GR_CORE_API gr_float_to_char_sptr gr_make_float_to_char ();
   gr_float_to_char ();
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_float_to_complex.h b/gnuradio-core/src/lib/general/gr_float_to_complex.h
index f6cc24852..596b595f3 100644
--- a/gnuradio-core/src/lib/general/gr_float_to_complex.h
+++ b/gnuradio-core/src/lib/general/gr_float_to_complex.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_FLOAT_TO_COMPLEX_H
 #define INCLUDED_GR_FLOAT_TO_COMPLEX_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_complex.h>
 
 class gr_float_to_complex;
 typedef boost::shared_ptr<gr_float_to_complex> gr_float_to_complex_sptr;
 
-gr_float_to_complex_sptr
+GR_CORE_API gr_float_to_complex_sptr
 gr_make_float_to_complex (size_t vlen = 1);
 
 /*!
@@ -37,9 +38,9 @@ gr_make_float_to_complex (size_t vlen = 1);
  * \ingroup converter_blk
  */
 
-class gr_float_to_complex : public gr_sync_block
+class GR_CORE_API gr_float_to_complex : public gr_sync_block
 {
-  friend gr_float_to_complex_sptr gr_make_float_to_complex (size_t vlen);
+  friend GR_CORE_API gr_float_to_complex_sptr gr_make_float_to_complex (size_t vlen);
   gr_float_to_complex (size_t vlen);
 
   size_t d_vlen;
diff --git a/usrp/host/apps/time_stuff.c b/gnuradio-core/src/lib/general/gr_float_to_int.cc
index 89a4a3815..2349de8cb 100644
--- a/usrp/host/apps/time_stuff.c
+++ b/gnuradio-core/src/lib/general/gr_float_to_int.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,45 +24,35 @@
 #include "config.h"
 #endif
 
-#include "time_stuff.h"
+#include <gr_float_to_int.h>
+#include <gr_io_signature.h>
+#include <gri_float_to_int.h>
 
-#include <sys/time.h>
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-#include <unistd.h>
-
-static double
-timeval_to_secs (struct timeval *tv)
+gr_float_to_int_sptr
+gr_make_float_to_int ()
 {
-  return (double) tv->tv_sec + (double) tv->tv_usec * 1e-6;
+  return gnuradio::get_initial_sptr(new gr_float_to_int ());
 }
 
-double
-get_cpu_usage (void)
+gr_float_to_int::gr_float_to_int ()
+  : gr_sync_block ("gr_float_to_int",
+		   gr_make_io_signature (1, 1, sizeof (float)),
+		   gr_make_io_signature (1, 1, sizeof (int)))
 {
-#ifdef HAVE_GETRUSAGE
-  struct rusage	ru;
-
-  if (getrusage (RUSAGE_SELF, &ru) != 0)
-    return 0;
-
-  return timeval_to_secs (&ru.ru_utime) + timeval_to_secs (&ru.ru_stime);
-#else
-  return 0;	/* FIXME */
-#endif
 }
 
-/*
- * return elapsed time (wall time) in seconds
- */
-double
-get_elapsed_time (void)
+int
+gr_float_to_int::work (int noutput_items,
+			 gr_vector_const_void_star &input_items,
+			 gr_vector_void_star &output_items)
 {
-  struct timeval	tv;
-  if (gettimeofday (&tv, 0) != 0)
-    return 0;
+  const float *in = (const float *) input_items[0];
+  int *out = (int *) output_items[0];
 
-  return timeval_to_secs (&tv);
+  gri_float_to_int (in, out, noutput_items);
+  
+  return noutput_items;
 }
 
+
+
diff --git a/gnuradio-core/src/lib/general/gr_float_to_int.h b/gnuradio-core/src/lib/general/gr_float_to_int.h
new file mode 100644
index 000000000..3324ed110
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_float_to_int.h
@@ -0,0 +1,52 @@
+/* -*- c++ -*- */
+/*
+ * 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_FLOAT_TO_INT_H
+#define INCLUDED_GR_FLOAT_TO_INT_H
+
+#include <gr_core_api.h>
+#include <gr_sync_block.h>
+
+class gr_float_to_int;
+typedef boost::shared_ptr<gr_float_to_int> gr_float_to_int_sptr;
+
+GR_CORE_API gr_float_to_int_sptr
+gr_make_float_to_int ();
+
+/*!
+ * \brief Convert stream of float to a stream of short
+ * \ingroup converter_blk
+ */
+
+class GR_CORE_API gr_float_to_int : public gr_sync_block
+{
+  friend GR_CORE_API gr_float_to_int_sptr gr_make_float_to_int ();
+  gr_float_to_int ();
+
+ public:
+  virtual int work (int noutput_items,
+		    gr_vector_const_void_star &input_items,
+		    gr_vector_void_star &output_items);
+};
+
+
+#endif /* INCLUDED_GR_FLOAT_TO_INT_H */
diff --git a/gr-usrp2/src/rx_32fc_handler.cc b/gnuradio-core/src/lib/general/gr_float_to_int.i
index c9c251558..4ab04cbf2 100644
--- a/gr-usrp2/src/rx_32fc_handler.cc
+++ b/gnuradio-core/src/lib/general/gr_float_to_int.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,13 +20,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+GR_SWIG_BLOCK_MAGIC(gr,float_to_int)
 
-#include <rx_32fc_handler.h>
+gr_float_to_int_sptr gr_make_float_to_int ();
 
-rx_32fc_handler::~rx_32fc_handler()
+class gr_float_to_int : public gr_sync_block
 {
-  // NOP
-}
+  gr_float_to_int ();
+};
diff --git a/gnuradio-core/src/lib/general/gr_float_to_short.h b/gnuradio-core/src/lib/general/gr_float_to_short.h
index e85343929..010d61141 100644
--- a/gnuradio-core/src/lib/general/gr_float_to_short.h
+++ b/gnuradio-core/src/lib/general/gr_float_to_short.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FLOAT_TO_SHORT_H
 #define INCLUDED_GR_FLOAT_TO_SHORT_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_float_to_short;
 typedef boost::shared_ptr<gr_float_to_short> gr_float_to_short_sptr;
 
-gr_float_to_short_sptr
+GR_CORE_API gr_float_to_short_sptr
 gr_make_float_to_short ();
 
 /*!
@@ -36,9 +37,9 @@ gr_make_float_to_short ();
  * \ingroup converter_blk
  */
 
-class gr_float_to_short : public gr_sync_block
+class GR_CORE_API gr_float_to_short : public gr_sync_block
 {
-  friend gr_float_to_short_sptr gr_make_float_to_short ();
+  friend GR_CORE_API gr_float_to_short_sptr gr_make_float_to_short ();
   gr_float_to_short ();
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_float_to_uchar.h b/gnuradio-core/src/lib/general/gr_float_to_uchar.h
index 3bca9c555..fca8eb07b 100644
--- a/gnuradio-core/src/lib/general/gr_float_to_uchar.h
+++ b/gnuradio-core/src/lib/general/gr_float_to_uchar.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FLOAT_TO_UCHAR_H
 #define INCLUDED_GR_FLOAT_TO_UCHAR_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_float_to_uchar;
 typedef boost::shared_ptr<gr_float_to_uchar> gr_float_to_uchar_sptr;
 
-gr_float_to_uchar_sptr
+GR_CORE_API gr_float_to_uchar_sptr
 gr_make_float_to_uchar ();
 
 /*!
@@ -36,9 +37,9 @@ gr_make_float_to_uchar ();
  * \ingroup converter_blk
  */
 
-class gr_float_to_uchar : public gr_sync_block
+class GR_CORE_API gr_float_to_uchar : public gr_sync_block
 {
-  friend gr_float_to_uchar_sptr gr_make_float_to_uchar ();
+  friend GR_CORE_API gr_float_to_uchar_sptr gr_make_float_to_uchar ();
   gr_float_to_uchar ();
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_fmdet_cf.h b/gnuradio-core/src/lib/general/gr_fmdet_cf.h
index 792646bef..7bf3baa3f 100644
--- a/gnuradio-core/src/lib/general/gr_fmdet_cf.h
+++ b/gnuradio-core/src/lib/general/gr_fmdet_cf.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FMDET_CF_H
 #define INCLUDED_GR_FMDET_CF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_fmdet_cf;
 typedef boost::shared_ptr<gr_fmdet_cf> gr_fmdet_cf_sptr;
 
-gr_fmdet_cf_sptr gr_make_fmdet_cf (float samplerate, float freq_low, float freq_high, float scl);
+GR_CORE_API gr_fmdet_cf_sptr gr_make_fmdet_cf (float samplerate, float freq_low, float freq_high, float scl);
 
 class gr_fir_ccf;
 
@@ -43,9 +44,9 @@ class gr_fir_ccf;
  * normalization by the magnitude of the sample 
  */
 
-class gr_fmdet_cf : public gr_sync_block
+class GR_CORE_API gr_fmdet_cf : public gr_sync_block
 {
-  friend gr_fmdet_cf_sptr gr_make_fmdet_cf (float samplerate, float freq_low,
+  friend GR_CORE_API gr_fmdet_cf_sptr gr_make_fmdet_cf (float samplerate, float freq_low,
 					    float freq_high, float scl);
 
   gr_complex d_S1,d_S2,d_S3,d_S4;
diff --git a/gnuradio-core/src/lib/general/gr_framer_sink_1.h b/gnuradio-core/src/lib/general/gr_framer_sink_1.h
index 3f2e8aa88..95ad6ced7 100644
--- a/gnuradio-core/src/lib/general/gr_framer_sink_1.h
+++ b/gnuradio-core/src/lib/general/gr_framer_sink_1.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_FRAMER_SINK_1_H
 #define INCLUDED_GR_FRAMER_SINK_1_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_msg_queue.h>
 
 class gr_framer_sink_1;
 typedef boost::shared_ptr<gr_framer_sink_1> gr_framer_sink_1_sptr;
 
-gr_framer_sink_1_sptr 
+GR_CORE_API gr_framer_sink_1_sptr 
 gr_make_framer_sink_1 (gr_msg_queue_sptr target_queue);
 
 /*!
@@ -50,9 +51,9 @@ gr_make_framer_sink_1 (gr_msg_queue_sptr target_queue);
  * the first bit of the packet.  That is, this bit is the first
  * one after the access code.
  */
-class gr_framer_sink_1 : public gr_sync_block
+class GR_CORE_API gr_framer_sink_1 : public gr_sync_block
 {
-  friend gr_framer_sink_1_sptr 
+  friend GR_CORE_API gr_framer_sink_1_sptr 
   gr_make_framer_sink_1 (gr_msg_queue_sptr target_queue);
 
  private:
diff --git a/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h b/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h
index 55f8412ce..932e7da36 100644
--- a/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h
+++ b/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FREQUENCY_MODULATOR_FC_H
 #define INCLUDED_GR_FREQUENCY_MODULATOR_FC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_frequency_modulator_fc;
 typedef boost::shared_ptr<gr_frequency_modulator_fc> gr_frequency_modulator_fc_sptr;
 
-gr_frequency_modulator_fc_sptr gr_make_frequency_modulator_fc (double sensitivity);
+GR_CORE_API gr_frequency_modulator_fc_sptr gr_make_frequency_modulator_fc (double sensitivity);
 
 /*!
  * \brief Frequency modulator block
@@ -36,19 +37,19 @@ gr_frequency_modulator_fc_sptr gr_make_frequency_modulator_fc (double sensitivit
  *
  * float input; complex baseband output
  */
-class gr_frequency_modulator_fc : public gr_sync_block
+class GR_CORE_API gr_frequency_modulator_fc : public gr_sync_block
 {
   double	d_sensitivity;
   double	d_phase;
 
-  friend gr_frequency_modulator_fc_sptr
+  friend GR_CORE_API gr_frequency_modulator_fc_sptr
   gr_make_frequency_modulator_fc (double sensitivity);
 
   gr_frequency_modulator_fc (double sensitivity);
 
  public:
   void set_sensitivity(float sens) { d_sensitivity = sens; }
-  float get_sensitivity() { return d_sensitivity; }
+  float sensitivity() const { return d_sensitivity; }
   
   int work (int noutput_items,
 	    gr_vector_const_void_star &input_items,
diff --git a/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.i b/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.i
index 04d9a41ba..7dfb82f1f 100644
--- a/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.i
+++ b/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.i
@@ -30,5 +30,5 @@ class gr_frequency_modulator_fc : public gr_sync_block
   gr_frequency_modulator_fc (double sensitivity);
 public:
   void set_sensitivity(float sens) { d_sensitivity = sens; }
-  float get_sensitivity() { return d_sensitivity; }
+  float sensitivity() const { return d_sensitivity; }
 };
diff --git a/gnuradio-core/src/lib/general/gr_fxpt.h b/gnuradio-core/src/lib/general/gr_fxpt.h
index c98d31b27..5cf736dfb 100644
--- a/gnuradio-core/src/lib/general/gr_fxpt.h
+++ b/gnuradio-core/src/lib/general/gr_fxpt.h
@@ -22,10 +22,11 @@
 #ifndef INCLUDED_GR_FXPT_H
 #define INCLUDED_GR_FXPT_H
 
+#include <gr_core_api.h>
 #include <gr_types.h>
 
 /*!
- * \brief fixed point sine and cosine and friends.
+ * \brief fixed point sine and cosine and friend GR_CORE_APIs.
  * \ingroup misc
  *
  *   fixed pt	radians
@@ -35,7 +36,7 @@
  *  2**31-1        pi - epsilon
  *
  */
-class gr_fxpt
+class GR_CORE_API gr_fxpt
 {
   static const int WORDBITS = 32;
   static const int NBITS = 10;
diff --git a/gnuradio-core/src/lib/general/gr_fxpt_nco.h b/gnuradio-core/src/lib/general/gr_fxpt_nco.h
index ca0d54f02..5597efb4f 100644
--- a/gnuradio-core/src/lib/general/gr_fxpt_nco.h
+++ b/gnuradio-core/src/lib/general/gr_fxpt_nco.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_FXPT_NCO_H
 #define INCLUDED_GR_FXPT_NCO_H
 
+#include <gr_core_api.h>
 #include <gr_fxpt.h>
 #include <gr_complex.h>
 
@@ -29,7 +30,7 @@
  * \brief Numerically Controlled Oscillator (NCO)
  * \ingroup misc
  */
-class gr_fxpt_nco {
+class GR_CORE_API gr_fxpt_nco {
   gr_uint32	d_phase;
   gr_int32	d_phase_inc;
 
diff --git a/gnuradio-core/src/lib/general/gr_fxpt_vco.h b/gnuradio-core/src/lib/general/gr_fxpt_vco.h
index 1ff968b79..a77a31311 100644
--- a/gnuradio-core/src/lib/general/gr_fxpt_vco.h
+++ b/gnuradio-core/src/lib/general/gr_fxpt_vco.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_FXPT_VCO_H
 #define INCLUDED_GR_FXPT_VCO_H
 
+#include <gr_core_api.h>
 #include <gr_fxpt.h>
 #include <gr_complex.h>
 
@@ -29,7 +30,7 @@
  * \brief Voltage Controlled Oscillator (VCO)
  * \ingroup misc
  */
-class gr_fxpt_vco {
+class GR_CORE_API gr_fxpt_vco {
   gr_int32	d_phase;
 
 public:
diff --git a/gnuradio-core/src/lib/general/gr_glfsr_source_b.h b/gnuradio-core/src/lib/general/gr_glfsr_source_b.h
index cff8df11b..bd66912ed 100644
--- a/gnuradio-core/src/lib/general/gr_glfsr_source_b.h
+++ b/gnuradio-core/src/lib/general/gr_glfsr_source_b.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_GLFSR_SOURCE_B_H
 #define INCLUDED_GR_GLFSR_SOURCE_B_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gri_glfsr;
@@ -30,16 +31,16 @@ class gri_glfsr;
 class gr_glfsr_source_b;
 typedef boost::shared_ptr<gr_glfsr_source_b> gr_glfsr_source_b_sptr;
 
-gr_glfsr_source_b_sptr gr_make_glfsr_source_b(int degree, bool repeat=true, int mask=0, int seed=1);
+GR_CORE_API gr_glfsr_source_b_sptr gr_make_glfsr_source_b(int degree, bool repeat=true, int mask=0, int seed=1);
 
 /*!
  * \brief Galois LFSR pseudo-random source
  * \ingroup source_blk
  */
-class gr_glfsr_source_b : public gr_sync_block 
+class GR_CORE_API gr_glfsr_source_b : public gr_sync_block
 {
  private:
-  friend gr_glfsr_source_b_sptr
+  friend GR_CORE_API gr_glfsr_source_b_sptr
   gr_make_glfsr_source_b(int degree, bool repeat, int mask, int seed);
   
   gri_glfsr *d_glfsr;
diff --git a/gnuradio-core/src/lib/general/gr_glfsr_source_f.h b/gnuradio-core/src/lib/general/gr_glfsr_source_f.h
index 007970806..2dd09c5ac 100644
--- a/gnuradio-core/src/lib/general/gr_glfsr_source_f.h
+++ b/gnuradio-core/src/lib/general/gr_glfsr_source_f.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_GLFSR_SOURCE_F_H
 #define INCLUDED_GR_GLFSR_SOURCE_F_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gri_glfsr;
@@ -30,16 +31,16 @@ class gri_glfsr;
 class gr_glfsr_source_f;
 typedef boost::shared_ptr<gr_glfsr_source_f> gr_glfsr_source_f_sptr;
 
-gr_glfsr_source_f_sptr gr_make_glfsr_source_f(int degree, bool repeat=true, int mask=0, int seed=1);
+GR_CORE_API gr_glfsr_source_f_sptr gr_make_glfsr_source_f(int degree, bool repeat=true, int mask=0, int seed=1);
 
 /*!
  * \brief Galois LFSR pseudo-random source generating float outputs -1.0 - 1.0
  * \ingroup source_blk
  */
-class gr_glfsr_source_f : public gr_sync_block 
+class GR_CORE_API gr_glfsr_source_f : public gr_sync_block
 {
  private:
-  friend gr_glfsr_source_f_sptr
+  friend GR_CORE_API gr_glfsr_source_f_sptr
   gr_make_glfsr_source_f(int degree, bool repeat, int mask, int seed);
   
   gri_glfsr *d_glfsr;
diff --git a/gnuradio-core/src/lib/general/gr_head.h b/gnuradio-core/src/lib/general/gr_head.h
index f7eee1064..f66d43308 100644
--- a/gnuradio-core/src/lib/general/gr_head.h
+++ b/gnuradio-core/src/lib/general/gr_head.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_HEAD_H
 #define INCLUDED_GR_HEAD_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <stddef.h>			// size_t
 
@@ -36,9 +37,9 @@ typedef boost::shared_ptr<gr_head> gr_head_sptr;
  * Useful for building test cases
  */
 
-class gr_head : public gr_sync_block
+class GR_CORE_API gr_head : public gr_sync_block
 {
-  friend gr_head_sptr gr_make_head (size_t sizeof_stream_item, unsigned long long nitems);
+  friend GR_CORE_API gr_head_sptr gr_make_head (size_t sizeof_stream_item, unsigned long long nitems);
   gr_head (size_t sizeof_stream_item, unsigned long long nitems);
 
   unsigned long long	d_nitems;
@@ -52,7 +53,7 @@ class gr_head : public gr_sync_block
   void reset() { d_ncopied_items = 0; }
 };
 
-gr_head_sptr
+GR_CORE_API gr_head_sptr
 gr_make_head (size_t sizeof_stream_item, unsigned long long nitems);
 
 
diff --git a/gnuradio-core/src/lib/general/gr_int_to_float.cc b/gnuradio-core/src/lib/general/gr_int_to_float.cc
index b5a19e5c0..29ca22add 100644
--- a/gnuradio-core/src/lib/general/gr_int_to_float.cc
+++ b/gnuradio-core/src/lib/general/gr_int_to_float.cc
@@ -26,6 +26,7 @@
 
 #include <gr_int_to_float.h>
 #include <gr_io_signature.h>
+#include <gri_int_to_float.h>
 
 gr_int_to_float_sptr
 gr_make_int_to_float ()
@@ -48,9 +49,7 @@ gr_int_to_float::work (int noutput_items,
   const int32_t *in = (const int32_t *) input_items[0];
   float *out = (float *) output_items[0];
 
-  for(int i=0; i < noutput_items; i++) {
-    out[i] = (float)in[i];
-  }
+  gri_int_to_float(in, out, noutput_items);
   
   return noutput_items;
 }
diff --git a/gnuradio-core/src/lib/general/gr_int_to_float.h b/gnuradio-core/src/lib/general/gr_int_to_float.h
index cf1223be5..9af381ba9 100644
--- a/gnuradio-core/src/lib/general/gr_int_to_float.h
+++ b/gnuradio-core/src/lib/general/gr_int_to_float.h
@@ -23,22 +23,23 @@
 #ifndef INCLUDED_GR_INT_TO_FLOAT_H
 #define INCLUDED_GR_INT_TO_FLOAT_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_int_to_float;
 typedef boost::shared_ptr<gr_int_to_float> gr_int_to_float_sptr;
 
-gr_int_to_float_sptr
+GR_CORE_API gr_int_to_float_sptr
 gr_make_int_to_float ();
 
 /*!
- * \brief Convert stream of short to a stream of float
+ * \brief Convert stream of int to a stream of float
  * \ingroup converter_blk
  */
 
-class gr_int_to_float : public gr_sync_block
+class GR_CORE_API gr_int_to_float : public gr_sync_block
 {
-  friend gr_int_to_float_sptr gr_make_int_to_float ();
+  friend GR_CORE_API gr_int_to_float_sptr gr_make_int_to_float ();
   gr_int_to_float ();
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_interleave.h b/gnuradio-core/src/lib/general/gr_interleave.h
index faffdd757..ef7bce07a 100644
--- a/gnuradio-core/src/lib/general/gr_interleave.h
+++ b/gnuradio-core/src/lib/general/gr_interleave.h
@@ -23,20 +23,21 @@
 #ifndef INCLUDED_GR_INTERLEAVE_H
 #define INCLUDED_GR_INTERLEAVE_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_interleave;
 typedef boost::shared_ptr<gr_interleave> gr_interleave_sptr;
 
-gr_interleave_sptr gr_make_interleave (size_t itemsize);
+GR_CORE_API gr_interleave_sptr gr_make_interleave (size_t itemsize);
 
 /*!
  * \brief interleave N inputs to a single output
  * \ingroup slicedice_blk
  */
-class gr_interleave : public gr_sync_interpolator
+class GR_CORE_API gr_interleave : public gr_sync_interpolator
 {
-  friend gr_interleave_sptr gr_make_interleave (size_t itemsize);
+  friend GR_CORE_API gr_interleave_sptr gr_make_interleave (size_t itemsize);
 
   size_t	d_itemsize;
 
diff --git a/gnuradio-core/src/lib/general/gr_interleaved_short_to_complex.h b/gnuradio-core/src/lib/general/gr_interleaved_short_to_complex.h
index c79a9370f..40f1636bd 100644
--- a/gnuradio-core/src/lib/general/gr_interleaved_short_to_complex.h
+++ b/gnuradio-core/src/lib/general/gr_interleaved_short_to_complex.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_INTERLEAVED_SHORT_TO_COMPLEX_H
 #define INCLUDED_GR_INTERLEAVED_SHORT_TO_COMPLEX_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 class gr_interleaved_short_to_complex;
 typedef boost::shared_ptr<gr_interleaved_short_to_complex>
   gr_interleaved_short_to_complex_sptr;
 
-gr_interleaved_short_to_complex_sptr
+GR_CORE_API gr_interleaved_short_to_complex_sptr
 gr_make_interleaved_short_to_complex ();
 
 /*!
@@ -37,9 +38,9 @@ gr_make_interleaved_short_to_complex ();
  * \ingroup converter_blk
  */
 
-class gr_interleaved_short_to_complex : public gr_sync_decimator
+class GR_CORE_API gr_interleaved_short_to_complex : public gr_sync_decimator
 {
-  friend gr_interleaved_short_to_complex_sptr gr_make_interleaved_short_to_complex ();
+  friend GR_CORE_API gr_interleaved_short_to_complex_sptr gr_make_interleaved_short_to_complex ();
   gr_interleaved_short_to_complex ();
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_iqcomp_cc.h b/gnuradio-core/src/lib/general/gr_iqcomp_cc.h
index f4c6cf8ea..c01e2a6ba 100644
--- a/gnuradio-core/src/lib/general/gr_iqcomp_cc.h
+++ b/gnuradio-core/src/lib/general/gr_iqcomp_cc.h
@@ -24,20 +24,21 @@
 #ifndef INCLUDED_GR_IQCOMP_CC_H
 #define INCLUDED_GR_IQCOMP_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_iqcomp_cc;
 typedef boost::shared_ptr<gr_iqcomp_cc> gr_iqcomp_cc_sptr;
 
-gr_iqcomp_cc_sptr gr_make_iqcomp_cc (float mu);
+GR_CORE_API gr_iqcomp_cc_sptr gr_make_iqcomp_cc (float mu);
 
 /*!
  * \brief 
  * \ingroup misc_blk
  */
-class gr_iqcomp_cc : public gr_sync_block
+class GR_CORE_API gr_iqcomp_cc : public gr_sync_block
 {
-  friend gr_iqcomp_cc_sptr gr_make_iqcomp_cc (float mu);
+  friend GR_CORE_API gr_iqcomp_cc_sptr gr_make_iqcomp_cc (float mu);
 
   float	d_mu, d_wi, d_wq;
   gr_iqcomp_cc (float mu);
diff --git a/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc b/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
index 8bccefa95..3f98a003b 100644
--- a/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
+++ b/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc
@@ -91,15 +91,13 @@ gr_keep_one_in_n::general_work (int noutput_items,
 
   // Because we have set TPP_DONT, we have to propagate the tags here manually.
   // Adjustment of the tag sample value is done using the float d_decim_rate.
-  std::vector<pmt::pmt_t> tags;
-  std::vector<pmt::pmt_t>::iterator t;
+  std::vector<gr_tag_t> tags;
+  std::vector<gr_tag_t>::iterator t;
   get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+ni);
   for(t = tags.begin(); t != tags.end(); t++) {
-    uint64_t newcount = pmt::pmt_to_uint64(pmt::pmt_tuple_ref(*t, 0));
-    add_item_tag(0, newcount * d_decim_rate,
-		 pmt::pmt_tuple_ref(*t, 1),
-		 pmt::pmt_tuple_ref(*t, 2),
-		 pmt::pmt_tuple_ref(*t, 3));
+    gr_tag_t new_tag = *t;
+    new_tag.offset *= d_decim_rate;
+    add_item_tag(0, new_tag);
   }
 
   consume_each (ni);
diff --git a/gnuradio-core/src/lib/general/gr_keep_one_in_n.h b/gnuradio-core/src/lib/general/gr_keep_one_in_n.h
index ba573618e..c32ed2a26 100644
--- a/gnuradio-core/src/lib/general/gr_keep_one_in_n.h
+++ b/gnuradio-core/src/lib/general/gr_keep_one_in_n.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_KEEP_ONE_IN_N_H
 #define INCLUDED_GR_KEEP_ONE_IN_N_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 class gr_keep_one_in_n;
 typedef boost::shared_ptr<gr_keep_one_in_n> gr_keep_one_in_n_sptr;
 
-gr_keep_one_in_n_sptr 
+GR_CORE_API gr_keep_one_in_n_sptr 
 gr_make_keep_one_in_n (size_t item_size, int n);
 
 
@@ -36,9 +37,9 @@ gr_make_keep_one_in_n (size_t item_size, int n);
  * \brief decimate a stream, keeping one item out of every n.
  * \ingroup slicedice_blk
  */
-class gr_keep_one_in_n : public gr_block
+class GR_CORE_API gr_keep_one_in_n : public gr_block
 {
-  friend gr_keep_one_in_n_sptr
+  friend GR_CORE_API gr_keep_one_in_n_sptr
   gr_make_keep_one_in_n (size_t item_size, int n);
 
   int	d_n;
diff --git a/gnuradio-core/src/lib/general/gr_kludge_copy.h b/gnuradio-core/src/lib/general/gr_kludge_copy.h
index 90fd047df..5c1e461a8 100644
--- a/gnuradio-core/src/lib/general/gr_kludge_copy.h
+++ b/gnuradio-core/src/lib/general/gr_kludge_copy.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_KLUDGE_COPY_H
 #define INCLUDED_GR_KLUDGE_COPY_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_kludge_copy;
 typedef boost::shared_ptr<gr_kludge_copy> gr_kludge_copy_sptr;
 
-gr_kludge_copy_sptr gr_make_kludge_copy(size_t itemsize);
+GR_CORE_API gr_kludge_copy_sptr gr_make_kludge_copy(size_t itemsize);
 
 /*!
  * \brief output[i] = input[i]
@@ -36,11 +37,11 @@ gr_kludge_copy_sptr gr_make_kludge_copy(size_t itemsize);
  *
  * This is a short term kludge to work around a problem with the hierarchical block impl.
  */
-class gr_kludge_copy : public gr_sync_block
+class GR_CORE_API gr_kludge_copy : public gr_sync_block
 {
   size_t		d_itemsize;
 
-  friend gr_kludge_copy_sptr gr_make_kludge_copy(size_t itemsize);
+  friend GR_CORE_API gr_kludge_copy_sptr gr_make_kludge_copy(size_t itemsize);
   gr_kludge_copy(size_t itemsize);
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h b/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h
index f8497e4cb..aa7ad7b1f 100644
--- a/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h
+++ b/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_LFSR_32K_SOURCE_S_H
 #define INCLUDED_GR_LFSR_32K_SOURCE_S_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gri_lfsr_32k.h>
 
 class gr_lfsr_32k_source_s;
 typedef boost::shared_ptr<gr_lfsr_32k_source_s> gr_lfsr_32k_source_s_sptr;
 
-gr_lfsr_32k_source_s_sptr gr_make_lfsr_32k_source_s ();
+GR_CORE_API gr_lfsr_32k_source_s_sptr gr_make_lfsr_32k_source_s ();
 
 /*!
  * \brief LFSR pseudo-random source with period of 2^15 bits (2^11 shorts)
@@ -38,9 +39,9 @@ gr_lfsr_32k_source_s_sptr gr_make_lfsr_32k_source_s ();
  * This source is typically used along with gr_check_lfsr_32k_s to test
  * the USRP using its digital loopback mode.
  */
-class gr_lfsr_32k_source_s : public gr_sync_block 
+class GR_CORE_API gr_lfsr_32k_source_s : public gr_sync_block
 {
-  friend gr_lfsr_32k_source_s_sptr gr_make_lfsr_32k_source_s ();
+  friend GR_CORE_API gr_lfsr_32k_source_s_sptr gr_make_lfsr_32k_source_s ();
 
   
   static const int BUFSIZE = 2048 - 1;	// ensure pattern isn't packet aligned
diff --git a/gnuradio-core/src/lib/general/gr_lms_dfe_cc.cc b/gnuradio-core/src/lib/general/gr_lms_dfe_cc.cc
deleted file mode 100644
index 8659386d5..000000000
--- a/gnuradio-core/src/lib/general/gr_lms_dfe_cc.cc
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_lms_dfe_cc.h>
-#include <gr_io_signature.h>
-#include <gr_misc.h>
-#include <iostream>
-
-gr_complex
-gr_lms_dfe_cc::slicer_0deg (gr_complex sample)
-{
-  gr_complex out;
-  if(fabs(real(sample))>fabs(imag(sample))) {
-    if(real(sample) > 0)
-      out = gr_complex(1,0);
-    else
-      out = gr_complex(-1,0);
-  }
-  else {
-    if(imag(sample) > 0)
-      out = gr_complex(0,1);
-    else
-      out = gr_complex(0,-1);
-  }
-  return out;
-}
-
-gr_complex
-gr_lms_dfe_cc::slicer_45deg (gr_complex sample)
-{
-  gr_complex out;
-  if(real(sample) > 0)
-    out = gr_complex(1,0);
-  else
-    out = gr_complex(-1,0);
-  if(imag(sample) > 0)
-    out += gr_complex(0,1);
-  else
-    out += gr_complex(0,-1);
-  return out;
-}
-
-gr_lms_dfe_cc_sptr
-gr_make_lms_dfe_cc (float lambda_ff, float lambda_fb, 
-		    unsigned int num_fftaps, unsigned int num_fbtaps)
-{
-  return gnuradio::get_initial_sptr(new gr_lms_dfe_cc (lambda_ff, lambda_fb,
-						num_fftaps, num_fbtaps));
-}
-
-gr_lms_dfe_cc::gr_lms_dfe_cc (float lambda_ff, float lambda_fb , 
-			      unsigned int num_fftaps, unsigned int num_fbtaps)
-  : gr_sync_block ("lms_dfe_cc",
-		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
-		   gr_make_io_signature (1, 1, sizeof (gr_complex))),
-    d_lambda_ff (lambda_ff), d_lambda_fb (lambda_fb), 
-    d_ff_delayline(gr_rounduppow2(num_fftaps)),
-    d_fb_delayline(gr_rounduppow2(num_fbtaps)),
-    d_ff_taps(num_fftaps),d_fb_taps(num_fbtaps),
-    d_ff_index(0), d_fb_index(0)
-{
-  gr_zero_vector(d_ff_taps);
-  d_ff_taps [d_ff_taps.size()/2] = 1;
-
-  gr_zero_vector(d_fb_taps);
-  gr_zero_vector(d_ff_delayline);
-  gr_zero_vector(d_fb_delayline);
-}
-
-int
-gr_lms_dfe_cc::work (int noutput_items,
-		   gr_vector_const_void_star &input_items,
-		   gr_vector_void_star &output_items)
-{
-  const gr_complex *iptr = (const gr_complex *) input_items[0];
-  gr_complex *optr = (gr_complex *) output_items[0];
-  
-  gr_complex acc, decision, error;
-  unsigned int i;
-
-  unsigned int ff_mask = d_ff_delayline.size() - 1;	// size is power of 2
-  unsigned int fb_mask = d_fb_delayline.size() - 1;
-
-  int	size = noutput_items;
-  while (size-- > 0){
-    acc = 0; 
-    d_ff_delayline[d_ff_index] = *iptr++;
-
-    // Compute output
-    for (i=0; i < d_ff_taps.size(); i++) 
-      acc += conj(d_ff_delayline[(i+d_ff_index) & ff_mask]) * d_ff_taps[i];
-    
-    for (i=0; i < d_fb_taps.size(); i++)
-      acc -= conj(d_fb_delayline[(i+d_fb_index) & fb_mask]) * d_fb_taps[i];
-
-    decision = slicer_45deg(acc);
-    error = decision - acc;
-    
-    //  Update taps
-    for (i=0; i < d_ff_taps.size(); i++)
-      d_ff_taps[i] += d_lambda_ff * conj(error) * d_ff_delayline[(i+d_ff_index) & ff_mask];
-    
-    for (i=0; i < d_fb_taps.size(); i++)
-      d_fb_taps[i] -= d_lambda_fb * conj(error) * d_fb_delayline[(i+d_fb_index) & fb_mask];
-    
-    d_fb_index = (d_fb_index - 1) & fb_mask;	// Decrement index
-    d_ff_index = (d_ff_index - 1) & ff_mask;	// Decrement index
-
-    d_fb_delayline[d_fb_index] = decision;	// Save decision in feedback
-
-    *optr++ = acc;   // Output decision
-  }
-
-  if (0){
-    std::cout << "FF Taps\t";
-    for(i=0;i<d_ff_taps.size();i++)
-      std::cout << d_ff_taps[i] << "\t";
-    std::cout << std::endl << "FB Taps\t";
-    for(i=0;i<d_fb_taps.size();i++)
-      std::cout << d_fb_taps[i] << "\t";
-    std::cout << std::endl;
-  }
-
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_lms_dfe_cc.h b/gnuradio-core/src/lib/general/gr_lms_dfe_cc.h
deleted file mode 100644
index 7b3a2c84e..000000000
--- a/gnuradio-core/src/lib/general/gr_lms_dfe_cc.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 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_LMS_DFE_CC_H
-#define INCLUDED_GR_LMS_DFE_CC_H
-
-#include <gr_sync_block.h>
-
-class gr_lms_dfe_cc;
-typedef boost::shared_ptr<gr_lms_dfe_cc> gr_lms_dfe_cc_sptr;
-
-gr_lms_dfe_cc_sptr gr_make_lms_dfe_cc (float lambda_ff, float lambda_fb,
-				       unsigned int num_fftaps, unsigned int num_fbtaps);
-
-/*!
- * \brief Least-Mean-Square Decision Feedback Equalizer (complex in/out)
- * \ingroup eq_blk
- */
-class gr_lms_dfe_cc : public gr_sync_block
-{
-  friend gr_lms_dfe_cc_sptr gr_make_lms_dfe_cc (float lambda_ff, float lambda_fb,
-						unsigned int num_fftaps, unsigned int num_fbtaps);
-  
-  float	d_lambda_ff;
-  float	d_lambda_fb;
-  std::vector<gr_complex>  d_ff_delayline;
-  std::vector<gr_complex>  d_fb_delayline;
-  std::vector<gr_complex>  d_ff_taps;
-  std::vector<gr_complex>  d_fb_taps;
-  unsigned int d_ff_index;
-  unsigned int d_fb_index;
-
-  gr_lms_dfe_cc (float lambda_ff, float lambda_fb, 
-		 unsigned int num_fftaps, unsigned int num_fbtaps);
-  gr_complex slicer_0deg(gr_complex baud);
-  gr_complex slicer_45deg(gr_complex baud);
-
-  public:
-  
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_lms_dfe_ff.cc b/gnuradio-core/src/lib/general/gr_lms_dfe_ff.cc
deleted file mode 100644
index 8a5e22c2f..000000000
--- a/gnuradio-core/src/lib/general/gr_lms_dfe_ff.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_lms_dfe_ff.h>
-#include <gr_io_signature.h>
-#include <gr_misc.h>
-#include <iostream>
-
-float
-slice(float val)
-{
-  if (val>0)
-    return 1;
-  else
-    return -1;
-}
-
-gr_lms_dfe_ff_sptr
-gr_make_lms_dfe_ff (float lambda_ff, float lambda_fb, 
-		    unsigned int num_fftaps, unsigned int num_fbtaps)
-{
-  return gnuradio::get_initial_sptr(new gr_lms_dfe_ff (lambda_ff,lambda_fb,num_fftaps,num_fbtaps));
-}
-
-gr_lms_dfe_ff::gr_lms_dfe_ff (float lambda_ff, float lambda_fb , 
-			      unsigned int num_fftaps, unsigned int num_fbtaps)
-  : gr_sync_block ("lms_dfe_ff",
-		   gr_make_io_signature (1, 1, sizeof (float)),
-		   gr_make_io_signature (1, 1, sizeof (float))),
-    d_lambda_ff (lambda_ff), d_lambda_fb (lambda_fb), 
-    d_ff_delayline(gr_rounduppow2(num_fftaps)),
-    d_fb_delayline(gr_rounduppow2(num_fbtaps)),
-    d_ff_taps(num_fftaps), d_fb_taps(num_fbtaps),
-    d_ff_index(0), d_fb_index(0)
-{
-  gr_zero_vector(d_ff_taps);
-  d_ff_taps [d_ff_taps.size()/2] = 1;
-
-  gr_zero_vector(d_fb_taps);
-  gr_zero_vector(d_ff_delayline);
-  gr_zero_vector(d_fb_delayline);
-}
-
-int
-gr_lms_dfe_ff::work (int noutput_items,
-		   gr_vector_const_void_star &input_items,
-		   gr_vector_void_star &output_items)
-{
-  const float *iptr = (const float *) input_items[0];
-  float *optr = (float *) output_items[0];
-  
-  float acc, decision, error;
-  unsigned int i;
-
-  unsigned int ff_mask = d_ff_delayline.size() - 1;	// size is power of 2
-  unsigned int fb_mask = d_fb_delayline.size() - 1;
-
-  int	size = noutput_items;
-  while(size-- > 0) {
-    acc = 0; 
-    d_ff_delayline[d_ff_index] = *iptr++;
-
-    // Compute output
-    for (i=0; i < d_ff_taps.size(); i++) 
-      acc += d_ff_delayline[(i+d_ff_index) & ff_mask] * d_ff_taps[i];
-    
-    for (i=0; i < d_fb_taps.size(); i++)
-      acc -= d_fb_delayline[(i+d_fb_index) & fb_mask] * d_fb_taps[i];
-
-    decision = slice(acc);
-    error = decision - acc;
-    
-    // Update taps
-    for (i=0; i < d_ff_taps.size(); i++)
-      d_ff_taps[i] += d_lambda_ff * error * d_ff_delayline[(i+d_ff_index) & ff_mask];
-    
-    for (i=0; i < d_fb_taps.size(); i++)
-      d_fb_taps[i] -= d_lambda_fb * error * d_fb_delayline[(i+d_fb_index) & fb_mask];
-    
-    d_fb_index = (d_fb_index - 1) & fb_mask;   	// Decrement index
-    d_ff_index = (d_ff_index - 1) & ff_mask;   	// Decrement index
-
-    d_fb_delayline[d_fb_index] = decision; 	// Save decision in feedback
-
-    *optr++ = acc;   // Output decision
-  }
-
-  if (0){
-    std::cout << "FF Taps\t";
-    for(i=0;i<d_ff_taps.size();i++)
-      std::cout << d_ff_taps[i] << "\t";
-    std::cout << std::endl << "FB Taps\t";
-    for(i=0;i<d_fb_taps.size();i++)
-      std::cout << d_fb_taps[i] << "\t";
-    std::cout << std::endl;
-  }
-
-  return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_lms_dfe_ff.h b/gnuradio-core/src/lib/general/gr_lms_dfe_ff.h
deleted file mode 100644
index dd610c470..000000000
--- a/gnuradio-core/src/lib/general/gr_lms_dfe_ff.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 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_LMS_DFE_FF_H
-#define INCLUDED_GR_LMS_DFE_FF_H
-
-#include <gr_sync_block.h>
-
-class gr_lms_dfe_ff;
-typedef boost::shared_ptr<gr_lms_dfe_ff> gr_lms_dfe_ff_sptr;
-
-gr_lms_dfe_ff_sptr gr_make_lms_dfe_ff (float lambda_ff, float lambda_fb,
-				       unsigned int num_fftaps, unsigned int num_fbtaps);
-
-/*!
- * \brief Least-Mean-Square Decision Feedback Equalizer (float in/out)
- * \ingroup eq_blk
- */
-class gr_lms_dfe_ff : public gr_sync_block
-{
-  friend gr_lms_dfe_ff_sptr gr_make_lms_dfe_ff (float lambda_ff, float lambda_fb,
-						unsigned int num_fftaps, unsigned int num_fbtaps);
-  
-  float	d_lambda_ff;
-  float	d_lambda_fb;
-  std::vector<float>  d_ff_delayline;
-  std::vector<float>  d_fb_delayline;
-  std::vector<float>  d_ff_taps;
-  std::vector<float>  d_fb_taps;
-  unsigned int d_ff_index;
-  unsigned int d_fb_index;
-
-  gr_lms_dfe_ff (float lambda_ff, float lambda_fb, 
-		 unsigned int num_fftaps, unsigned int num_fbtaps);
-  
-  public:
-  
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_log2_const.h b/gnuradio-core/src/lib/general/gr_log2_const.h
index 4ea420920..8e4a0860b 100644
--- a/gnuradio-core/src/lib/general/gr_log2_const.h
+++ b/gnuradio-core/src/lib/general/gr_log2_const.h
@@ -27,6 +27,7 @@
 #ifndef INCLUDED_GR_LOG2_CONST_H
 #define INCLUDED_GR_LOG2_CONST_H
 
+#include <gr_core_api.h>
 #include <assert.h>
 
 template<unsigned int k> static inline int gr_log2_const() { assert(0); return 0; }
diff --git a/gnuradio-core/src/lib/general/gr_map_bb.h b/gnuradio-core/src/lib/general/gr_map_bb.h
index 4986ab181..0820c6a16 100644
--- a/gnuradio-core/src/lib/general/gr_map_bb.h
+++ b/gnuradio-core/src/lib/general/gr_map_bb.h
@@ -22,21 +22,22 @@
 #ifndef INCLUDED_GR_MAP_BB_H
 #define INCLUDED_GR_MAP_BB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_map_bb;
 typedef boost::shared_ptr<gr_map_bb> gr_map_bb_sptr;
 
-gr_map_bb_sptr gr_make_map_bb(const std::vector<int> &map);
+GR_CORE_API gr_map_bb_sptr gr_make_map_bb(const std::vector<int> &map);
 
 /*!
  * \brief output[i] = map[input[i]]
  * \ingroup coding_blk
  */
 
-class gr_map_bb : public gr_sync_block
+class GR_CORE_API gr_map_bb : public gr_sync_block
 {
-  friend gr_map_bb_sptr gr_make_map_bb(const std::vector<int> &map);
+  friend GR_CORE_API gr_map_bb_sptr gr_make_map_bb(const std::vector<int> &map);
 
   unsigned char d_map[0x100];
 
diff --git a/gnuradio-core/src/lib/general/gr_math.h b/gnuradio-core/src/lib/general/gr_math.h
index f5935c1da..9c61942cd 100644
--- a/gnuradio-core/src/lib/general/gr_math.h
+++ b/gnuradio-core/src/lib/general/gr_math.h
@@ -27,6 +27,7 @@
 #ifndef _GR_MATH_H_
 #define _GR_MATH_H_
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 
 static inline bool
@@ -51,7 +52,7 @@ gr_is_power_of_2(long x)
  * to zero. This routine calculates the arc tangent with an average
  * error of +/- 0.045 degrees.
  */
-float gr_fast_atan2f(float y, float x);
+GR_CORE_API float gr_fast_atan2f(float y, float x);
 
 static inline float gr_fast_atan2f(gr_complex z) 
 { 
diff --git a/gnuradio-core/src/lib/general/gr_misc.h b/gnuradio-core/src/lib/general/gr_misc.h
index 55cc7eda6..78f7e18ac 100644
--- a/gnuradio-core/src/lib/general/gr_misc.h
+++ b/gnuradio-core/src/lib/general/gr_misc.h
@@ -23,16 +23,17 @@
 #ifndef INCLUDED_GR_MISC_H
 #define INCLUDED_GR_MISC_H
 
+#include <gr_core_api.h>
 #include <gr_types.h>
 
 unsigned int 
 gr_rounduppow2(unsigned int n);
 
 // FIXME should be template
-void gr_zero_vector(std::vector<float> &v);
-void gr_zero_vector(std::vector<double> &v);
-void gr_zero_vector(std::vector<int> &v);
-void gr_zero_vector(std::vector<gr_complex> &v);
+GR_CORE_API void gr_zero_vector(std::vector<float> &v);
+GR_CORE_API void gr_zero_vector(std::vector<double> &v);
+GR_CORE_API void gr_zero_vector(std::vector<int> &v);
+GR_CORE_API void gr_zero_vector(std::vector<gr_complex> &v);
 
 
 #endif /* INCLUDED_GR_MISC_H */
diff --git a/gnuradio-core/src/lib/general/gr_nlog10_ff.h b/gnuradio-core/src/lib/general/gr_nlog10_ff.h
index 1cb50f3ca..cea56f87e 100644
--- a/gnuradio-core/src/lib/general/gr_nlog10_ff.h
+++ b/gnuradio-core/src/lib/general/gr_nlog10_ff.h
@@ -22,20 +22,21 @@
 #ifndef INCLUDED_GR_NLOG10_FF_H
 #define INCLUDED_GR_NLOG10_FF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_nlog10_ff;
 typedef boost::shared_ptr<gr_nlog10_ff> gr_nlog10_ff_sptr;
 
-gr_nlog10_ff_sptr gr_make_nlog10_ff (float n=1.0, unsigned vlen=1, float k=0);
+GR_CORE_API gr_nlog10_ff_sptr gr_make_nlog10_ff (float n=1.0, unsigned vlen=1, float k=0);
 
 /*!
  * \brief output = n*log10(input) + k
  * \ingroup math_blk
  */
-class gr_nlog10_ff : public gr_sync_block
+class GR_CORE_API gr_nlog10_ff : public gr_sync_block
 {
-  friend gr_nlog10_ff_sptr gr_make_nlog10_ff (float n, unsigned vlen, float k);
+  friend GR_CORE_API gr_nlog10_ff_sptr gr_make_nlog10_ff (float n, unsigned vlen, float k);
 
   unsigned int		d_vlen;
   float			d_n;
diff --git a/gnuradio-core/src/lib/general/gr_nop.h b/gnuradio-core/src/lib/general/gr_nop.h
index 354c2f9fc..b8398befc 100644
--- a/gnuradio-core/src/lib/general/gr_nop.h
+++ b/gnuradio-core/src/lib/general/gr_nop.h
@@ -23,22 +23,23 @@
 #ifndef INCLUDED_GR_NOP_H
 #define INCLUDED_GR_NOP_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 #include <stddef.h>			// size_t
 
 class gr_nop;
 typedef boost::shared_ptr<gr_nop> gr_nop_sptr;
 
-gr_nop_sptr
+GR_CORE_API gr_nop_sptr
 gr_make_nop (size_t sizeof_stream_item);
 
 /*!
  * \brief Does nothing.  Used for testing only.
  * \ingroup misc_blk
  */
-class gr_nop : public gr_block
+class GR_CORE_API gr_nop : public gr_block
 {
-  friend gr_nop_sptr gr_make_nop (size_t sizeof_stream_item);
+  friend GR_CORE_API gr_nop_sptr gr_make_nop (size_t sizeof_stream_item);
   gr_nop (size_t sizeof_stream_item);
 
 protected:
diff --git a/gnuradio-core/src/lib/general/gr_null_sink.h b/gnuradio-core/src/lib/general/gr_null_sink.h
index 6d00382a5..c6c4f36fb 100644
--- a/gnuradio-core/src/lib/general/gr_null_sink.h
+++ b/gnuradio-core/src/lib/general/gr_null_sink.h
@@ -23,23 +23,23 @@
 #ifndef INCLUDED_GR_NULL_SINK_H
 #define INCLUDED_GR_NULL_SINK_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <stddef.h>			// size_t
 
 class gr_null_sink;
 typedef boost::shared_ptr<gr_null_sink> gr_null_sink_sptr;
 
-gr_null_sink_sptr
+GR_CORE_API gr_null_sink_sptr
 gr_make_null_sink (size_t sizeof_stream_item);
 
-
 /*!
  * \brief Bit bucket
  * \ingroup sink_blk
  */
-class gr_null_sink : public gr_sync_block
+class GR_CORE_API gr_null_sink : public gr_sync_block
 {
-  friend gr_null_sink_sptr gr_make_null_sink (size_t sizeof_stream_item);
+  friend GR_CORE_API gr_null_sink_sptr gr_make_null_sink (size_t sizeof_stream_item);
   gr_null_sink (size_t sizeof_stream_item);
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_null_source.h b/gnuradio-core/src/lib/general/gr_null_source.h
index b1a46a195..33687fbaa 100644
--- a/gnuradio-core/src/lib/general/gr_null_source.h
+++ b/gnuradio-core/src/lib/general/gr_null_source.h
@@ -23,21 +23,22 @@
 #ifndef INCLUDED_GR_NULL_SOURCE_H
 #define INCLUDED_GR_NULL_SOURCE_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_null_source;
 typedef boost::shared_ptr<gr_null_source> gr_null_source_sptr;
 
-gr_null_source_sptr
+GR_CORE_API gr_null_source_sptr
 gr_make_null_source (size_t sizeof_stream_item);
 
 /*!
  * \brief A source of zeros.
  * \ingroup source_blk
  */
-class gr_null_source : public gr_sync_block
+class GR_CORE_API gr_null_source : public gr_sync_block
 {
-  friend gr_null_source_sptr gr_make_null_source (size_t sizeof_stream_item);
+  friend GR_CORE_API gr_null_source_sptr gr_make_null_source (size_t sizeof_stream_item);
 
   gr_null_source (size_t sizeof_stream_item);
 
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_bpsk_demapper.h b/gnuradio-core/src/lib/general/gr_ofdm_bpsk_demapper.h
index 12ae6a8f6..6d532d50f 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_bpsk_demapper.h
+++ b/gnuradio-core/src/lib/general/gr_ofdm_bpsk_demapper.h
@@ -24,13 +24,14 @@
 #define INCLUDED_GR_OFDM_BPSK_DEMAPPER_H
 
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 #include <vector>
 
 class gr_ofdm_bpsk_demapper;
 typedef boost::shared_ptr<gr_ofdm_bpsk_demapper> gr_ofdm_bpsk_demapper_sptr;
 
-gr_ofdm_bpsk_demapper_sptr 
+GR_CORE_API gr_ofdm_bpsk_demapper_sptr 
 gr_make_ofdm_bpsk_demapper (unsigned int occupied_carriers);
 
 
@@ -39,9 +40,9 @@ gr_make_ofdm_bpsk_demapper (unsigned int occupied_carriers);
  * and demodulate to a stream of bits. Simple BPSK version.
  * \ingroup ofdm_blk
  */
-class gr_ofdm_bpsk_demapper : public gr_block
+class GR_CORE_API gr_ofdm_bpsk_demapper : public gr_block
 {
-  friend gr_ofdm_bpsk_demapper_sptr
+  friend GR_CORE_API gr_ofdm_bpsk_demapper_sptr
     gr_make_ofdm_bpsk_demapper (unsigned int occupied_carriers);
   
  protected:
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h b/gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h
deleted file mode 100644
index 979e1996b..000000000
--- a/gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h
+++ /dev/null
@@ -1,56 +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_GR_OFDM_DEMAPPER_VCB_H
-#define INCLUDED_GR_OFDM_DEMAPPER_VCB_H
-
-#include <gr_sync_decimator.h>
-
-class gr_ofdm_demapper_vcb;
-typedef boost::shared_ptr<gr_ofdm_demapper_vcb> gr_ofdm_demapper_vcb_sptr;
-
-gr_ofdm_demapper_vcb_sptr 
-gr_make_ofdm_demapper_vcb (unsigned int bits_per_symbol, unsigned int vlen);
-
-
-/*!
- * \brief take a stream of vectors in from an FFT and demodulate to a stream of
- * bits.  Abstract class must be subclassed with specific mapping.
- *
- * \ingroup demodulation_blk
- * \ingroup ofdm_blk
- */
-class gr_ofdm_demapper_vcb : public gr_sync_decimator
-{
-  friend gr_ofdm_demapper_vcb_sptr
-  gr_make_ofdm_demapper_vcb (unsigned int bits_per_symbol, unsigned int vlen);
-
-protected:
-  gr_ofdm_demapper_vcb (unsigned int bits_per_symbol, unsigned int vlen);
-
-public:
-  ~gr_ofdm_demapper_vcb(void);
-};
-
-
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.cc b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.cc
new file mode 100644
index 000000000..40574b4e9
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.cc
@@ -0,0 +1,374 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,2008,2010,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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_ofdm_frame_sink2.h>
+#include <gr_io_signature.h>
+#include <gr_expj.h>
+#include <gr_math.h>
+#include <math.h>
+#include <cstdio>
+#include <stdexcept>
+#include <iostream>
+#include <string.h>
+#include <gr_constellation.h>
+
+#define VERBOSE 0
+
+inline void
+gr_ofdm_frame_sink2::enter_search()
+{
+  if (VERBOSE)
+    fprintf(stderr, "@ enter_search\n");
+
+  d_state = STATE_SYNC_SEARCH;
+
+}
+    
+inline void
+gr_ofdm_frame_sink2::enter_have_sync()
+{
+  if (VERBOSE)
+    fprintf(stderr, "@ enter_have_sync\n");
+
+  d_state = STATE_HAVE_SYNC;
+
+  // clear state of demapper
+  d_byte_offset = 0;
+  d_partial_byte = 0;
+
+  d_header = 0;
+  d_headerbytelen_cnt = 0;
+
+  // Resetting PLL
+  d_freq = 0.0;
+  d_phase = 0.0;
+  fill(d_dfe.begin(), d_dfe.end(), gr_complex(1.0,0.0));
+}
+
+inline void
+gr_ofdm_frame_sink2::enter_have_header()
+{
+  d_state = STATE_HAVE_HEADER;
+
+  // header consists of two 16-bit shorts in network byte order
+  // payload length is lower 12 bits
+  // whitener offset is upper 4 bits
+  d_packetlen = (d_header >> 16) & 0x0fff;
+  d_packet_whitener_offset = (d_header >> 28) & 0x000f;
+  d_packetlen_cnt = 0;
+
+  if (VERBOSE)
+    fprintf(stderr, "@ enter_have_header (payload_len = %d) (offset = %d)\n", 
+	    d_packetlen, d_packet_whitener_offset);
+}
+
+
+unsigned int gr_ofdm_frame_sink2::demapper(const gr_complex *in,
+					  unsigned char *out)
+{
+  unsigned int i=0, bytes_produced=0;
+  gr_complex carrier;
+
+  carrier=gr_expj(d_phase);
+
+  gr_complex accum_error = 0.0;
+  //while(i < d_occupied_carriers) {
+  while(i < d_subcarrier_map.size()) {
+    if(d_nresid > 0) {
+      d_partial_byte |= d_resid;
+      d_byte_offset += d_nresid;
+      d_nresid = 0;
+      d_resid = 0;
+    }
+    
+    //while((d_byte_offset < 8) && (i < d_occupied_carriers)) {
+    while((d_byte_offset < 8) && (i < d_subcarrier_map.size())) {
+      //gr_complex sigrot = in[i]*carrier*d_dfe[i];
+      gr_complex sigrot = in[d_subcarrier_map[i]]*carrier*d_dfe[i];
+      
+      if(d_derotated_output != NULL){
+	d_derotated_output[i] = sigrot;
+      }
+      
+      unsigned char bits = d_constell->decision_maker(&sigrot);
+
+      gr_complex closest_sym = d_constell->points()[bits];
+      
+      accum_error += sigrot * conj(closest_sym);
+
+      // FIX THE FOLLOWING STATEMENT
+      if (norm(sigrot)> 0.001) d_dfe[i] +=  d_eq_gain*(closest_sym/sigrot-d_dfe[i]);
+      
+      i++;
+
+      if((8 - d_byte_offset) >= d_nbits) {
+	d_partial_byte |= bits << (d_byte_offset);
+	d_byte_offset += d_nbits;
+      }
+      else {
+	d_nresid = d_nbits-(8-d_byte_offset);
+	int mask = ((1<<(8-d_byte_offset))-1);
+	d_partial_byte |= (bits & mask) << d_byte_offset;
+	d_resid = bits >> (8-d_byte_offset);
+	d_byte_offset += (d_nbits - d_nresid);
+      }
+      //printf("demod symbol: %.4f + j%.4f   bits: %x   partial_byte: %x   byte_offset: %d   resid: %x   nresid: %d\n", 
+      //     in[i-1].real(), in[i-1].imag(), bits, d_partial_byte, d_byte_offset, d_resid, d_nresid);
+    }
+
+    if(d_byte_offset == 8) {
+      //printf("demod byte: %x \n\n", d_partial_byte);
+      out[bytes_produced++] = d_partial_byte;
+      d_byte_offset = 0;
+      d_partial_byte = 0;
+    }
+  }
+  //std::cerr << "accum_error " << accum_error << std::endl;
+
+  float angle = arg(accum_error);
+
+  d_freq = d_freq - d_freq_gain*angle;
+  d_phase = d_phase + d_freq - d_phase_gain*angle;
+  if (d_phase >= 2*M_PI) d_phase -= 2*M_PI;
+  if (d_phase <0) d_phase += 2*M_PI;
+    
+  //if(VERBOSE)
+  //  std::cerr << angle << "\t" << d_freq << "\t" << d_phase << "\t" << std::endl;
+  
+  return bytes_produced;
+}
+
+
+gr_ofdm_frame_sink2_sptr
+gr_make_ofdm_frame_sink2(gr_constellation_sptr constell,
+			gr_msg_queue_sptr target_queue, unsigned int occupied_carriers,
+			float phase_gain, float freq_gain)
+{
+  return gnuradio::get_initial_sptr(new gr_ofdm_frame_sink2(constell,
+							target_queue, occupied_carriers,
+							phase_gain, freq_gain));
+}
+
+
+gr_ofdm_frame_sink2::gr_ofdm_frame_sink2(gr_constellation_sptr constell,
+				       gr_msg_queue_sptr target_queue, unsigned int occupied_carriers,
+				       float phase_gain, float freq_gain)
+  : gr_sync_block ("ofdm_frame_sink2",
+		   gr_make_io_signature2 (2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char)),
+		   gr_make_io_signature (1, 1, sizeof(gr_complex)*occupied_carriers)),
+    d_constell(constell),
+    d_target_queue(target_queue), d_occupied_carriers(occupied_carriers), 
+    d_byte_offset(0), d_partial_byte(0),
+    d_resid(0), d_nresid(0),d_phase(0),d_freq(0),d_phase_gain(phase_gain),d_freq_gain(freq_gain),
+    d_eq_gain(0.05)
+{
+  if (d_constell->dimensionality() != 1)
+    throw std::runtime_error ("This receiver only works with constellations of dimension 1.");
+
+  std::string carriers = "FE7F";
+
+  // A bit hacky to fill out carriers to occupied_carriers length
+  int diff = (d_occupied_carriers - 4*carriers.length()); 
+  while(diff > 7) {
+    carriers.insert(0, "f");
+    carriers.insert(carriers.length(), "f");
+    diff -= 8;
+  }
+  
+  // if there's extras left to be processed
+  // divide remaining to put on either side of current map
+  // all of this is done to stick with the concept of a carrier map string that
+  // can be later passed by the user, even though it'd be cleaner to just do this
+  // on the carrier map itself
+  int diff_left=0;
+  int diff_right=0;
+
+  // dictionary to convert from integers to ascii hex representation
+  char abc[16] = {'0', '1', '2', '3', '4', '5', '6', '7', 
+		  '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+  if(diff > 0) {
+    char c[2] = {0,0};
+
+    diff_left = (int)ceil((float)diff/2.0f);  // number of carriers to put on the left side
+    c[0] = abc[(1 << diff_left) - 1];         // convert to bits and move to ASCI integer
+    carriers.insert(0, c);
+    
+    diff_right = diff - diff_left;	      // number of carriers to put on the right side
+    c[0] = abc[0xF^((1 << diff_right) - 1)];  // convert to bits and move to ASCI integer
+    carriers.insert(carriers.length(), c);
+  }
+
+  // It seemed like such a good idea at the time...
+  // because we are only dealing with the occupied_carriers
+  // at this point, the diff_left in the following compensates
+  // for any offset from the 0th carrier introduced
+  unsigned int i,j,k;
+  for(i = 0; i < (d_occupied_carriers/4)+diff_left; i++) {
+    char c = carriers[i];
+    for(j = 0; j < 4; j++) {
+      k = (strtol(&c, NULL, 16) >> (3-j)) & 0x1;
+      if(k) {
+	d_subcarrier_map.push_back(4*i + j - diff_left);
+      }
+    }
+  }
+  
+  // make sure we stay in the limit currently imposed by the occupied_carriers
+  if(d_subcarrier_map.size() > d_occupied_carriers) {
+    throw std::invalid_argument("gr_ofdm_mapper_bcv: subcarriers allocated exceeds size of occupied carriers");
+  }
+
+  d_bytes_out = new unsigned char[d_occupied_carriers];
+  d_dfe.resize(occupied_carriers);
+  fill(d_dfe.begin(), d_dfe.end(), gr_complex(1.0,0.0));
+
+  d_nbits = d_constell->bits_per_symbol();
+
+  enter_search();
+}
+
+gr_ofdm_frame_sink2::~gr_ofdm_frame_sink2 ()
+{
+  delete [] d_bytes_out;
+}
+
+
+int
+gr_ofdm_frame_sink2::work (int noutput_items,
+			  gr_vector_const_void_star &input_items,
+			  gr_vector_void_star &output_items)
+{
+  const gr_complex *in = (const gr_complex *) input_items[0];
+  const char *sig = (const char *) input_items[1];
+  unsigned int j = 0;
+  unsigned int bytes=0;
+
+  // If the output is connected, send it the derotated symbols
+  if(output_items.size() >= 1)
+    d_derotated_output = (gr_complex *)output_items[0];
+  else
+    d_derotated_output = NULL;
+  
+  if (VERBOSE)
+    fprintf(stderr,">>> Entering state machine\n");
+
+  switch(d_state) {
+      
+  case STATE_SYNC_SEARCH:    // Look for flag indicating beginning of pkt
+    if (VERBOSE)
+      fprintf(stderr,"SYNC Search, noutput=%d\n", noutput_items);
+    
+    if (sig[0]) {  // Found it, set up for header decode
+      enter_have_sync();
+    }
+    break;
+
+  case STATE_HAVE_SYNC:
+    // only demod after getting the preamble signal; otherwise, the 
+    // equalizer taps will screw with the PLL performance
+    bytes = demapper(&in[0], d_bytes_out);
+    
+    if (VERBOSE) {
+      if(sig[0])
+	printf("ERROR -- Found SYNC in HAVE_SYNC\n");
+      fprintf(stderr,"Header Search bitcnt=%d, header=0x%08x\n",
+	      d_headerbytelen_cnt, d_header);
+    }
+
+    j = 0;
+    while(j < bytes) {
+      d_header = (d_header << 8) | (d_bytes_out[j] & 0xFF);
+      j++;
+      
+      if (++d_headerbytelen_cnt == HEADERBYTELEN) {
+	
+	if (VERBOSE)
+	  fprintf(stderr, "got header: 0x%08x\n", d_header);
+	
+	// we have a full header, check to see if it has been received properly
+	if (header_ok()){
+	  enter_have_header();
+	  
+	  if (VERBOSE)
+	    printf("\nPacket Length: %d\n", d_packetlen);
+	  
+	  while((j < bytes) && (d_packetlen_cnt < d_packetlen)) {
+	    d_packet[d_packetlen_cnt++] = d_bytes_out[j++];
+	  }
+	  
+	  if(d_packetlen_cnt == d_packetlen) {
+	    gr_message_sptr msg =
+	      gr_make_message(0, d_packet_whitener_offset, 0, d_packetlen);
+	    memcpy(msg->msg(), d_packet, d_packetlen_cnt);
+	    d_target_queue->insert_tail(msg);		// send it
+	    msg.reset();  				// free it up
+	    
+	    enter_search();				
+	  }
+	}
+	else {
+	  enter_search();				// bad header
+	}
+      }
+    }
+    break;
+      
+  case STATE_HAVE_HEADER:
+    bytes = demapper(&in[0], d_bytes_out);
+
+    if (VERBOSE) {
+      if(sig[0])
+	printf("ERROR -- Found SYNC in HAVE_HEADER at %d, length of %d\n", d_packetlen_cnt, d_packetlen);
+      fprintf(stderr,"Packet Build\n");
+    }
+    
+    j = 0;
+    while(j < bytes) {
+      d_packet[d_packetlen_cnt++] = d_bytes_out[j++];
+      
+      if (d_packetlen_cnt == d_packetlen){		// packet is filled
+	// build a message
+	// NOTE: passing header field as arg1 is not scalable
+	gr_message_sptr msg =
+	  gr_make_message(0, d_packet_whitener_offset, 0, d_packetlen_cnt);
+	memcpy(msg->msg(), d_packet, d_packetlen_cnt);
+	
+	d_target_queue->insert_tail(msg);		// send it
+	msg.reset();  				// free it up
+	
+	enter_search();
+	break;
+      }
+    }
+    break;
+    
+  default:
+    assert(0);
+    
+  } // switch
+
+  return 1;
+}
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.h b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.h
index c419b8673..9595303b1 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.h
+++ b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,18 +20,19 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_OFDM_FRAME_SINK_H
-#define INCLUDED_GR_OFDM_FRAME_SINK_H
+#ifndef INCLUDED_GR_OFDM_FRAME_SINK2_H
+#define INCLUDED_GR_OFDM_FRAME_SINK2_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_msg_queue.h>
+#include <gr_constellation.h>
 
-class gr_ofdm_frame_sink;
-typedef boost::shared_ptr<gr_ofdm_frame_sink> gr_ofdm_frame_sink_sptr;
+class gr_ofdm_frame_sink2;
+typedef boost::shared_ptr<gr_ofdm_frame_sink2> gr_ofdm_frame_sink2_sptr;
 
-gr_ofdm_frame_sink_sptr 
-gr_make_ofdm_frame_sink (const std::vector<gr_complex> &sym_position, 
-			 const std::vector<unsigned char> &sym_value_out,
+GR_CORE_API gr_ofdm_frame_sink2_sptr 
+gr_make_ofdm_frame_sink2 (gr_constellation_sptr constell,
 			 gr_msg_queue_sptr target_queue, unsigned int occupied_tones,
 			 float phase_gain=0.25, float freq_gain=0.25*0.25/4.0);
 
@@ -45,11 +46,10 @@ gr_make_ofdm_frame_sink (const std::vector<gr_complex> &sym_position,
  * we want to be able to pass in a reference to an object to do the demapping and slicing
  * for a given modulation type.
  */
-class gr_ofdm_frame_sink : public gr_sync_block
+class GR_CORE_API gr_ofdm_frame_sink2 : public gr_sync_block
 {
-  friend gr_ofdm_frame_sink_sptr 
-  gr_make_ofdm_frame_sink (const std::vector<gr_complex> &sym_position, 
-			   const std::vector<unsigned char> &sym_value_out,
+  friend GR_CORE_API gr_ofdm_frame_sink2_sptr 
+  gr_make_ofdm_frame_sink2 (gr_constellation_sptr constell, 
 			   gr_msg_queue_sptr target_queue, unsigned int occupied_tones,
 			   float phase_gain, float freq_gain);
 
@@ -77,8 +77,7 @@ class gr_ofdm_frame_sink : public gr_sync_block
 
   gr_complex * d_derotated_output;  // Pointer to output stream to send deroated symbols out
 
-  std::vector<gr_complex>    d_sym_position;
-  std::vector<unsigned char> d_sym_value_out;
+  gr_constellation_sptr      d_constell;
   std::vector<gr_complex>    d_dfe;
   unsigned int d_nbits;
 
@@ -93,8 +92,7 @@ class gr_ofdm_frame_sink : public gr_sync_block
   std::vector<int> d_subcarrier_map;
 
  protected:
-  gr_ofdm_frame_sink(const std::vector<gr_complex> &sym_position, 
-		     const std::vector<unsigned char> &sym_value_out,
+  gr_ofdm_frame_sink2(gr_constellation_sptr constell,
 		     gr_msg_queue_sptr target_queue, unsigned int occupied_tones,
 		     float phase_gain, float freq_gain);
 
@@ -112,15 +110,12 @@ class gr_ofdm_frame_sink : public gr_sync_block
   unsigned int demapper(const gr_complex *in,
 			unsigned char *out);
 
-  bool set_sym_value_out(const std::vector<gr_complex> &sym_position, 
-			 const std::vector<unsigned char> &sym_value_out);
-
  public:
-  ~gr_ofdm_frame_sink();
+  ~gr_ofdm_frame_sink2();
 
   int work(int noutput_items,
 	   gr_vector_const_void_star &input_items,
 	   gr_vector_void_star &output_items);
 };
 
-#endif /* INCLUDED_GR_OFDM_FRAME_SINK_H */
+#endif /* INCLUDED_GR_OFDM_FRAME_SINK2_H */
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.i b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.i
index 38ab50e97..8fa320089 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.i
+++ b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,22 +20,20 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,ofdm_frame_sink);
+GR_SWIG_BLOCK_MAGIC(gr,ofdm_frame_sink2);
 
-gr_ofdm_frame_sink_sptr 
-gr_make_ofdm_frame_sink(const std::vector<gr_complex> &sym_position, 
-			const std::vector<unsigned char> &sym_value_out,
+gr_ofdm_frame_sink2_sptr 
+gr_make_ofdm_frame_sink2(gr_constellation_sptr constell,
 			gr_msg_queue_sptr target_queue, unsigned int occupied_tones,
 			float phase_gain=0.25, float freq_gain=0.25*0.25/4);
 
-class gr_ofdm_frame_sink : public gr_sync_block
+class gr_ofdm_frame_sink2 : public gr_sync_block
 {
  protected:
-  gr_ofdm_frame_sink(const std::vector<gr_complex> &sym_position, 
-		     const std::vector<unsigned char> &sym_value_out,
+  gr_ofdm_frame_sink2(gr_constellation_sptr constell,
 		     gr_msg_queue_sptr target_queue, unsigned int occupied_tones,
 		     float phase_gain, float freq_gain);
 
  public:
-  ~gr_ofdm_frame_sink();
+  ~gr_ofdm_frame_sink2();
 };
diff --git a/gnuradio-core/src/lib/general/gr_pa_2x2_phase_combiner.h b/gnuradio-core/src/lib/general/gr_pa_2x2_phase_combiner.h
index ec163911a..abb23e002 100644
--- a/gnuradio-core/src/lib/general/gr_pa_2x2_phase_combiner.h
+++ b/gnuradio-core/src/lib/general/gr_pa_2x2_phase_combiner.h
@@ -22,12 +22,13 @@
 #ifndef INCLUDED_GR_PA_2X2_PHASE_COMBINER_H
 #define INCLUDED_GR_PA_2X2_PHASE_COMBINER_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_pa_2x2_phase_combiner;
 typedef boost::shared_ptr<gr_pa_2x2_phase_combiner> gr_pa_2x2_phase_combiner_sptr;
 
-gr_pa_2x2_phase_combiner_sptr gr_make_pa_2x2_phase_combiner ();
+GR_CORE_API gr_pa_2x2_phase_combiner_sptr gr_make_pa_2x2_phase_combiner ();
 
 /*!
  * \brief pa_2x2 phase combiner
@@ -40,7 +41,7 @@ gr_pa_2x2_phase_combiner_sptr gr_make_pa_2x2_phase_combiner ();
  *
  * dx and dy are lambda/2.
  */
-class gr_pa_2x2_phase_combiner : public gr_sync_block
+class GR_CORE_API gr_pa_2x2_phase_combiner : public gr_sync_block
 {
   static const int	NM = 4;
 
@@ -48,7 +49,7 @@ class gr_pa_2x2_phase_combiner : public gr_sync_block
   gr_complex	d_phase[NM];
 
   gr_pa_2x2_phase_combiner ();
-  friend gr_pa_2x2_phase_combiner_sptr gr_make_pa_2x2_phase_combiner();
+  friend GR_CORE_API gr_pa_2x2_phase_combiner_sptr gr_make_pa_2x2_phase_combiner();
 
  public:
   float theta() const { return d_theta; }
diff --git a/gnuradio-core/src/lib/general/gr_packet_sink.h b/gnuradio-core/src/lib/general/gr_packet_sink.h
index 73c5d6c52..89a95f3e3 100644
--- a/gnuradio-core/src/lib/general/gr_packet_sink.h
+++ b/gnuradio-core/src/lib/general/gr_packet_sink.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_PACKET_SINK_H
 #define INCLUDED_GR_PACKET_SINK_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_msg_queue.h>
 
 class gr_packet_sink;
 typedef boost::shared_ptr<gr_packet_sink> gr_packet_sink_sptr;
 
-gr_packet_sink_sptr 
+GR_CORE_API gr_packet_sink_sptr 
 gr_make_packet_sink (const std::vector<unsigned char>& sync_vector,
 		     gr_msg_queue_sptr target_queue,
 		     int threshold = -1	                // -1 -> use default
@@ -38,9 +39,9 @@ gr_make_packet_sink (const std::vector<unsigned char>& sync_vector,
  * \brief process received  bits looking for packet sync, header, and process bits into packet
  * \ingroup sink_blk
  */
-class gr_packet_sink : public gr_sync_block
+class GR_CORE_API gr_packet_sink : public gr_sync_block
 {
-  friend gr_packet_sink_sptr 
+  friend GR_CORE_API gr_packet_sink_sptr 
   gr_make_packet_sink (const std::vector<unsigned char>& sync_vector,
 		       gr_msg_queue_sptr target_queue,
 		       int threshold);
diff --git a/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h b/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h
index 58a006246..5bb97fc5d 100644
--- a/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h
+++ b/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_gr_peak_detector2_FB_H
 #define INCLUDED_gr_peak_detector2_FB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_peak_detector2_fb;
 typedef boost::shared_ptr<gr_peak_detector2_fb> gr_peak_detector2_fb_sptr;
 
-gr_peak_detector2_fb_sptr gr_make_peak_detector2_fb (float threshold_factor_rise = 7,
+GR_CORE_API gr_peak_detector2_fb_sptr gr_make_peak_detector2_fb (float threshold_factor_rise = 7,
 						     int look_ahead = 1000,
 						     float alpha = 0.001);
 
@@ -49,9 +50,9 @@ gr_peak_detector2_fb_sptr gr_make_peak_detector2_fb (float threshold_factor_rise
  * \param alpha The gain value of a single-pole moving average filter
  */
 
-class gr_peak_detector2_fb : public gr_sync_block
+class GR_CORE_API gr_peak_detector2_fb : public gr_sync_block
 {
-  friend gr_peak_detector2_fb_sptr 
+  friend GR_CORE_API gr_peak_detector2_fb_sptr 
   gr_make_peak_detector2_fb (float threshold_factor_rise, int look_ahead, float alpha);
   
   gr_peak_detector2_fb (float threshold_factor_rise, int look_ahead, float alpha);
diff --git a/gnuradio-core/src/lib/general/gr_phase_modulator_fc.h b/gnuradio-core/src/lib/general/gr_phase_modulator_fc.h
index 50157534b..dd6e300a8 100644
--- a/gnuradio-core/src/lib/general/gr_phase_modulator_fc.h
+++ b/gnuradio-core/src/lib/general/gr_phase_modulator_fc.h
@@ -23,24 +23,25 @@
 #ifndef INCLUDED_GR_PHASE_MODULATOR_FC_H
 #define INCLUDED_GR_PHASE_MODULATOR_FC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_phase_modulator_fc;
 typedef boost::shared_ptr<gr_phase_modulator_fc> gr_phase_modulator_fc_sptr;
 
-gr_phase_modulator_fc_sptr gr_make_phase_modulator_fc (double sensitivity);
+GR_CORE_API gr_phase_modulator_fc_sptr gr_make_phase_modulator_fc (double sensitivity);
 
 /*!
  * \brief Phase modulator block
  * \ingroup modulation_blk 
  * output=complex(cos(in*sensitivity),sin(in*sensitivity))
  */
-class gr_phase_modulator_fc : public gr_sync_block
+class GR_CORE_API gr_phase_modulator_fc : public gr_sync_block
 {
   double	d_sensitivity;
   double	d_phase;
 
-  friend gr_phase_modulator_fc_sptr
+  friend GR_CORE_API gr_phase_modulator_fc_sptr
   gr_make_phase_modulator_fc (double sensitivity);
 
   gr_phase_modulator_fc (double sensitivity);
diff --git a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
index 1668f71f0..e8ec1e235 100644
--- a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
+++ b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2010 Free Software Foundation, Inc.
+ * Copyright 2006,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -30,22 +30,24 @@
 #include <math.h>
 #include <gr_math.h>
 
-#define M_TWOPI (2*M_PI)
+#ifndef M_TWOPI
+#define M_TWOPI (2.0f*M_PI)
+#endif
 
 gr_pll_carriertracking_cc_sptr
-gr_make_pll_carriertracking_cc (float alpha, float beta, float max_freq, float min_freq)
+gr_make_pll_carriertracking_cc (float loop_bw, float max_freq, float min_freq)
 {
-  return gnuradio::get_initial_sptr(new gr_pll_carriertracking_cc (alpha, beta, max_freq, min_freq));
+  return gnuradio::get_initial_sptr(new gr_pll_carriertracking_cc (loop_bw, max_freq, min_freq));
 }
 
-gr_pll_carriertracking_cc::gr_pll_carriertracking_cc (float alpha, float beta, float max_freq, float min_freq)
+gr_pll_carriertracking_cc::gr_pll_carriertracking_cc (float loop_bw,
+						      float max_freq,
+						      float min_freq)
   : gr_sync_block ("pll_carriertracking_cc",
 		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
 		   gr_make_io_signature (1, 1, sizeof (gr_complex))),
-    d_alpha(alpha), d_beta(beta), 
-    d_max_freq(max_freq), d_min_freq(min_freq),
-    d_phase(0), d_freq((max_freq+min_freq)/2),
-    d_locksig(0),d_lock_threshold(0),d_squelch_enable(false)
+    gri_control_loop(loop_bw, max_freq, min_freq),
+    d_locksig(0), d_lock_threshold(0), d_squelch_enable(false)
 {
 }
 
@@ -72,7 +74,7 @@ gr_pll_carriertracking_cc::phase_detector(gr_complex sample,float ref_phase)
 bool
 gr_pll_carriertracking_cc::lock_detector(void)
 {
-    return (fabs(d_locksig) > d_lock_threshold);
+    return (fabsf(d_locksig) > d_lock_threshold);
 }
 
 bool
@@ -99,19 +101,16 @@ gr_pll_carriertracking_cc::work (int noutput_items,
   float t_imag, t_real;
   
   for (int i = 0; i < noutput_items; i++){
-    gr_sincosf(d_phase,&t_imag,&t_real);
-    optr[i] = iptr[i] * gr_complex(t_real,-t_imag);
+    gr_sincosf(d_phase, &t_imag, &t_real);
+    optr[i] = iptr[i] * gr_complex(t_real, -t_imag);
 
     error = phase_detector(iptr[i],d_phase);
-    
-    d_freq = d_freq + d_beta * error;
-    d_phase = mod_2pi(d_phase + d_freq + d_alpha * error);
-    
-    if (d_freq > d_max_freq)
-      d_freq = d_max_freq;
-    else if (d_freq < d_min_freq)
-      d_freq = d_min_freq;
-    d_locksig = d_locksig * (1.0 - d_alpha) +
+
+    advance_loop(error);
+    phase_wrap();
+    frequency_limit();
+
+    d_locksig = d_locksig * (1.0 - d_alpha) + \
       d_alpha*(iptr[i].real() * t_real + iptr[i].imag() * t_imag);
     
     if ((d_squelch_enable) && !lock_detector())
diff --git a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h
index 195f06016..db74bb101 100644
--- a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h
+++ b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,206 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,13 +23,16 @@
 #ifndef INCLUDED_GR_PLL_CARRIERTRACKING_CC_H
 #define INCLUDED_GR_PLL_CARRIERTRACKING_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
+#include <gri_control_loop.h>
 
 class gr_pll_carriertracking_cc;
 typedef boost::shared_ptr<gr_pll_carriertracking_cc> gr_pll_carriertracking_cc_sptr;
 
-gr_pll_carriertracking_cc_sptr gr_make_pll_carriertracking_cc (float alpha, float beta,
-					       float max_freq, float min_freq);
+GR_CORE_API gr_pll_carriertracking_cc_sptr gr_make_pll_carriertracking_cc (float loop_bw,
+							       float max_freq,
+							       float min_freq);
 /*!
  * \brief Implements a PLL which locks to the input frequency and outputs the 
  * input signal mixed with that carrier.
@@ -41,19 +44,20 @@ gr_pll_carriertracking_cc_sptr gr_make_pll_carriertracking_cc (float alpha, floa
  * the input and outputs that signal, downconverted to DC
  * 
  * All settings max_freq and min_freq are in terms of radians per sample, 
- * NOT HERTZ.  Alpha is the phase gain (first order, units of radians per radian) 
- * and beta is the frequency gain (second order, units of radians per sample per radian)
+ * NOT HERTZ.  The loop bandwidth determins the lock range and should be set
+ * around pi/200 -- 2pi/100.
  * \sa gr_pll_freqdet_cf, gr_pll_carriertracking_cc
  */
 
-class gr_pll_carriertracking_cc : public gr_sync_block
+class GR_CORE_API gr_pll_carriertracking_cc : public gr_sync_block, public gri_control_loop
 {
-  friend gr_pll_carriertracking_cc_sptr gr_make_pll_carriertracking_cc (float alpha, float beta,
-							float max_freq, float min_freq);
+  friend GR_CORE_API gr_pll_carriertracking_cc_sptr gr_make_pll_carriertracking_cc (float loop_bw,
+									float max_freq,
+									float min_freq);
 
-  float d_alpha,d_beta,d_max_freq,d_min_freq,d_phase,d_freq,d_locksig,d_lock_threshold;
+  float d_locksig,d_lock_threshold;
   bool d_squelch_enable;
-  gr_pll_carriertracking_cc (float alpha, float beta, float max_freq, float min_freq);
+  gr_pll_carriertracking_cc (float loop_bw, float max_freq, float min_freq);
 
   int work (int noutput_items,
 	    gr_vector_const_void_star &input_items,
diff --git a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.i b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.i
index 3e84fccbe..d309111b2 100644
--- a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.i
+++ b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,13 +23,14 @@
 GR_SWIG_BLOCK_MAGIC(gr,pll_carriertracking_cc);
 
 gr_pll_carriertracking_cc_sptr
-gr_make_pll_carriertracking_cc (float alpha, float beta, 
-				float max_freq, float min_freq);
+gr_make_pll_carriertracking_cc (float loop_bw, 
+				float max_freq,
+				float min_freq);
 
-class gr_pll_carriertracking_cc : public gr_sync_block
+class gr_pll_carriertracking_cc : public gr_sync_block, public gri_control_loop
 {
  private:
-  gr_pll_carriertracking_cc (float alpha, float beta, float max_freq, float min_freq);
+  gr_pll_carriertracking_cc (float loop_bw, float max_freq, float min_freq);
  public:
   bool lock_detector(void);
   bool  squelch_enable(bool);
diff --git a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
index 997ba4042..aa0d67855 100644
--- a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
+++ b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2010 Free Software Foundation, Inc.
+ * Copyright 2004,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,8 +20,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-// WARNING: this file is machine generated.  Edits will be over written
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -31,21 +29,21 @@
 #include <math.h>
 #include <gr_math.h>
 
-#define M_TWOPI (2*M_PI)
+#ifndef M_TWOPI
+#define M_TWOPI (2.0f*M_PI)
+#endif
 
 gr_pll_freqdet_cf_sptr
-gr_make_pll_freqdet_cf (float alpha, float beta, float max_freq, float min_freq)
+gr_make_pll_freqdet_cf (float loop_bw, float max_freq, float min_freq)
 {
-  return gnuradio::get_initial_sptr(new gr_pll_freqdet_cf (alpha, beta, max_freq, min_freq));
+  return gnuradio::get_initial_sptr(new gr_pll_freqdet_cf (loop_bw, max_freq, min_freq));
 }
 
-gr_pll_freqdet_cf::gr_pll_freqdet_cf (float alpha, float beta, float max_freq, float min_freq)
+gr_pll_freqdet_cf::gr_pll_freqdet_cf (float loop_bw, float max_freq, float min_freq)
   : gr_sync_block ("pll_freqdet_cf",
 		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
 		   gr_make_io_signature (1, 1, sizeof (float))),
-    d_alpha(alpha), d_beta(beta), 
-    d_max_freq(max_freq), d_min_freq(min_freq),
-    d_phase(0), d_freq((max_freq+min_freq)/2)
+    gri_control_loop(loop_bw, max_freq, min_freq)    
 {
 }
 
@@ -70,8 +68,8 @@ gr_pll_freqdet_cf::phase_detector(gr_complex sample,float ref_phase)
 
 int
 gr_pll_freqdet_cf::work (int noutput_items,
-		   gr_vector_const_void_star &input_items,
-		   gr_vector_void_star &output_items)
+			 gr_vector_const_void_star &input_items,
+			 gr_vector_void_star &output_items)
 {
   const gr_complex *iptr = (gr_complex *) input_items[0];
   float *optr = (float *) output_items[0];
@@ -84,13 +82,9 @@ gr_pll_freqdet_cf::work (int noutput_items,
 
     error = phase_detector(*iptr++,d_phase);
     
-    d_freq = d_freq + d_beta * error;
-    d_phase = mod_2pi(d_phase + d_freq + d_alpha * error);
-    
-    if (d_freq > d_max_freq)
-      d_freq = d_max_freq;
-    else if (d_freq < d_min_freq)
-      d_freq = d_min_freq;
+    advance_loop(error);
+    phase_wrap();
+    frequency_limit();
   }
   return noutput_items;
 }
diff --git a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h
index 0581c8724..336f3fd31 100644
--- a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h
+++ b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,13 +23,16 @@
 #ifndef INCLUDED_GR_PLL_FREQDET_CF_H
 #define INCLUDED_GR_PLL_FREQDET_CF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
+#include <gri_control_loop.h>
 
 class gr_pll_freqdet_cf;
 typedef boost::shared_ptr<gr_pll_freqdet_cf> gr_pll_freqdet_cf_sptr;
 
-gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float alpha, float beta,
-					       float max_freq, float min_freq);
+GR_CORE_API gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float loop_bw,
+					       float max_freq,
+					       float min_freq);
 /*!
  * \brief Implements a PLL which locks to the input frequency and outputs 
  * an estimate of that frequency.  Useful for FM Demod.
@@ -40,24 +43,24 @@ gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float alpha, float beta,
  * This PLL locks onto a [possibly noisy] reference carrier on
  * the input and outputs an estimate of that frequency in radians per sample.
  * All settings max_freq and min_freq are in terms of radians per sample, 
- * NOT HERTZ.  Alpha is the phase gain (first order, units of radians per radian) 
- * and beta is the frequency gain (second order, units of radians per sample per radian)
+ * NOT HERTZ.  The loop bandwidth determins the lock range and should be set
+ * around pi/200 -- 2pi/100.
  * \sa gr_pll_refout_cc, gr_pll_carriertracking_cc
  */
 
-class gr_pll_freqdet_cf : public gr_sync_block
+class GR_CORE_API gr_pll_freqdet_cf : public gr_sync_block, public gri_control_loop
 {
-  friend gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float alpha, float beta,
-							float max_freq, float min_freq);
+  friend GR_CORE_API gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float loop_bw,
+							float max_freq,
+							float min_freq);
 
-  float d_alpha,d_beta,d_max_freq,d_min_freq,d_phase,d_freq;
-  gr_pll_freqdet_cf (float alpha, float beta, float max_freq, float min_freq);
+  float mod_2pi (float in);
+  gr_pll_freqdet_cf (float loop_bw, float max_freq, float min_freq);
 
   int work (int noutput_items,
 	    gr_vector_const_void_star &input_items,
 	    gr_vector_void_star &output_items);
 private:
-  float mod_2pi (float in);
   float phase_detector(gr_complex sample,float ref_phase);
 };
 
diff --git a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.i b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.i
index b730f037a..f93e6e37e 100644
--- a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.i
+++ b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,11 +22,12 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,pll_freqdet_cf)
 
-  gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float alpha, float beta, 
-						 float max_freq, float min_freq);
+  gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float loop_bw, 
+						 float max_freq,
+						 float min_freq);
 
-class gr_pll_freqdet_cf : public gr_sync_block
+class gr_pll_freqdet_cf : public gr_sync_block, public gri_control_loop
 {
  private:
-  gr_pll_freqdet_cf (float alpha, float beta, float max_freq, float min_freq);
+  gr_pll_freqdet_cf (float loop_bw, float max_freq, float min_freq);
 };
diff --git a/gnuradio-core/src/lib/general/gr_pll_refout_cc.cc b/gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
index d01f28e45..dfd5079da 100644
--- a/gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
+++ b/gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2010 Free Software Foundation, Inc.
+ * Copyright 2004,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,8 +20,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-// WARNING: this file is machine generated.  Edits will be over written
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -32,21 +30,21 @@
 #include <math.h>
 #include <gr_math.h>
 
-#define M_TWOPI (2*M_PI)
+#ifndef M_TWOPI
+#define M_TWOPI (2.0f*M_PI)
+#endif
 
 gr_pll_refout_cc_sptr
-gr_make_pll_refout_cc (float alpha, float beta, float max_freq, float min_freq)
+gr_make_pll_refout_cc (float loop_bw, float max_freq, float min_freq)
 {
-  return gnuradio::get_initial_sptr(new gr_pll_refout_cc (alpha, beta, max_freq, min_freq));
+  return gnuradio::get_initial_sptr(new gr_pll_refout_cc (loop_bw, max_freq, min_freq));
 }
 
-gr_pll_refout_cc::gr_pll_refout_cc (float alpha, float beta, float max_freq, float min_freq)
+gr_pll_refout_cc::gr_pll_refout_cc (float loop_bw, float max_freq, float min_freq)
   : gr_sync_block ("pll_refout_cc",
 		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
 		   gr_make_io_signature (1, 1, sizeof (gr_complex))),
-    d_alpha(alpha), d_beta(beta), 
-    d_max_freq(max_freq), d_min_freq(min_freq),
-    d_phase(0), d_freq((max_freq+min_freq)/2)
+    gri_control_loop(loop_bw, max_freq, min_freq)
 {
 }
 
@@ -87,13 +85,9 @@ gr_pll_refout_cc::work (int noutput_items,
 
     error = phase_detector(*iptr++,d_phase);
     
-    d_freq = d_freq + d_beta * error;
-    d_phase = mod_2pi(d_phase + d_freq + d_alpha * error);
-    
-    if (d_freq > d_max_freq)
-      d_freq = d_max_freq;
-    else if (d_freq < d_min_freq)
-      d_freq = d_min_freq;
+    advance_loop(error);
+    phase_wrap();
+    frequency_limit();
   }
   return noutput_items;
 }
diff --git a/gnuradio-core/src/lib/general/gr_pll_refout_cc.h b/gnuradio-core/src/lib/general/gr_pll_refout_cc.h
index 3263c957f..dcbeb1efa 100644
--- a/gnuradio-core/src/lib/general/gr_pll_refout_cc.h
+++ b/gnuradio-core/src/lib/general/gr_pll_refout_cc.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,18 +20,18 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
-
 #ifndef INCLUDED_GR_PLL_REFOUT_CC_H
 #define INCLUDED_GR_PLL_REFOUT_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
+#include <gri_control_loop.h>
 
 class gr_pll_refout_cc;
 typedef boost::shared_ptr<gr_pll_refout_cc> gr_pll_refout_cc_sptr;
 
-gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float alpha, float beta,
-					       float max_freq, float min_freq);
+GR_CORE_API gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float loop_bw,
+					     float max_freq, float min_freq);
 /*!
  * \brief Implements a PLL which locks to the input frequency and outputs a carrier
  * \ingroup sync_blk
@@ -43,24 +43,23 @@ gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float alpha, float beta,
  * aligned to it.
  * 
  * All settings max_freq and min_freq are in terms of radians per sample, 
- * NOT HERTZ.  Alpha is the phase gain (first order, units of radians per radian) 
- * and beta is the frequency gain (second order, units of radians per sample per radian)
+ * NOT HERTZ.  The loop bandwidth determins the lock range and should be set
+ * around pi/200 -- 2pi/100.
  * \sa gr_pll_freqdet_cf, gr_pll_carriertracking_cc
  */
-class gr_pll_refout_cc : public gr_sync_block
+class GR_CORE_API gr_pll_refout_cc : public gr_sync_block, public gri_control_loop
 {
-  friend gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float alpha, float beta,
-							float max_freq, float min_freq);
+  friend GR_CORE_API gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float loop_bw,
+						      float max_freq, float min_freq);
 
-  float d_alpha,d_beta,d_max_freq,d_min_freq,d_phase,d_freq;
-  gr_pll_refout_cc (float alpha, float beta, float max_freq, float min_freq);
+  gr_pll_refout_cc (float loop_bw, float max_freq, float min_freq);
 
   int work (int noutput_items,
 	    gr_vector_const_void_star &input_items,
 	    gr_vector_void_star &output_items);
 private:
   float mod_2pi (float in);
-  float phase_detector(gr_complex sample,float ref_phase);
+  float phase_detector(gr_complex sample, float ref_phase);
 };
 
 #endif
diff --git a/gnuradio-core/src/lib/general/gr_pll_refout_cc.i b/gnuradio-core/src/lib/general/gr_pll_refout_cc.i
index 026a684ed..834ea1e36 100644
--- a/gnuradio-core/src/lib/general/gr_pll_refout_cc.i
+++ b/gnuradio-core/src/lib/general/gr_pll_refout_cc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,11 +22,11 @@
 
 GR_SWIG_BLOCK_MAGIC(gr,pll_refout_cc)
 
-  gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float alpha, float beta, 
-						 float max_freq, float min_freq);
+gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float loop_bw, 
+					     float max_freq, float min_freq);
 
-class gr_pll_refout_cc : public gr_sync_block
+class gr_pll_refout_cc : public gr_sync_block, public gri_control_loop
 {
  private:
-  gr_pll_refout_cc (float alpha, float beta, float max_freq, float min_freq);
+  gr_pll_refout_cc (float loop_bw, float max_freq, float min_freq);
 };
diff --git a/gnuradio-core/src/lib/general/gr_pn_correlator_cc.h b/gnuradio-core/src/lib/general/gr_pn_correlator_cc.h
index 73bb7aa8c..75e2d1c7b 100644
--- a/gnuradio-core/src/lib/general/gr_pn_correlator_cc.h
+++ b/gnuradio-core/src/lib/general/gr_pn_correlator_cc.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_PN_CORRELATOR_CC_H
 #define INCLUDED_GR_PN_CORRELATOR_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 #include <gri_glfsr.h>
 
 class gr_pn_correlator_cc;
 typedef boost::shared_ptr<gr_pn_correlator_cc> gr_pn_correlator_cc_sptr;
 
-gr_pn_correlator_cc_sptr
+GR_CORE_API gr_pn_correlator_cc_sptr
 gr_make_pn_correlator_cc(int degree, int mask=0, int seed=1);
 /*!
  * \brief PN code sequential search correlator
@@ -39,9 +40,9 @@ gr_make_pn_correlator_cc(int degree, int mask=0, int seed=1);
  * reference PN code, one sample per PN code period
  */
 
-class gr_pn_correlator_cc : public gr_sync_decimator
+class GR_CORE_API gr_pn_correlator_cc : public gr_sync_decimator
 {
-  friend gr_pn_correlator_cc_sptr gr_make_pn_correlator_cc(int degree, int mask, int seed);
+  friend GR_CORE_API gr_pn_correlator_cc_sptr gr_make_pn_correlator_cc(int degree, int mask, int seed);
 
   int        d_len;
   float      d_pn;
diff --git a/gnuradio-core/src/lib/general/gr_prefs.h b/gnuradio-core/src/lib/general/gr_prefs.h
index 4396d727c..8ceb5b465 100644
--- a/gnuradio-core/src/lib/general/gr_prefs.h
+++ b/gnuradio-core/src/lib/general/gr_prefs.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_PREFS_H
 #define INCLUDED_GR_PREFS_H
 
+#include <gr_core_api.h>
 #include <string>
 
 /*!
@@ -32,7 +33,7 @@
  * via the magic of SWIG directors.
  */
 
-class gr_prefs
+class GR_CORE_API gr_prefs
 {
 public:
   static gr_prefs *singleton();
diff --git a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h
index ee8872010..e857686a8 100644
--- a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h
+++ b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_GR_PROBE_AVG_MAG_SQRD_C_H
 #define INCLUDED_GR_PROBE_AVG_MAG_SQRD_C_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_single_pole_iir.h>
 
 class gr_probe_avg_mag_sqrd_c;
 typedef boost::shared_ptr<gr_probe_avg_mag_sqrd_c> gr_probe_avg_mag_sqrd_c_sptr;
 
-gr_probe_avg_mag_sqrd_c_sptr
+GR_CORE_API gr_probe_avg_mag_sqrd_c_sptr
 gr_make_probe_avg_mag_sqrd_c (double threshold_db, double alpha = 0.0001);
 
 /*!
@@ -41,14 +42,14 @@ gr_make_probe_avg_mag_sqrd_c (double threshold_db, double alpha = 0.0001);
  * The level and indication as to whether the level exceeds threshold
  * can be retrieved with the level and unmuted accessors.
  */
-class gr_probe_avg_mag_sqrd_c : public gr_sync_block
+class GR_CORE_API gr_probe_avg_mag_sqrd_c : public gr_sync_block
 {
   double					d_threshold;
   gr_single_pole_iir<double,double,double>	d_iir;
   bool						d_unmuted;
   double					d_level;
 
-  friend gr_probe_avg_mag_sqrd_c_sptr
+  friend GR_CORE_API gr_probe_avg_mag_sqrd_c_sptr
   gr_make_probe_avg_mag_sqrd_c (double threshold_db, double alpha);
 
   gr_probe_avg_mag_sqrd_c (double threshold_db, double alpha);
diff --git a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_cf.h b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_cf.h
index 6c536ca5b..a85afcf3b 100644
--- a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_cf.h
+++ b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_cf.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_GR_PROBE_AVG_MAG_SQRD_CF_H
 #define INCLUDED_GR_PROBE_AVG_MAG_SQRD_CF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_single_pole_iir.h>
 
 class gr_probe_avg_mag_sqrd_cf;
 typedef boost::shared_ptr<gr_probe_avg_mag_sqrd_cf> gr_probe_avg_mag_sqrd_cf_sptr;
 
-gr_probe_avg_mag_sqrd_cf_sptr
+GR_CORE_API gr_probe_avg_mag_sqrd_cf_sptr
 gr_make_probe_avg_mag_sqrd_cf (double threshold_db, double alpha = 0.0001);
 
 /*!
@@ -43,14 +44,14 @@ gr_make_probe_avg_mag_sqrd_cf (double threshold_db, double alpha = 0.0001);
  * can be retrieved with the level and unmuted accessors.
  *
  */
-class gr_probe_avg_mag_sqrd_cf : public gr_sync_block
+class GR_CORE_API gr_probe_avg_mag_sqrd_cf : public gr_sync_block
 {
   double					d_threshold;
   gr_single_pole_iir<double,double,double>	d_iir;
   bool						d_unmuted;
   double					d_level;
 
-  friend gr_probe_avg_mag_sqrd_cf_sptr
+  friend GR_CORE_API gr_probe_avg_mag_sqrd_cf_sptr
   gr_make_probe_avg_mag_sqrd_cf (double threshold_db, double alpha);
 
   gr_probe_avg_mag_sqrd_cf (double threshold_db, double alpha);
diff --git a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h
index b31e54f6b..4181ccf46 100644
--- a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h
+++ b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_GR_PROBE_AVG_MAG_SQRD_F_H
 #define INCLUDED_GR_PROBE_AVG_MAG_SQRD_F_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_single_pole_iir.h>
 
 class gr_probe_avg_mag_sqrd_f;
 typedef boost::shared_ptr<gr_probe_avg_mag_sqrd_f> gr_probe_avg_mag_sqrd_f_sptr;
 
-gr_probe_avg_mag_sqrd_f_sptr
+GR_CORE_API gr_probe_avg_mag_sqrd_f_sptr
 gr_make_probe_avg_mag_sqrd_f (double threshold_db, double alpha = 0.0001);
 
 /*!
@@ -41,14 +42,14 @@ gr_make_probe_avg_mag_sqrd_f (double threshold_db, double alpha = 0.0001);
  * The level and indication as to whether the level exceeds threshold
  * can be retrieved with the level and unmuted accessors.
  */
-class gr_probe_avg_mag_sqrd_f : public gr_sync_block
+class GR_CORE_API gr_probe_avg_mag_sqrd_f : public gr_sync_block
 {
   double					d_threshold;
   gr_single_pole_iir<double,double,double>	d_iir;
   bool						d_unmuted;
   double					d_level;
 
-  friend gr_probe_avg_mag_sqrd_f_sptr
+  friend GR_CORE_API gr_probe_avg_mag_sqrd_f_sptr
   gr_make_probe_avg_mag_sqrd_f (double threshold_db, double alpha);
 
   gr_probe_avg_mag_sqrd_f (double threshold_db, double alpha);
diff --git a/gnuradio-core/src/lib/general/gr_probe_density_b.h b/gnuradio-core/src/lib/general/gr_probe_density_b.h
index 92b98d193..0af30c665 100644
--- a/gnuradio-core/src/lib/general/gr_probe_density_b.h
+++ b/gnuradio-core/src/lib/general/gr_probe_density_b.h
@@ -20,13 +20,14 @@
 #ifndef INCLUDED_GR_PROBE_DENSITY_B_H
 #define INCLUDED_GR_PROBE_DENSITY_B_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_probe_density_b;
 
 typedef boost::shared_ptr<gr_probe_density_b> gr_probe_density_b_sptr;
 
-gr_probe_density_b_sptr gr_make_probe_density_b(double alpha);
+GR_CORE_API gr_probe_density_b_sptr gr_make_probe_density_b(double alpha);
 
 /*!
  * This block maintains a running average of the input stream and
@@ -40,10 +41,10 @@ gr_probe_density_b_sptr gr_make_probe_density_b(double alpha);
  *
  */
 
-class gr_probe_density_b : public gr_sync_block
+class GR_CORE_API gr_probe_density_b : public gr_sync_block
 {
 private:
-  friend gr_probe_density_b_sptr gr_make_probe_density_b(double alpha);
+  friend GR_CORE_API gr_probe_density_b_sptr gr_make_probe_density_b(double alpha);
 
   double d_alpha;
   double d_beta;
diff --git a/gnuradio-core/src/lib/general/gr_probe_mpsk_snr_c.h b/gnuradio-core/src/lib/general/gr_probe_mpsk_snr_c.h
index 279a4a5b8..870e46701 100644
--- a/gnuradio-core/src/lib/general/gr_probe_mpsk_snr_c.h
+++ b/gnuradio-core/src/lib/general/gr_probe_mpsk_snr_c.h
@@ -22,12 +22,13 @@
 #ifndef INCLUDED_GR_PROBE_MPSK_SNR_C_H
 #define INCLUDED_GR_PROBE_MPSK_SNR_C_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_probe_mpsk_snr_c;
 typedef boost::shared_ptr<gr_probe_mpsk_snr_c> gr_probe_mpsk_snr_c_sptr;
 
-gr_probe_mpsk_snr_c_sptr
+GR_CORE_API gr_probe_mpsk_snr_c_sptr
 gr_make_probe_mpsk_snr_c(double alpha = 0.0001);
 
 /*!
@@ -46,7 +47,7 @@ gr_make_probe_mpsk_snr_c(double alpha = 0.0001);
  * This SNR estimator is inaccurate below about 7dB SNR.
  *
  */
-class gr_probe_mpsk_snr_c : public gr_sync_block
+class GR_CORE_API gr_probe_mpsk_snr_c : public gr_sync_block
 {
   double d_alpha;
   double d_beta;
@@ -54,7 +55,7 @@ class gr_probe_mpsk_snr_c : public gr_sync_block
   double d_noise_variance;
 
   // Factory function returning shared pointer of this class
-  friend gr_probe_mpsk_snr_c_sptr
+  friend GR_CORE_API gr_probe_mpsk_snr_c_sptr
   gr_make_probe_mpsk_snr_c(double alpha);
 
   // Private constructor
diff --git a/gnuradio-core/src/lib/general/gr_probe_signal_f.h b/gnuradio-core/src/lib/general/gr_probe_signal_f.h
index 9605bb685..b99c76976 100644
--- a/gnuradio-core/src/lib/general/gr_probe_signal_f.h
+++ b/gnuradio-core/src/lib/general/gr_probe_signal_f.h
@@ -22,23 +22,24 @@
 #ifndef INCLUDED_GR_PROBE_SIGNAL_F_H
 #define INCLUDED_GR_PROBE_SIGNAL_F_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_probe_signal_f;
 typedef boost::shared_ptr<gr_probe_signal_f> gr_probe_signal_f_sptr;
 
-gr_probe_signal_f_sptr
+GR_CORE_API gr_probe_signal_f_sptr
 gr_make_probe_signal_f ();
 
 /*!
  * \brief Sink that allows a sample to be grabbed from Python.
  * \ingroup sink_blk
  */
-class gr_probe_signal_f : public gr_sync_block
+class GR_CORE_API gr_probe_signal_f : public gr_sync_block
 {
   float	d_level;
 
-  friend gr_probe_signal_f_sptr
+  friend GR_CORE_API gr_probe_signal_f_sptr
   gr_make_probe_signal_f();
 
   gr_probe_signal_f();
diff --git a/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.h b/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.h
index 9c519f383..2a008d92d 100644
--- a/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.h
+++ b/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_PWR_SQUELCH_CC_H
 #define INCLUDED_GR_PWR_SQUELCH_CC_H
 
+#include <gr_core_api.h>
 #include <cmath>
 #include <gr_squelch_base_cc.h>
 #include <gr_single_pole_iir.h>
@@ -30,21 +31,21 @@
 class gr_pwr_squelch_cc;
 typedef boost::shared_ptr<gr_pwr_squelch_cc> gr_pwr_squelch_cc_sptr;
 
-gr_pwr_squelch_cc_sptr 
+GR_CORE_API gr_pwr_squelch_cc_sptr 
 gr_make_pwr_squelch_cc(double db, double alpha = 0.0001, int ramp=0, bool gate=false);
 
 /*!
  * \brief gate or zero output when input power below threshold
  * \ingroup level_blk
  */
-class gr_pwr_squelch_cc : public gr_squelch_base_cc
+class GR_CORE_API gr_pwr_squelch_cc : public gr_squelch_base_cc
 {
 private:
   double d_threshold;
   double d_pwr;
   gr_single_pole_iir<double,double,double> d_iir;
 
-  friend gr_pwr_squelch_cc_sptr gr_make_pwr_squelch_cc(double db, double alpha, int ramp, bool gate);
+  friend GR_CORE_API gr_pwr_squelch_cc_sptr gr_make_pwr_squelch_cc(double db, double alpha, int ramp, bool gate);
   gr_pwr_squelch_cc(double db, double alpha, int ramp, bool gate);
 
 protected:
diff --git a/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.h b/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.h
index 6952dbce2..27a7306b3 100644
--- a/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.h
+++ b/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_PWR_SQUELCH_FF_H
 #define INCLUDED_GR_PWR_SQUELCH_FF_H
 
+#include <gr_core_api.h>
 #include <cmath>
 #include <gr_squelch_base_ff.h>
 #include <gr_single_pole_iir.h>
@@ -30,21 +31,21 @@
 class gr_pwr_squelch_ff;
 typedef boost::shared_ptr<gr_pwr_squelch_ff> gr_pwr_squelch_ff_sptr;
 
-gr_pwr_squelch_ff_sptr 
+GR_CORE_API gr_pwr_squelch_ff_sptr 
 gr_make_pwr_squelch_ff(double db, double alpha = 0.0001, int ramp=0, bool gate=false);
 
 /*!
  * \brief gate or zero output when input power below threshold
  * \ingroup level_blk
  */
-class gr_pwr_squelch_ff : public gr_squelch_base_ff
+class GR_CORE_API gr_pwr_squelch_ff : public gr_squelch_base_ff
 {
 private:
   double d_threshold;
   double d_pwr;
   gr_single_pole_iir<double,double,double> d_iir;
 
-  friend gr_pwr_squelch_ff_sptr gr_make_pwr_squelch_ff(double db, double alpha, int ramp, bool gate);
+  friend GR_CORE_API gr_pwr_squelch_ff_sptr gr_make_pwr_squelch_ff(double db, double alpha, int ramp, bool gate);
   gr_pwr_squelch_ff(double db, double alpha, int ramp, bool gate);
 
 protected:
diff --git a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h
index df6de93d5..755f2839a 100644
--- a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h
+++ b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h
@@ -23,11 +23,12 @@
 #ifndef INCLUDED_GR_QUADRATURE_DEMOD_CF_H
 #define INCLUDED_GR_QUADRATURE_DEMOD_CF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_quadrature_demod_cf;
 typedef boost::shared_ptr<gr_quadrature_demod_cf> gr_quadrature_demod_cf_sptr;
-gr_quadrature_demod_cf_sptr gr_make_quadrature_demod_cf (float gain);
+GR_CORE_API gr_quadrature_demod_cf_sptr gr_make_quadrature_demod_cf (float gain);
 
 /*!
  * \brief quadrature demodulator: complex in, float out
@@ -36,9 +37,9 @@ gr_quadrature_demod_cf_sptr gr_make_quadrature_demod_cf (float gain);
  * This can be used to demod FM, FSK, GMSK, etc.
  * The input is complex baseband.
  */
-class gr_quadrature_demod_cf : public gr_sync_block
+class GR_CORE_API gr_quadrature_demod_cf : public gr_sync_block
 {
-  friend gr_quadrature_demod_cf_sptr gr_make_quadrature_demod_cf (float gain);
+  friend GR_CORE_API gr_quadrature_demod_cf_sptr gr_make_quadrature_demod_cf (float gain);
   gr_quadrature_demod_cf (float gain);
 
   float		d_gain;
diff --git a/gnuradio-core/src/lib/general/gr_rail_ff.h b/gnuradio-core/src/lib/general/gr_rail_ff.h
index d9e19a964..225bdf36e 100644
--- a/gnuradio-core/src/lib/general/gr_rail_ff.h
+++ b/gnuradio-core/src/lib/general/gr_rail_ff.h
@@ -23,6 +23,7 @@
 #ifndef   	INCLUDED_GR_RAIL_FF_H_
 # define   	INCLUDED_GR_RAIL_FF_H_
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 /*!
@@ -33,11 +34,11 @@
 class gr_rail_ff;
 typedef boost::shared_ptr<gr_rail_ff> gr_rail_ff_sptr;
 
-gr_rail_ff_sptr gr_make_rail_ff(float lo, float hi);
+GR_CORE_API gr_rail_ff_sptr gr_make_rail_ff(float lo, float hi);
 
-class gr_rail_ff : public gr_sync_block
+class GR_CORE_API gr_rail_ff : public gr_sync_block
 {
-  friend gr_rail_ff_sptr gr_make_rail_ff (float lo, float hi);
+  friend GR_CORE_API gr_rail_ff_sptr gr_make_rail_ff (float lo, float hi);
 
   float	d_lo, d_hi;		// the constant
   gr_rail_ff(float lo, float hi);
diff --git a/gnuradio-core/src/lib/general/gr_random.h b/gnuradio-core/src/lib/general/gr_random.h
index e5002fd33..13dbbfb04 100644
--- a/gnuradio-core/src/lib/general/gr_random.h
+++ b/gnuradio-core/src/lib/general/gr_random.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_RANDOM_H
 #define INCLUDED_GR_RANDOM_H
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 
 /*!
  * \brief pseudo random number generator
  * \ingroup math_blk
  */
-class gr_random {
+class GR_CORE_API gr_random {
 protected:
   static const int NTAB  = 32;
   long  d_seed;
diff --git a/gnuradio-core/src/lib/general/gr_regenerate_bb.h b/gnuradio-core/src/lib/general/gr_regenerate_bb.h
index db511b228..67cfedac7 100644
--- a/gnuradio-core/src/lib/general/gr_regenerate_bb.h
+++ b/gnuradio-core/src/lib/general/gr_regenerate_bb.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_REGENERATE_BB_H
 #define INCLUDED_GR_REGENERATE_BB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_regenerate_bb;
 typedef boost::shared_ptr<gr_regenerate_bb> gr_regenerate_bb_sptr;
 
-gr_regenerate_bb_sptr gr_make_regenerate_bb (int period, unsigned int max_regen=500);
+GR_CORE_API gr_regenerate_bb_sptr gr_make_regenerate_bb (int period, unsigned int max_regen=500);
 
 /*!
  * \brief Detect the peak of a signal and repeat every period samples
@@ -40,7 +41,7 @@ gr_regenerate_bb_sptr gr_make_regenerate_bb (int period, unsigned int max_regen=
  *
  * Note that if max_regen=(-1)/ULONG_MAX then the regeneration will run forever.
  */
-class gr_regenerate_bb : public gr_sync_block
+class GR_CORE_API gr_regenerate_bb : public gr_sync_block
 {
   /*!
    * \brief Make a regenerate block
@@ -48,7 +49,7 @@ class gr_regenerate_bb : public gr_sync_block
    * \param max_regen The maximum number of regenerations to perform; if set to 
    * ULONG_MAX, it will regenerate continuously.
    */
-  friend gr_regenerate_bb_sptr gr_make_regenerate_bb (int period, unsigned int max_regen);
+  friend GR_CORE_API gr_regenerate_bb_sptr gr_make_regenerate_bb (int period, unsigned int max_regen);
 
   gr_regenerate_bb (int period, unsigned int max_regen);
 
diff --git a/gnuradio-core/src/lib/general/gr_remez.h b/gnuradio-core/src/lib/general/gr_remez.h
index 85e1516a5..f7b8a72a3 100644
--- a/gnuradio-core/src/lib/general/gr_remez.h
+++ b/gnuradio-core/src/lib/general/gr_remez.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_REMEZ_H
 #define INCLUDED_GR_REMEZ_H
 
+#include <gr_core_api.h>
 #include <gr_types.h>
 #include <string>
 #include <stdexcept>
@@ -51,7 +52,7 @@
  * \throws std::runtime_error if args are invalid or calculation fails to converge.
  */
 
-std::vector<double>
+GR_CORE_API std::vector<double>
 gr_remez (int order,
 	  const std::vector<double> &bands,
 	  const std::vector<double> &ampl,
diff --git a/gnuradio-core/src/lib/general/gr_repeat.h b/gnuradio-core/src/lib/general/gr_repeat.h
index f323fc375..b90f2f51d 100644
--- a/gnuradio-core/src/lib/general/gr_repeat.h
+++ b/gnuradio-core/src/lib/general/gr_repeat.h
@@ -22,23 +22,24 @@
 #ifndef INCLUDED_GR_REPEAT_H
 #define INCLUDED_GR_REPEAT_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_repeat;
 
 typedef boost::shared_ptr<gr_repeat> gr_repeat_sptr;
 
-gr_repeat_sptr gr_make_repeat(size_t itemsize, int interp);
+GR_CORE_API gr_repeat_sptr gr_make_repeat(size_t itemsize, int interp);
 
 /*!
  * \brief Repeat a sample 'interp' times in output stream
  * \ingroup misc_blk
  */
 
-class gr_repeat : public gr_sync_interpolator
+class GR_CORE_API gr_repeat : public gr_sync_interpolator
 {
 private:
-  friend gr_repeat_sptr gr_make_repeat(size_t itemsize, int interp);
+  friend GR_CORE_API gr_repeat_sptr gr_make_repeat(size_t itemsize, int interp);
 						     
   gr_repeat(size_t itemsize, int interp);
 
diff --git a/gnuradio-core/src/lib/general/gr_reverse.h b/gnuradio-core/src/lib/general/gr_reverse.h
index d79d34e91..43d84fda7 100644
--- a/gnuradio-core/src/lib/general/gr_reverse.h
+++ b/gnuradio-core/src/lib/general/gr_reverse.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_REVERSE_H
 #define INCLUDED_GR_REVERSE_H
 
+#include <gr_core_api.h>
 #include <vector>
 #include <gr_complex.h>
 
diff --git a/gnuradio-core/src/lib/general/gr_rms_cf.h b/gnuradio-core/src/lib/general/gr_rms_cf.h
index 86c4bdbac..f1bd9802c 100644
--- a/gnuradio-core/src/lib/general/gr_rms_cf.h
+++ b/gnuradio-core/src/lib/general/gr_rms_cf.h
@@ -22,25 +22,26 @@
 #ifndef INCLUDED_GR_RMS_CF_H
 #define INCLUDED_GR_RMS_CF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_single_pole_iir.h>
 
 class gr_rms_cf;
 typedef boost::shared_ptr<gr_rms_cf> gr_rms_cf_sptr;
 
-gr_rms_cf_sptr
+GR_CORE_API gr_rms_cf_sptr
 gr_make_rms_cf (double alpha = 0.0001);
 
 /*!
  * \brief RMS average power
  * \ingroup math_blk
  */
-class gr_rms_cf : public gr_sync_block
+class GR_CORE_API gr_rms_cf : public gr_sync_block
 {
   gr_single_pole_iir<double,double,double>	d_iir;
   bool						d_unmuted;
 
-  friend gr_rms_cf_sptr
+  friend GR_CORE_API gr_rms_cf_sptr
   gr_make_rms_cf (double alpha);
 
   gr_rms_cf (double alpha);
diff --git a/gnuradio-core/src/lib/general/gr_rms_ff.h b/gnuradio-core/src/lib/general/gr_rms_ff.h
index ed1635eb1..0bbd53b70 100644
--- a/gnuradio-core/src/lib/general/gr_rms_ff.h
+++ b/gnuradio-core/src/lib/general/gr_rms_ff.h
@@ -22,25 +22,26 @@
 #ifndef INCLUDED_GR_RMS_FF_H
 #define INCLUDED_GR_RMS_FF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_single_pole_iir.h>
 
 class gr_rms_ff;
 typedef boost::shared_ptr<gr_rms_ff> gr_rms_ff_sptr;
 
-gr_rms_ff_sptr
+GR_CORE_API gr_rms_ff_sptr
 gr_make_rms_ff (double alpha = 0.0001);
 
 /*!
  * \brief RMS average power
  * \ingroup math_blk
  */
-class gr_rms_ff : public gr_sync_block
+class GR_CORE_API gr_rms_ff : public gr_sync_block
 {
   gr_single_pole_iir<double,double,double>	d_iir;
   bool						d_unmuted;
 
-  friend gr_rms_ff_sptr
+  friend GR_CORE_API gr_rms_ff_sptr
   gr_make_rms_ff (double alpha);
 
   gr_rms_ff (double alpha);
diff --git a/gnuradio-core/src/lib/general/gr_scrambler_bb.h b/gnuradio-core/src/lib/general/gr_scrambler_bb.h
index 7efe8b598..79905933d 100644
--- a/gnuradio-core/src/lib/general/gr_scrambler_bb.h
+++ b/gnuradio-core/src/lib/general/gr_scrambler_bb.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_GR_SCRAMBLER_BB_H
 #define INCLUDED_GR_SCRAMBLER_BB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include "gri_lfsr.h"
 
 class gr_scrambler_bb;
 typedef boost::shared_ptr<gr_scrambler_bb> gr_scrambler_bb_sptr;
 
-gr_scrambler_bb_sptr gr_make_scrambler_bb(int mask, int seed, int len);
+GR_CORE_API gr_scrambler_bb_sptr gr_make_scrambler_bb(int mask, int seed, int len);
 
 /*!
  * Scramble an input stream using an LFSR.  This block works on the LSB only
@@ -42,9 +43,9 @@ gr_scrambler_bb_sptr gr_make_scrambler_bb(int mask, int seed, int len);
  * \ingroup coding_blk
  */
 
-class gr_scrambler_bb : public gr_sync_block
+class GR_CORE_API gr_scrambler_bb : public gr_sync_block
 {
-  friend gr_scrambler_bb_sptr gr_make_scrambler_bb(int mask, int seed, int len);
+  friend GR_CORE_API gr_scrambler_bb_sptr gr_make_scrambler_bb(int mask, int seed, int len);
 
   gri_lfsr d_lfsr;
 
diff --git a/gnuradio-core/src/lib/general/gr_short_to_float.h b/gnuradio-core/src/lib/general/gr_short_to_float.h
index ccb19d9f2..b40c966ea 100644
--- a/gnuradio-core/src/lib/general/gr_short_to_float.h
+++ b/gnuradio-core/src/lib/general/gr_short_to_float.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_SHORT_TO_FLOAT_H
 #define INCLUDED_GR_SHORT_TO_FLOAT_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_short_to_float;
 typedef boost::shared_ptr<gr_short_to_float> gr_short_to_float_sptr;
 
-gr_short_to_float_sptr
+GR_CORE_API gr_short_to_float_sptr
 gr_make_short_to_float ();
 
 /*!
@@ -36,9 +37,9 @@ gr_make_short_to_float ();
  * \ingroup converter_blk
  */
 
-class gr_short_to_float : public gr_sync_block
+class GR_CORE_API gr_short_to_float : public gr_sync_block
 {
-  friend gr_short_to_float_sptr gr_make_short_to_float ();
+  friend GR_CORE_API gr_short_to_float_sptr gr_make_short_to_float ();
   gr_short_to_float ();
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_simple_correlator.cc b/gnuradio-core/src/lib/general/gr_simple_correlator.cc
index 01c007122..bdfa73ef3 100644
--- a/gnuradio-core/src/lib/general/gr_simple_correlator.cc
+++ b/gnuradio-core/src/lib/general/gr_simple_correlator.cc
@@ -50,6 +50,7 @@ gr_simple_correlator::gr_simple_correlator (int payload_bytesize)
     d_state (ST_LOOKING), d_osi (0),
     d_bblen ((payload_bytesize + GRSF_PAYLOAD_OVERHEAD) * GRSF_BITS_PER_BYTE),
     d_bitbuf (new unsigned char [d_bblen]),
+    d_pktbuf (new unsigned char [d_bblen/GRSF_BITS_PER_BYTE]),
     d_bbi (0)
 {
   d_avbi = 0;
@@ -71,6 +72,7 @@ gr_simple_correlator::~gr_simple_correlator ()
   fclose(d_debug_fp);
 #endif  
   delete [] d_bitbuf;
+  delete [] d_pktbuf;
 }
    
 
@@ -184,10 +186,9 @@ gr_simple_correlator::general_work (int noutput_items,
 	d_bbi++;
 	if (d_bbi >= d_bblen){
 	  // printf ("got whole packet\n");
-	  unsigned char pktbuf[d_bblen/GRSF_BITS_PER_BYTE];
-	  packit (pktbuf, d_bitbuf, d_bbi);
-	  printf ("seqno %3d\n", pktbuf[0]);
-	  memcpy (out, &pktbuf[GRSF_PAYLOAD_OVERHEAD], d_payload_bytesize);
+	  packit (d_pktbuf, d_bitbuf, d_bbi);
+	  printf ("seqno %3d\n", d_pktbuf[0]);
+	  memcpy (out, &d_pktbuf[GRSF_PAYLOAD_OVERHEAD], d_payload_bytesize);
 	  enter_looking ();
 	  consume_each (n + 1);
 	  return d_payload_bytesize;
diff --git a/gnuradio-core/src/lib/general/gr_simple_correlator.h b/gnuradio-core/src/lib/general/gr_simple_correlator.h
index b21d38a04..4c5f060cd 100644
--- a/gnuradio-core/src/lib/general/gr_simple_correlator.h
+++ b/gnuradio-core/src/lib/general/gr_simple_correlator.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_SIMPLE_CORRELATOR_H
 #define INCLUDED_GR_SIMPLE_CORRELATOR_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 #include <assert.h>
 
@@ -31,13 +32,13 @@
 class gr_simple_correlator;
 typedef boost::shared_ptr<gr_simple_correlator> gr_simple_correlator_sptr;
 
-gr_simple_correlator_sptr gr_make_simple_correlator (int payload_bytesize);
+GR_CORE_API gr_simple_correlator_sptr gr_make_simple_correlator (int payload_bytesize);
 
 /*!
  * \brief inverse of gr_simple_framer (more or less)
  * \ingroup sync_blk
  */
-class gr_simple_correlator : public gr_block
+class GR_CORE_API gr_simple_correlator : public gr_block
 {
   static const int OVERSAMPLE = 8;
   enum state_t { ST_LOOKING, ST_UNDER_THRESHOLD, ST_LOCKED };
@@ -50,6 +51,7 @@ class gr_simple_correlator : public gr_block
   unsigned long long int d_shift_reg[OVERSAMPLE];
   int		 d_bblen;			// length of bitbuf
   unsigned char	*d_bitbuf;			// demodulated bits
+  unsigned char	*d_pktbuf;			// temp packet buf
   int		 d_bbi;				// bitbuf index
 
   static const int AVG_PERIOD = 512;		// must be power of 2 (for freq offset correction)
@@ -62,7 +64,7 @@ class gr_simple_correlator : public gr_block
   FILE		*d_debug_fp;			// binary log file
 #endif
 
-  friend gr_simple_correlator_sptr gr_make_simple_correlator (int payload_bytesize);
+  friend GR_CORE_API gr_simple_correlator_sptr gr_make_simple_correlator (int payload_bytesize);
   gr_simple_correlator (int payload_bytesize);
 
 
diff --git a/gnuradio-core/src/lib/general/gr_simple_framer.h b/gnuradio-core/src/lib/general/gr_simple_framer.h
index d930da33b..15f392e4a 100644
--- a/gnuradio-core/src/lib/general/gr_simple_framer.h
+++ b/gnuradio-core/src/lib/general/gr_simple_framer.h
@@ -23,25 +23,26 @@
 #ifndef INCLUDED_GR_SIMPLE_FRAMER_H
 #define INCLUDED_GR_SIMPLE_FRAMER_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 class gr_simple_framer;
 typedef boost::shared_ptr<gr_simple_framer> gr_simple_framer_sptr;
 
-gr_simple_framer_sptr gr_make_simple_framer (int payload_bytesize);
+GR_CORE_API gr_simple_framer_sptr gr_make_simple_framer (int payload_bytesize);
 
 /*!
  * \brief add sync field, seq number and command field to payload
  * \ingroup sync_blk
  */
-class gr_simple_framer : public gr_block
+class GR_CORE_API gr_simple_framer : public gr_block
 {
   int	d_seqno;
   int	d_payload_bytesize;
   int	d_input_block_size;	// bytes
   int	d_output_block_size;	// bytes
 
-  friend gr_simple_framer_sptr gr_make_simple_framer (int payload_bytesize);
+  friend GR_CORE_API gr_simple_framer_sptr gr_make_simple_framer (int payload_bytesize);
   gr_simple_framer (int payload_bytesize);
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_simple_squelch_cc.h b/gnuradio-core/src/lib/general/gr_simple_squelch_cc.h
index 30744f6fb..590b86de8 100644
--- a/gnuradio-core/src/lib/general/gr_simple_squelch_cc.h
+++ b/gnuradio-core/src/lib/general/gr_simple_squelch_cc.h
@@ -22,26 +22,27 @@
 #ifndef INCLUDED_GR_SIMPLE_SQUELCH_CC_H
 #define INCLUDED_GR_SIMPLE_SQUELCH_CC_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_single_pole_iir.h>
 
 class gr_simple_squelch_cc;
 typedef boost::shared_ptr<gr_simple_squelch_cc> gr_simple_squelch_cc_sptr;
 
-gr_simple_squelch_cc_sptr
+GR_CORE_API gr_simple_squelch_cc_sptr
 gr_make_simple_squelch_cc (double threshold_db, double alpha = 0.0001);
 
 /*!
  * \brief simple squelch block based on average signal power and threshold in dB.
  * \ingroup level_blk
  */
-class gr_simple_squelch_cc : public gr_sync_block
+class GR_CORE_API gr_simple_squelch_cc : public gr_sync_block
 {
   double					d_threshold;
   gr_single_pole_iir<double,double,double>	d_iir;
   bool						d_unmuted;
 
-  friend gr_simple_squelch_cc_sptr
+  friend GR_CORE_API gr_simple_squelch_cc_sptr
   gr_make_simple_squelch_cc (double threshold_db, double alpha);
 
   gr_simple_squelch_cc (double threshold_db, double alpha);
diff --git a/gnuradio-core/src/lib/general/gr_skiphead.h b/gnuradio-core/src/lib/general/gr_skiphead.h
index 933c126e3..2beaaeab0 100644
--- a/gnuradio-core/src/lib/general/gr_skiphead.h
+++ b/gnuradio-core/src/lib/general/gr_skiphead.h
@@ -23,12 +23,16 @@
 #ifndef INCLUDED_GR_SKIPHEAD_H
 #define INCLUDED_GR_SKIPHEAD_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <stddef.h>      // size_t
 
 class gr_skiphead;
 typedef boost::shared_ptr<gr_skiphead> gr_skiphead_sptr;
 
+GR_CORE_API gr_skiphead_sptr
+gr_make_skiphead (size_t itemsize, uint64_t nitems_to_skip);
+
 
 /*!
  * \brief skips the first N items, from then on copies items to the output
@@ -37,9 +41,9 @@ typedef boost::shared_ptr<gr_skiphead> gr_skiphead_sptr;
  * Useful for building test cases and sources which have metadata or junk at the start
  */
 
-class gr_skiphead : public gr_block
+class GR_CORE_API gr_skiphead : public gr_block
 {
-  friend gr_skiphead_sptr gr_make_skiphead (size_t itemsize, uint64_t nitems_to_skip);
+  friend GR_CORE_API gr_skiphead_sptr gr_make_skiphead (size_t itemsize, uint64_t nitems_to_skip);
   gr_skiphead (size_t itemsize, uint64_t nitems_to_skip);
 
   uint64_t  		d_nitems_to_skip;
@@ -53,8 +57,4 @@ class gr_skiphead : public gr_block
 		   gr_vector_void_star &output_items);
 };
 
-gr_skiphead_sptr
-gr_make_skiphead (size_t itemsize, uint64_t nitems_to_skip);
-
-
 #endif /* INCLUDED_GR_SKIPHEAD_H */
diff --git a/gnuradio-core/src/lib/general/gr_squash_ff.h b/gnuradio-core/src/lib/general/gr_squash_ff.h
index ee3426cae..f7fea1648 100644
--- a/gnuradio-core/src/lib/general/gr_squash_ff.h
+++ b/gnuradio-core/src/lib/general/gr_squash_ff.h
@@ -23,6 +23,7 @@
 #ifndef   	INCLUDED_GR_SQUASH_FF_H_
 # define   	INCLUDED_GR_SQUASH_FF_H_
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_interp.h>
@@ -36,12 +37,12 @@
 class gr_squash_ff;
 typedef boost::shared_ptr<gr_squash_ff> gr_squash_ff_sptr;
 
-gr_squash_ff_sptr gr_make_squash_ff(const std::vector<float> &igrid,
+GR_CORE_API gr_squash_ff_sptr gr_make_squash_ff(const std::vector<float> &igrid,
 				    const std::vector<float> &ogrid);
 
-class gr_squash_ff : public gr_sync_block
+class GR_CORE_API gr_squash_ff : public gr_sync_block
 {
-  friend gr_squash_ff_sptr gr_make_squash_ff(const std::vector<float> &igrid,
+  friend GR_CORE_API gr_squash_ff_sptr gr_make_squash_ff(const std::vector<float> &igrid,
 					     const std::vector<float> &ogrid);
   
   size_t  d_inum;
diff --git a/gnuradio-core/src/lib/general/gr_squelch_base_cc.h b/gnuradio-core/src/lib/general/gr_squelch_base_cc.h
index 51e2e14e5..7c15e0121 100644
--- a/gnuradio-core/src/lib/general/gr_squelch_base_cc.h
+++ b/gnuradio-core/src/lib/general/gr_squelch_base_cc.h
@@ -23,9 +23,10 @@
 #ifndef INCLUDED_GR_SQUELCH_BASE_CC_H
 #define INCLUDED_GR_SQUELCH_BASE_CC_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
-class gr_squelch_base_cc : public gr_block
+class GR_CORE_API gr_squelch_base_cc : public gr_block
 {
 private:
   int	 d_ramp;
diff --git a/gnuradio-core/src/lib/general/gr_squelch_base_ff.h b/gnuradio-core/src/lib/general/gr_squelch_base_ff.h
index 2ca108c75..92a064e63 100644
--- a/gnuradio-core/src/lib/general/gr_squelch_base_ff.h
+++ b/gnuradio-core/src/lib/general/gr_squelch_base_ff.h
@@ -23,9 +23,10 @@
 #ifndef INCLUDED_GR_SQUELCH_BASE_FF_H
 #define INCLUDED_GR_SQUELCH_BASE_FF_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
-class gr_squelch_base_ff : public gr_block
+class GR_CORE_API gr_squelch_base_ff : public gr_block
 {
 private:
   int	 d_ramp;
diff --git a/gnuradio-core/src/lib/general/gr_stream_mux.h b/gnuradio-core/src/lib/general/gr_stream_mux.h
index 29829339e..68415ab1d 100644
--- a/gnuradio-core/src/lib/general/gr_stream_mux.h
+++ b/gnuradio-core/src/lib/general/gr_stream_mux.h
@@ -24,6 +24,7 @@
 #define INCLUDED_GR_STREAM_MUX_H
 
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 #include <vector>
 
@@ -45,7 +46,7 @@ typedef boost::shared_ptr<gr_stream_mux> gr_stream_mux_sptr;
 
 
 
-gr_stream_mux_sptr 
+GR_CORE_API gr_stream_mux_sptr 
 gr_make_stream_mux (size_t itemsize, const std::vector<int> &lengths);
 
 
@@ -60,9 +61,9 @@ gr_make_stream_mux (size_t itemsize, const std::vector<int> &lengths);
  * [N0, N1, N2, ..., Nm, N0, N1, ...]
  */
 
-class gr_stream_mux : public gr_block
+class GR_CORE_API gr_stream_mux : public gr_block
 {
-  friend gr_stream_mux_sptr
+  friend GR_CORE_API gr_stream_mux_sptr
     gr_make_stream_mux (size_t itemsize, const std::vector<int> &lengths);
   
  protected:
diff --git a/gnuradio-core/src/lib/general/gr_stream_to_streams.h b/gnuradio-core/src/lib/general/gr_stream_to_streams.h
index 2fdd39e4a..905d3c556 100644
--- a/gnuradio-core/src/lib/general/gr_stream_to_streams.h
+++ b/gnuradio-core/src/lib/general/gr_stream_to_streams.h
@@ -22,12 +22,13 @@
 #ifndef INCLUDED_GR_STREAM_TO_STREAMS_H
 #define INCLUDED_GR_STREAM_TO_STREAMS_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 class gr_stream_to_streams;
 typedef boost::shared_ptr<gr_stream_to_streams> gr_stream_to_streams_sptr;
 
-gr_stream_to_streams_sptr 
+GR_CORE_API gr_stream_to_streams_sptr 
 gr_make_stream_to_streams (size_t item_size, size_t nstreams);
 
 
@@ -38,9 +39,9 @@ gr_make_stream_to_streams (size_t item_size, size_t nstreams);
  * Converts a stream of N items into N streams of 1 item.
  * Repeat ad infinitum.
  */
-class gr_stream_to_streams : public gr_sync_decimator
+class GR_CORE_API gr_stream_to_streams : public gr_sync_decimator
 {
-  friend gr_stream_to_streams_sptr
+  friend GR_CORE_API gr_stream_to_streams_sptr
     gr_make_stream_to_streams (size_t item_size, size_t nstreams);
 
  protected:
diff --git a/gnuradio-core/src/lib/general/gr_stream_to_vector.h b/gnuradio-core/src/lib/general/gr_stream_to_vector.h
index 2cb03f6a8..77272b96b 100644
--- a/gnuradio-core/src/lib/general/gr_stream_to_vector.h
+++ b/gnuradio-core/src/lib/general/gr_stream_to_vector.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_STREAM_TO_VECTOR_H
 #define INCLUDED_GR_STREAM_TO_VECTOR_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 class gr_stream_to_vector;
 typedef boost::shared_ptr<gr_stream_to_vector> gr_stream_to_vector_sptr;
 
-gr_stream_to_vector_sptr 
+GR_CORE_API gr_stream_to_vector_sptr 
 gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block);
 
 
@@ -36,9 +37,9 @@ gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block);
  * \brief convert a stream of items into a stream of blocks containing nitems_per_block
  * \ingroup slicedice_blk
  */
-class gr_stream_to_vector : public gr_sync_decimator
+class GR_CORE_API gr_stream_to_vector : public gr_sync_decimator
 {
-  friend gr_stream_to_vector_sptr
+  friend GR_CORE_API gr_stream_to_vector_sptr
     gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block);
 
  protected:
diff --git a/gnuradio-core/src/lib/general/gr_streams_to_stream.h b/gnuradio-core/src/lib/general/gr_streams_to_stream.h
index 044af6cd2..8207fed42 100644
--- a/gnuradio-core/src/lib/general/gr_streams_to_stream.h
+++ b/gnuradio-core/src/lib/general/gr_streams_to_stream.h
@@ -22,12 +22,13 @@
 #ifndef INCLUDED_GR_STREAMS_TO_STREAM_H
 #define INCLUDED_GR_STREAMS_TO_STREAM_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_streams_to_stream;
 typedef boost::shared_ptr<gr_streams_to_stream> gr_streams_to_stream_sptr;
 
-gr_streams_to_stream_sptr 
+GR_CORE_API gr_streams_to_stream_sptr 
 gr_make_streams_to_stream (size_t item_size, size_t nstreams);
 
 
@@ -38,9 +39,9 @@ gr_make_streams_to_stream (size_t item_size, size_t nstreams);
  * Convert N streams of 1 item into 1 stream of N items.
  * Repeat ad infinitum.
  */
-class gr_streams_to_stream : public gr_sync_interpolator
+class GR_CORE_API gr_streams_to_stream : public gr_sync_interpolator
 {
-  friend gr_streams_to_stream_sptr
+  friend GR_CORE_API gr_streams_to_stream_sptr
     gr_make_streams_to_stream (size_t item_size, size_t nstreams);
 
  protected:
diff --git a/gnuradio-core/src/lib/general/gr_streams_to_vector.h b/gnuradio-core/src/lib/general/gr_streams_to_vector.h
index 1b2e3ebf7..6a05ac90a 100644
--- a/gnuradio-core/src/lib/general/gr_streams_to_vector.h
+++ b/gnuradio-core/src/lib/general/gr_streams_to_vector.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_STREAMS_TO_VECTOR_H
 #define INCLUDED_GR_STREAMS_TO_VECTOR_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_streams_to_vector;
 typedef boost::shared_ptr<gr_streams_to_vector> gr_streams_to_vector_sptr;
 
-gr_streams_to_vector_sptr 
+GR_CORE_API gr_streams_to_vector_sptr 
 gr_make_streams_to_vector (size_t item_size, size_t nstreams);
 
 
@@ -36,9 +37,9 @@ gr_make_streams_to_vector (size_t item_size, size_t nstreams);
  * \brief convert N streams of items to 1 stream of vector length N
  * \ingroup slicedice_blk
  */
-class gr_streams_to_vector : public gr_sync_block
+class GR_CORE_API gr_streams_to_vector : public gr_sync_block
 {
-  friend gr_streams_to_vector_sptr
+  friend GR_CORE_API gr_streams_to_vector_sptr
     gr_make_streams_to_vector (size_t item_size, size_t nstreams);
 
  protected:
diff --git a/gnuradio-core/src/lib/general/gr_stretch_ff.h b/gnuradio-core/src/lib/general/gr_stretch_ff.h
index e75e1969f..578634dd8 100644
--- a/gnuradio-core/src/lib/general/gr_stretch_ff.h
+++ b/gnuradio-core/src/lib/general/gr_stretch_ff.h
@@ -23,6 +23,7 @@
 #ifndef   	INCLUDED_GR_STRETCH_FF_H_
 # define   	INCLUDED_GR_STRETCH_FF_H_
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 /*!
@@ -36,11 +37,11 @@
 class gr_stretch_ff;
 typedef boost::shared_ptr<gr_stretch_ff> gr_stretch_ff_sptr;
 
-gr_stretch_ff_sptr gr_make_stretch_ff(float lo, size_t vlen);
+GR_CORE_API gr_stretch_ff_sptr gr_make_stretch_ff(float lo, size_t vlen);
 
-class gr_stretch_ff : public gr_sync_block
+class GR_CORE_API gr_stretch_ff : public gr_sync_block
 {
-  friend gr_stretch_ff_sptr gr_make_stretch_ff(float lo, size_t vlen);
+  friend GR_CORE_API gr_stretch_ff_sptr gr_make_stretch_ff(float lo, size_t vlen);
 
   float	d_lo;		// the constant
   size_t d_vlen;
diff --git a/gnuradio-core/src/lib/general/gr_test.h b/gnuradio-core/src/lib/general/gr_test.h
index 5438ac701..78e39d518 100644
--- a/gnuradio-core/src/lib/general/gr_test.h
+++ b/gnuradio-core/src/lib/general/gr_test.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_TEST_H
 #define INCLUDED_GR_TEST_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 #include <string>
 #include "gr_test_types.h"
@@ -31,7 +32,7 @@ class gr_test;
 typedef boost::shared_ptr<gr_test> gr_test_sptr;
 
 // public constructor
-gr_test_sptr gr_make_test (const std::string &name=std::string("gr_test"),
+GR_CORE_API gr_test_sptr gr_make_test (const std::string &name=std::string("gr_test"),
         int min_inputs=1, int max_inputs=1, unsigned int sizeof_input_item=1,
         int min_outputs=1, int max_outputs=1, unsigned int sizeof_output_item=1,
         unsigned int history=1,unsigned int output_multiple=1,double relative_rate=1.0,
@@ -50,7 +51,7 @@ gr_test_sptr gr_make_test (const std::string &name=std::string("gr_test"),
  * The runtime system should detect this and create large enough buffers
  * all through the signal chain.
  */
-class gr_test : public gr_block {
+class GR_CORE_API gr_test : public gr_block {
 
  public:
   
@@ -183,7 +184,7 @@ int general_work (int noutput_items,
 
 
 
-  friend gr_test_sptr gr_make_test (const std::string &name,int min_inputs, int max_inputs, unsigned int sizeof_input_item,
+  friend GR_CORE_API gr_test_sptr gr_make_test (const std::string &name,int min_inputs, int max_inputs, unsigned int sizeof_input_item,
                                    int min_outputs, int max_outputs, unsigned int sizeof_output_item,
                                    unsigned int history,unsigned int output_multiple,double relative_rate,
                                    bool fixed_rate,gr_consume_type_t cons_type, gr_produce_type_t prod_type);
diff --git a/gnuradio-core/src/lib/general/gr_threshold_ff.h b/gnuradio-core/src/lib/general/gr_threshold_ff.h
index 65b677a77..3bf3058cd 100644
--- a/gnuradio-core/src/lib/general/gr_threshold_ff.h
+++ b/gnuradio-core/src/lib/general/gr_threshold_ff.h
@@ -23,20 +23,21 @@
 #ifndef INCLUDED_GR_THRESHOLD_FF_H
 #define INCLUDED_GR_THRESHOLD_FF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_threshold_ff;
 typedef boost::shared_ptr<gr_threshold_ff> gr_threshold_ff_sptr;
 
-gr_threshold_ff_sptr gr_make_threshold_ff (float lo, float hi, float initial_state=0);
+GR_CORE_API gr_threshold_ff_sptr gr_make_threshold_ff (float lo, float hi, float initial_state=0);
 
 /*!
  * \brief Please fix my documentation
  * \ingroup misc_blk
  */
-class gr_threshold_ff : public gr_sync_block
+class GR_CORE_API gr_threshold_ff : public gr_sync_block
 {
-  friend gr_threshold_ff_sptr gr_make_threshold_ff (float lo, float hi, float initial_state);
+  friend GR_CORE_API gr_threshold_ff_sptr gr_make_threshold_ff (float lo, float hi, float initial_state);
 
   float	d_lo,d_hi;		// the constant
   float d_last_state;
diff --git a/gnuradio-core/src/lib/general/gr_throttle.h b/gnuradio-core/src/lib/general/gr_throttle.h
index a82821f77..0b6ada995 100644
--- a/gnuradio-core/src/lib/general/gr_throttle.h
+++ b/gnuradio-core/src/lib/general/gr_throttle.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_THROTTLE_H
 #define INCLUDED_GR_THROTTLE_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 /*!
@@ -35,7 +36,7 @@
  * controlling the rate of samples.  That should be controlled by a
  * source or sink tied to sample clock.  E.g., a USRP or audio card.
  */
-class gr_throttle : virtual public gr_sync_block
+class GR_CORE_API gr_throttle : virtual public gr_sync_block
 {
 public:
     typedef boost::shared_ptr<gr_throttle> sptr;
@@ -44,6 +45,6 @@ public:
     virtual void set_sample_rate(double rate) = 0;
 };
 
-gr_throttle::sptr gr_make_throttle(size_t itemsize, double samples_per_sec);
+GR_CORE_API gr_throttle::sptr gr_make_throttle(size_t itemsize, double samples_per_sec);
 
 #endif /* INCLUDED_GR_THROTTLE_H */
diff --git a/gnuradio-core/src/lib/general/gr_transcendental.h b/gnuradio-core/src/lib/general/gr_transcendental.h
index 1b237c44a..25c6eb75d 100644
--- a/gnuradio-core/src/lib/general/gr_transcendental.h
+++ b/gnuradio-core/src/lib/general/gr_transcendental.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_TRANSCENDENTAL_H
 #define INCLUDED_GR_TRANSCENDENTAL_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <string>
 
@@ -35,12 +36,12 @@
  *
  * output[i] = trans_fcn(input[i])
  */
-class gr_transcendental : virtual public gr_sync_block{
+class GR_CORE_API gr_transcendental : virtual public gr_sync_block{
 public:
     typedef boost::shared_ptr<gr_transcendental> sptr;
 };
 
-gr_transcendental::sptr gr_make_transcendental(
+GR_CORE_API gr_transcendental::sptr gr_make_transcendental(
     const std::string &name,
     const std::string &type = "float"
 );
diff --git a/gnuradio-core/src/lib/general/gr_uchar_to_float.h b/gnuradio-core/src/lib/general/gr_uchar_to_float.h
index 3b83c893f..8e8836c2c 100644
--- a/gnuradio-core/src/lib/general/gr_uchar_to_float.h
+++ b/gnuradio-core/src/lib/general/gr_uchar_to_float.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_UCHAR_TO_FLOAT_H
 #define INCLUDED_GR_UCHAR_TO_FLOAT_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_uchar_to_float;
 typedef boost::shared_ptr<gr_uchar_to_float> gr_uchar_to_float_sptr;
 
-gr_uchar_to_float_sptr
+GR_CORE_API gr_uchar_to_float_sptr
 gr_make_uchar_to_float ();
 
 /*!
@@ -36,9 +37,9 @@ gr_make_uchar_to_float ();
  * \ingroup converter_blk
  */
 
-class gr_uchar_to_float : public gr_sync_block
+class GR_CORE_API gr_uchar_to_float : public gr_sync_block
 {
-  friend gr_uchar_to_float_sptr gr_make_uchar_to_float ();
+  friend GR_CORE_API gr_uchar_to_float_sptr gr_make_uchar_to_float ();
   gr_uchar_to_float ();
 
  public:
diff --git a/gnuradio-core/src/lib/general/gr_unpack_k_bits_bb.h b/gnuradio-core/src/lib/general/gr_unpack_k_bits_bb.h
index e2be2c59c..056c69dc1 100644
--- a/gnuradio-core/src/lib/general/gr_unpack_k_bits_bb.h
+++ b/gnuradio-core/src/lib/general/gr_unpack_k_bits_bb.h
@@ -23,11 +23,12 @@
 #ifndef INCLUDED_GR_UNPACK_K_BITS_BB_H
 #define	INCLUDED_GR_UNPACK_K_BITS_BB_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_unpack_k_bits_bb;
 typedef boost::shared_ptr<gr_unpack_k_bits_bb> gr_unpack_k_bits_bb_sptr;
-gr_unpack_k_bits_bb_sptr gr_make_unpack_k_bits_bb (unsigned k);
+GR_CORE_API gr_unpack_k_bits_bb_sptr gr_make_unpack_k_bits_bb (unsigned k);
 
 class gr_unpack_k_bits_bb;
 
@@ -35,10 +36,10 @@ class gr_unpack_k_bits_bb;
  * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB.
  * \ingroup converter_blk
  */
-class gr_unpack_k_bits_bb : public gr_sync_interpolator
+class GR_CORE_API gr_unpack_k_bits_bb : public gr_sync_interpolator
 {
  private:
-  friend gr_unpack_k_bits_bb_sptr gr_make_unpack_k_bits_bb (unsigned k);
+  friend GR_CORE_API gr_unpack_k_bits_bb_sptr gr_make_unpack_k_bits_bb (unsigned k);
 
   gr_unpack_k_bits_bb (unsigned k);
 
diff --git a/gnuradio-core/src/lib/general/gr_vco_f.h b/gnuradio-core/src/lib/general/gr_vco_f.h
index 2bdf60899..b7524d581 100644
--- a/gnuradio-core/src/lib/general/gr_vco_f.h
+++ b/gnuradio-core/src/lib/general/gr_vco_f.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_VCO_F_H
 #define INCLUDED_GR_VCO_F_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_fxpt_vco.h>
 
@@ -37,7 +38,7 @@ class gr_vco_f;
 typedef boost::shared_ptr<gr_vco_f> gr_vco_f_sptr;
 
 
-gr_vco_f_sptr gr_make_vco_f(double sampling_rate, double sensitivity, double amplitude);
+GR_CORE_API gr_vco_f_sptr gr_make_vco_f(double sampling_rate, double sensitivity, double amplitude);
 
 /*!
  * \brief VCO - Voltage controlled oscillator
@@ -45,9 +46,9 @@ gr_vco_f_sptr gr_make_vco_f(double sampling_rate, double sensitivity, double amp
  *
  * input: float stream of control voltages; output: float oscillator output
  */
-class gr_vco_f : public gr_sync_block
+class GR_CORE_API gr_vco_f : public gr_sync_block
 {
-  friend gr_vco_f_sptr gr_make_vco_f(double sampling_rate, double sensitivity, double amplitude);
+  friend GR_CORE_API gr_vco_f_sptr gr_make_vco_f(double sampling_rate, double sensitivity, double amplitude);
 
   /*!
    * \brief VCO - Voltage controlled oscillator
diff --git a/gnuradio-core/src/lib/general/gr_vector_to_stream.h b/gnuradio-core/src/lib/general/gr_vector_to_stream.h
index de6cc2a8b..d2fa8c7ab 100644
--- a/gnuradio-core/src/lib/general/gr_vector_to_stream.h
+++ b/gnuradio-core/src/lib/general/gr_vector_to_stream.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_VECTOR_TO_STREAM_H
 #define INCLUDED_GR_VECTOR_TO_STREAM_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_vector_to_stream;
 typedef boost::shared_ptr<gr_vector_to_stream> gr_vector_to_stream_sptr;
 
-gr_vector_to_stream_sptr 
+GR_CORE_API gr_vector_to_stream_sptr 
 gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block);
 
 
@@ -36,9 +37,9 @@ gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block);
  * \brief convert a stream of blocks of nitems_per_block items into a stream of items
  * \ingroup slicedice_blk
  */
-class gr_vector_to_stream : public gr_sync_interpolator
+class GR_CORE_API gr_vector_to_stream : public gr_sync_interpolator
 {
-  friend gr_vector_to_stream_sptr
+  friend GR_CORE_API gr_vector_to_stream_sptr
     gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block);
 
  protected:
diff --git a/gnuradio-core/src/lib/general/gr_vector_to_streams.h b/gnuradio-core/src/lib/general/gr_vector_to_streams.h
index d5ba7acf9..04ac941a1 100644
--- a/gnuradio-core/src/lib/general/gr_vector_to_streams.h
+++ b/gnuradio-core/src/lib/general/gr_vector_to_streams.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_VECTOR_TO_STREAMS_H
 #define INCLUDED_GR_VECTOR_TO_STREAMS_H
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class gr_vector_to_streams;
 typedef boost::shared_ptr<gr_vector_to_streams> gr_vector_to_streams_sptr;
 
-gr_vector_to_streams_sptr 
+GR_CORE_API gr_vector_to_streams_sptr 
 gr_make_vector_to_streams (size_t item_size, size_t nstreams);
 
 
@@ -36,9 +37,9 @@ gr_make_vector_to_streams (size_t item_size, size_t nstreams);
  * \brief Convert 1 stream of vectors of length N to N streams of items
  * \ingroup slicedice_blk
  */
-class gr_vector_to_streams : public gr_sync_block
+class GR_CORE_API gr_vector_to_streams : public gr_sync_block
 {
-  friend gr_vector_to_streams_sptr
+  friend GR_CORE_API gr_vector_to_streams_sptr
     gr_make_vector_to_streams (size_t item_size, size_t nstreams);
 
  protected:
diff --git a/gnuradio-core/src/lib/general/gr_wavelet_ff.h b/gnuradio-core/src/lib/general/gr_wavelet_ff.h
index dcfb595e5..107a50fe2 100644
--- a/gnuradio-core/src/lib/general/gr_wavelet_ff.h
+++ b/gnuradio-core/src/lib/general/gr_wavelet_ff.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_WAVELET_FF_H
 #define INCLUDED_GR_WAVELET_FF_H
 
+#include <gr_core_api.h>
 #include <iostream>
 #include <gr_sync_block.h>
 
@@ -31,7 +32,7 @@
 class gr_wavelet_ff;
 typedef boost::shared_ptr<gr_wavelet_ff> gr_wavelet_ff_sptr;
 
-gr_wavelet_ff_sptr
+GR_CORE_API gr_wavelet_ff_sptr
 gr_make_wavelet_ff(int size = 1024,
 		   int order = 20,
 		   bool forward = true);
@@ -41,7 +42,7 @@ gr_make_wavelet_ff(int size = 1024,
  * \ingroup wavelet_blk
  */
 
-class gr_wavelet_ff : public gr_sync_block
+class GR_CORE_API gr_wavelet_ff : public gr_sync_block
 {
   int                    d_size;
   int                    d_order;
@@ -50,7 +51,7 @@ class gr_wavelet_ff : public gr_sync_block
   gsl_wavelet_workspace *d_workspace;
   double                *d_temp;
 
-  friend gr_wavelet_ff_sptr
+  friend GR_CORE_API gr_wavelet_ff_sptr
     gr_make_wavelet_ff(int size,
 		       int order,
 		       bool forward);
diff --git a/gnuradio-core/src/lib/general/gr_wvps_ff.h b/gnuradio-core/src/lib/general/gr_wvps_ff.h
index af122d0fc..7c8f26066 100644
--- a/gnuradio-core/src/lib/general/gr_wvps_ff.h
+++ b/gnuradio-core/src/lib/general/gr_wvps_ff.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_WVPS_FF_H
 #define INCLUDED_GR_WVPS_FF_H
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 class gr_wvps_ff;
 typedef boost::shared_ptr<gr_wvps_ff> gr_wvps_ff_sptr;
 
-gr_wvps_ff_sptr 
+GR_CORE_API gr_wvps_ff_sptr 
 gr_make_wvps_ff(int ilen);
 
 
@@ -36,9 +37,9 @@ gr_make_wvps_ff(int ilen);
  * \brief computes the Wavelet Power Spectrum from a set of wavelet coefficients
  * \ingroup wavelet_blk
  */
-class gr_wvps_ff : public gr_sync_block
+class GR_CORE_API gr_wvps_ff : public gr_sync_block
 {
-  friend gr_wvps_ff_sptr
+  friend GR_CORE_API gr_wvps_ff_sptr
   gr_make_wvps_ff(int ilen);
 
   int d_ilen;
diff --git a/gnuradio-core/src/lib/general/gri_agc2_cc.h b/gnuradio-core/src/lib/general/gri_agc2_cc.h
index 441d1e459..b0a027aad 100644
--- a/gnuradio-core/src/lib/general/gri_agc2_cc.h
+++ b/gnuradio-core/src/lib/general/gri_agc2_cc.h
@@ -23,6 +23,7 @@
 #ifndef _GRI_AGC2_CC_H_
 #define _GRI_AGC2_CC_H_
 
+#include <gr_core_api.h>
 #include <math.h>
 
 /*!
@@ -30,7 +31,7 @@
  *
  * For Power the absolute value of the complex number is used.
  */
-class gri_agc2_cc {
+class GR_CORE_API gri_agc2_cc {
 
  public:
   gri_agc2_cc (float attack_rate = 1e-1, float decay_rate = 1e-2, float reference = 1.0, 
diff --git a/gnuradio-core/src/lib/general/gri_agc2_ff.h b/gnuradio-core/src/lib/general/gri_agc2_ff.h
index a06dab78c..ee70c2537 100644
--- a/gnuradio-core/src/lib/general/gri_agc2_ff.h
+++ b/gnuradio-core/src/lib/general/gri_agc2_ff.h
@@ -23,6 +23,7 @@
 #ifndef _GRI_AGC2_FF_H_
 #define _GRI_AGC2_FF_H_
 
+#include <gr_core_api.h>
 #include <math.h>
 
 /*!
@@ -31,7 +32,7 @@
  * Power is approximated by absolute value
  */
 
-class gri_agc2_ff {
+class GR_CORE_API gri_agc2_ff {
 
  public:
   gri_agc2_ff (float attack_rate = 1e-1, float decay_rate = 1e-2, float reference = 1.0, 
diff --git a/gnuradio-core/src/lib/general/gri_agc_cc.h b/gnuradio-core/src/lib/general/gri_agc_cc.h
index bc31d9a3d..74dfdf1dc 100644
--- a/gnuradio-core/src/lib/general/gri_agc_cc.h
+++ b/gnuradio-core/src/lib/general/gri_agc_cc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GRI_AGC_CC_H
 #define INCLUDED_GRI_AGC_CC_H
 
+#include <gr_core_api.h>
 #include <math.h>
 
 /*!
@@ -31,7 +32,7 @@
  * For Power the absolute value of the complex number is used.
  */
 
-class gri_agc_cc {
+class GR_CORE_API gri_agc_cc {
 
  public:
   gri_agc_cc (float rate = 1e-4, float reference = 1.0, 
diff --git a/gnuradio-core/src/lib/general/gri_agc_ff.h b/gnuradio-core/src/lib/general/gri_agc_ff.h
index de609a8d4..753bbe275 100644
--- a/gnuradio-core/src/lib/general/gri_agc_ff.h
+++ b/gnuradio-core/src/lib/general/gri_agc_ff.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GRI_AGC_FF_H
 #define INCLUDED_GRI_AGC_FF_H
 
+#include <gr_core_api.h>
 #include <math.h>
 
 /*!
@@ -30,7 +31,7 @@
  *
  * Power is approximated by absolute value
  */
-class gri_agc_ff {
+class GR_CORE_API gri_agc_ff {
 
  public:
   gri_agc_ff (float rate = 1e-4, float reference = 1.0,
diff --git a/gnuradio-core/src/lib/general/gri_char_to_float.h b/gnuradio-core/src/lib/general/gri_char_to_float.h
index f4703bef7..890d482b5 100644
--- a/gnuradio-core/src/lib/general/gri_char_to_float.h
+++ b/gnuradio-core/src/lib/general/gri_char_to_float.h
@@ -23,10 +23,12 @@
 #ifndef INCLUDED_GRI_CHAR_TO_FLOAT_H
 #define INCLUDED_GRI_CHAR_TO_FLOAT_H
 
+#include <gr_core_api.h>
+
 /*
  * convert array of chars to floats
  */
-void gri_char_to_float (const char *in, float *out, int nsamples);
+GR_CORE_API void gri_char_to_float (const char *in, float *out, int nsamples);
 
 
-#endif /* INCLUDED_GRI_CHAR_TO_FLOAT_H */
+#endif /* INCLUDED_GRI_CHAR_TO_FLOAT_H */
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/general/gri_control_loop.cc b/gnuradio-core/src/lib/general/gri_control_loop.cc
new file mode 100644
index 000000000..4c64bb922
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gri_control_loop.cc
@@ -0,0 +1,187 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gri_control_loop.h>
+#include <gr_math.h>
+#include <stdexcept>
+
+#define M_TWOPI (2.0f*M_PI)
+
+gri_control_loop::gri_control_loop(float loop_bw,
+				   float max_freq, float min_freq)
+  : d_phase(0), d_freq(0), d_max_freq(max_freq), d_min_freq(min_freq)
+{
+  // Set the damping factor for a critically damped system
+  d_damping = sqrtf(2.0f)/2.0f;
+
+  // Set the bandwidth, which will then call update_gains()
+  set_loop_bandwidth(loop_bw);
+}
+
+gri_control_loop::~gri_control_loop()
+{
+}
+
+void
+gri_control_loop::update_gains()
+{
+  float denom = (1.0 + 2.0*d_damping*d_loop_bw + d_loop_bw*d_loop_bw);
+  d_alpha = (4*d_damping*d_loop_bw) / denom;
+  d_beta = (4*d_loop_bw*d_loop_bw) / denom;
+}
+
+void
+gri_control_loop::advance_loop(float error)
+{
+  d_freq = d_freq + d_beta * error;
+  d_phase = d_phase + d_freq + d_alpha * error;
+}
+
+
+void
+gri_control_loop::phase_wrap()
+{
+  while(d_phase>M_TWOPI)
+    d_phase -= M_TWOPI;
+  while(d_phase<-M_TWOPI)
+    d_phase += M_TWOPI;
+}
+
+void
+gri_control_loop::frequency_limit()
+{  
+  if (d_freq > d_max_freq)
+    d_freq = d_max_freq;
+  else if (d_freq < d_min_freq)
+    d_freq = d_min_freq;  
+}
+
+/*******************************************************************
+    SET FUNCTIONS
+*******************************************************************/
+
+void
+gri_control_loop::set_loop_bandwidth(float bw)
+{
+  if(bw < 0) {
+    throw std::out_of_range ("gri_control_loop: invalid bandwidth. Must be >= 0.");
+  }
+  
+  d_loop_bw = bw;
+  update_gains();
+}
+
+void
+gri_control_loop::set_damping_factor(float df) 
+{
+  if(df < 0 || df > 1.0) {
+    throw std::out_of_range ("gri_control_loop: invalid damping factor. Must be in [0,1].");
+  }
+  
+  d_damping = df;
+  update_gains();
+}
+
+void
+gri_control_loop::set_alpha(float alpha)
+{
+  if(alpha < 0 || alpha > 1.0) {
+    throw std::out_of_range ("gri_control_loop: invalid alpha. Must be in [0,1].");
+  }
+  d_alpha = alpha;
+}
+
+void
+gri_control_loop::set_beta(float beta)
+{
+  if(beta < 0 || beta > 1.0) {
+    throw std::out_of_range ("gri_control_loop: invalid beta. Must be in [0,1].");
+  }
+  d_beta = beta;
+}
+
+void
+gri_control_loop::set_frequency(float freq)
+{
+  if(freq > d_max_freq)
+    d_freq = d_min_freq;
+  else if(freq < d_min_freq)
+    d_freq = d_max_freq;
+  else
+    d_freq = freq;
+}
+
+void
+gri_control_loop::set_phase(float phase)
+{
+  d_phase = phase;
+  while(d_phase>M_TWOPI)
+    d_phase -= M_TWOPI;
+  while(d_phase<-M_TWOPI)
+    d_phase += M_TWOPI;
+}
+
+   
+/*******************************************************************
+    GET FUNCTIONS
+*******************************************************************/
+
+
+float
+gri_control_loop::get_loop_bandwidth() const
+{
+  return d_loop_bw;
+}
+
+float
+gri_control_loop::get_damping_factor() const
+{
+  return d_damping;
+}
+
+float
+gri_control_loop::get_alpha() const
+{
+  return d_alpha;
+}
+
+float
+gri_control_loop::get_beta() const
+{
+  return d_beta;
+}
+
+float
+gri_control_loop::get_frequency() const
+{
+  return d_freq;
+}
+
+float
+gri_control_loop::get_phase() const
+{
+  return d_phase;
+}
diff --git a/gnuradio-core/src/lib/general/gri_control_loop.h b/gnuradio-core/src/lib/general/gri_control_loop.h
new file mode 100644
index 000000000..3aeac58f7
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gri_control_loop.h
@@ -0,0 +1,203 @@
+/* -*- c++ -*- */
+/*
+ * 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 GRI_CONTROL_LOOP
+#define GRI_CONTROL_LOOP
+
+#include <gr_core_api.h>
+
+class GR_CORE_API gri_control_loop
+{
+ protected:
+  float d_phase, d_freq;
+  float d_max_freq, d_min_freq;
+  float d_damping, d_loop_bw;
+  float d_alpha, d_beta;
+
+ public:
+  gri_control_loop(float loop_bw, float max_freq, float min_freq);
+  virtual ~gri_control_loop();
+
+  /*! \brief update the system gains from the loop bandwidth and damping factor
+   *
+   *  This function updates the system gains based on the loop
+   *  bandwidth and damping factor of the system.
+   *  These two factors can be set separately through their own
+   *  set functions.
+   */
+  void update_gains();
+
+  /*! \brief update the system gains from the loop bandwidth and damping factor
+   *
+   *  This function updates the system gains based on the loop
+   *  bandwidth and damping factor of the system.
+   *  These two factors can be set separately through their own
+   *  set functions.
+   */
+  void advance_loop(float error);
+
+  /*! \brief Keep the phase between -2pi and 2pi
+   *
+   * This function keeps the phase between -2pi and 2pi. If the phase
+   * is greater than 2pi by d, it wraps around to be -2pi+d; similarly if
+   * it is less than -2pi by d, it wraps around to 2pi-d.
+   *
+   * This function should be called after advance_loop to keep the phase
+   * in a good operating region. It is set as a separate method in case
+   * another way is desired as this is fairly heavy-handed.
+   */
+  void phase_wrap();
+
+  /*! \brief Keep the frequency between d_min_freq and d_max_freq
+   *
+   * This function keeps the frequency between d_min_freq and d_max_freq.
+   * If the frequency is greater than d_max_freq, it is set to d_max_freq.
+   * If the frequency is less than d_min_freq, it is set to d_min_freq.
+   *
+   * This function should be called after advance_loop to keep the frequency
+   * in the specified region. It is set as a separate method in case
+   * another way is desired as this is fairly heavy-handed.
+   */
+  void frequency_limit();
+
+  /*******************************************************************
+    SET FUNCTIONS
+  *******************************************************************/
+
+  /*!
+   * \brief Set the loop bandwidth
+   *
+   * Set the loop filter's bandwidth to \p bw. This should be between 
+   * 2*pi/200 and 2*pi/100  (in rads/samp). It must also be a positive
+   * number.
+   *
+   * When a new damping factor is set, the gains, alpha and beta, of the loop
+   * are recalculated by a call to update_gains().
+   *
+   * \param bw    (float) new bandwidth
+   *
+   */
+  void set_loop_bandwidth(float bw);
+
+  /*!
+   * \brief Set the loop damping factor
+   *
+   * Set the loop filter's damping factor to \p df. The damping factor
+   * should be sqrt(2)/2.0 for critically damped systems.
+   * Set it to anything else only if you know what you are doing. It must
+   * be a number between 0 and 1.
+   *
+   * When a new damping factor is set, the gains, alpha and beta, of the loop
+   * are recalculated by a call to update_gains().
+   *
+   * \param df    (float) new damping factor
+   *
+   */
+  void set_damping_factor(float df);
+
+  /*!
+   * \brief Set the loop gain alpha
+   *
+   * Set's the loop filter's alpha gain parameter.
+   *
+   * This value should really only be set by adjusting the loop bandwidth
+   * and damping factor.
+   *
+   * \param alpha    (float) new alpha gain
+   *
+   */
+  void set_alpha(float alpha);
+
+  /*!
+   * \brief Set the loop gain beta
+   *
+   * Set's the loop filter's beta gain parameter.
+   *
+   * This value should really only be set by adjusting the loop bandwidth
+   * and damping factor.
+   *
+   * \param beta    (float) new beta gain
+   *
+   */
+  void set_beta(float beta);
+
+  /*!
+   * \brief Set the Costas loop's frequency.
+   *
+   * Set's the Costas Loop's frequency. While this is normally updated by the
+   * inner loop of the algorithm, it could be useful to manually initialize,
+   * set, or reset this under certain circumstances.
+   *
+   * \param freq    (float) new frequency
+   *
+   */
+  void set_frequency(float freq);
+
+  /*!
+   * \brief Set the Costas loop's phase.
+   *
+   * Set's the Costas Loop's phase. While this is normally updated by the
+   * inner loop of the algorithm, it could be useful to manually initialize,
+   * set, or reset this under certain circumstances.
+   *
+   * \param phase    (float) new phase
+   *
+   */
+  void set_phase(float phase);
+
+   
+  /*******************************************************************
+    GET FUNCTIONS
+  *******************************************************************/
+
+  /*!
+   * \brief Returns the loop bandwidth
+   */
+  float get_loop_bandwidth() const;
+
+  /*!
+   * \brief Returns the loop damping factor
+   */
+  float get_damping_factor() const;
+
+  /*!
+   * \brief Returns the loop gain alpha
+   */
+  float get_alpha() const;
+
+  /*!
+   * \brief Returns the loop gain beta
+   */
+  float get_beta() const;
+
+  /*!
+   * \brief Get the Costas loop's frequency estimate
+   */
+  float get_frequency() const;
+
+  /*!
+   * \brief Get the Costas loop's phase estimate
+   */
+  float get_phase() const;
+};
+
+#endif /* GRI_CONTROL_LOOP */
diff --git a/gnuradio-core/src/lib/general/gri_control_loop.i b/gnuradio-core/src/lib/general/gri_control_loop.i
new file mode 100644
index 000000000..67f8838cb
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gri_control_loop.i
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+
+class gri_control_loop
+{
+ public:
+  gri_control_loop(float loop_bw, float max_freq, float min_freq);
+  virtual ~gri_control_loop();
+
+  void update_gains();
+  void advance_loop(float error);
+  void phase_wrap();
+  void frequency_limit();
+
+  /*******************************************************************
+    SET FUNCTIONS
+  *******************************************************************/
+
+  void set_loop_bandwidth(float bw);
+  void set_damping_factor(float df);
+  void set_alpha(float alpha);
+  void set_beta(float beta);
+  void set_frequency(float freq);
+  void set_phase(float phase);
+
+   
+  /*******************************************************************
+    GET FUNCTIONS
+  *******************************************************************/
+
+  float get_loop_bandwidth() const;
+  float get_damping_factor() const;
+  float get_alpha() const;
+  float get_beta() const;
+  float get_frequency() const;
+  float get_phase() const;
+};
diff --git a/gnuradio-core/src/lib/general/gri_debugger_hook.h b/gnuradio-core/src/lib/general/gri_debugger_hook.h
index 60c90685e..cf227af8f 100644
--- a/gnuradio-core/src/lib/general/gri_debugger_hook.h
+++ b/gnuradio-core/src/lib/general/gri_debugger_hook.h
@@ -23,6 +23,8 @@
 #ifndef INCLUDED_GRI_DEBUGGER_HOOK_H
 #define INCLUDED_GRI_DEBUGGER_HOOK_H
 
-void gri_debugger_hook ();
+#include <gr_core_api.h>
 
-#endif /* INCLUDED_GRI_DEBUGGER_HOOK_H */
+GR_CORE_API void gri_debugger_hook ();
+
+#endif /* INCLUDED_GRI_DEBUGGER_HOOK_H */
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/general/gri_fft.cc b/gnuradio-core/src/lib/general/gri_fft.cc
index f20b15ca0..0df1af25d 100644
--- a/gnuradio-core/src/lib/general/gri_fft.cc
+++ b/gnuradio-core/src/lib/general/gri_fft.cc
@@ -23,6 +23,19 @@
 #include <gri_fft.h>
 #include <gr_sys_paths.h>
 #include <fftw3.h>
+
+#ifdef _MSC_VER //http://www.fftw.org/install/windows.html#DLLwisdom
+static void my_fftw_write_char(char c, void *f) { fputc(c, (FILE *) f); }
+#define fftw_export_wisdom_to_file(f) fftw_export_wisdom(my_fftw_write_char, (void*) (f))
+#define fftwf_export_wisdom_to_file(f) fftwf_export_wisdom(my_fftw_write_char, (void*) (f))
+#define fftwl_export_wisdom_to_file(f) fftwl_export_wisdom(my_fftw_write_char, (void*) (f))
+
+static int my_fftw_read_char(void *f) { return fgetc((FILE *) f); }
+#define fftw_import_wisdom_from_file(f) fftw_import_wisdom(my_fftw_read_char, (void*) (f))
+#define fftwf_import_wisdom_from_file(f) fftwf_import_wisdom(my_fftw_read_char, (void*) (f))
+#define fftwl_import_wisdom_from_file(f) fftwl_import_wisdom(my_fftw_read_char, (void*) (f))
+#endif //_MSC_VER
+
 #include <gr_complex.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/gnuradio-core/src/lib/general/gri_fft.h b/gnuradio-core/src/lib/general/gri_fft.h
index 9ffcc5a50..91a82fb55 100644
--- a/gnuradio-core/src/lib/general/gri_fft.h
+++ b/gnuradio-core/src/lib/general/gri_fft.h
@@ -26,6 +26,7 @@
  * Wrappers for FFTW single precision 1d dft
  */
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 #include <boost/thread.hpp>
 
@@ -33,7 +34,7 @@
  * \brief Export reference to planner mutex for those apps that
  * want to use FFTW w/o using the gri_fftw* classes.
  */
-class gri_fft_planner {
+class GR_CORE_API gri_fft_planner {
 public:
   typedef boost::mutex::scoped_lock scoped_lock;
   /*!
@@ -46,7 +47,7 @@ public:
  * \brief FFT: complex in, complex out
  * \ingroup misc
  */
-class gri_fft_complex {
+class GR_CORE_API gri_fft_complex {
   int	      d_fft_size;
   gr_complex *d_inbuf;
   gr_complex *d_outbuf;
@@ -77,7 +78,7 @@ public:
  * \brief FFT: real in, complex out
  * \ingroup misc
  */
-class gri_fft_real_fwd {
+class GR_CORE_API gri_fft_real_fwd {
   int	      d_fft_size;
   float	     *d_inbuf;
   gr_complex *d_outbuf;
@@ -108,7 +109,7 @@ public:
  * \brief FFT: complex in, float out
  * \ingroup misc
  */
-class gri_fft_real_rev {
+class GR_CORE_API gri_fft_real_rev {
   int	      d_fft_size;
   gr_complex *d_inbuf;
   float	     *d_outbuf;
diff --git a/gnuradio-core/src/lib/general/gri_float_to_char.h b/gnuradio-core/src/lib/general/gri_float_to_char.h
index 95cc8ea8d..184592a69 100644
--- a/gnuradio-core/src/lib/general/gri_float_to_char.h
+++ b/gnuradio-core/src/lib/general/gri_float_to_char.h
@@ -23,10 +23,11 @@
 #ifndef INCLUDED_GRI_FLOAT_TO_CHAR_H
 #define INCLUDED_GRI_FLOAT_TO_CHAR_H
 
+#include <gr_core_api.h>
+
 /*!
  * convert array of floats to chars with rounding and saturation.
  */
-void gri_float_to_char (const float *in, char *out, int nsamples);
+GR_CORE_API void gri_float_to_char (const float *in, char *out, int nsamples);
 
 #endif /* INCLUDED_GRI_FLOAT_TO_CHAR_H */
-
diff --git a/gnuradio-core/src/lib/general/gri_float_to_int.cc b/gnuradio-core/src/lib/general/gri_float_to_int.cc
new file mode 100644
index 000000000..7f170a9d5
--- /dev/null
+++ b/gnuradio-core/src/lib/general/gri_float_to_int.cc
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _ISOC9X_SOURCE
+#include <gri_float_to_int.h>
+#include <math.h>
+#include <stdint.h>
+
+static const int64_t MAX_INT =  2147483647; //  (2^31)-1
+static const int64_t MIN_INT = -2147483647; // -(2^31)-1
+
+
+void 
+gri_float_to_int (const float *in, int *out, int nsamples)
+{
+  for (int i = 0; i < nsamples; i++){
+    int64_t r = static_cast<int64_t>(rint(in[i]));
+    if (r < MIN_INT)
+      r = MIN_INT;
+    else if (r > MAX_INT)
+      r = MAX_INT;
+    out[i] = static_cast<int>(r);
+  }
+}
diff --git a/usrp/firmware/include/delay.h b/gnuradio-core/src/lib/general/gri_float_to_int.h
index f5df779e1..a2f6ea877 100644
--- a/usrp/firmware/include/delay.h
+++ b/gnuradio-core/src/lib/general/gri_float_to_int.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,19 +20,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _DELAY_H_
-#define _DELAY_H_
+#ifndef INCLUDED_GRI_FLOAT_TO_INT_H
+#define INCLUDED_GRI_FLOAT_TO_INT_H
 
-/*
- * delay for approximately usecs microseconds
- * Note limit of 255 usecs.
- */
-void udelay (unsigned char usecs);
+#include <gr_core_api.h>
 
-/*
- * delay for approximately msecs milliseconds
+/*!
+ * convert array of floats to int with rounding and saturation.
  */
-void mdelay (unsigned short msecs);
-
+GR_CORE_API void gri_float_to_int (const float *in, int *out, int nsamples);
 
-#endif /* _DELAY_H_ */
+#endif /* INCLUDED_GRI_FLOAT_TO_INT_H */
diff --git a/gnuradio-core/src/lib/general/gri_float_to_short.h b/gnuradio-core/src/lib/general/gri_float_to_short.h
index e36e25de6..6d814b2b3 100644
--- a/gnuradio-core/src/lib/general/gri_float_to_short.h
+++ b/gnuradio-core/src/lib/general/gri_float_to_short.h
@@ -23,10 +23,11 @@
 #ifndef INCLUDED_GRI_FLOAT_TO_SHORT_H
 #define INCLUDED_GRI_FLOAT_TO_SHORT_H
 
+#include <gr_core_api.h>
+
 /*!
  * convert array of floats to shorts with rounding and saturation.
  */
-void gri_float_to_short (const float *in, short *out, int nsamples);
+GR_CORE_API void gri_float_to_short (const float *in, short *out, int nsamples);
 
 #endif /* INCLUDED_GRI_FLOAT_TO_SHORT_H */
-
diff --git a/gnuradio-core/src/lib/general/gri_float_to_uchar.h b/gnuradio-core/src/lib/general/gri_float_to_uchar.h
index e413e725f..ff549333e 100644
--- a/gnuradio-core/src/lib/general/gri_float_to_uchar.h
+++ b/gnuradio-core/src/lib/general/gri_float_to_uchar.h
@@ -23,10 +23,11 @@
 #ifndef INCLUDED_GRI_FLOAT_TO_UCHAR_H
 #define INCLUDED_GRI_FLOAT_TO_UCHAR_H
 
+#include <gr_core_api.h>
+
 /*!
  * convert array of floats to unsigned chars with rounding and saturation.
  */
-void gri_float_to_uchar (const float *in, unsigned char *out, int nsamples);
+GR_CORE_API void gri_float_to_uchar (const float *in, unsigned char *out, int nsamples);
 
 #endif /* INCLUDED_GRI_FLOAT_TO_UCHAR_H */
-
diff --git a/gnuradio-core/src/lib/general/gri_glfsr.h b/gnuradio-core/src/lib/general/gri_glfsr.h
index 7dd5f8660..e6d28cf45 100644
--- a/gnuradio-core/src/lib/general/gri_glfsr.h
+++ b/gnuradio-core/src/lib/general/gri_glfsr.h
@@ -23,6 +23,8 @@
 #ifndef INCLUDED_GRI_GLFSR_H
 #define INCLUDED_GRI_GLFSR_H
 
+#include <gr_core_api.h>
+
 /*!
  * \brief Galois Linear Feedback Shift Register using specified polynomial mask
  * \ingroup misc
@@ -30,7 +32,7 @@
  * Generates a maximal length pseudo-random sequence of length 2^degree-1
  */
 
-class gri_glfsr
+class GR_CORE_API gri_glfsr
 {
  private:
   int d_shift_register;
@@ -52,4 +54,4 @@ class gri_glfsr
   int mask() const { return d_mask; }
 };
 
-#endif /* INCLUDED_GRI_GLFSR_H */
+#endif /* INCLUDED_GRI_GLFSR_H */
\ No newline at end of file
diff --git a/gr-qtgui/lib/highResTimeFunctions.h b/gnuradio-core/src/lib/general/gri_int_to_float.cc
index 6b3844901..342c20cc4 100644
--- a/gr-qtgui/lib/highResTimeFunctions.h
+++ b/gnuradio-core/src/lib/general/gri_int_to_float.cc
@@ -20,17 +20,18 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef HIGH_RES_TIME_FUNCTIONS_H
-#define HIGH_RES_TIME_FUNCTIONS_H
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <gruel/high_res_timer.h>
+#define _ISOC9X_SOURCE
+#include <gri_int_to_float.h>
+#include <math.h>
 
-typedef gruel::high_res_timer_type highres_timespec;
-
-static inline highres_timespec
-get_highres_clock()
+void 
+gri_int_to_float (const int *in, float *out, int nsamples)
 {
-  return gruel::high_res_timer_now();
+  for (int i = 0; i < nsamples; i++){
+    out[i] = static_cast<float>(in[i]);
+  }
 }
-
-#endif /* HIGH_RES_TIME_FUNCTIONS_H */
diff --git a/usrp/firmware/include/timer.h b/gnuradio-core/src/lib/general/gri_int_to_float.h
index 3181874d5..29d1e3b7d 100644
--- a/usrp/firmware/include/timer.h
+++ b/gnuradio-core/src/lib/general/gri_int_to_float.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,16 +20,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#ifndef INCLUDED_GRI_INT_TO_FLOAT_H
+#define INCLUDED_GRI_INT_TO_FLOAT_H
+
+#include <gr_core_api.h>
 
 /*
- * Arrange to have isr_tick_handler called at 100 Hz
+ * convert array of ints to floats
  */
-void hook_timer_tick (unsigned short isr_tick_handler);
-
-#define clear_timer_irq()  				\
-	TF2 = 0 	/* clear overflow flag */
+GR_CORE_API void gri_int_to_float (const int *in, float *out, int nsamples);
 
 
-#endif /* _TIMER_H_ */
+#endif /* INCLUDED_GRI_INT_TO_FLOAT_H */
diff --git a/gnuradio-core/src/lib/general/gri_interleaved_short_to_complex.h b/gnuradio-core/src/lib/general/gri_interleaved_short_to_complex.h
index 09d915f7a..107e2f778 100644
--- a/gnuradio-core/src/lib/general/gri_interleaved_short_to_complex.h
+++ b/gnuradio-core/src/lib/general/gri_interleaved_short_to_complex.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GRI_INTERLEAVED_SHORT_TO_COMPLEX_H
 #define INCLUDED_GRI_INTERLEAVED_SHORT_TO_COMPLEX_H
 
+#include <gr_core_api.h>
 #include <gr_complex.h>
 
 /*
@@ -30,7 +31,7 @@
  * the shorts contains real, imaginary, real, imaginary...
  * nsamples is the number of shorts; it must be even.
  */
-void gri_interleaved_short_to_complex (const short *in, gr_complex *out, int nsamples);
+GR_CORE_API void gri_interleaved_short_to_complex (const short *in, gr_complex *out, int nsamples);
 
 #endif /* INCLUDED_GRI_INTERLEAVED_SHORT_TO_COMPLEX_H */
 
diff --git a/gnuradio-core/src/lib/general/gri_lfsr.h b/gnuradio-core/src/lib/general/gri_lfsr.h
index f691e36ec..dc9358572 100644
--- a/gnuradio-core/src/lib/general/gri_lfsr.h
+++ b/gnuradio-core/src/lib/general/gri_lfsr.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GRI_LFSR_H
 #define INCLUDED_GRI_LFSR_H
 
+#include <gr_core_api.h>
 #include <stdexcept>
 #include <stdint.h>
 
@@ -81,7 +82,7 @@
  *
  */
 
-class gri_lfsr
+class GR_CORE_API gri_lfsr
 {
  private:
   uint32_t d_shift_register;
diff --git a/gnuradio-core/src/lib/general/gri_lfsr_15_1_0.h b/gnuradio-core/src/lib/general/gri_lfsr_15_1_0.h
index 798f2faad..7405ffbaa 100644
--- a/gnuradio-core/src/lib/general/gri_lfsr_15_1_0.h
+++ b/gnuradio-core/src/lib/general/gri_lfsr_15_1_0.h
@@ -23,6 +23,8 @@
 #ifndef INCLUDED_GRI_LFSR_15_1_0_H
 #define INCLUDED_GRI_LFSR_15_1_0_H
 
+#include <gr_core_api.h>
+
 /*!
  * \brief Linear Feedback Shift Register using primitive polynomial x^15 + x + 1
  * \ingroup misc
@@ -30,7 +32,7 @@
  * Generates a maximal length pseudo-random sequence of length 2^15 - 1 bits.
  */
 
-class gri_lfsr_15_1_0 {
+class GR_CORE_API gri_lfsr_15_1_0 {
   unsigned long	d_sr;		// shift register
 
  public:
@@ -55,4 +57,4 @@ class gri_lfsr_15_1_0 {
   }
 };
 
-#endif /* INCLUDED_GRI_LFSR_15_1_0_H */
+#endif /* INCLUDED_GRI_LFSR_15_1_0_H */
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/general/gri_lfsr_32k.h b/gnuradio-core/src/lib/general/gri_lfsr_32k.h
index 33e7ae3a1..5c0396b50 100644
--- a/gnuradio-core/src/lib/general/gri_lfsr_32k.h
+++ b/gnuradio-core/src/lib/general/gri_lfsr_32k.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GRI_LFSR_32k_H
 #define INCLUDED_GRI_LFSR_32k_H
 
+#include <gr_core_api.h>
 #include <gri_lfsr_15_1_0.h>
 
 /*!
@@ -33,7 +34,7 @@
  * of the sequence.
  */
 
-class gri_lfsr_32k {
+class GR_CORE_API gri_lfsr_32k {
   gri_lfsr_15_1_0	d_lfsr;
   unsigned int		d_count;
 
diff --git a/gnuradio-core/src/lib/general/gri_short_to_float.h b/gnuradio-core/src/lib/general/gri_short_to_float.h
index ce4193062..51767efab 100644
--- a/gnuradio-core/src/lib/general/gri_short_to_float.h
+++ b/gnuradio-core/src/lib/general/gri_short_to_float.h
@@ -23,10 +23,12 @@
 #ifndef INCLUDED_GRI_SHORT_TO_FLOAT_H
 #define INCLUDED_GRI_SHORT_TO_FLOAT_H
 
+#include <gr_core_api.h>
+
 /*
  * convert array of shorts to floats
  */
-void gri_short_to_float (const short *in, float *out, int nsamples);
+GR_CORE_API void gri_short_to_float (const short *in, float *out, int nsamples);
 
 
-#endif /* INCLUDED_GRI_SHORT_TO_FLOAT_H */
+#endif /* INCLUDED_GRI_SHORT_TO_FLOAT_H */
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/general/gri_uchar_to_float.h b/gnuradio-core/src/lib/general/gri_uchar_to_float.h
index 7a9f11ba6..9f342989d 100644
--- a/gnuradio-core/src/lib/general/gri_uchar_to_float.h
+++ b/gnuradio-core/src/lib/general/gri_uchar_to_float.h
@@ -23,10 +23,12 @@
 #ifndef INCLUDED_GRI_UCHAR_TO_FLOAT_H
 #define INCLUDED_GRI_UCHAR_TO_FLOAT_H
 
+#include <gr_core_api.h>
+
 /*
  * convert array of unsigned chars to floats
  */
-void gri_uchar_to_float (const unsigned char *in, float *out, int nsamples);
+GR_CORE_API void gri_uchar_to_float (const unsigned char *in, float *out, int nsamples);
 
 
-#endif /* INCLUDED_GRI_UCHAR_TO_FLOAT_H */
+#endif /* INCLUDED_GRI_UCHAR_TO_FLOAT_H */
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/general/malloc16.c b/gnuradio-core/src/lib/general/malloc16.c
index 331751499..2cc6135e7 100644
--- a/gnuradio-core/src/lib/general/malloc16.c
+++ b/gnuradio-core/src/lib/general/malloc16.c
@@ -7,7 +7,6 @@
 
 #include "malloc16.h"
 #include <string.h>
-#include <strings.h>
 
 void *malloc16Align(int size){
   void *p;
diff --git a/gnuradio-core/src/lib/general/malloc16.h b/gnuradio-core/src/lib/general/malloc16.h
index fc97f267d..6b1a3fb08 100644
--- a/gnuradio-core/src/lib/general/malloc16.h
+++ b/gnuradio-core/src/lib/general/malloc16.h
@@ -20,15 +20,17 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gr_core_api.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include <stdlib.h>
 
-void *malloc16Align(int size);
-void *calloc16Align(size_t nmemb,size_t size);
-void free16Align(void *p);
+GR_CORE_API void *malloc16Align(int size);
+GR_CORE_API void *calloc16Align(size_t nmemb,size_t size);
+GR_CORE_API void free16Align(void *p);
 
 #ifdef __cplusplus
 }
diff --git a/gnuradio-core/src/lib/general/qa_general.cc b/gnuradio-core/src/lib/general/qa_general.cc
index 6984d798c..b9080f362 100644
--- a/gnuradio-core/src/lib/general/qa_general.cc
+++ b/gnuradio-core/src/lib/general/qa_general.cc
@@ -28,6 +28,7 @@
 #include <qa_general.h>
 #include <qa_gr_firdes.h>
 #include <qa_gr_circular_file.h>
+#include <qa_gr_cpm.h>
 #include <qa_gr_fxpt.h>
 #include <qa_gr_fxpt_nco.h>
 #include <qa_gr_fxpt_vco.h>
@@ -41,6 +42,7 @@ qa_general::suite ()
 
   s->addTest (qa_gr_firdes::suite ());
   s->addTest (qa_gr_circular_file::suite ());
+  s->addTest (qa_gr_cpm::suite ());
   s->addTest (qa_gr_fxpt::suite ());
   s->addTest (qa_gr_fxpt_nco::suite ());
   s->addTest (qa_gr_fxpt_vco::suite ());
diff --git a/gnuradio-core/src/lib/general/qa_general.h b/gnuradio-core/src/lib/general/qa_general.h
index 577c9d7fb..7da188266 100644
--- a/gnuradio-core/src/lib/general/qa_general.h
+++ b/gnuradio-core/src/lib/general/qa_general.h
@@ -23,11 +23,12 @@
 #ifndef _QA_GENERAL_H_
 #define _QA_GENERAL_H_
 
+#include <gruel/attributes.h>
 #include <cppunit/TestSuite.h>
 
 //! collect all the tests for the gr directory
 
-class qa_general {
+class __GR_ATTR_EXPORT qa_general {
  public:
   //! return suite of tests for all of gr directory
   static CppUnit::TestSuite *suite ();
diff --git a/gnuradio-core/src/lib/general/qa_gr_cpm.cc b/gnuradio-core/src/lib/general/qa_gr_cpm.cc
new file mode 100644
index 000000000..cc32d1117
--- /dev/null
+++ b/gnuradio-core/src/lib/general/qa_gr_cpm.cc
@@ -0,0 +1,140 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 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.
+ */
+
+#include <qa_gr_cpm.h>
+#include <gr_cpm.h>
+#include <cppunit/TestAssert.h>
+
+const double DELTA = 1e-5;
+const int L = 5;
+const int samples_per_sym = 4;
+const float taps_lrc[20] = {
+                   0, 0.002447174185242, 0.009549150281253, 0.020610737385376,
+   0.034549150281253, 0.050000000000000, 0.065450849718747, 0.079389262614624,
+   0.090450849718747, 0.097552825814758, 0.100000000000000, 0.097552825814758,
+   0.090450849718747, 0.079389262614624, 0.065450849718747, 0.050000000000000,
+   0.034549150281253, 0.020610737385376, 0.009549150281253, 0.002447174185242
+};
+
+
+const float taps_lsrc[20] = { // beta = 0.2
+   0.000000000000000, 0.009062686687436, 0.019517618142920, 0.030875041875917,
+   0.042552315421249, 0.053912556756416, 0.064308860403517, 0.073130584159352,
+   0.079847961304114, 0.084051371489937, 0.085482007518284, 0.084051371489937,
+   0.079847961304114, 0.073130584159352, 0.064308860403517, 0.053912556756416,
+   0.042552315421249, 0.030875041875917, 0.019517618142920, 0.009062686687436
+};
+
+
+const float taps_tfm[20] = {
+  -0.003946522220317, -0.005147757690530, -0.003171631690177,  0.003959659609805,
+   0.017498721302356,  0.037346982678383,  0.062251889790391,  0.087364237065604,
+   0.110049050955117,  0.125677762224511,  0.132288693729399,  0.125677762224511,
+   0.110049050955117,  0.087364237065604,  0.062251889790391,  0.037346982678383,
+   0.017498721302356,  0.003959659609805, -0.003171631690177, -0.005147757690530
+};
+
+
+const float taps_gaussian[20] = { // BT = 0.3
+   0.000000743866524, 0.000009286258371, 0.000085441834550, 0.000581664421923,
+   0.002945540765422, 0.011178079812344, 0.032117220937421, 0.070841188736816,
+   0.122053715366673, 0.167389736919915, 0.185594670675172, 0.167389736919915,
+   0.122053715366673, 0.070841188736816, 0.032117220937421, 0.011178079812344,
+   0.002945540765422, 0.000581664421923, 0.000085441834550, 0.000009286258371
+};
+
+
+// Check LREC phase response
+void
+qa_gr_cpm::t1 ()
+{
+	std::vector<float> taps(gr_cpm::phase_response(gr_cpm::LREC, samples_per_sym, L));
+
+	for (int i = 0; i < L * samples_per_sym; i++) {
+		CPPUNIT_ASSERT_DOUBLES_EQUAL(taps[i], 0.05, DELTA);
+	}
+}
+
+
+// Check LRC phase response
+void
+qa_gr_cpm::t2 ()
+{
+	std::vector<float> taps(gr_cpm::phase_response(gr_cpm::LRC, samples_per_sym, L));
+	float sum = 0;
+
+	for (int i = 0; i < L * samples_per_sym; i++) {
+		CPPUNIT_ASSERT_DOUBLES_EQUAL(taps[i], taps_lrc[i], DELTA);
+		sum += taps[i];
+	}
+
+	CPPUNIT_ASSERT_DOUBLES_EQUAL(sum, 1.0, DELTA);
+}
+
+
+// Check LSRC phase response
+void
+qa_gr_cpm::t3 ()
+{
+	std::vector<float> taps(gr_cpm::phase_response(gr_cpm::LSRC, samples_per_sym, L, 0.2));
+	float sum = 0;
+
+	for (int i = 0; i < L * samples_per_sym; i++) {
+		CPPUNIT_ASSERT_DOUBLES_EQUAL(taps[i], taps_lsrc[i], DELTA);
+		sum += taps[i];
+	}
+
+	CPPUNIT_ASSERT_DOUBLES_EQUAL(sum, 1.0, DELTA);
+}
+
+
+// Check the TFM phase response
+void
+qa_gr_cpm::t4 ()
+{
+	std::vector<float> taps(gr_cpm::phase_response(gr_cpm::TFM, samples_per_sym, L));
+	float sum = 0;
+
+	for (int i = 0; i < L * samples_per_sym; i++) {
+		CPPUNIT_ASSERT_DOUBLES_EQUAL(taps[i], taps_tfm[i], DELTA);
+		sum += taps[i];
+	}
+
+	CPPUNIT_ASSERT_DOUBLES_EQUAL(sum, 1.0, DELTA);
+}
+
+
+// Check the Gaussian phase response
+void
+qa_gr_cpm::t5 ()
+{
+	std::vector<float> taps(gr_cpm::phase_response(gr_cpm::GAUSSIAN, samples_per_sym, L, 0.3));
+	float sum = 0;
+
+	for (int i = 0; i < L * samples_per_sym; i++) {
+		CPPUNIT_ASSERT_DOUBLES_EQUAL(taps[i], taps_gaussian[i], DELTA);
+		sum += taps[i];
+	}
+
+	CPPUNIT_ASSERT_DOUBLES_EQUAL(sum, 1.0, DELTA);
+}
+
diff --git a/gnuradio-core/src/lib/runtime/gr_tag_info.cc b/gnuradio-core/src/lib/general/qa_gr_cpm.h
index f15329f9b..741cb2860 100644
--- a/gnuradio-core/src/lib/runtime/gr_tag_info.cc
+++ b/gnuradio-core/src/lib/general/qa_gr_cpm.h
@@ -19,20 +19,31 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+#ifndef _QA_GR_CPM_H
+#define _QA_GR_CPM_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestCase.h>
 
-#include <gr_tag_info.h>
-#include <gruel/pmt.h>
+class qa_gr_cpm : public CppUnit::TestCase {
+
+  CPPUNIT_TEST_SUITE (qa_gr_cpm);
+  CPPUNIT_TEST (t1);
+  CPPUNIT_TEST (t2);
+  CPPUNIT_TEST (t3);
+  CPPUNIT_TEST (t4);
+  CPPUNIT_TEST (t5);
+  CPPUNIT_TEST_SUITE_END ();
+
+ private:
+  void t1 ();
+  void t2 ();
+  void t3 ();
+  void t4 ();
+  void t5 ();
+
+};
+
+
+#endif /* _QA_GR_CPM_H */
 
-namespace gr_tags {
-/*
-  const pmt::pmt_t key_time = pmt::pmt_string_to_symbol("time");
-  const pmt::pmt_t key_sample_rate = pmt::pmt_string_to_symbol("sample_rate");
-  const pmt::pmt_t key_frequency = pmt::pmt_string_to_symbol("frequency");
-  const pmt::pmt_t key_rssi = pmt::pmt_string_to_symbol("rssi");
-  const pmt::pmt_t key_rx_gain = pmt::pmt_string_to_symbol("gain");
-*/
-}
diff --git a/gnuradio-core/src/lib/general/qa_gri_lfsr.cc b/gnuradio-core/src/lib/general/qa_gri_lfsr.cc
index 9f8b62dcf..9625071d8 100644
--- a/gnuradio-core/src/lib/general/qa_gri_lfsr.cc
+++ b/gnuradio-core/src/lib/general/qa_gri_lfsr.cc
@@ -24,6 +24,7 @@
 #include <cppunit/TestAssert.h>
 #include <stdio.h>
 #include <string.h>
+#include <vector>
 
 void
 qa_gri_lfsr::test_lfsr ()
@@ -90,12 +91,12 @@ qa_gri_lfsr::test_scrambler()
       1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, };
 
   int len = sizeof(src);
-  unsigned char actual[len];
+  std::vector<unsigned char> actual(len);
 
   for (int i = 0; i < len; i++)
     actual[i] = scrambler.next_bit_scramble(src[i]);
 
-  CPPUNIT_ASSERT(memcmp(expected, actual, len) == 0);
+  CPPUNIT_ASSERT(memcmp(expected, &actual[0], len) == 0);
 }
 
 void
@@ -132,10 +133,10 @@ qa_gri_lfsr::test_descrambler()
       0, 0, 0, 0, 0, 0, 0, 0, 0 };
   
   int len = sizeof(src);
-  unsigned char actual[len];
+  std::vector<unsigned char> actual(len);
 
   for (int i = 0; i < len; i++)
     actual[i] = descrambler.next_bit_descramble(src[i]);
 
-  CPPUNIT_ASSERT(memcmp(expected, actual, len) == 0);
+  CPPUNIT_ASSERT(memcmp(expected, &actual[0], len) == 0);
 }
diff --git a/gnuradio-core/src/lib/gengen/CMakeLists.txt b/gnuradio-core/src/lib/gengen/CMakeLists.txt
new file mode 100644
index 000000000..e3da278f2
--- /dev/null
+++ b/gnuradio-core/src/lib/gengen/CMakeLists.txt
@@ -0,0 +1,179 @@
+# Copyright 2010-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.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+
+########################################################################
+# generate the python helper script which calls into the build utils
+########################################################################
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
+#!${PYTHON_EXECUTABLE}
+
+import sys, os, re
+sys.path.append('${GR_CORE_PYTHONPATH}')
+os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
+os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
+
+if __name__ == '__main__':
+    import build_utils
+    root, inp = sys.argv[1:3]
+    for sig in sys.argv[3:]:
+        name = re.sub ('X+', sig, root)
+        d = build_utils.standard_dict(name, sig)
+        build_utils.expand_template(d, inp)
+
+")
+
+########################################################################
+# generation helper macro to generate various files from template
+########################################################################
+macro(expand_h_cc_i root)
+
+    foreach(ext h cc i)
+        #make a list of all the generated files
+        unset(expanded_files_${ext})
+        foreach(sig ${ARGN})
+            string(REGEX REPLACE "X+" ${sig} name ${root})
+            list(APPEND expanded_files_${ext} ${CMAKE_CURRENT_BINARY_DIR}/${name}.${ext})
+        endforeach(sig)
+
+        #create a command to generate the files
+        add_custom_command(
+            OUTPUT ${expanded_files_${ext}}
+            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.${ext}.t
+            COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+                ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
+                ${root} ${root}.${ext}.t ${ARGN}
+        )
+    endforeach(ext)
+
+    #make source files depends on headers to force generation
+    set_source_files_properties(${expanded_files_cc}
+        PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
+    )
+
+    #install rules for the generated cc, h, and i files
+    list(APPEND generated_gengen_sources ${expanded_files_cc})
+    list(APPEND generated_gengen_includes ${expanded_files_h})
+    list(APPEND generated_gengen_swigs ${expanded_files_i})
+
+endmacro(expand_h_cc_i)
+
+########################################################################
+# Invoke macro to generate various sources
+########################################################################
+expand_h_cc_i(gr_vector_source_X   b s i f c)
+expand_h_cc_i(gr_vector_sink_X     b s i f c)
+expand_h_cc_i(gr_noise_source_X      s i f c)
+expand_h_cc_i(gr_sig_source_X        s i f c)
+
+expand_h_cc_i(gr_add_const_XX           ss ii ff cc sf)
+expand_h_cc_i(gr_multiply_const_XX      ss ii ff cc)
+expand_h_cc_i(gr_add_XX                 ss ii ff cc)
+expand_h_cc_i(gr_sub_XX                 ss ii ff cc)
+expand_h_cc_i(gr_multiply_XX            ss ii ff cc)
+expand_h_cc_i(gr_divide_XX              ss ii ff cc)
+expand_h_cc_i(gr_mute_XX                ss ii ff cc)
+expand_h_cc_i(gr_add_const_vXX          ss ii ff cc)
+expand_h_cc_i(gr_multiply_const_vXX     ss ii ff cc)
+expand_h_cc_i(gr_integrate_XX           ss ii ff cc)
+expand_h_cc_i(gr_moving_average_XX      ss ii ff cc)
+
+expand_h_cc_i(gr_chunks_to_symbols_XX         bf bc sf sc if ic)
+expand_h_cc_i(gr_unpacked_to_packed_XX        bb ss ii)
+expand_h_cc_i(gr_packed_to_unpacked_XX        bb ss ii)
+expand_h_cc_i(gr_xor_XX                       bb ss ii)
+expand_h_cc_i(gr_and_XX                       bb ss ii)
+expand_h_cc_i(gr_and_const_XX                 bb ss ii)
+expand_h_cc_i(gr_or_XX                        bb ss ii)
+expand_h_cc_i(gr_not_XX                       bb ss ii)
+expand_h_cc_i(gr_sample_and_hold_XX           bb ss ii ff)
+expand_h_cc_i(gr_argmax_XX                    fs is ss)
+expand_h_cc_i(gr_max_XX                       ff ii ss)
+expand_h_cc_i(gr_peak_detector_XX             fb ib sb)
+
+add_custom_target(gengen_generated DEPENDS
+    ${generated_gengen_includes}
+    ${generated_gengen_swigs}
+)
+
+########################################################################
+# Create the master gengen swig include files
+########################################################################
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.py "
+import os, sys
+if __name__ == '__main__':
+    incs = sys.argv[2:]
+    h_incs = '\\n'.join(['#include<%s.h>'%(os.path.splitext(os.path.basename(inc))[0]) for inc in incs])
+    i_incs = '\\n'.join(['%%include<%s>'%(os.path.basename(inc)) for inc in incs])
+    open(sys.argv[1], 'w').write('''
+//
+// This file is machine generated.  All edits will be overwritten
+//
+
+%%{
+%s
+%%}
+
+%s
+
+'''%(h_incs, i_incs))
+")
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i
+    DEPENDS ${generated_gengen_swigs}
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+        ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.py
+        ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i
+        ${generated_gengen_swigs}
+)
+
+add_custom_target(gengen_generated_index DEPENDS
+    ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i
+)
+
+########################################################################
+# Handle the generated sources + a few non-generated ones
+########################################################################
+list(APPEND gnuradio_core_sources
+    ${generated_gengen_sources}
+)
+
+install(FILES
+    ${generated_gengen_includes}
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_endianness.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_noise_type.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sig_source_waveform.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "core_devel"
+)
+
+if(ENABLE_PYTHON)
+    install(FILES
+        ${generated_gengen_swigs}
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_endianness.i
+        ${CMAKE_CURRENT_SOURCE_DIR}/gengen.i
+        ${CMAKE_CURRENT_BINARY_DIR}/gengen_generated.i
+        DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+        COMPONENT "core_swig"
+    )
+endif(ENABLE_PYTHON)
diff --git a/gnuradio-core/src/lib/gengen/gr_add_XX.h.t b/gnuradio-core/src/lib/gengen/gr_add_XX.h.t
index 91dd9196a..f0e857abf 100644
--- a/gnuradio-core/src/lib/gengen/gr_add_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_add_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
 
 /*!
  * \brief output = sum (input_0, input_1, ...)
@@ -38,9 +39,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *
  * Add across all input streams.
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
 
   @NAME@ (size_t vlen);
 
diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_XX.h.t b/gnuradio-core/src/lib/gengen/gr_add_const_XX.h.t
index 8e9884104..5b46d0f89 100644
--- a/gnuradio-core/src/lib/gengen/gr_add_const_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_add_const_XX.h.t
@@ -25,20 +25,21 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
 
 /*!
  * \brief output = input + constant
  * \ingroup math_blk
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
 
   @O_TYPE@	d_k;		// the constant
   @NAME@ (@O_TYPE@ k);
diff --git a/gnuradio-core/src/lib/gengen/gr_add_const_vXX.h.t b/gnuradio-core/src/lib/gengen/gr_add_const_vXX.h.t
index 574fc686c..9d986e960 100755..100644
--- a/gnuradio-core/src/lib/gengen/gr_add_const_vXX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_add_const_vXX.h.t
@@ -25,20 +25,21 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> &k);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> &k);
 
 /*!
  * \brief output vector = input vector + constant vector
  * \ingroup math_blk
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> &k);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> &k);
 
   std::vector<@I_TYPE@> d_k; // the constant
   @NAME@ (const std::vector<@I_TYPE@> &k);
diff --git a/gnuradio-core/src/lib/gengen/gr_and_XX.h.t b/gnuradio-core/src/lib/gengen/gr_and_XX.h.t
index 6152942dd..dbb225907 100644
--- a/gnuradio-core/src/lib/gengen/gr_and_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_and_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ ();
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ ();
 
 /*!
  * \brief output = input_0 & input_1 & , ... & input_N)
@@ -38,9 +39,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *
  * bitwise boolean and across all input streams.
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ ();
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ ();
 
   @NAME@ ();
 
diff --git a/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t b/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t
index 3119611f1..ceffc3066 100644
--- a/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_and_const_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
 
 /*!
  * \brief output_N = input_N & value
@@ -38,9 +39,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *
  * bitwise boolean and of const to the data stream.
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
 
   @O_TYPE@	d_k;		// the constant
   @NAME@ (@O_TYPE@ k);
diff --git a/gnuradio-core/src/lib/gengen/gr_argmax_XX.h.t b/gnuradio-core/src/lib/gengen/gr_argmax_XX.h.t
index 2aba94d71..437fa5735 100644
--- a/gnuradio-core/src/lib/gengen/gr_argmax_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_argmax_XX.h.t
@@ -25,17 +25,18 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
 
 
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
 
   @NAME@ (size_t vlen);
   size_t d_vlen;
diff --git a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.h.t b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.h.t
index a5313d07d..c1393df3f 100644
--- a/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_interpolator.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D = 1);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D = 1);
 
 /*!
  * \brief Map a stream of symbol indexes (unpacked bytes or shorts) to stream of float or complex onstellation points.in \p D dimensions (\p D = 1 by default)
@@ -51,9 +52,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc.
  */
 
-class @NAME@ : public gr_sync_interpolator
+class GR_CORE_API @NAME@ : public gr_sync_interpolator
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D);
 
   int d_D;
   std::vector<@O_TYPE@> d_symbol_table;
diff --git a/gnuradio-core/src/lib/gengen/gr_divide_XX.h.t b/gnuradio-core/src/lib/gengen/gr_divide_XX.h.t
index a59497c8c..ebe5ff5e5 100644
--- a/gnuradio-core/src/lib/gengen/gr_divide_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_divide_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
 
 /*!
  * \brief output = input_0 / input_1 / input_x ...)
@@ -38,9 +39,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *
  * Divide across all input streams.
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
 
   @NAME@ (size_t vlen);
 
diff --git a/gnuradio-core/src/lib/gengen/gr_integrate_XX.h.t b/gnuradio-core/src/lib/gengen/gr_integrate_XX.h.t
index 01061ff21..c1d81000f 100644
--- a/gnuradio-core/src/lib/gengen/gr_integrate_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_integrate_XX.h.t
@@ -25,13 +25,14 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_decimator.h>
 
 class @NAME@;
 
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (int decim);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (int decim);
 
 /*!
  * \brief output = sum(input[0]...input[n])
@@ -39,10 +40,10 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *
  * Integrate successive samples in input stream and decimate
  */
-class @NAME@ : public gr_sync_decimator
+class GR_CORE_API @NAME@ : public gr_sync_decimator
 {
 private:
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@(int decim);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@(int decim);
 
   @NAME@ (int decim);
 
diff --git a/gnuradio-core/src/lib/gengen/gr_max_XX.h.t b/gnuradio-core/src/lib/gengen/gr_max_XX.h.t
index 2aba94d71..437fa5735 100644
--- a/gnuradio-core/src/lib/gengen/gr_max_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_max_XX.h.t
@@ -25,17 +25,18 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
 
 
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
 
   @NAME@ (size_t vlen);
   size_t d_vlen;
diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_XX.h.t b/gnuradio-core/src/lib/gengen/gr_moving_average_XX.h.t
index 2441ca65b..7e228abb6 100644
--- a/gnuradio-core/src/lib/gengen/gr_moving_average_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_moving_average_XX.h.t
@@ -25,13 +25,14 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (int length, @O_TYPE@ scale, int max_iter = 4096);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (int length, @O_TYPE@ scale, int max_iter = 4096);
 
 /*!
  * \brief output is the moving sum of the last N samples, scaled by the scale factor
@@ -40,10 +41,10 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  * max_iter limits how long we go without flushing the accumulator
  * This is necessary to avoid numerical instability for float and complex.
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
 private:
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@(int length, @O_TYPE@ scale, int max_iter);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@(int length, @O_TYPE@ scale, int max_iter);
 
   @NAME@ (int length, @O_TYPE@ scale, int max_iter = 4096);
 
diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_XX.h.t b/gnuradio-core/src/lib/gengen/gr_multiply_XX.h.t
index cb4a0273d..1feb16202 100644
--- a/gnuradio-core/src/lib/gengen/gr_multiply_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_multiply_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
 
 /*!
  * \brief output = prod (input_0, input_1, ...)
@@ -38,9 +39,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *
  * Multiply across all input streams.
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
 
   @NAME@ (size_t vlen);
 
diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_XX.h.t b/gnuradio-core/src/lib/gengen/gr_multiply_const_XX.h.t
index 0c10185cc..6ff6f74a9 100644
--- a/gnuradio-core/src/lib/gengen/gr_multiply_const_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_multiply_const_XX.h.t
@@ -25,20 +25,21 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
 
 /*!
  * \brief output = input * constant
  * \ingroup math_blk
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (@O_TYPE@ k);
 
   @O_TYPE@	d_k;		// the constant
   @NAME@ (@O_TYPE@ k);
diff --git a/gnuradio-core/src/lib/gengen/gr_multiply_const_vXX.h.t b/gnuradio-core/src/lib/gengen/gr_multiply_const_vXX.h.t
index 81e781895..f696ab7b1 100755..100644
--- a/gnuradio-core/src/lib/gengen/gr_multiply_const_vXX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_multiply_const_vXX.h.t
@@ -25,20 +25,21 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> &k);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> &k);
 
 /*!
  * \brief output vector = input vector * constant vector (element-wise)
  * \ingroup math_blk
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> &k);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (const std::vector<@I_TYPE@> &k);
 
   std::vector<@I_TYPE@> d_k; // the constant
   @NAME@ (const std::vector<@I_TYPE@> &k);
diff --git a/gnuradio-core/src/lib/gengen/gr_mute_XX.h.t b/gnuradio-core/src/lib/gengen/gr_mute_XX.h.t
index 5007787c4..ccf966e53 100644
--- a/gnuradio-core/src/lib/gengen/gr_mute_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_mute_XX.h.t
@@ -25,20 +25,21 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (bool mute=false);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (bool mute=false);
 
 /*!
  * \brief output = input or zero if muted.
  * \ingroup level_blk
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (bool mute);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (bool mute);
 
   bool		d_mute;
   @NAME@ (bool mute);
diff --git a/gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t b/gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t
index a920ce04a..9dd92c8f5 100644
--- a/gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t
@@ -25,6 +25,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_noise_type.h>
 #include <gr_random.h>
@@ -33,15 +34,15 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @NAME@_sptr;
 
-@NAME@_sptr 
+GR_CORE_API @NAME@_sptr 
 gr_make_@BASE_NAME@ (gr_noise_type_t type, float ampl, long seed = 3021);
 
 /*!
  * \brief random number source
  * \ingroup source_blk
  */
-class @NAME@ : public gr_sync_block {
-  friend @NAME@_sptr 
+class GR_CORE_API @NAME@ : public gr_sync_block {
+  friend GR_CORE_API @NAME@_sptr 
   gr_make_@BASE_NAME@ (gr_noise_type_t type, float ampl, long seed);
 
   gr_noise_type_t	d_type;
diff --git a/gnuradio-core/src/lib/gengen/gr_not_XX.h.t b/gnuradio-core/src/lib/gengen/gr_not_XX.h.t
index cf8d96ede..b946ffc42 100644
--- a/gnuradio-core/src/lib/gengen/gr_not_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_not_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ ();
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ ();
 
 /*!
  * \brief output = ~input_0 
@@ -38,9 +39,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *
  * bitwise boolean not across input stream.
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ ();
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ ();
 
   @NAME@ ();
 
diff --git a/gnuradio-core/src/lib/gengen/gr_or_XX.h.t b/gnuradio-core/src/lib/gengen/gr_or_XX.h.t
index 3e02d9b1a..8d1fea951 100644
--- a/gnuradio-core/src/lib/gengen/gr_or_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_or_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ ();
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ ();
 
 /*!
  * \brief output = input_0 | input_1 | , ... | input_N)
@@ -38,9 +39,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *
  * bitwise boolean or across all input streams.
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ ();
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ ();
 
   @NAME@ ();
 
diff --git a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_XX.h.t b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_XX.h.t
index 803098c0d..77cd2b470 100644
--- a/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_packed_to_unpacked_XX.h.t
@@ -25,13 +25,14 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 #include <gr_endianness.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ 
+GR_CORE_API @SPTR_NAME@ 
 gr_make_@BASE_NAME@ (unsigned int bits_per_chunk, gr_endianness_t endianness);
 
 /*!
@@ -59,9 +60,9 @@ gr_make_@BASE_NAME@ (unsigned int bits_per_chunk, gr_endianness_t endianness);
  * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc.
  */
 
-class @NAME@ : public gr_block
+class GR_CORE_API @NAME@ : public gr_block
 {
-  friend @SPTR_NAME@ 
+  friend GR_CORE_API @SPTR_NAME@ 
   gr_make_@BASE_NAME@ (unsigned int bits_per_chunk, gr_endianness_t endianness);
 
   @NAME@ (unsigned int bits_per_chunk, gr_endianness_t endianness);
diff --git a/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.h.t b/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.h.t
index d6a8caf76..d6d1e5e51 100644
--- a/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (float threshold_factor_rise = 0.25,
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (float threshold_factor_rise = 0.25,
 				 float threshold_factor_fall = 0.40,
 				 int look_ahead = 10,
 				 float alpha = 0.001);
@@ -57,9 +58,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *        This look-ahead range.
  * \param alpha The gain value of a moving average filter
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (float threshold_factor_rise,
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (float threshold_factor_rise,
 					  float threshold_factor_fall,
 					  int look_ahead, float alpha);
 
diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.h.t b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.h.t
index b96487326..328c47106 100644
--- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ ();
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ ();
 
 /*!
  * \brief sample and hold circuit
@@ -39,9 +40,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  * Samples the data stream (input stream 0) and holds the value
  * if the control signal is 1 (intput stream 1).
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ ();
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ ();
 
   @NAME@ ();
 
diff --git a/gnuradio-core/src/lib/gengen/gr_sig_source_X.h.t b/gnuradio-core/src/lib/gengen/gr_sig_source_X.h.t
index 9906d16ab..3df723868 100644
--- a/gnuradio-core/src/lib/gengen/gr_sig_source_X.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_sig_source_X.h.t
@@ -25,6 +25,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_sig_source_waveform.h>
 #include <gr_fxpt_nco.h>
@@ -37,8 +38,8 @@ typedef boost::shared_ptr<@NAME@> @NAME@_sptr;
  * \ingroup source_blk
  */
 
-class @NAME@ : public gr_sync_block {
-  friend @NAME@_sptr 
+class GR_CORE_API @NAME@ : public gr_sync_block {
+  friend GR_CORE_API @NAME@_sptr 
   gr_make_@BASE_NAME@ (double sampling_freq, gr_waveform_t waveform,
 		       double frequency, double ampl, @TYPE@ offset);
 
@@ -73,7 +74,7 @@ class @NAME@ : public gr_sync_block {
   void set_offset (@TYPE@ offset);
 };
 
-@NAME@_sptr
+GR_CORE_API @NAME@_sptr
 gr_make_@BASE_NAME@ (double sampling_freq, gr_waveform_t waveform,
 		     double wave_freq, double ampl, @TYPE@ offset = 0);
 
diff --git a/gnuradio-core/src/lib/gengen/gr_sub_XX.h.t b/gnuradio-core/src/lib/gengen/gr_sub_XX.h.t
index a58d1f3b8..4c988945e 100644
--- a/gnuradio-core/src/lib/gengen/gr_sub_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_sub_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen = 1);
 
 /*!
  * \brief output = input_0 -  input_1 - ...)
@@ -38,9 +39,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *
  * Subtract across all input streams.
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (size_t vlen);
 
   @NAME@ (size_t vlen);
 
diff --git a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_XX.h.t b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_XX.h.t
index 42d201093..a7db84c5c 100644
--- a/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_unpacked_to_packed_XX.h.t
@@ -25,13 +25,14 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 #include <gr_endianness.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @NAME@_sptr;
 
-@SPTR_NAME@ 
+GR_CORE_API @SPTR_NAME@ 
 gr_make_@BASE_NAME@ (unsigned int bits_per_chunk, gr_endianness_t endianness);
 
 /*!
@@ -57,9 +58,9 @@ gr_make_@BASE_NAME@ (unsigned int bits_per_chunk, gr_endianness_t endianness);
  * \sa gr_chunks_to_symbols_bf, gr_chunks_to_symbols_bc.
  * \sa gr_chunks_to_symbols_sf, gr_chunks_to_symbols_sc.
  */
-class @NAME@ : public gr_block
+class GR_CORE_API @NAME@ : public gr_block
 {
-  friend @SPTR_NAME@
+  friend GR_CORE_API @SPTR_NAME@
   gr_make_@BASE_NAME@ (unsigned int bits_per_chunk, gr_endianness_t endianness);
 
   @NAME@ (unsigned int bits_per_chunk, gr_endianness_t endianness);
diff --git a/gnuradio-core/src/lib/gengen/gr_vector_sink_X.h.t b/gnuradio-core/src/lib/gengen/gr_vector_sink_X.h.t
index 7ba5ee9e9..475cc0112 100644
--- a/gnuradio-core/src/lib/gengen/gr_vector_sink_X.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_vector_sink_X.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @NAME@_sptr;
 
-@NAME@_sptr
+GR_CORE_API @NAME@_sptr
 gr_make_@BASE_NAME@ (int vlen = 1);
 
 
@@ -39,8 +40,8 @@ gr_make_@BASE_NAME@ (int vlen = 1);
  * \ingroup sink_blk
  */
 
-class @NAME@ : public gr_sync_block {
-  friend @NAME@_sptr gr_make_@BASE_NAME@ (int vlen);
+class GR_CORE_API @NAME@ : public gr_sync_block {
+  friend GR_CORE_API @NAME@_sptr gr_make_@BASE_NAME@ (int vlen);
   std::vector<@TYPE@>	d_data;
   int			d_vlen;
   @NAME@ (int vlen);
diff --git a/gnuradio-core/src/lib/gengen/gr_vector_source_X.h.t b/gnuradio-core/src/lib/gengen/gr_vector_source_X.h.t
index 63edcb61c..fbab3effb 100644
--- a/gnuradio-core/src/lib/gengen/gr_vector_source_X.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_vector_source_X.h.t
@@ -25,9 +25,10 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
-class @NAME@;
+class GR_CORE_API @NAME@;
 typedef boost::shared_ptr<@NAME@> @NAME@_sptr;
 
 /*!
@@ -36,7 +37,7 @@ typedef boost::shared_ptr<@NAME@> @NAME@_sptr;
  */
 
 class @NAME@ : public gr_sync_block {
-  friend @NAME@_sptr 
+  friend GR_CORE_API @NAME@_sptr 
   gr_make_@BASE_NAME@ (const std::vector<@TYPE@> &data, bool repeat, int vlen);
 
   std::vector<@TYPE@>	d_data;
@@ -53,7 +54,7 @@ class @NAME@ : public gr_sync_block {
 		    gr_vector_void_star &output_items);
 };
 
-@NAME@_sptr
+GR_CORE_API @NAME@_sptr
 gr_make_@BASE_NAME@ (const std::vector<@TYPE@> &data, bool repeat = false, int vlen = 1);
 
 #endif
diff --git a/gnuradio-core/src/lib/gengen/gr_xor_XX.h.t b/gnuradio-core/src/lib/gengen/gr_xor_XX.h.t
index 33d729450..b2e1a68c8 100644
--- a/gnuradio-core/src/lib/gengen/gr_xor_XX.h.t
+++ b/gnuradio-core/src/lib/gengen/gr_xor_XX.h.t
@@ -25,12 +25,13 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ gr_make_@BASE_NAME@ ();
+GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ ();
 
 /*!
  * \brief output = input_0 ^ input_1 ^ , ... ^ input_N)
@@ -38,9 +39,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  *
  * bitwise boolean xor across all input streams.
  */
-class @NAME@ : public gr_sync_block
+class GR_CORE_API @NAME@ : public gr_sync_block
 {
-  friend @SPTR_NAME@ gr_make_@BASE_NAME@ ();
+  friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ ();
 
   @NAME@ ();
 
diff --git a/gnuradio-core/src/lib/hier/CMakeLists.txt b/gnuradio-core/src/lib/hier/CMakeLists.txt
new file mode 100644
index 000000000..192dd5939
--- /dev/null
+++ b/gnuradio-core/src/lib/hier/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Copyright 2010-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.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+list(APPEND gnuradio_core_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_channel_model.cc
+)
+
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_channel_model.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "core_devel"
+)
+
+if(ENABLE_PYTHON)
+    install(FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/hier.i
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr_channel_model.i
+        DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+        COMPONENT "core_swig"
+    )
+endif(ENABLE_PYTHON)
diff --git a/gnuradio-core/src/lib/hier/Makefile.am b/gnuradio-core/src/lib/hier/Makefile.am
index b525d19b4..369feef75 100644
--- a/gnuradio-core/src/lib/hier/Makefile.am
+++ b/gnuradio-core/src/lib/hier/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.h b/gnuradio-core/src/lib/hier/gr_channel_model.h
index 116b5dc14..07c0c76b6 100644
--- a/gnuradio-core/src/lib/hier/gr_channel_model.h
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.h
@@ -19,6 +19,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gr_core_api.h>
 #include <gr_top_block.h>
 #include <gr_fractional_interpolator_cc.h>
 #include <gr_sig_source_c.h>
@@ -31,7 +32,7 @@ class gr_channel_model;
 typedef boost::shared_ptr<gr_channel_model> gr_channel_model_sptr;
 
 
-gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0,
+GR_CORE_API gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0,
 					    double frequency_offset=0.0,
 					    double epsilon=1.0,
 					    const std::vector<gr_complex> &taps=std::vector<gr_complex>(1, 1),
@@ -41,7 +42,7 @@ gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0,
  * \brief channel simulator
  * \ingroup misc_blk
  */
-class gr_channel_model : public gr_hier_block2
+class GR_CORE_API gr_channel_model : public gr_hier_block2
 {
  private:
   gr_channel_model(double noise_voltage,
@@ -50,7 +51,7 @@ class gr_channel_model : public gr_hier_block2
 		   const std::vector<gr_complex> &taps,
 		   double noise_seed);
 
-  friend gr_channel_model_sptr gr_make_channel_model(double noise_voltage,
+  friend GR_CORE_API gr_channel_model_sptr gr_make_channel_model(double noise_voltage,
 						     double frequency_offset,
 						     double epsilon,
 						     const std::vector<gr_complex> &taps,
diff --git a/gnuradio-core/src/lib/hier/hier.i b/gnuradio-core/src/lib/hier/hier.i
index dbcc8e915..bec3de7ed 100644
--- a/gnuradio-core/src/lib/hier/hier.i
+++ b/gnuradio-core/src/lib/hier/hier.i
@@ -29,3 +29,4 @@
 %}
 
 %include "gr_channel_model.i"
+
diff --git a/gnuradio-core/src/lib/io/CMakeLists.txt b/gnuradio-core/src/lib/io/CMakeLists.txt
new file mode 100644
index 000000000..af9d7583c
--- /dev/null
+++ b/gnuradio-core/src/lib/io/CMakeLists.txt
@@ -0,0 +1,108 @@
+# Copyright 2010-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.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+
+########################################################################
+# Append gnuradio-core library sources
+########################################################################
+list(APPEND gnuradio_core_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_histo_sink_f.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_guts.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_sink_f.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_sink_x.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/i2c.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/i2c_bitbang.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/i2c_bbio.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/i2c_bbio_pp.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/microtune_4702.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/microtune_4937.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/microtune_xxxx.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ppio_ppdev.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_wavfile.cc
+)
+
+########################################################################
+# Install runtime headers
+########################################################################
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_histo_sink_f.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_guts.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_sink_f.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_sink_x.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_trigger_mode.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/i2c.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/i2c_bitbang.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/i2c_bbio.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/i2c_bbio_pp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/microtune_4702.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/microtune_4937.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/microtune_eval_board_defs.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/microtune_xxxx.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/ppio_ppdev.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gri_wavfile.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "core_devel"
+)
+
+########################################################################
+# Install swig headers
+########################################################################
+if(ENABLE_PYTHON)
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/io.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_histo_sink.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_oscope_sink.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "core_swig"
+)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Handle triple-threat files that have cc, h, and i
+########################################################################
+set(gr_core_io_triple_threats
+    gr_file_sink
+    gr_file_sink_base
+    gr_file_source
+    gr_file_descriptor_sink
+    gr_file_descriptor_source
+    gr_message_sink
+    gr_message_source
+    microtune_xxxx_eval_board
+    microtune_4702_eval_board
+    microtune_4937_eval_board
+    ppio
+    sdr_1000
+    gr_udp_sink
+    gr_udp_source
+    gr_wavfile_source
+    gr_wavfile_sink
+    gr_tagged_file_sink
+)
+
+foreach(file_tt ${gr_core_io_triple_threats})
+    list(APPEND gnuradio_core_sources ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.cc)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio COMPONENT "core_devel")
+    if(ENABLE_PYTHON)
+        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${file_tt}.i DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig COMPONENT "core_swig")
+    endif(ENABLE_PYTHON)
+endforeach(file_tt ${gr_core_io_triple_threats})
diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.h b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.h
index fa8fa3f05..5e4cc6505 100644
--- a/gnuradio-core/src/lib/io/gr_file_descriptor_sink.h
+++ b/gnuradio-core/src/lib/io/gr_file_descriptor_sink.h
@@ -23,21 +23,22 @@
 #ifndef INCLUDED_GR_FILE_DESCRIPTOR_SINK_H
 #define INCLUDED_GR_FILE_DESCRIPTOR_SINK_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_file_descriptor_sink;
 typedef boost::shared_ptr<gr_file_descriptor_sink> gr_file_descriptor_sink_sptr;
 
-gr_file_descriptor_sink_sptr gr_make_file_descriptor_sink (size_t itemsize, int fd);
+GR_CORE_API gr_file_descriptor_sink_sptr gr_make_file_descriptor_sink (size_t itemsize, int fd);
 
 /*!
  * \brief Write stream to file descriptor.
  * \ingroup sink_blk
  */
 
-class gr_file_descriptor_sink : public gr_sync_block
+class GR_CORE_API gr_file_descriptor_sink : public gr_sync_block
 {
-  friend gr_file_descriptor_sink_sptr gr_make_file_descriptor_sink (size_t itemsize, int fd);
+  friend GR_CORE_API gr_file_descriptor_sink_sptr gr_make_file_descriptor_sink (size_t itemsize, int fd);
 
  private:
   size_t	d_itemsize;
diff --git a/gnuradio-core/src/lib/io/gr_file_descriptor_source.h b/gnuradio-core/src/lib/io/gr_file_descriptor_source.h
index a9f117286..fa513fd25 100644
--- a/gnuradio-core/src/lib/io/gr_file_descriptor_source.h
+++ b/gnuradio-core/src/lib/io/gr_file_descriptor_source.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H
 #define INCLUDED_GR_FILE_DESCRIPTOR_SOURCE_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_file_descriptor_source;
 typedef boost::shared_ptr<gr_file_descriptor_source> gr_file_descriptor_source_sptr;
 
-gr_file_descriptor_source_sptr
+GR_CORE_API gr_file_descriptor_source_sptr
 gr_make_file_descriptor_source (size_t itemsize, int fd, bool repeat = false);
 
 /*!
@@ -36,9 +37,9 @@ gr_make_file_descriptor_source (size_t itemsize, int fd, bool repeat = false);
  * \ingroup source_blk
  */
 
-class gr_file_descriptor_source : public gr_sync_block
+class GR_CORE_API gr_file_descriptor_source : public gr_sync_block
 {
-  friend gr_file_descriptor_source_sptr
+  friend GR_CORE_API gr_file_descriptor_source_sptr
   gr_make_file_descriptor_source (size_t itemsize, int fd, bool repeat);
  private:
   size_t	 d_itemsize;
diff --git a/gnuradio-core/src/lib/io/gr_file_sink.h b/gnuradio-core/src/lib/io/gr_file_sink.h
index b9ad06cd6..180cbef2a 100644
--- a/gnuradio-core/src/lib/io/gr_file_sink.h
+++ b/gnuradio-core/src/lib/io/gr_file_sink.h
@@ -23,22 +23,23 @@
 #ifndef INCLUDED_GR_FILE_SINK_H
 #define INCLUDED_GR_FILE_SINK_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_file_sink_base.h>
 
 class gr_file_sink;
 typedef boost::shared_ptr<gr_file_sink> gr_file_sink_sptr;
 
-gr_file_sink_sptr gr_make_file_sink(size_t itemsize, const char *filename);
+GR_CORE_API gr_file_sink_sptr gr_make_file_sink(size_t itemsize, const char *filename);
 
 /*!
  * \brief Write stream to file.
  * \ingroup sink_blk
  */
 
-class gr_file_sink : public gr_sync_block, public gr_file_sink_base
+class GR_CORE_API gr_file_sink : public gr_sync_block, public gr_file_sink_base
 {
-  friend gr_file_sink_sptr gr_make_file_sink(size_t itemsize, const char *filename);
+  friend GR_CORE_API gr_file_sink_sptr gr_make_file_sink(size_t itemsize, const char *filename);
 
  private:
   size_t	d_itemsize;
diff --git a/gnuradio-core/src/lib/io/gr_file_sink_base.h b/gnuradio-core/src/lib/io/gr_file_sink_base.h
index 7b96cdb7f..6765dbad8 100644
--- a/gnuradio-core/src/lib/io/gr_file_sink_base.h
+++ b/gnuradio-core/src/lib/io/gr_file_sink_base.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_FILE_SINK_BASE_H
 #define INCLUDED_GR_FILE_SINK_BASE_H
 
+#include <gr_core_api.h>
 #include <boost/thread.hpp>
 #include <cstdio>
 
 /*!
  * \brief Common base class for file sinks
  */
-class gr_file_sink_base 
+class GR_CORE_API gr_file_sink_base
 {
  protected:
   FILE	       *d_fp;		// current FILE pointer
diff --git a/gnuradio-core/src/lib/io/gr_file_source.h b/gnuradio-core/src/lib/io/gr_file_source.h
index 5f5c2564e..6e8fc4074 100644
--- a/gnuradio-core/src/lib/io/gr_file_source.h
+++ b/gnuradio-core/src/lib/io/gr_file_source.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_GR_FILE_SOURCE_H
 #define INCLUDED_GR_FILE_SOURCE_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 class gr_file_source;
 typedef boost::shared_ptr<gr_file_source> gr_file_source_sptr;
 
-gr_file_source_sptr
+GR_CORE_API gr_file_source_sptr
 gr_make_file_source (size_t itemsize, const char *filename, bool repeat = false);
 
 /*!
@@ -36,9 +37,9 @@ gr_make_file_source (size_t itemsize, const char *filename, bool repeat = false)
  * \ingroup source_blk
  */
 
-class gr_file_source : public gr_sync_block
+class GR_CORE_API gr_file_source : public gr_sync_block
 {
-  friend gr_file_source_sptr gr_make_file_source (size_t itemsize,
+  friend GR_CORE_API gr_file_source_sptr gr_make_file_source (size_t itemsize,
 						  const char *filename,
 						  bool repeat);
  private:
diff --git a/gnuradio-core/src/lib/io/gr_histo_sink_f.h b/gnuradio-core/src/lib/io/gr_histo_sink_f.h
index 8ba45ec55..934066ba2 100644
--- a/gnuradio-core/src/lib/io/gr_histo_sink_f.h
+++ b/gnuradio-core/src/lib/io/gr_histo_sink_f.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_HISTO_SINK_F_H
 #define INCLUDED_GR_HISTO_SINK_F_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_msg_queue.h>
 #include <gruel/thread.h>
@@ -30,13 +31,13 @@
 class gr_histo_sink_f;
 typedef boost::shared_ptr<gr_histo_sink_f> gr_histo_sink_f_sptr;
 
-gr_histo_sink_f_sptr gr_make_histo_sink_f (gr_msg_queue_sptr msgq);
+GR_CORE_API gr_histo_sink_f_sptr gr_make_histo_sink_f (gr_msg_queue_sptr msgq);
 
 /*!
  * \brief Histogram module.
  * \ingroup sink_blk
  */
-class gr_histo_sink_f : public gr_sync_block
+class GR_CORE_API gr_histo_sink_f : public gr_sync_block
 {
 private:
   gr_msg_queue_sptr	d_msgq;
@@ -47,7 +48,7 @@ private:
   float *d_samps;
   gruel::mutex d_mutex;
 
-  friend gr_histo_sink_f_sptr gr_make_histo_sink_f (gr_msg_queue_sptr msgq);
+  friend GR_CORE_API gr_histo_sink_f_sptr gr_make_histo_sink_f (gr_msg_queue_sptr msgq);
   gr_histo_sink_f (gr_msg_queue_sptr msgq);
   void send_frame(void);
   void clear(void);
diff --git a/gnuradio-core/src/lib/io/gr_message_sink.h b/gnuradio-core/src/lib/io/gr_message_sink.h
index 5f1e5f91f..180055261 100644
--- a/gnuradio-core/src/lib/io/gr_message_sink.h
+++ b/gnuradio-core/src/lib/io/gr_message_sink.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_MESSAGE_SINK_H
 #define INCLUDED_GR_MESSAGE_SINK_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_message.h>
 #include <gr_msg_queue.h>
@@ -30,7 +31,7 @@
 class gr_message_sink;
 typedef boost::shared_ptr<gr_message_sink> gr_message_sink_sptr;
 
-gr_message_sink_sptr gr_make_message_sink (size_t itemsize,
+GR_CORE_API gr_message_sink_sptr gr_make_message_sink (size_t itemsize,
 					   gr_msg_queue_sptr msgq,
 					   bool dont_block);
 
@@ -38,14 +39,14 @@ gr_message_sink_sptr gr_make_message_sink (size_t itemsize,
  * \brief Gather received items into messages and insert into msgq
  * \ingroup sink_blk
  */
-class gr_message_sink : public gr_sync_block
+class GR_CORE_API gr_message_sink : public gr_sync_block
 {
  private:
   size_t	 	d_itemsize;
   gr_msg_queue_sptr	d_msgq;
   bool			d_dont_block;
 
-  friend gr_message_sink_sptr
+  friend GR_CORE_API gr_message_sink_sptr
   gr_make_message_sink(size_t itemsize, gr_msg_queue_sptr msgq, bool dont_block);
 
  protected:
diff --git a/gnuradio-core/src/lib/io/gr_message_source.h b/gnuradio-core/src/lib/io/gr_message_source.h
index 46a808754..16a0f4474 100644
--- a/gnuradio-core/src/lib/io/gr_message_source.h
+++ b/gnuradio-core/src/lib/io/gr_message_source.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_MESSAGE_SOURCE_H
 #define INCLUDED_GR_MESSAGE_SOURCE_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_message.h>
 #include <gr_msg_queue.h>
@@ -30,14 +31,14 @@
 class gr_message_source;
 typedef boost::shared_ptr<gr_message_source> gr_message_source_sptr;
 
-gr_message_source_sptr gr_make_message_source (size_t itemsize, int msgq_limit=0);
-gr_message_source_sptr gr_make_message_source (size_t itemsize, gr_msg_queue_sptr msgq);
+GR_CORE_API gr_message_source_sptr gr_make_message_source (size_t itemsize, int msgq_limit=0);
+GR_CORE_API gr_message_source_sptr gr_make_message_source (size_t itemsize, gr_msg_queue_sptr msgq);
 
 /*!
  * \brief Turn received messages into a stream
  * \ingroup source_blk
  */
-class gr_message_source : public gr_sync_block
+class GR_CORE_API gr_message_source : public gr_sync_block
 {
  private:
   size_t	 	d_itemsize;
@@ -46,9 +47,9 @@ class gr_message_source : public gr_sync_block
   unsigned		d_msg_offset;
   bool			d_eof;
 
-  friend gr_message_source_sptr
+  friend GR_CORE_API gr_message_source_sptr
   gr_make_message_source(size_t itemsize, int msgq_limit);
-  friend gr_message_source_sptr
+  friend GR_CORE_API gr_message_source_sptr
   gr_make_message_source(size_t itemsize, gr_msg_queue_sptr msgq);
 
  protected:
diff --git a/gnuradio-core/src/lib/io/gr_oscope_guts.h b/gnuradio-core/src/lib/io/gr_oscope_guts.h
index f39db62f6..3223d4e38 100644
--- a/gnuradio-core/src/lib/io/gr_oscope_guts.h
+++ b/gnuradio-core/src/lib/io/gr_oscope_guts.h
@@ -24,6 +24,7 @@
 #ifndef INCLUDED_GR_OSCOPE_GUTS_H
 #define INCLUDED_GR_OSCOPE_GUTS_H
 
+#include <gr_core_api.h>
 #include <gr_trigger_mode.h>
 #include <gr_msg_queue.h>
 
@@ -40,7 +41,7 @@
  * consist of 50% pre-trigger data and 50% post-trigger data.
  */
 
-class gr_oscope_guts {
+class GR_CORE_API gr_oscope_guts {
 public:
   static const int	MAX_CHANNELS = 8;
 private:
diff --git a/gnuradio-core/src/lib/io/gr_oscope_sink_f.h b/gnuradio-core/src/lib/io/gr_oscope_sink_f.h
index 1a8022b89..e3d1f65e5 100644
--- a/gnuradio-core/src/lib/io/gr_oscope_sink_f.h
+++ b/gnuradio-core/src/lib/io/gr_oscope_sink_f.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_OSCOPE_SINK_F_H
 #define INCLUDED_GR_OSCOPE_SINK_F_H
 
+#include <gr_core_api.h>
 #include <gr_oscope_sink_x.h>
 #include <gr_msg_queue.h>
 
 class gr_oscope_sink_f;
 typedef boost::shared_ptr<gr_oscope_sink_x> gr_oscope_sink_f_sptr;
 
-gr_oscope_sink_f_sptr gr_make_oscope_sink_f (double sampling_rate, gr_msg_queue_sptr msgq);
+GR_CORE_API gr_oscope_sink_f_sptr gr_make_oscope_sink_f (double sampling_rate, gr_msg_queue_sptr msgq);
 
 
 /*!
@@ -38,10 +39,10 @@ gr_oscope_sink_f_sptr gr_make_oscope_sink_f (double sampling_rate, gr_msg_queue_
  *
  * Accepts multiple float streams.
  */
-class gr_oscope_sink_f : public gr_oscope_sink_x
+class GR_CORE_API gr_oscope_sink_f : public gr_oscope_sink_x
 {
 private:
-  friend gr_oscope_sink_f_sptr
+  friend GR_CORE_API gr_oscope_sink_f_sptr
   gr_make_oscope_sink_f (double sampling_rate, gr_msg_queue_sptr msgq);
 
   gr_oscope_sink_f (double sampling_rate, gr_msg_queue_sptr msgq);
diff --git a/gnuradio-core/src/lib/io/gr_oscope_sink_x.h b/gnuradio-core/src/lib/io/gr_oscope_sink_x.h
index 62cf65100..aaff5870b 100644
--- a/gnuradio-core/src/lib/io/gr_oscope_sink_x.h
+++ b/gnuradio-core/src/lib/io/gr_oscope_sink_x.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_OSCOPE_SINK_X_H
 #define INCLUDED_GR_OSCOPE_SINK_X_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_trigger_mode.h>
 
@@ -34,7 +35,7 @@ class gr_oscope_guts;
  *
  * Don't instantiate this.  Use gr_oscope_sink_f or gr_oscope_sink_c instead.
  */
-class gr_oscope_sink_x : public gr_sync_block
+class GR_CORE_API gr_oscope_sink_x : public gr_sync_block
 {
 protected:
   double			 d_sampling_rate;
diff --git a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
index 67184b9c5..4ac8c3512 100644
--- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.cc
@@ -32,7 +32,6 @@
 #include <fcntl.h>
 #include <stdexcept>
 #include <iostream>
-#include <gr_tag_info.h>
 
 #ifdef HAVE_IO_H
 #include <io.h>
@@ -85,21 +84,21 @@ gr_tagged_file_sink::work (int noutput_items,
   pmt::pmt_t bkey = pmt::pmt_string_to_symbol("burst");
   //pmt::pmt_t tkey = pmt::pmt_string_to_symbol("time"); // use gr_tags::key_time
 
-  std::vector<pmt::pmt_t> all_tags;
+  std::vector<gr_tag_t> all_tags;
   get_tags_in_range(all_tags, 0, start_N, end_N);
 
-  std::sort(all_tags.begin(), all_tags.end(), gr_tags::nitems_compare);
+  std::sort(all_tags.begin(), all_tags.end(), gr_tag_t::offset_compare);
 
-  std::vector<pmt::pmt_t>::iterator vitr = all_tags.begin();
+  std::vector<gr_tag_t>::iterator vitr = all_tags.begin();
 
   int idx = 0, idx_stop = 0;
   while(idx < noutput_items) {
     if(d_state == NOT_IN_BURST) {
       while(vitr != all_tags.end()) {
-	if((pmt::pmt_eqv(gr_tags::get_key(*vitr), bkey)) &&
-	   pmt::pmt_is_true(gr_tags::get_value(*vitr))) {
+	if((pmt::pmt_eqv((*vitr).key, bkey)) &&
+	   pmt::pmt_is_true((*vitr).value)) {
 
-	  uint64_t N = gr_tags::get_nitems(*vitr);
+	  uint64_t N = (*vitr).offset;
 	  idx = (int)(N - start_N);
 
 	  //std::cout << std::endl << "Found start of burst: "
@@ -107,17 +106,17 @@ gr_tagged_file_sink::work (int noutput_items,
 
 	  // Find time burst occurred by getting latest time tag and extrapolating
 	  // to new time based on sample rate of this block.
-	  std::vector<pmt::pmt_t> time_tags;
+	  std::vector<gr_tag_t> time_tags;
 	  //get_tags_in_range(time_tags, 0, d_last_N, N, gr_tags::key_time);
 	  get_tags_in_range(time_tags, 0, d_last_N, N,
 			    pmt::pmt_string_to_symbol("time"));
 	  if(time_tags.size() > 0) {
-	    pmt::pmt_t tag = time_tags[time_tags.size()-1];
+	    const gr_tag_t tag = time_tags[time_tags.size()-1];
 	    
-	    uint64_t time_nitems = gr_tags::get_nitems(tag);
+	    uint64_t time_nitems = tag.offset;
 
 	    // Get time based on last time tag from USRP
-	    pmt::pmt_t time = gr_tags::get_value(tag);
+	    pmt::pmt_t time = tag.value;
 	    int tsecs = pmt::pmt_to_long(pmt::pmt_tuple_ref(time, 0));
 	    double tfrac = pmt::pmt_to_double(pmt::pmt_tuple_ref(time, 1));
 
@@ -175,9 +174,9 @@ gr_tagged_file_sink::work (int noutput_items,
     }
     else {  // In burst
       while(vitr != all_tags.end()) {
-	if((pmt::pmt_eqv(gr_tags::get_key(*vitr), bkey)) &&
-	   pmt::pmt_is_false(gr_tags::get_value(*vitr))) {
-	  uint64_t N = gr_tags::get_nitems(*vitr);
+	if((pmt::pmt_eqv((*vitr).key, bkey)) &&
+	   pmt::pmt_is_false((*vitr).value)) {
+	  uint64_t N = (*vitr).offset;
 	  idx_stop = (int)N - start_N;
 
 	  //std::cout << "Found end of burst: "
diff --git a/gnuradio-core/src/lib/io/gr_tagged_file_sink.h b/gnuradio-core/src/lib/io/gr_tagged_file_sink.h
index 2e0a5c63a..da12dca78 100644
--- a/gnuradio-core/src/lib/io/gr_tagged_file_sink.h
+++ b/gnuradio-core/src/lib/io/gr_tagged_file_sink.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_TAGGED_FILE_SINK_H
 #define INCLUDED_GR_TAGGED_FILE_SINK_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <cstdio>  // for FILE
 
 class gr_tagged_file_sink;
 typedef boost::shared_ptr<gr_tagged_file_sink> gr_tagged_file_sink_sptr;
 
-gr_tagged_file_sink_sptr gr_make_tagged_file_sink (size_t itemsize,
+GR_CORE_API gr_tagged_file_sink_sptr gr_make_tagged_file_sink (size_t itemsize,
 						   double samp_rate);
 
 /*!
@@ -37,9 +38,9 @@ gr_tagged_file_sink_sptr gr_make_tagged_file_sink (size_t itemsize,
  * \ingroup sink_blk
  */
 
-class gr_tagged_file_sink : public gr_sync_block
+class GR_CORE_API gr_tagged_file_sink : public gr_sync_block
 {
-  friend gr_tagged_file_sink_sptr gr_make_tagged_file_sink (size_t itemsize,
+  friend GR_CORE_API gr_tagged_file_sink_sptr gr_make_tagged_file_sink (size_t itemsize,
 							    double samp_rate);
 
  private:
diff --git a/gnuradio-core/src/lib/io/gr_udp_sink.h b/gnuradio-core/src/lib/io/gr_udp_sink.h
index 421d514a4..e9d4f8c73 100644
--- a/gnuradio-core/src/lib/io/gr_udp_sink.h
+++ b/gnuradio-core/src/lib/io/gr_udp_sink.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_UDP_SINK_H
 #define INCLUDED_GR_UDP_SINK_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gruel/thread.h>
 
 class gr_udp_sink;
 typedef boost::shared_ptr<gr_udp_sink> gr_udp_sink_sptr;
 
-gr_udp_sink_sptr
+GR_CORE_API gr_udp_sink_sptr
 gr_make_udp_sink (size_t itemsize, 
 		  const char *host, unsigned short port,
 		  int payload_size=1472, bool eof=true);
@@ -47,9 +48,9 @@ gr_make_udp_sink (size_t itemsize,
  * \param eof          Send zero-length packet on disconnect
  */
 
-class gr_udp_sink : public gr_sync_block
+class GR_CORE_API gr_udp_sink : public gr_sync_block
 {
-  friend gr_udp_sink_sptr gr_make_udp_sink (size_t itemsize, 
+  friend GR_CORE_API gr_udp_sink_sptr gr_make_udp_sink (size_t itemsize, 
 					    const char *host,
 					    unsigned short port,
 					    int payload_size, bool eof);
diff --git a/gnuradio-core/src/lib/io/gr_udp_source.h b/gnuradio-core/src/lib/io/gr_udp_source.h
index 5d30fad30..e2898981d 100644
--- a/gnuradio-core/src/lib/io/gr_udp_source.h
+++ b/gnuradio-core/src/lib/io/gr_udp_source.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_UDP_SOURCE_H
 #define INCLUDED_GR_UDP_SOURCE_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gruel/thread.h>
 
 class gr_udp_source;
 typedef boost::shared_ptr<gr_udp_source> gr_udp_source_sptr;
 
-gr_udp_source_sptr gr_make_udp_source(size_t itemsize, const char *host, 
+GR_CORE_API gr_udp_source_sptr gr_make_udp_source(size_t itemsize, const char *host, 
 				      unsigned short port,
 				      int payload_size=1472,
 				      bool eof=true, bool wait=true);
@@ -52,9 +53,9 @@ gr_udp_source_sptr gr_make_udp_source(size_t itemsize, const char *host,
  *
 */
 
-class gr_udp_source : public gr_sync_block
+class GR_CORE_API gr_udp_source : public gr_sync_block
 {
-  friend gr_udp_source_sptr gr_make_udp_source(size_t itemsize,
+  friend GR_CORE_API gr_udp_source_sptr gr_make_udp_source(size_t itemsize,
 					       const char *host, 
 					       unsigned short port,
 					       int payload_size,
diff --git a/gnuradio-core/src/lib/io/gr_wavfile_sink.h b/gnuradio-core/src/lib/io/gr_wavfile_sink.h
index a1d6ed527..5fd3eaadc 100644
--- a/gnuradio-core/src/lib/io/gr_wavfile_sink.h
+++ b/gnuradio-core/src/lib/io/gr_wavfile_sink.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_WAVFILE_SINK_H
 #define INCLUDED_GR_WAVFILE_SINK_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <gr_file_sink_base.h>
 #include <boost/thread.hpp>
@@ -36,7 +37,7 @@ typedef boost::shared_ptr<gr_wavfile_sink> gr_wavfile_sink_sptr;
  * \p sample_rate Sample rate [S/s]
  * \p bits_per_sample 16 or 8 bit, default is 16
  */
-gr_wavfile_sink_sptr
+GR_CORE_API gr_wavfile_sink_sptr
 gr_make_wavfile_sink (const char *filename,
 		      int n_channels,
 		      unsigned int sample_rate,
@@ -50,10 +51,10 @@ gr_make_wavfile_sink (const char *filename,
  *
  * \ingroup sink_blk
  */
-class gr_wavfile_sink : public gr_sync_block
+class GR_CORE_API gr_wavfile_sink : public gr_sync_block
 {
 private:
-  friend gr_wavfile_sink_sptr gr_make_wavfile_sink (const char *filename,
+  friend GR_CORE_API gr_wavfile_sink_sptr gr_make_wavfile_sink (const char *filename,
 						    int n_channels,
 						    unsigned int sample_rate,
 						    int bits_per_sample);
diff --git a/gnuradio-core/src/lib/io/gr_wavfile_source.h b/gnuradio-core/src/lib/io/gr_wavfile_source.h
index e434a6b4c..b300f2808 100644
--- a/gnuradio-core/src/lib/io/gr_wavfile_source.h
+++ b/gnuradio-core/src/lib/io/gr_wavfile_source.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_GR_WAVFILE_SOURCE_H
 #define INCLUDED_GR_WAVFILE_SOURCE_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 #include <cstdio>  // for FILE
 
 class gr_wavfile_source;
 typedef boost::shared_ptr<gr_wavfile_source> gr_wavfile_source_sptr;
 
-gr_wavfile_source_sptr
+GR_CORE_API gr_wavfile_source_sptr
 gr_make_wavfile_source (const char *filename, bool repeat = false);
 
 /*!
@@ -41,10 +42,10 @@ gr_make_wavfile_source (const char *filename, bool repeat = false);
  * \ingroup source_blk
  */
 
-class gr_wavfile_source : public gr_sync_block
+class GR_CORE_API gr_wavfile_source : public gr_sync_block
 {
 private:
-  friend gr_wavfile_source_sptr gr_make_wavfile_source (const char *filename,
+  friend GR_CORE_API gr_wavfile_source_sptr gr_make_wavfile_source (const char *filename,
 		                                              bool repeat);
   gr_wavfile_source(const char *filename, bool repeat);
 
diff --git a/gnuradio-core/src/lib/io/gri_wavfile.h b/gnuradio-core/src/lib/io/gri_wavfile.h
index 2c7c1207c..2268474fb 100644
--- a/gnuradio-core/src/lib/io/gri_wavfile.h
+++ b/gnuradio-core/src/lib/io/gri_wavfile.h
@@ -23,6 +23,7 @@
 // This file stores all the RIFF file type knowledge for the gr_wavfile_*
 // blocks.
 
+#include <gr_core_api.h>
 #include <cstdio>
 
 /*!
diff --git a/gnuradio-core/src/lib/io/i2c.h b/gnuradio-core/src/lib/io/i2c.h
index e959f59a8..7d446dfa3 100644
--- a/gnuradio-core/src/lib/io/i2c.h
+++ b/gnuradio-core/src/lib/io/i2c.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_I2C_H
 #define INCLUDED_I2C_H
 
+#include <gr_core_api.h>
 #include <boost/shared_ptr.hpp>
 
 class i2c;
@@ -31,7 +32,7 @@ typedef boost::shared_ptr<i2c> i2c_sptr;
 /*!
  * \brief abstract class for controlling i2c bus
  */
-class i2c {
+class GR_CORE_API i2c {
  public:
   
   i2c () {}
diff --git a/gnuradio-core/src/lib/io/i2c_bbio.h b/gnuradio-core/src/lib/io/i2c_bbio.h
index c6b226e39..110a56555 100644
--- a/gnuradio-core/src/lib/io/i2c_bbio.h
+++ b/gnuradio-core/src/lib/io/i2c_bbio.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_I2C_BBIO_H
 #define INCLUDED_I2C_BBIO_H
 
+#include <gr_core_api.h>
 #include <boost/shared_ptr.hpp>
 
 class i2c_bbio;
@@ -33,7 +34,7 @@ typedef boost::shared_ptr<i2c_bbio>	i2c_bbio_sptr;
  * \brief abstract class that implements bit banging i/o for i2c bus.
  * \ingroup base
  */
-class i2c_bbio {
+class GR_CORE_API i2c_bbio {
  public:
 
   i2c_bbio () {}
diff --git a/gnuradio-core/src/lib/io/i2c_bbio_pp.h b/gnuradio-core/src/lib/io/i2c_bbio_pp.h
index 5a99cdcd1..4a311a2c9 100644
--- a/gnuradio-core/src/lib/io/i2c_bbio_pp.h
+++ b/gnuradio-core/src/lib/io/i2c_bbio_pp.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_I2C_BBIO_PP_H
 #define INCLUDED_I2C_BBIO_PP_H
 
+#include <gr_core_api.h>
 #include "i2c_bbio.h"
 #include "ppio.h"
 
@@ -33,8 +34,8 @@
  * This class talks to the i2c bus on the microtune eval board using
  * the parallel port.  This works for both the 4937 and 4702 boards.
  */
-class i2c_bbio_pp : public i2c_bbio {
-  friend i2c_bbio_sptr make_i2c_bbio_pp (ppio_sptr pp);
+class GR_CORE_API i2c_bbio_pp : public i2c_bbio {
+  friend GR_CORE_API i2c_bbio_sptr make_i2c_bbio_pp (ppio_sptr pp);
   i2c_bbio_pp (ppio_sptr pp);
 
  public:
@@ -50,7 +51,7 @@ class i2c_bbio_pp : public i2c_bbio {
   ppio_sptr	d_pp;
 };
 
-i2c_bbio_sptr make_i2c_bbio_pp (ppio_sptr pp);
+GR_CORE_API i2c_bbio_sptr make_i2c_bbio_pp (ppio_sptr pp);
 
 
 #endif /* INCLUDED_I2C_BBIO_PP_H */
diff --git a/gnuradio-core/src/lib/io/i2c_bitbang.h b/gnuradio-core/src/lib/io/i2c_bitbang.h
index c9deb38ba..feb23b787 100644
--- a/gnuradio-core/src/lib/io/i2c_bitbang.h
+++ b/gnuradio-core/src/lib/io/i2c_bitbang.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_I2C_BITBANG_H
 #define INCLUDED_I2C_BITBANG_H
 
+#include <gr_core_api.h>
 #include <i2c.h>
 #include <i2c_bbio.h>
 
@@ -30,8 +31,8 @@
  * \brief class for controlling i2c bus
  * \ingroup base
  */
-class i2c_bitbang : public i2c {
-  friend i2c_sptr make_i2c_bitbang (i2c_bbio_sptr io);
+class GR_CORE_API i2c_bitbang : public i2c {
+  friend GR_CORE_API i2c_sptr make_i2c_bitbang (i2c_bbio_sptr io);
   i2c_bitbang (i2c_bbio_sptr io);
 
  public:
@@ -57,7 +58,7 @@ private:
   i2c_bbio_sptr		d_io;
 };
 
-i2c_sptr make_i2c_bitbang (i2c_bbio_sptr io);
+GR_CORE_API i2c_sptr make_i2c_bitbang (i2c_bbio_sptr io);
 
 #endif /* INCLUDED_I2C_BITBANG_H */
 
diff --git a/gnuradio-core/src/lib/io/microtune_4702.h b/gnuradio-core/src/lib/io/microtune_4702.h
index 95c64abe7..fd8d89305 100644
--- a/gnuradio-core/src/lib/io/microtune_4702.h
+++ b/gnuradio-core/src/lib/io/microtune_4702.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_MICROTUNE_4702_H
 #define INCLUDED_MICROTUNE_4702_H
 
+#include <gr_core_api.h>
 #include <microtune_xxxx.h>
 
 /*!
@@ -30,7 +31,7 @@
  * \ingroup hardware
  */
 
-class microtune_4702 : public microtune_xxxx   {
+class GR_CORE_API microtune_4702 : public microtune_xxxx   {
 public:
   microtune_4702 (i2c_sptr i2c, int i2c_addr);
 
diff --git a/gnuradio-core/src/lib/io/microtune_4702_eval_board.h b/gnuradio-core/src/lib/io/microtune_4702_eval_board.h
index 6e9726917..e3c07fdf9 100644
--- a/gnuradio-core/src/lib/io/microtune_4702_eval_board.h
+++ b/gnuradio-core/src/lib/io/microtune_4702_eval_board.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_MICROTUNE_4702_EVAL_BOARD_H
 #define INCLUDED_MICROTUNE_4702_EVAL_BOARD_H
 
+#include <gr_core_api.h>
 #include "microtune_xxxx_eval_board.h"
 
 /*!
@@ -30,7 +31,7 @@
  * \ingroup hardware
  */
 
-class microtune_4702_eval_board : public microtune_xxxx_eval_board {
+class GR_CORE_API microtune_4702_eval_board : public microtune_xxxx_eval_board {
 public:
   microtune_4702_eval_board (int which_pp = 0);
   ~microtune_4702_eval_board ();
diff --git a/gnuradio-core/src/lib/io/microtune_4937.h b/gnuradio-core/src/lib/io/microtune_4937.h
index b263ceb0f..bc8a26c64 100644
--- a/gnuradio-core/src/lib/io/microtune_4937.h
+++ b/gnuradio-core/src/lib/io/microtune_4937.h
@@ -23,13 +23,14 @@
 #ifndef INCLUDED_MICROTUNE_4937_H
 #define INCLUDED_MICROTUNE_4937_H
 
+#include <gr_core_api.h>
 #include <microtune_xxxx.h>
 
 /*!
  * \brief class for controlling microtune 4937 tuner module
  * \ingroup hardware
  */
-class microtune_4937 : public microtune_xxxx {
+class GR_CORE_API microtune_4937 : public microtune_xxxx {
 public:
   microtune_4937 (i2c_sptr i2c, int i2c_addr = 0x61);
   virtual ~microtune_4937 ();
diff --git a/gnuradio-core/src/lib/io/microtune_4937_eval_board.h b/gnuradio-core/src/lib/io/microtune_4937_eval_board.h
index 154a7281a..09c00d116 100644
--- a/gnuradio-core/src/lib/io/microtune_4937_eval_board.h
+++ b/gnuradio-core/src/lib/io/microtune_4937_eval_board.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_MICROTUNE_4937_EVAL_BOARD_H
 #define INCLUDED_MICROTUNE_4937_EVAL_BOARD_H
 
+#include <gr_core_api.h>
 #include "microtune_xxxx_eval_board.h"
 
 /*!
@@ -30,7 +31,7 @@
  * \ingroup hardware
  */
 
-class microtune_4937_eval_board : public microtune_xxxx_eval_board {
+class GR_CORE_API microtune_4937_eval_board : public microtune_xxxx_eval_board {
 public:
   microtune_4937_eval_board (int which_pp = 0);
   ~microtune_4937_eval_board ();
diff --git a/gnuradio-core/src/lib/io/microtune_xxxx.h b/gnuradio-core/src/lib/io/microtune_xxxx.h
index 4d5074a85..8b6ec25aa 100644
--- a/gnuradio-core/src/lib/io/microtune_xxxx.h
+++ b/gnuradio-core/src/lib/io/microtune_xxxx.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_MICROTUNE_XXXX_H
 #define INCLUDED_MICROTUNE_XXXX_H
 
+#include <gr_core_api.h>
 #include <boost/shared_ptr.hpp>
 
 class i2c;
@@ -32,7 +33,7 @@ typedef boost::shared_ptr<i2c> i2c_sptr;
  * \brief abstract class for controlling microtune {4937,4702} tuner modules
  * \ingroup base
  */
-class microtune_xxxx {
+class GR_CORE_API microtune_xxxx {
 public:
   microtune_xxxx () {}
   virtual ~microtune_xxxx ();
diff --git a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.h b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.h
index 808075e55..08aa438c0 100644
--- a/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.h
+++ b/gnuradio-core/src/lib/io/microtune_xxxx_eval_board.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_MICROTUNE_XXXX_EVAL_BOARD_H
 #define INCLUDED_MICROTUNE_XXXX_EVAL_BOARD_H
 
+#include <gr_core_api.h>
 #include <boost/shared_ptr.hpp>
 
 class microtune_xxxx;
@@ -37,7 +38,7 @@ typedef boost::shared_ptr<i2c> i2c_sptr;
  * \brief abstract class for controlling microtune xxxx eval board
  * \ingroup hardware
  */
-class microtune_xxxx_eval_board {
+class GR_CORE_API microtune_xxxx_eval_board {
 public:
   microtune_xxxx_eval_board (int which_pp = 0);
   virtual ~microtune_xxxx_eval_board ();
diff --git a/gnuradio-core/src/lib/io/ppio.h b/gnuradio-core/src/lib/io/ppio.h
index e1a62e2a3..f7d14d52e 100644
--- a/gnuradio-core/src/lib/io/ppio.h
+++ b/gnuradio-core/src/lib/io/ppio.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_PPIO_H
 #define INCLUDED_PPIO_H
 
+#include <gr_core_api.h>
 #include <boost/shared_ptr.hpp>
 
 class ppio;
@@ -34,7 +35,7 @@ typedef boost::shared_ptr<ppio> ppio_sptr;
  * \ingroup hardware
  */
 
-class ppio {
+class GR_CORE_API ppio {
  public:
   ppio () {}
   virtual ~ppio ();
@@ -55,7 +56,7 @@ class ppio {
  * Split out from class to make life easier for SWIG
  */
 
-ppio_sptr make_ppio (int which_pp);
+GR_CORE_API ppio_sptr make_ppio (int which_pp);
 
 
 #endif /* INCLUDED_PPIO_H */
diff --git a/gnuradio-core/src/lib/io/ppio_ppdev.h b/gnuradio-core/src/lib/io/ppio_ppdev.h
index b5abe3f0a..5d082d784 100644
--- a/gnuradio-core/src/lib/io/ppio_ppdev.h
+++ b/gnuradio-core/src/lib/io/ppio_ppdev.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_PPIO_PPDEV_H
 #define INCLUDED_PPIO_PPDEV_H
 
+#include <gr_core_api.h>
 #include <ppio.h>
 
 class ppio_ppdev;
@@ -33,8 +34,8 @@ typedef boost::shared_ptr<ppio_ppdev> ppio_ppdev_sptr;
  * \ingroup hardware
  */
 
-class ppio_ppdev : public ppio {
-  friend ppio_ppdev_sptr make_ppio_ppdev (int which = 0);
+class GR_CORE_API ppio_ppdev : public ppio {
+  friend GR_CORE_API ppio_ppdev_sptr make_ppio_ppdev (int which = 0);
   ppio_ppdev (int which = 0);
 
  public:
diff --git a/gnuradio-core/src/lib/io/sdr_1000.h b/gnuradio-core/src/lib/io/sdr_1000.h
index 113e85deb..6647fbba5 100644
--- a/gnuradio-core/src/lib/io/sdr_1000.h
+++ b/gnuradio-core/src/lib/io/sdr_1000.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_SDR_1000_H
 #define INCLUDED_SDR_1000_H
 
+#include <gr_core_api.h>
 #include <boost/shared_ptr.hpp>
 
 class ppio;
@@ -36,7 +37,7 @@ enum { L_EXT = 0, L_BAND = 1, L_DDS0 = 2, L_DDS1 = 3 };
  * \sa sdr_1000.py for a higher level interface.
  * \ingroup hardware
  */
-class sdr_1000_base {
+class GR_CORE_API sdr_1000_base {
   ppio_sptr	d_ppio;
   int	 	d_shadow[4];	// shadow latches
   
diff --git a/gr-radar-mono/src/fpga/top/Makefile.am b/gnuradio-core/src/lib/missing/CMakeLists.txt
index 51f73ebfe..0a376645f 100644
--- a/gr-radar-mono/src/fpga/top/Makefile.am
+++ b/gnuradio-core/src/lib/missing/CMakeLists.txt
@@ -1,5 +1,4 @@
-#
-# Copyright 2007,2009 Free Software Foundation, Inc.
+# Copyright 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -17,32 +16,17 @@
 # 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-RBFS = usrp_radar_mono.rbf
-
-rbf2datadir = $(prefix)/share/usrp/rev2
-dist_rbf2data_DATA = $(RBFS)
 
-rbf4datadir = $(prefix)/share/usrp/rev4
-dist_rbf4data_DATA = $(RBFS)
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
 
-EXTRA_DIST += \
-	usrp_radar_mono.csf \
-	usrp_radar_mono.esf \
-	usrp_radar_mono.psf \
-	usrp_radar_mono.qpf \
-	usrp_radar_mono.qsf \
-	usrp_radar_mono.v
+list(APPEND gnuradio_core_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/bug_work_around_8.cc
+)
 
-MOSTLYCLEANFILES += 	\
-	db/*		\
-	*.rpt		\
-	*.summary	\
-	*.qws		\
-	*.smsg		\
-	*.done		\
-	*.pin		\
-	*.sof
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+    list(APPEND gnuradio_core_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/posix_memalign.cc
+    )
+endif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
diff --git a/gnuradio-core/src/lib/reed-solomon/CMakeLists.txt b/gnuradio-core/src/lib/reed-solomon/CMakeLists.txt
new file mode 100644
index 000000000..f073249f6
--- /dev/null
+++ b/gnuradio-core/src/lib/reed-solomon/CMakeLists.txt
@@ -0,0 +1,62 @@
+# Copyright 2010-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.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+#MSVC workaround: we cant have dynamically sized arrays.
+#So ifdef a max array bounds that is larger than NN and NROOTS
+#Its a bit of a hack, but if you look at the code, its so full of ifdefs,
+#and lacks optimization where it should be pre-allocating these arrays.
+if(MSVC)
+    set_source_files_properties(
+        ${CMAKE_CURRENT_SOURCE_DIR}/exercise.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/decode_rs.c
+        PROPERTIES COMPILE_DEFINITIONS "MAX_ARRAY=256;"
+    )
+endif(MSVC)
+
+set(gr_core_rs_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/encode_rs.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/decode_rs.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/init_rs.c
+)
+
+########################################################################
+# Setup sources and includes
+########################################################################
+list(APPEND gnuradio_core_sources ${gr_core_rs_sources})
+
+install(
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/rs.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "core_devel"
+)
+
+########################################################################
+# Register unit tests
+########################################################################
+if(ENABLE_TESTING)
+add_executable(gr_core_rstest
+    ${gr_core_rs_sources}
+    ${CMAKE_CURRENT_SOURCE_DIR}/rstest.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/exercise.c
+)
+add_test(gr-core-reed-solomon-test gr_core_rstest)
+endif(ENABLE_TESTING)
diff --git a/gnuradio-core/src/lib/reed-solomon/char.h b/gnuradio-core/src/lib/reed-solomon/char.h
index 2fbcb504a..8010fb0b9 100644
--- a/gnuradio-core/src/lib/reed-solomon/char.h
+++ b/gnuradio-core/src/lib/reed-solomon/char.h
@@ -6,6 +6,8 @@
 
 #define DTYPE unsigned char
 
+#include <gr_core_api.h>
+
 /* Reed-Solomon codec control block */
 struct rs {
   unsigned int mm;              /* Bits per symbol */
@@ -44,12 +46,11 @@ static inline int modnn(struct rs *rs,int x){
 #define INIT_RS init_rs_char
 #define FREE_RS free_rs_char
 
-void ENCODE_RS(void *p,DTYPE *data,DTYPE *parity);
-int DECODE_RS(void *p,DTYPE *data,int *eras_pos,int no_eras);
-void *INIT_RS(unsigned int symsize,unsigned int gfpoly,unsigned int fcr,
+GR_CORE_API void ENCODE_RS(void *p,DTYPE *data,DTYPE *parity);
+GR_CORE_API int DECODE_RS(void *p,DTYPE *data,int *eras_pos,int no_eras);
+GR_CORE_API void *INIT_RS(unsigned int symsize,unsigned int gfpoly,unsigned int fcr,
 		   unsigned int prim,unsigned int nroots);
-void FREE_RS(void *p);
-
+GR_CORE_API void FREE_RS(void *p);
 
 
 
diff --git a/gnuradio-core/src/lib/reed-solomon/decode_rs.c b/gnuradio-core/src/lib/reed-solomon/decode_rs.c
index 27ddd8532..ba60b89ee 100644
--- a/gnuradio-core/src/lib/reed-solomon/decode_rs.c
+++ b/gnuradio-core/src/lib/reed-solomon/decode_rs.c
@@ -8,7 +8,6 @@
 #endif
 
 #include <string.h>
-#include <strings.h>
 
 #define NULL ((void *)0)
 #define	min(a,b)	((a) < (b) ? (a) : (b))
@@ -32,11 +31,19 @@ DTYPE *data, int *eras_pos, int no_eras){
 #endif
   int deg_lambda, el, deg_omega;
   int i, j, r,k;
+#ifdef MAX_ARRAY
+  DTYPE u,q,tmp,num1,num2,den,discr_r;
+  DTYPE lambda[MAX_ARRAY], s[MAX_ARRAY];	/* Err+Eras Locator poly
+					 * and syndrome poly */
+  DTYPE b[MAX_ARRAY], t[MAX_ARRAY], omega[MAX_ARRAY];
+  DTYPE root[MAX_ARRAY], reg[MAX_ARRAY], loc[MAX_ARRAY];
+#else
   DTYPE u,q,tmp,num1,num2,den,discr_r;
   DTYPE lambda[NROOTS+1], s[NROOTS];	/* Err+Eras Locator poly
 					 * and syndrome poly */
   DTYPE b[NROOTS+1], t[NROOTS+1], omega[NROOTS+1];
   DTYPE root[NROOTS], reg[NROOTS+1], loc[NROOTS];
+#endif
   int syn_error, count;
 
   /* form the syndromes; i.e., evaluate data(x) at roots of g(x) */
diff --git a/gnuradio-core/src/lib/reed-solomon/encode_rs.c b/gnuradio-core/src/lib/reed-solomon/encode_rs.c
index 147f0a9e3..9d56d0bf1 100644
--- a/gnuradio-core/src/lib/reed-solomon/encode_rs.c
+++ b/gnuradio-core/src/lib/reed-solomon/encode_rs.c
@@ -3,7 +3,6 @@
  * May be used under the terms of the GNU General Public License (GPL)
  */
 #include <string.h>
-#include <strings.h>
 
 #ifdef FIXED
 #include "fixed.h"
diff --git a/gnuradio-core/src/lib/reed-solomon/exercise.c b/gnuradio-core/src/lib/reed-solomon/exercise.c
index 1e04f618d..987fe1aeb 100644
--- a/gnuradio-core/src/lib/reed-solomon/exercise.c
+++ b/gnuradio-core/src/lib/reed-solomon/exercise.c
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #ifdef FIXED
 #include "fixed.h"
@@ -47,11 +46,19 @@ int trials){
 #if !defined(CCSDS) && !defined(FIXED)
   struct rs *rs = (struct rs *)p;
 #endif
+#if MAX_ARRAY
+  DTYPE block[MAX_ARRAY],tblock[MAX_ARRAY];
+  int i;
+  int errors;
+  int errlocs[MAX_ARRAY];
+  int derrlocs[MAX_ARRAY];
+#else
   DTYPE block[NN],tblock[NN];
   int i;
   int errors;
   int errlocs[NN];
   int derrlocs[NROOTS];
+#endif
   int derrors;
   int errval,errloc;
   int erasures;
diff --git a/gnuradio-core/src/lib/reed-solomon/fixed.h b/gnuradio-core/src/lib/reed-solomon/fixed.h
index 9f0ddd9a4..30091e7bf 100644
--- a/gnuradio-core/src/lib/reed-solomon/fixed.h
+++ b/gnuradio-core/src/lib/reed-solomon/fixed.h
@@ -7,6 +7,8 @@
  */
 #define DTYPE unsigned char
 
+#include <gr_core_api.h>
+
 static inline int mod255(int x){
   while (x >= 255) {
     x -= 255;
@@ -34,5 +36,5 @@ extern unsigned char CCSDS_poly[];
 #define ENCODE_RS encode_rs_8
 #define DECODE_RS decode_rs_8
 
-void ENCODE_RS(DTYPE *data,DTYPE *parity);
-int DECODE_RS(DTYPE *data, int *eras_pos, int no_eras);
+GR_CORE_API void ENCODE_RS(DTYPE *data,DTYPE *parity);
+GR_CORE_API int DECODE_RS(DTYPE *data, int *eras_pos, int no_eras);
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/reed-solomon/int.h b/gnuradio-core/src/lib/reed-solomon/int.h
index 2b0405ae0..79979f827 100644
--- a/gnuradio-core/src/lib/reed-solomon/int.h
+++ b/gnuradio-core/src/lib/reed-solomon/int.h
@@ -5,8 +5,10 @@
  */
 #define DTYPE int
 
+#include <gr_core_api.h>
+
 /* Reed-Solomon codec control block */
-struct rs {
+struct GR_CORE_API rs {
   unsigned int mm;   /* Bits per symbol */
   unsigned int nn;   /* Symbols per block (= (1<<mm)-1) */
   int *alpha_to;      /* log lookup table */
@@ -43,12 +45,11 @@ static inline int modnn(struct rs *rs,int x){
 #define INIT_RS init_rs_int
 #define FREE_RS free_rs_int
 
-void ENCODE_RS(void *p,DTYPE *data,DTYPE *parity);
-int DECODE_RS(void *p,DTYPE *data,int *eras_pos,int no_eras);
+GR_CORE_API void ENCODE_RS(void *p,DTYPE *data,DTYPE *parity);
+GR_CORE_API int DECODE_RS(void *p,DTYPE *data,int *eras_pos,int no_eras);
 void *INIT_RS(unsigned int symsize,unsigned int gfpoly,unsigned int fcr,
 		   unsigned int prim,unsigned int nroots);
-void FREE_RS(void *p);
-
+GR_CORE_API void FREE_RS(void *p);
 
 
 
diff --git a/gnuradio-core/src/lib/reed-solomon/rs.h b/gnuradio-core/src/lib/reed-solomon/rs.h
index 9e731d9d9..97e78769e 100644
--- a/gnuradio-core/src/lib/reed-solomon/rs.h
+++ b/gnuradio-core/src/lib/reed-solomon/rs.h
@@ -1,28 +1,29 @@
+#include <gr_core_api.h>
 /* User include file for the Reed-Solomon codec
  * Copyright 2002, Phil Karn KA9Q
  * May be used under the terms of the GNU General Public License (GPL)
  */
 
 /* General purpose RS codec, 8-bit symbols */
-void encode_rs_char(void *rs,unsigned char *data,unsigned char *parity);
-int decode_rs_char(void *rs,unsigned char *data,int *eras_pos,
+GR_CORE_API void encode_rs_char(void *rs,unsigned char *data,unsigned char *parity);
+GR_CORE_API int decode_rs_char(void *rs,unsigned char *data,int *eras_pos,
 		   int no_eras);
-void *init_rs_char(unsigned int symsize,unsigned int gfpoly,
+GR_CORE_API void *init_rs_char(unsigned int symsize,unsigned int gfpoly,
 		   unsigned int fcr,unsigned int prim,unsigned int nroots);
-void free_rs_char(void *rs);
+GR_CORE_API void free_rs_char(void *rs);
 
 /* General purpose RS codec, integer symbols */
-void encode_rs_int(void *rs,int *data,int *parity);
-int decode_rs_int(void *rs,int *data,int *eras_pos,int no_eras);
-void *init_rs_int(unsigned int symsize,unsigned int gfpoly,unsigned int fcr,
+GR_CORE_API void encode_rs_int(void *rs,int *data,int *parity);
+GR_CORE_API int decode_rs_int(void *rs,int *data,int *eras_pos,int no_eras);
+GR_CORE_API void *init_rs_int(unsigned int symsize,unsigned int gfpoly,unsigned int fcr,
 		  unsigned int prim,unsigned int nroots);
-void free_rs_int(void *rs);
+GR_CORE_API void free_rs_int(void *rs);
 
 /* CCSDS standard (255,223) RS codec with conventional (*not* dual-basis)
  * symbol representation
  */
-void encode_rs_8(unsigned char *data,unsigned char *parity);
-int decode_rs_8(unsigned char *data,int *eras_pos,int no_eras);
+GR_CORE_API void encode_rs_8(unsigned char *data,unsigned char *parity);
+GR_CORE_API int decode_rs_8(unsigned char *data,int *eras_pos,int no_eras);
 
 /* Tables to map from conventional->dual (Taltab) and
  * dual->conventional (Tal1tab) bases
diff --git a/gnuradio-core/src/lib/runtime/CMakeLists.txt b/gnuradio-core/src/lib/runtime/CMakeLists.txt
new file mode 100644
index 000000000..105fc0e06
--- /dev/null
+++ b/gnuradio-core/src/lib/runtime/CMakeLists.txt
@@ -0,0 +1,162 @@
+# Copyright 2010-2010 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.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+
+########################################################################
+# Append gnuradio-core library sources
+########################################################################
+list(APPEND gnuradio_core_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_basic_block.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_flowgraph.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_flat_flowgraph.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_detail.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_executor.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2_detail.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_buffer.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_dispatcher.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_error_handler.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_io_signature.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_local_sighandler.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_message.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_accepter.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_handler.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_queue.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_pagesize.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_preferences.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_realtime.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler_sts.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler_tpb.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_single_threaded_scheduler.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sptr_magic.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_block.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_decimator.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_interpolator.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sys_paths.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block_impl.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tpb_detail.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tpb_thread_body.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf_mmap_shm_open.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf_mmap_tmpfile.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf_createfilemapping.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf_sysv_shm.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_select_handler.cc
+)
+
+########################################################################
+# Append gnuradio-core test sources
+########################################################################
+list(APPEND test_gnuradio_core_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_block.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_hier_block2.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_hier_block2_derived.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_buffer.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_flowgraph.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_top_block.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_io_signature.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_gr_vmcircbuf.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_block_tags.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_runtime.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_set_msg_handler.cc
+)
+
+########################################################################
+# Install runtime headers
+########################################################################
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_basic_block.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_flowgraph.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_flat_flowgraph.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_detail.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_executor.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2_detail.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_buffer.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_complex.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_dispatcher.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_error_handler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_io_signature.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_local_sighandler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_message.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_accepter.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_handler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_queue.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_pagesize.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_preferences.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_realtime.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_runtime_types.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler_sts.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_scheduler_tpb.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_select_handler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_single_threaded_scheduler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sptr_magic.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_block.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_decimator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_interpolator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block_impl.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tpb_detail.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tpb_thread_body.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_timer.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sys_paths.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_types.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_unittests.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_vmcircbuf.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tags.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "core_devel"
+)
+
+########################################################################
+# Install swig headers
+########################################################################
+if(ENABLE_PYTHON)
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_basic_block.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_block_detail.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_hier_block2.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_buffer.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_dispatcher.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_error_handler.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_io_signature.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_message.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_handler.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_msg_queue.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_realtime.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_single_threaded_scheduler.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_block.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_decimator.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_sync_interpolator.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_tags.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_top_block.i
+    ${CMAKE_CURRENT_SOURCE_DIR}/runtime.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "core_swig"
+)
+endif(ENABLE_PYTHON)
diff --git a/gnuradio-core/src/lib/runtime/Makefile.am b/gnuradio-core/src/lib/runtime/Makefile.am
index eca92e526..38da3d5fd 100644
--- a/gnuradio-core/src/lib/runtime/Makefile.am
+++ b/gnuradio-core/src/lib/runtime/Makefile.am
@@ -68,8 +68,7 @@ libruntime_la_SOURCES = 			\
 	gr_vmcircbuf_mmap_tmpfile.cc		\
 	gr_vmcircbuf_createfilemapping.cc	\
 	gr_vmcircbuf_sysv_shm.cc		\
-	gr_select_handler.cc			\
-	gr_tag_info.cc
+	gr_select_handler.cc
 
 libruntime_qa_la_SOURCES = 			\
 	qa_gr_block.cc				\
@@ -125,7 +124,7 @@ grinclude_HEADERS = 				\
 	gr_types.h				\
 	gr_unittests.h				\
 	gr_vmcircbuf.h				\
-	gr_tag_info.h
+	gr_tags.h
 
 noinst_HEADERS = 				\
 	gr_vmcircbuf_mmap_shm_open.h		\
@@ -161,5 +160,6 @@ swiginclude_HEADERS =			\
 	gr_sync_block.i			\
 	gr_sync_decimator.i		\
 	gr_sync_interpolator.i		\
+	gr_tags.i				\
 	gr_top_block.i			\
 	runtime.i
diff --git a/gnuradio-core/src/lib/runtime/gr_basic_block.h b/gnuradio-core/src/lib/runtime/gr_basic_block.h
index 3b0cd51dd..2adca8ccb 100644
--- a/gnuradio-core/src/lib/runtime/gr_basic_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_basic_block.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_BASIC_BLOCK_H
 #define INCLUDED_GR_BASIC_BLOCK_H
 
+#include <gr_core_api.h>
 #include <gr_runtime_types.h>
 #include <gr_sptr_magic.h>
 #include <boost/enable_shared_from_this.hpp>
@@ -41,7 +42,7 @@
  * signal processing functions.
  */
 
-class gr_basic_block : public gr_msg_accepter, public boost::enable_shared_from_this<gr_basic_block>
+class GR_CORE_API gr_basic_block : public gr_msg_accepter, public boost::enable_shared_from_this<gr_basic_block>
 {
     typedef boost::function<void(pmt::pmt_t)> msg_handler_t;
 
@@ -158,7 +159,7 @@ inline bool operator<(gr_basic_block_sptr lhs, gr_basic_block_sptr rhs)
 typedef std::vector<gr_basic_block_sptr> gr_basic_block_vector_t;
 typedef std::vector<gr_basic_block_sptr>::iterator gr_basic_block_viter_t;
 
-long gr_basic_block_ncurrently_allocated();
+GR_CORE_API long gr_basic_block_ncurrently_allocated();
 
 inline std::ostream &operator << (std::ostream &os, gr_basic_block_sptr basic_block)
 {
diff --git a/gnuradio-core/src/lib/runtime/gr_block.cc b/gnuradio-core/src/lib/runtime/gr_block.cc
index 81a55af9d..9463869f5 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block.cc
@@ -144,16 +144,13 @@ gr_block::nitems_written(unsigned int which_output)
 
 void
 gr_block::add_item_tag(unsigned int which_output,
-		       uint64_t offset,
-		       const pmt::pmt_t &key,
-		       const pmt::pmt_t &value,
-		       const pmt::pmt_t &srcid)
+		       const gr_tag_t &tag)
 {
-  d_detail->add_item_tag(which_output, offset, key, value, srcid);
+  d_detail->add_item_tag(which_output, tag);
 }
 
 void
-gr_block::get_tags_in_range(std::vector<pmt::pmt_t> &v,
+gr_block::get_tags_in_range(std::vector<gr_tag_t> &v,
 			    unsigned int which_output,
 			    uint64_t start, uint64_t end)
 {
@@ -161,7 +158,7 @@ gr_block::get_tags_in_range(std::vector<pmt::pmt_t> &v,
 }
   
 void
-gr_block::get_tags_in_range(std::vector<pmt::pmt_t> &v,
+gr_block::get_tags_in_range(std::vector<gr_tag_t> &v,
 			    unsigned int which_output,
 			    uint64_t start, uint64_t end,
 			    const pmt::pmt_t &key)
diff --git a/gnuradio-core/src/lib/runtime/gr_block.h b/gnuradio-core/src/lib/runtime/gr_block.h
index fc22f9ea8..86e0583e9 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_block.h
@@ -23,7 +23,9 @@
 #ifndef INCLUDED_GR_BLOCK_H
 #define INCLUDED_GR_BLOCK_H
 
+#include <gr_core_api.h>
 #include <gr_basic_block.h>
+#include <gr_tags.h>
 
 /*!
  * \brief The abstract base class for all 'terminal' processing blocks.
@@ -53,7 +55,7 @@
  * It reads the input items and writes the output items.
  */
 
-class gr_block : public gr_basic_block {
+class GR_CORE_API gr_block : public gr_basic_block {
 
  public:
   
@@ -254,11 +256,27 @@ class gr_block : public gr_basic_block {
    * \param value        any PMT holding any value for the given key
    * \param srcid        optional source ID specifier; defaults to PMT_F
    */
-  void add_item_tag(unsigned int which_output,
+  inline void add_item_tag(unsigned int which_output,
 		    uint64_t abs_offset,
 		    const pmt::pmt_t &key,
 		    const pmt::pmt_t &value,
-		    const pmt::pmt_t &srcid=pmt::PMT_F);
+		    const pmt::pmt_t &srcid=pmt::PMT_F)
+    {
+        gr_tag_t tag;
+        tag.offset = abs_offset;
+        tag.key = key;
+        tag.value = value;
+        tag.srcid = srcid;
+        this->add_item_tag(which_output, tag);
+    }
+
+ /*!
+   * \brief  Adds a new tag onto the given output buffer.
+   *
+   * \param which_output an integer of which output stream to attach the tag
+   * \param tag the tag object to add
+   */
+  void add_item_tag(unsigned int which_output, const gr_tag_t &tag);
 
   /*!
    * \brief Given a [start,end), returns a vector of all tags in the range.
@@ -273,7 +291,7 @@ class gr_block : public gr_basic_block {
    * \param abs_start    a uint64 count of the start of the range of interest
    * \param abs_end      a uint64 count of the end of the range of interest
    */
-  void get_tags_in_range(std::vector<pmt::pmt_t> &v,
+  void get_tags_in_range(std::vector<gr_tag_t> &v,
 			 unsigned int which_input,
 			 uint64_t abs_start,
 			 uint64_t abs_end);
@@ -293,14 +311,14 @@ class gr_block : public gr_basic_block {
    * \param abs_end      a uint64 count of the end of the range of interest
    * \param key          a PMT symbol key to filter only tags of this key
    */
-  void get_tags_in_range(std::vector<pmt::pmt_t> &v,
+  void get_tags_in_range(std::vector<gr_tag_t> &v,
 			 unsigned int which_input,
 			 uint64_t abs_start,
 			 uint64_t abs_end,
 			 const pmt::pmt_t &key);
 
   // These are really only for internal use, but leaving them public avoids
-  // having to work up an ever-varying list of friends
+  // having to work up an ever-varying list of friend GR_CORE_APIs
 
  public:
   gr_block_detail_sptr detail () const { return d_detail; }
diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.cc b/gnuradio-core/src/lib/runtime/gr_block_detail.cc
index a360240c0..cbd4239f3 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block_detail.cc
@@ -150,27 +150,19 @@ gr_block_detail::nitems_written(unsigned int which_output)
 }
 
 void
-gr_block_detail::add_item_tag(unsigned int which_output,
-			      uint64_t abs_offset,
-			      const pmt_t &key,
-			      const pmt_t &value,
-			      const pmt_t &srcid)
-{
-  if(!pmt_is_symbol(key)) {
-    throw pmt_wrong_type("gr_block_detail::add_item_tag key", key);
+gr_block_detail::add_item_tag(unsigned int which_output, const gr_tag_t &tag)
+{
+  if(!pmt_is_symbol(tag.key)) {
+    throw pmt_wrong_type("gr_block_detail::add_item_tag key", tag.key);
   }
   else {
-    // build tag tuple
-    pmt_t nitem = pmt_from_uint64(abs_offset);
-    pmt_t tuple = pmt_make_tuple(nitem, srcid, key, value);
-
     // Add tag to gr_buffer's deque tags
-    d_output[which_output]->add_item_tag(tuple);
+    d_output[which_output]->add_item_tag(tag);
   }
 }
 
 void
-gr_block_detail::get_tags_in_range(std::vector<pmt::pmt_t> &v,
+gr_block_detail::get_tags_in_range(std::vector<gr_tag_t> &v,
 				   unsigned int which_input,
 				   uint64_t abs_start,
 				   uint64_t abs_end)
@@ -180,13 +172,13 @@ gr_block_detail::get_tags_in_range(std::vector<pmt::pmt_t> &v,
 }
 
 void
-gr_block_detail::get_tags_in_range(std::vector<pmt_t> &v,
+gr_block_detail::get_tags_in_range(std::vector<gr_tag_t> &v,
 				   unsigned int which_input,
 				   uint64_t abs_start,
 				   uint64_t abs_end,
 				   const pmt_t &key)
 {
-  std::vector<pmt_t> found_items;
+  std::vector<gr_tag_t> found_items;
   
   v.resize(0);
 
@@ -195,9 +187,9 @@ gr_block_detail::get_tags_in_range(std::vector<pmt_t> &v,
 
   // Filter further by key name
   pmt_t itemkey;
-  std::vector<pmt_t>::iterator itr;
+  std::vector<gr_tag_t>::iterator itr;
   for(itr = found_items.begin(); itr != found_items.end(); itr++) {
-    itemkey = pmt_tuple_ref(*itr, 2);
+    itemkey = (*itr).key;
     if(pmt_eqv(key, itemkey)) {
       v.push_back(*itr);
     }
diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.h b/gnuradio-core/src/lib/runtime/gr_block_detail.h
index d7ec3b136..89081156a 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.h
+++ b/gnuradio-core/src/lib/runtime/gr_block_detail.h
@@ -23,9 +23,10 @@
 #ifndef INCLUDED_GR_BLOCK_DETAIL_H
 #define INCLUDED_GR_BLOCK_DETAIL_H
 
+#include <gr_core_api.h>
 #include <gr_runtime_types.h>
 #include <gr_tpb_detail.h>
-#include <gr_tag_info.h>
+#include <gr_tags.h>
 #include <stdexcept>
 
 /*!
@@ -36,7 +37,7 @@
  * of almost all users of GNU Radio.  This decoupling also means that
  * we can make changes to the guts without having to recompile everything.
  */
-class gr_block_detail {
+class GR_CORE_API gr_block_detail {
  public:
   ~gr_block_detail ();
 
@@ -104,17 +105,9 @@ class gr_block_detail {
    * which appends the tag onto its deque.
    *
    * \param which_output  an integer of which output stream to attach the tag
-   * \param abs_offset   a uint64 number of the absolute item number
-   *                     assicated with the tag. Can get from nitems_written.
-   * \param key          the tag key as a PMT symbol
-   * \param value        any PMT holding any value for the given key
-   * \param srcid        a PMT source ID specifier
+   * \param tag the tag object to add
    */
-  void add_item_tag(unsigned int which_output,
-		    uint64_t abs_offset,
-		    const pmt::pmt_t &key,
-		    const pmt::pmt_t &value,
-		    const pmt::pmt_t &srcid);
+  void add_item_tag(unsigned int which_output, const gr_tag_t &tag);
 
   /*!
    * \brief Given a [start,end), returns a vector of all tags in the range.
@@ -130,7 +123,7 @@ class gr_block_detail {
    * \param abs_start    a uint64 count of the start of the range of interest
    * \param abs_end      a uint64 count of the end of the range of interest
    */
-  void get_tags_in_range(std::vector<pmt::pmt_t> &v,
+  void get_tags_in_range(std::vector<gr_tag_t> &v,
 			 unsigned int which_input,
 			 uint64_t abs_start,
 			 uint64_t abs_end);
@@ -152,7 +145,7 @@ class gr_block_detail {
    * \param abs_end      a uint64 count of the end of the range of interest
    * \param key          a PMT symbol to select only tags of this key
    */
-  void get_tags_in_range(std::vector<pmt::pmt_t> &v,
+  void get_tags_in_range(std::vector<gr_tag_t> &v,
 			 unsigned int which_input,
 			 uint64_t abs_start,
 			 uint64_t abs_end,
@@ -172,16 +165,16 @@ class gr_block_detail {
 
   gr_block_detail (unsigned int ninputs, unsigned int noutputs);
 
-  friend class gr_tpb_detail;
+  friend struct gr_tpb_detail;
 
-  friend gr_block_detail_sptr
+  friend GR_CORE_API gr_block_detail_sptr
   gr_make_block_detail (unsigned int ninputs, unsigned int noutputs);
 };
 
-gr_block_detail_sptr
+GR_CORE_API gr_block_detail_sptr
 gr_make_block_detail (unsigned int ninputs, unsigned int noutputs);
 
-long
+GR_CORE_API long
 gr_block_detail_ncurrently_allocated ();
 
 #endif /* INCLUDED_GR_BLOCK_DETAIL_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_block_executor.cc b/gnuradio-core/src/lib/runtime/gr_block_executor.cc
index a8d0bc1c8..737b26f67 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_executor.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block_executor.cc
@@ -29,6 +29,7 @@
 #include <gr_block_detail.h>
 #include <gr_buffer.h>
 #include <boost/thread.hpp>
+#include <boost/format.hpp>
 #include <iostream>
 #include <limits>
 #include <assert.h>
@@ -90,7 +91,7 @@ min_available_space (gr_block_detail *d, int output_multiple)
 static bool
 propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d,
 	       const std::vector<uint64_t> &start_nitems_read, double rrate,
-	       std::vector<pmt::pmt_t> &rtags)
+	       std::vector<gr_tag_t> &rtags)
 {
   // Move tags downstream
   // if a sink, we don't need to move downstream
@@ -108,7 +109,7 @@ propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d,
       d->get_tags_in_range(rtags, i, start_nitems_read[i],
 			   d->nitems_read(i));
 
-      std::vector<pmt::pmt_t>::iterator t;
+      std::vector<gr_tag_t>::iterator t;
       if(rrate == 1.0) {
 	for(t = rtags.begin(); t != rtags.end(); t++) {
 	  for(int o = 0; o < d->noutputs(); o++)
@@ -117,14 +118,10 @@ propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d,
       }
       else {
 	for(t = rtags.begin(); t != rtags.end(); t++) {
-	  uint64_t newcount = pmt::pmt_to_uint64(pmt::pmt_tuple_ref(*t, 0));
-	  pmt::pmt_t newtup = pmt::mp(pmt::pmt_from_uint64(newcount * rrate),
-				      pmt::pmt_tuple_ref(*t, 1),
-				      pmt::pmt_tuple_ref(*t, 2),
-				      pmt::pmt_tuple_ref(*t, 3));
-	  
+	  gr_tag_t new_tag = *t;
+	  new_tag.offset *= rrate;
 	  for(int o = 0; o < d->noutputs(); o++)
-	    d->output(o)->add_item_tag(newtup);
+	    d->output(o)->add_item_tag(new_tag);
 	}
       }
     }
@@ -138,14 +135,11 @@ propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d,
 	d->get_tags_in_range(rtags, i, start_nitems_read[i],
 			     d->nitems_read(i));
 
-	std::vector<pmt::pmt_t>::iterator t;
+	std::vector<gr_tag_t>::iterator t;
 	for(t = rtags.begin(); t != rtags.end(); t++) {
-	  uint64_t newcount = pmt::pmt_to_uint64(pmt::pmt_tuple_ref(*t, 0));
-	  pmt::pmt_t newtup = pmt::mp(pmt::pmt_from_uint64(newcount * rrate),
-				      pmt::pmt_tuple_ref(*t, 1),
-				      pmt::pmt_tuple_ref(*t, 2),
-				      pmt::pmt_tuple_ref(*t, 3));
-	  d->output(i)->add_item_tag(newtup);
+	  gr_tag_t new_tag = *t;
+	  new_tag.offset *= rrate;
+	  d->output(i)->add_item_tag(new_tag);
 	}
       }
     }
@@ -165,9 +159,8 @@ gr_block_executor::gr_block_executor (gr_block_sptr block)
   : d_block(block), d_log(0)
 {
   if (ENABLE_LOGGING){
-    char name[100];
-    snprintf(name, sizeof(name), "sst-%03d.log", which_scheduler++);
-    d_log = new std::ofstream(name);
+    std::string name = str(boost::format("sst-%03d.log") % which_scheduler++);
+    d_log = new std::ofstream(name.c_str());
     std::unitbuf(*d_log);		// make it unbuffered...
     *d_log << "gr_block_executor: "
 	   << d_block << std::endl;
diff --git a/gnuradio-core/src/lib/runtime/gr_block_executor.h b/gnuradio-core/src/lib/runtime/gr_block_executor.h
index 77ace5522..15279f273 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_executor.h
+++ b/gnuradio-core/src/lib/runtime/gr_block_executor.h
@@ -23,9 +23,10 @@
 #ifndef INCLUDED_GR_BLOCK_EXECUTOR_H
 #define INCLUDED_GR_BLOCK_EXECUTOR_H
 
+#include <gr_core_api.h>
 #include <gr_runtime_types.h>
 #include <fstream>
-#include <gruel/pmt.h>
+#include <gr_tags.h>
 
 //class gr_block_executor;
 //typedef boost::shared_ptr<gr_block_executor>	gr_block_executor_sptr;
@@ -36,7 +37,7 @@
  * \ingroup internal
  */
 
-class gr_block_executor {
+class GR_CORE_API gr_block_executor {
 protected:
   gr_block_sptr			d_block;	// The block we're trying to run
   std::ofstream	       	       *d_log;
@@ -49,7 +50,7 @@ protected:
   std::vector<bool>		d_input_done;
   gr_vector_void_star		d_output_items;
   std::vector<uint64_t>         d_start_nitems_read; //stores where tag counts are before work
-  std::vector<pmt::pmt_t>       d_returned_tags;
+  std::vector<gr_tag_t>       d_returned_tags;
 
  public:
   gr_block_executor(gr_block_sptr block);
diff --git a/gnuradio-core/src/lib/runtime/gr_buffer.cc b/gnuradio-core/src/lib/runtime/gr_buffer.cc
index fa3722714..8ccc9db32 100644
--- a/gnuradio-core/src/lib/runtime/gr_buffer.cc
+++ b/gnuradio-core/src/lib/runtime/gr_buffer.cc
@@ -227,7 +227,7 @@ gr_buffer::drop_reader (gr_buffer_reader *reader)
 }
 
 void
-gr_buffer::add_item_tag(const pmt::pmt_t &tag)
+gr_buffer::add_item_tag(const gr_tag_t &tag)
 {
   gruel::scoped_lock guard(*mutex());
   d_item_tags.push_back(tag);
@@ -245,7 +245,7 @@ gr_buffer::prune_tags(uint64_t max_time)
      buffer's mutex al la the scoped_lock line below.
   */
   //gruel::scoped_lock guard(*mutex());
-  std::deque<pmt::pmt_t>::iterator itr = d_item_tags.begin();
+  std::deque<gr_tag_t>::iterator itr = d_item_tags.begin();
 
   uint64_t item_time;
 
@@ -255,7 +255,7 @@ gr_buffer::prune_tags(uint64_t max_time)
   // to find more. Mostly, we wil be erasing from the front and
   // therefore lose little time this way.
   while(itr != d_item_tags.end()) {
-    item_time = pmt::pmt_to_uint64(pmt::pmt_tuple_ref(*itr, 0));
+    item_time = (*itr).offset;
     if(item_time < max_time) {
       d_item_tags.erase(itr);
       itr = d_item_tags.begin();
@@ -307,18 +307,18 @@ gr_buffer_reader::update_read_pointer (int nitems)
 }
 
 void
-gr_buffer_reader::get_tags_in_range(std::vector<pmt::pmt_t> &v,
+gr_buffer_reader::get_tags_in_range(std::vector<gr_tag_t> &v,
 				    uint64_t abs_start,
 				    uint64_t abs_end)
 {
   gruel::scoped_lock guard(*mutex());
 
   v.resize(0);
-  std::deque<pmt::pmt_t>::iterator itr = d_buffer->get_tags_begin();
+  std::deque<gr_tag_t>::iterator itr = d_buffer->get_tags_begin();
   
   uint64_t item_time;
   while(itr != d_buffer->get_tags_end()) {
-    item_time = pmt::pmt_to_uint64(pmt::pmt_tuple_ref(*itr, 0));
+    item_time = (*itr).offset;
 
     if((item_time >= abs_start) && (item_time < abs_end)) {
       v.push_back(*itr);
diff --git a/gnuradio-core/src/lib/runtime/gr_buffer.h b/gnuradio-core/src/lib/runtime/gr_buffer.h
index e5725d386..e8e393756 100644
--- a/gnuradio-core/src/lib/runtime/gr_buffer.h
+++ b/gnuradio-core/src/lib/runtime/gr_buffer.h
@@ -23,10 +23,11 @@
 #ifndef INCLUDED_GR_BUFFER_H
 #define INCLUDED_GR_BUFFER_H
 
+#include <gr_core_api.h>
 #include <gr_runtime_types.h>
 #include <boost/weak_ptr.hpp>
 #include <gruel/thread.h>
-#include <gruel/pmt.h>
+#include <gr_tags.h>
 #include <deque>
 
 class gr_vmcircbuf;
@@ -42,14 +43,14 @@ class gr_vmcircbuf;
  * \param sizeof_item is the size of an item in bytes.
  * \param link is the block that writes to this buffer.
  */
-gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link=gr_block_sptr());
+GR_CORE_API gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link=gr_block_sptr());
 
 
 /*!
  * \brief Single writer, multiple reader fifo.
  * \ingroup internal
  */
-class gr_buffer {
+class GR_CORE_API gr_buffer {
  public:
 
   virtual ~gr_buffer ();
@@ -96,9 +97,9 @@ class gr_buffer {
   /*!
    * \brief  Adds a new tag to the buffer.
    * 
-   * \param tag        a PMT tuple containing the new tag
+   * \param tag        the new tag
    */
-  void add_item_tag(const pmt::pmt_t &tag);
+  void add_item_tag(const gr_tag_t &tag);
 
   /*!
    * \brief  Removes all tags before \p max_time from buffer
@@ -107,16 +108,16 @@ class gr_buffer {
    */
   void prune_tags(uint64_t max_time);
 
-  std::deque<pmt::pmt_t>::iterator get_tags_begin() { return d_item_tags.begin(); }
-  std::deque<pmt::pmt_t>::iterator get_tags_end() { return d_item_tags.end(); }
+  std::deque<gr_tag_t>::iterator get_tags_begin() { return d_item_tags.begin(); }
+  std::deque<gr_tag_t>::iterator get_tags_end() { return d_item_tags.end(); }
 
   // -------------------------------------------------------------------------
 
  private:
 
   friend class gr_buffer_reader;
-  friend gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link);
-  friend gr_buffer_reader_sptr gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link);
+  friend GR_CORE_API gr_buffer_sptr gr_make_buffer (int nitems, size_t sizeof_item, gr_block_sptr link);
+  friend GR_CORE_API gr_buffer_reader_sptr gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link);
 
  protected:
   char				       *d_base;		// base address of buffer
@@ -135,7 +136,7 @@ class gr_buffer {
   unsigned int				d_write_index;	// in items [0,d_bufsize)
   uint64_t                              d_abs_write_offset; // num items written since the start
   bool					d_done;
-  std::deque<pmt::pmt_t>                d_item_tags;
+  std::deque<gr_tag_t>                  d_item_tags;
   uint64_t                              d_last_min_items_read;
   
   unsigned
@@ -192,11 +193,11 @@ class gr_buffer {
  * \param nzero_preload -- number of zero items to "preload" into buffer.
  * \param link is the block that reads from the buffer using this gr_buffer_reader.
  */
-gr_buffer_reader_sptr 
+GR_CORE_API gr_buffer_reader_sptr 
 gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link=gr_block_sptr());
 
 //! returns # of gr_buffers currently allocated
-long gr_buffer_ncurrently_allocated ();
+GR_CORE_API long gr_buffer_ncurrently_allocated ();
 
 
 // ---------------------------------------------------------------------------
@@ -206,7 +207,7 @@ long gr_buffer_ncurrently_allocated ();
  * \ingroup internal
  */
 
-class gr_buffer_reader {
+class GR_CORE_API gr_buffer_reader {
  public:
 
   ~gr_buffer_reader ();
@@ -267,7 +268,7 @@ class gr_buffer_reader {
    * \param abs_start    a uint64 count of the start of the range of interest
    * \param abs_end      a uint64 count of the end of the range of interest
    */
-  void get_tags_in_range(std::vector<pmt::pmt_t> &v,
+  void get_tags_in_range(std::vector<gr_tag_t> &v,
 			 uint64_t abs_start,
 			 uint64_t abs_end);
 
@@ -276,7 +277,7 @@ class gr_buffer_reader {
  private:
 
   friend class gr_buffer;
-  friend gr_buffer_reader_sptr 
+  friend GR_CORE_API gr_buffer_reader_sptr 
   gr_buffer_add_reader (gr_buffer_sptr buf, int nzero_preload, gr_block_sptr link);
 
 
@@ -290,7 +291,7 @@ class gr_buffer_reader {
 };
 
 //! returns # of gr_buffer_readers currently allocated
-long gr_buffer_reader_ncurrently_allocated ();
+GR_CORE_API long gr_buffer_reader_ncurrently_allocated ();
 
 
 #endif /* INCLUDED_GR_BUFFER_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_dispatcher.h b/gnuradio-core/src/lib/runtime/gr_dispatcher.h
index 34f825102..735974766 100644
--- a/gnuradio-core/src/lib/runtime/gr_dispatcher.h
+++ b/gnuradio-core/src/lib/runtime/gr_dispatcher.h
@@ -23,14 +23,15 @@
 #ifndef INCLUDED_GR_DISPATCHER_H
 #define INCLUDED_GR_DISPATCHER_H
 
+#include <gr_core_api.h>
 #include <gr_select_handler.h>
 #include <vector>
 
 class gr_dispatcher;
 typedef boost::shared_ptr<gr_dispatcher> gr_dispatcher_sptr;
 
-gr_dispatcher_sptr gr_dispatcher_singleton();
-gr_dispatcher_sptr gr_make_dispatcher();
+GR_CORE_API gr_dispatcher_sptr gr_dispatcher_singleton();
+GR_CORE_API gr_dispatcher_sptr gr_make_dispatcher();
 
 /*!
  * \brief invoke callbacks based on select.
@@ -38,10 +39,10 @@ gr_dispatcher_sptr gr_make_dispatcher();
  *
  * \sa gr_select_handler
  */
-class gr_dispatcher
+class GR_CORE_API gr_dispatcher
 {
   gr_dispatcher();
-  friend gr_dispatcher_sptr gr_make_dispatcher();
+  friend GR_CORE_API gr_dispatcher_sptr gr_make_dispatcher();
 
   std::vector<gr_select_handler_sptr> d_handler;
   int			      	      d_max_index;
diff --git a/gnuradio-core/src/lib/runtime/gr_error_handler.h b/gnuradio-core/src/lib/runtime/gr_error_handler.h
index aedb6f41f..4c30791f2 100644
--- a/gnuradio-core/src/lib/runtime/gr_error_handler.h
+++ b/gnuradio-core/src/lib/runtime/gr_error_handler.h
@@ -43,6 +43,7 @@
 #ifndef INCLUDED_GR_ERROR_HANDLER_H
 #define INCLUDED_GR_ERROR_HANDLER_H
 
+#include <gr_core_api.h>
 #include <stdarg.h>
 #include <string>
 #include <cstdio>  // for FILE
@@ -51,7 +52,7 @@
  * \brief abstract error handler
  * \ingroup base
  */
-class gr_error_handler {
+class GR_CORE_API gr_error_handler {
 public:
   enum seriousness {
     ERR_DEBUG		= 0x00000000,
@@ -90,7 +91,7 @@ protected:
 };
 
 
-class gr_base_error_handler : public gr_error_handler {
+class GR_CORE_API gr_base_error_handler : public gr_error_handler {
   int	d_nwarnings;
   int	d_nerrors;
 
@@ -102,7 +103,7 @@ public:
   void count_error(seriousness s);
 };
 
-class gr_file_error_handler : public gr_base_error_handler {
+class GR_CORE_API gr_file_error_handler : public gr_base_error_handler {
   FILE		*d_file;
   int		 d_fd;
 public:
diff --git a/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.h b/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.h
index 8e9834337..2cc883686 100644
--- a/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.h
+++ b/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.h
@@ -23,22 +23,23 @@
 #ifndef INCLUDED_GR_FLAT_FLOWGRAPH_H
 #define INCLUDED_GR_FLAT_FLOWGRAPH_H
 
+#include <gr_core_api.h>
 #include <gr_flowgraph.h>
 #include <gr_block.h>
 
 // Create a shared pointer to a heap allocated gr_flat_flowgraph
 // (types defined in gr_runtime_types.h)
-gr_flat_flowgraph_sptr gr_make_flat_flowgraph();
+GR_CORE_API gr_flat_flowgraph_sptr gr_make_flat_flowgraph();
 
 /*!
  *\brief Class specializing gr_flat_flowgraph that has all nodes
  * as gr_blocks, with no hierarchy
  * \ingroup internal
  */
-class gr_flat_flowgraph : public gr_flowgraph
+class GR_CORE_API gr_flat_flowgraph : public gr_flowgraph
 {
 public:
-  friend gr_flat_flowgraph_sptr gr_make_flat_flowgraph();
+  friend GR_CORE_API gr_flat_flowgraph_sptr gr_make_flat_flowgraph();
 
   // Destruct an arbitrary gr_flat_flowgraph
   ~gr_flat_flowgraph();
diff --git a/gnuradio-core/src/lib/runtime/gr_flowgraph.h b/gnuradio-core/src/lib/runtime/gr_flowgraph.h
index 8e988506b..8f9a8ba71 100644
--- a/gnuradio-core/src/lib/runtime/gr_flowgraph.h
+++ b/gnuradio-core/src/lib/runtime/gr_flowgraph.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_FLOWGRAPH_H
 #define INCLUDED_GR_FLOWGRAPH_H
 
+#include <gr_core_api.h>
 #include <gr_basic_block.h>
 #include <iostream>
 
@@ -30,7 +31,7 @@
  * \brief Class representing a specific input or output graph endpoint
  * \ingroup internal
  */
-class gr_endpoint
+class GR_CORE_API gr_endpoint
 {
 private:
   gr_basic_block_sptr d_basic_block;
@@ -59,7 +60,7 @@ typedef std::vector<gr_endpoint>::iterator gr_endpoint_viter_t;
  *\brief Class representing a connection between to graph endpoints
  *
  */
-class gr_edge
+class GR_CORE_API gr_edge
 {
 public:
   gr_edge() : d_src(), d_dst() { };
@@ -81,16 +82,16 @@ typedef std::vector<gr_edge>::iterator gr_edge_viter_t;
 
 // Create a shared pointer to a heap allocated flowgraph
 // (types defined in gr_runtime_types.h)
-gr_flowgraph_sptr gr_make_flowgraph();
+GR_CORE_API gr_flowgraph_sptr gr_make_flowgraph();
 
 /*!
  * \brief Class representing a directed, acyclic graph of basic blocks
  * \ingroup internal
  */
-class gr_flowgraph
+class GR_CORE_API gr_flowgraph
 {
 public:
-  friend gr_flowgraph_sptr gr_make_flowgraph();
+  friend GR_CORE_API gr_flowgraph_sptr gr_make_flowgraph();
 
   // Destruct an arbitrary flowgraph
   ~gr_flowgraph();
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2.h b/gnuradio-core/src/lib/runtime/gr_hier_block2.h
index 0a40c36b7..8687b7d99 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2.h
+++ b/gnuradio-core/src/lib/runtime/gr_hier_block2.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_GR_HIER_BLOCK2_H
 #define INCLUDED_GR_HIER_BLOCK2_H
 
+#include <gr_core_api.h>
 #include <gr_basic_block.h>
 
 /*!
  * \brief public constructor for gr_hier_block2
 
  */
-gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
+GR_CORE_API gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
                                         gr_io_signature_sptr input_signature,
                                         gr_io_signature_sptr output_signature);
 
@@ -40,11 +41,11 @@ class gr_hier_block2_detail;
  * \ingroup base_blk
  *
  */
-class gr_hier_block2 : public gr_basic_block
+class GR_CORE_API gr_hier_block2 : public gr_basic_block
 {
 private:
   friend class gr_hier_block2_detail;
-  friend gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
+  friend GR_CORE_API gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
 						 gr_io_signature_sptr input_signature,
 						 gr_io_signature_sptr output_signature);
   
diff --git a/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h b/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h
index 6f5384e5a..5a77d6a03 100644
--- a/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h
+++ b/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_HIER_BLOCK2_DETAIL_H
 #define INCLUDED_GR_HIER_BLOCK2_DETAIL_H
 
+#include <gr_core_api.h>
 #include <gr_hier_block2.h>
 #include <gr_flat_flowgraph.h>
 #include <boost/utility.hpp>
@@ -29,7 +30,7 @@
 /*!
  * \ingroup internal
  */
-class gr_hier_block2_detail : boost::noncopyable
+class GR_CORE_API gr_hier_block2_detail : boost::noncopyable
 {
 public:
   gr_hier_block2_detail(gr_hier_block2 *owner);
diff --git a/gnuradio-core/src/lib/runtime/gr_io_signature.h b/gnuradio-core/src/lib/runtime/gr_io_signature.h
index 5d194cf55..11c6b7f13 100644
--- a/gnuradio-core/src/lib/runtime/gr_io_signature.h
+++ b/gnuradio-core/src/lib/runtime/gr_io_signature.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_IO_SIGNATURE_H
 #define INCLUDED_IO_SIGNATURE_H
 
+#include <gr_core_api.h>
 #include <gr_runtime_types.h>
 
 /*!
@@ -33,7 +34,7 @@
  * \param max_streams  specify maximum number of streams (>= min_streams or -1 -> infinite)
  * \param sizeof_stream_item  specify the size of the items in each stream
  */
-gr_io_signature_sptr
+GR_CORE_API gr_io_signature_sptr
 gr_make_io_signature(int min_streams, int max_streams,
 		     int sizeof_stream_item);
 
@@ -45,7 +46,7 @@ gr_make_io_signature(int min_streams, int max_streams,
  * \param sizeof_stream_item1 specify the size of the items in the first stream
  * \param sizeof_stream_item2 specify the size of the items in the second and subsequent streams
  */
-gr_io_signature_sptr
+GR_CORE_API gr_io_signature_sptr
 gr_make_io_signature2(int min_streams, int max_streams,
 		      int sizeof_stream_item1,
 		      int sizeof_stream_item2
@@ -60,7 +61,7 @@ gr_make_io_signature2(int min_streams, int max_streams,
  * \param sizeof_stream_item2 specify the size of the items in the second stream
  * \param sizeof_stream_item3 specify the size of the items in the third and subsequent streams
  */
-gr_io_signature_sptr
+GR_CORE_API gr_io_signature_sptr
 gr_make_io_signature3(int min_streams, int max_streams, 
 		      int sizeof_stream_item1,
 		      int sizeof_stream_item2,
@@ -78,7 +79,7 @@ gr_make_io_signature3(int min_streams, int max_streams,
  * value of the last entry in sizeof_stream_items is used for the missing values.
  * sizeof_stream_items must contain at least 1 entry.
  */
-gr_io_signature_sptr
+GR_CORE_API gr_io_signature_sptr
 gr_make_io_signaturev(int min_streams, int max_streams,
 		      const std::vector<int> &sizeof_stream_items);
 
@@ -87,7 +88,7 @@ gr_make_io_signaturev(int min_streams, int max_streams,
  * \brief i/o signature for input and output ports.
  * \brief misc
  */
-class gr_io_signature {
+class GR_CORE_API gr_io_signature {
   int			d_min_streams;
   int			d_max_streams;
   std::vector<int>	d_sizeof_stream_item;
@@ -95,7 +96,7 @@ class gr_io_signature {
   gr_io_signature(int min_streams, int max_streams,
 		  const std::vector<int> &sizeof_stream_items);
 
-  friend gr_io_signature_sptr 
+  friend GR_CORE_API gr_io_signature_sptr 
   gr_make_io_signaturev(int min_streams,
 			int max_streams,
 			const std::vector<int> &sizeof_stream_items);
diff --git a/gnuradio-core/src/lib/runtime/gr_local_sighandler.h b/gnuradio-core/src/lib/runtime/gr_local_sighandler.h
index 6b60cf09a..9e4eacc47 100644
--- a/gnuradio-core/src/lib/runtime/gr_local_sighandler.h
+++ b/gnuradio-core/src/lib/runtime/gr_local_sighandler.h
@@ -27,6 +27,7 @@
 #include <signal.h>
 #endif
 
+#include <gr_core_api.h>
 #include <string>
 
 /*!
@@ -36,7 +37,7 @@
  * Constructor installs new handler, destructor reinstalls
  * original value.
  */
-class gr_local_sighandler {
+class GR_CORE_API gr_local_sighandler {
   int			d_signum;
 #ifdef HAVE_SIGACTION
   struct sigaction	d_old_action;
@@ -52,7 +53,7 @@ public:
 /*!
  * \brief Representation of signal.
  */
-class gr_signal
+class GR_CORE_API gr_signal
 {
   int	d_signum;
 public:
diff --git a/gnuradio-core/src/lib/runtime/gr_message.h b/gnuradio-core/src/lib/runtime/gr_message.h
index 179f7d9bc..ead002616 100644
--- a/gnuradio-core/src/lib/runtime/gr_message.h
+++ b/gnuradio-core/src/lib/runtime/gr_message.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_MESSAGE_H
 #define INCLUDED_GR_MESSAGE_H
 
+#include <gr_core_api.h>
 #include <gr_types.h>
 #include <string>
 
@@ -31,10 +32,10 @@ typedef boost::shared_ptr<gr_message> gr_message_sptr;
 /*!
  * \brief public constructor for gr_message
  */
-gr_message_sptr 
+GR_CORE_API gr_message_sptr 
 gr_make_message(long type = 0, double arg1 = 0, double arg2 = 0, size_t length = 0);
 
-gr_message_sptr
+GR_CORE_API gr_message_sptr
 gr_make_message_from_string(const std::string s, long type = 0, double arg1 = 0, double arg2 = 0);
 
 /*!
@@ -44,7 +45,7 @@ gr_make_message_from_string(const std::string s, long type = 0, double arg1 = 0,
  * The ideas and method names for adjustable message length were
  * lifted from the click modular router "Packet" class.
  */
-class gr_message {
+class GR_CORE_API gr_message {
   gr_message_sptr d_next;	// link field for msg queue
   long		  d_type;	// type of the message
   double	  d_arg1;	// optional arg1
@@ -57,10 +58,10 @@ class gr_message {
   
   gr_message (long type, double arg1, double arg2, size_t length);
 
-  friend gr_message_sptr
+  friend GR_CORE_API gr_message_sptr
     gr_make_message (long type, double arg1, double arg2, size_t length);
 
-  friend gr_message_sptr
+  friend GR_CORE_API gr_message_sptr
     gr_make_message_from_string (const std::string s, long type, double arg1, double arg2);
 
   friend class gr_msg_queue;
@@ -85,6 +86,6 @@ public:
 
 };
 
-long gr_message_ncurrently_allocated ();
+GR_CORE_API long gr_message_ncurrently_allocated ();
 
 #endif /* INCLUDED_GR_MESSAGE_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_accepter.h b/gnuradio-core/src/lib/runtime/gr_msg_accepter.h
index 79a631f3a..4aec127a9 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_accepter.h
+++ b/gnuradio-core/src/lib/runtime/gr_msg_accepter.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_MSG_ACCEPTER_H
 #define INCLUDED_GR_MSG_ACCEPTER_H
 
+#include <gr_core_api.h>
 #include <gruel/msg_accepter.h>
 #include <gruel/pmt.h>
 
@@ -29,7 +30,7 @@
  * \brief Accepts messages and inserts them into a message queue, then notifies
  * subclass gr_basic_block there is a message pending.
  */
-class gr_msg_accepter : public gruel::msg_accepter
+class GR_CORE_API gr_msg_accepter : public gruel::msg_accepter
 {
 public:
   gr_msg_accepter();
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_handler.h b/gnuradio-core/src/lib/runtime/gr_msg_handler.h
index 774dce73e..ebe3ffe37 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_handler.h
+++ b/gnuradio-core/src/lib/runtime/gr_msg_handler.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_MSG_HANDLER_H
 #define INCLUDED_GR_MSG_HANDLER_H
 
+#include <gr_core_api.h>
 #include <gr_message.h>
 
 class gr_msg_handler;
@@ -31,7 +32,7 @@ typedef boost::shared_ptr<gr_msg_handler> gr_msg_handler_sptr;
  * \brief abstract class of message handlers
  * \ingroup base
  */
-class gr_msg_handler {
+class GR_CORE_API gr_msg_handler {
 public:
   virtual ~gr_msg_handler ();
   
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.h b/gnuradio-core/src/lib/runtime/gr_msg_queue.h
index 477b1ddf1..bf7b89882 100644
--- a/gnuradio-core/src/lib/runtime/gr_msg_queue.h
+++ b/gnuradio-core/src/lib/runtime/gr_msg_queue.h
@@ -22,19 +22,20 @@
 #ifndef INCLUDED_GR_MSG_QUEUE_H
 #define INCLUDED_GR_MSG_QUEUE_H
 
+#include <gr_core_api.h>
 #include <gr_msg_handler.h>
 #include <gruel/thread.h>
 
 class gr_msg_queue;
 typedef boost::shared_ptr<gr_msg_queue> gr_msg_queue_sptr;
 
-gr_msg_queue_sptr gr_make_msg_queue(unsigned int limit=0);
+GR_CORE_API gr_msg_queue_sptr gr_make_msg_queue(unsigned int limit=0);
 
 /*!
  * \brief thread-safe message queue
  * \ingroup misc
  */
-class gr_msg_queue : public gr_msg_handler {
+class GR_CORE_API gr_msg_queue : public gr_msg_handler {
 
   gruel::mutex		    d_mutex;
   gruel::condition_variable d_not_empty;
diff --git a/gnuradio-core/src/lib/runtime/gr_pagesize.h b/gnuradio-core/src/lib/runtime/gr_pagesize.h
index 3c1b8eb6b..60dad42c9 100644
--- a/gnuradio-core/src/lib/runtime/gr_pagesize.h
+++ b/gnuradio-core/src/lib/runtime/gr_pagesize.h
@@ -22,11 +22,13 @@
 #ifndef _GR_PAGESIZE_H_
 #define _GR_PAGESIZE_H_
 
+#include <gr_core_api.h>
+
 /*!
  * \brief return the page size in bytes
  */
 
-int gr_pagesize ();
+GR_CORE_API int gr_pagesize ();
 
 
-#endif /* _GR_PAGESIZE_H_ */
+#endif /* _GR_PAGESIZE_H_ */
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/runtime/gr_preferences.h b/gnuradio-core/src/lib/runtime/gr_preferences.h
index 7f2a25e6b..ab4dc0cb0 100644
--- a/gnuradio-core/src/lib/runtime/gr_preferences.h
+++ b/gnuradio-core/src/lib/runtime/gr_preferences.h
@@ -23,10 +23,12 @@
 #ifndef _GR_PREFERENCES_H_
 #define _GR_PREFERENCES_H_
 
-class gr_preferences {
+#include <gr_core_api.h>
+
+class GR_CORE_API gr_preferences {
  public:
   static const char *get (const char *key);
   static void set (const char *key, const char *value);
 };
 
-#endif /* _GR_PREFERENCES_H_ */
+#endif /* _GR_PREFERENCES_H_ */
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/runtime/gr_realtime.h b/gnuradio-core/src/lib/runtime/gr_realtime.h
index 830c201d7..58db83086 100644
--- a/gnuradio-core/src/lib/runtime/gr_realtime.h
+++ b/gnuradio-core/src/lib/runtime/gr_realtime.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_REALTIME_H
 #define INCLUDED_GR_REALTIME_H
 
+#include <gr_core_api.h>
 #include <gruel/realtime.h>
 
 typedef gruel::rt_status_t gr_rt_status_t;
@@ -31,6 +32,6 @@ typedef gruel::rt_status_t gr_rt_status_t;
  * \brief If possible, enable high-priority "real time" scheduling.
  * \ingroup misc
  */
-gr_rt_status_t gr_enable_realtime_scheduling();
+GR_CORE_API gr_rt_status_t gr_enable_realtime_scheduling();
 
 #endif /* INCLUDED_GR_REALTIME_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_runtime_types.h b/gnuradio-core/src/lib/runtime/gr_runtime_types.h
index 74d2614a8..98f08b417 100644
--- a/gnuradio-core/src/lib/runtime/gr_runtime_types.h
+++ b/gnuradio-core/src/lib/runtime/gr_runtime_types.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_RUNTIME_TYPES_H
 #define INCLUDED_GR_RUNTIME_TYPES_H
 
+#include <gr_core_api.h>
 #include <gr_types.h>
 
 /*
diff --git a/gnuradio-core/src/lib/runtime/gr_scheduler.h b/gnuradio-core/src/lib/runtime/gr_scheduler.h
index 13bc1ff14..4e97b5881 100644
--- a/gnuradio-core/src/lib/runtime/gr_scheduler.h
+++ b/gnuradio-core/src/lib/runtime/gr_scheduler.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GR_SCHEDULER_H
 #define INCLUDED_GR_SCHEDULER_H
 
+#include <gr_core_api.h>
 #include <boost/utility.hpp>
 #include <gr_block.h>
 #include <gr_flat_flowgraph.h>
@@ -36,7 +37,7 @@ typedef boost::shared_ptr<gr_scheduler> gr_scheduler_sptr;
  *
  * Preconditions: details, buffers and buffer readers have been assigned.
  */
-class gr_scheduler : boost::noncopyable
+class GR_CORE_API gr_scheduler : boost::noncopyable
 {
 
 public:
diff --git a/gnuradio-core/src/lib/runtime/gr_scheduler_sts.h b/gnuradio-core/src/lib/runtime/gr_scheduler_sts.h
index 4cf835156..9b73b68c1 100644
--- a/gnuradio-core/src/lib/runtime/gr_scheduler_sts.h
+++ b/gnuradio-core/src/lib/runtime/gr_scheduler_sts.h
@@ -21,13 +21,14 @@
 #ifndef INCLUDED_GR_SCHEDULER_STS_H
 #define INCLUDED_GR_SCHEDULER_STS_H
 
+#include <gr_core_api.h>
 #include <gr_scheduler.h>
 #include <gruel/thread_group.h>
 
 /*!
  * \brief Concrete scheduler that uses the single_threaded_scheduler
  */
-class gr_scheduler_sts : public gr_scheduler
+class GR_CORE_API gr_scheduler_sts : public gr_scheduler
 {
   gruel::thread_group		       d_threads;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_scheduler_tpb.h b/gnuradio-core/src/lib/runtime/gr_scheduler_tpb.h
index 16a0c0204..f97ab2e7f 100644
--- a/gnuradio-core/src/lib/runtime/gr_scheduler_tpb.h
+++ b/gnuradio-core/src/lib/runtime/gr_scheduler_tpb.h
@@ -21,13 +21,14 @@
 #ifndef INCLUDED_GR_SCHEDULER_TPB_H
 #define INCLUDED_GR_SCHEDULER_TPB_H
 
+#include <gr_core_api.h>
 #include <gr_scheduler.h>
 #include <gruel/thread_group.h>
 
 /*!
  * \brief Concrete scheduler that uses a kernel thread-per-block
  */
-class gr_scheduler_tpb : public gr_scheduler
+class GR_CORE_API gr_scheduler_tpb : public gr_scheduler
 {
   gruel::thread_group		       d_threads;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_select_handler.h b/gnuradio-core/src/lib/runtime/gr_select_handler.h
index c3808995b..532707a02 100644
--- a/gnuradio-core/src/lib/runtime/gr_select_handler.h
+++ b/gnuradio-core/src/lib/runtime/gr_select_handler.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_SELECT_HANDLER_H
 #define INCLUDED_GR_SELECT_HANDLER_H
 
+#include <gr_core_api.h>
 #include <boost/shared_ptr.hpp>
 
 class gr_select_handler;
@@ -35,7 +36,7 @@ typedef boost::shared_ptr<gr_select_handler> gr_select_handler_sptr;
  *
  * \sa gr_dispatcher
  */
-class gr_select_handler
+class GR_CORE_API gr_select_handler
 {
   int	d_fd;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.cc b/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.cc
index 7f1b40641..ae04e4a65 100644
--- a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.cc
+++ b/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.cc
@@ -29,6 +29,7 @@
 #include <gr_block_detail.h>
 #include <gr_buffer.h>
 #include <boost/thread.hpp>
+#include <boost/format.hpp>
 #include <iostream>
 #include <limits>
 #include <assert.h>
@@ -57,9 +58,8 @@ gr_single_threaded_scheduler::gr_single_threaded_scheduler (
   : d_blocks (blocks), d_enabled (true), d_log(0)
 {
   if (ENABLE_LOGGING){
-    char name[100];
-    snprintf(name, sizeof(name), "sst-%d.log", which_scheduler++);
-    d_log = new std::ofstream(name);
+    std::string name = str(boost::format("sst-%d.log") % which_scheduler++);
+    d_log = new std::ofstream(name.c_str());
     *d_log << "gr_single_threaded_scheduler: "
 	   << d_blocks.size ()
 	   << " blocks\n";
diff --git a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.h b/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.h
index 060d3017d..17f4a1c54 100644
--- a/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.h
+++ b/gnuradio-core/src/lib/runtime/gr_single_threaded_scheduler.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H
 #define INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H
 
+#include <gr_core_api.h>
 #include <gr_runtime_types.h>
 #include <fstream>
 
@@ -35,7 +36,7 @@ typedef boost::shared_ptr<gr_single_threaded_scheduler>	gr_single_threaded_sched
  * \ingroup internal
  */
 
-class gr_single_threaded_scheduler {
+class GR_CORE_API gr_single_threaded_scheduler {
  public:
   ~gr_single_threaded_scheduler ();
 
@@ -51,11 +52,11 @@ class gr_single_threaded_scheduler {
 
   void main_loop ();
   
-  friend gr_single_threaded_scheduler_sptr
+  friend GR_CORE_API gr_single_threaded_scheduler_sptr
   gr_make_single_threaded_scheduler (const std::vector<gr_block_sptr> &blocks);
 };
 
-gr_single_threaded_scheduler_sptr
+GR_CORE_API gr_single_threaded_scheduler_sptr
 gr_make_single_threaded_scheduler (const std::vector<gr_block_sptr> &blocks);
 
 #endif /* INCLUDED_GR_SINGLE_THREADED_SCHEDULER_H */
diff --git a/gnuradio-core/src/lib/runtime/gr_sptr_magic.h b/gnuradio-core/src/lib/runtime/gr_sptr_magic.h
index 872374ab6..4b7f9899d 100644
--- a/gnuradio-core/src/lib/runtime/gr_sptr_magic.h
+++ b/gnuradio-core/src/lib/runtime/gr_sptr_magic.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_GR_SPTR_MAGIC_H
 #define INCLUDED_GR_SPTR_MAGIC_H
 
+#include <gr_core_api.h>
 #include <boost/shared_ptr.hpp>
 
 class gr_basic_block;
@@ -30,7 +31,7 @@ namespace gnuradio {
 
   namespace detail {
     
-    class sptr_magic {
+    class GR_CORE_API sptr_magic {
     public:
       static boost::shared_ptr<gr_basic_block> fetch_initial_sptr(gr_basic_block *p);
       static void create_and_stash_initial_sptr(gr_hier_block2 *p);
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_block.h b/gnuradio-core/src/lib/runtime/gr_sync_block.h
index c5a6a50f1..808c1c18a 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_sync_block.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_SYNC_BLOCK_H
 #define INCLUDED_GR_SYNC_BLOCK_H
 
+#include <gr_core_api.h>
 #include <gr_block.h>
 
 /*!
@@ -31,7 +32,7 @@
  *
  * Override work to provide the signal processing implementation.
  */
-class gr_sync_block : public gr_block
+class GR_CORE_API gr_sync_block : public gr_block
 {
  protected:
   gr_sync_block (void){} //allows pure virtual interface sub-classes
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_decimator.h b/gnuradio-core/src/lib/runtime/gr_sync_decimator.h
index 12cd54195..b2ed3c4fe 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_decimator.h
+++ b/gnuradio-core/src/lib/runtime/gr_sync_decimator.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_SYNC_DECIMATOR_H
 #define INCLUDED_GR_SYNC_DECIMATOR_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 /*!
@@ -31,7 +32,7 @@
  *
  * Override work to provide the signal processing implementation.
  */
-class gr_sync_decimator : public gr_sync_block
+class GR_CORE_API gr_sync_decimator : public gr_sync_block
 {
  private:
   unsigned	d_decimation;
diff --git a/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h b/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
index 0363bc55c..d65b3da1e 100644
--- a/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
+++ b/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_SYNC_INTERPOLATOR_H
 #define INCLUDED_GR_SYNC_INTERPOLATOR_H
 
+#include <gr_core_api.h>
 #include <gr_sync_block.h>
 
 /*!
@@ -31,7 +32,7 @@
  *
  * Override work to provide the signal processing implementation.
  */
-class gr_sync_interpolator : public gr_sync_block
+class GR_CORE_API gr_sync_interpolator : public gr_sync_block
 {
  private:
   unsigned	d_interpolation;
diff --git a/gnuradio-core/src/lib/runtime/gr_sys_paths.h b/gnuradio-core/src/lib/runtime/gr_sys_paths.h
index aa8249775..1f1759c36 100644
--- a/gnuradio-core/src/lib/runtime/gr_sys_paths.h
+++ b/gnuradio-core/src/lib/runtime/gr_sys_paths.h
@@ -22,10 +22,12 @@
 #ifndef _GR_SYS_PATHS_H_
 #define _GR_SYS_PATHS_H_
 
+#include <gr_core_api.h>
+
 //! directory to create temporary files
-const char *gr_tmp_path();
+GR_CORE_API const char *gr_tmp_path();
 
 //! directory to store application data
-const char *gr_appdata_path();
+GR_CORE_API const char *gr_appdata_path();
 
 #endif /* _GR_SYS_PATHS_H_ */
diff --git a/gnuradio-core/src/lib/runtime/gr_tag_info.h b/gnuradio-core/src/lib/runtime/gr_tag_info.h
deleted file mode 100644
index 5a1e1555a..000000000
--- a/gnuradio-core/src/lib/runtime/gr_tag_info.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010 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_TAG_INFO_H
-#define INCLUDED_GR_TAG_INFO_H
-
-#include <gruel/pmt.h>
-
-namespace gr_tags {
-
-  enum {
-    TAG_NITEM_REF = 0,
-    TAG_SRCID_REF,
-    TAG_KEY_REF,
-    TAG_VALUE_REF
-  };
-
-  /*
-  extern const pmt::pmt_t key_time;
-  extern const pmt::pmt_t key_sample_rate;
-  extern const pmt::pmt_t key_frequency;
-  extern const pmt::pmt_t key_rssi;
-  extern const pmt::pmt_t key_gain;
-  */
-
-  /*! 
-   * \brief Returns the item \p tag occurred at (as a uint64_t)
-   */
-  static inline uint64_t
-  get_nitems(const pmt::pmt_t &tag) {
-    return pmt::pmt_to_uint64(pmt::pmt_tuple_ref(tag, TAG_NITEM_REF));
-  }
-  
-  /*! 
-   * \brief Returns the source ID of \p tag (as a PMT)
-   */
-  static inline pmt::pmt_t
-  get_srcid(const pmt::pmt_t &tag) {
-    return pmt::pmt_tuple_ref(tag, TAG_SRCID_REF);
-  }
-  
-  /*! 
-   * \brief Returns the key of \p tag (as a PMT symbol)
-   */
-  static inline pmt::pmt_t
-  get_key(const pmt::pmt_t &tag) {
-    return pmt::pmt_tuple_ref(tag, TAG_KEY_REF);
-  }
-
-  /*! 
-   * \brief Returns the value of \p tag (as a PMT)
-   */
-  static inline pmt::pmt_t
-  get_value(const pmt::pmt_t &tag) {
-    return pmt::pmt_tuple_ref(tag, TAG_VALUE_REF);
-  }
-
-  /*! 
-   * \brief Comparison function to test which tag, \p x or \p y, came first in time
-   */
-  static inline bool
-  nitems_compare(pmt::pmt_t x, pmt::pmt_t y) {
-    return get_nitems(x) < get_nitems(y);
-  }
-
-}; /* namespace tags */
-
-#endif /* GR_TAG_INFO */
diff --git a/gnuradio-core/src/lib/runtime/gr_tags.h b/gnuradio-core/src/lib/runtime/gr_tags.h
new file mode 100644
index 000000000..5fff6f15b
--- /dev/null
+++ b/gnuradio-core/src/lib/runtime/gr_tags.h
@@ -0,0 +1,50 @@
+/*
+ * 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_TAGS_H
+#define INCLUDED_GR_TAGS_H
+
+#include <gr_core_api.h>
+#include <gruel/pmt.h>
+
+struct GR_CORE_API gr_tag_t{
+
+    //! the item \p tag occurred at (as a uint64_t)
+    uint64_t offset;
+
+    //! the key of \p tag (as a PMT symbol)
+    pmt::pmt_t key;
+
+    //! the value of \p tag (as a PMT)
+    pmt::pmt_t value;
+
+    //! the source ID of \p tag (as a PMT)
+    pmt::pmt_t srcid;
+
+    //! Comparison function to test which tag, \p x or \p y, came first in time
+    static inline bool offset_compare(
+        const gr_tag_t &x, const gr_tag_t &y
+    ){
+        return x.offset < y.offset;
+    }
+};
+
+#endif /*INCLUDED_GR_TAGS_H*/
diff --git a/usrp/firmware/include/fx2utils.h b/gnuradio-core/src/lib/runtime/gr_tags.i
index b184dec27..828d0147c 100644
--- a/usrp/firmware/include/fx2utils.h
+++ b/gnuradio-core/src/lib/runtime/gr_tags.i
@@ -1,31 +1,32 @@
-/* -*- c -*- */
 /*
- * Copyright 2003 Free Software Foundation, Inc.
- * 
+ * 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 _FX2UTILS_H_
-#define _FX2UTILS_H_
 
-void fx2_stall_ep0 (void);
-void fx2_reset_data_toggle (unsigned char ep);
-void fx2_renumerate (void);
+%{
+#include <gr_tags.h>
+%}
 
+%include <pmt_swig.i> //for pmt support
 
+%include <gr_tags.h>
 
-#endif /* _FX2UTILS_H_ */
+//gives support for a vector of tags (get tags in range)
+%include "std_vector.i"
+%template(tags_vector_t) std::vector<gr_tag_t>;
diff --git a/gnuradio-core/src/lib/runtime/gr_timer.h b/gnuradio-core/src/lib/runtime/gr_timer.h
index ff14e315d..fa3c06ece 100644
--- a/gnuradio-core/src/lib/runtime/gr_timer.h
+++ b/gnuradio-core/src/lib/runtime/gr_timer.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_GR_TIMER_H
 #define INCLUDED_GR_TIMER_H
 
+#include <gr_core_api.h>
 #include <gr_types.h>
 
 class gr_timer;
 
 typedef boost::shared_ptr<gr_timer> gr_timer_sptr;
 
-typedef void (*gr_timer_hook)(gr_timer *, void *);
+GR_CORE_API typedef void (*gr_timer_hook)(gr_timer *, void *);
 
 /*!
  * \brief create a timeout.
@@ -36,18 +37,18 @@ typedef void (*gr_timer_hook)(gr_timer *, void *);
  * \ingroup misc
  * gr_timer_hook is called when timer fires.
  */
-gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
+GR_CORE_API gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
 
 /*!
  * \brief implement timeouts
  */
-class gr_timer {
+class GR_CORE_API gr_timer {
   double	d_expiry;
   double	d_period;
   gr_timer_hook	d_hook;
   void	       *d_hook_arg;
 
-  friend gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
+  friend GR_CORE_API gr_timer_sptr gr_make_timer (gr_timer_hook, void *);
 
   gr_timer (...);
 
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.h b/gnuradio-core/src/lib/runtime/gr_top_block.h
index ed244cb7c..fca68ae71 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.h
@@ -23,21 +23,22 @@
 #ifndef INCLUDED_GR_TOP_BLOCK_H
 #define INCLUDED_GR_TOP_BLOCK_H
 
+#include <gr_core_api.h>
 #include <gr_hier_block2.h>
 
 class gr_top_block_impl;
 
-gr_top_block_sptr gr_make_top_block(const std::string &name);
+GR_CORE_API gr_top_block_sptr gr_make_top_block(const std::string &name);
 
 /*!
  *\brief Top-level hierarchical block representing a flowgraph
  * \ingroup container_blk
  *
  */
-class gr_top_block : public gr_hier_block2
+class GR_CORE_API gr_top_block : public gr_hier_block2
 {
 private:
-  friend gr_top_block_sptr gr_make_top_block(const std::string &name);
+  friend GR_CORE_API gr_top_block_sptr gr_make_top_block(const std::string &name);
 
   gr_top_block_impl *d_impl;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block_impl.h b/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
index ef28dd829..904443be5 100644
--- a/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
+++ b/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_TOP_BLOCK_IMPL_H
 #define INCLUDED_GR_TOP_BLOCK_IMPL_H
 
+#include <gr_core_api.h>
 #include <gr_scheduler.h>
 #include <gruel/thread.h>
 
@@ -34,7 +35,7 @@
  * decoupling of changes from dependent classes.
  *
  */
-class gr_top_block_impl
+class GR_CORE_API gr_top_block_impl
 {
 public:
   gr_top_block_impl(gr_top_block *owner);
diff --git a/gnuradio-core/src/lib/runtime/gr_tpb_detail.h b/gnuradio-core/src/lib/runtime/gr_tpb_detail.h
index acfa264c7..90908c2f5 100644
--- a/gnuradio-core/src/lib/runtime/gr_tpb_detail.h
+++ b/gnuradio-core/src/lib/runtime/gr_tpb_detail.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_GR_TPB_DETAIL_H
 #define INCLUDED_GR_TPB_DETAIL_H
 
+#include <gr_core_api.h>
 #include <gruel/thread.h>
 #include <deque>
 #include <gruel/pmt.h>
@@ -30,7 +31,7 @@ class gr_block_detail;
 /*!
  * \brief used by thread-per-block scheduler
  */
-struct gr_tpb_detail {
+struct GR_CORE_API gr_tpb_detail {
 
   gruel::mutex			mutex;			//< protects all vars
   bool				input_changed;
diff --git a/gnuradio-core/src/lib/runtime/gr_tpb_thread_body.h b/gnuradio-core/src/lib/runtime/gr_tpb_thread_body.h
index a630b1be9..548cfedfb 100644
--- a/gnuradio-core/src/lib/runtime/gr_tpb_thread_body.h
+++ b/gnuradio-core/src/lib/runtime/gr_tpb_thread_body.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_GR_TPB_THREAD_BODY_H
 #define INCLUDED_GR_TPB_THREAD_BODY_H
 
+#include <gr_core_api.h>
 #include <gr_block_executor.h>
 #include <gr_block.h>
 #include <gr_block_detail.h>
@@ -33,7 +34,7 @@
  * done or is interrupted.
  */
 
-class gr_tpb_thread_body {
+class GR_CORE_API gr_tpb_thread_body {
   gr_block_executor	d_exec;
 
 public:
diff --git a/gnuradio-core/src/lib/runtime/gr_types.h b/gnuradio-core/src/lib/runtime/gr_types.h
index ad8f145b8..fd5ca7758 100644
--- a/gnuradio-core/src/lib/runtime/gr_types.h
+++ b/gnuradio-core/src/lib/runtime/gr_types.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GR_TYPES_H
 #define INCLUDED_GR_TYPES_H
 
+#include <gr_core_api.h>
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <stddef.h>				// size_t
diff --git a/gnuradio-core/src/lib/runtime/gr_unittests.h b/gnuradio-core/src/lib/runtime/gr_unittests.h
index 59149bb2e..7161b31e7 100644
--- a/gnuradio-core/src/lib/runtime/gr_unittests.h
+++ b/gnuradio-core/src/lib/runtime/gr_unittests.h
@@ -24,12 +24,14 @@
 #include "config.h"
 #endif
 
+#include <gr_core_api.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <string>
 
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc b/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
index 3b8a6e617..7138605c9 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
+++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc
@@ -30,6 +30,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <gr_local_sighandler.h>
+#include <vector>
+#include <boost/format.hpp>
 
 // all the factories we know about
 #include <gr_vmcircbuf_createfilemapping.h>
@@ -130,7 +132,7 @@ init_buffer (gr_vmcircbuf *c, int counter, int size)
 }
 
 static bool
-check_mapping (gr_vmcircbuf *c, int counter, int size, char *msg, bool verbose)
+check_mapping (gr_vmcircbuf *c, int counter, int size, const char *msg, bool verbose)
 {
   bool ok = true;
   
@@ -163,28 +165,28 @@ check_mapping (gr_vmcircbuf *c, int counter, int size, char *msg, bool verbose)
   return ok;
 }
 
-static char *
+static const char *
 memsize (int size)
 {
-  static char buf[100];
+  static std::string buf;
   if (size >= (1 << 20)){
-    snprintf (buf, sizeof (buf), "%dMB", size / (1 << 20));
+    buf = str(boost::format("%dMB") % (size / (1 << 20)));
   }
   else if (size >= (1 << 10)){
-    snprintf (buf, sizeof (buf), "%dKB", size / (1 << 10));
+    buf = str(boost::format("%dKB") % (size / (1 << 10)));
   }
   else {
-    snprintf (buf, sizeof (buf), "%d", size);
+    buf = str(boost::format("%d") % size);
   }
-  return buf;
+  return buf.c_str();
 }
 
 static bool
 test_a_bunch (gr_vmcircbuf_factory *factory, int n, int size, int *start_ptr, bool verbose)
 {
   bool		ok = true;
-  int		counter[n];
-  gr_vmcircbuf *c[n];
+  std::vector<int>		counter(n);
+  std::vector<gr_vmcircbuf *> c(n);
   int		cum_size = 0;
 
   for (int i = 0; i < n; i++){
@@ -202,9 +204,8 @@ test_a_bunch (gr_vmcircbuf_factory *factory, int n, int size, int *start_ptr, bo
   }
 
   for (int i = 0; i < n; i++){
-    char msg[100];
-    snprintf (msg, sizeof (msg), "test_a_bunch_%dx%s[%d]", n, memsize (size), i);
-    ok &= check_mapping (c[i], counter[i], size, msg, verbose);
+    std::string msg = str(boost::format("test_a_bunch_%dx%s[%d]") % n % memsize (size) % i);
+    ok &= check_mapping (c[i], counter[i], size, msg.c_str(), verbose);
   }
 
   for (int i = 0; i < n; i++){
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.h b/gnuradio-core/src/lib/runtime/gr_vmcircbuf.h
index a73a1559c..0e67d405b 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf.h
+++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf.h
@@ -23,13 +23,14 @@
 #ifndef _GR_VMCIRCBUF_H_
 #define _GR_VMCIRCBUF_H_
 
+#include <gr_core_api.h>
 #include <vector>
 
 /*!
  * \brief abstract class to implement doubly mapped virtual memory circular buffers
  * \ingroup internal
  */
-class gr_vmcircbuf {
+class GR_CORE_API gr_vmcircbuf {
  protected:
   int	 d_size;
   char	*d_base;
@@ -48,7 +49,7 @@ class gr_vmcircbuf {
 /*!
  * \brief abstract factory for creating circular buffers
  */
-class gr_vmcircbuf_factory {
+class GR_CORE_API gr_vmcircbuf_factory {
  protected:
   gr_vmcircbuf_factory () {};
   virtual ~gr_vmcircbuf_factory ();
@@ -76,7 +77,7 @@ class gr_vmcircbuf_factory {
 /*
  * \brief pulls together all implementations of gr_vmcircbuf
  */
-class gr_vmcircbuf_sysconfig {
+class GR_CORE_API gr_vmcircbuf_sysconfig {
  public:
 
   /*
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.cc b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.cc
index 42c459484..1b4d9700a 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.cc
+++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.cc
@@ -37,6 +37,7 @@
 #include <stdio.h>
 #include <gr_pagesize.h>
 #include <gr_vmcircbuf_createfilemapping.h>
+#include <boost/format.hpp>
 
 #ifdef HAVE_CREATEFILEMAPPING
 // Print Windows error (could/should be global?)
@@ -72,23 +73,21 @@ gr_vmcircbuf_createfilemapping::gr_vmcircbuf_createfilemapping (int size)
     throw std::runtime_error ("gr_vmcircbuf_createfilemapping");
   }
 
-  char    seg_name[1024];
-  snprintf (seg_name, sizeof (seg_name), "/gnuradio-%d-%d", getpid (), s_seg_counter);
+  std::string seg_name = str(boost::format("/gnuradio-%d-%d") % getpid () % s_seg_counter);
 
   d_handle = CreateFileMapping(INVALID_HANDLE_VALUE,    // use paging file
 			       NULL,                    // default security
 			       PAGE_READWRITE,          // read/write access
 			       0,                       // max. object size
 			       size,                    // buffer size
-			       seg_name);               // name of mapping object
+			       seg_name.c_str());       // name of mapping object
 
   s_seg_counter++;
   if (d_handle == NULL || d_handle == INVALID_HANDLE_VALUE){
-    char msg[1024];
-    snprintf( msg, sizeof(msg),
-	      "gr_vmcircbuf_mmap_createfilemapping: CreateFileMapping [%s]",
+    std::string msg = str(boost::format(
+	      "gr_vmcircbuf_mmap_createfilemapping: CreateFileMapping [%s]") %
 	      seg_name );
-    werror( msg, GetLastError() );
+    werror((char *) msg.c_str(), GetLastError() );
     throw std::runtime_error ("gr_vmcircbuf_mmap_createfilemapping");
   }
 
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.h b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.h
index 9276ae98b..5ef31f5c6 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.h
+++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_createfilemapping.h
@@ -23,6 +23,7 @@
 #ifndef _GR_VMCIRCBUF_CREATEFILEMAPPING_H_
 #define _GR_VMCIRCBUF_CREATEFILEMAPPING_H_
 
+#include <gr_core_api.h>
 #include <gr_vmcircbuf.h>
 
 #ifdef HAVE_CREATEFILEMAPPING
@@ -32,7 +33,7 @@
  * \brief concrete class to implement circular buffers with mmap and shm_open
  * \ingroup internal
  */
-class gr_vmcircbuf_createfilemapping : public gr_vmcircbuf
+class GR_CORE_API gr_vmcircbuf_createfilemapping : public gr_vmcircbuf
 {
  public:
    // CREATORS
@@ -49,7 +50,7 @@ class gr_vmcircbuf_createfilemapping : public gr_vmcircbuf
 /*!
  * \brief concrete factory for circular buffers built using mmap and shm_open
  */
-class gr_vmcircbuf_createfilemapping_factory : public gr_vmcircbuf_factory
+class GR_CORE_API gr_vmcircbuf_createfilemapping_factory : public gr_vmcircbuf_factory
 {
  private:
   static gr_vmcircbuf_factory *s_the_factory;
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_shm_open.h b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_shm_open.h
index 238f44414..002f5b434 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_shm_open.h
+++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_shm_open.h
@@ -23,13 +23,14 @@
 #ifndef _GR_VMCIRCBUF_MMAP_SHM_OPEN_H_
 #define _GR_VMCIRCBUF_MMAP_SHM_OPEN_H_
 
+#include <gr_core_api.h>
 #include <gr_vmcircbuf.h>
 
 /*!
  * \brief concrete class to implement circular buffers with mmap and shm_open
  * \ingroup internal
  */
-class gr_vmcircbuf_mmap_shm_open : public gr_vmcircbuf {
+class GR_CORE_API gr_vmcircbuf_mmap_shm_open : public gr_vmcircbuf {
  public:
 
   // CREATORS
@@ -41,7 +42,7 @@ class gr_vmcircbuf_mmap_shm_open : public gr_vmcircbuf {
 /*!
  * \brief concrete factory for circular buffers built using mmap and shm_open
  */
-class gr_vmcircbuf_mmap_shm_open_factory : public gr_vmcircbuf_factory {
+class GR_CORE_API gr_vmcircbuf_mmap_shm_open_factory : public gr_vmcircbuf_factory {
  private:
   static gr_vmcircbuf_factory	*s_the_factory;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.h b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.h
index e5be52768..a2ed6b87b 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.h
+++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.h
@@ -23,13 +23,14 @@
 #ifndef _GR_VMCIRCBUF_MMAP_TMPFILE_H_
 #define _GR_VMCIRCBUF_MMAP_TMPFILE_H_
 
+#include <gr_core_api.h>
 #include <gr_vmcircbuf.h>
 
 /*!
  * \brief concrete class to implement circular buffers with mmap and shm_open
  * \ingroup internal
  */
-class gr_vmcircbuf_mmap_tmpfile : public gr_vmcircbuf {
+class GR_CORE_API gr_vmcircbuf_mmap_tmpfile : public gr_vmcircbuf {
  public:
 
   // CREATORS
@@ -41,7 +42,7 @@ class gr_vmcircbuf_mmap_tmpfile : public gr_vmcircbuf {
 /*!
  * \brief concrete factory for circular buffers built using mmap and shm_open
  */
-class gr_vmcircbuf_mmap_tmpfile_factory : public gr_vmcircbuf_factory {
+class GR_CORE_API gr_vmcircbuf_mmap_tmpfile_factory : public gr_vmcircbuf_factory {
  private:
   static gr_vmcircbuf_factory	*s_the_factory;
 
diff --git a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.h b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.h
index cc87f8fe6..c7a008581 100644
--- a/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.h
+++ b/gnuradio-core/src/lib/runtime/gr_vmcircbuf_sysv_shm.h
@@ -23,13 +23,14 @@
 #ifndef _GR_VMCIRCBUF_SYSV_SHM_H_
 #define _GR_VMCIRCBUF_SYSV_SHM_H_
 
+#include <gr_core_api.h>
 #include <gr_vmcircbuf.h>
 
 /*!
  * \brief concrete class to implement circular buffers with mmap and shm_open
  * \ingroup internal
  */
-class gr_vmcircbuf_sysv_shm : public gr_vmcircbuf {
+class GR_CORE_API gr_vmcircbuf_sysv_shm : public gr_vmcircbuf {
  public:
 
   // CREATORS
@@ -41,7 +42,7 @@ class gr_vmcircbuf_sysv_shm : public gr_vmcircbuf {
 /*!
  * \brief concrete factory for circular buffers built using mmap and shm_open
  */
-class gr_vmcircbuf_sysv_shm_factory : public gr_vmcircbuf_factory {
+class GR_CORE_API gr_vmcircbuf_sysv_shm_factory : public gr_vmcircbuf_factory {
  private:
   static gr_vmcircbuf_factory	*s_the_factory;
 
diff --git a/gnuradio-core/src/lib/runtime/qa_block_tags.cc b/gnuradio-core/src/lib/runtime/qa_block_tags.cc
index 07ce5c276..ab5840c6d 100644
--- a/gnuradio-core/src/lib/runtime/qa_block_tags.cc
+++ b/gnuradio-core/src/lib/runtime/qa_block_tags.cc
@@ -103,9 +103,9 @@ qa_block_tags::t1 ()
 
   tb->run();
 
-  std::vector<pmt::pmt_t> tags0 = ann0->data();
-  std::vector<pmt::pmt_t> tags3 = ann3->data();
-  std::vector<pmt::pmt_t> tags4 = ann4->data();
+  std::vector<gr_tag_t> tags0 = ann0->data();
+  std::vector<gr_tag_t> tags3 = ann3->data();
+  std::vector<gr_tag_t> tags4 = ann4->data();
 
   // The first annotator does not receive any tags from the null sink upstream
   CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0);
@@ -187,11 +187,11 @@ qa_block_tags::t2 ()
 
   tb->run();
 
-  std::vector<pmt::pmt_t> tags0 = ann0->data();
-  std::vector<pmt::pmt_t> tags1 = ann1->data();
-  std::vector<pmt::pmt_t> tags2 = ann2->data();
-  std::vector<pmt::pmt_t> tags3 = ann4->data();
-  std::vector<pmt::pmt_t> tags4 = ann4->data();
+  std::vector<gr_tag_t> tags0 = ann0->data();
+  std::vector<gr_tag_t> tags1 = ann1->data();
+  std::vector<gr_tag_t> tags2 = ann2->data();
+  std::vector<gr_tag_t> tags3 = ann4->data();
+  std::vector<gr_tag_t> tags4 = ann4->data();
 
   // The first annotator does not receive any tags from the null sink upstream
   CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0);
@@ -287,9 +287,9 @@ qa_block_tags::t3 ()
   tb->run();
 
   
-  std::vector<pmt::pmt_t> tags0 = ann0->data();
-  std::vector<pmt::pmt_t> tags3 = ann3->data();
-  std::vector<pmt::pmt_t> tags4 = ann4->data();
+  std::vector<gr_tag_t> tags0 = ann0->data();
+  std::vector<gr_tag_t> tags3 = ann3->data();
+  std::vector<gr_tag_t> tags4 = ann4->data();
 
   // The first annotator does not receive any tags from the null sink upstream
   CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0);
@@ -394,9 +394,9 @@ qa_block_tags::t5 ()
 
   tb->run();
 
-  std::vector<pmt::pmt_t> tags0 = ann0->data();
-  std::vector<pmt::pmt_t> tags1 = ann1->data();
-  std::vector<pmt::pmt_t> tags2 = ann2->data();
+  std::vector<gr_tag_t> tags0 = ann0->data();
+  std::vector<gr_tag_t> tags1 = ann1->data();
+  std::vector<gr_tag_t> tags2 = ann2->data();
 
   // The first annotator does not receive any tags from the null sink upstream
   CPPUNIT_ASSERT_EQUAL(tags0.size(), (size_t)0);
diff --git a/gnuradio-core/src/lib/runtime/qa_runtime.h b/gnuradio-core/src/lib/runtime/qa_runtime.h
index c55208c39..e1038aaf6 100644
--- a/gnuradio-core/src/lib/runtime/qa_runtime.h
+++ b/gnuradio-core/src/lib/runtime/qa_runtime.h
@@ -23,11 +23,12 @@
 #ifndef _QA_RUNTIME_H_
 #define _QA_RUNTIME_H_
 
+#include <gruel/attributes.h>
 #include <cppunit/TestSuite.h>
 
 //! collect all the tests for the runtime directory
 
-class qa_runtime {
+class __GR_ATTR_EXPORT qa_runtime {
  public:
   //! return suite of tests for all of runtime directory
   static CppUnit::TestSuite *suite ();
diff --git a/gnuradio-core/src/lib/runtime/runtime.i b/gnuradio-core/src/lib/runtime/runtime.i
index ca89b8fbd..9bf2df31e 100644
--- a/gnuradio-core/src/lib/runtime/runtime.i
+++ b/gnuradio-core/src/lib/runtime/runtime.i
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#define GR_CORE_API
+
 %{
 #include <gr_runtime_types.h>
 #include <gr_io_signature.h>
diff --git a/gnuradio-core/src/lib/swig/CMakeLists.txt b/gnuradio-core/src/lib/swig/CMakeLists.txt
new file mode 100644
index 000000000..b10b7c186
--- /dev/null
+++ b/gnuradio-core/src/lib/swig/CMakeLists.txt
@@ -0,0 +1,93 @@
+# Copyright 2010-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.
+
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${Boost_INCLUDE_DIRS}
+    ${GSL_INCLUDE_DIRS}
+    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+set(GR_SWIG_LIBRARIES gnuradio-core)
+
+########################################################################
+# Build and install the swig targets
+########################################################################
+# ----------------------------------------------------------------
+# We've split the previously monstrous gnuradio_corethon into 6
+# smaller pieces.  This reduces compile time coupling and creates
+# smaller pieces for the compiler to digest.  prior to this change, on
+# X86_64, g++'s resident set size was 650MB!
+# ----------------------------------------------------------------
+
+set(GR_SWIG_TARGET_DEPS gengen_generated gengen_generated_index filter_generated)
+
+GR_SWIG_MAKE(gnuradio_core_runtime gnuradio_core_runtime.i)
+GR_SWIG_MAKE(gnuradio_core_general gnuradio_core_general.i)
+GR_SWIG_MAKE(gnuradio_core_gengen gnuradio_core_gengen.i)
+GR_SWIG_MAKE(gnuradio_core_filter gnuradio_core_filter.i)
+GR_SWIG_MAKE(gnuradio_core_io gnuradio_core_io.i)
+GR_SWIG_MAKE(gnuradio_core_hier gnuradio_core_hier.i)
+
+GR_SWIG_INSTALL(TARGETS
+    gnuradio_core_runtime
+    gnuradio_core_general
+    gnuradio_core_gengen
+    gnuradio_core_filter
+    gnuradio_core_io
+    gnuradio_core_hier
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/gr
+    COMPONENT "core_python"
+)
+
+########################################################################
+# Install various files
+########################################################################
+install(FILES
+    gnuradio.i
+    gr_swig_block_magic.i
+    gr_shared_ptr.i
+    gnuradio_core_runtime.i
+    gnuradio_core_general.i
+    gnuradio_core_gengen.i
+    gnuradio_core_filter.i
+    gnuradio_core_io.i
+    gnuradio_core_hier.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "core_swig"
+)
+
+GR_PYTHON_INSTALL(
+    FILES gnuradio_core.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/gr
+    COMPONENT "core_python"
+)
+
+install(
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio_swig_bug_workaround.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "core_swig"
+)
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index f8e7640ae..d304a2123 100644
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -45,7 +45,7 @@ TOP_SWIG_IFILES =		\
 swiginclude_HEADERS =			\
 	gnuradio.i			\
 	gr_swig_block_magic.i		\
-	gr_shared_ptr.i
+	gr_shared_ptr.i                
 
 # SWIG headers that get installed in ${prefix}/include/gnuradio/swig/...
 nobase_swiginclude_HEADERS = \
diff --git a/gnuradio-core/src/lib/swig/Makefile.swig.gen b/gnuradio-core/src/lib/swig/Makefile.swig.gen
index 0c3247565..cede68817 100644
--- a/gnuradio-core/src/lib/swig/Makefile.swig.gen
+++ b/gnuradio-core/src/lib/swig/Makefile.swig.gen
@@ -105,7 +105,7 @@ _gnuradio_core_runtime_la_CXXFLAGS =			\
 	$(gnuradio_core_runtime_la_swig_cxxflags)
 
 python/gnuradio_core_runtime.cc: gnuradio_core_runtime.py
-gnuradio_core_runtime.py: gnuradio_core_runtime.i
+gnuradio_core_runtime.py: gnuradio_core_runtime.i 
 
 # Include the python dependencies for this file
 -include python/gnuradio_core_runtime.d
@@ -250,7 +250,7 @@ _gnuradio_core_general_la_CXXFLAGS =			\
 	$(gnuradio_core_general_la_swig_cxxflags)
 
 python/gnuradio_core_general.cc: gnuradio_core_general.py
-gnuradio_core_general.py: gnuradio_core_general.i
+gnuradio_core_general.py: gnuradio_core_general.i 
 
 # Include the python dependencies for this file
 -include python/gnuradio_core_general.d
@@ -395,7 +395,7 @@ _gnuradio_core_gengen_la_CXXFLAGS =			\
 	$(gnuradio_core_gengen_la_swig_cxxflags)
 
 python/gnuradio_core_gengen.cc: gnuradio_core_gengen.py
-gnuradio_core_gengen.py: gnuradio_core_gengen.i
+gnuradio_core_gengen.py: gnuradio_core_gengen.i 
 
 # Include the python dependencies for this file
 -include python/gnuradio_core_gengen.d
@@ -540,7 +540,7 @@ _gnuradio_core_filter_la_CXXFLAGS =			\
 	$(gnuradio_core_filter_la_swig_cxxflags)
 
 python/gnuradio_core_filter.cc: gnuradio_core_filter.py
-gnuradio_core_filter.py: gnuradio_core_filter.i
+gnuradio_core_filter.py: gnuradio_core_filter.i 
 
 # Include the python dependencies for this file
 -include python/gnuradio_core_filter.d
@@ -685,7 +685,7 @@ _gnuradio_core_io_la_CXXFLAGS =			\
 	$(gnuradio_core_io_la_swig_cxxflags)
 
 python/gnuradio_core_io.cc: gnuradio_core_io.py
-gnuradio_core_io.py: gnuradio_core_io.i
+gnuradio_core_io.py: gnuradio_core_io.i 
 
 # Include the python dependencies for this file
 -include python/gnuradio_core_io.d
@@ -830,7 +830,7 @@ _gnuradio_core_hier_la_CXXFLAGS =			\
 	$(gnuradio_core_hier_la_swig_cxxflags)
 
 python/gnuradio_core_hier.cc: gnuradio_core_hier.py
-gnuradio_core_hier.py: gnuradio_core_hier.i
+gnuradio_core_hier.py: gnuradio_core_hier.i 
 
 # Include the python dependencies for this file
 -include python/gnuradio_core_hier.d
diff --git a/gnuradio-core/src/lib/swig/gnuradio_core_general.i b/gnuradio-core/src/lib/swig/gnuradio_core_general.i
index adf6b469a..b34d4f936 100644
--- a/gnuradio-core/src/lib/swig/gnuradio_core_general.i
+++ b/gnuradio-core/src/lib/swig/gnuradio_core_general.i
@@ -19,6 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define GR_CORE_API
+
 #ifndef SWIGIMPORTED
 %module(directors="1") gnuradio_core_general
 #endif
diff --git a/gnuradio-core/src/lib/viterbi/CMakeLists.txt b/gnuradio-core/src/lib/viterbi/CMakeLists.txt
new file mode 100644
index 000000000..add5c77e8
--- /dev/null
+++ b/gnuradio-core/src/lib/viterbi/CMakeLists.txt
@@ -0,0 +1,63 @@
+# Copyright 2010-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.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+
+set(viterbi_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/metrics.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/tab.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/viterbi.c
+)
+
+########################################################################
+# define missing erf function with C linkage (hack for metrics.c)
+########################################################################
+if(MSVC)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/boost_math_erf.cc "
+#include <boost/math/special_functions/erf.hpp>
+extern \"C\" double erf(double x){
+    return boost::math::erf(x);
+}
+")
+list(APPEND viterbi_sources ${CMAKE_CURRENT_BINARY_DIR}/boost_math_erf.cc)
+endif(MSVC)
+
+########################################################################
+# Append gnuradio-core library sources
+########################################################################
+list(APPEND gnuradio_core_sources ${viterbi_sources})
+
+########################################################################
+# Install runtime headers
+########################################################################
+install(
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/viterbi.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "core_devel"
+)
+
+########################################################################
+# Create some text executables (not registered tests)
+# Its not much to build so the sources are just re-listed,
+# rather than create a new library just for these two apps.
+########################################################################
+#ADD_EXECUTABLE(viterbi_encode ${CMAKE_CURRENT_SOURCE_DIR}/encode.cc ${viterbi_sources})
+#ADD_EXECUTABLE(viterbi_decode ${CMAKE_CURRENT_SOURCE_DIR}/decode.cc ${viterbi_sources})
diff --git a/gnuradio-core/src/lib/viterbi/Makefile.am b/gnuradio-core/src/lib/viterbi/Makefile.am
index 8384c52f0..7e65880b3 100644
--- a/gnuradio-core/src/lib/viterbi/Makefile.am
+++ b/gnuradio-core/src/lib/viterbi/Makefile.am
@@ -21,6 +21,10 @@ include $(top_srcdir)/Makefile.common
 
 LIBS = -lm
 
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GRUEL_INCLUDES) \
+	-I$(top_srcdir)/gnuradio-core/src/lib/general \
+	$(WITH_INCLUDES)
+
 noinst_LTLIBRARIES = libviterbi.la
 
 libviterbi_la_SOURCES = \
diff --git a/gnuradio-core/src/lib/viterbi/metrics.c b/gnuradio-core/src/lib/viterbi/metrics.c
index 9f958cab7..77c6a63c8 100644
--- a/gnuradio-core/src/lib/viterbi/metrics.c
+++ b/gnuradio-core/src/lib/viterbi/metrics.c
@@ -42,6 +42,9 @@
 #include <stdlib.h>
 #include <math.h>
 
+//declare erf in case it was missing in math.h and provided for by the build system
+extern double erf(double x);
+
 /* Normal function integrated from -Inf to x. Range: 0-1 */
 #define	normal(x)	(0.5 + 0.5*erf((x)/M_SQRT2))
 
diff --git a/gnuradio-core/src/lib/viterbi/viterbi.h b/gnuradio-core/src/lib/viterbi/viterbi.h
index 155b0d93a..3a3ea5615 100644
--- a/gnuradio-core/src/lib/viterbi/viterbi.h
+++ b/gnuradio-core/src/lib/viterbi/viterbi.h
@@ -23,27 +23,31 @@
  * than we'd like for K=7, especially since we chain back every 8 bits.
  * But it fits so nicely into a 32-bit machine word...
  */
+
+#include <gr_core_api.h>
+
 struct viterbi_state {
   unsigned long path;	/* Decoded path to this state */
   long metric;		/* Cumulative metric to this state */
 };
 
+GR_CORE_API
 int gen_met(int mettab[2][256],	/* Metric table */
 	    int amp,		/* Signal amplitude */
 	    double esn0,	/* Es/N0 ratio in dB */
 	    double bias, 	/* Metric bias */
 	    int scale);		/* Scale factor */
 
-unsigned char
+GR_CORE_API unsigned char
 encode(unsigned char *symbols, unsigned char *data,
        unsigned int nbytes,unsigned char encstate);
 
-void 
+GR_CORE_API void
 viterbi_chunks_init(struct viterbi_state* state);
 
-void 
+ GR_CORE_API void
 viterbi_butterfly2(unsigned char *symbols, int mettab[2][256], 
 		   struct viterbi_state *state0, struct viterbi_state *state1);
 
-unsigned char
+GR_CORE_API unsigned char
 viterbi_get_output(struct viterbi_state *state, unsigned char *outbuf);
diff --git a/gnuradio-core/src/python/build_utils.py b/gnuradio-core/src/python/build_utils.py
index c7acf6bd0..90c7978f2 100644
--- a/gnuradio-core/src/python/build_utils.py
+++ b/gnuradio-core/src/python/build_utils.py
@@ -93,7 +93,7 @@ def output_makefile_fragment ():
         return
 # overwrite the source, which must be writable; this should have been
 # checked for beforehand in the top-level Makefile.gen.gen .
-    f = open_src ('Makefile.gen', 'w')
+    f = open (os.path.join (os.environ.get('gendir', os.environ.get('srcdir', '.')), 'Makefile.gen'), 'w')
     f.write ('#\n# This file is machine generated.  All edits will be overwritten\n#\n')
     output_subfrag (f, 'h')
     output_subfrag (f, 'i')
diff --git a/gnuradio-examples/python/digital-bert/Makefile.am b/gnuradio-core/src/python/gnuradio/CMakeLists.txt
index eac013f09..bf696e0d3 100644
--- a/gnuradio-examples/python/digital-bert/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/CMakeLists.txt
@@ -1,33 +1,38 @@
+# Copyright 2010-2011 Free Software Foundation, Inc.
 #
-# Copyright 2008,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
 
-ourdatadir = $(exampledir)/digital-bert
+include(GrPython)
 
-dist_ourdata_DATA = 		\
-	README			\
-	receive_path.py		\
-	transmit_path.py
+add_subdirectory(gr)
+add_subdirectory(gru)
+add_subdirectory(gruimpl)
+add_subdirectory(blks2)
+add_subdirectory(blks2impl)
 
-dist_ourdata_SCRIPTS =		\
-	benchmark_rx.py		\
-	benchmark_tx.py
\ No newline at end of file
+GR_PYTHON_INSTALL(FILES
+    __init__.py
+    eng_notation.py
+    eng_option.py
+    gr_unittest.py
+    gr_xmlrunner.py
+    optfir.py
+    window.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio
+    COMPONENT "core_python"
+)
diff --git a/gnuradio-core/src/python/gnuradio/Makefile.am b/gnuradio-core/src/python/gnuradio/Makefile.am
index eff35e95c..ffc171b2d 100644
--- a/gnuradio-core/src/python/gnuradio/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/Makefile.am
@@ -22,19 +22,14 @@
 include $(top_srcdir)/Makefile.common
 
 if PYTHON
-SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder
+SUBDIRS = gr gru gruimpl blks2 blks2impl
 
 grpython_PYTHON = 			\
 	__init__.py			\
 	eng_notation.py			\
 	eng_option.py			\
-	modulation_utils.py		\
-	modulation_utils2.py		\
-	ofdm_packet_utils.py		\
-	packet_utils.py			\
 	gr_unittest.py			\
 	gr_xmlrunner.py			\
 	optfir.py			\
-	usrp_options.py		\
 	window.py
 endif
diff --git a/gnuradio-core/src/python/gnuradio/blks2/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/blks2/CMakeLists.txt
new file mode 100644
index 000000000..83d11dd83
--- /dev/null
+++ b/gnuradio-core/src/python/gnuradio/blks2/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Copyright 2010-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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    FILES __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/blks2
+    COMPONENT "core_python"
+)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/blks2impl/CMakeLists.txt
new file mode 100644
index 000000000..61fcdda42
--- /dev/null
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/CMakeLists.txt
@@ -0,0 +1,45 @@
+# Copyright 2010-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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(FILES
+    __init__.py
+    am_demod.py
+    channel_model.py
+    filterbank.py
+    fm_demod.py
+    fm_emph.py
+    logpwrfft.py
+    nbfm_rx.py
+    nbfm_tx.py
+    pfb_arb_resampler.py
+    pfb_channelizer.py
+    pfb_decimator.py
+    pfb_interpolator.py
+    rational_resampler.py
+    standard_squelch.py
+    stream_to_vector_decimator.py
+    wfm_rcv.py
+    wfm_rcv_fmdet.py
+    wfm_rcv_pll.py
+    wfm_tx.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/blks2impl
+    COMPONENT "core_python"
+)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
index 7b24fb69d..eb031cd20 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am
@@ -30,37 +30,16 @@ grblkspython_PYTHON =		\
 	__init__.py		\
 	am_demod.py		\
 	channel_model.py	\
-	dbpsk.py		\
-	dbpsk2.py		\
-	dqpsk.py		\
-	dqpsk2.py		\
-	d8psk.py		\
 	filterbank.py		\
 	fm_demod.py		\
 	fm_emph.py		\
-	generic_usrp.py	\
-	gmsk.py			\
-	cpm.py			\
 	logpwrfft.py		\
 	nbfm_rx.py		\
 	nbfm_tx.py		\
-	ofdm.py			\
-	ofdm_receiver.py	\
-	ofdm_sync_fixed.py	\
-	ofdm_sync_pn.py		\
-	ofdm_sync_pnac.py	\
-	ofdm_sync_ml.py		\
 	pfb_arb_resampler.py	\
 	pfb_channelizer.py	\
 	pfb_decimator.py	\
 	pfb_interpolator.py	\
-	pkt.py			\
-	psk.py			\
-	qam.py			\
-	qam8.py			\
-	qam16.py		\
-	qam64.py		\
-	qam256.py		\
 	rational_resampler.py	\
 	standard_squelch.py	\
 	stream_to_vector_decimator.py \
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/d8psk.py b/gnuradio-core/src/python/gnuradio/blks2impl/d8psk.py
deleted file mode 100644
index 67cf9f569..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/d8psk.py
+++ /dev/null
@@ -1,363 +0,0 @@
-#
-# Copyright 2005,2006,2007 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential 8PSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils
-from math import pi, sqrt
-import psk
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 3
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_costas_alpha = 0.175
-_def_gain_mu = 0.175
-_def_mu = 0.5
-_def_omega_relative_limit = 0.005
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           D8PSK modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class d8psk_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered QPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "d8psk_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-				
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % samples_per_symbol)
-
-	ntaps = 11 * samples_per_symbol
- 
-        arity = pow(2,self.bits_per_symbol())
-
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
-            
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
-
-        # pulse shaping filter
-	self.rrc_taps = gr.firdes.root_raised_cosine(
-	    self._samples_per_symbol, # gain  (sps since we're interpolating by sps)
-            self._samples_per_symbol, # sampling rate
-            1.0,		      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-
-	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps)
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
-            
-	# Connect & Initialize base class
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-            	     self.chunks2symbols, self.rrc_filter, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 3
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "bits per symbol = %d" % self.bits_per_symbol()
-        print "Gray code = %s" % self._gray_code
-        print "RS roll-off factor = %f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))        
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-
-    def add_options(parser):
-        """
-        Adds 8PSK modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(d8psk_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           D8PSK demodulator
-#
-# Differentially coherent detection of differentially encoded 8psk
-# /////////////////////////////////////////////////////////////////////////////
-
-class d8psk_demod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 costas_alpha=_def_costas_alpha,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered DQPSK demodulation
-
-	The input is the complex modulated signal at baseband.
-	The output is a stream of bits packed 1 bit per byte (LSB)
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: float
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param costas_alpha: loop filter gain
-        @type costas_alphas: float
-        @param gain_mu: for M&M block
-        @type gain_mu: float
-        @param mu: for M&M block
-        @type mu: float
-        @param omega_relative_limit: for M&M block
-        @type omega_relative_limit: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-	
-	gr.hier_block2.__init__(self, "d8psk_demod",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._costas_alpha = costas_alpha
-        self._mm_gain_mu = gain_mu
-        self._mm_mu = mu
-        self._mm_omega_relative_limit = omega_relative_limit
-        self._gray_code = gray_code
-
-        if samples_per_symbol < 2:
-            raise TypeError, "sbp must be >= 2, is %d" % samples_per_symbol
-
-        arity = pow(2,self.bits_per_symbol())
- 
-        # Automatic gain control
-        scale = (1.0/16384.0)
-        self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal from full-range to +-1
-        #self.agc = gr.agc_cc(1e-2, 1, 1, 100)
-        self.agc = gr.agc2_cc(1e-1, 1e-2, 1, 1, 100)
-        #self.agc = gr.feedforward_agc_cc(16, 1.0)
-
-        # RRC data filter
-        ntaps = 11 * samples_per_symbol
-        self.rrc_taps = gr.firdes.root_raised_cosine(
-            1.0,                      # gain
-            self._samples_per_symbol, # sampling rate
-            1.0,                      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-        self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
-
-        # symbol clock recovery
-        self._mm_omega = self._samples_per_symbol
-        self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
-        self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
-        fmin = -0.025
-        fmax = 0.025
-
-        self.receiver=gr.mpsk_receiver_cc(arity, 0,
-                                         self._costas_alpha, self._costas_beta,
-                                         fmin, fmax,
-                                         self._mm_mu, self._mm_gain_mu,
-                                         self._mm_omega, self._mm_gain_omega,
-                                         self._mm_omega_relative_limit)
-        
-        # Perform Differential decoding on the constellation
-        self.diffdec = gr.diff_phasor_cc()
-
-        # find closest constellation point
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
-
-        
-        # unpack the k bit vector into a stream of bits
-        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
- 
-        # Connect
-        self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, self.receiver,
-                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 3
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nDemodulator:"
-        print "bits per symbol:     %d"   % self.bits_per_symbol()
-        print "Gray code:           %s"   % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-        print "Costas Loop alpha:   %.2e" % self._costas_alpha
-        print "Costas Loop beta:    %.2e" % self._costas_beta
-        print "M&M mu:              %.2f" % self._mm_mu
-        print "M&M mu gain:         %.2e" % self._mm_gain_mu
-        print "M&M omega:           %.2f" % self._mm_omega
-        print "M&M omega gain:      %.2e" % self._mm_gain_omega
-        print "M&M omega limit:     %.2f" % self._mm_omega_relative_limit
-        
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.pre_scaler,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
-        self.connect(self.agc,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
-        self.connect(self.receiver,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
-        self.connect(self.diffdec,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))        
-        self.connect(self.slicer,
-                     gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "rx_gray_decoder.dat"))
-        self.connect(self.unpack,
-                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-
-    def add_options(parser):
-        """
-        Adds modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--costas-alpha", type="float", default=_def_costas_alpha,
-                          help="set Costas loop alpha value [default=%default] (PSK)")
-        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
-                          help="set M&M symbol sync loop gain mu value [default=%default] (PSK)")
-        parser.add_option("", "--mu", type="float", default=_def_mu,
-                          help="set M&M symbol sync loop mu value [default=%default] (PSK)")
-    add_options=staticmethod(add_options)
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(
-            d8psk_demod.__init__, ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-#
-# Add these to the mod/demod registry
-#
-# NOT READY TO BE USED YET -- ENABLE AT YOUR OWN RISK
-modulation_utils.add_type_1_mod('d8psk', d8psk_mod)
-modulation_utils.add_type_1_demod('d8psk', d8psk_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py
deleted file mode 100644
index 55e4890f3..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py
+++ /dev/null
@@ -1,363 +0,0 @@
-#
-# Copyright 2005,2006,2007,2009 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential BPSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils
-from math import pi, sqrt
-import psk
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_costas_alpha = 0.1
-_def_gain_mu = None
-_def_mu = 0.5
-_def_omega_relative_limit = 0.005
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                             DBPSK modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class dbpsk_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered differential BPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-        
-	@param samples_per_symbol: samples per baud >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param log: Log modulation data to files?
-        @type log: bool
-	"""
-
-	gr.hier_block2.__init__(self, "dbpsk_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if not isinstance(self._samples_per_symbol, int) or self._samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % self._samples_per_symbol)
-        
-	ntaps = 11 * self._samples_per_symbol
-
-        arity = pow(2,self.bits_per_symbol())
-        
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
-
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        self.chunks2symbols = gr.chunks_to_symbols_bc(psk.constellation[arity])
-
-        # pulse shaping filter
-	self.rrc_taps = gr.firdes.root_raised_cosine(
-	    self._samples_per_symbol,   # gain (samples_per_symbol since we're
-                                        # interpolating by samples_per_symbol)
-	    self._samples_per_symbol,   # sampling rate
-	    1.0,		        # symbol rate
-	    self._excess_bw,            # excess bandwidth (roll-off factor)
-            ntaps)
-	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol,
-                                                   self.rrc_taps)
-
-	# Connect
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-        if verbose:
-            self._print_verbage()
-            
-        if log:
-            self._setup_logging()
-            
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # static method that's also callable on an instance
-        return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def add_options(parser):
-        """
-        Adds DBPSK modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default]")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=True,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(dbpsk_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-    def _print_verbage(self):
-        print "\nModulator:"
-        print "bits per symbol:     %d" % self.bits_per_symbol()
-        print "Gray code:           %s" % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-              
-
-# /////////////////////////////////////////////////////////////////////////////
-#                             DBPSK demodulator
-#
-#      Differentially coherent detection of differentially encoded BPSK
-# /////////////////////////////////////////////////////////////////////////////
-
-class dbpsk_demod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 costas_alpha=_def_costas_alpha,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered differential BPSK demodulation
-
-	The input is the complex modulated signal at baseband.
-	The output is a stream of bits packed 1 bit per byte (LSB)
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: float
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param costas_alpha: loop filter gain
-        @type costas_alphas: float
-        @param gain_mu: for M&M block
-        @type gain_mu: float
-        @param mu: for M&M block
-        @type mu: float
-        @param omega_relative_limit: for M&M block
-        @type omega_relative_limit: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-        
-	gr.hier_block2.__init__(self, "dbpsk_demod",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
-				
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._costas_alpha = costas_alpha
-        self._mm_gain_mu = gain_mu
-        self._mm_mu = mu
-        self._mm_omega_relative_limit = omega_relative_limit
-        self._gray_code = gray_code
-        
-        if samples_per_symbol < 2:
-            raise TypeError, "samples_per_symbol must be >= 2, is %r" % (samples_per_symbol,)
-
-        arity = pow(2,self.bits_per_symbol())
-
-        # Automatic gain control
-        #scale = (1.0/16384.0)
-        #self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal from full-range to +-1
-        self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
-        #self.agc = gr.feedforward_agc_cc(16, 2.0)
-
-        # RRC data filter
-        ntaps = 11 * samples_per_symbol
-        self.rrc_taps = gr.firdes.root_raised_cosine(
-            1.0,                      # gain
-            self._samples_per_symbol, # sampling rate
-            1.0,                      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-        self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
-
-        # symbol clock recovery
-        if not self._mm_gain_mu:
-            self._mm_gain_mu = 0.1
-
-        self._mm_omega = self._samples_per_symbol
-        self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
-        self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
-        fmin = -0.25
-        fmax = 0.25
-        
-        self.receiver=gr.mpsk_receiver_cc(arity, 0,
-                                          self._costas_alpha, self._costas_beta,
-                                          fmin, fmax,
-                                          self._mm_mu, self._mm_gain_mu,
-                                          self._mm_omega, self._mm_gain_omega,
-                                          self._mm_omega_relative_limit)
-            
-        # Do differential decoding based on phase change of symbols
-        self.diffdec = gr.diff_phasor_cc()
-
-        # find closest constellation point
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
-        
-        # unpack the k bit vector into a stream of bits
-        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
-        if verbose:
-            self._print_verbage()
-
-        if log:
-            self._setup_logging()
-
-        # Connect and Initialize base class
-        self.connect(self, self.agc, self.rrc_filter, self.receiver,
-                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nDemodulator:"
-        print "bits per symbol:     %d"   % self.bits_per_symbol()
-        print "Gray code:           %s"   % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-        print "Costas Loop alpha:   %.2e" % self._costas_alpha
-        print "Costas Loop beta:    %.2e" % self._costas_beta
-        print "M&M mu:              %.2f" % self._mm_mu
-        print "M&M mu gain:         %.2e" % self._mm_gain_mu
-        print "M&M omega:           %.2f" % self._mm_omega
-        print "M&M omega gain:      %.2e" % self._mm_gain_omega
-        print "M&M omega limit:     %.2f" % self._mm_omega_relative_limit
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.pre_scaler,
-                         gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
-        self.connect(self.agc,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
-        self.connect(self.receiver,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
-        self.connect(self.diffdec,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))        
-        self.connect(self.slicer,
-                    gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
-        self.connect(self.unpack,
-                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-        
-    def add_options(parser):
-        """
-        Adds DBPSK demodulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--costas-alpha", type="float", default=None,
-                          help="set Costas loop alpha value [default=%default] (PSK)")
-        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
-                          help="set M&M symbol sync loop gain mu value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--mu", type="float", default=_def_mu,
-                          help="set M&M symbol sync loop mu value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--omega-relative-limit", type="float", default=_def_omega_relative_limit,
-                          help="M&M clock recovery omega relative limit [default=%default] (GMSK/PSK)")
-    add_options=staticmethod(add_options)
-    
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(
-                 dbpsk_demod.__init__, ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-#
-# Add these to the mod/demod registry
-#
-modulation_utils.add_type_1_mod('dbpsk', dbpsk_mod)
-modulation_utils.add_type_1_demod('dbpsk', dbpsk_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py b/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py
deleted file mode 100644
index d7bcf5390..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dbpsk2.py
+++ /dev/null
@@ -1,369 +0,0 @@
-#
-# Copyright 2009,2010 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential BPSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils2
-from math import pi, sqrt, ceil
-import psk
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_freq_alpha = 0.010
-_def_phase_alpha = 0.1
-_def_timing_alpha = 0.100
-_def_timing_beta = 0.010
-_def_timing_max_dev = 1.5
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                             DBPSK modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class dbpsk2_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered differential BPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-        
-	@param samples_per_symbol: samples per baud >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param log: Log modulation data to files?
-        @type log: bool
-	"""
-
-	gr.hier_block2.__init__(self, "dbpsk_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if self._samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % self._samples_per_symbol)
-        
-        arity = pow(2,self.bits_per_symbol())
-        
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
-
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        self.chunks2symbols = gr.chunks_to_symbols_bc(psk.constellation[arity])
-
-        # pulse shaping filter
-        nfilts = 32
-        ntaps = nfilts * 11 * int(self._samples_per_symbol)    # make nfilts filters of ntaps each
-        self.rrc_taps = gr.firdes.root_raised_cosine(
-            nfilts,          # gain
-            nfilts,          # sampling rate based on 32 filters in resampler
-            1.0,             # symbol rate
-            self._excess_bw, # excess bandwidth (roll-off factor)
-            ntaps)
-        self.rrc_filter = gr.pfb_arb_resampler_ccf(self._samples_per_symbol, self.rrc_taps)
-
-	# Connect
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-        if verbose:
-            self._print_verbage()
-            
-        if log:
-            self._setup_logging()
-            
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # static method that's also callable on an instance
-        return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def add_options(parser):
-        """
-        Adds DBPSK modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default]")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=True,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils2.extract_kwargs_from_options(dbpsk2_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-    def _print_verbage(self):
-        print "\nModulator:"
-        print "bits per symbol:     %d" % self.bits_per_symbol()
-        print "Gray code:           %s" % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-              
-
-# /////////////////////////////////////////////////////////////////////////////
-#                             DBPSK demodulator
-#
-#      Differentially coherent detection of differentially encoded BPSK
-# /////////////////////////////////////////////////////////////////////////////
-
-class dbpsk2_demod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 freq_alpha=_def_freq_alpha,
-                 phase_alpha=_def_phase_alpha,
-                 timing_alpha=_def_timing_alpha,
-                 timing_max_dev=_def_timing_max_dev,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log,
-                 sync_out=False):
-        """
-	Hierarchical block for RRC-filtered differential BPSK demodulation
-
-	The input is the complex modulated signal at baseband.
-	The output is a stream of bits packed 1 bit per byte (LSB)
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: float
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param freq_alpha: loop filter gain for frequency recovery
-        @type freq_alpha: float
-        @param phase_alpha: loop filter gain for phase/fine frequency recovery
-        @type phase_alpha: float
-        @param timing_alpha: loop alpha gain for timing recovery
-        @type timing_alpha: float
-        @param timing_max: timing loop maximum rate deviations
-        @type timing_max: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param log: Print modualtion data to files?
-        @type log: bool
-        @param sync_out: Output a sync signal on :1?
-        @type sync_out: bool
-	"""
-	if sync_out: io_sig_out = gr.io_signaturev(2, 2, (gr.sizeof_char, gr.sizeof_gr_complex))
-	else: io_sig_out = gr.io_signature(1, 1, gr.sizeof_char)
-
-	gr.hier_block2.__init__(self, "dqpsk2_demod",
-			        gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-			        io_sig_out)       # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._freq_alpha = freq_alpha
-        self._freq_beta = 0.10*self._freq_alpha
-        self._phase_alpha = phase_alpha
-        self._timing_alpha = timing_alpha
-        self._timing_beta = _def_timing_beta
-        self._timing_max_dev=timing_max_dev
-        self._gray_code = gray_code
-        
-        if samples_per_symbol < 2:
-            raise TypeError, "samples_per_symbol must be >= 2, is %r" % (samples_per_symbol,)
-
-        arity = pow(2,self.bits_per_symbol())
-
-        # Automatic gain control
-        self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
-        #self.agc = gr.feedforward_agc_cc(16, 1.0)
-
-        # Frequency correction
-        self.freq_recov = gr.fll_band_edge_cc(self._samples_per_symbol, self._excess_bw,
-                                              11*int(self._samples_per_symbol),
-                                              self._freq_alpha, self._freq_beta)
-
-        # symbol timing recovery with RRC data filter
-        nfilts = 32
-        ntaps = 11 * int(self._samples_per_symbol*nfilts)
-        taps = gr.firdes.root_raised_cosine(nfilts, nfilts,
-                                            1.0/float(self._samples_per_symbol),
-                                            self._excess_bw, ntaps)
-        self.time_recov = gr.pfb_clock_sync_ccf(self._samples_per_symbol,
-                                                self._timing_alpha,
-                                                taps, nfilts, nfilts/2, self._timing_max_dev)
-        self.time_recov.set_beta(self._timing_beta)
-
-        # Perform phase / fine frequency correction
-        self._phase_beta  = 0.25 * self._phase_alpha * self._phase_alpha
-        # Allow a frequency swing of +/- half of the sample rate
-        fmin = -0.5
-        fmax = 0.5
-        
-        self.phase_recov = gr.costas_loop_cc(self._phase_alpha,
-                                             self._phase_beta,
-                                             fmax, fmin, arity)
-
-        # Do differential decoding based on phase change of symbols
-        self.diffdec = gr.diff_phasor_cc()
-
-        # find closest constellation point
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
-        
-        # unpack the k bit vector into a stream of bits
-        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
-        if verbose:
-            self._print_verbage()
-
-        if log:
-            self._setup_logging()
-
-        # Connect
-        self.connect(self, self.agc,
-                     self.freq_recov, self.time_recov, self.phase_recov,
-                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
-        if sync_out: self.connect(self.time_recov, (self, 1))
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 1
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nDemodulator:"
-        print "bits per symbol:     %d"   % self.bits_per_symbol()
-        print "Gray code:           %s"   % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-        print "FLL gain:            %.2e" % self._freq_alpha
-        print "Timing alpha gain:   %.2e" % self._timing_alpha
-        print "Timing beta gain:    %.2e" % self._timing_beta
-        print "Timing max dev:      %.2f" % self._timing_max_dev
-        print "Phase track alpha:   %.2e" % self._phase_alpha
-        print "Phase track beta:    %.2e" % self._phase_beta
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.agc,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.connect(self.freq_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_freq_recov.dat"))
-        self.connect(self.time_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_time_recov.dat"))
-        self.connect(self.phase_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_phase_recov.dat"))
-        self.connect(self.diffdec,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))        
-        self.connect(self.slicer,
-                     gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.dat"))
-        self.connect(self.unpack,
-                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-        
-    def add_options(parser):
-        """
-        Adds DBPSK demodulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--freq-alpha", type="float", default=_def_freq_alpha,
-                          help="set frequency lock loop alpha gain value [default=%default] (PSK)")
-        parser.add_option("", "--phase-alpha", type="float", default=_def_phase_alpha,
-                          help="set phase tracking loop alpha value [default=%default] (PSK)")
-        parser.add_option("", "--timing-alpha", type="float", default=_def_timing_alpha,
-                          help="set timing symbol sync loop gain alpha value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--timing-beta", type="float", default=_def_timing_beta,
-                          help="set timing symbol sync loop gain beta value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--timing-max-dev", type="float", default=_def_timing_max_dev,
-                          help="set timing symbol sync loop maximum deviation [default=%default] (GMSK/PSK)")
-    add_options=staticmethod(add_options)
-    
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils2.extract_kwargs_from_options(
-                 dbpsk2_demod.__init__, ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-#
-# Add these to the mod/demod registry
-#
-modulation_utils2.add_type_1_mod('dbpsk2', dbpsk2_mod)
-modulation_utils2.add_type_1_demod('dbpsk2', dbpsk2_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
deleted file mode 100644
index 42d534168..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py
+++ /dev/null
@@ -1,363 +0,0 @@
-#
-# Copyright 2005,2006,2007,2009 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential QPSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils
-from math import pi, sqrt
-import psk
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_costas_alpha = 0.15
-_def_gain_mu = None
-_def_mu = 0.5
-_def_omega_relative_limit = 0.005
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           DQPSK modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class dqpsk_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered QPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "dqpsk_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % samples_per_symbol)
-
-	ntaps = 11 * samples_per_symbol
- 
-        arity = pow(2,self.bits_per_symbol())
-
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
-            
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        rot = .707 + .707j
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
-
-        # pulse shaping filter
-	self.rrc_taps = gr.firdes.root_raised_cosine(
-	    self._samples_per_symbol, # gain  (sps since we're interpolating by sps)
-            self._samples_per_symbol, # sampling rate
-            1.0,		      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-
-	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps)
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
-            
-	# Connect & Initialize base class
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 2
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nModulator:"
-        print "bits per symbol:     %d" % self.bits_per_symbol()
-        print "Gray code:           %s" % self._gray_code
-        print "RRS roll-off factor: %f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))        
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-
-    def add_options(parser):
-        """
-        Adds QPSK modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(dqpsk_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           DQPSK demodulator
-#
-# Differentially coherent detection of differentially encoded qpsk
-# /////////////////////////////////////////////////////////////////////////////
-
-class dqpsk_demod(gr.hier_block2):
-
-    def __init__(self, 
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 costas_alpha=_def_costas_alpha,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered DQPSK demodulation
-
-	The input is the complex modulated signal at baseband.
-	The output is a stream of bits packed 1 bit per byte (LSB)
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: float
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param costas_alpha: loop filter gain
-        @type costas_alphas: float
-        @param gain_mu: for M&M block
-        @type gain_mu: float
-        @param mu: for M&M block
-        @type mu: float
-        @param omega_relative_limit: for M&M block
-        @type omega_relative_limit: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "dqpsk_demod",
-			        gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-			        gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._costas_alpha = costas_alpha
-        self._mm_gain_mu = gain_mu
-        self._mm_mu = mu
-        self._mm_omega_relative_limit = omega_relative_limit
-        self._gray_code = gray_code
-
-        if samples_per_symbol < 2:
-            raise TypeError, "sbp must be >= 2, is %d" % samples_per_symbol
-
-        arity = pow(2,self.bits_per_symbol())
- 
-        # Automatic gain control
-        scale = (1.0/16384.0)
-        self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal from full-range to +-1
-        #self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
-        self.agc = gr.feedforward_agc_cc(16, 2.0)
-       
-        # RRC data filter
-        ntaps = 11 * samples_per_symbol
-        self.rrc_taps = gr.firdes.root_raised_cosine(
-            1.0,                      # gain
-            self._samples_per_symbol, # sampling rate
-            1.0,                      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-        self.rrc_filter=gr.interp_fir_filter_ccf(1, self.rrc_taps)        
-
-        if not self._mm_gain_mu:
-            sbs_to_mm = {2: 0.050, 3: 0.075, 4: 0.11, 5: 0.125, 6: 0.15, 7: 0.15}
-            self._mm_gain_mu = sbs_to_mm[samples_per_symbol]
-
-        self._mm_omega = self._samples_per_symbol
-        self._mm_gain_omega = .25 * self._mm_gain_mu * self._mm_gain_mu
-        self._costas_beta  = 0.25 * self._costas_alpha * self._costas_alpha
-        fmin = -0.25
-        fmax = 0.25
-        
-        self.receiver=gr.mpsk_receiver_cc(arity, pi/4.0,
-                                          self._costas_alpha, self._costas_beta,
-                                          fmin, fmax,
-                                          self._mm_mu, self._mm_gain_mu,
-                                          self._mm_omega, self._mm_gain_omega,
-                                          self._mm_omega_relative_limit)
-        
-        # Perform Differential decoding on the constellation
-        self.diffdec = gr.diff_phasor_cc()
-        
-        # find closest constellation point
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
-        
-        # unpack the k bit vector into a stream of bits
-        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
- 
-        # Connect & Initialize base class
-        self.connect(self, self.pre_scaler, self.agc, self.rrc_filter, self.receiver,
-                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 2
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nDemodulator:"
-        print "bits per symbol:     %d"   % self.bits_per_symbol()
-        print "Gray code:           %s"   % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-        print "Costas Loop alpha:   %.2e" % self._costas_alpha
-        print "Costas Loop beta:    %.2e" % self._costas_beta
-        print "M&M mu:              %.2f" % self._mm_mu
-        print "M&M mu gain:         %.2e" % self._mm_gain_mu
-        print "M&M omega:           %.2f" % self._mm_omega
-        print "M&M omega gain:      %.2e" % self._mm_gain_omega
-        print "M&M omega limit:     %.2f" % self._mm_omega_relative_limit
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.pre_scaler,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_prescaler.dat"))
-        self.connect(self.agc,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_rrc_filter.dat"))
-        self.connect(self.receiver,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_receiver.dat"))
-        self.connect(self.diffdec,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))        
-        self.connect(self.slicer,
-                     gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "rx_gray_decoder.dat"))
-        self.connect(self.unpack,
-                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-
-    def add_options(parser):
-        """
-        Adds modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--costas-alpha", type="float", default=_def_costas_alpha,
-                          help="set Costas loop alpha value [default=%default] (PSK)")
-        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
-                          help="set M&M symbol sync loop gain mu value [default=%default] (PSK)")
-        parser.add_option("", "--mu", type="float", default=_def_mu,
-                          help="set M&M symbol sync loop mu value [default=%default] (PSK)")
-    add_options=staticmethod(add_options)
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(
-            dqpsk_demod.__init__, ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-#
-# Add these to the mod/demod registry
-#
-modulation_utils.add_type_1_mod('dqpsk', dqpsk_mod)
-modulation_utils.add_type_1_demod('dqpsk', dqpsk_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py b/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py
deleted file mode 100644
index e1e627707..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/dqpsk2.py
+++ /dev/null
@@ -1,377 +0,0 @@
-#
-# Copyright 2009,2010 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential QPSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils2
-from math import pi, sqrt
-import psk
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_freq_alpha = 0.010
-_def_phase_alpha = 0.01
-_def_timing_alpha = 0.100
-_def_timing_beta = 0.010
-_def_timing_max_dev = 1.5
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           DQPSK modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class dqpsk2_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-        """
-	Hierarchical block for RRC-filtered QPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "dqpsk2_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if samples_per_symbol < 2:
-            raise TypeError, ("sbp must be >= 2, is %f" % samples_per_symbol)
-
-	ntaps = 11 * samples_per_symbol
- 
-        arity = pow(2,self.bits_per_symbol())
-
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.binary_to_ungray[arity])
-            
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        rot = .707 + .707j
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
-
-        # pulse shaping filter
-        nfilts = 32
-        ntaps = 11 * int(nfilts * self._samples_per_symbol)  # make nfilts filters of ntaps each
-        self.rrc_taps = gr.firdes.root_raised_cosine(
-            nfilts,          # gain
-            nfilts,          # sampling rate based on 32 filters in resampler
-            1.0,             # symbol rate
-            self._excess_bw, # excess bandwidth (roll-off factor)
-            ntaps)
-        self.rrc_filter = gr.pfb_arb_resampler_ccf(self._samples_per_symbol, self.rrc_taps)
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
-            
-	# Connect & Initialize base class
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 2
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nModulator:"
-        print "bits per symbol:     %d" % self.bits_per_symbol()
-        print "Gray code:           %s" % self._gray_code
-        print "RRS roll-off factor: %f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "tx_graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "tx_diffenc.dat"))        
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.dat"))
-
-    def add_options(parser):
-        """
-        Adds QPSK modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils2.extract_kwargs_from_options(dqpsk2_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           DQPSK demodulator
-#
-# Differentially coherent detection of differentially encoded qpsk
-# /////////////////////////////////////////////////////////////////////////////
-
-class dqpsk2_demod(gr.hier_block2):
-
-    def __init__(self, 
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 freq_alpha=_def_freq_alpha,
-                 phase_alpha=_def_phase_alpha,
-                 timing_alpha=_def_timing_alpha,
-                 timing_max_dev=_def_timing_max_dev,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log,
-                 sync_out=False):
-        """
-	Hierarchical block for RRC-filtered DQPSK demodulation
-
-	The input is the complex modulated signal at baseband.
-	The output is a stream of bits packed 1 bit per byte (LSB)
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: float
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param freq_alpha: loop filter gain for frequency recovery
-        @type freq_alpha: float
-        @param phase_alpha: loop filter gain
-        @type phase_alphas: float
-        @param timing_alpha: timing loop alpha gain
-        @type timing_alpha: float
-        @param timing_max: timing loop maximum rate deviations
-        @type timing_max: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param log: Print modualtion data to files?
-        @type log: bool
-        @param sync_out: Output a sync signal on :1?
-        @type sync_out: bool
-	"""
-	if sync_out: io_sig_out = gr.io_signaturev(2, 2, (gr.sizeof_char, gr.sizeof_gr_complex))
-	else: io_sig_out = gr.io_signature(1, 1, gr.sizeof_char)
-
-	gr.hier_block2.__init__(self, "dqpsk2_demod",
-			        gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-			        io_sig_out)       # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._freq_alpha = freq_alpha
-        self._freq_beta = 0.25*self._freq_alpha**2
-        self._phase_alpha = phase_alpha
-        self._timing_alpha = timing_alpha
-        self._timing_beta = _def_timing_beta
-        self._timing_max_dev=timing_max_dev
-        self._gray_code = gray_code
-
-        if samples_per_symbol < 2:
-            raise TypeError, "sbp must be >= 2, is %d" % samples_per_symbol
-
-        arity = pow(2,self.bits_per_symbol())
- 
-        # Automatic gain control
-        self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
-        #self.agc = gr.feedforward_agc_cc(16, 2.0)
-
-        # Frequency correction
-        self.freq_recov = gr.fll_band_edge_cc(self._samples_per_symbol, self._excess_bw,
-                                              11*int(self._samples_per_symbol),
-                                              self._freq_alpha, self._freq_beta)
-
-
-        # symbol timing recovery with RRC data filter
-        nfilts = 32
-        ntaps = 11 * int(samples_per_symbol*nfilts)
-        taps = gr.firdes.root_raised_cosine(nfilts, nfilts,
-                                            1.0/float(self._samples_per_symbol),
-                                            self._excess_bw, ntaps)
-        self.time_recov = gr.pfb_clock_sync_ccf(self._samples_per_symbol,
-                                                self._timing_alpha,
-                                                taps, nfilts, nfilts/2, self._timing_max_dev)
-        self.time_recov.set_beta(self._timing_beta)
-        
-
-        # Perform phase / fine frequency correction
-        self._phase_beta  = 0.25 * self._phase_alpha * self._phase_alpha
-        # Allow a frequency swing of +/- half of the sample rate
-        fmin = -0.5
-        fmax = 0.5
-
-        self.phase_recov = gr.costas_loop_cc(self._phase_alpha,
-                                             self._phase_beta,
-                                             fmax, fmin, arity)
-
-
-        # Perform Differential decoding on the constellation
-        self.diffdec = gr.diff_phasor_cc()
-        
-        # find closest constellation point
-        rot = 1
-        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
-        self.slicer = gr.constellation_decoder_cb(rotated_const, range(arity))
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(psk.gray_to_binary[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(psk.ungray_to_binary[arity])
-        
-        # unpack the k bit vector into a stream of bits
-        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
- 
-        # Connect
-        self.connect(self, self.agc, 
-                     self.freq_recov, self.time_recov, self.phase_recov,
-                     self.diffdec, self.slicer, self.symbol_mapper, self.unpack, self)
-        if sync_out: self.connect(self.time_recov, (self, 1))
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 2
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "\nDemodulator:"
-        print "bits per symbol:     %d"   % self.bits_per_symbol()
-        print "Gray code:           %s"   % self._gray_code
-        print "RRC roll-off factor: %.2f" % self._excess_bw
-        print "FLL gain:            %.2f" % self._freq_alpha
-        print "Timing alpha gain:   %.2f" % self._timing_alpha
-        print "Timing beta gain:    %.2f" % self._timing_beta
-        print "Timing max dev:      %.2f" % self._timing_max_dev
-        print "Phase track alpha:   %.2e" % self._phase_alpha
-        print "Phase track beta:    %.2e" % self._phase_beta
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.agc,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
-        self.connect(self.freq_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_freq_recov.dat"))
-        self.connect(self.time_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_time_recov.dat"))
-        self.connect(self.phase_recov,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_phase_recov.dat"))
-        self.connect(self.diffdec,
-                     gr.file_sink(gr.sizeof_gr_complex, "rx_diffdec.dat"))        
-        self.connect(self.slicer,
-                     gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "rx_gray_decoder.dat"))
-        self.connect(self.unpack,
-                     gr.file_sink(gr.sizeof_char, "rx_unpack.dat"))
-
-    def add_options(parser):
-        """
-        Adds DQPSK demodulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-        parser.add_option("", "--freq-alpha", type="float", default=_def_freq_alpha,
-                          help="set frequency lock loop alpha gain value [default=%default] (PSK)")
-        parser.add_option("", "--phase-alpha", type="float", default=_def_phase_alpha,
-                          help="set phase tracking loop alpha value [default=%default] (PSK)")
-        parser.add_option("", "--timing-alpha", type="float", default=_def_timing_alpha,
-                          help="set timing symbol sync loop gain alpha value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--timing-beta", type="float", default=_def_timing_beta,
-                          help="set timing symbol sync loop gain beta value [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--timing-max-dev", type="float", default=_def_timing_max_dev,
-                          help="set timing symbol sync loop maximum deviation [default=%default] (GMSK/PSK)")
-    add_options=staticmethod(add_options)
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils2.extract_kwargs_from_options(
-            dqpsk2_demod.__init__, ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-#
-# Add these to the mod/demod registry
-#
-modulation_utils2.add_type_1_mod('dqpsk2', dqpsk2_mod)
-modulation_utils2.add_type_1_demod('dqpsk2', dqpsk2_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/fm_demod.py b/gnuradio-core/src/python/gnuradio/blks2impl/fm_demod.py
index 1910b5011..55870513a 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/fm_demod.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/fm_demod.py
@@ -88,7 +88,7 @@ class demod_20k0f3e_cf(fm_demod_cf):
         fm_demod_cf.__init__(self, channel_rate, audio_decim,
                              5000,	# Deviation
                              3000,	# Audio passband frequency
-                             4000)	# Audio stopband frequency
+                             4500)	# Audio stopband frequency
 
 class demod_200kf3e_cf(fm_demod_cf):
     """
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/generic_usrp.py b/gnuradio-core/src/python/gnuradio/blks2impl/generic_usrp.py
deleted file mode 100644
index 82d1eca13..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/generic_usrp.py
+++ /dev/null
@@ -1,238 +0,0 @@
-#
-# Copyright 2009 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.
-#
-
-USRP1_TYPE = 'usrp1'
-USRP2_TYPE = 'usrp2'
-DUMMY_TYPE = 'dummy'
-#usrp2 rates common for decim and interp
-_USRP2_RATES = range(4, 128+1, 1) + range(130, 256+1, 2) + range(260, 512+1, 4)
-#dummy common rates
-_DUMMY_XRATES = range(4, 512, 2)
-_DUMMY_CONVERTER_RATE = 100e6
-#dummy freq result
-class _dummy_freq_result(object):
-    def __init__(self, target_freq):
-        self.baseband_freq = target_freq
-        self.dxc_freq = 0
-        self.residual_freq = 0
-from gnuradio import gr
-
-########################################################################
-# generic usrp common stuff
-########################################################################
-class _generic_usrp_base(object):
-
-    def __init__(self, which=0, subdev_spec=None, interface="", mac_addr="",
-        fusb_block_size=0, fusb_nblocks=0, usrpx=None, lo_offset=None, gain=None):
-        self._lo_offset = lo_offset
-        #usrp options
-        self._which = which
-        self._subdev_spec = subdev_spec
-        #usrp2 options
-        self._interface = interface
-        self._mac_addr = mac_addr
-        #fusb options
-        self._fusb_block_size = fusb_block_size
-        self._fusb_nblocks = fusb_nblocks
-        #pick which usrp model
-        if usrpx == '0': self._setup_usrpx(DUMMY_TYPE)
-        elif usrpx == '1' or self._subdev_spec: self._setup_usrpx(USRP1_TYPE)
-        elif usrpx == '2' or self._mac_addr: self._setup_usrpx(USRP2_TYPE)
-        else: #automatic
-            try: self._setup_usrpx(USRP2_TYPE)
-            except:
-                try: self._setup_usrpx(USRP1_TYPE)
-                except: raise Exception, 'Failed to automatically setup a usrp device.'
-        #post usrp setup
-        if self._lo_offset is not None:
-            self.set_lo_offset(self._lo_offset)
-        self.set_gain(gain)
-        self.set_auto_tr(True)
-
-    def _setup_usrpx(self, type):
-        """
-        Call the appropriate setup method.
-        @param type the usrp type constant
-        """
-        self._type = type
-        if self._type == USRP1_TYPE: self._setup_usrp1()
-        elif self._type == USRP2_TYPE: self._setup_usrp2()
-        elif self._type == DUMMY_TYPE: self._setup_dummy()
-
-    def __str__(self):
-        if self._type == USRP1_TYPE: return self._subdev.side_and_name()
-        elif self._type == USRP2_TYPE:
-            return 'Interface: %s    MAC Address: %s    D-Board ID: 0x%.2x'%(
-                self._u.interface_name(), self._u.mac_addr(), self._u.daughterboard_id())
-        elif self._type == DUMMY_TYPE: return 'Dummy USRP Device'
-
-    def gain(self): return self._gain
-
-    def set_gain(self, gain=None):
-        #automatic gain calculation
-        r = self.gain_range()
-        if gain is None: gain = (r[0] + r[1])/2 # set gain to midpoint
-        #set gain for usrp
-        self._gain = gain
-        if self._type == USRP1_TYPE: return self._subdev.set_gain(gain)
-        elif self._type == USRP2_TYPE: return self._u.set_gain(gain)
-        elif self._type == DUMMY_TYPE: return True
-
-    def gain_range(self):
-        if self._type == USRP1_TYPE: return self._subdev.gain_range()
-        elif self._type == USRP2_TYPE: return self._u.gain_range()
-        elif self._type == DUMMY_TYPE: return (0, 0, 0)
-
-    def set_center_freq(self, target_freq):
-        if self._type == USRP1_TYPE:
-            return self._u.tune(self._dxc, self._subdev, target_freq)
-        elif self._type == USRP2_TYPE:
-            return self._u.set_center_freq(target_freq)
-        elif self._type == DUMMY_TYPE: return _dummy_freq_result(target_freq)
-
-    def freq_range(self):
-        if self._type == USRP1_TYPE: return self._subdev.freq_range()
-        elif self._type == USRP2_TYPE: return self._u.freq_range()
-        elif self._type == DUMMY_TYPE: return (-10e9, 10e9, 100e3)
-
-    def set_lo_offset(self, lo_offset):
-        if self._type == USRP1_TYPE: return self._subdev.set_lo_offset(lo_offset)
-        elif self._type == USRP2_TYPE: return self._u.set_lo_offset(lo_offset)
-        elif self._type == DUMMY_TYPE: return True
-
-    def set_auto_tr(self, enable):
-        if self._type == USRP1_TYPE: return self._subdev.set_auto_tr(enable)
-
-########################################################################
-# generic usrp source
-########################################################################
-class generic_usrp_source_c(_generic_usrp_base, gr.hier_block2):
-    """
-    Create a generic usrp source that represents usrp and usrp2.
-    Take usrp and usrp2 constructor arguments and try to figure out usrp or usrp2.
-    Provide generic access methods so the API looks the same for both.
-    """
-
-    def __init__(self, **kwargs):
-        gr.hier_block2.__init__(self, "generic_usrp_source",
-            gr.io_signature(0, 0, 0), # Input signature
-            gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-        _generic_usrp_base.__init__(self, **kwargs)
-        self.connect(self._u, self)
-
-    ####################################################################
-    # generic access methods
-    ####################################################################
-    def set_decim(self, decim):
-        if decim not in self.get_decim_rates(): return False
-        if self._type == USRP1_TYPE: return self._u.set_decim_rate(decim)
-        elif self._type == USRP2_TYPE: return self._u.set_decim(decim)
-        elif self._type == DUMMY_TYPE: return True
-
-    def get_decim_rates(self):
-        if self._type == USRP1_TYPE: return range(8, 256+1, 2) #default firmware w/ hb filters
-        if self._type == USRP2_TYPE: return _USRP2_RATES
-        elif self._type == DUMMY_TYPE: return _DUMMY_XRATES
-
-    def adc_rate(self):
-        if self._type == USRP1_TYPE: return self._u.adc_rate()
-        if self._type == USRP2_TYPE: return self._u.adc_rate()
-        elif self._type == DUMMY_TYPE: return _DUMMY_CONVERTER_RATE
-
-    ####################################################################
-    # setup usrp methods
-    ####################################################################
-    def _setup_usrp1(self):
-        from gnuradio import usrp
-        self._u = usrp.source_c (self._which,
-                                fusb_block_size=self._fusb_block_size,
-                                fusb_nblocks=self._fusb_nblocks)
-        # determine the daughterboard subdevice we're using
-        if self._subdev_spec is None:
-            self._subdev_spec = usrp.pick_rx_subdevice(self._u)
-        self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
-        self._u.set_mux(usrp.determine_rx_mux_value(self._u, self._subdev_spec))
-        self._dxc = 0
-
-    def _setup_usrp2(self):
-        from gnuradio import usrp2
-        self._u = usrp2.source_32fc(self._interface, self._mac_addr)
-
-    def _setup_dummy(self): self._u = gr.null_source(gr.sizeof_gr_complex)
-
-########################################################################
-# generic usrp sink
-########################################################################
-class generic_usrp_sink_c(_generic_usrp_base, gr.hier_block2):
-    """
-    Create a generic usrp sink that represents usrp and usrp2.
-    Take usrp and usrp2 constructor arguments and try to figure out usrp or usrp2.
-    Provide generic access methods so the API looks the same for both.
-    """
-
-    def __init__(self, **kwargs):
-        gr.hier_block2.__init__(self, "generic_usrp_sink",
-            gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-            gr.io_signature(0, 0, 0)) # Output signature
-        _generic_usrp_base.__init__(self, **kwargs)
-        if self._type == USRP1_TYPE: #scale 0.0 to 1.0 input for usrp1
-            self.connect(self, gr.multiply_const_cc((2**15)-1), self._u)
-        else: self.connect(self, self._u)
-
-    ####################################################################
-    # generic access methods
-    ####################################################################
-    def set_interp(self, interp):
-        if interp not in self.get_interp_rates(): return False
-        if self._type == USRP1_TYPE: return self._u.set_interp_rate(interp)
-        elif self._type == USRP2_TYPE: return self._u.set_interp(interp)
-        elif self._type == DUMMY_TYPE: return True
-
-    def get_interp_rates(self):
-        if self._type == USRP1_TYPE: return range(16, 512+1, 4)
-        if self._type == USRP2_TYPE: return _USRP2_RATES
-        elif self._type == DUMMY_TYPE: return _DUMMY_XRATES
-
-    def dac_rate(self):
-        if self._type == USRP1_TYPE: return self._u.dac_rate()
-        if self._type == USRP2_TYPE: return self._u.dac_rate()
-        elif self._type == DUMMY_TYPE: return _DUMMY_CONVERTER_RATE
-
-    ####################################################################
-    # setup usrp methods
-    ####################################################################
-    def _setup_usrp1(self):
-        from gnuradio import usrp
-        self._u = usrp.sink_c (self._which,
-                                fusb_block_size=self._fusb_block_size,
-                                fusb_nblocks=self._fusb_nblocks)
-        # determine the daughterboard subdevice we're using
-        if self._subdev_spec is None:
-            self._subdev_spec = usrp.pick_tx_subdevice(self._u)
-        self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
-        self._u.set_mux(usrp.determine_tx_mux_value(self._u, self._subdev_spec))
-        self._dxc = self._subdev.which()
-
-    def _setup_usrp2(self):
-        from gnuradio import usrp2
-        self._u = usrp2.sink_32fc(self._interface, self._mac_addr)
-
-    def _setup_dummy(self): self._u = gr.null_sink(gr.sizeof_gr_complex)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py b/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
index 62f40582e..3aadf700b 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
@@ -73,3 +73,56 @@ class pfb_arb_resampler_ccf(gr.hier_block2):
 
     def set_rate(self, rate):
         self.pfb.set_rate(rate)
+
+
+class pfb_arb_resampler_fff(gr.hier_block2):
+    '''
+    Convenience wrapper for the polyphase filterbank arbitrary resampler.
+
+    The block takes a single float stream in and outputs a single float
+    stream out. As such, it requires no extra glue to handle the input/output
+    streams. This block is provided to be consistent with the interface to the
+    other PFB block.
+    '''
+    def __init__(self, rate, taps=None, flt_size=32, atten=100):
+	gr.hier_block2.__init__(self, "pfb_arb_resampler_fff",
+				gr.io_signature(1, 1, gr.sizeof_float), # Input signature
+				gr.io_signature(1, 1, gr.sizeof_float)) # Output signature
+        
+        self._rate = rate
+        self._size = flt_size
+
+        if taps is not None:
+            self._taps = taps
+        else:
+            # Create a filter that covers the full bandwidth of the input signal
+            bw = 0.4
+            tb = 0.2
+            ripple = 0.1
+            #self._taps = gr.firdes.low_pass_2(self._size, self._size, bw, tb, atten)
+            made = False
+            while not made:
+                try:
+                    self._taps = optfir.low_pass(self._size, self._size, bw, bw+tb, ripple, atten)
+                    made = True
+                except RuntimeError:
+                    ripple += 0.01
+                    made = False
+                    print("Warning: set ripple to %.4f dB. If this is a problem, adjust the attenuation or create your own filter taps." % (ripple))
+
+                    # Build in an exit strategy; if we've come this far, it ain't working.
+                    if(ripple >= 1.0):
+                        raise RuntimeError("optfir could not generate an appropriate filter.")
+
+        self.pfb = gr.pfb_arb_resampler_fff(self._rate, self._taps, self._size)
+        #print "PFB has %d taps\n" % (len(self._taps),)
+        
+        self.connect(self, self.pfb)
+        self.connect(self.pfb, self)
+
+    # Note -- set_taps not implemented in base class yet
+    def set_taps(self, taps):
+        self.pfb.set_taps(taps)
+
+    def set_rate(self, rate):
+        self.pfb.set_rate(rate)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/psk.py b/gnuradio-core/src/python/gnuradio/blks2impl/psk.py
deleted file mode 100644
index acedf3b69..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/psk.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Copyright 2005,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.
-# 
-
-from math import pi, sqrt, log10
-import math, cmath
-
-# The following algorithm generates Gray coded constellations for M-PSK for M=[2,4,8]
-def make_gray_constellation(m):
-    # number of bits/symbol (log2(M))
-    k = int(log10(m) / log10(2.0))
-
-    coeff = 1
-    const_map = []
-    bits = [0]*3
-    for i in range(m):
-        # get a vector of the k bits to use in this mapping
-        bits[3-k:3] = [((i&(0x01 << k-j-1)) >> k-j-1) for j in range(k)]
-
-        theta = -(2*bits[0]-1)*(2*pi/m)*(bits[0]+abs(bits[1]-bits[2])+2*bits[1])
-        re = math.cos(theta)
-        im = math.sin(theta)
-        const_map.append(complex(re, im))   # plug it into the constellation
-    
-    # return the constellation; by default, it is normalized
-    return const_map
-
-# This makes a constellation that increments around the unit circle
-def make_constellation(m):
-    return [cmath.exp(i * 2 * pi / m * 1j) for i in range(m)]
-
-# Common definition of constellations for Tx and Rx
-constellation = {
-    2 : make_constellation(2),           # BPSK
-    4 : make_constellation(4),           # QPSK
-    8 : make_constellation(8)            # 8PSK
-    }
-
-gray_constellation = {
-    2 : make_gray_constellation(2),           # BPSK
-    4 : make_gray_constellation(4),           # QPSK
-    8 : make_gray_constellation(8)            # 8PSK
-    }
-
-# -----------------------
-# Do Gray code
-# -----------------------
-# binary to gray coding -- constellation does Gray coding
-binary_to_gray = {
-    2 : range(2),
-    4 : [0,1,3,2],
-    8 : [0, 1, 3, 2, 7, 6, 4, 5]
-    }
-
-# gray to binary
-gray_to_binary = {
-    2 : range(2),
-    4 : [0,1,3,2],
-    8 : [0, 1, 3, 2, 6, 7, 5, 4]
-    }
-
-# -----------------------
-# Don't Gray code
-# -----------------------
-# identity mapping
-binary_to_ungray = {
-    2 : range(2),
-    4 : range(4),
-    8 : range(8)
-    }
-
-# identity mapping
-ungray_to_binary = {
-    2 : range(2),
-    4 : range(4),
-    8 : range(8)
-    }
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/qam.py b/gnuradio-core/src/python/gnuradio/blks2impl/qam.py
deleted file mode 100644
index 22b1e1dab..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/qam.py
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# Copyright 2005,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.
-# 
-
-from math import pi, sqrt
-import math
-
-# These constellations are generated for Gray coding when symbos [1, ..., m] are used
-# Mapping to Gray coding is therefore unnecessary
-
-def make_constellation(m):
-    # number of bits/symbol (log2(M))
-    k = int(math.log10(m) / math.log10(2.0))
-
-    coeff = 1
-    const_map = []
-    for i in range(m):
-        a = (i&(0x01 << k-1)) >> k-1
-        b = (i&(0x01 << k-2)) >> k-2
-        bits_i = [((i&(0x01 << k-j-1)) >> k-j-1) for j in range(2, k, 2)]
-        bits_q = [((i&(0x01 << k-j-1)) >> k-j-1) for j in range(3, k, 2)]
-
-        ss = 0
-        ll = len(bits_i)
-        for ii in range(ll):
-            rr = 0
-            for jj in range(ll-ii):
-                rr = abs(bits_i[jj] - rr)
-            ss += rr*pow(2.0, ii+1)
-        re = (2*a-1)*(ss+1)
-        
-        ss = 0
-        ll = len(bits_q)
-        for ii in range(ll):
-            rr = 0
-            for jj in range(ll-ii):
-                rr = abs(bits_q[jj] - rr)
-            ss += rr*pow(2.0, ii+1)
-        im = (2*b-1)*(ss+1)
-
-        a = max(re, im)
-        if a > coeff:
-            coeff = a
-        const_map.append(complex(re, im))
-
-    norm_map = [complex(i.real/coeff, i.imag/coeff) for i in const_map]
-    return norm_map
-        
-# Common definition of constellations for Tx and Rx
-constellation = {
-    4 :  make_constellation(4),           # QAM4 (QPSK)
-    8 :  make_constellation(8),           # QAM8
-    16:  make_constellation(16),          # QAM16
-    64:  make_constellation(64),          # QAM64
-    256: make_constellation(256)          # QAM256
-    }
-
-# -----------------------
-# Do Gray code
-# -----------------------
-# binary to gray coding
-binary_to_gray = {
-    4 : range(4),
-    8 : range(8),
-    16: range(16),
-    64: range(64),
-    256: range(256)
-    }
-   
-# gray to binary
-gray_to_binary = {
-    4 : range(4),
-    8 : range(8),
-    16: range(16),
-    64: range(64),
-    256: range(256)
-    }
-
-# -----------------------
-# Don't Gray code
-# -----------------------
-# identity mapping
-binary_to_ungray = {
-    4 : range(4),
-    8 : range(8),
-    16: range(16),
-    64: range(64)
-    }
-    
-# identity mapping
-ungray_to_binary = {
-    4 : range(4),
-    8 : range(8),
-    16: range(16),
-    64: range(64)
-    }
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/qam16.py b/gnuradio-core/src/python/gnuradio/blks2impl/qam16.py
deleted file mode 100644
index 0bdb9c6fb..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/qam16.py
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# Copyright 2005,2006,2007 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-QAM16 modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils
-from math import pi, sqrt
-import qam
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_costas_alpha = None
-_def_gain_mu = 0.03
-_def_mu = 0.05
-_def_omega_relative_limit = 0.005
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           QAM16 modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class qam16_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-
-        """
-	Hierarchical block for RRC-filtered QPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "qam16_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % samples_per_symbol)
-
-	ntaps = 11 * samples_per_symbol
- 
-        arity = pow(2, self.bits_per_symbol())
-
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(qam.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(qam.binary_to_ungray[arity])
-            
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        rot = 1.0
-        print "constellation with %d arity" % arity
-        rotated_const = map(lambda pt: pt * rot, qam.constellation[arity])
-        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
-
-        # pulse shaping filter
-	self.rrc_taps = gr.firdes.root_raised_cosine(
-	    self._samples_per_symbol, # gain  (sps since we're interpolating by sps)
-            self._samples_per_symbol, # sampling rate
-            1.0,		      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-
-	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps)
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
-            
-	# Connect
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 4
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "bits per symbol = %d" % self.bits_per_symbol()
-        print "Gray code = %s" % self._gray_code
-        print "RRS roll-off factor = %f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "diffenc.dat"))        
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat"))
-
-    def add_options(parser):
-        """
-        Adds QAM modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(qam16_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           QAM16 demodulator
-#
-# /////////////////////////////////////////////////////////////////////////////
-
-class qam16_demod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 costas_alpha=_def_costas_alpha,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-
-	gr.hier_block2.__init__(self, "qam16_demod",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
-        # do this
-        pass
-    
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 4
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-#
-# Add these to the mod/demod registry
-#
-# NOT READY TO BE USED YET -- ENABLE AT YOUR OWN RISK
-#modulation_utils.add_type_1_mod('qam16', qam16_mod)
-#modulation_utils.add_type_1_demod('qam16', qam16_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/qam256.py b/gnuradio-core/src/python/gnuradio/blks2impl/qam256.py
deleted file mode 100644
index fc455f17c..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/qam256.py
+++ /dev/null
@@ -1,209 +0,0 @@
-#
-# Copyright 2005,2006,2007 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-QAM256 modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils
-from math import pi, sqrt
-import qam
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_costas_alpha = None
-_def_gain_mu = 0.03
-_def_mu = 0.05
-_def_omega_relative_limit = 0.005
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           QAM256 modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class qam256_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-
-        """
-	Hierarchical block for RRC-filtered QPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "qam256_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-				
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % samples_per_symbol)
-
-	ntaps = 11 * samples_per_symbol
- 
-        arity = pow(2, self.bits_per_symbol())
-
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(qam.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(qam.binary_to_ungray[arity])
-            
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        rot = 1.0
-        print "constellation with %d arity" % arity
-        rotated_const = map(lambda pt: pt * rot, qam.constellation[arity])
-        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
-
-        # pulse shaping filter
-	self.rrc_taps = gr.firdes.root_raised_cosine(
-	    self._samples_per_symbol, # gain  (sps since we're interpolating by sps)
-            self._samples_per_symbol, # sampling rate
-            1.0,		      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-
-	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps)
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
-            
-	# Connect
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 8
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "bits per symbol = %d" % self.bits_per_symbol()
-        print "Gray code = %s" % self._gray_code
-        print "RRS roll-off factor = %f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "diffenc.dat"))        
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat"))
-
-    def add_options(parser):
-        """
-        Adds QAM modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(qam256_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           QAM256 demodulator
-#
-# /////////////////////////////////////////////////////////////////////////////
-
-class qam256_demod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 costas_alpha=_def_costas_alpha,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-
-	gr.hier_block2.__init__(self, "qam256_demod",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
-
-        # do this
-        pass
-    
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 8
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-#
-# Add these to the mod/demod registry
-#
-# NOT READY TO BE USED YET -- ENABLE AT YOUR OWN RISK
-#modulation_utils.add_type_1_mod('qam256', qam256_mod)
-#modulation_utils.add_type_1_demod('qam256', qam256_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/qam64.py b/gnuradio-core/src/python/gnuradio/blks2impl/qam64.py
deleted file mode 100644
index 5509f3745..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/qam64.py
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# Copyright 2005,2006,2007 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-differential QPSK modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils
-from math import pi, sqrt
-import qam
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_costas_alpha = None
-_def_gain_mu = 0.03
-_def_mu = 0.05
-_def_omega_relative_limit = 0.005
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           QAM64 modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class qam64_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-
-        """
-	Hierarchical block for RRC-filtered QPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "qam64_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % samples_per_symbol)
-
-	ntaps = 11 * samples_per_symbol
- 
-        arity = pow(2, self.bits_per_symbol())
-
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(qam.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(qam.binary_to_ungray[arity])
-            
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        rot = 1.0
-        print "constellation with %d arity" % arity
-        rotated_const = map(lambda pt: pt * rot, qam.constellation[arity])
-        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
-
-        # pulse shaping filter
-	self.rrc_taps = gr.firdes.root_raised_cosine(
-	    self._samples_per_symbol, # gain  (sps since we're interpolating by sps)
-            self._samples_per_symbol, # sampling rate
-            1.0,		      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-
-	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps)
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
-            
-	# Connect
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 6
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "bits per symbol = %d" % self.bits_per_symbol()
-        print "Gray code = %s" % self._gray_code
-        print "RRS roll-off factor = %f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "diffenc.dat"))        
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat"))
-
-    def add_options(parser):
-        """
-        Adds QAM modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(qam64_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           QAM16 demodulator
-#
-# /////////////////////////////////////////////////////////////////////////////
-
-class qam64_demod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 costas_alpha=_def_costas_alpha,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-	
-	gr.hier_block2.__init__(self, "qam64_demod",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
-
-        # do this
-        pass
-    
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 6
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-#
-# Add these to the mod/demod registry
-#
-# NOT READY TO BE USED YET -- ENABLE AT YOUR OWN RISK
-#modulation_utils.add_type_1_mod('qam64', qam64_mod)
-#modulation_utils.add_type_1_demod('qam16', qam16_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/qam8.py b/gnuradio-core/src/python/gnuradio/blks2impl/qam8.py
deleted file mode 100644
index 6a7b35597..000000000
--- a/gnuradio-core/src/python/gnuradio/blks2impl/qam8.py
+++ /dev/null
@@ -1,209 +0,0 @@
-#
-# Copyright 2005,2006,2007 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.
-# 
-
-# See gnuradio-examples/python/digital for examples
-
-"""
-QAM8 modulation and demodulation.
-"""
-
-from gnuradio import gr, gru, modulation_utils
-from math import pi, sqrt
-import qam
-import cmath
-from pprint import pprint
-
-# default values (used in __init__ and add_options)
-_def_samples_per_symbol = 2
-_def_excess_bw = 0.35
-_def_gray_code = True
-_def_verbose = False
-_def_log = False
-
-_def_costas_alpha = None
-_def_gain_mu = 0.03
-_def_mu = 0.05
-_def_omega_relative_limit = 0.005
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           QAM8 modulator
-# /////////////////////////////////////////////////////////////////////////////
-
-class qam8_mod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-
-        """
-	Hierarchical block for RRC-filtered QPSK modulation.
-
-	The input is a byte stream (unsigned char) and the
-	output is the complex modulated signal at baseband.
-
-	@param samples_per_symbol: samples per symbol >= 2
-	@type samples_per_symbol: integer
-	@param excess_bw: Root-raised cosine filter excess bandwidth
-	@type excess_bw: float
-        @param gray_code: Tell modulator to Gray code the bits
-        @type gray_code: bool
-        @param verbose: Print information about modulator?
-        @type verbose: bool
-        @param debug: Print modualtion data to files?
-        @type debug: bool
-	"""
-
-	gr.hier_block2.__init__(self, "qam8_mod",
-				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        self._samples_per_symbol = samples_per_symbol
-        self._excess_bw = excess_bw
-        self._gray_code = gray_code
-
-        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
-            raise TypeError, ("sbp must be an integer >= 2, is %d" % samples_per_symbol)
-
-	ntaps = 11 * samples_per_symbol
- 
-        arity = pow(2, self.bits_per_symbol())
-
-        # turn bytes into k-bit vectors
-        self.bytes2chunks = \
-          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
-
-        if self._gray_code:
-            self.symbol_mapper = gr.map_bb(qam.binary_to_gray[arity])
-        else:
-            self.symbol_mapper = gr.map_bb(qam.binary_to_ungray[arity])
-            
-        self.diffenc = gr.diff_encoder_bb(arity)
-
-        rot = 1.0
-        print "constellation with %d arity" % arity
-        rotated_const = map(lambda pt: pt * rot, qam.constellation[arity])
-        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
-
-        # pulse shaping filter
-	self.rrc_taps = gr.firdes.root_raised_cosine(
-	    self._samples_per_symbol, # gain  (sps since we're interpolating by sps)
-            self._samples_per_symbol, # sampling rate
-            1.0,		      # symbol rate
-            self._excess_bw,          # excess bandwidth (roll-off factor)
-            ntaps)
-
-	self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, self.rrc_taps)
-
-        if verbose:
-            self._print_verbage()
-        
-        if log:
-            self._setup_logging()
-            
-	# Connect
-        self.connect(self, self.bytes2chunks, self.symbol_mapper, self.diffenc,
-                     self.chunks2symbols, self.rrc_filter, self)
-
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 3
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-    def _print_verbage(self):
-        print "bits per symbol = %d" % self.bits_per_symbol()
-        print "Gray code = %s" % self._gray_code
-        print "RRS roll-off factor = %f" % self._excess_bw
-
-    def _setup_logging(self):
-        print "Modulation logging turned on."
-        self.connect(self.bytes2chunks,
-                     gr.file_sink(gr.sizeof_char, "bytes2chunks.dat"))
-        self.connect(self.symbol_mapper,
-                     gr.file_sink(gr.sizeof_char, "graycoder.dat"))
-        self.connect(self.diffenc,
-                     gr.file_sink(gr.sizeof_char, "diffenc.dat"))        
-        self.connect(self.chunks2symbols,
-                     gr.file_sink(gr.sizeof_gr_complex, "chunks2symbols.dat"))
-        self.connect(self.rrc_filter,
-                     gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat"))
-
-    def add_options(parser):
-        """
-        Adds QAM modulation-specific options to the standard parser
-        """
-        parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
-                          help="set RRC excess bandwith factor [default=%default] (PSK)")
-        parser.add_option("", "--no-gray-code", dest="gray_code",
-                          action="store_false", default=_def_gray_code,
-                          help="disable gray coding on modulated bits (PSK)")
-    add_options=staticmethod(add_options)
-
-
-    def extract_kwargs_from_options(options):
-        """
-        Given command line options, create dictionary suitable for passing to __init__
-        """
-        return modulation_utils.extract_kwargs_from_options(qam8_mod.__init__,
-                                                            ('self',), options)
-    extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           QAM8 demodulator
-#
-# /////////////////////////////////////////////////////////////////////////////
-
-class qam8_demod(gr.hier_block2):
-
-    def __init__(self,
-                 samples_per_symbol=_def_samples_per_symbol,
-                 excess_bw=_def_excess_bw,
-                 costas_alpha=_def_costas_alpha,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 gray_code=_def_gray_code,
-                 verbose=_def_verbose,
-                 log=_def_log):
-
-	gr.hier_block2.__init__(self, "qam8_demod",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(1, 1, gr.sizeof_char))    # Output signature
-
-        # do this
-        pass
-    
-    def bits_per_symbol(self=None):   # staticmethod that's also callable on an instance
-        return 3
-    bits_per_symbol = staticmethod(bits_per_symbol)      # make it a static method.  RTFM
-
-#
-# Add these to the mod/demod registry
-#
-# NOT READY TO BE USED YET -- ENABLE AT YOUR OWN RISK
-modulation_utils.add_type_1_mod('qam8', qam8_mod)
-#modulation_utils.add_type_1_demod('qam8', qam8_demod)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_fmdet.py b/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_fmdet.py
index 858b9cde6..14eaa1606 100755
--- a/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_fmdet.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_fmdet.py
@@ -28,8 +28,9 @@ class wfm_rcv_fmdet(gr.hier_block2):
         """
         Hierarchical block for demodulating a broadcast FM signal.
         
-        The input is the downconverted complex baseband signal (gr_complex).
-        The output is two streams of the demodulated audio (float) 0=Left, 1=Right.
+        The input is the downconverted complex baseband signal
+        (gr_complex).  The output is two streams of the demodulated
+        audio (float) 0=Left, 1=Right.
         
         @param demod_rate: input sample rate of complex baseband input.
         @type demod_rate: float
@@ -39,16 +40,15 @@ class wfm_rcv_fmdet(gr.hier_block2):
 	gr.hier_block2.__init__(self, "wfm_rcv_fmdet",
 				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
 				gr.io_signature(2, 2, gr.sizeof_float))      # Output signature
-        lowfreq = -125e3
-	highfreq = 125e3
+        lowfreq = -125e3/demod_rate
+	highfreq = 125e3/demod_rate
         audio_rate = demod_rate / audio_decimation
 
-
-        # We assign to self so that outsiders can grab the demodulator 
+        # We assign to self so that outsiders can grab the demodulator
         # if they need to.  E.g., to plot its output.
         #
         # input: complex; output: float
-            
+        
         self.fm_demod = gr.fmdet_cf (demod_rate, lowfreq, highfreq, 0.05)
 
         # input: float; output: float
@@ -62,25 +62,31 @@ class wfm_rcv_fmdet(gr.hier_block2):
                                            15000 ,
                                            width_of_transition_band,
                                            gr.firdes.WIN_HAMMING)
+
         # input: float; output: float
         self.audio_filter = gr.fir_filter_fff (audio_decimation, audio_coeffs)
         if 1:
-            # Pick off the stereo carrier/2 with this filter. It attenuated 10 dB so apply 10 dB gain
-            # We pick off the negative frequency half because we want to base band by it!
-            ##  NOTE  THIS WAS HACKED TO OFFSET INSERTION LOSS DUE TO DEEMPHASIS
+            # Pick off the stereo carrier/2 with this filter. It
+            # attenuated 10 dB so apply 10 dB gain We pick off the
+            # negative frequency half because we want to base band by
+            # it!
+            ##  NOTE THIS WAS HACKED TO OFFSET INSERTION LOSS DUE TO
+            ##  DEEMPHASIS
 
             stereo_carrier_filter_coeffs = gr.firdes.complex_band_pass(10.0,
-                                                                   demod_rate,
-                                                                   -19020,
-                                                                   -18980,
-                                                                   width_of_transition_band,
-                                                                   gr.firdes.WIN_HAMMING)
+                                                                       demod_rate,
+                                                                       -19020,
+                                                                       -18980,
+                                                                       width_of_transition_band,
+                                                                       gr.firdes.WIN_HAMMING)
             
             #print "len stereo carrier filter = ",len(stereo_carrier_filter_coeffs)
             #print "stereo carrier filter ", stereo_carrier_filter_coeffs
             #print "width of transition band = ",width_of_transition_band, " audio rate = ", audio_rate
 
-            # Pick off the double side band suppressed carrier Left-Right audio. It is attenuated 10 dB so apply 10 dB gain
+            # Pick off the double side band suppressed carrier
+            # Left-Right audio. It is attenuated 10 dB so apply 10 dB
+            # gain
 
             stereo_dsbsc_filter_coeffs = gr.firdes.complex_band_pass(20.0,
                                                                      demod_rate,
@@ -90,101 +96,120 @@ class wfm_rcv_fmdet(gr.hier_block2):
                                                                      gr.firdes.WIN_HAMMING)
             #print "len stereo dsbsc filter = ",len(stereo_dsbsc_filter_coeffs)
             #print "stereo dsbsc filter ", stereo_dsbsc_filter_coeffs
-            # construct overlap add filter system from coefficients for stereo carrier
 
-            self.stereo_carrier_filter = gr.fir_filter_fcc(audio_decimation, stereo_carrier_filter_coeffs)
-
-            # carrier is twice the picked off carrier so arrange to do a commplex multiply
+            # construct overlap add filter system from coefficients
+            # for stereo carrier
+            self.stereo_carrier_filter = gr.fir_filter_fcc(audio_decimation,
+                                                           stereo_carrier_filter_coeffs)
 
+            # carrier is twice the picked off carrier so arrange to do
+            # a commplex multiply
             self.stereo_carrier_generator = gr.multiply_cc();
 
             # Pick off the rds signal
-
             stereo_rds_filter_coeffs = gr.firdes.complex_band_pass(30.0,
-                                                                     demod_rate,
-                                                                     57000 - 1500,
-                                                                     57000 + 1500,
-                                                                     width_of_transition_band,
-                                                                     gr.firdes.WIN_HAMMING)
+                                                                   demod_rate,
+                                                                   57000 - 1500,
+                                                                   57000 + 1500,
+                                                                   width_of_transition_band,
+                                                                   gr.firdes.WIN_HAMMING)
             #print "len stereo dsbsc filter = ",len(stereo_dsbsc_filter_coeffs)
             #print "stereo dsbsc filter ", stereo_dsbsc_filter_coeffs
             # construct overlap add filter system from coefficients for stereo carrier
 
-	    self.rds_signal_filter = gr.fir_filter_fcc(audio_decimation, stereo_rds_filter_coeffs)
-
-
-
-
-
-
+	    self.rds_signal_filter = gr.fir_filter_fcc(audio_decimation,
+                                                       stereo_rds_filter_coeffs)
 	    self.rds_carrier_generator = gr.multiply_cc();
 	    self.rds_signal_generator = gr.multiply_cc();
 	    self_rds_signal_processor = gr.null_sink(gr.sizeof_gr_complex);
 
-
-
-            alpha = 5 * 0.25 * math.pi / (audio_rate)
-            beta = alpha * alpha / 4.0
+            loop_bw = 2*math.pi/100.0
             max_freq = -2.0*math.pi*18990/audio_rate;
-            min_freq = -2.0*math.pi*19010/audio_rate;
+            min_freq = -2.0*math.pi*19010/audio_rate;          
+            self.stereo_carrier_pll_recovery = gr.pll_refout_cc(loop_bw,
+                                                                max_freq,
+                                                                min_freq);
+
+            #self.stereo_carrier_pll_recovery.squelch_enable(False)
+            ##pll_refout does not have squelch yet, so disabled for
+            #now
             
-            self.stereo_carrier_pll_recovery = gr.pll_refout_cc(alpha,beta,max_freq,min_freq);
-            #self.stereo_carrier_pll_recovery.squelch_enable(False) #pll_refout does not have squelch yet, so disabled for now 
-            
-
-            # set up mixer (multiplier) to get the L-R signal at baseband
+            # set up mixer (multiplier) to get the L-R signal at
+            # baseband
 
             self.stereo_basebander = gr.multiply_cc();
 
-            # pick off the real component of the basebanded L-R signal.  The imaginary SHOULD be zero
+            # pick off the real component of the basebanded L-R
+            # signal.  The imaginary SHOULD be zero
 
             self.LmR_real = gr.complex_to_real();
             self.Make_Left = gr.add_ff();
             self.Make_Right = gr.sub_ff();
             
-            self.stereo_dsbsc_filter = gr.fir_filter_fcc(audio_decimation, stereo_dsbsc_filter_coeffs)
+            self.stereo_dsbsc_filter = gr.fir_filter_fcc(audio_decimation,
+                                                         stereo_dsbsc_filter_coeffs)
 
 
         if 1:
 
-            # send the real signal to complex filter to pick off the carrier and then to one side of a multiplier
-            self.connect (self, self.fm_demod,self.stereo_carrier_filter,self.stereo_carrier_pll_recovery, (self.stereo_carrier_generator,0))
+            # send the real signal to complex filter to pick off the
+            # carrier and then to one side of a multiplier
+            self.connect (self, self.fm_demod, self.stereo_carrier_filter,
+                          self.stereo_carrier_pll_recovery, 
+                          (self.stereo_carrier_generator,0))
+
             # send the already filtered carrier to the otherside of the carrier
+            # the resulting signal from this multiplier is the carrier
+            # with correct phase but at -38000 Hz.
             self.connect (self.stereo_carrier_pll_recovery, (self.stereo_carrier_generator,1))
-            # the resulting signal from this multiplier is the carrier with correct phase but at -38000 Hz.
 
             # send the new carrier to one side of the mixer (multiplier)
             self.connect (self.stereo_carrier_generator, (self.stereo_basebander,0))
+
             # send the demphasized audio to the DSBSC pick off filter,  the complex
             # DSBSC signal at +38000 Hz is sent to the other side of the mixer/multiplier
-            self.connect (self.fm_demod,self.stereo_dsbsc_filter, (self.stereo_basebander,1))
             # the result is BASEBANDED DSBSC with phase zero!
+            self.connect (self.fm_demod,self.stereo_dsbsc_filter, (self.stereo_basebander,1))
 
-            # Pick off the real part since the imaginary is theoretically zero and then to one side of a summer
+            # Pick off the real part since the imaginary is
+            # theoretically zero and then to one side of a summer
             self.connect (self.stereo_basebander, self.LmR_real, (self.Make_Left,0))
-            #take the same real part of the DSBSC baseband signal and send it to negative side of a subtracter
+
+            #take the same real part of the DSBSC baseband signal and
+            #send it to negative side of a subtracter
             self.connect (self.LmR_real,(self.Make_Right,1))
 
-	    # Make rds carrier by taking the squared pilot tone and multiplying by pilot tone
+	    # Make rds carrier by taking the squared pilot tone and
+	    # multiplying by pilot tone
 	    self.connect (self.stereo_basebander,(self.rds_carrier_generator,0))
             self.connect (self.stereo_carrier_pll_recovery,(self.rds_carrier_generator,1)) 
-	    # take signal, filter off rds,  send into mixer 0 channel
+
+	    # take signal, filter off rds, send into mixer 0 channel
 	    self.connect (self.fm_demod,self.rds_signal_filter,(self.rds_signal_generator,0))
-            # take rds_carrier_generator output and send into mixer 1 channel
+
+            # take rds_carrier_generator output and send into mixer 1
+            # channel
 	    self.connect (self.rds_carrier_generator,(self.rds_signal_generator,1))
-	    # send basebanded rds signal and send into "processor" which for now is a null sink
+
+	    # send basebanded rds signal and send into "processor"
+	    # which for now is a null sink
 	    self.connect (self.rds_signal_generator,self_rds_signal_processor)
 	    
 
         if 1:
-            # pick off the audio, L+R that is what we used to have and send it to the summer
+            # pick off the audio, L+R that is what we used to have and
+            # send it to the summer
             self.connect(self.fm_demod, self.audio_filter, (self.Make_Left, 1))
-            # take the picked off L+R audio and send it to the PLUS side of the subtractor
+
+            # take the picked off L+R audio and send it to the PLUS
+            # side of the subtractor
             self.connect(self.audio_filter,(self.Make_Right, 0))
+
             # The result of  Make_Left  gets    (L+R) +  (L-R) and results in 2*L
             # The result of Make_Right gets  (L+R) - (L-R) and results in 2*R
             self.connect(self.Make_Left , self.deemph_Left, (self, 0))
             self.connect(self.Make_Right, self.deemph_Right, (self, 1))
+
         # NOTE: mono support will require variable number of outputs in hier_block2s
         # See ticket:174 in Trac database
         #else:
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_pll.py b/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_pll.py
index dd0fae6e7..a2c1b3651 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_pll.py
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_pll.py
@@ -47,11 +47,9 @@ class wfm_rcv_pll(gr.hier_block2):
         # if they need to.  E.g., to plot its output.
         #
         # input: complex; output: float
-        alpha = 0.25*bandwidth * math.pi / demod_rate
-        beta = alpha * alpha / 4.0
+        loop_bw = 2*math.pi/100.0
         max_freq = 2.0*math.pi*90e3/demod_rate
-            
-        self.fm_demod = gr.pll_freqdet_cf (alpha,beta,max_freq,-max_freq)
+        self.fm_demod = gr.pll_freqdet_cf (loop_bw, max_freq,-max_freq)
 
         # input: float; output: float
         self.deemph_Left  = fm_deemph (audio_rate)
@@ -125,12 +123,11 @@ class wfm_rcv_pll(gr.hier_block2):
 
 
 
-            alpha = 5 * 0.25 * math.pi / (audio_rate)
-            beta = alpha * alpha / 4.0
+            loop_bw = 2*math.pi/100.0
             max_freq = -2.0*math.pi*18990/audio_rate;
             min_freq = -2.0*math.pi*19010/audio_rate;
             
-            self.stereo_carrier_pll_recovery = gr.pll_refout_cc(alpha,beta,max_freq,min_freq);
+            self.stereo_carrier_pll_recovery = gr.pll_refout_cc(loop_bw, max_freq, min_freq);
             #self.stereo_carrier_pll_recovery.squelch_enable(False) #pll_refout does not have squelch yet, so disabled for now 
             
 
diff --git a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
new file mode 100644
index 000000000..7b62a2f1e
--- /dev/null
+++ b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Copyright 2010-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.
+
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(FILES
+    __init__.py
+    exceptions.py
+    gr_threading.py
+    gr_threading_23.py
+    gr_threading_24.py
+    hier_block2.py
+    prefs.py
+    top_block.py
+    pubsub.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/gr
+    COMPONENT "core_python"
+)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+    )
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
index 45c970227..f5af80c78 100644
--- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.am
@@ -49,11 +49,8 @@ noinst_PYTHON = 			\
 	qa_argmax.py			\
 	qa_bin_statistics.py		\
 	qa_classify.py			\
-	qa_cma_equalizer.py		\
 	qa_complex_to_xxx.py		\
-	qa_constellation_decoder_cb.py  \
 	qa_copy.py			\
-	qa_correlate_access_code.py	\
 	qa_delay.py			\
 	qa_dc_blocker.py		\
 	qa_diff_encoder.py		\
@@ -63,6 +60,7 @@ noinst_PYTHON = 			\
 	qa_fft.py			\
 	qa_fft_filter.py		\
 	qa_filter_delay_fc.py		\
+	qa_float_to_int.py		\
 	qa_fractional_interpolator.py   \
 	qa_frequency_modulator.py	\
 	qa_fsk_stuff.py			\
@@ -82,7 +80,6 @@ noinst_PYTHON = 			\
 	qa_mute.py			\
 	qa_nlog10.py			\
 	qa_noise.py			\
-	qa_ofdm_insert_preamble.py	\
 	qa_packed_to_unpacked.py	\
 	qa_pipe_fittings.py		\
 	qa_pll_carriertracking.py	\
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_float_to_int.py b/gnuradio-core/src/python/gnuradio/gr/qa_float_to_int.py
new file mode 100644
index 000000000..3e0b847a2
--- /dev/null
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_float_to_int.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+
+class test_float_to_int (gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test_001(self):
+
+        src_data = (0.0, 1.1, 2.2, 3.3, 4.4, 5.5, -1.1, -2.2, -3.3, -4.4, -5.5)
+        expected_result = [int(round(s)) for s in src_data]
+        src = gr.vector_source_f(src_data)
+        op = gr.float_to_int()
+        dst = gr.vector_sink_i()
+
+        self.tb.connect(src, op, dst)
+        self.tb.run()
+        result_data = list(dst.data())
+
+        self.assertEqual(expected_result, result_data)
+
+    def test_002(self):
+
+        src_data = ( 2147483647,  2147483648,  2200000000,
+                    -2147483648, -2147483649, -2200000000)
+        expected_result = [ 2147483647,  2147483647,  2147483647,
+                           -2147483647, -2147483647, -2147483647]
+        src = gr.vector_source_f(src_data)
+        op = gr.float_to_int()
+        dst = gr.vector_sink_i()
+
+        self.tb.connect(src, op, dst)
+        self.tb.run()
+        result_data = list(dst.data())
+
+        self.assertEqual(expected_result, result_data)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_float_to_int, "test_float_to_int.xml")
+
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py b/gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py
index 47f0ecb22..5977c1b52 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2007,2010 Free Software Foundation, Inc.
+# Copyright 2004,2007,2010,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -34,115 +34,114 @@ class test_pll_carriertracking (gr_unittest.TestCase):
     def test_pll_carriertracking (self):
         expected_result = ((1.00000238419+7.21919457547e-09j),
                            (0.998025715351+0.062790453434j),
-                           (0.992878139019+0.119114711881j),
-                           (0.985585451126+0.16916936636j),
-                           (0.976963579655+0.21341380477j),
-                           (0.967643141747+0.252319812775j),
-                           (0.958120942116+0.286356031895j),
-                           (0.948766887188+0.315971136093j),
-                           (0.939851403236+0.341586351395j),
-                           (0.931558966637+0.363589793444j),
-                           (0.924019515514+0.382339715958j),
-                           (0.917312920094+0.398162424564j),
-                           (0.9114767313+0.411352336407j),
-                           (0.906515955925+0.422172755003j),
-                           (0.902329206467+0.431043088436j),
-                           (0.8989828825+0.437978446484j),
-                           (0.896438419819+0.443168222904j),
-                           (0.894643902779+0.446782171726j),
-                           (0.893543541431+0.448972672224j),
-                           (0.893085837364+0.449881345034j),
-                           (0.893211960793+0.449634194374j),
-                           (0.893862366676+0.448344886303j),
-                           (0.894974172115+0.446114838123j),
-                           (0.89649784565+0.443042784929j),
-                           (0.898379862309+0.439216792583j),
-                           (0.900570392609+0.434715718031j),
-                           (0.902926802635+0.429791986942j),
-                           (0.905423760414+0.424503326416j),
-                           (0.908115327358+0.418716549873j),
-                           (0.910964310169+0.412489384413j),
-                           (0.913929581642+0.405871063471j),
-                           (0.916985273361+0.398915469646j),
-                           (0.920104384422+0.391668856144j),
-                           (0.923261523247+0.384174525738j),
-                           (0.926428377628+0.376470327377j),
-                           (0.929587602615+0.3685952425j),
-                           (0.932724237442+0.360585510731j),
-                           (0.935822367668+0.352472603321j),
-                           (0.938865244389+0.344285786152j),
-                           (0.941773712635+0.336241692305j),
-                           (0.944620370865+0.328158795834j),
-                           (0.94739818573+0.32005661726j),
-                           (0.950098872185+0.311952739954j),
-                           (0.952714562416+0.303861320019j),
-                           (0.955247402191+0.295800030231j),
-                           (0.957694888115+0.287783116102j),
-                           (0.960053324699+0.279822826385j),
-                           (0.962315440178+0.271930038929j),
-                           (0.96448802948+0.264117747545j),
-                           (0.966570436954+0.256397068501j),
-                           (0.968563258648+0.248777091503j),
-                           (0.970409572124+0.241460204124j),
-                           (0.972127914429+0.234440952539j),
-                           (0.97377294302+0.227515518665j),
-                           (0.975345790386+0.220690101385j),
-                           (0.976839780807+0.213968709111j),
-                           (0.978262722492+0.207358703017j),
-                           (0.979616940022+0.200864806771j),
-                           (0.980905056+0.194491744041j),
-                           (0.982122182846+0.188243359327j),
-                           (0.983273088932+0.18212479353j),
-                           (0.984363257885+0.176140069962j),
-                           (0.985394001007+0.170292437077j),
-                           (0.986363172531+0.16458517313j),
-                           (0.98724168539+0.159217983484j),
-                           (0.988072276115+0.153976023197j),
-                           (0.988858819008+0.148855358362j),
-                           (0.989599764347+0.143855035305j),
-                           (0.990294575691+0.138971716166j),
-                           (0.990951240063+0.134203910828j),
-                           (0.991572141647+0.129550367594j),
-                           (0.992157161236+0.125009477139j),
-                           (0.992702245712+0.120578929782j),
-                           (0.993216574192+0.116259463131j),
-                           (0.993701457977+0.112050771713j),
-                           (0.994158565998+0.107951454818j),
-                           (0.994559407234+0.104160495102j),
-                           (0.9949182868+0.100662395358j),
-                           (0.995259582996+0.0972395762801j),
-                           (0.995584189892+0.0938917249441j),
-                           (0.995885193348+0.0906178206205j),
-                           (0.99616932869+0.0874189138412j),
-                           (0.996438741684+0.0842954516411j),
-                           (0.996694862843+0.0812477469444j),
-                           (0.996931552887+0.0782764554024j),
-                           (0.997152447701+0.0753828883171j),
-                           (0.997361660004+0.0725681483746j),
-                           (0.997559130192+0.0698337852955j),
-                           (0.997741162777+0.067180365324j),
-                           (0.99789583683+0.0648084580898j),
-                           (0.998042702675+0.0624987781048j),
-                           (0.998183488846+0.0602464973927j),
-                           (0.998314678669+0.0580499768257j),
-                           (0.998434245586+0.0559054017067j),
-                           (0.998548746109+0.053810685873j),
-                           (0.998658537865+0.0517641305923j),
-                           (0.998762428761+0.0497645735741j),
-                           (0.998855054379+0.0478102117777j),
-                           (0.998943626881+0.0459015443921j),
-                           (0.999028742313+0.0440383702517j))
+                           (0.992777824402+0.119947694242j),
+                           (0.985192835331+0.171441286802j),
+                           (0.976061582565+0.217501848936j),
+                           (0.966034710407+0.258409559727j),
+                           (0.95565611124+0.294477283955j),
+                           (0.945357382298+0.326030552387j),
+                           (0.935475051403+0.353395611048j),
+                           (0.926258146763+0.376889169216j),
+                           (0.917895197868+0.39681750536j),
+                           (0.910515546799+0.413470208645j),
+                           (0.904196679592+0.427117019892j),
+                           (0.898972511292+0.438006043434j),
+                           (0.894769787788+0.446523308754j),
+                           (0.891652584076+0.452715367079j),
+                           (0.8895829916+0.456773489714j),
+                           (0.888502895832+0.458873122931j),
+                           (0.888343691826+0.459175437689j),
+                           (0.889035582542+0.457833081484j),
+                           (0.890497922897+0.454985737801j),
+                           (0.892645597458+0.450762689114j),
+                           (0.895388305187+0.445282936096j),
+                           (0.898648142815+0.438664674759j),
+                           (0.902342617512+0.431016951799j),
+                           (0.906392872334+0.422441422939j),
+                           (0.910642921925+0.413191765547j),
+                           (0.915039420128+0.403358519077j),
+                           (0.919594764709+0.392864197493j),
+                           (0.92425006628+0.381792247295j),
+                           (0.928944349289+0.370217680931j),
+                           (0.933634519577+0.358220815659j),
+                           (0.938279032707+0.345874190331j),
+                           (0.942840516567+0.333247303963j),
+                           (0.947280526161+0.32040438056j),
+                           (0.951574921608+0.307409763336j),
+                           (0.955703914165+0.294323593378j),
+                           (0.959648966789+0.281201630831j),
+                           (0.963392794132+0.268095195293j),
+                           (0.966880619526+0.255221515894j),
+                           (0.970162451267+0.242447137833j),
+                           (0.973235487938+0.229809194803j),
+                           (0.97609680891+0.217341512442j),
+                           (0.978744983673+0.20507311821j),
+                           (0.981189727783+0.193033605814j),
+                           (0.983436584473+0.181248426437j),
+                           (0.985490739346+0.169738590717j),
+                           (0.987353682518+0.158523857594j),
+                           (0.989041447639+0.147622272372j),
+                           (0.990563035011+0.137049794197j),
+                           (0.991928339005+0.126818582416j),
+                           (0.993117690086+0.117111675441j),
+                           (0.994156062603+0.107930034399j),
+                           (0.995076179504+0.0990980416536j),
+                           (0.995887458324+0.0906178802252j),
+                           (0.996591091156+0.0824909061193j),
+                           (0.997202515602+0.0747182965279j),
+                           (0.997730851173+0.0672992765903j),
+                           (0.998185396194+0.0602316558361j),
+                           (0.99856698513+0.0535135567188j),
+                           (0.998885989189+0.0471420884132j),
+                           (0.99915266037+0.0411129891872j),
+                           (0.999372899532+0.0354214012623j),
+                           (0.999548316002+0.0300626158714j),
+                           (0.999680638313+0.0252036750317j),
+                           (0.999784469604+0.020652115345j),
+                           (0.999865531921+0.0163950324059j),
+                           (0.999923825264+0.0124222636223j),
+                           (0.999960243702+0.00872156023979j),
+                           (0.999983668327+0.00528120994568j),
+                           (0.999997138977+0.00209015607834j),
+                           (1.00000119209-0.00086285173893j),
+                           (0.999992132187-0.00358882546425j),
+                           (0.999979138374-0.00609711557627j),
+                           (0.999963641167-0.00839691981673j),
+                           (0.999947249889-0.0104993218556j),
+                           (0.999924004078-0.0122378543019j),
+                           (0.999904811382-0.0136305987835j),
+                           (0.999888062477-0.0148707330227j),
+                           (0.9998742342-0.0159679055214j),
+                           (0.999856114388-0.0169314742088j),
+                           (0.999839782715-0.0177700817585j),
+                           (0.999826967716-0.0184917747974j),
+                           (0.999818325043-0.0191045701504j),
+                           (0.999807476997-0.0196143388748j),
+                           (0.999797284603-0.0200265944004j),
+                           (0.999791204929-0.0203481912613j),
+                           (0.99978852272-0.0205836892128j),
+                           (0.99978530407-0.0207380950451j),
+                           (0.999785065651-0.0206423997879j),
+                           (0.999787807465-0.0204866230488j),
+                           (0.999794304371-0.0202808082104j),
+                           (0.999800384045-0.0200312435627j),
+                           (0.999803245068-0.0197458267212j),
+                           (0.9998087883-0.0194311738014j),
+                           (0.999816894531-0.0190933048725j),
+                           (0.999825954437-0.0187371373177j),
+                           (0.999829888344-0.0183679759502j),
+                           (0.999835848808-0.017987690866j),
+                           (0.999844014645-0.0176006518304j))
 
         sampling_freq = 10e3
         freq = sampling_freq / 100
 
-        alpha = 0.1
-        beta = alpha * alpha / 4.0
+        loop_bw = math.pi/100.0
         maxf = 1
         minf = -1
 
         src = gr.sig_source_c (sampling_freq, gr.GR_COS_WAVE, freq, 1.0)
-        pll = gr.pll_carriertracking_cc(alpha, beta, maxf, minf)
+        pll = gr.pll_carriertracking_cc(loop_bw, maxf, minf)
         head = gr.head (gr.sizeof_gr_complex, int (freq))
         dst = gr.vector_sink_c ()
 
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py b/gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py
index a044ca4e3..152026c35 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2007,2010 Free Software Foundation, Inc.
+# Copyright 2004,2007,2010,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -31,118 +31,117 @@ class test_pll_freqdet (gr_unittest.TestCase):
     def tearDown (self):
         self.tb = None
 
-    def test_pll_refout (self):
+    def test_pll_freqdet (self):
         expected_result = (0.0,
-                           1.1489677586e-07,
-                           0.972820967928,
-                           2.74556447638,
-                           5.14063115504,
-                           8.00965893424,
-                           11.2291407849,
-                           14.6967083575,
-                           18.3279143967,
-                           22.0534772463,
-                           25.8170063427,
-                           29.5729048372,
-                           33.28476877,
-                           36.923851464,
-                           40.4367920663,
-                           43.8452165447,
-                           47.1363805488,
-                           50.3011890178,
-                           53.3336388558,
-                           56.2301430274,
-                           58.9891659262,
-                           61.6107668417,
-                           64.0962975824,
-                           66.4481415997,
-                           68.6694590418,
-                           70.7640385293,
-                           72.7048794706,
-                           74.5033240115,
-                           76.2012544926,
-                           77.8019140677,
-                           79.3088126954,
-                           80.7255967005,
-                           82.0560428456,
-                           83.3039575383,
-                           84.473129399,
-                           85.5673470484,
-                           86.5902864563,
-                           87.5456176636,
-                           88.4368624865,
-                           89.2363977903,
-                           89.9861118444,
-                           90.6888920639,
-                           91.3474657813,
-                           91.9644713943,
-                           92.5423101413,
-                           93.0832765389,
-                           93.5894931633,
-                           94.0629225081,
-                           94.5054203452,
-                           94.9186882929,
-                           95.3043331057,
-                           95.6326268597,
-                           95.9117515522,
-                           96.1801447842,
-                           96.437391527,
-                           96.6831953314,
-                           96.9173605408,
-                           97.1397982206,
-                           97.3504727968,
-                           97.5493842694,
-                           97.7366275022,
-                           97.9123032879,
-                           98.0766013539,
-                           98.2297054988,
-                           98.3408027946,
-                           98.4487102971,
-                           98.5534280064,
-                           98.6549025616,
-                           98.7531576788,
-                           98.848110352,
-                           98.9397131494,
-                           99.0278712074,
-                           99.1124718752,
-                           99.193408431,
-                           99.2705445084,
-                           99.3437733855,
-                           99.3817366678,
-                           99.391110391,
-                           99.4089151289,
-                           99.4333959024,
-                           99.4630289627,
-                           99.4964565726,
-                           99.5325047932,
-                           99.5701419814,
-                           99.6084313579,
-                           99.6465902967,
-                           99.6838954618,
-                           99.7197776709,
-                           99.7537270313,
-                           99.7542606398,
-                           99.7595848672,
-                           99.7691305308,
-                           99.7823047325,
-                           99.7986450115,
-                           99.8176059012,
-                           99.838724941,
-                           99.8615040962,
-                           99.8854690481,
-                           99.910157336,
-                           99.9351302152)
+                           4.33888922882e-08,
+                           0.367369994515,
+                           1.08135249597,
+                           2.10983253908,
+                           3.42221529438,
+                           4.98940390402,
+                           6.78379190842,
+                           8.77923286024,
+                           10.9510106794,
+                           13.2758363182,
+                           15.7317829127,
+                           18.2982902299,
+                           20.9561068599,
+                           23.6755271122,
+                           26.452952094,
+                           29.2731265301,
+                           32.1219053479,
+                           34.9862418188,
+                           37.8540971414,
+                           40.7144315483,
+                           43.5571390869,
+                           46.3730179743,
+                           49.1537231663,
+                           51.8917218889,
+                           54.58026103,
+                           57.2015358514,
+                           59.7513664199,
+                           62.2380533124,
+                           64.657612252,
+                           67.006640002,
+                           69.2822432184,
+                           71.4820384499,
+                           73.6041047056,
+                           75.6469478817,
+                           77.6094829742,
+                           79.4909866472,
+                           81.2911031615,
+                           83.0097850853,
+                           84.6355598352,
+                           86.1820937186,
+                           87.6504420946,
+                           89.0418441206,
+                           90.3577286819,
+                           91.5996432431,
+                           92.7692775646,
+                           93.8684162704,
+                           94.8989269904,
+                           95.8627662892,
+                           96.7619381633,
+                           97.598505899,
+                           98.362769679,
+                           99.0579904444,
+                           99.6992633875,
+                           100.288805948,
+                           100.828805921,
+                           101.321421457,
+                           101.76878699,
+                           102.17300138,
+                           102.536116055,
+                           102.860158727,
+                           103.147085962,
+                           103.398830608,
+                           103.617254366,
+                           103.792467691,
+                           103.939387906,
+                           104.060030865,
+                           104.15631756,
+                           104.230085975,
+                           104.283067372,
+                           104.316933727,
+                           104.333238432,
+                           104.333440018,
+                           104.318914008,
+                           104.290941063,
+                           104.250742554,
+                           104.187634452,
+                           104.103822339,
+                           104.013227468,
+                           103.916810336,
+                           103.815448432,
+                           103.709936239,
+                           103.600997093,
+                           103.489283183,
+                           103.375351833,
+                           103.259712936,
+                           103.142828952,
+                           103.025091195,
+                           102.90686726,
+                           102.776726069,
+                           102.648078982,
+                           102.521459607,
+                           102.397294831,
+                           102.275999684,
+                           102.157882471,
+                           102.043215927,
+                           101.93218978,
+                           101.824958181,
+                           101.72159228,
+                           101.622151366)
 
         sampling_freq = 10e3
         freq = sampling_freq / 100
 
-        alpha = 0.2
-        beta = alpha * alpha / 4.0
+        loop_bw = math.pi/100.0
         maxf = 1
         minf = -1
 
         src = gr.sig_source_c (sampling_freq, gr.GR_COS_WAVE, freq, 1.0)
-        pll = gr.pll_freqdet_cf(alpha, beta, maxf, minf)
+        pll = gr.pll_freqdet_cf(loop_bw, maxf, minf)
         head = gr.head (gr.sizeof_float, int (freq))
         dst = gr.vector_sink_f ()
 
@@ -154,7 +153,7 @@ class test_pll_freqdet (gr_unittest.TestCase):
 
         # convert it from normalized frequency to absolute frequency (Hz)
         dst_data = [i*(sampling_freq/(2*math.pi)) for i in dst_data]
-
+            
         self.assertFloatTuplesAlmostEqual (expected_result, dst_data, 3)
 
 if __name__ == '__main__':
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py b/gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
index c719d901d..4d82ed692 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
@@ -33,116 +33,115 @@ class test_pll_refout (gr_unittest.TestCase):
 
     def test_pll_refout (self):
         expected_result = ((1+0j),
-                           (1+7.39965699825e-10j),
-                           (0.999980390072+0.00626518437639j),
-                           (0.999828696251+0.0185074303299j),
-                           (0.999342679977+0.0362518914044j),
-                           (0.998255133629+0.0590478256345j),
-                           (0.996255218983+0.0864609181881j),
-                           (0.993005692959+0.118066303432j),
-                           (0.988157629967+0.153442293406j),
-                           (0.981362581253+0.192165210843j),
-                           (0.972283244133+0.233806177974j),
-                           (0.960601866245+0.277928203344j),
-                           (0.946027696133+0.324085712433j),
-                           (0.928303182125+0.371824204922j),
-                           (0.907292485237+0.420500129461j),
-                           (0.882742881775+0.469856321812j),
-                           (0.854515135288+0.519426465034j),
-                           (0.822515428066+0.568742752075j),
-                           (0.786696374416+0.617340147495j),
-                           (0.747057676315+0.664759278297j),
-                           (0.703645706177+0.710551023483j),
-                           (0.656552672386+0.754280149937j),
-                           (0.605915188789+0.795529305935j),
-                           (0.551911652088+0.833902597427j),
-                           (0.494760125875+0.869029581547j),
-                           (0.43471467495+0.900568246841j),
-                           (0.37224906683+0.928132891655j),
-                           (0.307677358389+0.95149075985j),
-                           (0.241136670113+0.970491170883j),
-                           (0.17298206687+0.984924972057j),
-                           (0.103586681187+0.99462044239j),
-                           (0.0333374515176+0.999444127083j),
-                           (-0.0373689383268+0.999301552773j),
-                           (-0.108129791915+0.994136810303j),
-                           (-0.178540587425+0.983932554722j),
-                           (-0.248198464513+0.968709230423j),
-                           (-0.316705435514+0.948523938656j),
-                           (-0.383672863245+0.92346906662j),
-                           (-0.448723107576+0.893670797348j),
-                           (-0.511321544647+0.859389483929j),
-                           (-0.571328163147+0.820721685886j),
-                           (-0.628419756889+0.777874410152j),
-                           (-0.682292759418+0.731079041958j),
-                           (-0.73266518116+0.680589199066j),
-                           (-0.779277086258+0.626679480076j),
-                           (-0.821892678738+0.569642364979j),
-                           (-0.860300958157+0.509786486626j),
-                           (-0.894316911697+0.447434008121j),
-                           (-0.923782110214+0.382918506861j),
-                           (-0.948564827442+0.316582858562j),
-                           (-0.968560934067+0.248776495457j),
-                           (-0.983657181263+0.180051460862j),
-                           (-0.993847966194+0.110752984881j),
-                           (-0.999158382416+0.0410190448165j),
-                           (-0.999585151672-0.0288016609848j),
-                           (-0.995150506496-0.0983637422323j),
-                           (-0.985901653767-0.167325690389j),
-                           (-0.971909880638-0.235353350639j),
-                           (-0.953269898891-0.302119880915j),
-                           (-0.930099308491-0.367308050394j),
-                           (-0.902536988258-0.430612236261j),
-                           (-0.870742440224-0.491739332676j),
-                           (-0.834894299507-0.550410330296j),
-                           (-0.795189321041-0.606361210346j),
-                           (-0.751972556114-0.659194409847j),
-                           (-0.705345034599-0.708864152431j),
-                           (-0.65554022789-0.755160212517j),
-                           (-0.602804005146-0.79788929224j),
-                           (-0.547393083572-0.836875617504j),
-                           (-0.489574193954-0.871961593628j),
-                           (-0.429622590542-0.903008520603j),
-                           (-0.367820799351-0.929896712303j),
-                           (-0.30445766449-0.952525854111j),
-                           (-0.239826664329-0.970815718174j),
-                           (-0.174224823713-0.984705924988j),
-                           (-0.107951194048-0.994156181812j),
-                           (-0.0415062084794-0.999138236046j),
-                           (0.0248276274651-0.999691724777j),
-                           (0.0909758731723-0.995853126049j),
-                           (0.156649366021-0.987654268742j),
-                           (0.221562758088-0.975146114826j),
-                           (0.285434871912-0.958398103714j),
-                           (0.34799093008-0.937497913837j),
-                           (0.408963024616-0.912550985813j),
-                           (0.468091547489-0.883679986j),
-                           (0.525126516819-0.851024150848j),
-                           (0.579828321934-0.814738690853j),
-                           (0.631969094276-0.774993598461j),
-                           (0.68133354187-0.731973052025j),
-                           (0.727582633495-0.68602001667j),
-                           (0.770699501038-0.637198805809j),
-                           (0.810512304306-0.585721611977j),
-                           (0.846863090992-0.531810939312j),
-                           (0.879608631134-0.475698083639j),
-                           (0.908620357513-0.417623102665j),
-                           (0.933785498142-0.357833325863j),
-                           (0.955007135868-0.29658266902j),
-                           (0.972205162048-0.23413066566j),
-                           (0.985315918922-0.170741200447j),
-                           (0.994293212891-0.106681533158j))
+                           (1+6.4087357643e-10j),
+                           (0.999985277653+0.00542619498447j),
+                           (0.999868750572+0.0162021834403j),
+                           (0.99948567152+0.0320679470897j),
+                           (0.99860727787+0.0527590736747j),
+                           (0.996953129768+0.0780025869608j),
+                           (0.994203746319+0.107512556016j),
+                           (0.990011692047+0.140985429287j),
+                           (0.984013140202+0.178095817566j),
+                           (0.975838363171+0.218493551016j),
+                           (0.965121984482+0.261800557375j),
+                           (0.95151245594+0.307610183954j),
+                           (0.934681296349+0.355486690998j),
+                           (0.914401650429+0.404808044434j),
+                           (0.890356600285+0.455263823271j),
+                           (0.862329125404+0.506348133087j),
+                           (0.830152392387+0.557536482811j),
+                           (0.793714106083+0.608290970325j),
+                           (0.752960026264+0.658066213131j),
+                           (0.707896590233+0.706316053867j),
+                           (0.658591926098+0.752500295639j),
+                           (0.605175673962+0.796091973782j),
+                           (0.547837555408+0.836584687233j),
+                           (0.48682525754+0.873499393463j),
+                           (0.42244040966+0.906390726566j),
+                           (0.355197101831+0.934791445732j),
+                           (0.285494059324+0.958380460739j),
+                           (0.213591173291+0.976923108101j),
+                           (0.139945343137+0.990159213543j),
+                           (0.065038472414+0.997882783413j),
+                           (-0.0106285437942+0.999943494797j),
+                           (-0.0865436866879+0.996248066425j),
+                           (-0.162189796567+0.986759603024j),
+                           (-0.23705175519+0.971496999264j),
+                           (-0.310622543097+0.950533330441j),
+                           (-0.38240903616+0.923993110657j),
+                           (-0.451937526464+0.89204955101j),
+                           (-0.518758952618+0.854920566082j),
+                           (-0.582311093807+0.812966048717j),
+                           (-0.642372369766+0.76639264822j),
+                           (-0.698591887951+0.715520322323j),
+                           (-0.750654160976+0.660695314407j),
+                           (-0.798280358315+0.602286040783j),
+                           (-0.841228663921+0.540679454803j),
+                           (-0.87929558754+0.476276367903j),
+                           (-0.912315964699+0.409486919641j),
+                           (-0.940161883831+0.340728074312j),
+                           (-0.962742805481+0.270418733358j),
+                           (-0.980004072189+0.198977485299j),
+                           (-0.991925954819+0.126818284392j),
+                           (-0.99851256609+0.0545223206282j),
+                           (-0.999846458435-0.0175215266645j),
+                           (-0.996021270752-0.0891158208251j),
+                           (-0.987133920193-0.159895718098j),
+                           (-0.973306238651-0.2295101583j),
+                           (-0.954683184624-0.297624111176j),
+                           (-0.931430280209-0.363919824362j),
+                           (-0.903732538223-0.428097635508j),
+                           (-0.871792256832-0.489875763655j),
+                           (-0.835827112198-0.548992812634j),
+                           (-0.796068251133-0.605206847191j),
+                           (-0.752758979797-0.658296227455j),
+                           (-0.706152498722-0.70805978775j),
+                           (-0.656641483307-0.754202902317j),
+                           (-0.604367733002-0.79670548439j),
+                           (-0.549597978592-0.835429251194j),
+                           (-0.492602348328-0.870254516602j),
+                           (-0.433654457331-0.901079237461j),
+                           (-0.373029649258-0.927819430828j),
+                           (-0.31100410223-0.950408577919j),
+                           (-0.247853919864-0.968797445297j),
+                           (-0.183855071664-0.982953369617j),
+                           (-0.119282215834-0.992860376835j),
+                           (-0.0544078871608-0.998518764973j),
+                           (0.0104992967099-0.999944865704j),
+                           (0.0749994292855-0.997183561325j),
+                           (0.138844624162-0.990314185619j),
+                           (0.201967850327-0.979392170906j),
+                           (0.264124274254-0.964488625526j),
+                           (0.325075358152-0.945688128471j),
+                           (0.3845885396-0.92308807373j),
+                           (0.442438393831-0.89679890871j),
+                           (0.498407125473-0.866943061352j),
+                           (0.552284479141-0.833655714989j),
+                           (0.603869199753-0.797083437443j),
+                           (0.652970373631-0.757383465767j),
+                           (0.69940674305-0.714723825455j),
+                           (0.743007957935-0.66928255558j),
+                           (0.78350687027-0.62138313055j),
+                           (0.820889055729-0.571087777615j),
+                           (0.855021059513-0.51859331131j),
+                           (0.885780930519-0.46410369873j),
+                           (0.913058102131-0.407829582691j),
+                           (0.936754107475-0.349988251925j),
+                           (0.956783294678-0.290801793337j),
+                           (0.973072886467-0.230497643352j),
+                           (0.985563337803-0.169307261705j),
+                           (0.9942086339-0.1074674353j),
+                           (0.9989772439-0.0452152714133j))
 
         sampling_freq = 10e3
         freq = sampling_freq / 100
 
-        alpha = 0.1
-        beta = alpha * alpha / 4.0
+        loop_bw = math.pi/100.0
         maxf = 1
         minf = -1
 
         src = gr.sig_source_c (sampling_freq, gr.GR_COS_WAVE, freq, 1.0)
-        pll = gr.pll_refout_cc(alpha, beta, maxf, minf)
+        pll = gr.pll_refout_cc(loop_bw, maxf, minf)
         head = gr.head (gr.sizeof_gr_complex, int (freq))
         dst = gr.vector_sink_c ()
 
@@ -151,8 +150,7 @@ class test_pll_refout (gr_unittest.TestCase):
 
         self.tb.run ()
         dst_data = dst.data ()
-
-        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 5)
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 4)
 
 if __name__ == '__main__':
     gr_unittest.run(test_pll_refout, "test_pll_refout.xml")
diff --git a/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py b/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py
index ded77f5f3..c3dc5cf13 100644
--- a/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py
+++ b/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py
@@ -6,8 +6,6 @@ XML Test Runner for PyUnit
 # the Public Domain. With contributions by Paolo Borelli and others.
 # Added to GNU Radio Oct. 3, 2010
 
-from __future__ import with_statement
-
 __version__ = "0.1"
 
 import os.path
@@ -185,7 +183,9 @@ class XMLTestRunner(object):
         result = _XMLTestResult(classname)
         start_time = time.time()
 
-        with _fake_std_streams():
+        fss = _fake_std_streams()
+        fss.__enter__()
+        try:
             test(result)
             try:
                 out_s = sys.stdout.getvalue()
@@ -195,6 +195,8 @@ class XMLTestRunner(object):
                 err_s = sys.stderr.getvalue()
             except AttributeError:
                 err_s = ""
+        finally:
+            fss.__exit__(None, None, None)
 
         time_taken = time.time() - start_time
         result.print_report(stream, time_taken, out_s, err_s)
@@ -218,8 +220,8 @@ class _fake_std_streams(object):
     def __enter__(self):
         self._orig_stdout = sys.stdout
         self._orig_stderr = sys.stderr
-        sys.stdout = StringIO()
-        sys.stderr = StringIO()
+        #sys.stdout = StringIO()
+        #sys.stderr = StringIO()
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         sys.stdout = self._orig_stdout
diff --git a/gnuradio-core/src/python/gnuradio/vocoder/Makefile.am b/gnuradio-core/src/python/gnuradio/gru/CMakeLists.txt
index 69c140c10..1c50989d9 100644
--- a/gnuradio-core/src/python/gnuradio/vocoder/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/gru/CMakeLists.txt
@@ -1,26 +1,26 @@
+# Copyright 2010-2011 Free Software Foundation, Inc.
 #
-# Copyright 2004,2007 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.
-# 
 
-include $(top_srcdir)/Makefile.common
+include(GrPython)
 
-grvocoderpythondir = $(grpythondir)/vocoder
-grvocoderpython_PYTHON = \
-	__init__.py
+GR_PYTHON_INSTALL(
+    FILES __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/gru
+    COMPONENT "core_python"
+)
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/gruimpl/CMakeLists.txt
new file mode 100644
index 000000000..7d48f3512
--- /dev/null
+++ b/gnuradio-core/src/python/gnuradio/gruimpl/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Copyright 2010-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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(FILES
+    __init__.py
+    freqz.py
+    gnuplot_freqz.py
+    hexint.py
+    listmisc.py
+    mathmisc.py
+    lmx2306.py
+    msgq_runner.py
+    os_read_exactly.py
+    sdr_1000.py
+    seq_with_cursor.py
+    socket_stuff.py
+    daemon.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/gruimpl
+    COMPONENT "core_python"
+)
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am b/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am
index ffae4b809..903bc2695 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am
+++ b/gnuradio-core/src/python/gnuradio/gruimpl/Makefile.am
@@ -25,7 +25,6 @@ grupythondir = $(grpythondir)/gruimpl
 
 grupython_PYTHON = 			\
 	__init__.py			\
-	crc.py				\
 	freqz.py			\
 	gnuplot_freqz.py		\
 	hexint.py			\
diff --git a/gnuradio-core/src/python/gnuradio/modulation_utils2.py b/gnuradio-core/src/python/gnuradio/modulation_utils2.py
deleted file mode 100644
index c5dba3e79..000000000
--- a/gnuradio-core/src/python/gnuradio/modulation_utils2.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Copyright 2010 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-"""
-Miscellaneous utilities for managing mods and demods, as well as other items
-useful in dealing with generalized handling of different modulations and demods.
-"""
-
-import inspect
-
-
-# Type 1 modulators accept a stream of bytes on their input and produce complex baseband output
-_type_1_modulators = {}
-
-def type_1_mods():
-    return _type_1_modulators
-
-def add_type_1_mod(name, mod_class):
-    _type_1_modulators[name] = mod_class
-
-
-# Type 1 demodulators accept complex baseband input and produce a stream of bits, packed
-# 1 bit / byte as their output.  Their output is completely unambiguous.  There is no need
-# to resolve phase or polarity ambiguities.
-_type_1_demodulators = {}
-
-def type_1_demods():
-    return _type_1_demodulators
-
-def add_type_1_demod(name, demod_class):
-    _type_1_demodulators[name] = demod_class
-
-
-def extract_kwargs_from_options(function, excluded_args, options):
-    """
-    Given a function, a list of excluded arguments and the result of
-    parsing command line options, create a dictionary of key word
-    arguments suitable for passing to the function.  The dictionary
-    will be populated with key/value pairs where the keys are those
-    that are common to the function's argument list (minus the
-    excluded_args) and the attributes in options.  The values are the
-    corresponding values from options unless that value is None.
-    In that case, the corresponding dictionary entry is not populated.
-
-    (This allows different modulations that have the same parameter
-    names, but different default values to coexist.  The downside is
-    that --help in the option parser will list the default as None,
-    but in that case the default provided in the __init__ argument
-    list will be used since there is no kwargs entry.)
-
-    @param function: the function whose parameter list will be examined
-    @param excluded_args: function arguments that are NOT to be added to the dictionary
-    @type excluded_args: sequence of strings
-    @param options: result of command argument parsing
-    @type options: optparse.Values
-    """
-    # Try this in C++ ;)
-    args, varargs, varkw, defaults = inspect.getargspec(function)
-    d = {}
-    for kw in [a for a in args if a not in excluded_args]:
-        if hasattr(options, kw):
-            if getattr(options, kw) is not None:
-                d[kw] = getattr(options, kw)
-    return d
diff --git a/gnuradio-core/src/python/gnuradio/usrp_options.py b/gnuradio-core/src/python/gnuradio/usrp_options.py
deleted file mode 100644
index 86dba2f9a..000000000
--- a/gnuradio-core/src/python/gnuradio/usrp_options.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Copyright 2009 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.
-#
-
-_parser_to_groups_dict = dict()
-class _parser_groups(object):
-    def __init__(self, parser):
-        self.usrpx_grp = parser.add_option_group("General USRP Options")
-        self.usrp1_grp = parser.add_option_group("USRP1 Specific Options")
-        self.usrp1exp_grp = parser.add_option_group("USRP1 Expert Options")
-        self.usrp2_grp = parser.add_option_group("USRP2 Specific Options")
-
-from gnuradio import blks2
-
-def _add_options(parser):
-    """
-    Add options to manually choose between usrp or usrp2.
-    Add options for usb. Add options common to source and sink.
-    @param parser: instance of OptionParser
-    @return the parser group
-    """
-    #cache groups so they dont get added twice on tranceiver apps
-    if not _parser_to_groups_dict.has_key(parser): _parser_to_groups_dict[parser] = _parser_groups(parser)
-    pg = _parser_to_groups_dict[parser]
-    #pick usrp or usrp2
-    pg.usrpx_grp.add_option("-u", "--usrpx", type="string", default=None,
-                      help="specify which usrp model: 1 for USRP, 2 for USRP2 [default=auto]")
-    #fast usb options
-    pg.usrp1exp_grp.add_option("-B", "--fusb-block-size", type="int", default=0,
-                      help="specify fast usb block size [default=%default]")
-    pg.usrp1exp_grp.add_option("-N", "--fusb-nblocks", type="int", default=0,
-                      help="specify number of fast usb blocks [default=%default]")
-    #lo offset
-    pg.usrpx_grp.add_option("--lo-offset", type="eng_float", default=None,
-                      help="set LO Offset in Hz [default=automatic].")
-    #usrp options
-    pg.usrp1_grp.add_option("-w", "--which", type="int", default=0,
-                      help="select USRP board [default=%default]")
-    #usrp2 options
-    pg.usrp2_grp.add_option("-e", "--interface", type="string", default="eth0",
-                      help="Use USRP2 at specified Ethernet interface [default=%default]")
-    pg.usrp2_grp.add_option("-a", "--mac-addr", type="string", default="",
-                      help="Use USRP2 at specified MAC address [default=None]")
-    return pg
-
-def add_rx_options(parser):
-    """
-    Add receive specific usrp options.
-    @param parser: instance of OptionParser
-    """
-    pg = _add_options(parser)
-    pg.usrp1_grp.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                      help="select USRP Rx side A or B")
-    pg.usrpx_grp.add_option("--rx-gain", type="eng_float", default=None, metavar="GAIN",
-                      help="set receiver gain in dB [default=midpoint].  See also --show-rx-gain-range")
-    pg.usrpx_grp.add_option("--show-rx-gain-range", action="store_true", default=False, 
-                      help="print min and max Rx gain available on selected daughterboard")
-    pg.usrpx_grp.add_option("-d", "--decim", type="intx", default=None,
-                      help="set fpga decimation rate to DECIM [default=%default]")
-
-def create_usrp_source(options):
-    u = blks2.generic_usrp_source_c(
-        usrpx=options.usrpx,
-        which=options.which,
-        subdev_spec=options.rx_subdev_spec,
-        interface=options.interface,
-        mac_addr=options.mac_addr,
-        fusb_block_size=options.fusb_block_size,
-        fusb_nblocks=options.fusb_nblocks,
-        lo_offset=options.lo_offset,
-        gain=options.rx_gain,
-    )
-    if options.show_rx_gain_range:
-        print "Rx Gain Range: minimum = %g, maximum = %g, step size = %g"%tuple(u.gain_range())
-    return u
-
-def add_tx_options(parser):
-    """
-    Add transmit specific usrp options.
-    @param parser: instance of OptionParser
-    """
-    pg = _add_options(parser)
-    pg.usrp1_grp.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
-                      help="select USRP Rx side A or B")
-    pg.usrpx_grp.add_option("--tx-gain", type="eng_float", default=None, metavar="GAIN",
-                      help="set transmitter gain in dB [default=midpoint].  See also --show-tx-gain-range")
-    pg.usrpx_grp.add_option("--show-tx-gain-range", action="store_true", default=False, 
-                      help="print min and max Tx gain available on selected daughterboard")
-    pg.usrpx_grp.add_option("-i", "--interp", type="intx", default=None,
-                      help="set fpga interpolation rate to INTERP [default=%default]")
-
-def create_usrp_sink(options):
-    u = blks2.generic_usrp_sink_c(
-        usrpx=options.usrpx,
-        which=options.which,
-        subdev_spec=options.tx_subdev_spec,
-        interface=options.interface,
-        mac_addr=options.mac_addr,
-        fusb_block_size=options.fusb_block_size,
-        fusb_nblocks=options.fusb_nblocks,
-        lo_offset=options.lo_offset,
-        gain=options.tx_gain,
-    )
-    if options.show_tx_gain_range:
-        print "Tx Gain Range: minimum = %g, maximum = %g, step size = %g"%tuple(u.gain_range())
-    return u
diff --git a/gnuradio-core/src/python/gnuradio/vocoder/__init__.py b/gnuradio-core/src/python/gnuradio/vocoder/__init__.py
deleted file mode 100644
index a4917cf64..000000000
--- a/gnuradio-core/src/python/gnuradio/vocoder/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# make this a package
diff --git a/gnuradio-core/src/tests/CMakeLists.txt b/gnuradio-core/src/tests/CMakeLists.txt
new file mode 100644
index 000000000..6de259116
--- /dev/null
+++ b/gnuradio-core/src/tests/CMakeLists.txt
@@ -0,0 +1,69 @@
+# Copyright 2010-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.
+
+########################################################################
+include(GrMiscUtils) #check n def
+GR_CHECK_HDR_N_DEF(sys/resource.h HAVE_SYS_RESOURCE_H)
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(${GRUEL_INCLUDE_DIRS})
+include_directories(${GNURADIO_CORE_INCLUDE_DIRS})
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+include_directories(${CPPUNIT_INCLUDE_DIRS})
+link_directories(${CPPUNIT_LIBRARY_DIRS})
+
+########################################################################
+# Build benchmarks and non-registered tests
+########################################################################
+set(tests_not_run #single source per test
+    benchmark_dotprod_fff.cc
+    benchmark_dotprod_fsf.cc
+    benchmark_dotprod_ccf.cc
+    benchmark_dotprod_fcc.cc
+    benchmark_dotprod_scc.cc
+    benchmark_dotprod_ccc.cc
+    benchmark_nco.cc
+    benchmark_vco.cc
+    test_runtime.cc
+    test_general.cc
+    test_filter.cc
+    #test_atsc.cc
+    test_vmcircbuf.cc
+)
+
+foreach(test_not_run_src ${tests_not_run})
+    get_filename_component(name ${test_not_run_src} NAME_WE)
+    add_executable(${name} ${test_not_run_src})
+    target_link_libraries(${name} test-gnuradio-core)
+endforeach(test_not_run_src)
+
+########################################################################
+# Build the test-all test to end all tests
+# Set the test environment so the build libs will be found under MSVC.
+########################################################################
+include(GrTest)
+set(GR_TEST_TARGET_DEPS gruel gnuradio-core test-gnuradio-core)
+add_executable(gr_core_test_all test_all.cc)
+target_link_libraries(gr_core_test_all test-gnuradio-core)
+GR_ADD_TEST(gr-core-test-all gr_core_test_all)
diff --git a/gnuradio-examples/grc/CMakeLists.txt b/gnuradio-examples/grc/CMakeLists.txt
new file mode 100644
index 000000000..75f10d86a
--- /dev/null
+++ b/gnuradio-examples/grc/CMakeLists.txt
@@ -0,0 +1,86 @@
+# 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.
+
+# AUDIO
+install(
+    FILES
+    audio/cvsd_sweep.grc
+    audio/dial_tone.grc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/audio
+    COMPONENT "gnuadio-examples"
+)
+
+# DEMOD
+install(
+    FILES
+    demod/digital_freq_lock.grc
+    demod/mpsk_demod.grc
+    demod/pam_sync.grc
+    demod/pam_timing.grc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/demod
+    COMPONENT "gnuadio-examples"
+)
+
+# SIMPLE
+install(
+    FILES
+    simple/ber_simulation.grc
+    simple/dpsk_loopback.grc
+    simple/variable_config.grc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/simple
+    COMPONENT "gnuadio-examples"
+)
+
+# TRELLIS
+install(
+    FILES
+    trellis/interference_cancellation.grc
+    trellis/pccc1.grc
+    trellis/pccc.grc
+    trellis/sccc1.grc
+    trellis/sccc.grc
+    trellis/readme.txt
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/trellis
+    COMPONENT "gnuadio-examples"
+)
+
+# UHD
+install(
+    FILES
+    uhd/uhd_const_wave.grc
+    uhd/uhd_dpsk_mod.grc
+    uhd/uhd_fft.grc
+    uhd/uhd_rx_dpsk.grc
+    uhd/uhd_two_tone_loopback.grc
+    uhd/uhd_tx_dpsk.grc
+    uhd/uhd_wbfm_receive.grc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/uhd
+    COMPONENT "gnuadio-examples"
+)
+
+# XMLRPC
+install(
+    FILES
+    xmlrpc/readme.txt
+    xmlrpc/xmlrpc_client.grc
+    xmlrpc/xmlrpc_client_script.py
+    xmlrpc/xmlrpc_server.grc
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/xmlrpc
+    COMPONENT "gnuadio-examples"
+)
diff --git a/gnuradio-examples/grc/Makefile.am b/gnuradio-examples/grc/Makefile.am
index d9a0d9c2c..f8906ea67 100644
--- a/gnuradio-examples/grc/Makefile.am
+++ b/gnuradio-examples/grc/Makefile.am
@@ -44,17 +44,21 @@ dist_simpledata_DATA = \
 trellisdatadir = $(grc_examples_prefix)/trellis
 dist_trellisdata_DATA = \
 	trellis/readme.txt \
-	trellis/interference_cancellation.grc
+	trellis/interference_cancellation.grc \
+	trellis/pccc.grc \
+	trellis/pccc1.grc \
+	trellis/sccc.grc \
+	trellis/sccc1.grc
 
-usrpdatadir = $(grc_examples_prefix)/usrp
-dist_usrpdata_DATA = \
-	usrp/usrp2_const_wave.grc \
-	usrp/usrp2_dpsk_mod.grc \
-	usrp/usrp_rx_dpsk.grc \
-	usrp/usrp_tx_dpsk.grc \
-	usrp/usrp2_fft.grc \
-	usrp/usrp_two_tone_loopback.grc \
-	usrp/usrp_wbfm_receive.grc
+uhddatadir = $(grc_examples_prefix)/uhd
+dist_uhddata_DATA = \
+	uhd/uhd_const_wave.grc \
+	uhd/uhd_dpsk_mod.grc \
+	uhd/uhd_rx_dpsk.grc \
+	uhd/uhd_tx_dpsk.grc \
+	uhd/uhd_fft.grc \
+	uhd/uhd_two_tone_loopback.grc \
+	uhd/uhd_wbfm_receive.grc
 
 xmlrpcdatadir = $(grc_examples_prefix)/xmlrpc
 dist_xmlrpcdata_DATA = \
diff --git a/gnuradio-examples/grc/uhd/.gitignore b/gnuradio-examples/grc/uhd/.gitignore
new file mode 100644
index 000000000..f6c10401f
--- /dev/null
+++ b/gnuradio-examples/grc/uhd/.gitignore
@@ -0,0 +1,2 @@
+*.py
+*.pyc
diff --git a/gnuradio-examples/grc/uhd/uhd_const_wave.grc b/gnuradio-examples/grc/uhd/uhd_const_wave.grc
new file mode 100644
index 000000000..c64721c83
--- /dev/null
+++ b/gnuradio-examples/grc/uhd/uhd_const_wave.grc
@@ -0,0 +1,1020 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Sat Oct  8 10:24:27 2011</timestamp>
+  <block>
+    <key>const_source_x</key>
+    <param>
+      <key>id</key>
+      <value>const_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>const</key>
+      <value>ampl</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(102, 193)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>ampl</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Amplitude</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>.1</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(174, 313)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(318, 314)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD Freq (Hz)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>2.4e9</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2.5e9</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(24, 315)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>uhd_const_wave</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>UHD Constant Wave</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>Example</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>Tune UHD Device</value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>1280, 1024</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>address</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>IP Address</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>addr=192.168.11.2</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>a</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(188, 12)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Sample Rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1e6</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(342, 14)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>uhd_usrp_sink</key>
+    <param>
+      <key>id</key>
+      <value>uhd_usrp_sink_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>dev_addr</key>
+      <value>address</value>
+    </param>
+    <param>
+      <key>sync</key>
+      <value></value>
+    </param>
+    <param>
+      <key>clock_rate</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>num_mboards</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>ref_source0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>nchan</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>center_freq0</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>gain0</key>
+      <value>tun_gain</value>
+    </param>
+    <param>
+      <key>ant0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw0</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant11</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant12</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant13</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant14</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant15</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant16</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant17</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant18</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant19</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant20</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant21</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant22</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant23</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant24</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant25</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant26</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant27</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant28</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant29</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant30</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant31</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(308, 169)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Frequency</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>2.45e9</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>f</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(468, 14)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>g</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(616, 13)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>const_source_x_0</source_block_id>
+    <sink_block_id>uhd_usrp_sink_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/uhd/uhd_dpsk_mod.grc b/gnuradio-examples/grc/uhd/uhd_dpsk_mod.grc
new file mode 100644
index 000000000..18ae9c3db
--- /dev/null
+++ b/gnuradio-examples/grc/uhd/uhd_dpsk_mod.grc
@@ -0,0 +1,2238 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Sat Oct  8 14:44:48 2011</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>uhd_dpsk_mod</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>UHD DPSK Modulation</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>Example</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>Generate a DPSK signal</value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>1280, 1024</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>samps_per_sym</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>8</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(33, 280)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_fftsink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_fftsink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>FFT Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>baseband_freq</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>y_per_div</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>y_divs</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ref_scale</key>
+      <value>2.0</value>
+    </param>
+    <param>
+      <key>fft_size</key>
+      <value>1024</value>
+    </param>
+    <param>
+      <key>fft_rate</key>
+      <value>30</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>win</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(697, 248)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_scopesink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_scopesink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Scope Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>v_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>v_offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>t_scale</key>
+      <value>1e-6</value>
+    </param>
+    <param>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(469, 355)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>random_source_x</key>
+    <param>
+      <key>id</key>
+      <value>random_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>byte</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>256</value>
+    </param>
+    <param>
+      <key>num_samps</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>repeat</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(245, 139)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_multiply_const_vxx</key>
+    <param>
+      <key>id</key>
+      <value>gr_multiply_const_vxx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>const</key>
+      <value>ampl</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(647, 163)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_rx_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD RX Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>rx_gain</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(477, 509)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>rx_freq_off</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>RX Freq Offset (Hz)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>freq_offset</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-50e3</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>+50e3</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(190, 507)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>rx_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default RX Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1137, 8)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>freq_offset</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Rx Frequency Offset</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>o</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(824, 8)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>uhd_usrp_source</key>
+    <param>
+      <key>id</key>
+      <value>uhd_usrp_source_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>dev_addr</key>
+      <value>address1</value>
+    </param>
+    <param>
+      <key>sync</key>
+      <value></value>
+    </param>
+    <param>
+      <key>clock_rate</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>num_mboards</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>ref_source0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>nchan</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>center_freq0</key>
+      <value>tun_freq+rx_freq_off</value>
+    </param>
+    <param>
+      <key>gain0</key>
+      <value>tun_rx_gain</value>
+    </param>
+    <param>
+      <key>ant0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw0</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant11</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant12</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant13</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant14</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant15</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant16</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant17</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant18</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant19</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant20</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant21</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant22</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant23</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant24</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant25</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant26</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant27</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant28</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant29</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant30</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant31</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(216, 288)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_constellationsink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_constellationsink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Constellation Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>frame_rate</key>
+      <value>5</value>
+    </param>
+    <param>
+      <key>const_size</key>
+      <value>2048</value>
+    </param>
+    <param>
+      <key>M</key>
+      <value>4</value>
+    </param>
+    <param>
+      <key>theta</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>loop_bw</key>
+      <value>6.28/100.0</value>
+    </param>
+    <param>
+      <key>fmax</key>
+      <value>0.06</value>
+    </param>
+    <param>
+      <key>mu</key>
+      <value>0.5</value>
+    </param>
+    <param>
+      <key>gain_mu</key>
+      <value>0.005</value>
+    </param>
+    <param>
+      <key>symbol_rate</key>
+      <value>samp_rate/samps_per_sym</value>
+    </param>
+    <param>
+      <key>omega_limit</key>
+      <value>0.005</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(862, 336)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_dxpsk_mod</key>
+    <param>
+      <key>id</key>
+      <value>digital_dxpsk_mod_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>dqpsk</value>
+    </param>
+    <param>
+      <key>samples_per_symbol</key>
+      <value>samps_per_sym</value>
+    </param>
+    <param>
+      <key>excess_bw</key>
+      <value>0.35</value>
+    </param>
+    <param>
+      <key>gray_coded</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>verbose</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(426, 139)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>ampl</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Amplitude</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>.1</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(33, 353)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>uhd_usrp_sink</key>
+    <param>
+      <key>id</key>
+      <value>uhd_usrp_sink_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>dev_addr</key>
+      <value>address0</value>
+    </param>
+    <param>
+      <key>sync</key>
+      <value></value>
+    </param>
+    <param>
+      <key>clock_rate</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>num_mboards</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>ref_source0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>nchan</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>center_freq0</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>gain0</key>
+      <value>tun_rx_gain</value>
+    </param>
+    <param>
+      <key>ant0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw0</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant11</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant12</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant13</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant14</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant15</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant16</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant17</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant18</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant19</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant20</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant21</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant22</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant23</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant24</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant25</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant26</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant27</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant28</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant29</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant30</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant31</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(838, 139)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_tx_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD TX Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>tx_gain</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(351, 508)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>address0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>IP Address, Dev 0</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>addr=192.168.10.2</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(197, 11)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>address1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>IP Address, Dev 1</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>addr=192.168.11.2</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(357, 11)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Sample Rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1e6</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(543, 8)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Frequency</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>2.45e9</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>f</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(669, 8)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>tx_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default TX Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1003, 8)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Freq (Hz)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>2.4e9</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2.5e9</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(35, 506)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>wxgui_constellationsink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_multiply_const_vxx_0</source_block_id>
+    <sink_block_id>uhd_usrp_sink_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>digital_dxpsk_mod_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_dxpsk_mod_0</source_block_id>
+    <sink_block_id>gr_multiply_const_vxx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/uhd/uhd_fft.grc b/gnuradio-examples/grc/uhd/uhd_fft.grc
new file mode 100644
index 000000000..29c375065
--- /dev/null
+++ b/gnuradio-examples/grc/uhd/uhd_fft.grc
@@ -0,0 +1,1025 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Sat Oct  8 10:26:30 2011</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>uhd_fft</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>UHD FFT Plotter</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>Example</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>FFT waveform plot</value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>1280, 1024</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>g</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(633, 17)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Frequency</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>2.45e9</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>f</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(485, 18)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>address</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>IP Address</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>addr=192.168.11.2</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>a</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(205, 16)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Sample Rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1e6</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(359, 18)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_fftsink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_fftsink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>FFT Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>baseband_freq</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>y_per_div</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>y_divs</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ref_scale</key>
+      <value>2.0</value>
+    </param>
+    <param>
+      <key>fft_size</key>
+      <value>1024</value>
+    </param>
+    <param>
+      <key>fft_rate</key>
+      <value>30</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>win</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(479, 176)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>uhd_usrp_source</key>
+    <param>
+      <key>id</key>
+      <value>uhd_usrp_source_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>dev_addr</key>
+      <value>address</value>
+    </param>
+    <param>
+      <key>sync</key>
+      <value></value>
+    </param>
+    <param>
+      <key>clock_rate</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>num_mboards</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>ref_source0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>nchan</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>center_freq0</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>gain0</key>
+      <value>tun_gain</value>
+    </param>
+    <param>
+      <key>ant0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw0</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant11</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant12</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant13</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant14</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant15</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant16</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant17</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant18</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant19</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant20</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant21</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant22</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant23</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant24</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant25</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant26</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant27</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant28</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant29</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant30</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant31</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(212, 216)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD Freq (Hz)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>2.4e9</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2.5e9</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(36, 376)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(177, 377)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/uhd/uhd_rx_dpsk.grc b/gnuradio-examples/grc/uhd/uhd_rx_dpsk.grc
new file mode 100644
index 000000000..73848ff3c
--- /dev/null
+++ b/gnuradio-examples/grc/uhd/uhd_rx_dpsk.grc
@@ -0,0 +1,1431 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Sat Oct  8 15:08:55 2011</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>uhd_rx_dpsk</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>UHD RX DPSK</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value></value>
+    </param>
+    <param>
+      <key>description</key>
+      <value></value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>1280, 1024</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(12, 9)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>samps_per_sym</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>4</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(12, 88)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Sample Rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1e6</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(339, 11)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Frequency</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>2.45e9</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>f</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(466, 11)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>g</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(624, 14)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>address</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>IP Address</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>addr=192.168.10.2</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>a</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(186, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>freq_offset</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Rx Frequency Offset</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>o</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(748, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Freq (Hz)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>2.4e9</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2.5e9</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(12, 436)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_null_sink</key>
+    <param>
+      <key>id</key>
+      <value>gr_null_sink_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>byte</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(615, 144)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>timing_bw</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Timing Loop BW</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>6.28/100.0</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(604, 436)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>phase_bw</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Phase Loop BW</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>6.28/100.0</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(461, 436)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_constellationsink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_constellationsink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Constellation Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>frame_rate</key>
+      <value>5</value>
+    </param>
+    <param>
+      <key>const_size</key>
+      <value>2048</value>
+    </param>
+    <param>
+      <key>M</key>
+      <value>4</value>
+    </param>
+    <param>
+      <key>theta</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>loop_bw</key>
+      <value>6.28/100.0</value>
+    </param>
+    <param>
+      <key>fmax</key>
+      <value>0.06</value>
+    </param>
+    <param>
+      <key>mu</key>
+      <value>0.5</value>
+    </param>
+    <param>
+      <key>gain_mu</key>
+      <value>0.005</value>
+    </param>
+    <param>
+      <key>symbol_rate</key>
+      <value>samp_rate/samps_per_sym</value>
+    </param>
+    <param>
+      <key>omega_limit</key>
+      <value>0.005</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(931, 313)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_fftsink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_fftsink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>FFT Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>baseband_freq</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>y_per_div</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>y_divs</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ref_scale</key>
+      <value>2.0</value>
+    </param>
+    <param>
+      <key>fft_size</key>
+      <value>1024</value>
+    </param>
+    <param>
+      <key>fft_rate</key>
+      <value>30</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>win</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(710, 236)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_dxpsk_demod</key>
+    <param>
+      <key>id</key>
+      <value>digital_dxpsk_demod_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>dqpsk</value>
+    </param>
+    <param>
+      <key>samples_per_symbol</key>
+      <value>samps_per_sym</value>
+    </param>
+    <param>
+      <key>excess_bw</key>
+      <value>0.35</value>
+    </param>
+    <param>
+      <key>phase_bw</key>
+      <value>6.28/100.0</value>
+    </param>
+    <param>
+      <key>timing_bw</key>
+      <value>6.28/100.0</value>
+    </param>
+    <param>
+      <key>omega_relative_limit</key>
+      <value>0.005</value>
+    </param>
+    <param>
+      <key>gray_coded</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>verbose</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>sync_out</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(303, 154)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>rx_freq_off</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>RX Freq Offset (Hz)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>freq_offset</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-100e3</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>+100e3</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(149, 437)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(306, 438)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>uhd_usrp_source</key>
+    <param>
+      <key>id</key>
+      <value>uhd_usrp_source_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>dev_addr</key>
+      <value>address</value>
+    </param>
+    <param>
+      <key>sync</key>
+      <value></value>
+    </param>
+    <param>
+      <key>clock_rate</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>num_mboards</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>ref_source0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>nchan</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>center_freq0</key>
+      <value>tun_freq+rx_freq_off</value>
+    </param>
+    <param>
+      <key>gain0</key>
+      <value>tun_gain</value>
+    </param>
+    <param>
+      <key>ant0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw0</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant11</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant12</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant13</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant14</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant15</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant16</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant17</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant18</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant19</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant20</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant21</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant22</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant23</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant24</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant25</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant26</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant27</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant28</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant29</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant30</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant31</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(18, 276)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>digital_dxpsk_demod_0</source_block_id>
+    <sink_block_id>gr_null_sink_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>digital_dxpsk_demod_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>wxgui_constellationsink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/uhd/uhd_two_tone_loopback.grc b/gnuradio-examples/grc/uhd/uhd_two_tone_loopback.grc
new file mode 100644
index 000000000..8bcbc0792
--- /dev/null
+++ b/gnuradio-examples/grc/uhd/uhd_two_tone_loopback.grc
@@ -0,0 +1,2204 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Sat Oct  8 15:27:04 2011</timestamp>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>tx_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default TX Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(999, 11)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Frequency</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>2.45e9</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>f</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(665, 11)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>freq_offset</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Rx Frequency Offset</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>o</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(820, 11)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>address1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>IP Address, Dev 1</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>addr=192.168.11.2</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(353, 14)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>address0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>IP Address, Dev 0</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>addr=192.168.10.2</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(193, 14)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_sig_source_x</key>
+    <param>
+      <key>id</key>
+      <value>gr_sig_source_x</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>waveform</key>
+      <value>gr.GR_COS_WAVE</value>
+    </param>
+    <param>
+      <key>freq</key>
+      <value>tone1</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>tone_ampl</value>
+    </param>
+    <param>
+      <key>offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(258, 136)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_sig_source_x</key>
+    <param>
+      <key>id</key>
+      <value>gr_sig_source_x0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>waveform</key>
+      <value>gr.GR_COS_WAVE</value>
+    </param>
+    <param>
+      <key>freq</key>
+      <value>tone2</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>tone_ampl</value>
+    </param>
+    <param>
+      <key>offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(259, 248)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_noise_source_x</key>
+    <param>
+      <key>id</key>
+      <value>gr_noise_source_x</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>noise_type</key>
+      <value>gr.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>amp</key>
+      <value>noise_ampl</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(279, 364)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>uhd_usrp_sink</key>
+    <param>
+      <key>id</key>
+      <value>uhd_usrp_sink_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>dev_addr</key>
+      <value>address0</value>
+    </param>
+    <param>
+      <key>sync</key>
+      <value></value>
+    </param>
+    <param>
+      <key>clock_rate</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>num_mboards</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>ref_source0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>nchan</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>center_freq0</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>gain0</key>
+      <value>tun_rx_gain</value>
+    </param>
+    <param>
+      <key>ant0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw0</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant11</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant12</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant13</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant14</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant15</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant16</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant17</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant18</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant19</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant20</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant21</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant22</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant23</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant24</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant25</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant26</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant27</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant28</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant29</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant30</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant31</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(669, 178)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>rx_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default RX Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1139, 12)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tone1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Tone 1</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>50e3</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-samp_rate/2</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>samp_rate/2</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>0, 0, 1, 4</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(161, 484)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tone2</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Tone 2</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>75e3</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-samp_rate/2</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>samp_rate/2</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>0, 4, 1, 4</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(308, 483)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_tx_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD TX Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>tx_gain</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(655, 486)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Freq (Hz)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>2.4e9</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2.5e9</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(514, 487)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_rx_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD RX Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>rx_gain</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(781, 487)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>uhd_usrp_source</key>
+    <param>
+      <key>id</key>
+      <value>uhd_usrp_source_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>dev_addr</key>
+      <value>address1</value>
+    </param>
+    <param>
+      <key>sync</key>
+      <value></value>
+    </param>
+    <param>
+      <key>clock_rate</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>num_mboards</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>ref_source0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>nchan</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>center_freq0</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>gain0</key>
+      <value>tun_rx_gain</value>
+    </param>
+    <param>
+      <key>ant0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw0</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant11</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant12</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant13</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant14</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant15</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant16</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant17</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant18</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant19</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant20</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant21</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant22</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant23</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant24</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant25</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant26</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant27</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant28</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant29</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant30</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant31</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(672, 320)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tone_ampl</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Tone Ampl</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0.15</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_VERTICAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 0, 2, 1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(14, 485)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>noise_ampl</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Noise Ampl</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0.1</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_VERTICAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 1, 2, 1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(15, 335)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_add_xx</key>
+    <param>
+      <key>id</key>
+      <value>gr_add_xx</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>3</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(529, 172)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>uhd_two_tone_loopback</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>UHD Loopback - 2 Tone</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>Example</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>Loopback test</value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>1280, 1024</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_fftsink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_fftsink2</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>FFT Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>baseband_freq</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>y_per_div</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>y_divs</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ref_scale</key>
+      <value>2.0</value>
+    </param>
+    <param>
+      <key>fft_size</key>
+      <value>512*2</value>
+    </param>
+    <param>
+      <key>fft_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>win</key>
+      <value>window.blackmanharris</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 2, 2, 4</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1114, 264)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Sample Rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>500e3</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(539, 11)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>gr_noise_source_x</source_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>2</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sig_source_x0</source_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_sig_source_x</source_block_id>
+    <sink_block_id>gr_add_xx</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_xx</source_block_id>
+    <sink_block_id>uhd_usrp_sink_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>wxgui_fftsink2</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/uhd/uhd_tx_dpsk.grc b/gnuradio-examples/grc/uhd/uhd_tx_dpsk.grc
new file mode 100644
index 000000000..281ba8429
--- /dev/null
+++ b/gnuradio-examples/grc/uhd/uhd_tx_dpsk.grc
@@ -0,0 +1,1234 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Sat Oct  8 14:55:39 2011</timestamp>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>samps_per_sym</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>4</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 100)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>ampl</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Amplitude</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>.1</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(7, 299)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Sample Rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1e6</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(334, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Frequency</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>2.45e9</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>f</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(463, 17)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(151, 441)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Freq (Hz)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>2.4e9</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2.5e9</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(7, 441)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>random_source_x</key>
+    <param>
+      <key>id</key>
+      <value>random_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>byte</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2**8</value>
+    </param>
+    <param>
+      <key>num_samps</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>repeat</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(177, 162)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_dxpsk_mod</key>
+    <param>
+      <key>id</key>
+      <value>digital_dxpsk_mod_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>dqpsk</value>
+    </param>
+    <param>
+      <key>samples_per_symbol</key>
+      <value>samps_per_sym</value>
+    </param>
+    <param>
+      <key>excess_bw</key>
+      <value>0.35</value>
+    </param>
+    <param>
+      <key>gray_coded</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>verbose</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(366, 162)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>g</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(619, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>address</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>IP Address</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>addr=192.168.10.2</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>a</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(177, 14)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>uhd_usrp_sink</key>
+    <param>
+      <key>id</key>
+      <value>uhd_usrp_sink_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>dev_addr</key>
+      <value>address</value>
+    </param>
+    <param>
+      <key>sync</key>
+      <value></value>
+    </param>
+    <param>
+      <key>clock_rate</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>num_mboards</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>ref_source0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>nchan</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>center_freq0</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>gain0</key>
+      <value>tun_gain</value>
+    </param>
+    <param>
+      <key>ant0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw0</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant11</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant12</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant13</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant14</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant15</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant16</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant17</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant18</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant19</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant20</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant21</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant22</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant23</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant24</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant25</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant26</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant27</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant28</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant29</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant30</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant31</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(783, 162)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_multiply_const_vxx</key>
+    <param>
+      <key>id</key>
+      <value>gr_multiply_const_vxx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>const</key>
+      <value>ampl</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(566, 186)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_fftsink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_fftsink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Transmit Spectrum</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>baseband_freq</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>y_per_div</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>y_divs</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ref_scale</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>fft_size</key>
+      <value>1024</value>
+    </param>
+    <param>
+      <key>fft_rate</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>win</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(827, 299)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>uhd_tx_dpsk</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>UHD TX DPSK</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value></value>
+    </param>
+    <param>
+      <key>description</key>
+      <value></value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>1280, 1024</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>digital_dxpsk_mod_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_multiply_const_vxx_0</source_block_id>
+    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_multiply_const_vxx_0</source_block_id>
+    <sink_block_id>uhd_usrp_sink_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_dxpsk_mod_0</source_block_id>
+    <sink_block_id>gr_multiply_const_vxx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/uhd/uhd_wbfm_receive.grc b/gnuradio-examples/grc/uhd/uhd_wbfm_receive.grc
new file mode 100644
index 000000000..62658a2eb
--- /dev/null
+++ b/gnuradio-examples/grc/uhd/uhd_wbfm_receive.grc
@@ -0,0 +1,1365 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+  <timestamp>Sat Oct  8 15:18:49 2011</timestamp>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>uhd_wbfm_receive</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>UHD WBFM Receive</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>Example</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>WBFM Receive</value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>1280, 1024</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>g</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(631, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Default Frequency</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>93.3e6</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>f</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(479, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Freq (Hz)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>87.9e6</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>108.1e6</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(15, 441)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>fine</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Fine Freq (MHz)</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-.1</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>.1</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>0, 2, 1, 2</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(277, 444)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>tun_gain</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>UHD Gain</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>gain</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(158, 440)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>volume</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Volume</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 0, 1, 4</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(436, 446)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_multiply_const_vxx</key>
+    <param>
+      <key>id</key>
+      <value>gr_multiply_const_vxx</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>const</key>
+      <value>volume</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(836, 161)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>uhd_usrp_source</key>
+    <param>
+      <key>id</key>
+      <value>uhd_usrp_source_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>dev_addr</key>
+      <value>address</value>
+    </param>
+    <param>
+      <key>sync</key>
+      <value></value>
+    </param>
+    <param>
+      <key>clock_rate</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>num_mboards</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>ref_source0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>ref_source7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>sd_spec7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>nchan</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>center_freq0</key>
+      <value>tun_freq+fine</value>
+    </param>
+    <param>
+      <key>gain0</key>
+      <value>tun_gain</value>
+    </param>
+    <param>
+      <key>ant0</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw0</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw3</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw4</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw6</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw10</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant11</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw11</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant12</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw12</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant13</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw13</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant14</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw14</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant15</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw15</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant16</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw16</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant17</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw17</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant18</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw18</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant19</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw19</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant20</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant21</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw21</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant22</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw22</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant23</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw23</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant24</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw24</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant25</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw25</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant26</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw26</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant27</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw27</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant28</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw28</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant29</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw29</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant30</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw30</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant31</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw31</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(14, 165)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>address</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>IP Address</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>addr=192.168.10.2</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>a</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(199, 14)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_fftsink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_fftsink2</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>FFT Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>baseband_freq</key>
+      <value>(freq+fine)*1e6</value>
+    </param>
+    <param>
+      <key>y_per_div</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>y_divs</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ref_scale</key>
+      <value>2.0</value>
+    </param>
+    <param>
+      <key>fft_size</key>
+      <value>512</value>
+    </param>
+    <param>
+      <key>fft_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>win</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>2, 0, 2, 4</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(624, 278)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Sample Rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>400e3</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>s</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(352, 15)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>audio_output</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Audio Output Device</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value></value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value>O</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(769, 13)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>audio_sink</key>
+    <param>
+      <key>id</key>
+      <value>audio_sink</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>int(samp_rate/audio_decim)</value>
+    </param>
+    <param>
+      <key>device_name</key>
+      <value>audio_output</value>
+    </param>
+    <param>
+      <key>ok_to_block</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1023, 161)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>blks2_wfm_rcv</key>
+    <param>
+      <key>id</key>
+      <value>blks2_wfm_rcv</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>quad_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>audio_decimation</key>
+      <value>audio_decim</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(626, 153)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>low_pass_filter</key>
+    <param>
+      <key>id</key>
+      <value>low_pass_filter_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>fir_filter_ccf</value>
+    </param>
+    <param>
+      <key>decim</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>interp</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>gain</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>cutoff_freq</key>
+      <value>115e3</value>
+    </param>
+    <param>
+      <key>width</key>
+      <value>30e3</value>
+    </param>
+    <param>
+      <key>win</key>
+      <value>firdes.WIN_HANN</value>
+    </param>
+    <param>
+      <key>beta</key>
+      <value>6.76</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(326, 141)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>audio_decim</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(19, 351)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <connection>
+    <source_block_id>gr_multiply_const_vxx</source_block_id>
+    <sink_block_id>audio_sink</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>blks2_wfm_rcv</source_block_id>
+    <sink_block_id>gr_multiply_const_vxx</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>low_pass_filter_0</source_block_id>
+    <sink_block_id>blks2_wfm_rcv</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>low_pass_filter_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>low_pass_filter_0</source_block_id>
+    <sink_block_id>wxgui_fftsink2</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/usrp/usrp2_const_wave.grc b/gnuradio-examples/grc/usrp/usrp2_const_wave.grc
deleted file mode 100644
index fdbd7c1f3..000000000
--- a/gnuradio-examples/grc/usrp/usrp2_const_wave.grc
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version='1.0' encoding='ASCII'?>
-<flow_graph>
-  <timestamp>Wed Apr 15 11:22:56 2009</timestamp>
-  <block>
-    <key>const_source_x</key>
-    <param>
-      <key>id</key>
-      <value>const_source_x_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>const</key>
-      <value>ampl</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(284, 154)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>usrp2_sink_xxxx</key>
-    <param>
-      <key>id</key>
-      <value>usrp2_sink_xxxx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>interface</key>
-      <value></value>
-    </param>
-    <param>
-      <key>mac_addr</key>
-      <value></value>
-    </param>
-    <param>
-      <key>interpolation</key>
-      <value>interp</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>tun_freq</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(493, 106)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>interp</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>16</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(16, 255)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>tun_freq</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>USRP2 Freq (Hz)</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>2.45e9</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>2.4e9</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>2.5e9</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>slider_length</key>
-      <value>200</value>
-    </param>
-    <param>
-      <key>slider_type</key>
-      <value>horizontal</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(30, 376)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>ampl</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Amplitude</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>.1</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>slider_length</key>
-      <value>200</value>
-    </param>
-    <param>
-      <key>slider_type</key>
-      <value>horizontal</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(204, 376)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>options</key>
-    <param>
-      <key>id</key>
-      <value>usrp2_const_wave</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>USRP2 Constant Wave</value>
-    </param>
-    <param>
-      <key>author</key>
-      <value>Example</value>
-    </param>
-    <param>
-      <key>description</key>
-      <value>Tune USRP2</value>
-    </param>
-    <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
-    </param>
-    <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
-    </param>
-    <param>
-      <key>category</key>
-      <value>Custom</value>
-    </param>
-    <param>
-      <key>realtime_scheduling</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(10, 10)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <connection>
-    <source_block_id>const_source_x_0</source_block_id>
-    <sink_block_id>usrp2_sink_xxxx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-</flow_graph>
diff --git a/gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc b/gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc
deleted file mode 100644
index e9f9b41ea..000000000
--- a/gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc
+++ /dev/null
@@ -1,693 +0,0 @@
-<?xml version='1.0' encoding='ASCII'?>
-<flow_graph>
-  <timestamp>Wed Apr 15 17:31:00 2009</timestamp>
-  <block>
-    <key>options</key>
-    <param>
-      <key>id</key>
-      <value>usrp2_dpsk_mod</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>USRP2 DPSK Modulation</value>
-    </param>
-    <param>
-      <key>author</key>
-      <value>Example</value>
-    </param>
-    <param>
-      <key>description</key>
-      <value>Generate a DPSK signal</value>
-    </param>
-    <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
-    </param>
-    <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
-    </param>
-    <param>
-      <key>category</key>
-      <value>Custom</value>
-    </param>
-    <param>
-      <key>realtime_scheduling</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(10, 10)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>100e6/interp</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(52, 166)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>usrp2_sink_xxxx</key>
-    <param>
-      <key>id</key>
-      <value>usrp2_sink_xxxx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>interface</key>
-      <value></value>
-    </param>
-    <param>
-      <key>mac_addr</key>
-      <value></value>
-    </param>
-    <param>
-      <key>interpolation</key>
-      <value>interp</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>tun_freq</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(1059, 56)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_multiply_const_vxx</key>
-    <param>
-      <key>id</key>
-      <value>gr_multiply_const_vxx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>const</key>
-      <value>ampl</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(679, 58)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>blks2_dxpsk_mod</key>
-    <param>
-      <key>id</key>
-      <value>blks2_dxpsk_mod_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>dqpsk</value>
-    </param>
-    <param>
-      <key>samples_per_symbol</key>
-      <value>samps_per_sym</value>
-    </param>
-    <param>
-      <key>excess_bw</key>
-      <value>0.35</value>
-    </param>
-    <param>
-      <key>gray_code</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(468, 55)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>interp</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(31, 256)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>samps_per_sym</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>8</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(126, 250)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>random_source_x</key>
-    <param>
-      <key>id</key>
-      <value>random_source_x_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>byte</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>256</value>
-    </param>
-    <param>
-      <key>num_samps</key>
-      <value>1000</value>
-    </param>
-    <param>
-      <key>repeat</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(255, 39)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>ampl</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Amplitude</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>.1</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(246, 372)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>rx_freq_off</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>RX Freq Offset (Hz)</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>-20e3</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>-50e3</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>+50e3</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(247, 508)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>tun_freq</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>USRP2 Freq (Hz)</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>2.45e9</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>2.4e9</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>2.5e9</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(49, 341)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>wxgui_constellationsink2</key>
-    <param>
-      <key>id</key>
-      <value>wxgui_constellationsink2_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>Constellation Plot</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>frame_rate</key>
-      <value>5</value>
-    </param>
-    <param>
-      <key>const_size</key>
-      <value>2048</value>
-    </param>
-    <param>
-      <key>M</key>
-      <value>4</value>
-    </param>
-    <param>
-      <key>theta</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>alpha</key>
-      <value>0.005</value>
-    </param>
-    <param>
-      <key>fmax</key>
-      <value>0.06</value>
-    </param>
-    <param>
-      <key>mu</key>
-      <value>0.5</value>
-    </param>
-    <param>
-      <key>gain_mu</key>
-      <value>0.005</value>
-    </param>
-    <param>
-      <key>symbol_rate</key>
-      <value>samp_rate/samps_per_sym</value>
-    </param>
-    <param>
-      <key>omega_limit</key>
-      <value>0.005</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(920, 202)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>wxgui_fftsink2</key>
-    <param>
-      <key>id</key>
-      <value>wxgui_fftsink2_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>FFT Plot</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>baseband_freq</key>
-      <value>tun_freq</value>
-    </param>
-    <param>
-      <key>y_per_div</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>ref_level</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>fft_size</key>
-      <value>1024</value>
-    </param>
-    <param>
-      <key>fft_rate</key>
-      <value>30</value>
-    </param>
-    <param>
-      <key>peak_hold</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>average</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>avg_alpha</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(691, 155)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>wxgui_scopesink2</key>
-    <param>
-      <key>id</key>
-      <value>wxgui_scopesink2_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>Scope Plot</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>v_scale</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>t_scale</key>
-      <value>1e-6</value>
-    </param>
-    <param>
-      <key>ac_couple</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>xy_mode</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(515, 272)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>usrp2_source_xxxx</key>
-    <param>
-      <key>id</key>
-      <value>usrp2_source_xxxx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>interface</key>
-      <value>eth1</value>
-    </param>
-    <param>
-      <key>mac_addr</key>
-      <value></value>
-    </param>
-    <param>
-      <key>decimation</key>
-      <value>interp</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>tun_freq + rx_freq_off</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>30</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(270, 200)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <connection>
-    <source_block_id>random_source_x_0</source_block_id>
-    <sink_block_id>blks2_dxpsk_mod_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>blks2_dxpsk_mod_0</source_block_id>
-    <sink_block_id>gr_multiply_const_vxx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>usrp2_sink_xxxx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>usrp2_source_xxxx_0</source_block_id>
-    <sink_block_id>wxgui_constellationsink2_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>usrp2_source_xxxx_0</source_block_id>
-    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>usrp2_source_xxxx_0</source_block_id>
-    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-</flow_graph>
diff --git a/gnuradio-examples/grc/usrp/usrp_rx_dpsk.grc b/gnuradio-examples/grc/usrp/usrp_rx_dpsk.grc
deleted file mode 100644
index 9843ee6b0..000000000
--- a/gnuradio-examples/grc/usrp/usrp_rx_dpsk.grc
+++ /dev/null
@@ -1,727 +0,0 @@
-<?xml version='1.0' encoding='ASCII'?>
-<flow_graph>
-  <timestamp>Wed Dec  2 11:03:20 2009</timestamp>
-  <block>
-    <key>options</key>
-    <param>
-      <key>id</key>
-      <value>usrp_rx_dpsk</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>USRP RX DPSK</value>
-    </param>
-    <param>
-      <key>author</key>
-      <value></value>
-    </param>
-    <param>
-      <key>description</key>
-      <value></value>
-    </param>
-    <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
-    </param>
-    <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
-    </param>
-    <param>
-      <key>category</key>
-      <value>Custom</value>
-    </param>
-    <param>
-      <key>run_options</key>
-      <value>prompt</value>
-    </param>
-    <param>
-      <key>run</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>realtime_scheduling</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(12, 9)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>samps_per_sym</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>4</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(14, 79)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>bb_freq</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>2.45e9</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(18, 151)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>p2p</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>2.0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(13, 314)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>timing_alpha</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Timing Alpha</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>.1</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>.5</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(759, 365)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_null_sink</key>
-    <param>
-      <key>id</key>
-      <value>gr_null_sink_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>byte</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(815, 80)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>costas_alpha</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Costas Alpha</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>0.175</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>.5</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(598, 367)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>wxgui_fftsink2</key>
-    <param>
-      <key>id</key>
-      <value>wxgui_fftsink2_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>Receive Spectrum</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>baseband_freq</key>
-      <value>bb_freq</value>
-    </param>
-    <param>
-      <key>y_per_div</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>y_divs</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>ref_level</key>
-      <value>-40</value>
-    </param>
-    <param>
-      <key>ref_scale</key>
-      <value>p2p</value>
-    </param>
-    <param>
-      <key>fft_size</key>
-      <value>1024</value>
-    </param>
-    <param>
-      <key>fft_rate</key>
-      <value>15</value>
-    </param>
-    <param>
-      <key>peak_hold</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>average</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>avg_alpha</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>win</key>
-      <value>None</value>
-    </param>
-    <param>
-      <key>win_size</key>
-      <value></value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(383, 321)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>1e6/4</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(20, 234)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>gain</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Gain</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>20</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>70</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(152, 378)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>usrp2_source_xxxx</key>
-    <param>
-      <key>id</key>
-      <value>usrp2_source_xxxx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>interface</key>
-      <value></value>
-    </param>
-    <param>
-      <key>mac_addr</key>
-      <value></value>
-    </param>
-    <param>
-      <key>decimation</key>
-      <value>int(100e6/samp_rate)</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>bb_freq</value>
-    </param>
-    <param>
-      <key>lo_offset</key>
-      <value>float('inf')</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>gain</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(158, 51)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>usrp_simple_source_x</key>
-    <param>
-      <key>id</key>
-      <value>usrp_simple_source_x_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>format</key>
-      <value></value>
-    </param>
-    <param>
-      <key>which</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>decimation</key>
-      <value>int(64e6/samp_rate)</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>bb_freq</value>
-    </param>
-    <param>
-      <key>lo_offset</key>
-      <value>float('inf')</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>gain</value>
-    </param>
-    <param>
-      <key>side</key>
-      <value>B</value>
-    </param>
-    <param>
-      <key>rx_ant</key>
-      <value>TX/RX</value>
-    </param>
-    <param>
-      <key>hb_filters</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(154, 218)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>blks2_dxpsk2_demod</key>
-    <param>
-      <key>id</key>
-      <value>blks2_dxpsk2_demod_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>dqpsk</value>
-    </param>
-    <param>
-      <key>samples_per_symbol</key>
-      <value>samps_per_sym</value>
-    </param>
-    <param>
-      <key>excess_bw</key>
-      <value>0.35</value>
-    </param>
-    <param>
-      <key>costas_alpha</key>
-      <value>costas_alpha</value>
-    </param>
-    <param>
-      <key>timing_alpha</key>
-      <value>timing_alpha</value>
-    </param>
-    <param>
-      <key>timing_max_dev</key>
-      <value>1.5</value>
-    </param>
-    <param>
-      <key>omega_relative_limit</key>
-      <value>0.005</value>
-    </param>
-    <param>
-      <key>gray_code</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>verbose</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>log</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>sync_out</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(487, 64)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>wxgui_scopesink2</key>
-    <param>
-      <key>id</key>
-      <value>wxgui_scopesink2_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>Recovered DQPSK Constellation</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate/4/20</value>
-    </param>
-    <param>
-      <key>v_scale</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>v_offset</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>t_scale</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ac_couple</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>xy_mode</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>win_size</key>
-      <value></value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(760, 239)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_keep_one_in_n</key>
-    <param>
-      <key>id</key>
-      <value>gr_keep_one_in_n_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>n</key>
-      <value>20</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(873, 151)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <connection>
-    <source_block_id>usrp2_source_xxxx_0</source_block_id>
-    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>usrp2_source_xxxx_0</source_block_id>
-    <sink_block_id>blks2_dxpsk2_demod_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>blks2_dxpsk2_demod_0</source_block_id>
-    <sink_block_id>gr_null_sink_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>blks2_dxpsk2_demod_0</source_block_id>
-    <sink_block_id>gr_keep_one_in_n_0</sink_block_id>
-    <source_key>1</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_keep_one_in_n_0</source_block_id>
-    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-</flow_graph>
diff --git a/gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc b/gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc
deleted file mode 100644
index 3df977044..000000000
--- a/gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc
+++ /dev/null
@@ -1,749 +0,0 @@
-<?xml version='1.0' encoding='ASCII'?>
-<flow_graph>
-  <timestamp>Fri Apr 17 18:23:35 2009</timestamp>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>64e6/200</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(9, 166)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>tun_freq</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>int(100e6)</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(116, 166)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_sig_source_x</key>
-    <param>
-      <key>id</key>
-      <value>gr_sig_source_x</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>waveform</key>
-      <value>gr.GR_COS_WAVE</value>
-    </param>
-    <param>
-      <key>freq</key>
-      <value>tone1</value>
-    </param>
-    <param>
-      <key>amp</key>
-      <value>tone_ampl</value>
-    </param>
-    <param>
-      <key>offset</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(258, 20)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_sig_source_x</key>
-    <param>
-      <key>id</key>
-      <value>gr_sig_source_x0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>waveform</key>
-      <value>gr.GR_COS_WAVE</value>
-    </param>
-    <param>
-      <key>freq</key>
-      <value>tone2</value>
-    </param>
-    <param>
-      <key>amp</key>
-      <value>tone_ampl</value>
-    </param>
-    <param>
-      <key>offset</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(255, 179)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_add_xx</key>
-    <param>
-      <key>id</key>
-      <value>gr_add_xx</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>3</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(528, 78)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>parameter</key>
-    <param>
-      <key>id</key>
-      <value>tx_side</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value></value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>A</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>string</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(688, 384)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>usrp_simple_sink_x</key>
-    <param>
-      <key>id</key>
-      <value>usrp_simple_sink_x</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>format</key>
-      <value></value>
-    </param>
-    <param>
-      <key>which</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>interpolation</key>
-      <value>400</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>tun_freq</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>side</key>
-      <value>tx_side</value>
-    </param>
-    <param>
-      <key>transmit</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(835, 5)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>usrp_simple_source_x</key>
-    <param>
-      <key>id</key>
-      <value>usrp_simple_source_x</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>format</key>
-      <value></value>
-    </param>
-    <param>
-      <key>which</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>decimation</key>
-      <value>200</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>tun_freq</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>20</value>
-    </param>
-    <param>
-      <key>side</key>
-      <value>rx_side</value>
-    </param>
-    <param>
-      <key>rx_ant</key>
-      <value>rx_ant</value>
-    </param>
-    <param>
-      <key>hb_filters</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(479, 224)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>parameter</key>
-    <param>
-      <key>id</key>
-      <value>rx_ant</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value></value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>RXA</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>string</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(802, 384)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>wxgui_fftsink2</key>
-    <param>
-      <key>id</key>
-      <value>wxgui_fftsink2</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>FFT Plot</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>baseband_freq</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>y_per_div</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>ref_level</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>fft_size</key>
-      <value>512*2</value>
-    </param>
-    <param>
-      <key>fft_rate</key>
-      <value>15</value>
-    </param>
-    <param>
-      <key>peak_hold</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>average</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>avg_alpha</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>1, 2, 2, 4</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(746, 133)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>parameter</key>
-    <param>
-      <key>id</key>
-      <value>rx_side</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value></value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>A</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>string</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(568, 382)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_noise_source_x</key>
-    <param>
-      <key>id</key>
-      <value>gr_noise_source_x</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>noise_type</key>
-      <value>gr.GR_GAUSSIAN</value>
-    </param>
-    <param>
-      <key>amp</key>
-      <value>noise_ampl</value>
-    </param>
-    <param>
-      <key>seed</key>
-      <value>42</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(276, 312)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>noise_ampl</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Noise Ampl</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>2000</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>5000</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_VERTICAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>1, 1, 2, 1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(20, 243)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>tone_ampl</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Tone Ampl</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>5000</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>10e3</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_VERTICAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>1, 0, 2, 1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(28, 437)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>tone1</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Tone 1</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>50e3</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>-samp_rate/2</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>samp_rate/2</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>0, 0, 1, 4</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(190, 436)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>tone2</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Tone 2</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>75e3</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>-samp_rate/2</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>samp_rate/2</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>0, 4, 1, 4</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(367, 439)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>options</key>
-    <param>
-      <key>id</key>
-      <value>usrp_two_tone_loopback</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>USRP Loopback - 2 Tone</value>
-    </param>
-    <param>
-      <key>author</key>
-      <value>Example</value>
-    </param>
-    <param>
-      <key>description</key>
-      <value>Loopback test with basic rx and basic tx</value>
-    </param>
-    <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
-    </param>
-    <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
-    </param>
-    <param>
-      <key>category</key>
-      <value>Custom</value>
-    </param>
-    <param>
-      <key>realtime_scheduling</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(10, 10)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <connection>
-    <source_block_id>gr_sig_source_x</source_block_id>
-    <sink_block_id>gr_add_xx</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_sig_source_x0</source_block_id>
-    <sink_block_id>gr_add_xx</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>1</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_noise_source_x</source_block_id>
-    <sink_block_id>gr_add_xx</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>2</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>usrp_simple_source_x</source_block_id>
-    <sink_block_id>wxgui_fftsink2</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_add_xx</source_block_id>
-    <sink_block_id>usrp_simple_sink_x</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-</flow_graph>
diff --git a/gnuradio-examples/grc/usrp/usrp_tx_dpsk.grc b/gnuradio-examples/grc/usrp/usrp_tx_dpsk.grc
deleted file mode 100644
index 90ec5e910..000000000
--- a/gnuradio-examples/grc/usrp/usrp_tx_dpsk.grc
+++ /dev/null
@@ -1,583 +0,0 @@
-<?xml version='1.0' encoding='ASCII'?>
-<flow_graph>
-  <timestamp>Thu Dec  3 11:42:41 2009</timestamp>
-  <block>
-    <key>options</key>
-    <param>
-      <key>id</key>
-      <value>usrp_tx_dpsk</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>USRP TX DPSK</value>
-    </param>
-    <param>
-      <key>author</key>
-      <value></value>
-    </param>
-    <param>
-      <key>description</key>
-      <value></value>
-    </param>
-    <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
-    </param>
-    <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
-    </param>
-    <param>
-      <key>category</key>
-      <value>Custom</value>
-    </param>
-    <param>
-      <key>run_options</key>
-      <value>prompt</value>
-    </param>
-    <param>
-      <key>run</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>realtime_scheduling</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(10, 10)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>samps_per_sym</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>4</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(15, 76)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>random_source_x</key>
-    <param>
-      <key>id</key>
-      <value>random_source_x_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>byte</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>2**8</value>
-    </param>
-    <param>
-      <key>num_samps</key>
-      <value>1000</value>
-    </param>
-    <param>
-      <key>repeat</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(23, 319)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>blks2_dxpsk2_mod</key>
-    <param>
-      <key>id</key>
-      <value>blks2_dxpsk2_mod_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>dqpsk</value>
-    </param>
-    <param>
-      <key>samples_per_symbol</key>
-      <value>samps_per_sym</value>
-    </param>
-    <param>
-      <key>excess_bw</key>
-      <value>0.35</value>
-    </param>
-    <param>
-      <key>gray_code</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>verbose</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>log</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(234, 151)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>usrp_simple_sink_x</key>
-    <param>
-      <key>id</key>
-      <value>usrp_simple_sink_x_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>which</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>interpolation</key>
-      <value>int(128e6/samp_rate)</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>bb_freq</value>
-    </param>
-    <param>
-      <key>lo_offset</key>
-      <value>float('inf')</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>side</key>
-      <value>A</value>
-    </param>
-    <param>
-      <key>transmit</key>
-      <value>auto_tr</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(516, 203)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>usrp2_sink_xxxx</key>
-    <param>
-      <key>id</key>
-      <value>usrp2_sink_xxxx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>interface</key>
-      <value></value>
-    </param>
-    <param>
-      <key>mac_addr</key>
-      <value></value>
-    </param>
-    <param>
-      <key>interpolation</key>
-      <value>int(100e6/samp_rate)</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>bb_freq</value>
-    </param>
-    <param>
-      <key>lo_offset</key>
-      <value>float('inf')</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(498, 51)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>tx_ampl</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>TX Amplitude</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>.2</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(277, 491)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>bb_freq</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>2.45e9+freq_off</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(14, 141)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>freq_off</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Frequency Offset</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>-samp_rate/2</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>samp_rate/2</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(63, 483)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>p2p</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>2**15</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(179, 37)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_multiply_const_vxx</key>
-    <param>
-      <key>id</key>
-      <value>gr_multiply_const_vxx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>const</key>
-      <value>tx_ampl*p2p/2.</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(306, 355)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>wxgui_fftsink2</key>
-    <param>
-      <key>id</key>
-      <value>wxgui_fftsink2_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>Transmit Spectrum</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>baseband_freq</key>
-      <value>bb_freq</value>
-    </param>
-    <param>
-      <key>y_per_div</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>y_divs</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>ref_level</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ref_scale</key>
-      <value>p2p</value>
-    </param>
-    <param>
-      <key>fft_size</key>
-      <value>1024</value>
-    </param>
-    <param>
-      <key>fft_rate</key>
-      <value>20</value>
-    </param>
-    <param>
-      <key>peak_hold</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>average</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>avg_alpha</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>win</key>
-      <value>None</value>
-    </param>
-    <param>
-      <key>win_size</key>
-      <value></value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(576, 410)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>1e6/4</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(12, 207)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <connection>
-    <source_block_id>random_source_x_0</source_block_id>
-    <sink_block_id>blks2_dxpsk2_mod_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>blks2_dxpsk2_mod_0</source_block_id>
-    <sink_block_id>gr_multiply_const_vxx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>usrp_simple_sink_x_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-</flow_graph>
diff --git a/gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc b/gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc
deleted file mode 100644
index 8f53475ab..000000000
--- a/gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version='1.0' encoding='ASCII'?>
-<flow_graph>
-  <timestamp>Fri Apr 17 19:06:07 2009</timestamp>
-  <block>
-    <key>options</key>
-    <param>
-      <key>id</key>
-      <value>usrp_wbfm_receive</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>USRP WBFM Receive</value>
-    </param>
-    <param>
-      <key>author</key>
-      <value>Example</value>
-    </param>
-    <param>
-      <key>description</key>
-      <value>WBFM Receive with Basic RX or TV RX</value>
-    </param>
-    <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
-    </param>
-    <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
-    </param>
-    <param>
-      <key>category</key>
-      <value>Custom</value>
-    </param>
-    <param>
-      <key>realtime_scheduling</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(10, 10)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>decim</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>200</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(14, 173)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>volume</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Volume</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>1, 0, 1, 4</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(991, 40)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>usrp_simple_source_x</key>
-    <param>
-      <key>id</key>
-      <value>usrp_simple_source_x</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>format</key>
-      <value></value>
-    </param>
-    <param>
-      <key>which</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>decimation</key>
-      <value>decim</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>(freq+fine)*1e6</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>20</value>
-    </param>
-    <param>
-      <key>side</key>
-      <value>A</value>
-    </param>
-    <param>
-      <key>rx_ant</key>
-      <value>None</value>
-    </param>
-    <param>
-      <key>hb_filters</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(277, 29)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>wxgui_fftsink2</key>
-    <param>
-      <key>id</key>
-      <value>wxgui_fftsink2</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>FFT Plot</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>64e6/decim</value>
-    </param>
-    <param>
-      <key>baseband_freq</key>
-      <value>(freq+fine)*1e6</value>
-    </param>
-    <param>
-      <key>y_per_div</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>ref_level</key>
-      <value>50</value>
-    </param>
-    <param>
-      <key>fft_size</key>
-      <value>512</value>
-    </param>
-    <param>
-      <key>fft_rate</key>
-      <value>15</value>
-    </param>
-    <param>
-      <key>peak_hold</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>average</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>avg_alpha</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>2, 0, 2, 4</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(512, 191)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>freq</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Frequency (MHz)</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>87.5</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>108.0</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>1000</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>0, 0, 1, 2</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(104, 243)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>fine</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Fine Freq (MHz)</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>-.1</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>.1</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>float_converter</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>0, 2, 1, 2</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(275, 246)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>blks2_wfm_rcv</key>
-    <param>
-      <key>id</key>
-      <value>blks2_wfm_rcv</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>quad_rate</key>
-      <value>64e6/decim</value>
-    </param>
-    <param>
-      <key>audio_decimation</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(510, 37)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_multiply_const_vxx</key>
-    <param>
-      <key>id</key>
-      <value>gr_multiply_const_vxx</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>const</key>
-      <value>volume</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(764, 55)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>audio_sink</key>
-    <param>
-      <key>id</key>
-      <value>audio_sink</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>32000</value>
-    </param>
-    <param>
-      <key>device_name</key>
-      <value></value>
-    </param>
-    <param>
-      <key>ok_to_block</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(703, 241)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-  </block>
-  <connection>
-    <source_block_id>usrp_simple_source_x</source_block_id>
-    <sink_block_id>blks2_wfm_rcv</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>usrp_simple_source_x</source_block_id>
-    <sink_block_id>wxgui_fftsink2</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>blks2_wfm_rcv</source_block_id>
-    <sink_block_id>gr_multiply_const_vxx</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_multiply_const_vxx</source_block_id>
-    <sink_block_id>audio_sink</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-</flow_graph>
diff --git a/gnuradio-examples/python/CMakeLists.txt b/gnuradio-examples/python/CMakeLists.txt
new file mode 100644
index 000000000..39b1fe806
--- /dev/null
+++ b/gnuradio-examples/python/CMakeLists.txt
@@ -0,0 +1,23 @@
+# 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.
+
+add_subdirectory(mp-sched)
+add_subdirectory(network)
+add_subdirectory(pfb)
+add_subdirectory(tags)
\ No newline at end of file
diff --git a/gnuradio-examples/python/Makefile.am b/gnuradio-examples/python/Makefile.am
index 65021729a..4327fd359 100644
--- a/gnuradio-examples/python/Makefile.am
+++ b/gnuradio-examples/python/Makefile.am
@@ -22,16 +22,7 @@
 include $(top_srcdir)/Makefile.common
 
 SUBDIRS = \
-	apps \
-	digital \
-	digital-bert \
-	digital_voice \
 	mp-sched \
-	multi-antenna \
-	multi_usrp \
 	network \
-	ofdm \
 	pfb \
-	tags \
-	usrp \
-	usrp2
+	tags
diff --git a/gnuradio-examples/python/apps/hf_explorer/README b/gnuradio-examples/python/apps/hf_explorer/README
deleted file mode 100644
index 5f780b3d9..000000000
--- a/gnuradio-examples/python/apps/hf_explorer/README
+++ /dev/null
@@ -1,48 +0,0 @@
-hfx.py is meant to be a full-featured Long Wave / Medium Wave
-and Short Wave (250kHz to 30Mhz) AM and Single Sideband receiver.
-It uses the USRP with a Basic RX board, and will need an
-antenna and some preamps, about 30db gain will work. See the
-'Help' menu or hfx_help for more info.
-
-----------------------------------------------------------
-
-hfx2.py is a major revision built about complex fir filter
-coeffecients ability and cleaner python script. Inherits
-most features from hfx.py - Powermate knob supported but
-not required, tooltip frequency display, single click
-tuning, AGC, record to disk, play from disk and record audio.
-New feature is ability to tailor the audio passband with two
-sliders over the spectrum display. The sliders almost align
-with the actual frequency. Preset filter settings for LSB
-(-3000 to 0kHz), USB (0 to +3000kHz), CW (-400 to -800Hz)
-and AM (-5kHz from carrier to +5kHz).
-
-AM now switches in a synchronous PLL detector with the
-carriers at 7.5kHz. The PLL carrier is displayed in the
-bottom display and helps show where on the upper spectrum
-the demodulated signal lies. Everything gets shifted up
-7.5kHz in AM, center frequency, tooltips, etc.  The target
-AM carrier needs to be closely tuned in, it will have a
-hollow sound untill it is locked, and then the PLL carrier
-in the bottom display will jump up and remain relatively 
-constant. There is a slider "AM sync carrier" to play with
-different levels to mix with the signal for demodulation.
-The filter in AM is preset to 2500/12500 (7.5kHz +/- 5kHz)
-and is handy for removing adjacent channel interference.
-Change AM_SYNC_DISPLAY in script for whether to show AM
-Sync carrier or not.
-Run with "-h" for command line help with setting USRP 
-ddc center frequency, decimation, rf data record, playback
-and audio data recording.
-
-There are some controls for controlling a varactor and
-tuning an antenna - just ignore them unless you want
-to build a voltage tuned antenna to track frequency.
-
-There is also code for Web based control of frequency and
-volume - so I can tune the radio with an Ipaq from bed.
-Disabled by default - it takes a web server, some
-directories and scripts to use.
-
-
-
diff --git a/gnuradio-examples/python/apps/hf_radio/input.py b/gnuradio-examples/python/apps/hf_radio/input.py
deleted file mode 100644
index 5984d8254..000000000
--- a/gnuradio-examples/python/apps/hf_radio/input.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Basic USRP setup and control.
-# It's only ever been tried with a basic rx daughter card.
-#
-# Imagine that the gnuradio boilerplate is here.
-#
-# M. Revnell 2005-Dec
- 
-from gnuradio import gr, gru, optfir
-from gnuradio import usrp
-from usrpm import usrp_dbid
-import math
-
-# Put special knowlege of usrp here.
-
-class input:
-    def __init__( self, decim ):
-        self.freq = -2.5e6
-        self.src = usrp.source_c( )
-        self.subdev = usrp.pick_subdev( self.src,
-                                        (usrp_dbid.BASIC_RX,
-                                         usrp_dbid.TV_RX,
-                                         usrp_dbid.TV_RX_REV_2,
-                                         usrp_dbid.TV_RX_REV_3,
-                                         usrp_dbid.TV_RX_MIMO,
-                                         usrp_dbid.TV_RX_REV_2_MIMO,
-                                         usrp_dbid.TV_RX_REV_3_MIMO))
-
-        print self.subdev
-
-        self.subdevice = usrp.selected_subdev( self.src,
-                                               self.subdev )
-
-        self.mux = usrp.determine_rx_mux_value( self.src,
-                                                self.subdev )
-        self.decim = decim
-
-        self.adc_rate = self.src.adc_rate()
-        self.usrp_rate = self.adc_rate / self.decim
-        self.src.set_decim_rate( self.decim )
-        self.src.set_mux( self.mux )
-        usrp.tune( self.src, 0, self.subdevice, self.freq )
-
-    def set_freq( self, x ):
-        r = usrp.tune( self.src, 0, self.subdevice, -x )
-        if r:
-            self.freq = -x
diff --git a/gnuradio-examples/python/apps/hf_radio/output.py b/gnuradio-examples/python/apps/hf_radio/output.py
deleted file mode 100644
index dc9caf528..000000000
--- a/gnuradio-examples/python/apps/hf_radio/output.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Audio output with a volume control.
-#
-# M. Revnell 2005-Dec
-
-from gnuradio import gr, gru
-from gnuradio import audio
-
-class output( gr.hier_block ):
-    def __init__( self, fg, rate ):
-        self.out = audio.sink( rate )
-        self.vol = gr.multiply_const_ff( 0.1 )
-        fg.connect( self.vol, self.out )
-        gr.hier_block.__init__(self, fg, self.vol, None )
-
-    def set( self, val ):
-        self.vol.set_k( val )
-        
diff --git a/gnuradio-examples/python/apps/hf_radio/ssbagc.py b/gnuradio-examples/python/apps/hf_radio/ssbagc.py
deleted file mode 100644
index fdf40bc6b..000000000
--- a/gnuradio-examples/python/apps/hf_radio/ssbagc.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# post detection agc processing
-#
-# Imagine that the usual gnuradio copyright stuff is right here.
-#
-# This agc strategy is copied more or less verbatim from
-# weaver_isb_am1_usrp3.py by cswiger.
-#
-# Thanks.
-#
-# Then modified in a variety of ways.
-#
-# There doesn't appear to be a way to hook multiple blocks to the
-# input port when building a hier block like this. Thus the
-# split below.
-#
-# Basic operation.
-# Power is estimated by squaring the input.
-# Low pass filter using a 1 pole iir.
-# The time constant can be tweaked by changing the taps.
-# Currently there is no implementation to change this while operating
-#   a potentially useful addition.
-# The log block turns this into dB
-# gain adjusts the agc authority.
-#
-# M. Revnell 2006-Jan
-
-from gnuradio import gr, gru
-
-class agc( gr.hier_block ):
-    def __init__( self, fg ):
-        self.split = gr.multiply_const_ff( 1 )
-        self.sqr   = gr.multiply_ff( )
-        self.int0  = gr.iir_filter_ffd( [.004, 0], [0, .999] )
-        self.offs  = gr.add_const_ff( -30 )
-        self.gain  = gr.multiply_const_ff( 70 )
-        self.log   = gr.nlog10_ff( 10, 1 )
-        self.agc   = gr.divide_ff( )
-
-        fg.connect(   self.split,        ( self.agc,   0 ) )
-        fg.connect(   self.split,        ( self.sqr,   0 ) )
-        fg.connect(   self.split,        ( self.sqr,   1 ) )
-        fg.connect(   self.sqr,            self.int0       )
-        fg.connect(   self.int0,           self.log        )
-        fg.connect(   self.log,            self.offs       )
-        fg.connect(   self.offs,           self.gain       )
-        fg.connect(   self.gain,         ( self.agc,   1 ) )
-
-        gr.hier_block.__init__( self, fg, self.split, self.agc )
diff --git a/gnuradio-examples/python/digital-bert/README b/gnuradio-examples/python/digital-bert/README
deleted file mode 100644
index 83f52f4f5..000000000
--- a/gnuradio-examples/python/digital-bert/README
+++ /dev/null
@@ -1,63 +0,0 @@
-BERT testing example scripts
-
-
-benchmark_tx.py
-
-This sets up a BPSK transmitter that is modulated with a pseudorandom
-sequence of bits.  The PN code is generated by sending an all 1s
-sequence through a 7-bit scrambler. The transmitter performs the BPSK
-modulation, then passes the complex baseband waveform through a
-root-raised-cosine filter and onto the USRP.
-
-The --sps parameter controls how many baseband samples per symbol
-are created and passed through the RRC filter, prior to going to the
-USRP over the USB for interpolation to the final DAC rate.
-
-The baseband bit rate is controlled by -r or --rate.  This value, when
-multiplied by the --sps parameter, must result in valid interpolation
-rate for the USRP.  For example, if the baseband rate is 250k bits/sec,
-and the samples per symbol is 4, then the final rate is 1M samples/sec,
-which results in an interpolation rate of 128.  The valid interpolation
-rates for the USRP are multiples of 4 between 16 and 512.
-
-Finally, the RRC excess bandwidth may be specified by --excess-bw.
-(See ./benchmark_tx.py -h for additional parameters.)
-
-
-benchmark_rx.py
-
-This sets up a BPSK receiver to demodulate the received waveform.  It
-accepts a similar set of parameters as the transmitter, except that one
-specifies the USRP decimation rate desired.  The resulting sample stream
-rate must be an integral number of baseband symbols.  For example, the
-parameters corresponding to the above transmitter would be to use a
-decimation rate of 8 (32 sps), 16 (16 sps), 32 (8 sps), 64, (4 sps), or
-128 (2 sps).  The lower the USRP decimation, the more CPU is required to
-demodulate the signal, so not all valid decimation rates will work.
-
-The baseband signal from the USRP is first passed through an AGC to
-establish an average power of 1.0.  It is then passed through a matched
-filter (another RRC), a Costas phase-locked loop, and a Mueller and
-Muller bit timing recovery loop.  The resulting constellation has an SNR
-estimation probe attached, and is then sliced into a bit stream.
-
-The recovered bits are then passed through a 7-bit descrambler.  If
-there are no channel errors, the all 1s sequence is recovered. In the 
-event of a channel error, there will be a 0 in the bit stream for each
-feedback tap in the descrambler.  In this case, the CCSDS descrambler is
-using 3 feedback taps.
-
-Finally, the signal is passed into a bit density measurement probe. The
-channel BER is measured by dividing the 0s density by three.  This
-measurement is inaccurate at high BER rates (>10%) as the error 0s
-begin to overlap.
-
-The benchmark script will, once per second, output the Costas loop
-frequency offset, the recovered timing error, the estimated SNR, and the
-average BER.
-
-NOTE: The particular SNR estimator used is inaccurate below about 7dB,
-and will report erroneously high values even for random noise.
-
-There are a variety of Costas and M&M loop parameters one can adjust.
-See ./benchmark_rx.py -h for the full set.
diff --git a/gnuradio-examples/python/digital-bert/benchmark_rx.py b/gnuradio-examples/python/digital-bert/benchmark_rx.py
deleted file mode 100755
index 1e00dbd76..000000000
--- a/gnuradio-examples/python/digital-bert/benchmark_rx.py
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 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.
-#
-
-from gnuradio import gr, eng_notation, usrp
-from optparse import OptionParser
-from gnuradio.eng_option import eng_option
-from receive_path import receive_path
-import gnuradio.gr.gr_threading as _threading
-import sys, time
-
-n2s = eng_notation.num_to_str
-
-class status_thread(_threading.Thread):
-    def __init__(self, tb):
-        _threading.Thread.__init__(self)
-        self.setDaemon(1)
-        self.tb = tb
-        self.done = False
-        self.start()
-
-    def run(self):
-        while not self.done:
-            print "Freq. Offset: %5.0f Hz  Timing Offset: %5.1f ppm  Estimated SNR: %4.1f dB  BER: %g" % (
-                tb.frequency_offset(), tb.timing_offset()*1e6, tb.snr(), tb.ber())
-            try:
-                time.sleep(1.0)
-            except KeyboardInterrupt:
-                self.done = True
-
-class rx_bpsk_block(gr.top_block):
-    def __init__(self, options):    
-
-	gr.top_block.__init__(self, "rx_mpsk")
-
-        print "USRP decimation rate", options.decim_rate
-
-        # Create a USRP source at desired board, sample rate, frequency, and gain
-        self._setup_usrp(options.which,
-                         options.decim_rate,
-                         options.rx_subdev_spec,
-                         options.freq,
-                         options.gain)
-
-        # Create the BERT receiver
-        if_rate = self._usrp.adc_rate()/options.decim_rate
-        self._receiver = receive_path(if_rate,
-                                      options.rate,
-                                      options.excess_bw,
-                                      options.costas_alpha,
-                                      options.costas_beta,
-                                      options.costas_max,
-                                      options.mm_gain_mu,
-                                      options.mm_gain_omega,
-                                      options.mm_omega_limit)
-        
-        self.connect(self._usrp, self._receiver)
-
-
-    def _setup_usrp(self, which, decim, subdev_spec, freq, gain):
-        self._usrp = usrp.source_c(which=which, decim_rate=decim)
-	if subdev_spec is None:
-	    subdev_spec = usrp.pick_rx_subdevice(self._usrp)
-	self._subdev = usrp.selected_subdev(self._usrp, subdev_spec)
-        mux = usrp.determine_rx_mux_value(self._usrp, subdev_spec)
-	self._usrp.set_mux(mux)
-	tr = self._usrp.tune(0, self._subdev, freq)
-        if not (tr):
-            print "Failed to tune to center frequency!"
-        else:
-            print "Center frequency:", n2s(freq)
-        if gain is None:
-            g = self._subdev.gain_range();
-            gain = float(g[0]+g[1])/2.0
-	self._subdev.set_gain(gain)
-        print "RX d'board:", self._subdev.side_and_name()
-        
-    def snr(self):
-        return self._receiver.snr()
-
-    def mag(self):
-        return self._receiver.signal_mean()
-        
-    def var(self):
-        return self._receiver.noise_variance()
-
-    def ber(self):
-        return self._receiver.ber()
-
-    def frequency_offset(self):
-        return self._receiver.frequency_offset()
-        
-    def timing_offset(self):
-        return self._receiver.timing_offset()
-            
-def get_options():
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("-w", "--which", type="int", default=0,
-                      help="select which USRP (0, 1, ...) (default is %default)",
-                      metavar="NUM")
-    parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                      help="select USRP Rx side A or B (default=first one with a daughterboard)")
-    parser.add_option("-f", "--freq", type="eng_float", default=None,
-                      help="set frequency to FREQ", metavar="FREQ")
-    parser.add_option("-g", "--gain", type="eng_float", default=None,
-                      help="set Rx gain (default is mid-point)")
-    parser.add_option("-r", "--rate", type="eng_float", default=250e3,
-                      help="Select modulation symbol rate (default=%default)")
-    parser.add_option("-d", "--decim-rate", type="int", default=8,
-                      help="Select USRP decimation rate (default=%default)")
-    parser.add_option("", "--excess-bw", type="eng_float", default=0.35,
-                      help="Select RRC excess bandwidth (default=%default)")
-    parser.add_option("", "--costas-alpha", type="eng_float", default=0.05,
-                      help="set Costas loop 1st order gain, (default=%default)")
-    parser.add_option("", "--costas-beta", type="eng_float", default=0.00025,
-                      help="set Costas loop 2nd order gain, (default=%default)")
-    parser.add_option("", "--costas-max", type="eng_float", default=0.05,
-                      help="set Costas loop max freq (rad/sample) (default=%default)")
-    parser.add_option("", "--mm-gain-mu", type="eng_float", default=0.001,
-                      help="set M&M loop 1st order gain, (default=%default)")
-    parser.add_option("", "--mm-gain-omega", type="eng_float", default=0.000001,
-                      help="set M&M loop 2nd order gain, (default=%default)")
-    parser.add_option("", "--mm-omega-limit", type="eng_float", default=0.0001,
-                      help="set M&M max timing error, (default=%default)")
-
-		      
-    (options, args) = parser.parse_args()
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
-	
-    if options.freq == None:
-        print "You must supply a frequency with -f or --freq"
-        sys.exit(1)
-
-    return (options, args)
-
-
-if __name__ == "__main__":
-    (options, args) = get_options()
-
-    tb = rx_bpsk_block(options)
-
-    print "\n*** SNR estimator is inaccurate below about 7dB"
-    print "*** BER estimator is inaccurate above about 10%\n"
-    updater = status_thread(tb)
-
-    try:
-        tb.run()
-    except KeyboardInterrupt:
-        updater.done = True
-        updater = None
diff --git a/gnuradio-examples/python/digital-bert/benchmark_tx.py b/gnuradio-examples/python/digital-bert/benchmark_tx.py
deleted file mode 100755
index 000f4bca2..000000000
--- a/gnuradio-examples/python/digital-bert/benchmark_tx.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 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.
-#
-
-from gnuradio import gr, eng_notation, usrp
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-from transmit_path import transmit_path
-import sys
-
-_dac_rate = 128e6
-
-n2s = eng_notation.num_to_str
-
-class tx_bpsk_block(gr.top_block):
-    def __init__(self, options):    
-	gr.top_block.__init__(self, "tx_mpsk")
-
-        self._transmitter = transmit_path(options.sps,
-                                          options.excess_bw,
-                                          options.amplitude)
-
-        if_rate = options.rate*options.sps
-        interp = int(_dac_rate/if_rate)
-
-        print "Modulation:", n2s(options.rate), "bits/sec"
-        print "TX IF rate:", n2s(if_rate), "samples/sec"
-        print "USRP interpolation:", interp
-        print "DAC amplitude:", options.amplitude
-
-        self._setup_usrp(options.which,
-                         interp,
-                         options.tx_subdev_spec,
-                         options.freq)
-	
-	self.connect(self._transmitter, self._usrp)
-
-        
-    def _setup_usrp(self, which, interp, subdev_spec, freq):
-        self._usrp = usrp.sink_c(which=which, interp_rate=interp)
-	if subdev_spec is None:
-	    subdev_spec = usrp.pick_tx_subdevice(self._usrp)
-	self._usrp.set_mux(usrp.determine_tx_mux_value(self._usrp, subdev_spec))
-	self._subdev = usrp.selected_subdev(self._usrp, subdev_spec)
-	tr = usrp.tune(self._usrp, self._subdev.which(), self._subdev, freq)
-        if not (tr):
-            print "Failed to tune to center frequency!"
-        else:
-            print "Center frequency:", n2s(freq)
-        gain = float(self._subdev.gain_range()[1]) # Max TX gain
-	self._subdev.set_gain(gain)
-	self._subdev.set_enable(True)
-        print "TX d'board:", self._subdev.side_and_name()
-        
-
-def get_options():
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("-w", "--which", type="int", default=0,
-                      help="select which USRP (0, 1, ...) default is %default",
-                      metavar="NUM")
-    parser.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
-                      help="select USRP Tx side A or B (default=first one with a daughterboard)")
-    parser.add_option("-f", "--freq", type="eng_float", default=None,
-                      help="set frequency to FREQ", metavar="FREQ")
-    parser.add_option("-a", "--amplitude", type="eng_float", default=2000,
-                      help="set Tx amplitude (0-32767) (default=%default)")
-    parser.add_option("-r", "--rate", type="eng_float", default=250e3,
-                      help="Select modulation symbol rate (default=%default)")
-    parser.add_option("", "--sps", type="int", default=2,
-                      help="Select samples per symbol (default=%default)")
-    parser.add_option("", "--excess-bw", type="eng_float", default=0.35,
-                      help="Select RRC excess bandwidth (default=%default)")
-		      
-    (options, args) = parser.parse_args()
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
-	
-    if options.freq == None:
-        print "Must supply frequency as -f or --freq"
-        sys.exit(1)
-
-    return (options, args)
-
-if __name__ == "__main__":
-    (options, args) = get_options()
-    
-    tb = tx_bpsk_block(options)
-
-    try:
-        tb.run()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/digital-bert/receive_path.py b/gnuradio-examples/python/digital-bert/receive_path.py
deleted file mode 100644
index e273923a4..000000000
--- a/gnuradio-examples/python/digital-bert/receive_path.py
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Copyright 2008 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.
-#
-
-from gnuradio import gr, eng_notation
-import math
-
-n2s = eng_notation.num_to_str
-
-class receive_path(gr.hier_block2):
-    def __init__(self,
-                 if_rate,        # Incoming sample rate
-                 symbol_rate,    # Original symbol rate
-                 excess_bw,      # RRC excess bandwidth, typically 0.35-0.5
-                 costas_alpha,   # Costas loop 1st order gain, typically 0.01-0.2
-                 costas_beta,    # Costas loop 2nd order gain, typically alpha^2/4.0
-                 costas_max,     # Costas loop max frequency offset in radians/sample
-                 mm_gain_mu,     # M&M loop 1st order gain, typically 0.001-0.2
-                 mm_gain_omega,  # M&M loop 2nd order gain, typically alpha^2/4.0
-                 mm_omega_limit, # M&M loop max timing error
-                 ):
-        
-        gr.hier_block2.__init__(self, "receive_path",
-                                gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-                                gr.io_signature(0, 0, 0))                    # Output signature
-
-        self._if_rate = if_rate
-        self._sps = int(self._if_rate/symbol_rate)
-        print "IF sample rate:", n2s(self._if_rate)
-        print "Symbol rate:", n2s(symbol_rate)
-        print "Samples/symbol:", self._sps
-        print "RRC bandwidth:", excess_bw
-        
-        # Create AGC to scale input to unity
-        self._agc = gr.agc_cc(1e-5, 1.0, 1.0, 1.0)
-
-	# Create RRC with specified excess bandwidth
-	taps = gr.firdes.root_raised_cosine(1.0,          # Gain
-					    self._sps,    # Sampling rate
-					    1.0,          # Symbol rate
-					    excess_bw,    # Roll-off factor
-					    11*self._sps) # Number of taps
-
-	self._rrc = gr.fir_filter_ccf(1, taps)
-        
-        # Create a Costas loop frequency/phase recovery block
-
-        print "Costas alpha:", costas_alpha
-        print "Costas beta:", costas_beta
-        print "Costas max:", costas_max
-        
-        self._costas = gr.costas_loop_cc(costas_alpha,  # PLL first order gain
-                                         costas_beta,   # PLL second order gain
-                                         costas_max,    # Max frequency offset rad/sample
-                                         -costas_max,   # Min frequency offset rad/sample
-                                         2)             # BPSK
-
-        # Create a M&M bit synchronization retiming block
-        mm_mu = 0.5
-        mm_omega = self._sps
-
-        print "MM gain mu:", mm_gain_mu
-        print "MM gain omega:", mm_gain_omega
-        print "MM omega limit:", mm_omega_limit
-        
-        self._mm = gr.clock_recovery_mm_cc(mm_omega,       # Initial samples/symbol
-                                           mm_gain_omega,  # Second order gain
-                                           mm_mu,          # Initial symbol phase
-                                           mm_gain_mu,     # First order gain
-                                           mm_omega_limit) # Maximum timing offset
-
-        # Add an SNR probe on the demodulated constellation
-        self._snr_probe = gr.probe_mpsk_snr_c(10.0/symbol_rate)
-        self.connect(self._mm, self._snr_probe)
-        
-        # Slice the resulting constellation into bits.
-        # Get inphase channel and make decision about 0
-        self._c2r = gr.complex_to_real()
-        self._slicer = gr.binary_slicer_fb() 
-        
-        # Descramble BERT sequence.  A channel error will create 3 incorrect bits
-        self._descrambler = gr.descrambler_bb(0x8A, 0x7F, 7) # CCSDS 7-bit descrambler
-
-        # Measure BER by the density of 0s in the stream
-        self._ber = gr.probe_density_b(1.0/symbol_rate)
-
-        self.connect(self, self._agc, self._rrc, self._costas, self._mm, 
-                     self._c2r, self._slicer, self._descrambler, self._ber)
-
-    def frequency_offset(self):
-        return self._costas.freq()*self._if_rate/(2*math.pi)
-
-    def timing_offset(self):
-        return self._mm.omega()/self._sps-1.0
-
-    def snr(self):
-        return self._snr_probe.snr()
-
-    def ber(self):
-        return (1.0-self._ber.density())/3.0
-
diff --git a/gnuradio-examples/python/digital-bert/transmit_path.py b/gnuradio-examples/python/digital-bert/transmit_path.py
deleted file mode 100644
index 96834b398..000000000
--- a/gnuradio-examples/python/digital-bert/transmit_path.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright 2008 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.
-#
-
-from gnuradio import gr
-from math import pi, log10
-import cmath
-
-class transmit_path(gr.hier_block2):
-    """
-    This transmits a BERT sequence of bits using filtered BPSK and
-    outputs the complex baseband waveform.
-    """
-    def __init__(self,
-                 sps,          # Samples per symbol
-                 excess_bw,    # RRC filter excess bandwidth (typically 0.35-0.5)
-                 amplitude     # DAC output level, 0-32767, typically 2000-8000
-                 ):
-
-        gr.hier_block2.__init__(self, "transmit_path",
-                                gr.io_signature(0, 0, 0),                    # Input signature
-                                gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        # Create BERT data bit stream	
-	self._bits = gr.vector_source_b([1,], True)      # Infinite stream of ones
-        self._scrambler = gr.scrambler_bb(0x8A, 0x7F, 7) # CCSDS 7-bit scrambler
-
-	# Map to constellation
-	self._constellation = [-1+0j, 1+0j]
-	self._mapper = gr.chunks_to_symbols_bc(self._constellation)	
-
-	# Create RRC with specified excess bandwidth
-	taps = gr.firdes.root_raised_cosine(sps*amplitude,  # Gain
-					    sps,	    # Sampling rate
-					    1.0,	    # Symbol rate
-					    excess_bw,	    # Roll-off factor
-					    11*sps)         # Number of taps
-
-	self._rrc = gr.interp_fir_filter_ccf(sps,	    # Interpolation rate
-					     taps)	    # FIR taps
-
-        # Wire block inputs and outputs
-        self.connect(self._bits, self._scrambler, self._mapper, self._rrc, self)
-
diff --git a/gnuradio-examples/python/digital/.gitignore b/gnuradio-examples/python/digital/.gitignore
deleted file mode 100644
index ff40c06f3..000000000
--- a/gnuradio-examples/python/digital/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
-/*.dat
diff --git a/gnuradio-examples/python/digital/Makefile.am b/gnuradio-examples/python/digital/Makefile.am
deleted file mode 100644
index e32180cd4..000000000
--- a/gnuradio-examples/python/digital/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright 2004,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-ourdatadir = $(exampledir)/digital
-
-dist_ourdata_DATA =		\
-	README			\
-	pick_bitrate.py		\
-	qt_digital_window.ui	\
-	qt_digital_window.py	\
-	qt_rx_window.ui		\
-	qt_rx_window.py		\
-	receive_path.py		\
-	transmit_path.py	\
-	usrp_receive_path.py \
-	usrp_transmit_path.py
-
-dist_ourdata_SCRIPTS =		\
-	benchmark_loopback.py   \
-	benchmark_rx.py		\
-	benchmark_tx.py		\
-	benchmark_qt_rx.py	\
-	benchmark_qt_loopback.py\
-	gen_whitener.py		\
-	rx_voice.py		\
-	run_length.py		\
-	tunnel.py		\
-	tx_voice.py
diff --git a/gnuradio-examples/python/digital/benchmark_loopback.py b/gnuradio-examples/python/digital/benchmark_loopback.py
deleted file mode 100755
index 47e4f2028..000000000
--- a/gnuradio-examples/python/digital/benchmark_loopback.py
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005, 2006, 2007, 2009 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.
-# 
-
-from gnuradio import gr, gru, modulation_utils
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-import random, time, struct, sys, math
-
-# from current dir
-from transmit_path import transmit_path
-from receive_path import receive_path
-
-class my_top_block(gr.top_block):
-    def __init__(self, mod_class, demod_class, rx_callback, options):
-        gr.top_block.__init__(self)
-
-        channelon = True;
-
-        SNR = 10.0**(options.snr/10.0)
-        frequency_offset = options.frequency_offset
-        
-        power_in_signal = abs(options.tx_amplitude)**2
-        noise_power = power_in_signal/SNR
-        noise_voltage = math.sqrt(noise_power)
-
-        # With new interface, sps does not get set by default, but
-        # in the loopback, we don't recalculate it; so just force it here
-        if(options.samples_per_symbol == None):
-            options.samples_per_symbol = 2
-
-        self.txpath = transmit_path(mod_class, options)
-        self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate)
-        self.rxpath = receive_path(demod_class, rx_callback, options)
-
-        if channelon:
-            self.channel = gr.channel_model(noise_voltage, frequency_offset, 1.01)
-
-            if options.discontinuous:
-                z = 20000*[0,]
-                self.zeros = gr.vector_source_c(z, True)
-                packet_size = 5*((4+8+4+1500+4) * 8)
-                self.mux = gr.stream_mux(gr.sizeof_gr_complex, [packet_size-0, int(9e5)])
-
-                # Connect components
-                self.connect(self.txpath, (self.mux,0))
-                self.connect(self.zeros, (self.mux,1))
-                self.connect(self.mux, self.channel, self.rxpath)
-
-            else:
-                self.connect(self.txpath, self.channel, self.rxpath)
-
-        else:
-            # Connect components
-            self.connect(self.txpath, self.throttle, self.rxpath)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-def main():
-
-    global n_rcvd, n_right
-
-    n_rcvd = 0
-    n_right = 0
-    
-    def rx_callback(ok, payload):
-        global n_rcvd, n_right
-        (pktno,) = struct.unpack('!H', payload[0:2])
-        n_rcvd += 1
-        if ok:
-            n_right += 1
-
-        print "ok = %5s  pktno = %4d  n_rcvd = %4d  n_right = %4d" % (
-            ok, pktno, n_rcvd, n_right)
-        # print payload[2:len(payload)]
-
-    def send_pkt(payload='', eof=False):
-        return tb.txpath.send_pkt(payload, eof)
-
-
-    mods = modulation_utils.type_1_mods()
-    demods = modulation_utils.type_1_demods()
-
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-    channel_grp = parser.add_option_group("Channel")
-
-    parser.add_option("-m", "--modulation", type="choice", choices=mods.keys(),
-                      default='dbpsk',
-                      help="Select modulation from: %s [default=%%default]"
-                            % (', '.join(mods.keys()),))
-
-    parser.add_option("-s", "--size", type="eng_float", default=1500,
-                      help="set packet size [default=%default]")
-    parser.add_option("-M", "--megabytes", type="eng_float", default=1.0,
-                      help="set megabytes to transmit [default=%default]")
-    parser.add_option("","--discontinuous", action="store_true", default=False,
-                      help="enable discontinous transmission (bursts of 5 packets)")
-
-    channel_grp.add_option("", "--sample-rate", type="eng_float", default=1e5,
-                           help="set speed of channel/simulation rate to RATE [default=%default]") 
-    channel_grp.add_option("", "--snr", type="eng_float", default=30,
-                           help="set the SNR of the channel in dB [default=%default]")
-    channel_grp.add_option("", "--frequency-offset", type="eng_float", default=0,
-                           help="set frequency offset introduced by channel [default=%default]")
-    channel_grp.add_option("", "--seed", action="store_true", default=False,
-                           help="use a random seed for AWGN noise [default=%default]")
-
-    transmit_path.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
-
-    for mod in mods.values():
-        mod.add_options(expert_grp)
-    for demod in demods.values():
-        demod.add_options(expert_grp)
-
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
- 
-    r = gr.enable_realtime_scheduling()
-    if r != gr.RT_OK:
-        print "Warning: failed to enable realtime scheduling"
-        
-    # Create an instance of a hierarchical block
-    tb = my_top_block(mods[options.modulation], demods[options.modulation], rx_callback, options)
-    tb.start()
-
-    # generate and send packets
-    nbytes = int(1e6 * options.megabytes)
-    n = 0
-    pktno = 0
-    pkt_size = int(options.size)
-
-    while n < nbytes:
-        send_pkt(struct.pack('!H', pktno & 0xffff) + (pkt_size - 2) * chr(pktno & 0xff))
-        n += pkt_size
-        pktno += 1
-        
-    send_pkt(eof=True)
-
-    tb.wait()
-    
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/digital/benchmark_qt_loopback.py b/gnuradio-examples/python/digital/benchmark_qt_loopback.py
deleted file mode 100755
index 0ae0e4e51..000000000
--- a/gnuradio-examples/python/digital/benchmark_qt_loopback.py
+++ /dev/null
@@ -1,470 +0,0 @@
-#!/usr/bin/env python
-
-from gnuradio import gr, gru, modulation_utils
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import random, time, struct, sys, os, math
-
-from threading import Thread
-
-# from current dir
-from transmit_path import transmit_path
-from receive_path import receive_path
-
-try:
-    from gnuradio.qtgui import qtgui
-    from PyQt4 import QtGui, QtCore
-    import sip
-except ImportError:
-    print "Please install gr-qtgui."
-    sys.exit(1)
-    
-try:
-    from qt_digital_window import Ui_DigitalWindow
-except ImportError:
-    print "Error: could not find qt_digital_window.py:"
-    print "\t\"pyuic4 qt_digital_window.ui -o qt_digital_window.py\""
-    sys.exit(1)
-
-
-#print os.getpid()
-#raw_input()
-
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the QT Interface and Control Dialog
-# ////////////////////////////////////////////////////////////////////
-
-
-class dialog_box(QtGui.QMainWindow):
-    def __init__(self, snkTx, snkRx, fg, parent=None):
-
-        QtGui.QWidget.__init__(self, parent)
-        self.gui = Ui_DigitalWindow()
-        self.gui.setupUi(self)
-
-        self.fg = fg
-
-        self.set_sample_rate(self.fg.sample_rate())
-
-        self.set_snr(self.fg.snr())
-        self.set_frequency(self.fg.frequency_offset())
-        self.set_time_offset(self.fg.timing_offset())
-
-        self.set_gain_mu(self.fg.rx_timing_gain_alpha())
-        self.set_alpha(self.fg.rx_alpha())
-
-        # Add the qtsnk widgets to the hlayout box
-        self.gui.sinkLayout.addWidget(snkTx)
-        self.gui.sinkLayout.addWidget(snkRx)
-
-
-        # Connect up some signals
-        self.connect(self.gui.pauseButton, QtCore.SIGNAL("clicked()"),
-                     self.pauseFg)
-
-        self.connect(self.gui.sampleRateEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.sampleRateEditText)
-
-        self.connect(self.gui.snrEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.snrEditText)
-        self.connect(self.gui.freqEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.freqEditText)
-        self.connect(self.gui.timeEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.timeEditText)
-
-        self.connect(self.gui.gainMuEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainMuEditText)
-        self.connect(self.gui.alphaEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.alphaEditText)
-
-        # Build a timer to update the packet number and PER fields
-        self.update_delay = 250  # time between updating packet rate fields
-        self.pkt_timer = QtCore.QTimer(self)
-        self.connect(self.pkt_timer, QtCore.SIGNAL("timeout()"),
-                     self.updatePacketInfo)
-        self.pkt_timer.start(self.update_delay)
-
-    def pauseFg(self):
-        if(self.gui.pauseButton.text() == "Pause"):
-            self.fg.stop()
-            self.fg.wait()
-            self.gui.pauseButton.setText("Unpause")
-        else:
-            self.fg.start()
-            self.gui.pauseButton.setText("Pause")
-
-    # Accessor functions for Gui to manipulate system parameters
-    def set_sample_rate(self, sr):
-        ssr = eng_notation.num_to_str(sr)
-        self.gui.sampleRateEdit.setText(QtCore.QString("%1").arg(ssr))
-
-    def sampleRateEditText(self):
-        try:
-            rate = self.gui.sampleRateEdit.text().toAscii()
-            srate = eng_notation.str_to_num(rate)
-            #self.fg.set_sample_rate(srate)
-        except RuntimeError:
-            pass
-
-
-    # Accessor functions for Gui to manipulate channel model
-    def set_snr(self, snr):
-        self.gui.snrEdit.setText(QtCore.QString("%1").arg(snr))
-
-    def set_frequency(self, fo):
-        self.gui.freqEdit.setText(QtCore.QString("%1").arg(fo))
-
-    def set_time_offset(self, to):
-        self.gui.timeEdit.setText(QtCore.QString("%1").arg(to))
-
-    def snrEditText(self):
-        try:
-            snr = self.gui.snrEdit.text().toDouble()[0]
-            self.fg.set_snr(snr)
-        except RuntimeError:
-            pass
-
-    def freqEditText(self):
-        try:
-            freq = self.gui.freqEdit.text().toDouble()[0]
-            self.fg.set_frequency_offset(freq)
-        except RuntimeError:
-            pass
-
-    def timeEditText(self):
-        try:
-            to = self.gui.timeEdit.text().toDouble()[0]
-            self.fg.set_timing_offset(to)
-        except RuntimeError:
-            pass
-
-
-    # Accessor functions for Gui to manipulate receiver parameters
-    def set_gain_mu(self, gain):
-        self.gui.gainMuEdit.setText(QtCore.QString("%1").arg(gain))
-
-    def set_alpha(self, alpha):
-        self.gui.alphaEdit.setText(QtCore.QString("%1").arg(alpha))
-
-    def alphaEditText(self):
-        try:
-            alpha = self.gui.alphaEdit.text().toDouble()[0]
-            self.fg.set_rx_alpha(alpha)
-        except RuntimeError:
-            pass
-
-    def gainMuEditText(self):
-        try:
-            gain = self.gui.gainMuEdit.text().toDouble()[0]
-            self.fg.set_rx_timing_gain_alpha(gain)
-        except RuntimeError:
-            pass
-
-    # Accessor functions for packet error reporting
-    def updatePacketInfo(self):
-        # Pull these globals in from the main thread
-        global n_rcvd, n_right, pktno
-
-        if(pktno > 0):
-            per = float(n_rcvd - n_right)/float(pktno)
-        else:
-            per = 0
-        self.gui.pktsRcvdEdit.setText(QtCore.QString("%1").arg(n_rcvd))
-        self.gui.pktsCorrectEdit.setText(QtCore.QString("%1").arg(n_right))
-        self.gui.perEdit.setText(QtCore.QString("%1").arg(per))
-
-
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the GNU Radio Top Block
-# ////////////////////////////////////////////////////////////////////
-
-
-
-class my_top_block(gr.top_block):
-    def __init__(self, mod_class, demod_class, rx_callback, options):
-        gr.top_block.__init__(self)
-
-        self._sample_rate = options.sample_rate
-
-        if(options.samples_per_symbol is None):
-            options.samples_per_symbol = 2
-
-        channelon = True;
-
-        self.gui_on = options.gui
-
-        self._frequency_offset = options.frequency_offset
-        self._timing_offset = options.timing_offset
-        self._tx_amplitude = options.tx_amplitude
-        self._snr_dB = options.snr
-
-        self._noise_voltage = self.get_noise_voltage(self._snr_dB)
-
-        self.txpath = transmit_path(mod_class, options)
-        self.throttle = gr.throttle(gr.sizeof_gr_complex, self.sample_rate())
-        self.rxpath = receive_path(demod_class, rx_callback, options)
-
-        # FIXME: do better exposure to lower issues for control
-        self._timing_gain_alpha = self.rxpath.packet_receiver._demodulator._mm_gain_mu
-        self._alpha = self.rxpath.packet_receiver._demodulator._costas_alpha
-
-        if channelon:
-            self.channel = gr.channel_model(self._noise_voltage,
-                                            self.frequency_offset(),
-                                            self.timing_offset())
-            
-            if options.discontinuous:
-                z = 20000*[0,]
-                self.zeros = gr.vector_source_c(z, True)
-                packet_size = 5*((4+8+4+1500+4) * 8)
-                self.mux = gr.stream_mux(gr.sizeof_gr_complex, [packet_size-0, int(9e5)])
-
-                # Connect components
-                self.connect(self.txpath, self.throttle, (self.mux,0))
-                self.connect(self.zeros, (self.mux,1))
-                self.connect(self.mux, self.channel, self.rxpath)
-
-            else:
-                self.connect(self.txpath, self.throttle, self.channel, self.rxpath)
-
-            if self.gui_on:
-                self.qapp = QtGui.QApplication(sys.argv)
-                fftsize = 2048
-
-                self.snk_tx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                           0, self._sample_rate,
-                                           "Tx", True, True, False, True, True)
-                self.snk_rx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                           0, self._sample_rate,
-                                           "Rx", True, True, False, True, True)
-
-                self.snk_tx.set_frequency_axis(-80, 0)
-                self.snk_rx.set_frequency_axis(-60, 20)
-            
-                # Connect to the QT sinks
-                # FIXME: make better exposure to receiver from rxpath
-                self.receiver = self.rxpath.packet_receiver._demodulator.receiver
-                self.receiver.set_alpha(2)
-                self.receiver.set_beta(0.02)
-                self.connect(self.channel, self.snk_tx)
-                self.connect(self.receiver, self.snk_rx)
-
-                pyTxQt  = self.snk_tx.pyqwidget()
-                pyTx = sip.wrapinstance(pyTxQt, QtGui.QWidget)
-                 
-                pyRxQt  = self.snk_rx.pyqwidget()
-                pyRx = sip.wrapinstance(pyRxQt, QtGui.QWidget)
-
-                self.main_box = dialog_box(pyTx, pyRx, self)
-                self.main_box.show()
-                
-        else:
-            # Connect components
-            self.connect(self.txpath, self.throttle, self.rxpath)
-
-
-
-    # System Parameters
-    def sample_rate(self):
-        return self._sample_rate
-    
-    def set_sample_rate(self, sr):
-        self._sample_rate = sr
-        #self.throttle.set_samples_per_second(self._sample_rate)
-
-    # Channel Model Parameters
-    def snr(self):
-        return self._snr_dB
-    
-    def set_snr(self, snr):
-        self._snr_dB = snr
-        self._noise_voltage = self.get_noise_voltage(self._snr_dB)
-        self.channel.set_noise_voltage(self._noise_voltage)
-
-    def get_noise_voltage(self, SNR):
-        snr = 10.0**(SNR/10.0)        
-        power_in_signal = abs(self._tx_amplitude)**2
-        noise_power = power_in_signal/snr
-        noise_voltage = math.sqrt(noise_power)
-        return noise_voltage
-
-    def frequency_offset(self):
-        return self._frequency_offset * self.sample_rate()
-
-    def set_frequency_offset(self, fo):
-        self._frequency_offset = fo / self.sample_rate()
-        self.channel.set_frequency_offset(self._frequency_offset)
-
-    def timing_offset(self):
-        return self._timing_offset
-    
-    def set_timing_offset(self, to):
-        self._timing_offset = to
-        self.channel.set_timing_offset(self._timing_offset)
-
-
-    # Receiver Parameters
-    def rx_timing_gain_alpha(self):
-        return self._timing_gain_alpha
-
-    def rx_timing_gain_beta(self):
-        return self._timing_gain_beta
-    
-    def set_rx_timing_gain_alpha(self, gain):
-        self._timing_gain_alpha = gain
-        self.receiver.set_gain_mu(self._timing_gain_alpha)
-
-    def rx_alpha(self):
-        return self._alpha
-
-    def rx_beta(self):
-        return self.beta
-    
-    def set_rx_alpha(self, alpha):
-        self._alpha = alpha
-        self.beta = .25 * self._alpha * self._alpha
-        self.receiver.set_alpha(self._alpha)
-        self.receiver.set_beta(self.beta)
-
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#       Thread to handle the packet sending procedure
-#          Operates in parallel with qApp.exec_()       
-# /////////////////////////////////////////////////////////////////////////////
-
-
-
-class th_send(Thread):
-    def __init__(self, send_fnc, megs, sz):
-        Thread.__init__(self)
-        self.send = send_fnc
-        self.nbytes = int(1e6 * megs)
-        self.pkt_size = int(sz)
-
-    def run(self):
-        # generate and send packets
-        n = 0
-        pktno = 0
-        
-        while n < self.nbytes:
-            self.send(struct.pack('!H', pktno & 0xffff) +
-                      (self.pkt_size - 2) * chr(pktno & 0xff))
-            n += self.pkt_size
-            pktno += 1
-            
-        self.send(eof=True)
-
-    def stop(self):
-        self.nbytes = 0
-
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-
-
-def main():
-
-    global n_rcvd, n_right, pktno
-
-    n_rcvd = 0
-    n_right = 0
-    pktno = 0
-    
-    def rx_callback(ok, payload):
-        global n_rcvd, n_right, pktno
-        (pktno,) = struct.unpack('!H', payload[0:2])
-        n_rcvd += 1
-        if ok:
-            n_right += 1
-
-        if not options.gui:
-            print "ok = %5s  pktno = %4d  n_rcvd = %4d  n_right = %4d" % (
-                ok, pktno, n_rcvd, n_right)
-        
-
-    def send_pkt(payload='', eof=False):
-        return tb.txpath.send_pkt(payload, eof)
-
-    mods = modulation_utils.type_1_mods()
-    demods = modulation_utils.type_1_demods()
-
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-    channel_grp = parser.add_option_group("Channel")
-
-    parser.add_option("-m", "--modulation", type="choice", choices=mods.keys(),
-                      default='dbpsk',
-                      help="Select modulation from: %s [default=%%default]"
-                            % (', '.join(mods.keys()),))
-
-    parser.add_option("-s", "--size", type="eng_float", default=1500,
-                      help="set packet size [default=%default]")
-    parser.add_option("-M", "--megabytes", type="eng_float", default=1.0,
-                      help="set megabytes to transmit [default=%default]")
-    parser.add_option("","--discontinuous", action="store_true", default=False,
-                      help="enable discontinous transmission (bursts of 5 packets)")
-    parser.add_option("-G", "--gui", action="store_true", default=False,
-                      help="Turn on the GUI [default=%default]")
-
-    channel_grp.add_option("", "--sample-rate", type="eng_float", default=1e5,
-                           help="set speed of channel/simulation rate to RATE [default=%default]") 
-    channel_grp.add_option("", "--snr", type="eng_float", default=30,
-                           help="set the SNR of the channel in dB [default=%default]")
-    channel_grp.add_option("", "--frequency-offset", type="eng_float", default=0,
-                           help="set frequency offset introduced by channel [default=%default]")
-    channel_grp.add_option("", "--timing-offset", type="eng_float", default=1.0,
-                           help="set timing offset introduced by channel [default=%default]")
-    channel_grp.add_option("", "--seed", action="store_true", default=False,
-                           help="use a random seed for AWGN noise [default=%default]")
-
-    transmit_path.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
-
-    for mod in mods.values():
-        mod.add_options(expert_grp)
-    for demod in demods.values():
-        demod.add_options(expert_grp)
-
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
-        
-    r = gr.enable_realtime_scheduling()
-    if r != gr.RT_OK:
-        print "Warning: failed to enable realtime scheduling"
-        
-    # Create an instance of a hierarchical block
-    tb = my_top_block(mods[options.modulation],
-                      demods[options.modulation],
-                      rx_callback, options)
-    tb.start()
-
-    packet_sender = th_send(send_pkt, options.megabytes, options.size)
-    packet_sender.start()
-
-    if(options.gui):
-        tb.qapp.exec_()
-        packet_sender.stop()
-    else:
-        # Process until done; hack in to the join to stop on an interrupt
-        while(packet_sender.isAlive()):
-            try:
-                packet_sender.join(1)
-            except KeyboardInterrupt:
-                packet_sender.stop()
-        
-    
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/digital/benchmark_qt_loopback2.py b/gnuradio-examples/python/digital/benchmark_qt_loopback2.py
deleted file mode 100755
index 02ae4b25f..000000000
--- a/gnuradio-examples/python/digital/benchmark_qt_loopback2.py
+++ /dev/null
@@ -1,536 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2010 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.
-# 
-
-from gnuradio import gr, gru, modulation_utils2
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import random, time, struct, sys, os, math
-
-from threading import Thread
-
-# from current dir
-from transmit_path import transmit_path
-from receive_path import receive_path
-
-try:
-    from gnuradio.qtgui import qtgui
-    from PyQt4 import QtGui, QtCore
-    import sip
-except ImportError:
-    print "Please install gr-qtgui."
-    sys.exit(1)
-    
-try:
-    from qt_digital_window2 import Ui_DigitalWindow
-except ImportError:
-    print "Error: could not find qt_digital_window2.py:"
-    print "\t\"pyuic4 qt_digital_window2.ui -o qt_digital_window2.py\""
-    sys.exit(1)
-
-
-#print os.getpid()
-#raw_input()
-
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the QT Interface and Control Dialog
-# ////////////////////////////////////////////////////////////////////
-
-
-class dialog_box(QtGui.QMainWindow):
-    def __init__(self, snkTx, snkRx, fg, parent=None):
-
-        QtGui.QWidget.__init__(self, parent)
-        self.gui = Ui_DigitalWindow()
-        self.gui.setupUi(self)
-
-        self.fg = fg
-
-        self.set_sample_rate(self.fg.sample_rate())
-
-        self.set_snr(self.fg.snr())
-        self.set_frequency(self.fg.frequency_offset())
-        self.set_time_offset(self.fg.timing_offset())
-
-        self.set_gain_clock(self.fg.rx_gain_clock())
-        self.set_gain_phase(self.fg.rx_gain_phase())
-        self.set_gain_freq(self.fg.rx_gain_freq())
-
-        # Add the qtsnk widgets to the hlayout box
-        self.gui.sinkLayout.addWidget(snkTx)
-        self.gui.sinkLayout.addWidget(snkRx)
-
-
-        # Connect up some signals
-        self.connect(self.gui.pauseButton, QtCore.SIGNAL("clicked()"),
-                     self.pauseFg)
-
-        self.connect(self.gui.sampleRateEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.sampleRateEditText)
-
-        self.connect(self.gui.snrEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.snrEditText)
-        self.connect(self.gui.freqEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.freqEditText)
-        self.connect(self.gui.timeEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.timeEditText)
-
-        self.connect(self.gui.gainClockEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainClockEditText)
-        self.connect(self.gui.gainPhaseEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainPhaseEditText)
-        self.connect(self.gui.gainFreqEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainFreqEditText)
-
-        # Build a timer to update the packet number and PER fields
-        self.update_delay = 250  # time between updating packet rate fields
-        self.pkt_timer = QtCore.QTimer(self)
-        self.connect(self.pkt_timer, QtCore.SIGNAL("timeout()"),
-                     self.updatePacketInfo)
-        self.pkt_timer.start(self.update_delay)
-
-    def pauseFg(self):
-        if(self.gui.pauseButton.text() == "Pause"):
-            self.fg.stop()
-            self.fg.wait()
-            self.gui.pauseButton.setText("Unpause")
-        else:
-            self.fg.start()
-            self.gui.pauseButton.setText("Pause")
-
-    # Accessor functions for Gui to manipulate system parameters
-    def set_sample_rate(self, sr):
-        ssr = eng_notation.num_to_str(sr)
-        self.gui.sampleRateEdit.setText(QtCore.QString("%1").arg(ssr))
-
-    def sampleRateEditText(self):
-        try:
-            rate = self.gui.sampleRateEdit.text().toAscii()
-            srate = eng_notation.str_to_num(rate)
-            #self.fg.set_sample_rate(srate)
-        except RuntimeError:
-            pass
-
-
-    # Accessor functions for Gui to manipulate channel model
-    def set_snr(self, snr):
-        self.gui.snrEdit.setText(QtCore.QString("%1").arg(snr))
-
-    def set_frequency(self, fo):
-        self.gui.freqEdit.setText(QtCore.QString("%1").arg(fo))
-
-    def set_time_offset(self, to):
-        self.gui.timeEdit.setText(QtCore.QString("%1").arg(to))
-
-    def snrEditText(self):
-        try:
-            snr = self.gui.snrEdit.text().toDouble()[0]
-            self.fg.set_snr(snr)
-        except RuntimeError:
-            pass
-
-    def freqEditText(self):
-        try:
-            freq = self.gui.freqEdit.text().toDouble()[0]
-            self.fg.set_frequency_offset(freq)
-        except RuntimeError:
-            pass
-
-    def timeEditText(self):
-        try:
-            to = self.gui.timeEdit.text().toDouble()[0]
-            self.fg.set_timing_offset(to)
-        except RuntimeError:
-            pass
-
-
-    # Accessor functions for Gui to manipulate receiver parameters
-    def set_gain_clock(self, gain):
-        self.gui.gainClockEdit.setText(QtCore.QString("%1").arg(gain))
-
-    def set_gain_phase(self, gain_phase):
-        self.gui.gainPhaseEdit.setText(QtCore.QString("%1").arg(gain_phase))
-
-    def set_gain_freq(self, gain_freq):
-        self.gui.gainFreqEdit.setText(QtCore.QString("%1").arg(gain_freq))
-        
-
-    def set_alpha_time(self, alpha):
-        self.gui.alphaTimeEdit.setText(QtCore.QString("%1").arg(alpha))
-
-    def set_beta_time(self, beta):
-        self.gui.betaTimeEdit.setText(QtCore.QString("%1").arg(beta))
-
-    def set_alpha_phase(self, alpha):
-        self.gui.alphaPhaseEdit.setText(QtCore.QString("%1").arg(alpha))
-
-    def gainPhaseEditText(self):
-        try:
-            gain_phase = self.gui.gainPhaseEdit.text().toDouble()[0]
-            self.fg.set_rx_gain_phase(gain_phase)
-        except RuntimeError:
-            pass
-
-    def gainClockEditText(self):
-        try:
-            gain = self.gui.gainClockEdit.text().toDouble()[0]
-            self.fg.set_rx_gain_clock(gain)
-        except RuntimeError:
-            pass
-
-    def gainFreqEditText(self):
-        try:
-            gain = self.gui.gainFreqEdit.text().toDouble()[0]
-            self.fg.set_rx_gain_freq(gain)
-        except RuntimeError:
-            pass
-
-    # Accessor functions for packet error reporting
-    def updatePacketInfo(self):
-        # Pull these globals in from the main thread
-        global n_rcvd, n_right, pktno
-
-        if(pktno > 0):
-            per = float(n_rcvd - n_right)/float(pktno)
-        else:
-            per = 0
-        self.gui.pktsRcvdEdit.setText(QtCore.QString("%1").arg(n_rcvd))
-        self.gui.pktsCorrectEdit.setText(QtCore.QString("%1").arg(n_right))
-        self.gui.perEdit.setText(QtCore.QString("%1").arg(float(per), 0, 'e', 4))
-
-
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the GNU Radio Top Block
-# ////////////////////////////////////////////////////////////////////
-
-
-
-class my_top_block(gr.top_block):
-    def __init__(self, mod_class, demod_class, rx_callback, options):
-        gr.top_block.__init__(self)
-
-        self._sample_rate = options.sample_rate
-
-        channelon = True;
-
-        self.gui_on = options.gui
-
-        self._frequency_offset = options.frequency_offset
-        self._timing_offset = options.timing_offset
-        self._tx_amplitude = options.tx_amplitude
-        self._snr_dB = options.snr
-
-        self._noise_voltage = self.get_noise_voltage(self._snr_dB)
-
-        # With new interface, sps does not get set by default, but
-        # in the loopback, we don't recalculate it; so just force it here
-        if(options.samples_per_symbol == None):
-            options.samples_per_symbol = 2
-
-        self.txpath = transmit_path(mod_class, options)
-        self.throttle = gr.throttle(gr.sizeof_gr_complex, self.sample_rate())
-        self.rxpath = receive_path(demod_class, rx_callback, options)
-
-        # FIXME: do better exposure to lower issues for control
-        self._gain_clock = self.rxpath.packet_receiver._demodulator._timing_alpha
-        self._gain_phase = self.rxpath.packet_receiver._demodulator._phase_alpha
-        self._gain_freq  = self.rxpath.packet_receiver._demodulator._freq_alpha
-
-        if channelon:
-            self.channel = gr.channel_model(self._noise_voltage,
-                                            self.frequency_offset(),
-                                            self.timing_offset())
-            
-            if options.discontinuous:
-                z = 20000*[0,]
-                self.zeros = gr.vector_source_c(z, True)
-                packet_size = 5*((4+8+4+1500+4) * 8)
-                self.mux = gr.stream_mux(gr.sizeof_gr_complex, [packet_size-0, int(9e5)])
-
-                # Connect components
-                self.connect(self.txpath, self.throttle, (self.mux,0))
-                self.connect(self.zeros, (self.mux,1))
-                self.connect(self.mux, self.channel, self.rxpath)
-
-            else:
-                self.connect(self.txpath, self.throttle, self.channel, self.rxpath)
-
-            if self.gui_on:
-                self.qapp = QtGui.QApplication(sys.argv)
-                fftsize = 2048
-
-                self.snk_tx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                           0, 1,
-                                           "Tx", True, True, False, True, True)
-                self.snk_rx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                           0, 1,
-                                           "Rx", True, True, False, True, True)
-
-                self.snk_tx.set_frequency_axis(-80, 0)
-                self.snk_rx.set_frequency_axis(-60, 20)
-
-                self.freq_recov = self.rxpath.packet_receiver._demodulator.freq_recov
-                self.phase_recov = self.rxpath.packet_receiver._demodulator.phase_recov
-                self.time_recov = self.rxpath.packet_receiver._demodulator.time_recov
-                self.freq_recov.set_alpha(self._gain_freq)
-                self.freq_recov.set_beta(self._gain_freq/10.0)
-                self.phase_recov.set_alpha(self._gain_phase)
-                self.phase_recov.set_beta(0.25*self._gain_phase*self._gain_phase)
-                self.time_recov.set_alpha(self._gain_clock)
-                self.time_recov.set_beta(0.25*self._gain_clock*self._gain_clock)
-
-                # Connect to the QT sinks
-                # FIXME: make better exposure to receiver from rxpath
-                self.connect(self.channel, self.snk_tx)
-                self.connect(self.phase_recov, self.snk_rx)
-                #self.connect(self.freq_recov, self.snk_rx)
-
-                pyTxQt  = self.snk_tx.pyqwidget()
-                pyTx = sip.wrapinstance(pyTxQt, QtGui.QWidget)
-                 
-                pyRxQt  = self.snk_rx.pyqwidget()
-                pyRx = sip.wrapinstance(pyRxQt, QtGui.QWidget)
-
-                self.main_box = dialog_box(pyTx, pyRx, self)
-                self.main_box.show()
-                
-        else:
-            # Connect components
-            self.connect(self.txpath, self.throttle, self.rxpath)
-
-
-
-    # System Parameters
-    def sample_rate(self):
-        return self._sample_rate
-    
-    def set_sample_rate(self, sr):
-        self._sample_rate = sr
-        #self.throttle.set_samples_per_second(self._sample_rate)
-
-    # Channel Model Parameters
-    def snr(self):
-        return self._snr_dB
-    
-    def set_snr(self, snr):
-        self._snr_dB = snr
-        self._noise_voltage = self.get_noise_voltage(self._snr_dB)
-        self.channel.set_noise_voltage(self._noise_voltage)
-
-    def get_noise_voltage(self, SNR):
-        snr = 10.0**(SNR/10.0)        
-        power_in_signal = abs(self._tx_amplitude)**2
-        noise_power = power_in_signal/snr
-        noise_voltage = math.sqrt(noise_power)
-        return noise_voltage
-
-    def frequency_offset(self):
-        return self._frequency_offset * self.sample_rate()
-
-    def set_frequency_offset(self, fo):
-        self._frequency_offset = fo / self.sample_rate()
-        self.channel.set_frequency_offset(self._frequency_offset)
-
-    def timing_offset(self):
-        return self._timing_offset
-    
-    def set_timing_offset(self, to):
-        self._timing_offset = to
-        self.channel.set_timing_offset(self._timing_offset)
-
-
-    # Receiver Parameters
-    def rx_gain_clock(self):
-        return self._gain_clock
-
-    def rx_gain_clock_beta(self):
-        return self._gain_clock_beta
-
-    def set_rx_gain_clock(self, gain):
-        self._gain_clock = gain
-        self._gain_clock_beta = .25 * self._gain_clock * self._gain_clock
-        self.rxpath.packet_receiver._demodulator.time_recov.set_alpha(self._gain_clock)
-        self.rxpath.packet_receiver._demodulator.time_recov.set_beta(self._gain_clock_beta)
-
-    def rx_gain_phase(self):
-        return self._gain_phase
-
-    def rx_gain_phase_beta(self):
-        return self._gain_phase_beta
-    
-    def set_rx_gain_phase(self, gain_phase):
-        self._gain_phase = gain_phase
-        self._gain_phase_beta = .25 * self._gain_phase * self._gain_phase
-        self.rxpath.packet_receiver._demodulator.phase_recov.set_alpha(self._gain_phase)
-        self.rxpath.packet_receiver._demodulator.phase_recov.set_beta(self._gain_phase_beta)
-
-
-    def rx_gain_freq(self):
-        return self._gain_freq
-
-    def set_rx_gain_freq(self, gain_freq):
-        self._gain_freq = gain_freq
-        #self._gain_freq_beta = .25 * self._gain_freq * self._gain_freq
-        self.rxpath.packet_receiver._demodulator.freq_recov.set_alpha(self._gain_freq)
-        self.rxpath.packet_receiver._demodulator.freq_recov.set_beta(self._gain_freq/10.0)
-        #self.rxpath.packet_receiver._demodulator.freq_recov.set_beta(self._gain_fre_beta)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#       Thread to handle the packet sending procedure
-#          Operates in parallel with qApp.exec_()       
-# /////////////////////////////////////////////////////////////////////////////
-
-
-
-class th_send(Thread):
-    def __init__(self, send_fnc, megs, sz):
-        Thread.__init__(self)
-        self.send = send_fnc
-        self.nbytes = int(1e6 * megs)
-        self.pkt_size = int(sz)
-
-    def run(self):
-        # generate and send packets
-        n = 0
-        pktno = 0
-        
-        while n < self.nbytes:
-            self.send(struct.pack('!H', pktno & 0xffff) +
-                      (self.pkt_size - 2) * chr(pktno & 0xff))
-            n += self.pkt_size
-            pktno += 1
-            
-        self.send(eof=True)
-
-    def stop(self):
-        self.nbytes = 0
-
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-
-
-def main():
-
-    global n_rcvd, n_right, pktno
-
-    n_rcvd = 0
-    n_right = 0
-    pktno = 0
-    
-    def rx_callback(ok, payload):
-        global n_rcvd, n_right, pktno
-        (pktno,) = struct.unpack('!H', payload[0:2])
-        n_rcvd += 1
-        if ok:
-            n_right += 1
-
-        if not options.gui:
-            print "ok = %5s  pktno = %4d  n_rcvd = %4d  n_right = %4d" % (
-                ok, pktno, n_rcvd, n_right)
-        
-
-    def send_pkt(payload='', eof=False):
-        return tb.txpath.send_pkt(payload, eof)
-
-    mods = modulation_utils2.type_1_mods()
-    demods = modulation_utils2.type_1_demods()
-
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-    channel_grp = parser.add_option_group("Channel")
-
-    parser.add_option("-m", "--modulation", type="choice", choices=mods.keys(),
-                      default='dbpsk2',
-                      help="Select modulation from: %s [default=%%default]"
-                            % (', '.join(mods.keys()),))
-
-    parser.add_option("-s", "--size", type="eng_float", default=1500,
-                      help="set packet size [default=%default]")
-    parser.add_option("-M", "--megabytes", type="eng_float", default=1.0,
-                      help="set megabytes to transmit [default=%default]")
-    parser.add_option("","--discontinuous", action="store_true", default=False,
-                      help="enable discontinous transmission (bursts of 5 packets)")
-    parser.add_option("-G", "--gui", action="store_true", default=False,
-                      help="Turn on the GUI [default=%default]")
-
-    channel_grp.add_option("", "--sample-rate", type="eng_float", default=1e5,
-                           help="set speed of channel/simulation rate to RATE [default=%default]") 
-    channel_grp.add_option("", "--snr", type="eng_float", default=30,
-                           help="set the SNR of the channel in dB [default=%default]")
-    channel_grp.add_option("", "--frequency-offset", type="eng_float", default=0,
-                           help="set frequency offset introduced by channel [default=%default]")
-    channel_grp.add_option("", "--timing-offset", type="eng_float", default=1.0,
-                           help="set timing offset introduced by channel [default=%default]")
-    channel_grp.add_option("", "--seed", action="store_true", default=False,
-                           help="use a random seed for AWGN noise [default=%default]")
-
-    transmit_path.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
-
-    for mod in mods.values():
-        mod.add_options(expert_grp)
-    for demod in demods.values():
-        demod.add_options(expert_grp)
-
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
-        
-    r = gr.enable_realtime_scheduling()
-    if r != gr.RT_OK:
-        print "Warning: failed to enable realtime scheduling"
-        
-    # Create an instance of a hierarchical block
-    tb = my_top_block(mods[options.modulation],
-                      demods[options.modulation],
-                      rx_callback, options)
-    tb.start()
-
-    packet_sender = th_send(send_pkt, options.megabytes, options.size)
-    packet_sender.start()
-
-    if(options.gui):
-        tb.qapp.exec_()
-        packet_sender.stop()
-    else:
-        # Process until done; hack in to the join to stop on an interrupt
-        while(packet_sender.isAlive()):
-            try:
-                packet_sender.join(1)
-            except KeyboardInterrupt:
-                packet_sender.stop()
-        
-    
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/digital/benchmark_qt_rx.py b/gnuradio-examples/python/digital/benchmark_qt_rx.py
deleted file mode 100755
index 0cbb68d23..000000000
--- a/gnuradio-examples/python/digital/benchmark_qt_rx.py
+++ /dev/null
@@ -1,443 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2006,2007,2009 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.
-# 
-
-from gnuradio import gr, gru, modulation_utils
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-from gnuradio import usrp_options
-
-import random
-import struct
-import sys
-
-# from current dir
-from receive_path import receive_path
-from pick_bitrate import pick_rx_bitrate
-
-try:
-    from gnuradio.qtgui import qtgui
-    from PyQt4 import QtGui, QtCore
-    import sip
-except ImportError:
-    print "Please install gr-qtgui."
-    sys.exit(1)
-    
-try:
-    from qt_rx_window import Ui_DigitalWindow
-except ImportError:
-    print "Error: could not find qt_rx_window.py:"
-    print "\tYou must first build this from qt_rx_window.ui with the following command:"
-    print "\t\"pyuic4 qt_rx_window.ui -o qt_rx_window.py\""
-    sys.exit(1)
-
-#import os
-#print os.getpid()
-#raw_input('Attach and press enter: ')
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the QT Interface and Control Dialog
-# ////////////////////////////////////////////////////////////////////
-
-
-class dialog_box(QtGui.QMainWindow):
-    def __init__(self, snkRxIn, snkRx, fg, parent=None):
-
-        QtGui.QWidget.__init__(self, parent)
-        self.gui = Ui_DigitalWindow()
-        self.gui.setupUi(self)
-
-        self.fg = fg
-
-        self.set_frequency(self.fg.frequency())
-        self.set_gain(self.fg.gain())
-        self.set_decim(self.fg.decim())
-        self.set_gain_mu(self.fg.rx_gain_mu())
-        self.set_alpha(self.fg.rx_alpha())
-
-        # Add the qtsnk widgets to the hlayout box
-        self.gui.sinkLayout.addWidget(snkRxIn)
-        self.gui.sinkLayout.addWidget(snkRx)
-
-
-        # Connect up some signals
-        self.connect(self.gui.freqEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.freqEditText)
-        self.connect(self.gui.gainEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainEditText)
-        self.connect(self.gui.decimEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.decimEditText)
-        self.connect(self.gui.gainMuEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainMuEditText)
-        self.connect(self.gui.alphaEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.alphaEditText)
-
-        # Build a timer to update the packet number and PER fields
-        self.update_delay = 250  # time between updating packet rate fields
-        self.pkt_timer = QtCore.QTimer(self)
-        self.connect(self.pkt_timer, QtCore.SIGNAL("timeout()"),
-                     self.updatePacketInfo)
-        self.pkt_timer.start(self.update_delay)
-
-
-    # Accessor functions for Gui to manipulate receiver parameters
-    def set_frequency(self, fo):
-        self.gui.freqEdit.setText(QtCore.QString("%1").arg(fo))
-
-    def set_gain(self, gain):
-        self.gui.gainEdit.setText(QtCore.QString("%1").arg(gain))
-
-    def set_decim(self, decim):
-        self.gui.decimEdit.setText(QtCore.QString("%1").arg(decim))
-
-    def set_gain_mu(self, gain):
-        self.gui.gainMuEdit.setText(QtCore.QString("%1").arg(gain))
-
-    def set_alpha(self, alpha):
-        self.gui.alphaEdit.setText(QtCore.QString("%1").arg(alpha))
-        
-    def freqEditText(self):
-        try:
-            freq = self.gui.freqEdit.text().toDouble()[0]
-            self.fg.set_freq(freq)
-        except RuntimeError:
-            pass
-
-    def gainEditText(self):
-        try:
-            gain = self.gui.gainEdit.text().toDouble()[0]
-            self.fg.set_gain(gain)
-        except RuntimeError:
-            pass
-
-    def decimEditText(self):
-        try:
-            decim = self.gui.decimEdit.text().toInt()[0]
-            self.fg.set_decim(decim)
-        except RuntimeError:
-            pass
-
-    def alphaEditText(self):
-        try:
-            alpha = self.gui.alphaEdit.text().toDouble()[0]
-            self.fg.set_rx_alpha(alpha)
-        except RuntimeError:
-            pass
-
-    def gainMuEditText(self):
-        try:
-            gain = self.gui.gainMuEdit.text().toDouble()[0]
-            self.fg.set_rx_gain_mu(gain)
-        except RuntimeError:
-            pass
-
-
-    # Accessor function for packet error reporting
-    def updatePacketInfo(self):
-        # Pull these globals in from the main thread
-        global n_rcvd, n_right, pktno
-
-        per = float(n_rcvd - n_right)/float(pktno)
-        self.gui.pktsRcvdEdit.setText(QtCore.QString("%1").arg(n_rcvd))
-        self.gui.pktsCorrectEdit.setText(QtCore.QString("%1").arg(n_right))
-        self.gui.perEdit.setText(QtCore.QString("%1").arg(per))
-
-
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the GNU Radio Top Block
-# ////////////////////////////////////////////////////////////////////
-
-
-class my_top_block(gr.top_block):
-    def __init__(self, demodulator, rx_callback, options):
-        gr.top_block.__init__(self)
-
-        self._rx_freq            = options.rx_freq         # receiver's center frequency
-        self._rx_gain            = options.rx_gain         # receiver's gain
-        self._rx_subdev_spec     = options.rx_subdev_spec  # daughterboard to use
-        self._decim              = options.decim           # Decimating rate for the USRP (prelim)
-        self._bitrate            = options.bitrate
-        self._samples_per_symbol = options.samples_per_symbol
-        self._demod_class        = demodulator
-        self.gui_on              = options.gui
-               
-        if self._rx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --rx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        # Set up USRP source
-        self._setup_usrp_source(options)
-
-        # copy the final answers back into options for use by demodulator
-        options.samples_per_symbol = self._samples_per_symbol
-        options.bitrate = self._bitrate
-        options.decim = self._decim
-
-        ok = self.set_freq(self._rx_freq)
-        if not ok:
-            print "Failed to set Rx frequency to %s" % (eng_notation.num_to_str(self._rx_freq))
-            raise ValueError, eng_notation.num_to_str(self._rx_freq)
-
-        self.set_gain(options.rx_gain)
-
-        # Set up receive path
-        self.rxpath = receive_path(demodulator, rx_callback, options) 
-
-        # FIXME: do better exposure to lower issues for control
-        self._gain_mu = self.rxpath.packet_receiver._demodulator._mm_gain_mu
-        self._alpha = self.rxpath.packet_receiver._demodulator._costas_alpha
-
-        self.connect(self.u, self.rxpath)
-
-        if self.gui_on:
-            self.qapp = QtGui.QApplication(sys.argv)
-            fftsize = 2048
-
-            bw_in = self.u.adc_rate() / self.decim()
-            self.snk_rxin = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                         self._rx_freq, bw_in,
-                                         "Received", True, True, False, True, True, False)
-            self.snk_rx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                       0, self._bitrate,
-                                       "Post-Synchronizer", True, True, False, True, True, False)
-
-            self.snk_rxin.set_frequency_axis(-60, 60)
-            self.snk_rx.set_frequency_axis(-60, 20)
-            self.snk_rxin.set_time_domain_axis(-2000,2000)
-            
-            # Connect to the QT sinks
-            # FIXME: make better exposure to receiver from rxpath
-            self.receiver = self.rxpath.packet_receiver._demodulator.receiver
-            self.connect(self.u, self.snk_rxin)
-            self.connect(self.receiver, self.snk_rx)
-            
-            pyRxInQt  = self.snk_rxin.pyqwidget()
-            pyRxIn = sip.wrapinstance(pyRxInQt, QtGui.QWidget)
-            
-            pyRxQt  = self.snk_rx.pyqwidget()
-            pyRx = sip.wrapinstance(pyRxQt, QtGui.QWidget)
-            
-            self.main_box = dialog_box(pyRxIn, pyRx, self)
-            self.main_box.show()
-
-    def _setup_usrp_source(self, options):
-        self.u = usrp_options.create_usrp_source(options)
-        adc_rate = self.u.adc_rate()
-
-        self.u.set_decim(self._decim)
-
-        (self._bitrate, self._samples_per_symbol, self._decim) = \
-                        pick_rx_bitrate(self._bitrate, self._demod_class.bits_per_symbol(), \
-                                        self._samples_per_symbol, self._decim, adc_rate,  \
-                                        self.u.get_decim_rates())
-
-        self.u.set_decim(self._decim)
-        self.set_auto_tr(True)                 # enable Auto Transmit/Receive switching
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.
-        """
-        return self.u.set_center_freq(target_freq)
-
-    def set_gain(self, gain):
-        """
-        Sets the analog gain in the USRP
-        """
-        if gain is None:
-            r = self.u.gain_range()
-            gain = (r[0] + r[1])/2               # set gain to midpoint
-        self._rx_gain = gain
-        return self.u.set_gain(self._rx_gain)
-
-    def set_auto_tr(self, enable):
-        return self.u.set_auto_tr(enable)
-
-    def set_decim(self, decim):
-        self._decim = decim
-        self.u.set_decim(self._decim)
-
-        if(self.gui_on):
-            bw_in = self.u.adc_rate() / self._decim
-            self._bitrate = bw_in / self._samples_per_symbol
-            self.snk_rxin.set_frequency_range(0, -bw_in/2.0, bw_in/2.0)
-            self.snk_rx.set_frequency_range(0, -self._bitrate/2.0, self._bitrate/2.0)
-
-    def frequency(self):
-        return self._rx_freq
-
-    def gain(self):
-        return self._rx_gain
-
-    def decim(self):
-        return self._decim
-
-    def rx_gain_mu(self):
-        return self._gain_mu
-
-    def rx_gain_omega(self):
-        return self.gain_omega
-    
-    def set_rx_gain_mu(self, gain):
-        self._gain_mu = gain
-        self.gain_omega = .25 * self._gain_mu * self._gain_mu
-        self.receiver.set_gain_mu(self._gain_mu)
-        self.receiver.set_gain_omega(self.gain_omega)
-
-    def rx_alpha(self):
-        return self._alpha
-
-    def rx_beta(self):
-        return self.beta
-    
-    def set_rx_alpha(self, alpha):
-        self._alpha = alpha
-        self.beta = .25 * self._alpha * self._alpha
-        self.receiver.set_alpha(self._alpha)
-        self.receiver.set_beta(self.beta)
-
-    def add_options(normal, expert):
-        """
-        Adds usrp-specific options to the Options Parser
-        """
-        add_freq_option(normal)
-        normal.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B")
-        normal.add_option("", "--rx-gain", type="eng_float", default=None, metavar="GAIN",
-                          help="set receiver gain in dB [default=midpoint].  See also --show-rx-gain-range")
-        normal.add_option("", "--show-rx-gain-range", action="store_true", default=False, 
-                          help="print min and max Rx gain available on selected daughterboard")
-        normal.add_option("-v", "--verbose", action="store_true", default=False)
-        normal.add_option("-G", "--gui", action="store_true", default=False,
-                          help="Turn on the GUI [default=%default]")
-
-        expert.add_option("", "--rx-freq", type="eng_float", default=None,
-                          help="set Rx frequency to FREQ [default=%default]", metavar="FREQ")
-        expert.add_option("-d", "--decim", type="intx", default=128,
-                          help="set fpga decimation rate to DECIM [default=%default]")
-        expert.add_option("", "--snr", type="eng_float", default=30,
-                          help="set the SNR of the channel in dB [default=%default]")
-   
-
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
-                          metavar="FREQ")
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-global n_rcvd, n_right
-
-def main():
-    global n_rcvd, n_right, pktno
-
-    n_rcvd = 0
-    n_right = 0
-    pktno = 1
-    
-    def rx_callback(ok, payload):
-        global n_rcvd, n_right, pktno
-        (pktno,) = struct.unpack('!H', payload[0:2])
-        n_rcvd += 1
-        if ok:
-            n_right += 1
-
-        if not options.gui:
-            print "ok = %5s  pktno = %4d  n_rcvd = %4d  n_right = %4d" % (
-                ok, pktno, n_rcvd, n_right)
-
-
-    demods = modulation_utils.type_1_demods()
-
-    # Create Options Parser:
-    parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-
-    parser.add_option("-m", "--modulation", type="choice", choices=demods.keys(), 
-                      default='dbpsk',
-                      help="Select modulation from: %s [default=%%default]"
-                            % (', '.join(demods.keys()),))
-
-    my_top_block.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
-    usrp_options.add_rx_options(parser)
-
-    for mod in demods.values():
-        mod.add_options(expert_grp)
-
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-    if options.rx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-
-    # build the graph
-    tb = my_top_block(demods[options.modulation], rx_callback, options)
-
-    r = gr.enable_realtime_scheduling()
-    if r != gr.RT_OK:
-        print "Warning: Failed to enable realtime scheduling."
-
-    tb.start()        # start flow graph
-
-    if(options.gui):
-        tb.qapp.exec_()
-    else:
-        tb.wait()         # wait for it to finish
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/digital/benchmark_qt_rx2.py b/gnuradio-examples/python/digital/benchmark_qt_rx2.py
deleted file mode 100755
index 0c37f4c6a..000000000
--- a/gnuradio-examples/python/digital/benchmark_qt_rx2.py
+++ /dev/null
@@ -1,475 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2010 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.
-# 
-
-from gnuradio import gr, gru, modulation_utils2
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-from gnuradio import usrp_options
-
-import random
-import struct
-import sys
-
-# from current dir
-from receive_path import receive_path
-from pick_bitrate2 import pick_rx_bitrate
-
-try:
-    from gnuradio.qtgui import qtgui
-    from PyQt4 import QtGui, QtCore
-    import sip
-except ImportError:
-    print "Please install gr-qtgui."
-    sys.exit(1)
-    
-try:
-    from qt_rx_window2 import Ui_DigitalWindow
-except ImportError:
-    print "Error: could not find qt_rx_window2.py:"
-    print "\tYou must first build this from qt_rx_window2.ui with the following command:"
-    print "\t\"pyuic4 qt_rx_window2.ui -o qt_rx_window2.py\""
-    sys.exit(1)
-
-#import os
-#print os.getpid()
-#raw_input('Attach and press enter: ')
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the QT Interface and Control Dialog
-# ////////////////////////////////////////////////////////////////////
-
-
-class dialog_box(QtGui.QMainWindow):
-    def __init__(self, snkRxIn, snkRx, fg, parent=None):
-
-        QtGui.QWidget.__init__(self, parent)
-        self.gui = Ui_DigitalWindow()
-        self.gui.setupUi(self)
-
-        self.fg = fg
-
-        self.set_frequency(self.fg.frequency())
-        self.set_gain(self.fg.gain())
-        self.set_decim(self.fg.decim())
-        self.set_gain_clock(self.fg.rx_gain_clock())
-        self.set_gain_phase(self.fg.rx_gain_phase())
-        self.set_gain_freq(self.fg.rx_gain_freq())
-
-        # Add the qtsnk widgets to the hlayout box
-        self.gui.sinkLayout.addWidget(snkRxIn)
-        self.gui.sinkLayout.addWidget(snkRx)
-
-
-        # Connect up some signals
-        self.connect(self.gui.freqEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.freqEditText)
-        self.connect(self.gui.gainEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainEditText)
-        self.connect(self.gui.decimEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.decimEditText)
-        self.connect(self.gui.gainClockEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainClockEditText)
-        self.connect(self.gui.gainPhaseEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainPhaseEditText)
-        self.connect(self.gui.gainFreqEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainFreqEditText)
-
-        # Build a timer to update the packet number and PER fields
-        self.update_delay = 250  # time between updating packet rate fields
-        self.pkt_timer = QtCore.QTimer(self)
-        self.connect(self.pkt_timer, QtCore.SIGNAL("timeout()"),
-                     self.updatePacketInfo)
-        self.pkt_timer.start(self.update_delay)
-
-
-    # Accessor functions for Gui to manipulate receiver parameters
-    def set_frequency(self, fo):
-        self.gui.freqEdit.setText(QtCore.QString("%1").arg(fo))
-
-    def set_gain(self, gain):
-        self.gui.gainEdit.setText(QtCore.QString("%1").arg(gain))
-
-    def set_decim(self, decim):
-        self.gui.decimEdit.setText(QtCore.QString("%1").arg(decim))
-
-    def set_gain_clock(self, gain):
-        self.gui.gainClockEdit.setText(QtCore.QString("%1").arg(gain))
-
-    def set_gain_phase(self, gain_phase):
-        self.gui.gainPhaseEdit.setText(QtCore.QString("%1").arg(gain_phase))
-
-    def set_gain_freq(self, gain_freq):
-        self.gui.gainFreqEdit.setText(QtCore.QString("%1").arg(gain_freq))
-        
-    def freqEditText(self):
-        try:
-            freq = self.gui.freqEdit.text().toDouble()[0]
-            self.fg.set_freq(freq)
-        except RuntimeError:
-            pass
-
-    def gainEditText(self):
-        try:
-            gain = self.gui.gainEdit.text().toDouble()[0]
-            self.fg.set_gain(gain)
-        except RuntimeError:
-            pass
-
-    def decimEditText(self):
-        try:
-            decim = self.gui.decimEdit.text().toInt()[0]
-            self.fg.set_decim(decim)
-        except RuntimeError:
-            pass
-
-    def gainPhaseEditText(self):
-        try:
-            gain_phase = self.gui.gainPhaseEdit.text().toDouble()[0]
-            self.fg.set_rx_gain_phase(gain_phase)
-        except RuntimeError:
-            pass
-
-    def gainClockEditText(self):
-        try:
-            gain = self.gui.gainClockEdit.text().toDouble()[0]
-            self.fg.set_rx_gain_clock(gain)
-        except RuntimeError:
-            pass
-
-    def gainFreqEditText(self):
-        try:
-            gain = self.gui.gainFreqEdit.text().toDouble()[0]
-            self.fg.set_rx_gain_freq(gain)
-        except RuntimeError:
-            pass
-
-
-    # Accessor function for packet error reporting
-    def updatePacketInfo(self):
-        # Pull these globals in from the main thread
-        global n_rcvd, n_right, pktno
-
-        per = float(n_rcvd - n_right)/float(pktno)
-        self.gui.pktsRcvdEdit.setText(QtCore.QString("%1").arg(n_rcvd))
-        self.gui.pktsCorrectEdit.setText(QtCore.QString("%1").arg(n_right))
-        self.gui.perEdit.setText(QtCore.QString("%1").arg(per, 0, 'e', 4))
-
-
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the GNU Radio Top Block
-# ////////////////////////////////////////////////////////////////////
-
-
-class my_top_block(gr.top_block):
-    def __init__(self, demodulator, rx_callback, options):
-        gr.top_block.__init__(self)
-
-        self._rx_freq            = options.rx_freq         # receiver's center frequency
-        self._rx_gain            = options.rx_gain         # receiver's gain
-        self._rx_subdev_spec     = options.rx_subdev_spec  # daughterboard to use
-        self._decim              = options.decim           # Decimating rate for the USRP (prelim)
-        self._bitrate            = options.bitrate
-        self._samples_per_symbol = options.samples_per_symbol
-        self._demod_class        = demodulator
-        self.gui_on              = options.gui
-        
-        if self._rx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --rx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        # Set up USRP source
-        self._setup_usrp_source(options)
-
-        # copy the final answers back into options for use by demodulator
-        options.samples_per_symbol = self._samples_per_symbol
-        options.bitrate = self._bitrate
-        options.decim = self._decim
-
-        ok = self.set_freq(self._rx_freq)
-        if not ok:
-            print "Failed to set Rx frequency to %s" % (eng_notation.num_to_str(self._rx_freq))
-            raise ValueError, eng_notation.num_to_str(self._rx_freq)
-
-        self.set_gain(options.rx_gain)
-
-        # Set up receive path
-        self.rxpath = receive_path(demodulator, rx_callback, options) 
-
-        # FIXME: do better exposure to lower issues for control
-        self._gain_clock = self.rxpath.packet_receiver._demodulator._timing_alpha
-        self._gain_phase = self.rxpath.packet_receiver._demodulator._phase_alpha
-        self._gain_freq  = self.rxpath.packet_receiver._demodulator._freq_alpha
-
-        self.connect(self.u, self.rxpath)
-
-        if self.gui_on:
-            self.qapp = QtGui.QApplication(sys.argv)
-            fftsize = 2048
-
-            bw_in = self.u.adc_rate() / self.decim()
-            self.snk_rxin = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                         self._rx_freq, bw_in,
-                                         "Received", True, True, False, True, True, False)
-            self.snk_rx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                       0, self._bitrate,
-                                       "Post-Synchronizer", True, True, False, True, True, False)
-
-            self.snk_rxin.set_frequency_axis(-140, 20)
-            self.snk_rx.set_frequency_axis(-80, 20)
-            self.snk_rxin.set_time_domain_axis(-2000,2000)
-            
-            # Connect to the QT sinks
-            # FIXME: make better exposure to receiver from rxpath
-            self.receiver = self.rxpath.packet_receiver._demodulator.phase_recov
-            #self.receiver = self.rxpath.packet_receiver._demodulator.freq_recov
-            self.connect(self.u, self.snk_rxin)
-            self.connect(self.receiver, self.snk_rx)
-            
-            pyRxInQt  = self.snk_rxin.pyqwidget()
-            pyRxIn = sip.wrapinstance(pyRxInQt, QtGui.QWidget)
-            
-            pyRxQt  = self.snk_rx.pyqwidget()
-            pyRx = sip.wrapinstance(pyRxQt, QtGui.QWidget)
-
-            self.snk_freq = qtgui.sink_f(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                         0, self._bitrate,
-                                         "FLL", True, False, False, True, False, False)
-            
-            self.main_box = dialog_box(pyRxIn, pyRx, self)
-            self.main_box.show()
-
-    def _setup_usrp_source(self, options):
-        self.u = usrp_options.create_usrp_source(options)
-        adc_rate = self.u.adc_rate()
-
-        self.u.set_decim(self._decim)
-
-        (self._bitrate, self._samples_per_symbol, self._decim) = \
-                        pick_rx_bitrate(options.bitrate, self._demod_class.bits_per_symbol(), \
-                                        options.samples_per_symbol, options.decim, \
-                                        adc_rate, self.u.get_decim_rates())
-
-        self.u.set_decim(self._decim)
-        self.set_auto_tr(True)                 # enable Auto Transmit/Receive switching
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.
-        """
-        return self.u.set_center_freq(target_freq)
-
-    def set_gain(self, gain):
-        """
-        Sets the analog gain in the USRP
-        """
-        if gain is None:
-            r = self.u.gain_range()
-            gain = (r[0] + r[1])/2               # set gain to midpoint
-        self._rx_gain = gain
-        ret = self.u.set_gain(self._rx_gain)
-        return ret
-
-    def set_auto_tr(self, enable):
-        return self.u.set_auto_tr(enable)
-
-    def set_decim(self, decim):
-        self._decim = decim
-        self.u.set_decim(self._decim)
-
-        if(self.gui_on):
-            bw_in = self.u.adc_rate() / self._decim
-            self._bitrate = bw_in / self._samples_per_symbol
-            self.snk_rxin.set_frequency_range(0, bw_in)
-            self.snk_rx.set_frequency_range(0, self._bitrate)
-
-    def frequency(self):
-        return self._rx_freq
-
-    def gain(self):
-        return self._rx_gain
-
-    def decim(self):
-        return self._decim
-
-    def rx_gain_clock(self):
-        return self._gain_clock
-
-    def rx_gain_clock_beta(self):
-        return self._gain_clock_beta
-
-    def set_rx_gain_clock(self, gain):
-        self._gain_clock = gain
-        self._gain_clock_beta = .25 * self._gain_clock * self._gain_clock
-        self.rxpath.packet_receiver._demodulator.time_recov.set_alpha(self._gain_clock)
-        self.rxpath.packet_receiver._demodulator.time_recov.set_beta(self._gain_clock_beta)
-
-    def rx_gain_phase(self):
-        return self._gain_phase
-
-    def rx_gain_phase_beta(self):
-        return self._gain_phase_beta
-    
-    def set_rx_gain_phase(self, gain_phase):
-        self._gain_phase = gain_phase
-        self._gain_phase_beta = .25 * self._gain_phase * self._gain_phase
-        self.rxpath.packet_receiver._demodulator.phase_recov.set_alpha(self._gain_phase)
-        self.rxpath.packet_receiver._demodulator.phase_recov.set_beta(self._gain_phase_beta)
-
-
-    def rx_gain_freq(self):
-        return self._gain_freq
-
-    def set_rx_gain_freq(self, gain_freq):
-        self._gain_freq = gain_freq
-        #self._gain_freq_beta = .25 * self._gain_freq * self._gain_freq
-        self.rxpath.packet_receiver._demodulator.freq_recov.set_alpha(self._gain_freq)
-        self.rxpath.packet_receiver._demodulator.freq_recov.set_beta(self._gain_freq/10.0)
-        #self.rxpath.packet_receiver._demodulator.freq_recov.set_beta(self._gain_fre_beta)
-
-
-    def add_options(normal, expert):
-        """
-        Adds usrp-specific options to the Options Parser
-        """
-        add_freq_option(normal)
-        normal.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B")
-        normal.add_option("", "--rx-gain", type="eng_float", default=None, metavar="GAIN",
-                          help="set receiver gain in dB [default=midpoint].  See also --show-rx-gain-range")
-        normal.add_option("", "--show-rx-gain-range", action="store_true", default=False, 
-                          help="print min and max Rx gain available on selected daughterboard")
-        normal.add_option("-v", "--verbose", action="store_true", default=False)
-        normal.add_option("-G", "--gui", action="store_true", default=False,
-                          help="Turn on the GUI [default=%default]")
-
-        expert.add_option("", "--rx-freq", type="eng_float", default=None,
-                          help="set Rx frequency to FREQ [default=%default]", metavar="FREQ")
-        expert.add_option("-d", "--decim", type="intx", default=128,
-                          help="set fpga decimation rate to DECIM [default=%default]")
-        expert.add_option("", "--snr", type="eng_float", default=30,
-                          help="set the SNR of the channel in dB [default=%default]")
-   
-
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
-                          metavar="FREQ")
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-global n_rcvd, n_right
-
-def main():
-    global n_rcvd, n_right, pktno
-
-    n_rcvd = 0
-    n_right = 0
-    pktno = 1
-    
-    def rx_callback(ok, payload):
-        global n_rcvd, n_right, pktno
-        (pktno,) = struct.unpack('!H', payload[0:2])
-        n_rcvd += 1
-        if ok:
-            n_right += 1
-
-        if not options.gui:
-            print "ok = %5s  pktno = %4d  n_rcvd = %4d  n_right = %4d" % (
-                ok, pktno, n_rcvd, n_right)
-
-
-    demods = modulation_utils2.type_1_demods()
-
-    # Create Options Parser:
-    parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-
-    parser.add_option("-m", "--modulation", type="choice", choices=demods.keys(), 
-                      default='dbpsk2',
-                      help="Select modulation from: %s [default=%%default]"
-                            % (', '.join(demods.keys()),))
-
-    my_top_block.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
-    usrp_options.add_rx_options(parser)
-
-    for mod in demods.values():
-        mod.add_options(expert_grp)
-
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-    if options.rx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-
-    # build the graph
-    tb = my_top_block(demods[options.modulation], rx_callback, options)
-
-    r = gr.enable_realtime_scheduling()
-    if r != gr.RT_OK:
-        print "Warning: Failed to enable realtime scheduling."
-
-    tb.start()        # start flow graph
-
-    if(options.gui):
-        tb.qapp.exec_()
-    else:
-        tb.wait()         # wait for it to finish
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/digital/benchmark_rx2.py b/gnuradio-examples/python/digital/benchmark_rx2.py
deleted file mode 100755
index fe422be83..000000000
--- a/gnuradio-examples/python/digital/benchmark_rx2.py
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2010 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.
-# 
-
-from gnuradio import gr, gru, modulation_utils2
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-import random
-import struct
-import sys
-
-# from current dir
-import usrp_receive_path2
-
-#import os
-#print os.getpid()
-#raw_input('Attach and press enter: ')
-
-class my_top_block(gr.top_block):
-    def __init__(self, demodulator, rx_callback, options):
-        gr.top_block.__init__(self)
-
-        # Set up receive path
-        self.rxpath = usrp_receive_path2.usrp_receive_path(demodulator, rx_callback, options) 
-
-        self.connect(self.rxpath)
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-global n_rcvd, n_right
-
-def main():
-    global n_rcvd, n_right
-
-    n_rcvd = 0
-    n_right = 0
-    
-    def rx_callback(ok, payload):
-        global n_rcvd, n_right
-        (pktno,) = struct.unpack('!H', payload[0:2])
-        n_rcvd += 1
-        if ok:
-            n_right += 1
-
-        print "ok = %5s  pktno = %4d  n_rcvd = %4d  n_right = %4d" % (
-            ok, pktno, n_rcvd, n_right)
-
-
-    demods = modulation_utils2.type_1_demods()
-
-    # Create Options Parser:
-    parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-
-    parser.add_option("-m", "--modulation", type="choice", choices=demods.keys(), 
-                      default='dbpsk2',
-                      help="Select modulation from: %s [default=%%default]"
-                            % (', '.join(demods.keys()),))
-
-    usrp_receive_path2.add_options(parser, expert_grp)
-
-    for mod in demods.values():
-        mod.add_options(expert_grp)
-
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-    if options.rx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-
-    # build the graph
-    tb = my_top_block(demods[options.modulation], rx_callback, options)
-
-    r = gr.enable_realtime_scheduling()
-    if r != gr.RT_OK:
-        print "Warning: Failed to enable realtime scheduling."
-
-    tb.start()        # start flow graph
-    tb.wait()         # wait for it to finish
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/digital/pick_bitrate.py b/gnuradio-examples/python/digital/pick_bitrate.py
deleted file mode 100644
index ce1e021c5..000000000
--- a/gnuradio-examples/python/digital/pick_bitrate.py
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-# Copyright 2005,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.
-# 
-
-from gnuradio import eng_notation
-
-_default_bitrate = 500e3
-
-_valid_samples_per_symbol = (2,3,4,5,6,7)
-
-def _gen_tx_info(converter_rate, xrates):
-    results = []
-    for samples_per_symbol in _valid_samples_per_symbol:
-        for interp in xrates:
-            bitrate = converter_rate / interp / samples_per_symbol
-            results.append((bitrate, samples_per_symbol, interp))
-    results.sort()
-    return results
-
-def _gen_rx_info(converter_rate, xrates):
-    results = []
-    for samples_per_symbol in _valid_samples_per_symbol:
-        for decim in xrates:
-            bitrate = converter_rate / decim / samples_per_symbol
-            results.append((bitrate, samples_per_symbol, decim))
-    results.sort()
-    return results
-    
-def _filter_info(info, samples_per_symbol, xrate):
-    if samples_per_symbol is not None:
-        info = [x for x in info if x[1] == samples_per_symbol]
-    if xrate is not None:
-        info = [x for x in info if x[2] == xrate]
-    return info
-
-def _pick_best(target_bitrate, bits_per_symbol, info):
-    """
-    @returns tuple (bitrate, samples_per_symbol, interp_rate_or_decim_rate)
-    """
-    if len(info) == 0:
-        raise RuntimeError, "info is zero length!"
-
-    if target_bitrate is None:     # return the fastest one
-        return info[-1]
-    
-    # convert bit rate to symbol rate
-    target_symbolrate = target_bitrate / bits_per_symbol
-    
-    # Find the closest matching symbol rate.
-    # In the event of a tie, the one with the lowest samples_per_symbol wins.
-    # (We already sorted them, so the first one is the one we take)
-
-    best = info[0]
-    best_delta = abs(target_symbolrate - best[0])
-    for x in info[1:]:
-        delta = abs(target_symbolrate - x[0])
-        if delta < best_delta:
-            best_delta = delta
-            best = x
-
-    # convert symbol rate back to bit rate
-    return ((best[0] * bits_per_symbol),) + best[1:]
-
-def _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                  xrate, converter_rate, xrates, gen_info):
-    """
-    @returns tuple (bitrate, samples_per_symbol, interp_rate_or_decim_rate)
-    """
-    if not isinstance(bits_per_symbol, int) or bits_per_symbol < 1:
-        raise ValueError, "bits_per_symbol must be an int >= 1"
-    
-    if samples_per_symbol is not None and xrate is not None:  # completely determined
-        return (float(converter_rate) / xrate / samples_per_symbol,
-                samples_per_symbol, xrate)
-
-    if bitrate is None and samples_per_symbol is None and xrate is None:
-        bitrate = _default_bitrate
-
-    # now we have a target bitrate and possibly an xrate or
-    # samples_per_symbol constraint, but not both of them.
-
-    ret = _pick_best(bitrate, bits_per_symbol,
-                      _filter_info(gen_info(converter_rate, xrates), samples_per_symbol, xrate))
-    print "Actual Bitrate:", eng_notation.num_to_str(ret[0])
-    return ret
-    
-# ---------------------------------------------------------------------------------------
-
-def pick_tx_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                    interp_rate, converter_rate, possible_interps):
-    """
-    Given the 4 input parameters, return at configuration that matches
-
-    @param bitrate: desired bitrate or None
-    @type bitrate: number or None
-    @param bits_per_symbol: E.g., BPSK -> 1, QPSK -> 2, 8-PSK -> 3
-    @type bits_per_symbol: integer >= 1
-    @param samples_per_symbol: samples/baud (aka samples/symbol)
-    @type samples_per_symbol: number or None
-    @param interp_rate: USRP interpolation factor
-    @type interp_rate: integer or None
-    @param converter_rate: converter sample rate in Hz
-    @type converter_rate: number
-    @param possible_interps: a list of possible rates
-    @type possible_interps: a list of integers
-
-    @returns tuple (bitrate, samples_per_symbol, interp_rate)
-    """
-    print "Requested TX Bitrate:", bitrate and eng_notation.num_to_str(bitrate) or 'Auto',
-    return _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                         interp_rate, converter_rate, possible_interps, _gen_tx_info)
-
-
-def pick_rx_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                    decim_rate, converter_rate, possible_decims):
-    """
-    Given the 4 input parameters, return at configuration that matches
-
-    @param bitrate: desired bitrate or None
-    @type bitrate: number or None
-    @param bits_per_symbol: E.g., BPSK -> 1, QPSK -> 2, 8-PSK -> 3
-    @type bits_per_symbol: integer >= 1
-    @param samples_per_symbol: samples/baud (aka samples/symbol)
-    @type samples_per_symbol: number or None
-    @param decim_rate: USRP decimation factor
-    @type decim_rate: integer or None
-    @param converter_rate: converter sample rate in Hz
-    @type converter_rate: number
-    @param possible_decims: a list of possible rates
-    @type possible_decims: a list of integers
-
-    @returns tuple (bitrate, samples_per_symbol, decim_rate)
-    """
-    print "Requested RX Bitrate:", bitrate and eng_notation.num_to_str(bitrate) or 'Auto'
-    return _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                         decim_rate, converter_rate, possible_decims, _gen_rx_info)
diff --git a/gnuradio-examples/python/digital/pick_bitrate2.py b/gnuradio-examples/python/digital/pick_bitrate2.py
deleted file mode 100644
index 92539560c..000000000
--- a/gnuradio-examples/python/digital/pick_bitrate2.py
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# Copyright 2010 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.
-# 
-
-from gnuradio import eng_notation
-
-_default_bitrate = 500e3
-_sps_min = 2
-_sps_max = 100
-
-def _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                  xrate, converter_rate, xrates):
-    """
-    @returns tuple (bitrate, samples_per_symbol, interp_rate_or_decim_rate)
-    """
-
-    if not isinstance(bits_per_symbol, int) or bits_per_symbol < 1:
-        raise ValueError, "bits_per_symbol must be an int >= 1"
-
-    converter_rate = float(converter_rate)
-    bits_per_symbol = float(bits_per_symbol)
-
-    # completely determined; if bitrate is specified, this overwrites it
-    if (samples_per_symbol is not None) and (xrate is not None):
-        bitrate = converter_rate / bits_per_symbol / xrate / samples_per_symbol
-
-    # If only SPS is given
-    if (bitrate is None) and (samples_per_symbol is not None) and (xrate is None):
-        xrate = max(xrates)
-        bitrate = converter_rate / bits_per_symbol / xrate / samples_per_symbol
-        
-    # If only xrate is given, just set SPS to 2 and calculate bitrate
-    if (bitrate is None) and (samples_per_symbol is None) and (xrate is not None):
-        samples_per_symbol = 2.0
-        bitrate = converter_rate / bits_per_symbol / xrate / samples_per_symbol
-
-    # If no parameters are give, use the default bit rate
-    if (bitrate is None) and (samples_per_symbol is None) and (xrate is None):
-        bitrate = _default_bitrate
-
-    # If only bitrate is specified, return max xrate and appropriate
-    # samples per symbol (minimum of 2.0) to reach bit rate
-    if (samples_per_symbol is None) and (xrate is None):
-        xrates.sort()
-        for i in xrange(len(xrates)):
-            if((converter_rate / bits_per_symbol / xrates[i]) >= 2*bitrate):
-                rate = xrates[i]
-            else:
-                break
-
-        try:
-            xrate = rate
-        except UnboundLocalError:
-            raise ValueError("Requested bitrate out of bounds")
-            
-        samples_per_symbol = converter_rate / bits_per_symbol / rate / bitrate
-        bitrate = converter_rate / bits_per_symbol / xrate / samples_per_symbol
-
-    # If bitrate and xrate are specified
-    if(samples_per_symbol is None):
-        samples_per_symbol = converter_rate / xrate / bits_per_symbol / bitrate
-
-    # If bitrate and SPS are specified
-    if(xrate is None):
-        xrate = converter_rate / samples_per_symbol / bits_per_symbol / bitrate
-        if((xrate in xrates) == False):
-            # Find the closest avaiable rate larger than the calculated one
-            xrates.sort()
-            for x in xrates:
-                if(x > xrate):
-                    xrate = x
-                    break
-            if(xrate > max(xrates)):
-                xrate = max(xrates)
-            
-            bitrate = converter_rate / bits_per_symbol / xrate / samples_per_symbol
-            print "Could not find suitable rate for specified SPS and Bitrate"
-            print "Using rate = %d for bitrate of %sbps" % \
-                  (xrate, (eng_notation.num_to_str(bitrate)))
-
-    if((xrate in xrates) == False):
-        raise ValueError(("Invalid rate (rate = %d)" % xrate))
-    if((samples_per_symbol < _sps_min) or (samples_per_symbol > _sps_max)):
-        raise ValueError(("Invalid samples per symbol (sps = %.2f). Must be in [%.0f, %.0f]." \
-                          % (samples_per_symbol, _sps_min, _sps_max)))
-        
-    return (bitrate, samples_per_symbol, int(xrate))
-
-
-def pick_tx_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                    interp_rate, converter_rate, possible_interps):
-    """
-    Given the 4 input parameters, return at configuration that matches
-
-    @param bitrate: desired bitrate or None
-    @type bitrate: number or None
-    @param bits_per_symbol: E.g., BPSK -> 1, QPSK -> 2, 8-PSK -> 3
-    @type bits_per_symbol: integer >= 1
-    @param samples_per_symbol: samples/baud (aka samples/symbol)
-    @type samples_per_symbol: number or None
-    @param interp_rate: USRP interpolation factor
-    @type interp_rate: integer or None
-    @param converter_rate: converter sample rate in Hz
-    @type converter_rate: number
-    @param possible_interps: a list of possible rates
-    @type possible_interps: a list of integers
-
-    @returns tuple (bitrate, samples_per_symbol, interp_rate)
-    """
-
-    return _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                         interp_rate, converter_rate, possible_interps)
-
-
-def pick_rx_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                    decim_rate, converter_rate, possible_decims):
-    """
-    Given the 4 input parameters, return at configuration that matches
-
-    @param bitrate: desired bitrate or None
-    @type bitrate: number or None
-    @param bits_per_symbol: E.g., BPSK -> 1, QPSK -> 2, 8-PSK -> 3
-    @type bits_per_symbol: integer >= 1
-    @param samples_per_symbol: samples/baud (aka samples/symbol)
-    @type samples_per_symbol: number or None
-    @param decim_rate: USRP decimation factor
-    @type decim_rate: integer or None
-    @param converter_rate: converter sample rate in Hz
-    @type converter_rate: number
-    @param possible_decims: a list of possible rates
-    @type possible_decims: a list of integers
-
-    @returns tuple (bitrate, samples_per_symbol, decim_rate)
-    """
-
-    return _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                         decim_rate, converter_rate, possible_decims)
diff --git a/gnuradio-examples/python/digital/qt_digital_window.py b/gnuradio-examples/python/digital/qt_digital_window.py
deleted file mode 100644
index b47ed0c2b..000000000
--- a/gnuradio-examples/python/digital/qt_digital_window.py
+++ /dev/null
@@ -1,239 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'qt_digital_window.ui'
-#
-# Created: Tue May 11 20:58:35 2010
-#      by: PyQt4 UI code generator 4.6.1
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DigitalWindow(object):
-    def setupUi(self, DigitalWindow):
-        DigitalWindow.setObjectName("DigitalWindow")
-        DigitalWindow.resize(1059, 754)
-        self.centralwidget = QtGui.QWidget(DigitalWindow)
-        self.centralwidget.setObjectName("centralwidget")
-        self.verticalLayout_4 = QtGui.QVBoxLayout(self.centralwidget)
-        self.verticalLayout_4.setObjectName("verticalLayout_4")
-        self.sinkLayout = QtGui.QHBoxLayout()
-        self.sinkLayout.setObjectName("sinkLayout")
-        self.verticalLayout_4.addLayout(self.sinkLayout)
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.verticalLayout_2 = QtGui.QVBoxLayout()
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.sysBox = QtGui.QGroupBox(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.sysBox.sizePolicy().hasHeightForWidth())
-        self.sysBox.setSizePolicy(sizePolicy)
-        self.sysBox.setMinimumSize(QtCore.QSize(240, 60))
-        self.sysBox.setMaximumSize(QtCore.QSize(240, 16777215))
-        self.sysBox.setObjectName("sysBox")
-        self.formLayoutWidget = QtGui.QWidget(self.sysBox)
-        self.formLayoutWidget.setGeometry(QtCore.QRect(10, 20, 211, 31))
-        self.formLayoutWidget.setObjectName("formLayoutWidget")
-        self.formLayout = QtGui.QFormLayout(self.formLayoutWidget)
-        self.formLayout.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.formLayout.setVerticalSpacing(20)
-        self.formLayout.setObjectName("formLayout")
-        self.sampleRateEdit = QtGui.QLineEdit(self.formLayoutWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.sampleRateEdit.sizePolicy().hasHeightForWidth())
-        self.sampleRateEdit.setSizePolicy(sizePolicy)
-        self.sampleRateEdit.setMinimumSize(QtCore.QSize(60, 26))
-        self.sampleRateEdit.setMaximumSize(QtCore.QSize(80, 26))
-        self.sampleRateEdit.setObjectName("sampleRateEdit")
-        self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.sampleRateEdit)
-        self.sampleRateLabel = QtGui.QLabel(self.formLayoutWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.sampleRateLabel.sizePolicy().hasHeightForWidth())
-        self.sampleRateLabel.setSizePolicy(sizePolicy)
-        self.sampleRateLabel.setMinimumSize(QtCore.QSize(0, 20))
-        self.sampleRateLabel.setMaximumSize(QtCore.QSize(16777215, 20))
-        self.sampleRateLabel.setObjectName("sampleRateLabel")
-        self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.sampleRateLabel)
-        self.verticalLayout_2.addWidget(self.sysBox)
-        spacerItem = QtGui.QSpacerItem(20, 60, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.verticalLayout_2.addItem(spacerItem)
-        self.horizontalLayout.addLayout(self.verticalLayout_2)
-        self.channelModeBox = QtGui.QGroupBox(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.channelModeBox.sizePolicy().hasHeightForWidth())
-        self.channelModeBox.setSizePolicy(sizePolicy)
-        self.channelModeBox.setMinimumSize(QtCore.QSize(245, 130))
-        self.channelModeBox.setMaximumSize(QtCore.QSize(245, 16777215))
-        self.channelModeBox.setObjectName("channelModeBox")
-        self.formLayoutWidget_2 = QtGui.QWidget(self.channelModeBox)
-        self.formLayoutWidget_2.setGeometry(QtCore.QRect(10, 20, 221, 98))
-        self.formLayoutWidget_2.setObjectName("formLayoutWidget_2")
-        self.formLayout_2 = QtGui.QFormLayout(self.formLayoutWidget_2)
-        self.formLayout_2.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.formLayout_2.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
-        self.formLayout_2.setObjectName("formLayout_2")
-        self.snrLabel = QtGui.QLabel(self.formLayoutWidget_2)
-        self.snrLabel.setObjectName("snrLabel")
-        self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.snrLabel)
-        self.snrEdit = QtGui.QLineEdit(self.formLayoutWidget_2)
-        self.snrEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.snrEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.snrEdit.setObjectName("snrEdit")
-        self.formLayout_2.setWidget(0, QtGui.QFormLayout.FieldRole, self.snrEdit)
-        self.freqLabel = QtGui.QLabel(self.formLayoutWidget_2)
-        self.freqLabel.setObjectName("freqLabel")
-        self.formLayout_2.setWidget(1, QtGui.QFormLayout.LabelRole, self.freqLabel)
-        self.freqEdit = QtGui.QLineEdit(self.formLayoutWidget_2)
-        self.freqEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.freqEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.freqEdit.setObjectName("freqEdit")
-        self.formLayout_2.setWidget(1, QtGui.QFormLayout.FieldRole, self.freqEdit)
-        self.timeLabel = QtGui.QLabel(self.formLayoutWidget_2)
-        self.timeLabel.setObjectName("timeLabel")
-        self.formLayout_2.setWidget(2, QtGui.QFormLayout.LabelRole, self.timeLabel)
-        self.timeEdit = QtGui.QLineEdit(self.formLayoutWidget_2)
-        self.timeEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.timeEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.timeEdit.setObjectName("timeEdit")
-        self.formLayout_2.setWidget(2, QtGui.QFormLayout.FieldRole, self.timeEdit)
-        self.horizontalLayout.addWidget(self.channelModeBox)
-        self.rxBox = QtGui.QGroupBox(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.rxBox.sizePolicy().hasHeightForWidth())
-        self.rxBox.setSizePolicy(sizePolicy)
-        self.rxBox.setMinimumSize(QtCore.QSize(220, 130))
-        self.rxBox.setMaximumSize(QtCore.QSize(180, 16777215))
-        self.rxBox.setObjectName("rxBox")
-        self.formLayoutWidget_3 = QtGui.QWidget(self.rxBox)
-        self.formLayoutWidget_3.setGeometry(QtCore.QRect(10, 20, 201, 101))
-        self.formLayoutWidget_3.setObjectName("formLayoutWidget_3")
-        self.formLayout_3 = QtGui.QFormLayout(self.formLayoutWidget_3)
-        self.formLayout_3.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.formLayout_3.setObjectName("formLayout_3")
-        self.gainMuLabel = QtGui.QLabel(self.formLayoutWidget_3)
-        self.gainMuLabel.setObjectName("gainMuLabel")
-        self.formLayout_3.setWidget(0, QtGui.QFormLayout.LabelRole, self.gainMuLabel)
-        self.alphaLabel = QtGui.QLabel(self.formLayoutWidget_3)
-        self.alphaLabel.setObjectName("alphaLabel")
-        self.formLayout_3.setWidget(1, QtGui.QFormLayout.LabelRole, self.alphaLabel)
-        self.gainMuEdit = QtGui.QLineEdit(self.formLayoutWidget_3)
-        self.gainMuEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.gainMuEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.gainMuEdit.setObjectName("gainMuEdit")
-        self.formLayout_3.setWidget(0, QtGui.QFormLayout.FieldRole, self.gainMuEdit)
-        self.alphaEdit = QtGui.QLineEdit(self.formLayoutWidget_3)
-        self.alphaEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.alphaEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.alphaEdit.setObjectName("alphaEdit")
-        self.formLayout_3.setWidget(1, QtGui.QFormLayout.FieldRole, self.alphaEdit)
-        self.horizontalLayout.addWidget(self.rxBox)
-        self.rxBox_2 = QtGui.QGroupBox(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.rxBox_2.sizePolicy().hasHeightForWidth())
-        self.rxBox_2.setSizePolicy(sizePolicy)
-        self.rxBox_2.setMinimumSize(QtCore.QSize(220, 125))
-        self.rxBox_2.setMaximumSize(QtCore.QSize(265, 125))
-        self.rxBox_2.setObjectName("rxBox_2")
-        self.formLayoutWidget_4 = QtGui.QWidget(self.rxBox_2)
-        self.formLayoutWidget_4.setGeometry(QtCore.QRect(10, 20, 201, 91))
-        self.formLayoutWidget_4.setObjectName("formLayoutWidget_4")
-        self.formLayout_4 = QtGui.QFormLayout(self.formLayoutWidget_4)
-        self.formLayout_4.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.formLayout_4.setObjectName("formLayout_4")
-        self.pktsRcvdLabel = QtGui.QLabel(self.formLayoutWidget_4)
-        self.pktsRcvdLabel.setObjectName("pktsRcvdLabel")
-        self.formLayout_4.setWidget(0, QtGui.QFormLayout.LabelRole, self.pktsRcvdLabel)
-        self.pktsCorrectLabel = QtGui.QLabel(self.formLayoutWidget_4)
-        self.pktsCorrectLabel.setObjectName("pktsCorrectLabel")
-        self.formLayout_4.setWidget(1, QtGui.QFormLayout.LabelRole, self.pktsCorrectLabel)
-        self.perLabel = QtGui.QLabel(self.formLayoutWidget_4)
-        self.perLabel.setObjectName("perLabel")
-        self.formLayout_4.setWidget(2, QtGui.QFormLayout.LabelRole, self.perLabel)
-        self.pktsRcvdEdit = QtGui.QLineEdit(self.formLayoutWidget_4)
-        self.pktsRcvdEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.pktsRcvdEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.pktsRcvdEdit.setObjectName("pktsRcvdEdit")
-        self.formLayout_4.setWidget(0, QtGui.QFormLayout.FieldRole, self.pktsRcvdEdit)
-        self.pktsCorrectEdit = QtGui.QLineEdit(self.formLayoutWidget_4)
-        self.pktsCorrectEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.pktsCorrectEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.pktsCorrectEdit.setObjectName("pktsCorrectEdit")
-        self.formLayout_4.setWidget(1, QtGui.QFormLayout.FieldRole, self.pktsCorrectEdit)
-        self.perEdit = QtGui.QLineEdit(self.formLayoutWidget_4)
-        self.perEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.perEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.perEdit.setObjectName("perEdit")
-        self.formLayout_4.setWidget(2, QtGui.QFormLayout.FieldRole, self.perEdit)
-        self.horizontalLayout.addWidget(self.rxBox_2)
-        spacerItem1 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem1)
-        self.verticalLayout = QtGui.QVBoxLayout()
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.pauseButton = QtGui.QPushButton(self.centralwidget)
-        self.pauseButton.setMinimumSize(QtCore.QSize(80, 0))
-        self.pauseButton.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.pauseButton.setObjectName("pauseButton")
-        self.verticalLayout.addWidget(self.pauseButton)
-        spacerItem2 = QtGui.QSpacerItem(20, 60, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.verticalLayout.addItem(spacerItem2)
-        self.closeButton = QtGui.QPushButton(self.centralwidget)
-        self.closeButton.setMinimumSize(QtCore.QSize(80, 0))
-        self.closeButton.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.closeButton.setObjectName("closeButton")
-        self.verticalLayout.addWidget(self.closeButton)
-        self.horizontalLayout.addLayout(self.verticalLayout)
-        self.verticalLayout_4.addLayout(self.horizontalLayout)
-        DigitalWindow.setCentralWidget(self.centralwidget)
-        self.menubar = QtGui.QMenuBar(DigitalWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 1059, 23))
-        self.menubar.setObjectName("menubar")
-        self.menuFile = QtGui.QMenu(self.menubar)
-        self.menuFile.setObjectName("menuFile")
-        DigitalWindow.setMenuBar(self.menubar)
-        self.statusbar = QtGui.QStatusBar(DigitalWindow)
-        self.statusbar.setObjectName("statusbar")
-        DigitalWindow.setStatusBar(self.statusbar)
-        self.actionExit = QtGui.QAction(DigitalWindow)
-        self.actionExit.setObjectName("actionExit")
-        self.menuFile.addAction(self.actionExit)
-        self.menubar.addAction(self.menuFile.menuAction())
-
-        self.retranslateUi(DigitalWindow)
-        QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), DigitalWindow.close)
-        QtCore.QObject.connect(self.actionExit, QtCore.SIGNAL("triggered()"), DigitalWindow.close)
-        QtCore.QMetaObject.connectSlotsByName(DigitalWindow)
-        DigitalWindow.setTabOrder(self.snrEdit, self.freqEdit)
-        DigitalWindow.setTabOrder(self.freqEdit, self.timeEdit)
-
-    def retranslateUi(self, DigitalWindow):
-        DigitalWindow.setWindowTitle(QtGui.QApplication.translate("DigitalWindow", "MainWindow", None, QtGui.QApplication.UnicodeUTF8))
-        self.sysBox.setTitle(QtGui.QApplication.translate("DigitalWindow", "System Parameters", None, QtGui.QApplication.UnicodeUTF8))
-        self.sampleRateLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Sample Rate (sps)", None, QtGui.QApplication.UnicodeUTF8))
-        self.channelModeBox.setTitle(QtGui.QApplication.translate("DigitalWindow", "Channel Model Parameters", None, QtGui.QApplication.UnicodeUTF8))
-        self.snrLabel.setText(QtGui.QApplication.translate("DigitalWindow", "SNR (dB)", None, QtGui.QApplication.UnicodeUTF8))
-        self.freqLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Frequency Offset (Hz)", None, QtGui.QApplication.UnicodeUTF8))
-        self.timeLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Timing Offset", None, QtGui.QApplication.UnicodeUTF8))
-        self.rxBox.setTitle(QtGui.QApplication.translate("DigitalWindow", "Receiver Parameters", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainMuLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Gain mu", None, QtGui.QApplication.UnicodeUTF8))
-        self.alphaLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Alpha", None, QtGui.QApplication.UnicodeUTF8))
-        self.rxBox_2.setTitle(QtGui.QApplication.translate("DigitalWindow", "Received Packet Info", None, QtGui.QApplication.UnicodeUTF8))
-        self.pktsRcvdLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Packets Rcvd.", None, QtGui.QApplication.UnicodeUTF8))
-        self.pktsCorrectLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Packets Correct", None, QtGui.QApplication.UnicodeUTF8))
-        self.perLabel.setText(QtGui.QApplication.translate("DigitalWindow", "PER", None, QtGui.QApplication.UnicodeUTF8))
-        self.pauseButton.setText(QtGui.QApplication.translate("DigitalWindow", "Pause", None, QtGui.QApplication.UnicodeUTF8))
-        self.closeButton.setText(QtGui.QApplication.translate("DigitalWindow", "Close", None, QtGui.QApplication.UnicodeUTF8))
-        self.menuFile.setTitle(QtGui.QApplication.translate("DigitalWindow", "&File", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionExit.setText(QtGui.QApplication.translate("DigitalWindow", "E&xit", None, QtGui.QApplication.UnicodeUTF8))
-
diff --git a/gnuradio-examples/python/digital/qt_digital_window.ui b/gnuradio-examples/python/digital/qt_digital_window.ui
deleted file mode 100644
index 4b3857d87..000000000
--- a/gnuradio-examples/python/digital/qt_digital_window.ui
+++ /dev/null
@@ -1,581 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DigitalWindow</class>
- <widget class="QMainWindow" name="DigitalWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1059</width>
-    <height>754</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout_4">
-    <item>
-     <layout class="QHBoxLayout" name="sinkLayout"/>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
-         <widget class="QGroupBox" name="sysBox">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>240</width>
-            <height>60</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>240</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="title">
-           <string>System Parameters</string>
-          </property>
-          <widget class="QWidget" name="formLayoutWidget">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>20</y>
-             <width>211</width>
-             <height>31</height>
-            </rect>
-           </property>
-           <layout class="QFormLayout" name="formLayout">
-            <property name="sizeConstraint">
-             <enum>QLayout::SetFixedSize</enum>
-            </property>
-            <property name="verticalSpacing">
-             <number>20</number>
-            </property>
-            <item row="0" column="1">
-             <widget class="QLineEdit" name="sampleRateEdit">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>60</width>
-                <height>26</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>80</width>
-                <height>26</height>
-               </size>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="sampleRateLabel">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>20</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>20</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Sample Rate (sps)</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>60</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="channelModeBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>245</width>
-          <height>130</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>245</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Channel Model Parameters</string>
-        </property>
-        <widget class="QWidget" name="formLayoutWidget_2">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>20</y>
-           <width>221</width>
-           <height>98</height>
-          </rect>
-         </property>
-         <layout class="QFormLayout" name="formLayout_2">
-          <property name="sizeConstraint">
-           <enum>QLayout::SetFixedSize</enum>
-          </property>
-          <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="snrLabel">
-            <property name="text">
-             <string>SNR (dB)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="snrEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="freqLabel">
-            <property name="text">
-             <string>Frequency Offset (Hz)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="freqEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="timeLabel">
-            <property name="text">
-             <string>Timing Offset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="timeEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-        <zorder>formLayoutWidget_2</zorder>
-        <zorder>sysBox</zorder>
-       </widget>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="rxBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>220</width>
-          <height>130</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>180</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Receiver Parameters</string>
-        </property>
-        <widget class="QWidget" name="formLayoutWidget_3">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>20</y>
-           <width>201</width>
-           <height>101</height>
-          </rect>
-         </property>
-         <layout class="QFormLayout" name="formLayout_3">
-          <property name="sizeConstraint">
-           <enum>QLayout::SetFixedSize</enum>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="gainMuLabel">
-            <property name="text">
-             <string>Gain mu</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="alphaLabel">
-            <property name="text">
-             <string>Alpha</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="gainMuEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="alphaEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="rxBox_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>220</width>
-          <height>125</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>265</width>
-          <height>125</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Received Packet Info</string>
-        </property>
-        <widget class="QWidget" name="formLayoutWidget_4">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>20</y>
-           <width>201</width>
-           <height>91</height>
-          </rect>
-         </property>
-         <layout class="QFormLayout" name="formLayout_4">
-          <property name="sizeConstraint">
-           <enum>QLayout::SetFixedSize</enum>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="pktsRcvdLabel">
-            <property name="text">
-             <string>Packets Rcvd.</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="pktsCorrectLabel">
-            <property name="text">
-             <string>Packets Correct</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="perLabel">
-            <property name="text">
-             <string>PER</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="pktsRcvdEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="pktsCorrectEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="perEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QPushButton" name="pauseButton">
-          <property name="minimumSize">
-           <size>
-            <width>80</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>80</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Pause</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>60</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="closeButton">
-          <property name="minimumSize">
-           <size>
-            <width>80</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>80</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Close</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>1059</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>&amp;File</string>
-    </property>
-    <addaction name="actionExit"/>
-   </widget>
-   <addaction name="menuFile"/>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
-  <action name="actionExit">
-   <property name="text">
-    <string>E&amp;xit</string>
-   </property>
-  </action>
- </widget>
- <tabstops>
-  <tabstop>snrEdit</tabstop>
-  <tabstop>freqEdit</tabstop>
-  <tabstop>timeEdit</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>closeButton</sender>
-   <signal>clicked()</signal>
-   <receiver>DigitalWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>322</x>
-     <y>623</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>66</x>
-     <y>561</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>actionExit</sender>
-   <signal>triggered()</signal>
-   <receiver>DigitalWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>617</x>
-     <y>327</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/gnuradio-examples/python/digital/qt_digital_window2.py b/gnuradio-examples/python/digital/qt_digital_window2.py
deleted file mode 100644
index 2d10e3a7f..000000000
--- a/gnuradio-examples/python/digital/qt_digital_window2.py
+++ /dev/null
@@ -1,248 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'qt_digital_window2.ui'
-#
-# Created: Tue May 11 20:55:10 2010
-#      by: PyQt4 UI code generator 4.6.1
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DigitalWindow(object):
-    def setupUi(self, DigitalWindow):
-        DigitalWindow.setObjectName("DigitalWindow")
-        DigitalWindow.resize(1059, 751)
-        self.centralwidget = QtGui.QWidget(DigitalWindow)
-        self.centralwidget.setObjectName("centralwidget")
-        self.verticalLayout_3 = QtGui.QVBoxLayout(self.centralwidget)
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.sinkLayout = QtGui.QHBoxLayout()
-        self.sinkLayout.setObjectName("sinkLayout")
-        self.verticalLayout_3.addLayout(self.sinkLayout)
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.verticalLayout_2 = QtGui.QVBoxLayout()
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
-        self.sysBox = QtGui.QGroupBox(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.sysBox.sizePolicy().hasHeightForWidth())
-        self.sysBox.setSizePolicy(sizePolicy)
-        self.sysBox.setMinimumSize(QtCore.QSize(240, 60))
-        self.sysBox.setMaximumSize(QtCore.QSize(240, 16777215))
-        self.sysBox.setObjectName("sysBox")
-        self.formLayoutWidget = QtGui.QWidget(self.sysBox)
-        self.formLayoutWidget.setGeometry(QtCore.QRect(10, 20, 211, 31))
-        self.formLayoutWidget.setObjectName("formLayoutWidget")
-        self.formLayout = QtGui.QFormLayout(self.formLayoutWidget)
-        self.formLayout.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.formLayout.setVerticalSpacing(20)
-        self.formLayout.setObjectName("formLayout")
-        self.sampleRateEdit = QtGui.QLineEdit(self.formLayoutWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.sampleRateEdit.sizePolicy().hasHeightForWidth())
-        self.sampleRateEdit.setSizePolicy(sizePolicy)
-        self.sampleRateEdit.setMinimumSize(QtCore.QSize(60, 26))
-        self.sampleRateEdit.setMaximumSize(QtCore.QSize(80, 26))
-        self.sampleRateEdit.setObjectName("sampleRateEdit")
-        self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.sampleRateEdit)
-        self.sampleRateLabel = QtGui.QLabel(self.formLayoutWidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.sampleRateLabel.sizePolicy().hasHeightForWidth())
-        self.sampleRateLabel.setSizePolicy(sizePolicy)
-        self.sampleRateLabel.setMinimumSize(QtCore.QSize(0, 20))
-        self.sampleRateLabel.setMaximumSize(QtCore.QSize(16777215, 20))
-        self.sampleRateLabel.setObjectName("sampleRateLabel")
-        self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.sampleRateLabel)
-        self.verticalLayout_2.addWidget(self.sysBox)
-        spacerItem = QtGui.QSpacerItem(20, 60, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.verticalLayout_2.addItem(spacerItem)
-        self.horizontalLayout.addLayout(self.verticalLayout_2)
-        self.channelModeBox = QtGui.QGroupBox(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.channelModeBox.sizePolicy().hasHeightForWidth())
-        self.channelModeBox.setSizePolicy(sizePolicy)
-        self.channelModeBox.setMinimumSize(QtCore.QSize(245, 130))
-        self.channelModeBox.setMaximumSize(QtCore.QSize(245, 16777215))
-        self.channelModeBox.setObjectName("channelModeBox")
-        self.formLayoutWidget_2 = QtGui.QWidget(self.channelModeBox)
-        self.formLayoutWidget_2.setGeometry(QtCore.QRect(10, 20, 221, 98))
-        self.formLayoutWidget_2.setObjectName("formLayoutWidget_2")
-        self.formLayout_2 = QtGui.QFormLayout(self.formLayoutWidget_2)
-        self.formLayout_2.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.formLayout_2.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
-        self.formLayout_2.setObjectName("formLayout_2")
-        self.snrLabel = QtGui.QLabel(self.formLayoutWidget_2)
-        self.snrLabel.setObjectName("snrLabel")
-        self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.snrLabel)
-        self.snrEdit = QtGui.QLineEdit(self.formLayoutWidget_2)
-        self.snrEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.snrEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.snrEdit.setObjectName("snrEdit")
-        self.formLayout_2.setWidget(0, QtGui.QFormLayout.FieldRole, self.snrEdit)
-        self.freqLabel = QtGui.QLabel(self.formLayoutWidget_2)
-        self.freqLabel.setObjectName("freqLabel")
-        self.formLayout_2.setWidget(1, QtGui.QFormLayout.LabelRole, self.freqLabel)
-        self.freqEdit = QtGui.QLineEdit(self.formLayoutWidget_2)
-        self.freqEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.freqEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.freqEdit.setObjectName("freqEdit")
-        self.formLayout_2.setWidget(1, QtGui.QFormLayout.FieldRole, self.freqEdit)
-        self.timeLabel = QtGui.QLabel(self.formLayoutWidget_2)
-        self.timeLabel.setObjectName("timeLabel")
-        self.formLayout_2.setWidget(2, QtGui.QFormLayout.LabelRole, self.timeLabel)
-        self.timeEdit = QtGui.QLineEdit(self.formLayoutWidget_2)
-        self.timeEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.timeEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.timeEdit.setObjectName("timeEdit")
-        self.formLayout_2.setWidget(2, QtGui.QFormLayout.FieldRole, self.timeEdit)
-        self.horizontalLayout.addWidget(self.channelModeBox)
-        self.rxBox = QtGui.QGroupBox(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.rxBox.sizePolicy().hasHeightForWidth())
-        self.rxBox.setSizePolicy(sizePolicy)
-        self.rxBox.setMinimumSize(QtCore.QSize(220, 130))
-        self.rxBox.setMaximumSize(QtCore.QSize(180, 16777215))
-        self.rxBox.setObjectName("rxBox")
-        self.formLayoutWidget_3 = QtGui.QWidget(self.rxBox)
-        self.formLayoutWidget_3.setGeometry(QtCore.QRect(10, 20, 201, 101))
-        self.formLayoutWidget_3.setObjectName("formLayoutWidget_3")
-        self.formLayout_3 = QtGui.QFormLayout(self.formLayoutWidget_3)
-        self.formLayout_3.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.formLayout_3.setObjectName("formLayout_3")
-        self.gainClockLabel = QtGui.QLabel(self.formLayoutWidget_3)
-        self.gainClockLabel.setObjectName("gainClockLabel")
-        self.formLayout_3.setWidget(0, QtGui.QFormLayout.LabelRole, self.gainClockLabel)
-        self.gainPhaseLabel = QtGui.QLabel(self.formLayoutWidget_3)
-        self.gainPhaseLabel.setObjectName("gainPhaseLabel")
-        self.formLayout_3.setWidget(2, QtGui.QFormLayout.LabelRole, self.gainPhaseLabel)
-        self.gainClockEdit = QtGui.QLineEdit(self.formLayoutWidget_3)
-        self.gainClockEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.gainClockEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.gainClockEdit.setObjectName("gainClockEdit")
-        self.formLayout_3.setWidget(0, QtGui.QFormLayout.FieldRole, self.gainClockEdit)
-        self.gainFreqEdit = QtGui.QLineEdit(self.formLayoutWidget_3)
-        self.gainFreqEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.gainFreqEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.gainFreqEdit.setObjectName("gainFreqEdit")
-        self.formLayout_3.setWidget(2, QtGui.QFormLayout.FieldRole, self.gainFreqEdit)
-        self.gainPhaseEdit = QtGui.QLineEdit(self.formLayoutWidget_3)
-        self.gainPhaseEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.gainPhaseEdit.setObjectName("gainPhaseEdit")
-        self.formLayout_3.setWidget(1, QtGui.QFormLayout.FieldRole, self.gainPhaseEdit)
-        self.gainPhaseLabel_2 = QtGui.QLabel(self.formLayoutWidget_3)
-        self.gainPhaseLabel_2.setObjectName("gainPhaseLabel_2")
-        self.formLayout_3.setWidget(1, QtGui.QFormLayout.LabelRole, self.gainPhaseLabel_2)
-        self.horizontalLayout.addWidget(self.rxBox)
-        self.rxBox_2 = QtGui.QGroupBox(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.rxBox_2.sizePolicy().hasHeightForWidth())
-        self.rxBox_2.setSizePolicy(sizePolicy)
-        self.rxBox_2.setMinimumSize(QtCore.QSize(220, 125))
-        self.rxBox_2.setMaximumSize(QtCore.QSize(265, 125))
-        self.rxBox_2.setObjectName("rxBox_2")
-        self.formLayoutWidget_4 = QtGui.QWidget(self.rxBox_2)
-        self.formLayoutWidget_4.setGeometry(QtCore.QRect(10, 20, 201, 91))
-        self.formLayoutWidget_4.setObjectName("formLayoutWidget_4")
-        self.formLayout_4 = QtGui.QFormLayout(self.formLayoutWidget_4)
-        self.formLayout_4.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.formLayout_4.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow)
-        self.formLayout_4.setObjectName("formLayout_4")
-        self.pktsRcvdLabel = QtGui.QLabel(self.formLayoutWidget_4)
-        self.pktsRcvdLabel.setObjectName("pktsRcvdLabel")
-        self.formLayout_4.setWidget(0, QtGui.QFormLayout.LabelRole, self.pktsRcvdLabel)
-        self.pktsRcvdEdit = QtGui.QLineEdit(self.formLayoutWidget_4)
-        self.pktsRcvdEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.pktsRcvdEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.pktsRcvdEdit.setObjectName("pktsRcvdEdit")
-        self.formLayout_4.setWidget(0, QtGui.QFormLayout.FieldRole, self.pktsRcvdEdit)
-        self.pktsCorrectLabel = QtGui.QLabel(self.formLayoutWidget_4)
-        self.pktsCorrectLabel.setObjectName("pktsCorrectLabel")
-        self.formLayout_4.setWidget(1, QtGui.QFormLayout.LabelRole, self.pktsCorrectLabel)
-        self.pktsCorrectEdit = QtGui.QLineEdit(self.formLayoutWidget_4)
-        self.pktsCorrectEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.pktsCorrectEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.pktsCorrectEdit.setObjectName("pktsCorrectEdit")
-        self.formLayout_4.setWidget(1, QtGui.QFormLayout.FieldRole, self.pktsCorrectEdit)
-        self.perLabel = QtGui.QLabel(self.formLayoutWidget_4)
-        self.perLabel.setObjectName("perLabel")
-        self.formLayout_4.setWidget(2, QtGui.QFormLayout.LabelRole, self.perLabel)
-        self.perEdit = QtGui.QLineEdit(self.formLayoutWidget_4)
-        self.perEdit.setMinimumSize(QtCore.QSize(60, 0))
-        self.perEdit.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.perEdit.setObjectName("perEdit")
-        self.formLayout_4.setWidget(2, QtGui.QFormLayout.FieldRole, self.perEdit)
-        self.horizontalLayout.addWidget(self.rxBox_2)
-        spacerItem1 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem1)
-        self.verticalLayout = QtGui.QVBoxLayout()
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.pauseButton = QtGui.QPushButton(self.centralwidget)
-        self.pauseButton.setMinimumSize(QtCore.QSize(80, 0))
-        self.pauseButton.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.pauseButton.setObjectName("pauseButton")
-        self.verticalLayout.addWidget(self.pauseButton)
-        spacerItem2 = QtGui.QSpacerItem(20, 60, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.verticalLayout.addItem(spacerItem2)
-        self.closeButton = QtGui.QPushButton(self.centralwidget)
-        self.closeButton.setMinimumSize(QtCore.QSize(80, 0))
-        self.closeButton.setMaximumSize(QtCore.QSize(80, 16777215))
-        self.closeButton.setObjectName("closeButton")
-        self.verticalLayout.addWidget(self.closeButton)
-        self.horizontalLayout.addLayout(self.verticalLayout)
-        self.verticalLayout_3.addLayout(self.horizontalLayout)
-        DigitalWindow.setCentralWidget(self.centralwidget)
-        self.menubar = QtGui.QMenuBar(DigitalWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 1059, 23))
-        self.menubar.setObjectName("menubar")
-        self.menuFile = QtGui.QMenu(self.menubar)
-        self.menuFile.setObjectName("menuFile")
-        DigitalWindow.setMenuBar(self.menubar)
-        self.statusbar = QtGui.QStatusBar(DigitalWindow)
-        self.statusbar.setObjectName("statusbar")
-        DigitalWindow.setStatusBar(self.statusbar)
-        self.actionExit = QtGui.QAction(DigitalWindow)
-        self.actionExit.setObjectName("actionExit")
-        self.menuFile.addAction(self.actionExit)
-        self.menubar.addAction(self.menuFile.menuAction())
-
-        self.retranslateUi(DigitalWindow)
-        QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), DigitalWindow.close)
-        QtCore.QObject.connect(self.actionExit, QtCore.SIGNAL("triggered()"), DigitalWindow.close)
-        QtCore.QMetaObject.connectSlotsByName(DigitalWindow)
-        DigitalWindow.setTabOrder(self.snrEdit, self.freqEdit)
-        DigitalWindow.setTabOrder(self.freqEdit, self.timeEdit)
-
-    def retranslateUi(self, DigitalWindow):
-        DigitalWindow.setWindowTitle(QtGui.QApplication.translate("DigitalWindow", "MainWindow", None, QtGui.QApplication.UnicodeUTF8))
-        self.sysBox.setTitle(QtGui.QApplication.translate("DigitalWindow", "System Parameters", None, QtGui.QApplication.UnicodeUTF8))
-        self.sampleRateLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Sample Rate (sps)", None, QtGui.QApplication.UnicodeUTF8))
-        self.channelModeBox.setTitle(QtGui.QApplication.translate("DigitalWindow", "Channel Model Parameters", None, QtGui.QApplication.UnicodeUTF8))
-        self.snrLabel.setText(QtGui.QApplication.translate("DigitalWindow", "SNR (dB)", None, QtGui.QApplication.UnicodeUTF8))
-        self.freqLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Frequency Offset (Hz)", None, QtGui.QApplication.UnicodeUTF8))
-        self.timeLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Timing Offset", None, QtGui.QApplication.UnicodeUTF8))
-        self.rxBox.setTitle(QtGui.QApplication.translate("DigitalWindow", "Receiver Parameters", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainClockLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Clock Loop Gain", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainPhaseLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Freq. Loop Gain", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainPhaseLabel_2.setText(QtGui.QApplication.translate("DigitalWindow", "Phase Loop Gain", None, QtGui.QApplication.UnicodeUTF8))
-        self.rxBox_2.setTitle(QtGui.QApplication.translate("DigitalWindow", "Received Packet Info", None, QtGui.QApplication.UnicodeUTF8))
-        self.pktsRcvdLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Packets Rcvd.", None, QtGui.QApplication.UnicodeUTF8))
-        self.pktsCorrectLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Packets Correct", None, QtGui.QApplication.UnicodeUTF8))
-        self.perLabel.setText(QtGui.QApplication.translate("DigitalWindow", "PER", None, QtGui.QApplication.UnicodeUTF8))
-        self.pauseButton.setText(QtGui.QApplication.translate("DigitalWindow", "Pause", None, QtGui.QApplication.UnicodeUTF8))
-        self.closeButton.setText(QtGui.QApplication.translate("DigitalWindow", "Close", None, QtGui.QApplication.UnicodeUTF8))
-        self.menuFile.setTitle(QtGui.QApplication.translate("DigitalWindow", "&File", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionExit.setText(QtGui.QApplication.translate("DigitalWindow", "E&xit", None, QtGui.QApplication.UnicodeUTF8))
-
diff --git a/gnuradio-examples/python/digital/qt_digital_window2.ui b/gnuradio-examples/python/digital/qt_digital_window2.ui
deleted file mode 100644
index 544704668..000000000
--- a/gnuradio-examples/python/digital/qt_digital_window2.ui
+++ /dev/null
@@ -1,605 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DigitalWindow</class>
- <widget class="QMainWindow" name="DigitalWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1059</width>
-    <height>751</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout_3">
-    <item>
-     <layout class="QHBoxLayout" name="sinkLayout"/>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
-         <widget class="QGroupBox" name="sysBox">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>240</width>
-            <height>60</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>240</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="title">
-           <string>System Parameters</string>
-          </property>
-          <widget class="QWidget" name="formLayoutWidget">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>20</y>
-             <width>211</width>
-             <height>31</height>
-            </rect>
-           </property>
-           <layout class="QFormLayout" name="formLayout">
-            <property name="sizeConstraint">
-             <enum>QLayout::SetFixedSize</enum>
-            </property>
-            <property name="verticalSpacing">
-             <number>20</number>
-            </property>
-            <item row="0" column="1">
-             <widget class="QLineEdit" name="sampleRateEdit">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>60</width>
-                <height>26</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>80</width>
-                <height>26</height>
-               </size>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="sampleRateLabel">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>20</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>20</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>Sample Rate (sps)</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>60</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="channelModeBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>245</width>
-          <height>130</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>245</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Channel Model Parameters</string>
-        </property>
-        <widget class="QWidget" name="formLayoutWidget_2">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>20</y>
-           <width>221</width>
-           <height>98</height>
-          </rect>
-         </property>
-         <layout class="QFormLayout" name="formLayout_2">
-          <property name="sizeConstraint">
-           <enum>QLayout::SetFixedSize</enum>
-          </property>
-          <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="snrLabel">
-            <property name="text">
-             <string>SNR (dB)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="snrEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="freqLabel">
-            <property name="text">
-             <string>Frequency Offset (Hz)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="freqEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="timeLabel">
-            <property name="text">
-             <string>Timing Offset</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="timeEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="rxBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>220</width>
-          <height>130</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>180</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Receiver Parameters</string>
-        </property>
-        <widget class="QWidget" name="formLayoutWidget_3">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>20</y>
-           <width>201</width>
-           <height>101</height>
-          </rect>
-         </property>
-         <layout class="QFormLayout" name="formLayout_3">
-          <property name="sizeConstraint">
-           <enum>QLayout::SetFixedSize</enum>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="gainClockLabel">
-            <property name="text">
-             <string>Clock Loop Gain</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="gainPhaseLabel">
-            <property name="text">
-             <string>Freq. Loop Gain</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="gainClockEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="gainFreqEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="gainPhaseEdit">
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="gainPhaseLabel_2">
-            <property name="text">
-             <string>Phase Loop Gain</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="rxBox_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>220</width>
-          <height>125</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>265</width>
-          <height>125</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Received Packet Info</string>
-        </property>
-        <widget class="QWidget" name="formLayoutWidget_4">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>20</y>
-           <width>201</width>
-           <height>91</height>
-          </rect>
-         </property>
-         <layout class="QFormLayout" name="formLayout_4">
-          <property name="sizeConstraint">
-           <enum>QLayout::SetFixedSize</enum>
-          </property>
-          <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-          </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="pktsRcvdLabel">
-            <property name="text">
-             <string>Packets Rcvd.</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="pktsRcvdEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="pktsCorrectLabel">
-            <property name="text">
-             <string>Packets Correct</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="pktsCorrectEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="perLabel">
-            <property name="text">
-             <string>PER</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="perEdit">
-            <property name="minimumSize">
-             <size>
-              <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>16777215</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-         </layout>
-         <zorder>pktsRcvdLabel</zorder>
-         <zorder>pktsCorrectLabel</zorder>
-         <zorder>perLabel</zorder>
-         <zorder>pktsRcvdEdit</zorder>
-         <zorder>pktsCorrectEdit</zorder>
-         <zorder>perEdit</zorder>
-        </widget>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QPushButton" name="pauseButton">
-          <property name="minimumSize">
-           <size>
-            <width>80</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>80</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Pause</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>60</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="closeButton">
-          <property name="minimumSize">
-           <size>
-            <width>80</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>80</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Close</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>1059</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>&amp;File</string>
-    </property>
-    <addaction name="actionExit"/>
-   </widget>
-   <addaction name="menuFile"/>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
-  <action name="actionExit">
-   <property name="text">
-    <string>E&amp;xit</string>
-   </property>
-  </action>
- </widget>
- <tabstops>
-  <tabstop>snrEdit</tabstop>
-  <tabstop>freqEdit</tabstop>
-  <tabstop>timeEdit</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>closeButton</sender>
-   <signal>clicked()</signal>
-   <receiver>DigitalWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>322</x>
-     <y>623</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>66</x>
-     <y>561</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>actionExit</sender>
-   <signal>triggered()</signal>
-   <receiver>DigitalWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>617</x>
-     <y>327</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/gnuradio-examples/python/digital/qt_rx_window.py b/gnuradio-examples/python/digital/qt_rx_window.py
deleted file mode 100644
index e2488eb3d..000000000
--- a/gnuradio-examples/python/digital/qt_rx_window.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'qt_rx_window.ui'
-#
-# Created: Tue May 11 21:03:07 2010
-#      by: PyQt4 UI code generator 4.6.1
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DigitalWindow(object):
-    def setupUi(self, DigitalWindow):
-        DigitalWindow.setObjectName("DigitalWindow")
-        DigitalWindow.resize(999, 519)
-        self.centralwidget = QtGui.QWidget(DigitalWindow)
-        self.centralwidget.setObjectName("centralwidget")
-        self.verticalLayout = QtGui.QVBoxLayout(self.centralwidget)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.sinkLayout = QtGui.QHBoxLayout()
-        self.sinkLayout.setObjectName("sinkLayout")
-        self.verticalLayout.addLayout(self.sinkLayout)
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.rxBox = QtGui.QGroupBox(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.rxBox.sizePolicy().hasHeightForWidth())
-        self.rxBox.setSizePolicy(sizePolicy)
-        self.rxBox.setMinimumSize(QtCore.QSize(250, 190))
-        self.rxBox.setMaximumSize(QtCore.QSize(250, 190))
-        self.rxBox.setObjectName("rxBox")
-        self.gainMuEdit = QtGui.QLineEdit(self.rxBox)
-        self.gainMuEdit.setGeometry(QtCore.QRect(120, 120, 113, 23))
-        self.gainMuEdit.setObjectName("gainMuEdit")
-        self.gainMuLabel = QtGui.QLabel(self.rxBox)
-        self.gainMuLabel.setGeometry(QtCore.QRect(10, 120, 111, 20))
-        self.gainMuLabel.setObjectName("gainMuLabel")
-        self.alphaEdit = QtGui.QLineEdit(self.rxBox)
-        self.alphaEdit.setGeometry(QtCore.QRect(120, 150, 113, 23))
-        self.alphaEdit.setObjectName("alphaEdit")
-        self.alphaLabel = QtGui.QLabel(self.rxBox)
-        self.alphaLabel.setGeometry(QtCore.QRect(10, 150, 111, 20))
-        self.alphaLabel.setObjectName("alphaLabel")
-        self.gainLabel = QtGui.QLabel(self.rxBox)
-        self.gainLabel.setGeometry(QtCore.QRect(10, 60, 101, 17))
-        self.gainLabel.setObjectName("gainLabel")
-        self.freqEdit = QtGui.QLineEdit(self.rxBox)
-        self.freqEdit.setGeometry(QtCore.QRect(120, 30, 113, 23))
-        self.freqEdit.setObjectName("freqEdit")
-        self.freqLabel = QtGui.QLabel(self.rxBox)
-        self.freqLabel.setGeometry(QtCore.QRect(10, 30, 141, 17))
-        self.freqLabel.setObjectName("freqLabel")
-        self.gainEdit = QtGui.QLineEdit(self.rxBox)
-        self.gainEdit.setGeometry(QtCore.QRect(120, 60, 113, 23))
-        self.gainEdit.setObjectName("gainEdit")
-        self.decimLabel = QtGui.QLabel(self.rxBox)
-        self.decimLabel.setGeometry(QtCore.QRect(10, 90, 101, 17))
-        self.decimLabel.setObjectName("decimLabel")
-        self.decimEdit = QtGui.QLineEdit(self.rxBox)
-        self.decimEdit.setGeometry(QtCore.QRect(120, 90, 113, 23))
-        self.decimEdit.setObjectName("decimEdit")
-        self.horizontalLayout.addWidget(self.rxBox)
-        self.verticalLayout_3 = QtGui.QVBoxLayout()
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.rxPacketBox = QtGui.QGroupBox(self.centralwidget)
-        self.rxPacketBox.setEnabled(True)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.rxPacketBox.sizePolicy().hasHeightForWidth())
-        self.rxPacketBox.setSizePolicy(sizePolicy)
-        self.rxPacketBox.setMinimumSize(QtCore.QSize(250, 130))
-        self.rxPacketBox.setMaximumSize(QtCore.QSize(250, 130))
-        font = QtGui.QFont()
-        font.setWeight(50)
-        font.setBold(False)
-        self.rxPacketBox.setFont(font)
-        self.rxPacketBox.setObjectName("rxPacketBox")
-        self.pktsRcvdEdit = QtGui.QLineEdit(self.rxPacketBox)
-        self.pktsRcvdEdit.setGeometry(QtCore.QRect(120, 30, 113, 23))
-        self.pktsRcvdEdit.setObjectName("pktsRcvdEdit")
-        self.pktsRcvdLabel = QtGui.QLabel(self.rxPacketBox)
-        self.pktsRcvdLabel.setGeometry(QtCore.QRect(10, 30, 111, 20))
-        self.pktsRcvdLabel.setObjectName("pktsRcvdLabel")
-        self.pktsCorrectEdit = QtGui.QLineEdit(self.rxPacketBox)
-        self.pktsCorrectEdit.setGeometry(QtCore.QRect(120, 60, 113, 23))
-        self.pktsCorrectEdit.setObjectName("pktsCorrectEdit")
-        self.pktsCorrectLabel = QtGui.QLabel(self.rxPacketBox)
-        self.pktsCorrectLabel.setGeometry(QtCore.QRect(10, 60, 111, 20))
-        self.pktsCorrectLabel.setObjectName("pktsCorrectLabel")
-        self.perLabel = QtGui.QLabel(self.rxPacketBox)
-        self.perLabel.setGeometry(QtCore.QRect(10, 90, 111, 20))
-        self.perLabel.setObjectName("perLabel")
-        self.perEdit = QtGui.QLineEdit(self.rxPacketBox)
-        self.perEdit.setGeometry(QtCore.QRect(120, 90, 113, 23))
-        self.perEdit.setObjectName("perEdit")
-        self.verticalLayout_3.addWidget(self.rxPacketBox)
-        spacerItem = QtGui.QSpacerItem(20, 60, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.verticalLayout_3.addItem(spacerItem)
-        self.horizontalLayout.addLayout(self.verticalLayout_3)
-        spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem1)
-        self.verticalLayout_5 = QtGui.QVBoxLayout()
-        self.verticalLayout_5.setObjectName("verticalLayout_5")
-        spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout_5.addItem(spacerItem2)
-        self.closeButton = QtGui.QPushButton(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.closeButton.sizePolicy().hasHeightForWidth())
-        self.closeButton.setSizePolicy(sizePolicy)
-        self.closeButton.setMinimumSize(QtCore.QSize(80, 30))
-        self.closeButton.setMaximumSize(QtCore.QSize(80, 30))
-        self.closeButton.setObjectName("closeButton")
-        self.verticalLayout_5.addWidget(self.closeButton)
-        self.horizontalLayout.addLayout(self.verticalLayout_5)
-        self.verticalLayout.addLayout(self.horizontalLayout)
-        DigitalWindow.setCentralWidget(self.centralwidget)
-        self.menubar = QtGui.QMenuBar(DigitalWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 999, 23))
-        self.menubar.setObjectName("menubar")
-        self.menuFile = QtGui.QMenu(self.menubar)
-        self.menuFile.setObjectName("menuFile")
-        DigitalWindow.setMenuBar(self.menubar)
-        self.statusbar = QtGui.QStatusBar(DigitalWindow)
-        self.statusbar.setObjectName("statusbar")
-        DigitalWindow.setStatusBar(self.statusbar)
-        self.actionExit = QtGui.QAction(DigitalWindow)
-        self.actionExit.setObjectName("actionExit")
-        self.menuFile.addAction(self.actionExit)
-        self.menubar.addAction(self.menuFile.menuAction())
-
-        self.retranslateUi(DigitalWindow)
-        QtCore.QObject.connect(self.actionExit, QtCore.SIGNAL("triggered()"), DigitalWindow.close)
-        QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), DigitalWindow.close)
-        QtCore.QMetaObject.connectSlotsByName(DigitalWindow)
-
-    def retranslateUi(self, DigitalWindow):
-        DigitalWindow.setWindowTitle(QtGui.QApplication.translate("DigitalWindow", "MainWindow", None, QtGui.QApplication.UnicodeUTF8))
-        self.rxBox.setTitle(QtGui.QApplication.translate("DigitalWindow", "Receiver Parameters", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainMuLabel.setText(QtGui.QApplication.translate("DigitalWindow", "mu\'s gain", None, QtGui.QApplication.UnicodeUTF8))
-        self.alphaLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Alpha", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Gain (dB)", None, QtGui.QApplication.UnicodeUTF8))
-        self.freqLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Frequency (Hz)", None, QtGui.QApplication.UnicodeUTF8))
-        self.decimLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Decimation", None, QtGui.QApplication.UnicodeUTF8))
-        self.rxPacketBox.setTitle(QtGui.QApplication.translate("DigitalWindow", "Received Packet Info", None, QtGui.QApplication.UnicodeUTF8))
-        self.pktsRcvdLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Packets Rcvd.", None, QtGui.QApplication.UnicodeUTF8))
-        self.pktsCorrectLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Packets Correct", None, QtGui.QApplication.UnicodeUTF8))
-        self.perLabel.setText(QtGui.QApplication.translate("DigitalWindow", "PER", None, QtGui.QApplication.UnicodeUTF8))
-        self.closeButton.setText(QtGui.QApplication.translate("DigitalWindow", "Close", None, QtGui.QApplication.UnicodeUTF8))
-        self.menuFile.setTitle(QtGui.QApplication.translate("DigitalWindow", "&File", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionExit.setText(QtGui.QApplication.translate("DigitalWindow", "E&xit", None, QtGui.QApplication.UnicodeUTF8))
-
diff --git a/gnuradio-examples/python/digital/qt_rx_window.ui b/gnuradio-examples/python/digital/qt_rx_window.ui
deleted file mode 100644
index f5a074876..000000000
--- a/gnuradio-examples/python/digital/qt_rx_window.ui
+++ /dev/null
@@ -1,407 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DigitalWindow</class>
- <widget class="QMainWindow" name="DigitalWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>999</width>
-    <height>519</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <layout class="QHBoxLayout" name="sinkLayout"/>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="sizeConstraint">
-       <enum>QLayout::SetFixedSize</enum>
-      </property>
-      <item>
-       <widget class="QGroupBox" name="rxBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>190</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>250</width>
-          <height>190</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Receiver Parameters</string>
-        </property>
-        <widget class="QLineEdit" name="gainMuEdit">
-         <property name="geometry">
-          <rect>
-           <x>120</x>
-           <y>120</y>
-           <width>113</width>
-           <height>23</height>
-          </rect>
-         </property>
-        </widget>
-        <widget class="QLabel" name="gainMuLabel">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>120</y>
-           <width>111</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>mu's gain</string>
-         </property>
-        </widget>
-        <widget class="QLineEdit" name="alphaEdit">
-         <property name="geometry">
-          <rect>
-           <x>120</x>
-           <y>150</y>
-           <width>113</width>
-           <height>23</height>
-          </rect>
-         </property>
-        </widget>
-        <widget class="QLabel" name="alphaLabel">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>150</y>
-           <width>111</width>
-           <height>20</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Alpha</string>
-         </property>
-        </widget>
-        <widget class="QLabel" name="gainLabel">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>60</y>
-           <width>101</width>
-           <height>17</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Gain (dB)</string>
-         </property>
-        </widget>
-        <widget class="QLineEdit" name="freqEdit">
-         <property name="geometry">
-          <rect>
-           <x>120</x>
-           <y>30</y>
-           <width>113</width>
-           <height>23</height>
-          </rect>
-         </property>
-        </widget>
-        <widget class="QLabel" name="freqLabel">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>30</y>
-           <width>141</width>
-           <height>17</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Frequency (Hz)</string>
-         </property>
-        </widget>
-        <widget class="QLineEdit" name="gainEdit">
-         <property name="geometry">
-          <rect>
-           <x>120</x>
-           <y>60</y>
-           <width>113</width>
-           <height>23</height>
-          </rect>
-         </property>
-        </widget>
-        <widget class="QLabel" name="decimLabel">
-         <property name="geometry">
-          <rect>
-           <x>10</x>
-           <y>90</y>
-           <width>101</width>
-           <height>17</height>
-          </rect>
-         </property>
-         <property name="text">
-          <string>Decimation</string>
-         </property>
-        </widget>
-        <widget class="QLineEdit" name="decimEdit">
-         <property name="geometry">
-          <rect>
-           <x>120</x>
-           <y>90</y>
-           <width>113</width>
-           <height>23</height>
-          </rect>
-         </property>
-        </widget>
-       </widget>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="QGroupBox" name="rxPacketBox">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>250</width>
-            <height>130</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>250</width>
-            <height>130</height>
-           </size>
-          </property>
-          <property name="font">
-           <font>
-            <weight>50</weight>
-            <bold>false</bold>
-           </font>
-          </property>
-          <property name="title">
-           <string>Received Packet Info</string>
-          </property>
-          <widget class="QLineEdit" name="pktsRcvdEdit">
-           <property name="geometry">
-            <rect>
-             <x>120</x>
-             <y>30</y>
-             <width>113</width>
-             <height>23</height>
-            </rect>
-           </property>
-          </widget>
-          <widget class="QLabel" name="pktsRcvdLabel">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>30</y>
-             <width>111</width>
-             <height>20</height>
-            </rect>
-           </property>
-           <property name="text">
-            <string>Packets Rcvd.</string>
-           </property>
-          </widget>
-          <widget class="QLineEdit" name="pktsCorrectEdit">
-           <property name="geometry">
-            <rect>
-             <x>120</x>
-             <y>60</y>
-             <width>113</width>
-             <height>23</height>
-            </rect>
-           </property>
-          </widget>
-          <widget class="QLabel" name="pktsCorrectLabel">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>60</y>
-             <width>111</width>
-             <height>20</height>
-            </rect>
-           </property>
-           <property name="text">
-            <string>Packets Correct</string>
-           </property>
-          </widget>
-          <widget class="QLabel" name="perLabel">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>90</y>
-             <width>111</width>
-             <height>20</height>
-            </rect>
-           </property>
-           <property name="text">
-            <string>PER</string>
-           </property>
-          </widget>
-          <widget class="QLineEdit" name="perEdit">
-           <property name="geometry">
-            <rect>
-             <x>120</x>
-             <y>90</y>
-             <width>113</width>
-             <height>23</height>
-            </rect>
-           </property>
-          </widget>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>60</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_5">
-        <item>
-         <spacer name="verticalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="closeButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>80</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>80</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Close</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>999</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>&amp;File</string>
-    </property>
-    <addaction name="actionExit"/>
-   </widget>
-   <addaction name="menuFile"/>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
-  <action name="actionExit">
-   <property name="text">
-    <string>E&amp;xit</string>
-   </property>
-  </action>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>actionExit</sender>
-   <signal>triggered()</signal>
-   <receiver>DigitalWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>617</x>
-     <y>327</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>closeButton</sender>
-   <signal>clicked()</signal>
-   <receiver>DigitalWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>960</x>
-     <y>694</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>66</x>
-     <y>561</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/gnuradio-examples/python/digital/qt_rx_window2.py b/gnuradio-examples/python/digital/qt_rx_window2.py
deleted file mode 100644
index 2fd719ce1..000000000
--- a/gnuradio-examples/python/digital/qt_rx_window2.py
+++ /dev/null
@@ -1,166 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'qt_rx_window2.ui'
-#
-# Created: Tue May 11 21:01:39 2010
-#      by: PyQt4 UI code generator 4.6.1
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_DigitalWindow(object):
-    def setupUi(self, DigitalWindow):
-        DigitalWindow.setObjectName("DigitalWindow")
-        DigitalWindow.resize(1000, 523)
-        self.centralwidget = QtGui.QWidget(DigitalWindow)
-        self.centralwidget.setObjectName("centralwidget")
-        self.verticalLayout = QtGui.QVBoxLayout(self.centralwidget)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.sinkLayout = QtGui.QHBoxLayout()
-        self.sinkLayout.setObjectName("sinkLayout")
-        self.verticalLayout.addLayout(self.sinkLayout)
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setSizeConstraint(QtGui.QLayout.SetFixedSize)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.rxBox = QtGui.QGroupBox(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.rxBox.sizePolicy().hasHeightForWidth())
-        self.rxBox.setSizePolicy(sizePolicy)
-        self.rxBox.setMinimumSize(QtCore.QSize(250, 190))
-        self.rxBox.setMaximumSize(QtCore.QSize(250, 250))
-        self.rxBox.setObjectName("rxBox")
-        self.formLayout = QtGui.QFormLayout(self.rxBox)
-        self.formLayout.setObjectName("formLayout")
-        self.freqLabel = QtGui.QLabel(self.rxBox)
-        self.freqLabel.setObjectName("freqLabel")
-        self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.freqLabel)
-        self.freqEdit = QtGui.QLineEdit(self.rxBox)
-        self.freqEdit.setObjectName("freqEdit")
-        self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.freqEdit)
-        self.gainLabel = QtGui.QLabel(self.rxBox)
-        self.gainLabel.setObjectName("gainLabel")
-        self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.gainLabel)
-        self.gainEdit = QtGui.QLineEdit(self.rxBox)
-        self.gainEdit.setObjectName("gainEdit")
-        self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.gainEdit)
-        self.decimLabel = QtGui.QLabel(self.rxBox)
-        self.decimLabel.setObjectName("decimLabel")
-        self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.decimLabel)
-        self.decimEdit = QtGui.QLineEdit(self.rxBox)
-        self.decimEdit.setObjectName("decimEdit")
-        self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.decimEdit)
-        self.gainClockLabel = QtGui.QLabel(self.rxBox)
-        self.gainClockLabel.setObjectName("gainClockLabel")
-        self.formLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.gainClockLabel)
-        self.gainClockEdit = QtGui.QLineEdit(self.rxBox)
-        self.gainClockEdit.setObjectName("gainClockEdit")
-        self.formLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.gainClockEdit)
-        self.gainPhaseLabel = QtGui.QLabel(self.rxBox)
-        self.gainPhaseLabel.setObjectName("gainPhaseLabel")
-        self.formLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.gainPhaseLabel)
-        self.gainPhaseEdit = QtGui.QLineEdit(self.rxBox)
-        self.gainPhaseEdit.setObjectName("gainPhaseEdit")
-        self.formLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.gainPhaseEdit)
-        self.gainFreqEdit = QtGui.QLineEdit(self.rxBox)
-        self.gainFreqEdit.setObjectName("gainFreqEdit")
-        self.formLayout.setWidget(5, QtGui.QFormLayout.FieldRole, self.gainFreqEdit)
-        self.gainFreqLabel = QtGui.QLabel(self.rxBox)
-        self.gainFreqLabel.setObjectName("gainFreqLabel")
-        self.formLayout.setWidget(5, QtGui.QFormLayout.LabelRole, self.gainFreqLabel)
-        self.horizontalLayout.addWidget(self.rxBox)
-        self.verticalLayout_3 = QtGui.QVBoxLayout()
-        self.verticalLayout_3.setObjectName("verticalLayout_3")
-        self.rxPacketBox = QtGui.QGroupBox(self.centralwidget)
-        self.rxPacketBox.setEnabled(True)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.rxPacketBox.sizePolicy().hasHeightForWidth())
-        self.rxPacketBox.setSizePolicy(sizePolicy)
-        self.rxPacketBox.setMinimumSize(QtCore.QSize(250, 130))
-        self.rxPacketBox.setMaximumSize(QtCore.QSize(250, 130))
-        font = QtGui.QFont()
-        font.setWeight(50)
-        font.setBold(False)
-        self.rxPacketBox.setFont(font)
-        self.rxPacketBox.setObjectName("rxPacketBox")
-        self.pktsRcvdEdit = QtGui.QLineEdit(self.rxPacketBox)
-        self.pktsRcvdEdit.setGeometry(QtCore.QRect(120, 30, 113, 23))
-        self.pktsRcvdEdit.setObjectName("pktsRcvdEdit")
-        self.pktsRcvdLabel = QtGui.QLabel(self.rxPacketBox)
-        self.pktsRcvdLabel.setGeometry(QtCore.QRect(10, 30, 111, 20))
-        self.pktsRcvdLabel.setObjectName("pktsRcvdLabel")
-        self.pktsCorrectEdit = QtGui.QLineEdit(self.rxPacketBox)
-        self.pktsCorrectEdit.setGeometry(QtCore.QRect(120, 60, 113, 23))
-        self.pktsCorrectEdit.setObjectName("pktsCorrectEdit")
-        self.pktsCorrectLabel = QtGui.QLabel(self.rxPacketBox)
-        self.pktsCorrectLabel.setGeometry(QtCore.QRect(10, 60, 111, 20))
-        self.pktsCorrectLabel.setObjectName("pktsCorrectLabel")
-        self.perLabel = QtGui.QLabel(self.rxPacketBox)
-        self.perLabel.setGeometry(QtCore.QRect(10, 90, 111, 20))
-        self.perLabel.setObjectName("perLabel")
-        self.perEdit = QtGui.QLineEdit(self.rxPacketBox)
-        self.perEdit.setGeometry(QtCore.QRect(120, 90, 113, 23))
-        self.perEdit.setObjectName("perEdit")
-        self.verticalLayout_3.addWidget(self.rxPacketBox)
-        spacerItem = QtGui.QSpacerItem(20, 60, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.verticalLayout_3.addItem(spacerItem)
-        self.horizontalLayout.addLayout(self.verticalLayout_3)
-        spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem1)
-        self.verticalLayout_5 = QtGui.QVBoxLayout()
-        self.verticalLayout_5.setObjectName("verticalLayout_5")
-        spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout_5.addItem(spacerItem2)
-        self.closeButton = QtGui.QPushButton(self.centralwidget)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.closeButton.sizePolicy().hasHeightForWidth())
-        self.closeButton.setSizePolicy(sizePolicy)
-        self.closeButton.setMinimumSize(QtCore.QSize(80, 30))
-        self.closeButton.setMaximumSize(QtCore.QSize(80, 30))
-        self.closeButton.setObjectName("closeButton")
-        self.verticalLayout_5.addWidget(self.closeButton)
-        self.horizontalLayout.addLayout(self.verticalLayout_5)
-        self.verticalLayout.addLayout(self.horizontalLayout)
-        DigitalWindow.setCentralWidget(self.centralwidget)
-        self.menubar = QtGui.QMenuBar(DigitalWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 1000, 23))
-        self.menubar.setObjectName("menubar")
-        self.menuFile = QtGui.QMenu(self.menubar)
-        self.menuFile.setObjectName("menuFile")
-        DigitalWindow.setMenuBar(self.menubar)
-        self.statusbar = QtGui.QStatusBar(DigitalWindow)
-        self.statusbar.setObjectName("statusbar")
-        DigitalWindow.setStatusBar(self.statusbar)
-        self.actionExit = QtGui.QAction(DigitalWindow)
-        self.actionExit.setObjectName("actionExit")
-        self.menuFile.addAction(self.actionExit)
-        self.menubar.addAction(self.menuFile.menuAction())
-
-        self.retranslateUi(DigitalWindow)
-        QtCore.QObject.connect(self.actionExit, QtCore.SIGNAL("triggered()"), DigitalWindow.close)
-        QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), DigitalWindow.close)
-        QtCore.QMetaObject.connectSlotsByName(DigitalWindow)
-
-    def retranslateUi(self, DigitalWindow):
-        DigitalWindow.setWindowTitle(QtGui.QApplication.translate("DigitalWindow", "MainWindow", None, QtGui.QApplication.UnicodeUTF8))
-        self.rxBox.setTitle(QtGui.QApplication.translate("DigitalWindow", "Receiver Parameters", None, QtGui.QApplication.UnicodeUTF8))
-        self.freqLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Frequency (Hz)", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Gain (dB)", None, QtGui.QApplication.UnicodeUTF8))
-        self.decimLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Decimation", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainClockLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Clock Loop Gain", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainPhaseLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Phase Loop Gain", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainFreqLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Freq. Loop Gain", None, QtGui.QApplication.UnicodeUTF8))
-        self.rxPacketBox.setTitle(QtGui.QApplication.translate("DigitalWindow", "Received Packet Info", None, QtGui.QApplication.UnicodeUTF8))
-        self.pktsRcvdLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Packets Rcvd.", None, QtGui.QApplication.UnicodeUTF8))
-        self.pktsCorrectLabel.setText(QtGui.QApplication.translate("DigitalWindow", "Packets Correct", None, QtGui.QApplication.UnicodeUTF8))
-        self.perLabel.setText(QtGui.QApplication.translate("DigitalWindow", "PER", None, QtGui.QApplication.UnicodeUTF8))
-        self.closeButton.setText(QtGui.QApplication.translate("DigitalWindow", "Close", None, QtGui.QApplication.UnicodeUTF8))
-        self.menuFile.setTitle(QtGui.QApplication.translate("DigitalWindow", "&File", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionExit.setText(QtGui.QApplication.translate("DigitalWindow", "E&xit", None, QtGui.QApplication.UnicodeUTF8))
-
diff --git a/gnuradio-examples/python/digital/qt_rx_window2.ui b/gnuradio-examples/python/digital/qt_rx_window2.ui
deleted file mode 100644
index 745af8fb8..000000000
--- a/gnuradio-examples/python/digital/qt_rx_window2.ui
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DigitalWindow</class>
- <widget class="QMainWindow" name="DigitalWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1000</width>
-    <height>523</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <layout class="QHBoxLayout" name="sinkLayout"/>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="sizeConstraint">
-       <enum>QLayout::SetFixedSize</enum>
-      </property>
-      <item>
-       <widget class="QGroupBox" name="rxBox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>250</width>
-          <height>190</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>250</width>
-          <height>250</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Receiver Parameters</string>
-        </property>
-        <layout class="QFormLayout" name="formLayout">
-         <item row="0" column="0">
-          <widget class="QLabel" name="freqLabel">
-           <property name="text">
-            <string>Frequency (Hz)</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QLineEdit" name="freqEdit"/>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="gainLabel">
-           <property name="text">
-            <string>Gain (dB)</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QLineEdit" name="gainEdit"/>
-         </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="decimLabel">
-           <property name="text">
-            <string>Decimation</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QLineEdit" name="decimEdit"/>
-         </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="gainClockLabel">
-           <property name="text">
-            <string>Clock Loop Gain</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="QLineEdit" name="gainClockEdit"/>
-         </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="gainPhaseLabel">
-           <property name="text">
-            <string>Phase Loop Gain</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1">
-          <widget class="QLineEdit" name="gainPhaseEdit"/>
-         </item>
-         <item row="5" column="1">
-          <widget class="QLineEdit" name="gainFreqEdit"/>
-         </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="gainFreqLabel">
-           <property name="text">
-            <string>Freq. Loop Gain</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="QGroupBox" name="rxPacketBox">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>250</width>
-            <height>130</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>250</width>
-            <height>130</height>
-           </size>
-          </property>
-          <property name="font">
-           <font>
-            <weight>50</weight>
-            <bold>false</bold>
-           </font>
-          </property>
-          <property name="title">
-           <string>Received Packet Info</string>
-          </property>
-          <widget class="QLineEdit" name="pktsRcvdEdit">
-           <property name="geometry">
-            <rect>
-             <x>120</x>
-             <y>30</y>
-             <width>113</width>
-             <height>23</height>
-            </rect>
-           </property>
-          </widget>
-          <widget class="QLabel" name="pktsRcvdLabel">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>30</y>
-             <width>111</width>
-             <height>20</height>
-            </rect>
-           </property>
-           <property name="text">
-            <string>Packets Rcvd.</string>
-           </property>
-          </widget>
-          <widget class="QLineEdit" name="pktsCorrectEdit">
-           <property name="geometry">
-            <rect>
-             <x>120</x>
-             <y>60</y>
-             <width>113</width>
-             <height>23</height>
-            </rect>
-           </property>
-          </widget>
-          <widget class="QLabel" name="pktsCorrectLabel">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>60</y>
-             <width>111</width>
-             <height>20</height>
-            </rect>
-           </property>
-           <property name="text">
-            <string>Packets Correct</string>
-           </property>
-          </widget>
-          <widget class="QLabel" name="perLabel">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>90</y>
-             <width>111</width>
-             <height>20</height>
-            </rect>
-           </property>
-           <property name="text">
-            <string>PER</string>
-           </property>
-          </widget>
-          <widget class="QLineEdit" name="perEdit">
-           <property name="geometry">
-            <rect>
-             <x>120</x>
-             <y>90</y>
-             <width>113</width>
-             <height>23</height>
-            </rect>
-           </property>
-          </widget>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>60</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_5">
-        <item>
-         <spacer name="verticalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="closeButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>80</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>80</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Close</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>1000</width>
-     <height>23</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>&amp;File</string>
-    </property>
-    <addaction name="actionExit"/>
-   </widget>
-   <addaction name="menuFile"/>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
-  <action name="actionExit">
-   <property name="text">
-    <string>E&amp;xit</string>
-   </property>
-  </action>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>actionExit</sender>
-   <signal>triggered()</signal>
-   <receiver>DigitalWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>617</x>
-     <y>327</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>closeButton</sender>
-   <signal>clicked()</signal>
-   <receiver>DigitalWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>960</x>
-     <y>694</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>66</x>
-     <y>561</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/gnuradio-examples/python/digital/usrp_receive_path.py b/gnuradio-examples/python/digital/usrp_receive_path.py
deleted file mode 100644
index a8f16e28a..000000000
--- a/gnuradio-examples/python/digital/usrp_receive_path.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Copyright 2009 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.
-# 
-
-from gnuradio import gr
-from gnuradio import usrp_options
-import receive_path
-from pick_bitrate import pick_rx_bitrate
-from gnuradio import eng_notation
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
-                          metavar="FREQ")
-
-def add_options(parser, expert):
-    add_freq_option(parser)
-    usrp_options.add_rx_options(parser)
-    receive_path.receive_path.add_options(parser, expert)
-    expert.add_option("", "--rx-freq", type="eng_float", default=None,
-                          help="set Rx frequency to FREQ [default=%default]", metavar="FREQ")
-    parser.add_option("-v", "--verbose", action="store_true", default=False)
-
-class usrp_receive_path(gr.hier_block2):
-
-    def __init__(self, demod_class, rx_callback, options):
-        '''
-        See below for what options should hold
-        '''
-        gr.hier_block2.__init__(self, "usrp_receive_path",
-                gr.io_signature(0, 0, 0),                    # Input signature
-                gr.io_signature(0, 0, 0)) # Output signature
-        if options.rx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --rx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        #setup usrp
-        self._demod_class = demod_class
-        self._setup_usrp_source(options)
-
-        rx_path = receive_path.receive_path(demod_class, rx_callback, options)
-        for attr in dir(rx_path): #forward the methods
-            if not attr.startswith('_') and not hasattr(self, attr):
-                setattr(self, attr, getattr(rx_path, attr))
-
-        #connect
-        self.connect(self.u, rx_path)
-
-    def _setup_usrp_source(self, options):
-        self.u = usrp_options.create_usrp_source(options)
-        adc_rate = self.u.adc_rate()
-        self.rs_rate = options.bitrate
-
-        (self._bitrate, self._samples_per_symbol, self._decim) = \
-                        pick_rx_bitrate(options.bitrate, self._demod_class.bits_per_symbol(), \
-                                        options.samples_per_symbol, options.decim,
-                                        adc_rate, self.u.get_decim_rates())
-
-        if options.verbose:
-            print 'USRP Source:', self.u
-            print 'Decimation: ', self._decim
-
-        options.samples_per_symbol = self._samples_per_symbol
-        options.decim = self._decim
-        
-        self.u.set_decim(self._decim)
-
-        if not self.u.set_center_freq(options.rx_freq):
-            print "Failed to set Rx frequency to %s" % (eng_notation.num_to_str(options.rx_freq))
-            raise ValueError, eng_notation.num_to_str(options.rx_freq)
diff --git a/gnuradio-examples/python/digital/usrp_receive_path2.py b/gnuradio-examples/python/digital/usrp_receive_path2.py
deleted file mode 100644
index d20017204..000000000
--- a/gnuradio-examples/python/digital/usrp_receive_path2.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Copyright 2010 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.
-# 
-
-from gnuradio import gr
-from gnuradio import usrp_options
-import receive_path
-from pick_bitrate2 import pick_rx_bitrate
-from gnuradio import eng_notation
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
-                          metavar="FREQ")
-
-def add_options(parser, expert):
-    add_freq_option(parser)
-    usrp_options.add_rx_options(parser)
-    receive_path.receive_path.add_options(parser, expert)
-    expert.add_option("", "--rx-freq", type="eng_float", default=None,
-                          help="set Rx frequency to FREQ [default=%default]", metavar="FREQ")
-    parser.add_option("-v", "--verbose", action="store_true", default=False)
-
-class usrp_receive_path(gr.hier_block2):
-
-    def __init__(self, demod_class, rx_callback, options):
-        '''
-        See below for what options should hold
-        '''
-        gr.hier_block2.__init__(self, "usrp_receive_path",
-                gr.io_signature(0, 0, 0),                    # Input signature
-                gr.io_signature(0, 0, 0)) # Output signature
-        if options.rx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --rx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        #setup usrp
-        self._demod_class = demod_class
-        self._setup_usrp_source(options)
-
-        rx_path = receive_path.receive_path(demod_class, rx_callback, options)
-        for attr in dir(rx_path): #forward the methods
-            if not attr.startswith('_') and not hasattr(self, attr):
-                setattr(self, attr, getattr(rx_path, attr))
-
-        #connect
-        self.connect(self.u, rx_path)
-
-    def _setup_usrp_source(self, options):
-        self.u = usrp_options.create_usrp_source(options)
-        adc_rate = self.u.adc_rate()
-        self.rs_rate = options.bitrate
-
-        (self._bitrate, self._samples_per_symbol, self._decim) = \
-                        pick_rx_bitrate(options.bitrate, self._demod_class.bits_per_symbol(), \
-                                        options.samples_per_symbol, options.decim,
-                                        adc_rate, self.u.get_decim_rates())
-
-        if options.verbose:
-            print 'USRP Source:', self.u
-            print 'Decimation: ', self._decim
-
-        options.samples_per_symbol = self._samples_per_symbol
-        options.decim = self._decim
-        
-        self.u.set_decim(self._decim)
-
-        if not self.u.set_center_freq(options.rx_freq):
-            print "Failed to set Rx frequency to %s" % (eng_notation.num_to_str(options.rx_freq))
-            raise ValueError, eng_notation.num_to_str(options.rx_freq)
diff --git a/gnuradio-examples/python/digital/usrp_transmit_path.py b/gnuradio-examples/python/digital/usrp_transmit_path.py
deleted file mode 100644
index f0f467599..000000000
--- a/gnuradio-examples/python/digital/usrp_transmit_path.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# Copyright 2009 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.
-# 
-
-from gnuradio import gr
-from gnuradio import usrp_options
-import transmit_path
-from pick_bitrate import pick_tx_bitrate
-from gnuradio import eng_notation
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
-                          metavar="FREQ")
-
-def add_options(parser, expert):
-    add_freq_option(parser)
-    usrp_options.add_tx_options(parser)
-    transmit_path.transmit_path.add_options(parser, expert)
-    expert.add_option("", "--tx-freq", type="eng_float", default=None,
-                          help="set transmit frequency to FREQ [default=%default]", metavar="FREQ")
-    parser.add_option("-v", "--verbose", action="store_true", default=False)
-
-class usrp_transmit_path(gr.hier_block2):
-    def __init__(self, modulator_class, options):
-        '''
-        See below for what options should hold
-        '''
-        gr.hier_block2.__init__(self, "usrp_transmit_path",
-                gr.io_signature(0, 0, 0),                    # Input signature
-                gr.io_signature(0, 0, 0)) # Output signature
-        if options.tx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --tx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        #setup usrp
-        self._modulator_class = modulator_class
-        self._setup_usrp_sink(options)
-
-        tx_path = transmit_path.transmit_path(modulator_class, options)
-        for attr in dir(tx_path): #forward the methods
-            if not attr.startswith('_') and not hasattr(self, attr):
-                setattr(self, attr, getattr(tx_path, attr))
-
-        #connect
-        self.connect(tx_path, self.u)
-        
-    def _setup_usrp_sink(self, options):
-        """
-        Creates a USRP sink, determines the settings for best bitrate,
-        and attaches to the transmitter's subdevice.
-        """
-        self.u = usrp_options.create_usrp_sink(options)
-        dac_rate = self.u.dac_rate()
-        self.rs_rate = options.bitrate    # Store requested bit rate
-            
-        (self._bitrate, self._samples_per_symbol, self._interp) = \
-                        pick_tx_bitrate(options.bitrate, self._modulator_class.bits_per_symbol(),
-                                        options.samples_per_symbol, options.interp,
-                                        dac_rate, self.u.get_interp_rates())
-
-        options.interp = self._interp
-        options.samples_per_symbol = self._samples_per_symbol
-        options.bitrate = self._bitrate
-
-        if options.verbose:
-            print 'USRP Sink:', self.u
-            print "Interpolation Rate: ", self._interp
-        
-        self.u.set_interp(self._interp)
-        self.u.set_auto_tr(True)
-
-        if not self.u.set_center_freq(options.tx_freq):
-            print "Failed to set Rx frequency to %s" % (eng_notation.num_to_str(options.tx_freq))
-            raise ValueError, eng_notation.num_to_str(options.tx_freq)
diff --git a/gnuradio-examples/python/digital/usrp_transmit_path2.py b/gnuradio-examples/python/digital/usrp_transmit_path2.py
deleted file mode 100644
index 54930e5a0..000000000
--- a/gnuradio-examples/python/digital/usrp_transmit_path2.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# Copyright 2010 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.
-# 
-
-from gnuradio import gr
-from gnuradio import usrp_options
-import transmit_path
-from pick_bitrate2 import pick_tx_bitrate
-from gnuradio import eng_notation
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
-                          metavar="FREQ")
-
-def add_options(parser, expert):
-    add_freq_option(parser)
-    usrp_options.add_tx_options(parser)
-    transmit_path.transmit_path.add_options(parser, expert)
-    expert.add_option("", "--tx-freq", type="eng_float", default=None,
-                          help="set transmit frequency to FREQ [default=%default]", metavar="FREQ")
-    parser.add_option("-v", "--verbose", action="store_true", default=False)
-
-class usrp_transmit_path(gr.hier_block2):
-    def __init__(self, modulator_class, options):
-        '''
-        See below for what options should hold
-        '''
-        gr.hier_block2.__init__(self, "usrp_transmit_path",
-                gr.io_signature(0, 0, 0),                    # Input signature
-                gr.io_signature(0, 0, 0)) # Output signature
-        if options.tx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --tx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        #setup usrp
-        self._modulator_class = modulator_class
-        self._setup_usrp_sink(options)
-
-        tx_path = transmit_path.transmit_path(modulator_class, options)
-        for attr in dir(tx_path): #forward the methods
-            if not attr.startswith('_') and not hasattr(self, attr):
-                setattr(self, attr, getattr(tx_path, attr))
-
-        #connect
-        self.connect(tx_path, self.u)
-        
-    def _setup_usrp_sink(self, options):
-        """
-        Creates a USRP sink, determines the settings for best bitrate,
-        and attaches to the transmitter's subdevice.
-        """
-        self.u = usrp_options.create_usrp_sink(options)
-        dac_rate = self.u.dac_rate()
-        self.rs_rate = options.bitrate    # Store requested bit rate
-            
-        (self._bitrate, self._samples_per_symbol, self._interp) = \
-                        pick_tx_bitrate(options.bitrate, self._modulator_class.bits_per_symbol(),
-                                        options.samples_per_symbol, options.interp,
-                                        dac_rate, self.u.get_interp_rates())
-
-        options.interp = self._interp
-        options.samples_per_symbol = self._samples_per_symbol
-        options.bitrate = self._bitrate
-
-        if options.verbose:
-            print 'USRP Sink:', self.u
-            print "Interpolation Rate: ", self._interp
-        
-        self.u.set_interp(self._interp)
-        self.u.set_auto_tr(True)
-
-        if not self.u.set_center_freq(options.tx_freq):
-            print "Failed to set Rx frequency to %s" % (eng_notation.num_to_str(options.tx_freq))
-            raise ValueError, eng_notation.num_to_str(options.tx_freq)
diff --git a/gnuradio-examples/python/digital_voice/.gitignore b/gnuradio-examples/python/digital_voice/.gitignore
deleted file mode 100644
index c400497f5..000000000
--- a/gnuradio-examples/python/digital_voice/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gnuradio-examples/python/digital_voice/cvsd_test.py b/gnuradio-examples/python/digital_voice/cvsd_test.py
deleted file mode 100755
index f8f1b9cce..000000000
--- a/gnuradio-examples/python/digital_voice/cvsd_test.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 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.
-# 
-
-from gnuradio import gr, blks2
-from gnuradio import audio
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-def main():
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("-I", "--audio-input", type="string", default="",
-                      help="pcm input device name.  E.g., hw:0,0 or /dev/dsp")
-    parser.add_option("-O", "--audio-output", type="string", default="",
-                      help="pcm output device name.  E.g., hw:0,0 or /dev/dsp")
-    parser.add_option("-r", "--sample-rate", type="eng_float", default="32000",
-                      help="Audio sampling rate [defaul=%default]")
-    parser.add_option("-S", "--resample-rate", type="int", default="8",
-                      help="Resampling rate in CVSD [default=%default]")
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help()
-        raise SystemExit, 1
-
-    tb = gr.top_block()
-
-    src = audio.source(int(options.sample_rate), options.audio_input)
-    tx = blks2.cvsd_encode(options.resample_rate)
-
-    # todo: add noise
-
-    rx = blks2.cvsd_decode(options.resample_rate)
-    dst = audio.sink(int(options.sample_rate), options.audio_output)
-    
-    tb.connect(src, tx, rx, dst)    
-    tb.run()
-    
-if __name__ == '__main__':
-    print "Enter CTRL-C to exit"
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
-    
diff --git a/gnuradio-examples/python/digital_voice/encdec.py b/gnuradio-examples/python/digital_voice/encdec.py
deleted file mode 100755
index e87d57e2b..000000000
--- a/gnuradio-examples/python/digital_voice/encdec.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005 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.
-# 
-
-from gnuradio import gr, blks2
-from gnuradio import audio
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-class my_top_block(gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-I", "--audio-input", type="string", default="",
-                          help="pcm input device name.  E.g., hw:0,0 or /dev/dsp")
-        parser.add_option("-O", "--audio-output", type="string", default="",
-                          help="pcm output device name.  E.g., hw:0,0 or /dev/dsp")
-        (options, args) = parser.parse_args ()
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit, 1
-
-        sample_rate = 8000
-        src = audio.source(sample_rate, options.audio_input)
-        tx = blks2.digital_voice_tx(self)
-        if_gain = gr.multiply_const_cc(10000)
-        # channel simulator here...
-        rx = blks2.digital_voice_rx(self)
-        dst = audio.sink(sample_rate, options.audio_output)
-
-        self.connect(src, tx, if_gain, rx, dst)
-
-
-if __name__ == '__main__':
-    try:
-        my_top_block().run()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/mp-sched/CMakeLists.txt b/gnuradio-examples/python/mp-sched/CMakeLists.txt
new file mode 100644
index 000000000..ca090659d
--- /dev/null
+++ b/gnuradio-examples/python/mp-sched/CMakeLists.txt
@@ -0,0 +1,35 @@
+# 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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+  plot_flops.py
+  run_synthetic.py
+  synthetic.py
+  wfm_rcv_pll_to_wav.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched
+  COMPONENT "gnuradio_examples"
+)
+
+install(
+    FILES README
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched
+    COMPONENT "gnuadio-examples"
+)
diff --git a/gnuradio-examples/python/multi-antenna/.gitignore b/gnuradio-examples/python/multi-antenna/.gitignore
deleted file mode 100644
index ff40c06f3..000000000
--- a/gnuradio-examples/python/multi-antenna/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
-/*.dat
diff --git a/gnuradio-examples/python/multi-antenna/multi_fft.py b/gnuradio-examples/python/multi-antenna/multi_fft.py
deleted file mode 100755
index 544445860..000000000
--- a/gnuradio-examples/python/multi-antenna/multi_fft.py
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env python
-
-from gnuradio import gr, gru, eng_notation
-from gnuradio import usrp
-from gnuradio.eng_option import eng_option
-from gnuradio import eng_notation
-from gnuradio import optfir
-from optparse import OptionParser
-from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider
-import wx
-from usrpm import usrp_dbid
-import time
-import os.path
-import sys
-
-# required FPGA that can do 4 rx channels.
-
-
-class my_graph(stdgui2.std_top_block):
-
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        self.frame = frame
-        self.panel = panel
-
-        parser = OptionParser (option_class=eng_option)
-        #parser.add_option("-S", "--subdev", type="subdev", default=(0, None),
-        #                  help="select USRP Rx side A or B (default=A)")
-        parser.add_option("-d", "--decim", type="int", default=128,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=146.585e6,
-                          help="set frequency to FREQ [default=%default])", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=20,
-                          help="set gain in dB [default=%default]")
-        parser.add_option("-F", "--filter", action="store_true", default=True,
-                          help="Enable channel filter")
-        (options, args) = parser.parse_args()
-
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit
-
-        nchan = 4
-
-        if options.filter:
-            sw_decim = 4
-        else:
-            sw_decim = 1
-
-        self.u = usrp.source_c(0, options.decim, fpga_filename="std_4rx_0tx.rbf")
-        if self.u.nddcs() < nchan:
-            sys.stderr.write('This code requires an FPGA build with %d DDCs.  This FPGA has only %d.\n' % (
-                nchan, self.u.nddcs()))
-            raise SystemExit
-                             
-        if not self.u.set_nchannels(nchan):
-            sys.stderr.write('set_nchannels(%d) failed\n' % (nchan,))
-            raise SystemExit
-        
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-        print "USB data rate   = %s" % (eng_notation.num_to_str(input_rate),)
-        print "Scope data rate = %s" % (eng_notation.num_to_str(input_rate/sw_decim),)
-
-        self.subdev = self.u.db(0) + self.u.db(1)
-
-        if (len (self.subdev) < 4 or
-            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX or
-            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX):
-            sys.stderr.write('This code requires a Basic Rx board on Sides A & B\n')
-            sys.exit(1)
-
-        self.u.set_mux(gru.hexint(0xf3f2f1f0))
-
-        # deinterleave four channels from FPGA
-        di = gr.deinterleave(gr.sizeof_gr_complex)
-
-        self.connect(self.u, di)
-        
-
-
-        # taps for channel filter
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
-                                            input_rate,  # sampling rate
-                                            80e3,        # passband cutoff
-                                            115e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-
-        for i in range(nchan):
-            scope = fftsink2.fft_sink_c(panel, sample_rate=input_rate/sw_decim,
-                                        title="Input %d" % (i,),
-                                        ref_level=80, y_per_div=20)
-            vbox.Add(scope.win, 10, wx.EXPAND)
-
-            if options.filter:
-                chan_filt = gr.fir_filter_ccf(sw_decim, chan_filt_coeffs)
-                self.connect((di, i), chan_filt, scope)
-            else:
-                self.connect((di, i), scope)
-
-
-        self.set_gain(options.gain)
-        self.set_freq(options.freq)
-
-    def set_gain(self, gain):
-        for i in range(len(self.subdev)):
-            self.subdev[i].set_gain(gain)
-
-    def set_freq(self, target_freq):
-        ok = True
-        for i in range(len(self.subdev)):
-            r = usrp.tune(self.u, i, self.subdev[i], target_freq)
-            if not r:
-                ok = False
-                print "set_freq: failed to set subdev[%d] freq to %f" % (
-                    i, target_freq)
-
-        return ok
-
-
-def main ():
-    app = stdgui2.stdapp(my_graph, "Multi Scope", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gnuradio-examples/python/multi-antenna/multi_file.py b/gnuradio-examples/python/multi-antenna/multi_file.py
deleted file mode 100755
index 87d9085e3..000000000
--- a/gnuradio-examples/python/multi-antenna/multi_file.py
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env python
-
-from gnuradio import gr, gru, eng_notation
-from gnuradio import usrp
-from gnuradio.eng_option import eng_option
-from gnuradio import eng_notation
-from gnuradio import optfir
-from optparse import OptionParser
-from usrpm import usrp_dbid
-import time
-import os.path
-import sys
-
-# required FPGA that can do 4 rx channels.
-
-
-class my_graph(gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        parser = OptionParser (option_class=eng_option)
-        #parser.add_option("-S", "--subdev", type="subdev", default=(0, None),
-        #                  help="select USRP Rx side A or B (default=A)")
-        parser.add_option("-d", "--decim", type="int", default=128,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=146.585e6,
-                          help="set frequency to FREQ [default=%default])", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=20,
-                          help="set gain in dB [default=%default]")
-        parser.add_option("-F", "--filter", action="store_true", default=True,
-                          help="Enable channel filter")
-        parser.add_option("-o", "--output", type="string", default=None,
-                          help="set output basename")
-        (options, args) = parser.parse_args()
-
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit
-
-        if options.output is None:
-            parser.print_help()
-            sys.stderr.write("You must provide an output filename base with -o OUTPUT\n")
-            raise SystemExit
-        else:
-            basename = options.output
-
-        nchan = 4
-        nsecs = 4.0
-
-        if options.filter:
-            sw_decim = 4
-        else:
-            sw_decim = 1
-
-        self.u = usrp.source_c(0, options.decim, fpga_filename="std_4rx_0tx.rbf")
-        if self.u.nddcs() < nchan:
-            sys.stderr.write('This code requires an FPGA build with %d DDCs.  This FPGA has only %d.\n' % (
-                nchan, self.u.nddcs()))
-            raise SystemExit
-                             
-        if not self.u.set_nchannels(nchan):
-            sys.stderr.write('set_nchannels(%d) failed\n' % (nchan,))
-            raise SystemExit
-        
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-        print "USB data rate   = %s" % (eng_notation.num_to_str(input_rate),)
-        sink_data_rate = input_rate/sw_decim
-        print "Scope data rate = %s" % (eng_notation.num_to_str(sink_data_rate),)
-
-        self.subdev = self.u.db(0) + self.u.db(1)
-
-        if (len(self.subdev) < 4 or
-            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX or
-            self.u.db(1, 0).dbid() != usrp_dbid.BASIC_RX):
-            sys.stderr.write('This code requires a Basic Rx board on Sides A & B\n')
-            sys.exit(1)
-
-        self.u.set_mux(gru.hexint(0xf3f2f1f0))
-
-        # collect 1 second worth of data
-        limit = int(nsecs * input_rate * nchan)
-        print "limit = ", limit
-        head = gr.head(gr.sizeof_gr_complex, limit)
-
-        # deinterleave four channels from FPGA
-        di = gr.deinterleave(gr.sizeof_gr_complex)
-
-        self.connect(self.u, head, di)
-        
-        # taps for channel filter
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
-                                            input_rate,  # sampling rate
-                                            80e3,        # passband cutoff
-                                            115e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-
-        for i in range(nchan):
-
-            sink = gr.file_sink(gr.sizeof_gr_complex,
-                                basename + ("-%s-%d.dat" % (eng_notation.num_to_str(sink_data_rate), i)))
-            if options.filter:
-                chan_filt = gr.fir_filter_ccf(sw_decim, chan_filt_coeffs)
-                self.connect((di, i), chan_filt, sink)
-            else:
-                self.connect((di, i), sink)
-
-
-        self.set_gain(options.gain)
-        self.set_freq(options.freq)
-
-    def set_gain(self, gain):
-        for i in range(len(self.subdev)):
-            self.subdev[i].set_gain(gain)
-
-    def set_freq(self, target_freq):
-        ok = True
-        for i in range(len(self.subdev)):
-            r = usrp.tune(self.u, i, self.subdev[i], target_freq)
-            if not r:
-                ok = False
-                print "set_freq: failed to set subdev[%d] freq to %f" % (
-                    i, target_freq)
-
-        return ok
-
-
-def main ():
-    my_graph().run()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gnuradio-examples/python/multi-antenna/multi_scope.py b/gnuradio-examples/python/multi-antenna/multi_scope.py
deleted file mode 100755
index d1e28ad18..000000000
--- a/gnuradio-examples/python/multi-antenna/multi_scope.py
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env python
-
-from gnuradio import gr, gru, eng_notation
-from gnuradio import usrp
-from gnuradio.eng_option import eng_option
-from gnuradio import eng_notation
-from gnuradio import optfir
-from optparse import OptionParser
-from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider
-import wx
-from usrpm import usrp_dbid
-import time
-import os.path
-import sys
-
-# required FPGA that can do 4 rx channels.
-
-
-class my_top_block(stdgui2.std_top_block):
-
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        self.frame = frame
-        self.panel = panel
-
-        parser = OptionParser (option_class=eng_option)
-        #parser.add_option("-S", "--subdev", type="subdev", default=(0, None),
-        #                  help="select USRP Rx side A or B (default=A)")
-        parser.add_option("-d", "--decim", type="int", default=128,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=146.585e6,
-                          help="set frequency to FREQ [default=%default])", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=20,
-                          help="set gain in dB [default=%default]")
-        parser.add_option("-F", "--filter", action="store_true", default=True,
-                          help="Enable channel filter")
-        (options, args) = parser.parse_args()
-
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit
-
-        nchan = 4
-
-        if options.filter:
-            sw_decim = 4
-        else:
-            sw_decim = 1
-
-        self.u = usrp.source_c(0, options.decim, fpga_filename="std_4rx_0tx.rbf")
-        if self.u.nddcs() < nchan:
-            sys.stderr.write('This code requires an FPGA build with %d DDCs.  This FPGA has only %d.\n' % (
-                nchan, self.u.nddcs()))
-            raise SystemExit
-                             
-        if not self.u.set_nchannels(nchan):
-            sys.stderr.write('set_nchannels(%d) failed\n' % (nchan,))
-            raise SystemExit
-        
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-        print "USB data rate   = %s" % (eng_notation.num_to_str(input_rate),)
-        print "Scope data rate = %s" % (eng_notation.num_to_str(input_rate/sw_decim),)
-
-        self.subdev = self.u.db(0) + self.u.db(1)
-
-        if (len(self.subdev) < 4 or
-            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX or
-            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX):
-            sys.stderr.write('This code requires a Basic Rx board on Sides A & B\n')
-            sys.exit(1)
-
-        self.u.set_mux(gru.hexint(0xf3f2f1f0))
-
-        # deinterleave four channels from FPGA
-        di = gr.deinterleave(gr.sizeof_gr_complex)
-
-        self.connect(self.u, di)
-        
-        # our destination (8 float inputs)
-        self.scope = scopesink2.scope_sink_f(panel, sample_rate=input_rate/sw_decim,
-                                             num_inputs=2*nchan)
-
-        # taps for channel filter
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
-                                            input_rate,  # sampling rate
-                                            80e3,        # passband cutoff
-                                            115e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-
-        # bust the deinterleaved complex channels into floats
-        for i in range(nchan):
-
-            if options.filter:
-                chan_filt = gr.fir_filter_ccf(sw_decim, chan_filt_coeffs)
-                c2f = gr.complex_to_float()
-                self.connect((di, i), chan_filt, c2f)
-            else:
-                c2f = gr.complex_to_float()
-                self.connect((di, i), c2f)
-
-            self.connect((c2f, 0), (self.scope, 2*i + 0))
-            self.connect((c2f, 1), (self.scope, 2*i + 1))
-
-
-        self._build_gui(vbox)
-
-        self.set_gain(options.gain)
-        self.set_freq(options.freq)
-
-    def set_gain(self, gain):
-        for i in range(len(self.subdev)):
-            self.subdev[i].set_gain(gain)
-
-    def set_freq(self, target_freq):
-        ok = True
-        for i in range(len(self.subdev)):
-            r = usrp.tune(self.u, i, self.subdev[i], target_freq)
-            if not r:
-                ok = False
-                print "set_freq: failed to set subdev[%d] freq to %f" % (
-                    i, target_freq)
-
-        return ok
-
-
-    def _build_gui(self, vbox):
-        vbox.Add(self.scope.win, 10, wx.EXPAND)
-        
-
-
-def main ():
-    app = stdgui2.stdapp(my_top_block, "Multi Scope", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gnuradio-examples/python/multi_usrp/.gitignore b/gnuradio-examples/python/multi_usrp/.gitignore
deleted file mode 100644
index c400497f5..000000000
--- a/gnuradio-examples/python/multi_usrp/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gnuradio-examples/python/multi_usrp/README b/gnuradio-examples/python/multi_usrp/README
deleted file mode 100644
index 057239104..000000000
--- a/gnuradio-examples/python/multi_usrp/README
+++ /dev/null
@@ -1,266 +0,0 @@
-#
-# N.B., these files have not been converted to top_block/hier_block2 because
-# those of doing the conversion don't have the setup to test this.
-# As a result, these programs will no longer run until updated.
-#
-
-Quick start multi-usrp:
-
-Unpack, build and install usrp, gnuradio-core and gr-usrp
-Versions need to be more recent then 2.7cvs/svn 11 may 2006
-
-Make sure usrp/fpga/rbf/rev2/multi*.rbf is installed in /usr/local/share/usrp/rev2/
-Make sure usrp/fpga/rbf/rev4/multi*.rbf is installed in /usr/local/share/usrp/rev4/
-(If in doubt, copy manually)
- 
-build and install gr-wxgui gr-audio-xxx  and so on.
-
-unpack gnuradio-examples.
-
-There is a gnuradio-examples/python/multi_usrp directory which contains examples
-
-
-Put at least a basic RX or dbsrx board in RXA of the master and RXA of the slave board.
-Make sure that the usrps have a serial or unique identifier programmed in their eeprom.
-(All new rev 4.1 boards have this)
-You can do without a serial but then you never know which usrp is the master and which is the slave.
-
-
-CONNECTING THE CABLES
-Now connect the 64MHz clocks between the boards with a short sma coax cable.
-(See the wiki on how to enable clock-out and clock-in 
-http://gnuradio.org/trac/wiki/USRPClockingNotes )
-
-You need one board with a clock out and one board with a clock in.
-
-You can choose any of the two boards as master or slave, this is not dependant on which board has the clock-out or in.
-In my experiments I had fewer problems when the board that has the clock-in will be the master board.
-
-You can use a standard 16-pole flatcable to connect tvrx, basic-rx or dbsrx boards.
-Of this 16pin flatcable only two pins are used (io15 and ground)
-For all new daughterboards which use up a lot of io pins you have to use a cable with fewer connections.
-The savest is using a 2pin headercable connected to io15,gnd (a cable like the ones used to connect frontpanel leds to the mainboard of a PC)
-
-If using basic rx board:
-  Connect a 16-pole flatcable from J25 on basicrx/dbs_rx in rxa of the master usrp to J25 on basicrx/dbsrx in RXA of the slave usrp
-  Don't twist the cable (Make sure the pin1 marker (red line on the flatcable) is on the same side of the connector (at io-8 on the master and at io8 on the slave.))
-  For basic_rx this means the marker should be on the side of the dboard with the sma connectors. 
-  For dbs_rx this means the marker should be on the side of the dboard with the two little chips.
-  In other words, don't twist the cable, you will burn your board if you do.
-
-You can also connect a flatcable with multiple connectors from master-J25 to slave1-J25 to slave2-J25 to ...
-You will however have to think of something to create a common 64Mhz clock for more then two usrps.
-
-For all other daughterboards, connect a 2wire cable from masterRXA J25 io15,gnd to slaveRXA J25 io15,gnd 
-
-
-So now the hardware is setup, software is setup. Lets do some tests.
-
-Connect power to both usrps.
-unpack the gnuradio_examples somewhere (cvs version later then 11 may 2006) 
-go to the gnuradio-examples/python/multi_usrp folder.
-
-Now run 
- ./multi_usrp_oscope.py -x 12345678
-
-It should tell you that usrp 12345678 is not found and tell you which serials are available.
-
-Now run  ./multi_usrp_oscope.py -x actualserialnum 
-You should now get an oscope with two channels, one is from the master and one is from the slave
-It will which show the I-signal from channel 0 of the master usrp and I-signal from channel 0 of the slave usrp.
-(For testing connect the same signal source to the inputs of both boards)
-The signals should be aligned.
-If you click the sync button, it will resync the master and slave (should never be needed)
-
-Now run
-./multi_usrp_oscope.py --help
-To see all available options.
-
-
-Now you are ready to do phase-locked aligned signal processing.
-
-You can also capture to file with:
-./multi_usrp_rx_cfile.py 
-
-run ./multi_usrp_rx_cfile.py --help to see all available options.
-
-
-
-Here follows a description of the detail blocks used in usrp_multi.py
-
-Multi usrp
-
-With this code you can connect two or more usrps (with a locked clock) and get synchronised samples.
-You must connect a (flat)cable between a dboard on the master in RXA and a dboard on the slave in RXA.
-You then put one usrp in master mode, put the other in slave mode.
-
-The easiest thing to see how this works is just looking at the code in
- multi_usrp_oscope.py
- multi_usrp_rx_cfile.py 
-
-Use the usrp_multi block which is installed by gr-usrp.
-instantiate in the following way:
-
-        self.multi=usrp_multi.multi_source_align( fg=self, master_serialno=options.master_serialno, decim=options.decim, nchan=options.nchan )
-
-nchan should be 2 or 4.
-
-You determine which is the master by master_serialno (this is a text string a hexadecimal number).
-If you enter a serial number which is not found it will print the serial numbers which are available.
-If you give no serial number  (master_serialno=None), the code will pick a Master for you.
-
-You can get a reference to the master and the slave usrp in the following way:
-
-        self.um=self.multi.get_master_usrp()
-        self.us=self.multi.get_slave_usrp()
-
-You only need these references for setting freqs/gains or getting info about daughterboards.
-Don't use the output directly but use the aligned output from multi.get_master_source_c() and multi.get_slave_source_c()
-
-You get references to the aligned output samples in the following way:
-aligned_master_source_c=self.multi.get_master_source_c()
-aligned_slave_source_c=self.multi.get_slave_source_c()
-
-These blocks have multiple outputs.
-output 0 is the sample counter (high bits in I, low bits in Q)
-You normally don't need the samplecounters so you can ignore output 0
-
-output 1 is the first aligend output channel (if you enable 2 or 4 channels)
-output 2 is the second output channel (only if you enable 4 channels)
-
-so the usefull 4 channels are:
-self.aligned_master_chan1=(self.multi.get_master_source_c(),1)
-self.aligned_master_chan2=(self.multi.get_master_source_c(),2)
-self.aligned_slave_chan1=(self.multi.get_slave_source_c(),1)
-self.aligned_slave_chan2=(self.multi.get_slave_source_c(),2)
-
-The two samplecounters are:
-self.aligned_master_samplecounter=(self.multi.get_master_source_c(),0)
-self.aligned_slave_samplecounter=(self.multi.get_slave_source_c(),0)
-
-You can set the gain or tune the frequency for all 4 receive daughetrboards at once:
-        self.multi.set_gain_all_rx(options.gain)
-        result,r1,r2,r3,r4 = self.multi.tune_all_rx(options.freq)
-
-This will only work reliably when you have all the same daughterboards.
-Otherwise set all freqs and gains individually.
-
-You must call self.multi.sync() at least once AFTER the flowgraph has started running.
-(This will synchronise the streams of the two usrps)
-
-This work was funded by Toby Oliver at Sensus Analytics / Path Intelligence.
-Many Thanks for making this possible.
-
-It was written by Martin Dudok van Heel at Olifantasia.
-
-
-
-Here follows a brief of the new blocks and (changes)functionality written for multi-usrp support.
-
-You can also look at the generated documentation in  
-/usr/local/share/doc/gnuradio-core-X.X
-/usr/local/share/doc/usrp-X.X
-(Make sure to build and install the documentation, go to the doc directory of the sourcetree and issue make doc; make install)
- 
-
-gnuradio-examples:
-new/changed files:
-multi_usrp/multi_usrp_oscope.py
-multi_usrp/multi_usrp_rx_cfile.py
-
-
-gnuradio-core:
-gr.align_on_samplenumbers_ss (int nchan,int align_interval) 
-
-align several complex short (interleaved short) input channels with corresponding unsigned 32 bit sample_counters (provided as interleaved 16 bit values)
-
-Parameters:
-    	nchan 	number of complex_short input channels (including the 32 bit counting channel)
-    	align_interval 	interval at which the samples are aligned, ignored for now.
-
-Pay attention on how you connect this block It expects a minimum of 2 usrp_source_s with nchan number of channels and as mode  usrp_prims.bmFR_MODE_RX_COUNTING_32BIT enabled. This means that the first complex_short channel is an interleaved 32 bit counter. The samples are aligned by dropping samples untill the samplenumbers match.
-
-files:
-gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
-gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h
-gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.i
-
-
-gr-usrp
-   added _write_fpga_reg_masked
-   added usrp_multi.py
-  new usrp_multi block which can instantiate two linked usrps as master and slave and alignes their output.
-  It has a sync() function which should be called AFTER the flowgraph has started running.
-  bool sync();
-     \brief Call this on a master usrp to sync master and slave by outputing a sync pulse on rx_a_io[15].
-        The 32 bit samplecounter of master and slave will be reset to zero and all phase and buffer related things in the usrps are reset.
-        Call this only after the flowgraph has been started, otherwise there will be no effect since everything is kept in reset state as long as the flowgraph is not running.
-     \returns true if successfull.
-
-files:
-configure.ac
-src/Makefile.am
-src/usrp1.i
-src/usrp1_source_base.cc
-src/usrp1_source_base.h
-src/usrp_multi.py
-
-usrp-0.11cvsmulti:
-usrp:
-   new constant bmFR_MODE_RX_COUNTING_32BIT    (could also be added as extra mode like FPGA_MODE_COUNTING_32BIT)
-   Use this for the mode parameter when creating a usrp when you want to use the master/slave setup or if you want to use the 32 bit counter for other things, like testing with gr.check_counting_s(True)
-
-  added register FR_RX_MASTER_SLAVE
-  added bitno and bitmaskes:
-   bmFR_MODE_RX_COUNTING_32BIT
-
-   bitnoFR_RX_SYNC 
-   bitnoFR_RX_SYNC_MASTER
-   bitnoFR_RX_SYNC_SLAVE
-
-   bitnoFR_RX_SYNC_INPUT_IOPIN 15
-   bmFR_RX_SYNC_INPUT_IOPIN  (1<<bitnoFR_RX_SYNC_INPUT_IOPIN)
-   bitnoFR_RX_SYNC_OUTPUT_IOPIN 15
-   bmFR_RX_SYNC_OUTPUT_IOPIN (1<<bitnoFR_RX_SYNC_OUTPUT_IOPIN)
- 
-   added _write_fpga_reg_masked()
-   added new toplevel folder usrp_multi
-   added usrp_multi.v and master_control_multi.v
-   added new MULTI_ON and COUNTER_32BIT_ON defines
-      If these are turned off usrp_multi.v will behave exactly as usrp_std.v
-
-   added setting_reg_masked.v
-   changed reset behaviour of phase_acc.v and rx_buffer.v
-
-   changed generate_regs.py to handle bm and bitno defines
-
-
-files:
-firmware/include/fpga_regs_standard.v
-firmware/include/fpga_regs_common.h
-firmware/include/generate_regs.py
-firmware/include/fpga_regs_standard.h
-host/lib/usrp_basic.h
-host/lib/usrp_basic.cc
-host/lib/usrp_standard.h
-fpga/rbf/Makefile.am
-fpga/toplevel/usrp_std/usrp_std.v
-fpga/toplevel/usrp_multi/usrp_multi.esf
-fpga/toplevel/usrp_multi/usrp_multi.vh
-fpga/toplevel/usrp_multi/usrp_std.vh
-fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_0tx.vh
-fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_2tx.vh
-fpga/toplevel/usrp_multi/usrp_multi.v
-fpga/toplevel/usrp_multi/usrp_multi.qpf
-fpga/toplevel/usrp_multi/usrp_multi.psf
-fpga/toplevel/usrp_multi/usrp_multi_config_2rx_0tx.vh
-fpga/toplevel/usrp_multi/usrp_multi.qsf
-fpga/toplevel/usrp_multi/usrp_multi_config_4rx_0tx.vh
-fpga/toplevel/usrp_multi/usrp_multi.csf
-fpga/toplevel/usrp_multi/.cvsignore
-fpga/sdr_lib/rx_buffer.v
-fpga/sdr_lib/master_control_multi.v
-fpga/sdr_lib/phase_acc.v
-fpga/sdr_lib/setting_reg_masked.v
-
-
diff --git a/gnuradio-examples/python/multi_usrp/multi_usrp_oscope.py b/gnuradio-examples/python/multi_usrp/multi_usrp_oscope.py
deleted file mode 100755
index 512b125a4..000000000
--- a/gnuradio-examples/python/multi_usrp/multi_usrp_oscope.py
+++ /dev/null
@@ -1,343 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,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.
-# 
-
-# print "Loading revised usrp_oscope with additional options for scopesink..."
-
-from gnuradio import gr, gru
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider
-from optparse import OptionParser
-import wx
-import sys
-
-import time
-from gnuradio import usrp_multi
-
-
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    If there's a daughterboard on A, select A.
-    If there's a daughterboard on B, select B.
-    Otherwise, select A.
-    """
-    if u.db(0, 0).dbid() >= 0:       # dbid is < 0 if there's no d'board or a problem
-        return (0, 0)
-    if u.db(0, 0).dbid() >= 0:
-        return (1, 0)
-    return (0, 0)
-
-
-class app_flow_graph(stdgui.gui_flow_graph):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui.gui_flow_graph.__init__(self)
-
-        self.frame = frame
-        self.panel = panel
-        
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=first one with a daughterboard)")
-        parser.add_option("-d", "--decim", type="int", default=128,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        #align interval is default not yet enabled in gr.align_on_samplenumbers_ss
-        #parser.add_option("-a", "--align_interval", type="int", default=-1,
-        #                  help="Align master and slave every so much samples.")
-
-        # width 8 does not work yet with multi_usrp because it interferes with the 32 bit samplecounter
-        #parser.add_option("-8", "--width-8", action="store_true", default=False,
-        #                  help="Enable 8-bit samples across USB")
-        parser.add_option("-m", "--mux", type="intx", default=None,
-                          help="set fpga FR_RX_MUX register to MUX")
-        parser.add_option("-n", "--frame-decim", type="int", default=1,
-                          help="set oscope frame decimation factor to n [default=1]")
-        parser.add_option("-N", "--nchan", type="int", default=2,
-                          help="set nchannels to NCHAN")
-        parser.add_option("-q", "--show-q", action="store_true", default=False,
-                          help="show the q value of the complex samples")
-        parser.add_option("-s", "--show-counters", action="store_true", default=False,
-                          help="show the counters")
-        parser.add_option("-v", "--v-scale", type="eng_float", default=1000,
-                          help="set oscope initial V/div to SCALE [default=%default]")
-        parser.add_option("-t", "--t-scale", type="eng_float", default=49e-6,
-                          help="set oscope initial s/div to SCALE [default=50us]")
-        parser.add_option("-x", "--master-serialno", type="string", default=None, 
-                          help="Serial_no of the usrp which should be the MASTER (default= select any)")
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-
-        self.show_debug_info = True
-        
-        # build the graph
-
-        #self.u = usrp.source_c(which=options.which_usrp,decim_rate=options.decim)
-        if (options.mux is None) | (4==options.nchan):
-           init_mux=None #use default mux which is 0x10321032
-        else:
-           init_mux=options.mux
-
-        init_gain=0.0
-        init_freq=0.0
-        init_align_interval=-1
-
-        self.multi=usrp_multi.multi_source_align( self,   options.master_serialno, options.decim,
-                                                 options.nchan, init_gain, init_freq, init_mux, init_align_interval)
-        self.um=self.multi.get_master_usrp()
-        self.us=self.multi.get_slave_usrp()
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.um)
-        if (options.mux==None) and (options.nchan!=4):
-          mux=usrp.determine_rx_mux_value(self.um, options.rx_subdev_spec)
-          mux= (mux<<8 & 0xffffffff) | (mux & 0xff)
-          self.um.set_mux(mux)
-          self.us.set_mux(mux)
-
-        # width 8 does not work yet with multi_usrp because it interferes with the 32 bit samplecounter
-        #if options.width_8:
-        #    width = 8
-        #    shift = 8
-        #    format = self.um.make_format(width, shift)
-        #    r = self.um.set_format(format)
-        #    r = self.us.set_format(format)
-            
-        # determine the daughterboard subdevice of the first channel we're using
-        self.subdevm = usrp.selected_subdev(self.um, options.rx_subdev_spec)
-        self.subdevs = usrp.selected_subdev(self.us, options.rx_subdev_spec)
-
-        input_rate = self.um.adc_freq() / self.um.decim_rate()
-
-        self.scope = scopesink.scope_sink_f(self, panel, sample_rate=input_rate,
-                                            frame_decim=options.frame_decim,
-                                            v_scale=options.v_scale,
-                                            t_scale=options.t_scale)
-        self.sink_count=0
-        self.add_to_scope((self.multi.get_master_source_c(),1),options.show_q)
-        self.add_to_scope((self.multi.get_slave_source_c(),1),options.show_q)
-        if 4==options.nchan:
-          self.add_to_scope((self.multi.get_master_source_c(),2),options.show_q)
-          self.add_to_scope((self.multi.get_slave_source_c(),2),options.show_q)
-
-        if options.show_counters:
-          self.add_to_scope((self.multi.get_master_source_c(),0),options.show_q)
-          self.add_to_scope((self.multi.get_slave_source_c(),0),options.show_q)
-
-        self._build_gui(vbox)
-
-        # set initial values
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.subdevm.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-        if options.freq is None:
-            # if no freq was specified, use the mid-point
-            r = self.subdevm.freq_range()
-            options.freq = float(r[0]+r[1])/2
-
-        self.set_gain(options.gain)
-
-        if self.show_debug_info:
-            self.myform['decim'].set_value(self.um.decim_rate())
-            self.myform['fs@usb'].set_value(self.um.adc_freq() / self.um.decim_rate())
-            self.myform['dbname'].set_value(self.subdevm.name())
-            self.myform['baseband'].set_value(0)
-            self.myform['ddc'].set_value(0)
-                        
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-
-        self.multi.print_db_info()
-        self.unsynced=True
-        frame.Bind(wx.EVT_IDLE, self.onIdle)
-
-    def add_to_scope(self,source_c,show_q):
-        c2f= gr.complex_to_float ()
-        self.connect(source_c, c2f)
-        self.connect((c2f,0), (self.scope,self.sink_count))
-        self.sink_count=self.sink_count+1
-        if show_q:
-          self.connect((c2f,1), (self.scope,self.sink_count))
-          self.sink_count=self.sink_count+1
-        
-        
-    def _set_status_msg(self, msg):
-        self.frame.GetStatusBar().SetStatusText(msg, 0)
-
-    def _build_gui(self, vbox):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-            
-        vbox.Add(self.scope.win, 10, wx.EXPAND)
-        
-        # add control area at the bottom
-        self.myform = myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0, 0)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=hbox, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-        hbox.Add((5,0), 0, 0)
-        g = self.subdevm.gain_range()
-        myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                           weight=3,
-                                           min=int(g[0]), max=int(g[1]),
-                                           callback=self.set_gain)
-
-        hbox.Add((5,0), 0, 0)
-        buttonSync = form.button_with_callback(parent=self.panel, label='sync',callback=self.sync_usrps)
-        hbox.Add(buttonSync,0,wx.EXPAND)
-
-        hbox.Add((5,0), 0, 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        self._build_subpanel(vbox)
-
-    def _build_subpanel(self, vbox_arg):
-        # build a secondary information panel (sometimes hidden)
-
-        # FIXME figure out how to have this be a subpanel that is always
-        # created, but has its visibility controlled by foo.Show(True/False)
-        
-        if not(self.show_debug_info):
-            return
-
-        panel = self.panel
-        vbox = vbox_arg
-        myform = self.myform
-
-        #panel = wx.Panel(self.panel, -1)
-        #vbox = wx.BoxSizer(wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-        myform['decim'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Decim")
-
-        hbox.Add((5,0), 1)
-        myform['fs@usb'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Fs@USB")
-
-        hbox.Add((5,0), 1)
-        myform['dbname'] = form.static_text_field(
-            parent=panel, sizer=hbox)
-
-        hbox.Add((5,0), 1)
-        myform['baseband'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Analog BB")
-
-        hbox.Add((5,0), 1)
-        myform['ddc'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC")
-
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-
-    def set_freq(self, target_freq, sync=True):
-        """
-        Set the center frequency we're interested in for all channels,
-        on all rx daughterboards on MASTER and SLAVE.
-
-        @param target_freq: frequency in Hz
-        @param sync: sync the usrps after setting the freqs (this will clear any phase differences in the DDCS)
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        result,r1,r2,r3,r4 = self.multi.tune_all_rx(target_freq)
-        if sync:
-          self.sync_usrps() #sync master and slave and clear any DDC phase differences
-        if r1:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-            if self.show_debug_info:
-                self.myform['baseband'].set_value(r1.baseband_freq)
-                self.myform['ddc'].set_value(r1.dxc_freq)
-        return result
-
-    def set_freq_chan0(self, target_freq, sync=True):
-        """
-        Set the center frequency we're interested in for rx chan 0 only on MASTER and SLAVE.
-
-        @param target_freq: frequency in Hz
-        @param sync: sync the usrps after setting the freqs (this will clear any phase differences in the DDCS)
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        rm = usrp.tune(self.um, 0, self.subdevm, target_freq)
-        rs = usrp.tune(self.us, 0, self.subdevs, target_freq)
-        r=rm
-        if sync:
-          self.sync_usrps()  #sync master and slave and clear any DDC phase differences
-        if r:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-            if self.show_debug_info:
-                self.myform['baseband'].set_value(r.baseband_freq)
-                self.myform['ddc'].set_value(r.dxc_freq)
-            return True
-
-        return False
-
-    def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-        self.multi.set_gain_all_rx(gain)
-
-    def set_gain_chan0(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdevm.set_gain(gain)
-        self.subdevs.set_gain(gain)
-
-    def onIdle(self,evt):
-        if self.unsynced:
-          time.sleep(0.5)
-          self.unsynced=True
-          self.multi.sync()
-          self.unsynced=False
-          #print 'synced'
-
-    def sync_usrps(self):
-        self.multi.sync()
-
-def main ():
-    app = stdgui.stdapp(app_flow_graph, "MULTI_USRP O'scope", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gnuradio-examples/python/multi_usrp/multi_usrp_rx_cfile.py b/gnuradio-examples/python/multi_usrp/multi_usrp_rx_cfile.py
deleted file mode 100755
index ca0ec97c2..000000000
--- a/gnuradio-examples/python/multi_usrp/multi_usrp_rx_cfile.py
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Read samples 2 from two linked synchronised USRP's and write to file formatted as binary
-single-precision complex values.
-Make sure you read README on how to link the two usrps
-
-"""
-
-from gnuradio import gr, eng_notation
-from gnuradio import audio
-from gnuradio import usrp
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys
-
-import time
-from gnuradio import usrp_multi
-
-class my_top_block(gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        usage="%prog: [options] output_filename"
-        parser = OptionParser(option_class=eng_option, usage=usage)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=(0, 0),
-                          help="select USRP Rx side A or B (default=A)")
-        parser.add_option("-d", "--decim", type="int", default=128,
-                          help="set selfpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=0.0,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-n", "--nchan", type="intx", default=2,
-                          help="set nchannels to NCHAN")
-        parser.add_option("-N", "--nsamples", type="eng_float", default=None,
-                          help="number of samples to collect [default=+inf]")
-        parser.add_option ("-o", "--output-file-m", default="usrp_rx_m.dat",
-                       help="write master data to FILE", metavar="FILE")
-        parser.add_option ("--output-file-m2", default="usrp_rx_m2.dat",
-                       help="write master data from second channel to FILE", metavar="FILE")
-        parser.add_option ("-p", "--output-file-s", default="usrp_rx_s.dat",
-                       help="write slave data to FILE", metavar="FILE")
-        parser.add_option ("--output-file-s2", default="usrp_rx_s2.dat",
-                       help="write slave data from second channel to FILE", metavar="FILE")
-        parser.add_option("-x", "--master-serialno", type="string", default=None, 
-                          help="Serial_no of the usrp which should be the MASTER (default= select any)")
-        (options, args) = parser.parse_args ()
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit, 1
-
-        if options.freq is None:
-            parser.print_help()
-            sys.stderr.write('You must specify the frequency with -f FREQ\n');
-            raise SystemExit, 1
-
-        # build the graph
-        self.multi=usrp_multi.multi_source_align( fg=self, master_serialno=options.master_serialno, decim=options.decim, 
-                                                  nchan=options.nchan )
-        self.um=self.multi.get_master_usrp()
-        self.us=self.multi.get_slave_usrp()
-
-        dst_m=gr.file_sink (gr.sizeof_gr_complex, options.output_file_m)
-        dst_s=gr.file_sink (gr.sizeof_gr_complex, options.output_file_s)
-        if options.nsamples is None:
-            self.connect((self.multi.get_master_source_c(),1),dst_m)
-            self.connect((self.multi.get_slave_source_c(),1),dst_s)
-        else:
-            head_m = gr.head(gr.sizeof_gr_complex, int(options.nsamples))
-            head_s = gr.head(gr.sizeof_gr_complex, int(options.nsamples))
-            self.connect((self.multi.get_master_source_c(),1),head_m,dst_m)
-            self.connect((self.multi.get_slave_source_c(),1),head_s,dst_s)
-
-        if(4==options.nchan):
-            dst_m2=gr.file_sink (gr.sizeof_gr_complex, options.output_file_m2)
-            dst_s2=gr.file_sink (gr.sizeof_gr_complex, options.output_file_s2)
-            if options.nsamples is None:
-                self.connect((self.multi.get_master_source_c(),2),dst_m2)
-                self.connect((self.multi.get_slave_source_c(),2),dst_s2) 
-            else:
-                head_m2 = gr.head(gr.sizeof_gr_complex, int(options.nsamples))
-                head_s2 = gr.head(gr.sizeof_gr_complex, int(options.nsamples))
-                self.connect((self.multi.get_master_source_c(),2),head_m2,dst_m2)
-                self.connect((self.multi.get_slave_source_c(),2),head_s2,dst_s2) 
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = usrp.pick_rx_subdevice(self.um)
-
-        if (options.nchan!=4):
-          mux=usrp.determine_rx_mux_value(self.um, options.rx_subdev_spec)
-          mux= (mux<<8 & 0xffffffff) | (mux & 0xff)
-          self.um.set_mux(mux)
-          self.us.set_mux(mux)
-
-        # determine the daughterboard subdevice we're using
-        self.subdevm = usrp.selected_subdev(self.um, options.rx_subdev_spec)
-        self.subdevs = usrp.selected_subdev(self.us, options.rx_subdev_spec)
-        print "Using MASTER RX d'board %s" % (self.subdevm.side_and_name(),)
-        print "Using SLAVE RX d'board %s" % (self.subdevs.side_and_name(),)
-        input_rate = self.um.adc_freq() / self.um.decim_rate()
-        print "USB sample rate %s" % (eng_notation.num_to_str(input_rate))
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.subdevm.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-        self.multi.set_gain_all_rx(options.gain)
-        result,r1,r2,r3,r4 = self.multi.tune_all_rx(options.freq)
-        if not result:
-            sys.stderr.write('Failed to set frequency\n')
-            raise SystemExit, 1
-
-    def sync_usrps(self):
-        self.multi.sync()   
-       
-        
-if __name__ == '__main__':
-    tb=my_top_block()
-    tb.start()
-    #time.sleep(0.5)
-    tb.sync_usrps() 
-    raw_input ('Press Enter to quit: ')
-    tb.stop()
-    #try:
-    #    fg.start()
-    #    fg.sync_usrps()
-    #except KeyboardInterrupt:
-    #    pass
diff --git a/gnuradio-examples/python/network/CMakeLists.txt b/gnuradio-examples/python/network/CMakeLists.txt
new file mode 100644
index 000000000..e70403ba0
--- /dev/null
+++ b/gnuradio-examples/python/network/CMakeLists.txt
@@ -0,0 +1,30 @@
+# 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.
+
+GR_PYTHON_INSTALL(PROGRAMS
+  audio_sink.py
+  audio_source.py
+  dial_tone_sink.py
+  dial_tone_source.py
+  vector_sink.py
+  vector_source.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/network
+  COMPONENT "gnuradio_examples"
+)
+
diff --git a/gnuradio-examples/python/ofdm/Makefile.am b/gnuradio-examples/python/ofdm/Makefile.am
deleted file mode 100644
index fc7156b4c..000000000
--- a/gnuradio-examples/python/ofdm/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright 2007,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-ourdatadir = $(exampledir)/ofdm
-
-dist_ourdata_DATA =		\
-	ofdm_sync.m		\
-	ofdm_sync_pn.m		\
-	fusb_options.py		\
-	plot_ofdm.m		\
-	pick_bitrate.py		\
-	receive_path.py		\
-	transmit_path.py
-
-dist_ourdata_SCRIPTS =		\
-	benchmark_ofdm.py	\
-	benchmark_ofdm_rx.py	\
-	benchmark_ofdm_tx.py	\
-	fftshift.py		\
-	ofdm_mod_demod_test.py	\
-	tunnel.py
-
diff --git a/gnuradio-examples/python/ofdm/benchmark_ofdm.py b/gnuradio-examples/python/ofdm/benchmark_ofdm.py
deleted file mode 100755
index 6d6ca9f2a..000000000
--- a/gnuradio-examples/python/ofdm/benchmark_ofdm.py
+++ /dev/null
@@ -1,187 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006, 2007, 2009 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.
-# 
-
-from gnuradio import gr, blks2
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-import random, time, struct, sys, math, os
-
-# from current dir
-from transmit_path import transmit_path
-from receive_path import receive_path
-
-
-class my_top_block(gr.top_block):
-    def __init__(self, callback, options):
-        gr.top_block.__init__(self)
-
-        if not options.channel_off:
-            SNR = 10.0**(options.snr/10.0)
-            power_in_signal = abs(options.tx_amplitude)**2.0
-            noise_power_in_channel = power_in_signal/SNR
-            noise_voltage = math.sqrt(noise_power_in_channel/2.0)
-            print "Noise voltage: ", noise_voltage
-
-            frequency_offset = options.frequency_offset / options.fft_length
-            print "Frequency offset: ", frequency_offset
-
-            if options.multipath_on:
-                taps = [1.0, .2, 0.0, .1, .08, -.4, .12, -.2, 0, 0, 0, .3]
-            else:
-                taps = [1.0, 0.0]
-
-        else:
-            noise_voltage = 0.0
-            frequency_offset = 0.0
-            taps = [1.0, 0.0]
-
-        symbols_per_packet = math.ceil(((4+options.size+4) * 8) / options.occupied_tones)
-        samples_per_packet = (symbols_per_packet+2) * (options.fft_length+options.cp_length)
-        print "Symbols per Packet: ", symbols_per_packet
-        print "Samples per Packet: ", samples_per_packet
-        if options.discontinuous:
-            stream_size = [100000, int(options.discontinuous*samples_per_packet)]
-        else:
-            stream_size = [0, 100000]
-
-        z = [0,]
-        self.zeros = gr.vector_source_c(z, True)
-        self.txpath = transmit_path(options)
-
-        #self.mux = gr.stream_mux(gr.sizeof_gr_complex, stream_size)
-        self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate)
-        self.channel = gr.channel_model(noise_voltage, frequency_offset,
-                                        options.clockrate_ratio, taps)
-        self.rxpath = receive_path(callback, options)
-                
-        #self.connect(self.zeros, (self.mux,0))
-        #self.connect(self.txpath, (self.mux,1))
-        #self.connect(self.mux, self.throttle, self.channel, self.rxpath)
-        #self.connect(self.mux, self.throttle, self.rxpath)
-        self.connect(self.txpath, self.throttle, self.channel, self.rxpath)
-        
-        if options.log:
-            self.connect(self.txpath, gr.file_sink(gr.sizeof_gr_complex, "txpath.dat"))
-            #self.connect(self.mux, gr.file_sink(gr.sizeof_gr_complex, "mux.dat"))
-            #self.connect(self.channel, gr.file_sink(gr.sizeof_gr_complex, "channel.dat"))
-            
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-def main():
-    global n_rcvd, n_right
-        
-    n_rcvd = 0
-    n_right = 0
-        
-    def send_pkt(payload='', eof=False):
-        return tb.txpath.send_pkt(payload, eof)
-        
-    def rx_callback(ok, payload):
-        global n_rcvd, n_right
-        n_rcvd += 1
-        (pktno,) = struct.unpack('!H', payload[0:2])
-        if ok:
-            n_right += 1
-        print "ok: %r \t pktno: %d \t n_rcvd: %d \t n_right: %d" % (ok, pktno, n_rcvd, n_right)
-
-        printlst = list()
-        for x in payload[2:]:
-            t = hex(ord(x)).replace('0x', '')
-            if(len(t) == 1):
-                t = '0' + t
-            printlst.append(t)
-        printable = ''.join(printlst)
-
-        print printable
-        print "\n"
-                
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-    parser.add_option("-s", "--size", type="eng_float", default=400,
-                      help="set packet size [default=%default]")
-    parser.add_option("-M", "--megabytes", type="eng_float", default=1.0,
-                      help="set megabytes to transmit [default=%default]")
-    parser.add_option("-r", "--sample-rate", type="eng_float", default=1e5,
-                      help="limit sample rate to RATE in throttle (%default)") 
-    parser.add_option("", "--snr", type="eng_float", default=30,
-                      help="set the SNR of the channel in dB [default=%default]")
-    parser.add_option("", "--frequency-offset", type="eng_float", default=0,
-                      help="set frequency offset introduced by channel [default=%default]")
-    parser.add_option("", "--clockrate-ratio", type="eng_float", default=1.0,
-                      help="set clock rate ratio (sample rate difference) between two systems [default=%default]")
-    parser.add_option("","--discontinuous", type="int", default=0,
-                      help="enable discontinous transmission, burst of N packets [Default is continuous]")
-    parser.add_option("","--channel-off", action="store_true", default=False,
-                      help="Turns AWGN, freq offset channel off")
-    parser.add_option("","--multipath-on", action="store_true", default=False,
-                      help="enable multipath")
-
-    transmit_path.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
-    blks2.ofdm_mod.add_options(parser, expert_grp)
-    blks2.ofdm_demod.add_options(parser, expert_grp)
-    
-    (options, args) = parser.parse_args ()
-       
-    # build the graph
-    tb = my_top_block(rx_callback, options)
-    
-    r = gr.enable_realtime_scheduling()
-    #    if r != gr.RT_OK:
-    #        print "Warning: failed to enable realtime scheduling"
-    
-    tb.start()                       # start flow graph
-    
-    # generate and send packets
-    nbytes = int(1e6 * options.megabytes)
-    n = 0
-    pktno = 0
-    pkt_size = int(options.size)
-
-    while n < nbytes:
-        #r = ''.join([chr(random.randint(0,255)) for i in range(pkt_size-2)])
-        #pkt_contents = struct.pack('!H', pktno) + r
-
-        pkt_contents = struct.pack('!H', pktno) + (pkt_size - 2) * chr(pktno & 0xff)
-
-        send_pkt(pkt_contents)
-        n += pkt_size
-        #sys.stderr.write('.')
-        #if options.discontinuous and pktno % 5 == 4:
-        #    time.sleep(1)
-        pktno += 1
-        
-    send_pkt(eof=True)
-    tb.wait()                       # wait for it to finish
-
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
-
-
diff --git a/gnuradio-examples/python/ofdm/benchmark_ofdm_rx.py b/gnuradio-examples/python/ofdm/benchmark_ofdm_rx.py
deleted file mode 100755
index cb9649a6c..000000000
--- a/gnuradio-examples/python/ofdm/benchmark_ofdm_rx.py
+++ /dev/null
@@ -1,212 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006, 2007 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.
-# 
-
-from gnuradio import gr, blks2
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-import struct, sys
-
-# from current dir
-from receive_path import receive_path
-import fusb_options
-
-class my_top_block(gr.top_block):
-    def __init__(self, callback, options):
-        gr.top_block.__init__(self)
-
-        self._rx_freq            = options.rx_freq         # receiver's center frequency
-        self._rx_gain            = options.rx_gain         # receiver's gain
-        self._rx_subdev_spec     = options.rx_subdev_spec  # daughterboard to use
-        self._decim              = options.decim           # Decimating rate for the USRP (prelim)
-        self._fusb_block_size    = options.fusb_block_size # usb info for USRP
-        self._fusb_nblocks       = options.fusb_nblocks    # usb info for USRP
-
-        if self._rx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --rx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        # Set up USRP source
-        self._setup_usrp_source()
-        ok = self.set_freq(self._rx_freq)
-        if not ok:
-            print "Failed to set Rx frequency to %s" % (eng_notation.num_to_str(self._rx_freq))
-            raise ValueError, eng_notation.num_to_str(self._rx_freq)
-        g = self.subdev.gain_range()
-        if options.show_rx_gain_range:
-            print "Rx Gain Range: minimum = %g, maximum = %g, step size = %g" \
-                  % (g[0], g[1], g[2])
-        self.set_gain(options.rx_gain)
-        self.set_auto_tr(True)                 # enable Auto Transmit/Receive switching
-
-        # Set up receive path
-        self.rxpath = receive_path(callback, options)
-
-        self.connect(self.u, self.rxpath)
-        
-    def _setup_usrp_source(self):
-        self.u = usrp.source_c (fusb_block_size=self._fusb_block_size,
-                                fusb_nblocks=self._fusb_nblocks)
-        adc_rate = self.u.adc_rate()
-
-        self.u.set_decim_rate(self._decim)
-
-        # determine the daughterboard subdevice we're using
-        if self._rx_subdev_spec is None:
-            self._rx_subdev_spec = usrp.pick_rx_subdevice(self.u)
-        self.subdev = usrp.selected_subdev(self.u, self._rx_subdev_spec)
-
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, self._rx_subdev_spec))
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.
-        """
-        r = self.u.tune(0, self.subdev, target_freq)
-        if r:
-            return True
-
-        return False
-
-    def set_gain(self, gain):
-        """
-        Sets the analog gain in the USRP
-        """
-        if gain is None:
-            r = self.subdev.gain_range()
-            gain = (r[0] + r[1])/2               # set gain to midpoint
-        self.gain = gain
-        return self.subdev.set_gain(gain)
-
-    def set_auto_tr(self, enable):
-        return self.subdev.set_auto_tr(enable)
-
-    def decim(self):
-        return self._decim
-
-    def add_options(normal, expert):
-        """
-        Adds usrp-specific options to the Options Parser
-        """
-        add_freq_option(normal)
-        normal.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B")
-        normal.add_option("", "--rx-gain", type="eng_float", default=None, metavar="GAIN",
-                          help="set receiver gain in dB [default=midpoint].  See also --show-rx-gain-range")
-        normal.add_option("", "--show-rx-gain-range", action="store_true", default=False, 
-                          help="print min and max Rx gain available on selected daughterboard")
-        normal.add_option("-v", "--verbose", action="store_true", default=False)
-
-        expert.add_option("", "--rx-freq", type="eng_float", default=None,
-                          help="set Rx frequency to FREQ [default=%default]", metavar="FREQ")
-        expert.add_option("-d", "--decim", type="intx", default=128,
-                          help="set fpga decimation rate to DECIM [default=%default]")
-        expert.add_option("", "--snr", type="eng_float", default=30,
-                          help="set the SNR of the channel in dB [default=%default]")
-   
-
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
-                          metavar="FREQ")
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-def main():
-
-    global n_rcvd, n_right
-        
-    n_rcvd = 0
-    n_right = 0
-
-    def rx_callback(ok, payload):
-        global n_rcvd, n_right
-        n_rcvd += 1
-        (pktno,) = struct.unpack('!H', payload[0:2])
-        if ok:
-            n_right += 1
-        print "ok: %r \t pktno: %d \t n_rcvd: %d \t n_right: %d" % (ok, pktno, n_rcvd, n_right)
-
-        if 0:
-            printlst = list()
-            for x in payload[2:]:
-                t = hex(ord(x)).replace('0x', '')
-                if(len(t) == 1):
-                    t = '0' + t
-                printlst.append(t)
-            printable = ''.join(printlst)
-
-            print printable
-            print "\n"
-
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-    parser.add_option("","--discontinuous", action="store_true", default=False,
-                      help="enable discontinuous")
-
-    my_top_block.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
-    blks2.ofdm_mod.add_options(parser, expert_grp)
-    blks2.ofdm_demod.add_options(parser, expert_grp)
-    fusb_options.add_options(expert_grp)
-
-    (options, args) = parser.parse_args ()
-
-    # build the graph
-    tb = my_top_block(rx_callback, options)
-
-    r = gr.enable_realtime_scheduling()
-    if r != gr.RT_OK:
-        print "Warning: failed to enable realtime scheduling"
-
-    tb.start()                      # start flow graph
-    tb.wait()                       # wait for it to finish
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py b/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
deleted file mode 100755
index 918ff0842..000000000
--- a/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
+++ /dev/null
@@ -1,219 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005, 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.
-# 
-
-from gnuradio import gr, blks2
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-import time, struct, sys
-
-# from current dir
-from transmit_path import transmit_path
-from pick_bitrate import pick_tx_bitrate
-import fusb_options
-
-class my_top_block(gr.top_block):
-    def __init__(self, options):
-        gr.top_block.__init__(self)
-
-        self._tx_freq            = options.tx_freq         # tranmitter's center frequency
-        self._tx_subdev_spec     = options.tx_subdev_spec  # daughterboard to use
-        self._interp             = options.interp          # interpolating rate for the USRP (prelim)
-        self._fusb_block_size    = options.fusb_block_size # usb info for USRP
-        self._fusb_nblocks       = options.fusb_nblocks    # usb info for USRP
-
-        if self._tx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --tx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        # Set up USRP sink; also adjusts interp, and bitrate
-        self._setup_usrp_sink()
-
-        # copy the final answers back into options for use by modulator
-        #options.bitrate = self._bitrate
-
-        self.txpath = transmit_path(options)
-
-        self.connect(self.txpath, self.u)
-        
-    def _setup_usrp_sink(self):
-        """
-        Creates a USRP sink, determines the settings for best bitrate,
-        and attaches to the transmitter's subdevice.
-        """
-        self.u = usrp.sink_c(fusb_block_size=self._fusb_block_size,
-                             fusb_nblocks=self._fusb_nblocks)
-
-        self.u.set_interp_rate(self._interp)
-
-        # determine the daughterboard subdevice we're using
-        if self._tx_subdev_spec is None:
-            self._tx_subdev_spec = usrp.pick_tx_subdevice(self.u)
-        self.u.set_mux(usrp.determine_tx_mux_value(self.u, self._tx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, self._tx_subdev_spec)
-
-        # Set center frequency of USRP
-        ok = self.set_freq(self._tx_freq)
-        if not ok:
-            print "Failed to set Tx frequency to %s" % (eng_notation.num_to_str(self._tx_freq),)
-            raise ValueError
-
-        # Set the USRP for maximum transmit gain
-        # (Note that on the RFX cards this is a nop.)
-        self.set_gain(self.subdev.gain_range()[1])
-
-        # enable Auto Transmit/Receive switching
-        self.set_auto_tr(True)
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.
-        """
-        r = self.u.tune(self.subdev.which(), self.subdev, target_freq)
-        if r:
-            return True
-
-        return False
-        
-    def set_gain(self, gain):
-        """
-        Sets the analog gain in the USRP
-        """
-        self.gain = gain
-        self.subdev.set_gain(gain)
-
-    def set_auto_tr(self, enable):
-        """
-        Turns on auto transmit/receive of USRP daughterboard (if exits; else ignored)
-        """
-        return self.subdev.set_auto_tr(enable)
-        
-    def interp(self):
-        return self._interp
-
-    def add_options(normal, expert):
-        """
-        Adds usrp-specific options to the Options Parser
-        """
-        add_freq_option(normal)
-        normal.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Tx side A or B")
-        normal.add_option("-v", "--verbose", action="store_true", default=False)
-
-        expert.add_option("", "--tx-freq", type="eng_float", default=None,
-                          help="set transmit frequency to FREQ [default=%default]", metavar="FREQ")
-        expert.add_option("-i", "--interp", type="intx", default=256,
-                          help="set fpga interpolation rate to INTERP [default=%default]")
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-    def _print_verbage(self):
-        """
-        Prints information about the transmit path
-        """
-        print "Using TX d'board %s"    % (self.subdev.side_and_name(),)
-        print "modulation:      %s"    % (self._modulator_class.__name__)
-        print "interp:          %3d"   % (self._interp)
-        print "Tx Frequency:    %s"    % (eng_notation.num_to_str(self._tx_freq))
-        
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
-                          metavar="FREQ")
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-def main():
-
-    def send_pkt(payload='', eof=False):
-        return tb.txpath.send_pkt(payload, eof)
-
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-    parser.add_option("-s", "--size", type="eng_float", default=400,
-                      help="set packet size [default=%default]")
-    parser.add_option("-M", "--megabytes", type="eng_float", default=1.0,
-                      help="set megabytes to transmit [default=%default]")
-    parser.add_option("","--discontinuous", action="store_true", default=False,
-                      help="enable discontinuous mode")
-
-    my_top_block.add_options(parser, expert_grp)
-    transmit_path.add_options(parser, expert_grp)
-    blks2.ofdm_mod.add_options(parser, expert_grp)
-    blks2.ofdm_demod.add_options(parser, expert_grp)
-    fusb_options.add_options(expert_grp)
-
-    (options, args) = parser.parse_args ()
-
-    # build the graph
-    tb = my_top_block(options)
-    
-    r = gr.enable_realtime_scheduling()
-    if r != gr.RT_OK:
-        print "Warning: failed to enable realtime scheduling"
-
-    tb.start()                       # start flow graph
-    
-    # generate and send packets
-    nbytes = int(1e6 * options.megabytes)
-    n = 0
-    pktno = 0
-    pkt_size = int(options.size)
-
-    while n < nbytes:
-        send_pkt(struct.pack('!H', pktno) + (pkt_size - 2) * chr(pktno & 0xff))
-        n += pkt_size
-        sys.stderr.write('.')
-        if options.discontinuous and pktno % 5 == 1:
-            time.sleep(1)
-        pktno += 1
-        
-    send_pkt(eof=True)
-    tb.wait()                       # wait for it to finish
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/ofdm/fftshift.py b/gnuradio-examples/python/ofdm/fftshift.py
deleted file mode 100755
index 98abf5d4b..000000000
--- a/gnuradio-examples/python/ofdm/fftshift.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-
-from gnuradio import gr
-
-class my_top_block(gr.top_block):
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        length = 101
-
-        data_r = range(length)
-        data_i = range(length,2*length)
-        src_r = gr.vector_source_s(data_r, False)
-        src_i = gr.vector_source_s(data_i, False)
-        s2f_r = gr.short_to_float()
-        s2f_i = gr.short_to_float()
-        f2c = gr.float_to_complex()
-        s2v = gr.stream_to_vector(gr.sizeof_gr_complex, length)
-
-        shift = True
-        ifft = gr.fft_vcc(length, False, [], shift)
-        fft  = gr.fft_vcc(length, True, [], shift)
-        
-        v2s = gr.vector_to_stream(gr.sizeof_gr_complex, length)
-        snk_in = gr.file_sink(gr.sizeof_gr_complex, "fftshift.in")
-        snk_out = gr.file_sink(gr.sizeof_gr_complex, "fftshift.out")
-
-        self.connect(src_r, s2f_r, (f2c,0))
-        self.connect(src_i, s2f_i, (f2c,1))
-        self.connect(f2c, snk_in)
-        self.connect(f2c, s2v, ifft, fft, v2s, snk_out)
-        
-
-def main():
-    tb = my_top_block()
-    tb.start()
-    tb.wait()
-
-if __name__ == "__main__":
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
-    
diff --git a/gnuradio-examples/python/ofdm/fusb_options.py b/gnuradio-examples/python/ofdm/fusb_options.py
deleted file mode 100644
index 153e06bea..000000000
--- a/gnuradio-examples/python/ofdm/fusb_options.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# 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.
-# 
-
-def add_options(parser):
-    """
-    Add Fast USB specifc options to command line parser.
-    
-    @param parser: instance of OptionParser
-    """
-    parser.add_option("-B", "--fusb-block-size", type="int", default=0,
-                      help="specify fast usb block size [default=%default]")
-    parser.add_option("-N", "--fusb-nblocks", type="int", default=0,
-                      help="specify number of fast usb blocks [default=%default]")
diff --git a/gnuradio-examples/python/ofdm/pick_bitrate.py b/gnuradio-examples/python/ofdm/pick_bitrate.py
deleted file mode 100644
index 82a476888..000000000
--- a/gnuradio-examples/python/ofdm/pick_bitrate.py
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Copyright 2005,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.
-# 
-
-_default_bitrate = 500e3
-
-_valid_samples_per_symbol = (2,3,4,5,6,7)
-
-def _gen_tx_info(converter_rate):
-    results = []
-    for samples_per_symbol in _valid_samples_per_symbol:
-        for interp in range(16, 512 + 1, 4):
-            bitrate = converter_rate / interp / samples_per_symbol
-            results.append((bitrate, samples_per_symbol, interp))
-    results.sort()
-    return results
-
-def _gen_rx_info(converter_rate):
-    results = []
-    for samples_per_symbol in _valid_samples_per_symbol:
-        for decim in range(8, 256 + 1, 2):
-            bitrate = converter_rate / decim / samples_per_symbol
-            results.append((bitrate, samples_per_symbol, decim))
-    results.sort()
-    return results
-    
-def _filter_info(info, samples_per_symbol, xrate):
-    if samples_per_symbol is not None:
-        info = [x for x in info if x[1] == samples_per_symbol]
-    if xrate is not None:
-        info = [x for x in info if x[2] == xrate]
-    return info
-
-def _pick_best(target_bitrate, bits_per_symbol, info):
-    """
-    @returns tuple (bitrate, samples_per_symbol, interp_rate_or_decim_rate)
-    """
-    if len(info) == 0:
-        raise RuntimeError, "info is zero length!"
-
-    if target_bitrate is None:     # return the fastest one
-        return info[-1]
-    
-    # convert bit rate to symbol rate
-    target_symbolrate = target_bitrate / bits_per_symbol
-    
-    # Find the closest matching symbol rate.
-    # In the event of a tie, the one with the lowest samples_per_symbol wins.
-    # (We already sorted them, so the first one is the one we take)
-
-    best = info[0]
-    best_delta = abs(target_symbolrate - best[0])
-    for x in info[1:]:
-        delta = abs(target_symbolrate - x[0])
-        if delta < best_delta:
-            best_delta = delta
-            best = x
-
-    # convert symbol rate back to bit rate
-    return ((best[0] * bits_per_symbol),) + best[1:]
-
-def _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                  xrate, converter_rate, gen_info):
-    """
-    @returns tuple (bitrate, samples_per_symbol, interp_rate_or_decim_rate)
-    """
-    if not isinstance(bits_per_symbol, int) or bits_per_symbol < 1:
-        raise ValueError, "bits_per_symbol must be an int >= 1"
-    
-    if samples_per_symbol is not None and xrate is not None:  # completely determined
-        return (float(converter_rate) / xrate / samples_per_symbol,
-                samples_per_symbol, xrate)
-
-    if bitrate is None and samples_per_symbol is None and xrate is None:
-        bitrate = _default_bitrate
-
-    # now we have a target bitrate and possibly an xrate or
-    # samples_per_symbol constraint, but not both of them.
-
-    return _pick_best(bitrate, bits_per_symbol,
-                      _filter_info(gen_info(converter_rate), samples_per_symbol, xrate))
-    
-# ---------------------------------------------------------------------------------------
-
-def pick_tx_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                    interp_rate, converter_rate=128e6):
-    """
-    Given the 4 input parameters, return at configuration that matches
-
-    @param bitrate: desired bitrate or None
-    @type bitrate: number or None
-    @param bits_per_symbol: E.g., BPSK -> 1, QPSK -> 2, 8-PSK -> 3
-    @type bits_per_symbol: integer >= 1
-    @param samples_per_symbol: samples/baud (aka samples/symbol)
-    @type samples_per_symbol: number or None
-    @param interp_rate: USRP interpolation factor
-    @type interp_rate: integer or None
-    @param converter_rate: converter sample rate in Hz
-    @type converter_rate: number
-
-    @returns tuple (bitrate, samples_per_symbol, interp_rate)
-    """
-    return _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                         interp_rate, converter_rate, _gen_tx_info)
-
-
-def pick_rx_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                    decim_rate, converter_rate=64e6):
-    """
-    Given the 4 input parameters, return at configuration that matches
-
-    @param bitrate: desired bitrate or None
-    @type bitrate: number or None
-    @param bits_per_symbol: E.g., BPSK -> 1, QPSK -> 2, 8-PSK -> 3
-    @type bits_per_symbol: integer >= 1
-    @param samples_per_symbol: samples/baud (aka samples/symbol)
-    @type samples_per_symbol: number or None
-    @param decim_rate: USRP decimation factor
-    @type decim_rate: integer or None
-    @param converter_rate: converter sample rate in Hz
-    @type converter_rate: number
-
-    @returns tuple (bitrate, samples_per_symbol, decim_rate)
-    """
-    return _pick_bitrate(bitrate, bits_per_symbol, samples_per_symbol,
-                         decim_rate, converter_rate, _gen_rx_info)
diff --git a/gnuradio-examples/python/ofdm/tunnel.py b/gnuradio-examples/python/ofdm/tunnel.py
deleted file mode 100755
index 7e75c3ee8..000000000
--- a/gnuradio-examples/python/ofdm/tunnel.py
+++ /dev/null
@@ -1,435 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,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 2, 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.
-# 
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#
-#    This code sets up up a virtual ethernet interface (typically gr0),
-#    and relays packets between the interface and the GNU Radio PHY+MAC
-#
-#    What this means in plain language, is that if you've got a couple
-#    of USRPs on different machines, and if you run this code on those
-#    machines, you can talk between them using normal TCP/IP networking.
-#
-# /////////////////////////////////////////////////////////////////////////////
-
-
-from gnuradio import gr, gru, blks2
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-import random
-import time
-import struct
-import sys
-import os
-
-# from current dir
-from transmit_path import transmit_path
-from receive_path import receive_path
-import fusb_options
-
-#print os.getpid()
-#raw_input('Attach and press enter')
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#
-#   Use the Universal TUN/TAP device driver to move packets to/from kernel
-#
-#   See /usr/src/linux/Documentation/networking/tuntap.txt
-#
-# /////////////////////////////////////////////////////////////////////////////
-
-# Linux specific...
-# TUNSETIFF ifr flags from <linux/tun_if.h>
-
-IFF_TUN		= 0x0001   # tunnel IP packets
-IFF_TAP		= 0x0002   # tunnel ethernet frames
-IFF_NO_PI	= 0x1000   # don't pass extra packet info
-IFF_ONE_QUEUE	= 0x2000   # beats me ;)
-
-def open_tun_interface(tun_device_filename):
-    from fcntl import ioctl
-    
-    mode = IFF_TAP | IFF_NO_PI
-    TUNSETIFF = 0x400454ca
-
-    tun = os.open(tun_device_filename, os.O_RDWR)
-    ifs = ioctl(tun, TUNSETIFF, struct.pack("16sH", "gr%d", mode))
-    ifname = ifs[:16].strip("\x00")
-    return (tun, ifname)
-    
-
-# /////////////////////////////////////////////////////////////////////////////
-#                             the flow graph
-# /////////////////////////////////////////////////////////////////////////////
-
-class usrp_graph(gr.top_block):
-    def __init__(self, callback, options):
-        gr.top_block.__init__(self)
-
-        self._tx_freq            = options.tx_freq         # tranmitter's center frequency
-        self._tx_subdev_spec     = options.tx_subdev_spec  # daughterboard to use
-        self._interp             = options.interp          # interpolating rate for the USRP (prelim)
-        self._rx_freq            = options.rx_freq         # receiver's center frequency
-        self._rx_gain            = options.rx_gain         # receiver's gain
-        self._rx_subdev_spec     = options.rx_subdev_spec  # daughterboard to use
-        self._decim              = options.decim           # Decimating rate for the USRP (prelim)
-        self._fusb_block_size    = options.fusb_block_size # usb info for USRP
-        self._fusb_nblocks       = options.fusb_nblocks    # usb info for USRP
-
-        if self._tx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --tx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        if self._rx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --rx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        # Set up USRP sink and source
-        self._setup_usrp_sink()
-        self._setup_usrp_source()
-
-        # Set center frequency of USRP
-        ok = self.set_freq(self._tx_freq)
-        if not ok:
-            print "Failed to set Tx frequency to %s" % (eng_notation.num_to_str(self._tx_freq),)
-            raise ValueError
-
-        # copy the final answers back into options for use by modulator
-        #options.bitrate = self._bitrate
-
-        self.txpath = transmit_path(options)
-        self.rxpath = receive_path(callback, options)
-
-        self.connect(self.txpath, self.u_snk)
-        self.connect(self.u_src, self.rxpath)
-
-    def carrier_sensed(self):
-        """
-        Return True if the receive path thinks there's carrier
-        """
-        return self.rxpath.carrier_sensed()
-
-    def _setup_usrp_sink(self):
-        """
-        Creates a USRP sink, determines the settings for best bitrate,
-        and attaches to the transmitter's subdevice.
-        """
-        self.u_snk = usrp.sink_c(fusb_block_size=self._fusb_block_size,
-                                 fusb_nblocks=self._fusb_nblocks)
-
-        self.u_snk.set_interp_rate(self._interp)
-
-        # determine the daughterboard subdevice we're using
-        if self._tx_subdev_spec is None:
-            self._tx_subdev_spec = usrp.pick_tx_subdevice(self.u_snk)
-        self.u_snk.set_mux(usrp.determine_tx_mux_value(self.u_snk, self._tx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u_snk, self._tx_subdev_spec)
-
-        # Set the USRP for maximum transmit gain
-        # (Note that on the RFX cards this is a nop.)
-        self.set_gain(self.subdev.gain_range()[1])
-
-        # enable Auto Transmit/Receive switching
-        self.set_auto_tr(True)
-
-    def _setup_usrp_source(self):
-        self.u_src = usrp.source_c (fusb_block_size=self._fusb_block_size,
-                                fusb_nblocks=self._fusb_nblocks)
-        adc_rate = self.u_src.adc_rate()
-
-        self.u_src.set_decim_rate(self._decim)
-
-        # determine the daughterboard subdevice we're using
-        if self._rx_subdev_spec is None:
-            self._rx_subdev_spec = usrp.pick_rx_subdevice(self.u_src)
-        self.subdev = usrp.selected_subdev(self.u_src, self._rx_subdev_spec)
-
-        self.u_src.set_mux(usrp.determine_rx_mux_value(self.u_src, self._rx_subdev_spec))
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.
-        """
-        r_snk = self.u_snk.tune(self.subdev.which(), self.subdev, target_freq)
-        r_src = self.u_src.tune(self.subdev.which(), self.subdev, target_freq)
-        if r_snk and r_src:
-            return True
-
-        return False
-        
-    def set_gain(self, gain):
-        """
-        Sets the analog gain in the USRP
-        """
-        self.gain = gain
-        self.subdev.set_gain(gain)
-
-    def set_auto_tr(self, enable):
-        """
-        Turns on auto transmit/receive of USRP daughterboard (if exits; else ignored)
-        """
-        return self.subdev.set_auto_tr(enable)
-        
-    def interp(self):
-        return self._interp
-
-    def add_options(normal, expert):
-        """
-        Adds usrp-specific options to the Options Parser
-        """
-        add_freq_option(normal)
-        normal.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Tx side A or B")
-        normal.add_option("-v", "--verbose", action="store_true", default=False)
-
-        expert.add_option("", "--tx-freq", type="eng_float", default=None,
-                          help="set transmit frequency to FREQ [default=%default]", metavar="FREQ")
-        expert.add_option("-i", "--interp", type="intx", default=256,
-                          help="set fpga interpolation rate to INTERP [default=%default]")
-        normal.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B")
-        normal.add_option("", "--rx-gain", type="eng_float", default=None, metavar="GAIN",
-                          help="set receiver gain in dB [default=midpoint].  See also --show-rx-gain-range")
-        normal.add_option("", "--show-rx-gain-range", action="store_true", default=False, 
-                          help="print min and max Rx gain available on selected daughterboard")
-        normal.add_option("-v", "--verbose", action="store_true", default=False)
-
-        expert.add_option("", "--rx-freq", type="eng_float", default=None,
-                          help="set Rx frequency to FREQ [default=%default]", metavar="FREQ")
-        expert.add_option("-d", "--decim", type="intx", default=128,
-                          help="set fpga decimation rate to DECIM [default=%default]")
-        expert.add_option("", "--snr", type="eng_float", default=30,
-                          help="set the SNR of the channel in dB [default=%default]")
-   
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-    def _print_verbage(self):
-        """
-        Prints information about the transmit path
-        """
-        print "Using TX d'board %s"    % (self.subdev.side_and_name(),)
-        print "modulation:      %s"    % (self._modulator_class.__name__)
-        print "interp:          %3d"   % (self._interp)
-        print "Tx Frequency:    %s"    % (eng_notation.num_to_str(self._tx_freq))
-        
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
-                          metavar="FREQ")
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                           Carrier Sense MAC
-# /////////////////////////////////////////////////////////////////////////////
-
-class cs_mac(object):
-    """
-    Prototype carrier sense MAC
-
-    Reads packets from the TUN/TAP interface, and sends them to the PHY.
-    Receives packets from the PHY via phy_rx_callback, and sends them
-    into the TUN/TAP interface.
-
-    Of course, we're not restricted to getting packets via TUN/TAP, this
-    is just an example.
-    """
-    def __init__(self, tun_fd, verbose=False):
-        self.tun_fd = tun_fd       # file descriptor for TUN/TAP interface
-        self.verbose = verbose
-        self.tb = None             # top block (access to PHY)
-
-    def set_flow_graph(self, tb):
-        self.tb = tb
-
-    def phy_rx_callback(self, ok, payload):
-        """
-        Invoked by thread associated with PHY to pass received packet up.
-
-        @param ok: bool indicating whether payload CRC was OK
-        @param payload: contents of the packet (string)
-        """
-        if self.verbose:
-            print "Rx: ok = %r  len(payload) = %4d" % (ok, len(payload))
-        if ok:
-            os.write(self.tun_fd, payload)
-
-    def main_loop(self):
-        """
-        Main loop for MAC.
-        Only returns if we get an error reading from TUN.
-
-        FIXME: may want to check for EINTR and EAGAIN and reissue read
-        """
-        min_delay = 0.001               # seconds
-
-        while 1:
-            payload = os.read(self.tun_fd, 10*1024)
-            if not payload:
-                self.tb.txpath.send_pkt(eof=True)
-                break
-
-            if self.verbose:
-                print "Tx: len(payload) = %4d" % (len(payload),)
-
-            delay = min_delay
-            while self.tb.carrier_sensed():
-                sys.stderr.write('B')
-                time.sleep(delay)
-                if delay < 0.050:
-                    delay = delay * 2       # exponential back-off
-
-            self.tb.txpath.send_pkt(payload)
-
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-def main():
-
-    parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-
-    parser.add_option("-m", "--modulation", type="choice", choices=['bpsk', 'qpsk'],
-                      default='bpsk',
-                      help="Select modulation from: bpsk, qpsk [default=%%default]")
-    
-    parser.add_option("-v","--verbose", action="store_true", default=False)
-    expert_grp.add_option("-c", "--carrier-threshold", type="eng_float", default=30,
-                          help="set carrier detect threshold (dB) [default=%default]")
-    expert_grp.add_option("","--tun-device-filename", default="/dev/net/tun",
-                          help="path to tun device file [default=%default]")
-
-    usrp_graph.add_options(parser, expert_grp)
-    transmit_path.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
-    blks2.ofdm_mod.add_options(parser, expert_grp)
-    blks2.ofdm_demod.add_options(parser, expert_grp)
-
-    fusb_options.add_options(expert_grp)
-
-    (options, args) = parser.parse_args ()
-    if len(args) != 0:
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-    if options.rx_freq is None or options.tx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-    # open the TUN/TAP interface
-    (tun_fd, tun_ifname) = open_tun_interface(options.tun_device_filename)
-
-    # Attempt to enable realtime scheduling
-    r = gr.enable_realtime_scheduling()
-    if r == gr.RT_OK:
-        realtime = True
-    else:
-        realtime = False
-        print "Note: failed to enable realtime scheduling"
-
-
-    # If the user hasn't set the fusb_* parameters on the command line,
-    # pick some values that will reduce latency.
-
-    if options.fusb_block_size == 0 and options.fusb_nblocks == 0:
-        if realtime:                        # be more aggressive
-            options.fusb_block_size = gr.prefs().get_long('fusb', 'rt_block_size', 1024)
-            options.fusb_nblocks    = gr.prefs().get_long('fusb', 'rt_nblocks', 16)
-        else:
-            options.fusb_block_size = gr.prefs().get_long('fusb', 'block_size', 4096)
-            options.fusb_nblocks    = gr.prefs().get_long('fusb', 'nblocks', 16)
-    
-    #print "fusb_block_size =", options.fusb_block_size
-    #print "fusb_nblocks    =", options.fusb_nblocks
-
-    # instantiate the MAC
-    mac = cs_mac(tun_fd, verbose=True)
-
-
-    # build the graph (PHY)
-    tb = usrp_graph(mac.phy_rx_callback, options)
-
-    mac.set_flow_graph(tb)    # give the MAC a handle for the PHY
-
-    #if fg.txpath.bitrate() != fg.rxpath.bitrate():
-    #    print "WARNING: Transmit bitrate = %sb/sec, Receive bitrate = %sb/sec" % (
-    #        eng_notation.num_to_str(fg.txpath.bitrate()),
-    #        eng_notation.num_to_str(fg.rxpath.bitrate()))
-             
-    print "modulation:     %s"   % (options.modulation,)
-    print "freq:           %s"      % (eng_notation.num_to_str(options.tx_freq))
-    #print "bitrate:        %sb/sec" % (eng_notation.num_to_str(fg.txpath.bitrate()),)
-    #print "samples/symbol: %3d" % (fg.txpath.samples_per_symbol(),)
-    #print "interp:         %3d" % (fg.txpath.interp(),)
-    #print "decim:          %3d" % (fg.rxpath.decim(),)
-
-    tb.rxpath.set_carrier_threshold(options.carrier_threshold)
-    print "Carrier sense threshold:", options.carrier_threshold, "dB"
-    
-    print
-    print "Allocated virtual ethernet interface: %s" % (tun_ifname,)
-    print "You must now use ifconfig to set its IP address. E.g.,"
-    print
-    print "  $ sudo ifconfig %s 192.168.200.1" % (tun_ifname,)
-    print
-    print "Be sure to use a different address in the same subnet for each machine."
-    print
-
-
-    tb.start()    # Start executing the flow graph (runs in separate threads)
-
-    mac.main_loop()    # don't expect this to return...
-
-    tb.stop()     # but if it does, tell flow graph to stop.
-    tb.wait()     # wait for it to finish
-                
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/pfb/CMakeLists.txt b/gnuradio-examples/python/pfb/CMakeLists.txt
new file mode 100644
index 000000000..55dbb16ac
--- /dev/null
+++ b/gnuradio-examples/python/pfb/CMakeLists.txt
@@ -0,0 +1,35 @@
+# 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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+  channelize.py
+  chirp_channelize.py
+  decimate.py
+  fmtest.py
+  interpolate.py
+  resampler_demo.grc
+  resampler.py
+  synth_filter.py
+  synth_to_chan.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/pfb
+  COMPONENT "gnuradio_examples"
+)
+
diff --git a/gnuradio-examples/python/pfb/Makefile.am b/gnuradio-examples/python/pfb/Makefile.am
index 0b91d0a2d..39c81bfc2 100644
--- a/gnuradio-examples/python/pfb/Makefile.am
+++ b/gnuradio-examples/python/pfb/Makefile.am
@@ -28,7 +28,10 @@ dist_ourdata_SCRIPTS =		\
 	chirp_channelize.py	\
 	decimate.py		\
 	interpolate.py		\
-	fmtest.py
+	fmtest.py		\
+	resampler.py		\
+	synth_filter.py		\
+	synth_to_chan.py
 
 dist_ourdata_DATA =		\
 	resampler_demo.grc
diff --git a/gnuradio-examples/python/tags/CMakeLists.txt b/gnuradio-examples/python/tags/CMakeLists.txt
new file mode 100644
index 000000000..d2cd7b793
--- /dev/null
+++ b/gnuradio-examples/python/tags/CMakeLists.txt
@@ -0,0 +1,28 @@
+# 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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+  test_file_tags.py
+  uhd_burst_detector.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/tags
+  COMPONENT "gnuradio_examples"
+)
+
diff --git a/gnuradio-examples/python/usrp/.gitignore b/gnuradio-examples/python/usrp/.gitignore
deleted file mode 100644
index c400497f5..000000000
--- a/gnuradio-examples/python/usrp/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
diff --git a/gnuradio-examples/python/usrp/max_power.py b/gnuradio-examples/python/usrp/max_power.py
deleted file mode 100755
index 91005e530..000000000
--- a/gnuradio-examples/python/usrp/max_power.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2007 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.
-# 
-
-"""
-Setup USRP for maximum power consumption.
-"""
-
-
-from gnuradio import gr
-from gnuradio import usrp
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-def ramp_source ():
-    period = 2**16
-    src = gr.vector_source_s (range (-period/2, period/2, 1), True)
-    return src
-
-def build_block (tx_enable, rx_enable):
-    max_usb_rate = 8e6                  # 8 MS/sec
-    dac_freq = 128e6
-    adc_freq =  64e6
-    
-    tx_nchan = 2
-    tx_mux = 0x0000ba98
-    tx_interp =  int (dac_freq / (max_usb_rate/2 * tx_nchan)) # 16
-    
-    rx_nchan = 2
-    rx_mux = 0x00003210
-    rx_decim = int ((adc_freq * rx_nchan) / (max_usb_rate/2)) # 32
-    
-    tb = gr.top_block ()
-
-    if tx_enable:
-        tx_src0 = gr.sig_source_c (dac_freq/tx_interp, gr.GR_CONST_WAVE, 0, 16e3, 0)
-        usrp_tx = usrp.sink_c (0, tx_interp, tx_nchan, tx_mux)
-        usrp_tx.set_tx_freq (0, 10e6)
-        usrp_tx.set_tx_freq (1,  9e6)
-        tb.connect (tx_src0, usrp_tx)
-
-    if rx_enable:
-        usrp_rx = usrp.source_c (0, rx_decim, rx_nchan, rx_mux)
-        usrp_rx.set_rx_freq (0, 5.5e6)
-        usrp_rx.set_rx_freq (1, 6.5e6)
-        rx_dst0 = gr.null_sink (gr.sizeof_gr_complex)
-        tb.connect (usrp_rx, rx_dst0)
-
-    return tb
-    
-def main ():
-    parser = OptionParser (option_class=eng_option)
-    parser.add_option ("-t", action="store_true", dest="tx_enable",
-                       default=False, help="enable Tx path")
-    parser.add_option ("-r", action="store_true", dest="rx_enable",
-                       default=False, help="enable Rx path")
-    (options, args) = parser.parse_args ()
-    tb = build_block (options.tx_enable, options.rx_enable)
-
-    tb.start ()
-    raw_input ('Press Enter to quit: ')
-    tb.stop ()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gnuradio-examples/python/usrp/test_dft_analysis.py b/gnuradio-examples/python/usrp/test_dft_analysis.py
deleted file mode 100755
index 49db6bf2a..000000000
--- a/gnuradio-examples/python/usrp/test_dft_analysis.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-
-from gnuradio import gr, gru, blks2
-from gnuradio.wxgui import stdgui2, fftsink2, slider
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import wx
-
-class test_graph (stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        parser = OptionParser (option_class=eng_option)
-        (options, args) = parser.parse_args ()
-
-        sample_rate = 16e3
-        mpoints = 4
-        ampl = 1000
-        freq = 0
-
-        lo_freq = 1e6
-        lo_ampl = 1
-        
-        vbox.Add(slider.slider(panel,
-                               -sample_rate/2, sample_rate/2,
-                               self.set_lo_freq), 0, wx.ALIGN_CENTER)
-
-
-        src = gr.sig_source_c(sample_rate, gr.GR_CONST_WAVE,
-                              freq, ampl, 0)
-
-        self.lo = gr.sig_source_c(sample_rate, gr.GR_SIN_WAVE,
-                                  lo_freq, lo_ampl, 0)
-
-        mixer = gr.multiply_cc()
-        self.connect(src, (mixer, 0))
-        self.connect(self.lo, (mixer, 1))
-        
-        # We add these throttle blocks so that this demo doesn't
-        # suck down all the CPU available.  Normally you wouldn't use these.
-        thr = gr.throttle(gr.sizeof_gr_complex, sample_rate)
-
-        taps = gr.firdes.low_pass(1,   # gain
-                                  1,   # rate
-                                  1.0/mpoints * 0.4,  # cutoff
-                                  1.0/mpoints * 0.1,  # trans width
-                                  gr.firdes.WIN_HANN)
-        print len(taps)
-        analysis = blks2.analysis_filterbank(mpoints, taps)
-        
-        self.connect(mixer, thr)
-        self.connect(thr, analysis)
-
-        for i in range(mpoints):
-            fft = fftsink2.fft_sink_c(frame, fft_size=128,
-                                     sample_rate=sample_rate/mpoints,
-                                     fft_rate=5,
-                                     title="Ch %d" % (i,))
-            self.connect((analysis, i), fft)
-            vbox.Add(fft.win, 1, wx.EXPAND)
-
-    def set_lo_freq(self, freq):
-        self.lo.set_frequency(freq)
-        
-                                     
-
-def main ():
-    app = stdgui2.stdapp (test_graph, "Test DFT filterbank")
-    app.MainLoop ()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gnuradio-examples/python/usrp/test_dft_synth.py b/gnuradio-examples/python/usrp/test_dft_synth.py
deleted file mode 100755
index 99b1c4923..000000000
--- a/gnuradio-examples/python/usrp/test_dft_synth.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python
-
-from gnuradio import gr, gru, blks2
-from gnuradio.wxgui import stdgui2, fftsink2
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import wx
-import random
-
-
-def make_random_complex_tuple(L, gain=1):
-    result = []
-    for x in range(L):
-        result.append(gain * complex(random.gauss(0, 1),random.gauss(0, 1)))
-                      
-    return tuple(result)
-
-def random_noise_c(gain=1):
-    src = gr.vector_source_c(make_random_complex_tuple(32*1024, gain), True)
-    return src
-
-
-class test_graph (stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        parser = OptionParser (option_class=eng_option)
-        (options, args) = parser.parse_args ()
-
-        sample_rate = 16e6
-        mpoints = 16
-        ampl = 1000
-        
-        enable = mpoints/2 * [1, 0]
-        enable[0] = 1
-
-        taps = gr.firdes.low_pass(1,   # gain
-                                  1,   # rate
-                                  1.0/mpoints * 0.4,  # cutoff
-                                  1.0/mpoints * 0.1,  # trans width
-                                  gr.firdes.WIN_HANN)
-
-        synth = blks2.synthesis_filterbank(mpoints, taps)
-        
-        null_source = gr.null_source(gr.sizeof_gr_complex)
-        
-        if 1:
-            for i in range(mpoints):
-                s = gr.sig_source_c(sample_rate/mpoints, gr.GR_SIN_WAVE,
-                                    300e3, ampl * enable[i], 0)
-                self.connect(s, (synth, i))
-
-        else:
-            for i in range(mpoints):
-                if i == 1:
-                    #s = gr.sig_source_c(sample_rate/mpoints, gr.GR_SIN_WAVE,
-                    #                    300e3, ampl * enable[i], 0)
-                    s = random_noise_c(ampl)
-                    self.connect(s, (synth, i))
-                else:
-                    self.connect(null_source, (synth, i))
-            
-
-        # We add these throttle blocks so that this demo doesn't
-        # suck down all the CPU available.  Normally you wouldn't use these.
-        thr = gr.throttle(gr.sizeof_gr_complex, sample_rate)
-        fft = fftsink2.fft_sink_c(frame, fft_size=1024,sample_rate=sample_rate)
-        vbox.Add(fft.win, 1, wx.EXPAND)
-
-        self.connect(synth, thr, fft)
-
-
-def main ():
-    app = stdgui2.stdapp (test_graph, "Test DFT filterbank")
-    app.MainLoop ()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gnuradio-examples/python/usrp/usrp_benchmark_usb.py b/gnuradio-examples/python/usrp/usrp_benchmark_usb.py
deleted file mode 100755
index 4ea84f764..000000000
--- a/gnuradio-examples/python/usrp/usrp_benchmark_usb.py
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005 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.
-# 
-
-"""
-Benchmark the USB/USRP throughput.  Finds the maximum full-duplex speed
-the USRP/USB combination can sustain without errors.
-
-This program does not currently give reliable results.  Sorry about that...
-"""
-
-from gnuradio import gr
-from gnuradio import usrp
-from gnuradio import eng_notation
-
-import sys
-
-def run_test (usb_throughput, verbose):
-    # usb_throughput is in bytes/sec.
-    #
-    # Returns True or False
-    
-    nsec = 1
-    stream_length = int (usb_throughput/2 * nsec)   # length of stream to examine
-
-    adc_freq =  64e6
-    dac_freq = 128e6
-    sizeof_sample = 2 * gr.sizeof_short
-
-    usb_throughput_in_samples = usb_throughput / sizeof_sample
-
-    # allocate usb throughput 50/50 between Tx and Rx
-
-    tx_interp = int (dac_freq) / int (usb_throughput_in_samples / 2)
-    rx_decim  = int (adc_freq) / int (usb_throughput_in_samples / 2)
-
-    # print "tx_interp =", tx_interp, "rx_decim =", rx_decim
-    assert (tx_interp == 2 * rx_decim)
-    
-    tb = gr.top_block ()
-
-    # Build the Tx pipeline
-    data_src = gr.lfsr_32k_source_s ()
-    src_head = gr.head (gr.sizeof_short, int (stream_length * 2))
-    usrp_tx = usrp.sink_s (0, tx_interp)
-    tb.connect (data_src, src_head, usrp_tx)
-
-    # and the Rx pipeline
-    usrp_rx = usrp.source_s (0, rx_decim, 1, 0x32103210, usrp.FPGA_MODE_LOOPBACK)
-    head = gr.head (gr.sizeof_short, stream_length)
-    check = gr.check_lfsr_32k_s ()
-    tb.connect (usrp_rx, head, check)
-
-    tb.run ()
-
-    ntotal = check.ntotal ()
-    nright = check.nright ()
-    runlength = check.runlength ()
-
-    if verbose:
-        print "usb_throughput =", eng_notation.num_to_str (usb_throughput)
-        print "ntotal    =", ntotal
-        print "nright    =", nright
-        print "runlength =", runlength
-        print "delta     =", ntotal - runlength
-
-    return runlength >= stream_length - 80000
-    
-def main ():
-    verbose = True
-    best_rate = 0
-    usb_rate = [ 2e6, 4e6, 8e6, 16e6, 32e6 ]
-    #usb_rate = [ 32e6, 32e6, 32e6, 32e6, 32e6 ]
-    # usb_rate.reverse ()
-    for rate in usb_rate:
-        sys.stdout.write ("Testing %sB/sec... " % (eng_notation.num_to_str (rate)))
-        sys.stdout.flush ()
-        ok = run_test (rate, verbose)
-        if ok:
-            best_rate = max (best_rate, rate)
-            sys.stdout.write ("OK\n")
-        else:
-            sys.stdout.write ("FAILED\n")
-
-    print "Max USB/USRP throughput = %sB/sec" % (eng_notation.num_to_str (best_rate),)
-
-if __name__ == '__main__':
-    main ()
diff --git a/gnuradio-examples/python/usrp/usrp_test_loop_lfsr.py b/gnuradio-examples/python/usrp/usrp_test_loop_lfsr.py
deleted file mode 100755
index 696c1a24c..000000000
--- a/gnuradio-examples/python/usrp/usrp_test_loop_lfsr.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2007 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.
-# 
-
-"""
-Digital loopback (Tx to Rx) for the USRP Rev1.
-"""
-
-from gnuradio import gr
-from gnuradio import usrp
-
-
-def build_graph ():
-    tx_interp =  32       # tx should be twice rx
-    rx_decim  =  16
-    
-    tb = gr.top_block ()
-
-    data_src = gr.lfsr_32k_source_s ()
-
-    # usrp_tx = usrp.sink_s (0, tx_interp, 1, 0x98)
-    usrp_tx = usrp.sink_s (0, tx_interp)
-
-    tb.connect (data_src, usrp_tx)
-
-    usrp_rx = usrp.source_s (0, rx_decim, 1, 0x32103210, usrp.FPGA_MODE_LOOPBACK)
-
-    sink = gr.check_lfsr_32k_s ()
-    tb.connect (usrp_rx, sink)
-
-    # file_sink = gr.file_sink (gr.sizeof_short, "loopback.dat")
-    # tb.connect (usrp_rx, file_sink)
-    
-    return tb
-    
-def main ():
-    tb = build_graph ()
-    try:
-        tb.run()
-    except KeyboardInterrupt:
-        pass
-
-if __name__ == '__main__':
-    main ()
diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
deleted file mode 100755
index edfbc3657..000000000
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2006,2007 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.
-# 
-
-from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import audio
-from gnuradio import usrp
-from gnuradio import blks2
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-from usrpm import usrp_dbid
-import sys
-import math
-
-def calc_dxc_freq(target_freq, baseband_freq, fs):
-   dxc_temp = (target_freq - baseband_freq) % fs
-
-   if dxc_temp < fs/2.0:
-       dxc_freq = - dxc_temp
-       inverted = False
-   else:
-       dxc_freq = fs - dxc_temp
-       inverted = True
-
-   return (dxc_freq, inverted)
-
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    Try for one of these, in order: TV_RX, BASIC_RX, whatever is on side A.
-
-    @return a subdev_spec
-    """
-    return usrp.pick_subdev(u, (usrp_dbid.TV_RX,
-                                usrp_dbid.TV_RX_REV_2,
-				usrp_dbid.TV_RX_REV_3,
-				usrp_dbid.TV_RX_MIMO,
-                                usrp_dbid.TV_RX_REV_2_MIMO,
-				usrp_dbid.TV_RX_REV_3_MIMO,
-                                usrp_dbid.BASIC_RX))
-
-
-class wfm_rx_block (gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        parser=OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=A)")
-        parser.add_option("", "--f1", type="eng_float", default=100.7e6,
-                          help="set 1st station frequency to FREQ", metavar="FREQ")
-        parser.add_option("", "--f2", type="eng_float", default=102.5e6,
-                          help="set 2nd station freq to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=40,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-O", "--audio-output", type="string", default="",
-                          help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
-
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-        
-        if abs(options.f1) < 1e6:
-            options.f1 *= 1e6
-
-        if abs(options.f2) < 1e6:
-            options.f2 *= 1e6
-
-        if abs(options.f1 - options.f2) > 5.5e6:
-            print "Sorry, two stations must be within 5.5MHz of each other"
-            raise SystemExit
-
-        f = (options.f1, options.f2)
-        
-        self.vol = .1
-        self.state = "FREQ"
-
-        # build graph
-        
-        self.u = usrp.source_c(0, nchan=2)          # usrp is data source
-
-        adc_rate = self.u.adc_rate()                # 64 MS/s
-        usrp_decim = 200
-        self.u.set_decim_rate(usrp_decim)
-        usrp_rate = adc_rate / usrp_decim           # 320 kS/s
-        chanfilt_decim = 1
-        demod_rate = usrp_rate / chanfilt_decim
-        audio_decimation = 10
-        audio_rate = demod_rate / audio_decimation  # 32 kHz
-
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-
-        mv = usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec)
-        mv |= (mv << 8) & 0xff00   # both DDC inputs setup same way
-        self.u.set_mux(mv)
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        print "Using RX d'board %s" % (self.subdev.side_and_name(),)
-
-
-        # deinterleave two channels from FPGA
-        di = gr.deinterleave(gr.sizeof_gr_complex)
-        
-        # wire up the head of the chain
-        self.connect(self.u, di)
-        
-        # sound card as final sink
-        audio_sink = audio.sink(int(audio_rate), options.audio_output)
-
-        # taps for channel filter
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
-                                            usrp_rate,   # sampling rate
-                                            80e3,        # passband cutoff
-                                            115e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-
-        mid_freq = (f[0] + f[1]) / 2
-        # set front end PLL to middle frequency
-        tune_result = self.subdev.set_freq(mid_freq)
-
-        for n in range(2):
-            chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
-            guts = blks2.wfm_rcv (demod_rate, audio_decimation)
-            volume_control = gr.multiply_const_ff(self.vol)
-            self.connect((di, n), chan_filt)
-            self.connect(chan_filt, guts, volume_control)
-            self.connect(volume_control, (audio_sink, n))
-            dxc_freq, inverted = calc_dxc_freq(f[n], tune_result.baseband_freq,
-                                               self.u.converter_rate())
-            self.u.set_rx_freq(n, dxc_freq)
-        
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-
-        # set initial values
-        self.set_gain(options.gain)
-
-
-    def set_vol (self, vol):
-        self.vol = vol
-        self.volume_control.set_k(self.vol)
-
-
-    def set_gain(self, gain):
-        self.subdev.set_gain(gain)
-
-    def __del__(self):
-	# Avoid weak-reference error
-	del self.subdev
-    
-if __name__ == '__main__':
-    tb = wfm_rx_block()
-    try:
-        tb.run()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
deleted file mode 100755
index 217f207c5..000000000
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2006,2007 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.
-# 
-
-from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import audio
-from gnuradio import usrp
-from gnuradio import blks2
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-from usrpm import usrp_dbid
-import sys
-import math
-
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    Try for one of these, in order: TV_RX, BASIC_RX, whatever is on side A.
-
-    @return a subdev_spec
-    """
-    return usrp.pick_subdev(u, (usrp_dbid.TV_RX,
-                                usrp_dbid.TV_RX_REV_2,
-				usrp_dbid.TV_RX_REV_3,
-				usrp_dbid.TV_RX_MIMO,
-                                usrp_dbid.TV_RX_REV_2_MIMO,
-				usrp_dbid.TV_RX_REV_3_MIMO,
-                                usrp_dbid.BASIC_RX))
-
-
-class wfm_rx_block (gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        parser=OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=A)")
-        parser.add_option("-f", "--freq", type="eng_float", default=100.1e6,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-O", "--audio-output", type="string", default="",
-                          help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
-
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-        
-        self.vol = .1
-        self.state = "FREQ"
-        self.freq = 0
-
-        # build graph
-        
-        self.u = usrp.source_c()                    # usrp is data source
-
-        adc_rate = self.u.adc_rate()                # 64 MS/s
-        usrp_decim = 200
-        self.u.set_decim_rate(usrp_decim)
-        usrp_rate = adc_rate / usrp_decim           # 320 kS/s
-        chanfilt_decim = 1
-        demod_rate = usrp_rate / chanfilt_decim
-        audio_decimation = 10
-        audio_rate = demod_rate / audio_decimation  # 32 kHz
-
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        print "Using RX d'board %s" % (self.subdev.side_and_name(),)
-
-
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
-                                            usrp_rate,   # sampling rate
-                                            80e3,        # passband cutoff
-                                            115e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-        chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
-
-        self.guts = blks2.wfm_rcv (demod_rate, audio_decimation)
-
-        self.volume_control = gr.multiply_const_ff(self.vol)
-
-        # sound card as final sink
-        audio_sink = audio.sink(int(audio_rate),
-                                options.audio_output,
-                                False)  # ok_to_block
-        
-        # now wire it all together
-        self.connect (self.u, chan_filt, self.guts, self.volume_control, audio_sink)
-
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-        if abs(options.freq) < 1e6:
-            options.freq *= 1e6
-
-        # set initial values
-
-        self.set_gain(options.gain)
-
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-
-    def set_vol (self, vol):
-        self.vol = vol
-        self.volume_control.set_k(self.vol)
-        self.update_status_bar ()
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        r = self.u.tune(0, self.subdev, target_freq)
-        
-        if r:
-            self.freq = target_freq
-            self.update_status_bar()
-            self._set_status_msg("OK", 0)
-            return True
-
-        self._set_status_msg("Failed", 0)
-        return False
-
-    def set_gain(self, gain):
-        self.subdev.set_gain(gain)
-
-    def update_status_bar (self):
-        msg = "Freq: %s  Volume:%f  Setting:%s" % (
-            eng_notation.num_to_str(self.freq), self.vol, self.state)
-        self._set_status_msg(msg, 1)
-        
-    def _set_status_msg(self, msg, which=0):
-        print msg
-
-    
-if __name__ == '__main__':
-    tb = wfm_rx_block()
-    try:
-        tb.run()
-    except KeyboardInterrupt:
-        pass
diff --git a/gnuradio-examples/python/usrp2/Makefile.am b/gnuradio-examples/python/usrp2/Makefile.am
deleted file mode 100644
index cca813349..000000000
--- a/gnuradio-examples/python/usrp2/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright 2004,2005,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-ourdatadir = $(exampledir)/usrp2
-dist_ourdata_DATA = \
-	qt_wfm_interface.ui \
-	qt_wfm_interface.py
-
-
-dist_ourdata_SCRIPTS =	\
-	usrp2_wfm_qt.py \
-	usrp2_wfm_rcv.py
diff --git a/gnuradio-examples/python/usrp2/qt_wfm_interface.py b/gnuradio-examples/python/usrp2/qt_wfm_interface.py
deleted file mode 100644
index 4c4367ed0..000000000
--- a/gnuradio-examples/python/usrp2/qt_wfm_interface.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'qt_wfm_interface.ui'
-#
-# Created: Thu Jun 18 23:41:03 2009
-#      by: PyQt4 UI code generator 4.4.3
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_InterfaceWindow(object):
-    def setupUi(self, InterfaceWindow):
-        InterfaceWindow.setObjectName("InterfaceWindow")
-        InterfaceWindow.resize(909, 711)
-        self.centralwidget = QtGui.QWidget(InterfaceWindow)
-        self.centralwidget.setObjectName("centralwidget")
-        self.closeButton = QtGui.QPushButton(self.centralwidget)
-        self.closeButton.setGeometry(QtCore.QRect(790, 580, 101, 31))
-        self.closeButton.setObjectName("closeButton")
-        self.sinkFrame = QtGui.QFrame(self.centralwidget)
-        self.sinkFrame.setGeometry(QtCore.QRect(10, 10, 891, 501))
-        self.sinkFrame.setFrameShape(QtGui.QFrame.StyledPanel)
-        self.sinkFrame.setFrameShadow(QtGui.QFrame.Raised)
-        self.sinkFrame.setObjectName("sinkFrame")
-        self.horizontalLayoutWidget = QtGui.QWidget(self.sinkFrame)
-        self.horizontalLayoutWidget.setGeometry(QtCore.QRect(10, 10, 871, 481))
-        self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget")
-        self.sinkLayout = QtGui.QHBoxLayout(self.horizontalLayoutWidget)
-        self.sinkLayout.setObjectName("sinkLayout")
-        self.channelModeBox = QtGui.QGroupBox(self.centralwidget)
-        self.channelModeBox.setGeometry(QtCore.QRect(10, 520, 261, 131))
-        self.channelModeBox.setObjectName("channelModeBox")
-        self.bandwidthabel = QtGui.QLabel(self.channelModeBox)
-        self.bandwidthabel.setGeometry(QtCore.QRect(10, 90, 101, 17))
-        self.bandwidthabel.setObjectName("bandwidthabel")
-        self.bandwidthEdit = QtGui.QLineEdit(self.channelModeBox)
-        self.bandwidthEdit.setGeometry(QtCore.QRect(130, 90, 113, 23))
-        self.bandwidthEdit.setObjectName("bandwidthEdit")
-        self.gainEdit = QtGui.QLineEdit(self.channelModeBox)
-        self.gainEdit.setGeometry(QtCore.QRect(130, 60, 113, 23))
-        self.gainEdit.setObjectName("gainEdit")
-        self.gainLabel = QtGui.QLabel(self.channelModeBox)
-        self.gainLabel.setGeometry(QtCore.QRect(10, 60, 111, 20))
-        self.gainLabel.setObjectName("gainLabel")
-        self.freqEdit = QtGui.QLineEdit(self.channelModeBox)
-        self.freqEdit.setGeometry(QtCore.QRect(130, 30, 113, 23))
-        self.freqEdit.setObjectName("freqEdit")
-        self.freqLabel = QtGui.QLabel(self.channelModeBox)
-        self.freqLabel.setGeometry(QtCore.QRect(10, 30, 111, 17))
-        self.freqLabel.setObjectName("freqLabel")
-        self.pauseButton = QtGui.QPushButton(self.centralwidget)
-        self.pauseButton.setGeometry(QtCore.QRect(790, 520, 101, 31))
-        self.pauseButton.setObjectName("pauseButton")
-        self.fmBox = QtGui.QGroupBox(self.centralwidget)
-        self.fmBox.setGeometry(QtCore.QRect(290, 520, 251, 131))
-        self.fmBox.setObjectName("fmBox")
-        self.volumeEdit = QtGui.QLineEdit(self.fmBox)
-        self.volumeEdit.setGeometry(QtCore.QRect(130, 20, 113, 23))
-        self.volumeEdit.setObjectName("volumeEdit")
-        self.volumeLabel = QtGui.QLabel(self.fmBox)
-        self.volumeLabel.setGeometry(QtCore.QRect(10, 20, 111, 17))
-        self.volumeLabel.setObjectName("volumeLabel")
-        InterfaceWindow.setCentralWidget(self.centralwidget)
-        self.menubar = QtGui.QMenuBar(InterfaceWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 909, 24))
-        self.menubar.setObjectName("menubar")
-        self.menuFile = QtGui.QMenu(self.menubar)
-        self.menuFile.setObjectName("menuFile")
-        InterfaceWindow.setMenuBar(self.menubar)
-        self.statusbar = QtGui.QStatusBar(InterfaceWindow)
-        self.statusbar.setObjectName("statusbar")
-        InterfaceWindow.setStatusBar(self.statusbar)
-        self.actionExit = QtGui.QAction(InterfaceWindow)
-        self.actionExit.setObjectName("actionExit")
-        self.menuFile.addAction(self.actionExit)
-        self.menubar.addAction(self.menuFile.menuAction())
-
-        self.retranslateUi(InterfaceWindow)
-        QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), InterfaceWindow.close)
-        QtCore.QObject.connect(self.actionExit, QtCore.SIGNAL("triggered()"), InterfaceWindow.close)
-        QtCore.QMetaObject.connectSlotsByName(InterfaceWindow)
-        InterfaceWindow.setTabOrder(self.closeButton, self.gainEdit)
-        InterfaceWindow.setTabOrder(self.gainEdit, self.freqEdit)
-        InterfaceWindow.setTabOrder(self.freqEdit, self.bandwidthEdit)
-
-    def retranslateUi(self, InterfaceWindow):
-        InterfaceWindow.setWindowTitle(QtGui.QApplication.translate("InterfaceWindow", "MainWindow", None, QtGui.QApplication.UnicodeUTF8))
-        self.closeButton.setText(QtGui.QApplication.translate("InterfaceWindow", "Close", None, QtGui.QApplication.UnicodeUTF8))
-        self.channelModeBox.setTitle(QtGui.QApplication.translate("InterfaceWindow", "USRP Parameters", None, QtGui.QApplication.UnicodeUTF8))
-        self.bandwidthabel.setText(QtGui.QApplication.translate("InterfaceWindow", "Bandwidth (Hz)", None, QtGui.QApplication.UnicodeUTF8))
-        self.gainLabel.setText(QtGui.QApplication.translate("InterfaceWindow", "Gain (dB)", None, QtGui.QApplication.UnicodeUTF8))
-        self.freqLabel.setText(QtGui.QApplication.translate("InterfaceWindow", "Frequency", None, QtGui.QApplication.UnicodeUTF8))
-        self.pauseButton.setText(QtGui.QApplication.translate("InterfaceWindow", "Pause", None, QtGui.QApplication.UnicodeUTF8))
-        self.fmBox.setTitle(QtGui.QApplication.translate("InterfaceWindow", "FM Tuner Parameters", None, QtGui.QApplication.UnicodeUTF8))
-        self.volumeLabel.setText(QtGui.QApplication.translate("InterfaceWindow", "Volume", None, QtGui.QApplication.UnicodeUTF8))
-        self.menuFile.setTitle(QtGui.QApplication.translate("InterfaceWindow", "&File", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionExit.setText(QtGui.QApplication.translate("InterfaceWindow", "E&xit", None, QtGui.QApplication.UnicodeUTF8))
-
diff --git a/gnuradio-examples/python/usrp2/qt_wfm_interface.ui b/gnuradio-examples/python/usrp2/qt_wfm_interface.ui
deleted file mode 100644
index 16902d9f4..000000000
--- a/gnuradio-examples/python/usrp2/qt_wfm_interface.ui
+++ /dev/null
@@ -1,253 +0,0 @@
-<ui version="4.0" >
- <class>InterfaceWindow</class>
- <widget class="QMainWindow" name="InterfaceWindow" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>909</width>
-    <height>711</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget" >
-   <widget class="QPushButton" name="closeButton" >
-    <property name="geometry" >
-     <rect>
-      <x>790</x>
-      <y>580</y>
-      <width>101</width>
-      <height>31</height>
-     </rect>
-    </property>
-    <property name="text" >
-     <string>Close</string>
-    </property>
-   </widget>
-   <widget class="QFrame" name="sinkFrame" >
-    <property name="geometry" >
-     <rect>
-      <x>10</x>
-      <y>10</y>
-      <width>891</width>
-      <height>501</height>
-     </rect>
-    </property>
-    <property name="frameShape" >
-     <enum>QFrame::StyledPanel</enum>
-    </property>
-    <property name="frameShadow" >
-     <enum>QFrame::Raised</enum>
-    </property>
-    <widget class="QWidget" name="horizontalLayoutWidget" >
-     <property name="geometry" >
-      <rect>
-       <x>10</x>
-       <y>10</y>
-       <width>871</width>
-       <height>481</height>
-      </rect>
-     </property>
-     <layout class="QHBoxLayout" name="sinkLayout" />
-    </widget>
-   </widget>
-   <widget class="QGroupBox" name="channelModeBox" >
-    <property name="geometry" >
-     <rect>
-      <x>10</x>
-      <y>520</y>
-      <width>261</width>
-      <height>131</height>
-     </rect>
-    </property>
-    <property name="title" >
-     <string>USRP Parameters</string>
-    </property>
-    <widget class="QLabel" name="bandwidthabel" >
-     <property name="geometry" >
-      <rect>
-       <x>10</x>
-       <y>90</y>
-       <width>101</width>
-       <height>17</height>
-      </rect>
-     </property>
-     <property name="text" >
-      <string>Bandwidth (Hz)</string>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="bandwidthEdit" >
-     <property name="geometry" >
-      <rect>
-       <x>130</x>
-       <y>90</y>
-       <width>113</width>
-       <height>23</height>
-      </rect>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="gainEdit" >
-     <property name="geometry" >
-      <rect>
-       <x>130</x>
-       <y>60</y>
-       <width>113</width>
-       <height>23</height>
-      </rect>
-     </property>
-    </widget>
-    <widget class="QLabel" name="gainLabel" >
-     <property name="geometry" >
-      <rect>
-       <x>10</x>
-       <y>60</y>
-       <width>111</width>
-       <height>20</height>
-      </rect>
-     </property>
-     <property name="text" >
-      <string>Gain (dB)</string>
-     </property>
-    </widget>
-    <widget class="QLineEdit" name="freqEdit" >
-     <property name="geometry" >
-      <rect>
-       <x>130</x>
-       <y>30</y>
-       <width>113</width>
-       <height>23</height>
-      </rect>
-     </property>
-    </widget>
-    <widget class="QLabel" name="freqLabel" >
-     <property name="geometry" >
-      <rect>
-       <x>10</x>
-       <y>30</y>
-       <width>111</width>
-       <height>17</height>
-      </rect>
-     </property>
-     <property name="text" >
-      <string>Frequency</string>
-     </property>
-    </widget>
-   </widget>
-   <widget class="QPushButton" name="pauseButton" >
-    <property name="geometry" >
-     <rect>
-      <x>790</x>
-      <y>520</y>
-      <width>101</width>
-      <height>31</height>
-     </rect>
-    </property>
-    <property name="text" >
-     <string>Pause</string>
-    </property>
-   </widget>
-   <widget class="QGroupBox" name="fmBox" >
-    <property name="geometry" >
-     <rect>
-      <x>290</x>
-      <y>520</y>
-      <width>251</width>
-      <height>131</height>
-     </rect>
-    </property>
-    <property name="title" >
-     <string>FM Tuner Parameters</string>
-    </property>
-    <widget class="QLineEdit" name="volumeEdit" >
-     <property name="geometry" >
-      <rect>
-       <x>130</x>
-       <y>20</y>
-       <width>113</width>
-       <height>23</height>
-      </rect>
-     </property>
-    </widget>
-    <widget class="QLabel" name="volumeLabel" >
-     <property name="geometry" >
-      <rect>
-       <x>10</x>
-       <y>20</y>
-       <width>111</width>
-       <height>17</height>
-      </rect>
-     </property>
-     <property name="text" >
-      <string>Volume</string>
-     </property>
-    </widget>
-   </widget>
-  </widget>
-  <widget class="QMenuBar" name="menubar" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>909</width>
-     <height>24</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile" >
-    <property name="title" >
-     <string>&amp;File</string>
-    </property>
-    <addaction name="actionExit" />
-   </widget>
-   <addaction name="menuFile" />
-  </widget>
-  <widget class="QStatusBar" name="statusbar" />
-  <action name="actionExit" >
-   <property name="text" >
-    <string>E&amp;xit</string>
-   </property>
-  </action>
- </widget>
- <tabstops>
-  <tabstop>closeButton</tabstop>
-  <tabstop>gainEdit</tabstop>
-  <tabstop>freqEdit</tabstop>
-  <tabstop>bandwidthEdit</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>closeButton</sender>
-   <signal>clicked()</signal>
-   <receiver>InterfaceWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>322</x>
-     <y>623</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>66</x>
-     <y>561</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>actionExit</sender>
-   <signal>triggered()</signal>
-   <receiver>InterfaceWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>617</x>
-     <y>327</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/gnuradio-examples/python/usrp2/usrp2_wfm_qt.py b/gnuradio-examples/python/usrp2/usrp2_wfm_qt.py
deleted file mode 100755
index 0c7476921..000000000
--- a/gnuradio-examples/python/usrp2/usrp2_wfm_qt.py
+++ /dev/null
@@ -1,355 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2006,2007,2008,2009 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.
-# 
-
-from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import audio
-from gnuradio import usrp2
-from gnuradio import blks2
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys
-import math
-
-
-try:
-    from gnuradio.qtgui import qtgui
-    from PyQt4 import QtGui, QtCore
-    import sip
-except ImportError:
-    print "Please install gr-qtgui."
-    sys.exit(1)
-    
-try:
-    from qt_wfm_interface import Ui_InterfaceWindow
-except ImportError:
-    print "Error: could not find qt_wfm_interface.py:"
-    print "\tPlease run: \"pyuic4 qt_wfm_interface.ui -o qt_wfm_interface.py\""
-    sys.exit(1)
-
-print "This program is not in a proper working state. Comment this out if you want to play."
-sys.exit(1)
-
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the QT Interface and Control Dialog
-# ////////////////////////////////////////////////////////////////////
-
-
-class dialog_box(QtGui.QMainWindow):
-    def __init__(self, snk_usrp, snk_vol, fg, parent=None):
-
-        QtGui.QWidget.__init__(self, parent)
-        self.gui = Ui_InterfaceWindow()
-        self.gui.setupUi(self)
-
-        self.fg = fg
-
-        # Set USRP parameters
-        self.set_bw(self.fg.usrp_bw())
-        self.set_freq(self.fg.freq())
-        self.set_gain(self.fg.gain())
-        self.set_volume(self.fg.volume())
-
-        # Add the qtsnk widgets to the hlayout box
-        self.gui.sinkLayout.addWidget(snk_usrp)
-        self.gui.sinkLayout.addWidget(snk_vol)
-
-
-        # Connect up some signals
-        self.connect(self.gui.pauseButton, QtCore.SIGNAL("clicked()"),
-                     self.pauseFg)
-
-        self.connect(self.gui.bandwidthEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.bwEditText)
-        self.connect(self.gui.freqEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.freqEditText)
-        self.connect(self.gui.gainEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainEditText)
-
-        self.connect(self.gui.volumeEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.volumeEditText)
-
-
-    def pauseFg(self):
-        if(self.gui.pauseButton.text() == "Pause"):
-            self.fg.stop()
-            self.fg.wait()
-            self.gui.pauseButton.setText("Unpause")
-        else:
-            self.fg.start()
-            self.gui.pauseButton.setText("Pause")
-
-
-    # Accessor functions for Gui to manipulate USRP
-    def set_bw(self, bw):
-        self.gui.bandwidthEdit.setText(QtCore.QString("%1").arg(bw))
-
-    def set_freq(self, freq):
-        self.gui.freqEdit.setText(QtCore.QString("%1").arg(freq))
-
-    def set_gain(self, gain):
-        self.gui.gainEdit.setText(QtCore.QString("%1").arg(gain))
-
-    def set_volume(self, vol):
-        self.gui.volumeEdit.setText(QtCore.QString("%1").arg(vol))
-
-    def bwEditText(self):
-        try:
-            bw = self.gui.bandwidthEdit.text().toDouble()[0]
-            self.fg.set_usrp_bw(bw)
-        except RuntimeError:
-            pass
-
-    def freqEditText(self):
-        try:
-            freq = self.gui.freqEdit.text().toDouble()[0]
-            self.fg.set_freq(freq)
-        except RuntimeError:
-            pass
-
-    def gainEditText(self):
-        try:
-            gain = self.gui.gainEdit.text().toDouble()[0]
-            self.fg.set_gain(gain)
-        except RuntimeError:
-            pass
-
-    def volumeEditText(self):
-        try:
-            vol = self.gui.volumeEdit.text().toDouble()[0]
-            self.fg.set_volume(vol)
-        except RuntimeError:
-            pass
-
-
-
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the GNU Radio Top Block
-# ////////////////////////////////////////////////////////////////////
-
-
-class wfm_rx_block (gr.top_block):
-    def __init__(self):
-        gr.top_block.__init__(self)
-        
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-e", "--interface", type="string", default="eth0",
-                          help="select Ethernet interface, default is eth0")
-        parser.add_option("-m", "--mac-addr", type="string", default="",
-                          help="select USRP by MAC address, default is auto-select")
-        #parser.add_option("-A", "--antenna", default=None,
-        #                  help="select Rx Antenna (only on RFX-series boards)")
-        parser.add_option("-f", "--freq", type="eng_float", default=100.1,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-V", "--volume", type="eng_float", default=None,
-                          help="set volume (default is midpoint)")
-        parser.add_option("-O", "--audio-output", type="string", default="",
-                          help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
-
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-        
-        self._volume = options.volume
-        self._usrp_freq = options.freq
-        self._usrp_gain = options.gain
-        self._audio_rate = int(32e3)
-
-        # build graph
-     
-        self.u = usrp2.source_32fc(options.interface, options.mac_addr)
-
-        # calculate decimation values to get USRP BW at 320 kHz
-        self.calculate_usrp_bw(320e3)
-
-        self.set_decim(self._usrp_decim)
-
-        #FIXME: need named constants and text descriptions available to (gr-)usrp2 even
-        #when usrp(1) module is not built.  A usrp_common module, perhaps?
-        dbid = self.u.daughterboard_id()
-        print "Using RX d'board 0x%04X" % (dbid,)
-        #if not (dbid == 0x0001 or #usrp_dbid.BASIC_RX
-        #        dbid == 0x0003 or #usrp_dbid.TV_RX
-        #        dbid == 0x000c or #usrp_dbid.TV_RX_REV_2
-        #        dbid == 0x0040 or #usrp_dbid.TV_RX_REV_3
-        #        dbid == 0x0043 or #usrp_dbid.TV_RX_MIMO
-        #        dbid == 0x0044 or #usrp_dbid.TV_RX_REV_2_MIMO
-        #        dbid == 0x0045 ): #usrp_dbid.TV_RX_REV_3_MIMO
-        #    print "This daughterboard does not cover the required frequency range"
-        #    print "for this application.  Please use a BasicRX or TVRX daughterboard."
-        #    raw_input("Press ENTER to continue anyway, or Ctrl-C to exit.")
-
-        chan_filt_coeffs = optfir.low_pass (1,                 # gain
-                                            self._usrp_rate,   # sampling rate
-                                            80e3,        # passband cutoff
-                                            115e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-        chan_filt = gr.fir_filter_ccf (self._chanfilt_decim, chan_filt_coeffs)
-
-        self.guts = blks2.wfm_rcv (self._demod_rate, self._audio_decim)
-
-        self.volume_control = gr.multiply_const_ff(1)
-
-        # sound card as final sink
-        #audio_sink = audio.sink (int (audio_rate),
-        #                         options.audio_output,
-        #                         False)  # ok_to_block
-        audio_sink = audio.sink (self._audio_rate,
-                                 options.audio_output)
-
-        
-        if self._usrp_gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.u.gain_range()
-            print "Gain range: ", g
-            self._usrp_gain = float(g[0]+g[1])/2
-
-        if self._volume is None:
-            g = self.volume_range()
-            self._volume = float(g[0]+g[1])/2
-            
-        if abs(self._usrp_freq) < 1e6:
-            self._usrp_freq *= 1e6
-
-        # set initial values
-        self.set_gain(self._usrp_gain)
-        self.set_volume(self._volume)
-        if not(self.set_freq(self._usrp_freq)):
-            print ("Failed to set initial frequency")
-
-
-        # Define a GUI sink to display the received signal
-        self.qapp = QtGui.QApplication(sys.argv)
-        fftsize = 2048
-        
-        self.usrp_rx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                    -self._usrp_rate/2.0, self._usrp_rate/2.0,
-                                    "Received Signal", True, True, False, True, False,
-                                    use_openGL=False)
-        self.usrp_rx2 = qtgui.sink_f(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                    -self._usrp_rate/2.0, self._usrp_rate/2.0,
-                                    "Received Signal", True, True, False, True, False)
-        
-        # now wire it all together
-        self.connect (self.u, chan_filt, self.guts, self.volume_control, audio_sink)
-        self.connect (self.u, self.usrp_rx)
-        self.connect (self.volume_control, self.usrp_rx2)
-        
-        usrp_rx_widget = sip.wrapinstance(self.usrp_rx.pyqwidget(), QtGui.QWidget)
-        usrp_rx2_widget = sip.wrapinstance(self.usrp_rx2.pyqwidget(), QtGui.QWidget)
-        
-        self.main_box = dialog_box(usrp_rx_widget, usrp_rx2_widget, self)
-        self.main_box.show()
-
-
-    def calculate_usrp_bw(self, bw):
-        """
-        Calculate the different decimation rates that make the USRP BW equal to the
-        input bandwidth parameter 'bw' and the audio bandwidth equal to the system-
-        wide bandwidth 'self._audio_rate'
-        """
-        
-        adc_rate = self.u.adc_rate()
-        d_usrp = int(adc_rate/bw)
-        bw_real = adc_rate / float(d_usrp)
-
-        d_chan = 1
-        demod_rate = bw_real / d_chan
-
-        d_audio = int(bw_real / self._audio_rate)
-        audio_rate = demod_rate / d_audio
-
-        self._usrp_decim  = d_usrp
-        self._chanfilt_decim = d_chan
-        self._audio_decim = d_audio
-        self._demod_rate = demod_rate
-        self._usrp_rate = bw_real
-
-        print "USRP Decimation:  ", self._usrp_decim
-        print "USRP Bandwidth:   ", bw_real
-        print "Audio Decimation: ", self._audio_decim
-        print "Audio Bandwidth:  ", audio_rate
-
-    def set_volume (self, vol):
-        g = self.volume_range()
-        self._volume = max(g[0], min(g[1], vol))
-        self.volume_control.set_k(10**(self._volume/10))
-                                        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        r = self.u.set_center_freq(target_freq)
-        if r:
-            self._usrp_freq = target_freq
-            return True
-        return False
-
-    def set_usrp_bw(self, bw):
-        self.calculate_usrp_bw(bw)
-
-    def set_gain(self, gain):
-        self._usrp_gain = gain
-        self.u.set_gain(gain)
-
-    def set_decim(self, decim):
-        self._usrp_decim = int(decim)
-        self.u.set_decim(self._usrp_decim)
-
-    def volume(self):
-        return self._volume
-    
-    def freq(self):
-        return self._usrp_freq
-
-    def usrp_bw(self):
-        return self._usrp_rate
-
-    def gain(self):
-        return self._usrp_gain
-
-    def decim(self):
-        return self._usrp_decim
-
-    def volume_range(self):
-        return (-20.0, 0.0, 0.5)
-        
-
-if __name__ == '__main__':
-    tb = wfm_rx_block()
-    tb.start()
-    tb.qapp.exec_()
-    
diff --git a/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py b/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py
deleted file mode 100755
index 2b94c458e..000000000
--- a/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py
+++ /dev/null
@@ -1,289 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2006,2007,2008,2009 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.
-# 
-
-from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import audio
-from gnuradio import usrp2
-from gnuradio import blks2
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import slider, powermate
-from gnuradio.wxgui import stdgui2, fftsink2, form
-from optparse import OptionParser
-import sys
-import math
-import wx
-
-class wfm_rx_block (stdgui2.std_top_block):
-    def __init__(self,frame,panel,vbox,argv):
-        stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv)
-
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-e", "--interface", type="string", default="eth0",
-                          help="select Ethernet interface, default is eth0")
-        parser.add_option("-m", "--mac-addr", type="string", default="",
-                          help="select USRP by MAC address, default is auto-select")
-        #parser.add_option("-A", "--antenna", default=None,
-        #                  help="select Rx Antenna (only on RFX-series boards)")
-        parser.add_option("-f", "--freq", type="eng_float", default=100.1,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-V", "--volume", type="eng_float", default=None,
-                          help="set volume (default is midpoint)")
-        parser.add_option("-O", "--audio-output", type="string", default="",
-                          help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
-
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-        
-        self.frame = frame
-        self.panel = panel
-        
-        self.vol = 0
-        self.state = "FREQ"
-        self.freq = 0
-
-        # build graph
-        
-        self.u = usrp2.source_32fc(options.interface, options.mac_addr)
-
-        adc_rate = self.u.adc_rate()                # 100 MS/s
-        usrp_decim = 312
-        self.u.set_decim(usrp_decim)
-        usrp_rate = adc_rate / usrp_decim           # ~320 kS/s
-        chanfilt_decim = 1
-        demod_rate = usrp_rate / chanfilt_decim
-        audio_decimation = 10
-        audio_rate = demod_rate / audio_decimation  # ~32 kHz
-
-        #FIXME: need named constants and text descriptions available to (gr-)usrp2 even
-        #when usrp(1) module is not built.  A usrp_common module, perhaps?
-        dbid = self.u.daughterboard_id()
-        print "Using RX d'board 0x%04X" % (dbid,)
-        if not (dbid == 0x0001 or #usrp_dbid.BASIC_RX
-                dbid == 0x0003 or #usrp_dbid.TV_RX
-                dbid == 0x000c or #usrp_dbid.TV_RX_REV_2
-                dbid == 0x0040 or #usrp_dbid.TV_RX_REV_3
-                dbid == 0x0043 or #usrp_dbid.TV_RX_MIMO
-                dbid == 0x0044 or #usrp_dbid.TV_RX_REV_2_MIMO
-                dbid == 0x0045 or #usrp_dbid.TV_RX_REV_3_MIMO
-                dbid == 0x0053 ): #usrp_dbid.WBX
-            print "This daughterboard does not cover the required frequency range"
-            print "for this application.  Please use a BasicRX or TVRX daughterboard."
-            raw_input("Press ENTER to continue anyway, or Ctrl-C to exit.")
-
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
-                                            usrp_rate,   # sampling rate
-                                            80e3,        # passband cutoff
-                                            115e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-        chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
-
-        self.guts = blks2.wfm_rcv (demod_rate, audio_decimation)
-
-        self.volume_control = gr.multiply_const_ff(self.vol)
-
-        # sound card as final sink
-        audio_sink = audio.sink (int (audio_rate),
-                                 options.audio_output,
-                                 False)  # ok_to_block
-        
-        # now wire it all together
-        self.connect (self.u, chan_filt, self.guts, self.volume_control, audio_sink)
-
-        self._build_gui(vbox, usrp_rate, demod_rate, audio_rate)
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.u.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-        if options.volume is None:
-            g = self.volume_range()
-            options.volume = float(g[0]+g[1])/2
-            
-        if abs(options.freq) < 1e6:
-            options.freq *= 1e6
-
-        # set initial values
-
-        self.set_gain(options.gain)
-        self.set_vol(options.volume)
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-
-
-    def _set_status_msg(self, msg, which=0):
-        self.frame.GetStatusBar().SetStatusText(msg, which)
-
-
-    def _build_gui(self, vbox, usrp_rate, demod_rate, audio_rate):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-
-
-        if 1:
-            self.src_fft = fftsink2.fft_sink_c(self.panel, title="Data from USRP2",
-                                               fft_size=512, sample_rate=usrp_rate,
-					       ref_scale=1.0, ref_level=0, y_divs=12)
-            self.connect (self.u, self.src_fft)
-            vbox.Add (self.src_fft.win, 4, wx.EXPAND)
-
-        if 1:
-            post_filt_fft = fftsink2.fft_sink_f(self.panel, title="Post Demod", 
-                                                fft_size=1024, sample_rate=usrp_rate,
-                                                y_per_div=10, ref_level=0)
-            self.connect (self.guts.fm_demod, post_filt_fft)
-            vbox.Add (post_filt_fft.win, 4, wx.EXPAND)
-
-        if 0:
-            post_deemph_fft = fftsink2.fft_sink_f(self.panel, title="Post Deemph",
-                                                  fft_size=512, sample_rate=audio_rate,
-                                                  y_per_div=10, ref_level=-20)
-            self.connect (self.guts.deemph, post_deemph_fft)
-            vbox.Add (post_deemph_fft.win, 4, wx.EXPAND)
-
-        
-        # control area form at bottom
-        self.myform = myform = form.form()
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=hbox, label="Freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-        hbox.Add((5,0), 0)
-        myform['freq_slider'] = \
-            form.quantized_slider_field(parent=self.panel, sizer=hbox, weight=3,
-                                        range=(87.9e6, 108.1e6, 0.1e6),
-                                        callback=self.set_freq)
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-
-        myform['volume'] = \
-            form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Volume",
-                                        weight=3, range=self.volume_range(),
-                                        callback=self.set_vol)
-        hbox.Add((5,0), 1)
-
-        myform['gain'] = \
-            form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                        weight=3, range=self.u.gain_range(),
-                                        callback=self.set_gain)
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        try:
-            self.knob = powermate.powermate(self.frame)
-            self.rot = 0
-            powermate.EVT_POWERMATE_ROTATE (self.frame, self.on_rotate)
-            powermate.EVT_POWERMATE_BUTTON (self.frame, self.on_button)
-        except:
-            pass
-            #print "FYI: No Powermate or Contour Knob found"
-
-
-    def on_rotate (self, event):
-        self.rot += event.delta
-        if (self.state == "FREQ"):
-            if self.rot >= 3:
-                self.set_freq(self.freq + .1e6)
-                self.rot -= 3
-            elif self.rot <=-3:
-                self.set_freq(self.freq - .1e6)
-                self.rot += 3
-        else:
-            step = self.volume_range()[2]
-            if self.rot >= 3:
-                self.set_vol(self.vol + step)
-                self.rot -= 3
-            elif self.rot <=-3:
-                self.set_vol(self.vol - step)
-                self.rot += 3
-            
-    def on_button (self, event):
-        if event.value == 0:        # button up
-            return
-        self.rot = 0
-        if self.state == "FREQ":
-            self.state = "VOL"
-        else:
-            self.state = "FREQ"
-        self.update_status_bar ()
-        
-
-    def set_vol (self, vol):
-        g = self.volume_range()
-        self.vol = max(g[0], min(g[1], vol))
-        self.volume_control.set_k(10**(self.vol/10))
-        self.myform['volume'].set_value(self.vol)
-        self.update_status_bar ()
-                                        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        r = self.u.set_center_freq(target_freq)
-        if r:
-            self.freq = target_freq
-            self.myform['freq'].set_value(target_freq)         # update displayed value
-            self.myform['freq_slider'].set_value(target_freq)  # update displayed value
-            self.update_status_bar()
-            self._set_status_msg("OK", 0)
-            return True
-
-        self._set_status_msg("Failed", 0)
-        return False
-
-    def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-        self.u.set_gain(gain)
-
-    def update_status_bar (self):
-        msg = "Volume:%r  Setting:%s" % (self.vol, self.state)
-        self._set_status_msg(msg, 1)
-        self.src_fft.set_baseband_freq(self.freq)
-
-    def volume_range(self):
-        return (-20.0, 0.0, 0.5)
-        
-
-if __name__ == '__main__':
-    app = stdgui2.stdapp (wfm_rx_block, "USRP2 WFM RX")
-    app.MainLoop ()
diff --git a/gnuradio-pkg_chk.conf b/gnuradio-pkg_chk.conf
index 7f81101f4..0c7de2bb6 100644
--- a/gnuradio-pkg_chk.conf
+++ b/gnuradio-pkg_chk.conf
@@ -65,15 +65,6 @@ devel/SDL
 devel/doxygen		doc
 textproc/xmlto		doc
 
-## USRP
-
-devel/sdcc
-devel/libusb
-
 ## GUI
 
 x11/py-wxWidgets
-
-## gr-radio-astronomy
-
-math/py-ephem
diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt
new file mode 100644
index 000000000..670ff7e40
--- /dev/null
+++ b/gr-atsc/CMakeLists.txt
@@ -0,0 +1,106 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-atsc" ENABLE_GR_ATSC
+    Boost_FOUND
+    ENABLE_GR_CORE
+)
+
+GR_SET_GLOBAL(GR_ATSC_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_ATSC)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_ATSC_DESCRIPTION "GNU Radio ATSC Blocks")
+
+CPACK_COMPONENT("atsc_runtime"
+    GROUP        "ATSC"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("atsc_devel"
+    GROUP        "ATSC"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("atsc_python"
+    GROUP        "ATSC"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "core_python;atsc_runtime"
+)
+
+CPACK_COMPONENT("atsc_examples"
+    GROUP        "ATSC"
+    DISPLAY_NAME "Examples"
+    DESCRIPTION  "Python examples for ATSC"
+    DEPENDS      "atsc_python"
+)
+
+CPACK_COMPONENT("atsc_swig"
+    GROUP        "ATSC"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;atsc_python;atsc_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(src/lib)
+if(ENABLE_PYTHON)
+    add_subdirectory(src/python)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-atsc.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-atsc.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-atsc.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "atsc_devel"
+)
+
+endif(ENABLE_GR_ATSC)
diff --git a/gr-atsc/src/lib/CMakeLists.txt b/gr-atsc/src/lib/CMakeLists.txt
new file mode 100644
index 000000000..1d4501d27
--- /dev/null
+++ b/gr-atsc/src/lib/CMakeLists.txt
@@ -0,0 +1,228 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_ATSC_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# Generate viterbi mux source
+# http://www.vtk.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build
+########################################################################
+if(NOT CMAKE_CROSSCOMPILING)
+    add_executable(atsci_viterbi_gen atsci_viterbi_gen.cc)
+    export(TARGETS atsci_viterbi_gen APPEND FILE ${EXPORT_FILE})
+endif()
+
+
+set(atsci_viterbi_mux_cc ${CMAKE_CURRENT_BINARY_DIR}/atsci_viterbi_mux.cc)
+
+add_custom_command(
+    OUTPUT ${atsci_viterbi_mux_cc}
+    DEPENDS atsci_viterbi_gen
+    COMMAND atsci_viterbi_gen -o ${atsci_viterbi_mux_cc}
+)
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gr_atsc_sources
+    ${atsci_viterbi_mux_cc}
+    atsc_derandomizer.cc
+    atsc_randomizer.cc
+    atsc_rs_decoder.cc
+    atsc_rs_encoder.cc
+    atsc_interleaver.cc
+    atsc_deinterleaver.cc
+    atsc_trellis_encoder.cc
+    atsc_viterbi_decoder.cc
+    atsc_ds_to_softds.cc
+    atsc_field_sync_mux.cc
+    atsc_field_sync_demux.cc
+    atsc_equalizer.cc
+    atsc_fs_checker.cc
+    atsc_bit_timing_loop.cc
+    atsc_fpll.cc
+    atsc_depad.cc
+    atsc_pad.cc
+    atsci_basic_trellis_encoder.cc
+    atsci_data_interleaver.cc
+    atsci_equalizer.cc
+    atsci_equalizer_lms.cc
+    atsci_equalizer_lms2.cc
+    atsci_equalizer_nop.cc
+    atsci_fake_single_viterbi.cc
+    atsci_fs_checker.cc
+    atsci_fs_checker_naive.cc
+    atsci_fs_correlator.cc
+    atsci_fs_correlator_naive.cc
+    atsci_single_viterbi.cc
+    atsci_sssr.cc
+    atsci_pnXXX.cc
+    atsci_randomizer.cc
+    atsci_reed_solomon.cc
+    atsci_sliding_correlator.cc
+    atsci_trellis_encoder.cc
+    atsci_viterbi_decoder.cc
+    create_atsci_equalizer.cc
+    create_atsci_fs_checker.cc
+    create_atsci_fs_correlator.cc
+    plinfo.cc
+)
+
+list(APPEND atsc_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+)
+
+add_library(gnuradio-atsc SHARED ${gr_atsc_sources})
+target_link_libraries(gnuradio-atsc ${atsc_libs})
+GR_LIBRARY_FOO(gnuradio-atsc RUNTIME_COMPONENT "atsc_runtime" DEVEL_COMPONENT "atsc_devel")
+
+########################################################################
+# Build and register unit test
+########################################################################
+if(ENABLE_TESTING)
+
+include_directories(${CPPUNIT_INCLUDE_DIRS})
+link_directories(${CPPUNIT_LIBRARY_DIRS})
+
+list(APPEND test_atsci_sources
+    qa_atsci_basic_trellis_encoder.cc
+    qa_atsci_data_interleaver.cc
+    qa_atsci_equalizer_nop.cc
+    qa_atsci_fake_single_viterbi.cc
+    qa_atsci_fs_correlator.cc
+    qa_atsci_single_viterbi.cc
+    qa_atsci_randomizer.cc
+    qa_atsci_reed_solomon.cc
+    qa_atsci_sliding_correlator.cc
+    qa_atsci_trellis_encoder.cc
+    qa_atsci_viterbi_decoder.cc
+    qa_convolutional_interleaver.cc
+    qa_atsci.cc
+    qa_interleaver_fifo.cc
+)
+
+include(GrTest)
+set(GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-core gruel)
+add_executable(test_atsci ${test_atsci_sources} test_atsci.cc)
+target_link_libraries(test_atsci gnuradio-atsc gnuradio-core ${CPPUNIT_LIBRARIES})
+GR_ADD_TEST(atsci-test test_atsci)
+
+endif(ENABLE_TESTING)
+
+########################################################################
+# Install public header files
+########################################################################
+install(FILES
+    atsc_api.h
+    atsc_consts.h
+    atsc_derandomizer.h
+    atsc_randomizer.h
+    atsc_rs_decoder.h
+    atsc_rs_encoder.h
+    atsc_interleaver.h
+    atsc_deinterleaver.h
+    atsc_trellis_encoder.h
+    atsc_viterbi_decoder.h
+    atsc_ds_to_softds.h
+    atsc_field_sync_mux.h
+    atsc_field_sync_demux.h
+    atsc_equalizer.h
+    atsc_fs_checker.h
+    atsc_bit_timing_loop.h
+    atsc_fpll.h
+    atsc_depad.h
+    atsc_pad.h
+    atsc_types.h
+    atsci_basic_trellis_encoder.h
+    atsci_data_interleaver.h
+    atsci_diag_output.h
+    atsci_equalizer.h
+    atsci_equalizer_lms.h
+    atsci_equalizer_lms2.h
+    atsci_equalizer_nop.h
+    atsci_exp2_lp.h
+    atsci_fake_single_viterbi.h
+    atsci_fs_checker.h
+    atsci_fs_checker_naive.h
+    atsci_fs_correlator.h
+    atsci_fs_correlator_naive.h
+    atsci_pnXXX.h
+    atsci_randomizer.h
+    atsci_reed_solomon.h
+    atsci_root_raised_cosine.h
+    atsci_root_raised_cosine_bandpass.h
+    atsci_single_viterbi.h
+    atsci_slicer_agc.h
+    atsci_sliding_correlator.h
+    atsci_sssr.h
+    atsci_syminfo.h
+    atsci_sync_tag.h
+    atsci_trellis_encoder.h
+    atsci_viterbi_decoder.h
+    atsci_vsbtx_lp.h
+    convolutional_interleaver.h
+    create_atsci_equalizer.h
+    create_atsci_fs_checker.h
+    create_atsci_fs_correlator.h
+    fpll_btloop_coupling.h
+    interleaver_fifo.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "atsc_devel"
+)
+
+########################################################################
+# Setup swig generation
+########################################################################
+if(ENABLE_PYTHON)
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_ATSC_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_LIBRARIES gnuradio-atsc)
+
+GR_SWIG_MAKE(atsc atsc.i)
+
+GR_SWIG_INSTALL(
+    TARGETS atsc
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio
+    COMPONENT "atsc_python"
+)
+
+install(
+    FILES atsc.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "atsc_swig"
+)
+
+endif(ENABLE_PYTHON)
diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index b1bda90ff..0a2871a50 100644
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -123,6 +123,7 @@ libgnuradio_atsc_qa_la_LDFLAGS = \
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =				\
+	atsc_api.h					\
 	atsc_consts.h				\
 	atsc_derandomizer.h			\
 	atsc_randomizer.h			\
@@ -174,7 +175,9 @@ grinclude_HEADERS =				\
 	create_atsci_fs_checker.h		\
 	create_atsci_fs_correlator.h		\
 	fpll_btloop_coupling.h			\
-	interleaver_fifo.h			\
+	interleaver_fifo.h
+
+noinst_HEADERS = 				\
 	qa_atsci.h				\
 	qa_atsci_basic_trellis_encoder.h	\
 	qa_atsci_data_interleaver.h		\
diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 7dbb98b46..67f9c094a 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -105,7 +105,7 @@ _atsc_la_CXXFLAGS =			\
 	$(atsc_la_swig_cxxflags)
 
 python/atsc.cc: atsc.py
-atsc.py: atsc.i
+atsc.py: atsc.i 
 
 # Include the python dependencies for this file
 -include python/atsc.d
diff --git a/gr-atsc/src/lib/atsc_api.h b/gr-atsc/src/lib/atsc_api.h
new file mode 100644
index 000000000..5add37762
--- /dev/null
+++ b/gr-atsc/src/lib/atsc_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_ATSC_API_H
+#define INCLUDED_ATSC_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_atsc_EXPORTS
+#  define ATSC_API __GR_ATTR_EXPORT
+#else
+#  define ATSC_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_ATSC_API_H */
diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.h b/gr-atsc/src/lib/atsc_bit_timing_loop.h
index c9b63fee9..2adff26b8 100644
--- a/gr-atsc/src/lib/atsc_bit_timing_loop.h
+++ b/gr-atsc/src/lib/atsc_bit_timing_loop.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_ATSC_BIT_TIMING_LOOP_H
 #define INCLUDED_ATSC_BIT_TIMING_LOOP_H
 
+#include <atsc_api.h>
 #include <cstdio>
 #include <gr_block.h>
 #include <atsci_diag_output.h>
@@ -31,7 +32,7 @@
 class atsc_bit_timing_loop;
 typedef boost::shared_ptr<atsc_bit_timing_loop> atsc_bit_timing_loop_sptr;
 
-atsc_bit_timing_loop_sptr atsc_make_bit_timing_loop();
+ATSC_API atsc_bit_timing_loop_sptr atsc_make_bit_timing_loop();
 
 /*!
  * \brief ATSC BitTimingLoop3
@@ -40,9 +41,9 @@ atsc_bit_timing_loop_sptr atsc_make_bit_timing_loop();
  * This class accepts a single real input and produces two outputs,
  *  the raw symbol (float) and the tag (atsc_syminfo)
  */
-class atsc_bit_timing_loop : public gr_block
+class ATSC_API atsc_bit_timing_loop : public gr_block
 {
-  friend atsc_bit_timing_loop_sptr atsc_make_bit_timing_loop();
+  friend ATSC_API atsc_bit_timing_loop_sptr atsc_make_bit_timing_loop();
 
   atsc_bit_timing_loop();
 
diff --git a/gr-atsc/src/lib/atsc_deinterleaver.h b/gr-atsc/src/lib/atsc_deinterleaver.h
index 0920818a4..8cab62b62 100644
--- a/gr-atsc/src/lib/atsc_deinterleaver.h
+++ b/gr-atsc/src/lib/atsc_deinterleaver.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_DEINTERLEAVER_H
 #define INCLUDED_ATSC_DEINTERLEAVER_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsci_data_interleaver.h>
 
 class atsc_deinterleaver;
 typedef boost::shared_ptr<atsc_deinterleaver> atsc_deinterleaver_sptr;
 
-atsc_deinterleaver_sptr atsc_make_deinterleaver();
+ATSC_API atsc_deinterleaver_sptr atsc_make_deinterleaver();
 
 /*!
  * \brief Deinterleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_packet_rs_encoded)
@@ -36,9 +37,9 @@ atsc_deinterleaver_sptr atsc_make_deinterleaver();
  *
  * input: atsc_mpeg_packet_rs_encoded; output: atsc_mpeg_packet_rs_encoded
  */
-class atsc_deinterleaver : public gr_sync_block
+class ATSC_API atsc_deinterleaver : public gr_sync_block
 {
-  friend atsc_deinterleaver_sptr atsc_make_deinterleaver();
+  friend ATSC_API atsc_deinterleaver_sptr atsc_make_deinterleaver();
 
   atsci_data_deinterleaver	d_deinterleaver;
 
diff --git a/gr-atsc/src/lib/atsc_depad.h b/gr-atsc/src/lib/atsc_depad.h
index 58dfdaf62..b514efe28 100644
--- a/gr-atsc/src/lib/atsc_depad.h
+++ b/gr-atsc/src/lib/atsc_depad.h
@@ -22,12 +22,13 @@
 #ifndef INCLUDED_ATSC_DEPAD_H
 #define INCLUDED_ATSC_DEPAD_H
 
+#include <atsc_api.h>
 #include <gr_sync_interpolator.h>
 
 class atsc_depad;
 typedef boost::shared_ptr<atsc_depad> atsc_depad_sptr;
 
-atsc_depad_sptr atsc_make_depad();
+ATSC_API atsc_depad_sptr atsc_make_depad();
 
 /*!
  * \brief depad mpeg ts packets from 256 byte atsc_mpeg_packet to 188 byte char
@@ -35,9 +36,9 @@ atsc_depad_sptr atsc_make_depad();
  *
  * input: atsc_mpeg_packet; output: unsigned char
  */
-class atsc_depad : public gr_sync_interpolator
+class ATSC_API atsc_depad : public gr_sync_interpolator
 {
-  friend atsc_depad_sptr atsc_make_depad();
+  friend ATSC_API atsc_depad_sptr atsc_make_depad();
 
   atsc_depad();
 
diff --git a/gr-atsc/src/lib/atsc_derandomizer.h b/gr-atsc/src/lib/atsc_derandomizer.h
index a72efbd4e..54254d0c5 100644
--- a/gr-atsc/src/lib/atsc_derandomizer.h
+++ b/gr-atsc/src/lib/atsc_derandomizer.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_DERANDOMIZER_H
 #define INCLUDED_ATSC_DERANDOMIZER_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsci_randomizer.h>
 
 class atsc_derandomizer;
 typedef boost::shared_ptr<atsc_derandomizer> atsc_derandomizer_sptr;
 
-atsc_derandomizer_sptr atsc_make_derandomizer();
+ATSC_API atsc_derandomizer_sptr atsc_make_derandomizer();
 
 /*!
  * \brief "dewhiten" incoming mpeg transport stream packets
@@ -36,9 +37,9 @@ atsc_derandomizer_sptr atsc_make_derandomizer();
  *
  * input: atsc_mpeg_packet_no_sync; output: atsc_mpeg_packet; 
  */
-class atsc_derandomizer : public gr_sync_block
+class ATSC_API atsc_derandomizer : public gr_sync_block
 {
-  friend atsc_derandomizer_sptr atsc_make_derandomizer();
+  friend ATSC_API atsc_derandomizer_sptr atsc_make_derandomizer();
 
   atsci_randomizer	d_rand;
 
diff --git a/gr-atsc/src/lib/atsc_ds_to_softds.h b/gr-atsc/src/lib/atsc_ds_to_softds.h
index f8623e3b0..1021eed6f 100644
--- a/gr-atsc/src/lib/atsc_ds_to_softds.h
+++ b/gr-atsc/src/lib/atsc_ds_to_softds.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_DS_TO_SOFTDS_H
 #define INCLUDED_ATSC_DS_TO_SOFTDS_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsc_types.h>
 
 class atsc_ds_to_softds;
 typedef boost::shared_ptr<atsc_ds_to_softds> atsc_ds_to_softds_sptr;
 
-atsc_ds_to_softds_sptr atsc_make_ds_to_softds();
+ATSC_API atsc_ds_to_softds_sptr atsc_make_ds_to_softds();
 
 /*!
  * \brief Debug glue routine (atsc_data_segment --> atsc_soft_data_segment)
@@ -36,9 +37,9 @@ atsc_ds_to_softds_sptr atsc_make_ds_to_softds();
  *
  * input: atsc_data_segment; output: atsc_soft_data_segment
  */
-class atsc_ds_to_softds : public gr_sync_block
+class ATSC_API atsc_ds_to_softds : public gr_sync_block
 {
-  friend atsc_ds_to_softds_sptr atsc_make_ds_to_softds();
+  friend ATSC_API atsc_ds_to_softds_sptr atsc_make_ds_to_softds();
 
   atsc_ds_to_softds();
 
diff --git a/gr-atsc/src/lib/atsc_equalizer.h b/gr-atsc/src/lib/atsc_equalizer.h
index 52b5cd38d..773cd1a04 100644
--- a/gr-atsc/src/lib/atsc_equalizer.h
+++ b/gr-atsc/src/lib/atsc_equalizer.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_EQUALIZER_H
 #define INCLUDED_ATSC_EQUALIZER_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsci_equalizer.h>
 
 class atsc_equalizer;
 typedef boost::shared_ptr<atsc_equalizer> atsc_equalizer_sptr;
 
-atsc_equalizer_sptr atsc_make_equalizer();
+atsc_equalizer_sptr ATSC_API atsc_make_equalizer();
 
 /*!
  * \brief ATSC equalizer (float,syminfo --> float,syminfo)
@@ -37,9 +38,9 @@ atsc_equalizer_sptr atsc_make_equalizer();
  * first inputs are data samples, second inputs are tags.
  * first outputs are equalized data samples, second outputs are tags.
  */
-class atsc_equalizer : public gr_sync_block
+class ATSC_API atsc_equalizer : public gr_sync_block
 {
-  friend atsc_equalizer_sptr atsc_make_equalizer();
+  friend ATSC_API atsc_equalizer_sptr atsc_make_equalizer();
 
   atsc_equalizer();
 
diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.h b/gr-atsc/src/lib/atsc_field_sync_demux.h
index 01cc33f87..0e3a5003d 100644
--- a/gr-atsc/src/lib/atsc_field_sync_demux.h
+++ b/gr-atsc/src/lib/atsc_field_sync_demux.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
 #define INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
 
+#include <atsc_api.h>
 #include <gr_block.h>
 #include <atsc_types.h>
 
 class atsc_field_sync_demux;
 typedef boost::shared_ptr<atsc_field_sync_demux> atsc_field_sync_demux_sptr;
 
-atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
+ATSC_API atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
 
 /*!
  * \brief ATSC Field Sync Demux
@@ -37,9 +38,9 @@ atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
  * \ingroup atsc
  *
  */
-class atsc_field_sync_demux : public gr_block
+class ATSC_API atsc_field_sync_demux : public gr_block
 {
-  friend atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
+  friend ATSC_API atsc_field_sync_demux_sptr atsc_make_field_sync_demux();
 
   atsc_field_sync_demux();
 
diff --git a/gr-atsc/src/lib/atsc_field_sync_mux.h b/gr-atsc/src/lib/atsc_field_sync_mux.h
index 189341cb9..d08a99b5b 100644
--- a/gr-atsc/src/lib/atsc_field_sync_mux.h
+++ b/gr-atsc/src/lib/atsc_field_sync_mux.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_FIELD_SYNC_MUX_H
 #define INCLUDED_ATSC_FIELD_SYNC_MUX_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsc_types.h>
 
 class atsc_field_sync_mux;
 typedef boost::shared_ptr<atsc_field_sync_mux> atsc_field_sync_mux_sptr;
 
-atsc_field_sync_mux_sptr atsc_make_field_sync_mux();
+ATSC_API atsc_field_sync_mux_sptr atsc_make_field_sync_mux();
 
 /*!
  * \brief Insert ATSC Field Syncs as required (atsc_data_segment --> atsc_data_segment)
@@ -36,9 +37,9 @@ atsc_field_sync_mux_sptr atsc_make_field_sync_mux();
  *
  * input: atsc_data_segment; output: atsc_data_segment
  */
-class atsc_field_sync_mux : public gr_sync_block
+class ATSC_API atsc_field_sync_mux : public gr_sync_block
 {
-  friend atsc_field_sync_mux_sptr atsc_make_field_sync_mux();
+  friend ATSC_API atsc_field_sync_mux_sptr atsc_make_field_sync_mux();
 
   atsc_field_sync_mux();
 
diff --git a/gr-atsc/src/lib/atsc_fpll.h b/gr-atsc/src/lib/atsc_fpll.h
index 1ed41d865..dac3cda86 100644
--- a/gr-atsc/src/lib/atsc_fpll.h
+++ b/gr-atsc/src/lib/atsc_fpll.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_ATSC_FPLL_H
 #define INCLUDED_ATSC_FPLL_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <gr_nco.h>
 #include <gr_single_pole_iir.h>
@@ -32,7 +33,7 @@
 class atsc_fpll;
 typedef boost::shared_ptr<atsc_fpll> atsc_fpll_sptr;
 
-atsc_fpll_sptr atsc_make_fpll();
+ATSC_API atsc_fpll_sptr atsc_make_fpll();
 
 /*!
  * \brief ATSC FPLL (2nd Version)
@@ -45,9 +46,9 @@ atsc_fpll_sptr atsc_make_fpll();
  * This class accepts a single real input and produces a single real output
  */
 
-class atsc_fpll : public gr_sync_block
+class ATSC_API atsc_fpll : public gr_sync_block
 {
-  friend atsc_fpll_sptr atsc_make_fpll();
+  friend ATSC_API atsc_fpll_sptr atsc_make_fpll();
 
   atsc_fpll();
 
diff --git a/gr-atsc/src/lib/atsc_fs_checker.h b/gr-atsc/src/lib/atsc_fs_checker.h
index e7271af22..03e50ee9d 100644
--- a/gr-atsc/src/lib/atsc_fs_checker.h
+++ b/gr-atsc/src/lib/atsc_fs_checker.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_FS_CHECKER_H
 #define INCLUDED_ATSC_FS_CHECKER_H
 
+#include <atsc_api.h>
 #include <atsci_fs_checker.h>
 #include <gr_sync_block.h>
 
 class atsc_fs_checker;
 typedef boost::shared_ptr<atsc_fs_checker> atsc_fs_checker_sptr;
 
-atsc_fs_checker_sptr atsc_make_fs_checker();
+ATSC_API atsc_fs_checker_sptr atsc_make_fs_checker();
 
 /*!
  * \brief ATSC field sync checker (float,syminfo --> float,syminfo)
@@ -38,7 +39,7 @@ atsc_fs_checker_sptr atsc_make_fs_checker();
  * second output is set of tags, one-for-one with first output.
  */
 
-class atsc_fs_checker : public gr_sync_block
+class ATSC_API atsc_fs_checker : public gr_sync_block
 {
   friend atsc_fs_checker_sptr atsc_make_fs_checker();
 
diff --git a/gr-atsc/src/lib/atsc_interleaver.h b/gr-atsc/src/lib/atsc_interleaver.h
index 5f82b7596..00cd54c11 100644
--- a/gr-atsc/src/lib/atsc_interleaver.h
+++ b/gr-atsc/src/lib/atsc_interleaver.h
@@ -22,22 +22,23 @@
 #ifndef INCLUDED_ATSC_INTERLEAVER_H
 #define INCLUDED_ATSC_INTERLEAVER_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsci_data_interleaver.h>
 
 class atsc_interleaver;
 typedef boost::shared_ptr<atsc_interleaver> atsc_interleaver_sptr;
 
-atsc_interleaver_sptr atsc_make_interleaver();
+ATSC_API atsc_interleaver_sptr atsc_make_interleaver();
 
 /*!  \brief Interleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_packet_rs_encoded)* 
  *   \ingroup atsc
  *
  * input: atsc_mpeg_packet_rs_encoded; output: atsc_mpeg_packet_rs_encoded
  */
-class atsc_interleaver : public gr_sync_block
+class ATSC_API atsc_interleaver : public gr_sync_block
 {
-  friend atsc_interleaver_sptr atsc_make_interleaver();
+  friend ATSC_API atsc_interleaver_sptr atsc_make_interleaver();
 
   atsci_data_interleaver	d_interleaver;
 
diff --git a/gr-atsc/src/lib/atsc_pad.h b/gr-atsc/src/lib/atsc_pad.h
index e7e6874fb..866c72552 100644
--- a/gr-atsc/src/lib/atsc_pad.h
+++ b/gr-atsc/src/lib/atsc_pad.h
@@ -22,12 +22,13 @@
 #ifndef INCLUDED_ATSC_PAD_H
 #define INCLUDED_ATSC_PAD_H
 
+#include <atsc_api.h>
 #include <gr_sync_decimator.h>
 
 class atsc_pad;
 typedef boost::shared_ptr<atsc_pad> atsc_pad_sptr;
 
-atsc_pad_sptr atsc_make_pad();
+ATSC_API atsc_pad_sptr atsc_make_pad();
 
 /*!
  * \brief pad mpeg ts packets from 188 byte char to 
@@ -36,9 +37,9 @@ atsc_pad_sptr atsc_make_pad();
  *
  * input: unsigned char; output: atsc_mpeg_packet
  */
-class atsc_pad : public gr_sync_decimator
+class ATSC_API atsc_pad : public gr_sync_decimator
 {
-  friend atsc_pad_sptr atsc_make_pad();
+  friend ATSC_API atsc_pad_sptr atsc_make_pad();
 
   atsc_pad();
 
diff --git a/gr-atsc/src/lib/atsc_randomizer.h b/gr-atsc/src/lib/atsc_randomizer.h
index 6617bcc28..1178f06c0 100644
--- a/gr-atsc/src/lib/atsc_randomizer.h
+++ b/gr-atsc/src/lib/atsc_randomizer.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_RANDOMIZER_H
 #define INCLUDED_ATSC_RANDOMIZER_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsci_randomizer.h>
 
 class atsc_randomizer;
 typedef boost::shared_ptr<atsc_randomizer> atsc_randomizer_sptr;
 
-atsc_randomizer_sptr atsc_make_randomizer();
+ATSC_API atsc_randomizer_sptr atsc_make_randomizer();
 
 /*!
  * \brief "Whiten" incoming mpeg transport stream packets
@@ -36,9 +37,9 @@ atsc_randomizer_sptr atsc_make_randomizer();
  *
  * input: atsc_mpeg_packet; output: atsc_mpeg_packet_no_sync
  */
-class atsc_randomizer : public gr_sync_block
+class ATSC_API atsc_randomizer : public gr_sync_block
 {
-  friend atsc_randomizer_sptr atsc_make_randomizer();
+  friend ATSC_API atsc_randomizer_sptr atsc_make_randomizer();
 
   atsci_randomizer	d_rand;
   bool			d_field2;	// user to init plinfo in output
diff --git a/gr-atsc/src/lib/atsc_rs_decoder.h b/gr-atsc/src/lib/atsc_rs_decoder.h
index 00dea1603..4b8d6c1b4 100644
--- a/gr-atsc/src/lib/atsc_rs_decoder.h
+++ b/gr-atsc/src/lib/atsc_rs_decoder.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_RS_DECODER_H
 #define INCLUDED_ATSC_RS_DECODER_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsci_reed_solomon.h>
 
 class atsc_rs_decoder;
 typedef boost::shared_ptr<atsc_rs_decoder> atsc_rs_decoder_sptr;
 
-atsc_rs_decoder_sptr atsc_make_rs_decoder();
+ATSC_API atsc_rs_decoder_sptr atsc_make_rs_decoder();
 
 /*!
  * \brief Reed-Solomon decoder for ATSC
@@ -36,9 +37,9 @@ atsc_rs_decoder_sptr atsc_make_rs_decoder();
  *
  * input: atsc_mpeg_packet_rs_encoded; output: atsc_mpeg_packet_no_sync
  */
-class atsc_rs_decoder : public gr_sync_block
+class ATSC_API atsc_rs_decoder : public gr_sync_block
 {
-  friend atsc_rs_decoder_sptr atsc_make_rs_decoder();
+  friend ATSC_API atsc_rs_decoder_sptr atsc_make_rs_decoder();
 
   atsci_reed_solomon	d_rs_decoder;
 
diff --git a/gr-atsc/src/lib/atsc_rs_encoder.h b/gr-atsc/src/lib/atsc_rs_encoder.h
index 312b2e1cb..d9812678a 100644
--- a/gr-atsc/src/lib/atsc_rs_encoder.h
+++ b/gr-atsc/src/lib/atsc_rs_encoder.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_RS_ENCODER_H
 #define INCLUDED_ATSC_RS_ENCODER_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsci_reed_solomon.h>
 
 class atsc_rs_encoder;
 typedef boost::shared_ptr<atsc_rs_encoder> atsc_rs_encoder_sptr;
 
-atsc_rs_encoder_sptr atsc_make_rs_encoder();
+ATSC_API atsc_rs_encoder_sptr atsc_make_rs_encoder();
 
 /*!
  * \brief Reed-Solomon encoder for ATSC
@@ -36,9 +37,9 @@ atsc_rs_encoder_sptr atsc_make_rs_encoder();
  *
  * input: atsc_mpeg_packet_no_sync; output: atsc_mpeg_packet_rs_encoded
  */
-class atsc_rs_encoder : public gr_sync_block
+class ATSC_API atsc_rs_encoder : public gr_sync_block
 {
-  friend atsc_rs_encoder_sptr atsc_make_rs_encoder();
+  friend ATSC_API atsc_rs_encoder_sptr atsc_make_rs_encoder();
 
   atsci_reed_solomon	d_rs_encoder;
 
diff --git a/gr-atsc/src/lib/atsc_trellis_encoder.h b/gr-atsc/src/lib/atsc_trellis_encoder.h
index 5c93daf99..c84816118 100644
--- a/gr-atsc/src/lib/atsc_trellis_encoder.h
+++ b/gr-atsc/src/lib/atsc_trellis_encoder.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_TRELLIS_ENCODER_H
 #define INCLUDED_ATSC_TRELLIS_ENCODER_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsci_trellis_encoder.h>
 
 class atsc_trellis_encoder;
 typedef boost::shared_ptr<atsc_trellis_encoder> atsc_trellis_encoder_sptr;
 
-atsc_trellis_encoder_sptr atsc_make_trellis_encoder();
+ATSC_API atsc_trellis_encoder_sptr atsc_make_trellis_encoder();
 
 /*!
  * \brief ATSC 12-way interleaved trellis encoder (atsc_mpeg_packet_rs_encoded --> atsc_data_segment)
@@ -36,9 +37,9 @@ atsc_trellis_encoder_sptr atsc_make_trellis_encoder();
  *
  * input: atsc_mpeg_packet_rs_encoded; output: atsc_data_segment
  */
-class atsc_trellis_encoder : public gr_sync_block
+class ATSC_API atsc_trellis_encoder : public gr_sync_block
 {
-  friend atsc_trellis_encoder_sptr atsc_make_trellis_encoder();
+  friend ATSC_API atsc_trellis_encoder_sptr atsc_make_trellis_encoder();
 
   atsci_trellis_encoder	d_trellis_encoder;
 
diff --git a/gr-atsc/src/lib/atsc_viterbi_decoder.h b/gr-atsc/src/lib/atsc_viterbi_decoder.h
index 511df0dff..1a43b4952 100644
--- a/gr-atsc/src/lib/atsc_viterbi_decoder.h
+++ b/gr-atsc/src/lib/atsc_viterbi_decoder.h
@@ -22,13 +22,14 @@
 #ifndef INCLUDED_ATSC_VITERBI_DECODER_H
 #define INCLUDED_ATSC_VITERBI_DECODER_H
 
+#include <atsc_api.h>
 #include <gr_sync_block.h>
 #include <atsci_viterbi_decoder.h>
 
 class atsc_viterbi_decoder;
 typedef boost::shared_ptr<atsc_viterbi_decoder> atsc_viterbi_decoder_sptr;
 
-atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder();
+ATSC_API atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder();
 
 /*!
  * \brief ATSC 12-way interleaved viterbi decoder (atsc_soft_data_segment --> atsc_mpeg_packet_rs_encoded)
@@ -36,9 +37,9 @@ atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder();
  *
  * input: atsc_soft_data_segment; output: atsc_mpeg_packet_rs_encoded
  */
-class atsc_viterbi_decoder : public gr_sync_block
+class ATSC_API atsc_viterbi_decoder : public gr_sync_block
 {
-  friend atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder();
+  friend ATSC_API atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder();
 
   atsci_viterbi_decoder	d_viterbi_decoder;
 
diff --git a/gr-atsc/src/lib/atsci_basic_trellis_encoder.h b/gr-atsc/src/lib/atsci_basic_trellis_encoder.h
index 1e4073144..c17e5653e 100644
--- a/gr-atsc/src/lib/atsci_basic_trellis_encoder.h
+++ b/gr-atsc/src/lib/atsci_basic_trellis_encoder.h
@@ -22,6 +22,7 @@
 #ifndef _ATSC_BASIC_TRELLIS_ENCODER_H_
 #define _ATSC_BASIC_TRELLIS_ENCODER_H_
 
+#include <atsc_api.h>
 #include <assert.h>
 
 /*!
@@ -36,7 +37,7 @@
  * filter is not supported.
  */
 
-class atsci_basic_trellis_encoder {
+class ATSC_API atsci_basic_trellis_encoder {
 
 private:
   int		    state;		// two bit state;
diff --git a/gr-atsc/src/lib/atsci_data_interleaver.h b/gr-atsc/src/lib/atsci_data_interleaver.h
index ab4b64d4f..e7f982db4 100644
--- a/gr-atsc/src/lib/atsci_data_interleaver.h
+++ b/gr-atsc/src/lib/atsci_data_interleaver.h
@@ -23,13 +23,14 @@
 #ifndef _ATSC_DATA_INTERLEAVER_H_
 #define _ATSC_DATA_INTERLEAVER_H_
 
+#include <atsc_api.h>
 #include <atsc_types.h>
 #include <convolutional_interleaver.h>
 
 /*!
  * \brief atsc convolutional data interleaver
  */
-class atsci_data_interleaver : public convolutional_interleaver<unsigned char> {
+class ATSC_API atsci_data_interleaver : public convolutional_interleaver<unsigned char> {
  public:
   atsci_data_interleaver () : convolutional_interleaver<unsigned char>(true, 52, 4) {}
 
@@ -40,7 +41,7 @@ class atsci_data_interleaver : public convolutional_interleaver<unsigned char> {
 /*!
  * \brief atsc convolutional data deinterleaver
  */
-class atsci_data_deinterleaver : public convolutional_interleaver<unsigned char> {
+class ATSC_API atsci_data_deinterleaver : public convolutional_interleaver<unsigned char> {
  public:
   atsci_data_deinterleaver () :
     convolutional_interleaver<unsigned char>(false, 52, 4), alignment_fifo (156) {}
diff --git a/gr-atsc/src/lib/atsci_equalizer.h b/gr-atsc/src/lib/atsci_equalizer.h
index 2120ea90a..853c52689 100644
--- a/gr-atsc/src/lib/atsci_equalizer.h
+++ b/gr-atsc/src/lib/atsci_equalizer.h
@@ -23,12 +23,13 @@
 #ifndef _ATSC_EQUALIZER_H_
 #define _ATSC_EQUALIZER_H_
 
+#include <atsc_api.h>
 #include <atsci_syminfo.h>
 
 /*!
  * \brief abstract base class for ATSC equalizer
  */
-class atsci_equalizer {
+class ATSC_API atsci_equalizer {
 
 private:
 
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms.h b/gr-atsc/src/lib/atsci_equalizer_lms.h
index 1626da234..8a39255c6 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms.h
+++ b/gr-atsc/src/lib/atsci_equalizer_lms.h
@@ -23,11 +23,12 @@
 #ifndef _ATSC_EQUALIZER_LMS_H_
 #define _ATSC_EQUALIZER_LMS_H_
 
+#include <atsc_api.h>
 #include <atsci_equalizer.h>
 #include <vector>
 #include <stdio.h>
 
-class atsci_equalizer_lms : public atsci_equalizer
+class ATSC_API atsci_equalizer_lms : public atsci_equalizer
 {
 public:
   atsci_equalizer_lms ();
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.h b/gr-atsc/src/lib/atsci_equalizer_lms2.h
index 45b25b73f..7c60fc174 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms2.h
+++ b/gr-atsc/src/lib/atsci_equalizer_lms2.h
@@ -23,11 +23,12 @@
 #ifndef _ATSC_EQUALIZER_LMS2_H_
 #define _ATSC_EQUALIZER_LMS2_H_
 
+#include <atsc_api.h>
 #include <atsci_equalizer.h>
 #include <vector>
 #include <stdio.h>
 
-class atsci_equalizer_lms2 : public atsci_equalizer
+class ATSC_API atsci_equalizer_lms2 : public atsci_equalizer
 {
 public:
   atsci_equalizer_lms2 ();
diff --git a/gr-atsc/src/lib/atsci_equalizer_nop.h b/gr-atsc/src/lib/atsci_equalizer_nop.h
index 399f2da46..6d842601f 100644
--- a/gr-atsc/src/lib/atsci_equalizer_nop.h
+++ b/gr-atsc/src/lib/atsci_equalizer_nop.h
@@ -23,9 +23,10 @@
 #ifndef _ATSC_EQUALIZER_NOP_H_
 #define _ATSC_EQUALIZER_NOP_H_
 
+#include <atsc_api.h>
 #include <atsci_equalizer.h>
 
-class atsci_equalizer_nop : public atsci_equalizer
+class ATSC_API atsci_equalizer_nop : public atsci_equalizer
 {
 private:
   float scale (float input) { return input; }
diff --git a/gr-atsc/src/lib/atsci_exp2_lp.h b/gr-atsc/src/lib/atsci_exp2_lp.h
index cf66843c2..12d08fa6d 100644
--- a/gr-atsc/src/lib/atsci_exp2_lp.h
+++ b/gr-atsc/src/lib/atsci_exp2_lp.h
@@ -23,9 +23,10 @@
 #ifndef _ATSC_EXP2_LP_H_
 #define _ATSC_EXP2_LP_H_
 
+#include <atsc_api.h>
 #include <gr_fir_builder.h>
 
-class atsci_exp2_lp : public gr_fir_builder
+class ATSC_API atsci_exp2_lp : public gr_fir_builder
 {
 public:
   virtual std::vector<float> taps (double sampling_freq);
diff --git a/gr-atsc/src/lib/atsci_fake_single_viterbi.h b/gr-atsc/src/lib/atsci_fake_single_viterbi.h
index 1318256ec..b4cb6e3b3 100644
--- a/gr-atsc/src/lib/atsci_fake_single_viterbi.h
+++ b/gr-atsc/src/lib/atsci_fake_single_viterbi.h
@@ -23,10 +23,12 @@
 #ifndef _ATSCFAKESINGLEVITERBI_H_
 #define _ATSCFAKESINGLEVITERBI_H_
 
+#include <atsc_api.h>
+
 /*!
  * \brief single channel viterbi decoder
  */
-class atsci_fake_single_viterbi
+class ATSC_API atsci_fake_single_viterbi
 {
   
 public:
diff --git a/gr-atsc/src/lib/atsci_fs_checker.h b/gr-atsc/src/lib/atsci_fs_checker.h
index 76b754904..cdcd541e8 100644
--- a/gr-atsc/src/lib/atsci_fs_checker.h
+++ b/gr-atsc/src/lib/atsci_fs_checker.h
@@ -22,6 +22,7 @@
 #ifndef _ATSC_FS_CHECKER_H_
 #define _ATSC_FS_CHECKER_H_
 
+#include <atsc_api.h>
 #include <atsci_syminfo.h>
 
 /*!
@@ -47,7 +48,7 @@
  * occur every 832 samples assuming everything is working.
  */
 
-class atsci_fs_checker {
+class ATSC_API atsci_fs_checker {
 
 public:
 
diff --git a/gr-atsc/src/lib/atsci_fs_checker_naive.h b/gr-atsc/src/lib/atsci_fs_checker_naive.h
index 951820492..3ef507111 100644
--- a/gr-atsc/src/lib/atsci_fs_checker_naive.h
+++ b/gr-atsc/src/lib/atsci_fs_checker_naive.h
@@ -23,12 +23,13 @@
 #ifndef _ATSC_FS_CHECKER_NAIVE_H_
 #define _ATSC_FS_CHECKER_NAIVE_H_
 
+#include <atsc_api.h>
 #include <atsci_fs_checker.h>
 
 /*!
  * \brief Naive concrete implementation of field sync checker
  */
-class atsci_fs_checker_naive : public atsci_fs_checker {
+class ATSC_API atsci_fs_checker_naive : public atsci_fs_checker {
 
  private:
   static const int	SRSIZE = 1024;		// must be power of two
diff --git a/gr-atsc/src/lib/atsci_fs_correlator.h b/gr-atsc/src/lib/atsci_fs_correlator.h
index f7915364a..a6db7f518 100644
--- a/gr-atsc/src/lib/atsci_fs_correlator.h
+++ b/gr-atsc/src/lib/atsci_fs_correlator.h
@@ -22,6 +22,8 @@
 #ifndef _ATSC_FS_CORRELATOR_H_
 #define _ATSC_FS_CORRELATOR_H_
 
+#include <atsc_api.h>
+
 /*!
  * \brief abstract base class for ATSC field sync correlator
  *
@@ -42,7 +44,7 @@
  * occur every 832 samples assuming everything is working.
  */
 
-class atsci_fs_correlator {
+class ATSC_API atsci_fs_correlator {
 
 public:
 
diff --git a/gr-atsc/src/lib/atsci_fs_correlator_naive.h b/gr-atsc/src/lib/atsci_fs_correlator_naive.h
index c05cff0f7..92e3f7499 100644
--- a/gr-atsc/src/lib/atsci_fs_correlator_naive.h
+++ b/gr-atsc/src/lib/atsci_fs_correlator_naive.h
@@ -23,12 +23,13 @@
 #ifndef _ATSC_FS_CORRELATOR_NAIVE_H_
 #define _ATSC_FS_CORRELATOR_NAIVE_H_
 
+#include <atsc_api.h>
 #include <atsci_fs_correlator.h>
 
 /*!
  * \brief Naive concrete implementation of field sync correlator
  */
-class atsci_fs_correlator_naive : public atsci_fs_correlator {
+class ATSC_API atsci_fs_correlator_naive : public atsci_fs_correlator {
 
  private:
   static const int	SRSIZE = 1024;		// must be power of two
diff --git a/gr-atsc/src/lib/atsci_pnXXX.h b/gr-atsc/src/lib/atsci_pnXXX.h
index 0e09ae831..58cb2d02d 100644
--- a/gr-atsc/src/lib/atsci_pnXXX.h
+++ b/gr-atsc/src/lib/atsci_pnXXX.h
@@ -20,5 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-extern const unsigned char atsc_pn511[];
-extern const unsigned char atsc_pn63[];
+#include <atsc_api.h>
+
+ATSC_API extern const unsigned char atsc_pn511[];
+ATSC_API extern const unsigned char atsc_pn63[];
diff --git a/gr-atsc/src/lib/atsci_randomizer.h b/gr-atsc/src/lib/atsci_randomizer.h
index 36025d10b..30c3235bb 100644
--- a/gr-atsc/src/lib/atsci_randomizer.h
+++ b/gr-atsc/src/lib/atsci_randomizer.h
@@ -23,6 +23,7 @@
 #ifndef _ATSC_RANDOMIZER_H_
 #define _ATSC_RANDOMIZER_H_
 
+#include <atsc_api.h>
 #include <atsc_types.h>
 
 /*! 
@@ -32,7 +33,7 @@
  * See figure D4 on page 54.
  */
 
-class atsci_randomizer {
+class ATSC_API atsci_randomizer {
   friend class qa_atsci_randomizer;
   
  public:
diff --git a/gr-atsc/src/lib/atsci_reed_solomon.h b/gr-atsc/src/lib/atsci_reed_solomon.h
index c9cdca94b..6f53c77ca 100644
--- a/gr-atsc/src/lib/atsci_reed_solomon.h
+++ b/gr-atsc/src/lib/atsci_reed_solomon.h
@@ -23,6 +23,7 @@
 #ifndef _ATSC_REED_SOLOMON_H_
 #define _ATSC_REED_SOLOMON_H_
 
+#include <atsc_api.h>
 #include <atsc_types.h>
 
 /*!
@@ -32,7 +33,7 @@
  * See figure D5 on page 55.
  */
 
-class atsci_reed_solomon {
+class ATSC_API atsci_reed_solomon {
 
  public:
   atsci_reed_solomon();
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine.h b/gr-atsc/src/lib/atsci_root_raised_cosine.h
index cb2798ae5..12870faba 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine.h
+++ b/gr-atsc/src/lib/atsci_root_raised_cosine.h
@@ -22,9 +22,10 @@
 #ifndef _ATSC_RRC_H_
 #define _ATSC_RRC_H_
 
+#include <atsc_api.h>
 #include <gr_fir_builder.h>
 
-class atsc_root_raised_cosine : public gr_fir_builder
+class ATSC_API atsc_root_raised_cosine : public gr_fir_builder
 {
 public:
   virtual std::vector<float> taps (double sampling_freq);
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h b/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h
index 00f609929..98329ab53 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h
+++ b/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h
@@ -22,9 +22,10 @@
 #ifndef _ATSC_RRC_BANDPASS_H_
 #define _ATSC_RRC_BANDPASS_H_
 
+#include <atsc_api.h>
 #include <atsci_root_raised_cosine.h>
 
-class atsc_root_raised_cosine_bandpass : public atsc_root_raised_cosine
+class ATSC_API atsc_root_raised_cosine_bandpass : public atsc_root_raised_cosine
 {
 public:
   atsc_root_raised_cosine_bandpass (double center_freq) : _center_freq (center_freq) {}
diff --git a/gr-atsc/src/lib/atsci_single_viterbi.h b/gr-atsc/src/lib/atsci_single_viterbi.h
index a722a4aaf..cc752cb3a 100644
--- a/gr-atsc/src/lib/atsci_single_viterbi.h
+++ b/gr-atsc/src/lib/atsci_single_viterbi.h
@@ -23,10 +23,12 @@
 #ifndef _ATSCSINGLEVITERBI_H_
 #define _ATSCSINGLEVITERBI_H_
 
+#include <atsc_api.h>
+
 /*!
  * \brief single channel viterbi decoder
  */
-class atsci_single_viterbi
+class ATSC_API atsci_single_viterbi
 {
   
 public:
diff --git a/gr-atsc/src/lib/atsci_slicer_agc.h b/gr-atsc/src/lib/atsci_slicer_agc.h
index 2e7d3be7a..520fec44b 100644
--- a/gr-atsc/src/lib/atsci_slicer_agc.h
+++ b/gr-atsc/src/lib/atsci_slicer_agc.h
@@ -23,6 +23,7 @@
 #ifndef _ATSC_SLICER_AGC_H_
 #define _ATSC_SLICER_AGC_H_
 
+#include <atsc_api.h>
 #include <math.h>
 #include <gr_single_pole_iir.h>
 
@@ -32,7 +33,7 @@
  * Given perfect data, output values will be +/- {7, 5, 3, 1}
  */
 
-class atsci_slicer_agc {
+class ATSC_API atsci_slicer_agc {
 
  public:
   atsci_slicer_agc () : _gain(1), dc(0.0025) {};
diff --git a/gr-atsc/src/lib/atsci_sliding_correlator.h b/gr-atsc/src/lib/atsci_sliding_correlator.h
index c01bc9a20..64834a4e2 100644
--- a/gr-atsc/src/lib/atsci_sliding_correlator.h
+++ b/gr-atsc/src/lib/atsci_sliding_correlator.h
@@ -22,15 +22,17 @@
 #ifndef _ATSC_SLIDING_CORRELATOR_H_
 #define _ATSC_SLIDING_CORRELATOR_H_
 
+#include <atsc_api.h>
 #include <string.h>
 
-extern const unsigned char atsc_pn511[511];
-extern const unsigned char atsc_pn63[63];
+#include <atsci_pnXXX.h>
+//extern const unsigned char atsc_pn511[511];
+//extern const unsigned char atsc_pn63[63];
 
 /*!
  * \brief look for the PN 511 field sync pattern
  */
-class atsci_sliding_correlator {
+class ATSC_API atsci_sliding_correlator {
  public:
 
   atsci_sliding_correlator ();
diff --git a/gr-atsc/src/lib/atsci_sssr.h b/gr-atsc/src/lib/atsci_sssr.h
index 4555dc23c..1dee54c1d 100644
--- a/gr-atsc/src/lib/atsci_sssr.h
+++ b/gr-atsc/src/lib/atsci_sssr.h
@@ -27,6 +27,7 @@
 #ifndef _ATSC_SSSR_H_
 #define _ATSC_SSSR_H_
 
+#include <atsc_api.h>
 #include <atsc_consts.h>
 #include <gri_mmse_fir_interpolator.h>
 #include <gr_single_pole_iir.h>
@@ -43,7 +44,7 @@ namespace sssr {
   // ----------------------------------------------------------------
   //! digital correlator for 1001 and 0110 patterns
 
-  class digital_correlator {
+  class ATSC_API digital_correlator {
     int		d_sr;	// 4 bit shift register
 
   public:
@@ -70,7 +71,7 @@ namespace sssr {
   // ----------------------------------------------------------------
   //! segment sync integrator
 
-  class seg_sync_integrator {
+  class ATSC_API seg_sync_integrator {
     signed char	d_integrator[ATSC_DATA_SEGMENT_LENGTH];
     
   public:
@@ -94,7 +95,7 @@ namespace sssr {
   // ----------------------------------------------------------------
   //! quad filter (used to compute timing error)
 
-  class quad_filter {
+  class ATSC_API quad_filter {
     sample_t	d_delay[4];
 
   public:
@@ -128,7 +129,7 @@ namespace sssr {
  * by Wayne E. Bretl of Zenith, pgs 41-45.
  */
 
-class atsci_sssr {
+class ATSC_API atsci_sssr {
   sssr::digital_correlator	d_correlator;
   sssr::seg_sync_integrator	d_integrator;
   sssr::quad_filter		d_quad_filter;
@@ -193,7 +194,7 @@ public:
  * \brief interpolator control for segment and symbol sync recovery
  */
  
-class atsci_interpolator {
+class ATSC_API atsci_interpolator {
   gri_mmse_fir_interpolator	d_interp;
   gr_single_pole_iir<float,float,float> d_loop;	// ``VCO'' loop filter
   double			d_nominal_ratio_of_rx_clock_to_symbol_freq; // FREQ
diff --git a/gr-atsc/src/lib/atsci_trellis_encoder.h b/gr-atsc/src/lib/atsci_trellis_encoder.h
index dc5c16d76..53be3fc22 100644
--- a/gr-atsc/src/lib/atsci_trellis_encoder.h
+++ b/gr-atsc/src/lib/atsci_trellis_encoder.h
@@ -23,6 +23,7 @@
 #ifndef _ATSC_TRELLIS_ENCODER_H_
 #define _ATSC_TRELLIS_ENCODER_H_
 
+#include <atsc_api.h>
 #include <atsci_basic_trellis_encoder.h>
 #include <atsc_types.h>
 
@@ -30,7 +31,7 @@
  * \brief fancy, schmancy 12-way interleaved trellis encoder for ATSC
  */
 
-class atsci_trellis_encoder {
+class ATSC_API atsci_trellis_encoder {
  public:
   static const int	NCODERS = 12;
 
diff --git a/gr-atsc/src/lib/atsci_viterbi_decoder.h b/gr-atsc/src/lib/atsci_viterbi_decoder.h
index 22e3c1892..1243feeb5 100644
--- a/gr-atsc/src/lib/atsci_viterbi_decoder.h
+++ b/gr-atsc/src/lib/atsci_viterbi_decoder.h
@@ -25,6 +25,7 @@
 
 #define	USE_SIMPLE_SLICER  0
 
+#include <atsc_api.h>
 #include <atsc_types.h>
 #include <interleaver_fifo.h>
 
@@ -40,7 +41,7 @@ typedef atsci_single_viterbi		single_viterbi_t;
  * \brief fancy, schmancy 12-way interleaved viterbi decoder for ATSC
  */
 
-class atsci_viterbi_decoder {
+class ATSC_API atsci_viterbi_decoder {
 public:
   static const int	NCODERS = 12;
 
diff --git a/gr-atsc/src/lib/atsci_vsbtx_lp.h b/gr-atsc/src/lib/atsci_vsbtx_lp.h
index 7193c87d0..d3bb0c9d1 100644
--- a/gr-atsc/src/lib/atsci_vsbtx_lp.h
+++ b/gr-atsc/src/lib/atsci_vsbtx_lp.h
@@ -23,9 +23,10 @@
 #ifndef _ATSC_VSBTX_LP_H_
 #define _ATSC_VSBTX_LP_H_
 
+#include <atsc_api.h>
 #include <gr_fir_builder.h>
 
-class atsc_vsbtx_lp : public gr_fir_builder
+class ATSC_API atsc_vsbtx_lp : public gr_fir_builder
 {
 public:
   virtual std::vector<float> taps (double sampling_freq);
diff --git a/gr-atsc/src/lib/create_atsci_equalizer.h b/gr-atsc/src/lib/create_atsci_equalizer.h
index 57c167f59..fd26237d8 100644
--- a/gr-atsc/src/lib/create_atsci_equalizer.h
+++ b/gr-atsc/src/lib/create_atsci_equalizer.h
@@ -22,10 +22,12 @@
 #ifndef _CREATE_ATSC_EQUALIZER_H_
 #define _CREATE_ATSC_EQUALIZER_H_
 
+#include <atsc_api.h>
+
 class atsci_equalizer;
 
-atsci_equalizer *create_atsci_equalizer_nop ();
-atsci_equalizer *create_atsci_equalizer_lms ();
-atsci_equalizer *create_atsci_equalizer_lms2 ();
+ATSC_API atsci_equalizer *create_atsci_equalizer_nop ();
+ATSC_API atsci_equalizer *create_atsci_equalizer_lms ();
+ATSC_API atsci_equalizer *create_atsci_equalizer_lms2 ();
 
 #endif /* _CREATE_ATSC_EQUALIZER_H_ */
diff --git a/gr-atsc/src/lib/create_atsci_fs_checker.h b/gr-atsc/src/lib/create_atsci_fs_checker.h
index d08745052..23451757a 100644
--- a/gr-atsc/src/lib/create_atsci_fs_checker.h
+++ b/gr-atsc/src/lib/create_atsci_fs_checker.h
@@ -23,12 +23,14 @@
 #ifndef _CREATE_ATSC_FS_CHECKER_H_
 #define _CREATE_ATSC_FS_CHECKER_H_
 
+#include <atsc_api.h>
+
 class atsci_fs_checker;
 
 /*!
  * Factory that creates appropriate atsci_fs_checker
  */
-atsci_fs_checker *create_atsci_fs_checker ();
+ATSC_API atsci_fs_checker *create_atsci_fs_checker ();
 
 
 #endif /* _CREATE_ATSC_FS_CHECKER_H_ */
diff --git a/gr-atsc/src/lib/create_atsci_fs_correlator.h b/gr-atsc/src/lib/create_atsci_fs_correlator.h
index 9162be888..7b663fd56 100644
--- a/gr-atsc/src/lib/create_atsci_fs_correlator.h
+++ b/gr-atsc/src/lib/create_atsci_fs_correlator.h
@@ -23,12 +23,14 @@
 #ifndef _CREATE_ATSC_FS_CORRELATOR_H_
 #define _CREATE_ATSC_FS_CORRELATOR_H_
 
+#include <atsc_api.h>
+
 class atsci_fs_correlator;
 
 /*!
  * Factory that creates appropriate atsci_fs_correlator
  */
-atsci_fs_correlator *create_atsci_fs_correlator ();
+ATSC_API atsci_fs_correlator *create_atsci_fs_correlator ();
 
 
 #endif /* _CREATE_ATSC_FS_CORRELATOR_H_ */
diff --git a/gr-atsc/src/lib/interleaver_fifo.h b/gr-atsc/src/lib/interleaver_fifo.h
index 98764af49..6d1a44580 100644
--- a/gr-atsc/src/lib/interleaver_fifo.h
+++ b/gr-atsc/src/lib/interleaver_fifo.h
@@ -26,7 +26,6 @@
 
 #include <interleaver_fifo.h>
 #include <string.h>
-#include <strings.h>
 
 /*!
  * \brief template class for interleaver fifo
diff --git a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
index f50f3b6b8..1f5ba6b59 100644
--- a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
+++ b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
@@ -70,7 +70,7 @@ qa_atsci_fake_single_viterbi::noise ()
 void
 qa_atsci_fake_single_viterbi::t0 ()
 {
-  int 			  blocklen = NN;
+  static const int 			  blocklen = NN;
   unsigned char		  in[blocklen];
   unsigned char		  enc[blocklen];
   unsigned char		  out[blocklen];
diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
index d7c29097e..dac1e94c3 100644
--- a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
+++ b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
@@ -67,7 +67,7 @@ qa_atsci_single_viterbi::noise ()
 void
 qa_atsci_single_viterbi::t0 ()
 {
-  int 			  blocklen = NN;
+  static const int 			  blocklen = NN;
   unsigned char		  in[blocklen];
   unsigned char		  enc[blocklen];
   unsigned char		  out[blocklen];
@@ -142,7 +142,7 @@ qa_atsci_single_viterbi::t0 ()
 void
 qa_atsci_single_viterbi::t1 ()
 {
-  int 			  blocklen = NN;
+  static const int 			  blocklen = NN;
   unsigned char		  in[blocklen];
   unsigned char		  enc[blocklen];
   unsigned char		  out[blocklen];
diff --git a/gr-atsc/src/python/CMakeLists.txt b/gr-atsc/src/python/CMakeLists.txt
new file mode 100644
index 000000000..aca15c572
--- /dev/null
+++ b/gr-atsc/src/python/CMakeLists.txt
@@ -0,0 +1,58 @@
+# 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.
+
+########################################################################
+# Install python examples
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    btl-fsd.py
+    fpll.py
+    interp.py
+    xlate.py
+    viterbi-out.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/atsc
+    COMPONENT "atsc_examples"
+)
+
+install(
+    FILES README
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/atsc
+    COMPONENT "atsc_examples"
+)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-atsc/src/lib
+    )
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-atsc)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gr-atsc/src/python/README b/gr-atsc/src/python/README
index abe0937b5..6c23b46fd 100644
--- a/gr-atsc/src/python/README
+++ b/gr-atsc/src/python/README
@@ -1,13 +1,13 @@
 Decoding ATSC using 19.2MSps rate over 5 processes
 --------------------------------------------------
 
-1) Verify signal, adjust antenna and find best gain setting using usrp_fft.py,
-station frequency from the fcc video database, and decimation of 10.
+1) Verify signal, adjust antenna and find best gain setting using uhd_fft.py,
+station frequency from the fcc video database, and sample rate to 6.4e6.
 
 2) Capture data - adjust gain (-g) frequency (-f) and which side
 the tvrx is on to fit your local setup:
 
-usrp_rx_cfile.py -s -R B -d 10 -g 65 -f 503e6 atsc_data_6-4m_complex 
+uhd_rx_cfile.py -s --samp-rate=6.4e6 -g 65 -f 503e6 atsc_data_6-4m_complex 
 
 You probably still need fast disks to take the data, like a raid-0 set of
 striped sata drives. Make sure there are no or very few Ou overruns. Saving
diff --git a/gr-atsc/src/python/interp.py b/gr-atsc/src/python/interp.py
index ad69c6b34..b17b3a312 100755
--- a/gr-atsc/src/python/interp.py
+++ b/gr-atsc/src/python/interp.py
@@ -22,8 +22,7 @@
 # This module starts the atsc processing chain taking the captured
 # off-air signal created with:
 #
-#  usrp_rx_cfile.py -R <side with tuner, a or b>
-#                   -d 10     set decimation to get signal at 6.4e6 rate
+#  uhd_rx_cfile.py  --samp-rate=6.4e6
 #                   -f <center of tv signal channel freq>
 #                   -g <appropriate gain for best signal / noise>
 # 
diff --git a/gr-atsc/src/python/interp_short.py b/gr-atsc/src/python/interp_short.py
index 11b169b27..732ca831d 100755
--- a/gr-atsc/src/python/interp_short.py
+++ b/gr-atsc/src/python/interp_short.py
@@ -22,8 +22,7 @@
 # This module starts the atsc processing chain taking the captured
 # off-air signal created with:
 #
-#  usrp_rx_cfile.py -R <side with tuner, a or b>
-#                   -d 10     set decimation to get signal at 6.4e6 rate
+#  uhd_rx_cfile.py  --samp-rate=6.4e6
 #                   -f <center of tv signal channel freq>
 #                   -g <appropriate gain for best signal / noise>
 #                   -s output shorts
diff --git a/gr-audio/CMakeLists.txt b/gr-audio/CMakeLists.txt
new file mode 100644
index 000000000..7038b9b0f
--- /dev/null
+++ b/gr-audio/CMakeLists.txt
@@ -0,0 +1,102 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-audio" ENABLE_GR_AUDIO
+    Boost_FOUND
+    ENABLE_GR_CORE
+)
+
+GR_SET_GLOBAL(GR_AUDIO_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_AUDIO)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_AUDIO_DESCRIPTION "GNU Radio Audio Blocks")
+
+CPACK_COMPONENT("audio_runtime"
+    GROUP        "Audio"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("audio_devel"
+    GROUP        "Audio"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("audio_python"
+    GROUP        "Audio"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "core_python;audio_runtime"
+)
+
+CPACK_COMPONENT("audio_swig"
+    GROUP        "Audio"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;audio_python;audio_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(include)
+add_subdirectory(lib)
+add_subdirectory(examples/c++)
+add_subdirectory(doc)
+if(ENABLE_PYTHON)
+    add_subdirectory(swig)
+    add_subdirectory(grc)
+    add_subdirectory(examples/python)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-audio.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-audio.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-audio.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "audio_devel"
+)
+
+endif(ENABLE_GR_AUDIO)
diff --git a/gr-audio/Makefile.am b/gr-audio/Makefile.am
index cde1702f2..da4106c23 100644
--- a/gr-audio/Makefile.am
+++ b/gr-audio/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = include lib examples
+SUBDIRS = include lib examples doc
 
 if PYTHON
 SUBDIRS += grc swig
diff --git a/gcell/include/gcell/.gitignore b/gr-audio/doc/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gcell/include/gcell/.gitignore
+++ b/gr-audio/doc/.gitignore
diff --git a/gr-cvsd-vocoder/src/Makefile.am b/gr-audio/doc/CMakeLists.txt
index be38b7c1a..f4e6c4a07 100644
--- a/gr-cvsd-vocoder/src/Makefile.am
+++ b/gr-audio/doc/CMakeLists.txt
@@ -1,5 +1,4 @@
-#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -17,9 +16,8 @@
 # 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.
-# 
 
-SUBDIRS = lib
-if PYTHON
-SUBDIRS += python
-endif
+install(
+    FILES README.audio
+    DESTINATION ${GR_PKG_DOC_DIR}
+)
diff --git a/gr-gpio/Makefile.am b/gr-audio/doc/Makefile.am
index d800383ef..959a9044f 100644
--- a/gr-gpio/Makefile.am
+++ b/gr-audio/doc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,4 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = src
+SUBDIRS =
+
+dist_gr_doc_DATA =		\
+	README.audio
diff --git a/gr-audio/doc/README.audio b/gr-audio/doc/README.audio
new file mode 100644
index 000000000..ebd0fe5d7
--- /dev/null
+++ b/gr-audio/doc/README.audio
@@ -0,0 +1,20 @@
+This is the gr-audio package. This package includes all of the
+supported audio interfaces, including:
+    - alsa
+    - oss
+    - jack
+    - portaudio
+    - osx
+    - windows
+
+Typically, the audio package will auto-detect the proper driver to use
+based on the system it is run on. Import this package with:
+
+    from gnuradio import audio
+
+See the Doxygen documentation for details about the blocks available
+in this package. A quick listing of the details can be found in Python
+after importing by using: 
+
+    help(audio)
+
diff --git a/gr-audio/doc/audio.dox b/gr-audio/doc/audio.dox
new file mode 100644
index 000000000..3a0cb5e48
--- /dev/null
+++ b/gr-audio/doc/audio.dox
@@ -0,0 +1,51 @@
+/*! \page page_audio Audio Interface
+
+\section Introduction
+
+This is the gr-audio package. This package includes all of the
+supported audio interfaces, including:
+
+\li alsa
+\li oss
+\li jack
+\li portaudio
+\li osx
+\li windows
+
+\code
+    from gnuradio import audio
+\endcode
+
+See the Doxygen documentation for details about the blocks available
+in this package. The relevant blocks are listed in the \ref audio_blk group.
+
+A quick listing of the details can be found in Python after importing
+by using:
+
+\code
+    help(digital)
+\endcode
+
+
+\section Usage
+For an audio source, a typical OptionParser option and it's use looks
+like:
+
+\code
+    parser.add_option("-O", "--audio-output", type="string", default="",
+                       help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
+    audio_rate = 32e3
+    audio_sink = audio.sink (int (audio_rate), options.audio_output)
+\endcode
+
+Similarly, an audio sink would have a typical OptionParser option and
+its use would look like:
+
+\code
+    parser.add_option("-I", "--audio-input", type="string", default="",
+                      help="pcm input device name.  E.g., hw:0,0 or /dev/dsp")
+    audio_rate = 32e3
+    audio_source = audio.source(int(audio_rate), audio_input)
+\endcode
+
+*/
diff --git a/gr-audio/examples/c++/CMakeLists.txt b/gr-audio/examples/c++/CMakeLists.txt
new file mode 100644
index 000000000..38490cce8
--- /dev/null
+++ b/gr-audio/examples/c++/CMakeLists.txt
@@ -0,0 +1,23 @@
+# 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.
+
+include_directories(${GR_AUDIO_INCLUDE_DIRS})
+include_directories(${GNURADIO_CORE_INCLUDE_DIRS})
+add_executable(dial_tone dial_tone.cc)
+target_link_libraries(dial_tone gnuradio-audio)
diff --git a/gr-audio/examples/python/CMakeLists.txt b/gr-audio/examples/python/CMakeLists.txt
new file mode 100644
index 000000000..86ba86ac0
--- /dev/null
+++ b/gr-audio/examples/python/CMakeLists.txt
@@ -0,0 +1,37 @@
+# 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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+    audio_copy.py
+    audio_fft.py
+    audio_play.py
+    audio_to_file.py
+    dial_tone.py
+    dial_tone_daemon.py
+    dial_tone_wav.py
+    mono_tone.py
+    multi_tone.py
+    noise.py
+    spectrum_inversion.py
+    test_resampler.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/audio
+    COMPONENT "audio_python"
+)
diff --git a/gr-audio/grc/CMakeLists.txt b/gr-audio/grc/CMakeLists.txt
new file mode 100644
index 000000000..a077f7fb4
--- /dev/null
+++ b/gr-audio/grc/CMakeLists.txt
@@ -0,0 +1,22 @@
+# 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.
+
+########################################################################
+file(GLOB xml_files "*.xml")
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "audio_python")
diff --git a/gr-audio/grc/audio_sink.xml b/gr-audio/grc/audio_sink.xml
index 26e199d61..4a88a7fa2 100644
--- a/gr-audio/grc/audio_sink.xml
+++ b/gr-audio/grc/audio_sink.xml
@@ -8,6 +8,7 @@
 	<name>Audio Sink</name>
 	<key>audio_sink</key>
 	<category>Sinks</category>
+	<throttle>1</throttle>
 	<import>from gnuradio import audio</import>
 	<make>audio.sink($samp_rate, $device_name, $ok_to_block)</make>
 	<param>
diff --git a/gr-audio/grc/audio_source.xml b/gr-audio/grc/audio_source.xml
index 59b375244..d56e9153a 100644
--- a/gr-audio/grc/audio_source.xml
+++ b/gr-audio/grc/audio_source.xml
@@ -8,6 +8,7 @@
 	<name>Audio Source</name>
 	<key>audio_source</key>
 	<category>Sources</category>
+	<throttle>1</throttle>
 	<import>from gnuradio import audio</import>
 	<make>audio.source($samp_rate, $device_name, $ok_to_block)</make>
 	<param>
diff --git a/gr-audio/include/CMakeLists.txt b/gr-audio/include/CMakeLists.txt
new file mode 100644
index 000000000..6db55e92c
--- /dev/null
+++ b/gr-audio/include/CMakeLists.txt
@@ -0,0 +1,29 @@
+# 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.
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+    gr_audio_api.h
+    gr_audio_source.h
+    gr_audio_sink.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "audio_devel"
+)
diff --git a/gr-audio/include/gr_audio_sink.h b/gr-audio/include/gr_audio_sink.h
index ca3b15a37..ec064b64b 100644
--- a/gr-audio/include/gr_audio_sink.h
+++ b/gr-audio/include/gr_audio_sink.h
@@ -25,6 +25,19 @@
 #include <gr_audio_api.h>
 #include <gr_sync_block.h>
 
+/*!
+ * \brief Creates a sink from an audio device.
+ * \ingroup audio_blk
+ *
+ * Creates a sink from an audio device at a specified
+ * sample_rate. The specific audio device to use can be specified as
+ * the device_name parameter. Typical choices are:
+ * \li pulse
+ * \li hw:0,0
+ * \li plughw:0,0
+ * \li surround51
+ * \li /dev/dsp
+ */
 class GR_AUDIO_API audio_sink : virtual public gr_sync_block{
 public:
     typedef boost::shared_ptr<audio_sink> sptr;
diff --git a/gr-audio/include/gr_audio_source.h b/gr-audio/include/gr_audio_source.h
index b8ae2ca5f..eca22e3eb 100644
--- a/gr-audio/include/gr_audio_source.h
+++ b/gr-audio/include/gr_audio_source.h
@@ -25,6 +25,19 @@
 #include <gr_audio_api.h>
 #include <gr_sync_block.h>
 
+/*!
+ * \brief Creates a source from an audio device.
+ * \ingroup audio_blk
+ *
+ * Creates a source from an audio device at a specified
+ * sample_rate. The specific audio device to use can be specified as
+ * the device_name parameter. Typical choices are:
+ * \li pulse
+ * \li hw:0,0
+ * \li plughw:0,0
+ * \li surround51
+ * \li /dev/dsp
+ */
 class GR_AUDIO_API audio_source : virtual public gr_sync_block{
 public:
     typedef boost::shared_ptr<audio_source> sptr;
diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
new file mode 100644
index 000000000..28188a77b
--- /dev/null
+++ b/gr-audio/lib/CMakeLists.txt
@@ -0,0 +1,153 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_AUDIO_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+list(APPEND gr_audio_libs gnuradio-core ${Boost_LIBRARIES})
+list(APPEND gr_audio_sources gr_audio_registry.cc)
+list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/gr-audio.conf)
+
+########################################################################
+## ALSA Support
+########################################################################
+find_package(ALSA)
+
+if(ALSA_FOUND)
+
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/alsa ${ALSA_INCLUDE_DIRS})
+    list(APPEND gr_audio_libs ${ALSA_LIBRARIES})
+    list(APPEND gr_audio_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/alsa/gri_alsa.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/alsa/audio_alsa_source.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/alsa/audio_alsa_sink.cc
+    )
+    list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/alsa/gr-audio-alsa.conf)
+
+endif(ALSA_FOUND)
+
+########################################################################
+## OSS Support
+########################################################################
+find_package(OSS)
+
+if(OSS_FOUND)
+
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/oss ${OSS_INCLUDE_DIRS})
+    list(APPEND gr_audio_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/oss/audio_oss_source.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/oss/audio_oss_sink.cc
+    )
+    list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/oss/gr-audio-oss.conf)
+
+endif(OSS_FOUND)
+
+
+########################################################################
+## Jack Support
+########################################################################
+find_package(Jack)
+
+if(JACK_FOUND)
+
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/jack ${JACK_INCLUDE_DIRS})
+    list(APPEND gr_audio_libs ${JACK_LIBRARIES})
+    add_definitions(${JACK_DEFINITIONS})
+    list(APPEND gr_audio_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/jack/gri_jack.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/jack/audio_jack_source.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/jack/audio_jack_sink.cc
+    )
+    list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/jack/gr-audio-jack.conf)
+
+endif(JACK_FOUND)
+
+########################################################################
+## OSX Support
+########################################################################
+include(CheckIncludeFileCXX)
+CHECK_INCLUDE_FILE_CXX(AudioUnit/AudioUnit.h AUDIO_UNIT_H)
+CHECK_INCLUDE_FILE_CXX(AudioToolbox/AudioToolbox.h AUDIO_TOOLBOX_H)
+
+if(AUDIO_UNIT_H AND AUDIO_TOOLBOX_H)
+
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/osx)
+    list(APPEND gr_audio_libs
+        "-framework AudioUnit"
+        "-framework CoreAudio"
+        "-framework AudioToolbox"
+        "-framework Carbon"
+    )
+    list(APPEND gr_audio_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/osx/audio_osx_source.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/osx/audio_osx_sink.cc
+    )
+
+endif(AUDIO_UNIT_H AND AUDIO_TOOLBOX_H)
+
+########################################################################
+## PortAudio Support
+########################################################################
+find_package(Portaudio)
+
+if(PORTAUDIO_FOUND)
+
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/portaudio ${PORTAUDIO_INCLUDE_DIRS})
+    list(APPEND gr_audio_libs ${PORTAUDIO_LIBRARIES})
+    add_definitions(${PORTAUDIO_DEFINITIONS})
+    list(APPEND gr_audio_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/portaudio/gri_portaudio.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/portaudio/audio_portaudio_source.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/portaudio/audio_portaudio_sink.cc
+    )
+    list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/portaudio/gr-audio-portaudio.conf)
+
+endif(PORTAUDIO_FOUND)
+
+########################################################################
+## Windows Support
+########################################################################
+if(WIN32)
+
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/windows)
+    list(APPEND gr_audio_libs winmm.lib)
+    list(APPEND gr_audio_sources
+        ${CMAKE_CURRENT_SOURCE_DIR}/windows/audio_windows_source.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/windows/audio_windows_sink.cc
+    )
+
+endif(WIN32)
+
+########################################################################
+# Setup library
+########################################################################
+add_library(gnuradio-audio SHARED ${gr_audio_sources})
+target_link_libraries(gnuradio-audio ${gr_audio_libs})
+GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
+
+install(FILES ${gr_audio_confs} DESTINATION ${GR_PKG_CONF_DIR} COMPONENT "audio_runtime")
diff --git a/gr-audio/lib/alsa/audio_alsa_sink.h b/gr-audio/lib/alsa/audio_alsa_sink.h
index 23e406d6b..b33b84644 100644
--- a/gr-audio/lib/alsa/audio_alsa_sink.h
+++ b/gr-audio/lib/alsa/audio_alsa_sink.h
@@ -34,6 +34,7 @@
 
 /*!
  * \brief audio sink using ALSA
+ * \ingroup audio_blk
  *
  * The sink has N input streams of floats, where N depends
  * on the hardware characteristics of the selected device.
diff --git a/gr-audio/lib/alsa/audio_alsa_source.h b/gr-audio/lib/alsa/audio_alsa_source.h
index e38af3872..142ae711a 100644
--- a/gr-audio/lib/alsa/audio_alsa_source.h
+++ b/gr-audio/lib/alsa/audio_alsa_source.h
@@ -37,6 +37,7 @@ typedef boost::shared_ptr<audio_alsa_source> audio_alsa_source_sptr;
 
 /*!
  * \brief audio source using ALSA
+ * \ingroup audio_blk
  *
  * The source has between 1 and N input streams of floats, where N is
  * depends on the hardware characteristics of the selected device.
diff --git a/gr-audio/lib/jack/audio_jack_sink.h b/gr-audio/lib/jack/audio_jack_sink.h
index a11863ee0..5500b3641 100644
--- a/gr-audio/lib/jack/audio_jack_sink.h
+++ b/gr-audio/lib/jack/audio_jack_sink.h
@@ -32,6 +32,7 @@ int jack_sink_process (jack_nframes_t nframes, void *arg);
 
 /*!
  * \brief audio sink using JACK
+ * \ingroup audio_blk
  *
  * The sink has one input stream of floats.
  *
diff --git a/gr-audio/lib/jack/audio_jack_source.h b/gr-audio/lib/jack/audio_jack_source.h
index 858f34528..a155bf95b 100644
--- a/gr-audio/lib/jack/audio_jack_source.h
+++ b/gr-audio/lib/jack/audio_jack_source.h
@@ -32,6 +32,7 @@ int jack_source_process (jack_nframes_t nframes, void *arg);
 
 /*!
  * \brief audio source using JACK
+ * \ingroup audio_blk
  *
  * The source has one input stream of floats.
  *
diff --git a/gr-audio/lib/oss/audio_oss_sink.h b/gr-audio/lib/oss/audio_oss_sink.h
index 0d7280c2f..47b1407d3 100644
--- a/gr-audio/lib/oss/audio_oss_sink.h
+++ b/gr-audio/lib/oss/audio_oss_sink.h
@@ -28,6 +28,7 @@
 
 /*!
  * \brief audio sink using OSS
+ * \ingroup audio_blk
  *
  * input signature is one or two streams of floats.
  * Input samples must be in the range [-1,1].
diff --git a/gr-audio/lib/oss/audio_oss_source.h b/gr-audio/lib/oss/audio_oss_source.h
index b20ef5c05..df9f68e42 100644
--- a/gr-audio/lib/oss/audio_oss_source.h
+++ b/gr-audio/lib/oss/audio_oss_source.h
@@ -28,6 +28,7 @@
 
 /*!
  * \brief audio source using OSS
+ * \ingroup audio_blk
  *
  * Output signature is one or two streams of floats.
  * Output samples will be in the range [-1,1].
diff --git a/gr-audio/lib/osx/audio_osx_sink.h b/gr-audio/lib/osx/audio_osx_sink.h
index 13bd95d53..e7598097d 100644
--- a/gr-audio/lib/osx/audio_osx_sink.h
+++ b/gr-audio/lib/osx/audio_osx_sink.h
@@ -31,6 +31,7 @@
 
 /*!
  * \brief audio sink using OSX
+ * \ingroup audio_blk
  *
  * input signature is one or two streams of floats.
  * Input samples must be in the range [-1,1].
diff --git a/gr-audio/lib/osx/audio_osx_source.h b/gr-audio/lib/osx/audio_osx_source.h
index a373ea94f..435172a2c 100644
--- a/gr-audio/lib/osx/audio_osx_source.h
+++ b/gr-audio/lib/osx/audio_osx_source.h
@@ -31,6 +31,7 @@
 
 /*!
  * \brief audio source using OSX
+ * \ingroup audio_blk
  *
  * Input signature is one or two streams of floats.
  * Samples must be in the range [-1,1].
diff --git a/gr-audio/lib/portaudio/audio_portaudio_sink.h b/gr-audio/lib/portaudio/audio_portaudio_sink.h
index 6426a32ac..04a881f7e 100644
--- a/gr-audio/lib/portaudio/audio_portaudio_sink.h
+++ b/gr-audio/lib/portaudio/audio_portaudio_sink.h
@@ -34,7 +34,8 @@ PaStreamCallback portaudio_sink_callback;
 
 
 /*!
- * \ Audio sink using PORTAUDIO
+ * \brief Audio sink using PORTAUDIO
+ * \ingroup audio_blk
  *
  * Input samples must be in the range [-1,1].
  */
diff --git a/gr-audio/lib/portaudio/audio_portaudio_source.h b/gr-audio/lib/portaudio/audio_portaudio_source.h
index 245b3410b..b555bc759 100644
--- a/gr-audio/lib/portaudio/audio_portaudio_source.h
+++ b/gr-audio/lib/portaudio/audio_portaudio_source.h
@@ -33,7 +33,8 @@ PaStreamCallback portaudio_source_callback;
 
 
 /*!
- * \ Audio source using PORTAUDIO
+ * \brief Audio source using PORTAUDIO
+ * \ingroup audio_blk
  *
  * Input samples must be in the range [-1,1].
  */
diff --git a/gr-audio/lib/windows/audio_windows_sink.h b/gr-audio/lib/windows/audio_windows_sink.h
index 6819bd448..d4ca259b3 100644
--- a/gr-audio/lib/windows/audio_windows_sink.h
+++ b/gr-audio/lib/windows/audio_windows_sink.h
@@ -34,6 +34,7 @@
 
 /*!
  * \brief audio sink using winmm mmsystem (win32 only)
+ * \ingroup audio_blk
  *
  * input signature is one or two streams of floats.
  * Input samples must be in the range [-1,1].
diff --git a/gr-audio/lib/windows/audio_windows_source.h b/gr-audio/lib/windows/audio_windows_source.h
index 36311968d..9cb789576 100644
--- a/gr-audio/lib/windows/audio_windows_source.h
+++ b/gr-audio/lib/windows/audio_windows_source.h
@@ -28,6 +28,7 @@
 
 /*!
  * \brief audio source using winmm mmsystem (win32 only)
+ * \ingroup audio_blk
  *
  * Output signature is one or two streams of floats.
  * Output samples will be in the range [-1,1].
diff --git a/gr-audio/swig/CMakeLists.txt b/gr-audio/swig/CMakeLists.txt
new file mode 100644
index 000000000..3e7b7f861
--- /dev/null
+++ b/gr-audio/swig/CMakeLists.txt
@@ -0,0 +1,51 @@
+# 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_AUDIO_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_LIBRARIES gnuradio-audio)
+
+GR_SWIG_MAKE(audio_swig audio_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS audio_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/audio
+    COMPONENT "audio_python"
+)
+
+install(
+    FILES audio_swig.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "audio_swig"
+)
+
+GR_PYTHON_INSTALL(
+    FILES __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/audio
+    COMPONENT "audio_python"
+)
diff --git a/gr-audio/swig/Makefile.swig.gen b/gr-audio/swig/Makefile.swig.gen
index 7cdf04665..14322c0e5 100644
--- a/gr-audio/swig/Makefile.swig.gen
+++ b/gr-audio/swig/Makefile.swig.gen
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -105,7 +105,7 @@ _audio_swig_la_CXXFLAGS =			\
 	$(audio_swig_la_swig_cxxflags)
 
 python/audio_swig.cc: audio_swig.py
-audio_swig.py: audio_swig.i
+audio_swig.py: audio_swig.i 
 
 # Include the python dependencies for this file
 -include python/audio_swig.d
diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt
new file mode 100644
index 000000000..b12177fda
--- /dev/null
+++ b/gr-comedi/CMakeLists.txt
@@ -0,0 +1,104 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+include(FindPkgConfig)
+
+PKG_CHECK_MODULES(COMEDI comedilib)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-comedi" ENABLE_GR_COMEDI
+    COMEDI_FOUND
+    LINUX #comedi uses linux specific device noces
+    Boost_FOUND
+    ENABLE_GR_CORE
+)
+
+remove_definitions(-fvisibility=hidden) #FIXME until we do symbol visibility
+
+GR_SET_GLOBAL(GR_COMEDI_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_COMEDI)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_COMEDI_DESCRIPTION "GNU Radio Comedi Blocks")
+
+CPACK_COMPONENT("comedi_runtime"
+    GROUP        "Comedi"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("comedi_devel"
+    GROUP        "Comedi"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("comedi_python"
+    GROUP        "Comedi"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "core_python;comedi_runtime"
+)
+
+CPACK_COMPONENT("comedi_swig"
+    GROUP        "Comedi"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;comedi_python;comedi_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(src)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-comedi.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-comedi.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-comedi.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "comedi_devel"
+)
+
+endif(ENABLE_GR_COMEDI)
diff --git a/gr-comedi/src/CMakeLists.txt b/gr-comedi/src/CMakeLists.txt
new file mode 100644
index 000000000..2573940dc
--- /dev/null
+++ b/gr-comedi/src/CMakeLists.txt
@@ -0,0 +1,109 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_COMEDI_INCLUDE_DIRS}
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+include_directories(${COMEDI_INCLUDE_DIRS})
+link_directories(${COMEDI_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gr_comedi_sources
+    comedi_sink_s.cc
+    comedi_source_s.cc
+    gri_comedi.cc
+)
+
+list(APPEND comedi_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+    ${COMEDI_LIBRARIES}
+)
+
+add_library(gnuradio-comedi SHARED ${gr_comedi_sources})
+target_link_libraries(gnuradio-comedi ${comedi_libs})
+GR_LIBRARY_FOO(gnuradio-comedi RUNTIME_COMPONENT "comedi_runtime" DEVEL_COMPONENT "comedi_devel")
+
+########################################################################
+# Install public header files
+########################################################################
+install(FILES
+    comedi_sink_s.h
+    comedi_source_s.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "comedi_devel"
+)
+
+########################################################################
+# Setup swig generation
+########################################################################
+if(ENABLE_PYTHON)
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_COMEDI_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_LIBRARIES gnuradio-comedi)
+
+GR_SWIG_MAKE(comedi comedi.i)
+
+GR_SWIG_INSTALL(
+    TARGETS comedi
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio
+    COMPONENT "comedi_python"
+)
+
+install(
+    FILES comedi.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "comedi_swig"
+)
+
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+if(ENABLE_TESTING AND ENABLE_PYTHON)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-comedi/src
+    )
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-comedi)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING AND ENABLE_PYTHON)
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am
deleted file mode 100644
index 9c8c96b96..000000000
--- a/gr-cvsd-vocoder/src/lib/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright 2004,2005,2008,2009,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
-# These headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS =			\
-	cvsd_decode_bs.h		\
-	cvsd_encode_sb.h
-
-lib_LTLIBRARIES = libgnuradio-cvsd-vocoder.la
-
-libgnuradio_cvsd_vocoder_la_SOURCES = 	\
-	cvsd_decode_bs.cc		\
-	cvsd_encode_sb.cc
-
-libgnuradio_cvsd_vocoder_la_LIBADD =	\
-	$(GNURADIO_CORE_LA)
-
-libgnuradio_cvsd_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-###################################
-# SWIG interface and library
-
-TOP_SWIG_IFILES = 			\
-	cvsd_vocoder.i
-
-# Install so that they end up available as:
-#   import gnuradio.vocoder.cvsd_vocoder
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder
-cvsd_vocoder_pythondir_category =	\
-	gnuradio/vocoder
-
-# additional libraries for linking with the SWIG-generated library
-cvsd_vocoder_la_swig_libadd =		\
-	libgnuradio-cvsd-vocoder.la
diff --git a/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i b/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i
deleted file mode 100644
index 82662e84e..000000000
--- a/gr-cvsd-vocoder/src/lib/cvsd_vocoder.i
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2009 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.
- */
-
-%include "gnuradio.i"
-
-%{
-#include "cvsd_encode_sb.h"
-#include "cvsd_decode_bs.h"
-%}
-
-GR_SWIG_BLOCK_MAGIC(cvsd,encode_sb);
-
-cvsd_encode_sb_sptr cvsd_make_encode_sb (short min_step=10,
-					 short max_step=1280,
-					 double step_decay=0.9990234375,
-					 double accum_decay= 0.96875,
-					 int K=32,
-					 int J=4,
-					 short pos_accum_max=32767,
-					 short neg_accum_max=-32767);
-
-class cvsd_encode_sb : public gr_sync_decimator
-{
-private:
-  cvsd_encode_sb (short min_step, short max_step, double step_decay,
-		  double accum_decay, int K, int J,
-		  short pos_accum_max, short neg_accum_max);
-  
-
- public:
-  short min_step() { return d_min_step; }
-  short max_step() { return d_max_step; }
-  double step_decay() { return d_step_decay; }
-  double accum_decay() { return d_accum_decay; }
-  int K() { return d_K; }
-  int J() { return d_J; }
-  short pos_accum_max() { return d_pos_accum_max; }
-  short neg_accum_max() { return d_neg_accum_max; }
-};
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(cvsd,decode_bs);
-
-cvsd_decode_bs_sptr cvsd_make_decode_bs (short min_step=10,
-					 short max_step=1280,
-					 double step_decay=0.9990234375,
-					 double accum_decay= 0.96875,
-					 int K=32,
-					 int J=4,
-					 short pos_accum_max=32767,
-					 short neg_accum_max=-32767);
-
-class cvsd_decode_bs : public gr_sync_interpolator
-{
-private:
-  cvsd_decode_bs (short min_step, short max_step, double step_decay,
-		  double accum_decay, int K, int J,
-		  short pos_accum_max, short neg_accum_max);
-  
- public:
-};
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-cvsd_vocoder" "scm_init_gnuradio_cvsd_vocoder_module")
-%}
-
-%goops %{
-(use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gr-cvsd-vocoder/src/python/run_tests.in b/gr-cvsd-vocoder/src/python/run_tests.in
deleted file mode 100644
index be969e287..000000000
--- a/gr-cvsd-vocoder/src/python/run_tests.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# 1st parameter is absolute path to component source directory
-# 2nd parameter is absolute path to component build directory
-# 3rd parameter is path to Python QA directory
-
-@top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-cvsd-vocoder \
-    @abs_top_builddir@/gr-cvsd-vocoder \
-    @srcdir@
diff --git a/gr-gpio/src/python/.gitignore b/gr-digital/.gitignore
index b9e19a979..37c287f40 100644
--- a/gr-gpio/src/python/.gitignore
+++ b/gr-digital/.gitignore
@@ -1,4 +1,3 @@
 /Makefile
 /Makefile.in
-/*.pyc
-/run_tests
+gnuradio-digital.pc
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
new file mode 100644
index 000000000..099af0869
--- /dev/null
+++ b/gr-digital/CMakeLists.txt
@@ -0,0 +1,108 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-digital" ENABLE_GR_DIGITAL
+    Boost_FOUND
+    ENABLE_GR_CORE
+)
+
+GR_SET_GLOBAL(GR_DIGITAL_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
+GR_SET_GLOBAL(GR_DIGITAL_SWIG_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/swig
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_DIGITAL)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_DIGITAL_DESCRIPTION "GNU Radio Digital Blocks")
+
+CPACK_COMPONENT("digital_runtime"
+    GROUP        "Digital"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Dynamic link libraries"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("digital_devel"
+    GROUP        "Digital"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("digital_python"
+    GROUP        "Digital"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime"
+    DEPENDS      "core_python;digital_runtime"
+)
+
+CPACK_COMPONENT("digital_swig"
+    GROUP        "Digital"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;digital_python;digital_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(include)
+add_subdirectory(lib)
+add_subdirectory(doc)
+if(ENABLE_PYTHON)
+    add_subdirectory(swig)
+    add_subdirectory(python)
+    add_subdirectory(grc)
+    add_subdirectory(examples)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-digital.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-digital.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-digital.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "digital_devel"
+)
+
+endif(ENABLE_GR_DIGITAL)
diff --git a/gr-usrp2/Makefile.am b/gr-digital/Makefile.am
index 895032fb0..85a9bbbde 100644
--- a/gr-usrp2/Makefile.am
+++ b/gr-digital/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2006,2008,2009,2011 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,11 +21,11 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = src apps
+SUBDIRS =  include lib doc
 
 if PYTHON
-SUBDIRS += grc
+SUBDIRS += swig python apps grc examples
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnuradio-usrp2.pc
+dist_pkgconfig_DATA = gnuradio-digital.pc
diff --git a/gr-digital/README b/gr-digital/README
new file mode 100644
index 000000000..af2005c97
--- /dev/null
+++ b/gr-digital/README
@@ -0,0 +1,4 @@
+This GNU Radio component for implementing digitial modulators and demodulators.
+
+
+FIXME: just fixme.
\ No newline at end of file
diff --git a/gr-digital/apps/.gitignore b/gr-digital/apps/.gitignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/gr-digital/apps/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/gr-usrp2/apps/Makefile.am b/gr-digital/apps/Makefile.am
index e1cec4cfc..7373a0719 100644
--- a/gr-usrp2/apps/Makefile.am
+++ b/gr-digital/apps/Makefile.am
@@ -21,12 +21,13 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST += \
-    $(bin_SCRIPTS)
-
 if PYTHON
 
-bin_SCRIPTS = \
-    usrp2_rx_cfile.py
+dist_bin_SCRIPTS =
+
+noinst_PYTHON =
 
 endif
+
+EXTRA_DIST +=
+
diff --git a/gnuradio-examples/python/apps/.gitignore b/gr-digital/doc/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gnuradio-examples/python/apps/.gitignore
+++ b/gr-digital/doc/.gitignore
diff --git a/gr-digital/doc/CMakeLists.txt b/gr-digital/doc/CMakeLists.txt
new file mode 100644
index 000000000..5383236da
--- /dev/null
+++ b/gr-digital/doc/CMakeLists.txt
@@ -0,0 +1,23 @@
+# 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.
+
+install(
+    FILES README.digital
+    DESTINATION ${GR_PKG_DOC_DIR}
+)
diff --git a/gr-digital/doc/Makefile.am b/gr-digital/doc/Makefile.am
new file mode 100644
index 000000000..dbfe1d5a2
--- /dev/null
+++ b/gr-digital/doc/Makefile.am
@@ -0,0 +1,27 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS =
+
+dist_gr_doc_DATA =		\
+	README.digital
diff --git a/gr-digital/doc/README.digital b/gr-digital/doc/README.digital
new file mode 100644
index 000000000..f4d40f3a0
--- /dev/null
+++ b/gr-digital/doc/README.digital
@@ -0,0 +1,13 @@
+This is the gr-digital package. It contains all of the digital
+modulation blocks, utilities, and examples. To use the digital blocks,
+the Python namespaces is in gnuradio.digital, which would be normally
+imported as:
+
+    from gnuradio import digital
+
+See the Doxygen documentation for details about the blocks available
+in this package. A quick listing of the details can be found in Python
+after importing by using: 
+
+    help(digital)
+
diff --git a/gr-digital/doc/digital.dox b/gr-digital/doc/digital.dox
new file mode 100644
index 000000000..110dcb677
--- /dev/null
+++ b/gr-digital/doc/digital.dox
@@ -0,0 +1,23 @@
+/*! \page page_digital Digital Modulation
+
+\section Introduction
+This is the gr-digital package. It contains all of the digital
+modulation blocks, utilities, and examples. To use the digital blocks,
+the Python namespaces is in gnuradio.digital, which would be normally
+imported as:
+
+\code
+    from gnuradio import digital
+\endcode
+
+See the Doxygen documentation for details about the blocks available
+in this package. The relevant blocks are listed in the \ref digital group.
+
+A quick listing of the details can be found in Python after importing
+by using:
+
+\code
+    help(digital)
+\endcode
+
+*/
diff --git a/gr-digital/examples/.gitignore b/gr-digital/examples/.gitignore
new file mode 100644
index 000000000..d7028d40d
--- /dev/null
+++ b/gr-digital/examples/.gitignore
@@ -0,0 +1,8 @@
+/Makefile
+/Makefile.in
+/*.8b
+/*.16s
+/*.16i
+/*.32f
+/*.32fc
+/*.16sc
diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt
new file mode 100644
index 000000000..2645557cc
--- /dev/null
+++ b/gr-digital/examples/CMakeLists.txt
@@ -0,0 +1,45 @@
+# 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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+    example_costas.py
+    example_fll.py
+    example_timing.py
+    run_length.py
+    gen_whitener.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/digital
+    COMPONENT "digital_python"
+)
+
+GR_PYTHON_INSTALL(PROGRAMS
+    narrowband/transmit_path.py
+    narrowband/receive_path.py
+    narrowband/uhd_interface.py
+    narrowband/benchmark_tx.py
+    narrowband/benchmark_rx.py
+    narrowband/tx_voice.py
+    narrowband/rx_voice.py
+    narrowband/digital_bert_rx.py
+    narrowband/digital_bert_tx.py
+    narrowband/tunnel.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/digital/narrowband
+    COMPONENT "digital_python"
+)
diff --git a/gnuradio-examples/python/usrp/Makefile.am b/gr-digital/examples/Makefile.am
index 0ede005a0..3841bbd0e 100644
--- a/gnuradio-examples/python/usrp/Makefile.am
+++ b/gr-digital/examples/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2009 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,26 +21,26 @@
 
 include $(top_srcdir)/Makefile.common
 
-ourdatadir = $(exampledir)/usrp
+dig_examples_prefix= $(exampledir)/digital
+
+basicdatadir = $(dig_examples_prefix)
+dist_basicdata_SCRIPTS =		\
+	example_costas.py		\
+	example_fll.py			\
+	example_timing.py		\
+	run_length.py			\
+	gen_whitener.py
+
+nbdatadir = $(dig_examples_prefix)/narrowband
+dist_nbdata_SCRIPTS =		\
+	narrowband/transmit_path.py	\
+	narrowband/receive_path.py	\
+	narrowband/uhd_interface.py	\
+	narrowband/benchmark_tx.py	\
+	narrowband/benchmark_rx.py	\
+	narrowband/tx_voice.py		\
+	narrowband/rx_voice.py		\
+	narrowband/digital_bert_rx.py	\
+	narrowband/digital_bert_tx.py	\
+	narrowband/tunnel.py
 
-dist_ourdata_SCRIPTS = 			\
-	fm_tx_2_daughterboards.py	\
-	fm_tx4.py			\
-	max_power.py			\
-	test_dft_analysis.py		\
-	test_dft_synth.py		\
-	usrp_benchmark_usb.py		\
-	usrp_nbfm_ptt.py		\
-	usrp_nbfm_rcv.py		\
-	usrp_spectrum_sense.py		\
-	usrp_test_loop_lfsr.py		\
-	usrp_tv_rcv_nogui.py		\
-	usrp_tv_rcv.py			\
-	usrp_wfm_rcv.py			\
-	usrp_wfm_rcv_nogui.py		\
-	usrp_wfm_rcv_fmdet.py		\
-	usrp_wfm_rcv_pll.py		\
-	usrp_wfm_rcv_sca.py		\
-	usrp_wfm_rcv2_nogui.py		\
-	usrp_wxapt_rcv.py		\
-	usrp_am_mw_rcv.py
diff --git a/gr-digital/examples/example_costas.py b/gr-digital/examples/example_costas.py
new file mode 100755
index 000000000..aef0196cc
--- /dev/null
+++ b/gr-digital/examples/example_costas.py
@@ -0,0 +1,116 @@
+#!/usr/bin/env python
+
+from gnuradio import gr, digital
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+try:
+    import scipy
+except ImportError:
+    print "Error: could not import scipy (http://www.scipy.org/)"
+    sys.exit(1)
+
+try:
+    import pylab
+except ImportError:
+    print "Error: could not import pylab (http://matplotlib.sourceforge.net/)"
+    sys.exit(1)
+
+class example_costas(gr.top_block):
+    def __init__(self, N, sps, rolloff, ntaps, bw, noise, foffset, toffset, poffset):
+        gr.top_block.__init__(self)
+
+        rrc_taps = gr.firdes.root_raised_cosine(
+            sps, sps, 1.0, rolloff, ntaps)
+
+        data = 2.0*scipy.random.randint(0, 2, N) - 1.0
+        data = scipy.exp(1j*poffset) * data
+
+        self.src = gr.vector_source_c(data.tolist(), False)
+        self.rrc = gr.interp_fir_filter_ccf(sps, rrc_taps)
+        self.chn = gr.channel_model(noise, foffset, toffset)
+        self.cst = digital.costas_loop_cc(bw, 2)
+
+        self.vsnk_src = gr.vector_sink_c()
+        self.vsnk_cst = gr.vector_sink_c()
+        self.vsnk_frq = gr.vector_sink_f()
+
+        self.connect(self.src, self.rrc, self.chn, self.cst, self.vsnk_cst)
+        self.connect(self.rrc, self.vsnk_src)
+        self.connect((self.cst,1), self.vsnk_frq)
+
+def main():
+    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
+    parser.add_option("-N", "--nsamples", type="int", default=2000,
+                      help="Set the number of samples to process [default=%default]")
+    parser.add_option("-S", "--sps", type="int", default=4,
+                      help="Set the samples per symbol [default=%default]")
+    parser.add_option("-r", "--rolloff", type="eng_float", default=0.35,
+                      help="Set the rolloff factor [default=%default]")
+    parser.add_option("-W", "--bandwidth", type="eng_float", default=2*scipy.pi/100.0,
+                      help="Set the loop bandwidth [default=%default]")
+    parser.add_option("-n", "--ntaps", type="int", default=45,
+                      help="Set the number of taps in the filters [default=%default]")
+    parser.add_option("", "--noise", type="eng_float", default=0.0,
+                      help="Set the simulation noise voltage [default=%default]")
+    parser.add_option("-f", "--foffset", type="eng_float", default=0.0,
+                      help="Set the simulation's normalized frequency offset (in Hz) [default=%default]")
+    parser.add_option("-t", "--toffset", type="eng_float", default=1.0,
+                      help="Set the simulation's timing offset [default=%default]")
+    parser.add_option("-p", "--poffset", type="eng_float", default=0.707,
+                      help="Set the simulation's phase offset [default=%default]")
+    (options, args) = parser.parse_args ()
+
+    # Adjust N for the interpolation by sps
+    options.nsamples = options.nsamples // options.sps
+
+    # Set up the program-under-test
+    put = example_costas(options.nsamples, options.sps, options.rolloff,
+                         options.ntaps, options.bandwidth, options.noise,
+                         options.foffset, options.toffset, options.poffset)
+    put.run()
+
+    data_src = scipy.array(put.vsnk_src.data())
+
+    # Convert the FLL's LO frequency from rads/sec to Hz
+    data_frq = scipy.array(put.vsnk_frq.data()) / (2.0*scipy.pi)
+
+    # adjust this to align with the data.
+    data_cst = scipy.array(3*[0,]+list(put.vsnk_cst.data()))
+    
+    # Plot the Costas loop's LO frequency
+    f1 = pylab.figure(1, figsize=(12,10), facecolor='w')
+    s1 = f1.add_subplot(2,2,1)
+    s1.plot(data_frq)
+    s1.set_title("Costas LO")
+    s1.set_xlabel("Samples")
+    s1.set_ylabel("Frequency (normalized Hz)")
+
+    # Plot the IQ symbols
+    s3 = f1.add_subplot(2,2,2)
+    s3.plot(data_src.real, data_src.imag, "o")
+    s3.plot(data_cst.real, data_cst.imag, "rx")
+    s3.set_title("IQ")
+    s3.set_xlabel("Real part")
+    s3.set_ylabel("Imag part")
+    s3.set_xlim([-2, 2])
+    s3.set_ylim([-2, 2])
+
+    # Plot the symbols in time
+    s4 = f1.add_subplot(2,2,3)
+    s4.set_position([0.125, 0.05, 0.775, 0.4])
+    s4.plot(data_src.real, "o-")
+    s4.plot(data_cst.real, "rx-")
+    s4.set_title("Symbols")
+    s4.set_xlabel("Samples")
+    s4.set_ylabel("Real Part of Signals")
+
+    pylab.show()
+    
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+
diff --git a/gr-digital/examples/example_fll.py b/gr-digital/examples/example_fll.py
new file mode 100755
index 000000000..3b75b5a75
--- /dev/null
+++ b/gr-digital/examples/example_fll.py
@@ -0,0 +1,126 @@
+#!/usr/bin/env python
+
+from gnuradio import gr, digital
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+try:
+    import scipy
+except ImportError:
+    print "Error: could not import scipy (http://www.scipy.org/)"
+    sys.exit(1)
+
+try:
+    import pylab
+except ImportError:
+    print "Error: could not import pylab (http://matplotlib.sourceforge.net/)"
+    sys.exit(1)
+
+class example_fll(gr.top_block):
+    def __init__(self, N, sps, rolloff, ntaps, bw, noise, foffset, toffset, poffset):
+        gr.top_block.__init__(self)
+
+        rrc_taps = gr.firdes.root_raised_cosine(
+            sps, sps, 1.0, rolloff, ntaps)
+
+        data = 2.0*scipy.random.randint(0, 2, N) - 1.0
+        data = scipy.exp(1j*poffset) * data
+
+        self.src = gr.vector_source_c(data.tolist(), False)
+        self.rrc = gr.interp_fir_filter_ccf(sps, rrc_taps)
+        self.chn = gr.channel_model(noise, foffset, toffset)
+        self.fll = digital.fll_band_edge_cc(sps, rolloff, ntaps, bw)
+
+        self.vsnk_src = gr.vector_sink_c()
+        self.vsnk_fll = gr.vector_sink_c()
+        self.vsnk_frq = gr.vector_sink_f()
+        self.vsnk_phs = gr.vector_sink_f()
+        self.vsnk_err = gr.vector_sink_f()
+
+        self.connect(self.src, self.rrc, self.chn, self.fll, self.vsnk_fll)
+        self.connect(self.rrc, self.vsnk_src)
+        self.connect((self.fll,1), self.vsnk_frq)
+        self.connect((self.fll,2), self.vsnk_phs)
+        self.connect((self.fll,3), self.vsnk_err)
+
+def main():
+    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
+    parser.add_option("-N", "--nsamples", type="int", default=2000,
+                      help="Set the number of samples to process [default=%default]")
+    parser.add_option("-S", "--sps", type="int", default=4,
+                      help="Set the samples per symbol [default=%default]")
+    parser.add_option("-r", "--rolloff", type="eng_float", default=0.35,
+                      help="Set the rolloff factor [default=%default]")
+    parser.add_option("-W", "--bandwidth", type="eng_float", default=2*scipy.pi/100.0,
+                      help="Set the loop bandwidth [default=%default]")
+    parser.add_option("-n", "--ntaps", type="int", default=45,
+                      help="Set the number of taps in the filters [default=%default]")
+    parser.add_option("", "--noise", type="eng_float", default=0.0,
+                      help="Set the simulation noise voltage [default=%default]")
+    parser.add_option("-f", "--foffset", type="eng_float", default=0.2,
+                      help="Set the simulation's normalized frequency offset (in Hz) [default=%default]")
+    parser.add_option("-t", "--toffset", type="eng_float", default=1.0,
+                      help="Set the simulation's timing offset [default=%default]")
+    parser.add_option("-p", "--poffset", type="eng_float", default=0.0,
+                      help="Set the simulation's phase offset [default=%default]")
+    (options, args) = parser.parse_args ()
+
+    # Adjust N for the interpolation by sps
+    options.nsamples = options.nsamples // options.sps
+
+    # Set up the program-under-test
+    put = example_fll(options.nsamples, options.sps, options.rolloff,
+                      options.ntaps, options.bandwidth, options.noise,
+                      options.foffset, options.toffset, options.poffset)
+    put.run()
+
+    data_src = scipy.array(put.vsnk_src.data())
+    data_err = scipy.array(put.vsnk_err.data())
+
+    # Convert the FLL's LO frequency from rads/sec to Hz
+    data_frq = scipy.array(put.vsnk_frq.data()) / (2.0*scipy.pi)
+
+    # adjust this to align with the data. There are 2 filters of
+    # ntaps long and the channel introduces another 4 sample delay.
+    data_fll = scipy.array(put.vsnk_fll.data()[2*options.ntaps-4:])
+    
+    # Plot the FLL's LO frequency
+    f1 = pylab.figure(1, figsize=(12,10))
+    s1 = f1.add_subplot(2,2,1)
+    s1.plot(data_frq)
+    s1.set_title("FLL LO")
+    s1.set_xlabel("Samples")
+    s1.set_ylabel("Frequency (normalized Hz)")
+
+    # Plot the FLL's error
+    s2 = f1.add_subplot(2,2,2)
+    s2.plot(data_err)
+    s2.set_title("FLL Error")
+    s2.set_xlabel("Samples")
+    s2.set_ylabel("FLL Loop error")
+
+    # Plot the IQ symbols
+    s3 = f1.add_subplot(2,2,3)
+    s3.plot(data_src.real, data_src.imag, "o")
+    s3.plot(data_fll.real, data_fll.imag, "rx")
+    s3.set_title("IQ")
+    s3.set_xlabel("Real part")
+    s3.set_ylabel("Imag part")
+
+    # Plot the symbols in time
+    s4 = f1.add_subplot(2,2,4)
+    s4.plot(data_src.real, "o-")
+    s4.plot(data_fll.real, "rx-")
+    s4.set_title("Symbols")
+    s4.set_xlabel("Samples")
+    s4.set_ylabel("Real Part of Signals")
+
+    pylab.show()
+    
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+
diff --git a/gr-digital/examples/example_timing.py b/gr-digital/examples/example_timing.py
new file mode 100755
index 000000000..fd86acfb1
--- /dev/null
+++ b/gr-digital/examples/example_timing.py
@@ -0,0 +1,211 @@
+#!/usr/bin/env python
+
+from gnuradio import gr, digital
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+try:
+    import scipy
+except ImportError:
+    print "Error: could not import scipy (http://www.scipy.org/)"
+    sys.exit(1)
+
+try:
+    import pylab
+except ImportError:
+    print "Error: could not import pylab (http://matplotlib.sourceforge.net/)"
+    sys.exit(1)
+
+from scipy import fftpack
+
+class example_timing(gr.top_block):
+    def __init__(self, N, sps, rolloff, ntaps, bw, noise,
+                 foffset, toffset, poffset, mode=0):
+        gr.top_block.__init__(self)
+
+        rrc_taps = gr.firdes.root_raised_cosine(
+            sps, sps, 1.0, rolloff, ntaps)
+
+        gain = 2*scipy.pi/100.0
+        nfilts = 32
+        rrc_taps_rx = gr.firdes.root_raised_cosine(
+            nfilts, sps*nfilts, 1.0, rolloff, ntaps*nfilts)
+            
+        data = 2.0*scipy.random.randint(0, 2, N) - 1.0
+        data = scipy.exp(1j*poffset) * data
+
+        self.src = gr.vector_source_c(data.tolist(), False)
+        self.rrc = gr.interp_fir_filter_ccf(sps, rrc_taps)
+        self.chn = gr.channel_model(noise, foffset, toffset)
+        self.off = gr.fractional_interpolator_cc(0.20, 1.0)
+
+        if mode == 0:
+            self.clk = gr.pfb_clock_sync_ccf(sps, gain, rrc_taps_rx,
+                                             nfilts, nfilts//2, 3.5)
+            self.taps = self.clk.get_taps()
+            self.dtaps = self.clk.get_diff_taps()
+
+            self.vsnk_err = gr.vector_sink_f()
+            self.vsnk_rat = gr.vector_sink_f()
+            self.vsnk_phs = gr.vector_sink_f()
+
+            self.connect((self.clk,1), self.vsnk_err)
+            self.connect((self.clk,2), self.vsnk_rat)
+            self.connect((self.clk,3), self.vsnk_phs)
+            
+        else: # mode == 1
+            mu = 0.5
+            gain_mu = 0.1
+            gain_omega = 0.25*gain_mu*gain_mu
+            omega_rel_lim = 0.02
+            self.clk = digital.clock_recovery_mm_cc(sps, gain_omega,
+                                                    mu, gain_mu,
+                                                    omega_rel_lim)
+
+            self.vsnk_err = gr.vector_sink_f()
+
+            self.connect((self.clk,1), self.vsnk_err)
+
+        self.vsnk_src = gr.vector_sink_c()
+        self.vsnk_clk = gr.vector_sink_c()
+
+        self.connect(self.src, self.rrc, self.chn, self.off, self.clk, self.vsnk_clk)
+        self.connect(self.off, self.vsnk_src)
+
+
+def main():
+    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
+    parser.add_option("-N", "--nsamples", type="int", default=2000,
+                      help="Set the number of samples to process [default=%default]")
+    parser.add_option("-S", "--sps", type="int", default=4,
+                      help="Set the samples per symbol [default=%default]")
+    parser.add_option("-r", "--rolloff", type="eng_float", default=0.35,
+                      help="Set the rolloff factor [default=%default]")
+    parser.add_option("-W", "--bandwidth", type="eng_float", default=2*scipy.pi/100.0,
+                      help="Set the loop bandwidth [default=%default]")
+    parser.add_option("-n", "--ntaps", type="int", default=45,
+                      help="Set the number of taps in the filters [default=%default]")
+    parser.add_option("", "--noise", type="eng_float", default=0.0,
+                      help="Set the simulation noise voltage [default=%default]")
+    parser.add_option("-f", "--foffset", type="eng_float", default=0.0,
+                      help="Set the simulation's normalized frequency offset (in Hz) [default=%default]")
+    parser.add_option("-t", "--toffset", type="eng_float", default=1.0,
+                      help="Set the simulation's timing offset [default=%default]")
+    parser.add_option("-p", "--poffset", type="eng_float", default=0.0,
+                      help="Set the simulation's phase offset [default=%default]")
+    parser.add_option("-M", "--mode", type="int", default=0,
+                      help="Set the recovery mode (0: polyphase, 1: M&M) [default=%default]")
+    (options, args) = parser.parse_args ()
+
+    # Adjust N for the interpolation by sps
+    options.nsamples = options.nsamples // options.sps
+
+    # Set up the program-under-test
+    put = example_timing(options.nsamples, options.sps, options.rolloff,
+                         options.ntaps, options.bandwidth, options.noise,
+                         options.foffset, options.toffset, options.poffset,
+                         options.mode)
+    put.run()
+
+    if options.mode == 0:
+        data_src = scipy.array(put.vsnk_src.data()[20:])
+        data_clk = scipy.array(put.vsnk_clk.data()[20:])
+
+        data_err = scipy.array(put.vsnk_err.data()[20:])
+        data_rat = scipy.array(put.vsnk_rat.data()[20:])
+        data_phs = scipy.array(put.vsnk_phs.data()[20:])
+
+        f1 = pylab.figure(1, figsize=(12,10), facecolor='w')
+
+        # Plot the IQ symbols
+        s1 = f1.add_subplot(2,2,1)
+        s1.plot(data_src.real, data_src.imag, "bo")
+        s1.plot(data_clk.real, data_clk.imag, "ro")
+        s1.set_title("IQ")
+        s1.set_xlabel("Real part")
+        s1.set_ylabel("Imag part")
+        s1.set_xlim([-2, 2])
+        s1.set_ylim([-2, 2])
+
+        # Plot the symbols in time
+        s2 = f1.add_subplot(2,2,2)
+        s2.plot(data_src.real, "bo-")
+        s2.plot(data_clk.real, "ro")
+        s2.set_title("Symbols")
+        s2.set_xlabel("Samples")
+        s2.set_ylabel("Real Part of Signals")
+
+        # Plot the clock recovery loop's error
+        s3 = f1.add_subplot(2,2,3)
+        s3.plot(data_err)
+        s3.set_title("Clock Recovery Loop Error")
+        s3.set_xlabel("Samples")
+        s3.set_ylabel("Error")
+
+        # Plot the clock recovery loop's error
+        s4 = f1.add_subplot(2,2,4)
+        s4.plot(data_phs)
+        s4.set_title("Clock Recovery Loop Filter Phase")
+        s4.set_xlabel("Samples")
+        s4.set_ylabel("Filter Phase")
+
+
+        diff_taps = put.dtaps
+        ntaps = len(diff_taps[0])
+        nfilts = len(diff_taps)
+        t = scipy.arange(0, ntaps*nfilts)
+
+        f3 = pylab.figure(3, figsize=(12,10), facecolor='w')
+        s31 = f3.add_subplot(2,1,1)
+        s32 = f3.add_subplot(2,1,2)
+        s31.set_title("Differential Filters")
+        s32.set_title("FFT of Differential Filters")
+
+        for i,d in enumerate(diff_taps):
+            D = 20.0*scipy.log10(abs(fftpack.fftshift(fftpack.fft(d, 10000))))
+            s31.plot(t[i::nfilts].real, d, "-o")
+            s32.plot(D)
+
+    # If testing the M&M clock recovery loop
+    else:
+        data_src = scipy.array(put.vsnk_src.data()[20:])
+        data_clk = scipy.array(put.vsnk_clk.data()[20:])
+
+        data_err = scipy.array(put.vsnk_err.data()[20:])
+
+        f1 = pylab.figure(1, figsize=(12,10), facecolor='w')
+        
+        # Plot the IQ symbols
+        s1 = f1.add_subplot(2,2,1)
+        s1.plot(data_src.real, data_src.imag, "o")
+        s1.plot(data_clk.real, data_clk.imag, "ro")
+        s1.set_title("IQ")
+        s1.set_xlabel("Real part")
+        s1.set_ylabel("Imag part")
+        s1.set_xlim([-2, 2])
+        s1.set_ylim([-2, 2])
+
+        # Plot the symbols in time
+        s2 = f1.add_subplot(2,2,2)
+        s2.plot(data_src.real, "o-")
+        s2.plot(data_clk.real, "ro")
+        s2.set_title("Symbols")
+        s2.set_xlabel("Samples")
+        s2.set_ylabel("Real Part of Signals")
+
+        # Plot the clock recovery loop's error
+        s3 = f1.add_subplot(2,2,3)
+        s3.plot(data_err)
+        s3.set_title("Clock Recovery Loop Error")
+        s3.set_xlabel("Samples")
+        s3.set_ylabel("Error")
+
+    pylab.show()
+    
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+
diff --git a/gnuradio-examples/python/digital/gen_whitener.py b/gr-digital/examples/gen_whitener.py
index 9a81e4eaa..9a81e4eaa 100755
--- a/gnuradio-examples/python/digital/gen_whitener.py
+++ b/gr-digital/examples/gen_whitener.py
diff --git a/gnuradio-examples/python/digital/README b/gr-digital/examples/narrowband/README
index 904a64895..1c50ad69b 100644
--- a/gnuradio-examples/python/digital/README
+++ b/gr-digital/examples/narrowband/README
@@ -82,3 +82,72 @@ useful as a diagnostic tool when experimenting with line coding or
 whitening algorithms.
 
 
+
+**********************************************************************
+**********************************************************************
+
+
+BERT testing example scripts
+
+benchmark_tx.py
+
+This sets up a BPSK transmitter that is modulated with a pseudorandom
+sequence of bits.  The PN code is generated by sending an all 1s
+sequence through a 7-bit scrambler. The transmitter performs the BPSK
+modulation, then passes the complex baseband waveform through a
+root-raised-cosine filter and onto the USRP.
+
+The --sps parameter controls how many baseband samples per symbol
+are created and passed through the RRC filter, prior to going to the
+USRP over the USB for interpolation to the final DAC rate.
+
+The baseband bit rate is controlled by -r or --rate.  This value, when
+multiplied by the --sps parameter, must result in valid interpolation
+rate for the USRP.  For example, if the baseband rate is 250k bits/sec,
+and the samples per symbol is 4, then the final rate is 1M samples/sec,
+which results in an interpolation rate of 128.  The valid interpolation
+rates for the USRP are multiples of 4 between 16 and 512.
+
+Finally, the RRC excess bandwidth may be specified by --excess-bw.
+(See ./benchmark_tx.py -h for additional parameters.)
+
+
+benchmark_rx.py
+
+This sets up a BPSK receiver to demodulate the received waveform.  It
+accepts a similar set of parameters as the transmitter, except that one
+specifies the USRP decimation rate desired.  The resulting sample stream
+rate must be an integral number of baseband symbols.  For example, the
+parameters corresponding to the above transmitter would be to use a
+decimation rate of 8 (32 sps), 16 (16 sps), 32 (8 sps), 64, (4 sps), or
+128 (2 sps).  The lower the USRP decimation, the more CPU is required to
+demodulate the signal, so not all valid decimation rates will work.
+
+The baseband signal from the USRP is first passed through an AGC to
+establish an average power of 1.0.  It is then passed through a matched
+filter (another RRC), a Costas phase-locked loop, and a Mueller and
+Muller bit timing recovery loop.  The resulting constellation has an SNR
+estimation probe attached, and is then sliced into a bit stream.
+
+The recovered bits are then passed through a 7-bit descrambler.  If
+there are no channel errors, the all 1s sequence is recovered. In the 
+event of a channel error, there will be a 0 in the bit stream for each
+feedback tap in the descrambler.  In this case, the CCSDS descrambler is
+using 3 feedback taps.
+
+Finally, the signal is passed into a bit density measurement probe. The
+channel BER is measured by dividing the 0s density by three.  This
+measurement is inaccurate at high BER rates (>10%) as the error 0s
+begin to overlap.
+
+The benchmark script will, once per second, output the Costas loop
+frequency offset, the recovered timing error, the estimated SNR, and the
+average BER.
+
+NOTE: The particular SNR estimator used is inaccurate below about 7dB,
+and will report erroneously high values even for random noise.
+
+There are a variety of Costas and M&M loop parameters one can adjust.
+See ./benchmark_rx.py -h for the full set.
+
+
diff --git a/gr-digital/examples/narrowband/benchmark_add_channel.py b/gr-digital/examples/narrowband/benchmark_add_channel.py
new file mode 100755
index 000000000..841833a08
--- /dev/null
+++ b/gr-digital/examples/narrowband/benchmark_add_channel.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python
+#
+# Copyright 2010,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.
+# 
+
+from gnuradio import gr
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+import random, math, sys
+
+class my_top_block(gr.top_block):
+    def __init__(self, ifile, ofile, options):
+        gr.top_block.__init__(self)
+
+        SNR = 10.0**(options.snr/10.0)
+        frequency_offset = options.frequency_offset
+        time_offset = options.time_offset
+        phase_offset = options.phase_offset*(math.pi/180.0)
+
+        # calculate noise voltage from SNR
+        power_in_signal = abs(options.tx_amplitude)**2
+        noise_power = power_in_signal/SNR
+        noise_voltage = math.sqrt(noise_power)
+
+        self.src = gr.file_source(gr.sizeof_gr_complex, ifile)
+        #self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate)
+        self.channel = gr.channel_model(noise_voltage, frequency_offset,
+                                        time_offset, noise_seed=random.randint(0,100000))
+        self.phase = gr.multiply_const_cc(complex(math.cos(phase_offset),
+                                                  math.sin(phase_offset)))
+        self.snk = gr.file_sink(gr.sizeof_gr_complex, ofile)
+
+        self.connect(self.src, self.channel, self.phase, self.snk)
+        
+
+# /////////////////////////////////////////////////////////////////////////////
+#                                   main
+# /////////////////////////////////////////////////////////////////////////////
+
+def main():
+    # Create Options Parser:
+    usage = "benchmack_add_channel.py [options] <input file> <output file>"
+    parser = OptionParser (usage=usage, option_class=eng_option, conflict_handler="resolve")
+    parser.add_option("-n", "--snr", type="eng_float", default=30,
+                      help="set the SNR of the channel in dB [default=%default]")
+    parser.add_option("", "--seed", action="store_true", default=False,
+                      help="use a random seed for AWGN noise [default=%default]")
+    parser.add_option("-f", "--frequency-offset", type="eng_float", default=0,
+                      help="set frequency offset introduced by channel [default=%default]")
+    parser.add_option("-t", "--time-offset", type="eng_float", default=1.0,
+                      help="set timing offset between Tx and Rx [default=%default]")
+    parser.add_option("-p", "--phase-offset", type="eng_float", default=0,
+                      help="set phase offset (in degrees) between Tx and Rx [default=%default]")
+    parser.add_option("-m", "--use-multipath", action="store_true", default=False,
+                      help="Use a multipath channel [default=%default]")
+    parser.add_option("", "--tx-amplitude", type="eng_float",
+                      default=1.0,
+                      help="tell the simulator the signal amplitude [default=%default]")
+
+    (options, args) = parser.parse_args ()
+
+    if len(args) != 2:
+        parser.print_help(sys.stderr)
+        sys.exit(1)
+
+    ifile = args[0]
+    ofile = args[1]
+        
+    # build the graph
+    tb = my_top_block(ifile, ofile, options)
+
+    r = gr.enable_realtime_scheduling()
+    if r != gr.RT_OK:
+        print "Warning: Failed to enable realtime scheduling."
+
+    tb.start()        # start flow graph
+    tb.wait()         # wait for it to finish
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
diff --git a/gnuradio-examples/python/digital/benchmark_rx.py b/gr-digital/examples/narrowband/benchmark_rx.py
index ccb0c8963..1962fdc4b 100755
--- a/gnuradio-examples/python/digital/benchmark_rx.py
+++ b/gr-digital/examples/narrowband/benchmark_rx.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc.
+# Copyright 2010,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,18 +20,20 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, modulation_utils
-from gnuradio import usrp
+from gnuradio import gr, gru
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
-import random
-import struct
-import sys
+# From gr-digital
+from gnuradio import digital
 
 # from current dir
-import usrp_receive_path
+from receive_path import receive_path
+from uhd_interface import uhd_receiver
+
+import struct
+import sys
 
 #import os
 #print os.getpid()
@@ -41,10 +43,32 @@ class my_top_block(gr.top_block):
     def __init__(self, demodulator, rx_callback, options):
         gr.top_block.__init__(self)
 
+        if(options.rx_freq is not None):
+            # Work-around to get the modulation's bits_per_symbol
+            args = demodulator.extract_kwargs_from_options(options)
+            symbol_rate = options.bitrate / demodulator(**args).bits_per_symbol()
+
+            self.source = uhd_receiver(options.args, symbol_rate,
+                                       options.samples_per_symbol,
+                                       options.rx_freq, options.rx_gain,
+                                       options.spec, options.antenna,
+                                       options.verbose)
+            options.samples_per_symbol = self.source._sps
+
+        elif(options.from_file is not None):
+            sys.stderr.write(("Reading samples from '%s'.\n\n" % (options.from_file)))
+            self.source = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+        else:
+            sys.stderr.write("No source defined, pulling samples from null source.\n\n")
+            self.source = gr.null_source(gr.sizeof_gr_complex)
+
         # Set up receive path
-        self.rxpath = usrp_receive_path.usrp_receive_path(demodulator, rx_callback, options) 
+        # do this after for any adjustments to the options that may
+        # occur in the sinks (specifically the UHD sink)
+        self.rxpath = receive_path(demodulator, rx_callback, options) 
+
+        self.connect(self.source, self.rxpath)
 
-        self.connect(self.rxpath)
 
 # /////////////////////////////////////////////////////////////////////////////
 #                                   main
@@ -68,19 +92,21 @@ def main():
         print "ok = %5s  pktno = %4d  n_rcvd = %4d  n_right = %4d" % (
             ok, pktno, n_rcvd, n_right)
 
-
-    demods = modulation_utils.type_1_demods()
+    demods = digital.modulation_utils.type_1_demods()
 
     # Create Options Parser:
     parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
 
     parser.add_option("-m", "--modulation", type="choice", choices=demods.keys(), 
-                      default='gmsk',
+                      default='psk',
                       help="Select modulation from: %s [default=%%default]"
                             % (', '.join(demods.keys()),))
+    parser.add_option("","--from-file", default=None,
+                      help="input file of samples to demod")
 
-    usrp_receive_path.add_options(parser, expert_grp)
+    receive_path.add_options(parser, expert_grp)
+    uhd_receiver.add_options(parser)
 
     for mod in demods.values():
         mod.add_options(expert_grp)
@@ -91,10 +117,11 @@ def main():
         parser.print_help(sys.stderr)
         sys.exit(1)
 
-    if options.rx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
+    if options.from_file is None:
+        if options.rx_freq is None:
+            sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
+            parser.print_help(sys.stderr)
+            sys.exit(1)
 
 
     # build the graph
diff --git a/gnuradio-examples/python/digital/benchmark_tx.py b/gr-digital/examples/narrowband/benchmark_tx.py
index 73c4a3901..9afacb495 100755
--- a/gnuradio-examples/python/digital/benchmark_tx.py
+++ b/gr-digital/examples/narrowband/benchmark_tx.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc.
+# Copyright 2010,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,16 +20,19 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, modulation_utils
-from gnuradio import usrp
+from gnuradio import gr
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
-import random, time, struct, sys
+# From gr-digital
+from gnuradio import digital
 
 # from current dir
-import usrp_transmit_path
+from transmit_path import transmit_path
+from uhd_interface import uhd_transmitter
+
+import time, struct, sys
 
 #import os 
 #print os.getpid()
@@ -39,9 +42,30 @@ class my_top_block(gr.top_block):
     def __init__(self, modulator, options):
         gr.top_block.__init__(self)
 
-        self.txpath = usrp_transmit_path.usrp_transmit_path(modulator, options)
+        if(options.tx_freq is not None):
+            # Work-around to get the modulation's bits_per_symbol
+            args = modulator.extract_kwargs_from_options(options)
+            symbol_rate = options.bitrate / modulator(**args).bits_per_symbol()
+
+            self.sink = uhd_transmitter(options.args, symbol_rate,
+                                        options.samples_per_symbol,
+                                        options.tx_freq, options.tx_gain,
+                                        options.spec, options.antenna,
+                                        options.verbose)
+            options.samples_per_symbol = self.sink._sps
+            
+        elif(options.to_file is not None):
+            sys.stderr.write(("Saving samples to '%s'.\n\n" % (options.to_file)))
+            self.sink = gr.file_sink(gr.sizeof_gr_complex, options.to_file)
+        else:
+            sys.stderr.write("No sink defined, dumping samples to null sink.\n\n")
+            self.sink = gr.null_sink(gr.sizeof_gr_complex)
+
+        # do this after for any adjustments to the options that may
+        # occur in the sinks (specifically the UHD sink)
+        self.txpath = transmit_path(modulator, options)
 
-        self.connect(self.txpath)
+        self.connect(self.txpath, self.sink)
 
 # /////////////////////////////////////////////////////////////////////////////
 #                                   main
@@ -52,16 +76,13 @@ def main():
     def send_pkt(payload='', eof=False):
         return tb.txpath.send_pkt(payload, eof)
 
-    def rx_callback(ok, payload):
-        print "ok = %r, payload = '%s'" % (ok, payload)
-
-    mods = modulation_utils.type_1_mods()
+    mods = digital.modulation_utils.type_1_mods()
 
     parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
 
     parser.add_option("-m", "--modulation", type="choice", choices=mods.keys(),
-                      default='gmsk',
+                      default='psk',
                       help="Select modulation from: %s [default=%%default]"
                             % (', '.join(mods.keys()),))
 
@@ -72,9 +93,12 @@ def main():
     parser.add_option("","--discontinuous", action="store_true", default=False,
                       help="enable discontinous transmission (bursts of 5 packets)")
     parser.add_option("","--from-file", default=None,
-                      help="use file for packet contents")
+                      help="use intput file for packet contents")
+    parser.add_option("","--to-file", default=None,
+                      help="Output file for modulated samples")
 
-    usrp_transmit_path.add_options(parser, expert_grp)
+    transmit_path.add_options(parser, expert_grp)
+    uhd_transmitter.add_options(parser)
 
     for mod in mods.values():
         mod.add_options(expert_grp)
@@ -84,12 +108,7 @@ def main():
     if len(args) != 0:
         parser.print_help()
         sys.exit(1)
-
-    if options.tx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
+           
     if options.from_file is not None:
         source_file = open(options.from_file, 'r')
 
diff --git a/gr-digital/examples/narrowband/digital_bert_rx.py b/gr-digital/examples/narrowband/digital_bert_rx.py
new file mode 100755
index 000000000..28331310d
--- /dev/null
+++ b/gr-digital/examples/narrowband/digital_bert_rx.py
@@ -0,0 +1,209 @@
+#!/usr/bin/env python
+#
+# Copyright 2008,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.
+#
+
+from gnuradio import gr, eng_notation
+from optparse import OptionParser
+from gnuradio.eng_option import eng_option
+import gnuradio.gr.gr_threading as _threading
+import sys, time, math
+
+from gnuradio import digital
+
+# from current dir
+from uhd_interface import uhd_receiver
+
+n2s = eng_notation.num_to_str
+
+class status_thread(_threading.Thread):
+    def __init__(self, tb):
+        _threading.Thread.__init__(self)
+        self.setDaemon(1)
+        self.tb = tb
+        self.done = False
+        self.start()
+
+    def run(self):
+        while not self.done:
+            print "Freq. Offset: {0:5.0f} Hz  Timing Offset: {1:10.1f} ppm  Estimated SNR: {2:4.1f} dB  BER: {3:g}".format(
+                tb.frequency_offset(), tb.timing_offset()*1e6, tb.snr(), tb.ber())
+            try:
+                time.sleep(1.0)
+            except KeyboardInterrupt:
+                self.done = True
+
+
+
+class bert_receiver(gr.hier_block2):
+    def __init__(self, bitrate,
+                 constellation, samples_per_symbol,
+                 differential, excess_bw, gray_coded,
+                 freq_bw, timing_bw, phase_bw,
+                 verbose, log):
+
+        gr.hier_block2.__init__(self, "bert_receive",
+                                gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
+                                gr.io_signature(0, 0, 0))                    # Output signature
+        
+        self._bitrate = bitrate
+
+        self._demod = digital.generic_demod(constellation, samples_per_symbol,
+                                            differential, excess_bw, gray_coded,
+                                            freq_bw, timing_bw, phase_bw,
+                                            verbose, log)
+
+        self._symbol_rate = self._bitrate * self._demod.bits_per_symbol()
+        self._sample_rate = self._symbol_rate * samples_per_symbol
+
+        # Add an SNR probe on the demodulated constellation
+        self._snr_probe = gr.probe_mpsk_snr_c(10.0/self._symbol_rate)
+        self.connect(self._demod.time_recov, self._snr_probe)
+        
+        # Descramble BERT sequence.  A channel error will create 3 incorrect bits
+        self._descrambler = gr.descrambler_bb(0x8A, 0x7F, 7) # CCSDS 7-bit descrambler
+
+        # Measure BER by the density of 0s in the stream
+        self._ber = gr.probe_density_b(1.0/self._symbol_rate)
+        
+        self.connect(self, self._demod, self._descrambler, self._ber)
+
+    def frequency_offset(self):
+        return self._demod.freq_recov.get_frequency()*self._sample_rate/(2*math.pi)
+
+    def timing_offset(self):
+        return self._demod.time_recov.get_clock_rate()
+
+    def snr(self):
+        return self._snr_probe.snr()
+
+    def ber(self):
+        return (1.0-self._ber.density())/3.0
+
+
+
+class rx_psk_block(gr.top_block):
+    def __init__(self, demod, options):
+
+	gr.top_block.__init__(self, "rx_mpsk")
+
+        self._demodulator_class = demod
+
+        # Get demod_kwargs
+        demod_kwargs = self._demodulator_class.extract_kwargs_from_options(options)
+        
+        # demodulator
+	self._demodulator = self._demodulator_class(**demod_kwargs)
+
+        if(options.rx_freq is not None):
+            self._source = uhd_receiver(options.args, options.bitrate,
+                                        options.samples_per_symbol,
+                                        options.rx_freq, options.rx_gain,
+                                        options.antenna, options.verbose)
+            options.samples_per_symbol = self._source._sps
+
+        elif(options.from_file is not None):
+            self._source = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+        else:
+            self._source = gr.null_source(gr.sizeof_gr_complex)
+
+        # Create the BERT receiver
+        self._receiver = bert_receiver(options.bitrate,
+                                       self._demodulator._constellation, 
+                                       options.samples_per_symbol,
+                                       options.differential, 
+                                       options.excess_bw, 
+                                       gray_coded=True,
+                                       freq_bw=options.freq_bw,
+                                       timing_bw=options.timing_bw,
+                                       phase_bw=options.phase_bw,
+                                       verbose=options.verbose,
+                                       log=options.log)
+        
+        self.connect(self._source, self._receiver)
+
+    def snr(self):
+        return self._receiver.snr()
+
+    def mag(self):
+        return self._receiver.signal_mean()
+        
+    def var(self):
+        return self._receiver.noise_variance()
+
+    def ber(self):
+        return self._receiver.ber()
+
+    def frequency_offset(self):
+        return self._receiver.frequency_offset()
+        
+    def timing_offset(self):
+        return self._receiver.timing_offset()
+            
+
+def get_options(demods):
+    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
+    parser.add_option("","--from-file", default=None,
+                      help="input file of samples to demod")
+    parser.add_option("-m", "--modulation", type="choice", choices=demods.keys(), 
+                      default='psk',
+                      help="Select modulation from: %s [default=%%default]"
+                            % (', '.join(demods.keys()),))
+    parser.add_option("-r", "--bitrate", type="eng_float", default=250e3,
+                      help="Select modulation bit rate (default=%default)")
+    parser.add_option("-S", "--samples-per-symbol", type="float", default=2,
+                      help="set samples/symbol [default=%default]")
+    if not parser.has_option("--verbose"):
+        parser.add_option("-v", "--verbose", action="store_true", default=False)
+    if not parser.has_option("--log"):
+        parser.add_option("", "--log", action="store_true", default=False,
+                      help="Log all parts of flow graph to files (CAUTION: lots of data)")
+
+    uhd_receiver.add_options(parser)
+
+    demods = digital.modulation_utils.type_1_demods()
+    for mod in demods.values():
+        mod.add_options(parser)
+		      
+    (options, args) = parser.parse_args()
+    if len(args) != 0:
+        parser.print_help()
+        sys.exit(1)
+	
+    return (options, args)
+
+
+if __name__ == "__main__":
+    demods = digital.modulation_utils.type_1_demods()
+
+    (options, args) = get_options(demods)
+
+    demod = demods[options.modulation]
+    tb = rx_psk_block(demod, options)
+
+    print "\n*** SNR estimator is inaccurate below about 7dB"
+    print "*** BER estimator is inaccurate above about 10%\n"
+    updater = status_thread(tb)
+
+    try:
+        tb.run()
+    except KeyboardInterrupt:
+        updater.done = True
+        updater = None
diff --git a/gr-digital/examples/narrowband/digital_bert_tx.py b/gr-digital/examples/narrowband/digital_bert_tx.py
new file mode 100755
index 000000000..46f4f9097
--- /dev/null
+++ b/gr-digital/examples/narrowband/digital_bert_tx.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python
+#
+# Copyright 2008,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.
+#
+
+from gnuradio import gr, eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+import sys
+
+from gnuradio import digital
+
+# from current dir
+from uhd_interface import uhd_transmitter
+
+n2s = eng_notation.num_to_str
+
+class bert_transmit(gr.hier_block2):
+    def __init__(self, constellation, samples_per_symbol,
+                 differential, excess_bw, gray_coded,
+                 verbose, log):
+
+        gr.hier_block2.__init__(self, "bert_transmit",
+                                gr.io_signature(0, 0, 0),                    # Output signature
+                                gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Input signature
+        
+        # Create BERT data bit stream	
+	self._bits = gr.vector_source_b([1,], True)      # Infinite stream of ones
+        self._scrambler = gr.scrambler_bb(0x8A, 0x7F, 7) # CCSDS 7-bit scrambler
+
+        self._mod = digital.generic_mod(constellation, samples_per_symbol,
+                                        differential, excess_bw, gray_coded,
+                                        verbose, log)
+
+        self._pack = gr.unpacked_to_packed_bb(self._mod.bits_per_symbol(), gr.GR_MSB_FIRST)
+
+        self.connect(self._bits, self._scrambler, self._pack, self._mod, self)
+
+
+class tx_psk_block(gr.top_block):
+    def __init__(self, mod, options):
+	gr.top_block.__init__(self, "tx_mpsk")
+
+        self._modulator_class = mod
+
+        # Get mod_kwargs
+        mod_kwargs = self._modulator_class.extract_kwargs_from_options(options)
+        
+        # transmitter
+	self._modulator = self._modulator_class(**mod_kwargs)
+
+        if(options.tx_freq is not None):
+            self._sink = uhd_transmitter(options.args, options.bitrate,
+                                         options.samples_per_symbol,
+                                         options.tx_freq, options.tx_gain,
+                                         options.antenna, options.verbose)
+            options.samples_per_symbol = self._sink._sps
+            
+        elif(options.to_file is not None):
+            self._sink = gr.file_sink(gr.sizeof_gr_complex, options.to_file)
+        else:
+            self._sink = gr.null_sink(gr.sizeof_gr_complex)
+            
+            
+        self._transmitter = bert_transmit(self._modulator._constellation,
+                                          options.samples_per_symbol,
+                                          options.differential,
+                                          options.excess_bw,
+                                          gray_coded=True,
+                                          verbose=options.verbose,
+                                          log=options.log)
+
+	self.connect(self._transmitter, self._sink)
+
+
+def get_options(mods):
+    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
+    parser.add_option("-m", "--modulation", type="choice", choices=mods.keys(),
+                      default='psk',
+                      help="Select modulation from: %s [default=%%default]"
+                            % (', '.join(mods.keys()),))
+    parser.add_option("", "--amplitude", type="eng_float", default=0.2,
+                      help="set Tx amplitude (0-1) (default=%default)")
+    parser.add_option("-r", "--bitrate", type="eng_float", default=250e3,
+                      help="Select modulation bit rate (default=%default)")
+    parser.add_option("-S", "--samples-per-symbol", type="float", default=2,
+                      help="set samples/symbol [default=%default]")
+    parser.add_option("","--to-file", default=None,
+                      help="Output file for modulated samples")
+    if not parser.has_option("--verbose"):
+        parser.add_option("-v", "--verbose", action="store_true", default=False)
+    if not parser.has_option("--log"):
+        parser.add_option("", "--log", action="store_true", default=False)
+
+    uhd_transmitter.add_options(parser)
+
+    for mod in mods.values():
+        mod.add_options(parser)
+		      
+    (options, args) = parser.parse_args()
+    if len(args) != 0:
+        parser.print_help()
+        sys.exit(1)
+	
+    return (options, args)
+
+if __name__ == "__main__":
+    mods = digital.modulation_utils.type_1_mods()
+
+    (options, args) = get_options(mods)
+    
+    mod = mods[options.modulation]
+    tb = tx_psk_block(mod, options)
+
+    try:
+        tb.run()
+    except KeyboardInterrupt:
+        pass
diff --git a/gnuradio-examples/python/digital/receive_path.py b/gr-digital/examples/narrowband/receive_path.py
index 0024d6941..1c5e58963 100644
--- a/gnuradio-examples/python/digital/receive_path.py
+++ b/gr-digital/examples/narrowband/receive_path.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,8 +20,10 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, blks2
+from gnuradio import gr, gru
 from gnuradio import eng_notation
+from gnuradio import digital
+
 import copy
 import sys
 
@@ -32,26 +34,27 @@ import sys
 class receive_path(gr.hier_block2):
     def __init__(self, demod_class, rx_callback, options):
 	gr.hier_block2.__init__(self, "receive_path",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(0, 0, 0))                    # Output signature
-
+				gr.io_signature(1, 1, gr.sizeof_gr_complex),
+				gr.io_signature(0, 0, 0))
         
         options = copy.copy(options)    # make a copy so we can destructively modify
 
-        self._verbose            = options.verbose
-        self._bitrate            = options.bitrate         # desired bit rate
-        self._samples_per_symbol = options.samples_per_symbol  # desired samples/symbol
+        self._verbose     = options.verbose
+        self._bitrate     = options.bitrate  # desired bit rate
 
-        self._rx_callback   = rx_callback      # this callback is fired when there's a packet available
-        self._demod_class   = demod_class      # the demodulator_class we're using
+        self._rx_callback = rx_callback  # this callback is fired when a packet arrives
+        self._demod_class = demod_class  # the demodulator_class we're using
 
         # Get demod_kwargs
         demod_kwargs = self._demod_class.extract_kwargs_from_options(options)
 
+        # Build the demodulator
+        self.demodulator = self._demod_class(**demod_kwargs)
+        
         # Design filter to get actual channel we want
         sw_decim = 1
         chan_coeffs = gr.firdes.low_pass (1.0,                  # gain
-                                          sw_decim * self._samples_per_symbol, # sampling rate
+                                          sw_decim * self.samples_per_symbol(), # sampling rate
                                           1.0,                  # midpoint of trans. band
                                           0.5,                  # width of trans. band
                                           gr.firdes.WIN_HANN)   # filter type
@@ -59,10 +62,10 @@ class receive_path(gr.hier_block2):
         
         # receiver
         self.packet_receiver = \
-            blks2.demod_pkts(self._demod_class(**demod_kwargs),
-                             access_code=None,
-                             callback=self._rx_callback,
-                             threshold=-1)
+            digital.demod_pkts(self.demodulator,
+                               access_code=None,
+                               callback=self._rx_callback,
+                               threshold=-1)
 
         # Carrier Sensing Blocks
         alpha = 0.001
@@ -86,7 +89,10 @@ class receive_path(gr.hier_block2):
         return self._bitrate
 
     def samples_per_symbol(self):
-        return self._samples_per_symbol
+        return self.demodulator._samples_per_symbol
+
+    def differential(self):
+        return self.demodulator._differential
 
     def carrier_sensed(self):
         """
@@ -119,7 +125,7 @@ class receive_path(gr.hier_block2):
             normal.add_option("-r", "--bitrate", type="eng_float", default=100e3,
                               help="specify bitrate [default=%default].")
         normal.add_option("-v", "--verbose", action="store_true", default=False)
-        expert.add_option("-S", "--samples-per-symbol", type="float", default=None,
+        expert.add_option("-S", "--samples-per-symbol", type="float", default=2,
                           help="set samples/symbol [default=%default]")
         expert.add_option("", "--log", action="store_true", default=False,
                           help="Log all parts of flow graph to files (CAUTION: lots of data)")
@@ -135,4 +141,5 @@ class receive_path(gr.hier_block2):
         print "\nReceive Path:"
         print "modulation:      %s"    % (self._demod_class.__name__)
         print "bitrate:         %sb/s" % (eng_notation.num_to_str(self._bitrate))
-        print "samples/symbol:  %.4f"   % (self._samples_per_symbol)
+        print "samples/symbol:  %.4f"    % (self.samples_per_symbol())
+        print "Differential:    %s"    % (self.differential())
diff --git a/gnuradio-examples/python/digital/rx_voice.py b/gr-digital/examples/narrowband/rx_voice.py
index 1aad1ff8e..100caff8e 100755
--- a/gnuradio-examples/python/digital/rx_voice.py
+++ b/gr-digital/examples/narrowband/rx_voice.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2009 Free Software Foundation, Inc.
+# Copyright 2005,2006,2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,21 +20,21 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, modulation_utils
-from gnuradio import usrp
-from gnuradio import audio
+from gnuradio import gr, blks2, audio, uhd
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
-from gnuradio.vocoder import gsm_full_rate
+from gnuradio import digital
+from gnuradio import vocoder
 
 import random
 import struct
 import sys
 
 # from current dir
-import usrp_receive_path
+from receive_path import receive_path
+from uhd_interface import uhd_receiver
 
 #import os
 #print os.getpid()
@@ -47,11 +47,12 @@ class audio_tx(gr.hier_block2):
 				gr.io_signature(0, 0, 0), # Input signature
 				gr.io_signature(0, 0, 0)) # Output signature
 				
+        self.sample_rate = sample_rate = 8000
         self.packet_src = gr.message_source(33)
-        voice_decoder = gsm_full_rate.decode_ps()
+        voice_decoder = vocoder.gsm_fr_decode_ps()
         s2f = gr.short_to_float ()
         sink_scale = gr.multiply_const_ff(1.0/32767.)
-        audio_sink = audio.sink(8000, audio_output_dev)
+        audio_sink = audio.sink(sample_rate, audio_output_dev)
         self.connect(self.packet_src, voice_decoder, s2f, sink_scale, audio_sink)
         
     def msgq(self):
@@ -61,9 +62,33 @@ class audio_tx(gr.hier_block2):
 class my_top_block(gr.top_block):
     def __init__(self, demod_class, rx_callback, options):
         gr.top_block.__init__(self)
-        self.rxpath = usrp_receive_path.usrp_receive_path(demod_class, rx_callback, options)
+        self.rxpath = receive_path(demod_class, rx_callback, options)
         self.audio_tx = audio_tx(options.audio_output)
-	self.connect(self.rxpath)
+
+        if(options.rx_freq is not None):
+            self.source = uhd_receiver(options.args, options.bitrate,
+                                       options.samples_per_symbol,
+                                       options.rx_freq, options.rx_gain,
+                                       options.antenna, options.verbose)
+            options.samples_per_symbol = self.source._sps
+
+            audio_rate = self.audio_tx.sample_rate
+            usrp_rate = self.source.get_sample_rate()
+            rrate = audio_rate / usrp_rate
+            self.resampler = blks2.pfb_arb_resampler_ccf(rrate)
+            
+            self.connect(self.source, self.resampler, self.rxpath)
+
+        elif(options.from_file is not None):
+            self.thr = gr.throttle(gr.sizeof_gr_complex, options.bitrate)
+            self.source = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+            self.connect(self.source, self.thr, self.rxpath)
+
+        else:
+            self.thr = gr.throttle(gr.sizeof_gr_complex, 1e6)
+            self.source = gr.null_source(gr.sizeof_gr_complex)
+            self.connect(self.source, self.thr, self.rxpath)
+
 	self.connect(self.audio_tx)        
 
 # /////////////////////////////////////////////////////////////////////////////
@@ -89,7 +114,7 @@ def main():
         print "ok = %r  n_rcvd = %4d  n_right = %4d" % (
             ok, n_rcvd, n_right)
 
-    demods = modulation_utils.type_1_demods()
+    demods = digital.modulation_utils.type_1_demods()
 
     # Create Options Parser:
     parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
@@ -101,7 +126,10 @@ def main():
                             % (', '.join(demods.keys()),))
     parser.add_option("-O", "--audio-output", type="string", default="",
                       help="pcm output device name.  E.g., hw:0,0 or /dev/dsp")
-    usrp_receive_path.add_options(parser, expert_grp)
+    parser.add_option("","--from-file", default=None,
+                      help="input file of samples to demod")
+    receive_path.add_options(parser, expert_grp)
+    uhd_receiver.add_options(parser)
 
     for mod in demods.values():
         mod.add_options(expert_grp)
@@ -113,10 +141,11 @@ def main():
         parser.print_help(sys.stderr)
         sys.exit(1)
 
-    if options.rx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
+    if options.from_file is None:
+        if options.rx_freq is None:
+            sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
+            parser.print_help(sys.stderr)
+            sys.exit(1)
 
 
     # build the graph
diff --git a/gnuradio-examples/python/digital/transmit_path.py b/gr-digital/examples/narrowband/transmit_path.py
index 86ebf75c3..4d6162ed6 100644
--- a/gnuradio-examples/python/digital/transmit_path.py
+++ b/gr-digital/examples/narrowband/transmit_path.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -19,8 +19,9 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, blks2
+from gnuradio import gr
 from gnuradio import eng_notation
+from gnuradio import digital
 
 import copy
 import sys
@@ -35,28 +36,27 @@ class transmit_path(gr.hier_block2):
         See below for what options should hold
         '''
 	gr.hier_block2.__init__(self, "transmit_path",
-				gr.io_signature(0, 0, 0),                    # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
+				gr.io_signature(0,0,0),
+				gr.io_signature(1,1,gr.sizeof_gr_complex))
         
         options = copy.copy(options)    # make a copy so we can destructively modify
 
-        self._verbose            = options.verbose
-        self._tx_amplitude       = options.tx_amplitude    # digital amplitude sent to USRP
-        self._bitrate            = options.bitrate         # desired bit rate
-        self._samples_per_symbol = options.samples_per_symbol  # desired samples/baud
-
-        self._modulator_class = modulator_class         # the modulator_class we are using
+        self._verbose      = options.verbose
+        self._tx_amplitude = options.tx_amplitude   # digital amplitude sent to USRP
+        self._bitrate      = options.bitrate        # desired bit rate
+        self._modulator_class = modulator_class     # the modulator_class we are using
 
         # Get mod_kwargs
         mod_kwargs = self._modulator_class.extract_kwargs_from_options(options)
-    
+        
         # transmitter
-	modulator = self._modulator_class(**mod_kwargs)
+	self.modulator = self._modulator_class(**mod_kwargs)
+        
         self.packet_transmitter = \
-            blks2.mod_pkts(modulator,
-                           access_code=None,
-                           msgq_limit=4,
-                           pad_for_usrp=True)
+            digital.mod_pkts(self.modulator,
+                             access_code=None,
+                             msgq_limit=4,
+                             pad_for_usrp=True)
 
         self.amp = gr.multiply_const_cc(1)
         self.set_tx_amplitude(self._tx_amplitude)
@@ -86,22 +86,30 @@ class transmit_path(gr.hier_block2):
         return self._bitrate
 
     def samples_per_symbol(self):
-        return self._samples_per_symbol
+        return self.modulator._samples_per_symbol
+
+    def differential(self):
+        return self.modulator._differential
 
     def add_options(normal, expert):
         """
         Adds transmitter-specific options to the Options Parser
         """
         if not normal.has_option('--bitrate'):
-            normal.add_option("-r", "--bitrate", type="eng_float", default=100e3,
+            normal.add_option("-r", "--bitrate", type="eng_float",
+                              default=100e3,
                               help="specify bitrate [default=%default].")
-        normal.add_option("", "--tx-amplitude", type="eng_float", default=0.250, metavar="AMPL",
+        normal.add_option("", "--tx-amplitude", type="eng_float",
+                          default=0.250, metavar="AMPL",
                           help="set transmitter digital amplitude: 0 <= AMPL < 1 [default=%default]")
-        normal.add_option("-v", "--verbose", action="store_true", default=False)
+        normal.add_option("-v", "--verbose", action="store_true",
+                          default=False)
 
-        expert.add_option("-S", "--samples-per-symbol", type="float", default=None,
+        expert.add_option("-S", "--samples-per-symbol", type="float",
+                          default=2,
                           help="set samples/symbol [default=%default]")
-        expert.add_option("", "--log", action="store_true", default=False,
+        expert.add_option("", "--log", action="store_true",
+                          default=False,
                           help="Log all parts of flow graph to file (CAUTION: lots of data)")
 
     # Make a static method to call before instantiation
@@ -114,5 +122,5 @@ class transmit_path(gr.hier_block2):
         print "Tx amplitude     %s"    % (self._tx_amplitude)
         print "modulation:      %s"    % (self._modulator_class.__name__)
         print "bitrate:         %sb/s" % (eng_notation.num_to_str(self._bitrate))
-        print "samples/symbol:  %.4f"    % (self._samples_per_symbol)
-        
+        print "samples/symbol:  %.4f"  % (self.samples_per_symbol())
+        print "Differential:    %s"    % (self.differential())
diff --git a/gnuradio-examples/python/digital/tunnel.py b/gr-digital/examples/narrowband/tunnel.py
index b0af721da..65205b9f6 100755
--- a/gnuradio-examples/python/digital/tunnel.py
+++ b/gr-digital/examples/narrowband/tunnel.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2009 Free Software Foundation, Inc.
+# Copyright 2005,2006,2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,45 +21,45 @@
 # 
 
 
-# /////////////////////////////////////////////////////////////////////////////
+# ////////////////////////////////////////////////////////////////////
 #
-#    This code sets up up a virtual ethernet interface (typically gr0),
-#    and relays packets between the interface and the GNU Radio PHY+MAC
+#    This code sets up up a virtual ethernet interface (typically
+#    gr0), and relays packets between the interface and the GNU Radio
+#    PHY+MAC
 #
 #    What this means in plain language, is that if you've got a couple
 #    of USRPs on different machines, and if you run this code on those
-#    machines, you can talk between them using normal TCP/IP networking.
+#    machines, you can talk between them using normal TCP/IP
+#    networking.
 #
-# /////////////////////////////////////////////////////////////////////////////
+# ////////////////////////////////////////////////////////////////////
 
 
-from gnuradio import gr, gru, modulation_utils
-from gnuradio import usrp
+from gnuradio import gr, digital
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
-import random
-import time
-import struct
-import sys
-import os
-
 # from current dir
-import usrp_transmit_path
-import usrp_receive_path
+from receive_path  import receive_path
+from transmit_path import transmit_path
+from uhd_interface import uhd_transmitter
+from uhd_interface import uhd_receiver
+
+import os, sys
+import random, time, struct
 
 #print os.getpid()
 #raw_input('Attach and press enter')
 
-
-# /////////////////////////////////////////////////////////////////////////////
+# ////////////////////////////////////////////////////////////////////
 #
-#   Use the Universal TUN/TAP device driver to move packets to/from kernel
+#   Use the Universal TUN/TAP device driver to move packets to/from
+#   kernel
 #
 #   See /usr/src/linux/Documentation/networking/tuntap.txt
 #
-# /////////////////////////////////////////////////////////////////////////////
+# ////////////////////////////////////////////////////////////////////
 
 # Linux specific...
 # TUNSETIFF ifr flags from <linux/tun_if.h>
@@ -81,9 +81,9 @@ def open_tun_interface(tun_device_filename):
     return (tun, ifname)
     
 
-# /////////////////////////////////////////////////////////////////////////////
-#                             the flow graph
-# /////////////////////////////////////////////////////////////////////////////
+# ////////////////////////////////////////////////////////////////////
+#                     the flow graph
+# ////////////////////////////////////////////////////////////////////
 
 class my_top_block(gr.top_block):
 
@@ -91,10 +91,29 @@ class my_top_block(gr.top_block):
                  rx_callback, options):
 
         gr.top_block.__init__(self)
-        self.txpath = usrp_transmit_path.usrp_transmit_path(mod_class, options)
-        self.rxpath = usrp_receive_path.usrp_receive_path(demod_class, rx_callback, options)
-        self.connect(self.txpath)
-        self.connect(self.rxpath)
+
+        # Get the modulation's bits_per_symbol
+        args = mod_class.extract_kwargs_from_options(options)
+        symbol_rate = options.bitrate / mod_class(**args).bits_per_symbol()
+
+        self.source = uhd_receiver(options.args, symbol_rate,
+                                   options.samples_per_symbol,
+                                   options.rx_freq, options.rx_gain,
+                                   options.spec, options.antenna,
+                                   options.verbose)
+        
+        self.sink = uhd_transmitter(options.args, symbol_rate,
+                                    options.samples_per_symbol,
+                                    options.tx_freq, options.tx_gain,
+                                    options.spec, options.antenna,
+                                    options.verbose)
+        
+        options.samples_per_symbol = self.source._sps
+
+        self.txpath = transmit_path(mod_class, options)
+        self.rxpath = receive_path(demod_class, rx_callback, options)
+        self.connect(self.txpath, self.sink)
+        self.connect(self.source, self.rxpath)
 
     def send_pkt(self, payload='', eof=False):
         return self.txpath.send_pkt(payload, eof)
@@ -105,22 +124,31 @@ class my_top_block(gr.top_block):
         """
         return self.rxpath.carrier_sensed()
 
+    def set_freq(self, target_freq):
+        """
+        Set the center frequency we're interested in.
+        """
 
-# /////////////////////////////////////////////////////////////////////////////
+        self.sink.set_freq(target_freq)
+        self.source.set_freq(target_freq)
+        
+
+# ////////////////////////////////////////////////////////////////////
 #                           Carrier Sense MAC
-# /////////////////////////////////////////////////////////////////////////////
+# ////////////////////////////////////////////////////////////////////
 
 class cs_mac(object):
     """
     Prototype carrier sense MAC
 
-    Reads packets from the TUN/TAP interface, and sends them to the PHY.
-    Receives packets from the PHY via phy_rx_callback, and sends them
-    into the TUN/TAP interface.
+    Reads packets from the TUN/TAP interface, and sends them to the
+    PHY. Receives packets from the PHY via phy_rx_callback, and sends
+    them into the TUN/TAP interface.
 
-    Of course, we're not restricted to getting packets via TUN/TAP, this
-    is just an example.
+    Of course, we're not restricted to getting packets via TUN/TAP,
+    this is just an example.
     """
+
     def __init__(self, tun_fd, verbose=False):
         self.tun_fd = tun_fd       # file descriptor for TUN/TAP interface
         self.verbose = verbose
@@ -175,28 +203,28 @@ class cs_mac(object):
 
 def main():
 
-    mods = modulation_utils.type_1_mods()
-    demods = modulation_utils.type_1_demods()
+    mods = digital.modulation_utils.type_1_mods()
+    demods = digital.modulation_utils.type_1_demods()
 
     parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
-    expert_grp.add_option("", "--rx-freq", type="eng_float", default=None,
-                          help="set Rx frequency to FREQ [default=%default]", metavar="FREQ")
-    expert_grp.add_option("", "--tx-freq", type="eng_float", default=None,
-                          help="set transmit frequency to FREQ [default=%default]", metavar="FREQ")
     parser.add_option("-m", "--modulation", type="choice", choices=mods.keys(),
                       default='gmsk',
                       help="Select modulation from: %s [default=%%default]"
                             % (', '.join(mods.keys()),))
 
+    parser.add_option("-s", "--size", type="eng_float", default=1500,
+                      help="set packet size [default=%default]")
     parser.add_option("-v","--verbose", action="store_true", default=False)
     expert_grp.add_option("-c", "--carrier-threshold", type="eng_float", default=30,
                           help="set carrier detect threshold (dB) [default=%default]")
     expert_grp.add_option("","--tun-device-filename", default="/dev/net/tun",
                           help="path to tun device file [default=%default]")
 
-    usrp_transmit_path.add_options(parser, expert_grp)
-    usrp_receive_path.add_options(parser, expert_grp)
+    transmit_path.add_options(parser, expert_grp)
+    receive_path.add_options(parser, expert_grp)
+    uhd_receiver.add_options(parser)
+    uhd_transmitter.add_options(parser)
 
     for mod in mods.values():
         mod.add_options(expert_grp)
@@ -220,25 +248,9 @@ def main():
         realtime = False
         print "Note: failed to enable realtime scheduling"
 
-
-    # If the user hasn't set the fusb_* parameters on the command line,
-    # pick some values that will reduce latency.
-
-    if options.fusb_block_size == 0 and options.fusb_nblocks == 0:
-        if realtime:                        # be more aggressive
-            options.fusb_block_size = gr.prefs().get_long('fusb', 'rt_block_size', 1024)
-            options.fusb_nblocks    = gr.prefs().get_long('fusb', 'rt_nblocks', 16)
-        else:
-            options.fusb_block_size = gr.prefs().get_long('fusb', 'block_size', 4096)
-            options.fusb_nblocks    = gr.prefs().get_long('fusb', 'nblocks', 16)
-    
-    #print "fusb_block_size =", options.fusb_block_size
-    #print "fusb_nblocks    =", options.fusb_nblocks
-
     # instantiate the MAC
     mac = cs_mac(tun_fd, verbose=True)
 
-
     # build the graph (PHY)
     tb = my_top_block(mods[options.modulation],
                       demods[options.modulation],
@@ -256,8 +268,6 @@ def main():
     print "freq:           %s"      % (eng_notation.num_to_str(options.tx_freq))
     print "bitrate:        %sb/sec" % (eng_notation.num_to_str(tb.txpath.bitrate()),)
     print "samples/symbol: %3d" % (tb.txpath.samples_per_symbol(),)
-    #print "interp:         %3d" % (tb.txpath.interp(),)
-    #print "decim:          %3d" % (tb.rxpath.decim(),)
 
     tb.rxpath.set_carrier_threshold(options.carrier_threshold)
     print "Carrier sense threshold:", options.carrier_threshold, "dB"
diff --git a/gnuradio-examples/python/digital/tx_voice.py b/gr-digital/examples/narrowband/tx_voice.py
index d8692beb4..3d767a077 100755
--- a/gnuradio-examples/python/digital/tx_voice.py
+++ b/gr-digital/examples/narrowband/tx_voice.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc.
+# Copyright 2005-2007,2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,14 +20,13 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, modulation_utils
-from gnuradio import usrp
-from gnuradio import audio
+from gnuradio import gr, blks2, audio, uhd
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 
-from gnuradio.vocoder import gsm_full_rate
+from gnuradio import digital
+from gnuradio import vocoder
 
 import random
 import time
@@ -35,7 +34,8 @@ import struct
 import sys
 
 # from current dir
-import usrp_transmit_path
+from transmit_path import transmit_path
+from uhd_interface import uhd_transmitter
 
 #import os
 #print os.getpid()
@@ -47,11 +47,11 @@ class audio_rx(gr.hier_block2):
 	gr.hier_block2.__init__(self, "audio_rx",
 				gr.io_signature(0, 0, 0), # Input signature
 				gr.io_signature(0, 0, 0)) # Output signature
-        sample_rate = 8000
+        self.sample_rate = sample_rate = 8000
         src = audio.source(sample_rate, audio_input_dev)
         src_scale = gr.multiply_const_ff(32767)
         f2s = gr.float_to_short()
-        voice_coder = gsm_full_rate.encode_sp()
+        voice_coder = vocoder.gsm_fr_encode_sp()
         self.packets_from_encoder = gr.msg_queue()
         packet_sink = gr.message_sink(33, self.packets_from_encoder, False)
         self.connect(src, src_scale, f2s, voice_coder, packet_sink)
@@ -64,11 +64,31 @@ class my_top_block(gr.top_block):
 
     def __init__(self, modulator_class, options):
         gr.top_block.__init__(self)
-        self.txpath = usrp_transmit_path.usrp_transmit_path(modulator_class, options)
+        self.txpath = transmit_path(modulator_class, options)
         self.audio_rx = audio_rx(options.audio_input)
-	self.connect(self.txpath)
-	self.connect(self.audio_rx)
 
+        if(options.tx_freq is not None):
+            self.sink = uhd_transmitter(options.address, options.bitrate,
+                                        options.samples_per_symbol,
+                                        options.tx_freq, options.tx_gain,
+                                        options.antenna, options.verbose)
+            options.samples_per_symbol = self.sink._sps
+            audio_rate = self.audio_rx.sample_rate
+            usrp_rate = self.sink.get_sample_rate()
+            rrate = usrp_rate / audio_rate
+            
+        elif(options.to_file is not None):
+            self.sink = gr.file_sink(gr.sizeof_gr_complex, options.to_file)
+            rrate = 1
+        else:
+            self.sink = gr.null_sink(gr.sizeof_gr_complex)
+            rrate = 1
+
+        self.resampler = blks2.pfb_arb_resampler_ccf(rrate)
+            
+	self.connect(self.audio_rx)
+	self.connect(self.txpath, self.resampler, self.sink)
+            
 
 # /////////////////////////////////////////////////////////////////////////////
 #                                   main
@@ -82,7 +102,7 @@ def main():
     def rx_callback(ok, payload):
         print "ok = %r, payload = '%s'" % (ok, payload)
 
-    mods = modulation_utils.type_1_mods()
+    mods = digital.modulation_utils.type_1_mods()
 
     parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
@@ -95,7 +115,11 @@ def main():
                       help="set megabytes to transmit [default=inf]")
     parser.add_option("-I", "--audio-input", type="string", default="",
                       help="pcm input device name.  E.g., hw:0,0 or /dev/dsp")
-    usrp_transmit_path.add_options(parser, expert_grp)
+    parser.add_option("","--to-file", default=None,
+                      help="Output file for modulated samples")
+
+    transmit_path.add_options(parser, expert_grp)
+    uhd_transmitter.add_options(parser)
 
     for mod in mods.values():
         mod.add_options(expert_grp)
@@ -107,11 +131,11 @@ def main():
         parser.print_help()
         sys.exit(1)
 
-    if options.tx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
+    if options.to_file is None:
+        if options.tx_freq is None:
+            sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
+            parser.print_help(sys.stderr)
+            sys.exit(1)
 
     # build the graph
     tb = my_top_block(mods[options.modulation], options)
diff --git a/gr-digital/examples/narrowband/uhd_interface.py b/gr-digital/examples/narrowband/uhd_interface.py
new file mode 100644
index 000000000..21930ad01
--- /dev/null
+++ b/gr-digital/examples/narrowband/uhd_interface.py
@@ -0,0 +1,229 @@
+#!/usr/bin/env python
+#
+# Copyright 2010,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.
+# 
+
+from gnuradio import gr, uhd
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+import sys
+
+def add_freq_option(parser):
+    """
+    Hackery that has the -f / --freq option set both tx_freq and rx_freq
+    """
+    def freq_callback(option, opt_str, value, parser):
+        parser.values.rx_freq = value
+        parser.values.tx_freq = value
+
+    if not parser.has_option('--freq'):
+        parser.add_option('-f', '--freq', type="eng_float",
+                          action="callback", callback=freq_callback,
+                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
+                          metavar="FREQ")
+
+class uhd_interface:
+    def __init__(self, istx, args, sym_rate, sps, freq=None,
+                 gain=None, spec=None, antenna=None):
+        
+        if(istx):
+            self.u = uhd.usrp_sink(device_addr=args,
+                                   io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                   num_channels=1)
+        else:
+            self.u = uhd.usrp_source(device_addr=args,
+                                     io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                     num_channels=1)
+
+        self._args = args
+        self._ant  = antenna
+        self._spec = spec
+        self._gain = self.set_gain(gain)
+        self._freq = self.set_freq(freq)
+
+        self._rate, self._sps = self.set_sample_rate(sym_rate, sps)
+
+        # Set the subdevice spec
+        if(spec):
+            self.u.set_subdev_spec(spec, 0)
+
+        # Set the antenna
+        if(antenna):
+            self.u.set_antenna(antenna, 0)
+        
+    def set_sample_rate(self, sym_rate, req_sps):
+        start_sps = req_sps
+        while(True):
+            asked_samp_rate = sym_rate * req_sps
+            self.u.set_samp_rate(asked_samp_rate)
+            actual_samp_rate = self.u.get_samp_rate()
+
+            sps = actual_samp_rate/sym_rate
+            if(sps < 2):
+                req_sps +=1
+            else:
+                actual_sps = sps
+                break
+        
+        if(sps != req_sps):
+            print "\nSymbol Rate:         %f" % (sym_rate)
+            print "Requested sps:       %f" % (start_sps)
+            print "Given sample rate:   %f" % (actual_samp_rate)
+            print "Actual sps for rate: %f" % (actual_sps)
+
+        if(actual_samp_rate != asked_samp_rate):
+            print "\nRequested sample rate: %f" % (asked_samp_rate)
+            print "Actual sample rate: %f" % (actual_samp_rate)
+
+        return (actual_samp_rate, actual_sps)
+
+    def get_sample_rate(self):
+        return self.u.get_samp_rate()
+    
+    def set_gain(self, gain=None):
+        if gain is None:
+            # if no gain was specified, use the mid-point in dB
+            g = self.u.get_gain_range()
+            gain = float(g.start()+g.stop())/2
+            print "\nNo gain specified."
+            print "Setting gain to %f (from [%f, %f])" % \
+                (gain, g.start(), g.stop())
+        
+        self.u.set_gain(gain, 0)
+        return gain
+
+    def set_freq(self, freq=None):
+        if(freq is None):
+            sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
+            sys.exit(1)
+        
+        r = self.u.set_center_freq(freq, 0)
+        if r:
+            return freq
+        else:
+            frange = self.u.get_freq_range()
+            sys.stderr.write(("\nRequested frequency (%f) out or range [%f, %f]\n") % \
+                                 (freq, frange.start(), frange.stop()))
+            sys.exit(1)
+
+#-------------------------------------------------------------------#
+#   TRANSMITTER
+#-------------------------------------------------------------------#
+
+class uhd_transmitter(uhd_interface, gr.hier_block2):
+    def __init__(self, args, sym_rate, sps, freq=None, gain=None,
+                 spec=None, antenna=None, verbose=False):
+        gr.hier_block2.__init__(self, "uhd_transmitter",
+                                gr.io_signature(1,1,gr.sizeof_gr_complex),
+                                gr.io_signature(0,0,0))
+
+        # Set up the UHD interface as a transmitter
+        uhd_interface.__init__(self, True, args, sym_rate, sps,
+                               freq, gain, spec, antenna)
+
+        self.connect(self, self.u)
+
+        if(verbose):
+            self._print_verbage()
+            
+    def add_options(parser):
+        add_freq_option(parser)
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+                          help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("", "--tx-freq", type="eng_float", default=None,
+                          help="set transmit frequency to FREQ [default=%default]",
+                          metavar="FREQ")
+        parser.add_option("", "--tx-gain", type="eng_float", default=None,
+                          help="set transmit gain in dB (default is midpoint)")
+        parser.add_option("-v", "--verbose", action="store_true", default=False)
+
+    # Make a static method to call before instantiation
+    add_options = staticmethod(add_options)
+
+    def _print_verbage(self):
+        """
+        Prints information about the UHD transmitter
+        """
+        print "\nUHD Transmitter:"
+        print "Args:     %s"    % (self._args)
+        print "Freq:        %sHz"  % (eng_notation.num_to_str(self._freq))
+        print "Gain:        %f dB" % (self._gain)
+        print "Sample Rate: %ssps" % (eng_notation.num_to_str(self._rate))
+        print "Antenna:     %s"    % (self._ant)
+        print "Subdev Sec:  %s"    % (self._spec)
+
+
+#-------------------------------------------------------------------#
+#   RECEIVER
+#-------------------------------------------------------------------#
+
+
+class uhd_receiver(uhd_interface, gr.hier_block2):
+    def __init__(self, args, sym_rate, sps, freq=None, gain=None,
+                 spec=None, antenna=None, verbose=False):
+        gr.hier_block2.__init__(self, "uhd_receiver",
+                                gr.io_signature(0,0,0),
+                                gr.io_signature(1,1,gr.sizeof_gr_complex))
+      
+        # Set up the UHD interface as a receiver
+        uhd_interface.__init__(self, False, args, sym_rate, sps,
+                               freq, gain, spec, antenna)
+
+        self.connect(self.u, self)
+
+        if(verbose):
+            self._print_verbage()
+
+    def add_options(parser):
+        add_freq_option(parser)
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+                          help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("", "--rx-freq", type="eng_float", default=None,
+                          help="set receive frequency to FREQ [default=%default]",
+                          metavar="FREQ")
+        parser.add_option("", "--rx-gain", type="eng_float", default=None,
+                          help="set receive gain in dB (default is midpoint)")
+        if not parser.has_option("--verbose"):
+            parser.add_option("-v", "--verbose", action="store_true", default=False)
+
+    # Make a static method to call before instantiation
+    add_options = staticmethod(add_options)
+
+    def _print_verbage(self):
+        """
+        Prints information about the UHD transmitter
+        """
+        print "\nUHD Receiver:"
+        print "UHD Args:    %s"    % (self._args)
+        print "Freq:        %sHz"  % (eng_notation.num_to_str(self._freq))
+        print "Gain:        %f dB" % (self._gain)
+        print "Sample Rate: %ssps" % (eng_notation.num_to_str(self._rate))
+        print "Antenna:     %s"    % (self._ant)
+        print "Spec:        %s"    % (self._spec)
diff --git a/gr-digital/examples/ofdm/benchmark_add_channel.py b/gr-digital/examples/ofdm/benchmark_add_channel.py
new file mode 100755
index 000000000..01776d209
--- /dev/null
+++ b/gr-digital/examples/ofdm/benchmark_add_channel.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python
+#
+# Copyright 2010,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.
+# 
+
+from gnuradio import gr
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+import random, math, sys
+
+class my_top_block(gr.top_block):
+    def __init__(self, ifile, ofile, options):
+        gr.top_block.__init__(self)
+
+        SNR = 10.0**(options.snr/10.0)
+        time_offset = options.time_offset
+        phase_offset = options.phase_offset*(math.pi/180.0)
+
+        # calculate noise voltage from SNR
+        power_in_signal = abs(options.tx_amplitude)**2
+        noise_power = power_in_signal/SNR
+        noise_voltage = math.sqrt(noise_power)
+        print "Noise voltage: ", noise_voltage
+
+        frequency_offset = options.frequency_offset / options.fft_length
+
+        self.src = gr.file_source(gr.sizeof_gr_complex, ifile)
+        #self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate)
+        self.channel = gr.channel_model(noise_voltage, frequency_offset,
+                                        time_offset, noise_seed=random.randint(0,100000))
+        self.phase = gr.multiply_const_cc(complex(math.cos(phase_offset),
+                                                  math.sin(phase_offset)))
+        self.snk = gr.file_sink(gr.sizeof_gr_complex, ofile)
+
+        self.connect(self.src, self.channel, self.phase, self.snk)
+        
+
+# /////////////////////////////////////////////////////////////////////////////
+#                                   main
+# /////////////////////////////////////////////////////////////////////////////
+
+def main():
+    # Create Options Parser:
+    usage = "benchmack_add_channel.py [options] <input file> <output file>"
+    parser = OptionParser (usage=usage, option_class=eng_option, conflict_handler="resolve")
+    parser.add_option("-n", "--snr", type="eng_float", default=30,
+                      help="set the SNR of the channel in dB [default=%default]")
+    parser.add_option("", "--seed", action="store_true", default=False,
+                      help="use a random seed for AWGN noise [default=%default]")
+    parser.add_option("-f", "--frequency-offset", type="eng_float", default=0,
+                      help="set frequency offset introduced by channel [default=%default]")
+    parser.add_option("-t", "--time-offset", type="eng_float", default=1.0,
+                      help="set timing offset between Tx and Rx [default=%default]")
+    parser.add_option("-p", "--phase-offset", type="eng_float", default=0,
+                      help="set phase offset (in degrees) between Tx and Rx [default=%default]")
+    parser.add_option("-m", "--use-multipath", action="store_true", default=False,
+                      help="Use a multipath channel [default=%default]")
+    parser.add_option("", "--fft-length", type="intx", default=None,
+                      help="set the number of FFT bins [default=%default]")
+    parser.add_option("", "--tx-amplitude", type="eng_float",
+                      default=1.0,
+                      help="tell the simulator the signal amplitude [default=%default]")
+
+    (options, args) = parser.parse_args ()
+
+    if len(args) != 2:
+        parser.print_help(sys.stderr)
+        sys.exit(1)
+
+    if options.fft_length is None:
+        sys.stderr.write("Please enter the FFT length of the OFDM signal.\n")
+        sys.exit(1)
+
+    ifile = args[0]
+    ofile = args[1]
+        
+    # build the graph
+    tb = my_top_block(ifile, ofile, options)
+
+    r = gr.enable_realtime_scheduling()
+    if r != gr.RT_OK:
+        print "Warning: Failed to enable realtime scheduling."
+
+    tb.start()        # start flow graph
+    tb.wait()         # wait for it to finish
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
diff --git a/gr-digital/examples/ofdm/benchmark_rx.py b/gr-digital/examples/ofdm/benchmark_rx.py
new file mode 100755
index 000000000..57817c501
--- /dev/null
+++ b/gr-digital/examples/ofdm/benchmark_rx.py
@@ -0,0 +1,123 @@
+#!/usr/bin/env python
+#
+# Copyright 2006,2007,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.
+# 
+
+from gnuradio import gr, blks2
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+from gnuradio import digital
+
+# from current dir
+from receive_path import receive_path
+from uhd_interface import uhd_receiver
+
+import struct, sys
+
+class my_top_block(gr.top_block):
+    def __init__(self, callback, options):
+        gr.top_block.__init__(self)
+
+        if(options.rx_freq is not None):
+            self.source = uhd_receiver(options.args,
+                                       options.bandwidth,
+                                       options.rx_freq, options.rx_gain,
+                                       options.spec, options.antenna,
+                                       options.verbose)
+        elif(options.from_file is not None):
+            self.source = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+        else:
+            self.source = gr.null_source(gr.sizeof_gr_complex)
+
+        # Set up receive path
+        # do this after for any adjustments to the options that may
+        # occur in the sinks (specifically the UHD sink)
+        self.rxpath = receive_path(callback, options)
+
+        self.connect(self.source, self.rxpath)
+        
+
+# /////////////////////////////////////////////////////////////////////////////
+#                                   main
+# /////////////////////////////////////////////////////////////////////////////
+
+def main():
+
+    global n_rcvd, n_right
+        
+    n_rcvd = 0
+    n_right = 0
+
+    def rx_callback(ok, payload):
+        global n_rcvd, n_right
+        n_rcvd += 1
+        (pktno,) = struct.unpack('!H', payload[0:2])
+        if ok:
+            n_right += 1
+        print "ok: %r \t pktno: %d \t n_rcvd: %d \t n_right: %d" % (ok, pktno, n_rcvd, n_right)
+
+        if 0:
+            printlst = list()
+            for x in payload[2:]:
+                t = hex(ord(x)).replace('0x', '')
+                if(len(t) == 1):
+                    t = '0' + t
+                printlst.append(t)
+            printable = ''.join(printlst)
+
+            print printable
+            print "\n"
+
+    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
+    expert_grp = parser.add_option_group("Expert")
+    parser.add_option("","--discontinuous", action="store_true", default=False,
+                      help="enable discontinuous")
+    parser.add_option("","--from-file", default=None,
+                      help="input file of samples to demod")
+
+    receive_path.add_options(parser, expert_grp)
+    uhd_receiver.add_options(parser)
+    digital.ofdm_demod.add_options(parser, expert_grp)
+
+    (options, args) = parser.parse_args ()
+
+    if options.from_file is None:
+        if options.rx_freq is None:
+            sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
+            parser.print_help(sys.stderr)
+            sys.exit(1)
+
+    # build the graph
+    tb = my_top_block(rx_callback, options)
+
+    r = gr.enable_realtime_scheduling()
+    if r != gr.RT_OK:
+        print "Warning: failed to enable realtime scheduling"
+
+    tb.start()                      # start flow graph
+    tb.wait()                       # wait for it to finish
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
diff --git a/gnuradio-examples/python/digital/benchmark_tx2.py b/gr-digital/examples/ofdm/benchmark_tx.py
index 6093dba61..5962fe7ec 100755
--- a/gnuradio-examples/python/digital/benchmark_tx2.py
+++ b/gr-digital/examples/ofdm/benchmark_tx.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2010 Free Software Foundation, Inc.
+# Copyright 2005,2006,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,29 +20,39 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, modulation_utils2
-from gnuradio import usrp
+from gnuradio import gr
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
+import time, struct, sys
 
-import random, time, struct, sys
+from gnuradio import digital
 
 # from current dir
-import usrp_transmit_path2
-
-#import os 
-#print os.getpid()
-#raw_input('Attach and press enter')
+from transmit_path import transmit_path
+from uhd_interface import uhd_transmitter
 
 class my_top_block(gr.top_block):
-    def __init__(self, modulator, options):
+    def __init__(self, options):
         gr.top_block.__init__(self)
 
-        self.txpath = usrp_transmit_path2.usrp_transmit_path(modulator, options)
+        if(options.tx_freq is not None):
+            self.sink = uhd_transmitter(options.args,
+                                        options.bandwidth,
+                                        options.tx_freq, options.tx_gain,
+                                        options.spec, options.antenna,
+                                        options.verbose)
+        elif(options.to_file is not None):
+            self.sink = gr.file_sink(gr.sizeof_gr_complex, options.to_file)
+        else:
+            self.sink = gr.null_sink(gr.sizeof_gr_complex)
 
-        self.connect(self.txpath)
+        # do this after for any adjustments to the options that may
+        # occur in the sinks (specifically the UHD sink)
+        self.txpath = transmit_path(options)
 
+        self.connect(self.txpath, self.sink)
+        
 # /////////////////////////////////////////////////////////////////////////////
 #                                   main
 # /////////////////////////////////////////////////////////////////////////////
@@ -52,56 +62,34 @@ def main():
     def send_pkt(payload='', eof=False):
         return tb.txpath.send_pkt(payload, eof)
 
-    def rx_callback(ok, payload):
-        print "ok = %r, payload = '%s'" % (ok, payload)
-
-    mods = modulation_utils2.type_1_mods()
-
     parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
-
-    parser.add_option("-m", "--modulation", type="choice", choices=mods.keys(),
-                      default='dbpsk2',
-                      help="Select modulation from: %s [default=%%default]"
-                            % (', '.join(mods.keys()),))
-
-    parser.add_option("-s", "--size", type="eng_float", default=1500,
+    parser.add_option("-s", "--size", type="eng_float", default=400,
                       help="set packet size [default=%default]")
     parser.add_option("-M", "--megabytes", type="eng_float", default=1.0,
                       help="set megabytes to transmit [default=%default]")
     parser.add_option("","--discontinuous", action="store_true", default=False,
-                      help="enable discontinous transmission (bursts of 5 packets)")
+                      help="enable discontinuous mode")
     parser.add_option("","--from-file", default=None,
-                      help="use file for packet contents")
+                      help="use intput file for packet contents")
+    parser.add_option("","--to-file", default=None,
+                      help="Output file for modulated samples")
 
-    usrp_transmit_path2.add_options(parser, expert_grp)
-
-    for mod in mods.values():
-        mod.add_options(expert_grp)
+    transmit_path.add_options(parser, expert_grp)
+    digital.ofdm_mod.add_options(parser, expert_grp)
+    uhd_transmitter.add_options(parser)
 
     (options, args) = parser.parse_args ()
 
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
-
-    if options.tx_freq is None:
-        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-    if options.from_file is not None:
-        source_file = open(options.from_file, 'r')
-
     # build the graph
-    tb = my_top_block(mods[options.modulation], options)
-
+    tb = my_top_block(options)
+    
     r = gr.enable_realtime_scheduling()
     if r != gr.RT_OK:
         print "Warning: failed to enable realtime scheduling"
 
     tb.start()                       # start flow graph
-        
+    
     # generate and send packets
     nbytes = int(1e6 * options.megabytes)
     n = 0
@@ -125,7 +113,6 @@ def main():
         pktno += 1
         
     send_pkt(eof=True)
-
     tb.wait()                       # wait for it to finish
 
 if __name__ == '__main__':
diff --git a/gnuradio-examples/python/ofdm/gr_plot_ofdm.py b/gr-digital/examples/ofdm/gr_plot_ofdm.py
index b24855148..b24855148 100755
--- a/gnuradio-examples/python/ofdm/gr_plot_ofdm.py
+++ b/gr-digital/examples/ofdm/gr_plot_ofdm.py
diff --git a/gnuradio-examples/python/ofdm/ofdm_mod_demod_test.py b/gr-digital/examples/ofdm/ofdm_mod_demod_test.py
index b1521da6d..b1521da6d 100755
--- a/gnuradio-examples/python/ofdm/ofdm_mod_demod_test.py
+++ b/gr-digital/examples/ofdm/ofdm_mod_demod_test.py
diff --git a/gnuradio-examples/python/ofdm/ofdm_sync.m b/gr-digital/examples/ofdm/ofdm_sync.m
index d5df42137..d5df42137 100644
--- a/gnuradio-examples/python/ofdm/ofdm_sync.m
+++ b/gr-digital/examples/ofdm/ofdm_sync.m
diff --git a/gnuradio-examples/python/ofdm/ofdm_sync_pn.m b/gr-digital/examples/ofdm/ofdm_sync_pn.m
index d93c0ca92..d93c0ca92 100644
--- a/gnuradio-examples/python/ofdm/ofdm_sync_pn.m
+++ b/gr-digital/examples/ofdm/ofdm_sync_pn.m
diff --git a/gnuradio-examples/python/ofdm/plot_ofdm.m b/gr-digital/examples/ofdm/plot_ofdm.m
index 2a649b5f5..2a649b5f5 100755
--- a/gnuradio-examples/python/ofdm/plot_ofdm.m
+++ b/gr-digital/examples/ofdm/plot_ofdm.m
diff --git a/gnuradio-examples/python/ofdm/receive_path.py b/gr-digital/examples/ofdm/receive_path.py
index b758bc4d0..e1c7868a0 100644
--- a/gnuradio-examples/python/ofdm/receive_path.py
+++ b/gr-digital/examples/ofdm/receive_path.py
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,15 +19,13 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, blks2
-from gnuradio import usrp
+from gnuradio import gr
 from gnuradio import eng_notation
+from gnuradio import digital
+
 import copy
 import sys
 
-# from current dir
-from pick_bitrate import pick_rx_bitrate
-
 # /////////////////////////////////////////////////////////////////////////////
 #                              receive path
 # /////////////////////////////////////////////////////////////////////////////
@@ -37,8 +34,8 @@ class receive_path(gr.hier_block2):
     def __init__(self, rx_callback, options):
 
 	gr.hier_block2.__init__(self, "receive_path",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(0, 0, 0)) # Output signature
+				gr.io_signature(1, 1, gr.sizeof_gr_complex),
+				gr.io_signature(0, 0, 0))
 
 
         options = copy.copy(options)    # make a copy so we can destructively modify
@@ -48,8 +45,8 @@ class receive_path(gr.hier_block2):
         self._rx_callback = rx_callback      # this callback is fired when there's a packet available
 
         # receiver
-        self.ofdm_rx = \
-                     blks2.ofdm_demod(options, callback=self._rx_callback)
+        self.ofdm_rx = digital.ofdm_demod(options,
+                                          callback=self._rx_callback)
 
         # Carrier Sensing Blocks
         alpha = 0.001
@@ -90,6 +87,9 @@ class receive_path(gr.hier_block2):
         """
         Adds receiver-specific options to the Options Parser
         """
+        normal.add_option("-W", "--bandwidth", type="eng_float",
+                          default=500e3,
+                          help="set symbol bandwidth [default=%default]")
         normal.add_option("-v", "--verbose", action="store_true", default=False)
         expert.add_option("", "--log", action="store_true", default=False,
                           help="Log all parts of flow graph to files (CAUTION: lots of data)")
diff --git a/gnuradio-examples/python/ofdm/transmit_path.py b/gr-digital/examples/ofdm/transmit_path.py
index 44c7331b0..ec357d617 100644
--- a/gnuradio-examples/python/ofdm/transmit_path.py
+++ b/gr-digital/examples/ofdm/transmit_path.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -19,9 +19,9 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, blks2
-from gnuradio import usrp
+from gnuradio import gr
 from gnuradio import eng_notation
+from gnuradio import digital
 
 import copy
 import sys
@@ -37,16 +37,17 @@ class transmit_path(gr.hier_block2):
         '''
 
 	gr.hier_block2.__init__(self, "transmit_path",
-				gr.io_signature(0, 0, 0), # Input signature
-				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
+				gr.io_signature(0, 0, 0),
+				gr.io_signature(1, 1, gr.sizeof_gr_complex))
 
         options = copy.copy(options)    # make a copy so we can destructively modify
 
-        self._verbose      = options.verbose         # turn verbose mode on/off
-        self._tx_amplitude = options.tx_amplitude    # digital amplitude sent to USRP
+        self._verbose      = options.verbose      # turn verbose mode on/off
+        self._tx_amplitude = options.tx_amplitude # digital amp sent to radio
 
-        self.ofdm_tx = \
-                     blks2.ofdm_mod(options, msgq_limit=4, pad_for_usrp=False)
+        self.ofdm_tx = digital.ofdm_mod(options,
+                                        msgq_limit=4,
+                                        pad_for_usrp=False)
 
         self.amp = gr.multiply_const_cc(1)
         self.set_tx_amplitude(self._tx_amplitude)
@@ -61,9 +62,9 @@ class transmit_path(gr.hier_block2):
     def set_tx_amplitude(self, ampl):
         """
         Sets the transmit amplitude sent to the USRP
-        @param: ampl 0 <= ampl < 32768.  Try 8000
+        @param: ampl 0 <= ampl < 1.0.  Try 0.10
         """
-        self._tx_amplitude = max(0.0, min(ampl, 32767.0))
+        self._tx_amplitude = max(0.0, min(ampl, 1))
         self.amp.set_k(self._tx_amplitude)
         
     def send_pkt(self, payload='', eof=False):
@@ -76,10 +77,16 @@ class transmit_path(gr.hier_block2):
         """
         Adds transmitter-specific options to the Options Parser
         """
-        normal.add_option("", "--tx-amplitude", type="eng_float", default=200, metavar="AMPL",
-                          help="set transmitter digital amplitude: 0 <= AMPL < 32768 [default=%default]")
-        normal.add_option("-v", "--verbose", action="store_true", default=False)
-        expert.add_option("", "--log", action="store_true", default=False,
+        normal.add_option("", "--tx-amplitude", type="eng_float",
+                          default=0.1, metavar="AMPL",
+                          help="set transmitter digital amplitude: 0 <= AMPL < 1.0 [default=%default]")
+        normal.add_option("-W", "--bandwidth", type="eng_float",
+                          default=500e3,
+                          help="set symbol bandwidth [default=%default]")
+        normal.add_option("-v", "--verbose", action="store_true",
+                          default=False)
+        expert.add_option("", "--log", action="store_true",
+                          default=False,
                           help="Log all parts of flow graph to file (CAUTION: lots of data)")
 
     # Make a static method to call before instantiation
@@ -89,5 +96,5 @@ class transmit_path(gr.hier_block2):
         """
         Prints information about the transmit path
         """
-        print "Tx amplitude     %s"    % (self._tx_amplitude)
+        print "Tx amplitude     %s" % (self._tx_amplitude)
         
diff --git a/gr-digital/examples/ofdm/tunnel.py b/gr-digital/examples/ofdm/tunnel.py
new file mode 100755
index 000000000..e253cf516
--- /dev/null
+++ b/gr-digital/examples/ofdm/tunnel.py
@@ -0,0 +1,269 @@
+#!/usr/bin/env python
+#
+# Copyright 2005,2006,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 2, 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.
+# 
+
+
+# /////////////////////////////////////////////////////////////////////////////
+#
+#    This code sets up up a virtual ethernet interface (typically gr0),
+#    and relays packets between the interface and the GNU Radio PHY+MAC
+#
+#    What this means in plain language, is that if you've got a couple
+#    of USRPs on different machines, and if you run this code on those
+#    machines, you can talk between them using normal TCP/IP networking.
+#
+# /////////////////////////////////////////////////////////////////////////////
+
+
+from gnuradio import gr, digital
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+# from current dir
+from receive_path import receive_path
+from transmit_path import transmit_path
+from uhd_interface import uhd_transmitter
+from uhd_interface import uhd_receiver
+
+import os, sys
+import random, time, struct
+
+#print os.getpid()
+#raw_input('Attach and press enter')
+
+
+# /////////////////////////////////////////////////////////////////////////////
+#
+#   Use the Universal TUN/TAP device driver to move packets to/from kernel
+#
+#   See /usr/src/linux/Documentation/networking/tuntap.txt
+#
+# /////////////////////////////////////////////////////////////////////////////
+
+# Linux specific...
+# TUNSETIFF ifr flags from <linux/tun_if.h>
+
+IFF_TUN		= 0x0001   # tunnel IP packets
+IFF_TAP		= 0x0002   # tunnel ethernet frames
+IFF_NO_PI	= 0x1000   # don't pass extra packet info
+IFF_ONE_QUEUE	= 0x2000   # beats me ;)
+
+def open_tun_interface(tun_device_filename):
+    from fcntl import ioctl
+    
+    mode = IFF_TAP | IFF_NO_PI
+    TUNSETIFF = 0x400454ca
+
+    tun = os.open(tun_device_filename, os.O_RDWR)
+    ifs = ioctl(tun, TUNSETIFF, struct.pack("16sH", "gr%d", mode))
+    ifname = ifs[:16].strip("\x00")
+    return (tun, ifname)
+    
+
+# /////////////////////////////////////////////////////////////////////////////
+#                             the flow graph
+# /////////////////////////////////////////////////////////////////////////////
+
+class my_top_block(gr.top_block):
+    def __init__(self, callback, options):
+        gr.top_block.__init__(self)
+
+        self.source = uhd_receiver(options.args,
+                                   options.bandwidth,
+                                   options.rx_freq, options.rx_gain,
+                                   options.spec, options.antenna,
+                                   options.verbose)
+
+        self.sink = uhd_transmitter(options.args,
+                                    options.bandwidth,
+                                    options.tx_freq, options.tx_gain,
+                                    options.spec, options.antenna,
+                                    options.verbose)
+
+        self.txpath = transmit_path(options)
+        self.rxpath = receive_path(callback, options)
+
+        self.connect(self.txpath, self.sink)
+        self.connect(self.source, self.rxpath)
+
+    def carrier_sensed(self):
+        """
+        Return True if the receive path thinks there's carrier
+        """
+        return self.rxpath.carrier_sensed()
+
+    def set_freq(self, target_freq):
+        """
+        Set the center frequency we're interested in.
+        """
+        self.u_snk.set_freq(target_freq)
+        self.u_src.set_freq(target_freq)
+        
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           Carrier Sense MAC
+# /////////////////////////////////////////////////////////////////////////////
+
+class cs_mac(object):
+    """
+    Prototype carrier sense MAC
+
+    Reads packets from the TUN/TAP interface, and sends them to the PHY.
+    Receives packets from the PHY via phy_rx_callback, and sends them
+    into the TUN/TAP interface.
+
+    Of course, we're not restricted to getting packets via TUN/TAP, this
+    is just an example.
+    """
+    def __init__(self, tun_fd, verbose=False):
+        self.tun_fd = tun_fd       # file descriptor for TUN/TAP interface
+        self.verbose = verbose
+        self.tb = None             # top block (access to PHY)
+
+    def set_flow_graph(self, tb):
+        self.tb = tb
+
+    def phy_rx_callback(self, ok, payload):
+        """
+        Invoked by thread associated with PHY to pass received packet up.
+
+        @param ok: bool indicating whether payload CRC was OK
+        @param payload: contents of the packet (string)
+        """
+        if self.verbose:
+            print "Rx: ok = %r  len(payload) = %4d" % (ok, len(payload))
+        if ok:
+            os.write(self.tun_fd, payload)
+
+    def main_loop(self):
+        """
+        Main loop for MAC.
+        Only returns if we get an error reading from TUN.
+
+        FIXME: may want to check for EINTR and EAGAIN and reissue read
+        """
+        min_delay = 0.001               # seconds
+
+        while 1:
+            payload = os.read(self.tun_fd, 10*1024)
+            if not payload:
+                self.tb.txpath.send_pkt(eof=True)
+                break
+
+            if self.verbose:
+                print "Tx: len(payload) = %4d" % (len(payload),)
+
+            delay = min_delay
+            while self.tb.carrier_sensed():
+                sys.stderr.write('B')
+                time.sleep(delay)
+                if delay < 0.050:
+                    delay = delay * 2       # exponential back-off
+
+            self.tb.txpath.send_pkt(payload)
+
+
+# /////////////////////////////////////////////////////////////////////////////
+#                                   main
+# /////////////////////////////////////////////////////////////////////////////
+
+def main():
+
+    parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
+    expert_grp = parser.add_option_group("Expert")
+
+    parser.add_option("-m", "--modulation", type="choice", choices=['bpsk', 'qpsk'],
+                      default='bpsk',
+                      help="Select modulation from: bpsk, qpsk [default=%%default]")
+    
+    parser.add_option("-v","--verbose", action="store_true", default=False)
+    expert_grp.add_option("-c", "--carrier-threshold", type="eng_float", default=30,
+                          help="set carrier detect threshold (dB) [default=%default]")
+    expert_grp.add_option("","--tun-device-filename", default="/dev/net/tun",
+                          help="path to tun device file [default=%default]")
+
+    digital.ofdm_mod.add_options(parser, expert_grp)
+    digital.ofdm_demod.add_options(parser, expert_grp)
+    transmit_path.add_options(parser, expert_grp)
+    receive_path.add_options(parser, expert_grp)
+    uhd_receiver.add_options(parser)
+    uhd_transmitter.add_options(parser)
+
+    (options, args) = parser.parse_args ()
+    if len(args) != 0:
+        parser.print_help(sys.stderr)
+        sys.exit(1)
+
+    if options.rx_freq is None or options.tx_freq is None:
+        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
+        parser.print_help(sys.stderr)
+        sys.exit(1)
+
+    # open the TUN/TAP interface
+    (tun_fd, tun_ifname) = open_tun_interface(options.tun_device_filename)
+
+    # Attempt to enable realtime scheduling
+    r = gr.enable_realtime_scheduling()
+    if r == gr.RT_OK:
+        realtime = True
+    else:
+        realtime = False
+        print "Note: failed to enable realtime scheduling"
+
+    # instantiate the MAC
+    mac = cs_mac(tun_fd, verbose=True)
+
+
+    # build the graph (PHY)
+    tb = my_top_block(mac.phy_rx_callback, options)
+
+    mac.set_flow_graph(tb)    # give the MAC a handle for the PHY
+
+    print "modulation:     %s"   % (options.modulation,)
+    print "freq:           %s"      % (eng_notation.num_to_str(options.tx_freq))
+
+    tb.rxpath.set_carrier_threshold(options.carrier_threshold)
+    print "Carrier sense threshold:", options.carrier_threshold, "dB"
+    
+    print
+    print "Allocated virtual ethernet interface: %s" % (tun_ifname,)
+    print "You must now use ifconfig to set its IP address. E.g.,"
+    print
+    print "  $ sudo ifconfig %s 192.168.200.1" % (tun_ifname,)
+    print
+    print "Be sure to use a different address in the same subnet for each machine."
+    print
+
+
+    tb.start()    # Start executing the flow graph (runs in separate threads)
+
+    mac.main_loop()    # don't expect this to return...
+
+    tb.stop()     # but if it does, tell flow graph to stop.
+    tb.wait()     # wait for it to finish
+                
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
diff --git a/gr-digital/examples/ofdm/uhd_interface.py b/gr-digital/examples/ofdm/uhd_interface.py
new file mode 100644
index 000000000..476d3c842
--- /dev/null
+++ b/gr-digital/examples/ofdm/uhd_interface.py
@@ -0,0 +1,211 @@
+#!/usr/bin/env python
+#
+# Copyright 2010,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.
+# 
+
+from gnuradio import gr, uhd
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+import sys
+
+def add_freq_option(parser):
+    """
+    Hackery that has the -f / --freq option set both tx_freq and rx_freq
+    """
+    def freq_callback(option, opt_str, value, parser):
+        parser.values.rx_freq = value
+        parser.values.tx_freq = value
+
+    if not parser.has_option('--freq'):
+        parser.add_option('-f', '--freq', type="eng_float",
+                          action="callback", callback=freq_callback,
+                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
+                          metavar="FREQ")
+
+class uhd_interface:
+    def __init__(self, istx, args, bandwidth, freq=None,
+                 gain=None, spec=None, antenna=None):
+        
+        if(istx):
+            self.u = uhd.usrp_sink(device_addr=args,
+                                   io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                   num_channels=1)
+        else:
+            self.u = uhd.usrp_source(device_addr=args,
+                                     io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                     num_channels=1)
+
+        self._args = args
+        self._ant  = antenna
+        self._spec = spec
+        self._gain = self.set_gain(gain)
+        self._freq = self.set_freq(freq)
+
+        self._rate = self.set_sample_rate(bandwidth)
+
+        # Set the subdevice spec
+        if(spec):
+            self.u.set_subdev_spec(spec, 0)
+
+        # Set the antenna
+        if(antenna):
+            self.u.set_antenna(antenna, 0)
+        
+    def set_sample_rate(self, bandwidth):
+        self.u.set_samp_rate(bandwidth)
+        actual_bw = self.u.get_samp_rate()
+        
+        return actual_bw
+
+    def get_sample_rate(self):
+        return self.u.get_samp_rate()
+    
+    def set_gain(self, gain=None):
+        if gain is None:
+            # if no gain was specified, use the mid-point in dB
+            g = self.u.get_gain_range()
+            gain = float(g.start()+g.stop())/2
+            print "\nNo gain specified."
+            print "Setting gain to %f (from [%f, %f])" % \
+                (gain, g.start(), g.stop())
+        
+        self.u.set_gain(gain, 0)
+        return gain
+
+    def set_freq(self, freq=None):
+        if(freq is None):
+            sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
+            sys.exit(1)
+        
+        r = self.u.set_center_freq(freq, 0)
+        if r:
+            return freq
+        else:
+            frange = self.u.get_freq_range()
+            sys.stderr.write(("\nRequested frequency (%f) out or range [%f, %f]\n") % \
+                                 (freq, frange.start(), frange.stop()))
+            sys.exit(1)
+
+#-------------------------------------------------------------------#
+#   TRANSMITTER
+#-------------------------------------------------------------------#
+
+class uhd_transmitter(uhd_interface, gr.hier_block2):
+    def __init__(self, args, bandwidth, freq=None, gain=None,
+                 spec=None, antenna=None, verbose=False):
+        gr.hier_block2.__init__(self, "uhd_transmitter",
+                                gr.io_signature(1,1,gr.sizeof_gr_complex),
+                                gr.io_signature(0,0,0))
+
+        # Set up the UHD interface as a transmitter
+        uhd_interface.__init__(self, True, args, bandwidth,
+                               freq, gain, spec, antenna)
+
+        self.connect(self, self.u)
+
+        if(verbose):
+            self._print_verbage()
+            
+    def add_options(parser):
+        add_freq_option(parser)
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+                          help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("", "--tx-freq", type="eng_float", default=None,
+                          help="set transmit frequency to FREQ [default=%default]",
+                          metavar="FREQ")
+        parser.add_option("", "--tx-gain", type="eng_float", default=None,
+                          help="set transmit gain in dB (default is midpoint)")
+        parser.add_option("-v", "--verbose", action="store_true", default=False)
+
+    # Make a static method to call before instantiation
+    add_options = staticmethod(add_options)
+
+    def _print_verbage(self):
+        """
+        Prints information about the UHD transmitter
+        """
+        print "\nUHD Transmitter:"
+        print "UHD Args:    %s"    % (self._args)
+        print "Freq:        %sHz"  % (eng_notation.num_to_str(self._freq))
+        print "Gain:        %f dB" % (self._gain)
+        print "Sample Rate: %ssps" % (eng_notation.num_to_str(self._rate))
+        print "Antenna:     %s"    % (self._ant)
+        print "Subdev Sec:  %s"    % (self._spec)
+
+
+
+#-------------------------------------------------------------------#
+#   RECEIVER
+#-------------------------------------------------------------------#
+
+
+class uhd_receiver(uhd_interface, gr.hier_block2):
+    def __init__(self, args, bandwidth, freq=None, gain=None,
+                 spec=None, antenna=None, verbose=False):
+        gr.hier_block2.__init__(self, "uhd_receiver",
+                                gr.io_signature(0,0,0),
+                                gr.io_signature(1,1,gr.sizeof_gr_complex))
+      
+        # Set up the UHD interface as a receiver
+        uhd_interface.__init__(self, False, args, bandwidth,
+                               freq, gain, spec, antenna)
+
+        self.connect(self.u, self)
+
+        if(verbose):
+            self._print_verbage()
+
+    def add_options(parser):
+        add_freq_option(parser)
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+                          help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("", "--rx-freq", type="eng_float", default=None,
+                          help="set receive frequency to FREQ [default=%default]",
+                          metavar="FREQ")
+        parser.add_option("", "--rx-gain", type="eng_float", default=None,
+                          help="set receive gain in dB (default is midpoint)")
+        if not parser.has_option("--verbose"):
+            parser.add_option("-v", "--verbose", action="store_true", default=False)
+
+    # Make a static method to call before instantiation
+    add_options = staticmethod(add_options)
+
+    def _print_verbage(self):
+        """
+        Prints information about the UHD transmitter
+        """
+        print "\nUHD Receiver:"
+        print "UHD Args:    %s"    % (self._args)
+        print "Freq:        %sHz"  % (eng_notation.num_to_str(self._freq))
+        print "Gain:        %f dB" % (self._gain)
+        print "Sample Rate: %ssps" % (eng_notation.num_to_str(self._rate))
+        print "Antenna:     %s"    % (self._ant)
+        print "Subdev Sec:  %s"    % (self._spec)
+
diff --git a/gnuradio-examples/python/digital/run_length.py b/gr-digital/examples/run_length.py
index 5020655db..5020655db 100755
--- a/gnuradio-examples/python/digital/run_length.py
+++ b/gr-digital/examples/run_length.py
diff --git a/gr-msdd6000/gnuradio-msdd6000.pc.in b/gr-digital/gnuradio-digital.pc.in
index 565420718..6c0a7ccf8 100644
--- a/gr-msdd6000/gnuradio-msdd6000.pc.in
+++ b/gr-digital/gnuradio-digital.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: gnuradio-comedi
-Description: GNU Radio blocks for the Softronics MSDD 6000
+Name: gnuradio-digital
+Description: GNU Radio blocks for digital communications
 Requires: gnuradio-core
 Version: @LIBVER@
-Libs: -L${libdir} -lgnuradio-msdd6000
+Libs: -L${libdir} -lgnuradio-digital
 Cflags: -I${includedir}
diff --git a/gr-digital/grc/.gitignore b/gr-digital/grc/.gitignore
new file mode 100644
index 000000000..3dda72986
--- /dev/null
+++ b/gr-digital/grc/.gitignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/gr-digital/grc/CMakeLists.txt b/gr-digital/grc/CMakeLists.txt
new file mode 100644
index 000000000..330098539
--- /dev/null
+++ b/gr-digital/grc/CMakeLists.txt
@@ -0,0 +1,47 @@
+# 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.
+
+install(FILES
+    digital_block_tree.xml
+    digital_binary_slicer_fb.xml
+    digital_clock_recovery_mm_xx.xml
+    digital_constellation_decoder_cb.xml
+    digital_correlate_access_code_bb.xml
+    digital_costas_loop_cc.xml
+    digital_cma_equalizer_cc.xml
+    digital_fll_band_edge_cc.xml
+    digital_kurtotic_equalizer_cc.xml
+    digital_lms_dd_equalizer_cc.xml
+    digital_mpsk_receiver_cc.xml
+    digital_dxpsk_mod.xml
+    digital_dxpsk_demod.xml
+    digital_psk_mod.xml
+    digital_psk_demod.xml
+    digital_qam_mod.xml
+    digital_qam_demod.xml
+    digital_ofdm_mod.xml
+    digital_ofdm_demod.xml
+    digital_ofdm_cyclic_prefixer.xml
+    digital_ofdm_frame_acquisition.xml
+    digital_ofdm_insert_preamble.xml
+    digital_ofdm_sampler.xml
+    digital_ofdm_sync_pn.xml
+    DESTINATION ${GRC_BLOCKS_DIR}
+    COMPONENT "digital_python"
+)
diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am
new file mode 100644
index 000000000..ef4e38600
--- /dev/null
+++ b/gr-digital/grc/Makefile.am
@@ -0,0 +1,50 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+grcblocksdir = $(grc_blocksdir)
+
+dist_grcblocks_DATA = \
+	digital_block_tree.xml			\
+	digital_binary_slicer_fb.xml		\
+	digital_clock_recovery_mm_xx.xml	\
+	digital_constellation_decoder_cb.xml	\
+	digital_correlate_access_code_bb.xml	\
+	digital_costas_loop_cc.xml		\
+	digital_cma_equalizer_cc.xml		\
+	digital_fll_band_edge_cc.xml		\
+	digital_kurtotic_equalizer_cc.xml	\
+	digital_lms_dd_equalizer_cc.xml		\
+	digital_mpsk_receiver_cc.xml		\
+	digital_dxpsk_mod.xml			\
+	digital_dxpsk_demod.xml			\
+	digital_psk_mod.xml			\
+	digital_psk_demod.xml			\
+	digital_qam_mod.xml			\
+	digital_qam_demod.xml			\
+	digital_ofdm_mod.xml			\
+	digital_ofdm_demod.xml			\
+	digital_ofdm_cyclic_prefixer.xml	\
+	digital_ofdm_frame_acquisition.xml	\
+	digital_ofdm_insert_preamble.xml	\
+	digital_ofdm_sampler.xml		\
+	digital_ofdm_sync_pn.xml
diff --git a/grc/blocks/gr_binary_slicer_fb.xml b/gr-digital/grc/digital_binary_slicer_fb.xml
index 85d71e709..3187d13f9 100644
--- a/grc/blocks/gr_binary_slicer_fb.xml
+++ b/gr-digital/grc/digital_binary_slicer_fb.xml
@@ -6,9 +6,9 @@
  -->
 <block>
 	<name>Binary Slicer</name>
-	<key>gr_binary_slicer_fb</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.binary_slicer_fb()</make>
+	<key>digital_binary_slicer_fb</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.binary_slicer_fb()</make>
 	<sink>
 		<name>in</name>
 		<type>float</type>
diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml
new file mode 100644
index 000000000..816df7f45
--- /dev/null
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -0,0 +1,63 @@
+<?xml version="1.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.
+-->
+
+<!--
+###################################################
+##Block Tree for GR Digital blocks.
+###################################################
+ -->
+<cat>
+	<name></name> <!-- Blank for Root Name -->
+	<cat>
+		<name>Digital</name>
+		<block>digital_binary_slicer_fb</block>
+		<block>digital_clock_recovery_mm_xx</block>
+		<block>digital_cma_equalizer_cc</block>
+		<block>digital_constellation_decoder_cb</block>
+		<block>digital_correlate_access_code_bb</block>
+		<block>digital_costas_loop_cc</block>
+		<block>digital_fll_band_edge_cc</block>
+		<block>digital_kurtotic_equalizer_cc</block>
+		<block>digital_lms_dd_equalizer_cc</block>
+		<block>digital_mpsk_receiver_cc</block>
+	</cat>
+	<cat>
+		<name>Digital Modulators</name>
+		<block>digital_dxpsk_mod</block>
+		<block>digital_dxpsk_demod</block>
+		<block>digital_psk_mod</block>
+		<block>digital_psk_demod</block>
+		<block>digital_qam_mod</block>
+		<block>digital_qam_demod</block>
+	</cat>
+	<cat>
+                <name>OFDM</name>
+		<block>digital_ofdm_mod</block>
+		<block>digital_ofdm_demod</block>
+		<block>digital_ofdm_cyclic_prefixer</block>
+		<block>digital_ofdm_frame_acquisition</block>
+		<block>digital_ofdm_insert_preamble</block>
+		<block>digital_ofdm_sampler</block>
+		<block>digital_ofdm_sync_pn</block>
+	</cat>
+</cat>
diff --git a/grc/blocks/gr_clock_recovery_mm_xx.xml b/gr-digital/grc/digital_clock_recovery_mm_xx.xml
index 613cc23bf..d9c5ea4ff 100644
--- a/grc/blocks/gr_clock_recovery_mm_xx.xml
+++ b/gr-digital/grc/digital_clock_recovery_mm_xx.xml
@@ -6,9 +6,9 @@
  -->
 <block>
 	<name>Clock Recovery MM</name>
-	<key>gr_clock_recovery_mm_xx</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.clock_recovery_mm_$(type.fcn)($omega, $gain_omega, $mu, $gain_mu, $omega_relative_limit)</make>
+	<key>digital_clock_recovery_mm_xx</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.clock_recovery_mm_$(type.fcn)($omega, $gain_omega, $mu, $gain_mu, $omega_relative_limit)</make>
 	<callback>set_omega($omega)</callback>
 	<callback>set_gain_omega($gain_omega)</callback>
 	<callback>set_mu($mu)</callback>
diff --git a/gr-digital/grc/digital_cma_equalizer_cc.xml b/gr-digital/grc/digital_cma_equalizer_cc.xml
new file mode 100644
index 000000000..118c18e29
--- /dev/null
+++ b/gr-digital/grc/digital_cma_equalizer_cc.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## CMA Equalizer
+###################################################
+ -->
+<block>
+	<name>CMA Equalizer</name>
+	<key>digital_cma_equalizer_cc</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.cma_equalizer_cc($num_taps, $modulus, $mu, $sps)</make>
+	<callback>set_gain($mu)</callback>
+	<callback>set_modulus($modulus)</callback>
+	<param>
+		<name>Num. Taps</name>
+		<key>num_taps</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Modulus</name>
+		<key>modulus</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Gain</name>
+		<key>mu</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Samples per Symbol</name>
+		<key>sps</key>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+</block>
diff --git a/grc/blocks/gr_constellation_decoder_cb.xml b/gr-digital/grc/digital_constellation_decoder_cb.xml
index 99d897a3a..c7353e288 100644
--- a/grc/blocks/gr_constellation_decoder_cb.xml
+++ b/gr-digital/grc/digital_constellation_decoder_cb.xml
@@ -6,18 +6,13 @@
  -->
 <block>
 	<name>Constellation Decoder</name>
-	<key>gr_constellation_decoder_cb</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.constellation_decoder_cb($sym_position, $sym_value_out)</make>
+	<key>digital_constellation_decoder_cb</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.constellation_decoder_cb($constellation)</make>
 	<param>
-		<name>Symbol Position</name>
-		<key>sym_position</key>
-		<type>complex_vector</type>
-	</param>
-	<param>
-		<name>Symbol Value Out</name>
-		<key>sym_value_out</key>
-		<type>int_vector</type>
+		<name>Constellation Object</name>
+		<key>constellation</key>
+		<type>raw</type>
 	</param>
 	<sink>
 		<name>in</name>
diff --git a/grc/blocks/gr_correlate_access_code_bb.xml b/gr-digital/grc/digital_correlate_access_code_bb.xml
index e13d2d070..3941834c4 100644
--- a/grc/blocks/gr_correlate_access_code_bb.xml
+++ b/gr-digital/grc/digital_correlate_access_code_bb.xml
@@ -6,9 +6,9 @@
  -->
 <block>
 	<name>Correlate Access Code</name>
-	<key>gr_correlate_access_code_bb</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.correlate_access_code_bb($access_code, $threshold)</make>
+	<key>digital_correlate_access_code_bb</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.correlate_access_code_bb($access_code, $threshold)</make>
 	<param>
 		<name>Access Code</name>
 		<key>access_code</key>
diff --git a/gr-digital/grc/digital_costas_loop_cc.xml b/gr-digital/grc/digital_costas_loop_cc.xml
new file mode 100644
index 000000000..668c43dec
--- /dev/null
+++ b/gr-digital/grc/digital_costas_loop_cc.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Costas Loop
+###################################################
+ -->
+<block>
+	<name>Costas Loop</name>
+	<key>digital_costas_loop_cc</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.costas_loop_cc($w, $order)</make>
+	<callback>set_loop_bandwidth($w)</callback>
+	<param>
+		<name>Loop Bandwidth</name>
+		<key>w</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Order</name>
+		<key>order</key>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+
+	<!-- Optional Outputs -->
+	<source>
+		<name>frequency</name>
+		<type>float</type>
+		<optional>1</optional>
+	</source>
+</block>
diff --git a/grc/blocks/blks2_dxpsk2_demod.xml b/gr-digital/grc/digital_dxpsk_demod.xml
index 7fe4be32b..d5e742097 100644
--- a/grc/blocks/blks2_dxpsk2_demod.xml
+++ b/gr-digital/grc/digital_dxpsk_demod.xml
@@ -1,28 +1,46 @@
 <?xml version="1.0"?>
+
+<!--
+ Copyright 2009,2010,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.
+-->
+
 <!--
 ###################################################
-##DPSK2 Demod - 2, 4
+##DPSK2 Mod - 2, 4, 8
 ###################################################
  -->
 <block>
-	<name>DPSK2 Demod</name>
-	<key>blks2_dxpsk2_demod</key>
-	<import>from gnuradio import blks2</import>
-	<make>blks2.$(type)2_demod(
+	<name>DPSK Demod</name>
+	<key>digital_dxpsk_demod</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.$(type)_demod(
 	samples_per_symbol=$samples_per_symbol,
 	excess_bw=$excess_bw,
-        freq_alpha=$freq_alpha,
-        phase_alpha=$phase_alpha,
-	timing_alpha=$timing_alpha,
-	timing_max_dev=$timing_max_dev,
-	gray_code=$gray_code,
+	phase_bw=$phase_bw,
+	timing_bw=$timing_bw,
+	gray_coded=$gray_coded,
 	verbose=$verbose,
-	log=$log,
-	sync_out=$sync_out,
+	log=$log
 )</make>
-	<callback>clock_recov.set_alpha($costas_alpha)</callback>
-	<callback>clock_recov.set_beta(0.25*$costas_alpha**2)</callback>
-	<callback>time_recov.set_alpha($timing_alpha)</callback>
+	<callback>clock_recov.set_loop_bandwidth($phase_bw)</callback>
+	<callback>time_recov.set_loop_bandwidth($timing_bw)</callback>
 	<param>
 		<name>Type</name>
 		<key>type</key>
@@ -49,27 +67,15 @@
 		<type>real</type>
 	</param>
 	<param>
-		<name>FLL Alpha</name>
-		<key>freq_alpha</key>
-		<value>0.010</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Phase Alpha</name>
-		<key>phase_alpha</key>
-		<value>0.100</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Timing Alpha</name>
-		<key>timing_alpha</key>
-		<value>0.100</value>
+		<name>Phase Loop Bandwidth</name>
+		<key>phase_bw</key>
+		<value>6.28/100.0</value>
 		<type>real</type>
 	</param>
 	<param>
-		<name>Timing Max Dev</name>
-		<key>timing_max_dev</key>
-		<value>1.5</value>
+		<name>Timing Bandwidth</name>
+		<key>timing_bw</key>
+		<value>6.28/100.0</value>
 		<type>real</type>
 	</param>
 	<param>
@@ -80,7 +86,7 @@
 	</param>
 	<param>
 		<name>Gray Code</name>
-		<key>gray_code</key>
+		<key>gray_coded</key>
 		<value>True</value>
 		<type>bool</type>
 		<option>
@@ -144,9 +150,4 @@
 		<name>out</name>
 		<type>byte</type>
 	</source>
-	<source>
-		<name>sync</name>
-		<type>complex</type>
-		<optional>1</optional>
-	</source>
 </block>
diff --git a/grc/blocks/blks2_dxpsk_mod.xml b/gr-digital/grc/digital_dxpsk_mod.xml
index 77505d8ad..fbda9fb1f 100644
--- a/grc/blocks/blks2_dxpsk_mod.xml
+++ b/gr-digital/grc/digital_dxpsk_mod.xml
@@ -1,20 +1,42 @@
 <?xml version="1.0"?>
+
+<!--
+ Copyright 2009,2010,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.
+-->
+
 <!--
 ###################################################
-##DPSK Mod - 2, 4, 8
+## DPSK Mod - 2, 4, 8
 ###################################################
  -->
 <block>
 	<name>DPSK Mod</name>
-	<key>blks2_dxpsk_mod</key>
-	<import>from gnuradio import blks2</import>
-	<make>blks2.$(type)_mod(
+	<key>digital_dxpsk_mod</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.$(type)_mod(
 	samples_per_symbol=$samples_per_symbol,
 	excess_bw=$excess_bw,
-	gray_code=$gray_code,
+	gray_coded=$gray_coded,
 	verbose=$verbose,
-	log=$log,
-)</make>
+	log=$log)
+	</make>
 	<param>
 		<name>Type</name>
 		<key>type</key>
@@ -46,7 +68,7 @@
 	</param>
 	<param>
 		<name>Gray Code</name>
-		<key>gray_code</key>
+		<key>gray_coded</key>
 		<value>True</value>
 		<type>bool</type>
 		<option>
diff --git a/grc/blocks/gr_fll_band_edge_cc.xml b/gr-digital/grc/digital_fll_band_edge_cc.xml
index 5a13ac49b..e4da773db 100644
--- a/grc/blocks/gr_fll_band_edge_cc.xml
+++ b/gr-digital/grc/digital_fll_band_edge_cc.xml
@@ -6,12 +6,10 @@
  -->
 <block>
 	<name>FLL Band-Edge</name>
-	<key>gr_fll_band_edge_cc</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.fll_band_edge_cc($samps_per_sym, $rolloff, $filter_size, $alpha, $beta)</make>
-	<callback>set_alpha($alpha)</callback>
-	<callback>set_beta($beta)</callback>
-
+	<key>digital_fll_band_edge_cc</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.fll_band_edge_cc($samps_per_sym, $rolloff, $filter_size, $w)</make>
+	<callback>set_loop_bandwidth($w)</callback>
 	<param>
 		<name>Type</name>
 		<key>type</key>
@@ -41,15 +39,11 @@
 	</param>
 
 	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
+		<name>Loop Bandwidth</name>
+		<key>w</key>
 		<type>real</type>
 	</param>
+
 	<sink>
 		<name>in</name>
 		<type>$type.input</type>
diff --git a/grc/blocks/gr_cma_equalizer_cc.xml b/gr-digital/grc/digital_kurtotic_equalizer_cc.xml
index 142fb6d81..8c4a2012d 100644
--- a/grc/blocks/gr_cma_equalizer_cc.xml
+++ b/gr-digital/grc/digital_kurtotic_equalizer_cc.xml
@@ -1,26 +1,21 @@
 <?xml version="1.0"?>
 <!--
 ###################################################
-##CMA Equalizer
+## Kurtotic Equalizer
 ###################################################
  -->
 <block>
-	<name>CMA Equalizer</name>
-	<key>gr_cma_equalizer_cc</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.cma_equalizer_cc($num_taps, $modulus, $mu)</make>
+	<name>Kurtotic Equalizer</name>
+	<key>digital_kurtotic_equalizer_cc</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.kurtotic_equalizer_cc($num_taps, $mu)</make>
+	<callback>set_gain($mu)</callback>
 	<param>
-		<name>Num Taps</name>
+		<name>Num. Taps</name>
 		<key>num_taps</key>
-		<value>64</value>
 		<type>int</type>
 	</param>
 	<param>
-		<name>Modulus</name>
-		<key>modulus</key>
-		<type>real</type>
-	</param>
-	<param>
 		<name>Mu</name>
 		<key>mu</key>
 		<type>real</type>
diff --git a/gr-digital/grc/digital_lms_dd_equalizer_cc.xml b/gr-digital/grc/digital_lms_dd_equalizer_cc.xml
new file mode 100644
index 000000000..0fd7d523b
--- /dev/null
+++ b/gr-digital/grc/digital_lms_dd_equalizer_cc.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## LMS DD Equalizer
+###################################################
+ -->
+<block>
+	<name>LMS DD Equalizer</name>
+	<key>digital_lms_dd_equalizer_cc</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.lms_dd_equalizer_cc($num_taps, $mu, $sps, $cnst)</make>
+	<callback>set_gain($mu)</callback>
+	<param>
+		<name>Gain</name>
+		<key>mu</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Num. Taps</name>
+		<key>num_taps</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Samples per Symbol</name>
+		<key>sps</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Constellation Object</name>
+		<key>cnst</key>
+		<type>raw</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+</block>
diff --git a/grc/blocks/gr_mpsk_receiver_cc.xml b/gr-digital/grc/digital_mpsk_receiver_cc.xml
index 843c3a4c1..ab7e5c209 100644
--- a/grc/blocks/gr_mpsk_receiver_cc.xml
+++ b/gr-digital/grc/digital_mpsk_receiver_cc.xml
@@ -6,11 +6,10 @@
  -->
 <block>
 	<name>MPSK Receiver</name>
-	<key>gr_mpsk_receiver_cc</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.mpsk_receiver_cc($M, $theta, $alpha, $beta, $fmin, $fmax, $mu, $gain_mu, $omega, $gain_omega, $omega_relative_limit)</make>
-	<callback>set_alpha($alpha)</callback>
-	<callback>set_beta($beta)</callback>
+	<key>digital_mpsk_receiver_cc</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.mpsk_receiver_cc($M, $theta, $w, $fmin, $fmax, $mu, $gain_mu, $omega, $gain_omega, $omega_relative_limit)</make>
+	<callback>set_loop_bandwidth($w)</callback>
 	<callback>set_mu($mu)</callback>
 	<callback>set_gain_mu($gain_mu)</callback>
 	<callback>set_omega($omega)</callback>
@@ -26,13 +25,8 @@
 		<type>real</type>
 	</param>
 	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
+		<name>Loop Bandwidth</name>
+		<key>w</key>
 		<type>real</type>
 	</param>
 	<param>
diff --git a/gr-digital/grc/digital_ofdm_cyclic_prefixer.xml b/gr-digital/grc/digital_ofdm_cyclic_prefixer.xml
new file mode 100644
index 000000000..d5e5d3894
--- /dev/null
+++ b/gr-digital/grc/digital_ofdm_cyclic_prefixer.xml
@@ -0,0 +1,52 @@
+<?xml version="1.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.
+-->
+
+<!--
+###################################################
+##OFDM Cyclic Prefixer
+###################################################
+ -->
+<block>
+	<name>OFDM Cyclic Prefixer</name>
+	<key>digital_ofdm_cyclic_prefixer</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.ofdm_cyclic_prefixer($input_size, $output_size)</make>
+	<param>
+		<name>Input Size</name>
+		<key>input_size</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Output Size</name>
+		<key>output_size</key>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+		<vlen>$input_size</vlen>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+</block>
diff --git a/grc/blocks/blks2_ofdm_demod.xml b/gr-digital/grc/digital_ofdm_demod.xml
index ac5ee4795..9f3a83715 100644
--- a/grc/blocks/blks2_ofdm_demod.xml
+++ b/gr-digital/grc/digital_ofdm_demod.xml
@@ -1,15 +1,36 @@
 <?xml version="1.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.
+-->
+
+<!--
 ###################################################
 ##OFDM Demod
 ###################################################
  -->
 <block>
 	<name>OFDM Demod</name>
-	<key>blks2_ofdm_demod</key>
+	<key>digital_ofdm_demod</key>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<import>from gnuradio import blks2</import>
-	<make>grc_blks2.packet_demod_$(type.fcn)(blks2.ofdm_demod(
+	<import>from gnuradio import digital</import>
+	<make>grc_blks2.packet_demod_$(type.fcn)(digital.ofdm_demod(
 		options=grc_blks2.options(
 			modulation="$modulation",
 			fft_length=$fft_length,
diff --git a/gr-digital/grc/digital_ofdm_frame_acquisition.xml b/gr-digital/grc/digital_ofdm_frame_acquisition.xml
new file mode 100644
index 000000000..2545f18e6
--- /dev/null
+++ b/gr-digital/grc/digital_ofdm_frame_acquisition.xml
@@ -0,0 +1,77 @@
+<?xml version="1.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.
+-->
+
+<!--
+###################################################
+##OFDM Frame Acquisition
+###################################################
+ -->
+<block>
+	<name>OFDM Frame Acquisition</name>
+	<key>digital_ofdm_frame_acquisition</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.ofdm_frame_acquisition($occupied_carriers, $fft_length, $cplen, $known_symbol, $max_fft_shift_len)</make>
+	<param>
+		<name>Occupied Carriers</name>
+		<key>occupied_carriers</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>FFT Length</name>
+		<key>fft_length</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>CP Length</name>
+		<key>cplen</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Preamble</name>
+		<key>known_symbol</key>
+		<type>complex_vector</type>
+	</param>
+	<param>
+		<name>Max FFT Shift</name>
+		<key>max_fft_shift_len</key>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+		<vlen>$fft_length</vlen>
+	</sink>
+	<sink>
+		<name>flag</name>
+		<type>byte</type>
+		<vlen>$fft_length</vlen>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+		<vlen>$occupied_carriers</vlen>
+	</source>
+	<source>
+		<name>flag</name>
+		<type>byte</type>
+	</source>
+</block>
diff --git a/gr-digital/grc/digital_ofdm_insert_preamble.xml b/gr-digital/grc/digital_ofdm_insert_preamble.xml
new file mode 100644
index 000000000..33a93058f
--- /dev/null
+++ b/gr-digital/grc/digital_ofdm_insert_preamble.xml
@@ -0,0 +1,57 @@
+<?xml version="1.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.
+-->
+
+<!--
+###################################################
+##OFDM Insert Preamble
+###################################################
+ -->
+<block>
+	<name>OFDM Insert Preamble</name>
+	<key>digital_ofdm_insert_preamble</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.ofdm_insert_preamble($fft_length, $preamble)</make>
+	<param>
+		<name>FFT Length</name>
+		<key>fft_length</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Preamble</name>
+		<key>preamble</key>
+		<type>raw</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+		<vlen>$fft_length</vlen>
+	</sink>
+	<sink>
+		<name>flag</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+		<vlen>$fft_length</vlen>
+	</source>
+</block>
diff --git a/grc/blocks/blks2_ofdm_mod.xml b/gr-digital/grc/digital_ofdm_mod.xml
index 2c54d10f4..24cb2aa33 100644
--- a/grc/blocks/blks2_ofdm_mod.xml
+++ b/gr-digital/grc/digital_ofdm_mod.xml
@@ -1,15 +1,36 @@
 <?xml version="1.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.
+-->
+
+<!--
 ###################################################
 ##OFDM Mod
 ###################################################
  -->
 <block>
 	<name>OFDM Mod</name>
-	<key>blks2_ofdm_mod</key>
+	<key>digital_ofdm_mod</key>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<import>from gnuradio import blks2</import>
-	<make>grc_blks2.packet_mod_$(type.fcn)(blks2.ofdm_mod(
+	<import>from gnuradio import digital</import>
+	<make>grc_blks2.packet_mod_$(type.fcn)(digital.ofdm_mod(
 		options=grc_blks2.options(
 			modulation="$modulation",
 			fft_length=$fft_length,
diff --git a/gr-digital/grc/digital_ofdm_sampler.xml b/gr-digital/grc/digital_ofdm_sampler.xml
new file mode 100644
index 000000000..f3d5c85f3
--- /dev/null
+++ b/gr-digital/grc/digital_ofdm_sampler.xml
@@ -0,0 +1,67 @@
+<?xml version="1.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.
+-->
+
+<!--
+###################################################
+##OFDM Sampler
+###################################################
+ -->
+<block>
+	<name>OFDM Sampler</name>
+	<key>digital_ofdm_sampler</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.ofdm_sampler($fft_length, $symbol_length, $timeout)</make>
+	<param>
+		<name>FFT Length</name>
+		<key>fft_length</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Symbol Length</name>
+		<key>symbol_length</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Timeout</name>
+		<key>timeout</key>
+		<value>1000</value>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<sink>
+		<name>flag</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+		<vlen>$fft_length</vlen>
+	</source>
+	<source>
+		<name>flag</name>
+		<type>byte</type>
+		<vlen>$fft_length</vlen>
+	</source>
+</block>
diff --git a/gr-digital/grc/digital_ofdm_sync_pn.xml b/gr-digital/grc/digital_ofdm_sync_pn.xml
new file mode 100644
index 000000000..7a05f394d
--- /dev/null
+++ b/gr-digital/grc/digital_ofdm_sync_pn.xml
@@ -0,0 +1,61 @@
+<?xml version="1.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.
+-->
+
+<!--
+###################################################
+##OFDM Synchronizer - PN based
+###################################################
+ -->
+<block>
+	<name>OFDM Sync PN</name>
+	<key>digital_ofdm_sync_pn</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.ofdm_sync_pn($fft_length, $cp_length, $logging)</make>
+	<param>
+		<name>FFT Length</name>
+		<key>fft_length</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>CP Length</name>
+		<key>cp_length</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Logging</name>
+		<key>logging</key>
+		<value>False</value>
+		<type>bool</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>fine freq</name>
+		<type>float</type>
+	</source>
+	<source>
+		<name>timing sig</name>
+		<type>byte</type>
+	</source>
+</block>
diff --git a/gr-digital/grc/digital_psk_demod.xml b/gr-digital/grc/digital_psk_demod.xml
new file mode 100644
index 000000000..b2628ac88
--- /dev/null
+++ b/gr-digital/grc/digital_psk_demod.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2009,2010,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.
+-->
+
+<!--
+###################################################
+##PSK Demod
+###################################################
+ -->
+<block>
+  <name>PSK Demod</name>
+  <key>digital_psk_demod</key>
+  <import>from gnuradio import digital</import>
+  <make>digital.psk.psk_demod(
+  constellation_points=$constellation_points,
+  mod_code=$mod_code,
+  differential=$differential,
+  samples_per_symbol=$samples_per_symbol,
+  excess_bw=$excess_bw,
+  freq_alpha=$freq_alpha,
+  timing_alpha=$timing_alpha,
+  timing_max_dev=$timing_max_dev,
+  phase_alpha=$phase_alpha,
+  verbose=$verbose,
+  log=$log,
+  )</make>
+  <param>
+    <name>Number of Constellation Points</name>
+    <key>constellation_points</key>
+    <value>8</value>
+    <type>int</type>
+  </param>
+  <param>
+    <name>Gray Code</name>
+    <key>mod_code</key>
+    <type>enum</type>
+    <option>
+      <name>Yes</name>
+      <key>gray</key>
+    </option>
+    <option>
+      <name>No</name>
+      <key>none</key>
+    </option>
+  </param>
+  <param>
+    <name>Differential Encoding</name>
+    <key>differential</key>
+    <value>True</value>
+    <type>bool</type>
+    <option>
+      <name>Yes</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>No</name>
+      <key>False</key>
+    </option>
+  </param>
+  <param>
+    <name>Samples/Symbol</name>
+    <key>samples_per_symbol</key>
+    <value>2</value>
+    <type>int</type>
+  </param>
+  <param>
+    <name>Excess BW</name>
+    <key>excess_bw</key>
+    <value>0.35</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Frequency Alpha</name>
+    <key>freq_alpha</key>
+    <value>0.01</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Timing Alpha</name>
+    <key>timing_alpha</key>
+    <value>0.100</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Timing Max Dev</name>
+    <key>timing_max_dev</key>
+    <value>1.5</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Phase Alpha</name>
+    <key>phase_alpha</key>
+    <value>0.1</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Verbose</name>
+    <key>verbose</key>
+    <value>False</value>
+    <type>bool</type>
+    <hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide>
+    <option>
+      <name>On</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>Off</name>
+      <key>False</key>
+    </option>
+  </param>
+  <param>
+    <name>Logging</name>
+    <key>log</key>
+    <value>False</value>
+    <type>bool</type>
+    <hide>#if str($log) == 'False' then 'part' else 'none'#</hide>
+    <option>
+      <name>On</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>Off</name>
+      <key>False</key>
+    </option>
+  </param>
+  <sink>
+    <name>in</name>
+    <type>complex</type>
+  </sink>
+  <source>
+    <name>out</name>
+    <type>byte</type>
+  </source>
+  <source>
+    <name>sync</name>
+    <type>complex</type>
+    <optional>1</optional>
+  </source>
+</block>
diff --git a/gr-digital/grc/digital_psk_mod.xml b/gr-digital/grc/digital_psk_mod.xml
new file mode 100644
index 000000000..cafcf4e50
--- /dev/null
+++ b/gr-digital/grc/digital_psk_mod.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2009,2010,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.
+-->
+
+<!--
+###################################################
+##PSK Mod
+###################################################
+ -->
+<block>
+  <name>PSK Mod</name>
+  <key>digital_psk_mod</key>
+  <import>from gnuradio import digital</import>
+  <make>digital.psk.psk_mod(
+  constellation_points=$constellation_points,
+  mod_code=$mod_code,
+  differential=$differential,
+  samples_per_symbol=$samples_per_symbol,
+  excess_bw=$excess_bw,
+  verbose=$verbose,
+  log=$log,
+  )</make>
+  <param>
+    <name>Number of Constellation Points</name>
+    <key>constellation_points</key>
+    <value>8</value>
+    <type>int</type>
+  </param>
+  <param>
+    <name>Gray Code</name>
+    <key>mod_code</key>
+    <type>enum</type>
+    <option>
+      <name>Yes</name>
+      <key>"gray"</key>
+    </option>
+    <option>
+      <name>No</name>
+      <key>"none"</key>
+    </option>
+  </param>
+  <param>
+    <name>Differential Encoding</name>
+    <key>differential</key>
+    <value>True</value>
+    <type>bool</type>
+    <option>
+      <name>Yes</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>No</name>
+      <key>False</key>
+    </option>
+  </param>
+  <param>
+    <name>Samples/Symbol</name>
+    <key>samples_per_symbol</key>
+    <value>2</value>
+    <type>int</type>
+  </param>
+  <param>
+    <name>Excess BW</name>
+    <key>excess_bw</key>
+    <value>0.35</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Verbose</name>
+    <key>verbose</key>
+    <value>False</value>
+    <type>bool</type>
+    <hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide>
+    <option>
+      <name>On</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>Off</name>
+      <key>False</key>
+    </option>
+  </param>
+  <param>
+    <name>Logging</name>
+    <key>log</key>
+    <value>False</value>
+    <type>bool</type>
+    <hide>#if str($log) == 'False' then 'part' else 'none'#</hide>
+    <option>
+      <name>On</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>Off</name>
+      <key>False</key>
+    </option>
+  </param>
+  <sink>
+    <name>in</name>
+    <type>byte</type>
+  </sink>
+  <source>
+    <name>out</name>
+    <type>complex</type>
+  </source>
+</block>
diff --git a/gr-digital/grc/digital_qam_demod.xml b/gr-digital/grc/digital_qam_demod.xml
new file mode 100644
index 000000000..88b20293e
--- /dev/null
+++ b/gr-digital/grc/digital_qam_demod.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2009,2010,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.
+-->
+
+<!--
+###################################################
+##QAM Demod
+###################################################
+ -->
+<block>
+  <name>QAM Demod</name>
+  <key>digital_qam_demod</key>
+  <import>from gnuradio import digital</import>
+  <make>digital.qam.qam_demod(
+  constellation_points=$constellation_points,
+  mod_code=$mod_code,
+  differential=$differential,
+  samples_per_symbol=$samples_per_symbol,
+  excess_bw=$excess_bw,
+  freq_alpha=$freq_alpha,
+  timing_alpha=$timing_alpha,
+  timing_max_dev=$timing_max_dev,
+  phase_alpha=$phase_alpha,
+  verbose=$verbose,
+  log=$log,
+  )</make>
+  <param>
+    <name>Number of Constellation Points</name>
+    <key>constellation_points</key>
+    <value>16</value>
+    <type>int</type>
+  </param>
+  <param>
+    <name>Gray Code</name>
+    <key>mod_code</key>
+    <type>enum</type>
+    <option>
+      <name>Yes</name>
+      <key>gray</key>
+    </option>
+    <option>
+      <name>No</name>
+      <key>none</key>
+    </option>
+  </param>
+  <param>
+    <name>Differential Encoding</name>
+    <key>differential</key>
+    <value>True</value>
+    <type>bool</type>
+    <option>
+      <name>Yes</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>No</name>
+      <key>False</key>
+    </option>
+  </param>
+  <param>
+    <name>Samples/Symbol</name>
+    <key>samples_per_symbol</key>
+    <value>2</value>
+    <type>int</type>
+  </param>
+  <param>
+    <name>Excess BW</name>
+    <key>excess_bw</key>
+    <value>0.35</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Frequency Alpha</name>
+    <key>freq_alpha</key>
+    <value>0.01</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Timing Alpha</name>
+    <key>timing_alpha</key>
+    <value>0.100</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Timing Max Dev</name>
+    <key>timing_max_dev</key>
+    <value>1.5</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Phase Alpha</name>
+    <key>phase_alpha</key>
+    <value>0.1</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Verbose</name>
+    <key>verbose</key>
+    <value>False</value>
+    <type>bool</type>
+    <hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide>
+    <option>
+      <name>On</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>Off</name>
+      <key>False</key>
+    </option>
+  </param>
+  <param>
+    <name>Logging</name>
+    <key>log</key>
+    <value>False</value>
+    <type>bool</type>
+    <hide>#if str($log) == 'False' then 'part' else 'none'#</hide>
+    <option>
+      <name>On</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>Off</name>
+      <key>False</key>
+    </option>
+  </param>
+  <sink>
+    <name>in</name>
+    <type>complex</type>
+  </sink>
+  <source>
+    <name>out</name>
+    <type>byte</type>
+  </source>
+  <source>
+    <name>sync</name>
+    <type>complex</type>
+    <optional>1</optional>
+  </source>
+</block>
diff --git a/gr-digital/grc/digital_qam_mod.xml b/gr-digital/grc/digital_qam_mod.xml
new file mode 100644
index 000000000..4d73d9a68
--- /dev/null
+++ b/gr-digital/grc/digital_qam_mod.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2009,2010,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.
+-->
+
+<!--
+###################################################
+##QAM Mod
+###################################################
+ -->
+<block>
+  <name>QAM Mod</name>
+  <key>digital_qam_mod</key>
+  <import>from gnuradio import digital</import>
+  <make>digital.qam.qam_mod(
+  constellation_points=$constellation_points,
+  mod_code=$mod_code,
+  differential=$differential,
+  samples_per_symbol=$samples_per_symbol,
+  excess_bw=$excess_bw,
+  verbose=$verbose,
+  log=$log,
+  )</make>
+  <param>
+    <name>Number of Constellation Points</name>
+    <key>constellation_points</key>
+    <value>16</value>
+    <type>int</type>
+  </param>
+  <param>
+    <name>Gray Code</name>
+    <key>mod_code</key>
+    <type>enum</type>
+    <option>
+      <name>Yes</name>
+      <key>"gray"</key>
+    </option>
+    <option>
+      <name>No</name>
+      <key>"none"</key>
+    </option>
+  </param>
+  <param>
+    <name>Differential Encoding</name>
+    <key>differential</key>
+    <value>True</value>
+    <type>bool</type>
+    <option>
+      <name>Yes</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>No</name>
+      <key>False</key>
+    </option>
+  </param>
+  <param>
+    <name>Samples/Symbol</name>
+    <key>samples_per_symbol</key>
+    <value>2</value>
+    <type>int</type>
+  </param>
+  <param>
+    <name>Excess BW</name>
+    <key>excess_bw</key>
+    <value>0.35</value>
+    <type>real</type>
+  </param>
+  <param>
+    <name>Verbose</name>
+    <key>verbose</key>
+    <value>False</value>
+    <type>bool</type>
+    <hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide>
+    <option>
+      <name>On</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>Off</name>
+      <key>False</key>
+    </option>
+  </param>
+  <param>
+    <name>Logging</name>
+    <key>log</key>
+    <value>False</value>
+    <type>bool</type>
+    <hide>#if str($log) == 'False' then 'part' else 'none'#</hide>
+    <option>
+      <name>On</name>
+      <key>True</key>
+    </option>
+    <option>
+      <name>Off</name>
+      <key>False</key>
+    </option>
+  </param>
+  <sink>
+    <name>in</name>
+    <type>byte</type>
+  </sink>
+  <source>
+    <name>out</name>
+    <type>complex</type>
+  </source>
+</block>
diff --git a/gnuradio-examples/python/digital-bert/.gitignore b/gr-digital/include/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gnuradio-examples/python/digital-bert/.gitignore
+++ b/gr-digital/include/.gitignore
diff --git a/gr-digital/include/CMakeLists.txt b/gr-digital/include/CMakeLists.txt
new file mode 100644
index 000000000..cf20bd1e7
--- /dev/null
+++ b/gr-digital/include/CMakeLists.txt
@@ -0,0 +1,50 @@
+# 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.
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+    digital_api.h
+    digital_binary_slicer_fb.h
+    digital_clock_recovery_mm_cc.h
+    digital_clock_recovery_mm_ff.h
+    digital_constellation.h
+    digital_constellation_receiver_cb.h
+    digital_constellation_decoder_cb.h
+    digital_correlate_access_code_bb.h
+    digital_costas_loop_cc.h
+    digital_cma_equalizer_cc.h
+    digital_crc32.h
+    digital_fll_band_edge_cc.h
+    digital_lms_dd_equalizer_cc.h
+    digital_kurtotic_equalizer_cc.h
+    digital_metric_type.h
+    digital_mpsk_receiver_cc.h
+    digital_ofdm_cyclic_prefixer.h
+    digital_ofdm_frame_acquisition.h
+    digital_ofdm_frame_sink.h
+    digital_ofdm_insert_preamble.h
+    digital_ofdm_mapper_bcv.h
+    digital_ofdm_sampler.h
+    digital_gmskmod_bc.h
+    digital_cpmmod_bc.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "digital_devel"
+)
diff --git a/gr-digital/include/Makefile.am b/gr-digital/include/Makefile.am
new file mode 100644
index 000000000..8ce3a94e8
--- /dev/null
+++ b/gr-digital/include/Makefile.am
@@ -0,0 +1,51 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+# These headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS = 				\
+	digital_api.h		\
+	digital_binary_slicer_fb.h		\
+	digital_clock_recovery_mm_cc.h		\
+	digital_clock_recovery_mm_ff.h		\
+	digital_constellation.h			\
+	digital_constellation_receiver_cb.h 	\
+	digital_constellation_decoder_cb.h 	\
+	digital_correlate_access_code_bb.h	\
+	digital_costas_loop_cc.h		\
+	digital_cma_equalizer_cc.h		\
+	digital_crc32.h				\
+	digital_fll_band_edge_cc.h		\
+	digital_lms_dd_equalizer_cc.h		\
+	digital_kurtotic_equalizer_cc.h 	\
+	digital_metric_type.h			\
+	digital_mpsk_receiver_cc.h		\
+	digital_ofdm_cyclic_prefixer.h		\
+	digital_ofdm_frame_acquisition.h	\
+	digital_ofdm_frame_sink.h		\
+	digital_ofdm_insert_preamble.h		\
+	digital_ofdm_mapper_bcv.h		\
+	digital_ofdm_sampler.h			\
+	digital_gmskmod_bc.h 			\
+	digital_cpmmod_bc.h
+
+libgnuradio_digital_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
diff --git a/gr-digital/include/digital_api.h b/gr-digital/include/digital_api.h
new file mode 100644
index 000000000..d45ace13f
--- /dev/null
+++ b/gr-digital/include/digital_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_DIGITAL_API_H
+#define INCLUDED_DIGITAL_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_digital_EXPORTS
+#  define DIGITAL_API __GR_ATTR_EXPORT
+#else
+#  define DIGITAL_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_DIGITAL_API_H */
diff --git a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.h b/gr-digital/include/digital_binary_slicer_fb.h
index 2aa4a0828..35a7380fb 100644
--- a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.h
+++ b/gr-digital/include/digital_binary_slicer_fb.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,27 +20,29 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_BINARY_SLICER_FB_H
-#define INCLUDED_GR_BINARY_SLICER_FB_H
+#ifndef INCLUDED_DIGITAL_BINARY_SLICER_FB_H
+#define INCLUDED_DIGITAL_BINARY_SLICER_FB_H
 
+#include <digital_api.h>
 #include <gr_sync_block.h>
 
-class gr_binary_slicer_fb;
-typedef boost::shared_ptr<gr_binary_slicer_fb> gr_binary_slicer_fb_sptr;
+class digital_binary_slicer_fb;
+typedef boost::shared_ptr<digital_binary_slicer_fb> digital_binary_slicer_fb_sptr;
 
-gr_binary_slicer_fb_sptr gr_make_binary_slicer_fb ();
+DIGITAL_API digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
 
 /*!
  * \brief slice float binary symbol outputting 1 bit output
  * \ingroup converter_blk
+ * \ingroup digital
  *
  * x <  0 --> 0
  * x >= 0 --> 1
  */
-class gr_binary_slicer_fb : public gr_sync_block
+class DIGITAL_API digital_binary_slicer_fb : public gr_sync_block
 {
-  friend gr_binary_slicer_fb_sptr gr_make_binary_slicer_fb ();
-  gr_binary_slicer_fb ();
+  friend DIGITAL_API digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
+  digital_binary_slicer_fb ();
 
  public:
   int work (int noutput_items,
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.h b/gr-digital/include/digital_clock_recovery_mm_cc.h
index 04227a145..a2577d537 100644
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.h
+++ b/gr-digital/include/digital_clock_recovery_mm_cc.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2011 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -20,38 +20,44 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_CLOCK_RECOVERY_MM_CC_H
-#define	INCLUDED_GR_CLOCK_RECOVERY_MM_CC_H
+#ifndef INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_H
+#define	INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_H
 
+#include <digital_api.h>
 #include <gr_block.h>
 #include <gr_complex.h>
 #include <gr_math.h>
 
 class gri_mmse_fir_interpolator_cc;
 
-class gr_clock_recovery_mm_cc;
-typedef boost::shared_ptr<gr_clock_recovery_mm_cc> gr_clock_recovery_mm_cc_sptr;
+class digital_clock_recovery_mm_cc;
+typedef boost::shared_ptr<digital_clock_recovery_mm_cc> digital_clock_recovery_mm_cc_sptr;
 
 // public constructor
-gr_clock_recovery_mm_cc_sptr 
-gr_make_clock_recovery_mm_cc (float omega, float gain_omega, float mu, float gain_mu,
-			      float omega_relative_limit=0.001);
+DIGITAL_API digital_clock_recovery_mm_cc_sptr 
+digital_make_clock_recovery_mm_cc (float omega, float gain_omega,
+				   float mu, float gain_mu,
+				   float omega_relative_limit=0.001);
 
 /*!
  * \brief Mueller and Müller (M&M) based clock recovery block with complex input, complex output.
  * \ingroup sync_blk
+ * \ingroup digital
+ *
+ * This implements the Mueller and Müller (M&M) discrete-time
+ * error-tracking synchronizer.
  *
- * This implements the Mueller and Müller (M&M) discrete-time error-tracking synchronizer.
  * The complex version here is based on:
  * Modified Mueller and Muller clock recovery circuit
  * Based:
- *    G. R. Danesfahani, T.G. Jeans, "Optimisation of modified Mueller and Muller 
- *    algorithm,"  Electronics Letters, Vol. 31, no. 13,  22 June 1995, pp. 1032 - 1033.
+ *    G. R. Danesfahani, T.G. Jeans, "Optimisation of modified Mueller
+ *    and Muller algorithm," Electronics Letters, Vol. 31, no. 13, 22
+ *    June 1995, pp. 1032 - 1033.
  */
-class gr_clock_recovery_mm_cc : public gr_block
+class DIGITAL_API digital_clock_recovery_mm_cc : public gr_block
 {
  public:
-  ~gr_clock_recovery_mm_cc ();
+  ~digital_clock_recovery_mm_cc ();
   void forecast(int noutput_items, gr_vector_int &ninput_items_required);
   int general_work (int noutput_items,
 		    gr_vector_int &ninput_items,
@@ -74,8 +80,9 @@ class gr_clock_recovery_mm_cc : public gr_block
   }
 
 protected:
-  gr_clock_recovery_mm_cc (float omega, float gain_omega, float mu, float gain_mu,
-			   float omega_relative_limi);
+  digital_clock_recovery_mm_cc (float omega, float gain_omega,
+				float mu, float gain_mu,
+				float omega_relative_limi);
 
  private:
   float 			d_mu;
@@ -101,9 +108,10 @@ protected:
   gr_complex slicer_0deg (gr_complex sample);
   gr_complex slicer_45deg (gr_complex sample);
 
-  friend gr_clock_recovery_mm_cc_sptr
-  gr_make_clock_recovery_mm_cc (float omega, float gain_omega, float mu, float gain_mu, 
-				float omega_relative_limit);
+  friend DIGITAL_API digital_clock_recovery_mm_cc_sptr
+  digital_make_clock_recovery_mm_cc (float omega, float gain_omega,
+				     float mu, float gain_mu, 
+				     float omega_relative_limit);
 };
 
 #endif
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.h b/gr-digital/include/digital_clock_recovery_mm_ff.h
index d2ec6d3e6..36749553f 100644
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.h
+++ b/gr-digital/include/digital_clock_recovery_mm_ff.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2011 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -20,26 +20,29 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_CLOCK_RECOVERY_MM_FF_H
-#define	INCLUDED_GR_CLOCK_RECOVERY_MM_FF_H
+#ifndef INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_H
+#define	INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_H
 
+#include <digital_api.h>
 #include <gr_block.h>
 #include <gr_math.h>
 #include <stdio.h>
 
 class gri_mmse_fir_interpolator;
 
-class gr_clock_recovery_mm_ff;
-typedef boost::shared_ptr<gr_clock_recovery_mm_ff> gr_clock_recovery_mm_ff_sptr;
+class digital_clock_recovery_mm_ff;
+typedef boost::shared_ptr<digital_clock_recovery_mm_ff> digital_clock_recovery_mm_ff_sptr;
 
 // public constructor
-gr_clock_recovery_mm_ff_sptr 
-gr_make_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
-			      float omega_relative_limit=0.001);
+DIGITAL_API digital_clock_recovery_mm_ff_sptr 
+digital_make_clock_recovery_mm_ff (float omega, float gain_omega,
+				   float mu, float gain_mu,
+				   float omega_relative_limit=0.001);
 
 /*!
  * \brief Mueller and Müller (M&M) based clock recovery block with float input, float output.
  * \ingroup sync_blk
+ * \ingroup digital
  *
  * This implements the Mueller and Müller (M&M) discrete-time error-tracking synchronizer.
  *
@@ -47,10 +50,10 @@ gr_make_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gai
  * Estimation and Signal Processing" by Heinrich Meyr, Marc Moeneclaey, & Stefan Fechtel.
  * ISBN 0-471-50275-8.
  */
-class gr_clock_recovery_mm_ff : public gr_block
+class DIGITAL_API digital_clock_recovery_mm_ff : public gr_block
 {
  public:
-  ~gr_clock_recovery_mm_ff ();
+  ~digital_clock_recovery_mm_ff ();
   void forecast(int noutput_items, gr_vector_int &ninput_items_required);
   int general_work (int noutput_items,
 		    gr_vector_int &ninput_items,
@@ -72,7 +75,7 @@ class gr_clock_recovery_mm_ff : public gr_block
   }
 
 protected:
-  gr_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
+  digital_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
 			   float omega_relative_limit);
 
  private:
@@ -88,9 +91,10 @@ protected:
   FILE				*d_logfile;
   float				d_omega_relative_limit;	// used to compute min and max omega
 
-  friend gr_clock_recovery_mm_ff_sptr
-  gr_make_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
-				float omega_relative_limit);
+  friend DIGITAL_API digital_clock_recovery_mm_ff_sptr
+  digital_make_clock_recovery_mm_ff (float omega, float gain_omega,
+				     float mu, float gain_mu,
+				     float omega_relative_limit);
 };
 
 #endif
diff --git a/gr-digital/include/digital_cma_equalizer_cc.h b/gr-digital/include/digital_cma_equalizer_cc.h
new file mode 100644
index 000000000..0d703789a
--- /dev/null
+++ b/gr-digital/include/digital_cma_equalizer_cc.h
@@ -0,0 +1,103 @@
+/* -*- c++ -*- */
+/*
+ * 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_DIGITAL_CMA_EQUALIZER_CC_H
+#define	INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H
+
+#include <digital_api.h>
+#include <gr_adaptive_fir_ccc.h>
+#include <gr_math.h>
+#include <iostream>
+
+class digital_cma_equalizer_cc;
+typedef boost::shared_ptr<digital_cma_equalizer_cc> digital_cma_equalizer_cc_sptr;
+
+DIGITAL_API digital_cma_equalizer_cc_sptr 
+digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps);
+
+/*!
+ * \brief Implements constant modulus adaptive filter on complex stream
+ * \ingroup eq_blk
+ * \ingroup digital
+ *
+ * The error value and tap update equations (for p=2) can be found in:
+ *
+ * D. Godard, "Self-Recovering Equalization and Carrier Tracking in
+ * Two-Dimensional Data Communication Systems," IEEE Transactions on
+ * Communications, Vol. 28, No. 11, pp. 1867 - 1875, 1980,
+ */
+class DIGITAL_API digital_cma_equalizer_cc : public gr_adaptive_fir_ccc
+{
+private:
+  float d_modulus;
+  float d_mu;
+  
+  friend DIGITAL_API digital_cma_equalizer_cc_sptr digital_make_cma_equalizer_cc(int num_taps,
+								     float modulus,
+								     float mu,
+								     int sps);
+  digital_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps);
+
+protected:
+
+  virtual gr_complex error(const gr_complex &out) 
+  { 
+    gr_complex error = out*(norm(out) - d_modulus);
+    float re = gr_clip(error.real(), 1.0);
+    float im = gr_clip(error.imag(), 1.0);
+    return gr_complex(re, im);
+  }
+
+  virtual void update_tap(gr_complex &tap, const gr_complex &in) 
+  {
+    // Hn+1 = Hn - mu*conj(Xn)*zn*(|zn|^2 - 1)
+    tap -= d_mu*conj(in)*d_error;
+  }
+  
+public:
+  float get_gain() 
+  {
+    return d_mu;
+  }
+
+  void set_gain(float mu) 
+  {
+    if(mu < 0.0f || mu > 1.0f) {
+      throw std::out_of_range("digital_cma_equalizer::set_gain: Gain value must be in [0,1]");
+    }
+    d_mu = mu;
+  }
+    
+  float get_modulus() 
+  {
+    return d_modulus;
+  }
+
+  void set_modulus(float mod) 
+  {
+    if(mod < 0)
+      throw std::out_of_range("digital_cma_equalizer::set_modulus: Modulus value must be >= 0");
+    d_modulus = mod;
+  }
+};
+
+#endif
diff --git a/gr-digital/include/digital_constellation.h b/gr-digital/include/digital_constellation.h
new file mode 100644
index 000000000..a72bfb74c
--- /dev/null
+++ b/gr-digital/include/digital_constellation.h
@@ -0,0 +1,449 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010, 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_DIGITAL_CONSTELLATION_H
+#define	INCLUDED_DIGITAL_CONSTELLATION_H
+
+#include <digital_api.h>
+#include <vector>
+#include <math.h>
+#include <gr_complex.h>
+#include <boost/enable_shared_from_this.hpp>
+#include <digital_metric_type.h>
+
+/************************************************************/
+/* digital_constellation                                    */
+/*                                                          */
+/* Base class defining interface.                           */
+/************************************************************/
+
+class digital_constellation;
+typedef boost::shared_ptr<digital_constellation> digital_constellation_sptr;
+
+/*!
+ * \brief An abstracted constellation object
+ * \ingroup digital
+ *
+ * The constellation objects hold the necessary information to pass
+ * around constellation information for modulators and
+ * demodulators. These objects contain the mapping between the bits
+ * and the constellation points used to represent them as well as
+ * methods for slicing the symbol space. Various implementations are
+ * possible for efficiency and ease of use.
+ *
+ * Standard constellations (BPSK, QPSK, QAM, etc) can be inherited
+ * from this class and overloaded to perform optimized slicing and
+ * constellation mappings.
+ */
+class DIGITAL_API digital_constellation : public boost::enable_shared_from_this<digital_constellation>
+{
+public:
+  digital_constellation (std::vector<gr_complex> constellation,
+			 std::vector<unsigned int> pre_diff_code,
+			 unsigned int rotational_symmetry,
+			 unsigned int dimensionality);
+  digital_constellation ();
+
+  //! Returns the constellation points for a symbol value
+  void map_to_points(unsigned int value, gr_complex *points);
+  std::vector<gr_complex> map_to_points_v(unsigned int value);
+
+  //! Returns the constellation point that matches best.
+  virtual unsigned int decision_maker (const gr_complex *sample) = 0;
+  //! Takes a vector rather than a pointer.  Better for SWIG wrapping.
+  unsigned int decision_maker_v (std::vector<gr_complex> sample);
+  //! Also calculates the phase error.
+  unsigned int decision_maker_pe (const gr_complex *sample, float *phase_error);
+  //! Calculates distance.
+  unsigned int decision_maker_e (const gr_complex *sample, float *error);
+  
+  //! Calculates metrics for all points in the constellation.
+  //! For use with the viterbi algorithm.
+  virtual void calc_metric(const gr_complex *sample, float *metric, trellis_metric_type_t type);
+  virtual void calc_euclidean_metric(const gr_complex *sample, float *metric);
+  virtual void calc_hard_symbol_metric(const gr_complex *sample, float *metric);
+  
+  //! Returns the set of points in this constellation.
+  std::vector<gr_complex> points() { return d_constellation;}
+  //! Returns the vector of points in this constellation.
+  //! Raise error if dimensionality is not one.
+  std::vector<gr_complex> s_points();
+  //! Returns a vector of vectors of points.
+  std::vector<std::vector<gr_complex> > v_points();
+  //! Whether to apply an encoding before doing differential encoding. (e.g. gray coding)
+  bool apply_pre_diff_code() { return d_apply_pre_diff_code;}
+  //! Whether to apply an encoding before doing differential encoding. (e.g. gray coding)
+  void set_pre_diff_code(bool a) { d_apply_pre_diff_code = a;}
+  //! Returns the encoding to apply before differential encoding.
+  std::vector<unsigned int> pre_diff_code() { return d_pre_diff_code;}
+  //! Returns the order of rotational symmetry.
+  unsigned int rotational_symmetry() { return d_rotational_symmetry;}
+  //! Returns the number of complex numbers in a single symbol.
+  unsigned int dimensionality() {return d_dimensionality;}
+
+  unsigned int bits_per_symbol () {
+    return floor(log(double(d_constellation.size()))/d_dimensionality/log(2.0));
+  }
+  
+  unsigned int arity () {
+    return d_arity;
+  }
+
+  digital_constellation_sptr base() {
+    return shared_from_this();
+  }  
+
+ protected:
+
+  std::vector<gr_complex> d_constellation;
+  std::vector<unsigned int> d_pre_diff_code; 
+  bool d_apply_pre_diff_code;
+  unsigned int d_rotational_symmetry;
+  unsigned int d_dimensionality;
+  unsigned int d_arity;
+
+  float get_distance(unsigned int index, const gr_complex *sample);
+  unsigned int get_closest_point(const gr_complex *sample);
+  void calc_arity ();
+};
+
+/************************************************************/
+/* digital_constellation_calcdist                           */
+/*                                                          */
+/************************************************************/
+
+class digital_constellation_calcdist;
+typedef boost::shared_ptr<digital_constellation_calcdist> digital_constellation_calcdist_sptr;
+
+// public constructor
+DIGITAL_API digital_constellation_calcdist_sptr
+digital_make_constellation_calcdist (std::vector<gr_complex> constellation,
+				     std::vector<unsigned int> pre_diff_code,
+				     unsigned int rotational_symmetry,
+				     unsigned int dimensionality);
+
+
+/*! \brief Calculate Euclidian distance for any constellation
+ *  \ingroup digital
+ *
+ * Constellation which calculates the distance to each point in the
+ * constellation for decision making. Inefficient for large
+ * constellations.
+ */
+class DIGITAL_API digital_constellation_calcdist : public digital_constellation
+{
+ public:
+  digital_constellation_calcdist (std::vector<gr_complex> constellation,
+				  std::vector<unsigned int> pre_diff_code,
+				  unsigned int rotational_symmetry,
+				  unsigned int dimensionality);
+  unsigned int decision_maker (const gr_complex *sample);
+  // void calc_metric(gr_complex *sample, float *metric, trellis_metric_type_t type);
+  // void calc_euclidean_metric(gr_complex *sample, float *metric);
+  // void calc_hard_symbol_metric(gr_complex *sample, float *metric);
+  
+ private:
+  friend DIGITAL_API digital_constellation_calcdist_sptr
+  digital_make_constellation_calcdist (std::vector<gr_complex> constellation);
+};
+
+
+/************************************************************/
+/*! digital_constellation_sector                             */
+/************************************************************/
+
+/*!
+ * \brief Sectorized digital constellation
+ * \ingroup digital
+ *
+ * Constellation space is divided into sectors. Each sector is
+ * associated with the nearest constellation point.
+ *
+ */
+class DIGITAL_API digital_constellation_sector : public digital_constellation
+{
+ public:
+
+  digital_constellation_sector (std::vector<gr_complex> constellation,
+				std::vector<unsigned int> pre_diff_code,
+				unsigned int rotational_symmetry,
+				unsigned int dimensionality,
+				unsigned int n_sectors);
+
+  unsigned int decision_maker (const gr_complex *sample);
+
+ protected:
+
+  virtual unsigned int get_sector (const gr_complex *sample) = 0;
+  virtual unsigned int calc_sector_value (unsigned int sector) = 0;
+  void find_sector_values ();
+
+  unsigned int n_sectors;
+
+ private:
+
+  std::vector<unsigned int> sector_values;
+
+};
+
+/************************************************************/
+/* digital_constellation_rect                               */
+/************************************************************/
+
+/*!
+ * \brief Rectangular digital constellation
+ * \ingroup digital
+ *
+ * Only implemented for 1-(complex)dimensional constellation.
+ *
+ * Constellation space is divided into rectangular sectors. Each
+ * sector is associated with the nearest constellation point.
+ *
+ * Works well for square QAM.
+ *
+ * Works for any generic constellation provided sectors are not too
+ * large.
+ */
+
+class digital_constellation_rect;
+typedef boost::shared_ptr<digital_constellation_rect> digital_constellation_rect_sptr;
+
+// public constructor
+DIGITAL_API digital_constellation_rect_sptr 
+digital_make_constellation_rect (std::vector<gr_complex> constellation,
+				 std::vector<unsigned int> pre_diff_code,
+				 unsigned int rotational_symmetry,
+				 unsigned int real_sectors,
+				 unsigned int imag_sectors,
+				 float width_real_sectors,
+				 float width_imag_sectors);
+
+class DIGITAL_API digital_constellation_rect : public digital_constellation_sector
+{
+ public:
+
+  digital_constellation_rect (std::vector<gr_complex> constellation,
+			      std::vector<unsigned int> pre_diff_code,
+			      unsigned int rotational_symmetry,
+			      unsigned int real_sectors,
+			      unsigned int imag_sectors,
+			      float width_real_sectors,
+			      float width_imag_sectors);
+
+ protected:
+
+  unsigned int get_sector (const gr_complex *sample);
+  
+  unsigned int calc_sector_value (unsigned int sector);
+
+ private:
+
+  unsigned int n_real_sectors;
+  unsigned int n_imag_sectors;
+  float d_width_real_sectors;
+  float d_width_imag_sectors;
+
+  friend DIGITAL_API digital_constellation_rect_sptr
+  digital_make_constellation_rect (std::vector<gr_complex> constellation,
+				   std::vector<unsigned int> pre_diff_code,
+				   unsigned int rotational_symmetry,
+				   unsigned int real_sectors,
+				   unsigned int imag_sectors,
+				   float width_real_sectors,
+				   float width_imag_sectors);
+  
+};
+
+
+/************************************************************/
+/* digital_constellation_psk                                */
+/************************************************************/
+
+class digital_constellation_psk;
+typedef boost::shared_ptr<digital_constellation_psk> digital_constellation_psk_sptr;
+
+// public constructor
+DIGITAL_API digital_constellation_psk_sptr 
+digital_make_constellation_psk (std::vector<gr_complex> constellation,
+				std::vector<unsigned int> pre_diff_code,
+				unsigned int n_sectors);
+
+/*! 
+ * \brief digital_constellation_psk
+ * \ingroup digital
+ *
+ * Constellation space is divided into pie slices sectors.
+ *
+ * Each slice is associated with the nearest constellation point. 
+ *
+ * Works well for PSK but nothing else.  
+ *
+ * Assumes that there is a constellation point at 1.x 
+ */
+class DIGITAL_API digital_constellation_psk : public digital_constellation_sector
+{
+ public:
+
+  digital_constellation_psk (std::vector<gr_complex> constellation,
+			     std::vector<unsigned int> pre_diff_code,
+			     unsigned int n_sectors);
+
+ protected:
+
+  unsigned int get_sector (const gr_complex *sample);
+  
+  unsigned int calc_sector_value (unsigned int sector);
+
+ private:
+
+  friend DIGITAL_API digital_constellation_psk_sptr
+  digital_make_constellation_psk (std::vector<gr_complex> constellation,
+				  std::vector<unsigned int> pre_diff_code,
+				  unsigned int n_sectors);
+  
+};
+
+
+/************************************************************/
+/* digital_constellation_bpsk                               */
+/*                                                          */
+/* Only works for BPSK.                                     */
+/*                                                          */
+/************************************************************/
+
+class digital_constellation_bpsk;
+typedef boost::shared_ptr<digital_constellation_bpsk> digital_constellation_bpsk_sptr;
+
+// public constructor
+DIGITAL_API digital_constellation_bpsk_sptr 
+digital_make_constellation_bpsk ();
+
+/*! 
+ * \brief Digital constellation for BPSK 
+ * \ingroup digital
+ */
+class DIGITAL_API digital_constellation_bpsk : public digital_constellation
+{
+ public:
+
+  digital_constellation_bpsk ();
+  unsigned int decision_maker (const gr_complex *sample);
+
+  friend DIGITAL_API digital_constellation_bpsk_sptr
+  digital_make_constellation_bpsk ();
+  
+};
+
+
+/************************************************************/
+/* digital_constellation_qpsk                               */
+/*                                                          */
+/* Only works for QPSK.                                     */
+/*                                                          */
+/************************************************************/
+
+class digital_constellation_qpsk;
+typedef boost::shared_ptr<digital_constellation_qpsk> digital_constellation_qpsk_sptr;
+
+// public constructor
+DIGITAL_API digital_constellation_qpsk_sptr 
+digital_make_constellation_qpsk ();
+
+/*! 
+ * \brief Digital constellation for QPSK
+ * \ingroup digital
+ */
+class DIGITAL_API digital_constellation_qpsk : public digital_constellation
+{
+ public:
+
+  digital_constellation_qpsk ();
+  unsigned int decision_maker (const gr_complex *sample);
+
+  friend DIGITAL_API digital_constellation_qpsk_sptr
+  digital_make_constellation_qpsk ();
+  
+};
+
+
+/************************************************************/
+/* digital_constellation_dqpsk                              */
+/*                                                          */
+/* Works with differential encoding; slower decisions.      */
+/*                                                          */
+/************************************************************/
+
+class digital_constellation_dqpsk;
+typedef boost::shared_ptr<digital_constellation_dqpsk> digital_constellation_dqpsk_sptr;
+
+// public constructor
+DIGITAL_API digital_constellation_dqpsk_sptr 
+digital_make_constellation_dqpsk ();
+
+/*!
+ * \brief Digital constellation for DQPSK
+ * \ingroup digital
+ */
+class DIGITAL_API digital_constellation_dqpsk : public digital_constellation
+{
+ public:
+
+  digital_constellation_dqpsk ();
+  unsigned int decision_maker (const gr_complex *sample);
+
+  friend DIGITAL_API digital_constellation_dqpsk_sptr
+  digital_make_constellation_dqpsk ();
+  
+};
+
+
+/************************************************************/
+/* digital_constellation_8psk                               */
+/*                                                          */
+/* Only works for 8PSK.                                     */
+/*                                                          */
+/************************************************************/
+
+class digital_constellation_8psk;
+typedef boost::shared_ptr<digital_constellation_8psk> digital_constellation_8psk_sptr;
+
+// public constructor
+DIGITAL_API digital_constellation_8psk_sptr 
+digital_make_constellation_8psk ();
+
+/*! 
+ * \brief Digital constellation for 8PSK
+ * \ingroup digital
+ */
+class DIGITAL_API digital_constellation_8psk : public digital_constellation
+{
+ public:
+
+  digital_constellation_8psk ();
+  unsigned int decision_maker (const gr_complex *sample);
+
+  friend DIGITAL_API digital_constellation_8psk_sptr
+  digital_make_constellation_8psk ();
+  
+};
+
+#endif
diff --git a/gr-digital/include/digital_constellation_decoder_cb.h b/gr-digital/include/digital_constellation_decoder_cb.h
new file mode 100644
index 000000000..cce3a564f
--- /dev/null
+++ b/gr-digital/include/digital_constellation_decoder_cb.h
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * 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_DIGITAL_CONSTELLATION_DECODER_CB_H
+#define INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
+
+#include <digital_api.h>
+#include <gr_block.h>
+#include <digital_constellation.h>
+#include <vector>
+
+class digital_constellation_decoder_cb;
+typedef boost::shared_ptr<digital_constellation_decoder_cb>digital_constellation_decoder_cb_sptr;
+
+DIGITAL_API digital_constellation_decoder_cb_sptr 
+digital_make_constellation_decoder_cb (digital_constellation_sptr constellation);
+
+/*!
+ * \brief Constellation Decoder
+ * \ingroup coding_blk
+ * \ingroup digital
+ *
+ */
+class DIGITAL_API digital_constellation_decoder_cb : public gr_block
+{
+
+ private:
+  digital_constellation_sptr d_constellation;
+  unsigned int d_dim;
+
+  friend DIGITAL_API digital_constellation_decoder_cb_sptr 
+  digital_make_constellation_decoder_cb (digital_constellation_sptr constellation);
+  
+  digital_constellation_decoder_cb (digital_constellation_sptr constellation);
+
+ public:
+
+  void forecast (int noutput_items,
+		 gr_vector_int &ninput_items_required);
+  
+  int general_work (int noutput_items,
+		    gr_vector_int &ninput_items,
+		    gr_vector_const_void_star &input_items,
+		    gr_vector_void_star &output_items);
+};
+
+#endif
diff --git a/gr-digital/include/digital_constellation_receiver_cb.h b/gr-digital/include/digital_constellation_receiver_cb.h
new file mode 100644
index 000000000..8547bdd68
--- /dev/null
+++ b/gr-digital/include/digital_constellation_receiver_cb.h
@@ -0,0 +1,123 @@
+/* -*- c++ -*- */
+/*
+ * 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_DIGITAL_CONSTELLATION_RECEIVER_CB_H
+#define	INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
+
+#include <digital_api.h>
+#include <gr_block.h>
+#include <digital_constellation.h>
+#include <gruel/attributes.h>
+#include <gri_control_loop.h>
+#include <gr_complex.h>
+#include <math.h>
+#include <fstream>
+
+class digital_constellation_receiver_cb;
+typedef boost::shared_ptr<digital_constellation_receiver_cb> digital_constellation_receiver_cb_sptr;
+
+// public constructor
+DIGITAL_API digital_constellation_receiver_cb_sptr 
+digital_make_constellation_receiver_cb (digital_constellation_sptr constellation,
+					float loop_bw, float fmin, float fmax);
+
+/*!
+ * \brief This block takes care of receiving generic modulated signals
+ * through phase, frequency, and symbol synchronization.
+ * \ingroup sync_blk
+ * \ingroup demod_blk
+ * \ingroup digital
+ *
+ * This block takes care of receiving generic modulated signals
+ * through phase, frequency, and symbol synchronization. It performs
+ * carrier frequency and phase locking as well as symbol timing
+ * recovery.
+ *
+ * The phase and frequency synchronization are based on a Costas loop
+ * that finds the error of the incoming signal point compared to its
+ * nearest constellation point. The frequency and phase of the NCO are
+ * updated according to this error.
+ *
+ * The symbol synchronization is done using a modified Mueller and
+ * Muller circuit from the paper:
+ * 
+ *    G. R. Danesfahani, T.G. Jeans, "Optimisation of modified Mueller
+ *    and Muller algorithm," Electronics Letters, Vol. 31, no. 13, 22
+ *    June 1995, pp. 1032 - 1033.
+ *
+ * This circuit interpolates the downconverted sample (using the NCO
+ * developed by the Costas loop) every mu samples, then it finds the
+ * sampling error based on this and the past symbols and the decision
+ * made on the samples. Like the phase error detector, there are
+ * optimized decision algorithms for BPSK and QPKS, but 8PSK uses
+ * another brute force computation against all possible symbols. The
+ * modifications to the M&M used here reduce self-noise.
+ *
+ */
+
+class DIGITAL_API digital_constellation_receiver_cb : public gr_block, public gri_control_loop
+{
+public:
+  int general_work (int noutput_items,
+		    gr_vector_int &ninput_items,
+		    gr_vector_const_void_star &input_items,
+		    gr_vector_void_star &output_items);
+
+protected:
+
+ /*!
+   * \brief Constructor to synchronize incoming M-PSK symbols
+   *
+   * \param constellation	constellation of points for generic modulation
+   * \param loop_bw	Loop bandwidth of the Costas Loop (~ 2pi/100)
+   * \param fmin        minimum normalized frequency value the loop can achieve
+   * \param fmax        maximum normalized frequency value the loop can achieve
+   *
+   * The constructor also chooses which phase detector and decision maker to use in the
+   * work loop based on the value of M.
+   */
+  digital_constellation_receiver_cb (digital_constellation_sptr constellation, 
+				     float loop_bw, float fmin, float fmax);
+
+  void phase_error_tracking(float phase_error);
+
+private:
+  unsigned int d_M;
+
+  digital_constellation_sptr d_constellation;
+  unsigned int d_current_const_point;
+
+  //! delay line length.
+  static const unsigned int DLLEN = 8;
+  
+  //! delay line plus some length for overflow protection
+  __GR_ATTR_ALIGNED(8) gr_complex d_dl[2*DLLEN];
+  
+  //! index to delay line
+  unsigned int d_dl_idx;
+
+  friend DIGITAL_API digital_constellation_receiver_cb_sptr
+  digital_make_constellation_receiver_cb (digital_constellation_sptr constell,
+					  float loop_bw, float fmin, float fmax);
+};
+
+#endif
diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h b/gr-digital/include/digital_correlate_access_code_bb.h
index 581713c14..8095dd409 100644
--- a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.h
+++ b/gr-digital/include/digital_correlate_access_code_bb.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005,2006 Free Software Foundation, Inc.
+ * Copyright 2005,2006,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,25 +20,27 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_CORRELATE_ACCESS_CODE_BB_H
-#define INCLUDED_GR_CORRELATE_ACCESS_CODE_BB_H
+#ifndef INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_H
+#define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_H
 
+#include <digital_api.h>
 #include <gr_sync_block.h>
 #include <string>
 
-class gr_correlate_access_code_bb;
-typedef boost::shared_ptr<gr_correlate_access_code_bb> gr_correlate_access_code_bb_sptr;
+class digital_correlate_access_code_bb;
+typedef boost::shared_ptr<digital_correlate_access_code_bb> digital_correlate_access_code_bb_sptr;
 
 /*!
  * \param access_code is represented with 1 byte per bit, e.g., "010101010111000100"
  * \param threshold maximum number of bits that may be wrong
  */
-gr_correlate_access_code_bb_sptr 
-gr_make_correlate_access_code_bb (const std::string &access_code, int threshold);
+DIGITAL_API digital_correlate_access_code_bb_sptr 
+digital_make_correlate_access_code_bb (const std::string &access_code, int threshold);
 
 /*!
  * \brief Examine input for specified access code, one bit at a time.
  * \ingroup sync_blk
+ * \ingroup digital
  *
  * input:  stream of bits, 1 bit per input byte (data in LSB)
  * output: stream of bits, 2 bits per output byte (data in LSB, flag in next higher bit)
@@ -49,10 +51,10 @@ gr_make_correlate_access_code_bb (const std::string &access_code, int threshold)
  * flag bit and is 1 if the corresponding data bit is the first data
  * bit following the access code. Otherwise the flag bit is 0.
  */
-class gr_correlate_access_code_bb : public gr_sync_block
+class DIGITAL_API digital_correlate_access_code_bb : public gr_sync_block
 {
-  friend gr_correlate_access_code_bb_sptr 
-  gr_make_correlate_access_code_bb (const std::string &access_code, int threshold);
+  friend DIGITAL_API digital_correlate_access_code_bb_sptr 
+  digital_make_correlate_access_code_bb (const std::string &access_code, int threshold);
  private:
   unsigned long long d_access_code;	// access code to locate start of packet
                                         //   access code is left justified in the word
@@ -64,10 +66,10 @@ class gr_correlate_access_code_bb : public gr_sync_block
   unsigned int	     d_threshold;	// how many bits may be wrong in sync vector
 
  protected:
-  gr_correlate_access_code_bb(const std::string &access_code, int threshold);
+  digital_correlate_access_code_bb(const std::string &access_code, int threshold);
 
  public:
-  ~gr_correlate_access_code_bb();
+  ~digital_correlate_access_code_bb();
 
   int work(int noutput_items,
 	   gr_vector_const_void_star &input_items,
@@ -80,4 +82,4 @@ class gr_correlate_access_code_bb : public gr_sync_block
   bool set_access_code (const std::string &access_code);
 };
 
-#endif /* INCLUDED_GR_CORRELATE_ACCESS_CODE_BB_H */
+#endif /* INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_H */
diff --git a/gnuradio-core/src/lib/general/gr_costas_loop_cc.h b/gr-digital/include/digital_costas_loop_cc.h
index 3b4aab86c..c8c722c93 100644
--- a/gnuradio-core/src/lib/general/gr_costas_loop_cc.h
+++ b/gr-digital/include/digital_costas_loop_cc.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,16 +21,19 @@
  */
 
 
-#ifndef INCLUDED_GR_COSTAS_LOOP_CC_H
-#define INCLUDED_GR_COSTAS_LOOP_CC_H
+#ifndef INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
+#define INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
 
 #include <gr_sync_block.h>
+#include <gri_control_loop.h>
 #include <stdexcept>
 #include <fstream>
 
 
-/*! \brief A Costas loop carrier recovery module.
+/*! 
+ * \brief A Costas loop carrier recovery module.
  * \ingroup sync_blk
+ * \ingroup digital
  *  
  *  The Costas loop locks to the center frequency of a signal and
  *  downconverts it to baseband. The second (order=2) order loop is
@@ -41,9 +44,9 @@
  *
  *  More details can be found online:
  *
- *  J. Feigin, "Practical Costas loop design: Designing a simple and inexpensive
- *  BPSK Costas loop carrier recovery circuit," RF signal processing, pp. 20-36,
- *  2002.
+ *  J. Feigin, "Practical Costas loop design: Designing a simple and
+ *  inexpensive BPSK Costas loop carrier recovery circuit," RF signal
+ *  processing, pp. 20-36, 2002.
  *
  *  http://rfdesign.com/images/archive/0102Feigin20.pdf
  *  
@@ -53,15 +56,16 @@
  * \param min_freq the minimum frequency deviation (radians/sample) the loop can handle
  * \param order the loop order, either 2 or 4
  */
-class gr_costas_loop_cc;
-typedef boost::shared_ptr<gr_costas_loop_cc> gr_costas_loop_cc_sptr;
 
+#include <digital_api.h>
 
-gr_costas_loop_cc_sptr 
-gr_make_costas_loop_cc (float alpha, float beta,
-			float max_freq, float min_freq, 
-			int order
-			) throw (std::invalid_argument);
+class digital_costas_loop_cc;
+typedef boost::shared_ptr<digital_costas_loop_cc> digital_costas_loop_cc_sptr;
+
+
+DIGITAL_API digital_costas_loop_cc_sptr 
+digital_make_costas_loop_cc (float loop_bw, int order
+			     ) throw (std::invalid_argument);
 
 
 /*!
@@ -74,20 +78,22 @@ gr_make_costas_loop_cc (float alpha, float beta,
  *
  * \p order must be 2 or 4.
  */
-class gr_costas_loop_cc : public gr_sync_block
+class DIGITAL_API digital_costas_loop_cc : public gr_sync_block, public gri_control_loop
 {
-  friend gr_costas_loop_cc_sptr gr_make_costas_loop_cc (float alpha, float beta,
-							float max_freq, float min_freq, 
-							int order
-							) throw (std::invalid_argument);
+  friend DIGITAL_API digital_costas_loop_cc_sptr
+  digital_make_costas_loop_cc (float loop_bw, int order
+			       ) throw (std::invalid_argument);
 
-  float d_alpha, d_beta, d_max_freq, d_min_freq, d_phase, d_freq;
   int d_order;
 
-  gr_costas_loop_cc (float alpha, float beta,
-		     float max_freq, float min_freq, 
-		     int order
-		     ) throw (std::invalid_argument);
+  digital_costas_loop_cc (float loop_bw, int order
+			  ) throw (std::invalid_argument);
+  
+  /*! \brief the phase detector circuit for 8th-order PSK loops
+   *  \param sample complex sample
+   *  \return the phase error
+   */
+  float phase_detector_8(gr_complex sample) const;    // for 8PSK
 
   /*! \brief the phase detector circuit for fourth-order loops
    *  \param sample complex sample
@@ -102,38 +108,13 @@ class gr_costas_loop_cc : public gr_sync_block
   float phase_detector_2(gr_complex sample) const;    // for BPSK
 
 
-  float (gr_costas_loop_cc::*d_phase_detector)(gr_complex sample) const;
+  float (digital_costas_loop_cc::*d_phase_detector)(gr_complex sample) const;
 
 public:
 
-  /*! \brief set the first order gain
-   *  \param alpha
-   */
-  void set_alpha(float alpha);
-
-  /*! \brief get the first order gain
-   * 
-   */
-  float alpha() const { return d_alpha; }
-  
-  /*! \brief set the second order gain
-   *  \param beta
-   */
-  void set_beta(float beta);
-
-  /*! \brief get the second order gain
-   * 
-   */
-  float beta() const { return d_beta; }
-  
   int work (int noutput_items,
 	    gr_vector_const_void_star &input_items,
 	    gr_vector_void_star &output_items);
-
-  /*! \brief returns the current NCO frequency in radians/sample
-   *
-   */
-  float freq() const { return d_freq; }
 };
 
 #endif
diff --git a/gr-digital/include/digital_cpmmod_bc.h b/gr-digital/include/digital_cpmmod_bc.h
new file mode 100644
index 000000000..332856afc
--- /dev/null
+++ b/gr-digital/include/digital_cpmmod_bc.h
@@ -0,0 +1,97 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 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_DIGITAL_CPMMOD_BC_H
+#define INCLUDED_DIGITAL_CPMMOD_BC_H
+
+#include <digital_api.h>
+#include <gr_hier_block2.h>
+#include <gr_char_to_float.h>
+#include <gr_interp_fir_filter_fff.h>
+#include <gr_frequency_modulator_fc.h>
+#include <gr_cpm.h>
+
+
+class digital_cpmmod_bc;
+typedef boost::shared_ptr<digital_cpmmod_bc> digital_cpmmod_bc_sptr;
+
+
+DIGITAL_API digital_cpmmod_bc_sptr
+digital_make_cpmmod_bc(int type, float h,
+		       unsigned samples_per_sym,
+		       unsigned L, double beta=0.3);
+
+/*!
+ * \brief Generic CPM modulator
+ *
+ * \ingroup modulation_blk
+ * \ingroup digital
+ *
+ * \param type The modulation type. Can be one of LREC, LRC, LSRC, TFM
+ *             or GAUSSIAN. See gr_cpm::phase_response() for a
+ *             detailed description.
+ * \param h The modulation index. \f$ h \cdot \pi\f$ is the maximum
+ *          phase change that can occur between two symbols, i.e., if
+ *          you only send ones, the phase will increase by \f$ h \cdot
+ *          \pi\f$ every \p samples_per_sym samples. Set this to 0.5
+ *          for Minimum Shift Keying variants.
+ * \param samples_per_sym Samples per symbol.
+ * \param L The length of the phase duration in symbols. For L=1, this
+ *          yields full- response CPM symbols, for L > 1,
+ *          partial-response.
+ * \param beta For LSRC, this is the rolloff factor. For Gaussian
+ *             pulses, this is the 3 dB time-bandwidth product.
+ *
+ * Examples:
+ * - Setting h = 0.5, L = 1, type = LREC yields MSK.
+ * - Setting h = 0.5, type = GAUSSIAN and beta = 0.3 yields GMSK
+ *           as used in GSM.
+ *
+ * The input of this block are symbols from an M-ary alphabet
+ * +/-1, +/-3, ..., +/-(M-1). Usually, M = 2 and therefore, the
+ * valid inputs are +/-1.
+ * The modulator will silently accept any other inputs, though.
+ * The output is the phase-modulated signal.
+ */
+class DIGITAL_API digital_cpmmod_bc : public gr_hier_block2
+{
+  friend DIGITAL_API digital_cpmmod_bc_sptr digital_make_cpmmod_bc(int type, float h,
+						       unsigned samples_per_sym,
+						       unsigned L, double beta);
+  
+  std::vector<float> d_taps;
+  gr_char_to_float_sptr d_char_to_float;
+  gr_interp_fir_filter_fff_sptr d_pulse_shaper;
+  gr_frequency_modulator_fc_sptr d_fm;
+  
+protected:
+  digital_cpmmod_bc(gr_cpm::cpm_type type, float h,
+		    unsigned samples_per_sym,
+		    unsigned L, double beta);
+  
+public:
+  //! Return the phase response FIR taps
+  std::vector<float> get_taps() { return d_taps; };
+};
+
+#endif /* INCLUDED_DIGITAL_CPMMOD_BC_H */
+
diff --git a/gnuradio-core/src/lib/general/gr_crc32.h b/gr-digital/include/digital_crc32.h
index 87a8d15f2..ec4a0df5b 100644
--- a/gnuradio-core/src/lib/general/gr_crc32.h
+++ b/gr-digital/include/digital_crc32.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,31 +20,32 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_CRC32_H
-#define INCLUDED_GR_CRC32_H
+#ifndef INCLUDED_DIGITAL_CRC32_H
+#define INCLUDED_DIGITAL_CRC32_H
 
+#include <digital_api.h>
 #include <string>
 #include <gr_types.h>
 
 /*!
  * \brief update running CRC-32
- * \ingroup misc
+ * \ingroup digital
  *
  * Update a running CRC with the bytes buf[0..len-1] The CRC should be
  * initialized to all 1's, and the transmitted value is the 1's
  * complement of the final running CRC.  The resulting CRC should be
  * transmitted in big endian order.
  */
-unsigned int 
-gr_update_crc32(unsigned int crc, const unsigned char *buf, size_t len);
+DIGITAL_API unsigned int 
+digital_update_crc32(unsigned int crc, const unsigned char *buf, size_t len);
 
-unsigned int 
-gr_update_crc32(unsigned int crc, const std::string buf);
+DIGITAL_API unsigned int 
+digital_update_crc32(unsigned int crc, const std::string buf);
 
-unsigned int 
-gr_crc32(const unsigned char *buf, size_t len);
+DIGITAL_API unsigned int 
+digital_crc32(const unsigned char *buf, size_t len);
 
-unsigned int 
-gr_crc32(const std::string buf);
+DIGITAL_API unsigned int 
+digital_crc32(const std::string buf);
 
 #endif /* INCLUDED_CRC32_H */
diff --git a/gr-digital/include/digital_fll_band_edge_cc.h b/gr-digital/include/digital_fll_band_edge_cc.h
new file mode 100644
index 000000000..f07d7ba42
--- /dev/null
+++ b/gr-digital/include/digital_fll_band_edge_cc.h
@@ -0,0 +1,214 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,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_DIGITAL_FLL_BAND_EDGE_CC_H
+#define	INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_H
+
+#include <digital_api.h>
+#include <gr_sync_block.h>
+#include <gri_control_loop.h>
+
+class digital_fll_band_edge_cc;
+typedef boost::shared_ptr<digital_fll_band_edge_cc> digital_fll_band_edge_cc_sptr;
+DIGITAL_API digital_fll_band_edge_cc_sptr digital_make_fll_band_edge_cc (float samps_per_sym,
+							     float rolloff,
+							     int filter_size,
+							     float bandwidth);
+
+/*!
+ * \class digital_fll_band_edge_cc
+ * \brief Frequency Lock Loop using band-edge filters
+ *
+ * \ingroup general
+ * \ingroup digital
+ *
+ * The frequency lock loop derives a band-edge filter that covers the
+ * upper and lower bandwidths of a digitally-modulated signal. The
+ * bandwidth range is determined by the excess bandwidth (e.g.,
+ * rolloff factor) of the modulated signal. The placement in frequency
+ * of the band-edges is determined by the oversampling ratio (number
+ * of samples per symbol) and the excess bandwidth.  The size of the
+ * filters should be fairly large so as to average over a number of
+ * symbols.
+ *
+ * The FLL works by filtering the upper and lower band edges into
+ * x_u(t) and x_l(t), respectively.  These are combined to form cc(t)
+ * = x_u(t) + x_l(t) and ss(t) = x_u(t) - x_l(t). Combining these to
+ * form the signal e(t) = Re{cc(t) \\times ss(t)^*} (where ^* is the
+ * complex conjugate) provides an error signal at the DC term that is
+ * directly proportional to the carrier frequency.  We then make a
+ * second-order loop using the error signal that is the running
+ * average of e(t).
+ *
+ * In practice, the above equation can be simplified by just comparing
+ * the absolute value squared of the output of both filters:
+ * abs(x_l(t))^2 - abs(x_u(t))^2 = norm(x_l(t)) - norm(x_u(t)).
+ *
+ * In theory, the band-edge filter is the derivative of the matched
+ * filter in frequency, (H_be(f) = \\frac{H(f)}{df}. In practice, this
+ * comes down to a quarter sine wave at the point of the matched
+ * filter's rolloff (if it's a raised-cosine, the derivative of a
+ * cosine is a sine).  Extend this sine by another quarter wave to
+ * make a half wave around the band-edges is equivalent in time to the
+ * sum of two sinc functions. The baseband filter fot the band edges
+ * is therefore derived from this sum of sincs. The band edge filters
+ * are then just the baseband signal modulated to the correct place in
+ * frequency. All of these calculations are done in the
+ * 'design_filter' function.
+ *
+ * Note: We use FIR filters here because the filters have to have a
+ * flat phase response over the entire frequency range to allow their
+ * comparisons to be valid.
+ *
+ * It is very important that the band edge filters be the derivatives
+ * of the pulse shaping filter, and that they be linear
+ * phase. Otherwise, the variance of the error will be very large.
+ *
+ */
+
+class DIGITAL_API digital_fll_band_edge_cc : public gr_sync_block, public gri_control_loop
+{
+ private:
+  /*!
+   * Build the FLL
+   * \param samps_per_sym    (float) Number of samples per symbol of signal
+   * \param rolloff          (float) Rolloff factor of signal
+   * \param filter_size      (int)   Size (in taps) of the filter
+   * \param bandwidth        (float) Loop bandwidth
+   */
+  friend DIGITAL_API digital_fll_band_edge_cc_sptr digital_make_fll_band_edge_cc (float samps_per_sym,
+								      float rolloff,
+								      int filter_size,
+								      float bandwidth);
+
+  float                   d_sps;
+  float                   d_rolloff;
+  int                     d_filter_size;
+
+  std::vector<gr_complex> d_taps_lower;
+  std::vector<gr_complex> d_taps_upper;
+  bool			  d_updated;
+
+  /*!
+   * Build the FLL
+   * \param samps_per_sym (float) number of samples per symbol
+   * \param rolloff (float) Rolloff (excess bandwidth) of signal filter
+   * \param filter_size (int) number of filter taps to generate
+   * \param bandwidth (float) Loop bandwidth
+   */
+  digital_fll_band_edge_cc(float samps_per_sym, float rolloff,
+			   int filter_size, float bandwidth);
+  
+  /*!
+   * Design the band-edge filter based on the number of samples per symbol,
+   * filter rolloff factor, and the filter size
+   *
+   * \param samps_per_sym    (float) Number of samples per symbol of signal
+   * \param rolloff          (float) Rolloff factor of signal
+   * \param filter_size      (int)   Size (in taps) of the filter
+   */
+  void design_filter(float samps_per_sym, float rolloff, int filter_size);
+
+public:
+  ~digital_fll_band_edge_cc ();
+
+  /*******************************************************************
+    SET FUNCTIONS
+  *******************************************************************/
+  
+  /*!
+   * \brief Set the number of samples per symbol
+   *
+   * Set's the number of samples per symbol the system should
+   * use. This value is uesd to calculate the filter taps and will
+   * force a recalculation.
+   *
+   * \param sps    (float) new samples per symbol
+   *
+   */
+  void set_samples_per_symbol(float sps);
+
+  /*!
+   * \brief Set the rolloff factor of the shaping filter
+   *
+   * This sets the rolloff factor that is used in the pulse shaping
+   * filter and is used to calculate the filter taps. Changing this
+   * will force a recalculation of the filter taps.
+   *
+   * This should be the same value that is used in the transmitter's
+   * pulse shaping filter. It must be between 0 and 1 and is usually
+   * between 0.2 and 0.5 (where 0.22 and 0.35 are commonly used
+   * values).
+   *
+   * \param rolloff    (float) new shaping filter rolloff factor [0,1]
+   *
+   */
+  void set_rolloff(float rolloff);
+
+  /*!
+   * \brief Set the number of taps in the filter
+   *
+   * This sets the number of taps in the band-edge filters. Setting
+   * this will force a recalculation of the filter taps.
+   *
+   * This should be about the same number of taps used in the
+   * transmitter's shaping filter and also not very large. A large
+   * number of taps will result in a large delay between input and
+   * frequency estimation, and so will not be as accurate. Between 30
+   * and 70 taps is usual.
+   *
+   * \param filter_size    (float) number of taps in the filters
+   *
+   */
+  void set_filter_size(int filter_size);
+
+  /*******************************************************************
+    GET FUNCTIONS
+  *******************************************************************/
+
+  /*!
+   * \brief Returns the number of sampler per symbol used for the filter
+   */
+  float get_samples_per_symbol() const;
+
+  /*!
+   * \brief Returns the rolloff factor used for the filter
+   */
+  float get_rolloff() const;
+
+  /*!
+   * \brief Returns the number of taps of the filter
+   */
+  int get_filter_size() const;
+
+  /*!
+   * Print the taps to screen.
+   */
+  void print_taps();
+   
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
+};
+
+#endif
diff --git a/gr-digital/include/digital_gmskmod_bc.h b/gr-digital/include/digital_gmskmod_bc.h
new file mode 100644
index 000000000..9f378c8a7
--- /dev/null
+++ b/gr-digital/include/digital_gmskmod_bc.h
@@ -0,0 +1,63 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 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_DIGITAL_GMSKMOD_BC_H
+#define INCLUDED_DIGITAL_GMSKMOD_BC_H
+
+#include <digital_api.h>
+#include <digital_cpmmod_bc.h>
+
+class digital_gmskmod_bc;
+typedef boost::shared_ptr<digital_gmskmod_bc> digital_gmskmod_bc_sptr;
+
+
+DIGITAL_API digital_gmskmod_bc_sptr
+digital_make_gmskmod_bc(unsigned samples_per_sym=2,
+			double bt=0.3, unsigned L=4);
+
+/*!
+ * \brief GMSK modulator
+ *
+ * \ingroup modulation_blk
+ * \ingroup digital
+ *
+ * \param samples_per_sym Samples per symbol.
+ * \param bt The 3 dB time-bandwidth product.
+ * \param L The length of the phase duration in symbols. The Gaussian
+ *          pulse is truncated after L symbols.
+ *
+ * The input of this block are symbols from an M-ary alphabet
+ * +/-1, +/-3, ..., +/-(M-1). Usually, M = 2 and therefore, the
+ * valid inputs are +/-1.
+ * The modulator will silently accept any other inputs, though.
+ * The output is the phase-modulated signal.
+ */
+class DIGITAL_API digital_gmskmod_bc : public digital_cpmmod_bc
+{
+  friend DIGITAL_API digital_gmskmod_bc_sptr digital_make_gmskmod_bc(unsigned samples_per_sym,
+							 double bt, unsigned L);
+  digital_gmskmod_bc(unsigned samples_per_sym,
+		     double bt, unsigned L);
+};
+
+#endif /* INCLUDED_DIGITAL_GMSKMOD_BC_H */
+
diff --git a/gr-digital/include/digital_kurtotic_equalizer_cc.h b/gr-digital/include/digital_kurtotic_equalizer_cc.h
new file mode 100644
index 000000000..3ac8712d5
--- /dev/null
+++ b/gr-digital/include/digital_kurtotic_equalizer_cc.h
@@ -0,0 +1,113 @@
+/* -*- c++ -*- */
+/*
+ * 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_DIGITAL_KURTOTIC_EQUALIZER_CC_H
+#define	INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H
+
+#include <digital_api.h>
+#include <gr_adaptive_fir_ccc.h>
+#include <gr_math.h>
+#include <iostream>
+
+class digital_kurtotic_equalizer_cc;
+typedef boost::shared_ptr<digital_kurtotic_equalizer_cc> digital_kurtotic_equalizer_cc_sptr;
+
+DIGITAL_API digital_kurtotic_equalizer_cc_sptr 
+digital_make_kurtotic_equalizer_cc(int num_taps, float mu);
+
+/*!
+ * \brief Implements a kurtosis-based adaptive equalizer on complex stream
+ * \ingroup eq_blk
+ * \ingroup digital
+ *
+ * Y. Guo, J. Zhao, Y. Sun, "Sign kurtosis maximization based blind
+ * equalization algorithm," IEEE Conf. on Control, Automation,
+ * Robotics and Vision, Vol. 3, Dec. 2004, pp. 2052 - 2057.
+ */
+class DIGITAL_API digital_kurtotic_equalizer_cc : public gr_adaptive_fir_ccc
+{
+private:
+  float d_mu;
+  float d_p, d_m;
+  gr_complex d_q, d_u;
+  float d_alpha_p, d_alpha_q, d_alpha_m;
+  
+  friend DIGITAL_API digital_kurtotic_equalizer_cc_sptr digital_make_kurtotic_equalizer_cc(int num_taps,
+									       float mu);
+  digital_kurtotic_equalizer_cc(int num_taps, float mu);
+
+  gr_complex sign(gr_complex x)
+  {
+    float re = (float)(x.real() >= 0.0f);
+    float im = (float)(x.imag() >= 0.0f);
+    return gr_complex(re, im);
+  }
+
+protected:
+
+  virtual gr_complex error(const gr_complex &out) 
+  {
+
+    // p = E[|z|^2]
+    // q = E[z^2]
+    // m = E[|z|^4]
+    // u = E[kurtosis(z)]
+
+    float nrm = norm(out);
+    gr_complex cnj = conj(out);
+    float epsilon_f = 1e-12;
+    gr_complex epsilon_c = gr_complex(1e-12, 1e-12);
+
+    
+    d_p = (1-d_alpha_p)*d_p + (d_alpha_p)*nrm + epsilon_f;
+    d_q = (1-d_alpha_q)*d_q + (d_alpha_q)*out*out + epsilon_c;
+    d_m = (1-d_alpha_m)*d_m + (d_alpha_m)*nrm*nrm + epsilon_f;
+    d_u = d_m - 2.0f*(d_p*d_p) - d_q*d_q;
+
+    gr_complex F = (1.0f / (d_p*d_p*d_p)) *
+      (sign(d_u) * (nrm*cnj - 2.0f*d_p*cnj - conj(d_q)*out) -
+       abs(d_u)*cnj);
+
+    //std::cout << "out: " << out << "   p: " << d_p << "   q: " << d_q;
+    //std::cout << "   m: " << d_m << "   u: " << d_u << std::endl;
+    //std::cout << "error: " << F << std::endl;
+    
+    float re = gr_clip(F.real(), 1.0);
+    float im = gr_clip(F.imag(), 1.0);
+    return gr_complex(re, im);
+  }
+
+  virtual void update_tap(gr_complex &tap, const gr_complex &in) 
+  {
+    tap += d_mu*in*d_error;
+  }
+  
+public:
+  void set_gain(float mu) 
+  {
+    if(mu < 0)
+      throw std::out_of_range("digital_kurtotic_equalizer::set_gain: Gain value must be >= 0");
+    d_mu = mu;
+  }
+};
+
+#endif
diff --git a/gr-digital/include/digital_lms_dd_equalizer_cc.h b/gr-digital/include/digital_lms_dd_equalizer_cc.h
new file mode 100644
index 000000000..56871fa67
--- /dev/null
+++ b/gr-digital/include/digital_lms_dd_equalizer_cc.h
@@ -0,0 +1,118 @@
+/* -*- c++ -*- */
+/*
+ * 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_DIGITAL_LMS_DD_EQUALIZER_CC_H
+#define INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
+
+#include <digital_api.h>
+#include <gr_adaptive_fir_ccc.h>
+#include <digital_constellation.h>
+
+class digital_lms_dd_equalizer_cc;
+typedef boost::shared_ptr<digital_lms_dd_equalizer_cc> digital_lms_dd_equalizer_cc_sptr;
+
+DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
+								   float mu, int sps,
+								   digital_constellation_sptr cnst);
+								   
+/*!
+ * \brief Least-Mean-Square Decision Directed Equalizer (complex in/out)
+ * \ingroup eq_blk
+ * \ingroup digital
+ *
+ * This block implements an LMS-based decision-directed equalizer.
+ * It uses a set of weights, w, to correlate against the inputs, u,
+ * and a decisions is then made from this output. The error
+ * in the decision is used to update teh weight vector.
+ *
+ * y[n] = conj(w[n]) u[n]
+ * d[n] = decision(y[n])
+ * e[n] = d[n] - y[n]
+ * w[n+1] = w[n] + mu u[n] conj(e[n])
+ *
+ * Where mu is a gain value (between 0 and 1 and usualy small,
+ * around 0.001 - 0.01.
+ *
+ * This block uses the digital_constellation object for making
+ * the decision from y[n]. Create the constellation object for
+ * whatever constellation is to be used and pass in the object.
+ * In Python, you can use something like:
+ *    self.constellation = digital.constellation_qpsk()
+ * To create a QPSK constellation (see the digital_constellation
+ * block for more details as to what constellations are available
+ * or how to create your own). You then pass the object to this
+ * block as an sptr, or using "self.constellation.base()".
+ *
+ * The theory for this algorithm can be found in Chapter 9 of:
+ * S. Haykin, Adaptive Filter Theory, Upper Saddle River, NJ:
+ *    Prentice Hall, 1996.
+ *
+ */
+class DIGITAL_API digital_lms_dd_equalizer_cc : public gr_adaptive_fir_ccc
+{
+private:
+  friend DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
+									    float mu, int sps,
+									    digital_constellation_sptr cnst);
+  
+  float	d_mu;
+  std::vector<gr_complex>  d_taps;
+  digital_constellation_sptr d_cnst;
+
+  digital_lms_dd_equalizer_cc (int num_taps,
+			       float mu, int sps,
+			       digital_constellation_sptr cnst);
+
+protected:
+
+  virtual gr_complex error(const gr_complex &out) 
+  { 
+    gr_complex decision, error;
+    d_cnst->map_to_points(d_cnst->decision_maker(&out), &decision);
+    error = decision - out;
+    return error;
+  }
+
+  virtual void update_tap(gr_complex &tap, const gr_complex &in) 
+  {
+    tap += d_mu*conj(in)*d_error;
+  }
+
+public:
+  float get_gain()
+  {
+    return d_mu;
+  }
+  
+  void set_gain(float mu)
+  {
+    if(mu < 0.0f || mu > 1.0f) {
+      throw std::out_of_range("digital_lms_dd_equalizer::set_mu: Gain value must in [0, 1]");
+    }
+    else {
+      d_mu = mu;
+    }
+  }
+  
+};
+
+#endif
diff --git a/gr-trellis/src/lib/metric_type.h b/gr-digital/include/digital_metric_type.h
index a1040f108..83de166f0 100644
--- a/gr-trellis/src/lib/metric_type.h
+++ b/gr-digital/include/digital_metric_type.h
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_TRELLIS_METRIC_TYPE_H
-#define INCLUDED_TRELLIS_METRIC_TYPE_H
+#ifndef INCLUDED_DIGITAL_METRIC_TYPE_H
+#define INCLUDED_DIGITAL_METRIC_TYPE_H
 
 typedef enum {
   TRELLIS_EUCLIDEAN = 200, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
diff --git a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.h b/gr-digital/include/digital_mpsk_receiver_cc.h
index f17b68aa0..e70495bfa 100644
--- a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.h
+++ b/gr-digital/include/digital_mpsk_receiver_cc.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2007 Free Software Foundation, Inc.
+ * Copyright 2004,2007,2011 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -20,60 +20,70 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_MPSK_RECEIVER_CC_H
-#define	INCLUDED_GR_MPSK_RECEIVER_CC_H
+#ifndef INCLUDED_DIGITAL_MPSK_RECEIVER_CC_H
+#define	INCLUDED_DIGITAL_MPSK_RECEIVER_CC_H
 
+#include <digital_api.h>
 #include <gruel/attributes.h>
+#include <gri_control_loop.h>
 #include <gr_block.h>
 #include <gr_complex.h>
 #include <fstream>
 
 class gri_mmse_fir_interpolator_cc;
 
-class gr_mpsk_receiver_cc;
-typedef boost::shared_ptr<gr_mpsk_receiver_cc> gr_mpsk_receiver_cc_sptr;
+class digital_mpsk_receiver_cc;
+typedef boost::shared_ptr<digital_mpsk_receiver_cc> digital_mpsk_receiver_cc_sptr;
 
 // public constructor
-gr_mpsk_receiver_cc_sptr 
-gr_make_mpsk_receiver_cc (unsigned int M, float theta, 
-			  float alpha, float beta,
-			  float fmin, float fmax,
-			  float mu, float gain_mu, 
-			  float omega, float gain_omega, float omega_rel);
+DIGITAL_API digital_mpsk_receiver_cc_sptr 
+digital_make_mpsk_receiver_cc (unsigned int M, float theta, 
+			       float loop_bw,
+			       float fmin, float fmax,
+			       float mu, float gain_mu, 
+			       float omega, float gain_omega, float omega_rel);
 
 /*!
- * \brief This block takes care of receiving M-PSK modulated signals through phase, frequency, and symbol
- * synchronization. 
+ * \brief This block takes care of receiving M-PSK modulated signals
+ * through phase, frequency, and symbol synchronization.
  * \ingroup sync_blk
  * \ingroup demod_blk
+ * \ingroup digital
  *
- * This block takes care of receiving M-PSK modulated signals through phase, frequency, and symbol
- * synchronization. It performs carrier frequency and phase locking as well as symbol timing recovery. 
- * It works with (D)BPSK, (D)QPSK, and (D)8PSK as tested currently. It should also work for OQPSK and 
- * PI/4 DQPSK.
+ * This block takes care of receiving M-PSK modulated signals through
+ * phase, frequency, and symbol synchronization. It performs carrier
+ * frequency and phase locking as well as symbol timing recovery.  It
+ * works with (D)BPSK, (D)QPSK, and (D)8PSK as tested currently. It
+ * should also work for OQPSK and PI/4 DQPSK.
  *
- * The phase and frequency synchronization are based on a Costas loop that finds the error of the incoming
- * signal point compared to its nearest constellation point. The frequency and phase of the NCO are 
- * updated according to this error. There are optimized phase error detectors for BPSK and QPSK, but 8PSK
- * is done using a brute-force computation of the constellation points to find the minimum.
+ * The phase and frequency synchronization are based on a Costas loop
+ * that finds the error of the incoming signal point compared to its
+ * nearest constellation point. The frequency and phase of the NCO are
+ * updated according to this error. There are optimized phase error
+ * detectors for BPSK and QPSK, but 8PSK is done using a brute-force
+ * computation of the constellation points to find the minimum.
  *
- * The symbol synchronization is done using a modified Mueller and Muller circuit from the paper:
+ * The symbol synchronization is done using a modified Mueller and
+ * Muller circuit from the paper:
  * 
- *    G. R. Danesfahani, T.G. Jeans, "Optimisation of modified Mueller and Muller 
- *    algorithm,"  Electronics Letters, Vol. 31, no. 13,  22 June 1995, pp. 1032 - 1033.
+ *    G. R. Danesfahani, T.G. Jeans, "Optimisation of modified Mueller
+ *    and Muller algorithm," Electronics Letters, Vol. 31, no. 13, 22
+ *    June 1995, pp. 1032 - 1033.
  *
- * This circuit interpolates the downconverted sample (using the NCO developed by the Costas loop)
- * every mu samples, then it finds the sampling error based on this and the past symbols and the decision
- * made on the samples. Like the phase error detector, there are optimized decision algorithms for BPSK
- * and QPKS, but 8PSK uses another brute force computation against all possible symbols. The modifications
- * to the M&M used here reduce self-noise.
+ * This circuit interpolates the downconverted sample (using the NCO
+ * developed by the Costas loop) every mu samples, then it finds the
+ * sampling error based on this and the past symbols and the decision
+ * made on the samples. Like the phase error detector, there are
+ * optimized decision algorithms for BPSK and QPKS, but 8PSK uses
+ * another brute force computation against all possible symbols. The
+ * modifications to the M&M used here reduce self-noise.
  *
  */
 
-class gr_mpsk_receiver_cc : public gr_block
+class DIGITAL_API digital_mpsk_receiver_cc : public gr_block, public gri_control_loop
 {
  public:
-  ~gr_mpsk_receiver_cc ();
+  ~digital_mpsk_receiver_cc ();
   void forecast(int noutput_items, gr_vector_int &ninput_items_required);
   int general_work (int noutput_items,
 		    gr_vector_int &ninput_items,
@@ -111,43 +121,14 @@ class gr_mpsk_receiver_cc : public gr_block
   //! (M&M) Sets value for omega gain factor
   void set_gain_omega (float gain_omega) { d_gain_omega = gain_omega; }
 
-
-
-  // Member function related to the phase/frequency tracking portion of the receiver
-  //! (CL) Returns the value for alpha (the phase gain term)
-  float alpha() const { return d_alpha; }
-  
-  //! (CL) Returns the value of beta (the frequency gain term)
-  float beta() const { return d_beta; }
-
-  //! (CL) Returns the current value of the frequency of the NCO in the Costas loop
-  float freq() const { return d_freq; }
-
-  //! (CL) Returns the current value of the phase of the NCO in the Costal loop
-  float phase() const { return d_phase; }
-
-  //! (CL) Sets the value for alpha (the phase gain term)
-  void set_alpha(float alpha) { d_alpha = alpha; }
-  
-  //! (CL) Setss the value of beta (the frequency gain term)
-  void set_beta(float beta) { d_beta = beta; }
-
-  //! (CL) Sets the current value of the frequency of the NCO in the Costas loop
-  void set_freq(float freq) { d_freq = freq; }
-
-  //! (CL) Setss the current value of the phase of the NCO in the Costal loop
-  void set_phase(float phase) { d_phase = phase; }
-
-
 protected:
-
- /*!
+  
+  /*!
    * \brief Constructor to synchronize incoming M-PSK symbols
    *
    * \param M	        modulation order of the M-PSK modulation
    * \param theta	any constant phase rotation from the real axis of the constellation
-   * \param alpha	gain parameter to adjust the phase in the Costas loop (~0.01)
-   * \param beta        gain parameter to adjust the frequency in the Costas loop (~alpha^2/4)	
+   * \param loop_bw	Loop bandwidth to set gains of phase/freq tracking loop
    * \param fmin        minimum normalized frequency value the loop can achieve
    * \param fmax        maximum normalized frequency value the loop can achieve
    * \param mu          initial parameter for the interpolator [0,1]
@@ -159,11 +140,11 @@ protected:
    * The constructor also chooses which phase detector and decision maker to use in the work loop based on the
    * value of M.
    */
-  gr_mpsk_receiver_cc (unsigned int M, float theta, 
-		       float alpha, float beta,
-		       float fmin, float fmax,
-		       float mu, float gain_mu, 
-		       float omega, float gain_omega, float omega_rel);
+  digital_mpsk_receiver_cc (unsigned int M, float theta, 
+			    float loop_bw,
+			    float fmin, float fmax,
+			    float mu, float gain_mu, 
+			    float omega, float gain_omega, float omega_rel);
 
   void make_constellation();
   void mm_sampler(const gr_complex symbol);
@@ -171,54 +152,61 @@ protected:
   void phase_error_tracking(gr_complex sample);
 
 
-/*!
+  /*!
    * \brief Phase error detector for MPSK modulations.
    *
    * \param sample   the I&Q sample from which to determine the phase error
    *
-   * This function determines the phase error for any MPSK signal by creating a set of PSK constellation points
-   * and doing a brute-force search to see which point minimizes the Euclidean distance. This point is then used
-   * to derotate the sample to the real-axis and a atan (using the fast approximation function) to determine the
-   * phase difference between the incoming sample and the real constellation point
+   * This function determines the phase error for any MPSK signal by
+   * creating a set of PSK constellation points and doing a
+   * brute-force search to see which point minimizes the Euclidean
+   * distance. This point is then used to derotate the sample to the
+   * real-axis and a atan (using the fast approximation function) to
+   * determine the phase difference between the incoming sample and
+   * the real constellation point
    *
    * This should be cleaned up and made more efficient.
    *
    * \returns the approximated phase error.
- */
+   */
   float phase_error_detector_generic(gr_complex sample) const; // generic for M but more costly
 
- /*!
+  /*!
    * \brief Phase error detector for BPSK modulation.
    *
    * \param sample   the I&Q sample from which to determine the phase error
    *
-   * This function determines the phase error using a simple BPSK phase error detector by multiplying the real
-   * and imaginary (the error signal) components together. As the imaginary part goes to 0, so does this error.
+   * This function determines the phase error using a simple BPSK
+   * phase error detector by multiplying the real and imaginary (the
+   * error signal) components together. As the imaginary part goes to
+   * 0, so does this error.
    *
    * \returns the approximated phase error.
- */
+   */
   float phase_error_detector_bpsk(gr_complex sample) const;    // optimized for BPSK
 
- /*!
+  /*!
    * \brief Phase error detector for QPSK modulation.
    *
    * \param sample   the I&Q sample from which to determine the phase error
    *
-   * This function determines the phase error using the limiter approach in a standard 4th order Costas loop
+   * This function determines the phase error using the limiter
+   * approach in a standard 4th order Costas loop
    *
    * \returns the approximated phase error.
- */
+   */
   float phase_error_detector_qpsk(gr_complex sample) const;
 
 
 
- /*!
+  /*!
    * \brief Decision maker for a generic MPSK constellation.
    *
    * \param sample   the baseband I&Q sample from which to make the decision
    *
-   * This decision maker is a generic implementation that does a brute-force search 
-   * for the constellation point that minimizes the error between it and the incoming signal.
+   * This decision maker is a generic implementation that does a
+   * brute-force search for the constellation point that minimizes the
+   * error between it and the incoming signal.
    *
    * \returns the index to d_constellation that minimizes the error/
  */
@@ -230,47 +218,45 @@ protected:
    *
    * \param sample   the baseband I&Q sample from which to make the decision
    *
-   * This decision maker is a simple slicer function that makes a decision on the symbol based on its
-   * placement on the real axis of greater than 0 or less than 0; the quadrature component is always 0.
+   * This decision maker is a simple slicer function that makes a
+   * decision on the symbol based on its placement on the real axis of
+   * greater than 0 or less than 0; the quadrature component is always
+   * 0.
    *
    * \returns the index to d_constellation that minimizes the error/
- */
+   */
   unsigned int decision_bpsk(gr_complex sample) const;
   
 
- /*!
+  /*!
    * \brief Decision maker for QPSK constellation.
    *
    * \param sample   the baseband I&Q sample from which to make the decision
    *
-   * This decision maker is a simple slicer function that makes a decision on the symbol based on its
-   * placement versus both axes and returns which quadrant the symbol is in.
+   * This decision maker is a simple slicer function that makes a
+   * decision on the symbol based on its placement versus both axes
+   * and returns which quadrant the symbol is in.
    *
    * \returns the index to d_constellation that minimizes the error/
- */
+   */
   unsigned int decision_qpsk(gr_complex sample) const;
 
-  private:
+private:
   unsigned int d_M;
   float        d_theta;
 
-  // Members related to carrier and phase tracking
-  float d_alpha;
-  float d_beta;
-  float d_freq, d_max_freq, d_min_freq;
-  float d_phase;
-
-/*!
+  /*!
    * \brief Decision maker function pointer 
    *
    * \param sample   the baseband I&Q sample from which to make the decision
    *
-   * This is a function pointer that is set in the constructor to point to the proper decision function
-   * for the specified constellation order.
+   * This is a function pointer that is set in the constructor to
+   * point to the proper decision function for the specified
+   * constellation order.
    *
    * \return index into d_constellation point that is the closest to the recieved sample
- */
-  unsigned int (gr_mpsk_receiver_cc::*d_decision)(gr_complex sample) const; // pointer to decision function
+   */
+  unsigned int (digital_mpsk_receiver_cc::*d_decision)(gr_complex sample) const; // pointer to decision function
 
 
   std::vector<gr_complex> d_constellation;
@@ -282,15 +268,16 @@ protected:
   gr_complex d_p_2T, d_p_1T, d_p_0T;
   gr_complex d_c_2T, d_c_1T, d_c_0T;
 
- /*!
+  /*!
    * \brief Phase error detector function pointer 
    *
    * \param sample   the I&Q sample from which to determine the phase error
    *
-   * This is a function pointer that is set in the constructor to point to the proper phase error detector
-   * function for the specified constellation order.
- */
-  float (gr_mpsk_receiver_cc::*d_phase_error_detector)(gr_complex sample) const;
+   * This is a function pointer that is set in the constructor to
+   * point to the proper phase error detector function for the
+   * specified constellation order.
+   */
+  float (digital_mpsk_receiver_cc::*d_phase_error_detector)(gr_complex sample) const;
 
 
   //! get interpolated value
@@ -305,12 +292,12 @@ protected:
   //! index to delay line
   unsigned int d_dl_idx;
 
-  friend gr_mpsk_receiver_cc_sptr
-  gr_make_mpsk_receiver_cc (unsigned int M, float theta,
-			    float alpha, float beta,
-			    float fmin, float fmax,
-			    float mu, float gain_mu, 
-			    float omega, float gain_omega, float omega_rel);
+  friend DIGITAL_API digital_mpsk_receiver_cc_sptr
+  digital_make_mpsk_receiver_cc (unsigned int M, float theta,
+				 float loop_bw,
+				 float fmin, float fmax,
+				 float mu, float gain_mu, 
+				 float omega, float gain_omega, float omega_rel);
 };
 
 #endif
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_cyclic_prefixer.h b/gr-digital/include/digital_ofdm_cyclic_prefixer.h
index eab91cd11..1b9682bb3 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_cyclic_prefixer.h
+++ b/gr-digital/include/digital_ofdm_cyclic_prefixer.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2005,2006 Free Software Foundation, Inc.
+ * Copyright 2004-2006,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,17 +20,18 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_OFDM_CYCLIC_PREFIXER_H
-#define INCLUDED_GR_OFDM_CYCLIC_PREFIXER_H
+#ifndef INCLUDED_DIGITAL_OFDM_CYCLIC_PREFIXER_H
+#define INCLUDED_DIGITAL_OFDM_CYCLIC_PREFIXER_H
 
+#include <digital_api.h>
 #include <gr_sync_interpolator.h>
 #include <stdio.h>
 
-class gr_ofdm_cyclic_prefixer;
-typedef boost::shared_ptr<gr_ofdm_cyclic_prefixer> gr_ofdm_cyclic_prefixer_sptr;
+class digital_ofdm_cyclic_prefixer;
+typedef boost::shared_ptr<digital_ofdm_cyclic_prefixer> digital_ofdm_cyclic_prefixer_sptr;
 
-gr_ofdm_cyclic_prefixer_sptr 
-gr_make_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
+DIGITAL_API digital_ofdm_cyclic_prefixer_sptr 
+digital_make_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
 
 
 /*!
@@ -38,13 +39,13 @@ gr_make_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
  * symbol(vector) and converts vector to a stream output_size long.
  * \ingroup ofdm_blk
  */
-class gr_ofdm_cyclic_prefixer : public gr_sync_interpolator
+class DIGITAL_API digital_ofdm_cyclic_prefixer : public gr_sync_interpolator
 {
-  friend gr_ofdm_cyclic_prefixer_sptr
-    gr_make_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
+  friend DIGITAL_API digital_ofdm_cyclic_prefixer_sptr
+    digital_make_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
 
  protected:
-  gr_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
+  digital_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
 
  public:
   int work (int noutput_items,
@@ -55,4 +56,4 @@ class gr_ofdm_cyclic_prefixer : public gr_sync_interpolator
   size_t d_output_size;
 };
 
-#endif /* INCLUDED_GR_OFDM_CYCLIC_PREFIXER_H */
+#endif /* INCLUDED_DIGITAL_OFDM_CYCLIC_PREFIXER_H */
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.h b/gr-digital/include/digital_ofdm_frame_acquisition.h
index 5db8dbb7f..9c2f60233 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.h
+++ b/gr-digital/include/digital_ofdm_frame_acquisition.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006, 2007 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,18 +20,18 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_OFDM_FRAME_ACQUISITION_H
-#define INCLUDED_GR_OFDM_FRAME_ACQUISITION_H
-
+#ifndef INCLUDED_DIGITAL_OFDM_FRAME_ACQUISITION_H
+#define INCLUDED_DIGITAL_OFDM_FRAME_ACQUISITION_H
 
+#include <digital_api.h>
 #include <gr_block.h>
 #include <vector>
 
-class gr_ofdm_frame_acquisition;
-typedef boost::shared_ptr<gr_ofdm_frame_acquisition> gr_ofdm_frame_acquisition_sptr;
+class digital_ofdm_frame_acquisition;
+typedef boost::shared_ptr<digital_ofdm_frame_acquisition> digital_ofdm_frame_acquisition_sptr;
 
-gr_ofdm_frame_acquisition_sptr 
-gr_make_ofdm_frame_acquisition (unsigned int occupied_carriers, unsigned int fft_length,
+digital_ofdm_frame_acquisition_sptr 
+DIGITAL_API digital_make_ofdm_frame_acquisition (unsigned int occupied_carriers, unsigned int fft_length,
 				unsigned int cplen,
 				const std::vector<gr_complex> &known_symbol, 
 				unsigned int max_fft_shift_len=10);
@@ -54,7 +54,7 @@ gr_make_ofdm_frame_acquisition (unsigned int occupied_carriers, unsigned int fft
  * distortion caused by the channel.
  */
 
-class gr_ofdm_frame_acquisition : public gr_block
+class DIGITAL_API digital_ofdm_frame_acquisition : public gr_block
 {
   /*! 
    * \brief Build an OFDM correlator and equalizer.
@@ -65,14 +65,14 @@ class gr_ofdm_frame_acquisition : public gr_block
    *                            start of a frame (usually a BPSK PN sequence)
    * \param max_fft_shift_len   Set's the maximum distance you can look between bins for correlation
    */
-  friend gr_ofdm_frame_acquisition_sptr
-  gr_make_ofdm_frame_acquisition (unsigned int occupied_carriers, unsigned int fft_length,
+  friend DIGITAL_API digital_ofdm_frame_acquisition_sptr
+  digital_make_ofdm_frame_acquisition (unsigned int occupied_carriers, unsigned int fft_length,
 				  unsigned int cplen,
 				  const std::vector<gr_complex> &known_symbol, 
 				  unsigned int max_fft_shift_len);
   
 protected:
-  gr_ofdm_frame_acquisition (unsigned int occupied_carriers, unsigned int fft_length,
+  digital_ofdm_frame_acquisition (unsigned int occupied_carriers, unsigned int fft_length,
 			     unsigned int cplen,
 			     const std::vector<gr_complex> &known_symbol, 
 			     unsigned int max_fft_shift_len);
@@ -105,7 +105,7 @@ protected:
    */
   float snr() { return d_snr_est; }
 
-  ~gr_ofdm_frame_acquisition(void);
+  ~digital_ofdm_frame_acquisition(void);
   int general_work(int noutput_items,
 		   gr_vector_int &ninput_items,
 		   gr_vector_const_void_star &input_items,
diff --git a/gr-digital/include/digital_ofdm_frame_sink.h b/gr-digital/include/digital_ofdm_frame_sink.h
new file mode 100644
index 000000000..5785d4be7
--- /dev/null
+++ b/gr-digital/include/digital_ofdm_frame_sink.h
@@ -0,0 +1,127 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,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_DIGITAL_OFDM_FRAME_SINK_H
+#define INCLUDED_DIGITAL_OFDM_FRAME_SINK_H
+
+#include <digital_api.h>
+#include <gr_sync_block.h>
+#include <gr_msg_queue.h>
+
+class digital_ofdm_frame_sink;
+typedef boost::shared_ptr<digital_ofdm_frame_sink> digital_ofdm_frame_sink_sptr;
+
+DIGITAL_API digital_ofdm_frame_sink_sptr 
+digital_make_ofdm_frame_sink (const std::vector<gr_complex> &sym_position, 
+			      const std::vector<unsigned char> &sym_value_out,
+			      gr_msg_queue_sptr target_queue, unsigned int occupied_tones,
+			      float phase_gain=0.25, float freq_gain=0.25*0.25/4.0);
+
+/*!
+ * \brief Takes an OFDM symbol in, demaps it into bits of 0's and 1's, packs
+ * them into packets, and sends to to a message queue sink.
+ * \ingroup sink_blk
+ * \ingroup ofdm_blk
+ *
+ * NOTE: The mod input parameter simply chooses a pre-defined demapper/slicer. Eventually,
+ * we want to be able to pass in a reference to an object to do the demapping and slicing
+ * for a given modulation type.
+ */
+class DIGITAL_API digital_ofdm_frame_sink : public gr_sync_block
+{
+  friend DIGITAL_API digital_ofdm_frame_sink_sptr 
+  digital_make_ofdm_frame_sink (const std::vector<gr_complex> &sym_position, 
+				const std::vector<unsigned char> &sym_value_out,
+				gr_msg_queue_sptr target_queue, unsigned int occupied_tones,
+				float phase_gain, float freq_gain);
+
+ private:
+  enum state_t {STATE_SYNC_SEARCH, STATE_HAVE_SYNC, STATE_HAVE_HEADER};
+
+  static const int MAX_PKT_LEN    = 4096;
+  static const int HEADERBYTELEN   = 4;
+
+  gr_msg_queue_sptr  d_target_queue;		// where to send the packet when received
+  state_t            d_state;
+  unsigned int       d_header;			// header bits
+  int		     d_headerbytelen_cnt;	// how many so far
+
+  unsigned char      *d_bytes_out;              // hold the current bytes produced by the demapper    
+
+  unsigned int       d_occupied_carriers;
+  unsigned int       d_byte_offset;
+  unsigned int       d_partial_byte;
+
+  unsigned char      d_packet[MAX_PKT_LEN];	// assembled payload
+  int 		     d_packetlen;		// length of packet
+  int                d_packet_whitener_offset;  // offset into whitener string to use
+  int		     d_packetlen_cnt;		// how many so far
+
+  gr_complex * d_derotated_output;  // Pointer to output stream to send deroated symbols out
+
+  std::vector<gr_complex>    d_sym_position;
+  std::vector<unsigned char> d_sym_value_out;
+  std::vector<gr_complex>    d_dfe;
+  unsigned int d_nbits;
+
+  unsigned char d_resid;
+  unsigned int d_nresid;
+  float d_phase;
+  float d_freq;
+  float d_phase_gain;
+  float d_freq_gain;
+  float d_eq_gain;
+
+  std::vector<int> d_subcarrier_map;
+
+ protected:
+  digital_ofdm_frame_sink(const std::vector<gr_complex> &sym_position, 
+			  const std::vector<unsigned char> &sym_value_out,
+			  gr_msg_queue_sptr target_queue, unsigned int occupied_tones,
+			  float phase_gain, float freq_gain);
+
+  void enter_search();
+  void enter_have_sync();
+  void enter_have_header();
+  
+  bool header_ok()
+  {
+    // confirm that two copies of header info are identical
+    return ((d_header >> 16) ^ (d_header & 0xffff)) == 0;
+  }
+  
+  unsigned char slicer(const gr_complex x);
+  unsigned int demapper(const gr_complex *in,
+			unsigned char *out);
+
+  bool set_sym_value_out(const std::vector<gr_complex> &sym_position, 
+			 const std::vector<unsigned char> &sym_value_out);
+
+ public:
+  ~digital_ofdm_frame_sink();
+
+  int work(int noutput_items,
+	   gr_vector_const_void_star &input_items,
+	   gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_GR_OFDM_FRAME_SINK_H */
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.h b/gr-digital/include/digital_ofdm_insert_preamble.h
index 57c1af013..6f9dae5d6 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.h
+++ b/gr-digital/include/digital_ofdm_insert_preamble.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -19,18 +19,19 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef INCLUDED_GR_OFDM_INSERT_PREAMBLE_H
-#define INCLUDED_GR_OFDM_INSERT_PREAMBLE_H
+#ifndef INCLUDED_DIGITAL_OFDM_INSERT_PREAMBLE_H
+#define INCLUDED_DIGITAL_OFDM_INSERT_PREAMBLE_H
 
+#include <digital_api.h>
 #include <gr_block.h>
 #include <vector>
 
-class gr_ofdm_insert_preamble;
-typedef boost::shared_ptr<gr_ofdm_insert_preamble> gr_ofdm_insert_preamble_sptr;
+class digital_ofdm_insert_preamble;
+typedef boost::shared_ptr<digital_ofdm_insert_preamble> digital_ofdm_insert_preamble_sptr;
 
-gr_ofdm_insert_preamble_sptr
-gr_make_ofdm_insert_preamble(int fft_length,
-			     const std::vector<std::vector<gr_complex> > &preamble);
+DIGITAL_API digital_ofdm_insert_preamble_sptr
+digital_make_ofdm_insert_preamble(int fft_length,
+				  const std::vector<std::vector<gr_complex> > &preamble);
 
 /*!
  * \brief insert "pre-modulated" preamble symbols before each payload.
@@ -62,15 +63,15 @@ gr_make_ofdm_insert_preamble(int fft_length,
  * \param preamble   vector of symbols that represent the pre-modulated preamble.
  */
 
-class gr_ofdm_insert_preamble : public gr_block
+class DIGITAL_API digital_ofdm_insert_preamble : public gr_block
 {
-  friend gr_ofdm_insert_preamble_sptr
-  gr_make_ofdm_insert_preamble(int fft_length,
-			       const std::vector<std::vector<gr_complex> > &preamble);
+  friend DIGITAL_API digital_ofdm_insert_preamble_sptr
+  digital_make_ofdm_insert_preamble(int fft_length,
+				    const std::vector<std::vector<gr_complex> > &preamble);
 
 protected:
-  gr_ofdm_insert_preamble(int fft_length,
-			  const std::vector<std::vector<gr_complex> > &preamble);
+  digital_ofdm_insert_preamble(int fft_length,
+			       const std::vector<std::vector<gr_complex> > &preamble);
 
 private:
   enum state_t {
@@ -93,7 +94,7 @@ private:
   
 
 public:
-  ~gr_ofdm_insert_preamble();
+  ~digital_ofdm_insert_preamble();
 
   int general_work (int noutput_items,
 		    gr_vector_int &ninput_items,
@@ -101,4 +102,4 @@ public:
 		    gr_vector_void_star &output_items);
 };
 
-#endif /* INCLUDED_GR_OFDM_INSERT_PREAMBLE_H */
+#endif /* INCLUDED_DIGITAL_OFDM_INSERT_PREAMBLE_H */
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.h b/gr-digital/include/digital_ofdm_mapper_bcv.h
index 5a21b90af..daed1eab2 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.h
+++ b/gr-digital/include/digital_ofdm_mapper_bcv.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2007 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,19 +20,20 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_OFDM_MAPPER_BCV_H
-#define INCLUDED_GR_OFDM_MAPPER_BCV_H
+#ifndef INCLUDED_DIGITAL_OFDM_MAPPER_BCV_H
+#define INCLUDED_DIGITAL_OFDM_MAPPER_BCV_H
 
+#include <digital_api.h>
 #include <gr_sync_block.h>
 #include <gr_message.h>
 #include <gr_msg_queue.h>
 
-class gr_ofdm_mapper_bcv;
-typedef boost::shared_ptr<gr_ofdm_mapper_bcv> gr_ofdm_mapper_bcv_sptr;
+class digital_ofdm_mapper_bcv;
+typedef boost::shared_ptr<digital_ofdm_mapper_bcv> digital_ofdm_mapper_bcv_sptr;
 
-gr_ofdm_mapper_bcv_sptr 
-gr_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned msgq_limit, 
-			 unsigned occupied_carriers, unsigned int fft_length);
+DIGITAL_API digital_ofdm_mapper_bcv_sptr 
+digital_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned msgq_limit, 
+			      unsigned occupied_carriers, unsigned int fft_length);
 
 /*!
  * \brief take a stream of bytes in and map to a vector of complex
@@ -42,14 +43,14 @@ gr_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned
  * \ingroup ofdm_blk
  */
 
-class gr_ofdm_mapper_bcv : public gr_sync_block
+class DIGITAL_API digital_ofdm_mapper_bcv : public gr_sync_block
 {
-  friend gr_ofdm_mapper_bcv_sptr
-  gr_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned msgq_limit, 
+  friend DIGITAL_API digital_ofdm_mapper_bcv_sptr
+  digital_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned msgq_limit, 
+				unsigned occupied_carriers, unsigned int fft_length);
+protected:
+  digital_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned msgq_limit, 
 			   unsigned occupied_carriers, unsigned int fft_length);
- protected:
-  gr_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned msgq_limit, 
-		      unsigned occupied_carriers, unsigned int fft_length);
 
  private:
   std::vector<gr_complex> d_constellation;
@@ -74,7 +75,7 @@ class gr_ofdm_mapper_bcv : public gr_sync_block
   int randsym();
 
  public:
-  ~gr_ofdm_mapper_bcv(void);
+  ~digital_ofdm_mapper_bcv(void);
 
   gr_msg_queue_sptr	msgq() const { return d_msgq; }
 
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_sampler.h b/gr-digital/include/digital_ofdm_sampler.h
index d059636ed..9c54e4e77 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_sampler.h
+++ b/gr-digital/include/digital_ofdm_sampler.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,31 +20,32 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_OFDM_SAMPLER_H
-#define INCLUDED_GR_OFDM_SAMPLER_H
+#ifndef INCLUDED_DIGITAL_OFDM_SAMPLER_H
+#define INCLUDED_DIGITAL_OFDM_SAMPLER_H
 
+#include <digital_api.h>
 #include <gr_sync_block.h>
 
-class gr_ofdm_sampler;
-typedef boost::shared_ptr<gr_ofdm_sampler> gr_ofdm_sampler_sptr;
+class digital_ofdm_sampler;
+typedef boost::shared_ptr<digital_ofdm_sampler> digital_ofdm_sampler_sptr;
 
-gr_ofdm_sampler_sptr gr_make_ofdm_sampler (unsigned int fft_length, 
-					   unsigned int symbol_length,
-					   unsigned int timeout=1000);
+DIGITAL_API digital_ofdm_sampler_sptr digital_make_ofdm_sampler (unsigned int fft_length, 
+						     unsigned int symbol_length,
+						     unsigned int timeout=1000);
 
 /*!
  * \brief does the rest of the OFDM stuff
  * \ingroup ofdm_blk
  */
-class gr_ofdm_sampler : public gr_block
+class DIGITAL_API digital_ofdm_sampler : public gr_block
 {
-  friend gr_ofdm_sampler_sptr gr_make_ofdm_sampler (unsigned int fft_length, 
-						    unsigned int symbol_length,
-						    unsigned int timeout);
+  friend DIGITAL_API digital_ofdm_sampler_sptr digital_make_ofdm_sampler (unsigned int fft_length, 
+							      unsigned int symbol_length,
+							      unsigned int timeout);
 
-  gr_ofdm_sampler (unsigned int fft_length, 
-		   unsigned int symbol_length,
-		   unsigned int timeout);
+  digital_ofdm_sampler (unsigned int fft_length, 
+			unsigned int symbol_length,
+			unsigned int timeout);
 
  private:
   enum state_t {STATE_NO_SIG, STATE_PREAMBLE, STATE_FRAME};
diff --git a/usrp2/host/lib/.gitignore b/gr-digital/lib/.gitignore
index 8f5500b33..1b6114c39 100644
--- a/usrp2/host/lib/.gitignore
+++ b/gr-digital/lib/.gitignore
@@ -2,4 +2,3 @@
 /.deps
 /Makefile
 /Makefile.in
-/usrp2_socket_opener
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
new file mode 100644
index 000000000..b90757111
--- /dev/null
+++ b/gr-digital/lib/CMakeLists.txt
@@ -0,0 +1,66 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_DIGITAL_INCLUDE_DIRS}
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gr_digital_sources
+    digital_binary_slicer_fb.cc
+    digital_clock_recovery_mm_cc.cc
+    digital_clock_recovery_mm_ff.cc
+    digital_constellation.cc
+    digital_constellation_receiver_cb.cc
+    digital_constellation_decoder_cb.cc
+    digital_correlate_access_code_bb.cc
+    digital_costas_loop_cc.cc
+    digital_cma_equalizer_cc.cc
+    digital_crc32.cc
+    digital_fll_band_edge_cc.cc
+    digital_lms_dd_equalizer_cc.cc
+    digital_kurtotic_equalizer_cc.cc
+    digital_mpsk_receiver_cc.cc
+    digital_ofdm_cyclic_prefixer.cc
+    digital_ofdm_frame_acquisition.cc
+    digital_ofdm_frame_sink.cc
+    digital_ofdm_insert_preamble.cc
+    digital_ofdm_mapper_bcv.cc
+    digital_ofdm_sampler.cc
+    digital_gmskmod_bc.cc
+    digital_cpmmod_bc.cc
+)
+
+list(APPEND digital_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+)
+
+add_library(gnuradio-digital SHARED ${gr_digital_sources})
+target_link_libraries(gnuradio-digital ${digital_libs})
+GR_LIBRARY_FOO(gnuradio-digital RUNTIME_COMPONENT "digital_runtime" DEVEL_COMPONENT "digital_devel")
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am
new file mode 100644
index 000000000..2860974ca
--- /dev/null
+++ b/gr-digital/lib/Makefile.am
@@ -0,0 +1,56 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
+	$(GR_DIGITAL_INCLUDES) $(WITH_INCLUDES)
+
+lib_LTLIBRARIES = libgnuradio-digital.la
+
+libgnuradio_digital_la_SOURCES = 		\
+	digital_binary_slicer_fb.cc		\
+	digital_clock_recovery_mm_cc.cc		\
+	digital_clock_recovery_mm_ff.cc		\
+	digital_constellation.cc		\
+	digital_constellation_receiver_cb.cc	\
+	digital_constellation_decoder_cb.cc	\
+	digital_correlate_access_code_bb.cc	\
+	digital_costas_loop_cc.cc		\
+	digital_cma_equalizer_cc.cc		\
+	digital_crc32.cc			\
+	digital_fll_band_edge_cc.cc		\
+	digital_lms_dd_equalizer_cc.cc		\
+	digital_kurtotic_equalizer_cc.cc	\
+	digital_mpsk_receiver_cc.cc		\
+	digital_ofdm_cyclic_prefixer.cc		\
+	digital_ofdm_frame_acquisition.cc	\
+	digital_ofdm_frame_sink.cc		\
+	digital_ofdm_insert_preamble.cc		\
+	digital_ofdm_mapper_bcv.cc		\
+	digital_ofdm_sampler.cc			\
+	digital_gmskmod_bc.cc			\
+	digital_cpmmod_bc.cc
+
+libgnuradio_digital_la_LIBADD =	\
+	$(GNURADIO_CORE_LA)
+
+libgnuradio_digital_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
diff --git a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.cc b/gr-digital/lib/digital_binary_slicer_fb.cc
index ae8903abb..fcdb4291f 100644
--- a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.cc
+++ b/gr-digital/lib/digital_binary_slicer_fb.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2010 Free Software Foundation, Inc.
+ * Copyright 2006,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,40 +24,35 @@
 #include "config.h"
 #endif
 
-#include <gr_binary_slicer_fb.h>
+#include <digital_binary_slicer_fb.h>
 #include <gr_io_signature.h>
+#include <gr_math.h>
 #include <stdexcept>
 
-gr_binary_slicer_fb_sptr
-gr_make_binary_slicer_fb ()
+digital_binary_slicer_fb_sptr
+digital_make_binary_slicer_fb ()
 {
-  return gnuradio::get_initial_sptr(new gr_binary_slicer_fb ());
+  return gnuradio::get_initial_sptr(new digital_binary_slicer_fb ());
 }
 
-gr_binary_slicer_fb::gr_binary_slicer_fb ()
+digital_binary_slicer_fb::digital_binary_slicer_fb ()
   : gr_sync_block ("binary_slicer_fb",
 		   gr_make_io_signature (1, 1, sizeof (float)),
 		   gr_make_io_signature (1, 1, sizeof (unsigned char)))
 {
 }
 
-static inline int
-slice(float x)
-{
-  return x < 0 ? 0 : 1;
-}
-
 int
-gr_binary_slicer_fb::work (int noutput_items,
-			   gr_vector_const_void_star &input_items,
-			   gr_vector_void_star &output_items)
+digital_binary_slicer_fb::work (int noutput_items,
+				gr_vector_const_void_star &input_items,
+				gr_vector_void_star &output_items)
 {
   const float *in = (const float *) input_items[0];
   unsigned char *out = (unsigned char *) output_items[0];
 
 
   for (int i = 0; i < noutput_items; i++){
-    out[i] = slice(in[i]);
+    out[i] = gr_binary_slicer(in[i]);
   }
   
   return noutput_items;
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc b/gr-digital/lib/digital_clock_recovery_mm_cc.cc
index 7c20f7fd9..198eb4b89 100644
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
+++ b/gr-digital/lib/digital_clock_recovery_mm_cc.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005,2006,2010 Free Software Foundation, Inc.
+ * Copyright 2005,2006,2010,2011 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -26,7 +26,7 @@
 
 #include <gr_io_signature.h>
 #include <gr_prefs.h>
-#include <gr_clock_recovery_mm_cc.h>
+#include <digital_clock_recovery_mm_cc.h>
 #include <gri_mmse_fir_interpolator_cc.h>
 #include <stdexcept>
 #include <cstdio>
@@ -35,22 +35,24 @@
 // Public constructor
 static const int FUDGE = 16;
 
-gr_clock_recovery_mm_cc_sptr 
-gr_make_clock_recovery_mm_cc(float omega, float gain_omega, float mu, float gain_mu,
-			     float omega_relative_limit)
+digital_clock_recovery_mm_cc_sptr 
+digital_make_clock_recovery_mm_cc(float omega, float gain_omega,
+				  float mu, float gain_mu,
+				  float omega_relative_limit)
 {
-  return gnuradio::get_initial_sptr(new gr_clock_recovery_mm_cc (omega, 
-								    gain_omega, 
-								    mu,
-								    gain_mu,
-								    omega_relative_limit));
+  return gnuradio::get_initial_sptr(new digital_clock_recovery_mm_cc (omega, 
+								      gain_omega, 
+								      mu,
+								      gain_mu,
+								      omega_relative_limit));
 }
 
-gr_clock_recovery_mm_cc::gr_clock_recovery_mm_cc (float omega, float gain_omega, float mu, 
-						  float gain_mu, float omega_relative_limit)
+digital_clock_recovery_mm_cc::digital_clock_recovery_mm_cc (float omega, float gain_omega,
+							    float mu, float gain_mu,
+							    float omega_relative_limit)
   : gr_block ("clock_recovery_mm_cc",
 	      gr_make_io_signature (1, 1, sizeof (gr_complex)),
-	      gr_make_io_signature (1, 2, sizeof (gr_complex))),
+	      gr_make_io_signature2 (1, 2, sizeof (gr_complex), sizeof(float))),
     d_mu (mu), d_omega(omega), d_gain_omega(gain_omega), 
     d_omega_relative_limit(omega_relative_limit), 
     d_gain_mu(gain_mu), d_last_sample(0), d_interp(new gri_mmse_fir_interpolator_cc()),
@@ -67,13 +69,13 @@ gr_clock_recovery_mm_cc::gr_clock_recovery_mm_cc (float omega, float gain_omega,
   set_history(3);			// ensure 2 extra input sample is available
 }
 
-gr_clock_recovery_mm_cc::~gr_clock_recovery_mm_cc ()
+digital_clock_recovery_mm_cc::~digital_clock_recovery_mm_cc ()
 {
   delete d_interp;
 }
 
 void
-gr_clock_recovery_mm_cc::forecast(int noutput_items, gr_vector_int &ninput_items_required)
+digital_clock_recovery_mm_cc::forecast(int noutput_items, gr_vector_int &ninput_items_required)
 {
   unsigned ninputs = ninput_items_required.size();
   for (unsigned i=0; i < ninputs; i++)
@@ -82,7 +84,7 @@ gr_clock_recovery_mm_cc::forecast(int noutput_items, gr_vector_int &ninput_items
 }
 
 gr_complex
-gr_clock_recovery_mm_cc::slicer_0deg (gr_complex sample)
+digital_clock_recovery_mm_cc::slicer_0deg (gr_complex sample)
 {
   float real=0, imag=0;
 
@@ -94,7 +96,7 @@ gr_clock_recovery_mm_cc::slicer_0deg (gr_complex sample)
 }
 
 gr_complex
-gr_clock_recovery_mm_cc::slicer_45deg (gr_complex sample)
+digital_clock_recovery_mm_cc::slicer_45deg (gr_complex sample)
 {
   float real= -1, imag = -1;
   if(sample.real() > 0)
@@ -112,14 +114,14 @@ gr_clock_recovery_mm_cc::slicer_45deg (gr_complex sample)
 */
 
 int
-gr_clock_recovery_mm_cc::general_work (int noutput_items,
-				       gr_vector_int &ninput_items,
-				       gr_vector_const_void_star &input_items,
-				       gr_vector_void_star &output_items)
+digital_clock_recovery_mm_cc::general_work (int noutput_items,
+					    gr_vector_int &ninput_items,
+					    gr_vector_const_void_star &input_items,
+					    gr_vector_void_star &output_items)
 {
   const gr_complex *in = (const gr_complex *) input_items[0];
   gr_complex *out = (gr_complex *) output_items[0];
-  gr_complex *foptr = (gr_complex *) output_items[1];
+  float *foptr = (float *) output_items[1];
 
   bool write_foptr = output_items.size() >= 2;
   
@@ -151,7 +153,7 @@ gr_clock_recovery_mm_cc::general_work (int noutput_items,
       out[oo++] = d_p_0T;
       
       // limit mm_val
-      mm_val = gr_branchless_clip(mm_val,1.0);
+      mm_val = gr_branchless_clip(mm_val,4.0);
       d_omega = d_omega + d_gain_omega * mm_val;
       d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit);   // make sure we don't walk away
 
@@ -160,7 +162,7 @@ gr_clock_recovery_mm_cc::general_work (int noutput_items,
       d_mu -= floor(d_mu);
             
       // write the error signal to the second output
-      foptr[oo-1] = gr_complex(d_mu,0);
+      foptr[oo-1] = mm_val;
       
       if (ii < 0)	// clamp it.  This should only happen with bogus input
 	ii = 0;
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc b/gr-digital/lib/digital_clock_recovery_mm_ff.cc
index bb5a27071..04057f0e9 100644
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
+++ b/gr-digital/lib/digital_clock_recovery_mm_ff.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2010 Free Software Foundation, Inc.
+ * Copyright 2004,2010,2011 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -25,7 +25,7 @@
 #endif
 
 #include <gr_io_signature.h>
-#include <gr_clock_recovery_mm_ff.h>
+#include <digital_clock_recovery_mm_ff.h>
 #include <gri_mmse_fir_interpolator.h>
 #include <stdexcept>
 
@@ -33,19 +33,21 @@
 
 // Public constructor
 
-gr_clock_recovery_mm_ff_sptr 
-gr_make_clock_recovery_mm_ff(float omega, float gain_omega, float mu, float gain_mu,
-			     float omega_relative_limit)
+digital_clock_recovery_mm_ff_sptr 
+digital_make_clock_recovery_mm_ff(float omega, float gain_omega,
+				  float mu, float gain_mu,
+				  float omega_relative_limit)
 {
-  return gnuradio::get_initial_sptr(new gr_clock_recovery_mm_ff (omega,
-								    gain_omega, 
-								    mu,
-								    gain_mu,
-								    omega_relative_limit));
+  return gnuradio::get_initial_sptr(new digital_clock_recovery_mm_ff (omega,
+								      gain_omega, 
+								      mu,
+								      gain_mu,
+								      omega_relative_limit));
 }
 
-gr_clock_recovery_mm_ff::gr_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
-						  float omega_relative_limit)
+digital_clock_recovery_mm_ff::digital_clock_recovery_mm_ff (float omega, float gain_omega,
+							    float mu, float gain_mu,
+							    float omega_relative_limit)
   : gr_block ("clock_recovery_mm_ff",
 	      gr_make_io_signature (1, 1, sizeof (float)),
 	      gr_make_io_signature (1, 1, sizeof (float))),
@@ -65,7 +67,7 @@ gr_clock_recovery_mm_ff::gr_clock_recovery_mm_ff (float omega, float gain_omega,
     d_logfile = fopen("cr_mm_ff.dat", "wb");
 }
 
-gr_clock_recovery_mm_ff::~gr_clock_recovery_mm_ff ()
+digital_clock_recovery_mm_ff::~digital_clock_recovery_mm_ff ()
 {
   delete d_interp;
 
@@ -76,7 +78,7 @@ gr_clock_recovery_mm_ff::~gr_clock_recovery_mm_ff ()
 }
 
 void
-gr_clock_recovery_mm_ff::forecast(int noutput_items, gr_vector_int &ninput_items_required)
+digital_clock_recovery_mm_ff::forecast(int noutput_items, gr_vector_int &ninput_items_required)
 {
   unsigned ninputs = ninput_items_required.size();
   for (unsigned i=0; i < ninputs; i++)
@@ -98,10 +100,10 @@ slice(float x)
  * ISBN 0-471-50275-8.
  */
 int
-gr_clock_recovery_mm_ff::general_work (int noutput_items,
-				       gr_vector_int &ninput_items,
-				       gr_vector_const_void_star &input_items,
-				       gr_vector_void_star &output_items)
+digital_clock_recovery_mm_ff::general_work (int noutput_items,
+					    gr_vector_int &ninput_items,
+					    gr_vector_const_void_star &input_items,
+					    gr_vector_void_star &output_items)
 {
   const float *in = (const float *) input_items[0];
   float *out = (float *) output_items[0];
diff --git a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.cc b/gr-digital/lib/digital_cma_equalizer_cc.cc
index f80bfd518..c6c46c2d8 100644
--- a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.cc
+++ b/gr-digital/lib/digital_cma_equalizer_cc.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2010 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,19 +24,23 @@
 #include "config.h"
 #endif
 
-#include <gr_cma_equalizer_cc.h>
+#include <digital_cma_equalizer_cc.h>
+#include <cstdio>
 
-gr_cma_equalizer_cc_sptr
-gr_make_cma_equalizer_cc(int num_taps, float modulus, float mu)
+digital_cma_equalizer_cc_sptr
+digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps)
 {
-  return gnuradio::get_initial_sptr(new gr_cma_equalizer_cc(num_taps, modulus, mu));
+  return gnuradio::get_initial_sptr(new digital_cma_equalizer_cc(num_taps, modulus,
+								 mu, sps));
 }
 
-gr_cma_equalizer_cc::gr_cma_equalizer_cc(int num_taps, float modulus, float mu)
-  : gr_adaptive_fir_ccf("cma_equalizer_cc", 1, std::vector<float>(num_taps)),
-    d_modulus(modulus), d_mu(mu)
+digital_cma_equalizer_cc::digital_cma_equalizer_cc(int num_taps, float modulus,
+						   float mu, int sps)
+  : gr_adaptive_fir_ccc("cma_equalizer_cc", sps,
+			std::vector<gr_complex>(num_taps, gr_complex(0,0)))
 {
+  set_modulus(modulus);
+  set_gain(mu);
   if (num_taps > 0)
     d_taps[0] = 1.0;
 }
-
diff --git a/gr-digital/lib/digital_constellation.cc b/gr-digital/lib/digital_constellation.cc
new file mode 100644
index 000000000..0c100f38e
--- /dev/null
+++ b/gr-digital/lib/digital_constellation.cc
@@ -0,0 +1,554 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010, 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_io_signature.h>
+#include <digital_constellation.h>
+#include <digital_metric_type.h>
+#include <gr_math.h>
+#include <gr_complex.h>
+#include <math.h>
+#include <iostream>
+#include <stdlib.h>
+#include <float.h>
+#include <stdexcept>
+
+#define M_TWOPI (2*M_PI)
+#define SQRT_TWO 0.707107
+
+// Base Constellation Class
+
+digital_constellation::digital_constellation (std::vector<gr_complex> constellation,
+					      std::vector<unsigned int> pre_diff_code,
+					      unsigned int rotational_symmetry,
+					      unsigned int dimensionality) :
+  d_constellation(constellation),
+  d_pre_diff_code(pre_diff_code),
+  d_rotational_symmetry(rotational_symmetry),
+  d_dimensionality(dimensionality)
+{
+  if (pre_diff_code.size() == 0)
+    d_apply_pre_diff_code = false;
+  else if (pre_diff_code.size() != constellation.size())
+    throw std::runtime_error ("The constellation and pre-diff code must be of the same length.");
+  else
+    d_apply_pre_diff_code = true;
+  calc_arity();
+}
+
+digital_constellation::digital_constellation () :
+  d_apply_pre_diff_code(false),
+  d_rotational_symmetry(0),
+  d_dimensionality(1)
+{
+  calc_arity();
+}
+
+//! Returns the constellation points for a symbol value
+void
+digital_constellation::map_to_points(unsigned int value, gr_complex *points)
+{
+  for (unsigned int i=0; i<d_dimensionality; i++)
+    points[i] = d_constellation[value*d_dimensionality + i];
+}
+
+std::vector<gr_complex>
+digital_constellation::map_to_points_v(unsigned int value)
+{
+  std::vector<gr_complex> points_v;
+  points_v.resize(d_dimensionality);
+  map_to_points(value, &(points_v[0]));
+  return points_v;
+}
+
+float
+digital_constellation::get_distance(unsigned int index, const gr_complex *sample)
+{
+  float dist = 0;
+  for (unsigned int i=0; i<d_dimensionality; i++) {
+    dist += norm(sample[i] - d_constellation[index*d_dimensionality + i]);
+  }
+  return dist;
+}
+
+unsigned int
+digital_constellation::get_closest_point(const gr_complex *sample)
+{
+  unsigned int min_index = 0;
+  float min_euclid_dist;
+  float euclid_dist;
+    
+  min_euclid_dist = get_distance(0, sample);
+  min_index = 0;
+  for (unsigned int j = 1; j < d_arity; j++){
+    euclid_dist = get_distance(j, sample);
+    if (euclid_dist < min_euclid_dist){
+      min_euclid_dist = euclid_dist;
+      min_index = j;
+    }
+  }
+  return min_index;
+}
+
+unsigned int
+digital_constellation::decision_maker_pe(const gr_complex *sample, float *phase_error)
+{
+  unsigned int index = decision_maker(sample);
+  *phase_error = 0;
+  for (unsigned int d=0; d<d_dimensionality; d++)
+    *phase_error += -arg(sample[d]*conj(d_constellation[index+d]));
+  return index;
+}
+
+/*
+unsigned int digital_constellation::decision_maker_e(const gr_complex *sample, float *error)
+{
+  unsigned int index = decision_maker(sample);
+  *error = 0;
+  for (unsigned int d=0; d<d_dimensionality; d++)
+    *error += sample[d]*conj(d_constellation[index+d]);
+  return index;
+}
+*/
+
+std::vector<gr_complex> digital_constellation::s_points () {
+  if (d_dimensionality != 1)
+    throw std::runtime_error ("s_points only works for dimensionality 1 constellations.");
+  else
+    return d_constellation;
+}
+
+std::vector<std::vector<gr_complex> >
+digital_constellation::v_points ()
+{
+  std::vector<std::vector<gr_complex> > vv_const;
+  vv_const.resize(d_arity);
+  for (unsigned int p=0; p<d_arity; p++) {
+    std::vector<gr_complex> v_const;
+    v_const.resize(d_dimensionality);
+    for (unsigned int d=0; d<d_dimensionality; d++) {
+      v_const[d] = d_constellation[p*d_dimensionality+d];
+    }
+    vv_const[p] = v_const;
+  }
+  return vv_const;
+}
+
+void
+digital_constellation::calc_metric(const gr_complex *sample, float *metric,
+				   trellis_metric_type_t type)
+{
+  switch (type){
+  case TRELLIS_EUCLIDEAN:
+    calc_euclidean_metric(sample, metric);
+    break;
+  case TRELLIS_HARD_SYMBOL:
+    calc_hard_symbol_metric(sample, metric);
+    break;
+  case TRELLIS_HARD_BIT:
+    throw std::runtime_error ("Invalid metric type (not yet implemented).");
+    break;
+  default:
+    throw std::runtime_error ("Invalid metric type.");
+  }
+}
+
+void
+digital_constellation::calc_euclidean_metric(const gr_complex *sample, float *metric)
+{
+  for (unsigned int o=0; o<d_arity; o++) {
+    metric[o] = get_distance(o, sample);
+  }
+}
+
+void
+digital_constellation::calc_hard_symbol_metric(const gr_complex *sample, float *metric)
+{
+  float minm = FLT_MAX;
+  unsigned int minmi = 0;
+  for (unsigned int o=0; o<d_arity; o++) {
+    float dist = get_distance(o, sample);
+    if (dist < minm) {
+      minm = dist;
+      minmi = o;
+    }
+  }
+  for(unsigned int o=0; o<d_arity; o++) {
+    metric[o] = (o==minmi?0.0:1.0);
+  }
+}
+
+void
+digital_constellation::calc_arity ()
+{
+  if (d_constellation.size() % d_dimensionality != 0)
+    throw std::runtime_error ("Constellation vector size must be a multiple of the dimensionality.");    
+  d_arity = d_constellation.size()/d_dimensionality;
+}
+
+unsigned int
+digital_constellation::decision_maker_v (std::vector<gr_complex> sample)
+{
+  assert(sample.size() == d_dimensionality);
+  return decision_maker (&(sample[0]));
+}
+
+digital_constellation_calcdist_sptr 
+digital_make_constellation_calcdist(std::vector<gr_complex> constellation,
+				    std::vector<unsigned int> pre_diff_code,
+				    unsigned int rotational_symmetry,
+				    unsigned int dimensionality)
+{
+  return digital_constellation_calcdist_sptr(new digital_constellation_calcdist
+					     (constellation, pre_diff_code,
+					      rotational_symmetry, dimensionality));
+}
+
+digital_constellation_calcdist::digital_constellation_calcdist(std::vector<gr_complex> constellation,
+							       std::vector<unsigned int> pre_diff_code,
+							       unsigned int rotational_symmetry,
+							       unsigned int dimensionality) :
+  digital_constellation(constellation, pre_diff_code, rotational_symmetry, dimensionality)
+{}
+
+// Chooses points base on shortest distance.
+// Inefficient.
+unsigned int
+digital_constellation_calcdist::decision_maker(const gr_complex *sample)
+{
+  return get_closest_point(sample);
+}
+
+digital_constellation_sector::digital_constellation_sector (std::vector<gr_complex> constellation,
+							    std::vector<unsigned int> pre_diff_code,
+							    unsigned int rotational_symmetry,
+							    unsigned int dimensionality,
+							    unsigned int n_sectors) :
+  digital_constellation(constellation, pre_diff_code, rotational_symmetry, dimensionality),
+  n_sectors(n_sectors)
+{
+}
+
+unsigned int
+digital_constellation_sector::decision_maker (const gr_complex *sample)
+{
+  unsigned int sector;
+  sector = get_sector(sample);
+  return sector_values[sector];
+}
+
+void
+digital_constellation_sector::find_sector_values ()
+{
+  unsigned int i;
+  sector_values.clear();
+  for (i=0; i<n_sectors; i++) {
+    sector_values.push_back(calc_sector_value(i));
+  }
+}
+
+digital_constellation_rect_sptr 
+digital_make_constellation_rect(std::vector<gr_complex> constellation,
+				std::vector<unsigned int> pre_diff_code,
+				unsigned int rotational_symmetry,
+				unsigned int real_sectors, unsigned int imag_sectors,
+				float width_real_sectors, float width_imag_sectors)
+{
+  return digital_constellation_rect_sptr(new digital_constellation_rect
+					 (constellation, pre_diff_code,
+					  rotational_symmetry,
+					  real_sectors, imag_sectors,
+					  width_real_sectors,
+					  width_imag_sectors));
+  }
+
+digital_constellation_rect::digital_constellation_rect (std::vector<gr_complex> constellation,
+							std::vector<unsigned int> pre_diff_code,
+							unsigned int rotational_symmetry,
+							unsigned int real_sectors, unsigned int imag_sectors,
+							float width_real_sectors, float width_imag_sectors) :
+  digital_constellation_sector(constellation, pre_diff_code, rotational_symmetry, 1, real_sectors * imag_sectors),
+  n_real_sectors(real_sectors), n_imag_sectors(imag_sectors),
+  d_width_real_sectors(width_real_sectors), d_width_imag_sectors(width_imag_sectors)
+{
+  find_sector_values();
+}
+
+unsigned int
+digital_constellation_rect::get_sector (const gr_complex *sample)
+{
+  int real_sector, imag_sector;
+  unsigned int sector;
+
+  real_sector = int(real(*sample)/d_width_real_sectors + n_real_sectors/2.0);
+  if(real_sector < 0)
+    real_sector = 0;
+  if(real_sector >= (int)n_real_sectors)
+    real_sector = n_real_sectors-1;
+
+  imag_sector = int(imag(*sample)/d_width_imag_sectors + n_imag_sectors/2.0);
+  if(imag_sector < 0)
+    imag_sector = 0;
+  if(imag_sector >= (int)n_imag_sectors)
+    imag_sector = n_imag_sectors-1;
+
+  sector = real_sector * n_imag_sectors + imag_sector;
+  return sector;
+}
+  
+unsigned int
+digital_constellation_rect::calc_sector_value (unsigned int sector)
+{
+  unsigned int real_sector, imag_sector;
+  gr_complex sector_center;
+  unsigned int closest_point;
+  real_sector = float(sector)/n_imag_sectors;
+  imag_sector = sector - real_sector * n_imag_sectors;
+  sector_center = gr_complex((real_sector + 0.5 - n_real_sectors/2.0) * d_width_real_sectors,
+			     (imag_sector + 0.5 - n_imag_sectors/2.0) * d_width_imag_sectors);
+  closest_point = get_closest_point(&sector_center);
+  return closest_point;
+}
+
+
+digital_constellation_psk_sptr 
+digital_make_constellation_psk(std::vector<gr_complex> constellation, 
+			       std::vector<unsigned int> pre_diff_code,
+			       unsigned int n_sectors)
+{
+  return digital_constellation_psk_sptr(new digital_constellation_psk
+					(constellation, pre_diff_code,
+					 n_sectors));
+}
+
+digital_constellation_psk::digital_constellation_psk (std::vector<gr_complex> constellation,
+						      std::vector<unsigned int> pre_diff_code,
+						      unsigned int n_sectors) :
+  digital_constellation_sector(constellation, pre_diff_code, constellation.size(), 1, n_sectors)
+{
+  find_sector_values();
+}
+
+unsigned int
+digital_constellation_psk::get_sector (const gr_complex *sample)
+{
+  float phase = arg(*sample);
+  float width = M_TWOPI / n_sectors;
+  int sector = floor(phase/width + 0.5);
+  unsigned int u_sector;
+  if (sector < 0)
+    sector += n_sectors;
+  u_sector = sector;
+  return sector;
+}
+  
+unsigned int
+digital_constellation_psk::calc_sector_value (unsigned int sector)
+{
+  float phase = sector * M_TWOPI / n_sectors;
+  gr_complex sector_center = gr_complex(cos(phase), sin(phase));
+  unsigned int closest_point = get_closest_point(&sector_center);
+  return closest_point;
+}
+
+
+digital_constellation_bpsk_sptr 
+digital_make_constellation_bpsk()
+{
+  return digital_constellation_bpsk_sptr(new digital_constellation_bpsk ());
+}
+
+digital_constellation_bpsk::digital_constellation_bpsk ()
+{
+  d_constellation.resize(2);
+  d_constellation[0] = gr_complex(-1, 0);
+  d_constellation[1] = gr_complex(1, 0);
+  d_rotational_symmetry = 2;
+  d_dimensionality = 1;
+  calc_arity();
+}
+
+unsigned int
+digital_constellation_bpsk::decision_maker(const gr_complex *sample)
+{
+  return (real(*sample) > 0);
+}
+
+
+digital_constellation_qpsk_sptr 
+digital_make_constellation_qpsk()
+{
+  return digital_constellation_qpsk_sptr(new digital_constellation_qpsk ());
+}
+
+digital_constellation_qpsk::digital_constellation_qpsk ()
+{
+  d_constellation.resize(4);
+  // Gray-coded
+  d_constellation[0] = gr_complex(-SQRT_TWO, -SQRT_TWO);
+  d_constellation[1] = gr_complex(SQRT_TWO, -SQRT_TWO);
+  d_constellation[2] = gr_complex(-SQRT_TWO, SQRT_TWO);
+  d_constellation[3] = gr_complex(SQRT_TWO, SQRT_TWO);
+  
+  /*
+  d_constellation[0] = gr_complex(SQRT_TWO, SQRT_TWO);
+  d_constellation[1] = gr_complex(-SQRT_TWO, SQRT_TWO);
+  d_constellation[2] = gr_complex(SQRT_TWO, -SQRT_TWO);
+  d_constellation[3] = gr_complex(SQRT_TWO, -SQRT_TWO);
+  */
+
+  d_pre_diff_code.resize(4);
+  d_pre_diff_code[0] = 0x0;
+  d_pre_diff_code[1] = 0x2;
+  d_pre_diff_code[2] = 0x3;
+  d_pre_diff_code[3] = 0x1;
+
+  d_rotational_symmetry = 4;
+  d_dimensionality = 1;
+  calc_arity();
+}
+
+unsigned int
+digital_constellation_qpsk::decision_maker(const gr_complex *sample)
+{
+  // Real component determines small bit.
+  // Imag component determines big bit.
+  return 2*(imag(*sample)>0) + (real(*sample)>0);
+
+  /*
+  bool a = real(*sample) > 0;
+  bool b = imag(*sample) > 0;
+  if(a) {
+    if(b)
+      return 0x0;
+    else
+      return 0x1;
+  }
+  else {
+    if(b)
+      return 0x2;
+    else
+      return 0x3;
+  }
+  */
+}
+
+
+/********************************************************************/
+
+
+digital_constellation_dqpsk_sptr 
+digital_make_constellation_dqpsk()
+{
+  return digital_constellation_dqpsk_sptr(new digital_constellation_dqpsk ());
+}
+
+digital_constellation_dqpsk::digital_constellation_dqpsk ()
+{
+  // This constellation is not gray coded, which allows
+  // us to use differential encodings (through gr_diff_encode and
+  // gr_diff_decode) on the symbols.
+  d_constellation.resize(4);
+  d_constellation[0] = gr_complex(+SQRT_TWO, +SQRT_TWO);
+  d_constellation[1] = gr_complex(-SQRT_TWO, +SQRT_TWO);
+  d_constellation[2] = gr_complex(-SQRT_TWO, -SQRT_TWO);
+  d_constellation[3] = gr_complex(+SQRT_TWO, -SQRT_TWO);
+
+  // Use this mapping to convert to gray code before diff enc.
+  d_pre_diff_code.resize(4);
+  d_pre_diff_code[0] = 0x0;
+  d_pre_diff_code[1] = 0x1;
+  d_pre_diff_code[2] = 0x3;
+  d_pre_diff_code[3] = 0x2;
+  d_apply_pre_diff_code = true;
+
+  d_rotational_symmetry = 4;
+  d_dimensionality = 1;
+  calc_arity();
+}
+
+unsigned int
+digital_constellation_dqpsk::decision_maker(const gr_complex *sample)
+{
+  // Slower deicison maker as we can't slice along one axis.
+  // Maybe there's a better way to do this, still.
+
+  bool a = real(*sample) > 0;
+  bool b = imag(*sample) > 0;
+  if(a) {
+    if(b)
+      return 0x0;
+    else
+      return 0x3;
+  }
+  else {
+    if(b)
+      return 0x1;
+    else
+      return 0x2;
+  }
+}
+
+digital_constellation_8psk_sptr 
+digital_make_constellation_8psk()
+{
+  return digital_constellation_8psk_sptr(new digital_constellation_8psk ());
+}
+
+digital_constellation_8psk::digital_constellation_8psk ()
+{
+  float angle = M_PI/8.0;
+  d_constellation.resize(8);
+  // Gray-coded
+  d_constellation[0] = gr_complex(cos( 1*angle), sin( 1*angle));
+  d_constellation[1] = gr_complex(cos( 7*angle), sin( 7*angle));
+  d_constellation[2] = gr_complex(cos(15*angle), sin(15*angle));
+  d_constellation[3] = gr_complex(cos( 9*angle), sin( 9*angle));
+  d_constellation[4] = gr_complex(cos( 3*angle), sin( 3*angle));
+  d_constellation[5] = gr_complex(cos( 5*angle), sin( 5*angle));
+  d_constellation[6] = gr_complex(cos(13*angle), sin(13*angle));
+  d_constellation[7] = gr_complex(cos(11*angle), sin(11*angle));
+  d_rotational_symmetry = 8;
+  d_dimensionality = 1;
+  calc_arity();
+}
+
+unsigned int
+digital_constellation_8psk::decision_maker(const gr_complex *sample)
+{
+  unsigned int ret = 0;
+
+  float re = sample->real();
+  float im = sample->imag();
+
+  if(fabsf(re) <= fabsf(im))
+    ret  = 4;
+  if(re <= 0)
+    ret |= 1;
+  if(im <= 0)
+    ret |= 2;
+
+  return ret;
+}
diff --git a/gr-digital/lib/digital_constellation_decoder_cb.cc b/gr-digital/lib/digital_constellation_decoder_cb.cc
new file mode 100644
index 000000000..4638790f6
--- /dev/null
+++ b/gr-digital/lib/digital_constellation_decoder_cb.cc
@@ -0,0 +1,77 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <digital_constellation_decoder_cb.h>
+#include <digital_constellation.h>
+#include <gr_io_signature.h>
+#include <iostream>
+
+digital_constellation_decoder_cb_sptr
+digital_make_constellation_decoder_cb (digital_constellation_sptr constellation)
+{
+  return gnuradio::get_initial_sptr
+    (new digital_constellation_decoder_cb(constellation));
+}
+
+digital_constellation_decoder_cb::
+digital_constellation_decoder_cb (digital_constellation_sptr constellation)
+  : gr_block ("constellation_decoder_cb",
+	      gr_make_io_signature (1, 1, sizeof (gr_complex)),
+	      gr_make_io_signature (1, 1, sizeof (unsigned char))),
+    d_constellation(constellation),
+    d_dim(constellation->dimensionality())
+{
+  set_relative_rate (1.0 / ((double) d_dim));
+}
+
+void
+digital_constellation_decoder_cb::forecast (int noutput_items,
+					    gr_vector_int &ninput_items_required)
+{
+  unsigned int input_required = noutput_items * d_dim;
+
+  unsigned ninputs = ninput_items_required.size();
+  for (unsigned int i = 0; i < ninputs; i++)
+    ninput_items_required[i] = input_required;
+}
+
+
+int
+digital_constellation_decoder_cb::general_work (int noutput_items,
+						gr_vector_int &ninput_items,
+						gr_vector_const_void_star &input_items,
+						gr_vector_void_star &output_items)
+{
+  gr_complex const *in = (const gr_complex *) input_items[0];
+  unsigned char *out = (unsigned char *) output_items[0];
+
+  for(int i = 0; i < noutput_items; i++){
+    out[i] = d_constellation->decision_maker(&(in[i*d_dim]));
+  }
+
+  consume_each (noutput_items * d_dim);
+  return noutput_items;
+}
diff --git a/gr-digital/lib/digital_constellation_receiver_cb.cc b/gr-digital/lib/digital_constellation_receiver_cb.cc
new file mode 100644
index 000000000..b9239962a
--- /dev/null
+++ b/gr-digital/lib/digital_constellation_receiver_cb.cc
@@ -0,0 +1,123 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_io_signature.h>
+#include <gr_prefs.h>
+#include <digital_constellation_receiver_cb.h>
+#include <stdexcept>
+#include <gr_math.h>
+#include <gr_expj.h>
+
+
+#define M_TWOPI (2*M_PI)
+#define VERBOSE_MM     0     // Used for debugging symbol timing loop
+#define VERBOSE_COSTAS 0     // Used for debugging phase and frequency tracking
+
+// Public constructor
+
+digital_constellation_receiver_cb_sptr 
+digital_make_constellation_receiver_cb(digital_constellation_sptr constell,
+				       float loop_bw, float fmin, float fmax)
+{
+  return gnuradio::get_initial_sptr(new digital_constellation_receiver_cb (constell,
+									   loop_bw,
+									   fmin, fmax));
+}
+ 
+static int ios[] = {sizeof(char), sizeof(float), sizeof(float), sizeof(float)};
+static std::vector<int> iosig(ios, ios+sizeof(ios)/sizeof(int));
+digital_constellation_receiver_cb::digital_constellation_receiver_cb (digital_constellation_sptr constellation, 
+								      float loop_bw, float fmin, float fmax)
+  : gr_block ("constellation_receiver_cb",
+	      gr_make_io_signature (1, 1, sizeof (gr_complex)),
+	      gr_make_io_signaturev (1, 4, iosig)),
+    gri_control_loop(loop_bw, fmax, fmin),
+    d_constellation(constellation), 
+    d_current_const_point(0)
+{
+  if (d_constellation->dimensionality() != 1)
+    throw std::runtime_error ("This receiver only works with constellations of dimension 1.");
+}
+
+void
+digital_constellation_receiver_cb::phase_error_tracking(float phase_error)
+{
+  advance_loop(phase_error);
+  phase_wrap();
+  frequency_limit();
+  
+#if VERBOSE_COSTAS
+  printf("cl: phase_error: %f  phase: %f  freq: %f  sample: %f+j%f  constellation: %f+j%f\n",
+	 phase_error, d_phase, d_freq, sample.real(), sample.imag(), 
+	 d_constellation->points()[d_current_const_point].real(),
+	 d_constellation->points()[d_current_const_point].imag());
+#endif
+}
+
+int
+digital_constellation_receiver_cb::general_work (int noutput_items,
+						 gr_vector_int &ninput_items,
+						 gr_vector_const_void_star &input_items,
+						 gr_vector_void_star &output_items)
+{
+  const gr_complex *in = (const gr_complex *) input_items[0];
+  unsigned char *out = (unsigned char *) output_items[0];
+
+  int i=0;
+
+  float phase_error;
+  unsigned int sym_value;
+  gr_complex sample, nco;
+
+  float *out_err = 0, *out_phase = 0, *out_freq = 0;
+  if(output_items.size() == 4) {
+    out_err = (float *) output_items[1];
+    out_phase = (float *) output_items[2];
+    out_freq = (float *) output_items[3];
+  }
+
+  while((i < noutput_items) && (i < ninput_items[0])) {
+    sample = in[i];
+    nco = gr_expj(d_phase);   // get the NCO value for derotating the current sample
+    sample = nco*sample;      // get the downconverted symbol
+
+    sym_value = d_constellation->decision_maker_pe(&sample, &phase_error);
+    phase_error_tracking(phase_error);  // corrects phase and frequency offsets
+
+    out[i] = sym_value;
+
+    if(output_items.size() == 4) {
+      out_err[i] = phase_error;
+      out_phase[i] = d_phase;
+      out_freq[i] = d_freq;
+    }
+    i++;
+  }
+
+  consume_each(i);
+  return i;
+}
+
diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc b/gr-digital/lib/digital_correlate_access_code_bb.cc
index 15f673411..f21b57d92 100644
--- a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc
+++ b/gr-digital/lib/digital_correlate_access_code_bb.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006,2010 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <gr_correlate_access_code_bb.h>
+#include <digital_correlate_access_code_bb.h>
 #include <gr_io_signature.h>
 #include <stdexcept>
 #include <gr_count_bits.h>
@@ -34,14 +34,15 @@
 #define VERBOSE 0
 
 
-gr_correlate_access_code_bb_sptr
-gr_make_correlate_access_code_bb (const std::string &access_code, int threshold)
+digital_correlate_access_code_bb_sptr
+digital_make_correlate_access_code_bb (const std::string &access_code, int threshold)
 {
-  return gnuradio::get_initial_sptr(new gr_correlate_access_code_bb (access_code, threshold));
+  return gnuradio::get_initial_sptr(new digital_correlate_access_code_bb
+				    (access_code, threshold));
 }
 
 
-gr_correlate_access_code_bb::gr_correlate_access_code_bb (
+digital_correlate_access_code_bb::digital_correlate_access_code_bb (
   const std::string &access_code, int threshold)
   : gr_sync_block ("correlate_access_code_bb",
 		   gr_make_io_signature (1, 1, sizeof(char)),
@@ -51,17 +52,17 @@ gr_correlate_access_code_bb::gr_correlate_access_code_bb (
 
 {
   if (!set_access_code(access_code)){
-    fprintf(stderr, "gr_correlate_access_code_bb: access_code is > 64 bits\n");
+    fprintf(stderr, "digital_correlate_access_code_bb: access_code is > 64 bits\n");
     throw std::out_of_range ("access_code is > 64 bits");
   }
 }
 
-gr_correlate_access_code_bb::~gr_correlate_access_code_bb ()
+digital_correlate_access_code_bb::~digital_correlate_access_code_bb ()
 {
 }
 
 bool
-gr_correlate_access_code_bb::set_access_code(
+digital_correlate_access_code_bb::set_access_code(
   const std::string &access_code)
 {
   unsigned len = access_code.length();	// # of bytes in string
@@ -84,9 +85,9 @@ gr_correlate_access_code_bb::set_access_code(
 }
 
 int
-gr_correlate_access_code_bb::work (int noutput_items,
-				   gr_vector_const_void_star &input_items,
-				   gr_vector_void_star &output_items)
+digital_correlate_access_code_bb::work (int noutput_items,
+					gr_vector_const_void_star &input_items,
+					gr_vector_void_star &output_items)
 {
   const unsigned char *in = (const unsigned char *) input_items[0];
   unsigned char *out = (unsigned char *) output_items[0];
diff --git a/gr-digital/lib/digital_costas_loop_cc.cc b/gr-digital/lib/digital_costas_loop_cc.cc
new file mode 100644
index 000000000..370dc7e5c
--- /dev/null
+++ b/gr-digital/lib/digital_costas_loop_cc.cc
@@ -0,0 +1,153 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2010,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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <digital_costas_loop_cc.h>
+#include <gr_io_signature.h>
+#include <gr_expj.h>
+#include <gr_sincos.h>
+#include <gr_math.h>
+
+digital_costas_loop_cc_sptr
+digital_make_costas_loop_cc (float loop_bw, int order
+			     ) throw (std::invalid_argument)
+{
+  return gnuradio::get_initial_sptr(new digital_costas_loop_cc 
+				    (loop_bw, order));
+}
+
+digital_costas_loop_cc::digital_costas_loop_cc (float loop_bw, int order
+						) throw (std::invalid_argument)
+  : gr_sync_block ("costas_loop_cc",
+		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
+		   gr_make_io_signature2 (1, 2, sizeof (gr_complex), sizeof(float))),
+    gri_control_loop(loop_bw, 1.0, -1.0),
+    d_order(order), d_phase_detector(NULL)
+{
+  // Set up the phase detector to use based on the constellation order
+  switch(d_order) {
+  case 2:
+    d_phase_detector = &digital_costas_loop_cc::phase_detector_2;
+    break;
+
+  case 4:
+    d_phase_detector = &digital_costas_loop_cc::phase_detector_4;
+    break;
+
+  case 8:
+    d_phase_detector = &digital_costas_loop_cc::phase_detector_8;
+    break;
+
+  default: 
+    throw std::invalid_argument("order must be 2, 4, or 8");
+    break;
+  }
+}
+
+float
+digital_costas_loop_cc::phase_detector_8(gr_complex sample) const
+{
+  /* This technique splits the 8PSK constellation into 2 squashed
+     QPSK constellations, one when I is larger than Q and one where
+     Q is larger than I. The error is then calculated proportionally
+     to these squashed constellations by the const K = sqrt(2)-1.
+
+     The signal magnitude must be > 1 or K will incorrectly bias
+     the error value. 
+
+     Ref: Z. Huang, Z. Yi, M. Zhang, K. Wang, "8PSK demodulation for
+     new generation DVB-S2", IEEE Proc. Int. Conf. Communications,
+     Circuits and Systems, Vol. 2, pp. 1447 - 1450, 2004.
+  */
+
+  float K = (sqrt(2.0) - 1);
+  if(fabsf(sample.real()) >= fabsf(sample.imag())) {
+    return ((sample.real()>0 ? 1.0 : -1.0) * sample.imag() -
+	    (sample.imag()>0 ? 1.0 : -1.0) * sample.real() * K);
+  }
+  else {
+    return ((sample.real()>0 ? 1.0 : -1.0) * sample.imag() * K -
+	    (sample.imag()>0 ? 1.0 : -1.0) * sample.real());
+  }
+}
+
+float
+digital_costas_loop_cc::phase_detector_4(gr_complex sample) const
+{
+
+  return ((sample.real()>0 ? 1.0 : -1.0) * sample.imag() -
+	  (sample.imag()>0 ? 1.0 : -1.0) * sample.real());
+}
+
+float
+digital_costas_loop_cc::phase_detector_2(gr_complex sample) const
+{
+  return (sample.real()*sample.imag());
+}
+
+int
+digital_costas_loop_cc::work (int noutput_items,
+			      gr_vector_const_void_star &input_items,
+			      gr_vector_void_star &output_items)
+{
+  const gr_complex *iptr = (gr_complex *) input_items[0];
+  gr_complex *optr = (gr_complex *) output_items[0];
+  float *foptr = (float *) output_items[1];
+
+  bool write_foptr = output_items.size() >= 2;
+
+  float error;
+  gr_complex nco_out;
+  
+  if (write_foptr) {
+
+    for (int i = 0; i < noutput_items; i++){
+      nco_out = gr_expj(-d_phase);
+      optr[i] = iptr[i] * nco_out;
+      
+      error = (*this.*d_phase_detector)(optr[i]);
+      error = gr_branchless_clip(error, 1.0);
+	
+      advance_loop(error);
+      phase_wrap();
+      frequency_limit();
+      
+      foptr[i] = d_freq;
+    } 
+  } else {
+    for (int i = 0; i < noutput_items; i++){
+      nco_out = gr_expj(-d_phase);
+      optr[i] = iptr[i] * nco_out;
+      
+      error = (*this.*d_phase_detector)(optr[i]);
+      error = gr_branchless_clip(error, 1.0);
+
+      advance_loop(error);
+      phase_wrap();
+      frequency_limit();
+    }
+  }
+  return noutput_items;
+}
diff --git a/gr-digital/lib/digital_cpmmod_bc.cc b/gr-digital/lib/digital_cpmmod_bc.cc
new file mode 100644
index 000000000..a95b604d1
--- /dev/null
+++ b/gr-digital/lib/digital_cpmmod_bc.cc
@@ -0,0 +1,69 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 Free Software Foundation, Inc.
+ * 
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <digital_cpmmod_bc.h>
+#include <gr_io_signature.h>
+
+
+// Shared pointer constructor
+digital_cpmmod_bc_sptr
+digital_make_cpmmod_bc(int type, float h,
+		       unsigned samples_per_sym,
+		       unsigned L, double beta)
+{
+  return gnuradio::get_initial_sptr(new digital_cpmmod_bc((gr_cpm::cpm_type)type,
+							  h, samples_per_sym,
+							  L, beta));
+}
+
+
+digital_cpmmod_bc::digital_cpmmod_bc(gr_cpm::cpm_type type, float h,
+				     unsigned samples_per_sym,
+				     unsigned L, double beta)
+  : gr_hier_block2("digital_cpmmod_bc",
+		   gr_make_io_signature(1, 1, sizeof(char)),
+		   gr_make_io_signature2(1, 1, sizeof(gr_complex), sizeof(float))),
+    d_taps(gr_cpm::phase_response(type, samples_per_sym, L, beta)),
+    d_char_to_float(gr_make_char_to_float()),
+    d_pulse_shaper(gr_make_interp_fir_filter_fff(samples_per_sym, d_taps)),
+    d_fm(gr_make_frequency_modulator_fc(M_PI * h))
+{
+  switch (type) {
+  case gr_cpm::LRC:
+  case gr_cpm::LSRC:
+  case gr_cpm::LREC:
+  case gr_cpm::TFM:
+  case gr_cpm::GAUSSIAN:
+    break;
+    
+  default:
+    throw std::invalid_argument("invalid CPM type");
+  }
+  
+  connect(self(), 0, d_char_to_float, 0);
+  connect(d_char_to_float, 0, d_pulse_shaper, 0);
+  connect(d_pulse_shaper, 0, d_fm, 0);
+  connect(d_fm, 0, self(), 0);
+}
+
diff --git a/gnuradio-core/src/lib/general/gr_crc32.cc b/gr-digital/lib/digital_crc32.cc
index d4e843528..8806d6e9c 100644
--- a/gnuradio-core/src/lib/general/gr_crc32.cc
+++ b/gr-digital/lib/digital_crc32.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -27,13 +27,13 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <gr_crc32.h>
+#include <digital_crc32.h>
 
    
 // Automatically generated CRC function
 // polynomial: 0x104C11DB7
 unsigned int
-gr_update_crc32(unsigned int crc, const unsigned char *data, size_t len)
+digital_update_crc32(unsigned int crc, const unsigned char *data, size_t len)
 {
     static const unsigned int table[256] = {
     0x00000000U,0x04C11DB7U,0x09823B6EU,0x0D4326D9U,
@@ -112,19 +112,19 @@ gr_update_crc32(unsigned int crc, const unsigned char *data, size_t len)
 }
 
 unsigned int
-gr_update_crc32(unsigned int crc, const std::string s)
+digital_update_crc32(unsigned int crc, const std::string s)
 {
-  return gr_update_crc32(crc, (const unsigned char *) s.data(), s.size());
+  return digital_update_crc32(crc, (const unsigned char *) s.data(), s.size());
 }
     
 unsigned int
-gr_crc32(const unsigned char *buf, size_t len)
+digital_crc32(const unsigned char *buf, size_t len)
 {
-  return gr_update_crc32(0xffffffff, buf, len) ^ 0xffffffff;
+  return digital_update_crc32(0xffffffff, buf, len) ^ 0xffffffff;
 }
 
 unsigned int
-gr_crc32(const std::string s)
+digital_crc32(const std::string s)
 {
-  return gr_crc32((const unsigned char *) s.data(), s.size());
+  return digital_crc32((const unsigned char *) s.data(), s.size());
 }
diff --git a/gr-digital/lib/digital_fll_band_edge_cc.cc b/gr-digital/lib/digital_fll_band_edge_cc.cc
new file mode 100644
index 000000000..05c092622
--- /dev/null
+++ b/gr-digital/lib/digital_fll_band_edge_cc.cc
@@ -0,0 +1,259 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009-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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <digital_fll_band_edge_cc.h>
+#include <gr_io_signature.h>
+#include <gr_expj.h>
+#include <cstdio>
+
+#define M_TWOPI (2*M_PI)
+
+float sinc(float x)
+{
+  if(x == 0)
+    return 1;
+  else
+    return sin(M_PI*x)/(M_PI*x);
+}
+
+digital_fll_band_edge_cc_sptr
+digital_make_fll_band_edge_cc (float samps_per_sym, float rolloff,
+			       int filter_size, float bandwidth)
+{
+  return gnuradio::get_initial_sptr(new digital_fll_band_edge_cc (samps_per_sym, rolloff,
+								  filter_size, bandwidth));
+}
+
+
+static int ios[] = {sizeof(gr_complex), sizeof(float), sizeof(float), sizeof(float)};
+static std::vector<int> iosig(ios, ios+sizeof(ios)/sizeof(int));
+digital_fll_band_edge_cc::digital_fll_band_edge_cc (float samps_per_sym, float rolloff,
+						    int filter_size, float bandwidth)
+  : gr_sync_block ("fll_band_edge_cc",
+		   gr_make_io_signature (1, 1, sizeof(gr_complex)),
+		   gr_make_io_signaturev (1, 4, iosig)),
+    gri_control_loop(bandwidth, M_TWOPI*(2.0/samps_per_sym), -M_TWOPI*(2.0/samps_per_sym)),
+    d_updated (false)
+{
+  // Initialize samples per symbol
+  if(samps_per_sym <= 0) {
+    throw std::out_of_range ("digital_fll_band_edge_cc: invalid number of sps. Must be > 0.");
+  }
+  d_sps = samps_per_sym;
+  
+  // Initialize rolloff factor
+  if(rolloff < 0 || rolloff > 1.0) {
+    throw std::out_of_range ("digital_fll_band_edge_cc: invalid rolloff factor. Must be in [0,1].");
+  }
+  d_rolloff = rolloff;
+  
+  // Initialize filter length
+  if(filter_size <= 0) {
+    throw std::out_of_range ("digital_fll_band_edge_cc: invalid filter size. Must be > 0.");
+  }
+  d_filter_size = filter_size;
+  
+  // Build the band edge filters
+  design_filter(d_sps, d_rolloff, d_filter_size);
+}
+
+digital_fll_band_edge_cc::~digital_fll_band_edge_cc ()
+{
+}
+
+
+/*******************************************************************
+    SET FUNCTIONS
+*******************************************************************/
+
+void
+digital_fll_band_edge_cc::set_samples_per_symbol(float sps)
+{
+  if(sps <= 0) {
+    throw std::out_of_range ("digital_fll_band_edge_cc: invalid number of sps. Must be > 0.");
+  }
+  d_sps = sps;
+  design_filter(d_sps, d_rolloff, d_filter_size);
+}
+
+void
+digital_fll_band_edge_cc::set_rolloff(float rolloff)
+{
+  if(rolloff < 0 || rolloff > 1.0) {
+    throw std::out_of_range ("digital_fll_band_edge_cc: invalid rolloff factor. Must be in [0,1].");
+  }
+  d_rolloff = rolloff;
+  design_filter(d_sps, d_rolloff, d_filter_size);
+}
+
+void
+digital_fll_band_edge_cc::set_filter_size(int filter_size)
+{
+  if(filter_size <= 0) {
+    throw std::out_of_range ("digital_fll_band_edge_cc: invalid filter size. Must be > 0.");
+  }
+  d_filter_size = filter_size;
+  design_filter(d_sps, d_rolloff, d_filter_size);
+}
+
+/*******************************************************************
+    GET FUNCTIONS
+*******************************************************************/
+
+float
+digital_fll_band_edge_cc::get_samples_per_symbol() const
+{
+  return d_sps;
+}
+
+float
+digital_fll_band_edge_cc::get_rolloff() const
+{
+  return d_rolloff;
+}
+
+int
+digital_fll_band_edge_cc:: get_filter_size() const
+{
+  return d_filter_size;
+}
+
+
+/*******************************************************************
+*******************************************************************/
+
+void
+digital_fll_band_edge_cc::design_filter(float samps_per_sym,
+					float rolloff, int filter_size)
+{
+  int M = rint(filter_size / samps_per_sym);
+  float power = 0;
+
+  // Create the baseband filter by adding two sincs together
+  std::vector<float> bb_taps;
+  for(int i = 0; i < filter_size; i++) {
+    float k = -M + i*2.0/samps_per_sym;
+    float tap = sinc(rolloff*k - 0.5) + sinc(rolloff*k + 0.5);
+    power += tap;
+    
+    bb_taps.push_back(tap);
+  }
+
+  d_taps_lower.resize(filter_size);
+  d_taps_upper.resize(filter_size);
+
+  // Create the band edge filters by spinning the baseband
+  // filter up and down to the right places in frequency.
+  // Also, normalize the power in the filters
+  int N = (bb_taps.size() - 1.0)/2.0;
+  for(int i = 0; i < filter_size; i++) {
+    float tap = bb_taps[i] / power;
+    
+    float k = (-N + (int)i)/(2.0*samps_per_sym);
+    
+    gr_complex t1 = tap * gr_expj(-M_TWOPI*(1+rolloff)*k);
+    gr_complex t2 = tap * gr_expj(M_TWOPI*(1+rolloff)*k);
+    
+    d_taps_lower[filter_size-i-1] = t1;
+    d_taps_upper[filter_size-i-1] = t2;
+  }
+  
+  d_updated = true;
+
+  // Set the history to ensure enough input items for each filter
+  set_history(filter_size+1);
+}
+
+void
+digital_fll_band_edge_cc::print_taps()
+{
+  unsigned int i;
+
+  printf("Upper Band-edge: [");
+  for(i = 0; i < d_taps_upper.size(); i++) {
+    printf(" %.4e + %.4ej,", d_taps_upper[i].real(), d_taps_upper[i].imag());
+  }
+  printf("]\n\n");
+
+  printf("Lower Band-edge: [");
+  for(i = 0; i < d_taps_lower.size(); i++) {
+    printf(" %.4e + %.4ej,", d_taps_lower[i].real(), d_taps_lower[i].imag());
+  }
+  printf("]\n\n");
+}
+
+int
+digital_fll_band_edge_cc::work (int noutput_items,
+				gr_vector_const_void_star &input_items,
+				gr_vector_void_star &output_items)
+{
+  const gr_complex *in  = (const gr_complex *) input_items[0];
+  gr_complex *out = (gr_complex *) output_items[0];
+
+  float *frq = NULL;
+  float *phs = NULL;
+  float *err = NULL;
+  if(output_items.size() == 4) {
+    frq = (float *) output_items[1];
+    phs = (float *) output_items[2];
+    err = (float *) output_items[3];
+  }
+
+  if (d_updated) {
+    d_updated = false;
+    return 0;		     // history requirements may have changed.
+  }
+
+  int i;
+  float error;
+  gr_complex nco_out;
+  gr_complex out_upper, out_lower;
+  for(i = 0; i < noutput_items; i++) {
+    nco_out = gr_expj(d_phase);
+    out[i+d_filter_size-1] = in[i] * nco_out;
+
+    // Perform the dot product of the output with the filters
+    out_upper = 0;
+    out_lower = 0;
+    for(int k = 0; k < d_filter_size; k++) {
+      out_upper += d_taps_upper[k] * out[i+k];
+      out_lower += d_taps_lower[k] * out[i+k];
+    }
+    error = norm(out_lower) - norm(out_upper);
+
+    advance_loop(error);
+    phase_wrap();
+    frequency_limit();
+
+    if(output_items.size() == 4) {
+      frq[i] = d_freq;
+      phs[i] = d_phase;
+      err[i] = error;
+    }
+  }
+
+  return noutput_items;
+}
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.cc b/gr-digital/lib/digital_gmskmod_bc.cc
index 4da7690b1..e53e90037 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.cc
+++ b/gr-digital/lib/digital_gmskmod_bc.cc
@@ -1,9 +1,9 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2005 Free Software Foundation, Inc.
+ * Copyright 2010 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)
@@ -24,18 +24,21 @@
 #include "config.h"
 #endif
 
-#include <gr_ofdm_demapper_vcb.h>
+#include <digital_gmskmod_bc.h>
 #include <gr_io_signature.h>
 
-gr_ofdm_demapper_vcb::~gr_ofdm_demapper_vcb(void)
+// Shared pointer constructor
+digital_gmskmod_bc_sptr
+digital_make_gmskmod_bc(unsigned samples_per_sym,
+			double bt, unsigned L)
 {
+  return gnuradio::get_initial_sptr(new digital_gmskmod_bc(samples_per_sym, bt, L));
 }
 
-gr_ofdm_demapper_vcb::gr_ofdm_demapper_vcb (unsigned bits_per_symbol,unsigned int vlen)
-  : gr_sync_decimator ("ofdm_demapper_vcb",
-		       gr_make_io_signature (1, 1, sizeof(gr_complex)*vlen),
-		       gr_make_io_signature (1, 1, sizeof(unsigned char)),
-		       bits_per_symbol)
+
+digital_gmskmod_bc::digital_gmskmod_bc(unsigned samples_per_sym,
+				       double bt, unsigned L)
+	: digital_cpmmod_bc(gr_cpm::GAUSSIAN, 0.5, samples_per_sym, L, bt)
 {
 }
 
diff --git a/gr-digital/lib/digital_kurtotic_equalizer_cc.cc b/gr-digital/lib/digital_kurtotic_equalizer_cc.cc
new file mode 100644
index 000000000..c95b56021
--- /dev/null
+++ b/gr-digital/lib/digital_kurtotic_equalizer_cc.cc
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <digital_kurtotic_equalizer_cc.h>
+
+digital_kurtotic_equalizer_cc_sptr
+digital_make_kurtotic_equalizer_cc(int num_taps, float mu)
+{
+  return gnuradio::get_initial_sptr(new digital_kurtotic_equalizer_cc(num_taps, mu));
+}
+
+digital_kurtotic_equalizer_cc::digital_kurtotic_equalizer_cc(int num_taps, float mu)
+  : gr_adaptive_fir_ccc("kurtotic_equalizer_cc", 1, std::vector<gr_complex>(num_taps))
+{
+  set_gain(mu);
+  if (num_taps > 0)
+    d_taps[0] = 1.0;
+
+  d_alpha_p = 0.01;
+  d_alpha_q = 0.01;
+  d_alpha_m = 0.01;
+
+  d_p = 0.0f;
+  d_m = 0.0f;
+  d_q = gr_complex(0,0);
+  d_u = gr_complex(0,0);
+}
+
diff --git a/gr-digital/lib/digital_lms_dd_equalizer_cc.cc b/gr-digital/lib/digital_lms_dd_equalizer_cc.cc
new file mode 100644
index 000000000..e2c2f16f2
--- /dev/null
+++ b/gr-digital/lib/digital_lms_dd_equalizer_cc.cc
@@ -0,0 +1,85 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <digital_lms_dd_equalizer_cc.h>
+#include <gr_io_signature.h>
+#include <gr_misc.h>
+#include <iostream>
+
+digital_lms_dd_equalizer_cc_sptr
+digital_make_lms_dd_equalizer_cc(int num_taps, float mu, int sps,
+				 digital_constellation_sptr cnst)
+{
+  return gnuradio::get_initial_sptr(new digital_lms_dd_equalizer_cc(num_taps, mu,
+								    sps, cnst));
+}
+
+digital_lms_dd_equalizer_cc::digital_lms_dd_equalizer_cc(int num_taps, float mu,
+							 int sps,
+							 digital_constellation_sptr cnst)
+  : gr_adaptive_fir_ccc("lms_dd_equalizer_cc", sps,
+			std::vector<gr_complex>(num_taps, gr_complex(0,0))),
+    d_taps(num_taps), d_cnst(cnst)
+{
+  set_gain(mu);
+  if (num_taps > 0)
+    d_taps[num_taps/2] = 1.0;
+}
+
+
+
+
+/*
+int
+digital_lms_dd_equalizer_cc::work (int noutput_items,
+				   gr_vector_const_void_star &input_items,
+				   gr_vector_void_star &output_items)
+{
+  const gr_complex *in = (const gr_complex *) input_items[0];
+  gr_complex *out = (gr_complex *) output_items[0];
+  
+  gr_complex acc, decision, error;
+
+  for(int i = 0; i < noutput_items; i++) {
+    acc = 0;
+
+    // Compute output
+    for (size_t j=0; j < d_taps.size(); j++) 
+      acc += in[i+j] * conj(d_taps[j]);
+    
+    d_cnst->map_to_points(d_cnst->decision_maker(&acc), &decision);
+    error = decision - acc;
+    
+    //  Update taps
+    for (size_t j=0; j < d_taps.size(); j++)
+      d_taps[j] += d_mu * conj(error) * in[i+j];
+    
+    out[i] = acc;
+  }
+
+  return noutput_items;
+}
+*/
diff --git a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc b/gr-digital/lib/digital_mpsk_receiver_cc.cc
index bc51c6769..363b86c9f 100644
--- a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
+++ b/gr-digital/lib/digital_mpsk_receiver_cc.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005,2006,2007,2010 Free Software Foundation, Inc.
+ * Copyright 2005,2006,2007,2010,2011 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -26,7 +26,7 @@
 
 #include <gr_io_signature.h>
 #include <gr_prefs.h>
-#include <gr_mpsk_receiver_cc.h>
+#include <digital_mpsk_receiver_cc.h>
 #include <stdexcept>
 #include <gr_math.h>
 #include <gr_expj.h>
@@ -39,30 +39,32 @@
 
 // Public constructor
 
-gr_mpsk_receiver_cc_sptr 
-gr_make_mpsk_receiver_cc(unsigned int M, float theta,
-			 float alpha, float beta,
+digital_mpsk_receiver_cc_sptr 
+digital_make_mpsk_receiver_cc(unsigned int M, float theta,
+			 float loop_bw,
 			 float fmin, float fmax,
 			 float mu, float gain_mu, 
 			 float omega, float gain_omega, float omega_rel)
 {
-  return gnuradio::get_initial_sptr(new gr_mpsk_receiver_cc (M, theta, 
-							    alpha, beta,
-							    fmin, fmax,
-							    mu, gain_mu, 
-							    omega, gain_omega, omega_rel));
+  return gnuradio::get_initial_sptr(new digital_mpsk_receiver_cc (M, theta, 
+								  loop_bw,
+								  fmin, fmax,
+								  mu, gain_mu, 
+								  omega, gain_omega, 
+								  omega_rel));
 }
 
-gr_mpsk_receiver_cc::gr_mpsk_receiver_cc (unsigned int M, float theta, 
-					  float alpha, float beta,
-					  float fmin, float fmax,
-					  float mu, float gain_mu, 
-					  float omega, float gain_omega, float omega_rel)
+digital_mpsk_receiver_cc::digital_mpsk_receiver_cc (unsigned int M, float theta, 
+						    float loop_bw,
+						    float fmin, float fmax,
+						    float mu, float gain_mu, 
+						    float omega, float gain_omega,
+						    float omega_rel)
   : gr_block ("mpsk_receiver_cc",
 	      gr_make_io_signature (1, 1, sizeof (gr_complex)),
 	      gr_make_io_signature (1, 1, sizeof (gr_complex))),
+    gri_control_loop(loop_bw, fmax, fmin),  
     d_M(M), d_theta(theta), 
-    d_alpha(alpha), d_beta(beta), d_freq(0), d_max_freq(fmax), d_min_freq(fmin), d_phase(0),
     d_current_const_point(0),
     d_mu(mu), d_gain_mu(gain_mu), d_gain_omega(gain_omega), 
     d_omega_rel(omega_rel), d_max_omega(0), d_min_omega(0),
@@ -90,29 +92,29 @@ gr_mpsk_receiver_cc::gr_mpsk_receiver_cc (unsigned int M, float theta,
   // Select a phase detector and a decision maker for the modulation order
   switch(d_M) {
   case 2:  // optimized algorithms for BPSK
-    d_phase_error_detector = &gr_mpsk_receiver_cc::phase_error_detector_bpsk; //bpsk;
-    d_decision = &gr_mpsk_receiver_cc::decision_bpsk;
+    d_phase_error_detector = &digital_mpsk_receiver_cc::phase_error_detector_bpsk; //bpsk;
+    d_decision = &digital_mpsk_receiver_cc::decision_bpsk;
     break;
 
   case 4: // optimized algorithms for QPSK
-    d_phase_error_detector = &gr_mpsk_receiver_cc::phase_error_detector_qpsk; //qpsk;
-    d_decision = &gr_mpsk_receiver_cc::decision_qpsk;
+    d_phase_error_detector = &digital_mpsk_receiver_cc::phase_error_detector_qpsk; //qpsk;
+    d_decision = &digital_mpsk_receiver_cc::decision_qpsk;
     break;
 
   default: // generic algorithms for any M (power of 2?) but not pretty
-    d_phase_error_detector = &gr_mpsk_receiver_cc::phase_error_detector_generic;
-    d_decision = &gr_mpsk_receiver_cc::decision_generic;
+    d_phase_error_detector = &digital_mpsk_receiver_cc::phase_error_detector_generic;
+    d_decision = &digital_mpsk_receiver_cc::decision_generic;
     break;
   }
 }
 
-gr_mpsk_receiver_cc::~gr_mpsk_receiver_cc ()
+digital_mpsk_receiver_cc::~digital_mpsk_receiver_cc ()
 {
   delete d_interp;
 }
 
 void
-gr_mpsk_receiver_cc::forecast(int noutput_items, gr_vector_int &ninput_items_required)
+digital_mpsk_receiver_cc::forecast(int noutput_items, gr_vector_int &ninput_items_required)
 {
   unsigned ninputs = ninput_items_required.size();
   for (unsigned i=0; i < ninputs; i++)
@@ -121,7 +123,7 @@ gr_mpsk_receiver_cc::forecast(int noutput_items, gr_vector_int &ninput_items_req
 
 // FIXME add these back in an test difference in performance
 float
-gr_mpsk_receiver_cc::phase_error_detector_qpsk(gr_complex sample) const
+digital_mpsk_receiver_cc::phase_error_detector_qpsk(gr_complex sample) const
 {
   float phase_error = 0;
   if(fabsf(sample.real()) > fabsf(sample.imag())) {
@@ -141,26 +143,26 @@ gr_mpsk_receiver_cc::phase_error_detector_qpsk(gr_complex sample) const
 }
 
 float
-gr_mpsk_receiver_cc::phase_error_detector_bpsk(gr_complex sample) const
+digital_mpsk_receiver_cc::phase_error_detector_bpsk(gr_complex sample) const
 {
   return -(sample.real()*sample.imag());
 }
 
-float gr_mpsk_receiver_cc::phase_error_detector_generic(gr_complex sample) const
+float digital_mpsk_receiver_cc::phase_error_detector_generic(gr_complex sample) const
 {
   //return gr_fast_atan2f(sample*conj(d_constellation[d_current_const_point]));
   return -arg(sample*conj(d_constellation[d_current_const_point]));
 }
 
 unsigned int
-gr_mpsk_receiver_cc::decision_bpsk(gr_complex sample) const
+digital_mpsk_receiver_cc::decision_bpsk(gr_complex sample) const
 {
   return (gr_branchless_binary_slicer(sample.real()) ^ 1);
   //return gr_binary_slicer(sample.real()) ^ 1;
 }
 
 unsigned int
-gr_mpsk_receiver_cc::decision_qpsk(gr_complex sample) const
+digital_mpsk_receiver_cc::decision_qpsk(gr_complex sample) const
 {
   unsigned int index;
 
@@ -170,7 +172,7 @@ gr_mpsk_receiver_cc::decision_qpsk(gr_complex sample) const
 }
 
 unsigned int
-gr_mpsk_receiver_cc::decision_generic(gr_complex sample) const
+digital_mpsk_receiver_cc::decision_generic(gr_complex sample) const
 {
   unsigned int min_m = 0;
   float min_s = 65535;
@@ -191,7 +193,7 @@ gr_mpsk_receiver_cc::decision_generic(gr_complex sample) const
 
 
 void
-gr_mpsk_receiver_cc::make_constellation()
+digital_mpsk_receiver_cc::make_constellation()
 {
   for(unsigned int m=0; m < d_M; m++) {
     d_constellation.push_back(gr_expj((M_TWOPI/d_M)*m));
@@ -199,7 +201,7 @@ gr_mpsk_receiver_cc::make_constellation()
 }
 
 void
-gr_mpsk_receiver_cc::mm_sampler(const gr_complex symbol)
+digital_mpsk_receiver_cc::mm_sampler(const gr_complex symbol)
 {
   gr_complex sample, nco;
 
@@ -222,7 +224,7 @@ gr_mpsk_receiver_cc::mm_sampler(const gr_complex symbol)
 }
 
 void
-gr_mpsk_receiver_cc::mm_error_tracking(gr_complex sample)
+digital_mpsk_receiver_cc::mm_error_tracking(gr_complex sample)
 {
   gr_complex u, x, y;
   float mm_error = 0;
@@ -259,24 +261,16 @@ gr_mpsk_receiver_cc::mm_error_tracking(gr_complex sample)
 
 
 void
-gr_mpsk_receiver_cc::phase_error_tracking(gr_complex sample)
+digital_mpsk_receiver_cc::phase_error_tracking(gr_complex sample)
 {
   float phase_error = 0;
 
   // Make phase and frequency corrections based on sampled value
   phase_error = (*this.*d_phase_error_detector)(sample);
-    
-  d_freq += d_beta*phase_error;             // adjust frequency based on error
-  d_phase += d_freq + d_alpha*phase_error;  // adjust phase based on error
-
-  // Make sure we stay within +-2pi
-  while(d_phase > M_TWOPI)
-    d_phase -= M_TWOPI;
-  while(d_phase < -M_TWOPI)
-    d_phase += M_TWOPI;
   
-  // Limit the frequency range
-  d_freq = gr_branchless_clip(d_freq, d_max_freq);
+  advance_loop(phase_error);
+  phase_wrap();
+  frequency_limit();
   
 #if VERBOSE_COSTAS
   printf("cl: phase_error: %f  phase: %f  freq: %f  sample: %f+j%f  constellation: %f+j%f\n",
@@ -286,10 +280,10 @@ gr_mpsk_receiver_cc::phase_error_tracking(gr_complex sample)
 }
 
 int
-gr_mpsk_receiver_cc::general_work (int noutput_items,
-				   gr_vector_int &ninput_items,
-				   gr_vector_const_void_star &input_items,
-				   gr_vector_void_star &output_items)
+digital_mpsk_receiver_cc::general_work (int noutput_items,
+					gr_vector_int &ninput_items,
+					gr_vector_const_void_star &input_items,
+					gr_vector_void_star &output_items)
 {
   const gr_complex *in = (const gr_complex *) input_items[0];
   gr_complex *out = (gr_complex *) output_items[0];
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_cyclic_prefixer.cc b/gr-digital/lib/digital_ofdm_cyclic_prefixer.cc
index fb40a3035..192af2591 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_cyclic_prefixer.cc
+++ b/gr-digital/lib/digital_ofdm_cyclic_prefixer.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006,2010 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,16 +24,18 @@
 #include "config.h"
 #endif
 
-#include <gr_ofdm_cyclic_prefixer.h>
+#include <digital_ofdm_cyclic_prefixer.h>
 #include <gr_io_signature.h>
 
-gr_ofdm_cyclic_prefixer_sptr
-gr_make_ofdm_cyclic_prefixer (size_t input_size, size_t output_size)
+digital_ofdm_cyclic_prefixer_sptr
+digital_make_ofdm_cyclic_prefixer (size_t input_size, size_t output_size)
 {
-  return gnuradio::get_initial_sptr(new gr_ofdm_cyclic_prefixer (input_size, output_size));
+  return gnuradio::get_initial_sptr(new digital_ofdm_cyclic_prefixer (input_size,
+								      output_size));
 }
 
-gr_ofdm_cyclic_prefixer::gr_ofdm_cyclic_prefixer (size_t input_size, size_t output_size)
+digital_ofdm_cyclic_prefixer::digital_ofdm_cyclic_prefixer (size_t input_size,
+							    size_t output_size)
   : gr_sync_interpolator ("ofdm_cyclic_prefixer",
 			  gr_make_io_signature (1, 1, input_size*sizeof(gr_complex)),
 			  gr_make_io_signature (1, 1, sizeof(gr_complex)),
@@ -45,9 +47,9 @@ gr_ofdm_cyclic_prefixer::gr_ofdm_cyclic_prefixer (size_t input_size, size_t outp
 }
 
 int
-gr_ofdm_cyclic_prefixer::work (int noutput_items,
-			     gr_vector_const_void_star &input_items,
-			     gr_vector_void_star &output_items)
+digital_ofdm_cyclic_prefixer::work (int noutput_items,
+				    gr_vector_const_void_star &input_items,
+				    gr_vector_void_star &output_items)
 {
   gr_complex *in = (gr_complex *) input_items[0];
   gr_complex *out = (gr_complex *) output_items[0];
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc b/gr-digital/lib/digital_ofdm_frame_acquisition.cc
index 201375597..93b58aeca 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc
+++ b/gr-digital/lib/digital_ofdm_frame_acquisition.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2007,2008,2010 Free Software Foundation, Inc.
+ * Copyright 2006-2008,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <gr_ofdm_frame_acquisition.h>
+#include <digital_ofdm_frame_acquisition.h>
 #include <gr_io_signature.h>
 #include <gr_expj.h>
 #include <gr_math.h>
@@ -34,20 +34,22 @@
 #define M_TWOPI (2*M_PI)
 #define MAX_NUM_SYMBOLS 1000
 
-gr_ofdm_frame_acquisition_sptr
-gr_make_ofdm_frame_acquisition (unsigned int occupied_carriers, unsigned int fft_length, 
-				unsigned int cplen,
-				const std::vector<gr_complex> &known_symbol,
-				unsigned int max_fft_shift_len)
+digital_ofdm_frame_acquisition_sptr
+digital_make_ofdm_frame_acquisition (unsigned int occupied_carriers,
+				     unsigned int fft_length, 
+				     unsigned int cplen,
+				     const std::vector<gr_complex> &known_symbol,
+				     unsigned int max_fft_shift_len)
 {
-  return gnuradio::get_initial_sptr(new gr_ofdm_frame_acquisition (occupied_carriers, fft_length, cplen,
+  return gnuradio::get_initial_sptr(new digital_ofdm_frame_acquisition (occupied_carriers, fft_length, cplen,
 									known_symbol, max_fft_shift_len));
 }
 
-gr_ofdm_frame_acquisition::gr_ofdm_frame_acquisition (unsigned occupied_carriers, unsigned int fft_length, 
-						      unsigned int cplen,
-						      const std::vector<gr_complex> &known_symbol,
-						      unsigned int max_fft_shift_len)
+digital_ofdm_frame_acquisition::digital_ofdm_frame_acquisition (unsigned occupied_carriers,
+								unsigned int fft_length, 
+								unsigned int cplen,
+								const std::vector<gr_complex> &known_symbol,
+								unsigned int max_fft_shift_len)
   : gr_block ("ofdm_frame_acquisition",
 	      gr_make_io_signature2 (2, 2, sizeof(gr_complex)*fft_length, sizeof(char)*fft_length),
 	      gr_make_io_signature2 (2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char))),
@@ -78,13 +80,13 @@ gr_ofdm_frame_acquisition::gr_ofdm_frame_acquisition (unsigned occupied_carriers
   }
 }
 
-gr_ofdm_frame_acquisition::~gr_ofdm_frame_acquisition(void)
+digital_ofdm_frame_acquisition::~digital_ofdm_frame_acquisition(void)
 {
   delete [] d_phase_lut;
 }
 
 void
-gr_ofdm_frame_acquisition::forecast (int noutput_items, gr_vector_int &ninput_items_required)
+digital_ofdm_frame_acquisition::forecast (int noutput_items, gr_vector_int &ninput_items_required)
 {
   unsigned ninputs = ninput_items_required.size ();
   for (unsigned i = 0; i < ninputs; i++)
@@ -92,7 +94,7 @@ gr_ofdm_frame_acquisition::forecast (int noutput_items, gr_vector_int &ninput_it
 }
 
 gr_complex
-gr_ofdm_frame_acquisition::coarse_freq_comp(int freq_delta, int symbol_count)
+digital_ofdm_frame_acquisition::coarse_freq_comp(int freq_delta, int symbol_count)
 {
   //  return gr_complex(cos(-M_TWOPI*freq_delta*d_cplen/d_fft_length*symbol_count),
   //	    sin(-M_TWOPI*freq_delta*d_cplen/d_fft_length*symbol_count));
@@ -103,7 +105,7 @@ gr_ofdm_frame_acquisition::coarse_freq_comp(int freq_delta, int symbol_count)
 }
 
 void
-gr_ofdm_frame_acquisition::correlate(const gr_complex *symbol, int zeros_on_left)
+digital_ofdm_frame_acquisition::correlate(const gr_complex *symbol, int zeros_on_left)
 {
   unsigned int i,j;
   
@@ -131,7 +133,7 @@ gr_ofdm_frame_acquisition::correlate(const gr_complex *symbol, int zeros_on_left
 }
 
 void
-gr_ofdm_frame_acquisition::calculate_equalizer(const gr_complex *symbol, int zeros_on_left)
+digital_ofdm_frame_acquisition::calculate_equalizer(const gr_complex *symbol, int zeros_on_left)
 {
   unsigned int i=0;
 
@@ -169,10 +171,10 @@ gr_ofdm_frame_acquisition::calculate_equalizer(const gr_complex *symbol, int zer
 }
 
 int
-gr_ofdm_frame_acquisition::general_work(int noutput_items,
-					gr_vector_int &ninput_items,
-					gr_vector_const_void_star &input_items,
-					gr_vector_void_star &output_items)
+digital_ofdm_frame_acquisition::general_work(int noutput_items,
+					     gr_vector_int &ninput_items,
+					     gr_vector_const_void_star &input_items,
+					     gr_vector_void_star &output_items)
 {
   const gr_complex *symbol = (const gr_complex *)input_items[0];
   const char *signal_in = (const char *)input_items[1];
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc b/gr-digital/lib/digital_ofdm_frame_sink.cc
index 279945766..f8fb1bbb1 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
+++ b/gr-digital/lib/digital_ofdm_frame_sink.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2008,2010 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <gr_ofdm_frame_sink.h>
+#include <digital_ofdm_frame_sink.h>
 #include <gr_io_signature.h>
 #include <gr_expj.h>
 #include <gr_math.h>
@@ -37,7 +37,7 @@
 #define VERBOSE 0
 
 inline void
-gr_ofdm_frame_sink::enter_search()
+digital_ofdm_frame_sink::enter_search()
 {
   if (VERBOSE)
     fprintf(stderr, "@ enter_search\n");
@@ -47,7 +47,7 @@ gr_ofdm_frame_sink::enter_search()
 }
     
 inline void
-gr_ofdm_frame_sink::enter_have_sync()
+digital_ofdm_frame_sink::enter_have_sync()
 {
   if (VERBOSE)
     fprintf(stderr, "@ enter_have_sync\n");
@@ -68,7 +68,7 @@ gr_ofdm_frame_sink::enter_have_sync()
 }
 
 inline void
-gr_ofdm_frame_sink::enter_have_header()
+digital_ofdm_frame_sink::enter_have_header()
 {
   d_state = STATE_HAVE_HEADER;
 
@@ -85,7 +85,7 @@ gr_ofdm_frame_sink::enter_have_header()
 }
 
 
-unsigned char gr_ofdm_frame_sink::slicer(const gr_complex x)
+unsigned char digital_ofdm_frame_sink::slicer(const gr_complex x)
 {
   unsigned int table_size = d_sym_value_out.size();
   unsigned int min_index = 0;
@@ -102,8 +102,8 @@ unsigned char gr_ofdm_frame_sink::slicer(const gr_complex x)
   return d_sym_value_out[min_index];
 }
 
-unsigned int gr_ofdm_frame_sink::demapper(const gr_complex *in,
-					  unsigned char *out)
+unsigned int digital_ofdm_frame_sink::demapper(const gr_complex *in,
+					       unsigned char *out)
 {
   unsigned int i=0, bytes_produced=0;
   gr_complex carrier;
@@ -178,22 +178,22 @@ unsigned int gr_ofdm_frame_sink::demapper(const gr_complex *in,
 }
 
 
-gr_ofdm_frame_sink_sptr
-gr_make_ofdm_frame_sink(const std::vector<gr_complex> &sym_position, 
-			const std::vector<unsigned char> &sym_value_out,
-			gr_msg_queue_sptr target_queue, unsigned int occupied_carriers,
-			float phase_gain, float freq_gain)
+digital_ofdm_frame_sink_sptr
+digital_make_ofdm_frame_sink(const std::vector<gr_complex> &sym_position, 
+			     const std::vector<unsigned char> &sym_value_out,
+			     gr_msg_queue_sptr target_queue, unsigned int occupied_carriers,
+			     float phase_gain, float freq_gain)
 {
-  return gnuradio::get_initial_sptr(new gr_ofdm_frame_sink(sym_position, sym_value_out,
-							target_queue, occupied_carriers,
-							phase_gain, freq_gain));
+  return gnuradio::get_initial_sptr(new digital_ofdm_frame_sink(sym_position, sym_value_out,
+								target_queue, occupied_carriers,
+								phase_gain, freq_gain));
 }
 
 
-gr_ofdm_frame_sink::gr_ofdm_frame_sink(const std::vector<gr_complex> &sym_position, 
-				       const std::vector<unsigned char> &sym_value_out,
-				       gr_msg_queue_sptr target_queue, unsigned int occupied_carriers,
-				       float phase_gain, float freq_gain)
+digital_ofdm_frame_sink::digital_ofdm_frame_sink(const std::vector<gr_complex> &sym_position, 
+						 const std::vector<unsigned char> &sym_value_out,
+						 gr_msg_queue_sptr target_queue, unsigned int occupied_carriers,
+						 float phase_gain, float freq_gain)
   : gr_sync_block ("ofdm_frame_sink",
 		   gr_make_io_signature2 (2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char)),
 		   gr_make_io_signature (1, 1, sizeof(gr_complex)*occupied_carriers)),
@@ -252,7 +252,7 @@ gr_ofdm_frame_sink::gr_ofdm_frame_sink(const std::vector<gr_complex> &sym_positi
   
   // make sure we stay in the limit currently imposed by the occupied_carriers
   if(d_subcarrier_map.size() > d_occupied_carriers) {
-    throw std::invalid_argument("gr_ofdm_mapper_bcv: subcarriers allocated exceeds size of occupied carriers");
+    throw std::invalid_argument("digital_ofdm_mapper_bcv: subcarriers allocated exceeds size of occupied carriers");
   }
 
   d_bytes_out = new unsigned char[d_occupied_carriers];
@@ -264,14 +264,14 @@ gr_ofdm_frame_sink::gr_ofdm_frame_sink(const std::vector<gr_complex> &sym_positi
   enter_search();
 }
 
-gr_ofdm_frame_sink::~gr_ofdm_frame_sink ()
+digital_ofdm_frame_sink::~digital_ofdm_frame_sink ()
 {
   delete [] d_bytes_out;
 }
 
 bool
-gr_ofdm_frame_sink::set_sym_value_out(const std::vector<gr_complex> &sym_position, 
-				      const std::vector<unsigned char> &sym_value_out)
+digital_ofdm_frame_sink::set_sym_value_out(const std::vector<gr_complex> &sym_position, 
+					   const std::vector<unsigned char> &sym_value_out)
 {
   if (sym_position.size() != sym_value_out.size())
     return false;
@@ -288,9 +288,9 @@ gr_ofdm_frame_sink::set_sym_value_out(const std::vector<gr_complex> &sym_positio
 
 
 int
-gr_ofdm_frame_sink::work (int noutput_items,
-			  gr_vector_const_void_star &input_items,
-			  gr_vector_void_star &output_items)
+digital_ofdm_frame_sink::work (int noutput_items,
+			       gr_vector_const_void_star &input_items,
+			       gr_vector_void_star &output_items)
 {
   const gr_complex *in = (const gr_complex *) input_items[0];
   const char *sig = (const char *) input_items[1];
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc b/gr-digital/lib/digital_ofdm_insert_preamble.cc
index ed10c94a8..a46133643 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc
+++ b/gr-digital/lib/digital_ofdm_insert_preamble.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2010 Free Software Foundation, Inc.
+ * Copyright 2007,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,21 +23,21 @@
 #include <config.h>
 #endif
 
-#include <gr_ofdm_insert_preamble.h>
+#include <digital_ofdm_insert_preamble.h>
 #include <gr_io_signature.h>
 #include <stdexcept>
 #include <iostream>
 #include <string.h>
 
-gr_ofdm_insert_preamble_sptr
-gr_make_ofdm_insert_preamble(int fft_length,
-			     const std::vector<std::vector<gr_complex> > &preamble)
+digital_ofdm_insert_preamble_sptr
+digital_make_ofdm_insert_preamble(int fft_length,
+				  const std::vector<std::vector<gr_complex> > &preamble)
 {
-  return gnuradio::get_initial_sptr(new gr_ofdm_insert_preamble(fft_length,
-								  preamble));
+  return gnuradio::get_initial_sptr(new digital_ofdm_insert_preamble(fft_length,
+								     preamble));
 }
 
-gr_ofdm_insert_preamble::gr_ofdm_insert_preamble
+digital_ofdm_insert_preamble::digital_ofdm_insert_preamble
        (int fft_length,
 	const std::vector<std::vector<gr_complex> > &preamble)
   : gr_block("ofdm_insert_preamble",
@@ -56,22 +56,22 @@ gr_ofdm_insert_preamble::gr_ofdm_insert_preamble
   // sanity check preamble symbols
   for (size_t i = 0; i < d_preamble.size(); i++){
     if (d_preamble[i].size() != (size_t) d_fft_length)
-      throw std::invalid_argument("gr_ofdm_insert_preamble: invalid length for preamble symbol");
+      throw std::invalid_argument("digital_ofdm_insert_preamble: invalid length for preamble symbol");
   }
 
   enter_idle();
 }
 
 
-gr_ofdm_insert_preamble::~gr_ofdm_insert_preamble()
+digital_ofdm_insert_preamble::~digital_ofdm_insert_preamble()
 {
 }
 
 int
-gr_ofdm_insert_preamble::general_work (int noutput_items,
-				       gr_vector_int &ninput_items_v,
-				       gr_vector_const_void_star &input_items,
-				       gr_vector_void_star &output_items)
+digital_ofdm_insert_preamble::general_work (int noutput_items,
+					    gr_vector_int &ninput_items_v,
+					    gr_vector_const_void_star &input_items,
+					    gr_vector_void_star &output_items)
 {
   int ninput_items = std::min(ninput_items_v[0], ninput_items_v[1]);
   const gr_complex *in_sym = (const gr_complex *) input_items[0];
@@ -149,7 +149,7 @@ gr_ofdm_insert_preamble::general_work (int noutput_items,
       break;
 
     default:
-      std::cerr << "gr_ofdm_insert_preamble: (can't happen) invalid state, resetting\n";
+      std::cerr << "digital_ofdm_insert_preamble: (can't happen) invalid state, resetting\n";
       enter_idle();
     }
   }
@@ -159,7 +159,7 @@ gr_ofdm_insert_preamble::general_work (int noutput_items,
 }
 
 void
-gr_ofdm_insert_preamble::enter_idle()
+digital_ofdm_insert_preamble::enter_idle()
 {
   d_state = ST_IDLE;
   d_nsymbols_output = 0;
@@ -167,7 +167,7 @@ gr_ofdm_insert_preamble::enter_idle()
 }
 
 void
-gr_ofdm_insert_preamble::enter_preamble()
+digital_ofdm_insert_preamble::enter_preamble()
 {
   d_state = ST_PREAMBLE;
   d_nsymbols_output = 0;
@@ -175,13 +175,13 @@ gr_ofdm_insert_preamble::enter_preamble()
 }
 
 void
-gr_ofdm_insert_preamble::enter_first_payload()
+digital_ofdm_insert_preamble::enter_first_payload()
 {
   d_state = ST_FIRST_PAYLOAD;
 }
 
 void
-gr_ofdm_insert_preamble::enter_payload()
+digital_ofdm_insert_preamble::enter_payload()
 {
   d_state = ST_PAYLOAD;
 }
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc b/gr-digital/lib/digital_ofdm_mapper_bcv.cc
index cc4aba0cb..cf3d08703 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
+++ b/gr-digital/lib/digital_ofdm_mapper_bcv.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2007,2008,2010 Free Software Foundation, Inc.
+ * Copyright 2006-2008,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -25,22 +25,22 @@
 #include "config.h"
 #endif
 
-#include <gr_ofdm_mapper_bcv.h>
+#include <digital_ofdm_mapper_bcv.h>
 #include <gr_io_signature.h>
 #include <stdexcept>
 #include <string.h>
 
-gr_ofdm_mapper_bcv_sptr
-gr_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned int msgq_limit, 
-			 unsigned int occupied_carriers, unsigned int fft_length)
+digital_ofdm_mapper_bcv_sptr
+digital_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned int msgq_limit, 
+			      unsigned int occupied_carriers, unsigned int fft_length)
 {
-  return gnuradio::get_initial_sptr(new gr_ofdm_mapper_bcv (constellation, msgq_limit, 
-							  occupied_carriers, fft_length));
+  return gnuradio::get_initial_sptr(new digital_ofdm_mapper_bcv (constellation, msgq_limit, 
+								 occupied_carriers, fft_length));
 }
 
 // Consumes 1 packet and produces as many OFDM symbols of fft_length to hold the full packet
-gr_ofdm_mapper_bcv::gr_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned int msgq_limit, 
-					unsigned int occupied_carriers, unsigned int fft_length)
+digital_ofdm_mapper_bcv::digital_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned int msgq_limit, 
+						  unsigned int occupied_carriers, unsigned int fft_length)
   : gr_sync_block ("ofdm_mapper_bcv",
 		   gr_make_io_signature (0, 0, 0),
 		   gr_make_io_signature2 (1, 2, sizeof(gr_complex)*fft_length, sizeof(char))),
@@ -54,7 +54,7 @@ gr_ofdm_mapper_bcv::gr_ofdm_mapper_bcv (const std::vector<gr_complex> &constella
     d_nresid(0)
 {
   if (!(d_occupied_carriers <= d_fft_length))
-    throw std::invalid_argument("gr_ofdm_mapper_bcv: occupied carriers must be <= fft_length");
+    throw std::invalid_argument("digital_ofdm_mapper_bcv: occupied carriers must be <= fft_length");
 
   // this is not the final form of this solution since we still use the occupied_tones concept,
   // which would get us into trouble if the number of carriers we seek is greater than the occupied carriers.
@@ -110,25 +110,25 @@ gr_ofdm_mapper_bcv::gr_ofdm_mapper_bcv (const std::vector<gr_complex> &constella
 
   // make sure we stay in the limit currently imposed by the occupied_carriers
   if(d_subcarrier_map.size() > d_occupied_carriers) {
-    throw std::invalid_argument("gr_ofdm_mapper_bcv: subcarriers allocated exceeds size of occupied carriers");
+    throw std::invalid_argument("digital_ofdm_mapper_bcv: subcarriers allocated exceeds size of occupied carriers");
   }
   
   d_nbits = (unsigned long)ceil(log10(float(d_constellation.size())) / log10(2.0));
 }
 
-gr_ofdm_mapper_bcv::~gr_ofdm_mapper_bcv(void)
+digital_ofdm_mapper_bcv::~digital_ofdm_mapper_bcv(void)
 {
 }
 
-int gr_ofdm_mapper_bcv::randsym()
+int digital_ofdm_mapper_bcv::randsym()
 {
   return (rand() % d_constellation.size());
 }
 
 int
-gr_ofdm_mapper_bcv::work(int noutput_items,
-			  gr_vector_const_void_star &input_items,
-			  gr_vector_void_star &output_items)
+digital_ofdm_mapper_bcv::work(int noutput_items,
+			      gr_vector_const_void_star &input_items,
+			      gr_vector_void_star &output_items)
 {
   gr_complex *out = (gr_complex *)output_items[0];
   
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc b/gr-digital/lib/digital_ofdm_sampler.cc
index f9a53c87f..cab8c2ba9 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
+++ b/gr-digital/lib/digital_ofdm_sampler.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2008,2010 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,22 +24,22 @@
 #include "config.h"
 #endif
 
-#include <gr_ofdm_sampler.h>
+#include <digital_ofdm_sampler.h>
 #include <gr_io_signature.h>
 #include <gr_expj.h>
 #include <cstdio>
 
-gr_ofdm_sampler_sptr
-gr_make_ofdm_sampler (unsigned int fft_length, 
-		      unsigned int symbol_length,
-		      unsigned int timeout)
+digital_ofdm_sampler_sptr
+digital_make_ofdm_sampler (unsigned int fft_length, 
+			   unsigned int symbol_length,
+			   unsigned int timeout)
 {
-  return gnuradio::get_initial_sptr(new gr_ofdm_sampler (fft_length, symbol_length, timeout));
+  return gnuradio::get_initial_sptr(new digital_ofdm_sampler (fft_length, symbol_length, timeout));
 }
 
-gr_ofdm_sampler::gr_ofdm_sampler (unsigned int fft_length, 
-				  unsigned int symbol_length,
-				  unsigned int timeout)
+digital_ofdm_sampler::digital_ofdm_sampler (unsigned int fft_length, 
+					    unsigned int symbol_length,
+					    unsigned int timeout)
   : gr_block ("ofdm_sampler",
 	      gr_make_io_signature2 (2, 2, sizeof (gr_complex), sizeof(char)),
 	      gr_make_io_signature2 (2, 2, sizeof (gr_complex)*fft_length, sizeof(char)*fft_length)),
@@ -49,7 +49,7 @@ gr_ofdm_sampler::gr_ofdm_sampler (unsigned int fft_length,
 }
 
 void
-gr_ofdm_sampler::forecast (int noutput_items, gr_vector_int &ninput_items_required)
+digital_ofdm_sampler::forecast (int noutput_items, gr_vector_int &ninput_items_required)
 {
   // FIXME do we need more
   //int nreqd  = (noutput_items-1) * d_symbol_length + d_fft_length;
@@ -61,10 +61,10 @@ gr_ofdm_sampler::forecast (int noutput_items, gr_vector_int &ninput_items_requir
 
 
 int
-gr_ofdm_sampler::general_work (int noutput_items,
-			       gr_vector_int &ninput_items,
-			       gr_vector_const_void_star &input_items,
-			       gr_vector_void_star &output_items)
+digital_ofdm_sampler::general_work (int noutput_items,
+				    gr_vector_int &ninput_items,
+				    gr_vector_const_void_star &input_items,
+				    gr_vector_void_star &output_items)
 {
   const gr_complex *iptr = (const gr_complex *) input_items[0];
   const char *trigger = (const char *) input_items[1];
diff --git a/gr-cvsd-vocoder/src/python/.gitignore b/gr-digital/python/.gitignore
index 604b402c5..604b402c5 100644
--- a/gr-cvsd-vocoder/src/python/.gitignore
+++ b/gr-digital/python/.gitignore
diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt
new file mode 100644
index 000000000..905626b8b
--- /dev/null
+++ b/gr-digital/python/CMakeLists.txt
@@ -0,0 +1,77 @@
+# 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.
+
+########################################################################
+# Setup python install
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    FILES
+    __init__.py
+    bpsk.py
+    cpm.py
+    crc.py
+    generic_mod_demod.py
+    gmsk.py
+    modulation_utils.py
+    ofdm.py
+    ofdm_packet_utils.py
+    ofdm_receiver.py
+    ofdm_sync_fixed.py
+    ofdm_sync_ml.py
+    ofdm_sync_pnac.py
+    ofdm_sync_pn.py
+    packet_utils.py
+    pkt.py
+    psk.py
+    qam.py
+    qpsk.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital
+    COMPONENT "digital_python"
+)
+
+GR_PYTHON_INSTALL(
+    FILES
+    utils/__init__.py
+    utils/gray_code.py
+    utils/mod_codes.py
+    utils/alignment.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital/utils
+    COMPONENT "digital_python"
+)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-digital/python
+        ${CMAKE_BINARY_DIR}/gr-digital/swig
+    )
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-digital)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gr-digital/python/Makefile.am b/gr-digital/python/Makefile.am
new file mode 100644
index 000000000..ead6f7dfd
--- /dev/null
+++ b/gr-digital/python/Makefile.am
@@ -0,0 +1,70 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+TESTS =
+EXTRA_DIST += run_tests.in
+
+if PYTHON
+SUBDIRS = utils
+TESTS += run_tests
+
+digitaldir = $(grpythondir)/digital
+
+noinst_PYTHON = \
+	qa_digital.py			\
+	qa_binary_slicer_fb.py		\
+	qa_clock_recovery_mm.py		\
+	qa_cma_equalizer.py		\
+	qa_cpm.py			\
+	qa_constellation.py		\
+	qa_constellation_receiver.py	\
+	qa_constellation_decoder_cb.py	\
+	qa_correlate_access_code.py	\
+	qa_costas_loop_cc.py		\
+	qa_crc32.py			\
+	qa_fll_band_edge.py		\
+	qa_lms_equalizer.py		\
+	qa_mpsk_receiver.py		\
+	qa_ofdm_insert_preamble.py
+
+digital_PYTHON = \
+	__init__.py		\
+	bpsk.py			\
+	cpm.py			\
+	crc.py			\
+	generic_mod_demod.py	\
+	gmsk.py			\
+	modulation_utils.py	\
+	ofdm.py			\
+	ofdm_packet_utils.py	\
+	ofdm_receiver.py	\
+	ofdm_sync_fixed.py	\
+	ofdm_sync_ml.py		\
+	ofdm_sync_pnac.py	\
+	ofdm_sync_pn.py		\
+	packet_utils.py		\
+	pkt.py			\
+	psk.py			\
+	qam.py			\
+	qpsk.py
+endif
diff --git a/gr-usrp2/src/__init__.py b/gr-digital/python/__init__.py
index fd4289af5..7c76183c9 100644
--- a/gr-usrp2/src/__init__.py
+++ b/gr-digital/python/__init__.py
@@ -1,5 +1,4 @@
-#
-# Copyright 2008,2010 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -19,10 +18,29 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-# The presence of this file turns this directory into a Python package
+'''
+This is the gr-digital package. It contains all of the blocks,
+utilities, and examples for doing digital modulation and demodulation.
+'''
 
-# Add SWIG generated code to this namespace
-from usrp2_swig import *
+# The presence of this file turns this directory into a Python package
 
-# Add other content from pure-Python modules here
+from digital_swig import *
+from psk import *
+from qam import *
+from bpsk import *
+from qpsk import *
+from gmsk import *
+from cpm import *
+from pkt import *
+from crc import *
+from modulation_utils import *
+from ofdm import *
+from ofdm_receiver import *
+from ofdm_sync_fixed import *
+from ofdm_sync_ml import *
+from ofdm_sync_pnac import *
+from ofdm_sync_pn import *
 
+import packet_utils
+import ofdm_packet_utils
diff --git a/gr-digital/python/bpsk.py b/gr-digital/python/bpsk.py
new file mode 100644
index 000000000..0d8f05c4c
--- /dev/null
+++ b/gr-digital/python/bpsk.py
@@ -0,0 +1,171 @@
+#
+# Copyright 2005,2006,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.
+# 
+
+"""
+BPSK modulation and demodulation.
+"""
+
+from math import pi, log
+from cmath import exp
+
+from gnuradio import gr
+from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod
+import digital_swig
+import modulation_utils
+
+# Default number of points in constellation.
+_def_constellation_points = 2
+# Whether differential coding is used.
+_def_differential = False
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           BPSK constellation
+# /////////////////////////////////////////////////////////////////////////////
+
+def bpsk_constellation(m=_def_constellation_points):
+    if m != _def_constellation_points:
+        raise ValueError("BPSK can only have 2 constellation points.")
+    return digital_swig.constellation_bpsk()
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           BPSK modulator
+# /////////////////////////////////////////////////////////////////////////////
+
+class bpsk_mod(generic_mod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 differential=False, *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered BPSK modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_mod block for list of parameters.
+	"""
+
+        constellation_points = _def_constellation_points
+        constellation = digital_swig.constellation_bpsk()
+        if constellation_points != 2:
+            raise ValueError('Number of constellation points must be 2 for BPSK.')
+        super(bpsk_mod, self).__init__(constellation=constellation,
+                                       differential=differential, *args, **kwargs)
+        
+# /////////////////////////////////////////////////////////////////////////////
+#                           BPSK demodulator
+#
+# /////////////////////////////////////////////////////////////////////////////
+
+class bpsk_demod(generic_demod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 differential=False, *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered BPSK modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_demod block for list of parameters.
+        """
+
+        constellation_points = _def_constellation_points
+        constellation = digital_swig.constellation_bpsk()
+        if constellation_points != 2:
+            raise ValueError('Number of constellation points must be 2 for BPSK.')
+        super(bpsk_demod, self).__init__(constellation=constellation,
+                                         differential=differential, *args, **kwargs)
+
+
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           DBPSK constellation
+# /////////////////////////////////////////////////////////////////////////////
+
+def dbpsk_constellation(m=_def_constellation_points):
+    if m != _def_constellation_points:
+        raise ValueError("DBPSK can only have 2 constellation points.")
+    return digital_swig.constellation_dbpsk()
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           DBPSK modulator
+# /////////////////////////////////////////////////////////////////////////////
+
+class dbpsk_mod(generic_mod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 differential=True, *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered DBPSK modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_mod block for list of parameters.
+	"""
+
+        constellation_points = _def_constellation_points
+        constellation = digital_swig.constellation_bpsk()
+        if constellation_points != 2:
+            raise ValueError('Number of constellation points must be 2 for DBPSK.')
+        super(dbpsk_mod, self).__init__(constellation=constellation,
+                                        differential=True,
+                                        *args, **kwargs)
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           DBPSK demodulator
+#
+# /////////////////////////////////////////////////////////////////////////////
+
+class dbpsk_demod(generic_demod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 differential=True, *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered DBPSK modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_demod block for list of parameters.
+        """
+
+        constellation_points = _def_constellation_points
+        constellation = digital_swig.constellation_bpsk()
+        if constellation_points != 2:
+            raise ValueError('Number of constellation points must be 2 for DBPSK.')
+        super(dbpsk_demod, self).__init__(constellation=constellation,
+                                          differential=True,
+                                          *args, **kwargs)
+
+#
+# Add these to the mod/demod registry
+#
+modulation_utils.add_type_1_mod('bpsk', bpsk_mod)
+modulation_utils.add_type_1_demod('bpsk', bpsk_demod)
+modulation_utils.add_type_1_constellation('bpsk', bpsk_constellation)
+modulation_utils.add_type_1_mod('dbpsk', dbpsk_mod)
+modulation_utils.add_type_1_demod('dbpsk', dbpsk_demod)
+modulation_utils.add_type_1_constellation('dbpsk', dbpsk_constellation)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/cpm.py b/gr-digital/python/cpm.py
index 8f593cd51..05032336d 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/cpm.py
+++ b/gr-digital/python/cpm.py
@@ -2,7 +2,7 @@
 # CPM modulation and demodulation.  
 #
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -24,12 +24,12 @@
 
 # See gnuradio-examples/python/digital for examples
 
-from gnuradio import gr
-from gnuradio import modulation_utils
+from gnuradio import gr, blks2
 from math import pi
 import numpy
-from pprint import pprint
-import inspect
+
+import digital_swig
+import modulation_utils
 
 # default values (used in __init__ and add_options)
 _def_samples_per_symbol = 2
@@ -97,7 +97,7 @@ class cpm_mod(gr.hier_block2):
         @type debug: bool       
 	"""
 
-	gr.hier_block2.__init__("cpm_mod", 
+	gr.hier_block2.__init__(self, "cpm_mod", 
 				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
 				gr.io_signature(1, 1, gr.sizeof_gr_complex)) #  Output signature
 
@@ -116,14 +116,14 @@ class cpm_mod(gr.hier_block2):
 
         self._generic_taps=numpy.array(generic_taps)
 
-        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
-            raise TypeError, ("samples_per_symbol must be an integer >= 2, is %r" % (samples_per_symbol,))
+        if samples_per_symbol < 2:
+            raise TypeError, ("samples_per_symbol must be >= 2, is %r" % (samples_per_symbol,))
 
         self.nsymbols = 2**bits_per_symbol
-        self.sym_alphabet=numpy.arange(-(self.nsymbols-1),self.nsymbols,2)
+        self.sym_alphabet = numpy.arange(-(self.nsymbols-1),self.nsymbols,2).tolist()
 
 
-	self.ntaps = self._symbols_per_pulse * samples_per_symbol
+	self.ntaps = int(self._symbols_per_pulse * samples_per_symbol)
 	sensitivity = 2 * pi * h_numerator / h_denominator / samples_per_symbol
 
         # Unpack Bytes into bits_per_symbol groups
@@ -153,7 +153,7 @@ class cpm_mod(gr.hier_block2):
         else:
             raise TypeError, ("cpm_type must be an integer in {0,1,2,3}, is %r" % (cpm_type,))
 
-	self.filter = gr.interp_fir_filter_fff(samples_per_symbol, self.taps)
+        self.filter = blks2.pfb_arb_resampler_fff(samples_per_symbol, self.taps)
 
 	# FM modulation
 	self.fmmod = gr.frequency_modulator_fc(sensitivity)
@@ -167,26 +167,26 @@ class cpm_mod(gr.hier_block2):
 	# Connect
 	self.connect(self, self.B2s, self.pam, self.filter, self.fmmod, self)
 
-    #def samples_per_symbol(self):
-        #return self._samples_per_symbol
+    def samples_per_symbol(self):
+        return self._samples_per_symbol
     
-    #def bits_per_symbol(self):  
-        #return self._bits_per_symbol
+    def bits_per_symbol(self):  
+        return self._bits_per_symbol
     
-    #def h_numerator(self):  
-        #return self._h_numerator
+    def h_numerator(self):  
+        return self._h_numerator
 
-    #def h_denominator(self):  
-        #return self._h_denominator
+    def h_denominator(self):  
+        return self._h_denominator
 
-    #def cpm_type(self):  
-        #return self._cpm_type
+    def cpm_type(self):  
+        return self._cpm_type
 
-    #def bt(self):  
-        #return self._bt
+    def bt(self):  
+        return self._bt
 
-    #def symbols_per_pulse(self):  
-        #return self._symbols_per_pulse
+    def symbols_per_pulse(self):  
+        return self._symbols_per_pulse
 
 
     def _print_verbage(self):
@@ -228,7 +228,7 @@ class cpm_mod(gr.hier_block2):
         Given command line options, create dictionary suitable for passing to __init__
         """
         return modulation_utils.extract_kwargs_from_options(cpm_mod.__init__,
-                                                            ('self',), options)
+                                                             ('self',), options)
     extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
 
 
@@ -240,8 +240,6 @@ class cpm_mod(gr.hier_block2):
 # Not yet implemented
 #
 
-
-
 #
 # Add these to the mod/demod registry
 #
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/crc.py b/gr-digital/python/crc.py
index d31aca0ea..198ab059f 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/crc.py
+++ b/gr-digital/python/crc.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2005,2007 Free Software Foundation, Inc.
+# Copyright 2005,2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -19,20 +19,20 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr
-from hexint import *
+from gnuradio import gru
+import digital_swig
 import struct
 
 def gen_and_append_crc32(s):
-    crc = gr.crc32(s)
-    return s + struct.pack(">I", hexint(crc) & 0xFFFFFFFF)
+    crc = digital_swig.crc32(s)
+    return s + struct.pack(">I", gru.hexint(crc) & 0xFFFFFFFF)
 
 def check_crc32(s):
     if len(s) < 4:
         return (False, '')
     msg = s[:-4]
     #print "msg = '%s'" % (msg,)
-    actual = gr.crc32(msg)
+    actual = digital_swig.crc32(msg)
     (expected,) = struct.unpack(">I", s[-4:])
     # print "actual =", hex(actual), "expected =", hex(expected)
     return (actual == expected, msg)
diff --git a/gr-digital/python/generic_mod_demod.py b/gr-digital/python/generic_mod_demod.py
new file mode 100644
index 000000000..ae876e108
--- /dev/null
+++ b/gr-digital/python/generic_mod_demod.py
@@ -0,0 +1,387 @@
+#
+# Copyright 2005,2006,2007,2009,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.
+# 
+
+# See gnuradio-examples/python/digital for examples
+
+"""
+Generic modulation and demodulation.
+"""
+
+from gnuradio import gr
+from modulation_utils import extract_kwargs_from_options_for_class
+from utils import mod_codes
+import digital_swig
+import math
+
+# default values (used in __init__ and add_options)
+_def_samples_per_symbol = 2
+_def_excess_bw = 0.35
+_def_verbose = False
+_def_log = False
+
+# Frequency correction
+_def_freq_bw = 2*math.pi/100.0
+# Symbol timing recovery 
+_def_timing_bw = 2*math.pi/100.0
+_def_timing_max_dev = 1.5
+# Fine frequency / Phase correction
+_def_phase_bw = 2*math.pi/100.0
+# Number of points in constellation
+_def_constellation_points = 16
+# Whether differential coding is used.
+_def_differential = False
+
+def add_common_options(parser):
+    """
+    Sets options common to both modulator and demodulator.
+    """
+    parser.add_option("-p", "--constellation-points", type="int", default=_def_constellation_points,
+                      help="set the number of constellation points (must be a power of 2 for psk, power of 4 for QAM) [default=%default]")
+    parser.add_option("", "--non-differential", action="store_false",
+                      dest="differential",
+                      help="do not use differential encoding [default=False]")
+    parser.add_option("", "--differential", action="store_true",
+                      dest="differential", default=True,
+                      help="use differential encoding [default=%default]")
+    parser.add_option("", "--mod-code", type="choice", choices=mod_codes.codes,
+                      default=mod_codes.NO_CODE,
+                      help="Select modulation code from: %s [default=%%default]"
+                            % (', '.join(mod_codes.codes),))
+    parser.add_option("", "--excess-bw", type="float", default=_def_excess_bw,
+                      help="set RRC excess bandwith factor [default=%default]")
+    
+
+# /////////////////////////////////////////////////////////////////////////////
+#                             Generic modulator
+# /////////////////////////////////////////////////////////////////////////////
+
+class generic_mod(gr.hier_block2):
+
+    def __init__(self, constellation,
+                 samples_per_symbol=_def_samples_per_symbol,
+                 differential=_def_differential,
+                 excess_bw=_def_excess_bw,
+                 gray_coded=True,
+                 verbose=_def_verbose,
+                 log=_def_log):
+        """
+	Hierarchical block for RRC-filtered differential generic modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+        
+	@param constellation: determines the modulation type
+	@type constellation: gnuradio.digital.gr_constellation
+	@param samples_per_symbol: samples per baud >= 2
+	@type samples_per_symbol: float
+	@param excess_bw: Root-raised cosine filter excess bandwidth
+	@type excess_bw: float
+        @param gray_coded: turn gray coding on/off
+        @type gray_coded: bool
+        @param verbose: Print information about modulator?
+        @type verbose: bool
+        @param log: Log modulation data to files?
+        @type log: bool
+	"""
+
+	gr.hier_block2.__init__(self, "generic_mod",
+				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
+				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
+
+        self._constellation = constellation.base()
+        self._samples_per_symbol = samples_per_symbol
+        self._excess_bw = excess_bw
+        self._differential = differential
+
+        if self._samples_per_symbol < 2:
+            raise TypeError, ("sbp must be >= 2, is %f" % self._samples_per_symbol)
+        
+        arity = pow(2,self.bits_per_symbol())
+        
+        # turn bytes into k-bit vectors
+        self.bytes2chunks = \
+          gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST)
+
+        if gray_coded == True:
+            self.symbol_mapper = gr.map_bb(self._constellation.pre_diff_code())
+
+        if differential:
+            self.diffenc = gr.diff_encoder_bb(arity)
+
+        self.chunks2symbols = gr.chunks_to_symbols_bc(self._constellation.points())
+
+        # pulse shaping filter
+        nfilts = 32
+        ntaps = nfilts * 11 * int(self._samples_per_symbol)    # make nfilts filters of ntaps each
+        self.rrc_taps = gr.firdes.root_raised_cosine(
+            nfilts,          # gain
+            nfilts,          # sampling rate based on 32 filters in resampler
+            1.0,             # symbol rate
+            self._excess_bw, # excess bandwidth (roll-off factor)
+            ntaps)
+        self.rrc_filter = gr.pfb_arb_resampler_ccf(self._samples_per_symbol,
+                                                   self.rrc_taps)
+
+	# Connect
+        blocks = [self, self.bytes2chunks]
+        if gray_coded == True:
+            blocks.append(self.symbol_mapper)
+        if differential:
+            blocks.append(self.diffenc)
+        blocks += [self.chunks2symbols, self.rrc_filter, self]
+        self.connect(*blocks)
+
+        if verbose:
+            self._print_verbage()
+            
+        if log:
+            self._setup_logging()
+            
+
+    def samples_per_symbol(self):
+        return self._samples_per_symbol
+
+    def bits_per_symbol(self):   # static method that's also callable on an instance
+        return self._constellation.bits_per_symbol()
+
+    def add_options(parser):
+        """
+        Adds generic modulation options to the standard parser
+        """
+        add_common_options(parser)
+    add_options=staticmethod(add_options)
+
+    def extract_kwargs_from_options(cls, options):
+        """
+        Given command line options, create dictionary suitable for passing to __init__
+        """
+        return extract_kwargs_from_options_for_class(cls, options)
+    extract_kwargs_from_options=classmethod(extract_kwargs_from_options)
+
+
+    def _print_verbage(self):
+        print "\nModulator:"
+        print "bits per symbol:     %d" % self.bits_per_symbol()
+        print "RRC roll-off factor: %.2f" % self._excess_bw
+
+    def _setup_logging(self):
+        print "Modulation logging turned on."
+        self.connect(self.bytes2chunks,
+                     gr.file_sink(gr.sizeof_char, "tx_bytes2chunks.8b"))
+        if self._constellation.apply_pre_diff_code():
+            self.connect(self.symbol_mapper,
+                         gr.file_sink(gr.sizeof_char, "tx_symbol_mapper.8b"))
+        if self._differential:
+            self.connect(self.diffenc,
+                         gr.file_sink(gr.sizeof_char, "tx_diffenc.8b"))
+        self.connect(self.chunks2symbols,
+                     gr.file_sink(gr.sizeof_gr_complex, "tx_chunks2symbols.32fc"))
+        self.connect(self.rrc_filter,
+                     gr.file_sink(gr.sizeof_gr_complex, "tx_rrc_filter.32fc"))
+              
+
+# /////////////////////////////////////////////////////////////////////////////
+#                             Generic demodulator
+#
+#      Differentially coherent detection of differentially encoded generically
+#      modulated signal.
+# /////////////////////////////////////////////////////////////////////////////
+
+class generic_demod(gr.hier_block2):
+
+    def __init__(self, constellation,
+                 samples_per_symbol=_def_samples_per_symbol,
+                 differential=_def_differential,
+                 excess_bw=_def_excess_bw,
+                 gray_coded=True,
+                 freq_bw=_def_freq_bw,
+                 timing_bw=_def_timing_bw,
+                 phase_bw=_def_phase_bw,
+                 verbose=_def_verbose,
+                 log=_def_log):
+        """
+	Hierarchical block for RRC-filtered differential generic demodulation.
+
+	The input is the complex modulated signal at baseband.
+	The output is a stream of bits packed 1 bit per byte (LSB)
+
+	@param constellation: determines the modulation type
+	@type constellation: gnuradio.digital.gr_constellation
+	@param samples_per_symbol: samples per symbol >= 2
+	@type samples_per_symbol: float
+	@param excess_bw: Root-raised cosine filter excess bandwidth
+	@type excess_bw: float
+        @param gray_coded: turn gray coding on/off
+        @type gray_coded: bool
+        @param freq_bw: loop filter lock-in bandwidth
+        @type freq_bw: float
+        @param timing_bw: timing recovery loop lock-in bandwidth
+        @type timing_bw: float
+        @param phase_bw: phase recovery loop bandwidth
+        @type phase_bw: float
+        @param verbose: Print information about modulator?
+        @type verbose: bool
+        @param debug: Print modualtion data to files?
+        @type debug: bool
+	"""
+        
+	gr.hier_block2.__init__(self, "generic_demod",
+				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
+				gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
+				
+        self._constellation = constellation.base()
+        self._samples_per_symbol = samples_per_symbol
+        self._excess_bw = excess_bw
+        self._phase_bw = phase_bw
+        self._freq_bw = freq_bw
+        self._timing_bw = timing_bw
+        self._timing_max_dev= _def_timing_max_dev
+        self._differential = differential
+
+        if self._samples_per_symbol < 2:
+            raise TypeError, ("sbp must be >= 2, is %d" % self._samples_per_symbol)
+
+        arity = pow(2,self.bits_per_symbol())
+
+        nfilts = 32
+        ntaps = 11 * int(self._samples_per_symbol*nfilts)
+
+        # Automatic gain control
+        self.agc = gr.agc2_cc(0.6e-1, 1e-3, 1, 1, 100)
+
+        # Frequency correction
+        fll_ntaps = 55
+        self.freq_recov = digital_swig.fll_band_edge_cc(self._samples_per_symbol, self._excess_bw,
+                                                        fll_ntaps, self._freq_bw)
+
+        # symbol timing recovery with RRC data filter
+        taps = gr.firdes.root_raised_cosine(nfilts, nfilts*self._samples_per_symbol,
+                                            1.0, self._excess_bw, ntaps)
+        self.time_recov = gr.pfb_clock_sync_ccf(self._samples_per_symbol,
+                                                self._timing_bw, taps,
+                                                nfilts, nfilts//2, self._timing_max_dev)
+
+        fmin = -0.25
+        fmax = 0.25
+        self.receiver = digital_swig.constellation_receiver_cb(
+            self._constellation, self._phase_bw,
+            fmin, fmax)
+
+        # Do differential decoding based on phase change of symbols
+        if differential:
+            self.diffdec = gr.diff_decoder_bb(arity)
+
+        if gray_coded:
+            self.symbol_mapper = gr.map_bb(
+                mod_codes.invert_code(self._constellation.pre_diff_code()))
+
+        # unpack the k bit vector into a stream of bits
+        self.unpack = gr.unpack_k_bits_bb(self.bits_per_symbol())
+
+        if verbose:
+            self._print_verbage()
+
+        if log:
+            self._setup_logging()
+        
+        # Connect and Initialize base class
+        blocks = [self, self.agc, self.freq_recov,
+                  self.time_recov, self.receiver]
+        if differential:
+            blocks.append(self.diffdec)
+        if self._constellation.apply_pre_diff_code():
+            blocks.append(self.symbol_mapper)
+        blocks += [self.unpack, self]
+        self.connect(*blocks)
+
+    def samples_per_symbol(self):
+        return self._samples_per_symbol
+
+    def bits_per_symbol(self):   # staticmethod that's also callable on an instance
+        return self._constellation.bits_per_symbol()
+
+    def _print_verbage(self):
+        print "\nDemodulator:"
+        print "bits per symbol:     %d"   % self.bits_per_symbol()
+        print "RRC roll-off factor: %.2f" % self._excess_bw
+        print "FLL bandwidth:       %.2e" % self._freq_bw
+        print "Timing bandwidth:    %.2e" % self._timing_bw
+        print "Phase bandwidth:     %.2e" % self._phase_bw
+
+    def _setup_logging(self):
+        print "Modulation logging turned on."
+        self.connect(self.agc,
+                     gr.file_sink(gr.sizeof_gr_complex, "rx_agc.32fc"))
+        self.connect((self.freq_recov, 0),
+                     gr.file_sink(gr.sizeof_gr_complex, "rx_freq_recov.32fc"))
+        self.connect((self.freq_recov, 1),
+                     gr.file_sink(gr.sizeof_float, "rx_freq_recov_freq.32f"))
+        self.connect((self.freq_recov, 2),
+                     gr.file_sink(gr.sizeof_float, "rx_freq_recov_phase.32f"))
+        self.connect((self.freq_recov, 3),
+                     gr.file_sink(gr.sizeof_float, "rx_freq_recov_error.32f"))
+        self.connect((self.time_recov, 0),
+                     gr.file_sink(gr.sizeof_gr_complex, "rx_time_recov.32fc"))
+        self.connect((self.time_recov, 1),
+                     gr.file_sink(gr.sizeof_float, "rx_time_recov_error.32f"))
+        self.connect((self.time_recov, 2),
+                     gr.file_sink(gr.sizeof_float, "rx_time_recov_rate.32f"))
+        self.connect((self.time_recov, 3),
+                     gr.file_sink(gr.sizeof_float, "rx_time_recov_phase.32f"))
+        self.connect((self.receiver, 0),
+                     gr.file_sink(gr.sizeof_char, "rx_receiver.8b"))
+        self.connect((self.receiver, 1),
+                     gr.file_sink(gr.sizeof_float, "rx_receiver_error.32f"))
+        self.connect((self.receiver, 2),
+                     gr.file_sink(gr.sizeof_float, "rx_receiver_phase.32f"))
+        self.connect((self.receiver, 3),
+                     gr.file_sink(gr.sizeof_float, "rx_receiver_freq.32f"))
+        if self._differential:
+            self.connect(self.diffdec,
+                         gr.file_sink(gr.sizeof_char, "rx_diffdec.8b"))
+        if self._constellation.apply_pre_diff_code():
+            self.connect(self.symbol_mapper,
+                         gr.file_sink(gr.sizeof_char, "rx_symbol_mapper.8b"))
+        self.connect(self.unpack,
+                     gr.file_sink(gr.sizeof_char, "rx_unpack.8b"))
+        
+    def add_options(parser):
+        """
+        Adds generic demodulation options to the standard parser
+        """
+        # Add options shared with modulator.
+        add_common_options(parser)
+        # Add options specific to demodulator.
+        parser.add_option("", "--freq-bw", type="float", default=_def_freq_bw,
+                          help="set frequency lock loop lock-in bandwidth [default=%default]")
+        parser.add_option("", "--phase-bw", type="float", default=_def_phase_bw,
+                          help="set phase tracking loop lock-in bandwidth [default=%default]")
+        parser.add_option("", "--timing-bw", type="float", default=_def_timing_bw,
+                          help="set timing symbol sync loop gain lock-in bandwidth [default=%default]")
+    add_options=staticmethod(add_options)
+    
+    def extract_kwargs_from_options(cls, options):
+        """
+        Given command line options, create dictionary suitable for passing to __init__
+        """
+        return extract_kwargs_from_options_for_class(cls, options)
+    extract_kwargs_from_options=classmethod(extract_kwargs_from_options)
+
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/gmsk.py b/gr-digital/python/gmsk.py
index 3b6c016a0..70fa197e3 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/gmsk.py
+++ b/gr-digital/python/gmsk.py
@@ -25,7 +25,9 @@
 # See gnuradio-examples/python/digital for examples
 
 from gnuradio import gr
-from gnuradio import modulation_utils
+import digital_swig
+import modulation_utils
+
 from math import pi
 import numpy
 from pprint import pprint
@@ -37,11 +39,9 @@ _def_bt = 0.35
 _def_verbose = False
 _def_log = False
 
-_def_gain_mu = None
-_def_mu = 0.5
-_def_freq_error = 0.0
-_def_omega_relative_limit = 0.005
-
+# Symbol timing recovery 
+_def_timing_bw = 2*pi/100.0
+_def_timing_max_dev = 1.5
 
 # /////////////////////////////////////////////////////////////////////////////
 #                              GMSK modulator
@@ -78,8 +78,11 @@ class gmsk_mod(gr.hier_block2):
         self._samples_per_symbol = samples_per_symbol
         self._bt = bt
 
-        if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2:
-            raise TypeError, ("samples_per_symbol must be an integer >= 2, is %r" % (samples_per_symbol,))
+        self._differential = False # make consistant with other modulators
+        
+        if samples_per_symbol < 2:
+            raise TypeError, ("samples_per_symbol must  >= 2, is %r" % \
+                                  (samples_per_symbol,))
 
 	ntaps = 4 * samples_per_symbol			# up to 3 bits in filter at once
 	sensitivity = (pi / 2) / samples_per_symbol	# phase change per bit = pi / 2
@@ -93,12 +96,12 @@ class gmsk_mod(gr.hier_block2):
 		1,		       # gain
 		samples_per_symbol,    # symbol_rate
 		bt,		       # bandwidth * symbol time
-		ntaps	               # number of taps
+		int(ntaps)             # number of taps
 		)
 
-	self.sqwave = (1,) * samples_per_symbol       # rectangular window
+	self.sqwave = (1,) * int(samples_per_symbol)       # rectangular window
 	self.taps = numpy.convolve(numpy.array(self.gaussian_taps),numpy.array(self.sqwave))
-	self.gaussian_filter = gr.interp_fir_filter_fff(samples_per_symbol, self.taps)
+        self.gaussian_filter = gr.pfb_arb_resampler_fff(samples_per_symbol, self.taps)
 
 	# FM modulation
 	self.fmmod = gr.frequency_modulator_fc(sensitivity)
@@ -128,11 +131,11 @@ class gmsk_mod(gr.hier_block2):
     def _setup_logging(self):
         print "Modulation logging turned on."
         self.connect(self.nrz,
-                     gr.file_sink(gr.sizeof_float, "nrz.dat"))
+                     gr.file_sink(gr.sizeof_float, "tx_gmsk_nrz.32f"))
         self.connect(self.gaussian_filter,
-                     gr.file_sink(gr.sizeof_float, "gaussian_filter.dat"))
+                     gr.file_sink(gr.sizeof_float, "tx_gmsk_gaussian_filter.32f"))
         self.connect(self.fmmod,
-                     gr.file_sink(gr.sizeof_gr_complex, "fmmod.dat"))
+                     gr.file_sink(gr.sizeof_gr_complex, "tx_gmsk_fmmod.32fc"))
 
 
     def add_options(parser):
@@ -162,10 +165,8 @@ class gmsk_demod(gr.hier_block2):
 
     def __init__(self,
                  samples_per_symbol=_def_samples_per_symbol,
-                 gain_mu=_def_gain_mu,
-                 mu=_def_mu,
-                 omega_relative_limit=_def_omega_relative_limit,
-                 freq_error=_def_freq_error,
+                 bt=_def_bt,
+                 timing_bw=_def_timing_bw,
                  verbose=_def_verbose,
                  log=_def_log):
         """
@@ -177,21 +178,12 @@ class gmsk_demod(gr.hier_block2):
 
 	@param samples_per_symbol: samples per baud
 	@type samples_per_symbol: integer
+        @param timing_bw: timing recovery loop lock-in bandwidth
+        @type timing_bw: float
         @param verbose: Print information about modulator?
         @type verbose: bool
         @param log: Print modualtion data to files?
         @type log: bool 
-
-        Clock recovery parameters.  These all have reasonble defaults.
-        
-        @param gain_mu: controls rate of mu adjustment
-        @type gain_mu: float
-        @param mu: fractional delay [0.0, 1.0]
-        @type mu: float
-        @param omega_relative_limit: sets max variation in omega
-        @type omega_relative_limit: float, typically 0.000200 (200 ppm)
-        @param freq_error: bit rate error as a fraction
-        @param float
 	"""
 
 	gr.hier_block2.__init__(self, "gmsk_demod",
@@ -199,33 +191,33 @@ class gmsk_demod(gr.hier_block2):
 				gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
 
         self._samples_per_symbol = samples_per_symbol
-        self._gain_mu = gain_mu
-        self._mu = mu
-        self._omega_relative_limit = omega_relative_limit
-        self._freq_error = freq_error
+        self._bt = bt
+        self._timing_bw = timing_bw
+        self._timing_max_dev= _def_timing_max_dev
+
+        self._differential = False # make consistant with other modulators
         
         if samples_per_symbol < 2:
             raise TypeError, "samples_per_symbol >= 2, is %f" % samples_per_symbol
 
-        self._omega = samples_per_symbol*(1+self._freq_error)
-
-        if not self._gain_mu:
-            self._gain_mu = 0.175
-            
-	self._gain_omega = .25 * self._gain_mu * self._gain_mu        # critically damped
-
 	# Demodulate FM
 	sensitivity = (pi / 2) / samples_per_symbol
 	self.fmdemod = gr.quadrature_demod_cf(1.0 / sensitivity)
 
 	# the clock recovery block tracks the symbol clock and resamples as needed.
 	# the output of the block is a stream of soft symbols (float)
-	self.clock_recovery = gr.clock_recovery_mm_ff(self._omega, self._gain_omega,
-                                                      self._mu, self._gain_mu,
-                                                      self._omega_relative_limit)
-
+        nfilts = 32
+        ntaps = 11 * int(self._samples_per_symbol*nfilts) 
+	taps = gr.firdes.gaussian(nfilts,
+                                  nfilts*self._samples_per_symbol,
+                                  self._bt, ntaps)
+        self.clock_recovery = \
+            gr.pfb_clock_sync_fff(self._samples_per_symbol,
+                                  self._timing_bw, taps,
+                                  nfilts, nfilts//2, self._timing_max_dev)
+            
         # slice the floats at 0, outputting 1 bit (the LSB of the output byte) per sample
-        self.slicer = gr.binary_slicer_fb()
+        self.slicer = digital_swig.binary_slicer_fb()
 
         if verbose:
             self._print_verbage()
@@ -245,35 +237,28 @@ class gmsk_demod(gr.hier_block2):
 
 
     def _print_verbage(self):
-        print "bits per symbol = %d" % self.bits_per_symbol()
-        print "M&M clock recovery omega = %f" % self._omega
-        print "M&M clock recovery gain mu = %f" % self._gain_mu
-        print "M&M clock recovery mu = %f" % self._mu
-        print "M&M clock recovery omega rel. limit = %f" % self._omega_relative_limit
-        print "frequency error = %f" % self._freq_error
+        print "bits per symbol:     %d" % self.bits_per_symbol()
+        print "Bandwidth-Time Prod: %f" % self._bt
+        print "Timing bandwidth:    %.2e" % self._timing_bw
 
 
     def _setup_logging(self):
         print "Demodulation logging turned on."
         self.connect(self.fmdemod,
-                    gr.file_sink(gr.sizeof_float, "fmdemod.dat"))
+                    gr.file_sink(gr.sizeof_float, "rx_gmsk_fmdemod.32f"))
         self.connect(self.clock_recovery,
-                    gr.file_sink(gr.sizeof_float, "clock_recovery.dat"))
+                    gr.file_sink(gr.sizeof_float, "rx_gmsk_clock_recovery.32f"))
         self.connect(self.slicer,
-                    gr.file_sink(gr.sizeof_char, "slicer.dat"))
+                    gr.file_sink(gr.sizeof_char, "rx_gmsk_slicer.8b"))
 
     def add_options(parser):
         """
         Adds GMSK demodulation-specific options to the standard parser
         """
-        parser.add_option("", "--gain-mu", type="float", default=_def_gain_mu,
-                          help="M&M clock recovery gain mu [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--mu", type="float", default=_def_mu,
-                          help="M&M clock recovery mu [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--omega-relative-limit", type="float", default=_def_omega_relative_limit,
-                          help="M&M clock recovery omega relative limit [default=%default] (GMSK/PSK)")
-        parser.add_option("", "--freq-error", type="float", default=_def_freq_error,
-                          help="M&M clock recovery frequency error [default=%default] (GMSK)")
+        parser.add_option("", "--timing-bw", type="float", default=_def_timing_bw,
+                          help="set timing symbol sync loop gain lock-in bandwidth [default=%default]")
+        parser.add_option("", "--bt", type="float", default=_def_bt,
+                          help="set bandwidth-time product [default=%default] (GMSK)")
     add_options=staticmethod(add_options)
 
     def extract_kwargs_from_options(options):
@@ -281,10 +266,9 @@ class gmsk_demod(gr.hier_block2):
         Given command line options, create dictionary suitable for passing to __init__
         """
         return modulation_utils.extract_kwargs_from_options(gmsk_demod.__init__,
-                                                            ('self',), options)
+                                                             ('self',), options)
     extract_kwargs_from_options=staticmethod(extract_kwargs_from_options)
 
-
 #
 # Add these to the mod/demod registry
 #
diff --git a/gnuradio-core/src/python/gnuradio/modulation_utils.py b/gr-digital/python/modulation_utils.py
index 71ba77389..cb3a9812d 100644
--- a/gnuradio-core/src/python/gnuradio/modulation_utils.py
+++ b/gr-digital/python/modulation_utils.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -47,6 +47,15 @@ def type_1_demods():
 def add_type_1_demod(name, demod_class):
     _type_1_demodulators[name] = demod_class
 
+# Also record the constellation making functions of the modulations
+_type_1_constellations = {}
+
+def type_1_constellations():
+    return _type_1_constellations
+
+def add_type_1_constellation(name, constellation):
+    _type_1_constellations[name] = constellation
+
 
 def extract_kwargs_from_options(function, excluded_args, options):
     """
@@ -71,6 +80,7 @@ def extract_kwargs_from_options(function, excluded_args, options):
     @param options: result of command argument parsing
     @type options: optparse.Values
     """
+    
     # Try this in C++ ;)
     args, varargs, varkw, defaults = inspect.getargspec(function)
     d = {}
@@ -79,3 +89,14 @@ def extract_kwargs_from_options(function, excluded_args, options):
             if getattr(options, kw) is not None:
                 d[kw] = getattr(options, kw)
     return d
+
+def extract_kwargs_from_options_for_class(cls, options):
+    """
+    Given command line options, create dictionary suitable for passing to __init__
+    """
+    d = extract_kwargs_from_options(
+        cls.__init__, ('self',), options)
+    for base in cls.__bases__:
+        if hasattr(base, 'extract_kwargs_from_options'):
+            d.update(base.extract_kwargs_from_options(options))
+    return d
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py b/gr-digital/python/ofdm.py
index 2663f7cf8..9f57920ef 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
+++ b/gr-digital/python/ofdm.py
@@ -21,13 +21,13 @@
 # 
 
 import math
-from gnuradio import gr, ofdm_packet_utils
+from gnuradio import gr
+import digital_swig
+import ofdm_packet_utils
+from ofdm_receiver import ofdm_receiver
 import gnuradio.gr.gr_threading as _threading
 import psk, qam
 
-from gnuradio.blks2impl.ofdm_receiver import ofdm_receiver
-
-
 # /////////////////////////////////////////////////////////////////////////////
 #                   mod/demod with packets as i/o
 # /////////////////////////////////////////////////////////////////////////////
@@ -89,17 +89,24 @@ class ofdm_mod(gr.hier_block2):
         if self._modulation == "qpsk":
             rot = (0.707+0.707j)
             
+        # FIXME: pass the constellation objects instead of just the points
         if(self._modulation.find("psk") >= 0):
-            rotated_const = map(lambda pt: pt * rot, psk.gray_constellation[arity])
+            constel = psk.psk_constellation(arity)
+            rotated_const = map(lambda pt: pt * rot, constel.points())
         elif(self._modulation.find("qam") >= 0):
-            rotated_const = map(lambda pt: pt * rot, qam.constellation[arity])
+            constel = qam.qam_constellation(arity)
+            rotated_const = map(lambda pt: pt * rot, constel.points())
         #print rotated_const
-        self._pkt_input = gr.ofdm_mapper_bcv(rotated_const, msgq_limit,
-                                             options.occupied_tones, options.fft_length)
+        self._pkt_input = digital_swig.ofdm_mapper_bcv(rotated_const,
+                                                       msgq_limit,
+                                                       options.occupied_tones,
+                                                       options.fft_length)
         
-        self.preambles = gr.ofdm_insert_preamble(self._fft_length, padded_preambles)
+        self.preambles = digital_swig.ofdm_insert_preamble(self._fft_length,
+                                                           padded_preambles)
         self.ifft = gr.fft_vcc(self._fft_length, False, win, True)
-        self.cp_adder = gr.ofdm_cyclic_prefixer(self._fft_length, symbol_length)
+        self.cp_adder = digital_swig.ofdm_cyclic_prefixer(self._fft_length,
+                                                          symbol_length)
         self.scale = gr.multiply_const_cc(1.0 / math.sqrt(self._fft_length))
         
         self.connect((self._pkt_input, 0), (self.preambles, 0))
@@ -130,7 +137,9 @@ class ofdm_mod(gr.hier_block2):
             msg = gr.message(1) # tell self._pkt_input we're not sending any more packets
         else:
             # print "original_payload =", string_to_hex_list(payload)
-            pkt = ofdm_packet_utils.make_packet(payload, 1, 1, self._pad_for_usrp, whitening=True)
+            pkt = ofdm_packet_utils.make_packet(payload, 1, 1,
+                                                self._pad_for_usrp,
+                                                whitening=True)
             
             #print "pkt =", string_to_hex_list(pkt)
             msg = gr.message_from_string(pkt)
@@ -205,10 +214,12 @@ class ofdm_demod(gr.hier_block2):
 
         # hard-coded known symbols
         preambles = (ksfreq,)
-        
+
         symbol_length = self._fft_length + self._cp_length
-        self.ofdm_recv = ofdm_receiver(self._fft_length, self._cp_length,
-                                       self._occupied_tones, self._snr, preambles,
+        self.ofdm_recv = ofdm_receiver(self._fft_length,
+                                       self._cp_length,
+                                       self._occupied_tones,
+                                       self._snr, preambles,
                                        options.log)
 
         mods = {"bpsk": 2, "qpsk": 4, "8psk": 8, "qam8": 8, "qam16": 16, "qam64": 64, "qam256": 256}
@@ -218,18 +229,21 @@ class ofdm_demod(gr.hier_block2):
         if self._modulation == "qpsk":
             rot = (0.707+0.707j)
 
+        # FIXME: pass the constellation objects instead of just the points
         if(self._modulation.find("psk") >= 0):
-            rotated_const = map(lambda pt: pt * rot, psk.gray_constellation[arity])
+            constel = psk.psk_constellation(arity)
+            rotated_const = map(lambda pt: pt * rot, constel.points())
         elif(self._modulation.find("qam") >= 0):
-            rotated_const = map(lambda pt: pt * rot, qam.constellation[arity])
+            constel = qam.qam_constellation(arity)
+            rotated_const = map(lambda pt: pt * rot, constel.points())
         #print rotated_const
 
         phgain = 0.25
         frgain = phgain*phgain / 4.0
-        self.ofdm_demod = gr.ofdm_frame_sink(rotated_const, range(arity),
-                                             self._rcvd_pktq,
-                                             self._occupied_tones,
-                                             phgain, frgain)
+        self.ofdm_demod = digital_swig.ofdm_frame_sink(rotated_const, range(arity),
+                                                       self._rcvd_pktq,
+                                                       self._occupied_tones,
+                                                       phgain, frgain)
 
         self.connect(self, self.ofdm_recv)
         self.connect((self.ofdm_recv, 0), (self.ofdm_demod, 0))
@@ -240,9 +254,12 @@ class ofdm_demod(gr.hier_block2):
         self.connect(self.ofdm_recv.chan_filt, self)
 
         if options.log:
-            self.connect(self.ofdm_demod, gr.file_sink(gr.sizeof_gr_complex*self._occupied_tones, "ofdm_frame_sink_c.dat"))
+            self.connect(self.ofdm_demod,
+                         gr.file_sink(gr.sizeof_gr_complex*self._occupied_tones,
+                                      "ofdm_frame_sink_c.dat"))
         else:
-            self.connect(self.ofdm_demod, gr.null_sink(gr.sizeof_gr_complex*self._occupied_tones))
+            self.connect(self.ofdm_demod,
+                         gr.null_sink(gr.sizeof_gr_complex*self._occupied_tones))
 
         if options.verbose:
             self._print_verbage()
@@ -261,6 +278,8 @@ class ofdm_demod(gr.hier_block2):
                           help="set the number of occupied FFT bins [default=%default]")
         expert.add_option("", "--cp-length", type="intx", default=128,
                           help="set the number of bits in the cyclic prefix [default=%default]")
+        expert.add_option("", "--snr", type="float", default=30.0,
+                          help="SNR estimate [default=%default]")
     # Make a static method to call before instantiation
     add_options = staticmethod(add_options)
 
diff --git a/gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py b/gr-digital/python/ofdm_packet_utils.py
index f151ffe74..d0000e6db 100644
--- a/gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py
+++ b/gr-digital/python/ofdm_packet_utils.py
@@ -22,6 +22,7 @@
 import struct
 import numpy
 from gnuradio import gru
+import crc
 
 def conv_packed_binary_string_to_1_0_string(s):
     """
@@ -116,7 +117,7 @@ def make_packet(payload, samples_per_symbol, bits_per_symbol,
     if not whitener_offset >=0 and whitener_offset < 16:
         raise ValueError, "whitener_offset must be between 0 and 15, inclusive (%i)" % (whitener_offset,)
 
-    payload_with_crc = gru.gen_and_append_crc32(payload)
+    payload_with_crc = crc.gen_and_append_crc32(payload)
     #print "outbound crc =", string_to_hex_list(payload_with_crc[-4:])
 
     L = len(payload_with_crc)
@@ -180,7 +181,7 @@ def unmake_packet(whitened_payload_with_crc, whitener_offset=0, dewhitening=1):
     else:
         payload_with_crc = whitened_payload_with_crc
 
-    ok, payload = gru.check_crc32(payload_with_crc)
+    ok, payload = crc.check_crc32(payload_with_crc)
 
     if 0:
         print "payload_with_crc =", string_to_hex_list(payload_with_crc)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py b/gr-digital/python/ofdm_receiver.py
index 56ae0c0f0..9d4d6e559 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
+++ b/gr-digital/python/ofdm_receiver.py
@@ -23,10 +23,12 @@
 import math
 from numpy import fft
 from gnuradio import gr
-from gnuradio.blks2impl.ofdm_sync_ml import ofdm_sync_ml
-from gnuradio.blks2impl.ofdm_sync_pn import ofdm_sync_pn
-from gnuradio.blks2impl.ofdm_sync_pnac import ofdm_sync_pnac
-from gnuradio.blks2impl.ofdm_sync_fixed import ofdm_sync_fixed
+
+import digital_swig
+from ofdm_sync_pn import ofdm_sync_pn
+from ofdm_sync_fixed import ofdm_sync_fixed
+from ofdm_sync_pnac import ofdm_sync_pnac
+from ofdm_sync_ml import ofdm_sync_ml
 
 class ofdm_receiver(gr.hier_block2):
     """
@@ -85,29 +87,45 @@ class ofdm_receiver(gr.hier_block2):
 
         SYNC = "pn"
         if SYNC == "ml":
-            nco_sensitivity = -1.0/fft_length                             # correct for fine frequency
-            self.ofdm_sync = ofdm_sync_ml(fft_length, cp_length, snr, ks0time, logging)
+            nco_sensitivity = -1.0/fft_length   # correct for fine frequency
+            self.ofdm_sync = ofdm_sync_ml(fft_length,
+                                          cp_length,
+                                          snr,
+                                          ks0time,
+                                          logging)
         elif SYNC == "pn":
-            nco_sensitivity = -2.0/fft_length                             # correct for fine frequency
-            self.ofdm_sync = ofdm_sync_pn(fft_length, cp_length, logging)
+            nco_sensitivity = -2.0/fft_length   # correct for fine frequency
+            self.ofdm_sync = ofdm_sync_pn(fft_length,
+                                          cp_length,
+                                          logging)
         elif SYNC == "pnac":
-            nco_sensitivity = -2.0/fft_length                             # correct for fine frequency
-            self.ofdm_sync = ofdm_sync_pnac(fft_length, cp_length, ks0time, logging)
-        elif SYNC == "fixed":                                             # for testing only; do not user over the air
-            self.chan_filt = gr.multiply_const_cc(1.0)                    # remove filter and filter delay for this
-            nsymbols = 18                                                 # enter the number of symbols per packet
-            freq_offset = 0.0                                             # if you use a frequency offset, enter it here
-            nco_sensitivity = -2.0/fft_length                             # correct for fine frequency
-            self.ofdm_sync = ofdm_sync_fixed(fft_length, cp_length, nsymbols, freq_offset, logging)
+            nco_sensitivity = -2.0/fft_length   # correct for fine frequency
+            self.ofdm_sync = ofdm_sync_pnac(fft_length,
+                                            cp_length,
+                                            ks0time,
+                                            logging)
+        # for testing only; do not user over the air
+        # remove filter and filter delay for this
+        elif SYNC == "fixed":
+            self.chan_filt = gr.multiply_const_cc(1.0) 
+            nsymbols = 18      # enter the number of symbols per packet
+            freq_offset = 0.0  # if you use a frequency offset, enter it here
+            nco_sensitivity = -2.0/fft_length   # correct for fine frequency
+            self.ofdm_sync = ofdm_sync_fixed(fft_length,
+                                             cp_length,
+                                             nsymbols,
+                                             freq_offset,
+                                             logging)
 
         # Set up blocks
 
         self.nco = gr.frequency_modulator_fc(nco_sensitivity)         # generate a signal proportional to frequency error of sync block
         self.sigmix = gr.multiply_cc()
-        self.sampler = gr.ofdm_sampler(fft_length, fft_length+cp_length)
+        self.sampler = digital_swig.ofdm_sampler(fft_length, fft_length+cp_length)
         self.fft_demod = gr.fft_vcc(fft_length, True, win, True)
-        self.ofdm_frame_acq = gr.ofdm_frame_acquisition(occupied_tones, fft_length,
-                                                        cp_length, ks[0])
+        self.ofdm_frame_acq = digital_swig.ofdm_frame_acquisition(occupied_tones,
+                                                                  fft_length,
+                                                                  cp_length, ks[0])
 
         self.connect(self, self.chan_filt)                            # filter the input channel
         self.connect(self.chan_filt, self.ofdm_sync)                  # into the synchronization alg.
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py b/gr-digital/python/ofdm_sync_fixed.py
index 9bac789bf..9bac789bf 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
+++ b/gr-digital/python/ofdm_sync_fixed.py
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py b/gr-digital/python/ofdm_sync_ml.py
index 7c75d7f1d..7c75d7f1d 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py
+++ b/gr-digital/python/ofdm_sync_ml.py
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py b/gr-digital/python/ofdm_sync_pn.py
index 05b1de2e1..05b1de2e1 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
+++ b/gr-digital/python/ofdm_sync_pn.py
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pnac.py b/gr-digital/python/ofdm_sync_pnac.py
index 10a125964..10a125964 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pnac.py
+++ b/gr-digital/python/ofdm_sync_pnac.py
diff --git a/gnuradio-core/src/python/gnuradio/packet_utils.py b/gr-digital/python/packet_utils.py
index e36b05413..2e216ff50 100644
--- a/gnuradio-core/src/python/gnuradio/packet_utils.py
+++ b/gr-digital/python/packet_utils.py
@@ -22,7 +22,7 @@
 import struct
 import numpy
 from gnuradio import gru
-
+import crc
 
 def conv_packed_binary_string_to_1_0_string(s):
     """
@@ -127,7 +127,7 @@ def make_packet(payload, samples_per_symbol, bits_per_symbol,
     (packed_access_code, padded) = conv_1_0_string_to_packed_binary_string(access_code)
     (packed_preamble, ignore) = conv_1_0_string_to_packed_binary_string(preamble)
     
-    payload_with_crc = gru.gen_and_append_crc32(payload)
+    payload_with_crc = crc.gen_and_append_crc32(payload)
     #print "outbound crc =", string_to_hex_list(payload_with_crc[-4:])
 
     L = len(payload_with_crc)
@@ -184,7 +184,7 @@ def unmake_packet(whitened_payload_with_crc, whitener_offset=0, dewhitening=True
     else:
         payload_with_crc = (whitened_payload_with_crc)
 
-    ok, payload = gru.check_crc32(payload_with_crc)
+    ok, payload = crc.check_crc32(payload_with_crc)
 
     if 0:
         print "payload_with_crc =", string_to_hex_list(payload_with_crc)
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/pkt.py b/gr-digital/python/pkt.py
index 908437ef2..8650bdbb0 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/pkt.py
+++ b/gr-digital/python/pkt.py
@@ -20,8 +20,10 @@
 # 
 
 from math import pi
-from gnuradio import gr, packet_utils
+from gnuradio import gr
 import gnuradio.gr.gr_threading as _threading
+import packet_utils
+import digital_swig
 
 
 # /////////////////////////////////////////////////////////////////////////////
@@ -34,7 +36,8 @@ class mod_pkts(gr.hier_block2):
 
     Send packets by calling send_pkt
     """
-    def __init__(self, modulator, access_code=None, msgq_limit=2, pad_for_usrp=True, use_whitener_offset=False):
+    def __init__(self, modulator, access_code=None, msgq_limit=2, pad_for_usrp=True,
+                 use_whitener_offset=False, modulate=True):
         """
 	Hierarchical block for sending packets
 
@@ -138,7 +141,7 @@ class demod_pkts(gr.hier_block2):
             threshold = 12              # FIXME raise exception
 
         self._rcvd_pktq = gr.msg_queue()          # holds packets from the PHY
-        self.correlator = gr.correlate_access_code_bb(access_code, threshold)
+        self.correlator = digital_swig.correlate_access_code_bb(access_code, threshold)
 
         self.framer_sink = gr.framer_sink_1(self._rcvd_pktq)
         self.connect(self, self._demodulator, self.correlator, self.framer_sink)
diff --git a/gr-digital/python/psk.py b/gr-digital/python/psk.py
new file mode 100644
index 000000000..58f6787f0
--- /dev/null
+++ b/gr-digital/python/psk.py
@@ -0,0 +1,122 @@
+#
+# Copyright 2005,2006,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.
+# 
+
+"""
+PSK modulation and demodulation.
+"""
+
+from math import pi, log
+from cmath import exp
+
+import digital_swig
+import modulation_utils
+from utils import mod_codes, gray_code
+from generic_mod_demod import generic_mod, generic_demod
+
+# Default number of points in constellation.
+_def_constellation_points = 4
+# The default encoding (e.g. gray-code, set-partition)
+_def_mod_code = mod_codes.GRAY_CODE
+
+def create_encodings(mod_code, arity):
+    post_diff_code = None
+    if mod_code not in mod_codes.codes:
+        raise ValueError('That modulation code does not exist.')
+    if mod_code == mod_codes.GRAY_CODE:
+        pre_diff_code = gray_code.gray_code(arity)
+    elif mod_code == mod_codes.SET_PARTITION_CODE:
+        pre_diff_code = set_partition_code.set_partition_code(arity) 
+    elif mod_code == mod_codes.NO_CODE:
+        pre_diff_code = []
+    else:
+        raise ValueError('That modulation code is not implemented for this constellation.')
+    return (pre_diff_code, post_diff_code)
+    
+# /////////////////////////////////////////////////////////////////////////////
+#                           PSK constellation
+# /////////////////////////////////////////////////////////////////////////////
+
+def psk_constellation(m=_def_constellation_points, mod_code=_def_mod_code):
+    """
+    Creates a PSK constellation object.
+    """
+    k = log(m) / log(2.0)
+    if (k != int(k)):
+        raise StandardError('Number of constellation points must be a power of two.')
+    points = [exp(2*pi*(0+1j)*i/m) for i in range(0,m)]
+    pre_diff_code, post_diff_code = create_encodings(mod_code, m)
+    if post_diff_code is not None:
+        inverse_post_diff_code = mod_codes.invert_code(post_diff_code)
+        points = [points[x] for x in inverse_post_diff_code]
+    constellation = digital_swig.constellation_psk(points, pre_diff_code, m)
+    return constellation
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           PSK modulator
+# /////////////////////////////////////////////////////////////////////////////
+
+class psk_mod(generic_mod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 mod_code=_def_mod_code,
+                 *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered PSK modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_mod block for list of parameters.
+	"""
+
+        constellation = psk_constellation(constellation_points, mod_code)
+        super(psk_mod, self).__init__(constellation, *args, **kwargs)
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           PSK demodulator
+#
+# /////////////////////////////////////////////////////////////////////////////
+
+class psk_demod(generic_demod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 mod_code=_def_mod_code,
+                 *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered PSK modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_demod block for list of parameters.
+        """
+
+        constellation = psk_constellation(constellation_points, mod_code)
+        super(psk_demod, self).__init__(constellation, *args, **kwargs)
+
+#
+# Add these to the mod/demod registry
+#
+modulation_utils.add_type_1_mod('psk', psk_mod)
+modulation_utils.add_type_1_demod('psk', psk_demod)
+modulation_utils.add_type_1_constellation('psk', psk_constellation)
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_constellation_decoder_cb.py b/gr-digital/python/qa_binary_slicer_fb.py
index 27e1802e0..944dc1b5a 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_constellation_decoder_cb.py
+++ b/gr-digital/python/qa_binary_slicer_fb.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2007,2010 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,7 +21,8 @@
 # 
 
 from gnuradio import gr, gr_unittest
-import math
+import digital_swig
+import math, random
 
 class test_constellation_decoder (gr_unittest.TestCase):
 
@@ -31,17 +32,18 @@ class test_constellation_decoder (gr_unittest.TestCase):
     def tearDown (self):
         self.tb = None
 
-    def test_constellation_decoder_cb (self):
-        symbol_positions  = [1 + 0j, 0 + 1j , -1 + 0j, 0 - 1j]
-        symbol_values_out = [0, 1, 2, 3]
-	expected_result = (       0,          3,           2,            1,        0,       0,          3)
-  	src_data =        (0.5 + 0j, 0.1 - 1.2j, -0.8 - 0.1j, -0.45 + 0.8j, 0.8 - 0j, 0.5 + 0j, 0.1 - 1.2j)
-        src = gr.vector_source_c (src_data)
-        op = gr.constellation_decoder_cb (symbol_positions, symbol_values_out)
+    def test_binary_slicer_fb (self):
+	expected_result = ( 0, 1,  0,  0, 1, 1,  0,  0,  0, 1, 1, 1,  0, 1, 1, 1, 1)
+  	src_data =        (-1, 1, -1, -1, 1, 1, -1, -1, -1, 1, 1, 1, -1, 1, 1, 1, 1)
+        src_data = [s + (1 - random.random()) for s in src_data] # add some noise
+        src = gr.vector_source_f (src_data)
+        op = digital_swig.binary_slicer_fb ()
         dst = gr.vector_sink_b ()
+
         self.tb.connect (src, op)
         self.tb.connect (op, dst)
         self.tb.run ()               # run the graph and wait for it to finish
+
         actual_result = dst.data ()  # fetch the contents of the sink
 	#print "actual result", actual_result
 	#print "expected result", expected_result
diff --git a/gr-digital/python/qa_clock_recovery_mm.py b/gr-digital/python/qa_clock_recovery_mm.py
new file mode 100755
index 000000000..f4c345b03
--- /dev/null
+++ b/gr-digital/python/qa_clock_recovery_mm.py
@@ -0,0 +1,176 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig
+import random, cmath
+
+class test_clock_recovery_mm(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test01 (self):
+        # Test complex/complex version
+        omega = 2
+        gain_omega = 0.001
+        mu = 0.5
+        gain_mu = 0.01
+        omega_rel_lim = 0.001
+
+        self.test = digital_swig.clock_recovery_mm_cc(omega, gain_omega,
+                                                      mu, gain_mu,
+                                                      omega_rel_lim)
+        
+        data = 100*[complex(1, 1),]
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+        
+        expected_result = 100*[complex(0.99972, 0.99972)] # doesn't quite get to 1.0
+        dst_data = self.snk.data()
+
+        # Only compare last Ncmp samples
+        Ncmp = 30
+        len_e = len(expected_result)
+        len_d = len(dst_data)
+        expected_result = expected_result[len_e - Ncmp:]
+        dst_data = dst_data[len_d - Ncmp:]
+
+        #print expected_result
+        #print dst_data
+        
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 5)
+
+
+    def test02 (self):
+        # Test float/float version
+        omega = 2
+        gain_omega = 0.01
+        mu = 0.5
+        gain_mu = 0.01
+        omega_rel_lim = 0.001
+
+        self.test = digital_swig.clock_recovery_mm_ff(omega, gain_omega,
+                                                      mu, gain_mu,
+                                                      omega_rel_lim)
+        
+        data = 100*[1,]
+        self.src = gr.vector_source_f(data, False)
+        self.snk = gr.vector_sink_f()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+        
+        expected_result = 100*[0.99972, ] # doesn't quite get to 1.0
+        dst_data = self.snk.data()
+
+        # Only compare last Ncmp samples
+        Ncmp = 30
+        len_e = len(expected_result)
+        len_d = len(dst_data)
+        expected_result = expected_result[len_e - Ncmp:]
+        dst_data = dst_data[len_d - Ncmp:]
+
+        #print expected_result
+        #print dst_data
+        
+        self.assertFloatTuplesAlmostEqual (expected_result, dst_data, 5)
+
+
+    def test03 (self):
+        # Test complex/complex version with varying input
+        omega = 2
+        gain_omega = 0.01
+        mu = 0.25
+        gain_mu = 0.1
+        omega_rel_lim = 0.0001
+
+        self.test = digital_swig.clock_recovery_mm_cc(omega, gain_omega,
+                                                      mu, gain_mu,
+                                                      omega_rel_lim)
+        
+        data = 1000*[complex(1, 1), complex(1, 1), complex(-1, -1), complex(-1, -1)]
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+        
+        expected_result = 1000*[complex(-1.2, -1.2), complex(1.2, 1.2)]
+        dst_data = self.snk.data()
+
+        # Only compare last Ncmp samples
+        Ncmp = 100
+        len_e = len(expected_result)
+        len_d = len(dst_data)
+        expected_result = expected_result[len_e - Ncmp:]
+        dst_data = dst_data[len_d - Ncmp:]
+        
+        #print expected_result
+        #print dst_data
+        
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 1)
+
+
+    def test04 (self):
+        # Test float/float version
+        omega = 2
+        gain_omega = 0.01
+        mu = 0.25
+        gain_mu = 0.1
+        omega_rel_lim = 0.001
+
+        self.test = digital_swig.clock_recovery_mm_ff(omega, gain_omega,
+                                                      mu, gain_mu,
+                                                      omega_rel_lim)
+        
+        data = 1000*[1, 1, -1, -1]
+        self.src = gr.vector_source_f(data, False)
+        self.snk = gr.vector_sink_f()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+        
+        expected_result = 1000*[-1.31, 1.31]
+        dst_data = self.snk.data()
+
+        # Only compare last Ncmp samples
+        Ncmp = 100
+        len_e = len(expected_result)
+        len_d = len(dst_data)
+        expected_result = expected_result[len_e - Ncmp:]
+        dst_data = dst_data[len_d - Ncmp:]
+
+        #print expected_result
+        #print dst_data
+        
+        self.assertFloatTuplesAlmostEqual (expected_result, dst_data, 1)
+
+
+if __name__ == '__main__':
+    gr_unittest.run(test_clock_recovery_mm, "test_clock_recovery_mm.xml")
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_cma_equalizer.py b/gr-digital/python/qa_cma_equalizer.py
index 79e9cd092..75fb0f05e 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_cma_equalizer.py
+++ b/gr-digital/python/qa_cma_equalizer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2006,2007,2010 Free Software Foundation, Inc.
+# Copyright 2006,2007,2010,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,6 +21,7 @@
 # 
 
 from gnuradio import gr, gr_unittest
+import digital_swig
 
 class test_cma_equalizer_fir(gr_unittest.TestCase):
 
@@ -32,7 +33,7 @@ class test_cma_equalizer_fir(gr_unittest.TestCase):
     	
     def transform(self, src_data):
 	SRC = gr.vector_source_c(src_data, False)
-	EQU = gr.cma_equalizer_cc(4, 1.0, .001)
+	EQU = digital_swig.cma_equalizer_cc(4, 1.0, .001, 1)
 	DST = gr.vector_sink_c()
 	self.tb.connect(SRC, EQU, DST)
 	self.tb.run()
diff --git a/gr-digital/python/qa_constellation.py b/gr-digital/python/qa_constellation.py
new file mode 100755
index 000000000..b17d2a0fc
--- /dev/null
+++ b/gr-digital/python/qa_constellation.py
@@ -0,0 +1,204 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+import random
+from cmath import exp, pi, log
+
+from gnuradio import gr, gr_unittest, blks2
+from utils import mod_codes
+import digital_swig
+
+# import from local folder
+import psk
+import qam
+
+tested_mod_codes = (mod_codes.NO_CODE, mod_codes.GRAY_CODE)
+
+# A list of the constellations to test.
+# Each constellation is given by a 3-tuple.
+# First item is a function to generate the constellation
+# Second item is a dictionary of arguments for function with lists of
+# possible values.
+# Third item is whether differential encoding should be tested.
+# Fourth item is the name of the argument to constructor that specifices
+# whether differential encoding is used.
+
+def twod_constell():
+    """
+    
+    """
+    points = ((1+0j), (0+1j),
+              (-1+0j), (0-1j))
+    rot_sym = 2
+    dim = 2
+    return digital_swig.constellation_calcdist(points, [], rot_sym, dim)
+
+def threed_constell():
+    oned_points = ((1+0j), (0+1j), (-1+0j), (0-1j))
+    points = []
+    r4 = range(0, 4)
+    for ia in r4:
+        for ib in r4:
+            for ic in r4:
+                points += [oned_points[ia], oned_points[ib], oned_points[ic]]
+    rot_sym = 4
+    dim = 3
+    return digital_swig.constellation_calcdist(points, [], rot_sym, dim)
+
+tested_constellation_info = (
+    (psk.psk_constellation,
+     {'m': (2, 4, 8, 16, 32, 64),
+      'mod_code': tested_mod_codes, },
+     True, None),
+    (digital_swig.constellation_bpsk, {}, True, None),
+    (digital_swig.constellation_qpsk, {}, False, None),
+    (digital_swig.constellation_dqpsk, {}, True, None),
+    (digital_swig.constellation_8psk, {}, False, None),
+    (twod_constell, {}, True, None),
+    (threed_constell, {}, True, None),
+    )
+
+def tested_constellations():
+    """
+    Generator to produce (constellation, differential) tuples for testing purposes.
+    """
+    for constructor, poss_args, differential, diff_argname in tested_constellation_info:
+        if differential:
+            diff_poss = (True, False)
+        else:
+            diff_poss = (False,)
+        poss_args = [[argname, argvalues, 0] for argname, argvalues in poss_args.items()]
+        for current_diff in diff_poss:
+            # Add an index into args to keep track of current position in argvalues
+            while True:
+                current_args = dict([(argname, argvalues[argindex])
+                                     for argname, argvalues, argindex in poss_args])
+                if diff_argname is not None:
+                    current_args[diff_argname] = current_diff
+                constellation = constructor(**current_args)
+                yield (constellation, current_diff)
+                for this_poss_arg in poss_args:
+                    argname, argvalues, argindex = this_poss_arg
+                    if argindex < len(argvalues) - 1:
+                        this_poss_arg[2] += 1
+                        break
+                    else:
+                        this_poss_arg[2] = 0
+                if sum([argindex for argname, argvalues, argindex in poss_args]) == 0:
+                    break
+            
+
+class test_constellation (gr_unittest.TestCase):
+
+    src_length = 256
+
+    def setUp(self):
+        # Generate a list of random bits.
+        self.src_data = tuple([random.randint(0,1) for i in range(0, self.src_length)])
+
+    def tearDown(self):
+        pass
+
+    def test_hard_decision(self):
+        for constellation, differential in tested_constellations():
+            if differential:
+                rs = constellation.rotational_symmetry()
+                rotations = [exp(i*2*pi*(0+1j)/rs) for i in range(0, rs)] 
+            else:
+                rotations = [None]
+            for rotation in rotations:
+                src = gr.vector_source_b(self.src_data)
+                content = mod_demod(constellation, differential, rotation)
+                dst = gr.vector_sink_b()
+                self.tb = gr.top_block()
+                self.tb.connect(src, content, dst)
+                self.tb.run()
+                data = dst.data()
+                # Don't worry about cut off data for now.
+                first = constellation.bits_per_symbol()
+                self.assertEqual (self.src_data[first:len(data)], data[first:])
+
+
+class mod_demod(gr.hier_block2):
+    def __init__(self, constellation, differential, rotation):
+        if constellation.arity() > 256:
+            # If this becomes limiting some of the blocks should be generalised so
+            # that they can work with shorts and ints as well as chars.
+            raise ValueError("Constellation cannot contain more than 256 points.")
+
+	gr.hier_block2.__init__(self, "mod_demod",
+				gr.io_signature(1, 1, gr.sizeof_char),       # Input signature
+				gr.io_signature(1, 1, gr.sizeof_char))       # Output signature
+
+        arity = constellation.arity()
+
+        # TX
+        self.constellation = constellation
+        self.differential = differential
+        self.blocks = [self]
+        # We expect a stream of unpacked bits.
+        # First step is to pack them.
+        self.blocks.append(
+            gr.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST))
+        # Second step we unpack them such that we have k bits in each byte where
+        # each constellation symbol hold k bits.
+        self.blocks.append(
+            gr.packed_to_unpacked_bb(self.constellation.bits_per_symbol(),
+                                     gr.GR_MSB_FIRST))
+        # Apply any pre-differential coding
+        # Gray-coding is done here if we're also using differential coding.
+        if self.constellation.apply_pre_diff_code():
+            self.blocks.append(gr.map_bb(self.constellation.pre_diff_code()))
+        # Differential encoding.
+        if self.differential:
+            self.blocks.append(gr.diff_encoder_bb(arity))
+        # Convert to constellation symbols.
+        self.blocks.append(gr.chunks_to_symbols_bc(self.constellation.points(),
+                                                   self.constellation.dimensionality()))
+        # CHANNEL
+        # Channel just consists of a rotation to check differential coding.
+        if rotation is not None:
+            self.blocks.append(gr.multiply_const_cc(rotation))
+
+        # RX
+        # Convert the constellation symbols back to binary values.
+        self.blocks.append(digital_swig.constellation_decoder_cb(self.constellation.base()))
+        # Differential decoding.
+        if self.differential:
+            self.blocks.append(gr.diff_decoder_bb(arity))
+        # Decode any pre-differential coding.
+        if self.constellation.apply_pre_diff_code():
+            self.blocks.append(gr.map_bb(
+                mod_codes.invert_code(self.constellation.pre_diff_code())))
+        # unpack the k bit vector into a stream of bits            
+        self.blocks.append(gr.unpack_k_bits_bb(
+                self.constellation.bits_per_symbol()))
+        # connect to block output
+        check_index = len(self.blocks)
+        self.blocks = self.blocks[:check_index]
+        self.blocks.append(self)
+
+        self.connect(*self.blocks)
+
+        
+if __name__ == '__main__':
+    gr_unittest.run(test_constellation, "test_constellation.xml")
diff --git a/gr-digital/python/qa_constellation_decoder_cb.py b/gr-digital/python/qa_constellation_decoder_cb.py
new file mode 100755
index 000000000..5401a07fc
--- /dev/null
+++ b/gr-digital/python/qa_constellation_decoder_cb.py
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,2007,2010,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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig
+import math
+
+class test_constellation_decoder (gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test_constellation_decoder_cb_bpsk (self):
+        cnst = digital_swig.constellation_bpsk()
+  	src_data =        (0.5 + 0.5j,  0.1 - 1.2j, -0.8 - 0.1j, -0.45 + 0.8j,
+                           0.8 + 1.0j, -0.5 + 0.1j,  0.1 - 1.2j)
+	expected_result = (        1,           1,           0,            0,
+                                   1,           0,           1)
+        src = gr.vector_source_c (src_data)
+        op = digital_swig.constellation_decoder_cb (cnst.base())
+        dst = gr.vector_sink_b ()
+
+        self.tb.connect (src, op)
+        self.tb.connect (op, dst)
+        self.tb.run ()               # run the graph and wait for it to finish
+
+        actual_result = dst.data ()  # fetch the contents of the sink
+	#print "actual result", actual_result
+	#print "expected result", expected_result
+        self.assertFloatTuplesAlmostEqual (expected_result, actual_result)
+
+    def test_constellation_decoder_cb_qpsk (self):
+        cnst = digital_swig.constellation_qpsk()
+  	src_data =        (0.5 + 0.5j,  0.1 - 1.2j, -0.8 - 0.1j, -0.45 + 0.8j,
+                           0.8 + 1.0j, -0.5 + 0.1j,  0.1 - 1.2j)
+	expected_result = (        3,           1,           0,            2,
+                                   3,           2,           1)
+        src = gr.vector_source_c (src_data)
+        op = digital_swig.constellation_decoder_cb (cnst.base())
+        dst = gr.vector_sink_b ()
+
+        self.tb.connect (src, op)
+        self.tb.connect (op, dst)
+        self.tb.run ()               # run the graph and wait for it to finish
+
+        actual_result = dst.data ()  # fetch the contents of the sink
+	#print "actual result", actual_result
+	#print "expected result", expected_result
+        self.assertFloatTuplesAlmostEqual (expected_result, actual_result)
+
+
+if __name__ == '__main__':
+    gr_unittest.run(test_constellation_decoder, "test_constellation_decoder.xml")
+
diff --git a/gr-digital/python/qa_constellation_receiver.py b/gr-digital/python/qa_constellation_receiver.py
new file mode 100755
index 000000000..25107e4a7
--- /dev/null
+++ b/gr-digital/python/qa_constellation_receiver.py
@@ -0,0 +1,134 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+import random
+
+from gnuradio import gr, blks2, gr_unittest
+from utils import mod_codes, alignment
+import digital_swig, packet_utils
+from generic_mod_demod import generic_mod, generic_demod
+
+from qa_constellation import tested_constellations, twod_constell
+
+import math
+
+# Set a seed so that if errors turn up they are reproducible.
+# 1234 fails
+random.seed(1239)
+
+# TESTING PARAMETERS
+# The number of symbols to test with.
+# We need this many to let the frequency recovery block converge.
+DATA_LENGTH = 10000
+# Test fails if fraction of output that is correct is less than this.
+REQ_CORRECT = 0.8
+
+# CHANNEL PARAMETERS
+NOISE_VOLTAGE = 0.01
+FREQUENCY_OFFSET = 0.01
+TIMING_OFFSET = 1.0
+
+# RECEIVER PARAMETERS
+FREQ_BW = 2*math.pi/100.0
+PHASE_BW = 2*math.pi/100.0
+
+
+class test_constellation_receiver (gr_unittest.TestCase):
+    
+    # We ignore the first half of the output data since often it takes
+    # a while for the receiver to lock on.
+    ignore_fraction = 0.8
+    seed = 1234
+    max_data_length = DATA_LENGTH * 6
+    max_num_samples = 1000
+    
+    def test_basic(self):
+        """
+        Tests a bunch of different constellations by using generic
+        modulation, a channel, and generic demodulation.  The generic
+        demodulation uses constellation_receiver which is what
+        we're really trying to test.
+        """
+
+        # Assumes not more than 64 points in a constellation
+        # Generates some random input data to use.
+        self.src_data = tuple(
+            [random.randint(0,1) for i in range(0, self.max_data_length)])
+        # Generates some random indices to use for comparing input and
+        # output data (a full comparison is too slow in python).
+        self.indices = alignment.random_sample(
+            self.max_data_length, self.max_num_samples, self.seed)
+
+        for constellation, differential in tested_constellations():
+            # The constellation_receiver doesn't work for constellations
+            # of multple dimensions (i.e. multiple complex numbers to a
+            # single symbol).
+            # That is not implemented since the receiver has no way of
+            # knowing where the beginning of a symbol is.
+            # It also doesn't work for non-differential modulation.
+            if constellation.dimensionality() != 1 or not differential:
+                continue
+            data_length = DATA_LENGTH * constellation.bits_per_symbol()
+            tb = rec_test_tb(constellation, differential,
+                             src_data=self.src_data[:data_length])
+            tb.run()
+            data = tb.dst.data()
+            d1 = tb.src_data[:int(len(tb.src_data)*self.ignore_fraction)]
+            d2 = data[:int(len(data)*self.ignore_fraction)]
+            correct, overlap, offset, indices = alignment.align_sequences(
+                d1, d2, indices=self.indices)
+            self.assertTrue(correct > REQ_CORRECT)
+            
+
+class rec_test_tb (gr.top_block):
+    """
+    Takes a constellation an runs a generic modulation, channel,
+    and generic demodulation.
+    """
+    def __init__(self, constellation, differential,
+                 data_length=None, src_data=None):
+        """
+        constellation -- a constellation object
+        differential -- whether differential encoding is used
+        data_length -- the number of bits of data to use
+        src_data -- a list of the bits to use
+        """
+        super(rec_test_tb, self).__init__()
+        # Transmission Blocks
+        if src_data is None:
+            self.src_data = tuple([random.randint(0,1) for i in range(0, data_length)])
+        else:
+            self.src_data = src_data
+        packer = gr.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST)
+        src = gr.vector_source_b(self.src_data)
+        mod = generic_mod(constellation, differential=differential)
+        # Channel
+        channel = gr.channel_model(NOISE_VOLTAGE, FREQUENCY_OFFSET, TIMING_OFFSET)
+        # Receiver Blocks
+        demod = generic_demod(constellation, differential=differential,
+                              freq_bw=FREQ_BW,
+                              phase_bw=PHASE_BW)
+        self.dst = gr.vector_sink_b()
+        self.connect(src, packer, mod, channel, demod, self.dst)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_constellation_receiver, "test_constellation_receiver.xml")
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_correlate_access_code.py b/gr-digital/python/qa_correlate_access_code.py
index b3575f4e6..6b6f25051 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_correlate_access_code.py
+++ b/gr-digital/python/qa_correlate_access_code.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2006,2007,2010 Free Software Foundation, Inc.
+# Copyright 2006,2007,2010,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,6 +21,7 @@
 # 
 
 from gnuradio import gr, gr_unittest
+import digital_swig
 import math
 
 default_access_code = '\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC'
@@ -52,7 +53,7 @@ class test_correlate_access_code(gr_unittest.TestCase):
         src_data = (1, 0, 1, 1, 1, 1, 0, 1, 1) + pad + (0,) * 7
         expected_result = pad + (1, 0, 1, 1, 3, 1, 0, 1, 1, 2) + (0,) * 6
         src = gr.vector_source_b (src_data)
-        op = gr.correlate_access_code_bb("1011", 0)
+        op = digital_swig.correlate_access_code_bb("1011", 0)
         dst = gr.vector_sink_b ()
         self.tb.connect (src, op, dst)
         self.tb.run ()
@@ -69,7 +70,7 @@ class test_correlate_access_code(gr_unittest.TestCase):
         src_data = code + (1, 0, 1, 1) + pad
         expected_result = pad + code + (3, 0, 1, 1)
         src = gr.vector_source_b (src_data)
-        op = gr.correlate_access_code_bb(access_code, 0)
+        op = digital_swig.correlate_access_code_bb(access_code, 0)
         dst = gr.vector_sink_b ()
         self.tb.connect (src, op, dst)
         self.tb.run ()
diff --git a/gr-digital/python/qa_costas_loop_cc.py b/gr-digital/python/qa_costas_loop_cc.py
new file mode 100755
index 000000000..75fdbc2f8
--- /dev/null
+++ b/gr-digital/python/qa_costas_loop_cc.py
@@ -0,0 +1,151 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig, psk
+import random, cmath
+
+class test_costas_loop_cc(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test01 (self):
+        # test basic functionality by setting all gains to 0
+        natfreq = 0.0
+        order = 2
+        self.test = digital_swig.costas_loop_cc(natfreq, order)
+
+        data = 100*[complex(1,0),]
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+        
+        expected_result = data
+        dst_data = self.snk.data()
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 5)
+
+    def test02 (self):
+        # Make sure it doesn't diverge given perfect data
+        natfreq = 0.25
+        order = 2
+        self.test = digital_swig.costas_loop_cc(natfreq, order)
+
+        data = [complex(2*random.randint(0,1)-1, 0) for i in xrange(100)]
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+
+        expected_result = data
+        dst_data = self.snk.data()
+
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 5)
+
+    def test03 (self):
+        # BPSK Convergence test with static rotation
+        natfreq = 0.25
+        order = 2
+        self.test = digital_swig.costas_loop_cc(natfreq, order)
+
+        rot = cmath.exp(0.2j) # some small rotation
+        data = [complex(2*random.randint(0,1)-1, 0) for i in xrange(100)]
+        
+        N = 40 # settling time
+        expected_result = data[N:]
+        data = [rot*d for d in data]
+
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+
+        dst_data = self.snk.data()[N:]
+        
+        # generously compare results; the loop will converge near to, but
+        # not exactly on, the target data
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 2)
+
+    def test04 (self):
+        # QPSK Convergence test with static rotation
+        natfreq = 0.25
+        order = 4
+        self.test = digital_swig.costas_loop_cc(natfreq, order)
+
+        rot = cmath.exp(0.2j) # some small rotation
+        data = [complex(2*random.randint(0,1)-1, 2*random.randint(0,1)-1)
+                for i in xrange(100)]
+        
+        N = 40 # settling time
+        expected_result = data[N:]
+        data = [rot*d for d in data]
+
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+
+        dst_data = self.snk.data()[N:]
+
+        # generously compare results; the loop will converge near to, but
+        # not exactly on, the target data
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 2)
+
+    def test05 (self):
+        # 8PSK Convergence test with static rotation
+        natfreq = 0.25
+        order = 8
+        self.test = digital_swig.costas_loop_cc(natfreq, order)
+
+        rot = cmath.exp(-cmath.pi/8.0j) # rotate to match Costas rotation
+        const = psk.psk_constellation(order)
+        data = [random.randint(0,7) for i in xrange(100)]
+        data = [2*rot*const.points()[d] for d in data]
+        
+        N = 40 # settling time
+        expected_result = data[N:]
+
+        rot = cmath.exp(0.1j) # some small rotation
+        data = [rot*d for d in data]
+
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+
+        dst_data = self.snk.data()[N:]
+        
+	# generously compare results; the loop will converge near to, but
+        # not exactly on, the target data
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 2)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_costas_loop_cc, "test_costas_loop_cc.xml")
diff --git a/gr-digital/python/qa_cpm.py b/gr-digital/python/qa_cpm.py
new file mode 100755
index 000000000..12a84c76c
--- /dev/null
+++ b/gr-digital/python/qa_cpm.py
@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+#
+# Copyright 2010 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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig
+import numpy
+
+class test_cpm(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def do_check_phase_shift(self, type, name):
+        sps = 2
+        L = 1
+        in_bits = (1,) * 20
+        src = gr.vector_source_b(in_bits, False)
+        cpm = digital_swig.cpmmod_bc(type, 0.5, sps, L)
+        arg = gr.complex_to_arg()
+        sink = gr.vector_sink_f()
+
+        self.tb.connect(src, cpm, arg, sink)
+        self.tb.run()
+
+        symbol_phases = numpy.array(sink.data()[sps*L-1::sps])
+        phase_diff = numpy.mod(numpy.subtract(symbol_phases[1:], symbol_phases[:-1]),
+                               (2*numpy.pi,) * (len(symbol_phases)-1))
+        self.assertFloatTuplesAlmostEqual(tuple(phase_diff), (0.5 * numpy.pi,) * len(phase_diff), 5,
+                                          msg="Phase shift was not correct for CPM method " + name)
+
+    def test_001_lrec(self):
+        self.do_check_phase_shift(gr.cpm.LRC, 'LREC')
+
+    def test_001_lrc(self):
+        self.do_check_phase_shift(gr.cpm.LRC, 'LRC')
+
+    def test_001_lsrc(self):
+        self.do_check_phase_shift(gr.cpm.LSRC, 'LSRC')
+
+    def test_001_ltfm(self):
+        self.do_check_phase_shift(gr.cpm.TFM, 'TFM')
+
+    def test_001_lgmsk(self):
+        sps = 2
+        L = 5
+        bt = 0.3
+        in_bits = (1,) * 20
+        src = gr.vector_source_b(in_bits, False)
+        gmsk = digital_swig.gmskmod_bc(sps, bt, L)
+        arg = gr.complex_to_arg()
+        sink = gr.vector_sink_f()
+
+        self.tb.connect(src, gmsk, arg, sink)
+        self.tb.run()
+
+        symbol_phases = numpy.array(sink.data()[sps*L-1::sps])
+        phase_diff = numpy.mod(numpy.subtract(symbol_phases[1:], symbol_phases[:-1]),
+                               (2*numpy.pi,) * (len(symbol_phases)-1))
+        self.assertFloatTuplesAlmostEqual(tuple(phase_diff), (0.5 * numpy.pi,) * len(phase_diff), 5,
+                                          msg="Phase shift was not correct for GMSK")
+
+    def test_phase_response(self):
+        phase_response = gr.cpm.phase_response(gr.cpm.LREC, 2, 4)
+        self.assertAlmostEqual(numpy.sum(phase_response), 1)
+
+
+if __name__ == '__main__':
+    gr_unittest.run(test_cpm, "test_cpm.xml")
+
diff --git a/gr-digital/python/qa_crc32.py b/gr-digital/python/qa_crc32.py
new file mode 100755
index 000000000..f86813f3f
--- /dev/null
+++ b/gr-digital/python/qa_crc32.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig
+import random, cmath
+
+class test_crc32(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test01 (self):
+        data = 100*"0"
+        expected_result = 2943744955
+        result = digital_swig.crc32(data)
+        #print hex(result)
+        
+        self.assertEqual (expected_result, result)
+
+    def test02 (self):
+        data = 100*"1"
+        expected_result = 2326594156
+        result = digital_swig.crc32(data)
+        #print hex(result)
+        
+        self.assertEqual (expected_result, result)
+
+    def test03 (self):
+        data = 10*"0123456789"
+        expected_result = 3774345973
+        result = digital_swig.crc32(data)
+        #print hex(result)
+
+        self.assertEqual (expected_result, result)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_crc32, "test_crc32.xml")
diff --git a/gr-radio-astronomy/src/python/qa_ra.py b/gr-digital/python/qa_digital.py
index 2cb0f42be..97e35da56 100755
--- a/gr-radio-astronomy/src/python/qa_ra.py
+++ b/gr-digital/python/qa_digital.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2006,2010 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,9 +21,9 @@
 # 
 
 from gnuradio import gr, gr_unittest
-import ra
+import digital_swig
 
-class test_radio_astronomy (gr_unittest.TestCase):
+class test_digital(gr_unittest.TestCase):
 
     def setUp (self):
         self.tb = gr.top_block ()
@@ -31,8 +31,5 @@ class test_radio_astronomy (gr_unittest.TestCase):
     def tearDown (self):
         self.tb = None
 
-    def test_000_(self):          # ensure that we can load the module
-        pass
-        
 if __name__ == '__main__':
-    gr_unittest.run(test_radio_astronomy, "test_radio_astronomy.xml")
+    gr_unittest.run(test_digital, "test_digital.xml")
diff --git a/gr-digital/python/qa_fll_band_edge.py b/gr-digital/python/qa_fll_band_edge.py
new file mode 100755
index 000000000..088eb2b68
--- /dev/null
+++ b/gr-digital/python/qa_fll_band_edge.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig
+import random, math
+
+class test_fll_band_edge_cc(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test01 (self):
+        sps = 4
+        rolloff = 0.35
+        bw = 2*math.pi/100.0
+        ntaps = 45
+        
+        # Create pulse shape filter
+        rrc_taps = gr.firdes.root_raised_cosine(
+            sps, sps, 1.0, rolloff, ntaps)
+
+        # The frequency offset to correct
+        foffset = 0.2 / (2.0*math.pi)
+
+        # Create a set of 1's and -1's, pulse shape and interpolate to sps
+        data = [2.0*random.randint(0, 2) - 1.0 for i in xrange(200)]
+        self.src = gr.vector_source_c(data, False)
+        self.rrc = gr.interp_fir_filter_ccf(sps, rrc_taps)
+
+        # Mix symbols with a complex sinusoid to spin them
+        self.nco = gr.sig_source_c(1, gr.GR_SIN_WAVE, foffset, 1)
+        self.mix = gr.multiply_cc()
+
+        # FLL will despin the symbols to an arbitrary phase
+        self.fll = digital_swig.fll_band_edge_cc(sps, rolloff, ntaps, bw)
+
+        # Create sinks for all outputs of the FLL
+        # we will only care about the freq and error outputs
+        self.vsnk_frq = gr.vector_sink_f()
+        self.nsnk_fll = gr.null_sink(gr.sizeof_gr_complex)
+        self.nsnk_phs = gr.null_sink(gr.sizeof_float)
+        self.nsnk_err = gr.null_sink(gr.sizeof_float)
+        
+        # Connect the blocks
+        self.tb.connect(self.nco, (self.mix,1))
+        self.tb.connect(self.src, self.rrc, (self.mix,0))
+        self.tb.connect(self.mix, self.fll, self.nsnk_fll)
+        self.tb.connect((self.fll,1), self.vsnk_frq)
+        self.tb.connect((self.fll,2), self.nsnk_phs)
+        self.tb.connect((self.fll,3), self.nsnk_err)
+        self.tb.run()
+        
+        N = 700
+        dst_data = self.vsnk_frq.data()[N:]
+
+        expected_result = len(dst_data)* [-0.20,]
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 4)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_fll_band_edge_cc, "test_fll_band_edge_cc.xml")
diff --git a/gr-digital/python/qa_lms_equalizer.py b/gr-digital/python/qa_lms_equalizer.py
new file mode 100755
index 000000000..025c785aa
--- /dev/null
+++ b/gr-digital/python/qa_lms_equalizer.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+#
+# Copyright 2006,2007,2010,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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig
+
+class test_lms_dd_equalizer(gr_unittest.TestCase):
+
+    def setUp(self):
+    	self.tb = gr.top_block()
+
+    def tearDown(self):
+    	self.tb = None
+    	
+    def transform(self, src_data, gain, const):
+	SRC = gr.vector_source_c(src_data, False)
+	EQU = digital_swig.lms_dd_equalizer_cc(4, gain, 1, const.base())
+	DST = gr.vector_sink_c()
+	self.tb.connect(SRC, EQU, DST)
+	self.tb.run()
+	return DST.data()
+
+    def test_001_identity(self):
+    	# Constant modulus signal so no adjustments
+        const = digital_swig.constellation_qpsk()
+	src_data = const.points()*1000
+
+        N = 100 # settling time
+	expected_data = src_data[N:]
+	result = self.transform(src_data, 0.1, const)[N:]
+	self.assertComplexTuplesAlmostEqual(expected_data, result, 5)
+
+if __name__ == "__main__":
+    gr_unittest.run(test_lms_dd_equalizer, "test_lms_dd_equalizer.xml")
diff --git a/gr-digital/python/qa_mpsk_receiver.py b/gr-digital/python/qa_mpsk_receiver.py
new file mode 100755
index 000000000..e1f16ee67
--- /dev/null
+++ b/gr-digital/python/qa_mpsk_receiver.py
@@ -0,0 +1,121 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig
+import random, cmath
+
+class test_mpsk_receiver(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test01 (self):
+        # Test BPSK sync
+        M = 2
+        theta = 0
+        loop_bw = cmath.pi/100.0
+        fmin = -0.5
+        fmax = 0.5
+        mu = 0.25
+        gain_mu = 0.01
+        omega = 2
+        gain_omega = 0.001
+        omega_rel = 0.001
+
+        self.test = digital_swig.mpsk_receiver_cc(M, theta, loop_bw,
+                                                  fmin, fmax, mu, gain_mu,
+                                                  omega, gain_omega,
+                                                  omega_rel)
+        
+        data = 1000*[complex(1,0), complex(1,0), complex(-1,0), complex(-1,0)]
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+        
+        expected_result = 1000*[complex(-0.5,0), complex(0.5,0)]
+        dst_data = self.snk.data()
+
+        # Only compare last Ncmp samples
+        Ncmp = 100
+        len_e = len(expected_result)
+        len_d = len(dst_data)
+        expected_result = expected_result[len_e - Ncmp:]
+        dst_data = dst_data[len_d - Ncmp:]
+
+        #for e,d in zip(expected_result, dst_data):
+        #    print e, d
+        
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 1)
+
+
+    def test02 (self):
+        # Test QPSK sync
+        M = 4
+        theta = 0
+        loop_bw = 2*cmath.pi/100.0
+        fmin = -0.5
+        fmax = 0.5
+        mu = 0.25
+        gain_mu = 0.01
+        omega = 2
+        gain_omega = 0.001
+        omega_rel = 0.001
+
+        self.test = digital_swig.mpsk_receiver_cc(M, theta, loop_bw,
+                                                  fmin, fmax, mu, gain_mu,
+                                                  omega, gain_omega,
+                                                  omega_rel)
+
+        data = 1000*[complex( 0.707,  0.707), complex( 0.707,  0.707),
+                     complex(-0.707,  0.707), complex(-0.707,  0.707),
+                     complex(-0.707, -0.707), complex(-0.707, -0.707),
+                     complex( 0.707, -0.707), complex( 0.707, -0.707)]
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+        
+        expected_result = 1000*[complex(0, -1.0), complex(1.0, 0),
+                                complex(0, 1.0), complex(-1.0, 0)]
+        dst_data = self.snk.data()
+
+        # Only compare last Ncmp samples
+        Ncmp = 100
+        len_e = len(expected_result)
+        len_d = len(dst_data)
+        expected_result = expected_result[len_e - Ncmp:]
+        dst_data = dst_data[len_d - Ncmp:]
+
+        #for e,d in zip(expected_result, dst_data):
+        #    print e, d
+
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 1)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_mpsk_receiver, "test_mpsk_receiver.xml")
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_ofdm_insert_preamble.py b/gr-digital/python/qa_ofdm_insert_preamble.py
index d69f5ca5b..c45893fa3 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_ofdm_insert_preamble.py
+++ b/gr-digital/python/qa_ofdm_insert_preamble.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2007,2010 Free Software Foundation, Inc.
+# Copyright 2007,2010,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,6 +22,7 @@
 
 from gnuradio import gr, gr_unittest
 from pprint import pprint
+import digital_swig
 
 class test_ofdm_insert_preamble (gr_unittest.TestCase):
 
@@ -40,7 +41,7 @@ class test_ofdm_insert_preamble (gr_unittest.TestCase):
 
         # print "len(v) = %d" % (len(v))
 
-        op = gr.ofdm_insert_preamble(fft_length, preamble)
+        op = digital_swig.ofdm_insert_preamble(fft_length, preamble)
 
         v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fft_length)
         dst0 = gr.vector_sink_c()
diff --git a/gr-digital/python/qam.py b/gr-digital/python/qam.py
new file mode 100644
index 000000000..5b1f7683b
--- /dev/null
+++ b/gr-digital/python/qam.py
@@ -0,0 +1,229 @@
+#
+# Copyright 2005,2006,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.
+# 
+
+"""
+QAM modulation and demodulation.
+"""
+
+from math import pi, sqrt, log
+
+from gnuradio import gr
+from generic_mod_demod import generic_mod, generic_demod
+from utils.gray_code import gray_code
+from utils import mod_codes
+import modulation_utils
+import digital_swig
+
+# Default number of points in constellation.
+_def_constellation_points = 16
+# Whether the quadrant bits are coded differentially.
+_def_differential = True
+# Whether gray coding is used.  If differential is True then gray
+# coding is used within but not between each quadrant.
+_def_mod_code = mod_codes.NO_CODE
+
+def is_power_of_four(x):
+    v = log(x)/log(4)
+    return int(v) == v
+
+def get_bit(x, n):
+    """ Get the n'th bit of integer x (from little end)."""
+    return (x&(0x01 << n)) >> n
+
+def get_bits(x, n, k):
+    """ Get the k bits of integer x starting at bit n(from little end)."""
+    # Remove the n smallest bits
+    v = x >> n 
+    # Remove all bits bigger than n+k-1
+    return v % pow(2, k)
+
+def make_differential_constellation(m, gray_coded):
+    """
+    Create a constellation with m possible symbols where m must be
+    a power of 4.
+
+    Points are laid out in a square grid.
+
+    Bits referring to the quadrant are differentilly encoded,
+    remaining bits are gray coded.
+
+    """
+    sqrtm = pow(m, 0.5)
+    if (not isinstance(m, int) or m < 4 or not is_power_of_four(m)):
+        raise ValueError("m must be a power of 4 integer.")
+    # Each symbol holds k bits.
+    k = int(log(m) / log(2.0))
+    # First create a constellation for one quadrant containing m/4 points.
+    # The quadrant has 'side' points along each side of a quadrant.
+    side = int(sqrtm/2)
+    if gray_coded:
+        # Number rows and columns using gray codes.
+        gcs = gray_code(side)
+        # Get inverse gray codes.
+        i_gcs = dict([(v, key) for key, v in enumerate(gcs)])
+    else:
+        i_gcs = dict([(i, i) for i in range(0, side)])
+    # The distance between points is found.
+    step = 1/(side-0.5)
+
+    gc_to_x = [(i_gcs[gc]+0.5)*step for gc in range(0, side)]
+
+    # Takes the (x, y) location of the point with the quadrant along
+    # with the quadrant number. (x, y) are integers referring to which
+    # point within the quadrant it is.
+    # A complex number representing this location of this point is returned.
+    def get_c(gc_x, gc_y, quad):
+        if quad == 0:
+            return complex(gc_to_x[gc_x], gc_to_x[gc_y])
+        if quad == 1:
+            return complex(-gc_to_x[gc_y], gc_to_x[gc_x])
+        if quad == 2:
+            return complex(-gc_to_x[gc_x], -gc_to_x[gc_y])
+        if quad == 3:
+            return complex(gc_to_x[gc_y], -gc_to_x[gc_x])
+        raise StandardError("Impossible!")
+
+    # First two bits determine quadrant.
+    # Next (k-2)/2 bits determine x position.
+    # Following (k-2)/2 bits determine y position.
+    # How x and y relate to real and imag depends on quadrant (see get_c function).
+    const_map = []
+    for i in range(m):
+        y = get_bits(i, 0, (k-2)/2)
+        x = get_bits(i, (k-2)/2, (k-2)/2)
+        quad = get_bits(i, k-2, 2)
+        const_map.append(get_c(x, y, quad))
+
+    return const_map
+
+def make_non_differential_constellation(m, gray_coded):
+    side = int(pow(m, 0.5))
+    if (not isinstance(m, int) or m < 4 or not is_power_of_four(m)):
+        raise ValueError("m must be a power of 4 integer.")
+    # Each symbol holds k bits.
+    k = int(log(m) / log(2.0))
+    if gray_coded:
+        # Number rows and columns using gray codes.
+        gcs = gray_code(side)
+        # Get inverse gray codes.
+        i_gcs = mod_codes.invert_code(gcs)
+    else:
+        i_gcs = range(0, side)
+    # The distance between points is found.
+    step = 2.0/(side-1)
+
+    gc_to_x = [-1 + i_gcs[gc]*step for gc in range(0, side)]
+    # First k/2 bits determine x position.
+    # Following k/2 bits determine y position.
+    const_map = []
+    for i in range(m):
+        y = gc_to_x[get_bits(i, 0, k/2)]
+        x = gc_to_x[get_bits(i, k/2, k/2)]
+        const_map.append(complex(x,y))
+    return const_map
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           QAM constellation
+# /////////////////////////////////////////////////////////////////////////////
+
+def qam_constellation(constellation_points=_def_constellation_points,
+                      differential=_def_differential,
+                      mod_code=_def_mod_code):
+    """
+    Creates a QAM constellation object.
+    """
+    if mod_code == mod_codes.GRAY_CODE:
+        gray_coded = True
+    elif mod_code == mod_codes.NO_CODE:
+        gray_coded = False
+    else:
+        raise ValueError("Mod code is not implemented for QAM")
+    if differential:
+        points = make_differential_constellation(constellation_points, gray_coded)
+    else:
+        points = make_non_differential_constellation(constellation_points, gray_coded)
+    side = int(sqrt(constellation_points))
+    width = 2.0/(side-1)
+    # No pre-diff code
+    # Should add one so that we can gray-code the quadrant bits too.
+    pre_diff_code = []
+    constellation = digital_swig.constellation_rect(points, pre_diff_code, 4,
+                                                    side, side, width, width)
+    return constellation
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           QAM modulator
+# /////////////////////////////////////////////////////////////////////////////
+
+class qam_mod(generic_mod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 differential=_def_differential,
+                 mod_code=_def_mod_code,
+                 *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered QAM modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_mod block for list of parameters.
+	"""
+
+        constellation = qam_constellation(constellation_points, differential, mod_code)
+        # We take care of the gray coding in the constellation generation so it doesn't 
+        # need to be done in the block.
+        super(qam_mod, self).__init__(constellation, differential=differential,
+                                      *args, **kwargs)
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           QAM demodulator
+#
+# /////////////////////////////////////////////////////////////////////////////
+
+class qam_demod(generic_demod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 differential=_def_differential,
+                 mod_code=_def_mod_code,
+                 *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered QAM modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_demod block for list of parameters.
+        """
+        constellation = qam_constellation(constellation_points, differential, mod_code)
+        # We take care of the gray coding in the constellation generation so it doesn't 
+        # need to be done in the block.
+        super(qam_demod, self).__init__(constellation, differential=differential,
+                                        *args, **kwargs)
+
+#
+# Add these to the mod/demod registry
+#
+modulation_utils.add_type_1_mod('qam', qam_mod)
+modulation_utils.add_type_1_demod('qam', qam_demod)
+modulation_utils.add_type_1_constellation('qam', qam_constellation)
diff --git a/gr-digital/python/qpsk.py b/gr-digital/python/qpsk.py
new file mode 100644
index 000000000..be21fd76f
--- /dev/null
+++ b/gr-digital/python/qpsk.py
@@ -0,0 +1,176 @@
+#
+# Copyright 2005,2006,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.
+# 
+
+"""
+QPSK modulation.
+
+Demodulation is not included since the generic_mod_demod
+"""
+
+from gnuradio import gr
+from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod
+import digital_swig
+import modulation_utils
+
+# Default number of points in constellation.
+_def_constellation_points = 4
+# Whether gray coding is used.
+_def_gray_coded = True
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           QPSK constellation
+# /////////////////////////////////////////////////////////////////////////////
+
+def qpsk_constellation(m=_def_constellation_points): 
+    if m != _def_constellation_points:
+        raise ValueError("QPSK can only have 4 constellation points.")
+    return digital_swig.constellation_qpsk()
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           QPSK modulator
+# /////////////////////////////////////////////////////////////////////////////
+
+class qpsk_mod(generic_mod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 gray_coded=_def_gray_coded,
+                 *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered QPSK modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_mod block for list of parameters.
+	"""
+
+        constellation_points = _def_constellation_points
+        constellation = digital_swig.constellation_qpsk()
+        if constellation_points != 4:
+            raise ValueError("QPSK can only have 4 constellation points.")
+        if not gray_coded:
+            raise ValueError("This QPSK mod/demod works only for gray-coded constellations.")
+        super(qpsk_mod, self).__init__(constellation=constellation,
+                                       gray_coded=gray_coded, 
+                                       *args, **kwargs)
+
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           QPSK demodulator
+#
+# /////////////////////////////////////////////////////////////////////////////
+
+class qpsk_demod(generic_demod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered QPSK modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_demod block for list of parameters.
+        """
+
+        constellation_points = _def_constellation_points
+        constellation = digital_swig.constellation_qpsk()
+        if constellation_points != 4:
+            raise ValueError('Number of constellation points must be 4 for QPSK.')
+        super(qpsk_demod, self).__init__(constellation=constellation,
+                                         *args, **kwargs)
+
+
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           DQPSK constellation
+# /////////////////////////////////////////////////////////////////////////////
+
+def dqpsk_constellation(m=_def_constellation_points):
+    if m != _def_constellation_points:
+        raise ValueError("DQPSK can only have 4 constellation points.")
+    return digital_swig.constellation_dqpsk()
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           DQPSK modulator
+# /////////////////////////////////////////////////////////////////////////////
+
+class dqpsk_mod(generic_mod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 gray_coded=_def_gray_coded,
+                 differential=True, *args, **kwargs):
+        """
+	Hierarchical block for RRC-filtered DQPSK modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_mod block for list of parameters.
+	"""
+
+        constellation_points = _def_constellation_points
+        constellation = digital_swig.constellation_dqpsk()
+        if constellation_points != 4:
+            raise ValueError('Number of constellation points must be 4 for DQPSK.')
+        super(dqpsk_mod, self).__init__(constellation=constellation,
+                                        gray_coded=gray_coded,
+                                        differential=True,
+                                        *args, **kwargs)
+
+# /////////////////////////////////////////////////////////////////////////////
+#                           DQPSK demodulator
+#
+# /////////////////////////////////////////////////////////////////////////////
+
+class dqpsk_demod(generic_demod):
+
+    def __init__(self, constellation_points=_def_constellation_points,
+                 differential=True, *args, **kwargs):
+
+        """
+	Hierarchical block for RRC-filtered DQPSK modulation.
+
+	The input is a byte stream (unsigned char) and the
+	output is the complex modulated signal at baseband.
+
+        See generic_demod block for list of parameters.
+        """
+        constellation_points = _def_constellation_points
+        constellation = digital_swig.constellation_dqpsk()
+        if constellation_points != 4:
+            raise ValueError('Number of constellation points must be 4 for DQPSK.')
+        super(dqpsk_demod, self).__init__(constellation=constellation,
+                                          differential=True,
+                                          *args, **kwargs)
+
+#
+# Add these to the mod/demod registry
+#
+modulation_utils.add_type_1_mod('qpsk', qpsk_mod)
+modulation_utils.add_type_1_demod('qpsk', qpsk_demod)
+modulation_utils.add_type_1_constellation('qpsk', qpsk_constellation)
+modulation_utils.add_type_1_mod('dqpsk', dqpsk_mod)
+modulation_utils.add_type_1_demod('dqpsk', dqpsk_demod)
+modulation_utils.add_type_1_constellation('dqpsk', dqpsk_constellation)
+
diff --git a/gr-sounder/src/python/run_tests.in b/gr-digital/python/run_tests.in
index b8f7830c2..b39e7e847 100644
--- a/gr-sounder/src/python/run_tests.in
+++ b/gr-digital/python/run_tests.in
@@ -5,6 +5,6 @@
 # 3rd parameter is path to Python QA directory
 
 @top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-sounder \
-    @abs_top_builddir@/gr-sounder \
+    @abs_top_srcdir@/gr-digital \
+    @abs_top_builddir@/gr-digital \
     @srcdir@
diff --git a/gr-digital/python/utils/.gitignore b/gr-digital/python/utils/.gitignore
new file mode 100644
index 000000000..60c81fdce
--- /dev/null
+++ b/gr-digital/python/utils/.gitignore
@@ -0,0 +1,3 @@
+run_tests
+Makefile
+Makefile.in
diff --git a/gr-radar-mono/src/Makefile.am b/gr-digital/python/utils/Makefile.am
index d546da7f8..6da4d61dd 100644
--- a/gr-radar-mono/src/Makefile.am
+++ b/gr-digital/python/utils/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,7 +21,14 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = fpga lib
 if PYTHON
-SUBDIRS += python
-endif
+utilspythondir = $(grpythondir)/digital/utils
+
+TESTS = 
+
+utilspython_PYTHON = \
+	__init__.py \
+	gray_code.py \
+	mod_codes.py \
+	alignment.py
+endif
\ No newline at end of file
diff --git a/usrp/host/include/Makefile.am b/gr-digital/python/utils/__init__.py
index 5de5fe58e..b3e997f9f 100644
--- a/usrp/host/include/Makefile.am
+++ b/gr-digital/python/utils/__init__.py
@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 #
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -18,6 +19,3 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 # 
-
-SUBDIRS = usrp
-
diff --git a/gr-digital/python/utils/alignment.py b/gr-digital/python/utils/alignment.py
new file mode 100644
index 000000000..d32365866
--- /dev/null
+++ b/gr-digital/python/utils/alignment.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+"""
+This module contains functions for aligning sequences.
+
+>>> import random
+>>> random.seed(1234)
+>>> ran_seq = [random.randint(0,1) for i in range(0, 100)]
+>>> offset_seq = [0] * 20 + ran_seq
+>>> correct, overlap, offset = align_sequences(ran_seq, offset_seq)
+>>> print(correct, overlap, offset)
+(1.0, 100, -20)
+>>> offset_err_seq = []
+>>> for bit in offset_seq:
+...     if random.randint(0,4) == 4:
+...         offset_err_seq.append(random.randint(0,1))
+...     else:
+...         offset_err_seq.append(bit)
+>>> correct, overlap, offset = align_sequences(ran_seq, offset_err_seq)
+>>> print(overlap, offset)
+(100, -20)
+
+"""
+
+import random
+
+# DEFAULT PARAMETERS
+# If the fraction of matching bits between two sequences is greater than
+# this the sequences are assumed to be aligned.
+def_correct_cutoff = 0.9
+# The maximum offset to test during sequence alignment.
+def_max_offset = 500
+# The maximum number of samples to take from two sequences to check alignment.
+def_num_samples = 1000
+
+def compare_sequences(d1, d2, offset, sample_indices=None):
+    """
+    Takes two binary sequences and an offset and returns the number of
+    matching entries and the number of compared entries.
+    d1 & d2 -- sequences
+    offset -- offset of d2 relative to d1
+    sample_indices -- a list of indices to use for the comparison
+    """
+    max_index = min(len(d1), len(d2)+offset)
+    if sample_indices is None:
+        sample_indices = range(0, max_index)
+    correct = 0
+    total = 0
+    for i in sample_indices:
+        if i >= max_index:
+            break
+        if d1[i] == d2[i-offset]:
+            correct += 1
+        total += 1
+    return (correct, total)
+
+def random_sample(size, num_samples=def_num_samples, seed=None):
+    """
+    Returns a set of random integers between 0 and (size-1).
+    The set contains no more than num_samples integers.
+    """
+    random.seed(seed)
+    if num_samples > size:
+        indices = set(range(0, size))
+    else:
+        if num_samples > size/2:
+            num_samples = num_samples/2
+        indices = set([])
+        while len(indices) < num_samples:
+            index = random.randint(0, size-1)
+            indices.add(index)
+    indices = list(indices)
+    indices.sort()
+    return indices
+
+def align_sequences(d1, d2,
+                    num_samples=def_num_samples,
+                    max_offset=def_max_offset,
+                    correct_cutoff=def_correct_cutoff,
+                    seed=None,
+                    indices=None):
+    """
+    Takes two sequences and finds the offset and which the two sequences best
+    match.  It returns the fraction correct, the number of entries compared,
+    the offset.
+    d1 & d2 -- sequences to compare
+    num_samples -- the maximum number of entries to compare
+    max_offset -- the maximum offset between the sequences that is checked
+    correct_cutoff -- If the fraction of bits correct is greater than this then
+                      the offset is assumed to optimum.
+    seed -- a random number seed
+    indices -- an explicit list of the indices used to compare the two sequences
+    """
+    max_overlap = max(len(d1), len(d2))
+    if indices is None:
+        indices = random_sample(max_overlap, num_samples, seed)
+    max_frac_correct = 0
+    best_offset = None
+    best_compared = None
+    best_correct = None
+    pos_range = range(0, min(len(d1), max_offset))
+    neg_range = range(-1, -min(len(d2), max_offset), -1)
+    # Interleave the positive and negative offsets.
+    int_range = [item for items in zip(pos_range, neg_range) for item in items]
+    for offset in int_range:
+        correct, compared = compare_sequences(d1, d2, offset, indices)
+        frac_correct = 1.0*correct/compared
+        if frac_correct > max_frac_correct:
+            max_frac_correct = frac_correct
+            best_offset = offset
+            best_compared = compared
+            best_correct = correct
+            if frac_correct > correct_cutoff:
+                break
+    return max_frac_correct, best_compared, best_offset, indices
+    
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod()
+    
diff --git a/gr-digital/python/utils/gray_code.py b/gr-digital/python/utils/gray_code.py
new file mode 100644
index 000000000..926a1ded1
--- /dev/null
+++ b/gr-digital/python/utils/gray_code.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+class GrayCodeGenerator(object):
+    """
+    Generates and caches gray codes.
+    """
+
+    def __init__(self):
+        self.gcs = [0, 1]
+        # The last power of two passed through.
+        self.lp2 = 2
+        # The next power of two that will be passed through.
+        self.np2 = 4
+        # Curent index
+        self.i = 2
+
+    def get_gray_code(self, length):
+        """
+        Returns a list of gray code of given length.
+        """
+        if len(self.gcs) < length:
+            self.generate_new_gray_code(length)
+        return self.gcs[:length]
+    
+    def generate_new_gray_code(self, length):
+        """
+        Generates new gray code and places into cache.
+        """
+        while len(self.gcs) < length:
+            if self.i == self.lp2:
+                # if i is a power of two then gray number is of form 1100000...
+                result = self.i + self.i/2
+            else:
+                # if not we take advantage of the symmetry of all but the last bit
+                # around a power of two.
+                result = self.gcs[2*self.lp2-1-self.i] + self.lp2
+            self.gcs.append(result)
+            self.i += 1
+            if self.i == self.np2:
+                self.lp2 = self.i
+                self.np2 = self.i*2
+
+_gray_code_generator = GrayCodeGenerator()
+
+gray_code = _gray_code_generator.get_gray_code
+
diff --git a/usrp/host/lib/dump_data.py b/gr-digital/python/utils/mod_codes.py
index 034586d8a..caacda5cc 100755..100644
--- a/usrp/host/lib/dump_data.py
+++ b/gr-digital/python/utils/mod_codes.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2003 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -18,23 +18,16 @@
 # 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.
+# 
 
-import sys
-import struct
-
-fin = sys.stdin
-
-count = 0
-
-while 1:
-    s = fin.read(2)
-    if not s or len(s) != 2:
-        break
-
-    v, = struct.unpack ('H', s)
-    iv = int(v) & 0xffff
-    print "%8d  %6d  0x%04x" % (count, iv, iv)
-    count += 1
-    
+GRAY_CODE = 'gray'
+SET_PARTITION_CODE = 'set-partition'
+NO_CODE = 'none'
 
+codes = (GRAY_CODE, SET_PARTITION_CODE, NO_CODE)
 
+def invert_code(code):
+    c = enumerate(code)
+    ic = [(b, a) for (a, b) in c]
+    ic.sort()
+    return [a for (b, a) in ic]
diff --git a/gr-digital/swig/.gitignore b/gr-digital/swig/.gitignore
new file mode 100644
index 000000000..7e864f43f
--- /dev/null
+++ b/gr-digital/swig/.gitignore
@@ -0,0 +1,9 @@
+/Makefile
+/Makefile.in
+/pager_swig.py
+/pager_swig.cc
+/*.pyc
+/run_tests
+/run_guile_tests
+/guile
+/python
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
new file mode 100644
index 000000000..3f97da5e3
--- /dev/null
+++ b/gr-digital/swig/CMakeLists.txt
@@ -0,0 +1,68 @@
+# 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_DIGITAL_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_LIBRARIES gnuradio-digital)
+
+GR_SWIG_MAKE(digital_swig digital_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS digital_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital
+    COMPONENT "digital_python"
+)
+
+install(
+    FILES
+    digital_swig.i
+    digital_binary_slicer_fb.i
+    digital_clock_recovery_mm_cc.i
+    digital_clock_recovery_mm_ff.i
+    digital_constellation.i
+    digital_constellation_receiver_cb.i
+    digital_constellation_decoder_cb.i
+    digital_correlate_access_code_bb.i
+    digital_costas_loop_cc.i
+    digital_cma_equalizer_cc.i
+    digital_crc32.i
+    digital_fll_band_edge_cc.i
+    digital_lms_dd_equalizer_cc.i
+    digital_kurtotic_equalizer_cc.i
+    digital_mpsk_receiver_cc.i
+    digital_ofdm_cyclic_prefixer.i
+    digital_ofdm_frame_acquisition.i
+    digital_ofdm_frame_sink.i
+    digital_ofdm_insert_preamble.i
+    digital_ofdm_mapper_bcv.i
+    digital_ofdm_sampler.i
+    digital_gmskmod_bc.i
+    digital_cpmmod_bc.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "digital_swig"
+)
diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am
new file mode 100644
index 000000000..1afa44743
--- /dev/null
+++ b/gr-digital/swig/Makefile.am
@@ -0,0 +1,88 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
+
+TESTS =
+EXTRA_DIST += $(nobase_guile_DATA)
+
+AM_CPPFLAGS = \
+	$(GR_DIGITAL_INCLUDES) \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(PYTHON_CPPFLAGS) \
+	$(WITH_INCLUDES)
+
+if GUILE
+nobase_guile_DATA = \
+	gnuradio/digital.scm
+endif
+
+noinst_GUILE  = digital.test
+
+
+##############################
+# SWIG interface and library
+TOP_SWIG_IFILES = \
+	digital_swig.i
+
+# Install so that they end up available as:
+#   import gnuradio.digital
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/digital
+digital_swig_pythondir_category = \
+	gnuradio/digital
+
+# additional libraries for linking with the SWIG-generated library
+digital_swig_la_swig_libadd = \
+	$(abs_top_builddir)/gr-digital/lib/libgnuradio-digital.la
+
+# additional SWIG files to be installed
+digital_swig_swiginclude_headers =		\
+	digital_binary_slicer_fb.i		\
+	digital_clock_recovery_mm_cc.i		\
+	digital_clock_recovery_mm_ff.i		\
+	digital_constellation.i			\
+	digital_constellation_receiver_cb.i 	\
+	digital_constellation_decoder_cb.i	\
+	digital_correlate_access_code_bb.i	\
+	digital_costas_loop_cc.i		\
+	digital_cma_equalizer_cc.i		\
+	digital_crc32.i				\
+	digital_fll_band_edge_cc.i		\
+	digital_lms_dd_equalizer_cc.i		\
+	digital_kurtotic_equalizer_cc.i		\
+	digital_mpsk_receiver_cc.i		\
+	digital_ofdm_cyclic_prefixer.i		\
+	digital_ofdm_frame_acquisition.i	\
+	digital_ofdm_frame_sink.i		\
+	digital_ofdm_insert_preamble.i		\
+	digital_ofdm_mapper_bcv.i		\
+	digital_ofdm_sampler.i			\
+	digital_gmskmod_bc.i			\
+	digital_cpmmod_bc.i
+
+digital_swig_swig_args = \
+	$(GR_DIGITAL_INCLUDES)
+
+if GUILE
+TESTS += run_guile_tests
+endif
\ No newline at end of file
diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-digital/swig/Makefile.swig.gen
index d791ae2fa..ff3eff4e9 100644
--- a/gr-usrp2/src/Makefile.swig.gen
+++ b/gr-digital/swig/Makefile.swig.gen
@@ -20,37 +20,37 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-# Makefile.swig.gen for usrp2_swig.i
+# Makefile.swig.gen for digital_swig.i
 
 ## Default install locations for these files:
 ##
 ## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/usrp2_swig
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/digital_swig
 ## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/usrp2_swig
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/digital_swig
 ##
 ## The following can be overloaded to change the install location, but
 ## this has to be done in the including Makefile.am -before-
 ## Makefile.swig is included.
 
-usrp2_swig_pythondir_category ?= gnuradio/usrp2_swig
-usrp2_swig_pylibdir_category ?= $(usrp2_swig_pythondir_category)
-usrp2_swig_pythondir = $(pythondir)/$(usrp2_swig_pythondir_category)
-usrp2_swig_pylibdir = $(pyexecdir)/$(usrp2_swig_pylibdir_category)
+digital_swig_pythondir_category ?= gnuradio/digital_swig
+digital_swig_pylibdir_category ?= $(digital_swig_pythondir_category)
+digital_swig_pythondir = $(pythondir)/$(digital_swig_pythondir_category)
+digital_swig_pylibdir = $(pyexecdir)/$(digital_swig_pylibdir_category)
 
 # The .so libraries for the guile modules get installed whereever guile
 # is installed, usually /usr/lib/guile/gnuradio/
 # FIXME: determince whether these should be installed with gnuradio.
-usrp2_swig_scmlibdir = $(libdir)
+digital_swig_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/usrp2_swig
+# is installed, usually /usr/share/guile/site/digital_swig
 # FIXME: determince whether these should be installed with gnuradio.
-usrp2_swig_scmdir = $(guiledir)
+digital_swig_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
-usrp2_swig_swigincludedir = $(swigincludedir)
+digital_swig_swigincludedir = $(swigincludedir)
 
 ## This is a template file for a "generated" Makefile addition (in
 ## this case, "Makefile.swig.gen").  By including the top-level
@@ -75,71 +75,68 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
 
-usrp2_swig_swiginclude_HEADERS =		\
-	usrp2_swig.i			\
-	$(usrp2_swig_swiginclude_headers)
+digital_swig_swiginclude_HEADERS =		\
+	digital_swig.i			\
+	$(digital_swig_swiginclude_headers)
 
 if PYTHON
-usrp2_swig_pylib_LTLIBRARIES =		\
-	_usrp2_swig.la
+digital_swig_pylib_LTLIBRARIES =		\
+	_digital_swig.la
 
-_usrp2_swig_la_SOURCES = 			\
-	python/usrp2_swig.cc		\
-	$(usrp2_swig_la_swig_sources)
+_digital_swig_la_SOURCES = 			\
+	python/digital_swig.cc		\
+	$(digital_swig_la_swig_sources)
 
-usrp2_swig_python_PYTHON =			\
-	usrp2_swig.py			\
-	$(usrp2_swig_python)
+digital_swig_python_PYTHON =			\
+	digital_swig.py			\
+	$(digital_swig_python)
 
-_usrp2_swig_la_LIBADD =			\
+_digital_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
-	$(usrp2_swig_la_swig_libadd)
+	$(digital_swig_la_swig_libadd)
 
-_usrp2_swig_la_LDFLAGS =			\
+_digital_swig_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(usrp2_swig_la_swig_ldflags)
+	$(digital_swig_la_swig_ldflags)
 
-_usrp2_swig_la_CXXFLAGS =			\
+_digital_swig_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(usrp2_swig_la_swig_cxxflags)
+	-I$(top_builddir)
 
-python/usrp2_swig.cc: usrp2_swig.py
-usrp2_swig.py: usrp2_swig.i
+python/digital_swig.cc: digital_swig.py
+digital_swig.py: digital_swig.i
 
 # Include the python dependencies for this file
--include python/usrp2_swig.d
+-include python/digital_swig.d
 
 endif		# end of if python
 
 if GUILE
 
-usrp2_swig_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-usrp2_swig.la
-libguile_gnuradio_usrp2_swig_la_SOURCES =	\
-	guile/usrp2_swig.cc			\
-	$(usrp2_swig_la_swig_sources)
-nobase_usrp2_swig_scm_DATA = 		\
-	gnuradio/usrp2_swig.scm 		\
-	gnuradio/usrp2_swig-primitive.scm
-libguile_gnuradio_usrp2_swig_la_LIBADD = 	\
+digital_swig_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-digital_swig.la
+libguile_gnuradio_digital_swig_la_SOURCES =	\
+	guile/digital_swig.cc			\
+	$(digital_swig_la_swig_sources)
+nobase_digital_swig_scm_DATA = 		\
+	gnuradio/digital_swig.scm 		\
+	gnuradio/digital_swig-primitive.scm
+libguile_gnuradio_digital_swig_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
-	$(usrp2_swig_la_swig_libadd)
-libguile_gnuradio_usrp2_swig_la_LDFLAGS = 	\
+	$(digital_swig_la_swig_libadd)
+libguile_gnuradio_digital_swig_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(usrp2_swig_la_swig_ldflags)
-libguile_gnuradio_usrp2_swig_la_CXXFLAGS = 	\
+	$(digital_swig_la_swig_ldflags)
+libguile_gnuradio_digital_swig_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
-	$(usrp2_swig_la_swig_cxxflags)
+	$(digital_swig_la_swig_cxxflags)
 
-guile/usrp2_swig.cc: gnuradio/usrp2_swig.scm
-gnuradio/usrp2_swig.scm: usrp2_swig.i
-gnuradio/usrp2_swig-primitive.scm: gnuradio/usrp2_swig.scm
+guile/digital_swig.cc: gnuradio/digital_swig.scm
+gnuradio/digital_swig.scm: digital_swig.i
+gnuradio/digital_swig-primitive.scm: gnuradio/digital_swig.scm
 
 # Include the guile dependencies for this file
--include guile/usrp2_swig.d
+-include guile/digital_swig.d
 
 endif				# end of GUILE
-
-
diff --git a/gr-usrp2/src/rx_16sc_handler.cc b/gr-digital/swig/_digital_hier.i
index 7fb9ad06f..022e38644 100644
--- a/gr-usrp2/src/rx_16sc_handler.cc
+++ b/gr-digital/swig/_digital_hier.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,13 +20,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
+%{
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include <rx_16sc_handler.h>
+#include <digital_cpmmod_bc.h>
+#include <digital_gmskmod_bc.h>
+%}
 
-rx_16sc_handler::~rx_16sc_handler()
-{
-  // NOP
-}
+%include "digital_cpmmod_bc.i"
+%include "digital_gmskmod_bc.i"
diff --git a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.i b/gr-digital/swig/digital_binary_slicer_fb.i
index b6f4e9312..30603748b 100644
--- a/gnuradio-core/src/lib/general/gr_binary_slicer_fb.i
+++ b/gr-digital/swig/digital_binary_slicer_fb.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,14 +20,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,binary_slicer_fb);
+GR_SWIG_BLOCK_MAGIC(digital,binary_slicer_fb);
 
-gr_binary_slicer_fb_sptr gr_make_binary_slicer_fb ();
+digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
 
-class gr_binary_slicer_fb : public gr_sync_block
+class digital_binary_slicer_fb : public gr_sync_block
 {
  private:
-  gr_binary_slicer_fb ();
+  digital_binary_slicer_fb ();
 
  public:
 };
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.i b/gr-digital/swig/digital_clock_recovery_mm_cc.i
index 27eb70b95..4ce9a9725 100644
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.i
+++ b/gr-digital/swig/digital_clock_recovery_mm_cc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,18 +20,19 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,clock_recovery_mm_cc);
+GR_SWIG_BLOCK_MAGIC(digital,clock_recovery_mm_cc);
 
-gr_clock_recovery_mm_cc_sptr
-gr_make_clock_recovery_mm_cc (float omega, float gain_omega,
-			      float mu, float gain_mu,
-			      float omega_relative_limit) throw(std::exception);
+digital_clock_recovery_mm_cc_sptr
+digital_make_clock_recovery_mm_cc (float omega, float gain_omega,
+				   float mu, float gain_mu,
+				   float omega_relative_limit) throw(std::exception);
 
-class gr_clock_recovery_mm_cc : public gr_sync_block
+class digital_clock_recovery_mm_cc : public gr_sync_block
 {
  private:
-  gr_clock_recovery_mm_cc (float omega, float gain_omega, float mu, 
-			   float gain_mu, float omega_relative_limit);
+  digital_clock_recovery_mm_cc (float omega, float gain_omega,
+				float mu, float gain_mu,
+				float omega_relative_limit);
 
 public:
   float mu() const { return d_mu;}
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.i b/gr-digital/swig/digital_clock_recovery_mm_ff.i
index 1b2437000..054ef9ebf 100644
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.i
+++ b/gr-digital/swig/digital_clock_recovery_mm_ff.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,18 +20,19 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,clock_recovery_mm_ff);
+GR_SWIG_BLOCK_MAGIC(digital,clock_recovery_mm_ff);
 
-gr_clock_recovery_mm_ff_sptr
-gr_make_clock_recovery_mm_ff (float omega, float gain_omega,
-			      float mu, float gain_mu,
-			      float omega_relative_limit=0.001) throw(std::exception);
+digital_clock_recovery_mm_ff_sptr
+digital_make_clock_recovery_mm_ff (float omega, float gain_omega,
+				   float mu, float gain_mu,
+				   float omega_relative_limit=0.001) throw(std::exception);
 
-class gr_clock_recovery_mm_ff : public gr_sync_block
+class digital_clock_recovery_mm_ff : public gr_sync_block
 {
  private:
-  gr_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
-			   float omega_relative_limit);
+  digital_clock_recovery_mm_ff (float omega, float gain_omega,
+				float mu, float gain_mu,
+				float omega_relative_limit);
 
 public:
   float mu() const;
diff --git a/gr-usrp/src/usrp_sink_s.i b/gr-digital/swig/digital_cma_equalizer_cc.i
index 9993d5214..183e43ef9 100644
--- a/gr-usrp/src/usrp_sink_s.i
+++ b/gr-digital/swig/digital_cma_equalizer_cc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,28 +20,25 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%{
-#include "usrp_sink_s.h"
-%}
+GR_SWIG_BLOCK_MAGIC(digital,cma_equalizer_cc)
 
-GR_SWIG_BLOCK_MAGIC(usrp,sink_s)
+// retrieve info on the base class, without generating wrappers since
+// the base class has a pure virual method.
+%import "gr_adaptive_fir_ccc.i"
 
-class usrp_sink_s;
-typedef boost::shared_ptr<usrp_sink_s> usrp_sink_s_sptr;
+digital_cma_equalizer_cc_sptr
+digital_make_cma_equalizer_cc(int num_taps, float modulus,
+			      float mu, int sps);
 
-usrp_sink_s_sptr
-usrp_make_sink_s(int which=0,
-		 unsigned int interp_rate=32,
-		 int nchan=1,
-		 int mux=-1,
-		 int fusb_block_size=0,
-		 int fusb_nblocks=0,
-		 const std::string fpga_filename="",
-		 const std::string firmware_filename=""
-		 ) throw (std::runtime_error);
-
-class usrp_sink_s : public usrp_sink_base 
+class digital_cma_equalizer_cc : public gr_adaptive_fir_ccc
 {
 private:
-  usrp_sink_s() throw (std::runtime_error);
+  digital_cma_equalizer_cc(int num_taps, float modulus,
+			   float mu, int sps);
+
+public:
+  float get_gain();
+  void set_gain(float mu);
+  float get_modulus();
+  void set_modulus(float mod);
 };
diff --git a/gr-digital/swig/digital_constellation.i b/gr-digital/swig/digital_constellation.i
new file mode 100644
index 000000000..7e0ad6afe
--- /dev/null
+++ b/gr-digital/swig/digital_constellation.i
@@ -0,0 +1,189 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010, 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.
+ */
+
+%template(gr_complex_vector) std::vector<gr_complex>;
+%template(unsigned_int_vector) std::vector<unsigned int>;
+
+// Make sure metric types get SWIGed.
+%include "digital_metric_type.h"
+
+class digital_constellation;
+typedef boost::shared_ptr<digital_constellation> digital_constellation_sptr;
+%template(digital_constellation_sptr) boost::shared_ptr<digital_constellation>;
+
+class digital_constellation
+{
+public:
+  digital_constellation (std::vector<gr_complex> constellation,
+			 std::vector<unsigned int> pre_diff_code,
+			 unsigned int rotational_symmetry,
+			 unsigned int dimensionality);
+  std::vector<gr_complex> points();
+  std::vector<gr_complex> s_points();
+  std::vector<std::vector<gr_complex> > v_points();
+  virtual unsigned int decision_maker (gr_complex *sample) = 0;  
+  unsigned int decision_maker_v (std::vector<gr_complex> sample);  
+  //  void calc_metric(gr_complex *sample, float *metric, trellis_metric_type_t type);
+  //  void calc_euclidean_metric(gr_complex *sample, float *metric);
+  //  void calc_hard_symbol_metric(gr_complex *sample, float *metric);
+  std::vector<gr_complex> map_to_points_v(unsigned int value);
+  unsigned int bits_per_symbol ();
+  unsigned int arity ();
+  digital_constellation_sptr base ();
+  bool apply_pre_diff_code();
+  void set_pre_diff_code(bool a);
+  std::vector<unsigned int> pre_diff_code();
+  unsigned int rotational_symmetry();
+  unsigned int dimensionality();
+};
+
+class digital_constellation_calcdist;
+typedef boost::shared_ptr<digital_constellation_calcdist> digital_constellation_calcdist_sptr;
+%template(digital_constellation_calcdist_sptr) boost::shared_ptr<digital_constellation_calcdist>;
+%rename(constellation_calcdist) digital_make_constellation_calcdist;
+digital_constellation_calcdist_sptr
+digital_make_constellation_calcdist(std::vector<gr_complex> constellation,
+				    std::vector<unsigned int> pre_diff_code,
+				    unsigned int rotational_symmetry,
+				    unsigned int dimensionality);
+%ignore digital_constellation_calcdist;
+
+class digital_constellation_calcdist: public digital_constellation
+{
+ public:
+  digital_constellation_calcdist (std::vector<gr_complex> constellation,
+				  std::vector<unsigned int> pre_diff_code,
+				  unsigned int rotational_symmetry,
+				  unsigned int dimensionality);
+  unsigned int decision_maker (const gr_complex *sample);
+};
+
+class digital_constellation_sector: public digital_constellation
+{
+};
+
+class digital_constellation_rect;
+typedef boost::shared_ptr<digital_constellation_rect> digital_constellation_rect_sptr;
+%template(digital_constellation_rect_sptr) boost::shared_ptr<digital_constellation_rect>;
+%rename(constellation_rect) digital_make_constellation_rect;
+digital_constellation_rect_sptr digital_make_constellation_rect(std::vector<gr_complex> constellation,
+								std::vector<unsigned int> pre_diff_code,
+								unsigned int rotational_symmetry,
+								unsigned int real_sectors, unsigned int imag_sectors,
+								float width_real_sectors, float width_imag_sectors);
+%ignore digital_constellation_rect;
+
+class digital_constellation_rect : public digital_constellation_sector
+{
+public:
+  digital_constellation_rect (std::vector<gr_complex> constellation,
+			      std::vector<unsigned int> pre_diff_code,
+			      unsigned int rotational_symmetry,
+			      unsigned int real_sectors, unsigned int imag_sectors,
+			      float width_real_sectors, float width_imag_sectors);
+};
+
+class digital_constellation_psk;
+typedef boost::shared_ptr<digital_constellation_psk> digital_constellation_psk_sptr;
+%template(digital_constellation_psk_sptr) boost::shared_ptr<digital_constellation_psk>;
+%rename(constellation_psk) digital_make_constellation_psk;
+digital_constellation_psk_sptr digital_make_constellation_psk(std::vector<gr_complex> constellation,
+							      std::vector<unsigned int> pre_diff_code,
+							      unsigned int n_sectors);
+%ignore digital_constellation_psk;
+
+class digital_constellation_psk : public digital_constellation_sector
+{
+public:
+  digital_constellation_psk (std::vector<gr_complex> constellation,
+			     std::vector<unsigned int> pre_diff_code,
+			     unsigned int n_sectors);
+};
+
+/*
+  BPSK Constellation
+*/
+
+class digital_constellation_bpsk;
+typedef boost::shared_ptr<digital_constellation_bpsk> digital_constellation_bpsk_sptr;
+%template(digital_constellation_bpsk_sptr) boost::shared_ptr<digital_constellation_bpsk>;
+%rename(constellation_bpsk) digital_make_constellation_bpsk;
+digital_constellation_bpsk_sptr digital_make_constellation_bpsk();
+%ignore digital_constellation_bpsk;
+
+class digital_constellation_bpsk : public digital_constellation
+{
+public:
+  digital_constellation_bpsk ();
+};
+
+/*
+  QPSK Constellation
+*/
+
+class digital_constellation_qpsk;
+typedef boost::shared_ptr<digital_constellation_qpsk> digital_constellation_qpsk_sptr;
+%template(digital_constellation_qpsk_sptr) boost::shared_ptr<digital_constellation_qpsk>;
+%rename(constellation_qpsk) digital_make_constellation_qpsk;
+digital_constellation_qpsk_sptr digital_make_constellation_qpsk();
+%ignore digital_constellation_qpsk;
+
+class digital_constellation_qpsk : public digital_constellation
+{
+public:
+  digital_constellation_qpsk ();
+};
+
+/*
+  DQPSK Constellation
+*/
+
+class digital_constellation_dqpsk;
+typedef boost::shared_ptr<digital_constellation_dqpsk> digital_constellation_dqpsk_sptr;
+%template(digital_constellation_dqpsk_sptr) boost::shared_ptr<digital_constellation_dqpsk>;
+%rename(constellation_dqpsk) digital_make_constellation_dqpsk;
+digital_constellation_dqpsk_sptr digital_make_constellation_dqpsk();
+%ignore digital_constellation_dqpsk;
+
+class digital_constellation_dqpsk : public digital_constellation
+{
+public:
+  digital_constellation_dqpsk ();
+};
+
+
+/*
+  8PSK Constellation
+*/
+
+class digital_constellation_8psk;
+typedef boost::shared_ptr<digital_constellation_8psk> digital_constellation_8psk_sptr;
+%template(digital_constellation_8psk_sptr) boost::shared_ptr<digital_constellation_8psk>;
+%rename(constellation_8psk) digital_make_constellation_8psk;
+digital_constellation_8psk_sptr digital_make_constellation_8psk();
+%ignore digital_constellation_8psk;
+
+class digital_constellation_8psk : public digital_constellation
+{
+public:
+  digital_constellation_8psk ();
+};
diff --git a/gnuradio-core/src/lib/general/gr_costas_loop_cc.i b/gr-digital/swig/digital_constellation_decoder_cb.i
index 488cab370..53d3fe8e0 100644
--- a/gnuradio-core/src/lib/general/gr_costas_loop_cc.i
+++ b/gr-digital/swig/digital_constellation_decoder_cb.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005,2006 Free Software Foundation, Inc.
+ * Copyright 2006, 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,25 +20,19 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,costas_loop_cc);
+GR_SWIG_BLOCK_MAGIC(digital,constellation_decoder_cb)
 
-gr_costas_loop_cc_sptr
-gr_make_costas_loop_cc (float alpha, float beta, 
-			float max_freq, float min_freq,
-			int order
-			) throw (std::invalid_argument);
+digital_constellation_decoder_cb_sptr 
+digital_make_constellation_decoder_cb (digital_constellation_sptr constellation);
 
-
-class gr_costas_loop_cc : public gr_sync_block
+class digital_constellation_decoder_cb : public gr_sync_block
 {
  private:
-  gr_costas_loop_cc (float alpha, float beta,
-		     float max_freq, float min_freq, int order);
+  digital_constellation_decoder_cb (digital_constellation_sptr constellation);
+
+  friend digital_constellation_decoder_cb_sptr 
+  	gr_make_constellation_decoder_cb (digital_constellation_sptr constellation);
 
  public:
-   void set_alpha(float alpha);
-   float alpha();
-   void set_beta(float beta);
-   float beta();
-   float freq();   
+  ~digital_constellation_decoder_cb();
 };
diff --git a/gnuradio-core/src/lib/general/gr_lms_dfe_cc.i b/gr-digital/swig/digital_constellation_receiver_cb.i
index 9a9f22b6e..9c4ba645e 100644
--- a/gnuradio-core/src/lib/general/gr_lms_dfe_cc.i
+++ b/gr-digital/swig/digital_constellation_receiver_cb.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,18 +20,17 @@
  * Boston, MA 02110-1301, USA.
  */
 
+GR_SWIG_BLOCK_MAGIC(digital,constellation_receiver_cb);
 
-GR_SWIG_BLOCK_MAGIC(gr,lms_dfe_cc)
+%include "digital_constellation.i"
 
-gr_lms_dfe_cc_sptr gr_make_lms_dfe_cc (float lambda_ff, float lambda_fb, 
-				       unsigned int num_fftaps, unsigned int num_fbtaps);
+digital_constellation_receiver_cb_sptr
+digital_make_constellation_receiver_cb (digital_constellation_sptr constellation,
+					float loop_bw, float fmin, float fmax);
 
-class gr_lms_dfe_cc : public gr_sync_block
+class digital_constellation_receiver_cb : public gr_block, public gri_control_loop
 {
  private:
-  gr_lms_dfe_cc (float lambda_ff, float lambda_fb, 
-		 unsigned int num_fftaps, unsigned int num_fbtaps);
-  gr_complex slicer_0deg(gr_complex baud);
-  gr_complex slicer_45deg(gr_complex baud);
-  gr_complex conjg(gr_complex val);
+  digital_constellation_receiver_cb (digital_contellation_sptr constellation,
+				     float loop_bw, float fmin, float fmax);
 };
diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.i b/gr-digital/swig/digital_correlate_access_code_bb.i
index bec4282f1..01087b8e9 100644
--- a/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.i
+++ b/gr-digital/swig/digital_correlate_access_code_bb.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,14 +20,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,correlate_access_code_bb);
+GR_SWIG_BLOCK_MAGIC(digital,correlate_access_code_bb);
 
 /*!
  * \param access_code is represented with 1 byte per bit, e.g., "010101010111000100"
  * \param threshold maximum number of bits that may be wrong
  */
-gr_correlate_access_code_bb_sptr 
-gr_make_correlate_access_code_bb (const std::string &access_code, int threshold) 
+digital_correlate_access_code_bb_sptr 
+digital_make_correlate_access_code_bb (const std::string &access_code, int threshold) 
   throw(std::out_of_range);
 
 /*!
@@ -43,15 +43,15 @@ gr_make_correlate_access_code_bb (const std::string &access_code, int threshold)
  * flag bit and is 1 if the corresponding data bit is the first data
  * bit following the access code. Otherwise the flag bit is 0.
  */
-class gr_correlate_access_code_bb : public gr_sync_block
+class digital_correlate_access_code_bb : public gr_sync_block
 {
-  friend gr_correlate_access_code_bb_sptr 
-  gr_make_correlate_access_code_bb (const std::string &access_code, int threshold);
+  friend digital_correlate_access_code_bb_sptr 
+  digital_make_correlate_access_code_bb (const std::string &access_code, int threshold);
  protected:
-  gr_correlate_access_code_bb(const std::string &access_code, int threshold);
+  digital_correlate_access_code_bb(const std::string &access_code, int threshold);
 
  public:
-  ~gr_correlate_access_code_bb();
+  ~digital_correlate_access_code_bb();
 
   /*!
    * \param access_code is represented with 1 byte per bit, e.g., "010101010111000100"
diff --git a/gnuradio-core/src/lib/general/gr_lms_dfe_ff.i b/gr-digital/swig/digital_costas_loop_cc.i
index 3ca488b52..ab09200a0 100644
--- a/gnuradio-core/src/lib/general/gr_lms_dfe_ff.i
+++ b/gr-digital/swig/digital_costas_loop_cc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2006,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,15 +20,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
+GR_SWIG_BLOCK_MAGIC(digital,costas_loop_cc);
 
-GR_SWIG_BLOCK_MAGIC(gr,lms_dfe_ff)
+digital_costas_loop_cc_sptr
+digital_make_costas_loop_cc (float loop_bw, int order
+			     ) throw (std::invalid_argument);
 
-gr_lms_dfe_ff_sptr gr_make_lms_dfe_ff (float lambda_ff, float lambda_fb, 
-				       unsigned int num_fftaps, unsigned int num_fbtaps);
-
-class gr_lms_dfe_ff : public gr_sync_block
+class digital_costas_loop_cc : public gr_sync_block, public gri_control_loop
 {
  private:
-  gr_lms_dfe_ff (float lambda_ff, float lambda_fb, 
-		 unsigned int num_fftaps, unsigned int num_fbtaps);
+  digital_costas_loop_cc (float loop_bw, int order);
 };
diff --git a/gr-digital/swig/digital_cpmmod_bc.i b/gr-digital/swig/digital_cpmmod_bc.i
new file mode 100644
index 000000000..fa7c50da7
--- /dev/null
+++ b/gr-digital/swig/digital_cpmmod_bc.i
@@ -0,0 +1,40 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2010 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(digital, cpmmod_bc)
+
+digital_cpmmod_bc_sptr
+digital_make_cpmmod_bc(int type, float h,
+		       unsigned samples_per_sym,
+		       unsigned L, double beta=0.3);
+
+class digital_cpmmod_bc : public gr_hier_block2
+{
+ private:
+  digital_cpmmod_bc(int type, float h,
+		    unsigned samples_per_sym,
+		    unsigned L, double beta);
+  
+ public:
+  std::vector<float> get_taps();
+};
+
diff --git a/gnuradio-core/src/lib/general/gr_crc32.i b/gr-digital/swig/digital_crc32.i
index 7dca5c6a1..806bfad6a 100644
--- a/gnuradio-core/src/lib/general/gr_crc32.i
+++ b/gr-digital/swig/digital_crc32.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%rename(update_crc32) gr_update_crc32;
-%rename(crc32) gr_crc32;
+%rename(update_crc32) digital_update_crc32;
+%rename(crc32) digital_crc32;
 
-unsigned int gr_update_crc32(unsigned int crc, const std::string buf);
-unsigned int gr_crc32(const std::string buf);
+unsigned int digital_update_crc32(unsigned int crc, const std::string buf);
+unsigned int digital_crc32(const std::string buf);
diff --git a/gr-digital/swig/digital_fll_band_edge_cc.i b/gr-digital/swig/digital_fll_band_edge_cc.i
new file mode 100644
index 000000000..3efcb89ed
--- /dev/null
+++ b/gr-digital/swig/digital_fll_band_edge_cc.i
@@ -0,0 +1,60 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(digital,fll_band_edge_cc);
+
+digital_fll_band_edge_cc_sptr digital_make_fll_band_edge_cc (float samps_per_sym,
+							     float rolloff,
+							     int filter_size,
+							     float bandwidth);
+
+class digital_fll_band_edge_cc : public gr_sync_block, public gri_control_loop
+{
+ private:
+  digital_fll_band_edge_cc (float samps_per_sym, float rolloff,
+			    int filter_size, float bandwidth);
+
+ public:
+  ~digital_fll_band_edge_cc ();
+
+  void set_loop_bandwidth(float bw);
+  void set_damping_factor(float df);
+  void set_alpha(float alpha);
+  void set_beta(float beta);
+  void set_samples_per_symbol(float sps);
+  void set_rolloff(float rolloff);
+  void set_filter_size(int filter_size);
+  void set_frequency(float freq);
+  void set_phase(float phase);
+
+  float get_loop_bandwidth() const;
+  float get_damping_factor() const;
+  float get_alpha() const;
+  float get_beta() const;
+  float get_samples_per_symbol() const;
+  float get_rolloff() const;
+  int get_filter_size() const;
+  float get_frequency() const;
+  float get_phase() const;
+
+  void print_taps();
+};
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.i b/gr-digital/swig/digital_gmskmod_bc.i
index e786c70f5..ad7b82237 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.i
+++ b/gr-digital/swig/digital_gmskmod_bc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,17 +20,20 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,ofdm_mapper_bcv)
+GR_SWIG_BLOCK_MAGIC(digital, gmskmod_bc)
 
-gr_ofdm_mapper_bcv_sptr 
-gr_make_ofdm_mapper_bcv (unsigned int bits_per_symbol, 
-			 unsigned int vlen);
+digital_gmskmod_bc_sptr
+digital_make_gmskmod_bc(unsigned samples_per_sym=2,
+			double bt=0.3, unsigned L=4);
 
-class gr_ofdm_mapper_bcv : public gr_sync_decimator
+class digital_gmskmod_bc : public gr_hier_block2
 {
- protected:
-  gr_ofdm_mapper_bcv (unsigned int bits_per_symbol,
-		      unsigned int vlen);
+ private:
+  digital_cpmmod_bc(int type, float h,
+		    unsigned samples_per_sym,
+		    double beta, unsigned L);
 
  public:
+  std::vector<float> get_taps();
 };
+
diff --git a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.i b/gr-digital/swig/digital_kurtotic_equalizer_cc.i
index 30e2fb8bd..67a9dc6fd 100644
--- a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.i
+++ b/gr-digital/swig/digital_kurtotic_equalizer_cc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2009 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,18 +20,21 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,cma_equalizer_cc)
+GR_SWIG_BLOCK_MAGIC(digital,kurtotic_equalizer_cc)
 
 // retrieve info on the base class, without generating wrappers since
 // the base class has a pure virual method.
-%import "gr_adaptive_fir_ccf.i"
+%import "gr_adaptive_fir_ccc.i"
 
-gr_cma_equalizer_cc_sptr gr_make_cma_equalizer_cc(int num_taps, float modulus, float mu);
+digital_kurtotic_equalizer_cc_sptr
+digital_make_kurtotic_equalizer_cc(int num_taps,
+				   float mu);
 
-class gr_cma_equalizer_cc : public gr_adaptive_fir_ccf
+class digital_kurtotic_equalizer_cc : public gr_adaptive_fir_ccc
 {
 private:
-  gr_cma_equalizer_cc(int num_taps, float modulus, float mu);
+  digital_kurtotic_equalizer_cc(int num_taps, float mu);
 
 public:
+  void set_gain(float mu);
 };
diff --git a/gr-digital/swig/digital_lms_dd_equalizer_cc.i b/gr-digital/swig/digital_lms_dd_equalizer_cc.i
new file mode 100644
index 000000000..bd5c6ae29
--- /dev/null
+++ b/gr-digital/swig/digital_lms_dd_equalizer_cc.i
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+
+GR_SWIG_BLOCK_MAGIC(digital,lms_dd_equalizer_cc)
+
+// retrieve info on the base class, without generating wrappers since
+// the base class has a pure virual method.
+%import "gr_adaptive_fir_ccc.i"
+
+
+digital_lms_dd_equalizer_cc_sptr
+digital_make_lms_dd_equalizer_cc (int num_taps,
+				  float mu, int sps,
+				  digital_constellation_sptr cnst);
+
+class digital_lms_dd_equalizer_cc : public gr_sync_block
+{
+private:
+  digital_lms_dd_equalizer_cc (int num_taps,
+			       float mu, int sps,
+			       digital_constellation_sptr cnst);
+
+public:
+  float get_gain();
+  void  set_gain(float mu);
+};
diff --git a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.i b/gr-digital/swig/digital_mpsk_receiver_cc.i
index 88cb43e04..b51411f6f 100644
--- a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.i
+++ b/gr-digital/swig/digital_mpsk_receiver_cc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,21 +20,22 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,mpsk_receiver_cc);
+GR_SWIG_BLOCK_MAGIC(digital,mpsk_receiver_cc);
 
-gr_mpsk_receiver_cc_sptr gr_make_mpsk_receiver_cc (unsigned int M, float theta,
-						   float alpha, float beta,
-						   float fmin, float fmax,
-						   float mu, float gain_mu, 
-						   float omega, float gain_omega, float omega_rel);
-class gr_mpsk_receiver_cc : public gr_block
+digital_mpsk_receiver_cc_sptr digital_make_mpsk_receiver_cc (unsigned int M, float theta,
+							     float loop_bw,
+							     float fmin, float fmax,
+							     float mu, float gain_mu, 
+							     float omega, float gain_omega,
+							     float omega_rel);
+class digital_mpsk_receiver_cc : public gr_block, public gri_control_loop
 {
  private:
-  gr_mpsk_receiver_cc (unsigned int M,float theta,
-				float alpha, float beta,
-				float fmin, float fmax,
-				float mu, float gain_mu, 
-				float omega, float gain_omega, float omega_rel);
+  digital_mpsk_receiver_cc (unsigned int M,float theta,
+			    float loop_bw,
+			    float fmin, float fmax,
+			    float mu, float gain_mu, 
+			    float omega, float gain_omega, float omega_rel);
 public:
   float mu() const { return d_mu;}
   float omega() const { return d_omega;}
@@ -48,12 +49,4 @@ public:
   }
   void set_gain_mu (float gain_mu) { d_gain_mu = gain_mu; }
   void set_gain_omega (float gain_omega) { d_gain_omega = gain_omega; }
-  float alpha() const { return d_alpha; }
-  float beta() const { return d_beta; }
-  float freq() const { return d_freq; }
-  float phase() const { return d_phase; }
-  void set_alpha(float alpha) { d_alpha = alpha; }
-  void set_beta(float beta) { d_beta = beta; }
-  void set_freq(float freq) { d_freq = freq; }
-  void set_phase(float phase) { d_phase = phase; } 
 };
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_cyclic_prefixer.i b/gr-digital/swig/digital_ofdm_cyclic_prefixer.i
index 9fd8521a2..56d1629a8 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_cyclic_prefixer.i
+++ b/gr-digital/swig/digital_ofdm_cyclic_prefixer.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2009 Free Software Foundation, Inc.
+ * Copyright 2006,2009,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,15 +20,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,ofdm_cyclic_prefixer)
+GR_SWIG_BLOCK_MAGIC(digital,ofdm_cyclic_prefixer)
 
-gr_ofdm_cyclic_prefixer_sptr 
-gr_make_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
+digital_ofdm_cyclic_prefixer_sptr 
+digital_make_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
 
-class gr_ofdm_cyclic_prefixer : public gr_sync_interpolator
+class digital_ofdm_cyclic_prefixer : public gr_sync_interpolator
 {
  protected:
-  gr_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
+  digital_ofdm_cyclic_prefixer (size_t input_size, size_t output_size);
 
  public:
 };
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.i b/gr-digital/swig/digital_ofdm_frame_acquisition.i
index 0fd0bc58b..b61297bde 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.i
+++ b/gr-digital/swig/digital_ofdm_frame_acquisition.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006, 2007 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,23 +22,23 @@
 
 #include <vector>
 
-GR_SWIG_BLOCK_MAGIC(gr,ofdm_frame_acquisition);
+GR_SWIG_BLOCK_MAGIC(digital,ofdm_frame_acquisition);
 
-gr_ofdm_frame_acquisition_sptr 
-gr_make_ofdm_frame_acquisition (unsigned int occupied_carriers, 
-				unsigned int fft_length,
-				unsigned int cplen,
-				const std::vector<gr_complex> &known_symbol, 
-				unsigned int max_fft_shift_len=4);
+digital_ofdm_frame_acquisition_sptr 
+digital_make_ofdm_frame_acquisition (unsigned int occupied_carriers, 
+				     unsigned int fft_length,
+				     unsigned int cplen,
+				     const std::vector<gr_complex> &known_symbol, 
+				     unsigned int max_fft_shift_len=4);
 
-class gr_ofdm_frame_acquisition : public gr_sync_decimator
+class digital_ofdm_frame_acquisition : public gr_sync_decimator
 {
  protected:
-  gr_ofdm_frame_acquisition (unsigned int occupied_carriers,
-			     unsigned int fft_length,
-			     unsigned int cplen,
-			     const std::vector<gr_complex> &known_symbol, 
-			     unsigned int max_fft_shift_len);
+  digital_ofdm_frame_acquisition (unsigned int occupied_carriers,
+				  unsigned int fft_length,
+				  unsigned int cplen,
+				  const std::vector<gr_complex> &known_symbol, 
+				  unsigned int max_fft_shift_len);
 
  public:
   float snr() { return d_snr_est; }
diff --git a/gr-digital/swig/digital_ofdm_frame_sink.i b/gr-digital/swig/digital_ofdm_frame_sink.i
new file mode 100644
index 000000000..cd3fa1422
--- /dev/null
+++ b/gr-digital/swig/digital_ofdm_frame_sink.i
@@ -0,0 +1,41 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007,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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(digital,ofdm_frame_sink);
+
+digital_ofdm_frame_sink_sptr 
+digital_make_ofdm_frame_sink(const std::vector<gr_complex> &sym_position, 
+			     const std::vector<unsigned char> &sym_value_out,
+			     gr_msg_queue_sptr target_queue, unsigned int occupied_tones,
+			     float phase_gain=0.25, float freq_gain=0.25*0.25/4);
+
+class digital_ofdm_frame_sink : public gr_sync_block
+{
+ protected:
+  digital_ofdm_frame_sink(const std::vector<gr_complex> &sym_position, 
+			  const std::vector<unsigned char> &sym_value_out,
+			  gr_msg_queue_sptr target_queue, unsigned int occupied_tones,
+			  float phase_gain, float freq_gain);
+
+ public:
+  ~digital_ofdm_frame_sink();
+};
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.i b/gr-digital/swig/digital_ofdm_insert_preamble.i
index e33bd63a0..5f7b16369 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.i
+++ b/gr-digital/swig/digital_ofdm_insert_preamble.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,16 +20,16 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,ofdm_insert_preamble);
+GR_SWIG_BLOCK_MAGIC(digital,ofdm_insert_preamble);
 
-gr_ofdm_insert_preamble_sptr
-gr_make_ofdm_insert_preamble(int fft_length,
-			     const std::vector<std::vector<gr_complex> > &preamble);
+digital_ofdm_insert_preamble_sptr
+digital_make_ofdm_insert_preamble(int fft_length,
+				  const std::vector<std::vector<gr_complex> > &preamble);
 
 
-class gr_ofdm_insert_preamble : public gr_block
+class digital_ofdm_insert_preamble : public gr_block
 {
  protected:
-  gr_ofdm_insert_preamble(int fft_length,
-			  const std::vector<std::vector<gr_complex> > &preamble);
+  digital_ofdm_insert_preamble(int fft_length,
+			       const std::vector<std::vector<gr_complex> > &preamble);
 };
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.i b/gr-digital/swig/digital_ofdm_mapper_bcv.i
index 3850220ba..4e9aaba7d 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.i
+++ b/gr-digital/swig/digital_ofdm_mapper_bcv.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006,2007 Free Software Foundation, Inc.
+ * Copyright 2006,2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,22 +20,22 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,ofdm_mapper_bcv);
+GR_SWIG_BLOCK_MAGIC(digital,ofdm_mapper_bcv);
 
-gr_ofdm_mapper_bcv_sptr 
-gr_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation,
-			 unsigned int msgq_limit,
-			 unsigned int bits_per_symbol, 
-			 unsigned int fft_length) throw(std::exception);
+digital_ofdm_mapper_bcv_sptr 
+digital_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation,
+			      unsigned int msgq_limit,
+			      unsigned int bits_per_symbol, 
+			      unsigned int fft_length) throw(std::exception);
 
 
-class gr_ofdm_mapper_bcv : public gr_sync_block
+class digital_ofdm_mapper_bcv : public gr_sync_block
 {
  protected:
-  gr_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation,
-		      unsigned int msgq_limit,
-		      unsigned int bits_per_symbol,
-		      unsigned int fft_length);
+  digital_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation,
+			   unsigned int msgq_limit,
+			   unsigned int bits_per_symbol,
+			   unsigned int fft_length);
   
  public:
   gr_msg_queue_sptr msgq();
diff --git a/gnuradio-core/src/lib/general/gr_ofdm_sampler.i b/gr-digital/swig/digital_ofdm_sampler.i
index 601330b07..91056c320 100644
--- a/gnuradio-core/src/lib/general/gr_ofdm_sampler.i
+++ b/gr-digital/swig/digital_ofdm_sampler.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,16 +20,16 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,ofdm_sampler)
+GR_SWIG_BLOCK_MAGIC(digital,ofdm_sampler)
 
-  gr_ofdm_sampler_sptr gr_make_ofdm_sampler (unsigned int fft_length, 
-					     unsigned int symbol_length,
-					     unsigned int timeout=1000);
+  digital_ofdm_sampler_sptr digital_make_ofdm_sampler (unsigned int fft_length, 
+						       unsigned int symbol_length,
+						       unsigned int timeout=1000);
 
-class gr_ofdm_sampler : public gr_sync_block
+class digital_ofdm_sampler : public gr_sync_block
 {
  private:
-  gr_ofdm_sampler (unsigned int fft_length,
-		   unsigned int symbol_length,
-		   unsigned int timeout);
+  digital_ofdm_sampler (unsigned int fft_length,
+			unsigned int symbol_length,
+			unsigned int timeout);
 };
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
new file mode 100644
index 000000000..3e3a63b61
--- /dev/null
+++ b/gr-digital/swig/digital_swig.i
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+%include "gnuradio.i"
+
+%include <gri_control_loop.i>
+
+%{
+#include "digital_binary_slicer_fb.h"
+#include "digital_clock_recovery_mm_cc.h"
+#include "digital_clock_recovery_mm_ff.h"
+#include "digital_cma_equalizer_cc.h"
+#include "digital_constellation.h"
+#include "digital_constellation_decoder_cb.h"
+#include "digital_constellation_receiver_cb.h"
+#include "digital_correlate_access_code_bb.h"
+#include "digital_costas_loop_cc.h"
+#include "digital_crc32.h"
+#include "digital_fll_band_edge_cc.h"
+#include "digital_kurtotic_equalizer_cc.h"
+#include "digital_lms_dd_equalizer_cc.h"
+#include "digital_mpsk_receiver_cc.h"
+#include "digital_ofdm_cyclic_prefixer.h"
+#include "digital_ofdm_frame_acquisition.h"
+#include "digital_ofdm_frame_sink.h"
+#include "digital_ofdm_insert_preamble.h"
+#include "digital_ofdm_mapper_bcv.h"
+#include "digital_ofdm_sampler.h"
+#include "digital_cpmmod_bc.h"
+#include "digital_gmskmod_bc.h"
+%}
+
+%include "digital_binary_slicer_fb.i"
+%include "digital_clock_recovery_mm_cc.i"
+%include "digital_clock_recovery_mm_ff.i"
+%include "digital_cma_equalizer_cc.i"
+%include "digital_constellation.i"
+%include "digital_constellation_decoder_cb.i"
+%include "digital_constellation_receiver_cb.i"
+%include "digital_correlate_access_code_bb.i"
+%include "digital_costas_loop_cc.i"
+%include "digital_crc32.i"
+%include "digital_fll_band_edge_cc.i"
+%include "digital_kurtotic_equalizer_cc.i"
+%include "digital_lms_dd_equalizer_cc.i"
+%include "digital_mpsk_receiver_cc.i"
+%include "digital_ofdm_cyclic_prefixer.i"
+%include "digital_ofdm_frame_acquisition.i"
+%include "digital_ofdm_frame_sink.i"
+%include "digital_ofdm_insert_preamble.i"
+%include "digital_ofdm_mapper_bcv.i"
+%include "digital_ofdm_sampler.i"
+%include "digital_cpmmod_bc.i"
+%include "digital_gmskmod_bc.i"
+
+#if SWIGGUILE
+%scheme %{
+(load-extension-global "libguile-gnuradio-digital_swig" "scm_init_gnuradio_digital_swig_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif
diff --git a/gr-digital/swig/gnuradio/.gitignore b/gr-digital/swig/gnuradio/.gitignore
new file mode 100644
index 000000000..c264c571a
--- /dev/null
+++ b/gr-digital/swig/gnuradio/.gitignore
@@ -0,0 +1,2 @@
+digital_swig-primitive.scm
+digital_swig.scm
diff --git a/gr-usrp/src/gnuradio/usrp.scm b/gr-digital/swig/gnuradio/digital.scm
index e01c9454a..834bc8d6d 100644
--- a/gr-usrp/src/gnuradio/usrp.scm
+++ b/gr-digital/swig/gnuradio/digital.scm
@@ -1,5 +1,5 @@
 ;;;
-;;; Copyright 2010 Free Software Foundation, Inc.
+;;; Copyright 2011 Free Software Foundation, Inc.
 ;;;
 ;;; This file is part of GNU Radio
 ;;;
@@ -17,11 +17,12 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;;;
 
-;;; Semi bogus module that just re-exports the usrp_swig module
+;;; Module that just re-exports the digital_swig module
 
-(define-module (gnuradio usrp)
+(define-module (gnuradio digital)
   #:use-module (gnuradio export-safely)
-  #:use-module (gnuradio usrp_swig)
+  #:use-module (gnuradio digital_swig)
   #:duplicates (merge-generics replace check))
 
-(re-export-all '(gnuradio usrp_swig))
+(re-export-all '(gnuradio digital_swig))
+
diff --git a/gr-usrp/src/run_guile_tests.in b/gr-digital/swig/run_guile_tests.in
index 5d08b0dd5..5d08b0dd5 100644
--- a/gr-usrp/src/run_guile_tests.in
+++ b/gr-digital/swig/run_guile_tests.in
diff --git a/gr-gcell/.gitignore b/gr-gcell/.gitignore
deleted file mode 100644
index 53edad32f..000000000
--- a/gr-gcell/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.cache
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/make.log
-/missing
-/missing
-/mkinstalldirs
-/py-compile
-/stamp-h
-/stamp-h.in
-/stamp-h1
-/stamp-h1.in
-/stamp-h2.in
diff --git a/gr-gcell/Makefile.am b/gr-gcell/Makefile.am
deleted file mode 100644
index 2386f80ae..000000000
--- a/gr-gcell/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = src
-
diff --git a/gr-gcell/src/.gitignore b/gr-gcell/src/.gitignore
deleted file mode 100644
index bea05149a..000000000
--- a/gr-gcell/src/.gitignore
+++ /dev/null
@@ -1,39 +0,0 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.cache
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/make.log
-/missing
-/missing
-/mkinstalldirs
-/py-compile
-/stamp-h
-/stamp-h.in
-/stamp-h1
-/stamp-h1.in
-/stamp-h2.in
-/run_tests
-/gcell.d
-/gcell.cc
-/gcell.py
-/gnuradio
-/guile
-/python
diff --git a/gr-gcell/src/Makefile.am b/gr-gcell/src/Makefile.am
deleted file mode 100644
index dfbd8f828..000000000
--- a/gr-gcell/src/Makefile.am
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Copyright 2008,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-TESTS =
-EXTRA_DIST += run_tests.in
-DISTCLEANFILES += run_tests
-
-SUBDIRS = . examples
-
-AM_CPPFLAGS = $(GCELL_INCLUDES) $(STD_DEFINES_AND_INCLUDES) \
-	$(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
-# ----------------------------------------------------------------
-
-noinst_PYTHON =  \
-	qa_fft.py
-
-
-# ----------------------------------------------------------------
-#                        The C++ blocks
-# ----------------------------------------------------------------
-
-# the library for the C++ blocks
-lib_LTLIBRARIES = libgnuradio_gcell.la
-
-libgnuradio_gcell_la_SOURCES = \
-	gcell_fft_vcc.cc
-
-# C/C++ headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS = \
-	gcell_fft_vcc.h
-
-libgnuradio_gcell_la_LIBADD = \
-	$(GNURADIO_CORE_LA) \
-	$(GCELL_LA)
-
-libgnuradio_gcell_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-# ----------------------------------------------------------------
-#                         SWIG stuff
-# ----------------------------------------------------------------
-
-TOP_SWIG_IFILES =		\
-	gcell.i
-
-# Install so that they end up available as:
-#   import gnuradio.gcell
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-gcell_pythondir_category =	\
-	gnuradio
-
-# additional arguments to the SWIG command
-gcell_swig_args =		\
-	$(GCELL_INCLUDES)
-
-# additional libraries for linking with the SWIG-generated library
-gcell_la_swig_libadd =		\
-	libgnuradio_gcell.la
-
-# additional SWIG files to be installed
-gcell_swiginclude_headers =	\
-	gc_job_manager.i	\
-	gcell_fft_vcc.i
-
-
-if PYTHON
-TESTS += run_tests
-endif
diff --git a/gr-gcell/src/Makefile.swig.gen b/gr-gcell/src/Makefile.swig.gen
deleted file mode 100644
index dcd8bdefb..000000000
--- a/gr-gcell/src/Makefile.swig.gen
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright 2009 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.
-# 
-
-# Makefile.swig.gen for gcell.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/gcell
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gcell
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-gcell_pythondir_category ?= gnuradio/gcell
-gcell_pylibdir_category ?= $(gcell_pythondir_category)
-gcell_pythondir = $(pythondir)/$(gcell_pythondir_category)
-gcell_pylibdir = $(pyexecdir)/$(gcell_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-gcell_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/gcell
-# FIXME: determince whether these should be installed with gnuradio.
-gcell_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-gcell_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-gcell_swiginclude_HEADERS =		\
-	gcell.i			\
-	$(gcell_swiginclude_headers)
-
-if PYTHON
-gcell_pylib_LTLIBRARIES =		\
-	_gcell.la
-
-_gcell_la_SOURCES = 			\
-	python/gcell.cc		\
-	$(gcell_la_swig_sources)
-
-gcell_python_PYTHON =			\
-	gcell.py			\
-	$(gcell_python)
-
-_gcell_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gcell_la_swig_libadd)
-
-_gcell_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gcell_la_swig_ldflags)
-
-_gcell_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gcell_la_swig_cxxflags)
-
-python/gcell.cc: gcell.py
-gcell.py: gcell.i
-
-# Include the python dependencies for this file
--include python/gcell.d
-
-endif		# end of if python
-
-if GUILE
-
-gcell_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-gcell.la
-libguile_gnuradio_gcell_la_SOURCES =	\
-	guile/gcell.cc			\
-	$(gcell_la_swig_sources)
-nobase_gcell_scm_DATA = 		\
-	gnuradio/gcell.scm 		\
-	gnuradio/gcell-primitive.scm
-libguile_gnuradio_gcell_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gcell_la_swig_libadd)
-libguile_gnuradio_gcell_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gcell_la_swig_ldflags)
-libguile_gnuradio_gcell_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gcell_la_swig_cxxflags)
-
-guile/gcell.cc: gnuradio/gcell.scm
-gnuradio/gcell.scm: gcell.i
-gnuradio/gcell-primitive.scm: gnuradio/gcell.scm
-
-# Include the guile dependencies for this file
--include guile/gcell.d
-
-endif				# end of GUILE
-
-
diff --git a/gr-gcell/src/examples/.gitignore b/gr-gcell/src/examples/.gitignore
deleted file mode 100644
index 53edad32f..000000000
--- a/gr-gcell/src/examples/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.cache
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/make.log
-/missing
-/missing
-/mkinstalldirs
-/py-compile
-/stamp-h
-/stamp-h.in
-/stamp-h1
-/stamp-h1.in
-/stamp-h2.in
diff --git a/gr-gcell/src/examples/Makefile.am b/gr-gcell/src/examples/Makefile.am
deleted file mode 100644
index bdea961ea..000000000
--- a/gr-gcell/src/examples/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright 2008,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-#ourdatadir = $(exampledir)/gcell
-
-#dist_ourdata_DATA = README
-
-#dist_ourdata_SCRIPTS = fsm_utils.py
diff --git a/gr-gcell/src/gc_job_manager.i b/gr-gcell/src/gc_job_manager.i
deleted file mode 100644
index 7bec48e19..000000000
--- a/gr-gcell/src/gc_job_manager.i
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-    
-struct spe_program_handle_t;
-typedef boost::shared_ptr<spe_program_handle_t> spe_program_handle_sptr;
-%template(spe_program_handle_sptr) boost::shared_ptr<spe_program_handle_t>;
-
-class gc_job_manager;
-typedef boost::shared_ptr<gc_job_manager> gc_job_manager_sptr;
-%template(gc_job_manager_sptr) boost::shared_ptr<gc_job_manager>;
-
-
-%rename(program_handle_from_filename) gc_program_handle_from_filename;
-spe_program_handle_sptr 
-gc_program_handle_from_filename(const std::string &filename);
-
-%rename(program_handle_from_address) gc_program_handle_from_address;
-spe_program_handle_sptr 
-gc_program_handle_from_address(spe_program_handle_t *handle);
-
-
-%rename(jm_options) gc_jm_options;
-struct gc_jm_options {
-  unsigned int max_jobs;	    // max # of job descriptors in system
-  unsigned int max_client_threads;  // max # of client threads of job manager
-  unsigned int nspes;		    // how many SPEs shall we use? 0 -> all of them
-  bool gang_schedule;		    // shall we gang schedule?
-  bool use_affinity;		    // shall we try for affinity (FIXME not implmented)
-  bool enable_logging;		    // shall we log SPE events?
-  uint32_t log2_nlog_entries;    	   // log2 of number of log entries (default is 12 == 4k)
-  spe_program_handle_sptr program_handle;  // program to load into SPEs
-
-  gc_jm_options(spe_program_handle_sptr program_handle_,
-		unsigned int nspes_ = 0) :
-    max_jobs(0), max_client_threads(0), nspes(nspes_),
-    gang_schedule(false), use_affinity(false),
-    enable_logging(false), log2_nlog_entries(12),
-    program_handle(program_handle_)
-  {
-  }
-};
-
-%rename(job_manager) gc_make_job_manager;
-gc_job_manager_sptr
-gc_make_job_manager(const gc_jm_options *options);
-
-%inline {
-  void set_singleton(gc_job_manager_sptr mgr)
-  {
-    gc_job_manager::set_singleton(mgr);
-  }
-
-  gc_job_manager_sptr singleton()
-  {
-    return gc_job_manager::singleton();
-  }
-}
diff --git a/gr-gcell/src/gcell.i b/gr-gcell/src/gcell.i
deleted file mode 100644
index 7437b9d4e..000000000
--- a/gr-gcell/src/gcell.i
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-%include "gnuradio.i"				// the common stuff
-
-%{
-#include <gcell/gc_job_manager.h>
-#include <gcell_fft_vcc.h>
-%}
-
-%include "gc_job_manager.i"
-%include "gcell_fft_vcc.i"
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-gcell" "scm_init_gnuradio_gcell_module")
-%}
-
-%goops %{
-(use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gr-gcell/src/gcell_fft_vcc.cc b/gr-gcell/src/gcell_fft_vcc.cc
deleted file mode 100644
index ae40b6fad..000000000
--- a/gr-gcell/src/gcell_fft_vcc.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2007,2008,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gcell_fft_vcc.h>
-#include <gr_io_signature.h>
-#include <gcell/gc_job_manager.h>
-#include <gcell/gc_aligned_alloc.h>
-#include <gcell/gcp_fft_1d_r2.h>
-#include <math.h>
-#include <assert.h>
-#include <stdexcept>
-#include <string.h>
-
-
-#define MIN_FFT_SIZE	  32
-#define	MAX_FFT_SIZE	4096
-
-inline static bool
-is_power_of_2(int x)
-{
-  return x != 0 && (x & (x-1)) == 0;
-}
-
-static int 
-int_log2(int x)	// x is an exact power of 2
-{
-  for (int i = 0; i < 32; i++)
-    if (x == (1 << i))
-      return i;
-
-  assert(0);
-}
-
-#if 0
-gr_fft_vcc_sptr
-gcell_make_fft_vcc(int fft_size, bool forward, const std::vector<float> &window, bool shift)
-{
-  // If it doesn't meet our constraints, use standard implemenation
-  if (fft_size < MIN_FFT_SIZE || fft_size > MAX_FFT_SIZE
-      || !is_power_of_2(fft_size)
-      || (window.size() != 0 && fft_size > MAX_FFT_SIZE/2))
-    return gr_make_fft_vcc(fft_size, forward, window, shift);
-  else
-    return gr_fft_vcc_sptr (new gcell_fft_vcc(fft_size, forward, window, shift));
-}
-#else
-
-gcell_fft_vcc_sptr
-gcell_make_fft_vcc(int fft_size, bool forward, const std::vector<float> &window, bool shift)
-{
-  return gnuradio::get_initial_sptr(new gcell_fft_vcc(fft_size, forward, window, shift));
-}
-
-#endif
-
-gcell_fft_vcc::gcell_fft_vcc (int fft_size, bool forward,
-			      const std::vector<float> &window, bool shift)
-  : gr_fft_vcc("gcell_fft_vcc", fft_size, forward, window, shift)
-{
-  if (fft_size < MIN_FFT_SIZE || fft_size > MAX_FFT_SIZE || !is_power_of_2(fft_size)){
-    throw std::invalid_argument("fft_size");
-  }
-
-  if (window.size() != 0 && fft_size > MAX_FFT_SIZE/2){
-    throw std::invalid_argument("fft_size too big to use window");
-  }
-
-  d_log2_fft_size = int_log2(fft_size);
-  d_mgr = gc_job_manager::singleton();		// grab the singleton job manager
-  d_twiddle_boost = gc_aligned_alloc_sptr(sizeof(std::complex<float>) * fft_size/4, 128);
-  d_twiddle = (std::complex<float>*) d_twiddle_boost.get();
-  gcp_fft_1d_r2_twiddle(d_log2_fft_size, d_twiddle);
-}
-
-gcell_fft_vcc::~gcell_fft_vcc ()
-{
-}
-
-int
-gcell_fft_vcc::work(int noutput_items,
-		    gr_vector_const_void_star &input_items,
-		    gr_vector_void_star &output_items)
-{
-  const gr_complex *in = (const gr_complex *) input_items[0];
-  gr_complex *out = (gr_complex *) output_items[0];
-
-  // unsigned int input_data_size = input_signature()->sizeof_stream_item(0);
-  // unsigned int output_data_size = output_signature()->sizeof_stream_item(0);
-
-  float window_buf[MAX_FFT_SIZE/2] __attribute__((aligned (16)));
-  float *window = 0;
-  
-  // If we've got a window, ensure it's 16-byte aligned
-  // FIXME move this to set_window
-  if (d_window.size()){
-    if ((((intptr_t)&d_window[0]) & 0xf) == 0)
-      window = &d_window[0];		// OK as is
-    else {
-      window = window_buf;		// copy to aligned buffer
-      memcpy(window, &d_window[0], sizeof(float) * d_window.size());
-    }
-  }
-
-  std::vector<gc_job_desc_sptr>	jd_sptr(noutput_items);
-  gc_job_desc *jd[noutput_items];
-  bool done[noutput_items];
-  
-  // submit noutput_items jobs in parallel
-
-  for (int i = 0; i < noutput_items; i++){
-    jd_sptr[i] = gcp_fft_1d_r2_submit(d_mgr, d_log2_fft_size,
-				      d_forward, d_shift,
-				      &out[i * d_fft_size],
-				      &in[i * d_fft_size],
-				      d_twiddle,
-				      window);
-    jd[i] = jd_sptr[i].get();
-  }
-
-  int n = d_mgr->wait_jobs(noutput_items, jd, done, GC_WAIT_ALL);
-  if (n != noutput_items){
-    fprintf(stderr, "gcell_fft_vcc: wait_jobs returned %d, expected %d\n",
-	    n, noutput_items);
-    return -1;
-  }
-
-  for (int i = 0; i < noutput_items; i++){
-    if (jd[i]->status != JS_OK){
-      fprintf(stderr, "gcell_fft_vcc jd[%d]->status = %s\n",
-	      i, gc_job_status_string(jd[i]->status).c_str());
-      return -1;
-    }
-  }
-
-  return noutput_items;
-}
-
diff --git a/gr-gcell/src/gcell_fft_vcc.h b/gr-gcell/src/gcell_fft_vcc.h
deleted file mode 100644
index 9e3035b44..000000000
--- a/gr-gcell/src/gcell_fft_vcc.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2007,2008 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_GCELL_FFT_VCC_H
-#define INCLUDED_GCELL_FFT_VCC_H
-
-#include <gr_fft_vcc.h>
-
-class gc_job_manager;
-
-class gcell_fft_vcc;
-typedef boost::shared_ptr<gcell_fft_vcc> gcell_fft_vcc_sptr;
-
-gcell_fft_vcc_sptr
-gcell_make_fft_vcc(int fft_size, bool forward, const std::vector<float> &window, bool shift=false);
-
-/*!
- * \brief Compute forward or reverse FFT.  complex vector in / complex vector out.
- * \ingroup dft_blk
- * \ingroup gcell
- *
- * Concrete class that uses gcell to offload FFT to SPEs.
- */
-class gcell_fft_vcc : public gr_fft_vcc
-{
-  int				     d_log2_fft_size;
-  boost::shared_ptr<gc_job_manager>  d_mgr;
-  std::complex<float>		    *d_twiddle;		// twiddle values (16-byte aligned)
-  boost::shared_ptr<void>	     d_twiddle_boost;	// automatic storage mgmt
-  
-  friend gcell_fft_vcc_sptr
-  gcell_make_fft_vcc(int fft_size, bool forward, const std::vector<float> &window, bool shift);
-
-  gcell_fft_vcc(int fft_size, bool forward, const std::vector<float> &window, bool shift);
-
- public:
-  ~gcell_fft_vcc();
-
-  int work(int noutput_items,
-	   gr_vector_const_void_star &input_items,
-	   gr_vector_void_star &output_items);
-};
-
-
-#endif /* INCLUDED_GCELL_FFT_VCC_H */
diff --git a/gr-gcell/src/gcell_fft_vcc.i b/gr-gcell/src/gcell_fft_vcc.i
deleted file mode 100644
index 1d4a359f9..000000000
--- a/gr-gcell/src/gcell_fft_vcc.i
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#if 1
-
-// This version works.
-
-GR_SWIG_BLOCK_MAGIC(gcell, fft_vcc)
-
-gcell_fft_vcc_sptr 
-gcell_make_fft_vcc (int fft_size, bool forward, const std::vector<float> window, bool shift=false);
-
-class gcell_fft_vcc : public gr_sync_block
-{
- protected:
-  gcell_fft_vcc (int fft_size, bool forward, const std::vector<float> &window, bool shift);
-
- public:
-  bool set_window(const std::vector<float> &window);
-};
-
-#else
-
-// This version gives swig heartburn.  We end up with an object that's
-// not quite usable.
-
-GR_SWIG_BLOCK_MAGIC(gcell, fft_vcc);
-
-gcell_fft_vcc_sptr 
-gcell_make_fft_vcc (int fft_size, bool forward, const std::vector<float> window, bool shift=false);
-
-class gcell_fft_vcc : public gr_fft_vcc
-{
- protected:
-  gr_fft_vcc(int fft_size, bool forward, const std::vector<float> &window, bool shift);
-};
-
-#endif
diff --git a/gr-gcell/src/qa_fft.py b/gr-gcell/src/qa_fft.py
deleted file mode 100755
index 88a4f5207..000000000
--- a/gr-gcell/src/qa_fft.py
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-from gnuradio import gr, gr_unittest
-import gcell
-import sys
-import random
-
-primes = (2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,
-          59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,
-          137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,
-          227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311)
-
-
-class test_fft_filter(gr_unittest.TestCase):
-
-    def setUp(self):
-        ph = gcell.program_handle_from_filename("../../gcell/lib/spu/gcell_all")
-        opts = gcell.jm_options(ph, 1)
-        self.mgr = gcell.job_manager(opts)
-        gcell.set_singleton(self.mgr)
-
-    def tearDown(self):
-	pass
-
-    def assert_fft_ok2(self, expected_result, result_data):
-        expected_result = expected_result[:len(result_data)]
-        self.assertComplexTuplesAlmostEqual2 (expected_result, result_data,
-                                              abs_eps=1e-9, rel_eps=4e-4)
-
-    def assert_fft_float_ok2(self, expected_result, result_data, abs_eps=1e-9, rel_eps=4e-4):
-        expected_result = expected_result[:len(result_data)]
-        self.assertFloatTuplesAlmostEqual2 (expected_result, result_data,
-                                            abs_eps, rel_eps)
-
-    def test_001(self):
-	tb = gr.top_block()
-        fft_size = 32
-        src_data = tuple([complex(primes[2*i], primes[2*i+1]) for i in range(fft_size)])
-
-        expected_result = ((4377+4516j),
-                           (-1706.1268310546875+1638.4256591796875j),
-                           (-915.2083740234375+660.69427490234375j),
-                           (-660.370361328125+381.59600830078125j),
-                           (-499.96044921875+238.41630554199219j),
-                           (-462.26748657226562+152.88948059082031j),
-                           (-377.98440551757812+77.5928955078125j),
-                           (-346.85821533203125+47.152004241943359j),
-                           (-295+20j),
-                           (-286.33609008789062-22.257017135620117j),
-                           (-271.52999877929688-33.081821441650391j),
-                           (-224.6358642578125-67.019538879394531j),
-                           (-244.24473571777344-91.524826049804688j),
-                           (-203.09068298339844-108.54627227783203j),
-                           (-198.45195007324219-115.90768432617188j),
-                           (-182.97744750976562-128.12318420410156j),
-                           (-167-180j),
-                           (-130.33688354492188-173.83778381347656j),
-                           (-141.19784545898438-190.28807067871094j),
-                           (-111.09677124023438-214.48896789550781j),
-                           (-70.039543151855469-242.41630554199219j),
-                           (-68.960540771484375-228.30015563964844j),
-                           (-53.049201965332031-291.47097778320312j),
-                           (-28.695289611816406-317.64553833007812j),
-                           (57-300j),
-                           (45.301143646240234-335.69509887695312j),
-                           (91.936195373535156-373.32437133789062j),
-                           (172.09465026855469-439.275146484375j),
-                           (242.24473571777344-504.47515869140625j),
-                           (387.81732177734375-666.6788330078125j),
-                           (689.48553466796875-918.2142333984375j),
-                           (1646.539306640625-1694.1956787109375j))
-
-        src = gr.vector_source_c(src_data)
-        s2v = gr.stream_to_vector(gr.sizeof_gr_complex, fft_size)
-        fft = gcell.fft_vcc(fft_size, True, [], False)
-        v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fft_size)
-        dst = gr.vector_sink_c()
-        tb.connect(src, s2v, fft, v2s, dst)
-        tb.run()
-        result_data = dst.data()
-        #print 'expected:', expected_result
-        #print 'results: ', result_data
-        #self.assertComplexTuplesAlmostEqual (expected_result, result_data, 5)
-        self.assert_fft_ok2(expected_result, result_data)
-
-    def test_002(self):
-	tb = gr.top_block()
-        fft_size = 32
-
-        tmp_data = ((4377+4516j),
-                    (-1706.1268310546875+1638.4256591796875j),
-                    (-915.2083740234375+660.69427490234375j),
-                    (-660.370361328125+381.59600830078125j),
-                    (-499.96044921875+238.41630554199219j),
-                    (-462.26748657226562+152.88948059082031j),
-                    (-377.98440551757812+77.5928955078125j),
-                    (-346.85821533203125+47.152004241943359j),
-                    (-295+20j),
-                    (-286.33609008789062-22.257017135620117j),
-                    (-271.52999877929688-33.081821441650391j),
-                    (-224.6358642578125-67.019538879394531j),
-                    (-244.24473571777344-91.524826049804688j),
-                    (-203.09068298339844-108.54627227783203j),
-                    (-198.45195007324219-115.90768432617188j),
-                    (-182.97744750976562-128.12318420410156j),
-                    (-167-180j),
-                    (-130.33688354492188-173.83778381347656j),
-                    (-141.19784545898438-190.28807067871094j),
-                    (-111.09677124023438-214.48896789550781j),
-                    (-70.039543151855469-242.41630554199219j),
-                    (-68.960540771484375-228.30015563964844j),
-                    (-53.049201965332031-291.47097778320312j),
-                    (-28.695289611816406-317.64553833007812j),
-                    (57-300j),
-                    (45.301143646240234-335.69509887695312j),
-                    (91.936195373535156-373.32437133789062j),
-                    (172.09465026855469-439.275146484375j),
-                    (242.24473571777344-504.47515869140625j),
-                    (387.81732177734375-666.6788330078125j),
-                    (689.48553466796875-918.2142333984375j),
-                    (1646.539306640625-1694.1956787109375j))
-
-        src_data = tuple([x/fft_size for x in tmp_data])
-
-        expected_result = tuple([complex(primes[2*i], primes[2*i+1]) for i in range(fft_size)])
-
-        src = gr.vector_source_c(src_data)
-        s2v = gr.stream_to_vector(gr.sizeof_gr_complex, fft_size)
-        fft = gcell.fft_vcc(fft_size, False, [], False)
-        v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fft_size)
-        dst = gr.vector_sink_c()
-        tb.connect(src, s2v, fft, v2s, dst)
-        tb.run()
-        result_data = dst.data()
-        #print 'expected:', expected_result
-        #print 'results: ', result_data
-        #self.assertComplexTuplesAlmostEqual (expected_result, result_data, 5)
-        self.assert_fft_ok2(expected_result, result_data)
-
-
-if __name__ == '__main__':
-    gr_unittest.main ()
-        
diff --git a/gr-gcell/src/run_tests.in b/gr-gcell/src/run_tests.in
deleted file mode 100644
index f7d51750d..000000000
--- a/gr-gcell/src/run_tests.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# 1st parameter is absolute path to component source directory
-# 2nd parameter is absolute path to component build directory
-# 3rd parameter is path to Python QA directory
-
-@top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-gcell \
-    @abs_top_builddir@/gr-gcell \
-    @srcdir@
diff --git a/gr-gpio/src/fpga/include/common_config_2rxhb_2tx_dig.vh b/gr-gpio/src/fpga/include/common_config_2rxhb_2tx_dig.vh
deleted file mode 100644
index 580082c92..000000000
--- a/gr-gpio/src/fpga/include/common_config_2rxhb_2tx_dig.vh
+++ /dev/null
@@ -1,71 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2006,2007 Matt Ettus
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-// ------------------------------------------------------------
-// If TX_ON is not defined, there is *no* transmit circuitry built
-  `define TX_ON
-
-// ------------------------------------------------------------
-// Define 1 and only one of TX_SINGLE, TX_DUAL and TX_QUAD
-// to respectively enable 1, 2 or 4 transmit channels.
-// [Please note that only TX_SINGLE and TX_DUAL are currently valid]
-//`define TX_SINGLE
-  `define TX_DUAL
-//`define TX_QUAD
-
-// ------------------------------------------------------------
-// If TX_DIG_ON is defined each transmit channel sends its I lsb and Q lsb to gpio pins
-// The lsb bits of the analog output signal are truncated
-  `define TX_DIG_ON
-// ------------------------------------------------------------
-// Define TX_HB_ON to enable the transmit halfband filter
-// [Not implemented]
-//`define TX_HB_ON
-
-// ------------------------------------------------------------
-// IF RX_ON is not defined, there is *no* receive circuitry built
-  `define RX_ON
-
-// ------------------------------------------------------------
-// Define 1 and only one of RX_SINGLE, RX_DUAL and RX_QUAD
-// to respectively define 1, 2 or 4 receive channels.
-
-//`define RX_SINGLE
-  `define RX_DUAL
-//`define RX_QUAD
-
-// ------------------------------------------------------------
-// Define RX_HB_ON to enable the receive halfband filter
-  `define RX_HB_ON
-
-// ------------------------------------------------------------
-// Define RX_NCO_ON to enable the receive Numerical Controlled Osc
-  `define RX_NCO_ON
-
-// ------------------------------------------------------------
-// Define RX_CIC_ON to enable the receive Cascaded Integrator Comb filter
-  `define RX_CIC_ON
-
-// ------------------------------------------------------------
-// If RX_DIG_ON is defined each receive channel sends has its I lsb and Q lsb replaced by digital input from gpio pins
-// So the analog signals are truncated to 15  bits 
-  `define RX_DIG_ON
diff --git a/gr-gpio/src/fpga/include/common_config_2rxint_2tx_dig.vh b/gr-gpio/src/fpga/include/common_config_2rxint_2tx_dig.vh
deleted file mode 100644
index 01995543b..000000000
--- a/gr-gpio/src/fpga/include/common_config_2rxint_2tx_dig.vh
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2006,2007 Matt Ettus
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-// ------------------------------------------------------------
-// If TX_ON is not defined, there is *no* transmit circuitry built
-  `define TX_ON
-
-// ------------------------------------------------------------
-// Define 1 and only one of TX_SINGLE, TX_DUAL and TX_QUAD
-// to respectively enable 1, 2 or 4 transmit channels.
-// [Please note that only TX_SINGLE and TX_DUAL are currently valid]
-//`define TX_SINGLE
-  `define TX_DUAL
-//`define TX_QUAD
-
-// ------------------------------------------------------------
-// If TX_DIG_ON is defined each transmit channel sends its I lsb and Q lsb to gpio pins
-// The lsb bits of the analog output signal are truncated
-  `define TX_DIG_ON
-// ------------------------------------------------------------
-// Define TX_HB_ON to enable the transmit halfband filter
-// [Not implemented]
-//`define TX_HB_ON
-
-// ------------------------------------------------------------
-// IF RX_ON is not defined, there is *no* receive circuitry built
-  `define RX_ON
-
-// ------------------------------------------------------------
-// Define 1 and only one of RX_SINGLE, RX_DUAL and RX_QUAD
-// to respectively define 1, 2 or 4 receive channels.
-
-//`define RX_SINGLE
-  `define RX_DUAL
-//`define RX_QUAD
-
-// ------------------------------------------------------------
-// Define RX_HB_ON to enable the receive halfband filter
-// `define RX_HB_ON
-
-// ------------------------------------------------------------
-// Define RX_NCO_ON to enable the receive Numerical Controlled Osc
-  `define RX_NCO_ON
-
-// ------------------------------------------------------------
-// Define RX_CIC_ON to enable the receive Cascaded Integrator Comb filter
-// This is mutually exclusive with RX_INTEG_ON
-//  `define RX_CIC_ON
-
-// ------------------------------------------------------------
-// Define RX_INTEG_ON to enable the receive single stage integrate and dump
-// This is mutually exclusive with RX_CIC_ON
-  `define RX_INTEG_ON
-
-// ------------------------------------------------------------
-// If RX_DIG_ON is defined each receive channel sends has its I lsb and Q lsb replaced by digital input from gpio pins
-// So the analog signals are truncated to 15  bits 
-  `define RX_DIG_ON
diff --git a/gr-gpio/src/fpga/include/common_config_bottom.vh b/gr-gpio/src/fpga/include/common_config_bottom.vh
deleted file mode 100644
index 9e032642b..000000000
--- a/gr-gpio/src/fpga/include/common_config_bottom.vh
+++ /dev/null
@@ -1,133 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2006,2007 Matt Ettus
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-// ====================================================================
-//	   This is the common tail for standard configuation
-// ====================================================================
-// 
-//                  >>>> DO NOT EDIT BELOW HERE <<<<
-//
-// N.B., *all* the remainder of the code should be conditionalized
-// only in terms of:
-//
-//  TX_ON, TX_EN_0, TX_EN_1, TX_EN_2, TX_EN_3, TX_CAP_NCHAN, TX_CAP_HB,
-//  RX_ON, RX_EN_0, RX_EN_1, RX_EN_2, RX_EN_3, RX_CAP_NCHAN, RX_CAP_HB,
-//  RX_NCO_ON, RX_CIC_ON
-// ====================================================================
-
-`ifdef TX_ON
-
- `ifdef TX_SINGLE
-  `define TX_EN_0
-  `ifdef TX_DIG_ON
-    `define TX_EN_DIG_0
-    `define TX_CAP_DIG   1
-  `endif
-  `define TX_CAP_NCHAN 3'd1
- `endif
-
- `ifdef TX_DUAL
-  `define TX_EN_0
-  `define TX_EN_1
-  `define TX_CAP_NCHAN 3'd2
-  `ifdef TX_DIG_ON
-    `define TX_EN_DIG_0
-    `define TX_EN_DIG_1
-    `define TX_CAP_DIG   1
-  `endif
- `endif
-
- `ifdef TX_QUAD
-  `define TX_EN_0
-  `define TX_EN_1
-  `define TX_EN_2
-  `define TX_EN_3
-  `ifdef TX_DIG_ON
-    `define TX_EN_DIG_0
-    `define TX_EN_DIG_1
-    `define TX_CAP_DIG   1
-  `endif
-  `define TX_CAP_NCHAN 3'd4
- `endif
-
- `ifdef TX_HB_ON
-  `define TX_CAP_HB   1
- `else
-  `define TX_CAP_HB   0
- `endif
-
-`else	// !ifdef TX_ON
-
- `define TX_CAP_NCHAN 3'd0
- `define TX_CAP_HB 0
-
-`endif // !ifdef TX_ON
-
-// --------------------------------------------------------------------
-
-`ifdef RX_ON
-
- `ifdef RX_SINGLE
-  `define RX_EN_0
-  `define RX_CAP_NCHAN 3'd1
-  `ifdef RX_DIG_ON
-    `define RX_EN_DIG_0
-    `define RX_CAP_DIG   1
-  `endif
- `endif
-
- `ifdef RX_DUAL
-  `define RX_EN_0
-  `define RX_EN_1
-  `define RX_CAP_NCHAN 3'd2
-  `ifdef RX_DIG_ON
-    `define RX_EN_DIG_0
-    `define RX_EN_DIG_1
-    `define RX_CAP_DIG   1
-  `endif
- `endif
-
- `ifdef RX_QUAD
-  `define RX_EN_0
-  `define RX_EN_1
-  `define RX_EN_2
-  `define RX_EN_3
-  `define RX_CAP_NCHAN 3'd4
-  `ifdef RX_DIG_ON
-    `define RX_EN_DIG_0
-    `define RX_EN_DIG_1
-    `define RX_CAP_DIG   1
-  `endif
- `endif
-
- `ifdef RX_HB_ON
-  `define RX_CAP_HB   1
- `else
-  `define RX_CAP_HB   0
- `endif
-
-`else	// !ifdef RX_ON
-
- `define RX_CAP_NCHAN 3'd0
- `define RX_CAP_HB 0
-
-`endif // !ifdef RX_ON
diff --git a/gr-gpio/src/fpga/lib/Makefile.am b/gr-gpio/src/fpga/lib/Makefile.am
deleted file mode 100644
index 85fec113f..000000000
--- a/gr-gpio/src/fpga/lib/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2007 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS =
-
-EXTRA_DIST += 		\
-    gpio_input.v 	\
-    io_pins.v		\
-    rx_chain_dig.v 	\
-    tx_chain_dig.v      \
-    integrator.v        \
-    integ_shifter.v     \
-    rx_chain.v
\ No newline at end of file
diff --git a/gr-gpio/src/fpga/lib/gpio_input.v b/gr-gpio/src/fpga/lib/gpio_input.v
deleted file mode 100644
index 871fe3263..000000000
--- a/gr-gpio/src/fpga/lib/gpio_input.v
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`include "../../../../usrp/firmware/include/fpga_regs_common.v"
-`include "../../../../usrp/firmware/include/fpga_regs_standard.v"
-
-module gpio_input
-  (input clock, input reset, input enable,
-   input out_strobe,
-   input wire [6:0] serial_addr, input wire [31:0] serial_data, input serial_strobe,
-   input wire [15:0] io_rx_a_in, input wire [15:0] io_rx_b_in,
-   //input wire [15:0] io_tx_a_in, input wire [15:0] io_tx_b_in, 
-   output reg rx_dig0_i, output reg rx_dig0_q, 
-   output reg rx_dig1_i, output reg rx_dig1_q );
-      
-    // Buffer at input to chip
-
-   reg rx_dig_rx_a_a,rx_dig_rx_b_a,rx_dig_rx_a_b,rx_dig_rx_b_b;
-   //TODO possibly use a flancter here
-   //This code can optionally be extended to do streaming input from gpio of tx boards
-   //The code can also be extended to input more bits
- 
-   always @(posedge clock)
-     begin
-        //This is the first point where is determined which physical input gpio pins are used for streaming digital input
-        //The other point is the code which overrides these pins as input  (oe = 0)
-	//rx_dig_tx_a_a <= #1 io_tx_a_in[14];
-	//rx_dig_tx_b_a <= #1 io_tx_a_in[15];
-	rx_dig_rx_a_a <= #1 io_rx_a_in[14];
-	rx_dig_rx_b_a <= #1 io_rx_a_in[15];
-	//rx_dig_tx_a_b <= #1 io_tx_b_in[14];
-	//rx_dig_tx_b_b <= #1 io_tx_b_in[15];
-	rx_dig_rx_a_b <= #1 io_rx_b_in[14];
-	rx_dig_rx_b_b <= #1 io_rx_b_in[15];
-     end
-   
-   // Now mux to the appropriate outputs
-   wire [3:0] 	ddc3mux,ddc2mux,ddc1mux,ddc0mux;
-   wire 	rx_realsignals;
-   wire [3:0]  rx_numchan;//not used here
-   //TODO This setting reg readout is a duplicate of the one in adc_interface.v.
-   //     Change code so this is done in only one place, or give this code its own register.
-   setting_reg #(`FR_RX_MUX) sr_rxmux(.clock(clock),.reset(reset),.strobe(serial_strobe),.addr(serial_addr),
-				      .in(serial_data),.out({ddc3mux,ddc2mux,ddc1mux,ddc0mux,rx_realsignals,rx_numchan[3:1]}));
-   //assign 	rx_numchan[0] = 1'b0;
-  
-   always @(posedge clock)
-     if (out_strobe) //out_strobe determines the time at which the digital inputs are sampled (with a delay of one sample)
-     begin
-	rx_dig0_i <= #1 ddc0mux[1] ? (ddc0mux[0] ? rx_dig_rx_b_b : rx_dig_rx_a_b) : (ddc0mux[0] ? rx_dig_rx_b_a : rx_dig_rx_a_a);
-	rx_dig0_q <= #1 rx_realsignals ? 1'b0 : ddc0mux[3] ? (ddc0mux[2] ? rx_dig_rx_b_b : rx_dig_rx_a_b) : (ddc0mux[2] ? rx_dig_rx_b_a : rx_dig_rx_a_a);
-	rx_dig1_i <= #1 ddc1mux[1] ? (ddc1mux[0] ? rx_dig_rx_b_b : rx_dig_rx_a_b) : (ddc1mux[0] ? rx_dig_rx_b_a : rx_dig_rx_a_a);
-	rx_dig1_q <= #1 rx_realsignals ? 1'b0 : ddc1mux[3] ? (ddc1mux[2] ? rx_dig_rx_b_b : rx_dig_rx_a_b) : (ddc1mux[2] ? rx_dig_rx_b_a : rx_dig_rx_a_a);
-	//rx_dig2_i <= #1 ddc2mux[1] ? (ddc2mux[0] ? rx_dig_rx_b_b : rx_dig_rx_a_b) : (ddc2mux[0] ? rx_dig_rx_b_a : rx_dig_rx_a_a);
-	//rx_dig2_q <= #1 rx_realsignals ? 1'b0 : ddc2mux[3] ? (ddc2mux[2] ? rx_dig_rx_b_b : rx_dig_rx_a_b) : (ddc2mux[2] ? rx_dig_rx_b_a : rx_dig_rx_a_a);
-	//rx_dig3_i <= #1 ddc3mux[1] ? (ddc3mux[0] ? rx_dig_rx_b_b : rx_dig_rx_a_b) : (ddc3mux[0] ? rx_dig_rx_b_a : rx_dig_rx_a_a);
-	//rx_dig3_q <= #1 rx_realsignals ? 1'b0 : ddc3mux[3] ? (ddc3mux[2] ? rx_dig_rx_b_b : rx_dig_rx_a_b) : (ddc3mux[2] ? rx_dig_rx_b_a : rx_dig_rx_a_a);
-     end
-
-endmodule // gpio_input
-
-   
diff --git a/gr-gpio/src/fpga/lib/integ_shifter.v b/gr-gpio/src/fpga/lib/integ_shifter.v
deleted file mode 100644
index 1ad0504cb..000000000
--- a/gr-gpio/src/fpga/lib/integ_shifter.v
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2003 Matt Ettus
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-
-// NOTE: This only works for a max decim rate of 256
-// NOTE: Signal "rate" is ONE LESS THAN the actual rate
-
-module integ_shifter(rate,signal_in,signal_out);
-    parameter bw = 16;
-    parameter maxbitgain = 8;
-   
-    input [7:0] rate;
-    input       wire [bw+maxbitgain-1:0] signal_in;
-    output      reg [bw-1:0] signal_out;
-
-    reg [3:0] bitgain;
-
-    // Nearest without overflow -- ceil(log2(rate+1))
-    always @*
-      if (rate >= 8'd128)
-        bitgain = 8;
-      else if (rate >= 8'd64)
-        bitgain = 7;
-      else if (rate >= 8'd32)
-        bitgain = 6;
-      else if (rate >= 8'd16)
-        bitgain = 5;
-      else if (rate >= 8'd8)
-        bitgain = 4;
-      else if (rate >= 8'd4)
-        bitgain = 3;
-      else if (rate >= 8'd2)
-        bitgain = 2;
-      else
-        bitgain = 1;
-
-   always @*
-     case(bitgain)
-       5'd1 : signal_out = signal_in[1+bw-1:1];
-       5'd2 : signal_out = signal_in[2+bw-1:2];
-       5'd3 : signal_out = signal_in[3+bw-1:3];
-       5'd4 : signal_out = signal_in[4+bw-1:4];
-       5'd5 : signal_out = signal_in[5+bw-1:5];
-       5'd6 : signal_out = signal_in[6+bw-1:6];
-       5'd7 : signal_out = signal_in[7+bw-1:7];
-       default : signal_out = signal_in[8+bw-1:8];
-     endcase // case(shift)
-
-endmodule // integ_shifter
diff --git a/gr-gpio/src/fpga/lib/integrator.v b/gr-gpio/src/fpga/lib/integrator.v
deleted file mode 100644
index 22357a565..000000000
--- a/gr-gpio/src/fpga/lib/integrator.v
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2003 Matt Ettus
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-// Integrate and dump decimation filter
-// 
-// Functionally equivalent to single-stage CIC decimator, simpler code
-// Results in single sample impulse response at decimated rate
-
-module integrator
-  ( clock,reset,enable,rate,strobe_in,strobe_out,signal_in,signal_out);
-   parameter bw = 16;
-   parameter maxbitgain = 8;
-   
-   input       clock;
-   input       reset;
-   input       enable;
-   input [7:0] rate;
-   input       strobe_in;
-   input       strobe_out;	
-
-   input  [bw-1:0] signal_in;
-   wire   [bw-1:0] signal_out_unreg;
-   output [bw-1:0] signal_out;
-   reg    [bw-1:0] signal_out;
-
-   wire [bw+maxbitgain-1:0] signal_in_ext;
-   reg  [bw+maxbitgain-1:0] accum;
-   reg  [bw+maxbitgain-1:0] dump;
-
-   sign_extend #(bw,bw+maxbitgain) 
-      ext_input (.in(signal_in),.out(signal_in_ext));
-   
-   // Integrate samples, dump on strobe out
-   always @(posedge clock)
-     if (reset | ~enable)
-       begin
-	 accum <= 0;
-	 dump <= 0;
-       end
-     else if (enable && strobe_in)
-        if (~strobe_out)
-	   accum <= accum + signal_in_ext;
-        else
-	   begin
-	     dump <= accum;
-	     accum <= signal_in_ext;
-           end
-   
-   // Normalize for integration bit gain
-   integ_shifter #(bw)
-	shifter(rate,dump,signal_out_unreg);
-
-   always @(posedge clock)
-     signal_out <= #1 signal_out_unreg;
-   
-endmodule // integrator
diff --git a/gr-gpio/src/fpga/lib/io_pins.v b/gr-gpio/src/fpga/lib/io_pins.v
deleted file mode 100644
index 9d857902f..000000000
--- a/gr-gpio/src/fpga/lib/io_pins.v
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2005,2006 Matt Ettus
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`include "../../../../usrp/firmware/include/fpga_regs_common.v"
-`include "../../../../usrp/firmware/include/fpga_regs_standard.v"
-
-module io_pins
-  ( inout wire [15:0] io_0, inout wire [15:0] io_1, inout wire [15:0] io_2, inout wire [15:0] io_3,
-    input wire [15:0] reg_0, input wire [15:0] reg_1, input wire [15:0] reg_2, input wire [15:0] reg_3,
-    input wire [15:0] io_0_force_output, input wire [15:0] io_2_force_output, 
-    input wire [15:0] io_1_force_input,  input wire [15:0] io_3_force_input,
-    input clock, input rx_reset, input tx_reset,
-    input [6:0] serial_addr, input [31:0] serial_data, input serial_strobe);
-   
-   reg [15:0] io_0_oe,io_1_oe,io_2_oe,io_3_oe;
-   
-   bidir_reg bidir_reg_0 (.tristate(io_0),.oe(io_0_oe |   io_0_force_output),.reg_val(reg_0));
-   bidir_reg bidir_reg_1 (.tristate(io_1),.oe(io_1_oe & (~io_1_force_input)),.reg_val(reg_1));
-   bidir_reg bidir_reg_2 (.tristate(io_2),.oe(io_2_oe |   io_2_force_output),.reg_val(reg_2));
-   bidir_reg bidir_reg_3 (.tristate(io_3),.oe(io_3_oe & (~io_3_force_input)),.reg_val(reg_3));
-   
-   // Upper 16 bits are mask for lower 16
-   always @(posedge clock)
-     if(serial_strobe)
-       case(serial_addr)
-	 `FR_OE_0 : io_0_oe
-	   <= #1 (io_0_oe & ~serial_data[31:16]) | (serial_data[15:0] & serial_data[31:16] );
-	 `FR_OE_1 : io_1_oe
-	   <= #1 (io_1_oe & ~serial_data[31:16]) | (serial_data[15:0] & serial_data[31:16] );
-	 `FR_OE_2 : io_2_oe
-	   <= #1 (io_2_oe & ~serial_data[31:16]) | (serial_data[15:0] & serial_data[31:16] );
-	 `FR_OE_3 : io_3_oe
-	   <= #1 (io_3_oe & ~serial_data[31:16]) | (serial_data[15:0] & serial_data[31:16] );
-       endcase // case(serial_addr)
-
-endmodule // io_pins
diff --git a/gr-gpio/src/fpga/lib/rx_chain.v b/gr-gpio/src/fpga/lib/rx_chain.v
deleted file mode 100644
index 172e978de..000000000
--- a/gr-gpio/src/fpga/lib/rx_chain.v
+++ /dev/null
@@ -1,121 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2003 Matt Ettus
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-// Following defines conditionally include RX path circuitry
-
-`include "config.vh"	// resolved relative to project root
-
-module rx_chain
-  (input clock,
-   input reset,
-   input enable,
-   input wire [7:0] decim_rate,
-   input sample_strobe,
-   input decimator_strobe,
-   output wire hb_strobe,
-   input [6:0] serial_addr, input [31:0] serial_data, input serial_strobe,
-   input wire [15:0] i_in,
-   input wire [15:0] q_in,
-   output wire [15:0] i_out,
-   output wire [15:0] q_out,
-   output wire [15:0] debugdata,output wire [15:0] debugctrl
-   );
-
-   parameter FREQADDR = 0;
-   parameter PHASEADDR = 0;
-   
-   wire [31:0] phase;
-   wire [15:0] bb_i, bb_q;
-   wire [15:0] hb_in_i, hb_in_q;
-   
-   assign	debugdata = hb_in_i;
-
-`ifdef RX_NCO_ON
-    phase_acc #(FREQADDR,PHASEADDR,32) rx_phase_acc
-     (.clk(clock),.reset(reset),.enable(enable),
-      .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-      .strobe(sample_strobe),.phase(phase) );
-
-   cordic rx_cordic
-     ( .clock(clock),.reset(reset),.enable(enable), 
-       .xi(i_in),.yi(q_in),.zi(phase[31:16]),
-       .xo(bb_i),.yo(bb_q),.zo() );
-`else
-   assign bb_i = i_in;
-   assign bb_q = q_in;
-   assign sample_strobe = 1;
-`endif // !`ifdef RX_NCO_ON
-
-`ifdef RX_INTEG_ON
-   integrator integ_decim_i_0
-     ( .clock(clock),.reset(reset),.enable(enable),
-       .rate(decim_rate),.strobe_in(sample_strobe),.strobe_out(decimator_strobe),
-       .signal_in(bb_i),.signal_out(i_out) );
-
-   assign hb_strobe = decimator_strobe;
-`else
-`ifdef RX_CIC_ON
-   cic_decim cic_decim_i_0
-     ( .clock(clock),.reset(reset),.enable(enable),
-       .rate(decim_rate),.strobe_in(sample_strobe),.strobe_out(decimator_strobe),
-       .signal_in(bb_i),.signal_out(hb_in_i) );
-`else
-   assign hb_in_i = bb_i;
-   assign decimator_strobe = sample_strobe;
-`endif
-   
-`ifdef RX_HB_ON
-   halfband_decim hbd_i_0
-     ( .clock(clock),.reset(reset),.enable(enable),
-       .strobe_in(decimator_strobe),.strobe_out(hb_strobe),
-       .data_in(hb_in_i),.data_out(i_out),.debugctrl(debugctrl) );
-`else
-   assign i_out = hb_in_i;
-   assign hb_strobe = decimator_strobe;
-`endif
-`endif // RX_INTEG_ON
-
-`ifdef RX_INTEG_ON
-   integrator integ_decim_q_0
-     ( .clock(clock),.reset(reset),.enable(enable),
-       .rate(decim_rate),.strobe_in(sample_strobe),.strobe_out(decimator_strobe),
-       .signal_in(bb_q),.signal_out(q_out) );
-`else   
-`ifdef RX_CIC_ON
-   cic_decim cic_decim_q_0
-     ( .clock(clock),.reset(reset),.enable(enable),
-       .rate(decim_rate),.strobe_in(sample_strobe),.strobe_out(decimator_strobe),
-       .signal_in(bb_q),.signal_out(hb_in_q) );
-`else
-   assign hb_in_q = bb_q;
-`endif
-
-`ifdef RX_HB_ON
-   halfband_decim hbd_q_0
-     ( .clock(clock),.reset(reset),.enable(enable),
-       .strobe_in(decimator_strobe),.strobe_out(),
-       .data_in(hb_in_q),.data_out(q_out) );   
-`else
-   assign q_out = hb_in_q;
-`endif
-`endif // RX_INTEG_ON
-
-endmodule // rx_chain
diff --git a/gr-gpio/src/fpga/lib/rx_chain_dig.v b/gr-gpio/src/fpga/lib/rx_chain_dig.v
deleted file mode 100644
index 4f760dded..000000000
--- a/gr-gpio/src/fpga/lib/rx_chain_dig.v
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-// Following defines conditionally include RX path circuitry
-
-`include "../top/config.vh"	// resolved relative to project root
-
-module rx_chain_dig
-  (input clock,
-   input reset,
-   input enable,
-   input wire [15:0] i_in_ana,
-   input wire [15:0] q_in_ana,
-   input wire i_in_dig,
-   input wire q_in_dig,
-   output wire [15:0] i_out,
-   output wire [15:0] q_out
-   );
-
-   //assign upper 15 bits of output to analog input,
-   // discards lsb of analog input and replace with digital input bit (which comes from gpio)
-   assign i_out = (enable)?{i_in_ana[15:1],i_in_dig}:i_in_ana;
-   assign q_out = (enable)?{q_in_ana[15:1],q_in_dig}:q_in_ana;
-
-endmodule // rx_chain_dig
diff --git a/gr-gpio/src/fpga/lib/tx_chain_dig.v b/gr-gpio/src/fpga/lib/tx_chain_dig.v
deleted file mode 100644
index 7001947f7..000000000
--- a/gr-gpio/src/fpga/lib/tx_chain_dig.v
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-module tx_chain_dig
-  (input clock,
-   input reset,
-   input enable,
-   input wire [15:0] i_in,
-   input wire [15:0] q_in,
-   output wire [15:0] i_out_ana,
-   output wire [15:0] q_out_ana,
-   output wire i_out_dig,
-   output wire q_out_dig
-   );
-
-   //assign upper 15 bits to analog processing, discard lowest bit
-   //output lower two bits of I and Q  as digital signal (to be output on gpio pins)
-   assign i_out_ana = (enable)?{i_in[15:1],1'b0}:i_in;
-   assign q_out_ana = (enable)?{q_in[15:1],1'b0}:q_in;
-   //wire out_dig   = (enable)?{i_in[0],q_in[0]}:2'b00;
-   assign i_out_dig = (enable)?i_in[0]:1'b0;
-   assign q_out_dig = (enable)?q_in[0]:1'b0;
-
-endmodule // tx_chain_dig
diff --git a/gr-gpio/src/fpga/rbf/Makefile.am b/gr-gpio/src/fpga/rbf/Makefile.am
deleted file mode 100644
index e444d62eb..000000000
--- a/gr-gpio/src/fpga/rbf/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright 2008,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-RBFS = \
-	std_2rxhb_2tx_dig.rbf \
-	std_2rxint_2tx_dig.rbf
-
-datadir = $(prefix)/share/usrp
-datarev2dir = $(datadir)/rev2
-datarev4dir = $(datadir)/rev4
-
-dist_datarev2_DATA = $(RBFS)
-
-dist_datarev4_DATA = $(RBFS)
diff --git a/gr-gpio/src/fpga/rbf/std_2rxhb_2tx_dig.rbf b/gr-gpio/src/fpga/rbf/std_2rxhb_2tx_dig.rbf
deleted file mode 100644
index 5d1c9c7d2..000000000
--- a/gr-gpio/src/fpga/rbf/std_2rxhb_2tx_dig.rbf
+++ /dev/null
diff --git a/gr-gpio/src/fpga/rbf/std_2rxint_2tx_dig.rbf b/gr-gpio/src/fpga/rbf/std_2rxint_2tx_dig.rbf
deleted file mode 100644
index 60e194eee..000000000
--- a/gr-gpio/src/fpga/rbf/std_2rxint_2tx_dig.rbf
+++ /dev/null
diff --git a/gr-gpio/src/fpga/top/.gitignore b/gr-gpio/src/fpga/top/.gitignore
deleted file mode 100644
index 28be78cfc..000000000
--- a/gr-gpio/src/fpga/top/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/Makefile
-/Makefile.in
-/db
-/prev*.*
-/*.summary
-/*.qws
-/*.rpt
-/*.done
-/*.pin
-/*.sof
-/*.rbf
diff --git a/gr-gpio/src/fpga/top/config.vh b/gr-gpio/src/fpga/top/config.vh
deleted file mode 100644
index d40e75d2f..000000000
--- a/gr-gpio/src/fpga/top/config.vh
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2006,2007 Matt Ettus
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-// ====================================================================
-//            User control over what parts get included
-//
-//                  >>>> EDIT ONLY THIS SECTION <<<<
-//                  Uncomment only ONE configuration
-// ====================================================================
-
-// ====================================================================
-// FIXME drive configuration selection from the command line and/or gui
-// ====================================================================
-
-// Uncomment this for 1 rx channel (w/ halfband) & 1 transmit channel
-//`include "../include/common_config_1rxhb_1tx.vh"
-
-// Uncomment this for 2 rx channels (w/ halfband) & 2 transmit channels
-//`include "../include/common_config_2rxhb_2tx.vh"
-
-// Uncomment this for 2 rx channels (w/ halfband) & 2 transmit channels with digital output (lsb of I and Q) on gpio pins
-//`include "../include/common_config_2rxhb_2tx_dig.vh"
-
-// Uncomment this for 2 rx channels (w/o halfband, but w/integrator) & 2 tx channels, with streaming GPIO
-  `include "../include/common_config_2rxint_2tx_dig.vh"
-
-// Uncomment this for 4 rx channels (w/o halfband) & 0 transmit channels
-//`include "../include/common_config_4rx_0tx.vh"
-
-// Uncomment this for multi with 2 rx channels (w/ halfband) & 0 transmit channels
-//`include "../include/common_config_2rxhb_0tx.vh"
-
-// Uncomment this for multi with 2 rx channels (w/o halfband) & 0 transmit channels
-//`include "../include/common_config_2rx_0tx.vh"
-
-// Add other "known to fit" configurations here...
-
-// ====================================================================
-//  Now include the common footer
-// ====================================================================
-  `include "../include/common_config_bottom.vh"
diff --git a/gr-gpio/src/fpga/top/usrp_gpio.csf b/gr-gpio/src/fpga/top/usrp_gpio.csf
deleted file mode 100644
index 8a6a0b466..000000000
--- a/gr-gpio/src/fpga/top/usrp_gpio.csf
+++ /dev/null
@@ -1,444 +0,0 @@
-COMPILER_SETTINGS
-{
-	IO_PLACEMENT_OPTIMIZATION = OFF;
-	ENABLE_DRC_SETTINGS = OFF;
-	PHYSICAL_SYNTHESIS_REGISTER_RETIMING = OFF;
-	PHYSICAL_SYNTHESIS_REGISTER_DUPLICATION = OFF;
-	PHYSICAL_SYNTHESIS_COMBO_LOGIC = OFF;
-	DRC_FANOUT_EXCEEDING = 30;
-	DRC_REPORT_FANOUT_EXCEEDING = OFF;
-	DRC_TOP_FANOUT = 50;
-	DRC_REPORT_TOP_FANOUT = OFF;
-	RUN_DRC_DURING_COMPILATION = OFF;
-	ADV_NETLIST_OPT_RETIME_CORE_AND_IO = ON;
-	ADV_NETLIST_OPT_SYNTH_USE_FITTER_INFO = OFF;
-	ADV_NETLIST_OPT_SYNTH_GATE_RETIME = OFF;
-	ADV_NETLIST_OPT_SYNTH_WYSIWYG_REMAP = OFF;
-	SMART_COMPILE_IGNORES_TDC_FOR_STRATIX_PLL_CHANGES = OFF;
-	MERGE_HEX_FILE = OFF;
-	TRUE_WYSIWYG_FLOW = OFF;
-	SEED = 1;
-	FINAL_PLACEMENT_OPTIMIZATION = AUTOMATICALLY;
-	FAMILY = Cyclone;
-	DPRAM_DUAL_PORT_MODE_OTHER_SIGNALS_EPXA1 = "DPRAM0 TO 1 DPRAM1 TO 2";
-	DPRAM_32BIT_SINGLE_PORT_MODE_OTHER_SIGNALS_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_8BIT_16BIT_SINGLE_PORT_MODE_OTHER_SIGNALS_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_DUAL_PORT_MODE_OUTPUT_EPXA1 = "DPRAM0 TO 1 DPRAM1 TO 2";
-	DPRAM_32BIT_SINGLE_PORT_MODE_OUTPUT_EPXA1 = "LOWER TO 1ESB UPPER TO 1";
-	DPRAM_8BIT_16BIT_SINGLE_PORT_MODE_OUTPUT_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_DUAL_PORT_MODE_INPUT_EPXA1 = "DPRAM0 TO 1 DPRAM1 TO 2";
-	DPRAM_32BIT_SINGLE_PORT_MODE_INPUT_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_8BIT_16BIT_SINGLE_PORT_MODE_INPUT_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_DUAL_PORT_MODE_OTHER_SIGNALS_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_SINGLE_PORT_MODE_OTHER_SIGNALS_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_WIDE_MODE_OTHER_SIGNALS_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_DEEP_MODE_OTHER_SIGNALS_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_DUAL_PORT_MODE_OUTPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4ESB";
-	DPRAM_SINGLE_PORT_MODE_OUTPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4ESB";
-	DPRAM_WIDE_MODE_OUTPUT_EPXA4_10 = "LOWER TO 3 UPPER TO 4ESB";
-	DPRAM_DEEP_MODE_OUTPUT_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_DUAL_PORT_MODE_INPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_SINGLE_PORT_MODE_INPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_WIDE_MODE_INPUT_EPXA4_10 = "LOWER TO 3 UPPER TO 4";
-	DPRAM_DEEP_MODE_INPUT_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_OTHER_SIGNALS_EPXA4_10 = "DEFAULT OTHER ROUTING OPTIONS";
-	DPRAM_OUTPUT_EPXA4_10 = "DEFAULT OUTPUT ROUTING OPTIONS";
-	DPRAM_INPUT_EPXA4_10 = "DEFAULT INPUT ROUTING OPTIONS";
-	STRIPE_TO_PLD_INTERRUPTS_EPXA4_10 = "MEGALAB COLUMN 2";
-	PLD_TO_STRIPE_INTERRUPTS_EPXA4_10 = "MEGALAB COLUMN 2";
-	PROCESSOR_DEBUG_EXTENSIONS_EPXA4_10 = "MEGALAB COLUMN 2";
-	STRIPE_TO_PLD_BRIDGE_EPXA4_10 = "MEGALAB COLUMN 1";
-	FAST_FIT_COMPILATION = OFF;
-	SIGNALPROBE_DURING_NORMAL_COMPILATION = OFF;
-	OPTIMIZE_IOC_REGISTER_PLACEMENT_FOR_TIMING = ON;
-	OPTIMIZE_TIMING = "NORMAL COMPILATION";
-	OPTIMIZE_HOLD_TIMING = OFF;
-	COMPILATION_LEVEL = FULL;
-	SAVE_DISK_SPACE = OFF;
-	SPEED_DISK_USAGE_TRADEOFF = NORMAL;
-	LOGICLOCK_INCREMENTAL_COMPILE_ASSIGNMENT = OFF;
-	SIGNALPROBE_ALLOW_OVERUSE = OFF;
-	FOCUS_ENTITY_NAME = |usrp_gpio;
-	ROUTING_BACK_ANNOTATION_MODE = OFF;
-	INC_PLC_MODE = OFF;
-	FIT_ONLY_ONE_ATTEMPT = OFF;
-}
-DEFAULT_DEVICE_OPTIONS
-{
-	GENERATE_CONFIG_HEXOUT_FILE = OFF;
-	GENERATE_CONFIG_JBC_FILE_COMPRESSED = ON;
-	GENERATE_CONFIG_JBC_FILE = OFF;
-	GENERATE_CONFIG_JAM_FILE = OFF;
-	GENERATE_CONFIG_ISC_FILE = OFF;
-	GENERATE_CONFIG_SVF_FILE = OFF;
-	GENERATE_JBC_FILE_COMPRESSED = ON;
-	GENERATE_JBC_FILE = OFF;
-	GENERATE_JAM_FILE = OFF;
-	GENERATE_ISC_FILE = OFF;
-	GENERATE_SVF_FILE = OFF;
-	RESERVE_PIN = "AS INPUT TRI-STATED";
-	RESERVE_ALL_UNUSED_PINS = "AS OUTPUT DRIVING GROUND";
-	HEXOUT_FILE_COUNT_DIRECTION = UP;
-	HEXOUT_FILE_START_ADDRESS = 0;
-	GENERATE_HEX_FILE = OFF;
-	GENERATE_RBF_FILE = OFF;
-	GENERATE_TTF_FILE = OFF;
-	RESERVE_ASDO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_DATA0_AFTER_CONFIGURATION = "AS INPUT TRI-STATED";
-	RESERVE_DATA7_THROUGH_DATA1_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_RDYNBUSY_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_NWS_NRS_NCS_CS_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	DISABLE_NCS_AND_OE_PULLUPS_ON_CONFIG_DEVICE = OFF;
-	AUTO_INCREMENT_CONFIG_DEVICE_JTAG_USER_CODE = ON;
-	EPROM_USE_CHECKSUM_AS_USERCODE = OFF;
-	FLEX10K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	MERCURY_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	APEX20K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_CONFIGURATION_DEVICE = AUTO;
-	CYCLONE_CONFIGURATION_DEVICE = AUTO;
-	FLEX10K_CONFIGURATION_DEVICE = AUTO;
-	FLEX6K_CONFIGURATION_DEVICE = AUTO;
-	MERCURY_CONFIGURATION_DEVICE = AUTO;
-	EXCALIBUR_CONFIGURATION_DEVICE = AUTO;
-	APEX20K_CONFIGURATION_DEVICE = AUTO;
-	USE_CONFIGURATION_DEVICE = ON;
-	ENABLE_INIT_DONE_OUTPUT = OFF;
-	FLEX10K_ENABLE_LOCK_OUTPUT = OFF;
-	ENABLE_DEVICE_WIDE_OE = OFF;
-	ENABLE_DEVICE_WIDE_RESET = OFF;
-	RELEASE_CLEARS_BEFORE_TRI_STATES = OFF;
-	AUTO_RESTART_CONFIGURATION = OFF;
-	ENABLE_VREFB_PIN = OFF;
-	ENABLE_VREFA_PIN = OFF;
-	SECURITY_BIT = OFF;
-	USER_START_UP_CLOCK = OFF;
-	APEXII_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX10K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX6K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	MERCURY_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	EXCALIBUR_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	CYCLONE_CONFIGURATION_SCHEME = "ACTIVE SERIAL";
-	STRATIX_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	APEX20K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	STRATIX_UPDATE_MODE = STANDARD;
-	USE_CHECKSUM_AS_USERCODE = OFF;
-	MAX7000_USE_CHECKSUM_AS_USERCODE = OFF;
-	MAX7000_JTAG_USER_CODE = FFFFFFFF;
-	FLEX10K_JTAG_USER_CODE = 7F;
-	MERCURY_JTAG_USER_CODE = FFFFFFFF;
-	APEX20K_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_JTAG_USER_CODE = FFFFFFFF;
-	MAX7000S_JTAG_USER_CODE = FFFF;
-	RESERVE_NCEO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	FLEX10K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	FLEX6K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = OFF;
-	ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	MAX7000_ENABLE_JTAG_BST_SUPPORT = ON;
-	ENABLE_JTAG_BST_SUPPORT = OFF;
-	CONFIGURATION_CLOCK_DIVISOR = 1;
-	CONFIGURATION_CLOCK_FREQUENCY = "10 MHZ";
-	CLOCK_SOURCE = INTERNAL;
-	COMPRESSION_MODE = OFF;
-	ON_CHIP_BITSTREAM_DECOMPRESSION = OFF;
-}
-AUTO_SLD_HUB_ENTITY
-{
-	AUTO_INSERT_SLD_HUB_ENTITY = ENABLE;
-	HUB_INSTANCE_NAME = SLD_HUB_INST;
-	HUB_ENTITY_NAME = SLD_HUB;
-}
-SIGNALTAP_LOGIC_ANALYZER_SETTINGS
-{
-	ENABLE_SIGNALTAP = Off;
-	AUTO_ENABLE_SMART_COMPILE = On;
-}
-CHIP(usrp_gpio)
-{
-	DEVICE = EP1C12Q240C8;
-	DEVICE_FILTER_PACKAGE = "ANY QFP";
-	DEVICE_FILTER_PIN_COUNT = 240;
-	DEVICE_FILTER_SPEED_GRADE = ANY;
-	AUTO_RESTART_CONFIGURATION = OFF;
-	RELEASE_CLEARS_BEFORE_TRI_STATES = OFF;
-	USER_START_UP_CLOCK = OFF;
-	ENABLE_DEVICE_WIDE_RESET = OFF;
-	ENABLE_DEVICE_WIDE_OE = OFF;
-	ENABLE_INIT_DONE_OUTPUT = OFF;
-	FLEX10K_ENABLE_LOCK_OUTPUT = OFF;
-	ENABLE_JTAG_BST_SUPPORT = OFF;
-	MAX7000_ENABLE_JTAG_BST_SUPPORT = ON;
-	APEX20K_JTAG_USER_CODE = FFFFFFFF;
-	MERCURY_JTAG_USER_CODE = FFFFFFFF;
-	FLEX10K_JTAG_USER_CODE = 7F;
-	MAX7000_JTAG_USER_CODE = FFFFFFFF;
-	MAX7000S_JTAG_USER_CODE = FFFF;
-	STRATIX_JTAG_USER_CODE = FFFFFFFF;
-	APEX20K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	MERCURY_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX6K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX10K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	EXCALIBUR_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	APEXII_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	STRATIX_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	CYCLONE_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	USE_CONFIGURATION_DEVICE = OFF;
-	APEX20K_CONFIGURATION_DEVICE = AUTO;
-	MERCURY_CONFIGURATION_DEVICE = AUTO;
-	FLEX6K_CONFIGURATION_DEVICE = AUTO;
-	FLEX10K_CONFIGURATION_DEVICE = AUTO;
-	EXCALIBUR_CONFIGURATION_DEVICE = AUTO;
-	STRATIX_CONFIGURATION_DEVICE = AUTO;
-	CYCLONE_CONFIGURATION_DEVICE = AUTO;
-	STRATIX_UPDATE_MODE = STANDARD;
-	APEX20K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	MERCURY_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	FLEX10K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	AUTO_INCREMENT_CONFIG_DEVICE_JTAG_USER_CODE = ON;
-	DISABLE_NCS_AND_OE_PULLUPS_ON_CONFIG_DEVICE = OFF;
-	COMPRESSION_MODE = OFF;
-	ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	FLEX6K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = OFF;
-	FLEX10K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	EPROM_USE_CHECKSUM_AS_USERCODE = OFF;
-	USE_CHECKSUM_AS_USERCODE = OFF;
-	MAX7000_USE_CHECKSUM_AS_USERCODE = OFF;
-	GENERATE_TTF_FILE = OFF;
-	GENERATE_RBF_FILE = ON;
-	GENERATE_HEX_FILE = OFF;
-	SECURITY_BIT = OFF;
-	ENABLE_VREFA_PIN = OFF;
-	ENABLE_VREFB_PIN = OFF;
-	GENERATE_SVF_FILE = OFF;
-	GENERATE_ISC_FILE = OFF;
-	GENERATE_JAM_FILE = OFF;
-	GENERATE_JBC_FILE = OFF;
-	GENERATE_JBC_FILE_COMPRESSED = ON;
-	GENERATE_CONFIG_SVF_FILE = OFF;
-	GENERATE_CONFIG_ISC_FILE = OFF;
-	GENERATE_CONFIG_JAM_FILE = OFF;
-	GENERATE_CONFIG_JBC_FILE = OFF;
-	GENERATE_CONFIG_JBC_FILE_COMPRESSED = ON;
-	GENERATE_CONFIG_HEXOUT_FILE = OFF;
-	ON_CHIP_BITSTREAM_DECOMPRESSION = OFF;
-	BASE_PIN_OUT_FILE_ON_SAMEFRAME_DEVICE = OFF;
-	HEXOUT_FILE_START_ADDRESS = 0;
-	HEXOUT_FILE_COUNT_DIRECTION = UP;
-	RESERVE_ALL_UNUSED_PINS = "AS INPUT TRI-STATED";
-	STRATIX_DEVICE_IO_STANDARD = LVTTL;
-	CLOCK_SOURCE = INTERNAL;
-	CONFIGURATION_CLOCK_FREQUENCY = "10 MHZ";
-	CONFIGURATION_CLOCK_DIVISOR = 1;
-	RESERVE_NWS_NRS_NCS_CS_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_RDYNBUSY_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_DATA7_THROUGH_DATA1_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_DATA0_AFTER_CONFIGURATION = "AS INPUT TRI-STATED";
-	RESERVE_NCEO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_ASDO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	SCLK : LOCATION = Pin_101;
-	SDI : LOCATION = Pin_100;
-	SEN : LOCATION = Pin_98;
-	SLD : LOCATION = Pin_95;
-	adc1_data[0] : LOCATION = Pin_5;
-	adc1_data[10] : LOCATION = Pin_235;
-	adc1_data[11] : LOCATION = Pin_234;
-	adc1_data[1] : LOCATION = Pin_4;
-	adc1_data[2] : LOCATION = Pin_3;
-	adc1_data[3] : LOCATION = Pin_2;
-	adc1_data[4] : LOCATION = Pin_1;
-	adc1_data[4] : IO_STANDARD = LVTTL;
-	adc1_data[5] : LOCATION = Pin_240;
-	adc1_data[6] : LOCATION = Pin_239;
-	adc1_data[7] : LOCATION = Pin_238;
-	adc1_data[8] : LOCATION = Pin_237;
-	adc1_data[9] : LOCATION = Pin_236;
-	adc2_data[0] : LOCATION = Pin_20;
-	adc2_data[10] : LOCATION = Pin_8;
-	adc2_data[11] : LOCATION = Pin_7;
-	adc2_data[1] : LOCATION = Pin_19;
-	adc2_data[2] : LOCATION = Pin_18;
-	adc2_data[3] : LOCATION = Pin_17;
-	adc2_data[4] : LOCATION = Pin_16;
-	adc2_data[5] : LOCATION = Pin_15;
-	adc2_data[6] : LOCATION = Pin_14;
-	adc2_data[7] : LOCATION = Pin_13;
-	adc2_data[8] : LOCATION = Pin_12;
-	adc2_data[9] : LOCATION = Pin_11;
-	adc3_data[0] : LOCATION = Pin_200;
-	adc3_data[10] : LOCATION = Pin_184;
-	adc3_data[11] : LOCATION = Pin_183;
-	adc3_data[1] : LOCATION = Pin_197;
-	adc3_data[2] : LOCATION = Pin_196;
-	adc3_data[3] : LOCATION = Pin_195;
-	adc3_data[4] : LOCATION = Pin_194;
-	adc3_data[5] : LOCATION = Pin_193;
-	adc3_data[6] : LOCATION = Pin_188;
-	adc3_data[7] : LOCATION = Pin_187;
-	adc3_data[8] : LOCATION = Pin_186;
-	adc3_data[9] : LOCATION = Pin_185;
-	adc4_data[0] : LOCATION = Pin_222;
-	adc4_data[10] : LOCATION = Pin_203;
-	adc4_data[11] : LOCATION = Pin_202;
-	adc4_data[1] : LOCATION = Pin_219;
-	adc4_data[2] : LOCATION = Pin_217;
-	adc4_data[3] : LOCATION = Pin_216;
-	adc4_data[4] : LOCATION = Pin_215;
-	adc4_data[5] : LOCATION = Pin_214;
-	adc4_data[6] : LOCATION = Pin_213;
-	adc4_data[7] : LOCATION = Pin_208;
-	adc4_data[8] : LOCATION = Pin_207;
-	adc4_data[9] : LOCATION = Pin_206;
-	adc_oeb[0] : LOCATION = Pin_228;
-	adc_oeb[1] : LOCATION = Pin_21;
-	adc_oeb[2] : LOCATION = Pin_181;
-	adc_oeb[3] : LOCATION = Pin_218;
-	adc_otr[0] : LOCATION = Pin_233;
-	adc_otr[1] : LOCATION = Pin_6;
-	adc_otr[2] : LOCATION = Pin_182;
-	adc_otr[3] : LOCATION = Pin_201;
-	adclk0 : LOCATION = Pin_224;
-	adclk1 : LOCATION = Pin_226;
-	clk0 : LOCATION = Pin_28;
-	clk0 : RESERVE_PIN = "AS INPUT TRI-STATED";
-	clk0 : IO_STANDARD = LVTTL;
-	clk1 : LOCATION = Pin_29;
-	clk1 : RESERVE_PIN = "AS INPUT TRI-STATED";
-	clk1 : IO_STANDARD = LVTTL;
-	clk3 : LOCATION = Pin_152;
-	clk3 : RESERVE_PIN = "AS INPUT TRI-STATED";
-	clk3 : IO_STANDARD = LVTTL;
-	clk_120mhz : LOCATION = Pin_153;
-	clk_120mhz : IO_STANDARD = LVTTL;
-	clk_out : LOCATION = Pin_63;
-	clk_out : IO_STANDARD = LVTTL;
-	dac1_data[0] : LOCATION = Pin_165;
-	dac1_data[10] : LOCATION = Pin_177;
-	dac1_data[11] : LOCATION = Pin_178;
-	dac1_data[12] : LOCATION = Pin_179;
-	dac1_data[13] : LOCATION = Pin_180;
-	dac1_data[1] : LOCATION = Pin_166;
-	dac1_data[2] : LOCATION = Pin_167;
-	dac1_data[3] : LOCATION = Pin_168;
-	dac1_data[4] : LOCATION = Pin_169;
-	dac1_data[5] : LOCATION = Pin_170;
-	dac1_data[6] : LOCATION = Pin_173;
-	dac1_data[7] : LOCATION = Pin_174;
-	dac1_data[8] : LOCATION = Pin_175;
-	dac1_data[9] : LOCATION = Pin_176;
-	dac2_data[0] : LOCATION = Pin_159;
-	dac2_data[10] : LOCATION = Pin_163;
-	dac2_data[11] : LOCATION = Pin_139;
-	dac2_data[12] : LOCATION = Pin_164;
-	dac2_data[13] : LOCATION = Pin_138;
-	dac2_data[1] : LOCATION = Pin_158;
-	dac2_data[2] : LOCATION = Pin_160;
-	dac2_data[3] : LOCATION = Pin_156;
-	dac2_data[4] : LOCATION = Pin_161;
-	dac2_data[5] : LOCATION = Pin_144;
-	dac2_data[6] : LOCATION = Pin_162;
-	dac2_data[7] : LOCATION = Pin_141;
-	dac2_data[8] : LOCATION = Pin_143;
-	dac2_data[9] : LOCATION = Pin_140;
-	dac3_data[0] : LOCATION = Pin_122;
-	dac3_data[10] : LOCATION = Pin_134;
-	dac3_data[11] : LOCATION = Pin_135;
-	dac3_data[12] : LOCATION = Pin_136;
-	dac3_data[13] : LOCATION = Pin_137;
-	dac3_data[1] : LOCATION = Pin_123;
-	dac3_data[2] : LOCATION = Pin_124;
-	dac3_data[3] : LOCATION = Pin_125;
-	dac3_data[4] : LOCATION = Pin_126;
-	dac3_data[5] : LOCATION = Pin_127;
-	dac3_data[6] : LOCATION = Pin_128;
-	dac3_data[7] : LOCATION = Pin_131;
-	dac3_data[8] : LOCATION = Pin_132;
-	dac3_data[9] : LOCATION = Pin_133;
-	dac4_data[0] : LOCATION = Pin_104;
-	dac4_data[10] : LOCATION = Pin_118;
-	dac4_data[11] : LOCATION = Pin_119;
-	dac4_data[12] : LOCATION = Pin_120;
-	dac4_data[13] : LOCATION = Pin_121;
-	dac4_data[1] : LOCATION = Pin_105;
-	dac4_data[2] : LOCATION = Pin_106;
-	dac4_data[3] : LOCATION = Pin_107;
-	dac4_data[4] : LOCATION = Pin_108;
-	dac4_data[5] : LOCATION = Pin_113;
-	dac4_data[6] : LOCATION = Pin_114;
-	dac4_data[7] : LOCATION = Pin_115;
-	dac4_data[8] : LOCATION = Pin_116;
-	dac4_data[9] : LOCATION = Pin_117;
-	enable_rx : LOCATION = Pin_88;
-	enable_tx : LOCATION = Pin_93;
-	gndbus[0] : LOCATION = Pin_223;
-	gndbus[0] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[0] : IO_STANDARD = LVTTL;
-	gndbus[1] : LOCATION = Pin_225;
-	gndbus[1] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[1] : IO_STANDARD = LVTTL;
-	gndbus[2] : LOCATION = Pin_227;
-	gndbus[2] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[2] : IO_STANDARD = LVTTL;
-	gndbus[3] : LOCATION = Pin_62;
-	gndbus[3] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[3] : IO_STANDARD = LVTTL;
-	gndbus[4] : LOCATION = Pin_64;
-	gndbus[4] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[4] : IO_STANDARD = LVTTL;
-	misc_pins[0] : LOCATION = Pin_87;
-	misc_pins[0] : IO_STANDARD = LVTTL;
-	misc_pins[10] : LOCATION = Pin_76;
-	misc_pins[10] : IO_STANDARD = LVTTL;
-	misc_pins[11] : LOCATION = Pin_74;
-	misc_pins[11] : IO_STANDARD = LVTTL;
-	misc_pins[1] : LOCATION = Pin_86;
-	misc_pins[1] : IO_STANDARD = LVTTL;
-	misc_pins[2] : LOCATION = Pin_85;
-	misc_pins[2] : IO_STANDARD = LVTTL;
-	misc_pins[3] : LOCATION = Pin_84;
-	misc_pins[3] : IO_STANDARD = LVTTL;
-	misc_pins[4] : LOCATION = Pin_83;
-	misc_pins[4] : IO_STANDARD = LVTTL;
-	misc_pins[5] : LOCATION = Pin_82;
-	misc_pins[5] : IO_STANDARD = LVTTL;
-	misc_pins[6] : LOCATION = Pin_79;
-	misc_pins[6] : IO_STANDARD = LVTTL;
-	misc_pins[7] : LOCATION = Pin_78;
-	misc_pins[7] : IO_STANDARD = LVTTL;
-	misc_pins[8] : LOCATION = Pin_77;
-	misc_pins[8] : IO_STANDARD = LVTTL;
-	misc_pins[9] : LOCATION = Pin_75;
-	misc_pins[9] : IO_STANDARD = LVTTL;
-	reset : LOCATION = Pin_94;
-	usbclk : LOCATION = Pin_55;
-	usbctl[0] : LOCATION = Pin_56;
-	usbctl[1] : LOCATION = Pin_54;
-	usbctl[2] : LOCATION = Pin_53;
-	usbctl[3] : LOCATION = Pin_58;
-	usbctl[4] : LOCATION = Pin_57;
-	usbctl[5] : LOCATION = Pin_44;
-	usbdata[0] : LOCATION = Pin_73;
-	usbdata[10] : LOCATION = Pin_41;
-	usbdata[11] : LOCATION = Pin_39;
-	usbdata[12] : LOCATION = Pin_38;
-	usbdata[12] : IO_STANDARD = LVTTL;
-	usbdata[13] : LOCATION = Pin_37;
-	usbdata[14] : LOCATION = Pin_24;
-	usbdata[15] : LOCATION = Pin_23;
-	usbdata[1] : LOCATION = Pin_68;
-	usbdata[2] : LOCATION = Pin_67;
-	usbdata[3] : LOCATION = Pin_66;
-	usbdata[4] : LOCATION = Pin_65;
-	usbdata[5] : LOCATION = Pin_61;
-	usbdata[6] : LOCATION = Pin_60;
-	usbdata[7] : LOCATION = Pin_59;
-	usbdata[8] : LOCATION = Pin_43;
-	usbdata[9] : LOCATION = Pin_42;
-	usbrdy[0] : LOCATION = Pin_45;
-	usbrdy[1] : LOCATION = Pin_46;
-	usbrdy[2] : LOCATION = Pin_47;
-	usbrdy[3] : LOCATION = Pin_48;
-	usbrdy[4] : LOCATION = Pin_49;
-	usbrdy[5] : LOCATION = Pin_50;
-	clear_status : LOCATION = Pin_99;
-}
diff --git a/gr-gpio/src/fpga/top/usrp_gpio.esf b/gr-gpio/src/fpga/top/usrp_gpio.esf
deleted file mode 100644
index 5ca386649..000000000
--- a/gr-gpio/src/fpga/top/usrp_gpio.esf
+++ /dev/null
@@ -1,14 +0,0 @@
-SIMULATOR_SETTINGS
-{
-	ESTIMATE_POWER_CONSUMPTION = OFF;
-	GLITCH_INTERVAL = 1NS;
-	GLITCH_DETECTION = OFF;
-	SIMULATION_COVERAGE = ON;
-	CHECK_OUTPUTS = OFF;
-	SETUP_HOLD_DETECTION = OFF;
-	POWER_ESTIMATION_START_TIME = "0 NS";
-	ADD_DEFAULT_PINS_TO_SIMULATION_OUTPUT_WAVEFORMS = ON;
-	SIMULATION_MODE = TIMING;
-	START_TIME = 0NS;
-	USE_COMPILER_SETTINGS = usrp_gpio;
-}
diff --git a/gr-gpio/src/fpga/top/usrp_gpio.psf b/gr-gpio/src/fpga/top/usrp_gpio.psf
deleted file mode 100644
index ff8e6ab08..000000000
--- a/gr-gpio/src/fpga/top/usrp_gpio.psf
+++ /dev/null
@@ -1,312 +0,0 @@
-DEFAULT_DESIGN_ASSISTANT_SETTINGS
-{
-	HCPY_ALOAD_SIGNALS = OFF;
-	HCPY_VREF_PINS = OFF;
-	HCPY_CAT = OFF;
-	HCPY_ILLEGAL_HC_DEV_PKG = OFF;
-	ACLK_RULE_IMSZER_ADOMAIN = OFF;
-	ACLK_RULE_SZER_BTW_ACLK_DOMAIN = OFF;
-	ACLK_RULE_NO_SZER_ACLK_DOMAIN = OFF;
-	ACLK_CAT = OFF;
-	SIGNALRACE_RULE_ASYNCHPIN_SYNCH_CLKPIN = OFF;
-	SIGNALRACE_CAT = OFF;
-	NONSYNCHSTRUCT_RULE_LATCH_UNIDENTIFIED = OFF;
-	NONSYNCHSTRUCT_RULE_SRLATCH = OFF;
-	NONSYNCHSTRUCT_RULE_DLATCH = OFF;
-	NONSYNCHSTRUCT_RULE_MULTI_VIBRATOR = OFF;
-	NONSYNCHSTRUCT_RULE_ILLEGAL_PULSE_GEN = OFF;
-	NONSYNCHSTRUCT_RULE_RIPPLE_CLK = OFF;
-	NONSYNCHSTRUCT_RULE_DELAY_CHAIN = OFF;
-	NONSYNCHSTRUCT_RULE_REG_LOOP = OFF;
-	NONSYNCHSTRUCT_RULE_COMBLOOP = OFF;
-	NONSYNCHSTRUCT_CAT = OFF;
-	NONSYNCHSTRUCT_RULE_COMB_DRIVES_RAM_WE = OFF;
-	TIMING_RULE_COIN_CLKEDGE = OFF;
-	TIMING_RULE_SHIFT_REG = OFF;
-	TIMING_RULE_HIGH_FANOUTS = OFF;
-	TIMING_CAT = OFF;
-	RESET_RULE_ALL = OFF;
-	RESET_RULE_IMSYNCH_ASYNCH_DOMAIN = OFF;
-	RESET_RULE_UNSYNCH_ASYNCH_DOMAIN = OFF;
-	RESET_RULE_REG_ASNYCH = OFF;
-	RESET_RULE_COMB_ASYNCH_RESET = OFF;
-	RESET_RULE_IMSYNCH_EXRESET = OFF;
-	RESET_RULE_UNSYNCH_EXRESET = OFF;
-	RESET_RULE_INPINS_RESETNET = OFF;
-	RESET_CAT = OFF;
-	CLK_RULE_ALL = OFF;
-	CLK_RULE_MIX_EDGES = OFF;
-	CLK_RULE_CLKNET_CLKSPINES = OFF;
-	CLK_RULE_INPINS_CLKNET = OFF;
-	CLK_RULE_GATING_SCHEME = OFF;
-	CLK_RULE_INV_CLOCK = OFF;
-	CLK_RULE_COMB_CLOCK = OFF;
-	CLK_CAT = OFF;
-	HCPY_EXCEED_USER_IO_USAGE = OFF;
-	HCPY_EXCEED_RAM_USAGE = OFF;
-	NONSYNCHSTRUCT_RULE_ASYN_RAM = OFF;
-	SIGNALRACE_RULE_TRISTATE = OFF;
-	ASSG_RULE_MISSING_TIMING = OFF;
-	ASSG_RULE_MISSING_FMAX = OFF;
-	ASSG_CAT = OFF;
-}
-SYNTHESIS_FITTING_SETTINGS
-{
-	AUTO_SHIFT_REGISTER_RECOGNITION = ON;
-	AUTO_DSP_RECOGNITION = ON;
-	AUTO_RAM_RECOGNITION = ON;
-	REMOVE_DUPLICATE_LOGIC = ON;
-	AUTO_TURBO_BIT = ON;
-	AUTO_MERGE_PLLS = ON;
-	AUTO_OPEN_DRAIN_PINS = ON;
-	AUTO_PARALLEL_EXPANDERS = ON;
-	AUTO_FAST_OUTPUT_ENABLE_REGISTERS = OFF;
-	AUTO_FAST_OUTPUT_REGISTERS = OFF;
-	AUTO_FAST_INPUT_REGISTERS = OFF;
-	AUTO_CASCADE_CHAINS = ON;
-	AUTO_CARRY_CHAINS = ON;
-	AUTO_DELAY_CHAINS = ON;
-	MAX7000_PARALLEL_EXPANDER_CHAIN_LENGTH = 4;
-	PARALLEL_EXPANDER_CHAIN_LENGTH = 16;
-	CASCADE_CHAIN_LENGTH = 2;
-	STRATIX_CARRY_CHAIN_LENGTH = 70;
-	MERCURY_CARRY_CHAIN_LENGTH = 48;
-	FLEX10K_CARRY_CHAIN_LENGTH = 32;
-	FLEX6K_CARRY_CHAIN_LENGTH = 32;
-	CARRY_CHAIN_LENGTH = 48;
-	CARRY_OUT_PINS_LCELL_INSERT = ON;
-	NORMAL_LCELL_INSERT = ON;
-	AUTO_LCELL_INSERTION = ON;
-	ALLOW_XOR_GATE_USAGE = ON;
-	AUTO_PACKED_REGISTERS_STRATIX = NORMAL;
-	AUTO_PACKED_REGISTERS = OFF;
-	AUTO_PACKED_REG_CYCLONE = NORMAL;
-	FLEX10K_OPTIMIZATION_TECHNIQUE = AREA;
-	FLEX6K_OPTIMIZATION_TECHNIQUE = AREA;
-	MERCURY_OPTIMIZATION_TECHNIQUE = AREA;
-	APEX20K_OPTIMIZATION_TECHNIQUE = SPEED;
-	MAX7000_OPTIMIZATION_TECHNIQUE = SPEED;
-	STRATIX_OPTIMIZATION_TECHNIQUE = SPEED;
-	CYCLONE_OPTIMIZATION_TECHNIQUE = AREA;
-	FLEX10K_TECHNOLOGY_MAPPER = LUT;
-	FLEX6K_TECHNOLOGY_MAPPER = LUT;
-	MERCURY_TECHNOLOGY_MAPPER = LUT;
-	APEX20K_TECHNOLOGY_MAPPER = LUT;
-	MAX7000_TECHNOLOGY_MAPPER = "PRODUCT TERM";
-	STRATIX_TECHNOLOGY_MAPPER = LUT;
-	AUTO_IMPLEMENT_IN_ROM = OFF;
-	AUTO_GLOBAL_MEMORY_CONTROLS = OFF;
-	AUTO_GLOBAL_REGISTER_CONTROLS = ON;
-	AUTO_GLOBAL_OE = ON;
-	AUTO_GLOBAL_CLOCK = ON;
-	USE_LPM_FOR_AHDL_OPERATORS = ON;
-	LIMIT_AHDL_INTEGERS_TO_32_BITS = OFF;
-	ENABLE_BUS_HOLD_CIRCUITRY = OFF;
-	WEAK_PULL_UP_RESISTOR = OFF;
-	TURBO_BIT = ON;
-	MAX7000_IGNORE_SOFT_BUFFERS = OFF;
-	IGNORE_SOFT_BUFFERS = ON;
-	MAX7000_IGNORE_LCELL_BUFFERS = AUTO;
-	IGNORE_LCELL_BUFFERS = OFF;
-	IGNORE_ROW_GLOBAL_BUFFERS = OFF;
-	IGNORE_GLOBAL_BUFFERS = OFF;
-	IGNORE_CASCADE_BUFFERS = OFF;
-	IGNORE_CARRY_BUFFERS = OFF;
-	REMOVE_DUPLICATE_REGISTERS = ON;
-	REMOVE_REDUNDANT_LOGIC_CELLS = OFF;
-	ALLOW_POWER_UP_DONT_CARE = ON;
-	PCI_IO = OFF;
-	NOT_GATE_PUSH_BACK = ON;
-	SLOW_SLEW_RATE = OFF;
-	DSP_BLOCK_BALANCING = AUTO;
-	STATE_MACHINE_PROCESSING = AUTO;
-}
-DEFAULT_HARDCOPY_SETTINGS
-{
-	HARDCOPY_EXTERNAL_CLOCK_JITTER = "0.0 NS";
-}
-DEFAULT_TIMING_REQUIREMENTS
-{
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	RUN_ALL_TIMING_ANALYSES = ON;
-	IGNORE_CLOCK_SETTINGS = OFF;
-	DEFAULT_HOLD_MULTICYCLE = "SAME AS MULTICYCLE";
-	CUT_OFF_IO_PIN_FEEDBACK = ON;
-	CUT_OFF_CLEAR_AND_PRESET_PATHS = ON;
-	CUT_OFF_READ_DURING_WRITE_PATHS = ON;
-	CUT_OFF_PATHS_BETWEEN_CLOCK_DOMAINS = ON;
-	DO_MIN_ANALYSIS = ON;
-	DO_MIN_TIMING = OFF;
-	NUMBER_OF_PATHS_TO_REPORT = 200;
-	NUMBER_OF_DESTINATION_TO_REPORT = 10;
-	NUMBER_OF_SOURCES_PER_DESTINATION_TO_REPORT = 10;
-	MAX_SCC_SIZE = 50;
-}
-HDL_SETTINGS
-{
-	VERILOG_INPUT_VERSION = VERILOG_2001;
-	ENABLE_IP_DEBUG = OFF;
-	VHDL_INPUT_VERSION = VHDL93;
-	VHDL_SHOW_LMF_MAPPING_MESSAGES = OFF;
-}
-PROJECT_INFO(usrp_gpio)
-{
-	ORIGINAL_QUARTUS_VERSION = 3.0;
-	PROJECT_CREATION_TIME_DATE = "00:14:04  JULY 13, 2003";
-	LAST_QUARTUS_VERSION = 3.0;
-	SHOW_REGISTRATION_MESSAGE = ON;
-	USER_LIBRARIES = "e:\usrp\fpga\megacells";
-}
-THIRD_PARTY_EDA_TOOLS(usrp_gpio)
-{
-	EDA_DESIGN_ENTRY_SYNTHESIS_TOOL = "<NONE>";
-	EDA_SIMULATION_TOOL = "<NONE>";
-	EDA_TIMING_ANALYSIS_TOOL = "<NONE>";
-	EDA_BOARD_DESIGN_TOOL = "<NONE>";
-	EDA_FORMAL_VERIFICATION_TOOL = "<NONE>";
-	EDA_RESYNTHESIS_TOOL = "<NONE>";
-}
-EDA_TOOL_SETTINGS(eda_design_synthesis)
-{
-	EDA_INPUT_GND_NAME = GND;
-	EDA_INPUT_VCC_NAME = VCC;
-	EDA_SHOW_LMF_MAPPING_MESSAGES = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_INPUT_DATA_FORMAT = EDIF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_simulation)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_timing_analysis)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	EDA_LAUNCH_CMD_LINE_TOOL = OFF;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_board_design)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_formal_verification)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_palace)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	RESYNTHESIS_RETIMING = FULL;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-}
-CLOCK(clk_120mhz)
-{
-	FMAX_REQUIREMENT = "120.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(usbclk)
-{
-	FMAX_REQUIREMENT = "48.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(SCLK)
-{
-	FMAX_REQUIREMENT = "1.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(adclk0)
-{
-	FMAX_REQUIREMENT = "60.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(adclk1)
-{
-	FMAX_REQUIREMENT = "60.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
diff --git a/gr-gpio/src/fpga/top/usrp_gpio.qpf b/gr-gpio/src/fpga/top/usrp_gpio.qpf
deleted file mode 100644
index 7eb8da9eb..000000000
--- a/gr-gpio/src/fpga/top/usrp_gpio.qpf
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 1991-2004 Altera Corporation
-# Any  megafunction  design,  and related netlist (encrypted  or  decrypted),
-# support information,  device programming or simulation file,  and any other
-# associated  documentation or information  provided by  Altera  or a partner
-# under  Altera's   Megafunction   Partnership   Program  may  be  used  only
-# to program  PLD  devices (but not masked  PLD  devices) from  Altera.   Any
-# other  use  of such  megafunction  design,  netlist,  support  information,
-# device programming or simulation file,  or any other  related documentation
-# or information  is prohibited  for  any  other purpose,  including, but not
-# limited to  modification,  reverse engineering,  de-compiling, or use  with
-# any other  silicon devices,  unless such use is  explicitly  licensed under
-# a separate agreement with  Altera  or a megafunction partner.  Title to the
-# intellectual property,  including patents,  copyrights,  trademarks,  trade
-# secrets,  or maskworks,  embodied in any such megafunction design, netlist,
-# support  information,  device programming or simulation file,  or any other
-# related documentation or information provided by  Altera  or a megafunction
-# partner, remains with Altera, the megafunction partner, or their respective
-# licensors. No other licenses, including any licenses needed under any third
-# party's intellectual property, are provided herein.
-
-
-
-QUARTUS_VERSION = "4.0"
-DATE = "17:10:11  December 20, 2004"
-
-
-# Active Revisions
-
-PROJECT_REVISION = "usrp_gpio"
diff --git a/gr-gpio/src/fpga/top/usrp_gpio.qsf b/gr-gpio/src/fpga/top/usrp_gpio.qsf
deleted file mode 100644
index cfdcd552b..000000000
--- a/gr-gpio/src/fpga/top/usrp_gpio.qsf
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright (C) 1991-2005 Altera Corporation

-# Your use of Altera Corporation's design tools, logic functions 

-# and other software and tools, and its AMPP partner logic       

-# functions, and any output files any of the foregoing           

-# (including device programming or simulation files), and any    

-# associated documentation or information are expressly subject  

-# to the terms and conditions of the Altera Program License      

-# Subscription Agreement, Altera MegaCore Function License       

-# Agreement, or other applicable license agreement, including,   

-# without limitation, that your use is for the sole purpose of   

-# programming logic devices manufactured by Altera and sold by   

-# Altera or its authorized distributors.  Please refer to the    

-# applicable agreement for further details.

-

-

-# The default values for assignments are stored in the file

-#		usrp_gpio_assignment_defaults.qdf

-# If this file doesn't exist, and for assignments not listed, see file

-#		assignment_defaults.qdf

-

-# Altera recommends that you do not modify this file. This

-# file is updated automatically by the Quartus II software

-# and any changes you make may be lost or overwritten.

-

-

-# Project-Wide Assignments

-# ========================

-set_global_assignment -name ORIGINAL_QUARTUS_VERSION 3.0

-set_global_assignment -name PROJECT_CREATION_TIME_DATE "00:14:04  JULY 13, 2003"

-set_global_assignment -name LAST_QUARTUS_VERSION "7.1 SP1"

-

-# Pin & Location Assignments

-# ==========================

-set_global_assignment -name RESERVE_PIN "AS INPUT TRI-STATED"

-set_location_assignment PIN_29 -to SCLK

-set_location_assignment PIN_117 -to SDI

-set_location_assignment PIN_28 -to usbclk

-set_location_assignment PIN_107 -to usbctl[0]

-set_location_assignment PIN_106 -to usbctl[1]

-set_location_assignment PIN_105 -to usbctl[2]

-set_location_assignment PIN_100 -to usbdata[0]

-set_location_assignment PIN_84 -to usbdata[10]

-set_location_assignment PIN_83 -to usbdata[11]

-set_location_assignment PIN_82 -to usbdata[12]

-set_location_assignment PIN_79 -to usbdata[13]

-set_location_assignment PIN_78 -to usbdata[14]

-set_location_assignment PIN_77 -to usbdata[15]

-set_location_assignment PIN_99 -to usbdata[1]

-set_location_assignment PIN_98 -to usbdata[2]

-set_location_assignment PIN_95 -to usbdata[3]

-set_location_assignment PIN_94 -to usbdata[4]

-set_location_assignment PIN_93 -to usbdata[5]

-set_location_assignment PIN_88 -to usbdata[6]

-set_location_assignment PIN_87 -to usbdata[7]

-set_location_assignment PIN_86 -to usbdata[8]

-set_location_assignment PIN_85 -to usbdata[9]

-set_location_assignment PIN_104 -to usbrdy[0]

-set_location_assignment PIN_101 -to usbrdy[1]

-set_location_assignment PIN_76 -to FX2_1

-set_location_assignment PIN_75 -to FX2_2

-set_location_assignment PIN_74 -to FX2_3

-set_location_assignment PIN_116 -to io_rx_a[0]

-set_location_assignment PIN_115 -to io_rx_a[1]

-set_location_assignment PIN_114 -to io_rx_a[2]

-set_location_assignment PIN_113 -to io_rx_a[3]

-set_location_assignment PIN_108 -to io_rx_a[4]

-set_location_assignment PIN_195 -to io_rx_a[5]

-set_location_assignment PIN_196 -to io_rx_a[6]

-set_location_assignment PIN_197 -to io_rx_a[7]

-set_location_assignment PIN_200 -to io_rx_a[8]

-set_location_assignment PIN_201 -to io_rx_a[9]

-set_location_assignment PIN_202 -to io_rx_a[10]

-set_location_assignment PIN_203 -to io_rx_a[11]

-set_location_assignment PIN_206 -to io_rx_a[12]

-set_location_assignment PIN_207 -to io_rx_a[13]

-set_location_assignment PIN_208 -to io_rx_a[14]

-set_location_assignment PIN_214 -to io_rx_b[0]

-set_location_assignment PIN_215 -to io_rx_b[1]

-set_location_assignment PIN_216 -to io_rx_b[2]

-set_location_assignment PIN_217 -to io_rx_b[3]

-set_location_assignment PIN_218 -to io_rx_b[4]

-set_location_assignment PIN_219 -to io_rx_b[5]

-set_location_assignment PIN_222 -to io_rx_b[6]

-set_location_assignment PIN_223 -to io_rx_b[7]

-set_location_assignment PIN_224 -to io_rx_b[8]

-set_location_assignment PIN_225 -to io_rx_b[9]

-set_location_assignment PIN_226 -to io_rx_b[10]

-set_location_assignment PIN_227 -to io_rx_b[11]

-set_location_assignment PIN_228 -to io_rx_b[12]

-set_location_assignment PIN_233 -to io_rx_b[13]

-set_location_assignment PIN_234 -to io_rx_b[14]

-set_location_assignment PIN_175 -to io_tx_a[0]

-set_location_assignment PIN_176 -to io_tx_a[1]

-set_location_assignment PIN_177 -to io_tx_a[2]

-set_location_assignment PIN_178 -to io_tx_a[3]

-set_location_assignment PIN_179 -to io_tx_a[4]

-set_location_assignment PIN_180 -to io_tx_a[5]

-set_location_assignment PIN_181 -to io_tx_a[6]

-set_location_assignment PIN_182 -to io_tx_a[7]

-set_location_assignment PIN_183 -to io_tx_a[8]

-set_location_assignment PIN_184 -to io_tx_a[9]

-set_location_assignment PIN_185 -to io_tx_a[10]

-set_location_assignment PIN_186 -to io_tx_a[11]

-set_location_assignment PIN_187 -to io_tx_a[12]

-set_location_assignment PIN_188 -to io_tx_a[13]

-set_location_assignment PIN_193 -to io_tx_a[14]

-set_location_assignment PIN_73 -to io_tx_b[0]

-set_location_assignment PIN_68 -to io_tx_b[1]

-set_location_assignment PIN_67 -to io_tx_b[2]

-set_location_assignment PIN_66 -to io_tx_b[3]

-set_location_assignment PIN_65 -to io_tx_b[4]

-set_location_assignment PIN_64 -to io_tx_b[5]

-set_location_assignment PIN_63 -to io_tx_b[6]

-set_location_assignment PIN_62 -to io_tx_b[7]

-set_location_assignment PIN_61 -to io_tx_b[8]

-set_location_assignment PIN_60 -to io_tx_b[9]

-set_location_assignment PIN_59 -to io_tx_b[10]

-set_location_assignment PIN_58 -to io_tx_b[11]

-set_location_assignment PIN_57 -to io_tx_b[12]

-set_location_assignment PIN_56 -to io_tx_b[13]

-set_location_assignment PIN_55 -to io_tx_b[14]

-set_location_assignment PIN_152 -to master_clk

-set_location_assignment PIN_144 -to rx_a_a[0]

-set_location_assignment PIN_143 -to rx_a_a[1]

-set_location_assignment PIN_141 -to rx_a_a[2]

-set_location_assignment PIN_140 -to rx_a_a[3]

-set_location_assignment PIN_139 -to rx_a_a[4]

-set_location_assignment PIN_138 -to rx_a_a[5]

-set_location_assignment PIN_137 -to rx_a_a[6]

-set_location_assignment PIN_136 -to rx_a_a[7]

-set_location_assignment PIN_135 -to rx_a_a[8]

-set_location_assignment PIN_134 -to rx_a_a[9]

-set_location_assignment PIN_133 -to rx_a_a[10]

-set_location_assignment PIN_132 -to rx_a_a[11]

-set_location_assignment PIN_23 -to rx_a_b[0]

-set_location_assignment PIN_21 -to rx_a_b[1]

-set_location_assignment PIN_20 -to rx_a_b[2]

-set_location_assignment PIN_19 -to rx_a_b[3]

-set_location_assignment PIN_18 -to rx_a_b[4]

-set_location_assignment PIN_17 -to rx_a_b[5]

-set_location_assignment PIN_16 -to rx_a_b[6]

-set_location_assignment PIN_15 -to rx_a_b[7]

-set_location_assignment PIN_14 -to rx_a_b[8]

-set_location_assignment PIN_13 -to rx_a_b[9]

-set_location_assignment PIN_12 -to rx_a_b[10]

-set_location_assignment PIN_11 -to rx_a_b[11]

-set_location_assignment PIN_131 -to rx_b_a[0]

-set_location_assignment PIN_128 -to rx_b_a[1]

-set_location_assignment PIN_127 -to rx_b_a[2]

-set_location_assignment PIN_126 -to rx_b_a[3]

-set_location_assignment PIN_125 -to rx_b_a[4]

-set_location_assignment PIN_124 -to rx_b_a[5]

-set_location_assignment PIN_123 -to rx_b_a[6]

-set_location_assignment PIN_122 -to rx_b_a[7]

-set_location_assignment PIN_121 -to rx_b_a[8]

-set_location_assignment PIN_120 -to rx_b_a[9]

-set_location_assignment PIN_119 -to rx_b_a[10]

-set_location_assignment PIN_118 -to rx_b_a[11]

-set_location_assignment PIN_8 -to rx_b_b[0]

-set_location_assignment PIN_7 -to rx_b_b[1]

-set_location_assignment PIN_6 -to rx_b_b[2]

-set_location_assignment PIN_5 -to rx_b_b[3]

-set_location_assignment PIN_4 -to rx_b_b[4]

-set_location_assignment PIN_3 -to rx_b_b[5]

-set_location_assignment PIN_2 -to rx_b_b[6]

-set_location_assignment PIN_240 -to rx_b_b[7]

-set_location_assignment PIN_239 -to rx_b_b[8]

-set_location_assignment PIN_238 -to rx_b_b[9]

-set_location_assignment PIN_237 -to rx_b_b[10]

-set_location_assignment PIN_236 -to rx_b_b[11]

-set_location_assignment PIN_156 -to SDO

-set_location_assignment PIN_153 -to SEN_FPGA

-set_location_assignment PIN_159 -to tx_a[0]

-set_location_assignment PIN_160 -to tx_a[1]

-set_location_assignment PIN_161 -to tx_a[2]

-set_location_assignment PIN_162 -to tx_a[3]

-set_location_assignment PIN_163 -to tx_a[4]

-set_location_assignment PIN_164 -to tx_a[5]

-set_location_assignment PIN_165 -to tx_a[6]

-set_location_assignment PIN_166 -to tx_a[7]

-set_location_assignment PIN_167 -to tx_a[8]

-set_location_assignment PIN_168 -to tx_a[9]

-set_location_assignment PIN_169 -to tx_a[10]

-set_location_assignment PIN_170 -to tx_a[11]

-set_location_assignment PIN_173 -to tx_a[12]

-set_location_assignment PIN_174 -to tx_a[13]

-set_location_assignment PIN_38 -to tx_b[0]

-set_location_assignment PIN_39 -to tx_b[1]

-set_location_assignment PIN_41 -to tx_b[2]

-set_location_assignment PIN_42 -to tx_b[3]

-set_location_assignment PIN_43 -to tx_b[4]

-set_location_assignment PIN_44 -to tx_b[5]

-set_location_assignment PIN_45 -to tx_b[6]

-set_location_assignment PIN_46 -to tx_b[7]

-set_location_assignment PIN_47 -to tx_b[8]

-set_location_assignment PIN_48 -to tx_b[9]

-set_location_assignment PIN_49 -to tx_b[10]

-set_location_assignment PIN_50 -to tx_b[11]

-set_location_assignment PIN_53 -to tx_b[12]

-set_location_assignment PIN_54 -to tx_b[13]

-set_location_assignment PIN_158 -to TXSYNC_A

-set_location_assignment PIN_37 -to TXSYNC_B

-set_location_assignment PIN_235 -to io_rx_b[15]

-set_location_assignment PIN_24 -to io_tx_b[15]

-set_location_assignment PIN_213 -to io_rx_a[15]

-set_location_assignment PIN_194 -to io_tx_a[15]

-set_location_assignment PIN_1 -to MYSTERY_SIGNAL

-

-# Timing Assignments

-# ==================

-set_global_assignment -name INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS OFF

-

-# Analysis & Synthesis Assignments

-# ================================

-set_global_assignment -name SAVE_DISK_SPACE OFF

-set_global_assignment -name DEVICE_FILTER_PACKAGE "ANY QFP"

-set_global_assignment -name DEVICE_FILTER_PIN_COUNT 240

-set_global_assignment -name EDA_DESIGN_ENTRY_SYNTHESIS_TOOL "<None>"

-set_global_assignment -name FAMILY Cyclone

-set_global_assignment -name CYCLONE_OPTIMIZATION_TECHNIQUE BALANCED

-set_global_assignment -name STRATIX_OPTIMIZATION_TECHNIQUE SPEED

-set_global_assignment -name APEX20K_OPTIMIZATION_TECHNIQUE SPEED

-set_global_assignment -name TOP_LEVEL_ENTITY usrp_gpio

-set_global_assignment -name VHDL_SHOW_LMF_MAPPING_MESSAGES OFF

-set_global_assignment -name USER_LIBRARIES "e:\\usrp\\fpga\\megacells"

-set_global_assignment -name AUTO_ENABLE_SMART_COMPILE ON

-

-# Fitter Assignments

-# ==================

-set_global_assignment -name DEVICE EP1C12Q240C8

-set_global_assignment -name CYCLONE_CONFIGURATION_SCHEME "PASSIVE SERIAL"

-set_global_assignment -name RESERVE_ALL_UNUSED_PINS "AS INPUT TRI-STATED"

-set_global_assignment -name OPTIMIZE_HOLD_TIMING OFF

-set_global_assignment -name OPTIMIZE_TIMING "NORMAL COMPILATION"

-set_global_assignment -name PHYSICAL_SYNTHESIS_COMBO_LOGIC OFF

-set_global_assignment -name PHYSICAL_SYNTHESIS_REGISTER_DUPLICATION OFF

-set_global_assignment -name PHYSICAL_SYNTHESIS_REGISTER_RETIMING OFF

-set_global_assignment -name IO_PLACEMENT_OPTIMIZATION OFF

-set_global_assignment -name PHYSICAL_SYNTHESIS_EFFORT NORMAL

-set_global_assignment -name INC_PLC_MODE OFF

-set_global_assignment -name ROUTING_BACK_ANNOTATION_MODE OFF

-set_instance_assignment -name IO_STANDARD LVTTL -to usbdata[12]

-set_global_assignment -name STRATIX_DEVICE_IO_STANDARD LVTTL

-set_global_assignment -name ERROR_CHECK_FREQUENCY_DIVISOR 1

-

-# Timing Analysis Assignments

-# ===========================

-set_global_assignment -name MAX_SCC_SIZE 50

-

-# EDA Netlist Writer Assignments

-# ==============================

-set_global_assignment -name EDA_SIMULATION_TOOL "<None>"

-set_global_assignment -name EDA_TIMING_ANALYSIS_TOOL "<NONE>"

-set_global_assignment -name EDA_BOARD_DESIGN_TOOL "<NONE>"

-set_global_assignment -name EDA_FORMAL_VERIFICATION_TOOL "<NONE>"

-set_global_assignment -name EDA_RESYNTHESIS_TOOL "<NONE>"

-

-# Assembler Assignments

-# =====================

-set_global_assignment -name USE_CONFIGURATION_DEVICE OFF

-set_global_assignment -name GENERATE_RBF_FILE ON

-set_global_assignment -name RESERVE_ALL_UNUSED_PINS_NO_OUTPUT_GND "AS INPUT TRI-STATED"

-set_global_assignment -name AUTO_RESTART_CONFIGURATION OFF

-

-# Simulator Assignments

-# =====================

-set_global_assignment -name START_TIME "0 ns"

-set_global_assignment -name GLITCH_INTERVAL "1 ns"

-

-# Design Assistant Assignments

-# ============================

-set_global_assignment -name DRC_REPORT_TOP_FANOUT OFF

-set_global_assignment -name DRC_REPORT_FANOUT_EXCEEDING OFF

-set_global_assignment -name ASSG_CAT OFF

-set_global_assignment -name ASSG_RULE_MISSING_FMAX OFF

-set_global_assignment -name ASSG_RULE_MISSING_TIMING OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_ASYN_RAM OFF

-set_global_assignment -name CLK_CAT OFF

-set_global_assignment -name CLK_RULE_COMB_CLOCK OFF

-set_global_assignment -name CLK_RULE_INV_CLOCK OFF

-set_global_assignment -name CLK_RULE_GATING_SCHEME OFF

-set_global_assignment -name CLK_RULE_INPINS_CLKNET OFF

-set_global_assignment -name CLK_RULE_CLKNET_CLKSPINES OFF

-set_global_assignment -name CLK_RULE_MIX_EDGES OFF

-set_global_assignment -name RESET_CAT OFF

-set_global_assignment -name RESET_RULE_INPINS_RESETNET OFF

-set_global_assignment -name RESET_RULE_UNSYNCH_EXRESET OFF

-set_global_assignment -name RESET_RULE_IMSYNCH_EXRESET OFF

-set_global_assignment -name RESET_RULE_COMB_ASYNCH_RESET OFF

-set_global_assignment -name RESET_RULE_UNSYNCH_ASYNCH_DOMAIN OFF

-set_global_assignment -name RESET_RULE_IMSYNCH_ASYNCH_DOMAIN OFF

-set_global_assignment -name TIMING_CAT OFF

-set_global_assignment -name TIMING_RULE_SHIFT_REG OFF

-set_global_assignment -name TIMING_RULE_COIN_CLKEDGE OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_COMB_DRIVES_RAM_WE OFF

-set_global_assignment -name NONSYNCHSTRUCT_CAT OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_COMBLOOP OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_REG_LOOP OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_DELAY_CHAIN OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_RIPPLE_CLK OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_ILLEGAL_PULSE_GEN OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_MULTI_VIBRATOR OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_SRLATCH OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_LATCH_UNIDENTIFIED OFF

-set_global_assignment -name SIGNALRACE_CAT OFF

-set_global_assignment -name ACLK_CAT OFF

-set_global_assignment -name ACLK_RULE_NO_SZER_ACLK_DOMAIN OFF

-set_global_assignment -name ACLK_RULE_SZER_BTW_ACLK_DOMAIN OFF

-set_global_assignment -name ACLK_RULE_IMSZER_ADOMAIN OFF

-set_global_assignment -name HCPY_CAT OFF

-set_global_assignment -name HCPY_VREF_PINS OFF

-

-# SignalTap II Assignments

-# ========================

-set_global_assignment -name HUB_ENTITY_NAME SLD_HUB

-set_global_assignment -name HUB_INSTANCE_NAME SLD_HUB_INST

-set_global_assignment -name ENABLE_SIGNALTAP OFF

-

-# LogicLock Region Assignments

-# ============================

-set_global_assignment -name LOGICLOCK_INCREMENTAL_COMPILE_ASSIGNMENT OFF

-

-# -----------------

-# start CLOCK(SCLK)

-

-	# Timing Assignments

-	# ==================

-set_global_assignment -name DUTY_CYCLE 50 -section_id SCLK

-set_global_assignment -name FMAX_REQUIREMENT "1 MHz" -section_id SCLK

-set_global_assignment -name INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS OFF -section_id SCLK

-

-# end CLOCK(SCLK)

-# ---------------

-

-# -----------------------

-# start CLOCK(master_clk)

-

-	# Timing Assignments

-	# ==================

-set_global_assignment -name DUTY_CYCLE 50 -section_id master_clk

-set_global_assignment -name FMAX_REQUIREMENT "64 MHz" -section_id master_clk

-set_global_assignment -name INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS OFF -section_id master_clk

-

-# end CLOCK(master_clk)

-# ---------------------

-

-# -------------------

-# start CLOCK(usbclk)

-

-	# Timing Assignments

-	# ==================

-set_global_assignment -name DUTY_CYCLE 50 -section_id usbclk

-set_global_assignment -name FMAX_REQUIREMENT "48 MHz" -section_id usbclk

-set_global_assignment -name INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS OFF -section_id usbclk

-

-# end CLOCK(usbclk)

-# -----------------

-

-# ----------------------

-# start ENTITY(usrp_gpio)

-

-	# Timing Assignments

-	# ==================

-set_instance_assignment -name CLOCK_SETTINGS SCLK -to SCLK

-set_instance_assignment -name CLOCK_SETTINGS usbclk -to usbclk

-set_instance_assignment -name CLOCK_SETTINGS master_clk -to master_clk

-

-# end ENTITY(usrp_gpio)

-# --------------------

-

-set_instance_assignment -name PARTITION_HIERARCHY no_file_for_top_partition -to | -section_id Top

-set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top

-set_global_assignment -name VERILOG_FILE usrp_gpio.v

-set_global_assignment -name VERILOG_FILE ../lib/gpio_input.v

-set_global_assignment -name VERILOG_FILE ../lib/io_pins.v

-set_global_assignment -name VERILOG_FILE ../lib/rx_chain_dig.v

-set_global_assignment -name VERILOG_FILE ../lib/tx_chain_dig.v

-set_global_assignment -name VERILOG_FILE ../lib/integrator.v

-set_global_assignment -name VERILOG_FILE ../lib/integ_shifter.v

-set_global_assignment -name VERILOG_FILE ../lib/rx_chain.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/atr_delay.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/cic_dec_shifter.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rssi.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/ram16.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/megacells/fifo_4k.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/megacells/bustri.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/megacells/fifo_4k_18.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/hb/acc.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/hb/mult.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/hb/ram16_2sum.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/hb/coeff_rom.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/hb/halfband_decim.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/hb/mac.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/tx_chain.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rx_dcoffset.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/adc_interface.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/setting_reg.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/bidir_reg.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/cic_int_shifter.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/gen_sync.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/master_control.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rx_buffer.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/tx_buffer.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/phase_acc.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/cic_interp.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/cic_decim.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/cordic_stage.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/cordic.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/clk_divider.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/serial_io.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/strobe_gen.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/sign_extend.v
\ No newline at end of file
diff --git a/gr-gpio/src/fpga/top/usrp_gpio.v b/gr-gpio/src/fpga/top/usrp_gpio.v
deleted file mode 100644
index 50a0dbe64..000000000
--- a/gr-gpio/src/fpga/top/usrp_gpio.v
+++ /dev/null
@@ -1,467 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2003,2004 Matt Ettus
-//  Copyright (C) 2008 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-// Top level module for a full setup with DUCs and DDCs
-
-// Define DEBUG_OWNS_IO_PINS if we're using the daughterboard i/o pins
-// for debugging info.  NB, This can kill the m'board and/or d'board if you
-// have anything except basic d'boards installed.
-
-// Uncomment the following to include optional circuitry
-
-`include "../top/config.vh"
-`include "../../../../usrp/firmware/include/fpga_regs_common.v"
-`include "../../../../usrp/firmware/include/fpga_regs_standard.v"
-
-module usrp_gpio
-(output MYSTERY_SIGNAL,
- input master_clk,
- input SCLK,
- input SDI,
- inout SDO,
- input SEN_FPGA,
-
- input FX2_1,
- output FX2_2,
- output FX2_3,
- 
- input wire [11:0] rx_a_a,
- input wire [11:0] rx_b_a,
- input wire [11:0] rx_a_b,
- input wire [11:0] rx_b_b,
-
- output wire [13:0] tx_a,
- output wire [13:0] tx_b,
-
- output wire TXSYNC_A,
- output wire TXSYNC_B,
- 
-  // USB interface
- input usbclk,
- input wire [2:0] usbctl,
- output wire [1:0] usbrdy,
- inout [15:0] usbdata,  // NB Careful, inout
-
- // These are the general purpose i/o's that go to the daughterboard slots
- inout wire [15:0] io_tx_a,
- inout wire [15:0] io_tx_b,
- inout wire [15:0] io_rx_a,
- inout wire [15:0] io_rx_b
- );	
-   wire [15:0] debugdata,debugctrl;
-   assign MYSTERY_SIGNAL = 1'b0;
-   
-   wire clk64,clk128;
-   
-   wire WR = usbctl[0];
-   wire RD = usbctl[1];
-   wire OE = usbctl[2];
-
-   wire have_space, have_pkt_rdy;
-   assign usbrdy[0] = have_space;
-   assign usbrdy[1] = have_pkt_rdy;
-
-   wire   tx_underrun, rx_overrun;    
-   wire   clear_status = FX2_1;
-   assign FX2_2 = rx_overrun;
-   assign FX2_3 = tx_underrun;
-      
-   wire [15:0] usbdata_out;
-   
-   wire [3:0]  dac0mux,dac1mux,dac2mux,dac3mux;
-   
-   wire        tx_realsignals;
-   wire [3:0]  rx_numchan;
-   wire [2:0]  tx_numchan;
-   
-   wire [7:0]  interp_rate, decim_rate;
-   wire [31:0] tx_debugbus, rx_debugbus;
-   
-   wire        enable_tx, enable_rx;
-   wire        tx_dsp_reset, rx_dsp_reset, tx_bus_reset, rx_bus_reset;
-   wire [7:0]  settings;
-   
-   // Tri-state bus macro
-   bustri bustri( .data(usbdata_out),.enabledt(OE),.tridata(usbdata) );
-
-   assign      clk64 = master_clk;
-
-   wire [15:0] ch0tx,ch1tx,ch2tx,ch3tx; //,ch4tx,ch5tx,ch6tx,ch7tx;
-   wire [15:0] ch0rx,ch1rx,ch2rx,ch3rx,ch4rx,ch5rx,ch6rx,ch7rx;
-   wire [15:0] ch0rx_ext,ch1rx_ext;  
- 
-   // TX
-   wire [15:0] i_out_0,i_out_1,q_out_0,q_out_1;//analog signals
-   wire [15:0] bb_tx_i0,bb_tx_q0,bb_tx_i1,bb_tx_q1;  // bb_tx_i2,bb_tx_q2,bb_tx_i3,bb_tx_q3;
-   
-   wire        strobe_interp, tx_sample_strobe;
-   wire        tx_empty;
-   
-   wire        serial_strobe;
-   wire [6:0]  serial_addr;
-   wire [31:0] serial_data;
-
-   reg [15:0] debug_counter;
-   reg [15:0] loopback_i_0,loopback_q_0;
-
-  //TX_DIG streaming digital IO signals
-   wire i_out_dig_0,i_out_dig_1,q_out_dig_0,q_out_dig_1;
-   wire rx_dig0_i, rx_dig0_q,rx_dig1_i,rx_dig1_q;
-   
-   ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Transmit Side
-`ifdef TX_ON
-   
-   tx_buffer tx_buffer
-     ( .usbclk(usbclk), .bus_reset(tx_bus_reset),
-       .usbdata(usbdata),.WR(WR), .have_space(have_space),
-       .tx_underrun(tx_underrun), .clear_status(clear_status),
-       .txclk(clk64), .reset(tx_dsp_reset),
-       .channels({tx_numchan,1'b0}),
-       .tx_i_0(ch0tx),.tx_q_0(ch1tx),
-       .tx_i_1(ch2tx),.tx_q_1(ch3tx),
-       .txstrobe(strobe_interp),
-       .tx_empty(tx_empty),
-       .debugbus(tx_debugbus) );
-   
- `ifdef TX_EN_0
-   tx_chain tx_chain_0
-     ( .clock(clk64),.reset(tx_dsp_reset),.enable(enable_tx),
-       .interp_rate(interp_rate),.sample_strobe(tx_sample_strobe),
-       .interpolator_strobe(strobe_interp),.freq(),
-       .i_in(bb_tx_i0),.q_in(bb_tx_q0),.i_out(i_out_0),.q_out(q_out_0));
- `else
-   assign      i_out_0=16'd0;
-   assign      q_out_0=16'd0;
- `endif
-
- `ifdef TX_EN_1
-   tx_chain tx_chain_1
-     ( .clock(clk64),.reset(tx_dsp_reset),.enable(enable_tx),
-       .interp_rate(interp_rate),.sample_strobe(tx_sample_strobe),
-       .interpolator_strobe(strobe_interp),.freq(),
-       .i_in(bb_tx_i1),.q_in(bb_tx_q1),.i_out(i_out_1),.q_out(q_out_1) );
- `else
-   assign      i_out_1=16'd0;
-   assign      q_out_1=16'd0;
- `endif
-
-
-
-   setting_reg #(`FR_TX_MUX) 
-     sr_txmux(.clock(clk64),.reset(tx_dsp_reset),.strobe(serial_strobe),.addr(serial_addr),.in(serial_data),
-	      .out({dac3mux,dac2mux,dac1mux,dac0mux,tx_realsignals,tx_numchan}));
-   
-   wire [15:0] tx_a_a = dac0mux[3] ? (dac0mux[1] ? (dac0mux[0] ? q_out_1 : i_out_1) : (dac0mux[0] ? q_out_0 : i_out_0)) : 16'b0;
-   wire [15:0] tx_b_a = dac1mux[3] ? (dac1mux[1] ? (dac1mux[0] ? q_out_1 : i_out_1) : (dac1mux[0] ? q_out_0 : i_out_0)) : 16'b0;
-   wire [15:0] tx_a_b = dac2mux[3] ? (dac2mux[1] ? (dac2mux[0] ? q_out_1 : i_out_1) : (dac2mux[0] ? q_out_0 : i_out_0)) : 16'b0;
-   wire [15:0] tx_b_b = dac3mux[3] ? (dac3mux[1] ? (dac3mux[0] ? q_out_1 : i_out_1) : (dac3mux[0] ? q_out_0 : i_out_0)) : 16'b0;
-
-   wire  tx_dig_a_a = (dac0mux[1] ? (dac0mux[0] ? q_out_dig_1 : i_out_dig_1) : (dac0mux[0] ? q_out_dig_0 : i_out_dig_0));
-   wire  tx_dig_b_a = (dac1mux[1] ? (dac1mux[0] ? q_out_dig_1 : i_out_dig_1) : (dac1mux[0] ? q_out_dig_0 : i_out_dig_0));
-   wire  tx_dig_a_b = (dac2mux[1] ? (dac2mux[0] ? q_out_dig_1 : i_out_dig_1) : (dac2mux[0] ? q_out_dig_0 : i_out_dig_0));
-   wire  tx_dig_b_b = (dac3mux[1] ? (dac3mux[0] ? q_out_dig_1 : i_out_dig_1) : (dac3mux[0] ? q_out_dig_0 : i_out_dig_0));
-
-   //wire [1:0] tx_dig_a = {tx_dig_a_a,tx_dig_b_a};
-   //wire [1:0] tx_dig_b = {tx_dig_a_b,tx_dig_b_b};
-
-   //wire tx_dig_a_chan = (dac0mux[1] | dac1mux[1] );
-   //wire tx_dig_b_chan = (dac2mux[1] | dac3mux[1] );
-
-   //TODO make enabling tx_dig configurable through register
- 
-   wire enable_tx_dig_a = 1'b1 & enable_tx;
-   wire enable_tx_dig_b = 1'b1 & enable_tx;
-
-   wire tx_dig_a_a_en = dac0mux[3] & enable_tx_dig_a;
-   wire tx_dig_b_a_en = dac1mux[3] & enable_tx_dig_a;
-   wire tx_dig_a_b_en = dac2mux[3] & enable_tx_dig_b;
-   wire tx_dig_b_b_en = dac3mux[3] & enable_tx_dig_b;
-
-  //TODO make gpio bits used for tx_dig configurable through register
-   assign io_tx_a_out = {tx_dig_a_a_en?tx_dig_a_a:reg_0[15],tx_dig_b_a_en?tx_dig_b_a:reg_0[14],reg_0[13:0]};
-   assign io_tx_b_out = {tx_dig_a_b_en?tx_dig_a_b:reg_2[15],tx_dig_b_b_en?tx_dig_b_b:reg_2[14],reg_2[13:0]};
-   assign io_tx_a_force_output = {tx_dig_a_a_en,tx_dig_b_a_en,14'b0};
-   assign io_tx_b_force_output = {tx_dig_a_b_en,tx_dig_b_b_en,14'b0};
-
-
- `ifdef TX_EN_DIG_0
-   //TODO make enabling tx_dig configurable through register
-   //tx_chain_dig tx_chain_dig_0
-   //  ( .clock(clk64),.reset(tx_dsp_reset),.enable(enable_tx),
-   //    .i_in(ch0tx), q_in(ch1tx),
-   //    .i_out_ana(bb_tx_i0),
-   //    .q_out_ana(bb_tx_q0),
-   //    .i_out_dig(i_out_dig_0),
-   //    .q_out_dig(q_out_dig_0)
-   //   );
-   tx_chain_dig tx_chain_dig_0
-     ( .clock(clk64),.reset(tx_dsp_reset),.enable(enable_tx),
-       .i_in(ch0tx),.q_in(ch1tx),
-       .i_out_ana(bb_tx_i0),.q_out_ana(bb_tx_q0),
-       .i_out_dig(i_out_dig_0),.q_out_dig(q_out_dig_0));
- `else
-   assign      bb_tx_i0 = ch0tx;
-   assign      bb_tx_q0 = ch1tx;
-   assign      i_out_dig_0=1'b0;
-   assign      q_out_dig_0=1'b0;
- `endif
-
- `ifdef TX_EN_DIG_1
-   //TODO make enabling tx_dig configurable through register
-   tx_chain_dig tx_chain_dig_1
-     ( .clock(clk64),.reset(tx_dsp_reset),.enable(enable_tx),
-       .i_in(ch2tx),.q_in(ch3tx),
-       .i_out_ana(bb_tx_i1),.q_out_ana(bb_tx_q1),
-       .i_out_dig(i_out_dig_1),.q_out_dig(q_out_dig_1));
-//   tx_chain_dig tx_chain_dig_1
-//     ( .clock(clk64),.reset(tx_dsp_reset),.enable(enable_tx),
-//       .i_in(ch2tx), q_in(ch3tx),
-//       .i_out_ana(bb_tx_i1),
-//       .q_out_ana(bb_tx_q1),
-//       .i_out_dig(i_out_dig_1),
-//       .q_out_dig(q_out_dig_1)
-//      );
- `else
-   assign      bb_tx_i1 = ch2tx;
-   assign      bb_tx_q1 = ch3tx;
-   assign      i_out_dig_1=1'b0;
-   assign      q_out_dig_1=1'b0;
- `endif
-
-   wire txsync = tx_sample_strobe;
-   assign TXSYNC_A = txsync;
-   assign TXSYNC_B = txsync;
-
-   assign tx_a = txsync ? tx_b_a[15:2] : tx_a_a[15:2];
-   assign tx_b = txsync ? tx_b_b[15:2] : tx_a_b[15:2];
-`else //  `ifdef TX_ON
-   assign      io_tx_a_out = reg_0;
-   assign      io_tx_b_out = reg_2;
-   assign      io_tx_a_force_output=16'b0;
-   assign      io_tx_b_force_output=16'b0;
-`endif   
-   /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Receive Side
-`ifdef RX_ON
-   wire        rx_sample_strobe,strobe_decim,hb_strobe;
-   wire [15:0] bb_rx_i0,bb_rx_q0,bb_rx_i1,bb_rx_q1,
-	       bb_rx_i2,bb_rx_q2,bb_rx_i3,bb_rx_q3;
-
-   wire loopback = settings[0];
-   wire counter = settings[1];
-
-   always @(posedge clk64)
-     if(rx_dsp_reset)
-       debug_counter <= #1 16'd0;
-     else if(~enable_rx)
-       debug_counter <= #1 16'd0;
-     else if(hb_strobe)
-       debug_counter <=#1 debug_counter + 16'd2;
-   
-   always @(posedge clk64)
-     if(strobe_interp)
-       begin
-	  loopback_i_0 <= #1 ch0tx;
-	  loopback_q_0 <= #1 ch1tx;
-       end
-
-
-   wire [15:0] ddc0_in_i,ddc0_in_q,ddc1_in_i,ddc1_in_q,ddc2_in_i,ddc2_in_q,ddc3_in_i,ddc3_in_q;
-   wire [31:0] rssi_0,rssi_1,rssi_2,rssi_3;
-   
-   adc_interface adc_interface(.clock(clk64),.reset(rx_dsp_reset),.enable(1'b1),
-			       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-			       .rx_a_a(rx_a_a),.rx_b_a(rx_b_a),.rx_a_b(rx_a_b),.rx_b_b(rx_b_b),
-			       .rssi_0(rssi_0),.rssi_1(rssi_1),.rssi_2(rssi_2),.rssi_3(rssi_3),
-			       .ddc0_in_i(ddc0_in_i),.ddc0_in_q(ddc0_in_q),
-			       .ddc1_in_i(ddc1_in_i),.ddc1_in_q(ddc1_in_q),
-			       .ddc2_in_i(ddc2_in_i),.ddc2_in_q(ddc2_in_q),
-			       .ddc3_in_i(ddc3_in_i),.ddc3_in_q(ddc3_in_q),.rx_numchan(rx_numchan) );
-   
-   rx_buffer rx_buffer
-     ( .usbclk(usbclk),.bus_reset(rx_bus_reset),.reset(rx_dsp_reset),
-       .reset_regs(rx_dsp_reset),
-       .usbdata(usbdata_out),.RD(RD),.have_pkt_rdy(have_pkt_rdy),.rx_overrun(rx_overrun),
-       .channels(rx_numchan),
-       .ch_0(ch0rx_ext),.ch_1(ch1rx_ext),
-       .ch_2(ch2rx),.ch_3(ch3rx),
-       .ch_4(ch4rx),.ch_5(ch5rx),
-       .ch_6(ch6rx),.ch_7(ch7rx),
-       .rxclk(clk64),.rxstrobe(hb_strobe),
-       .clear_status(clear_status),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .debugbus(rx_debugbus) );
-   
- `ifdef RX_EN_0
-   rx_chain #(`FR_RX_FREQ_0,`FR_RX_PHASE_0) rx_chain_0
-     ( .clock(clk64),.reset(1'b0),.enable(enable_rx),
-       .decim_rate(decim_rate),.sample_strobe(rx_sample_strobe),.decimator_strobe(strobe_decim),.hb_strobe(hb_strobe),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .i_in(ddc0_in_i),.q_in(ddc0_in_q),.i_out(bb_rx_i0),.q_out(bb_rx_q0),.debugdata(debugdata),.debugctrl(debugctrl));
- `else
-   assign      bb_rx_i0=16'd0;
-   assign      bb_rx_q0=16'd0;
- `endif
-   
- `ifdef RX_EN_1
-   rx_chain #(`FR_RX_FREQ_1,`FR_RX_PHASE_1) rx_chain_1
-     ( .clock(clk64),.reset(1'b0),.enable(enable_rx),
-       .decim_rate(decim_rate),.sample_strobe(rx_sample_strobe),.decimator_strobe(strobe_decim),.hb_strobe(),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .i_in(ddc1_in_i),.q_in(ddc1_in_q),.i_out(bb_rx_i1),.q_out(bb_rx_q1));
- `else
-   assign      bb_rx_i1=16'd0;
-   assign      bb_rx_q1=16'd0;
- `endif
-   
- `ifdef RX_EN_2
-   rx_chain #(`FR_RX_FREQ_2,`FR_RX_PHASE_2) rx_chain_2
-     ( .clock(clk64),.reset(1'b0),.enable(enable_rx),
-       .decim_rate(decim_rate),.sample_strobe(rx_sample_strobe),.decimator_strobe(strobe_decim),.hb_strobe(),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .i_in(ddc2_in_i),.q_in(ddc2_in_q),.i_out(bb_rx_i2),.q_out(bb_rx_q2));
- `else
-   assign      bb_rx_i2=16'd0;
-   assign      bb_rx_q2=16'd0;
- `endif
-
- `ifdef RX_EN_3
-   rx_chain #(`FR_RX_FREQ_3,`FR_RX_PHASE_3) rx_chain_3
-     ( .clock(clk64),.reset(1'b0),.enable(enable_rx),
-       .decim_rate(decim_rate),.sample_strobe(rx_sample_strobe),.decimator_strobe(strobe_decim),.hb_strobe(),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .i_in(ddc3_in_i),.q_in(ddc3_in_q),.i_out(bb_rx_i3),.q_out(bb_rx_q3));
- `else
-   assign      bb_rx_i3=16'd0;
-   assign      bb_rx_q3=16'd0;
- `endif
-
- `ifdef RX_DIG_ON
-   wire enable_rx_dig = 1'b1 & enable_rx;//TODO make  enabling rx_dig configurable through register
-   assign      io_rx_a_force_input = {enable_rx_dig,enable_rx_dig,14'b0};
-   assign      io_rx_b_force_input = {enable_rx_dig,enable_rx_dig,14'b0};
-   gpio_input  gpio_input(.clock(clk64),.reset(rx_dsp_reset),.enable(1'b1),
-                          .out_strobe(hb_strobe),
-			  .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-			  .io_rx_a_in(io_rx_a),.io_rx_b_in(io_rx_b),
-                          //.io_tx_a_in(io_tx_a),.io_tx_b_in(io_tx_b),
-			  .rx_dig0_i(rx_dig0_i),.rx_dig0_q(rx_dig0_q),
-			  .rx_dig1_i(rx_dig1_i),.rx_dig1_q(rx_dig1_q) );
-
-  `ifdef RX_EN_DIG_0
-    rx_chain_dig rx_chain_dig_0
-     ( .clock(clk64),.reset(rx_dsp_reset),.enable(enable_rx_dig),
-       .i_in_ana(bb_rx_i0),.q_in_ana(bb_rx_q0),
-       .i_in_dig(rx_dig0_i),.q_in_dig(rx_dig0_q),
-       .i_out(ch0rx),.q_out(ch1rx));
-  `else
-    assign      ch0rx = bb_rx_i0;
-    assign      ch1rx = bb_rx_q0;
-  `endif
-
-   assign ch0rx_ext = counter ? debug_counter : loopback ? loopback_i_0 : ch0rx;
-   assign ch1rx_ext = counter ? debug_counter + 16'd1 : loopback ? loopback_q_0 : ch1rx;
-
-  `ifdef RX_EN_DIG_1
-    rx_chain_dig rx_chain_dig_1
-     ( .clock(clk64),.reset(rx_dsp_reset),.enable(enable_rx_dig),
-       .i_in_ana(bb_rx_i1),.q_in_ana(bb_rx_q1),
-       .i_in_dig(rx_dig1_i),.q_in_dig(rx_dig1_q),
-       .i_out(ch2rx),.q_out(ch3rx));
-  `else
-    assign      ch2rx = bb_rx_i1;
-    assign      ch3rx = bb_rx_q1;
-  `endif
-
-   assign ch4rx = bb_rx_i2;
-   assign ch5rx = bb_rx_q2;
-   assign ch6rx = bb_rx_i3;
-   assign ch7rx = bb_rx_q3;
- `else //  `ifdef RX_DIG_ON
-   assign ch0rx = counter ? debug_counter : loopback ? loopback_i_0 : bb_rx_i0;
-   assign ch1rx = counter ? debug_counter + 16'd1 : loopback ? loopback_q_0 : bb_rx_q0;
-   assign ch2rx = bb_rx_i1;
-   assign ch3rx = bb_rx_q1;
-   assign ch4rx = bb_rx_i2;
-   assign ch5rx = bb_rx_q2;
-   assign ch6rx = bb_rx_i3;
-   assign ch7rx = bb_rx_q3;
- `endif //  `ifdef RX_DIG_ON
-
-`endif //  `ifdef RX_ON
-   
-   ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Control Functions
-
-   wire [31:0] capabilities;
-   assign      capabilities[7] =   `TX_CAP_HB;
-   assign      capabilities[6:4] = `TX_CAP_NCHAN;
-   assign      capabilities[3] =   `RX_CAP_HB;
-   assign      capabilities[2:0] = `RX_CAP_NCHAN;
-
-
-   serial_io serial_io
-     ( .master_clk(clk64),.serial_clock(SCLK),.serial_data_in(SDI),
-       .enable(SEN_FPGA),.reset(1'b0),.serial_data_out(SDO),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .readback_0({io_rx_a,io_tx_a}),.readback_1({io_rx_b,io_tx_b}),.readback_2(capabilities),.readback_3(32'hf0f0931a),
-       .readback_4(rssi_0),.readback_5(rssi_1),.readback_6(rssi_2),.readback_7(rssi_3)
-       );
-
-   wire [15:0] reg_0,reg_1,reg_2,reg_3;
-   wire [15:0] io_tx_a_out;
-   wire [15:0] io_tx_b_out;
-   wire [15:0] io_tx_a_force_output;
-   wire [15:0] io_tx_b_force_output; 
-   wire [15:0] io_rx_a_force_input;
-   wire [15:0] io_rx_b_force_input;
-
-   master_control master_control
-     ( .master_clk(clk64),.usbclk(usbclk),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .tx_bus_reset(tx_bus_reset),.rx_bus_reset(rx_bus_reset),
-       .tx_dsp_reset(tx_dsp_reset),.rx_dsp_reset(rx_dsp_reset),
-       .enable_tx(enable_tx),.enable_rx(enable_rx),
-       .interp_rate(interp_rate),.decim_rate(decim_rate),
-       .tx_sample_strobe(tx_sample_strobe),.strobe_interp(strobe_interp),
-       .rx_sample_strobe(rx_sample_strobe),.strobe_decim(strobe_decim),
-       .tx_empty(tx_empty),
-       //.debug_0(rx_a_a),.debug_1(ddc0_in_i),
-       .debug_0(tx_debugbus[15:0]),.debug_1(tx_debugbus[31:16]),
-       .debug_2(rx_debugbus[15:0]),.debug_3(rx_debugbus[31:16]),
-       //.tx_dig_a(tx_dig_a),tx_dig_b(tx_dig_b),
-       .reg_0(reg_0),.reg_1(reg_1),.reg_2(reg_2),.reg_3(reg_3) );
-  
-   io_pins io_pins
-     (.io_0(io_tx_a),.io_1(io_rx_a),.io_2(io_tx_b),.io_3(io_rx_b),
-      .reg_0(io_tx_a_out),.reg_1(reg_1),.reg_2(io_tx_b_out),.reg_3(reg_3),
-      .io_0_force_output(io_tx_a_force_output), .io_2_force_output(io_tx_b_force_output), 
-      .io_1_force_input(io_rx_a_force_input),   .io_3_force_input(io_rx_b_force_input),
-      .clock(clk64),.rx_reset(rx_dsp_reset),.tx_reset(tx_dsp_reset),
-      .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe));
-   
-   ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Misc Settings
-   setting_reg #(`FR_MODE) sr_misc(.clock(clk64),.reset(rx_dsp_reset),.strobe(serial_strobe),.addr(serial_addr),.in(serial_data),.out(settings));
-
-endmodule // usrp_gpio
diff --git a/gr-gpio/src/python/Makefile.am b/gr-gpio/src/python/Makefile.am
deleted file mode 100644
index 427047cdf..000000000
--- a/gr-gpio/src/python/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright 2007,2008,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# Installation locations
-ourpythondir = $(grpythondir)/gpio
-ourlibdir = $(grpyexecdir)/gpio
-
-# List of Python files that will get installed into site-packages
-ourpython_PYTHON = 			\
-    __init__.py 			\
-    gpio.py
-
-# List of python files that will be installed onto $prefix/bin
-dist_bin_SCRIPTS = 			\
-    gpio_rx_sfile.py			\
-    gpio_usrp_siggen.py 		\
-    gpio_usrp_fft.py
diff --git a/gr-gpio/src/python/__init__.py b/gr-gpio/src/python/__init__.py
deleted file mode 100644
index b1f69b7ea..000000000
--- a/gr-gpio/src/python/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright 2007,2008 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.
-# 
-
-import glob
-import os.path
-
-# This automatically imports all top-level objects from .py files
-# in our directory into the package name space
-for _p in __path__:
-    _filenames = glob.glob (os.path.join (_p, "*.py"))
-    for _f in _filenames:
-        _f = os.path.basename(_f).lower()
-        _f = _f[:-3]
-        if _f == '__init__':
-            continue
-        exec "from %s import *" % (_f,)
diff --git a/gr-gpio/src/python/gpio.py b/gr-gpio/src/python/gpio.py
deleted file mode 100644
index a315e166b..000000000
--- a/gr-gpio/src/python/gpio.py
+++ /dev/null
@@ -1 +0,0 @@
-fpga_filename = 'std_2rxint_2tx_dig.rbf'
diff --git a/gr-gpio/src/python/gpio_rx_sfile.py b/gr-gpio/src/python/gpio_rx_sfile.py
deleted file mode 100755
index 31f598ef7..000000000
--- a/gr-gpio/src/python/gpio_rx_sfile.py
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008,2009 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.
-# 
-
-from gnuradio import gr, eng_notation
-from gnuradio import usrp
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys
-
-from gnuradio import gpio
-
-class my_top_block(gr.top_block):
-
-    def __init__(self, options):
-        gr.top_block.__init__(self)
-
-	# Create a USRP source with GPIO FPGA build, then configure
-        u = usrp.source_s(decim_rate=options.decim,fpga_filename=gpio.fpga_filename)
-
-        if options.force_complex_RXA:
-           # This is a dirty hack to force complex mode (receive both I and Q) on basicRX or LFRX
-           # This forces the receive board in RXA (side A) to be used 
-           # FIXME: This has as a side effect that the gain for Q is not set. So only use with gain 0 (--gain 0)
-           options.rx_subdev_spec=(0,0)
-           u.set_mux(0x10)
-           if not (0==options.gain):
-             print "WARNING, you should set the gain to 0 with --gain 0 when using --force-complex-RXA"
-             print "The gain for Q will now still be zero while the gain for I is not" 
-             #options.gain=0
-        else:
-          if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = usrp.pick_rx_subdevice(u)
-          u.set_mux(usrp.determine_rx_mux_value(u, options.rx_subdev_spec))
-
-        subdev = usrp.selected_subdev(u, options.rx_subdev_spec)
-        print "Using RX d'board %s" % (subdev.side_and_name(),)
-        input_rate = u.adc_freq()/u.decim_rate()
-        print "USB sample rate %s" % (eng_notation.num_to_str(input_rate))
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-
-        #TODO setting gain on basicRX only sets the I channel, use a second subdev to set gain of Q channel
-        #see gnuradio-examples/multi-antenna for possible solutions
-        subdev.set_gain(options.gain)
-
-        #TODO check if freq has same problem as gain when trying to use complex mode on basicRX
-        r = u.tune(0, subdev, options.freq)
-        if not r:
-            sys.stderr.write('Failed to set frequency\n')
-            raise SystemExit, 1
-
-	# Connect pipeline
-	src = u
-	if options.nsamples is not None:
-	    head = gr.head(gr.sizeof_short, int(options.nsamples)*2)
-	    self.connect(u, head)
-	    src = head
-
-	ana_strip = gr.and_const_ss(0xFFFE)
-	dig_strip = gr.and_const_ss(0x0001)
-        ana_sink = gr.file_sink(gr.sizeof_short, options.ana_filename)
-	dig_sink = gr.file_sink(gr.sizeof_short, options.dig_filename)
-    
-	self.connect(src, ana_strip, ana_sink)
-	self.connect(src, dig_strip, dig_sink)
-
-if __name__ == '__main__':
-    usage="%prog: [options] analog_filename digital_filename"
-    parser = OptionParser(option_class=eng_option, usage=usage)
-    parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=(0, 0),
-                      help="select USRP Rx side A or B (default=A)")
-    parser.add_option("-d", "--decim", type="int", default=16,
-                      help="set fgpa decimation rate to DECIM [default=%default]")
-    parser.add_option("-f", "--freq", type="eng_float", default=None,
-                      help="set frequency to FREQ", metavar="FREQ")
-    parser.add_option("-g", "--gain", type="eng_float", default=None,
-                      help="set gain in dB (default is midpoint)")
-    parser.add_option("-N", "--nsamples", type="eng_float", default=None,
-                      help="number of samples to collect [default=+inf]")
-    parser.add_option("-F", "--force-complex-RXA", action="store_true", default=False,
-                          help="enable basicRX hack to force complex mode on basicRX and LFRX. Only works on side A. Only use with --gain 0")
-    (options, args) = parser.parse_args ()
-    if len(args) != 2:
-        parser.print_help()
-        raise SystemExit, 1
-    options.ana_filename = args[0]
-    options.dig_filename = args[1]
-
-    if options.freq is None:
-        parser.print_help()
-        sys.stderr.write('You must specify the frequency with -f FREQ\n');
-        raise SystemExit, 1
-
-    try:
-        tb = my_top_block(options)
-	tb.run()
-    except KeyboardInterrupt:
-        pass
diff --git a/gr-gpio/src/python/gpio_usrp_fft.py b/gr-gpio/src/python/gpio_usrp_fft.py
deleted file mode 100755
index c9ecb032d..000000000
--- a/gr-gpio/src/python/gpio_usrp_fft.py
+++ /dev/null
@@ -1,333 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,2007,2008,2009,2010 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.
-# 
-
-from gnuradio import gr, gru
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider
-from optparse import OptionParser
-import wx
-import sys
-import numpy
-
-from gnuradio import gpio
-
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    If there's a daughterboard on A, select A.
-    If there's a daughterboard on B, select B.
-    Otherwise, select A.
-    """
-    if u.db[0][0].dbid() >= 0:       # dbid is < 0 if there's no d'board or a problem
-        return (0, 0)
-    #if u.db[1][0].dbid() >= 0:  #disable the use of RXB
-    #    return (1, 0)
-    return (0, 0)
-
-
-class app_top_block(stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        self.frame = frame
-        self.panel = panel
-        
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-w", "--which", type="int", default=0,
-                          help="select which USRP (0, 1, ...) default is %default",
-			  metavar="NUM")
-#        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-#                          help="select USRP Rx side A or B (default=first one with a daughterboard)")
-        parser.add_option("-A", "--antenna", default=None,
-                          help="select Rx Antenna (only on RFX-series boards)")
-        parser.add_option("-d", "--decim", type="int", default=32,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=0.0,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-W", "--waterfall", action="store_true", default=False,
-                          help="Enable waterfall display")
-        parser.add_option("-8", "--width-8", action="store_true", default=False,
-                          help="Enable 8-bit samples across USB")
-#        parser.add_option( "--no-hb", action="store_true", default=False,
-#                          help="don't use halfband filter in usrp")
-        parser.add_option("-S", "--oscilloscope", action="store_true", default=False,
-                          help="Enable oscilloscope display (default)")
-        parser.add_option("-F", "--fft", action="store_true", default=False,
-                          help="Enable FFT display")
-        parser.add_option("-n", "--frame-decim", type="int", default=1,
-                          help="set oscope frame decimation factor to n [default=1]")
-        parser.add_option("-v", "--v-scale", type="eng_float", default=1,
-                          help="set oscope initial V/div to SCALE [default=%default]")
-        parser.add_option("-t", "--t-scale", type="eng_float", default=10e-6,
-                          help="set oscope initial s/div to SCALE [default=10us]")
-        parser.add_option ("--digital", action="store_true", default=False, 
-                       help="show (only) the digital wave on lsb (will be input from gpio pins with special usrp firmware)")
-        parser.add_option ("--analog", action="store_true", default=False, 
-                       help="show (only) the analog wave on msbs (will be input from analog inputs)")
-        parser.add_option ("--file",  default=None, 
-                       help="input from file FILE in stead of USRP (will be input from raw file in interleaved short format)")
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-	self.options = options
-        self.show_debug_info = True
-
-        self.u = usrp.source_s(which=options.which, decim_rate=options.decim, fpga_filename=gpio.fpga_filename)
-
-        print "Warning: This script only supports boards on RXA, change the script if you want otherwise"
-        #options.rx_subdev_spec=(0, 0)#force the use of RXA 
-        options.rx_subdev_spec=None   #force the use of RXA      
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-
-        #This hardcoded mux setting is why this script only supports RXA
-        #We want both I and Q active, even when using basicRX
-        #set to 0x10 for RXA
-        #set to 0x32 for RXB
-        self.u.set_mux(0x10) #usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-
-        if options.width_8:
-            width = 8
-            shift = 8
-            format = self.u.make_format(width, shift)
-            print "format =", hex(format)
-            r = self.u.set_format(format)
-            print "set_format =", r
-            
-        # determine the daughterboard subdevice we're using
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        #if options.rx_subdev_spec==(0,0):
-        #  rx_subdev_spec2=(0,1)
-        #  self.subdev2 = usrp.selected_subdev(self.u, rx_subdev_spec2)
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-
-        if options.waterfall:
-            self.scope = \
-              waterfallsink2.waterfall_sink_c (panel, fft_size=1024, sample_rate=input_rate)
-        elif options.fft:
-            self.scope = fftsink2.fft_sink_c (panel, fft_size=1024, sample_rate=input_rate)
-        else: # options.oscilloscope:
-            #self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate)
-            self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate,
-                                            frame_decim=options.frame_decim,
-                                            v_scale=options.v_scale,
-                                            t_scale=options.t_scale)
-
-        self.is2c = gr.interleaved_short_to_complex()
-        if not (options.file is None):
-          self.filesrc=gr.file_source(gr.sizeof_short, options.file, True)
-          thr = gr.throttle(gr.sizeof_short, input_rate)
-          self.connect(self.filesrc,thr,self.is2c,self.scope)
-        elif options.digital:
-          self.select_dig=gr.and_const_ss(0x0001)
-          self.connect(self.u, self.select_dig,self.is2c,self.scope)
-        elif options.analog:
-          self.select_ana=gr.and_const_ss(0xFFFE)
-          self.connect(self.u, self.select_ana,self.is2c,self.scope)
-        else:
-          self.connect(self.u,self.is2c,self.scope)
-
-        self._build_gui(vbox)
-	self._setup_events()
-	
-        # set initial values
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-        if options.freq is None:
-            # if no freq was specified, use the mid-point
-            r = self.subdev.freq_range()
-            options.freq = float(r[0]+r[1])/2
-
-        self.set_gain(options.gain)
-
-	if options.antenna is not None:
-            print "Selecting antenna %s" % (options.antenna,)
-            self.subdev.select_rx_antenna(options.antenna)
-
-        if self.show_debug_info:
-            self.myform['decim'].set_value(self.u.decim_rate())
-            self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-            self.myform['dbname'].set_value(self.subdev.name())
-            self.myform['baseband'].set_value(0)
-            self.myform['ddc'].set_value(0)
-
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-
-    def _set_status_msg(self, msg):
-        self.frame.GetStatusBar().SetStatusText(msg, 0)
-
-    def _build_gui(self, vbox):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-            
-        vbox.Add(self.scope.win, 10, wx.EXPAND)
-        
-        # add control area at the bottom
-        self.myform = myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0, 0)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=hbox, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-        hbox.Add((5,0), 0, 0)
-        g = self.subdev.gain_range()
-        myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                           weight=3,
-                                           min=int(g[0]), max=int(g[1]),
-                                           callback=self.set_gain)
-
-        hbox.Add((5,0), 0, 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        self._build_subpanel(vbox)
-
-    def _build_subpanel(self, vbox_arg):
-        # build a secondary information panel (sometimes hidden)
-
-        # FIXME figure out how to have this be a subpanel that is always
-        # created, but has its visibility controlled by foo.Show(True/False)
-        
-        def _form_set_decim(kv):
-            return self.set_decim(kv['decim'])
-
-        if not(self.show_debug_info):
-            return
-
-        panel = self.panel
-        vbox = vbox_arg
-        myform = self.myform
-
-        #panel = wx.Panel(self.panel, -1)
-        #vbox = wx.BoxSizer(wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-
-        myform['decim'] = form.int_field(
-            parent=panel, sizer=hbox, label="Decim",
-            callback=myform.check_input_and_call(_form_set_decim, self._set_status_msg))
-
-        hbox.Add((5,0), 1)
-        myform['fs@usb'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Fs@USB")
-
-        hbox.Add((5,0), 1)
-        myform['dbname'] = form.static_text_field(
-            parent=panel, sizer=hbox)
-
-        hbox.Add((5,0), 1)
-        myform['baseband'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Analog BB")
-
-        hbox.Add((5,0), 1)
-        myform['ddc'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC")
-
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        r = self.u.tune(0, self.subdev, target_freq)
-        
-        if r:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-            if self.show_debug_info:
-                self.myform['baseband'].set_value(r.baseband_freq)
-                self.myform['ddc'].set_value(r.dxc_freq)
-	    if not self.options.waterfall and not self.options.oscilloscope:
-		self.scope.set_baseband_freq(target_freq)
-    	    return True
-
-        return False
-
-    def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
-
-    def set_decim(self, decim):
-        ok = self.u.set_decim_rate(decim)
-        if not ok:
-            print "set_decim failed"
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-        self.scope.set_sample_rate(input_rate)
-        if self.show_debug_info:  # update displayed values
-            self.myform['decim'].set_value(self.u.decim_rate())
-            self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-        return ok
-
-    def _setup_events(self):
-	if not self.options.waterfall and not self.options.oscilloscope:
-	    self.scope.win.Bind(wx.EVT_LEFT_DCLICK, self.evt_left_dclick)
-	    
-    def evt_left_dclick(self, event):
-	(ux, uy) = self.scope.win.GetXY(event)
-	if event.CmdDown():
-	    # Re-center on maximum power
-	    points = self.scope.win._points
-	    if self.scope.win.peak_hold:
-		if self.scope.win.peak_vals is not None:
-		    ind = numpy.argmax(self.scope.win.peak_vals)
-		else:
-		    ind = int(points.shape()[0]/2)
-	    else:
-        	ind = numpy.argmax(points[:,1])
-            (freq, pwr) = points[ind]
-	    target_freq = freq/self.scope.win._scale_factor
-	    print ind, freq, pwr
-            self.set_freq(target_freq)            
-	else:
-	    # Re-center on clicked frequency
-	    target_freq = ux/self.scope.win._scale_factor
-	    self.set_freq(target_freq)
-	    
-	
-def main ():
-    app = stdgui2.stdapp(app_top_block, "USRP FFT", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-gpio/src/python/gpio_usrp_siggen.py b/gr-gpio/src/python/gpio_usrp_siggen.py
deleted file mode 100755
index 0e483c35d..000000000
--- a/gr-gpio/src/python/gpio_usrp_siggen.py
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 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.
-# 
-from gnuradio import gr, gru
-from gnuradio import usrp
-from gnuradio.eng_option import eng_option
-from gnuradio import eng_notation
-from optparse import OptionParser
-import sys
-
-from gnuradio import gpio
-
-class my_top_block(gr.top_block):
-    def __init__ (self):
-        gr.top_block.__init__(self)
-        
-        # controllable values
-        self.interp = 64
-        self.waveform_type = gr.GR_CONST_WAVE
-        self.waveform_ampl = 16000
-        self.waveform_freq = 100.12345e3
-        self.waveform_offset = 0
-        self._instantiate_blocks ()
-        self.set_waveform_type (self.waveform_type)
-
-    def usb_freq (self):
-        return self.u.dac_freq() / self.interp
-
-    def usb_throughput (self):
-        return self.usb_freq () * 4
-        
-    def set_waveform_type (self, type):
-        '''
-        valid waveform types are: gr.GR_SIN_WAVE, gr.GR_CONST_WAVE,
-        gr.GR_UNIFORM and gr.GR_GAUSSIAN
-        '''
-        self._configure_graph (type)
-        self.waveform_type = type
-
-    def set_waveform_ampl (self, ampl):
-        self.waveform_ampl = ampl
-        self.siggen.set_amplitude (ampl)
-        self.noisegen.set_amplitude (ampl)
-
-    def set_waveform_freq (self, freq):
-        self.waveform_freq = freq
-        self.siggen.set_frequency (freq)
-        
-    def set_waveform_offset (self, offset):
-        self.waveform_offset = offset
-        self.siggen.set_offset (offset)
-
-    def set_interpolator (self, interp):
-        self.interp = interp
-        self.siggen.set_sampling_freq (self.usb_freq ())
-        self.u.set_interp_rate (interp)
-
-    def _instantiate_blocks (self):
-        self.src = None
-        self.u = usrp.sink_c (0, self.interp,fpga_filename=gpio.fpga_filename)
-        
-        self.siggen = gr.sig_source_c (self.usb_freq (),
-                                       gr.GR_SIN_WAVE,
-                                       self.waveform_freq,
-                                       self.waveform_ampl,
-                                       self.waveform_offset)
-
-        self.noisegen = gr.noise_source_c (gr.GR_UNIFORM,
-                                           self.waveform_ampl)
-        self.vecgen = gr.vector_source_c ([complex(1.0,0.0),complex(0.0,0.0),complex(1.0,1.0),complex(0.0,1.0)],True)
-
-        # self.file_sink = gr.file_sink (gr.sizeof_gr_complex, "siggen.dat")
-
-    def _configure_graph (self, type):
-        try:
-            self.lock()
-            self.disconnect_all ()
-            if type == gr.GR_SIN_WAVE:
-                self.connect (self.siggen, self.u)
-                # self.connect (self.siggen, self.file_sink)
-                self.siggen.set_waveform (type)
-                self.src = self.siggen
-            elif type == gr.GR_UNIFORM or type == gr.GR_GAUSSIAN:
-                self.connect (self.noisegen, self.u)
-                self.noisegen.set_type (type)
-                self.src = self.noisegen
-            elif type == gr.GR_CONST_WAVE:
-                self.connect (self.vecgen, self.u)
-                self.src = self.vecgen
-            else:
-                raise ValueError, type
-        finally:
-            self.unlock()
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.
-        """
-        r = self.u.tune(self.subdev._which, self.subdev, target_freq)
-        if r:
-            #print "r.baseband_freq =", eng_notation.num_to_str(r.baseband_freq)
-            #print "r.dxc_freq      =", eng_notation.num_to_str(r.dxc_freq)
-            #print "r.residual_freq =", eng_notation.num_to_str(r.residual_freq)
-            #print "r.inverted      =", r.inverted
-            return True
-
-        return False
-
-
-
-def main ():
-    parser = OptionParser (option_class=eng_option)
-    parser.add_option ("-T", "--tx-subdev-spec", type="subdev", default=(0, 0),
-                       help="select USRP Tx side A or B")
-    parser.add_option ("-f", "--rf-freq", type="eng_float", default=None,
-                       help="set RF center frequency to FREQ")
-    parser.add_option ("-i", "--interp", type="int", default=512,
-                       help="set fgpa interpolation rate to INTERP [default=%default]")
-    parser.add_option ("--sine", dest="type", action="store_const", const=gr.GR_SIN_WAVE,
-                       help="generate a complex sinusoid [default]", default=gr.GR_SIN_WAVE)
-
-    parser.add_option ("--gaussian", dest="type", action="store_const", const=gr.GR_GAUSSIAN,
-                       help="generate Gaussian random output")
-    parser.add_option ("--uniform", dest="type", action="store_const", const=gr.GR_UNIFORM,
-                       help="generate Uniform random output")
-
-    parser.add_option ("-w", "--waveform-freq", type="eng_float", default=100e3,
-                       help="set waveform frequency to FREQ [default=%default]")
-    parser.add_option ("-a", "--amplitude", type="eng_float", default=16e3,
-                       help="set waveform amplitude to AMPLITUDE [default=%default]", metavar="AMPL")
-    parser.add_option ("-g", "--gain", type="eng_float", default=None,
-                       help="set output gain to GAIN [default=%default]")
-    parser.add_option ("-o", "--offset", type="eng_float", default=0,
-                       help="set waveform offset to OFFSET [default=%default]")
-    parser.add_option ("--digital", dest="type", action="store_const", const=gr.GR_CONST_WAVE, 
-                       help="generate (only) a digital wave on lsb (will be output on gpio pins with special usrp firmware)")
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help()
-        raise SystemExit
-
-    if options.rf_freq is None:
-        sys.stderr.write("usrp_siggen: must specify RF center frequency with -f RF_FREQ\n")
-        parser.print_help()
-        raise SystemExit
-
-    tb = my_top_block()
-    tb.set_interpolator (options.interp)
-    tb.set_waveform_type (options.type)
-    tb.set_waveform_freq (options.waveform_freq)
-    tb.set_waveform_ampl (options.amplitude)
-    tb.set_waveform_offset (options.offset)
-
-    # determine the daughterboard subdevice we're using
-    if options.tx_subdev_spec is None:
-        options.tx_subdev_spec = usrp.pick_tx_subdevice(tb.u)
-
-    m = usrp.determine_tx_mux_value(tb.u, options.tx_subdev_spec)
-    #print "mux = %#04x" % (m,)
-    tb.u.set_mux(m)
-    tb.subdev = usrp.selected_subdev(tb.u, options.tx_subdev_spec)
-    print "Using TX d'board %s" % (tb.subdev.side_and_name(),)
-    
-    if options.gain is None:
-        tb.subdev.set_gain(tb.subdev.gain_range()[1])    # set max Tx gain
-    else:
-        tb.subdev.set_gain(options.gain)    # set max Tx gain
-
-    if not tb.set_freq(options.rf_freq):
-        sys.stderr.write('Failed to set RF frequency\n')
-        raise SystemExit
-    
-    tb.subdev.set_enable(True)                       # enable transmitter
-
-    try:
-        tb.run()
-    except KeyboardInterrupt:
-        pass
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-gsm-fr-vocoder/.gitignore b/gr-gsm-fr-vocoder/.gitignore
deleted file mode 100644
index f3462d009..000000000
--- a/gr-gsm-fr-vocoder/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/configure
-/config.h.in
-/stamp-h.in
-/libtool
-/config.log
-/config.h
-/config.cache
-/config.status
-/missing
-/stamp-h
-/stamp-h1
-/.deps
-/.libs
-/*.la
-/*.lo
-/autom4te.cache
-/*.cache
-/missing
-/make.log
-/*.pc
diff --git a/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in b/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in
deleted file mode 100644
index a799fcd82..000000000
--- a/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: gnuradio-comedi
-Description: GNU Radio blocks implementing a GSM full rate vocoder
-Requires: gnuradio-core
-Version: @LIBVER@
-Libs: -L${libdir} -lgnuradio-gsm-fr-vocoder-$@LIBVER@
-Cflags: -I${includedir}
diff --git a/gr-gsm-fr-vocoder/src/.gitignore b/gr-gsm-fr-vocoder/src/.gitignore
deleted file mode 100644
index bb3f27777..000000000
--- a/gr-gsm-fr-vocoder/src/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/howto.cc
-/howto.py
diff --git a/gr-gsm-fr-vocoder/src/Makefile.am b/gr-gsm-fr-vocoder/src/Makefile.am
deleted file mode 100644
index be38b7c1a..000000000
--- a/gr-gsm-fr-vocoder/src/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright 2004 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.
-# 
-
-SUBDIRS = lib
-if PYTHON
-SUBDIRS += python
-endif
diff --git a/gr-gsm-fr-vocoder/src/lib/.gitignore b/gr-gsm-fr-vocoder/src/lib/.gitignore
deleted file mode 100644
index 5cf6fde83..000000000
--- a/gr-gsm-fr-vocoder/src/lib/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/gsm_full_rate.py
-/gsm_full_rate.cc
-/*.pyc
-/gnuradio
-/guile
-/python
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am
deleted file mode 100644
index 4ce65bc31..000000000
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright 2004,2005,2008,2009,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-SUBDIRS = gsm .
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
-# C/C++ headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS =			\
-	gsm_fr_decode_ps.h		\
-	gsm_fr_encode_sp.h
-
-lib_LTLIBRARIES = libgnuradio-gsm-fr-vocoder.la
-
-libgnuradio_gsm_fr_vocoder_la_SOURCES = \
-	gsm_fr_decode_ps.cc		\
-	gsm_fr_encode_sp.cc
-
-libgnuradio_gsm_fr_vocoder_la_LIBADD =	\
-	$(GNURADIO_CORE_LA)		\
-	gsm/libgsm.la
-
-libgnuradio_gsm_fr_vocoder_la_LDFLAGS =	$(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-
-# SWIG interface and library
-TOP_SWIG_IFILES = 			\
-	gsm_full_rate.i
-
-# Install so that they end up available as:
-#   import gnuradio.vocoder.gsm_full_rate
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder
-gsm_full_rate_pythondir_category =	\
-	gnuradio/vocoder
-
-# additional libraries for linking with the SWIG-generated library
-gsm_full_rate_la_swig_libadd =		\
-	libgnuradio-gsm-fr-vocoder.la
-
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen b/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
deleted file mode 100644
index 77776abd8..000000000
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.swig.gen
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright 2009 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.
-# 
-
-# Makefile.swig.gen for gsm_full_rate.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/gsm_full_rate
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gsm_full_rate
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-gsm_full_rate_pythondir_category ?= gnuradio/gsm_full_rate
-gsm_full_rate_pylibdir_category ?= $(gsm_full_rate_pythondir_category)
-gsm_full_rate_pythondir = $(pythondir)/$(gsm_full_rate_pythondir_category)
-gsm_full_rate_pylibdir = $(pyexecdir)/$(gsm_full_rate_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-gsm_full_rate_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/gsm_full_rate
-# FIXME: determince whether these should be installed with gnuradio.
-gsm_full_rate_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-gsm_full_rate_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-gsm_full_rate_swiginclude_HEADERS =		\
-	gsm_full_rate.i			\
-	$(gsm_full_rate_swiginclude_headers)
-
-if PYTHON
-gsm_full_rate_pylib_LTLIBRARIES =		\
-	_gsm_full_rate.la
-
-_gsm_full_rate_la_SOURCES = 			\
-	python/gsm_full_rate.cc		\
-	$(gsm_full_rate_la_swig_sources)
-
-gsm_full_rate_python_PYTHON =			\
-	gsm_full_rate.py			\
-	$(gsm_full_rate_python)
-
-_gsm_full_rate_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gsm_full_rate_la_swig_libadd)
-
-_gsm_full_rate_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gsm_full_rate_la_swig_ldflags)
-
-_gsm_full_rate_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gsm_full_rate_la_swig_cxxflags)
-
-python/gsm_full_rate.cc: gsm_full_rate.py
-gsm_full_rate.py: gsm_full_rate.i
-
-# Include the python dependencies for this file
--include python/gsm_full_rate.d
-
-endif		# end of if python
-
-if GUILE
-
-gsm_full_rate_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-gsm_full_rate.la
-libguile_gnuradio_gsm_full_rate_la_SOURCES =	\
-	guile/gsm_full_rate.cc			\
-	$(gsm_full_rate_la_swig_sources)
-nobase_gsm_full_rate_scm_DATA = 		\
-	gnuradio/gsm_full_rate.scm 		\
-	gnuradio/gsm_full_rate-primitive.scm
-libguile_gnuradio_gsm_full_rate_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(gsm_full_rate_la_swig_libadd)
-libguile_gnuradio_gsm_full_rate_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(gsm_full_rate_la_swig_ldflags)
-libguile_gnuradio_gsm_full_rate_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(gsm_full_rate_la_swig_cxxflags)
-
-guile/gsm_full_rate.cc: gnuradio/gsm_full_rate.scm
-gnuradio/gsm_full_rate.scm: gsm_full_rate.i
-gnuradio/gsm_full_rate-primitive.scm: gnuradio/gsm_full_rate.scm
-
-# Include the guile dependencies for this file
--include guile/gsm_full_rate.d
-
-endif				# end of GUILE
-
-
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/.gitignore b/gr-gsm-fr-vocoder/src/lib/gsm/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/gr-gsm-fr-vocoder/src/lib/gsm/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gr-gsm-fr-vocoder/src/python/Makefile.am b/gr-gsm-fr-vocoder/src/python/Makefile.am
deleted file mode 100644
index 8a97395ee..000000000
--- a/gr-gsm-fr-vocoder/src/python/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2004 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += run_tests.in
-
-TESTS = run_tests
-
-noinst_PYTHON = 			\
-	encdec.py			\
-	qa_gsm_full_rate.py		
diff --git a/gr-gsm-fr-vocoder/src/python/run_tests.in b/gr-gsm-fr-vocoder/src/python/run_tests.in
deleted file mode 100644
index 96eefc559..000000000
--- a/gr-gsm-fr-vocoder/src/python/run_tests.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# 1st parameter is absolute path to component source directory
-# 2nd parameter is absolute path to component build directory
-# 3rd parameter is path to Python QA directory
-
-@top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-gsm-fr-vocoder \
-    @abs_top_builddir@/gr-gsm-fr-vocoder \
-    @srcdir@
diff --git a/gr-howto-write-a-block-cmake/CMakeLists.txt b/gr-howto-write-a-block-cmake/CMakeLists.txt
new file mode 100644
index 000000000..06f3bb72c
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/CMakeLists.txt
@@ -0,0 +1,104 @@
+# 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.
+
+
+########################################################################
+# Project setup
+########################################################################
+cmake_minimum_required(VERSION 2.6)
+project(gr-howto-write-a-block CXX)
+enable_testing()
+
+#select the release build type by default to get optimization flags
+if(NOT CMAKE_BUILD_TYPE)
+   set(CMAKE_BUILD_TYPE "Release")
+   message(STATUS "Build type not specified: defaulting to release.")
+endif(NOT CMAKE_BUILD_TYPE)
+set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
+
+########################################################################
+# Compiler specific setup
+########################################################################
+if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
+    #http://gcc.gnu.org/wiki/Visibility
+    add_definitions(-fvisibility=hidden)
+endif()
+
+########################################################################
+# Find boost
+########################################################################
+if(UNIX AND EXISTS "/usr/lib64")
+    list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
+endif(UNIX AND EXISTS "/usr/lib64")
+set(Boost_ADDITIONAL_VERSIONS
+    "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39"
+    "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44"
+    "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49"
+    "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54"
+    "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59"
+    "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
+    "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
+)
+find_package(Boost "1.35")
+
+if(NOT Boost_FOUND)
+    message(FATAL_ERROR "Boost required to compile howto")
+endif()
+
+########################################################################
+# Find gnuradio build dependencies
+########################################################################
+find_package(Gruel)
+find_package(GnuradioCore)
+
+if(NOT GRUEL_FOUND)
+    message(FATAL_ERROR "Gruel required to compile howto")
+endif()
+
+if(NOT GNURADIO_CORE_FOUND)
+    message(FATAL_ERROR "GnuRadio Core required to compile howto")
+endif()
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${CMAKE_SOURCE_DIR}/include
+    ${Boost_INCLUDE_DIRS}
+    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+)
+
+link_directories(
+    ${Boost_LIBRARY_DIRS}
+    ${GRUEL_LIBRARY_DIRS}
+    ${GNURADIO_CORE_LIBRARY_DIRS}
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(include)
+add_subdirectory(lib)
+add_subdirectory(swig)
+add_subdirectory(python)
+add_subdirectory(grc)
+add_subdirectory(apps)
diff --git a/gr-howto-write-a-block-cmake/apps/CMakeLists.txt b/gr-howto-write-a-block-cmake/apps/CMakeLists.txt
new file mode 100644
index 000000000..a736fb2d0
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/apps/CMakeLists.txt
@@ -0,0 +1,26 @@
+# 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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    howto_square.py
+    DESTINATION bin
+)
diff --git a/gnuradio-examples/grc/usrp/usrp2_fft.grc b/gr-howto-write-a-block-cmake/apps/howto_square.grc
index 134bd4614..a8563698b 100644
--- a/gnuradio-examples/grc/usrp/usrp2_fft.grc
+++ b/gr-howto-write-a-block-cmake/apps/howto_square.grc
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Wed Apr 15 17:30:20 2009</timestamp>
+  <timestamp>Thu Nov 12 11:26:07 2009</timestamp>
   <block>
     <key>options</key>
     <param>
       <key>id</key>
-      <value>usrp2_fft</value>
+      <value>howto_square</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -13,15 +13,15 @@
     </param>
     <param>
       <key>title</key>
-      <value>USRP2 FFT Plotter</value>
+      <value></value>
     </param>
     <param>
       <key>author</key>
-      <value>Example</value>
+      <value></value>
     </param>
     <param>
       <key>description</key>
-      <value>FFT waveform plot</value>
+      <value></value>
     </param>
     <param>
       <key>window_size</key>
@@ -36,6 +36,14 @@
       <value>Custom</value>
     </param>
     <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>realtime_scheduling</key>
       <value></value>
     </param>
@@ -60,7 +68,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>100e6/decim</value>
+      <value>10e3</value>
     </param>
     <param>
       <key>_coordinate</key>
@@ -72,73 +80,85 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>decim</value>
+      <value>sink</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>16</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(24, 267)</value>
+      <key>title</key>
+      <value>Input</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>v_scale</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>v_offset</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
     <param>
-      <key>id</key>
-      <value>tun_freq</value>
+      <key>t_scale</key>
+      <value>0.002</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>ac_couple</key>
+      <value>False</value>
     </param>
     <param>
-      <key>label</key>
-      <value>USRP2 Freq (Hz)</value>
+      <key>xy_mode</key>
+      <value>False</value>
     </param>
     <param>
-      <key>value</key>
-      <value>2.45e9</value>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
-      <key>min</key>
-      <value>2.4e9</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>max</key>
-      <value>2.5e9</value>
+      <key>grid_pos</key>
+      <value></value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>100</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>_coordinate</key>
+      <value>(691, 222)</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>howto_square_ff</key>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>id</key>
+      <value>sqr</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(32, 365)</value>
+      <value>(709, 344)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -146,10 +166,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>gr_throttle</key>
     <param>
       <key>id</key>
-      <value>wxgui_fftsink2_0</value>
+      <value>thr</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -157,55 +177,54 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>FFT Plot</value>
+      <value>float</value>
     </param>
     <param>
-      <key>samp_rate</key>
+      <key>samples_per_second</key>
       <value>samp_rate</value>
     </param>
     <param>
-      <key>baseband_freq</key>
-      <value>tun_freq</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>y_per_div</key>
-      <value>10</value>
+      <key>_coordinate</key>
+      <value>(497, 340)</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>10</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>gr_vector_source_x</key>
     <param>
-      <key>fft_size</key>
-      <value>1024</value>
+      <key>id</key>
+      <value>src</value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>30</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>vector</key>
+      <value>[float(n)-50 for n in range(100)]</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>repeat</key>
+      <value>True</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(466, 100)</value>
+      <value>(246, 332)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -213,10 +232,10 @@
     </param>
   </block>
   <block>
-    <key>usrp2_source_xxxx</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>usrp2_source_xxxx_0</value>
+      <value>sink2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -224,31 +243,55 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>float</value>
     </param>
     <param>
-      <key>interface</key>
-      <value></value>
+      <key>title</key>
+      <value>Output</value>
     </param>
     <param>
-      <key>mac_addr</key>
-      <value></value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>v_scale</key>
+      <value>0</value>
     </param>
     <param>
-      <key>decimation</key>
-      <value>decim</value>
+      <key>v_offset</key>
+      <value>0</value>
     </param>
     <param>
-      <key>frequency</key>
-      <value>tun_freq</value>
+      <key>t_scale</key>
+      <value>0.002</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>0</value>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(211, 200)</value>
+      <value>(869, 324)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -256,8 +299,26 @@
     </param>
   </block>
   <connection>
-    <source_block_id>usrp2_source_xxxx_0</source_block_id>
-    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+    <source_block_id>thr</source_block_id>
+    <sink_block_id>sqr</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>src</source_block_id>
+    <sink_block_id>thr</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>thr</source_block_id>
+    <sink_block_id>sink</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>sqr</source_block_id>
+    <sink_block_id>sink2</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gr-howto-write-a-block-cmake/apps/howto_square.py b/gr-howto-write-a-block-cmake/apps/howto_square.py
new file mode 100755
index 000000000..f14e28325
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/apps/howto_square.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+##################################################
+# Gnuradio Python Flow Graph
+# Title: Howto Square
+# Generated: Thu Nov 12 11:26:07 2009
+##################################################
+
+import howto
+from gnuradio import eng_notation
+from gnuradio import gr
+from gnuradio.eng_option import eng_option
+from gnuradio.gr import firdes
+from gnuradio.wxgui import scopesink2
+from grc_gnuradio import wxgui as grc_wxgui
+from optparse import OptionParser
+import wx
+
+class howto_square(grc_wxgui.top_block_gui):
+
+	def __init__(self):
+		grc_wxgui.top_block_gui.__init__(self, title="Howto Square")
+
+		##################################################
+		# Variables
+		##################################################
+		self.samp_rate = samp_rate = 10e3
+
+		##################################################
+		# Blocks
+		##################################################
+		self.sink = scopesink2.scope_sink_f(
+			self.GetWin(),
+			title="Input",
+			sample_rate=samp_rate,
+			v_scale=20,
+			v_offset=0,
+			t_scale=0.002,
+			ac_couple=False,
+			xy_mode=False,
+			num_inputs=1,
+		)
+		self.Add(self.sink.win)
+		self.sink2 = scopesink2.scope_sink_f(
+			self.GetWin(),
+			title="Output",
+			sample_rate=samp_rate,
+			v_scale=0,
+			v_offset=0,
+			t_scale=0.002,
+			ac_couple=False,
+			xy_mode=False,
+			num_inputs=1,
+		)
+		self.Add(self.sink2.win)
+		self.sqr = howto.square_ff()
+		self.src = gr.vector_source_f(([float(n)-50 for n in range(100)]), True, 1)
+		self.thr = gr.throttle(gr.sizeof_float*1, samp_rate)
+
+		##################################################
+		# Connections
+		##################################################
+		self.connect((self.thr, 0), (self.sqr, 0))
+		self.connect((self.src, 0), (self.thr, 0))
+		self.connect((self.thr, 0), (self.sink, 0))
+		self.connect((self.sqr, 0), (self.sink2, 0))
+
+	def set_samp_rate(self, samp_rate):
+		self.samp_rate = samp_rate
+		self.sink.set_sample_rate(self.samp_rate)
+		self.sink2.set_sample_rate(self.samp_rate)
+
+if __name__ == '__main__':
+	parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
+	(options, args) = parser.parse_args()
+	tb = howto_square()
+	tb.Run(True)
+
diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/CMakeParseArgumentsCopy.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/CMakeParseArgumentsCopy.cmake
new file mode 100644
index 000000000..7ce4c49ae
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/cmake/Modules/CMakeParseArgumentsCopy.cmake
@@ -0,0 +1,138 @@
+# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...)
+#
+# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions for
+# parsing the arguments given to that macro or function.
+# It processes the arguments and defines a set of variables which hold the
+# values of the respective options.
+#
+# The <options> argument contains all options for the respective macro,
+# i.e. keywords which can be used when calling the macro without any value
+# following, like e.g. the OPTIONAL keyword of the install() command.
+#
+# The <one_value_keywords> argument contains all keywords for this macro
+# which are followed by one value, like e.g. DESTINATION keyword of the
+# install() command.
+#
+# The <multi_value_keywords> argument contains all keywords for this macro
+# which can be followed by more than one value, like e.g. the TARGETS or
+# FILES keywords of the install() command.
+#
+# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
+# keywords listed in <options>, <one_value_keywords> and
+# <multi_value_keywords> a variable composed of the given <prefix>
+# followed by "_" and the name of the respective keyword.
+# These variables will then hold the respective value from the argument list.
+# For the <options> keywords this will be TRUE or FALSE.
+#
+# All remaining arguments are collected in a variable
+# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see whether
+# your macro was called with unrecognized parameters.
+#
+# As an example here a my_install() macro, which takes similar arguments as the
+# real install() command:
+#
+#   function(MY_INSTALL)
+#     set(options OPTIONAL FAST)
+#     set(oneValueArgs DESTINATION RENAME)
+#     set(multiValueArgs TARGETS CONFIGURATIONS)
+#     cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
+#     ...
+#
+# Assume my_install() has been called like this:
+#   my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub)
+#
+# After the cmake_parse_arguments() call the macro will have set the following
+# variables:
+#   MY_INSTALL_OPTIONAL = TRUE
+#   MY_INSTALL_FAST = FALSE (this option was not used when calling my_install()
+#   MY_INSTALL_DESTINATION = "bin"
+#   MY_INSTALL_RENAME = "" (was not used)
+#   MY_INSTALL_TARGETS = "foo;bar"
+#   MY_INSTALL_CONFIGURATIONS = "" (was not used)
+#   MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
+#
+# You can the continue and process these variables.
+#
+# Keywords terminate lists of values, e.g. if directly after a one_value_keyword
+# another recognized keyword follows, this is interpreted as the beginning of
+# the new option.
+# E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in
+# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would
+# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
+
+#=============================================================================
+# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+
+if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
+  return()
+endif()
+set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
+
+
+function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
+  # first set all result variables to empty/FALSE
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames})
+    set(${prefix}_${arg_name})
+  endforeach(arg_name)
+
+  foreach(option ${_optionNames})
+    set(${prefix}_${option} FALSE)
+  endforeach(option)
+
+  set(${prefix}_UNPARSED_ARGUMENTS)
+
+  set(insideValues FALSE)
+  set(currentArgName)
+
+  # now iterate over all arguments and fill the result variables
+  foreach(currentArg ${ARGN})
+    list(FIND _optionNames "${currentArg}" optionIndex)  # ... then this marks the end of the arguments belonging to this keyword
+    list(FIND _singleArgNames "${currentArg}" singleArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+    list(FIND _multiArgNames "${currentArg}" multiArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
+
+    if(${optionIndex} EQUAL -1  AND  ${singleArgIndex} EQUAL -1  AND  ${multiArgIndex} EQUAL -1)
+      if(insideValues)
+        if("${insideValues}" STREQUAL "SINGLE")
+          set(${prefix}_${currentArgName} ${currentArg})
+          set(insideValues FALSE)
+        elseif("${insideValues}" STREQUAL "MULTI")
+          list(APPEND ${prefix}_${currentArgName} ${currentArg})
+        endif()
+      else(insideValues)
+        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
+      endif(insideValues)
+    else()
+      if(NOT ${optionIndex} EQUAL -1)
+        set(${prefix}_${currentArg} TRUE)
+        set(insideValues FALSE)
+      elseif(NOT ${singleArgIndex} EQUAL -1)
+        set(currentArgName ${currentArg})
+        set(${prefix}_${currentArgName})
+        set(insideValues "SINGLE")
+      elseif(NOT ${multiArgIndex} EQUAL -1)
+        set(currentArgName ${currentArg})
+        set(${prefix}_${currentArgName})
+        set(insideValues "MULTI")
+      endif()
+    endif()
+
+  endforeach(currentArg)
+
+  # propagate the result variables to the caller:
+  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
+    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE)
+  endforeach(arg_name)
+  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)
+
+endfunction(CMAKE_PARSE_ARGUMENTS _options _singleArgs _multiArgs)
diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake
new file mode 100644
index 000000000..ffa6582a2
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGnuradioCore.cmake
@@ -0,0 +1,26 @@
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core QUIET)
+
+FIND_PATH(
+    GNURADIO_CORE_INCLUDE_DIRS
+    NAMES gr_random.h
+    HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio
+        ${PC_GNURADIO_CORE_INCLUDE_DIRS}
+    PATHS /usr/local/include/gnuradio
+          /usr/include/gnuradio
+)
+
+FIND_LIBRARY(
+    GNURADIO_CORE_LIBRARIES
+    NAMES gnuradio-core
+    HINTS $ENV{GNURADIO_CORE_DIR}/lib
+        ${PC_GNURADIO_CORE_LIBRARIES}
+    PATHS /usr/local/lib
+          /usr/local/lib64
+          /usr/lib
+          /usr/lib64
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_CORE DEFAULT_MSG GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS)
+MARK_AS_ADVANCED(GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS)
diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake
new file mode 100644
index 000000000..3c21af91d
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/cmake/Modules/FindGruel.cmake
@@ -0,0 +1,26 @@
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(PC_GRUEL gnuradio-core QUIET)
+
+FIND_PATH(
+    GRUEL_INCLUDE_DIRS
+    NAMES gruel/attributes.h
+    HINTS $ENV{GRUEL_DIR}/include
+        ${PC_GRUEL_INCLUDE_DIRS}
+    PATHS /usr/local/include
+          /usr/include
+)
+
+FIND_LIBRARY(
+    GRUEL_LIBRARIES
+    NAMES gruel
+    HINTS $ENV{GRUEL_DIR}/lib
+        ${PC_GRUEL_LIBRARIES}
+    PATHS /usr/local/lib
+          /usr/local/lib64
+          /usr/lib
+          /usr/lib64
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GRUEL DEFAULT_MSG GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS)
+MARK_AS_ADVANCED(GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS)
diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/GrPlatform.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/GrPlatform.cmake
new file mode 100644
index 000000000..ce2e15fef
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/cmake/Modules/GrPlatform.cmake
@@ -0,0 +1,46 @@
+# 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.
+
+if(DEFINED __INCLUDED_GR_PLATFORM_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_PLATFORM_CMAKE TRUE)
+
+########################################################################
+# Setup additional defines for OS types
+########################################################################
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(LINUX TRUE)
+endif()
+
+if(LINUX AND EXISTS "/etc/debian_version")
+    set(DEBIAN TRUE)
+endif()
+
+if(LINUX AND EXISTS "/etc/redhat-release")
+    set(REDHAT TRUE)
+endif()
+
+########################################################################
+# when the library suffix should be 64 (applies to redhat linux family)
+########################################################################
+if(NOT DEFINED LIB_SUFFIX AND REDHAT AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$")
+    set(LIB_SUFFIX 64)
+endif()
+set(LIB_SUFFIX ${LIB_SUFFIX} CACHE STRING "lib directory suffix")
diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/GrPython.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/GrPython.cmake
new file mode 100644
index 000000000..da0590d42
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/cmake/Modules/GrPython.cmake
@@ -0,0 +1,177 @@
+# Copyright 2010-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.
+
+if(DEFINED __INCLUDED_GR_PYTHON_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_PYTHON_CMAKE TRUE)
+
+########################################################################
+# Setup the python interpreter:
+# This allows the user to specify a specific interpreter,
+# or finds the interpreter via the built-in cmake module.
+########################################################################
+#this allows the user to override PYTHON_EXECUTABLE
+if(PYTHON_EXECUTABLE)
+
+    set(PYTHONINTERP_FOUND TRUE)
+
+#otherwise if not set, try to automatically find it
+else(PYTHON_EXECUTABLE)
+
+    #use the built-in find script
+    find_package(PythonInterp)
+
+    #and if that fails use the find program routine
+    if(NOT PYTHONINTERP_FOUND)
+        find_program(PYTHON_EXECUTABLE NAMES python python2.7 python2.6 python2.5)
+        if(PYTHON_EXECUTABLE)
+            set(PYTHONINTERP_FOUND TRUE)
+        endif(PYTHON_EXECUTABLE)
+    endif(NOT PYTHONINTERP_FOUND)
+
+endif(PYTHON_EXECUTABLE)
+
+#make the path to the executable appear in the cmake gui
+set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "python interpreter")
+
+########################################################################
+# Check for the existence of a python module:
+# - desc a string description of the check
+# - mod the name of the module to import
+# - cmd an additional command to run
+# - have the result variable to set
+########################################################################
+macro(GR_PYTHON_CHECK_MODULE desc mod cmd have)
+    message(STATUS "")
+    message(STATUS "Python checking for ${desc}")
+    execute_process(
+        COMMAND ${PYTHON_EXECUTABLE} -c "
+#########################################
+try: import ${mod}
+except: exit(-1)
+try: assert ${cmd}
+except: exit(-1)
+#########################################"
+        RESULT_VARIABLE ${have}
+    )
+    if(${have} EQUAL 0)
+        message(STATUS "Python checking for ${desc} - found")
+        set(${have} TRUE)
+    else(${have} EQUAL 0)
+        message(STATUS "Python checking for ${desc} - not found")
+        set(${have} FALSE)
+    endif(${have} EQUAL 0)
+endmacro(GR_PYTHON_CHECK_MODULE)
+
+########################################################################
+# Sets the python installation directory GR_PYTHON_DIR
+########################################################################
+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
+from distutils import sysconfig
+print sysconfig.get_python_lib(plat_specific=True, prefix='')
+" OUTPUT_VARIABLE GR_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+file(TO_CMAKE_PATH ${GR_PYTHON_DIR} GR_PYTHON_DIR)
+
+########################################################################
+# Create an always-built target with a unique name
+# Usage: GR_UNIQUE_TARGET(<description> <dependencies list>)
+########################################################################
+function(GR_UNIQUE_TARGET desc)
+    file(RELATIVE_PATH reldir ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import re, hashlib
+unique = hashlib.md5('${reldir}${ARGN}').hexdigest()[:5]
+print(re.sub('\\W', '_', '${desc} ${reldir} ' + unique))"
+    OUTPUT_VARIABLE _target OUTPUT_STRIP_TRAILING_WHITESPACE)
+    add_custom_target(${_target} ALL DEPENDS ${ARGN})
+endfunction(GR_UNIQUE_TARGET)
+
+########################################################################
+# Install python sources (also builds and installs byte-compiled python)
+########################################################################
+function(GR_PYTHON_INSTALL)
+    include(CMakeParseArgumentsCopy)
+    CMAKE_PARSE_ARGUMENTS(GR_PYTHON_INSTALL "" "DESTINATION;COMPONENT" "FILES;PROGRAMS" ${ARGN})
+
+    ####################################################################
+    if(GR_PYTHON_INSTALL_FILES)
+    ####################################################################
+        install(${ARGN}) #installs regular python files
+
+        foreach(pyfile ${GR_PYTHON_INSTALL_FILES})
+            get_filename_component(pyfile_name ${pyfile} NAME)
+            get_filename_component(pyfile ${pyfile} ABSOLUTE)
+            string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" pycfile "${pyfile}c")
+            list(APPEND python_install_gen_targets ${pycfile})
+
+            get_filename_component(pycfile_path ${pycfile} PATH)
+            file(MAKE_DIRECTORY ${pycfile_path})
+
+            #create a command to generate the byte-compiled pyc file
+            add_custom_command(
+                OUTPUT ${pycfile} DEPENDS ${pyfile}
+                COMMAND ${PYTHON_EXECUTABLE} -c
+                \"import py_compile\; py_compile.compile(file='${pyfile}', cfile='${pycfile}', doraise=True)\"
+                COMMENT "Byte-compiling ${pyfile_name}"
+            )
+            install(FILES ${pycfile}
+                DESTINATION ${GR_PYTHON_INSTALL_DESTINATION}
+                COMPONENT ${GR_PYTHON_INSTALL_COMPONENT}
+            )
+        endforeach(pyfile)
+
+    ####################################################################
+    elseif(GR_PYTHON_INSTALL_PROGRAMS)
+    ####################################################################
+        file(TO_NATIVE_PATH ${PYTHON_EXECUTABLE} pyexe_native)
+
+        foreach(pyfile ${GR_PYTHON_INSTALL_PROGRAMS})
+            get_filename_component(pyfile_name ${pyfile} NAME)
+            get_filename_component(pyfile ${pyfile} ABSOLUTE)
+            string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" pyexefile "${pyfile}.exe")
+            list(APPEND python_install_gen_targets ${pyexefile})
+
+            get_filename_component(pyexefile_path ${pyexefile} PATH)
+            file(MAKE_DIRECTORY ${pyexefile_path})
+
+            add_custom_command(
+                OUTPUT ${pyexefile} DEPENDS ${pyfile}
+                COMMAND ${PYTHON_EXECUTABLE} -c
+                \"open('${pyexefile}', 'w').write('\#!${pyexe_native}\\n'+open('${pyfile}').read())\"
+                COMMENT "Shebangin ${pyfile_name}"
+            )
+
+            #on windows, python files need an extension to execute
+            get_filename_component(pyfile_ext ${pyfile} EXT)
+            if(WIN32 AND NOT pyfile_ext)
+                set(pyfile_name "${pyfile_name}.py")
+            endif()
+
+            install(PROGRAMS ${pyexefile} RENAME ${pyfile_name}
+                DESTINATION ${GR_PYTHON_INSTALL_DESTINATION}
+                COMPONENT ${GR_PYTHON_INSTALL_COMPONENT}
+            )
+        endforeach(pyfile)
+
+    endif()
+
+    GR_UNIQUE_TARGET("pygen" ${python_install_gen_targets})
+
+endfunction(GR_PYTHON_INSTALL)
diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/GrSwig.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/GrSwig.cmake
new file mode 100644
index 000000000..0fa1c7b77
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/cmake/Modules/GrSwig.cmake
@@ -0,0 +1,136 @@
+# Copyright 2010-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.
+
+if(DEFINED __INCLUDED_GR_SWIG_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_SWIG_CMAKE TRUE)
+
+include(GrPython)
+
+########################################################################
+# Build a swig target for the common gnuradio use case. Usage:
+# GR_SWIG_MAKE(target ifile ifile ifile...)
+#
+# Set the following variables before calling:
+#   - GR_SWIG_FLAGS
+#   - GR_SWIG_INCLUDE_DIRS
+#   - GR_SWIG_LIBRARIES
+#   - GR_SWIG_SOURCE_DEPS
+#   - GR_SWIG_TARGET_DEPS
+########################################################################
+macro(GR_SWIG_MAKE name)
+    set(ifiles ${ARGN})
+
+    #determine include dependencies for swig file
+    execute_process(
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/get_swig_deps.py
+        "${ifiles}" "${GR_SWIG_INCLUDE_DIRS}"
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        OUTPUT_VARIABLE SWIG_MODULE_${name}_EXTRA_DEPS
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
+    #append the specified include directories
+    include_directories(${GR_SWIG_INCLUDE_DIRS})
+    list(APPEND SWIG_MODULE_${name}_EXTRA_DEPS ${GR_SWIG_SOURCE_DEPS})
+
+    find_package(PythonLibs)
+    include_directories(${PYTHON_INCLUDE_DIRS})
+
+    #setup the swig flags with flags and include directories
+    set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -module ${name} ${GR_SWIG_FLAGS})
+    foreach(dir ${GR_SWIG_INCLUDE_DIRS})
+        list(APPEND CMAKE_SWIG_FLAGS "-I${dir}")
+    endforeach(dir)
+
+    #set the C++ property on the swig .i file so it builds
+    set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON)
+
+    #setup the actual swig library target to be built
+    include(UseSWIG)
+    SWIG_ADD_MODULE(${name} python ${ifiles})
+    SWIG_LINK_LIBRARIES(${name} ${PYTHON_LIBRARIES} ${GR_SWIG_LIBRARIES})
+    if(GR_SWIG_TARGET_DEPS)
+        add_dependencies(${SWIG_MODULE_${name}_REAL_NAME} ${GR_SWIG_TARGET_DEPS})
+    endif(GR_SWIG_TARGET_DEPS)
+
+endmacro(GR_SWIG_MAKE)
+
+########################################################################
+# Install swig targets generated by GR_SWIG_MAKE. Usage:
+# GR_SWIG_INSTALL(
+#   TARGETS target target target...
+#   [DESTINATION destination]
+#   [COMPONENT component]
+# )
+########################################################################
+macro(GR_SWIG_INSTALL)
+
+    include(CMakeParseArgumentsCopy)
+    CMAKE_PARSE_ARGUMENTS(GR_SWIG_INSTALL "" "DESTINATION;COMPONENT" "TARGETS" ${ARGN})
+
+    foreach(name ${GR_SWIG_INSTALL_TARGETS})
+        install(TARGETS ${SWIG_MODULE_${name}_REAL_NAME}
+            DESTINATION ${GR_SWIG_INSTALL_DESTINATION}
+            COMPONENT ${GR_SWIG_INSTALL_COMPONENT}
+        )
+
+        include(GrPython)
+        GR_PYTHON_INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.py
+            DESTINATION ${GR_SWIG_INSTALL_DESTINATION}
+            COMPONENT ${GR_SWIG_INSTALL_COMPONENT}
+        )
+    endforeach(name)
+
+endmacro(GR_SWIG_INSTALL)
+
+########################################################################
+# Generate a python file that can determine swig dependencies.
+# Used by the make macro above to determine extra dependencies.
+# When you build C++, CMake figures out the header dependencies.
+# This code essentially performs that logic for swig includes.
+########################################################################
+file(WRITE ${CMAKE_BINARY_DIR}/get_swig_deps.py "
+
+import os, sys, re
+
+include_matcher = re.compile('[#|%]include\\s*[<|\"](.*)[>|\"]')
+include_dirs = sys.argv[2].split(';')
+
+def get_swig_incs(file_path):
+    file_contents = open(file_path, 'r').read()
+    return include_matcher.findall(file_contents, re.MULTILINE)
+
+def get_swig_deps(file_path, level):
+    deps = [file_path]
+    if level == 0: return deps
+    for inc_file in get_swig_incs(file_path):
+        for inc_dir in include_dirs:
+            inc_path = os.path.join(inc_dir, inc_file)
+            if not os.path.exists(inc_path): continue
+            deps.extend(get_swig_deps(inc_path, level-1))
+    return deps
+
+if __name__ == '__main__':
+    ifiles = sys.argv[1].split(';')
+    deps = sum([get_swig_deps(ifile, 3) for ifile in ifiles], [])
+    #sys.stderr.write(';'.join(set(deps)) + '\\n\\n')
+    print(';'.join(set(deps)))
+")
diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/GrTest.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/GrTest.cmake
new file mode 100644
index 000000000..9ec3141f9
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/cmake/Modules/GrTest.cmake
@@ -0,0 +1,133 @@
+# Copyright 2010-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.
+
+if(DEFINED __INCLUDED_GR_TEST_CMAKE)
+    return()
+endif()
+set(__INCLUDED_GR_TEST_CMAKE TRUE)
+
+########################################################################
+# Add a unit test and setup the environment for a unit test.
+# Takes the same arguments as the ADD_TEST function.
+#
+# Before calling set the following variables:
+# GR_TEST_TARGET_DEPS  - built targets for the library path
+# GR_TEST_LIBRARY_DIRS - directories for the library path
+# GR_TEST_PYTHON_DIRS  - directories for the python path
+########################################################################
+function(GR_ADD_TEST test_name)
+
+    if(WIN32)
+        #Ensure that the build exe also appears in the PATH.
+        list(APPEND GR_TEST_TARGET_DEPS ${ARGN})
+
+        #In the land of windows, all libraries must be in the PATH.
+        #Since the dependent libraries are not yet installed,
+        #we must manually set them in the PATH to run tests.
+        #The following appends the path of a target dependency.
+        foreach(target ${GR_TEST_TARGET_DEPS})
+            get_target_property(location ${target} LOCATION)
+            if(location)
+                get_filename_component(path ${location} PATH)
+                string(REGEX REPLACE "\\$\\(.*\\)" ${CMAKE_BUILD_TYPE} path ${path})
+                list(APPEND GR_TEST_LIBRARY_DIRS ${path})
+            endif(location)
+        endforeach(target)
+
+        #SWIG generates the python library files into a subdirectory.
+        #Therefore, we must append this subdirectory into PYTHONPATH.
+        #Only do this for the python directories matching the following:
+        foreach(pydir ${GR_TEST_PYTHON_DIRS})
+            get_filename_component(name ${pydir} NAME)
+            if(name MATCHES "^(swig|lib|src)$")
+                list(APPEND GR_TEST_PYTHON_DIRS ${pydir}/${CMAKE_BUILD_TYPE})
+            endif()
+        endforeach(pydir)
+    endif(WIN32)
+
+    file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} srcdir)
+    file(TO_NATIVE_PATH "${GR_TEST_LIBRARY_DIRS}" libpath) #ok to use on dir list?
+    file(TO_NATIVE_PATH "${GR_TEST_PYTHON_DIRS}" pypath) #ok to use on dir list?
+
+    set(environs "GR_DONT_LOAD_PREFS=1" "srcdir=${srcdir}")
+
+    #http://www.cmake.org/pipermail/cmake/2009-May/029464.html
+    #Replaced this add test + set environs code with the shell script generation.
+    #Its nicer to be able to manually run the shell script to diagnose problems.
+    #ADD_TEST(${ARGV})
+    #SET_TESTS_PROPERTIES(${test_name} PROPERTIES ENVIRONMENT "${environs}")
+
+    if(UNIX)
+        set(binpath "${CMAKE_CURRENT_BINARY_DIR}:$PATH")
+        #set both LD and DYLD paths to cover multiple UNIX OS library paths
+        list(APPEND libpath "$LD_LIBRARY_PATH" "$DYLD_LIBRARY_PATH")
+        list(APPEND pypath "$PYTHONPATH")
+
+        #replace list separator with the path separator
+        string(REPLACE ";" ":" libpath "${libpath}")
+        string(REPLACE ";" ":" pypath "${pypath}")
+        list(APPEND environs "PATH=${binpath}" "LD_LIBRARY_PATH=${libpath}" "DYLD_LIBRARY_PATH=${libpath}" "PYTHONPATH=${pypath}")
+
+        #generate a bat file that sets the environment and runs the test
+        find_program(SHELL sh)
+        set(sh_file ${CMAKE_CURRENT_BINARY_DIR}/${test_name}_test.sh)
+        file(WRITE ${sh_file} "#!${SHELL}\n")
+        #each line sets an environment variable
+        foreach(environ ${environs})
+            file(APPEND ${sh_file} "export ${environ}\n")
+        endforeach(environ)
+        #load the command to run with its arguments
+        foreach(arg ${ARGN})
+            file(APPEND ${sh_file} "${arg} ")
+        endforeach(arg)
+        file(APPEND ${sh_file} "\n")
+
+        #make the shell file executable
+        execute_process(COMMAND chmod +x ${sh_file})
+
+        add_test(${test_name} ${SHELL} ${sh_file})
+
+    endif(UNIX)
+
+    if(WIN32)
+        list(APPEND libpath ${DLL_PATHS} "%PATH%")
+        list(APPEND pypath "%PYTHONPATH%")
+
+        #replace list separator with the path separator (escaped)
+        string(REPLACE ";" "\\;" libpath "${libpath}")
+        string(REPLACE ";" "\\;" pypath "${pypath}")
+        list(APPEND environs "PATH=${libpath}" "PYTHONPATH=${pypath}")
+
+        #generate a bat file that sets the environment and runs the test
+        set(bat_file ${CMAKE_CURRENT_BINARY_DIR}/${test_name}_test.bat)
+        file(WRITE ${bat_file} "@echo off\n")
+        #each line sets an environment variable
+        foreach(environ ${environs})
+            file(APPEND ${bat_file} "SET ${environ}\n")
+        endforeach(environ)
+        #load the command to run with its arguments
+        foreach(arg ${ARGN})
+            file(APPEND ${bat_file} "${arg} ")
+        endforeach(arg)
+        file(APPEND ${bat_file} "\n")
+
+        add_test(${test_name} ${bat_file})
+    endif(WIN32)
+
+endfunction(GR_ADD_TEST)
diff --git a/gr-howto-write-a-block-cmake/grc/CMakeLists.txt b/gr-howto-write-a-block-cmake/grc/CMakeLists.txt
new file mode 100644
index 000000000..cc43db7ba
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/grc/CMakeLists.txt
@@ -0,0 +1,24 @@
+# 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.
+
+install(FILES
+    howto_square_ff.xml
+    howto_square2_ff.xml
+    DESTINATION share/gnuradio/grc/blocks
+)
diff --git a/gr-howto-write-a-block-cmake/grc/howto_square2_ff.xml b/gr-howto-write-a-block-cmake/grc/howto_square2_ff.xml
new file mode 100644
index 000000000..c58ef0047
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/grc/howto_square2_ff.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<block>
+  <name>Square2</name>
+  <key>howto_square2_ff</key>
+  <category>HOWTO</category>
+  <import>import howto</import>
+  <make>howto.square2_ff()</make>
+
+  <sink>
+    <name>in</name>
+    <type>float</type>
+  </sink>
+
+  <source>
+    <name>out</name>
+    <type>float</type>
+  </source>
+</block>
diff --git a/gr-howto-write-a-block-cmake/grc/howto_square_ff.xml b/gr-howto-write-a-block-cmake/grc/howto_square_ff.xml
new file mode 100644
index 000000000..34a0b0a3f
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/grc/howto_square_ff.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<block>
+  <name>Square</name>
+  <key>howto_square_ff</key>
+  <category>HOWTO</category>
+  <import>import howto</import>
+  <make>howto.square_ff()</make>
+
+  <sink>
+    <name>in</name>
+    <type>float</type>
+  </sink>
+
+  <source>
+    <name>out</name>
+    <type>float</type>
+  </source>
+</block>
diff --git a/gr-howto-write-a-block-cmake/include/CMakeLists.txt b/gr-howto-write-a-block-cmake/include/CMakeLists.txt
new file mode 100644
index 000000000..475cc73c6
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/include/CMakeLists.txt
@@ -0,0 +1,28 @@
+# 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.
+
+########################################################################
+# Install public header files
+########################################################################
+install(FILES
+    howto_api.h
+    howto_square_ff.h
+    howto_square2_ff.h
+    DESTINATION include/howto
+)
diff --git a/gr-howto-write-a-block-cmake/include/howto_api.h b/gr-howto-write-a-block-cmake/include/howto_api.h
new file mode 100644
index 000000000..5263a1cf7
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/include/howto_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_HOWTO_API_H
+#define INCLUDED_HOWTO_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_howto_EXPORTS
+#  define HOWTO_API __GR_ATTR_EXPORT
+#else
+#  define HOWTO_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_HOWTO_API_H */
diff --git a/gr-howto-write-a-block-cmake/include/howto_square2_ff.h b/gr-howto-write-a-block-cmake/include/howto_square2_ff.h
new file mode 100644
index 000000000..c45a1851f
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/include/howto_square2_ff.h
@@ -0,0 +1,78 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_HOWTO_SQUARE2_FF_H
+#define INCLUDED_HOWTO_SQUARE2_FF_H
+
+#include <howto_api.h>
+#include <gr_sync_block.h>
+
+class howto_square2_ff;
+
+/*
+ * We use boost::shared_ptr's instead of raw pointers for all access
+ * to gr_blocks (and many other data structures).  The shared_ptr gets
+ * us transparent reference counting, which greatly simplifies storage
+ * management issues.  This is especially helpful in our hybrid
+ * C++ / Python system.
+ *
+ * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
+ *
+ * As a convention, the _sptr suffix indicates a boost::shared_ptr
+ */
+typedef boost::shared_ptr<howto_square2_ff> howto_square2_ff_sptr;
+
+/*!
+ * \brief Return a shared_ptr to a new instance of howto_square2_ff.
+ *
+ * To avoid accidental use of raw pointers, howto_square2_ff's
+ * constructor is private.  howto_make_square2_ff is the public
+ * interface for creating new instances.
+ */
+HOWTO_API howto_square2_ff_sptr howto_make_square2_ff ();
+
+/*!
+ * \brief square2 a stream of floats.
+ * \ingroup block
+ *
+ * This uses the preferred technique: subclassing gr_sync_block.
+ */
+class HOWTO_API howto_square2_ff : public gr_sync_block
+{
+private:
+  // The friend declaration allows howto_make_square2_ff to
+  // access the private constructor.
+
+  friend HOWTO_API howto_square2_ff_sptr howto_make_square2_ff ();
+
+  howto_square2_ff ();  	// private constructor
+
+ public:
+  ~howto_square2_ff ();	// public destructor
+
+  // Where all the action really happens
+
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_HOWTO_SQUARE2_FF_H */
diff --git a/gr-howto-write-a-block-cmake/include/howto_square_ff.h b/gr-howto-write-a-block-cmake/include/howto_square_ff.h
new file mode 100644
index 000000000..f07a1d4f6
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/include/howto_square_ff.h
@@ -0,0 +1,79 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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_HOWTO_SQUARE_FF_H
+#define INCLUDED_HOWTO_SQUARE_FF_H
+
+#include <howto_api.h>
+#include <gr_block.h>
+
+class howto_square_ff;
+
+/*
+ * We use boost::shared_ptr's instead of raw pointers for all access
+ * to gr_blocks (and many other data structures).  The shared_ptr gets
+ * us transparent reference counting, which greatly simplifies storage
+ * management issues.  This is especially helpful in our hybrid
+ * C++ / Python system.
+ *
+ * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
+ *
+ * As a convention, the _sptr suffix indicates a boost::shared_ptr
+ */
+typedef boost::shared_ptr<howto_square_ff> howto_square_ff_sptr;
+
+/*!
+ * \brief Return a shared_ptr to a new instance of howto_square_ff.
+ *
+ * To avoid accidental use of raw pointers, howto_square_ff's
+ * constructor is private.  howto_make_square_ff is the public
+ * interface for creating new instances.
+ */
+HOWTO_API howto_square_ff_sptr howto_make_square_ff ();
+
+/*!
+ * \brief square a stream of floats.
+ * \ingroup block
+ *
+ * \sa howto_square2_ff for a version that subclasses gr_sync_block.
+ */
+class HOWTO_API howto_square_ff : public gr_block
+{
+private:
+  // The friend declaration allows howto_make_square_ff to
+  // access the private constructor.
+
+  friend HOWTO_API howto_square_ff_sptr howto_make_square_ff ();
+
+  howto_square_ff ();  	// private constructor
+
+ public:
+  ~howto_square_ff ();	// public destructor
+
+  // Where all the action really happens
+
+  int general_work (int noutput_items,
+		    gr_vector_int &ninput_items,
+		    gr_vector_const_void_star &input_items,
+		    gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_HOWTO_SQUARE_FF_H */
diff --git a/gr-howto-write-a-block-cmake/lib/CMakeLists.txt b/gr-howto-write-a-block-cmake/lib/CMakeLists.txt
new file mode 100644
index 000000000..835ae02d6
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/lib/CMakeLists.txt
@@ -0,0 +1,54 @@
+# 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.
+
+########################################################################
+# Setup library
+########################################################################
+include(GrPlatform) #define LIB_SUFFIX
+
+add_library(gnuradio-howto SHARED howto_square_ff.cc howto_square2_ff.cc)
+target_link_libraries(gnuradio-howto ${Boost_LIBRARIES} ${GRUEL_LIBRARIES} ${GNURADIO_CORE_LIBRARIES})
+set_target_properties(gnuradio-howto PROPERTIES DEFINE_SYMBOL "gnuradio_howto_EXPORTS")
+
+########################################################################
+# Install built library files
+########################################################################
+install(TARGETS gnuradio-howto
+    LIBRARY DESTINATION lib${LIB_SUFFIX} # .so/.dylib file
+    ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
+    RUNTIME DESTINATION bin              # .dll file
+)
+
+########################################################################
+# Build and register unit test
+########################################################################
+find_package(Boost COMPONENTS unit_test_framework)
+
+include(GrTest)
+set(GR_TEST_TARGET_DEPS gnuradio-howto)
+#turn each test cpp file into an executable with an int main() function
+add_definitions(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN)
+
+add_executable(qa_howto_square_ff qa_howto_square_ff.cc)
+target_link_libraries(qa_howto_square_ff gnuradio-howto ${Boost_LIBRARIES})
+GR_ADD_TEST(qa_howto_square_ff qa_howto_square_ff)
+
+add_executable(qa_howto_square2_ff qa_howto_square2_ff.cc)
+target_link_libraries(qa_howto_square2_ff gnuradio-howto ${Boost_LIBRARIES})
+GR_ADD_TEST(qa_howto_square2_ff qa_howto_square2_ff)
diff --git a/gr-howto-write-a-block-cmake/lib/howto_square2_ff.cc b/gr-howto-write-a-block-cmake/lib/howto_square2_ff.cc
new file mode 100644
index 000000000..5e0fd7a43
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/lib/howto_square2_ff.cc
@@ -0,0 +1,92 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010 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.
+ */
+
+/*
+ * config.h is generated by configure.  It contains the results
+ * of probing for features, options etc.  It should be the first
+ * file included in your .cc file.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <howto_square2_ff.h>
+#include <gr_io_signature.h>
+
+/*
+ * Create a new instance of howto_square2_ff and return
+ * a boost shared_ptr.  This is effectively the public constructor.
+ */
+howto_square2_ff_sptr 
+howto_make_square2_ff ()
+{
+  return gnuradio::get_initial_sptr(new howto_square2_ff ());
+}
+
+/*
+ * Specify constraints on number of input and output streams.
+ * This info is used to construct the input and output signatures
+ * (2nd & 3rd args to gr_block's constructor).  The input and
+ * output signatures are used by the runtime system to
+ * check that a valid number and type of inputs and outputs
+ * are connected to this block.  In this case, we accept
+ * only 1 input and 1 output.
+ */
+static const int MIN_IN = 1;	// mininum number of input streams
+static const int MAX_IN = 1;	// maximum number of input streams
+static const int MIN_OUT = 1;	// minimum number of output streams
+static const int MAX_OUT = 1;	// maximum number of output streams
+
+/*
+ * The private constructor
+ */
+howto_square2_ff::howto_square2_ff ()
+  : gr_sync_block ("square2_ff",
+		   gr_make_io_signature (MIN_IN, MAX_IN, sizeof (float)),
+		   gr_make_io_signature (MIN_OUT, MAX_OUT, sizeof (float)))
+{
+  // nothing else required in this example
+}
+
+/*
+ * Our virtual destructor.
+ */
+howto_square2_ff::~howto_square2_ff ()
+{
+  // nothing else required in this example
+}
+
+int 
+howto_square2_ff::work (int noutput_items,
+			gr_vector_const_void_star &input_items,
+			gr_vector_void_star &output_items)
+{
+  const float *in = (const float *) input_items[0];
+  float *out = (float *) output_items[0];
+
+  for (int i = 0; i < noutput_items; i++){
+    out[i] = in[i] * in[i];
+  }
+
+  // Tell runtime system how many output items we produced.
+  return noutput_items;
+}
diff --git a/gr-howto-write-a-block-cmake/lib/howto_square_ff.cc b/gr-howto-write-a-block-cmake/lib/howto_square_ff.cc
new file mode 100644
index 000000000..f1d5a7848
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/lib/howto_square_ff.cc
@@ -0,0 +1,98 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010 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.
+ */
+
+/*
+ * config.h is generated by configure.  It contains the results
+ * of probing for features, options etc.  It should be the first
+ * file included in your .cc file.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <howto_square_ff.h>
+#include <gr_io_signature.h>
+
+/*
+ * Create a new instance of howto_square_ff and return
+ * a boost shared_ptr.  This is effectively the public constructor.
+ */
+howto_square_ff_sptr 
+howto_make_square_ff ()
+{
+  return gnuradio::get_initial_sptr(new howto_square_ff ());
+}
+
+/*
+ * Specify constraints on number of input and output streams.
+ * This info is used to construct the input and output signatures
+ * (2nd & 3rd args to gr_block's constructor).  The input and
+ * output signatures are used by the runtime system to
+ * check that a valid number and type of inputs and outputs
+ * are connected to this block.  In this case, we accept
+ * only 1 input and 1 output.
+ */
+static const int MIN_IN = 1;	// mininum number of input streams
+static const int MAX_IN = 1;	// maximum number of input streams
+static const int MIN_OUT = 1;	// minimum number of output streams
+static const int MAX_OUT = 1;	// maximum number of output streams
+
+/*
+ * The private constructor
+ */
+howto_square_ff::howto_square_ff ()
+  : gr_block ("square_ff",
+	      gr_make_io_signature (MIN_IN, MAX_IN, sizeof (float)),
+	      gr_make_io_signature (MIN_OUT, MAX_OUT, sizeof (float)))
+{
+  // nothing else required in this example
+}
+
+/*
+ * Our virtual destructor.
+ */
+howto_square_ff::~howto_square_ff ()
+{
+  // nothing else required in this example
+}
+
+int 
+howto_square_ff::general_work (int noutput_items,
+			       gr_vector_int &ninput_items,
+			       gr_vector_const_void_star &input_items,
+			       gr_vector_void_star &output_items)
+{
+  const float *in = (const float *) input_items[0];
+  float *out = (float *) output_items[0];
+
+  for (int i = 0; i < noutput_items; i++){
+    out[i] = in[i] * in[i];
+  }
+
+  // Tell runtime system how many input items we consumed on
+  // each input stream.
+
+  consume_each (noutput_items);
+
+  // Tell runtime system how many output items we produced.
+  return noutput_items;
+}
diff --git a/usrp2/host/lib/data_handler.cc b/gr-howto-write-a-block-cmake/lib/qa_howto_square2_ff.cc
index ba9123681..9c37b62c1 100644
--- a/usrp2/host/lib/data_handler.cc
+++ b/gr-howto-write-a-block-cmake/lib/qa_howto_square2_ff.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -19,14 +19,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <usrp2/data_handler.h>
+#include <boost/test/unit_test.hpp>
 
-namespace usrp2 {
-  
-  data_handler::~data_handler()
-  {
-    // default nop destructor
-  }
+BOOST_AUTO_TEST_CASE(qa_howto_square2_ff_t1){
+    BOOST_CHECK_EQUAL(2 + 2, 4);
+    // TODO BOOST_* test macros here
+}
 
+BOOST_AUTO_TEST_CASE(qa_howto_square2_ff_t2){
+    BOOST_CHECK_EQUAL(2 + 2, 4);
+    // TODO BOOST_* test macros here
 }
-  
diff --git a/usrp2/firmware/lib/abort.c b/gr-howto-write-a-block-cmake/lib/qa_howto_square_ff.cc
index d1d709392..da1d3040a 100644
--- a/usrp2/firmware/lib/abort.c
+++ b/gr-howto-write-a-block-cmake/lib/qa_howto_square_ff.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -19,14 +19,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <nonstdio.h>
+#include <boost/test/unit_test.hpp>
 
-extern void _exit(int status);
+BOOST_AUTO_TEST_CASE(qa_howto_square_ff_t1){
+    BOOST_CHECK_EQUAL(2 + 2, 4);
+    // TODO BOOST_* test macros here
+}
 
-void 
-abort(void)
-{
-  putstr("\n\nabort\n");
-  // FIXME loop blinking leds
-  _exit(-1);
+BOOST_AUTO_TEST_CASE(qa_howto_square_ff_t2){
+    BOOST_CHECK_EQUAL(2 + 2, 4);
+    // TODO BOOST_* test macros here
 }
diff --git a/gr-howto-write-a-block-cmake/python/CMakeLists.txt b/gr-howto-write-a-block-cmake/python/CMakeLists.txt
new file mode 100644
index 000000000..5da80ef15
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/python/CMakeLists.txt
@@ -0,0 +1,44 @@
+# 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.
+
+########################################################################
+# Include python install macros
+########################################################################
+include(GrPython)
+if(NOT PYTHONINTERP_FOUND)
+    return()
+endif()
+
+########################################################################
+# Install python sources
+########################################################################
+GR_PYTHON_INSTALL(
+    FILES
+    __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/howto
+)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+include(GrTest)
+
+set(GR_TEST_TARGET_DEPS gnuradio-howto)
+set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig)
+GR_ADD_TEST(qa_howto ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_howto.py)
diff --git a/gr-howto-write-a-block-cmake/python/__init__.py b/gr-howto-write-a-block-cmake/python/__init__.py
new file mode 100644
index 000000000..d4a41c271
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/python/__init__.py
@@ -0,0 +1,49 @@
+#
+# Copyright 2008,2009 Free Software Foundation, Inc.
+# 
+# This application 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.
+# 
+# This application 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+# The presence of this file turns this directory into a Python package
+
+# ----------------------------------------------------------------
+# Temporary workaround for ticket:181 (swig+python problem)
+import sys
+_RTLD_GLOBAL = 0
+try:
+    from dl import RTLD_GLOBAL as _RTLD_GLOBAL
+except ImportError:
+    try:
+	from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL
+    except ImportError:
+	pass
+    
+if _RTLD_GLOBAL != 0:
+    _dlopenflags = sys.getdlopenflags()
+    sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL)
+# ----------------------------------------------------------------
+
+
+# import swig generated symbols into the howto namespace
+from howto_swig import *
+
+# import any pure python here
+#
+
+# ----------------------------------------------------------------
+# Tail of workaround
+if _RTLD_GLOBAL != 0:
+    sys.setdlopenflags(_dlopenflags)      # Restore original flags
+# ----------------------------------------------------------------
diff --git a/gr-howto-write-a-block-cmake/python/qa_howto.py b/gr-howto-write-a-block-cmake/python/qa_howto.py
new file mode 100755
index 000000000..630f57bf4
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/python/qa_howto.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,2007 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.
+# 
+
+from gnuradio import gr, gr_unittest
+import howto_swig
+
+class qa_howto (gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test_001_square_ff (self):
+        src_data = (-3, 4, -5.5, 2, 3)
+        expected_result = (9, 16, 30.25, 4, 9)
+        src = gr.vector_source_f (src_data)
+        sqr = howto_swig.square_ff ()
+        dst = gr.vector_sink_f ()
+        self.tb.connect (src, sqr)
+        self.tb.connect (sqr, dst)
+        self.tb.run ()
+        result_data = dst.data ()
+        self.assertFloatTuplesAlmostEqual (expected_result, result_data, 6)
+
+    def test_002_square2_ff (self):
+        src_data = (-3, 4, -5.5, 2, 3)
+        expected_result = (9, 16, 30.25, 4, 9)
+        src = gr.vector_source_f (src_data)
+        sqr = howto_swig.square2_ff ()
+        dst = gr.vector_sink_f ()
+        self.tb.connect (src, sqr)
+        self.tb.connect (sqr, dst)
+        self.tb.run ()
+        result_data = dst.data ()
+        self.assertFloatTuplesAlmostEqual (expected_result, result_data, 6)
+        
+if __name__ == '__main__':
+    gr_unittest.main ()
diff --git a/gr-howto-write-a-block-cmake/swig/CMakeLists.txt b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt
new file mode 100644
index 000000000..676cc76ca
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/swig/CMakeLists.txt
@@ -0,0 +1,54 @@
+# 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.
+
+########################################################################
+# Include swig generation macros
+########################################################################
+find_package(SWIG)
+find_package(PythonLibs)
+if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND)
+    return()
+endif()
+include(GrSwig)
+include(GrPython)
+
+########################################################################
+# Setup swig generation
+########################################################################
+foreach(incdir ${GNURADIO_CORE_INCLUDE_DIRS})
+    list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/swig)
+endforeach(incdir)
+
+set(GR_SWIG_LIBRARIES gnuradio-howto)
+
+GR_SWIG_MAKE(howto_swig howto_swig.i)
+
+########################################################################
+# Install the build swig module
+########################################################################
+GR_SWIG_INSTALL(TARGETS howto_swig DESTINATION ${GR_PYTHON_DIR}/howto)
+
+########################################################################
+# Install swig .i files for development
+########################################################################
+install(
+    FILES
+    howto_swig.i
+    DESTINATION include/howto/swig
+)
diff --git a/gr-howto-write-a-block-cmake/swig/howto_swig.i b/gr-howto-write-a-block-cmake/swig/howto_swig.i
new file mode 100644
index 000000000..52100057c
--- /dev/null
+++ b/gr-howto-write-a-block-cmake/swig/howto_swig.i
@@ -0,0 +1,26 @@
+/* -*- c++ -*- */
+
+#define HOWTO_API
+
+%include "gnuradio.i"			// the common stuff
+
+%{
+#include "howto_square_ff.h"
+#include "howto_square2_ff.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(howto,square_ff);
+%include "howto_square_ff.h"
+
+GR_SWIG_BLOCK_MAGIC(howto,square2_ff);
+%include "howto_square2_ff.h"
+
+#if SWIGGUILE
+%scheme %{
+(load-extension-global "libguile-gnuradio-howto_swig" "scm_init_gnuradio_howto_swig_module")
+%}
+
+%goops %{
+(use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif
diff --git a/gr-howto-write-a-block/config/Makefile.am b/gr-howto-write-a-block/config/Makefile.am
index aaaf0db7c..7b7e5812e 100644
--- a/gr-howto-write-a-block/config/Makefile.am
+++ b/gr-howto-write-a-block/config/Makefile.am
@@ -46,7 +46,6 @@ m4macros = \
 	gr_check_createfilemapping.m4 \
 	gr_check_mc4020.m4 \
 	gr_check_shm_open.m4 \
-	gr_check_usrp.m4 \
 	gr_doxygen.m4 \
 	gr_fortran.m4 \
 	gr_git.m4 \
@@ -72,10 +71,7 @@ m4macros = \
 	lf_x11.m4 \
 	mkstemp.m4 \
 	onceonly.m4 \
-	pkg.m4 \
-	usrp_fusb_tech.m4 \
-	usrp_libusb.m4 \
-	usrp_sdcc.m4
+	pkg.m4
 
 
 # Don't install m4 macros anymore
diff --git a/gr-howto-write-a-block/version.sh b/gr-howto-write-a-block/version.sh
index 05ffe83b4..b17b4b366 100644
--- a/gr-howto-write-a-block/version.sh
+++ b/gr-howto-write-a-block/version.sh
@@ -1,4 +1,5 @@
 MAJOR_VERSION=3
-API_COMPAT=4
-MINOR_VERSION=2
+API_COMPAT=5
+MINOR_VERSION=0
 MAINT_VERSION=git
+
diff --git a/gr-msdd6000/.gitignore b/gr-msdd6000/.gitignore
deleted file mode 100644
index a37fc0c1a..000000000
--- a/gr-msdd6000/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile
-/Makefile.in
-/*.pc
diff --git a/gr-msdd6000/Makefile.am b/gr-msdd6000/Makefile.am
deleted file mode 100644
index 89405d08c..000000000
--- a/gr-msdd6000/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright 2008 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 2, 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = src
-
-pkgconfigdir = $(libdir)/pkgconfig
-dist_pkgconfig_DATA = gnuradio-msdd6000.pc
diff --git a/gr-msdd6000/doc/Softronics_Ltd_msdd6000_BlockDiagram.pdf b/gr-msdd6000/doc/Softronics_Ltd_msdd6000_BlockDiagram.pdf
deleted file mode 100644
index 34356da75..000000000
--- a/gr-msdd6000/doc/Softronics_Ltd_msdd6000_BlockDiagram.pdf
+++ /dev/null
diff --git a/gr-msdd6000/src/.gitignore b/gr-msdd6000/src/.gitignore
deleted file mode 100644
index 3b0356f86..000000000
--- a/gr-msdd6000/src/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/Makefile
-/Makefile.in
-/.libs
-/.deps
-/msdd.cc
-/msdd.py
-/msdd_rs.cc
-/msdd_rs.py
-/gnuradio
-/guile
-/python
diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am
deleted file mode 100644
index 91173702f..000000000
--- a/gr-msdd6000/src/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright 2007,2008,2009,2010 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 2, 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
-	$(WITH_INCLUDES)
-
-# C/C++ headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS =			\
-	msdd_source_simple.h		\
-	msdd_buffer_copy_behaviors.h	\
-	msdd6000.h			\
-	msdd_rs_source_simple.h		\
-	msdd6000_rs.h
-
-lib_LTLIBRARIES = libgnuradio-msdd6000.la \
-	libgnuradio-msdd6000_rs.la
-
-libgnuradio_msdd6000_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-libgnuradio_msdd6000_rs_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-libgnuradio_msdd6000_la_SOURCES = 	\
-	msdd_source_simple.cc		\
-	msdd6000.cc
-
-libgnuradio_msdd6000_rs_la_SOURCES = 	\
-	msdd_rs_source_simple.cc	\
-	msdd6000_rs.cc
-
-libgnuradio_msdd6000_la_LIBADD = 	\
-	$(GNURADIO_CORE_LA)
-
-libgnuradio_msdd6000_rs_la_LIBADD = 	\
-	$(GNURADIO_CORE_LA)
-
-
-#################################
-# SWIG interfaces and libraries
-
-TOP_SWIG_IFILES =			\
-	msdd.i msdd_rs.i
-
-# Install so that they end up available as:
-#   import gnuradio.msdd
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-msdd_pythondir_category =		\
-	gnuradio
-
-msdd_rs_pythondir_category =	\
-	gnuradio
-
-# additional libraries for linking with the SWIG-generated library
-msdd_la_swig_libadd =			\
-	libgnuradio-msdd6000.la
-
-msdd_rs_la_swig_libadd =			\
-	libgnuradio-msdd6000_rs.la
diff --git a/gr-msdd6000/src/Makefile.swig.gen b/gr-msdd6000/src/Makefile.swig.gen
deleted file mode 100644
index dbf137334..000000000
--- a/gr-msdd6000/src/Makefile.swig.gen
+++ /dev/null
@@ -1,290 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright 2009 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.
-# 
-
-# Makefile.swig.gen for msdd.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/msdd
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/msdd
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-msdd_pythondir_category ?= gnuradio/msdd
-msdd_pylibdir_category ?= $(msdd_pythondir_category)
-msdd_pythondir = $(pythondir)/$(msdd_pythondir_category)
-msdd_pylibdir = $(pyexecdir)/$(msdd_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-msdd_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/msdd
-# FIXME: determince whether these should be installed with gnuradio.
-msdd_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-msdd_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-msdd_swiginclude_HEADERS =		\
-	msdd.i			\
-	$(msdd_swiginclude_headers)
-
-if PYTHON
-msdd_pylib_LTLIBRARIES =		\
-	_msdd.la
-
-_msdd_la_SOURCES = 			\
-	python/msdd.cc		\
-	$(msdd_la_swig_sources)
-
-msdd_python_PYTHON =			\
-	msdd.py			\
-	$(msdd_python)
-
-_msdd_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(msdd_la_swig_libadd)
-
-_msdd_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(msdd_la_swig_ldflags)
-
-_msdd_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(msdd_la_swig_cxxflags)
-
-python/msdd.cc: msdd.py
-msdd.py: msdd.i
-
-# Include the python dependencies for this file
--include python/msdd.d
-
-endif		# end of if python
-
-if GUILE
-
-msdd_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-msdd.la
-libguile_gnuradio_msdd_la_SOURCES =	\
-	guile/msdd.cc			\
-	$(msdd_la_swig_sources)
-nobase_msdd_scm_DATA = 		\
-	gnuradio/msdd.scm 		\
-	gnuradio/msdd-primitive.scm
-libguile_gnuradio_msdd_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(msdd_la_swig_libadd)
-libguile_gnuradio_msdd_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(msdd_la_swig_ldflags)
-libguile_gnuradio_msdd_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(msdd_la_swig_cxxflags)
-
-guile/msdd.cc: gnuradio/msdd.scm
-gnuradio/msdd.scm: msdd.i
-gnuradio/msdd-primitive.scm: gnuradio/msdd.scm
-
-# Include the guile dependencies for this file
--include guile/msdd.d
-
-endif				# end of GUILE
-
-
-# -*- Makefile -*-
-#
-# Copyright 2009 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.
-# 
-
-# Makefile.swig.gen for msdd_rs.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/msdd_rs
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/msdd_rs
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-msdd_rs_pythondir_category ?= gnuradio/msdd_rs
-msdd_rs_pylibdir_category ?= $(msdd_rs_pythondir_category)
-msdd_rs_pythondir = $(pythondir)/$(msdd_rs_pythondir_category)
-msdd_rs_pylibdir = $(pyexecdir)/$(msdd_rs_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-msdd_rs_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/msdd_rs
-# FIXME: determince whether these should be installed with gnuradio.
-msdd_rs_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-msdd_rs_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-msdd_rs_swiginclude_HEADERS =		\
-	msdd_rs.i			\
-	$(msdd_rs_swiginclude_headers)
-
-if PYTHON
-msdd_rs_pylib_LTLIBRARIES =		\
-	_msdd_rs.la
-
-_msdd_rs_la_SOURCES = 			\
-	python/msdd_rs.cc		\
-	$(msdd_rs_la_swig_sources)
-
-msdd_rs_python_PYTHON =			\
-	msdd_rs.py			\
-	$(msdd_rs_python)
-
-_msdd_rs_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(msdd_rs_la_swig_libadd)
-
-_msdd_rs_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(msdd_rs_la_swig_ldflags)
-
-_msdd_rs_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(msdd_rs_la_swig_cxxflags)
-
-python/msdd_rs.cc: msdd_rs.py
-msdd_rs.py: msdd_rs.i
-
-# Include the python dependencies for this file
--include python/msdd_rs.d
-
-endif		# end of if python
-
-if GUILE
-
-msdd_rs_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-msdd_rs.la
-libguile_gnuradio_msdd_rs_la_SOURCES =	\
-	guile/msdd_rs.cc			\
-	$(msdd_rs_la_swig_sources)
-nobase_msdd_rs_scm_DATA = 		\
-	gnuradio/msdd_rs.scm 		\
-	gnuradio/msdd_rs-primitive.scm
-libguile_gnuradio_msdd_rs_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(msdd_rs_la_swig_libadd)
-libguile_gnuradio_msdd_rs_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(msdd_rs_la_swig_ldflags)
-libguile_gnuradio_msdd_rs_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(msdd_rs_la_swig_cxxflags)
-
-guile/msdd_rs.cc: gnuradio/msdd_rs.scm
-gnuradio/msdd_rs.scm: msdd_rs.i
-gnuradio/msdd_rs-primitive.scm: gnuradio/msdd_rs.scm
-
-# Include the guile dependencies for this file
--include guile/msdd_rs.d
-
-endif				# end of GUILE
-
-
diff --git a/gr-msdd6000/src/README b/gr-msdd6000/src/README
deleted file mode 100644
index 230b7b6cf..000000000
--- a/gr-msdd6000/src/README
+++ /dev/null
@@ -1,34 +0,0 @@
-This block implements an interface between the Softronics MSDD6000 and GR
-
-Jul 13, 2008
-
-Tools / Waveforms
-	
-
-	- python-examples/new_msdd/fft.py
-		A clone of the original usrp_fft.py
-		adapted to work with the new msdd.source_simple
-		source block.
-		run ./new_msdd_fft.py -W 
-		for waterfall mode.
-		
-
-GNU Radio Blocks,
-
-	- msdd.source_simple
-		this block produces a stream of
-		interleaved complex shorts and 
-		currently works with FAPP.LDR
-		
-		if you want complex floats,
-		put a gr.interleaved_short_to_complex()
-		block immidiately following.
-
-	
-	- msdd.source_s / source_c / source_base
-		These were written with the
-		old TCP based app.ldr protocol
-		and will no longer work.
-		data was never streamed
-		without discontinuities
-		through this method.
diff --git a/gr-msdd6000/src/msdd.i b/gr-msdd6000/src/msdd.i
deleted file mode 100644
index 935bf2b58..000000000
--- a/gr-msdd6000/src/msdd.i
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009 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.
- */
-
-%include "gnuradio.i"	// the common stuff
-
-%{
-#include "msdd_source_simple.h"
-%}
-
-
-GR_SWIG_BLOCK_MAGIC(msdd,source_simple)
-
-msdd_source_simple_sptr
-msdd_make_source_simple (
-	const char *src,
-	unsigned short port_src
-	);
-
-class msdd_source_simple : public gr_sync_block {
-  protected:
-    msdd_source_simple(
-	const char *src,
-	unsigned short port_src
-	);
- 
-  public:
-    ~msdd_source_c(); 
-  int work (int noutput_items,
-      gr_vector_const_void_star &input_items,
-      gr_vector_void_star &output_items);
-
-  bool start();
-  bool stop();
-
-  long adc_freq();
-  int decim_rate();
-  gr_vector_int gain_range();
-  gr_vector_float freq_range();
-
-  bool set_decim_rate(unsigned int);
-  bool set_rx_freq(int,double);
-  bool set_pga(int,double);
-  
-
-  };
diff --git a/gr-msdd6000/src/msdd6000.cc b/gr-msdd6000/src/msdd6000.cc
deleted file mode 100644
index f0a13936c..000000000
--- a/gr-msdd6000/src/msdd6000.cc
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <msdd6000.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#define DEBUG(A)	printf("=debug=> %s\n", A)
-
-static void 
-optimize_socket(int socket);
-
-/*
- * Holds types that need autoconf help.  They're here and not in the .h file because
- * here we've got access to config.h
- */
-class MSDD6000::detail {
-public:
-  struct sockaddr_in d_sockaddr;
-};
-
-
-MSDD6000::MSDD6000(char* addr)
-  : d_detail(new MSDD6000::detail())
-{
-	d_sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
-	
-	optimize_socket(d_sock);
-	
-	
-	// set up remote sockaddr
-//	int s = inet_aton(addr, &d_adx); 
-	d_detail->d_sockaddr.sin_family = AF_INET;
-	d_detail->d_sockaddr.sin_port = htons(10000);
-	int s = inet_aton(addr, &d_detail->d_sockaddr.sin_addr);
-	
-	// set up local sockaddr
-	struct in_addr d_myadx;
-	struct sockaddr_in d_mysockaddr;
-	short int port = 10010;
-	d_myadx.s_addr = INADDR_ANY;
-	d_mysockaddr.sin_family = AF_INET;
-	d_mysockaddr.sin_port = htons(port);
-	memcpy(&d_mysockaddr.sin_addr.s_addr, &d_myadx.s_addr, sizeof(in_addr));
-	//d_sockaddr.sin_addr = INADDR_ANY;
-	s = bind(d_sock, (const sockaddr*) &d_mysockaddr, sizeof(d_mysockaddr));
-	
-	// set default values
-	d_decim = 2;
-	d_ddc_gain = 2;
-	d_rf_attn = 0;
-	d_state = STATE_STOPPED;
-}
-
-MSDD6000::~MSDD6000()
-{
-    // printf("MSDD6000::Destructing\n");
-    close(d_sock);
-}
-
-
-static void
-optimize_socket(int socket){
-#define BANDWIDTH	1000000000/8
-#define DELAY		0.5
-	int ret;
-
-	int sock_buf_size = static_cast<int>(2*BANDWIDTH*DELAY);
-	char textbuf[512];
-	snprintf(textbuf, sizeof(textbuf), "%d", sock_buf_size);
-	printf("sock_buf_size = %d\n", sock_buf_size);
-	
-	ret = setsockopt(socket, SOL_SOCKET, SO_SNDBUF,
-			 &sock_buf_size, sizeof(sock_buf_size));
-
-	ret = setsockopt(socket, SOL_SOCKET, SO_RCVBUF,
-			 &sock_buf_size, sizeof(sock_buf_size));
-	
-	int uid = getuid();
-	if(uid!=0){
-		printf(" ****** COULD NOT OPTIMIZE SYSTEM NETWORK PARAMETERS BECAUSE YOU ARE NOT RUNNING AS ROOT *******\n ****** YOUR MSDD6000 RECIEVER PERFORMANCE IS GOING TO BE TERRIBLE *******\n");
-		return;
-	}
-
-
-	// SET UP SOME SYSTEM WIDE TCP SOCKET PARAMETERS
-	// FIXME seems like kind of a big hammer.  Are you sure you need this?
-	FILE* fd = fopen("/proc/sys/net/core/netdev_max_backlog", "w");
-	if (fd){
-	  fwrite("10000", 1, strlen("10000"), fd);
-	  fclose(fd);
-	}
-
-	fd = fopen("/proc/sys/net/core/rmem_max", "w");
-	if (fd){
-	  fwrite(textbuf, 1, strlen(textbuf), fd);
-	  fclose(fd);
-	}
-
-	fd = fopen("/proc/sys/net/core/wmem_max", "w");
-	if (fd){
-	  fwrite(textbuf, 1, strlen(textbuf), fd);
-	  fclose(fd);
-	}
-
-	// just incase these were rejected before because of max sizes...
-
-	ret = setsockopt( socket, SOL_SOCKET, SO_SNDBUF,
-                   (char *)&sock_buf_size, sizeof(sock_buf_size) );
-
-	ret = setsockopt( socket, SOL_SOCKET, SO_RCVBUF,
-                   (char *)&sock_buf_size, sizeof(sock_buf_size) );
-	
-}
-
-
-void MSDD6000::set_decim(int decim_pow2){
-	DEBUG("SETTING NEW DECIM");
-	d_decim = decim_pow2;
-
-	if(d_state==STATE_STARTED)
-		send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_decim, d_offset_hz);
-}
-
-void MSDD6000::set_rf_attn(int attn){
-	DEBUG("SETTING NEW RF ATTN");
-	d_rf_attn = attn;
-	if(d_state==STATE_STARTED)
-		send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_decim, d_offset_hz);
-}
-
-void MSDD6000::set_ddc_gain(int gain){
-	DEBUG("SETTING NEW DDC GAIN");
-	d_ddc_gain = gain;
-	if(d_state==STATE_STARTED)
-		send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_decim, d_offset_hz);
-}
-
-void MSDD6000::set_fc(int center_mhz, int offset_hz){
-	DEBUG("SETTING NEW FC");
-	d_fc_mhz = center_mhz;
-	d_offset_hz = offset_hz;
-	
-	if(d_state==STATE_STARTED)
-		send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_decim, d_offset_hz);
-}
-
-
-void MSDD6000::start(){
-	send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_decim, d_offset_hz);
-	d_state = STATE_STARTED;
-	}
-
-
-void MSDD6000::stop(){
-	// new request with 0 decim tells it to halt
-	send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, 0, d_offset_hz);
-	d_state = STATE_STOPPED;
-	}
-
-
-void MSDD6000::send_request(float freq_mhz, float rf_attn, float ddc_gain, float ddc_dec, float ddc_offset_hz){
-	static char buff[512];
-	sprintf(buff, "%f %f %f %f %f\n",freq_mhz, rf_attn, ddc_gain, ddc_dec, ddc_offset_hz);
-	printf("sending: %s\n", buff);
-        int flags = 0;
-	sendto( d_sock, buff, strlen(buff)+1, flags,
-		(const sockaddr*)&(d_detail->d_sockaddr), sizeof(d_detail->d_sockaddr));
-	}
-
-
-int  MSDD6000::read(char* buf, int size){
-	int flags = 0;
-	return recv(d_sock, buf, size, flags);
-	}
-
-
diff --git a/gr-msdd6000/src/msdd6000.h b/gr-msdd6000/src/msdd6000.h
deleted file mode 100644
index 808a8386f..000000000
--- a/gr-msdd6000/src/msdd6000.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef MSDD6000_H
-#define MSDD6000_H
-
-#include <boost/scoped_ptr.hpp>
-
-class MSDD6000 {
-  class detail;
-
-  //! holds objects with system dependent types
-  boost::scoped_ptr<detail>	d_detail;  
-
-public:
-
-  enum state {
-    STATE_STOPPED, STATE_STARTED,
-  };
-
-  MSDD6000(char* ip_addr);
-  ~MSDD6000();
-
-  void set_decim(int decim_pow2);
-  void set_fc(int center_mhz, int offset_hz);	
-  void set_ddc_gain(int gain);
-  void set_rf_attn(int attn);
-
-  void set_output(int mode, void* arg);
-
-  void start();
-  void stop();
-	
-  void send_request(float,float,float,float,float);	
-  int read(char*, int);
-
-  int d_decim;
-  int d_fc_mhz;
-  int d_offset_hz;
-  int d_rf_attn;
-  int d_ddc_gain;
-  int d_sock;
-  state d_state;
-
-};
-
-
-#endif
diff --git a/gr-msdd6000/src/msdd6000_rs.cc b/gr-msdd6000/src/msdd6000_rs.cc
deleted file mode 100644
index d78f2b4da..000000000
--- a/gr-msdd6000/src/msdd6000_rs.cc
+++ /dev/null
@@ -1,286 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <msdd6000_rs.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#define DEBUG(A)	printf("=debug=> %s\n", A)
-
-static void 
-optimize_socket(int socket);
-
-/*
- * Holds types that need autoconf help.  They're here and not in the .h file because
- * here we've got access to config.h
- */
-class MSDD6000_RS::detail {
-public:
-  struct sockaddr_in d_sockaddr;
-};
-
-
-MSDD6000_RS::MSDD6000_RS(char* addr)
-  : d_detail(new MSDD6000_RS::detail())
-{
-	d_sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
-	
-	optimize_socket(d_sock);
-	
-	
-	// set up remote sockaddr
-//	int s = inet_aton(addr, &d_adx); 
-	d_detail->d_sockaddr.sin_family = AF_INET;
-	d_detail->d_sockaddr.sin_port = htons(10000);
-	int s = inet_aton(addr, &d_detail->d_sockaddr.sin_addr);
-	
-	// set up local sockaddr
-	struct in_addr d_myadx;
-	struct sockaddr_in d_mysockaddr;
-	short int port = 10010;
-	d_myadx.s_addr = INADDR_ANY;
-	d_mysockaddr.sin_family = AF_INET;
-	d_mysockaddr.sin_port = htons(port);
-	memcpy(&d_mysockaddr.sin_addr.s_addr, &d_myadx.s_addr, sizeof(in_addr));
-	//d_sockaddr.sin_addr = INADDR_ANY;
-	s = bind(d_sock, (const sockaddr*) &d_mysockaddr, sizeof(d_mysockaddr));
-	
-	// set default values
-	//d_decim = 2;
-	d_ddc_gain 	= 2;
-	d_rf_attn 	= 0;
-	d_fc_mhz  	= 3500;
-	d_offset_hz = 0;
-        d_ddc_gain  = 0;
-        d_ddc_sample_rate_khz = 25600;
-        d_ddc_bw_khz          = 25600;
-        d_start               = 0;
-	d_state = STATE_STOPPED;
-}
-
-MSDD6000_RS::~MSDD6000_RS()
-{
-	//printf("MSDD6000_RS::Destructing\n");
-	close(d_sock);
-}
-
-
-static void
-optimize_socket(int socket){
-#define BANDWIDTH	1000000000/8
-#define DELAY		0.5
-	int ret;
-
-	int sock_buf_size = static_cast<int>(2*BANDWIDTH*DELAY);
-	char textbuf[512];
-	snprintf(textbuf, sizeof(textbuf), "%d", sock_buf_size);
-	printf("sock_buf_size = %d\n", sock_buf_size);
-	
-	ret = setsockopt(socket, SOL_SOCKET, SO_SNDBUF,
-			 &sock_buf_size, sizeof(sock_buf_size));
-
-	ret = setsockopt(socket, SOL_SOCKET, SO_RCVBUF,
-			 &sock_buf_size, sizeof(sock_buf_size));
-	
-	int uid = getuid();
-	if(uid!=0){
-		printf(" ****** COULD NOT OPTIMIZE SYSTEM NETWORK PARAMETERS BECAUSE YOU ARE NOT RUNNING AS ROOT *******\n ****** YOUR MSDD6000_RS RECIEVER PERFORMANCE IS GOING TO BE TERRIBLE *******\n");
-		return;
-	}
-
-
-	// SET UP SOME SYSTEM WIDE TCP SOCKET PARAMETERS
-	// FIXME seems like kind of a big hammer.  Are you sure you need this?
-	FILE* fd = fopen("/proc/sys/net/core/netdev_max_backlog", "w");
-	if (fd){
-	  fwrite("10000", 1, strlen("10000"), fd);
-	  fclose(fd);
-	}
-
-	fd = fopen("/proc/sys/net/core/rmem_max", "w");
-	if (fd){
-	  fwrite(textbuf, 1, strlen(textbuf), fd);
-	  fclose(fd);
-	}
-
-	fd = fopen("/proc/sys/net/core/wmem_max", "w");
-	if (fd){
-	  fwrite(textbuf, 1, strlen(textbuf), fd);
-	  fclose(fd);
-	}
-
-	// just incase these were rejected before because of max sizes...
-
-	ret = setsockopt( socket, SOL_SOCKET, SO_SNDBUF,
-                   (char *)&sock_buf_size, sizeof(sock_buf_size) );
-
-	ret = setsockopt( socket, SOL_SOCKET, SO_RCVBUF,
-                   (char *)&sock_buf_size, sizeof(sock_buf_size) );
-	
-}
-
-
-//void MSDD6000_RS::set_decim(int decim_pow2){
-//	DEBUG("SETTING NEW DECIM");
-//	d_decim = decim_pow2;
-//
-//	if(d_state==STATE_STARTED)
-//		send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_decim, d_offset_hz);
-//}
-
-void MSDD6000_RS::set_rf_attn(int attn){
-	DEBUG("SETTING NEW RF ATTN");
-	d_rf_attn = attn;
-	if(d_state==STATE_STARTED)
-		send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_offset_hz, d_ddc_sample_rate_khz, d_ddc_bw_khz, d_start);
-}
-
-void MSDD6000_RS::set_ddc_gain(int gain){
-	DEBUG("SETTING NEW DDC GAIN");
-	d_ddc_gain = gain;
-	if(d_state==STATE_STARTED)
-		send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_offset_hz, d_ddc_sample_rate_khz, d_ddc_bw_khz, d_start);
-}
-
-void MSDD6000_RS::set_fc(int center_mhz, int offset_hz){
-	DEBUG("SETTING NEW FC");
-	d_fc_mhz = center_mhz;
-	d_offset_hz = offset_hz;
-	
-	send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_offset_hz, d_ddc_sample_rate_khz, d_ddc_bw_khz, d_start);
-//	if(d_state==STATE_STARTED)
-//		send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_decim, d_offset_hz);
-//		send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_ddc_sample_rate_khz, d_ddc_bw_khz, d_start);
-//		
-}
-
-void MSDD6000_RS::set_ddc_samp_rate(float sample_rate_khz){
-	DEBUG("SETTING NEW SAMPLE RATE");
-	d_ddc_sample_rate_khz = sample_rate_khz;
-	send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_offset_hz, d_ddc_sample_rate_khz, d_ddc_bw_khz, d_start);		
-}
-
-void MSDD6000_RS::set_ddc_bw(float bw_khz){
-	DEBUG("SETTING NEW DDC BW");
-	d_ddc_bw_khz = bw_khz;
-	send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_offset_hz, d_ddc_sample_rate_khz, d_ddc_bw_khz, d_start);		
-}
-
-void MSDD6000_RS::start(){
-    send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_offset_hz, d_ddc_sample_rate_khz, d_ddc_bw_khz, d_start);       
-    return;
-}
-
-void MSDD6000_RS::stop(){
-	// new request with 0 decim tells it to halt
-	stop_data();
-}
-
-
-int MSDD6000_RS::start_data(){
-	d_start = 1;
-	send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_offset_hz, d_ddc_sample_rate_khz, d_ddc_bw_khz, d_start);	
-	d_state = STATE_STARTED;
-    return 0;
-	}
-
-
-int MSDD6000_RS::stop_data(){
-	// new request with 0 decim tells it to halt
-	d_start = 0;
-	send_request(d_fc_mhz, d_rf_attn, d_ddc_gain, d_offset_hz, d_ddc_sample_rate_khz, d_ddc_bw_khz, d_start);	
-	d_state = STATE_STOPPED;
-    return 0;
-	}
-	
-/* Query functions */
-float MSDD6000_RS::pull_ddc_samp_rate(){
-  return d_ddc_sample_rate_khz;
-}
-float MSDD6000_RS::pull_ddc_bw(){
-	return d_ddc_bw_khz;
-}
-
-float MSDD6000_RS::pull_rx_freq(){
-	return d_fc_mhz;
-}
-int   MSDD6000_RS::pull_ddc_gain(){
-	return d_ddc_gain;
-}
-
-int   MSDD6000_RS::pull_rf_atten(){
-	return d_rf_attn;
-}
-
-
-void MSDD6000_RS::send_request(float freq_mhz, float rf_attn, float ddc_gain, float ddc_offset_hz, float ddc_samp_rate_khz, float ddc_input_bw_khz, float ddc_start){
-	static char buff[512];
-	// Send MSDD6000_RS control frame.
-	sprintf(buff, "%f %f %f %f %f %f %f\n",freq_mhz, rf_attn, ddc_gain, ddc_offset_hz, ddc_samp_rate_khz, ddc_input_bw_khz, ddc_start); //ddc_dec, ddc_offset_hz);
-	printf("sending: %s\n", buff);
-        int flags = 0;
-	sendto( d_sock, buff, strlen(buff)+1, flags,
-		(const sockaddr*)&(d_detail->d_sockaddr), sizeof(d_detail->d_sockaddr));
-	}
-
-
-int  MSDD6000_RS::read(char* buf, int size){
-	int flags = 0;
-	return recv(d_sock, buf, size, flags);
-	}
-	
-int MSDD6000_RS::parse_control(char* buf, int size){
-    //packet_len = sprintf(&txbuff[6], "%f %f %f %f %f %f %f",downsamp,ddc_dec_rate,ddc_step_int,ddc_step_frac,ddc_samp_rate_khz,ddc_input_bw_khz,ddc_start);    
-
-    float downsamp;
-    float ddc_dec_rate;
-    float ddc_step_int;
-    float ddc_step_frac;
-    float ddc_samp_rate_khz;
-    float ddc_input_bw_khz;
-    float ddc_start;
-
-    sscanf(&buf[6],"%f %f %f %f %f %f %f",&downsamp,&ddc_dec_rate,&ddc_step_int,&ddc_step_frac,&ddc_samp_rate_khz,&ddc_input_bw_khz,&ddc_start);
-  
-    // pull off sample rate  
-    d_ddc_sample_rate_khz = ddc_samp_rate_khz;
-    printf("Sample Rate %f\n",d_ddc_sample_rate_khz);
-    // pull off bw
-    d_ddc_bw_khz  =  ddc_input_bw_khz;
-    printf("BW %f\n", d_ddc_bw_khz);
-    return 0;
-}
-
-
diff --git a/gr-msdd6000/src/msdd6000_rs.h b/gr-msdd6000/src/msdd6000_rs.h
deleted file mode 100644
index 4be4624be..000000000
--- a/gr-msdd6000/src/msdd6000_rs.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef MSDD_RS__RS_6000_H
-#define MSDD_RS__RS_6000_H
-
-#include <boost/scoped_ptr.hpp>
-
-class MSDD6000_RS {
-  class detail;
-
-  //! holds objects with system dependent types
-  boost::scoped_ptr<detail>	d_detail;  
-
-public:
-
-  enum state {
-    STATE_STOPPED, STATE_STARTED
-  };
-
-  MSDD6000_RS(char* ip_addr);
-  ~MSDD6000_RS();
-
-  /* set functions -- sets digitizer parameters */
- 
- // void set_output(int mode, void* arg);
-
-  void set_rf_attn(int attn);
-  void set_ddc_gain(int gain);
-  void set_fc(int center_mhz, int offset_hz);
-  void set_ddc_samp_rate(float sample_rate_khz);
-  void set_ddc_bw(float bw_khz);
-
-  void start();
-  void stop();
-
-  /* function starts the flow of data from the digitizer */
-  int start_data();
-  /* function stops the flow of data from the digitizer */
-  int stop_data();
-  
-  /* query functions -- queries digitizer 'actual' parameters */
-  float pull_ddc_samp_rate();
-  float pull_ddc_bw();
-  float pull_rx_freq();
-  int   pull_ddc_gain();
-  int   pull_rf_atten();
-	
-  void send_request(float,float,float,float,float,float,float);	
-  int read(char*, int);
-
-  int parse_control(char*, int);
-
-private:
-  // parameters for a receiver object.
-  int   d_fc_mhz;
-  int   d_offset_hz;
-  int   d_rf_attn;
-  int   d_ddc_gain;
-  float d_ddc_sample_rate_khz;
-  float d_ddc_bw_khz;
-  int   d_start;
-  int   d_sock;
-  state d_state;
-
-};
-
-
-#endif
diff --git a/gr-msdd6000/src/msdd_buffer_copy_behaviors.h b/gr-msdd6000/src/msdd_buffer_copy_behaviors.h
deleted file mode 100644
index 398f8ae66..000000000
--- a/gr-msdd6000/src/msdd_buffer_copy_behaviors.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef MSDD_BUFFER_COPY_BEHAVIORS_H_
-#define MSDD_BUFFER_COPY_BEHAVIORS_H_
-
-namespace msdd {
-	
-	class BufferCopyBehavior 
-	  {
-	  public: 
-	    virtual void operator() (gr_vector_void_star &a, const void * b, unsigned int output_index, unsigned int nitems) = 0;
-	    virtual ~BufferCopyBehavior() {};
-	  };
-	  
-	template <class Tin, class Tout> 
-	class BufferCopyBehaviorGeneric : public BufferCopyBehavior {
-		void operator() (gr_vector_void_star &a, const void * b, unsigned int output_index, unsigned int nitems) {
-			Tout 	*out(&(reinterpret_cast<Tout *>(a[0]))[output_index]);	// sloppy
-			const Tin 	*in(reinterpret_cast<const Tin *>(b)); // equisloppy
-			
-		    for (unsigned int i = 0; i < nitems; ++i) {
-		    	out[i] = in[i];
-		    }
-		}
-	};
-	
-	template <class Tin>
-	class BufferCopyBehaviorComplex : public BufferCopyBehavior {
-		void operator() (gr_vector_void_star &a, const void * b, unsigned int output_index, unsigned int nitems) {
-		gr_complex 	*out(&(reinterpret_cast<gr_complex *>(a[0]))[output_index]);	// sloppy
-		const Tin 	*in(reinterpret_cast<const Tin *>(b)); // equisloppy
-		
-		    for (unsigned int i = 0; i < nitems; ++i) {
-		    	out[i] = gr_complex (in[4*i+1],in[4*i+3]);
-		    }
-		}
-	};
-}
-
-#endif /*MSDD_BUFFER_COPY_BEHAVIORS_H_*/
diff --git a/gr-msdd6000/src/msdd_rs.i b/gr-msdd6000/src/msdd_rs.i
deleted file mode 100644
index 8afb1fb7e..000000000
--- a/gr-msdd6000/src/msdd_rs.i
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009 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.
- */
-
-%include "gnuradio.i"	// the common stuff
-
-%{
-#include "msdd_rs_source_simple.h"
-%}
-
-
-GR_SWIG_BLOCK_MAGIC(msdd_rs,source_simple)
-
-msdd_rs_source_simple_sptr
-msdd_rs_make_source_simple (
-	const char *src,
-	unsigned short port_src
-	);
-
-class msdd_rs_source_simple : public gr_sync_block {
-  protected:
-    msdd_rs_source_simple(
-	const char *src,
-	unsigned short port_src
-	);
- 
-  public:
-    ~msdd_rs_source_c(); 
-  int work (int noutput_items,
-      gr_vector_const_void_star &input_items,
-      gr_vector_void_star &output_items);
-
-  bool start();
-  bool stop();
-
-  /* function starts the flow of data */
-  int start_data();
-
-  /* function stops the flow of data */
-  int stop_data();
-
-  long pull_adc_freq();
-  /* Request the current ddc sample rate */
-  float pull_ddc_samp_rate();
-  /* Request the current ddc bandwidth */
-  float pull_ddc_bw();
-  /* Request the current rx freq */
-  float pull_rx_freq();
-  /* Request current ddc gain */
-  int pull_ddc_gain();
-  /* Request current RF attenuation */
-  int pull_rf_atten();
-
-
-  /*  int decim_rate(); */
-  gr_vector_int gain_range();
-  gr_vector_float freq_range();
-
-  /* Set Functions */
-  /*  bool set_decim_rate(unsigned int); */
-  bool set_rx_freq(double); /* set_rx_freq(int,double); */
-  /*  bool set_pga(int,double); */
-
-  bool set_ddc_gain(double);
-  /* Set desired sample rate of MSDD6000 -- Note bounds checking is 
-  done by the module and it will return the value actually used in the hardware. */
-  bool set_ddc_samp_rate(double);
-  /* Set desired input BW of MSDD6000 -- Note bounds checking is 
-  // done by the module and it will return the value actually used in the hardware. */
-  bool set_ddc_bw(double);
-
-  bool set_rf_atten(double);
-
-
-  };
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-msdd_rs" "scm_init_gnuradio_msdd_rs_module")
-%}
-
-%goops %{
-(use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gr-msdd6000/src/msdd_rs_source_simple.cc b/gr-msdd6000/src/msdd_rs_source_simple.cc
deleted file mode 100644
index 70e692d83..000000000
--- a/gr-msdd6000/src/msdd_rs_source_simple.cc
+++ /dev/null
@@ -1,240 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <msdd_rs_source_simple.h>
-#include <gr_io_signature.h>
-#include <string.h>
-#include <cstdio>
-
-
-msdd_rs_source_simple_sptr
-msdd_rs_make_source_simple ( const char *src, unsigned short port_src) 
-{
-  return gnuradio::get_initial_sptr(new msdd_rs_source_simple ( src, port_src)); 
-}
-
-
-msdd_rs_source_simple::msdd_rs_source_simple (
-	            const char *src, 
-	            unsigned short port_src) 
-		: gr_sync_block("MSDD_RS_SOURCE_SIMPLE",
-				gr_make_io_signature (0,0,0),
-				gr_make_io_signature (1, 1, sizeof (short))),
-                  rcv(new MSDD6000_RS((char*) src)), d_lastseq(0)
-{
-}
-
-msdd_rs_source_simple::~msdd_rs_source_simple ()
-{
-}
-
-
-int
-msdd_rs_source_simple::work (int noutput_items,
-                         gr_vector_const_void_star &input_items,
-                         gr_vector_void_star &output_items)
-{
-	
-#define BUF_LEN	(366*sizeof(short)*2 + 6)
-
-	float* out1 =(float*) output_items[0];
-
-	char buffer[BUF_LEN];
-	/* Read a buffer out -- looking at UDP payload at this point.*/
-	rcv->read( &buffer[0], BUF_LEN );
-	
-	//int seq = *((int*) &buffer[2]);
-	int seq;
-	memcpy(&seq, &buffer[2], 4*sizeof(char));
-
-	char type = buffer[0];
-	//printf("Sequence %d\n",seq);
-	
-	// FIXME get rid of these magic 366's!
-	if(d_lastseq == -366)
-	{
-        if (type != 0){
-            /* Received control packet -- parse and update locally stored parameters */
-            printf("Parsing control Packet\n");
-            rcv->parse_control(&buffer[0], seq);       
-        }
-        else{   
-            // not started case
-            if(seq == 0){
-                d_lastseq = 0;
-            } 
-            else 
-            {
-                // THROW AWAY SAMPLES WE ARE NOT STARTED YET!
-                return 0;
-            }
-        }
-	} 
-	// Started case
-	else 
-	{
-        if (type != 0){
-                        /* Received control packet -- parse and update locally stored parameters */
-            printf("Parsing control Packet\n");
-            rcv->parse_control(&buffer[0], seq);       
-        }
-            
-        else {
-            int samples_missed = seq - d_lastseq - 366;
-            if(samples_missed > 0)
-            {
-                printf("dropped %d samples.\n", samples_missed);
-            }
-            d_lastseq = seq;
-        }
-	}
-	
-	if(noutput_items< 366*2){
-		printf("NOT ENOUGH SPACE IN OUTPUT BUFFER!!! >:-(\n");
-		}
-	
-	memcpy(&out1[0], &buffer[6], BUF_LEN - 6);
-	
-//	for(int i = 0; i < 366*2; i++){
-//		out1[i] = (float)  (*((short*) &buffer[6+2*i]) );
-//	}
-	
-	return 366*2;
-}
-
-//bool msdd_rs_source_simple::set_decim_rate(unsigned int rate)
-//{
-//	// FIXME seems buggy.  How about a floor or ceil?
-//        rcv->set_decim((int) log2(rate));
-//	return true;
-//}
-
-bool msdd_rs_source_simple::set_rx_freq(double freq)
-{
-	long new_fc = (long)freq;
-	rcv->set_fc( new_fc/1000000, new_fc%1000000);
-	return true;
-}
-
-
-bool msdd_rs_source_simple::set_ddc_gain(double gain)
-{
-	if(gain < 0 || gain > 7){ // only 3 bits available.
-		printf("GAIN IS OUTSIDE ACCEPTABLE RANGE!\n");
-		return false;
-	}
-	//decimation gain
-	rcv->set_ddc_gain((int)gain);
-	return true;
-}
-
-// Set desired sample rate of MSDD6000 -- Note bounds checking is 
-// done by the module and it will return the value actually used in the hardware.
-bool msdd_rs_source_simple::set_ddc_samp_rate(double rate)
-{
-	rcv->set_ddc_samp_rate((float) rate);
-	return true;		
-}
-
-// Set desired input BW of MSDD6000 -- Note bounds checking is 
-// done by the module and it will return the value actually used in the hardware.
-bool msdd_rs_source_simple::set_ddc_bw(double bw)
-{
-	rcv->set_ddc_bw((float) bw);
-	return true;		
-}
-
-bool msdd_rs_source_simple::set_rf_atten(double rf_atten)
-{
-        rcv->set_rf_attn((int) rf_atten);
-        return true;
-}
-
-bool msdd_rs_source_simple::start()
-{
-	rcv->start();
-    rcv->stop_data();
-	return true;
-}
-
-bool msdd_rs_source_simple::stop()
-{
-	rcv->stop();
-	return true;
-}
-
-int msdd_rs_source_simple::start_data()
-{
-	return rcv->start_data();
-}
-
-int msdd_rs_source_simple::stop_data()
-{
-	return rcv->stop_data();
-}
-
-/* Query functions */
-long msdd_rs_source_simple::pull_adc_freq(){
-	return 102400000;
-}
-
-/* Request the current ddc sample rate */
-float msdd_rs_source_simple::pull_ddc_samp_rate(){
-	return(rcv->pull_ddc_samp_rate());
-}
-
-/* Request the current ddc bandwidth */
-float msdd_rs_source_simple::pull_ddc_bw(){
-	return(rcv->pull_ddc_bw());
-	
-}
-
-/* Request the current rx freq */
-float msdd_rs_source_simple::pull_rx_freq(){
-	return(rcv->pull_rx_freq());
-}
-
-/* Request current ddc gain */
-int msdd_rs_source_simple::pull_ddc_gain(){
-	return(rcv->pull_ddc_gain());
-}
-
-/* Request current RF attenuation */
-int msdd_rs_source_simple::pull_rf_atten(){
-	return(rcv->pull_rf_atten());
-}
-
-std::vector<int> msdd_rs_source_simple::gain_range(){
-	static std::vector<int> r;
-	r.push_back(0);
-	r.push_back(12);
-	return r;
-}
-
-std::vector<float> msdd_rs_source_simple::freq_range(){
-	std::vector<float> r;
-	r.push_back(30.0*1000*1000);
-	r.push_back(6.0*1000*1000*1000);
-	return r;
-}
diff --git a/gr-msdd6000/src/msdd_rs_source_simple.h b/gr-msdd6000/src/msdd_rs_source_simple.h
deleted file mode 100644
index f320cbb4d..000000000
--- a/gr-msdd6000/src/msdd_rs_source_simple.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_MSDD_RS_SOURCE_SIMPLE_H
-#define INCLUDED_MSDD_RS_SOURCE_SIMPLE_H
-
-#include <gr_sync_block.h>
-#include <msdd6000_rs.h>
-#include <boost/scoped_ptr.hpp>
-
-class msdd_rs_source_simple;
-typedef boost::shared_ptr<msdd_rs_source_simple> msdd_rs_source_simple_sptr;
-
-
-// public shared_ptr constructor
-
-msdd_rs_source_simple_sptr msdd_rs_make_source_simple ( const char *src, unsigned short port_src);
-
-
-class msdd_rs_source_simple : public gr_sync_block {
- private:
-  friend msdd_rs_source_simple_sptr
-  msdd_rs_make_source_simple ( const char *src, unsigned short port_src);
-
-  boost::scoped_ptr<MSDD6000_RS> rcv;
-  int d_lastseq;
-
- protected:
-  msdd_rs_source_simple (const char *src, unsigned short port_src);
-
- public:
-  ~msdd_rs_source_simple ();
-  bool stop();
-  bool start();
-
-  /* function starts the flow of data from the digitizer */
-  int start_data();
-  /* function stops the flow of data from the digitizer */
-  int stop_data();
-
-  // Do not need this //
-//  bool set_decim_rate(unsigned int);
-  /* Adding functions for setting the sample rate and
-  * receiver bandwidth
-  */
-  
-  /* hardware commands -- change current state of digitizer */
-  bool set_ddc_samp_rate(double);
-  bool set_ddc_bw(double);
-  
-  bool set_rx_freq(double);
-  bool set_ddc_gain(double);
-  bool set_rf_atten(double);
-
-  int work(int, gr_vector_const_void_star&, gr_vector_void_star&);
-  
-  /* Query methods -- query current state of digitizer */
-  long  pull_adc_freq();
-  float pull_ddc_samp_rate();
-  float pull_ddc_bw();
-  float pull_rx_freq();
-  int   pull_ddc_gain();
-  int   pull_rf_atten();
-  
-  /* Pulling back gain and frequency ranges */
-  std::vector<int> gain_range();
-  std::vector<float> freq_range();
-};
-
-#endif /* INCLUDED_MSDD_RS__RS__SOURCE_C_H */
diff --git a/gr-msdd6000/src/msdd_source_simple.cc b/gr-msdd6000/src/msdd_source_simple.cc
deleted file mode 100644
index 20b15c43d..000000000
--- a/gr-msdd6000/src/msdd_source_simple.cc
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <msdd_source_simple.h>
-#include <gr_io_signature.h>
-#include <string.h>
-#include <cstdio>
-
-
-msdd_source_simple_sptr
-msdd_make_source_simple (const char *src, unsigned short port_src) 
-{
-  return gnuradio::get_initial_sptr(new msdd_source_simple ( src, port_src)); 
-}
-
-
-msdd_source_simple::msdd_source_simple (const char *src, 
-					unsigned short port_src) 
-  : gr_sync_block("MSDD_SOURCE_SIMPLE",
-		  gr_make_io_signature (0,0,0),
-		  gr_make_io_signature (1, 1, sizeof (short))),
-    rcv(new MSDD6000((char*) src)), d_lastseq(0), d_firstrun(true)
-{
-  set_output_multiple(MSDD_COMPLEX_SAMPLES_PER_PACKET*2);
-}
-
-msdd_source_simple::~msdd_source_simple ()
-{
-}
-
-
-int
-msdd_source_simple::work (int noutput_items,
-                         gr_vector_const_void_star &input_items,
-                         gr_vector_void_star &output_items)
-{
-	
-#define BUF_LEN        (MSDD_COMPLEX_SAMPLES_PER_PACKET*sizeof(short)*2 + 6)
-
-  signed short* out1 =(signed short*) output_items[0];
-
-  for(int i=0; i<floor(noutput_items*1.0/(2*MSDD_COMPLEX_SAMPLES_PER_PACKET));i++){
-    char buffer[BUF_LEN];
-    rcv->read( &buffer[0], BUF_LEN );
-
-    //int seq = *((int*) &buffer[2]);
-    int seq;
-    memcpy(&seq, &buffer[2], 4*sizeof(char));
-
-    if(d_lastseq == -MSDD_COMPLEX_SAMPLES_PER_PACKET){
-      // not started case
-      if(seq == 0){
-	d_lastseq = 0;
-      } else {
-	// THROW AWAY SAMPLES WE ARE NOT STARTED YET!
-	return 0;
-      }
-
-    } else {
-      // started case
-      int samples_missed = seq - d_lastseq - MSDD_COMPLEX_SAMPLES_PER_PACKET;
-      if(samples_missed > 0){
-	if(d_firstrun == true){
-	  // we may have missed some initial samples off the beginning of
-	  // a stream but there are no drop outs in the middle of what we have
-	} else {
-	  printf("dropped %d samples.\n", samples_missed);
-	}
-      }
-      d_lastseq = seq;
-    }
-
-    int out_idx = i*MSDD_COMPLEX_SAMPLES_PER_PACKET*2;
-    memcpy(&out1[out_idx], &buffer[6], BUF_LEN - 6);
-    d_firstrun = false;
-  }
-
-  return noutput_items;
-
-}
-
-bool msdd_source_simple::set_decim_rate(unsigned int rate)
-{
-  rcv->set_decim((int) floor(log2(rate)));
-  return true;
-}
-
-
-bool msdd_source_simple::set_rx_freq(int channel, double freq)
-{
-  long new_fc = (long)freq;
-  rcv->set_fc( new_fc/1000000, new_fc%1000000);
-  return true;
-}
-
-
-bool msdd_source_simple::set_pga(int which, double gain)
-{
-  if(gain < 0 || gain > 10){
-    printf("GAIN IS OUTSIDE ACCEPTABLE RANGE!\n");
-    return false;
-  }
-  // ok i lied this is not really a pga, its decimation gain
-  rcv->set_ddc_gain((int)gain);
-  return true;
-}
-
-
-bool msdd_source_simple::start()
-{
-  rcv->start();
-  return true;
-}
-
-
-bool msdd_source_simple::stop()
-{
-  rcv->stop();
-  return true;
-}
-
-long msdd_source_simple::adc_freq()
-{
-  return 102400000;
-}
-
-int msdd_source_simple::decim_rate()
-{
-  return 1 << rcv->d_decim;
-}
-
-
-std::vector<int> msdd_source_simple::gain_range()
-{
-  static std::vector<int> r;
-  r.push_back(0);
-  r.push_back(12);
-  return r;
-}
-
-std::vector<float> msdd_source_simple::freq_range()
-{
-  std::vector<float> r;
-  r.push_back(30.0*1000*1000);
-  r.push_back(6.0*1000*1000*1000);
-  return r;
-}
diff --git a/gr-msdd6000/src/msdd_source_simple.h b/gr-msdd6000/src/msdd_source_simple.h
deleted file mode 100644
index 142c544a4..000000000
--- a/gr-msdd6000/src/msdd_source_simple.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_MSDD_SOURCE_SIMPLE_H
-#define INCLUDED_MSDD_SOURCE_SIMPLE_H
-
-#include <gr_sync_block.h>
-#include <msdd6000.h>
-#include <boost/scoped_ptr.hpp>
-
-#define     MSDD_COMPLEX_SAMPLES_PER_PACKET        366
-
-class msdd_source_simple;
-typedef boost::shared_ptr<msdd_source_simple> msdd_source_simple_sptr;
-
-
-// public shared_ptr constructor
-
-msdd_source_simple_sptr msdd_make_source_simple(const char *src, unsigned short port_src);
-
-
-class msdd_source_simple : public gr_sync_block {
- private:
-  friend msdd_source_simple_sptr
-  msdd_make_source_simple(const char *src, unsigned short port_src);
-
-  boost::scoped_ptr<MSDD6000> rcv;
-  int d_lastseq;
-  bool d_firstrun;
-
- protected:
-  msdd_source_simple(const char *src, unsigned short port_src);
-
- public:
-  ~msdd_source_simple();
-  bool stop();
-  bool start();
-
-  bool set_decim_rate(unsigned int);
-  bool set_rx_freq(int,double);
-  bool set_pga(int,double);
-
-  int work(int, gr_vector_const_void_star&, gr_vector_void_star&);
-  
-  long adc_freq();
-  int decim_rate();
-  std::vector<int> gain_range();
-  std::vector<float> freq_range();
-};
-
-#endif /* INCLUDED_MSDD_SOURCE_C_H */
diff --git a/gr-msdd6000/src/python-examples/msdd_dynamics.py b/gr-msdd6000/src/python-examples/msdd_dynamics.py
deleted file mode 100755
index 8cd1e52bc..000000000
--- a/gr-msdd6000/src/python-examples/msdd_dynamics.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 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.
-# 
-
-from gnuradio import gr
-from gnuradio import msdd
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import time
-
-class benchmark_msdd6000(gr.top_block):
-    def __init__(self, address, options):
-        gr.top_block.__init__(self)
-
-        # Extract the initial options
-        self.frequency = options.frequency
-        self.filename  = options.filename
-        self.decim     = options.decim
-        self.gain      = options.gain
-        self.address   = address
-
-        # Set up and initialize the MSDD receiver
-        self.port = 10001 # required port
-        self.src = msdd.source_c(0, 1, self.address, self.port)
-        self.src.set_decim_rate(self.decim)
-        self.src.set_desired_packet_size(0, 1460)
-        self.src.set_pga(0, self.gain)
-        self.src.set_rx_freq(0, self.frequency)
-
-        # Display some info
-        print "Min PGA: ", self.src.pga_min()
-        print "Max PGA: ", self.src.pga_max()
-        print "PGA:     ", self.src.pga(0)
-        print "Decim:   ", self.src.decim_rate()
-        print "Freq:    ", self.src.rx_freq(0)
-        
-        # Build a file sink to save the info for post analysis
-        self.snk = gr.file_sink(gr.sizeof_gr_complex, self.filename)
-
-        # Connect the reciever source to file sink
-        self.connect(self.src, self.snk)
-        
-def main():
-    ''' This is a simple little script to play with retunning of the MSDD board.
-    You can cycle through frequencies or the attenuation of the board here.
-    '''
-
-    usage="%prog: [options] host_address"
-    parser = OptionParser(usage=usage, option_class=eng_option, conflict_handler="resolve")
-    parser.add_option("-f", "--frequency", type="eng_float", default=100e6,
-                      help="set frequency (Hz) [default=%default]")
-    parser.add_option("-d", "--decim", type="int", default=256,
-                      help="set decimation rate [default=%default]")
-    parser.add_option("-g", "--gain", type="int", default=32,
-                      help="set receiver gain (dB) [default=%default]")
-    parser.add_option("-F", "--filename", type="string", default="output.dat",
-                      help="set output filename [default=%default]")
-    (options, args) = parser.parse_args ()
-    host_address = args[0]
-
-    # Set up benchmark system that simply connects the MSDD source to a file sink
-    tb = benchmark_msdd6000(host_address, options)
-    tb.start() # start it here
-
-    # Adjust your parameters here. Use the time.sleep(x) function to set a wait period
-    # between adjusting the parameter.
-    for i in range(7):
-        time.sleep(0.5)
-        if 0:
-            freq = (tb.src.rx_freq(0) + 1) * 1e6
-            tb.src.set_rx_freq(0, freq)
-            print "Setting frequency: ", freq
-        if 1:
-            pga = tb.src.pga(0)+10
-            tb.src.set_pga(0, pga)
-            print "Setting PGA: ", pga
-
-    tb.stop()  # stop the radio
-
-if __name__ == '__main__':
-    main()
diff --git a/gr-msdd6000/src/python-examples/msdd_fft.py b/gr-msdd6000/src/python-examples/msdd_fft.py
deleted file mode 100755
index 813a77d38..000000000
--- a/gr-msdd6000/src/python-examples/msdd_fft.py
+++ /dev/null
@@ -1,277 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,2007 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.
-# 
-
-from gnuradio import gr, gru
-from gnuradio import msdd
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider
-from optparse import OptionParser
-import wx
-import sys
-
-
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    If there's a daughterboard on A, select A.
-    If there's a daughterboard on B, select B.
-    Otherwise, select A.
-    """
-    if u.db[0][0].dbid() >= 0:       # dbid is < 0 if there's no d'board or a problem
-        return (0, 0)
-    if u.db[1][0].dbid() >= 0:
-        return (1, 0)
-    return (0, 0)
-
-
-class app_top_block(stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        self.frame = frame
-        self.panel = panel
-        
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-w", "--which", type="int", default=0,
-                          help="select which MSDD (0, 1, ...) default is %default",
-			  metavar="NUM")
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select MSDD Rx side A or B (default=first one with a daughterboard)")
-        parser.add_option("-A", "--antenna", default=None,
-                          help="select Rx Antenna (only on RFX-series boards)")
-        parser.add_option("-d", "--decim", type="int", default=16,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-W", "--waterfall", action="store_true", default=False,
-                          help="Enable waterfall display")
-        parser.add_option("-8", "--width-8", action="store_true", default=False,
-                          help="Enable 8-bit samples across USB")
-        parser.add_option("-S", "--oscilloscope", action="store_true", default=False,
-                          help="Enable oscilloscope display")
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-
-        self.show_debug_info = True
-        
-        # build the graph
-
-        #self.u = MSDD.source_simo(which=options.which, decim_rate=options.decim)
-        self.u = msdd.source_simple("192.168.1.200", 0)
-        self.u.set_decim_rate(options.decim) #(16)
-
-#        msdd_src = gr.file_source(gr.sizeof_gr_complex, 'msdd.dat')
-#        thr = gr.throttle(gr.sizeof_gr_complex, 200000)
-#        self.connect(msdd_src, thr)
-
-#        if options.rx_subdev_spec is None:
-#           options.rx_subdev_spec = pick_subdevice(self.u)
-#        self.u.set_mux(MSDD.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-
-#        if options.width_8:
-#            width = 8
-#            shift = 8
-#            format = self.u.make_format(width, shift)
-#            print "format =", hex(format)
-#            r = self.u.set_format(format)
-#            print "set_format =", r
-            
-        # determine the daughterboard subdevice we're using
-#        self.subdev = MSDD.selected_subdev(self.u, options.rx_subdev_spec)
-
-#        print "Initial Freq", self.u.rx_freq(0), "deci: ", self.u.decim_rate()
-#        input_rate = 50e6 / self.u.decim_rate()
-        input_rate = 50e6 / options.decim;
-
-        if options.waterfall:
-            self.scope = \
-              waterfallsink2.waterfall_sink_c (panel, fft_size=1024, sample_rate=input_rate)
-        elif options.oscilloscope:
-            self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate)
-        else:
-            self.scope = fftsink2.fft_sink_c (panel, fft_size=1024, sample_rate=input_rate)
-
-#        self.connect(self.u, self.scope)
-               
-        msdd_sink = gr.file_sink(gr.sizeof_gr_complex, 'schmen1.dat')
-	
-	self.conv = gr.interleaved_short_to_complex();
-        self.connect(self.u, self.conv,  msdd_sink)
-        self._build_gui(vbox)
-
-        # set initial values
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            #g = self.subdev.gain_range()
-            self.gain_range = (20,70,.5);
-	    options.gain = float(self.gain_range[0]+self.gain_range[1])/2
-
-        if options.freq is None:
-            # if no freq was specified, use the mid-point
-            #r = self.subdev.freq_range()
-	    r = (30e6,6e9,1e6)
-            options.freq = float(r[0]+r[1])/2
-
-        self.set_gain(options.gain)
-#
-#	if options.antenna is not None:
-#            print "Selecting antenna %s" % (options.antenna,)
-#            self.subdev.select_rx_antenna(options.antenna)
-
-        if self.show_debug_info:
-            #self.myform['decim'].set_value(self.u.decim_rate())
-            self.myform['decim'].set_value(options.decim)
- #           self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
- #           self.myform['dbname'].set_value(self.subdev.name())
-            self.myform['baseband'].set_value(0)
-            self.myform['ddc'].set_value(0)
-
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-
-    def _set_status_msg(self, msg):
-        self.frame.GetStatusBar().SetStatusText(msg, 0)
-
-    def _build_gui(self, vbox):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-            
-        vbox.Add(self.scope.win, 10, wx.EXPAND)
-        
-        # add control area at the bottom
-        self.myform = myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0, 0)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=hbox, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-        hbox.Add((5,0), 0, 0)
-        g = self.gain_range = (20,50,.5);
-        myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                           weight=3,
-                                           min=int(g[0]), max=int(g[1]),
-                                           callback=self.set_gain)
-
-        hbox.Add((5,0), 0, 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        self._build_subpanel(vbox)
-
-    def _build_subpanel(self, vbox_arg):
-        # build a secondary information panel (sometimes hidden)
-
-        # FIXME figure out how to have this be a subpanel that is always
-        # created, but has its visibility controlled by foo.Show(True/False)
-        
-        def _form_set_decim(kv):
-            return self.set_decim(kv['decim'])
-
-        if not(self.show_debug_info):
-            return
-
-        panel = self.panel
-        vbox = vbox_arg
-        myform = self.myform
-
-        #panel = wx.Panel(self.panel, -1)
-        #vbox = wx.BoxSizer(wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-
-        myform['decim'] = form.int_field(
-            parent=panel, sizer=hbox, label="Decim",
-            callback=myform.check_input_and_call(_form_set_decim, self._set_status_msg))
-
-#        hbox.Add((5,0), 1)
-#        myform['fs@usb'] = form.static_float_field(
-#            parent=panel, sizer=hbox, label="Fs@USB")
-
-        hbox.Add((5,0), 1)
-        myform['dbname'] = form.static_text_field(
-            parent=panel, sizer=hbox)
-
-        hbox.Add((5,0), 1)
-        myform['baseband'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Analog BB")
-
-        hbox.Add((5,0), 1)
-        myform['ddc'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC")
-
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-	r = self.u.set_rx_freq	(0, target_freq)
-        #r = self.u.tune(0, self.subdev, target_freq)
-        if r:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-#            if self.show_debug_info:
-#                self.myform['baseband'].set_value(r.baseband_freq)
-#                self.myform['ddc'].set_value(r.dxc_freq)
-            return True
-
-        return False
-
-    def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-        #self.subdev.set_gain(gain)
-        self.u.set_pga(0, gain)
-
-    def set_decim(self, decim):
-        ok = self.u.set_decim_rate(decim)
-        if not ok:
-            print "set_decim failed"
-        #input_rate = 20e6 / self.u.decim_rate()
-        #self.scope.set_sample_rate(input_rate)
-        if self.show_debug_info:  # update displayed values
-            self.myform['decim'].set_value(decim)
-            #self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-        return ok
-
-def main ():
-    app = stdgui2.stdapp(app_top_block, "MSDD FFT", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-msdd6000/src/python-examples/msdd_rcv.py b/gr-msdd6000/src/python-examples/msdd_rcv.py
deleted file mode 100755
index cc2f3e4a3..000000000
--- a/gr-msdd6000/src/python-examples/msdd_rcv.py
+++ /dev/null
@@ -1,287 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2006,2007 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.
-# 
-
-from gnuradio import gr, gru, eng_notation
-from gnuradio import msdd
-from gnuradio import blks2
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import slider, powermate
-from gnuradio.wxgui import stdgui2, form
-from gnuradio.wxgui import fftsink2
-from optparse import OptionParser
-#from usrpm import usrp_dbid
-import sys
-import math
-import wx
-
-class wfm_rx_block (stdgui2.std_top_block):
-    def __init__(self,frame,panel,vbox,argv):
-        stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv)
-
-        parser=OptionParser(option_class=eng_option)        
-#        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-#                          help="select MSDD Rx side A or B (default=A)")
-        parser.add_option("-f", "--freq", type="eng_float", default=100.1e6,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=40,
-                          help="set gain in dB (default is midpoint)")
-#        parser.add_option("-V", "--volume", type="eng_float", default=None,
-#                          help="set volume (default is midpoint)")
-#        parser.add_option("-O", "--audio-output", type="string", default="",
-#                          help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
-
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-        
-        self.frame = frame
-        self.panel = panel
-        
-        self.vol = 0
-        self.gain_range = (10, 70, .5)
-        self.state = "FREQ"
-        self.freq = 0
-        msdd_decim = 2
-
-        # build graph
-        self.fft_size = 8192
-        self.sample_rate = 200
-        self.u = msdd.source_c(0, 1, "10.45.4.44", 10000)
-        self.u.set_decim_rate(4)
-        self.u.set_desired_packet_size(0, 1460*100)        
-
-
-        #self.u.set_decim_rate(msdd_decim)
-#        usrp_rate = adc_rate / msdd_decim           # 320 kS/s
-#        chanfilt_decim = 1
-#        demod_rate = usrp_rate / chanfilt_decim
-#        audio_decimation = 10
-#        audio_rate = demod_rate / audio_decimation  # 32 kHz
-#
-#        if options.rx_subdev_spec is None:
-#            options.rx_subdev_spec = pick_subdevice(self.u)
-#
-#        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-#        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-#        print "Using RX d'board %s" % (self.subdev.side_and_name(),)
-#
-#
-#        chan_filt_coeffs = optfir.low_pass (1,           # gain
-#                                            usrp_rate,   # sampling rate
-#                                            80e3,        # passband cutoff
-#                                            115e3,       # stopband cutoff
-#                                            0.1,         # passband ripple
-#                                            60)          # stopband attenuation
-#        #print len(chan_filt_coeffs)
-#        chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
-#
-#        self.guts = blks2.wfm_rcv (demod_rate, audio_decimation)
-#
-#        self.volume_control = gr.multiply_const_ff(self.vol)
-#
-#        # sound card as final sink
-#        audio_sink = audio.sink (int (audio_rate),
-#                                 options.audio_output,
-#                                 False)  # ok_to_block
-        
-        # now wire it all together
-        #self.connect (self.u, chan_filt, self.guts, self.volume_control, audio_sink)
-
-        self._build_gui(vbox)
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            #g = self.subdev.gain_range()
-            g = self.gain_range
-            options.gain = float(g[0]+g[1])/2
-#
-#        if options.volume is None:
-#            g = self.volume_range()
-#            options.volume = float(g[0]+g[1])/2
-#            
-#        if abs(options.freq) < 1e6:
-#            options.freq *= 1e6
-
-        # set initial values
-#
-        self.set_gain(options.gain)
-#        self.set_vol(options.volume)
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-        print "Frequency: ", self.u.rx_freq(0)
-
-
-    def _set_status_msg(self, msg, which=0):
-        self.frame.GetStatusBar().SetStatusText(msg, which)
-
-
-    def _build_gui(self, vbox):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-
-        self.src_fft = None
-        if 1:
-            self.src_fft = fftsink2.fft_sink_c(self.panel, title="Data from MSDD",
-                                               fft_size=512, sample_rate=512)
-#            self.s2f1 = gr.short_to_float()
-#            self.scope = scopesink2.scope_sink_f(self.panel, sample_rate=self.sample_rate*self.fft_size)
-            
-            self.connect (self.u, self.src_fft)
-            #self.connect (self.s2f1, self.scope)
-            vbox.Add (self.src_fft.win, 4, wx.EXPAND)
-#
-#        if 1:
-#            post_filt_fft = fftsink2.fft_sink_f(self.panel, title="Post Demod", 
-#                                                fft_size=1024, sample_rate=usrp_rate,
-#                                                y_per_div=10, ref_level=0)
-#            self.connect (self.guts.fm_demod, post_filt_fft)
-#            vbox.Add (post_filt_fft.win, 4, wx.EXPAND)
-#
-#        if 0:
-#            post_deemph_fft = fftsink2.fft_sink_f(self.panel, title="Post Deemph",
-#                                                  fft_size=512, sample_rate=audio_rate,
-#                                                  y_per_div=10, ref_level=-20)
-#            self.connect (self.guts.deemph, post_deemph_fft)
-#            vbox.Add (post_deemph_fft.win, 4, wx.EXPAND)
-
-        
-        # control area form at bottom
-        self.myform = myform = form.form()
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=hbox, label="Freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-        hbox.Add((5,0), 0)
-        myform['freq_slider'] = \
-            form.quantized_slider_field(parent=self.panel, sizer=hbox, weight=3,
-                                        range=(30e6, 6e9, 1e6),
-                                        callback=self.set_freq)
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-#
-#        myform['volume'] = \
-#            form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Volume",
-#                                        weight=3, range=self.volume_range(),
-#                                        callback=self.set_vol)
-#        hbox.Add((5,0), 1)
-
-        myform['gain'] = \
-            form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                        weight=3, range=self.gain_range,
-                                        callback=self.set_gain)
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-#
-#        try:
-#            self.knob = powermate.powermate(self.frame)
-#            self.rot = 0
-#            powermate.EVT_POWERMATE_ROTATE (self.frame, self.on_rotate)
-#            powermate.EVT_POWERMATE_BUTTON (self.frame, self.on_button)
-#        except:
-#            print "FYI: No Powermate or Contour Knob found"
-
-
-    def on_rotate (self, event):
-        self.rot += event.delta
-        if (self.state == "FREQ"):
-            if self.rot >= 3:
-                self.set_freq(self.freq + .1e6)
-                self.rot -= 3
-            elif self.rot <=-3:
-                self.set_freq(self.freq - .1e6)
-                self.rot += 3
-        else:
-            step = self.volume_range()[2]
-            if self.rot >= 3:
-                self.set_vol(self.vol + step)
-                self.rot -= 3
-            elif self.rot <=-3:
-                self.set_vol(self.vol - step)
-                self.rot += 3
-            
-    def on_button (self, event):
-        if event.value == 0:        # button up
-            return
-        self.rot = 0
-        if self.state == "FREQ":
-            self.state = "VOL"
-        else:
-            self.state = "FREQ"
-        self.update_status_bar ()
-#        
-#
-#    def set_vol (self, vol):
-#        g = self.volume_range()
-#        self.vol = max(g[0], min(g[1], vol))
-#        self.volume_control.set_k(10**(self.vol/10))
-#        self.myform['volume'].set_value(self.vol)
-#        self.update_status_bar ()
-                                        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        r = self.u.set_rx_freq(0, target_freq);
-        
-        if r:
-            self.freq = target_freq
-            self.myform['freq'].set_value(target_freq)         # update displayed value
-            self.myform['freq_slider'].set_value(target_freq)  # update displayed value
-            self.update_status_bar()
-            self._set_status_msg("OK", 0)
-            return True
-
-        self._set_status_msg("Failed", 0)
-        return False
-
-    def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-        self.u.set_pga(0,gain)
-        
-    def update_status_bar (self):
-        msg = "Volume:%r  Setting:%s" % (self.vol, self.state)
-        self._set_status_msg(msg, 1)
-        #self.src_fft.set_baseband_freq(self.freq)
-#
-#    def volume_range(self):
-#        return (-20.0, 0.0, 0.5)
-        
-
-if __name__ == '__main__':
-    app = stdgui2.stdapp (wfm_rx_block, "MSDD FFT RX")
-    app.MainLoop ()
diff --git a/gr-msdd6000/src/python-examples/msdd_rs_spec_an.py b/gr-msdd6000/src/python-examples/msdd_rs_spec_an.py
deleted file mode 100755
index 4855375b8..000000000
--- a/gr-msdd6000/src/python-examples/msdd_rs_spec_an.py
+++ /dev/null
@@ -1,350 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2009 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.
-# 
-
-from gnuradio import gr
-from gnuradio import msdd_rs
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.qtgui import qtgui
-from optparse import OptionParser
-import sys,time
-
-try:
-    from gnuradio.qtgui import qtgui
-    from PyQt4 import QtGui, QtCore
-    import sip
-except ImportError:
-    print "Please install gr-qtgui."
-    sys.exit(1)
-
-try:
-    from msdd_display_qtgui import Ui_MainWindow
-except ImportError:
-    print "Error: could not find msdd_display_qtgui.py:"
-    print "\t\"pyuic4 msdd_display_qtgui.ui -o msdd_display_qtgui.py\""
-    sys.exit(1)
-
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the QT Interface and Control Dialog
-# ////////////////////////////////////////////////////////////////////
-
-
-class main_window(QtGui.QMainWindow):
-    def __init__(self, snk, fg, parent=None):
-
-        QtGui.QWidget.__init__(self, parent)
-        self.gui = Ui_MainWindow()
-        self.gui.setupUi(self)
-
-        self.fg = fg
-
-        # Add the qtsnk widgets to the layout box
-        self.gui.sinkLayout.addWidget(snk)
-
-        self.gui.dcGainEdit.setText(QtCore.QString("%1").arg(0.001))
-
-        # Connect up some signals
-        self.connect(self.gui.pauseButton, QtCore.SIGNAL("clicked()"),
-                     self.pauseFg)
-        self.connect(self.gui.frequencyEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.frequencyEditText)
-        self.connect(self.gui.gainEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainEditText)
-        self.connect(self.gui.bandwidthEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.bandwidthEditText)
-        self.connect(self.gui.amplifierEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.amplifierEditText)
-
-        self.connect(self.gui.actionSaveData, QtCore.SIGNAL("activated()"),
-                     self.saveData)
-        self.gui.actionSaveData.setShortcut(QtGui.QKeySequence.Save)
-
-        self.connect(self.gui.dcGainEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.dcGainEditText)
-        self.connect(self.gui.dcCancelCheckBox, QtCore.SIGNAL("clicked(bool)"),
-                     self.dcCancelClicked)
-
-    def pauseFg(self):
-        if(self.gui.pauseButton.text() == "Pause"):
-            self.fg.stop()
-            self.fg.wait()
-            self.fg.stop_data()
-            self.gui.pauseButton.setText("Unpause")
-        else:
-            self.fg.start()
-            self.fg.start_data()
-            self.gui.pauseButton.setText("Pause")
-      
-
-    # Functions to set the values in the GUI
-    def set_frequency(self, freq):
-        self.freq = freq
-        sfreq = eng_notation.num_to_str(self.freq)
-        self.gui.frequencyEdit.setText(QtCore.QString("%1").arg(sfreq))
-        
-    def set_gain(self, gain):
-        self.gain = gain
-        self.gui.gainEdit.setText(QtCore.QString("%1").arg(self.gain))
-
-    def set_bandwidth(self, bw):
-        self.bw = bw
-        sbw = eng_notation.num_to_str(self.bw)
-        self.gui.bandwidthEdit.setText(QtCore.QString("%1").arg(sbw))
-
-    def set_amplifier(self, amp):
-        self.amp = amp
-        self.gui.amplifierEdit.setText(QtCore.QString("%1").arg(self.amp))
-
-
-    # Functions called when signals are triggered in the GUI
-    def frequencyEditText(self):
-        try:
-            freq = eng_notation.str_to_num(self.gui.frequencyEdit.text().toAscii()) 
-            self.fg.set_frequency(freq)
-            self.freq = freq
-        except RuntimeError:
-            pass
-
-    def gainEditText(self):
-        try:
-            gain = float(self.gui.gainEdit.text())
-            self.fg.set_gain(gain)
-            self.gain = gain
-        except ValueError:
-            pass
-                
-    def bandwidthEditText(self):
-        try:
-            bw = eng_notation.str_to_num(self.gui.bandwidthEdit.text().toAscii())
-            self.fg.set_bandwidth(bw)
-            self.bw = bw
-        except ValueError:
-            pass
-        
-    def amplifierEditText(self):
-        try:
-            amp = float(self.gui.amplifierEdit.text())
-            self.fg.set_amplifier_gain(amp)
-            self.amp = amp
-        except ValueError:
-            pass
-
-    def saveData(self):
-        fileName = QtGui.QFileDialog.getSaveFileName(self, "Save data to file", ".");
-        if(len(fileName)):
-            self.fg.save_to_file(str(fileName))
-
-    def dcGainEditText(self):
-        gain = float(self.gui.dcGainEdit.text())
-        self.fg.set_dc_gain(gain)
-        
-    def dcCancelClicked(self, state):
-        self.dcGainEditText()
-        self.fg.cancel_dc(state)
-        
-
-        
-class my_top_block(gr.top_block):
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-e", "--interface", type="string", default="eth0",
-                          help="select Ethernet interface, default is eth0")
-        parser.add_option("-m", "--mac-addr", type="string", default="",
-                          help="select USRP by MAC address, default is auto-select")
-        parser.add_option("-W", "--bw", type="float", default=1e6,
-                          help="set bandwidth of receiver [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default="2.4G",
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("--fft-size", type="int", default=2048,
-                          help="Set number of FFT bins [default=%default]")
-        (options, args) = parser.parse_args()
-
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-	self.options = options
-        self.show_debug_info = True
-        
-        self.qapp = QtGui.QApplication(sys.argv)
-
-#        self.u = usrp2.source_32fc(options.interface, options.mac_addr)
-	self.u = msdd_rs.source_simple("192.168.1.20", 10000);
-	self.conv = gr.interleaved_short_to_complex();
-        self._adc_rate = self.u.pull_adc_freq()
-        self.set_bandwidth(options.bw)
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-#            g = self.u.gain_range()	
- 	    g = [0, 10]
-            #options.gain = float(g[0]+g[1])/2
-            options.gain = float(0)
-        self.set_gain(options.gain)
-
-        if options.freq is None:
-		options.freq = 2.4e9;
-#            # if no frequency was specified, use the mid-point of the subdev
-#            f = self.u.freq_range()
-#            options.freq = float(f[0]+f[1])/2
-
-	self.set_frequency(options.freq)
-
-        self._fftsize = options.fft_size
-
-
-	self._freq = options.freq;
-	self._bandwidth = 400;
-        
-	self.set_bandwidth(self._bandwidth);
-
-        self.snk = qtgui.sink_c(options.fft_size, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                self._freq, self._bandwidth,
-                                "USRP2 Display",
-                                True, True, False, True, False)
-
-        # Set up internal amplifier
-        self.amp = gr.multiply_const_cc(0.0)
-        self.set_amplifier_gain(0.01)
-
-        # Create a single-pole IIR filter to remove DC
-        #   but don't connect it yet
-        self.dc_gain = 0.001
-        self.dc = gr.single_pole_iir_filter_cc(self.dc_gain)
-        self.dc_sub = gr.sub_cc()
-
-	self.agc = gr.agc2_cc(1e-3, 1e-5, 0.01, 0.01, 10);
-
-        self.connect(self.u, self.conv, self.snk)
-        #self.connect(self.u, self.conv, self.amp, self.snk)
-
-        if self.show_debug_info:
-            print "Decimation rate: ", self._decim
-            print "Bandwidth: ", self._bandwidth
-#            print "D'board: ", self.u.daughterboard_id()
-
-        # Get the reference pointer to the SpectrumDisplayForm QWidget
-        # Wrap the pointer as a PyQt SIP object
-        #     This can now be manipulated as a PyQt4.QtGui.QWidget
-        self.pysink = sip.wrapinstance(self.snk.pyqwidget(), QtGui.QWidget)
-
-        self.main_win = main_window(self.pysink, self)
-
-        self.main_win.set_frequency(self._freq)
-        self.main_win.set_gain(self._gain)
-        self.main_win.set_bandwidth(self._bandwidth)
-        self.main_win.set_amplifier(self._amp_value)
-
-        self.main_win.show()
-
-
-    def save_to_file(self, name):
-        self.lock()
-
-        # Add file sink to save data
-        self.file_sink = gr.file_sink(gr.sizeof_gr_complex, name)
-        self.connect(self.conv, self.file_sink)
-
-        self.unlock()
-
-    def set_gain(self, gain):
-        self._gain = gain
-        self.u.set_ddc_gain(self._gain)
-
-    def set_frequency(self, freq):
-        self._freq = freq
-        r = self.u.set_rx_freq(freq)
-
-        try:
-            self.snk.set_frequency_range(self._freq, self._bandwidth)
-        except:
-            pass
-
-    def set_bandwidth(self, bw):
-        self._bandwidth = bw
-        self._decim = int(self._adc_rate / self._bandwidth)
-#        self.u.set_decim_rate(self._decim)
-	r1 = self.u.set_ddc_samp_rate( bw );
-	r2 = self.u.set_ddc_bw( bw );
-	self.u.start_data();
-
-	print r1
-	print r2;
-	
-	time.sleep(0.05);
-	bw = self.u.pull_ddc_bw();
-	sr = self.u.pull_ddc_samp_rate();
-	fc = self.u.pull_rx_freq();
-	
-	#self.snk.d_bandwidth = sr;
-
-	print bw;
-	print sr;
-	print fc;
-
-#	sys.exit(-1);
-
-        try:
-            self.snk.set_frequency_range(self._freq, self._bandwidth)
-        except:
-            pass
-
-    def set_amplifier_gain(self, amp):
-        self._amp_value = amp
-        self.amp.set_k(self._amp_value)
-
-    def set_dc_gain(self, gain):
-        self.dc.set_taps(gain)
-        
-    def cancel_dc(self, state):
-        self.lock()
-
-        if(state):
-            self.disconnect(self.u, self.amp)
-            self.connect(self.u, (self.dc_sub,0))
-            self.connect(self.u, self.dc, (self.dc_sub,1))
-            self.connect(self.dc_sub, self.amp)
-        else:
-            self.disconnect(self.dc_sub, self.amp)
-            self.disconnect(self.dc, (self.dc_sub,1))
-            self.disconnect(self.u, self.dc)
-            self.disconnect(self.u, (self.dc_sub,0))
-            self.connect(self.u, self.amp)
-
-        self.unlock()
-
-def main ():
-    tb = my_top_block()
-    tb.start()
-    tb.u.start_data();
-    tb.snk.exec_();
-
-if __name__ == '__main__':
-    try:
-        main ()
-    except KeyboardInterrupt:
-        pass
-    
diff --git a/gr-msdd6000/src/python-examples/msdd_spectrum_sense.py b/gr-msdd6000/src/python-examples/msdd_spectrum_sense.py
deleted file mode 100755
index e3d182b03..000000000
--- a/gr-msdd6000/src/python-examples/msdd_spectrum_sense.py
+++ /dev/null
@@ -1,296 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 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.
-# 
-
-from gnuradio import gr, gru, eng_notation, optfir, window
-from gnuradio import msdd
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys
-import math
-import struct
-from pylab import *
-from numpy import array
-import time
-
-matplotlib.interactive(True)
-matplotlib.use('TkAgg')
-
-class tune(gr.feval_dd):
-    """
-    This class allows C++ code to callback into python.
-    """
-    def __init__(self, tb):
-        gr.feval_dd.__init__(self)
-        self.tb = tb
-
-    def eval(self, ignore):
-        """
-        This method is called from gr.bin_statistics_f when it wants to change
-        the center frequency.  This method tunes the front end to the new center
-        frequency, and returns the new frequency as its result.
-        """
-        try:
-            # We use this try block so that if something goes wrong from here 
-            # down, at least we'll have a prayer of knowing what went wrong.
-            # Without this, you get a very mysterious:
-            #
-            #   terminate called after throwing an instance of 'Swig::DirectorMethodException'
-            #   Aborted
-            #
-            # message on stderr.  Not exactly helpful ;)
-
-            new_freq = self.tb.set_next_freq()
-            return new_freq
-
-        except Exception, e:
-            print "tune: Exception: ", e
-
-
-class parse_msg(object):
-    def __init__(self, sample_rate, percent, alpha=0.01):
-        self.axis_font_size = 16
-        self.label_font_size = 18
-        self.title_font_size = 20
-        self.text_size = 22
-
-        self.fig = figure(1, facecolor="w", figsize=(12,9))
-        self.sp  = self.fig.add_subplot(1,1,1)
-        self.pl  = self.sp.plot(range(100), 100*[1,])
-
-        params = {'backend': 'ps',
-                  'xtick.labelsize': self.axis_font_size,
-                  'ytick.labelsize': self.axis_font_size,
-                  'text.usetex': False}
-        rcParams.update(params)
-
-        self.sp.set_title(("FFT"), fontsize=self.title_font_size, fontweight="bold")
-        self.sp.set_xlabel("Frequency (Hz)", fontsize=self.label_font_size, fontweight="bold")
-        self.sp.set_ylabel("Magnitude (dB)", fontsize=self.label_font_size, fontweight="bold")
-        self.text_alpha = figtext(0.10, 0.94, ('Moving average alpha: %s' % alpha), weight="heavy", size=self.text_size)
-
-        self.cfreqs = list()
-        self.freqrange = list()
-        self.data = list() #array('f')
-
-        self.alpha = alpha
-
-        self.index = 0
-        self.full = False
-        self.last_cfreq = 0
-        
-        self.sample_rate = sample_rate
-        self.percent = (1.0-percent)/2.0
-        
-    def parse(self, msg):
-        self.center_freq = msg.arg1()
-        self.vlen = int(msg.arg2())
-        assert(msg.length() == self.vlen * gr.sizeof_float)
-
-
-        if(self.center_freq < self.last_cfreq):
-            print "Plotting spectrum\n"
-            self.full = True
-
-            self.pl[0].set_data([self.freqrange, self.data])
-            self.sp.set_ylim([min(self.data), max(self.data)])
-            self.sp.set_xlim([min(self.freqrange), max(self.freqrange)])
-            draw()
-
-            self.index = 0
-            del self.freqrange
-            self.freqrange = list()
-            #raw_input()
-
-        self.last_cfreq = self.center_freq
-
-        startind = int(self.percent * self.vlen)
-        endind = int((1.0 - self.percent) * self.vlen)
-        
-        fstep = self.sample_rate / self.vlen
-        f = [self.center_freq - self.sample_rate/2.0 + i*fstep for i in range(startind, endind)]
-        self.freqrange += f
-
-        t = msg.to_string()
-        d = struct.unpack('%df' % (self.vlen,), t)
-
-        if self.full:
-            for i in range(startind, endind):
-                self.data[self.index] = (1.0-self.alpha)*self.data[self.index] + (self.alpha)*d[i]
-                self.index += 1
-        else:
-            self.data += [di for di in d[startind:endind]]
-        
-
-class my_top_block(gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        usage = "usage: %prog [options] host min_freq max_freq"
-        parser = OptionParser(option_class=eng_option, usage=usage)
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("", "--tune-delay", type="eng_float", default=5e-5, metavar="SECS",
-                          help="time to delay (in seconds) after changing frequency [default=%default]")
-        parser.add_option("", "--dwell-delay", type="eng_float", default=50e-5, metavar="SECS",
-                          help="time to dwell (in seconds) at a given frequncy [default=%default]")
-        parser.add_option("-F", "--fft-size", type="int", default=256,
-                          help="specify number of FFT bins [default=%default]")
-        parser.add_option("-d", "--decim", type="intx", default=16,
-                          help="set decimation to DECIM [default=%default]")
-        parser.add_option("", "--real-time", action="store_true", default=False,
-                          help="Attempt to enable real-time scheduling")
-
-        (options, args) = parser.parse_args()
-        if len(args) != 3:
-            parser.print_help()
-            sys.exit(1)
-
-        self.address  = args[0]
-        self.min_freq = eng_notation.str_to_num(args[1])
-        self.max_freq = eng_notation.str_to_num(args[2])
-
-        self.decim = options.decim
-        self.gain  = options.gain
-        
-        if self.min_freq > self.max_freq:
-            self.min_freq, self.max_freq = self.max_freq, self.min_freq   # swap them
-
-	self.fft_size = options.fft_size
-
-        if not options.real_time:
-            realtime = False
-        else:
-            # Attempt to enable realtime scheduling
-            r = gr.enable_realtime_scheduling()
-            if r == gr.RT_OK:
-                realtime = True
-            else:
-                realtime = False
-                print "Note: failed to enable realtime scheduling"
-
-        adc_rate = 102.4e6
-        self.int_rate = adc_rate / self.decim
-        print "Sampling rate: ", self.int_rate
-
-        # build graph
-        self.port = 10001
-        self.src = msdd.source_simple(self.address, self.port)
-        self.src.set_decim_rate(self.decim)
-
-        self.set_gain(self.gain)
-        self.set_freq(self.min_freq)
-
-	s2v = gr.stream_to_vector(gr.sizeof_gr_complex, self.fft_size)
-
-        mywindow = window.blackmanharris(self.fft_size)
-        fft = gr.fft_vcc(self.fft_size, True, mywindow, True)
-        power = 0
-        for tap in mywindow:
-            power += tap*tap
-        
-        norm = gr.multiply_const_cc(1.0/self.fft_size)
-        c2mag = gr.complex_to_mag_squared(self.fft_size)
-
-        # FIXME the log10 primitive is dog slow
-        log = gr.nlog10_ff(10, self.fft_size,
-                           -20*math.log10(self.fft_size)-10*math.log10(power/self.fft_size))
-		
-        # Set the freq_step to % of the actual data throughput.
-        # This allows us to discard the bins on both ends of the spectrum.
-        self.percent = 0.4
-
-        self.freq_step = self.percent * self.int_rate
-        self.min_center_freq = self.min_freq + self.freq_step/2
-        nsteps = math.ceil((self.max_freq - self.min_freq) / self.freq_step)
-        self.max_center_freq = self.min_center_freq + (nsteps * self.freq_step)
-
-        self.next_freq = self.min_center_freq
-        
-        tune_delay  = max(0, int(round(options.tune_delay * self.int_rate / self.fft_size)))  # in fft_frames
-        dwell_delay = max(1, int(round(options.dwell_delay * self.int_rate / self.fft_size))) # in fft_frames
-
-        self.msgq = gr.msg_queue(16)
-        self._tune_callback = tune(self)        # hang on to this to keep it from being GC'd
-        stats = gr.bin_statistics_f(self.fft_size, self.msgq,
-                                    self._tune_callback, tune_delay, dwell_delay)
-
-        # FIXME leave out the log10 until we speed it up
-	self.connect(self.src, s2v, fft, c2mag, log, stats)
-
-
-    def set_next_freq(self):
-        target_freq = self.next_freq
-        self.next_freq = self.next_freq + self.freq_step
-        if self.next_freq >= self.max_center_freq:
-            self.next_freq = self.min_center_freq
-
-        if not self.set_freq(target_freq):
-            print "Failed to set frequency to", target_freq
-
-        return target_freq
-                          
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        """
-        return self.src.set_rx_freq(0, target_freq)
-
-
-    def set_gain(self, gain):
-        self.src.set_pga(0, gain)
-
-
-def main_loop(tb):
-    msgparser = parse_msg(tb.int_rate, tb.percent)
-    
-    while 1:
-
-        # Get the next message sent from the C++ code (blocking call).
-        # It contains the center frequency and the mag squared of the fft
-        msgparser.parse(tb.msgq.delete_head())
-
-        # Print center freq so we know that something is happening...
-        print msgparser.center_freq
-
-        # FIXME do something useful with the data...
-        
-        # m.data are the mag_squared of the fft output (they are in the
-        # standard order.  I.e., bin 0 == DC.)
-        # You'll probably want to do the equivalent of "fftshift" on them
-        # m.raw_data is a string that contains the binary floats.
-        # You could write this as binary to a file.
-
-    
-if __name__ == '__main__':
-    tb = my_top_block()
-    try:
-        tb.start()              # start executing flow graph in another thread...
-        main_loop(tb)
-        
-    except KeyboardInterrupt:
-        pass
diff --git a/gr-msdd6000/src/python-examples/msdd_spectrum_waterfall.py b/gr-msdd6000/src/python-examples/msdd_spectrum_waterfall.py
deleted file mode 100755
index 05f047e11..000000000
--- a/gr-msdd6000/src/python-examples/msdd_spectrum_waterfall.py
+++ /dev/null
@@ -1,306 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 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.
-# 
-
-from gnuradio import gr, gru, eng_notation, optfir, window
-from gnuradio import msdd
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys
-import math
-import struct
-from pylab import *
-from numpy import array
-import time
-
-matplotlib.interactive(True)
-matplotlib.use('TkAgg')
-
-class tune(gr.feval_dd):
-    """
-    This class allows C++ code to callback into python.
-    """
-    def __init__(self, tb):
-        gr.feval_dd.__init__(self)
-        self.tb = tb
-
-    def eval(self, ignore):
-        """
-        This method is called from gr.bin_statistics_f when it wants to change
-        the center frequency.  This method tunes the front end to the new center
-        frequency, and returns the new frequency as its result.
-        """
-        try:
-            # We use this try block so that if something goes wrong from here 
-            # down, at least we'll have a prayer of knowing what went wrong.
-            # Without this, you get a very mysterious:
-            #
-            #   terminate called after throwing an instance of 'Swig::DirectorMethodException'
-            #   Aborted
-            #
-            # message on stderr.  Not exactly helpful ;)
-
-            new_freq = self.tb.set_next_freq()
-            return new_freq
-
-        except Exception, e:
-            print "tune: Exception: ", e
-
-
-class parse_msg(object):
-    def __init__(self, sample_rate, percent):
-        self.axis_font_size = 16
-        self.label_font_size = 18
-        self.title_font_size = 20
-        self.text_size = 22
-
-        # Set up figures and subplots
-        self.fig = figure(1, facecolor="w", figsize=(12,9))
-        self.sp  = self.fig.add_subplot(1,1,1)
-        self.pl  = self.sp.matshow(100*[range(100),])
-
-        params = {'xtick.labelsize': self.axis_font_size,
-                  'ytick.labelsize': self.axis_font_size}
-        rcParams.update(params)
-
-        # Throw up some title info
-        self.sp.set_title(("FFT"), fontsize=self.title_font_size, fontweight="bold")
-        self.sp.set_xlabel("Frequency (Hz)", fontsize=self.label_font_size, fontweight="bold")
-        self.sp.set_ylabel("Sample index (should be time)", fontsize=self.label_font_size, fontweight="bold")
-
-        self.freqrange = list()
-        self.data = list()
-        self.data3 = list()
-
-        self.index = 0
-        self.last_cfreq = 0
-
-        # So we know how to splice the data
-        self.sample_rate = sample_rate
-        self.percent = (1.0-percent)/2.0
-        
-    def parse(self, msg):
-        self.center_freq = msg.arg1()    # read the current center frequency
-        self.vlen = int(msg.arg2())      # read the length of the data set received
-
-        # wait until we wrap around before plotting the entire collected band
-        if(self.center_freq < self.last_cfreq):
-            #print "Plotting spectrum\n"
-
-            # If we have 100 sets, start dropping the oldest
-            if(len(self.data3) > 100):
-                self.data3.pop(0)
-            self.data3.append(self.data)
-
-            # add the new data to the plot
-            self.pl.set_data(self.data3)
-            draw()
-
-            # reset lists to collect next round
-            self.index = 0
-            del self.freqrange
-            self.freqrange = list()
-            del self.data
-            self.data = list()
-            #raw_input()
-
-        self.last_cfreq = self.center_freq
-
-        startind = int(self.percent * self.vlen)
-        endind = int((1.0 - self.percent) * self.vlen)
-        
-        fstep = self.sample_rate / self.vlen
-        f = [self.center_freq - self.sample_rate/2.0 + i*fstep for i in range(startind, endind)]
-        self.freqrange += f
-
-        t = msg.to_string();
-
-        d = struct.unpack('%df' % (self.vlen,), t)
-
-        self.data += [di for di in d[startind:endind]]
-        
-
-class my_top_block(gr.top_block):
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        # Build an options parser to bring in information from the user on usage
-        usage = "usage: %prog [options] host min_freq max_freq"
-        parser = OptionParser(option_class=eng_option, usage=usage)
-        parser.add_option("-g", "--gain", type="eng_float", default=32,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("", "--tune-delay", type="eng_float", default=5e-5, metavar="SECS",
-                          help="time to delay (in seconds) after changing frequency [default=%default]")
-        parser.add_option("", "--dwell-delay", type="eng_float", default=50e-5, metavar="SECS",
-                          help="time to dwell (in seconds) at a given frequncy [default=%default]")
-        parser.add_option("-F", "--fft-size", type="int", default=256,
-                          help="specify number of FFT bins [default=%default]")
-        parser.add_option("-d", "--decim", type="intx", default=16,
-                          help="set decimation to DECIM [default=%default]")
-        parser.add_option("", "--real-time", action="store_true", default=False,
-                          help="Attempt to enable real-time scheduling")
-
-        (options, args) = parser.parse_args()
-        if len(args) != 3:
-            parser.print_help()
-            sys.exit(1)
-
-        # get user-provided info on address of MSDD and frequency to sweep
-        self.address  = args[0]
-        self.min_freq = eng_notation.str_to_num(args[1])
-        self.max_freq = eng_notation.str_to_num(args[2])
-
-        self.decim = options.decim
-        self.gain  = options.gain
-        
-        if self.min_freq > self.max_freq:
-            self.min_freq, self.max_freq = self.max_freq, self.min_freq   # swap them
-
-	self.fft_size = options.fft_size
-
-        if not options.real_time:
-            realtime = False
-        else:
-            # Attempt to enable realtime scheduling
-            r = gr.enable_realtime_scheduling()
-            if r == gr.RT_OK:
-                realtime = True
-            else:
-                realtime = False
-                print "Note: failed to enable realtime scheduling"
-
-        # Sampling rate is hardcoded and cannot be read off device
-        adc_rate = 102.4e6
-        self.int_rate = adc_rate / self.decim
-        print "Sampling rate: ", self.int_rate
-
-        # build graph
-        self.port = 10001   # required port for UDP packets
-	
-	#	which board,	op mode,	adx,	port
-#        self.src = msdd.source_c(0, 1, self.address, self.port)  # build source object
-
-	self.conv = gr.interleaved_short_to_complex();
-
-	self.src = msdd.source_simple(self.address,self.port);
-        self.src.set_decim_rate(self.decim)                      # set decimation rate
-#        self.src.set_desired_packet_size(0, 1460)                # set packet size to collect
-
-        self.set_gain(self.gain)                                 # set receiver's attenuation
-        self.set_freq(self.min_freq)                             # set receiver's rx frequency
-        
-        # restructure into vector format for FFT input
-	s2v = gr.stream_to_vector(gr.sizeof_gr_complex, self.fft_size)
-
-        # set up FFT processing block
-        mywindow = window.blackmanharris(self.fft_size)
-        fft = gr.fft_vcc(self.fft_size, True, mywindow, True)
-        power = 0
-        for tap in mywindow:
-            power += tap*tap
-        
-        # calculate magnitude squared of output of FFT
-        c2mag = gr.complex_to_mag_squared(self.fft_size)
-
-        # FIXME the log10 primitive is dog slow
-        log = gr.nlog10_ff(10, self.fft_size,
-                           -20*math.log10(self.fft_size)-10*math.log10(power/self.fft_size))
-		
-        # Set the freq_step to % of the actual data throughput.
-        # This allows us to discard the bins on both ends of the spectrum.
-        self.percent = 0.4
-
-        # Calculate the frequency steps to use in the collection over the whole bandwidth
-        self.freq_step = self.percent * self.int_rate
-        self.min_center_freq = self.min_freq + self.freq_step/2
-        nsteps = math.ceil((self.max_freq - self.min_freq) / self.freq_step)
-        self.max_center_freq = self.min_center_freq + (nsteps * self.freq_step)
-
-        self.next_freq = self.min_center_freq
-        
-        # use these values to set receiver settling time between samples and sampling time
-        # the default values provided seem to work well with the MSDD over 100 Mbps ethernet
-        tune_delay  = max(0, int(round(options.tune_delay * self.int_rate / self.fft_size)))  # in fft_frames
-        dwell_delay = max(1, int(round(options.dwell_delay * self.int_rate / self.fft_size))) # in fft_frames
-
-        # set up message callback routine to get data from bin_statistics_f block
-        self.msgq = gr.msg_queue(16)
-        self._tune_callback = tune(self)        # hang on to this to keep it from being GC'd
-
-        # FIXME this block doesn't like to work with negatives because of the "d_max[i]=0" on line
-        # 151 of gr_bin_statistics_f.cc file. Set this to -10000 or something to get it to work.
-        stats = gr.bin_statistics_f(self.fft_size, self.msgq,
-                                    self._tune_callback, tune_delay, dwell_delay)
-
-        # FIXME there's a concern over the speed of the log calculation
-        # We can probably calculate the log inside the stats block
-	self.connect(self.src, self.conv, s2v, fft, c2mag, log, stats)
-
-
-    def set_next_freq(self):
-        ''' Find and set the next frequency of the reciver. After going past the maximum frequency,
-        the frequency is wrapped around to the start again'''
-        target_freq = self.next_freq
-        self.next_freq = self.next_freq + self.freq_step
-        if self.next_freq >= self.max_center_freq:
-            self.next_freq = self.min_center_freq
-
-        if not self.set_freq(target_freq):
-            print "Failed to set frequency to", target_freq
-
-        return target_freq
-                          
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        """
-        return self.src.set_rx_freq(0, target_freq)
-
-
-    def set_gain(self, gain):
-        self.src.set_pga(0, gain)
-
-
-def main_loop(tb):
-    # Set up parser to get data from stats block and display them.
-    msgparser = parse_msg(tb.int_rate, tb.percent)
-    
-    while 1:
-        # Get the next message sent from the C++ code (blocking call).
-        # It contains the center frequency and the mag squared of the fft
-	d = tb.msgq.delete_head();
-	print d.to_string();
-        msgparser.parse(d)
-        #print msgparser.center_freq
-    
-if __name__ == '__main__':
-    tb = my_top_block()
-    try:
-        tb.start()              # start executing flow graph in another thread...
-        main_loop(tb)
-        
-    except KeyboardInterrupt:
-        pass
diff --git a/gr-msdd6000/src/python-examples/new_msdd_fft.py b/gr-msdd6000/src/python-examples/new_msdd_fft.py
deleted file mode 100755
index 782ecb66e..000000000
--- a/gr-msdd6000/src/python-examples/new_msdd_fft.py
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,2007,2008,2010 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.
-# 
-
-from gnuradio import gr, gru
-from gnuradio import usrp
-from gnuradio import msdd
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider
-from optparse import OptionParser
-import wx
-import sys
-import numpy
-
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    If there's a daughterboard on A, select A.
-    If there's a daughterboard on B, select B.
-    Otherwise, select A.
-    """
-    return (0, 0)
-
-
-class app_top_block(stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        self.frame = frame
-        self.panel = panel
-        
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-w", "--which", type="int", default=0,
-                          help="select which USRP (0, 1, ...) default is %default",
-			  metavar="NUM")
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=first one with a daughterboard)")
-        parser.add_option("-A", "--antenna", default=None,
-                          help="select Rx Antenna (only on RFX-series boards)")
-        parser.add_option("-d", "--decim", type="int", default=16,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-W", "--waterfall", action="store_true", default=False,
-                          help="Enable waterfall display")
-        parser.add_option("-8", "--width-8", action="store_true", default=False,
-                          help="Enable 8-bit samples across USB")
-        parser.add_option( "--no-hb", action="store_true", default=False,
-                          help="don't use halfband filter in usrp")
-        parser.add_option("-S", "--oscilloscope", action="store_true", default=False,
-                          help="Enable oscilloscope display")
-	parser.add_option("", "--avg-alpha", type="eng_float", default=1e-1,
-			  help="Set fftsink averaging factor, default=[%default]")
-	parser.add_option("", "--ref-scale", type="eng_float", default=13490.0,
-			  help="Set dBFS=0dB input value, default=[%default]")
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-	self.options = options
-        self.show_debug_info = True
-        
-        # build the graph
-        if options.no_hb or (options.decim<8):
-          #Min decimation of this firmware is 4. 
-          #contains 4 Rx paths without halfbands and 0 tx paths.
-          self.fpga_filename="std_4rx_0tx.rbf"
-#          self.u = usrp.source_c(which=options.which, decim_rate=options.decim, fpga_filename=self.fpga_filename)
-	  self.u = msdd.source_simple("192.168.1.200",0);
-        else:
-          #Min decimation of standard firmware is 8. 
-          #standard fpga firmware "std_2rxhb_2tx.rbf" 
-          #contains 2 Rx paths with halfband filters and 2 tx paths (the default)
-          #self.u = usrp.source_c(which=options.which, decim_rate=options.decim)
-	  self.u = msdd.source_simple("192.168.1.200",0);
-
-            
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-
-        if options.waterfall:
-            self.scope = \
-              waterfallsink2.waterfall_sink_c (panel, fft_size=1024, sample_rate=input_rate)
-        elif options.oscilloscope:
-            self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate)
-        else:
-            self.scope = fftsink2.fft_sink_c (panel, fft_size=1024, sample_rate=input_rate, 
-					      ref_scale=options.ref_scale, ref_level=0.0, y_divs = 10,
-					      avg_alpha=options.avg_alpha)
-
-	self.conv = gr.interleaved_short_to_complex();
-        self.connect(self.u, self.conv,  self.scope)
-
-        self._build_gui(vbox)
-	self._setup_events()
-	
-        # set initial values
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            #g = self.subdev.gain_range()
-            #g = self.u.gain_range()
-            g = [0,10]
-            options.gain = float(g[0]+g[1])/2
-
-        if options.freq is None:
-            # if no freq was specified, use the mid-point
-            #r = self.subdev.freq_range()
-            #r = self.u.freq_range()
-	    r = [30e6, 6e9]
-            options.freq = float(r[0]+r[1])/2
-
-        self.set_gain(options.gain)
-
-	if options.antenna is not None:
-            print "Selecting antenna %s" % (options.antenna,)
-            self.subdev.select_rx_antenna(options.antenna)
-
-        if self.show_debug_info:
-            self.myform['decim'].set_value(self.u.decim_rate())
-            self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-            self.myform['dbname'].set_value("no subdevs used")
-            self.myform['baseband'].set_value(0)
-            self.myform['ddc'].set_value(0)
-
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-
-    def _set_status_msg(self, msg):
-        self.frame.GetStatusBar().SetStatusText(msg, 0)
-
-    def _build_gui(self, vbox):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-            
-        vbox.Add(self.scope.win, 10, wx.EXPAND)
-        
-        # add control area at the bottom
-        self.myform = myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0, 0)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=hbox, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-        hbox.Add((5,0), 0, 0)
-        #g = self.subdev.gain_range()
-        #g = self.u.gain_range()
-        g = [0,10]
-        myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                           weight=3,
-                                           min=int(g[0]), max=int(g[1]),
-                                           callback=self.set_gain)
-
-        hbox.Add((5,0), 0, 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        self._build_subpanel(vbox)
-
-    def _build_subpanel(self, vbox_arg):
-        # build a secondary information panel (sometimes hidden)
-
-        # FIXME figure out how to have this be a subpanel that is always
-        # created, but has its visibility controlled by foo.Show(True/False)
-        
-        def _form_set_decim(kv):
-            return self.set_decim(kv['decim'])
-
-        if not(self.show_debug_info):
-            return
-
-        panel = self.panel
-        vbox = vbox_arg
-        myform = self.myform
-
-        #panel = wx.Panel(self.panel, -1)
-        #vbox = wx.BoxSizer(wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-
-        myform['decim'] = form.int_field(
-            parent=panel, sizer=hbox, label="Decim",
-            callback=myform.check_input_and_call(_form_set_decim, self._set_status_msg))
-
-        hbox.Add((5,0), 1)
-        myform['fs@usb'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Fs@gigE")
-
-        hbox.Add((5,0), 1)
-        myform['dbname'] = form.static_text_field(
-            parent=panel, sizer=hbox)
-
-        hbox.Add((5,0), 1)
-        myform['baseband'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Analog BB")
-
-        hbox.Add((5,0), 1)
-        myform['ddc'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC")
-
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        #r = self.u.tune(0, self.subdev, target_freq)
-        r = self.u.set_rx_freq(0, target_freq)
-        
-        if r:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-#            if self.show_debug_info:
-#                self.myform['baseband'].set_value(r.baseband_freq)
-#                self.myform['ddc'].set_value(r.dxc_freq)
-	    if not self.options.waterfall and not self.options.oscilloscope:
-		self.scope.set_baseband_freq(target_freq)
-    	    return True
-
-        return False
-
-    def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-        self.u.set_pga(0,gain)
-
-    def set_decim(self, decim):
-        ok = self.u.set_decim_rate(decim)
-        if not ok:
-            print "set_decim failed"
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-        self.scope.set_sample_rate(input_rate)
-        if self.show_debug_info:  # update displayed values
-            self.myform['decim'].set_value(self.u.decim_rate())
-            self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-        return ok
-
-    def _setup_events(self):
-	if not self.options.waterfall and not self.options.oscilloscope:
-	    self.scope.win.Bind(wx.EVT_LEFT_DCLICK, self.evt_left_dclick)
-	    
-    def evt_left_dclick(self, event):
-	(ux, uy) = self.scope.win.GetXY(event)
-	if event.CmdDown():
-	    # Re-center on maximum power
-	    points = self.scope.win._points
-	    if self.scope.win.peak_hold:
-		if self.scope.win.peak_vals is not None:
-		    ind = numpy.argmax(self.scope.win.peak_vals)
-		else:
-		    ind = int(points.shape()[0]/2)
-	    else:
-        	ind = numpy.argmax(points[:,1])
-            (freq, pwr) = points[ind]
-	    target_freq = freq/self.scope.win._scale_factor
-	    print ind, freq, pwr
-            self.set_freq(target_freq)            
-	else:
-	    # Re-center on clicked frequency
-	    target_freq = ux/self.scope.win._scale_factor
-	    self.set_freq(target_freq)
-	    
-	
-def main ():
-    app = stdgui2.stdapp(app_top_block, "USRP FFT", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-msdd6000/src/python-examples/ofdm/benchmark_ofdm_rx.py b/gr-msdd6000/src/python-examples/ofdm/benchmark_ofdm_rx.py
deleted file mode 100755
index deb82e111..000000000
--- a/gr-msdd6000/src/python-examples/ofdm/benchmark_ofdm_rx.py
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006, 2007 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.
-# 
-
-from gnuradio import gr, blks2
-from gnuradio import msdd
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-import struct, sys
-
-# from current dir
-from receive_path import receive_path
-
-class my_top_block(gr.top_block):
-    def __init__(self, address, callback, options):
-        gr.top_block.__init__(self)
-
-        self._address = address
-        self._rx_freq = options.rx_freq         # receiver's center frequency
-        self._rx_gain = options.rx_gain         # receiver's gain
-        self._decim   = options.decim           # Decimating rate for the USRP (prelim)
-
-        if self._rx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --rx-freq FREQ must be specified\n")
-            raise SystemExit
-
-        # Set up USRP source
-        self._setup_source()
-
-        #taps = gr.firdes.low_pass(1, 1, 0.4, 0.2)
-        #self.resample = gr.rational_resampler_base_ccf(5, 8, taps)
-        self.resample = blks2.rational_resampler_ccf(5, 8)
-
-        # Set up receive path
-        self.rxpath = receive_path(callback, options)
-
-        self.connect(self.src, self.resample, self.rxpath)
-        #self.connect(self.src, gr.file_sink(gr.sizeof_gr_complex, "receive.dat"))
-        #self.connect(self.resample, gr.file_sink(gr.sizeof_gr_complex, "resampled.dat"))
-        
-    def _setup_source(self):
-        # build graph
-        self._port = 10001
-        self.src = msdd.source_c(0, 1, self._address, self._port)
-        self.src.set_decim_rate(self._decim)
-        self.src.set_desired_packet_size(0, 1460)
-
-        self.set_gain(self._rx_gain)
-        self.set_freq(self._rx_freq)
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-        """
-        r = self.src.set_rx_freq(0, target_freq)
-        if r:
-            return True
-        return False
-
-    def set_gain(self, gain):
-        """
-        Sets the analog gain in the USRP
-        """
-        return self.src.set_pga(0, gain)
-
-    def decim(self):
-        return self._decim
-
-    def add_options(normal, expert):
-        """
-        Adds usrp-specific options to the Options Parser
-        """
-        add_freq_option(normal)
-        normal.add_option("", "--rx-gain", type="eng_float", default=32, metavar="GAIN",
-                          help="set receiver gain in dB [default=%default].")
-        normal.add_option("-v", "--verbose", action="store_true", default=False)
-
-        expert.add_option("", "--rx-freq", type="eng_float", default=None,
-                          help="set Rx frequency to FREQ [default=%default]", metavar="FREQ")
-        expert.add_option("-d", "--decim", type="intx", default=128,
-                          help="set fpga decimation rate to DECIM [default=%default]")
-        expert.add_option("", "--snr", type="eng_float", default=30,
-                          help="set the SNR of the channel in dB [default=%default]")
-   
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ [default=%default]",
-                          metavar="FREQ")
-
-# /////////////////////////////////////////////////////////////////////////////
-#                                   main
-# /////////////////////////////////////////////////////////////////////////////
-
-def main():
-
-    global n_rcvd, n_right
-        
-    n_rcvd = 0
-    n_right = 0
-
-    def rx_callback(ok, payload):
-        global n_rcvd, n_right
-        n_rcvd += 1
-        (pktno,) = struct.unpack('!H', payload[0:2])
-        if ok:
-            n_right += 1
-        print "ok: %r \t pktno: %d \t n_rcvd: %d \t n_right: %d" % (ok, pktno, n_rcvd, n_right)
-
-        if 0:
-            printlst = list()
-            for x in payload[2:]:
-                t = hex(ord(x)).replace('0x', '')
-                if(len(t) == 1):
-                    t = '0' + t
-                printlst.append(t)
-            printable = ''.join(printlst)
-
-            print printable
-            print "\n"
-
-    usage = "usage: %prog [options] host"
-    parser = OptionParser(usage=usage, option_class=eng_option, conflict_handler="resolve")
-    expert_grp = parser.add_option_group("Expert")
-    parser.add_option("","--discontinuous", action="store_true", default=False,
-                      help="enable discontinuous")
-
-    my_top_block.add_options(parser, expert_grp)
-    receive_path.add_options(parser, expert_grp)
-    blks2.ofdm_mod.add_options(parser, expert_grp)
-    blks2.ofdm_demod.add_options(parser, expert_grp)
-
-    (options, args) = parser.parse_args ()
-    address = args[0]
-
-    # build the graph
-    tb = my_top_block(address, rx_callback, options)
-
-    #r = gr.enable_realtime_scheduling()
-    #if r != gr.RT_OK:
-    #    print "Warning: failed to enable realtime scheduling"
-
-    tb.start()                      # start flow graph
-    tb.wait()                       # wait for it to finish
-
-if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
diff --git a/gr-msdd6000/src/python-examples/ofdm/gr_plot_ofdm.py b/gr-msdd6000/src/python-examples/ofdm/gr_plot_ofdm.py
deleted file mode 100755
index 0bca41037..000000000
--- a/gr-msdd6000/src/python-examples/ofdm/gr_plot_ofdm.py
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 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.
-# 
-
-import scipy, pylab, math
-import struct, sys
-from pylab import *
-from matplotlib.font_manager import fontManager, FontProperties
-from optparse import OptionParser
-from scipy import fftpack
-from math import log10
-
-matplotlib.interactive(True)
-matplotlib.use('TkAgg')
-
-class draw_constellation:
-    def __init__(self, options):
-        derot_file = "ofdm_frame_sink_c.dat"
-        acq_file = "ofdm_frame_acq_c.dat"
-        fft_file = "fft_out_c.dat"
-
-        self.h_derot_file = open(derot_file, "r")
-        self.h_acq_file = open(acq_file, "r")
-        self.h_fft_file = open(fft_file, "r")
-
-        self.occ_tones = options.occ_tones
-        self.fft_size  = options.fft_size
-        self.symbol = options.start
-        self.sample_rate = options.sample_rate
-        
-        self.axis_font_size = 16
-        self.label_font_size = 18
-        self.title_font_size = 20
-        self.text_size = 22
-        
-        # Setup PLOT
-        self.fig = figure(1, figsize=(14, 9), facecolor='w')
-        rcParams['xtick.labelsize'] = self.axis_font_size
-        rcParams['ytick.labelsize'] = self.axis_font_size
-
-        self.text_sym = figtext(0.05, 0.95, ("Symbol: %s" % self.symbol), weight="heavy", size=self.text_size)
-
-        self.make_plots()
-
-        self.button_left_axes = self.fig.add_axes([0.45, 0.01, 0.05, 0.05], frameon=True)
-        self.button_left = Button(self.button_left_axes, "<")
-        self.button_left_callback = self.button_left.on_clicked(self.button_left_click)
-
-        self.button_right_axes = self.fig.add_axes([0.50, 0.01, 0.05, 0.05], frameon=True)
-        self.button_right = Button(self.button_right_axes, ">")
-        self.button_right_callback = self.button_right.on_clicked(self.button_right_click)
-
-        self.xlim = self.sp_eq.get_xlim()
-
-        self.manager = get_current_fig_manager()
-        #connect('draw_event', self.zoom)
-        connect('key_press_event', self.click)
-        show()
-
-    def get_data(self):
-        self.text_sym.set_text("Symbol: %d" % (self.symbol))
-
-        derot_data = scipy.fromfile(self.h_derot_file, dtype=scipy.complex64, count=self.occ_tones)
-        acq_data = scipy.fromfile(self.h_acq_file, dtype=scipy.complex64, count=self.occ_tones)
-        fft_data = scipy.fromfile(self.h_fft_file, dtype=scipy.complex64, count=self.fft_size)
-        if(len(acq_data) == 0):
-            print "End of File"
-        else:
-            self.acq_data_reals = [r.real for r in acq_data]
-            self.acq_data_imags = [i.imag for i in acq_data]
-            self.derot_data_reals = [r.real for r in derot_data]
-            self.derot_data_imags = [i.imag for i in derot_data]
-
-            self.unequalized_angle = [math.atan2(x.imag, x.real) for x in fft_data]
-            self.equalized_angle = [math.atan2(x.imag, x.real) for x in acq_data]
-            self.derot_equalized_angle = [math.atan2(x.imag, x.real) for x in derot_data]
-
-            self.time = [i*(1/self.sample_rate) for i in range(len(acq_data))]
-            ffttime = [i*(1/self.sample_rate) for i in range(len(fft_data))]
-
-            self.freq = self.get_freq(ffttime, self.sample_rate)
-
-            for i in range(len(fft_data)):
-                if(abs(fft_data[i]) == 0.0):
-                    fft_data[i] = complex(1e-6,1e-6)
-            self.fft_data = [20*log10(abs(f)) for f in fft_data]
-              
-    def get_freq(self, time, sample_rate, T=1):
-        N = len(time)
-        Fs = 1.0 / (max(time) - min(time))
-        Fn = 0.5 * sample_rate
-        freq = [-Fn + i*Fs for i in range(N)]
-        return freq
-
-    def make_plots(self):
-        self.h_acq_file.seek(8*self.symbol*self.occ_tones, 0)
-        self.h_fft_file.seek(8*self.symbol*self.fft_size, 0)
-        self.h_derot_file.seek(8*self.symbol*self.occ_tones, 0)
-
-        self.get_data()
-        
-        # Subplot:  constellation of rotated symbols
-        self.sp_const = self.fig.add_subplot(4,1,1, position=[0.15, 0.55, 0.3, 0.35])
-        self.sp_const.set_title(("Constellation"), fontsize=self.title_font_size, fontweight="bold")
-        self.sp_const.set_xlabel("Inphase", fontsize=self.label_font_size, fontweight="bold")
-        self.sp_const.set_ylabel("Qaudrature", fontsize=self.label_font_size, fontweight="bold")
-        self.plot_const = plot(self.acq_data_reals, self.acq_data_imags, 'bo')
-        self.plot_const += plot(self.derot_data_reals, self.derot_data_imags, 'ro')
-        self.sp_const.axis([-2, 2, -2, 2])
-
-        # Subplot: unequalized angle
-        self.sp_uneq = self.fig.add_subplot(4,2,1, position=[0.575, 0.55, 0.3, 0.35])
-        self.sp_uneq.set_title(("Unequalized Angle"), fontsize=self.title_font_size, fontweight="bold")
-        self.sp_uneq.set_xlabel("Time (s)", fontsize=self.label_font_size, fontweight="bold")
-        self.sp_uneq.set_ylabel("Angle", fontsize=self.label_font_size, fontweight="bold")
-        uneqscale = range(len(self.unequalized_angle))
-        self.plot_uneq = plot(uneqscale, self.unequalized_angle, 'bo')
-
-        # Subplot: equalized angle
-        self.sp_eq = self.fig.add_subplot(4,1,2, position=[0.15, 0.1, 0.3, 0.35])
-        self.sp_eq.set_title(("Equalized Angle"), fontsize=self.title_font_size, fontweight="bold")
-        self.sp_eq.set_xlabel("Time (s)", fontsize=self.label_font_size, fontweight="bold")
-        self.sp_eq.set_ylabel("Angle", fontsize=self.label_font_size, fontweight="bold")
-        eqscale = range(len(self.equalized_angle))
-        self.plot_eq = plot(eqscale, self.equalized_angle, 'bo')
-        self.plot_eq += plot(eqscale, self.derot_equalized_angle, 'ro', markersize=4)
-
-        # Subplot: FFT
-        self.sp_fft = self.fig.add_subplot(4,2,2, position=[0.575, 0.1, 0.3, 0.35])
-        self.sp_fft.set_title(("FFT"), fontsize=self.title_font_size, fontweight="bold")
-        self.sp_fft.set_xlabel("Frequency (MHz)", fontsize=self.label_font_size, fontweight="bold")
-        self.sp_fft.set_ylabel("Power (dBm)", fontsize=self.label_font_size, fontweight="bold")
-        self.plot_fft = plot(self.freq, self.fft_data, '-bo')
-
-        draw()
-
-    def update_plots(self):
-        eqscale = range(len(self.equalized_angle))
-        uneqscale = range(len(self.unequalized_angle))
-        self.plot_eq[0].set_data([eqscale, self.equalized_angle])
-        self.plot_eq[1].set_data([eqscale, self.derot_equalized_angle])
-        self.plot_uneq[0].set_data([uneqscale, self.unequalized_angle])
-        self.sp_eq.set_ylim([-4, 4])
-        self.sp_uneq.set_ylim([-4, 4])
-
-        #self.sp_iq.axis([min(self.time), max(self.time),
-        #                 1.5*min([min(self.acq_data_reals), min(self.acq_data_imags)]),
-        #                 1.5*max([max(self.acq_data_reals), max(self.acq_data_imags)])])
-
-        self.plot_const[0].set_data([self.acq_data_reals, self.acq_data_imags])
-        self.plot_const[1].set_data([self.derot_data_reals, self.derot_data_imags])
-        self.sp_const.axis([-2, 2, -2, 2])
-
-        self.plot_fft[0].set_data([self.freq, self.fft_data])
-
-        draw()
-        
-    def zoom(self, event):
-        newxlim = self.sp_eq.get_xlim()
-        if(newxlim != self.xlim):
-            self.xlim = newxlim
-            r = self.reals[int(ceil(self.xlim[0])) : int(ceil(self.xlim[1]))]
-            i = self.imags[int(ceil(self.xlim[0])) : int(ceil(self.xlim[1]))]
-
-            self.plot_const[0].set_data(r, i)
-            self.sp_const.axis([-2, 2, -2, 2])
-            self.manager.canvas.draw()
-            draw()
-
-    def click(self, event):
-        forward_valid_keys = [" ", "down", "right"]
-        backward_valid_keys = ["up", "left"]
-
-        if(find(event.key, forward_valid_keys)):
-            self.step_forward()
-            
-        elif(find(event.key, backward_valid_keys)):
-            self.step_backward()
-
-    def button_left_click(self, event):
-        self.step_backward()
-
-    def button_right_click(self, event):
-        self.step_forward()
-
-    def step_forward(self):
-        self.symbol += 1
-        self.get_data()
-        self.update_plots()
-
-    def step_backward(self):
-        # Step back in file position
-        self.symbol -= 1
-        if(self.h_acq_file.tell() >= 16*self.occ_tones):
-            self.h_acq_file.seek(-16*self.occ_tones, 1)
-        else:
-            self.symbol = 0
-            self.h_acq_file.seek(-self.h_acq_file.tell(),1)
-
-
-        if(self.h_derot_file.tell() >= 16*self.occ_tones):
-            self.h_derot_file.seek(-16*self.occ_tones, 1)
-        else:
-            self.symbol = 0
-            self.h_derot_file.seek(-self.h_derot_file.tell(),1)
-
-
-        if(self.h_fft_file.tell() >= 16*self.fft_size):
-            self.h_fft_file.seek(-16*self.fft_size, 1)
-        else:
-            self.symbol = 0
-            self.h_fft_file.seek(-self.h_fft_file.tell(),1)
-
-        self.get_data()
-        self.update_plots()
-        
-            
-
-#FIXME: there must be a way to do this with a Python builtin
-def find(item_in, list_search):
-    for l in list_search:
-        if item_in == l:
-            return True
-    return False
-
-def main():
-    usage="%prog: [options]"
-
-    parser = OptionParser(conflict_handler="resolve", usage=usage)
-    parser.add_option("", "--fft-size", type="int", default=512,
-                      help="Specify the size of the FFT [default=%default]")
-    parser.add_option("", "--occ-tones", type="int", default=200,
-                      help="Specify the number of occupied tones [default=%default]")
-    parser.add_option("-s", "--start", type="int", default=0,
-                      help="Specify the starting symbol to plot [default=%default]")
-    parser.add_option("-R", "--sample-rate", type="float", default=1.0,
-                      help="Set the sampler rate of the data [default=%default]")
-    
-    (options, args) = parser.parse_args ()
-
-    dc = draw_constellation(options)
-
-if __name__ == "__main__":
-    try:
-        main()
-    except KeyboardInterrupt:
-        pass
-    
-
-
diff --git a/gr-msdd6000/src/python-examples/ofdm/receive_path.py b/gr-msdd6000/src/python-examples/ofdm/receive_path.py
deleted file mode 100644
index 11c714aaf..000000000
--- a/gr-msdd6000/src/python-examples/ofdm/receive_path.py
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,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.
-# 
-
-from gnuradio import gr, gru, blks2
-from gnuradio import usrp
-from gnuradio import eng_notation
-import copy
-import sys
-
-# /////////////////////////////////////////////////////////////////////////////
-#                              receive path
-# /////////////////////////////////////////////////////////////////////////////
-
-class receive_path(gr.hier_block2):
-    def __init__(self, rx_callback, options):
-
-	gr.hier_block2.__init__(self, "receive_path",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-				gr.io_signature(0, 0, 0)) # Output signature
-
-
-        options = copy.copy(options)    # make a copy so we can destructively modify
-
-        self._verbose     = options.verbose
-        self._log         = options.log
-        self._rx_callback = rx_callback      # this callback is fired when there's a packet available
-
-        # receiver
-        self.ofdm_rx = \
-                     blks2.ofdm_demod(options, callback=self._rx_callback)
-
-        # Carrier Sensing Blocks
-        alpha = 0.001
-        thresh = 30   # in dB, will have to adjust
-        self.probe = gr.probe_avg_mag_sqrd_c(thresh,alpha)
-
-        self.connect(self, self.ofdm_rx)
-        self.connect(self.ofdm_rx, self.probe)
-        
-        # Display some information about the setup
-        if self._verbose:
-            self._print_verbage()
-        
-    def carrier_sensed(self):
-        """
-        Return True if we think carrier is present.
-        """
-        #return self.probe.level() > X
-        return self.probe.unmuted()
-
-    def carrier_threshold(self):
-        """
-        Return current setting in dB.
-        """
-        return self.probe.threshold()
-
-    def set_carrier_threshold(self, threshold_in_db):
-        """
-        Set carrier threshold.
-
-        @param threshold_in_db: set detection threshold
-        @type threshold_in_db:  float (dB)
-        """
-        self.probe.set_threshold(threshold_in_db)
-    
-        
-    def add_options(normal, expert):
-        """
-        Adds receiver-specific options to the Options Parser
-        """
-        normal.add_option("-v", "--verbose", action="store_true", default=False)
-        expert.add_option("", "--log", action="store_true", default=False,
-                          help="Log all parts of flow graph to files (CAUTION: lots of data)")
-
-    # Make a static method to call before instantiation
-    add_options = staticmethod(add_options)
-
-
-    def _print_verbage(self):
-        """
-        Prints information about the receive path
-        """
-        pass
diff --git a/gr-msdd6000/src/python-examples/playback_samples.m b/gr-msdd6000/src/python-examples/playback_samples.m
deleted file mode 100644
index 332296e72..000000000
--- a/gr-msdd6000/src/python-examples/playback_samples.m
+++ /dev/null
@@ -1,12 +0,0 @@
-t = read_complex_binary('msdd.dat',10000000);
-
-fftsize=256;
-w = [0:pi/fftsize:pi];
-
-for i = 0:length(t)/fftsize
-	fftdata = fft(i*fftsize:i*fftsize+fftsize);
-	clear plot;
-	plot(w,fftdata);
-endfor
-
-pause;
diff --git a/gr-msdd6000/src/python-examples/read_complex_binary.m b/gr-msdd6000/src/python-examples/read_complex_binary.m
deleted file mode 100644
index 67158b528..000000000
--- a/gr-msdd6000/src/python-examples/read_complex_binary.m
+++ /dev/null
@@ -1,48 +0,0 @@
-%
-% Copyright 2001 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.
-% 
-
-function v = read_complex_binary (filename, count)
-
-  %% usage: read_complex_binary (filename, [count])
-  %%
-  %%  open filename and return the contents as a column vector, 
-  %%  treating them as 32 bit complex numbers
-  %%
-
-  m = nargchk (1,2,nargin);
-  if (m)
-    usage (m);
-  end
-
-  if (nargin < 2)
-    count = Inf;
-  end
-
-  f = fopen (filename, 'rb');
-  if (f < 0)
-    v = 0;
-  else
-    t = fread (f, [2, count], 'float');
-    fclose (f);
-    v = t(1,:) + t(2,:)*i;
-    [r, c] = size (v);
-    v = reshape (v, c, r);
-  end
diff --git a/gr-msdd6000/src/python_test/capture_tcp_one_set.py b/gr-msdd6000/src/python_test/capture_tcp_one_set.py
deleted file mode 100644
index 7a106a63a..000000000
--- a/gr-msdd6000/src/python_test/capture_tcp_one_set.py
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-import array;
-import cmath;
-from numpy import *;
-from numpy.fft import *;
-from pylab import *;
-
-myport = random.randint(1025,65535);
-filename = "output.dat";
-
-port = 10000
-host = "10.45.4.46"
-#host = "10.45.4.41"
-myaddr = ('',myport);
-
-buf = 100000;
-
-TCPSock = socket(AF_INET,SOCK_STREAM);
-TCPSock.bind(myaddr);
-TCPSock.connect((host,port));
-
-#f_mhz = 2647;	# roof ofdm
-if(len(sys.argv)!= 3):
-	print "usage: %s  fc_ghz   decim_pow2_exponent"%(sys.argv[0]);
-	sys.exit(-1);
-
-f_mhz = float(sys.argv[1])*1000;
-decim = int(sys.argv[2]);
-
-#f_mhz = 3500;
-#f_mhz = 2600;
-f_hz = 0;	# offset	
-gain = 0; 	
-window = 3; 	#0=rect, 1=hanning, 2=hamming, 3=blackman
-
-samples = 65536;
-#samples = 16777216;
-samples = samples*4; 	#bytes of data we are requesting
-samples=samples*2;
-#decim = 2;	#0-8   (3 => 2^3 = 8)  
-decim = decim+16;	# +16 to use 16bit floats instead of 32 bit floats
-mode = 0; 	#0=IQ, 1=MAG, 2=MAGDB
-sets = 1;
-
-raw_data = struct.pack("<IIIIIIII", 0x01, 0x18, f_mhz, f_hz, gain, samples, decim, sets);
-
-data = raw_data;
-
-TCPSock.send(data);
-
-print "sent"
-
-
-
-count = 0;
-
-total_data = [];
-
-state = 0;
-
-vals = [];
-mags = [];
-re = [];
-
-sample_count = 0;
-IQ_bytes=0;
-while(TCPSock):
-	if(state==0):
-		data = TCPSock.recv(4);
-		[opcode] = struct.unpack("<I", data);
-		print "Opcode = %d"%(opcode);
-		if(opcode==1):
-			state = 1;
-
-	elif(state==1):
-		data = TCPSock.recv(7*4);
-		args = struct.unpack("<IIIIIII", data);
-		print ["reply_len", "freq_mhz", "offset_hz", "gain", "sample_bytes", "decim", "sets_remain"];
-		print args;
-		IQ_bytes = args[0] - 7*4;
-		state =2;
-
-	elif(state==2):
-		data = TCPSock.recv(4);
-		[i,q] = struct.unpack("<hh", data);
-		tmp = complex(i,q);
-
-		re.append(i);
-		vals.append(tmp);
-		mags.append(abs(tmp));
-
-
-		sample_count = sample_count + 1;
-#		print "sample count %d"%(sample_count)	
-
-		IQ_bytes = IQ_bytes - 4;
-		if(IQ_bytes < 4):
-			print "got all data (total %d)"%(sample_count);
-			print "remaining: %d"%(IQ_bytes);
-			break;
-
-
-TCPSock.close();
-
-print "done"
-nmags = []
-for i in mags:
-	if i == 0:
-		i=1;
-	nmags.append(i);
-
-
-subplot(2,1,1);
-plot(nmags);
-#plot(10*log10(nmags));
-
-dlen = len(vals);
-fftlen = (dlen-1024)/1024;
-
-fft_data = []
-for i in range(1, dlen-1025, 1024):
-
-	t_in = [];
-	for ind in range(i, i+1024):
-		t_in.append(vals[ind]);
-
-	#tmp = 20*log10(fftshift(fft(t_in)));
-	tmp = (fftshift(fft(t_in)));
-
-	if(len(fft_data) == 0):
-		for ind in range(0,1024):
-			fft_data.append( tmp[ind] );
-	else:
-		for ind in range(0,1024):
-			fft_data[ind] = fft_data[ind] + tmp[ind];
-
-#fft_data = 20*log10(fftshift(fft(vals)));
-
-
-subplot(2,1,2);
-plot(fft_data);
-show();
-
-f = open(filename, "w");
-for sample in vals:
-	binchunk = struct.pack("<ff",float(sample.real), float(sample.imag) );
-	f.write(binchunk);
-f.close();
-
-
diff --git a/gr-msdd6000/src/python_test/flood_udp.py b/gr-msdd6000/src/python_test/flood_udp.py
deleted file mode 100644
index e59208a7a..000000000
--- a/gr-msdd6000/src/python_test/flood_udp.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-
-msdd_port = 10001
-msdd_host = "10.45.4.43"
-
-my_udp_addr = ("10.45.1.229",10001);
-
-buf = 1024;
-
-#myport = random.randint(1025,65535);
-#my_tcp_addr = ("10.45.1.229",myport);
-#TCPSock = socket(AF_INET,SOCK_STREAM);
-#TCPSock.bind(my_tcp_addr);
-#TCPSock.connect((msdd_host,msdd_port));
-
-UDPSock = socket(AF_INET,SOCK_DGRAM);
-UDPSock.bind(my_udp_addr);
-
-SETS_STREAM = 0xffffffff;
-
-f_mhz = 2400;
-f_hz = 1;
-gain = 3;
-samples = 512;
-decim = 4;
-#sets = 16;
-sets = SETS_STREAM;
-window =  3;
-mode = 1;
-
-
-
-for first_byte in range(0,0xff):
-	for second_byte in range(0,0xff):
-		for third_byte in range(0,0xff):
-			data = struct.pack("!III", first_byte, second_byte,third_byte);
-			UDPSock.sendto(data, (msdd_host,msdd_port))
-
-	
-# construct the 3 different request type packets
-#fft_data = struct.pack("<IIIIIIIIII", 0x02, 0x20, f_mhz, f_hz, gain,window, samples, decim, mode,sets);
-#raw_data = struct.pack("<IIIIIIII", 0x01, 0x18, f_mhz, f_hz, gain,samples, decim,sets);
-#stat_data = struct.pack("!II", 0x0000, 0x0000)
-
-# send appropriate udp request packet
-
-
-
-
-
-
-
-
-
diff --git a/gr-msdd6000/src/python_test/halt.py b/gr-msdd6000/src/python_test/halt.py
deleted file mode 100644
index 0285f7817..000000000
--- a/gr-msdd6000/src/python_test/halt.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-import array;
-import cmath;
-from numpy import *;
-from numpy.fft import *;
-from pylab import *;
-
-myport = random.randint(1025,65535);
-filename = "output.dat";
-
-msdd_port = 10001
-msdd_host = "10.45.4.43"
-
-buf = 100000;
-
-my_udp_addr = ('',10001);
-my_udp_addr = ('10.45.1.229 ',10001);
-
-UDPSock = socket(AF_INET,SOCK_DGRAM);
-UDPSock.bind(my_udp_addr);
-
-halt_data = struct.pack("<II", 0x04, 0x00);
-halt_data = struct.pack("<II", 0x04, 0x00);
-
-data = halt_data;
-
-UDPSock.sendto(data, (msdd_host, msdd_port));
-
-print "sent"
-
-UDPSock.close();
-
-
-
diff --git a/gr-msdd6000/src/python_test/newtest.py b/gr-msdd6000/src/python_test/newtest.py
deleted file mode 100644
index 9596a0675..000000000
--- a/gr-msdd6000/src/python_test/newtest.py
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-import array;
-import cmath;
-from numpy import *;
-from numpy.fft import *;
-from pylab import *;
-
-myport = random.randint(1025,65535);
-filename = "output.dat";
-
-msdd_port = 10001
-msdd_host = "10.45.4.43"
-
-buf = 100000;
-
-my_udp_addr = ('',10001);
-my_udp_addr = ('10.45.1.229 ',10001);
-
-UDPSock = socket(AF_INET,SOCK_DGRAM);
-UDPSock.bind(my_udp_addr);
-
-#f_mhz = 3500;	
-#f_mhz = 3500;	
-f_mhz = 100;	
-f_hz = 0;	
-gain = 0; 	
-window = 3; 	#0=rect, 1=hanning, 2=hamming, 3=blackman
-
-samples = 12000;
-samples = samples*4; 	#bytes of data we are requesting
-
-decim = 2;	#0-8   (3 => 2^3 = 8)  
-decim = decim+16;	# +16 to use 16bit floats instead of 32 bit floats
-mode = 0; 	#0=IQ, 1=MAG, 2=MAGDB
-#sets = 0;
-sets = 0xffffffff;
-
-size_int = 4;
-request_len = 6*size_int;	# 6 int items not including the 8 bytes for opcode and length fields
-print "request len = %d"%(request_len);
-
-#raw_data = struct.pack("<IIIIIIII", 0x01, 0x18, f_mhz, f_hz, gain, samples, decim, sets);
-raw_data = struct.pack("<IIIIIIII", 0x01, request_len, f_mhz, f_hz, gain, samples, decim, sets);
-
-data = raw_data;
-
-UDPSock.sendto(data, (msdd_host, msdd_port));
-
-print "sent"
-
-
-
-count = 0;
-
-total_data = [];
-
-state = 0;
-
-vals = [];
-mags = [];
-re = [];
-
-sample_count = 0;
-IQ_bytes=0;
-
-while(True):
-	print state;
-	if(state==0):
-		data = UDPSock.recv(4);
-		[opcode] = struct.unpack("<I", data);
-		print "Opcode = %d"%(opcode);
-		if(opcode==1):
-
-			# if UDP mode and sets_stream requested,
-			# we do not get a header reply back, only data
-			if(sets == 0):
-				state = 1;
-			else:
-				state = 2;
-
-	elif(state==1):
-		data = UDPSock.recv(7*4);
-		args = struct.unpack("<IIIIIII", data);
-		print ["reply_len", "freq_mhz", "offset_hz", "gain", "sample_bytes", "decim", "sets_remain"];
-		print args;
-		IQ_bytes = args[0] - 7*4;
-		state =2;
-
-	elif(state==2):
-		data = UDPSock.recv(4);
-		[i,q] = struct.unpack("<hh", data);
-		tmp = complex(i,q);
-
-		re.append(i);
-		vals.append(tmp);
-		mags.append(abs(tmp));
-
-
-		sample_count = sample_count + 1;
-#		print "sample count %d"%(sample_count)	
-
-		IQ_bytes = IQ_bytes - 4;
-		if(IQ_bytes < 4):
-			print "got all data (total %d)"%(sample_count);
-			print "remaining: %d"%(IQ_bytes);
-			break;
-
-
-UDPSock.close();
-
-print "done"
-nmags = []
-for i in mags:
-	if i == 0:
-		i=1;
-	nmags.append(i);
-
-
-subplot(2,1,1);
-plot(20*log10(nmags));
-
-fft_data = 20*log10(fftshift(fft(vals)));
-
-subplot(2,1,2);
-plot(fft_data);
-show();
-
-f = open(filename, "w");
-for sample in vals:
-	binchunk = struct.pack("<ff",float(sample.real), float(sample.imag) );
-	f.write(binchunk);
-f.close();
-
-
diff --git a/gr-msdd6000/src/python_test/spectrogram.py b/gr-msdd6000/src/python_test/spectrogram.py
deleted file mode 100644
index 015dd9105..000000000
--- a/gr-msdd6000/src/python_test/spectrogram.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/python
-
-fft_bins = 1024;
-stride = 256;
-
-#filename = "output.dat";
-#decim = 4;
-#Fs = (102.4/decim) * 1e6;
-
-
-from gnuradio import gr;
-from Numeric import *;
-import FFT;
-import numpy.fft;
-from numpy import *;
-from pylab import *;
-import sys;
-
-if len(sys.argv) <2: 
-	print "usage:  %s filename <sample_rate_in_MSPS> <stride_samples>"%(sys.argv[0]);
-	sys.exit(-1);
-
-filename = sys.argv[1];
-fs = 0;
-if(len(sys.argv)>2):
-	fs = float(sys.argv[2])*1000000;
-print "opening %s.\n"%(filename);
-
-if(len(sys.argv)>=4):
-	stride = int(sys.argv[3]);
-	print "using stride = %d"%(stride);
-
-tb = gr.top_block();
-src = gr.file_source(gr.sizeof_gr_complex, filename, False)
-sink = gr.vector_sink_c();
-tb.connect(src,sink);
-tb.run();
-
-data = sink.data();
-dataa = array(data);
-datalen = len( data );
-
-time_bins = (datalen - fft_bins) / stride;
-
-print "output vector :: fft_bins = %d, time_bins = %d\n"%(fft_bins,time_bins);
-
-start_idx = 0;
-
-b = numpy.zeros((time_bins, fft_bins), complex);
-l = [];
-
-window = numpy.blackman(fft_bins);
-
-for i in range(0,time_bins):
-	
-	time_chunk = take( dataa, range(start_idx,start_idx + fft_bins), 0);
-	time_chunk = time_chunk * window;
-	fft_chunk = numpy.fft.fftshift(numpy.fft.fft(time_chunk));
-	psd = 10*log10(fft_chunk * conj(fft_chunk)+0.001);
-
-	b[i] = psd.real;
-	l.append( psd.real.tolist() );
-
-	start_idx = start_idx + stride;
-
-#c = array(b, 10);
-
-print b[0];
-c = array(b);
-#l = c.tolist();
-print size(l);
-
-x = range(0,time_bins);
-print size(x);
-y = range(0,fft_bins);
-print size(y);
-
-print size(l);
-
-contourf(l);
-#contourf([x,y], l);
-colorbar();
-show();
-
-#print c[1,1];
-
-
diff --git a/gr-msdd6000/src/python_test/test_tcp.py b/gr-msdd6000/src/python_test/test_tcp.py
deleted file mode 100755
index b02db815d..000000000
--- a/gr-msdd6000/src/python_test/test_tcp.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-
-myport = random.randint(1025,65535);
-
-port = 10000
-host = "10.45.4.43"
-myaddr = ("10.45.1.229",myport);
-
-buf = 100000;
-
-TCPSock = socket(AF_INET,SOCK_STREAM);
-#TCPSock = socket(AF_INET,SOCK_DGRAM);
-TCPSock.bind(myaddr);
-TCPSock.connect((host,port));
-
-f_mhz = 2400;	
-f_hz = 0;	
-gain = 2; 	
-window = 3; 	#0=rect, 1=hanning, 2=hamming, 3=blackman
-#samples = 0xffffffff; 	#8-15	fft:(returns 2^number[8-15]) raw:(returns number)
-samples = 2; 	#8-15	fft:(returns 2^number[8-15]) raw:(returns number)
-decim = 2; 	#0-8  
-#decim = decim+16;	# +16 to use 16bit instead of 32 bit 
-mode = 1; 	#0=IQ, 1=MAG, 2=MAGDB
-sets = 0xffffffff;	
-#sets = 1;
-
-fft_data = struct.pack("<IIIIIIIIII", 0x02, 0x20, f_mhz, f_hz, gain,window, samples, decim, mode,sets);
-raw_data = struct.pack("<IIIIIIII", 0x01, 0x18, f_mhz, f_hz, gain,samples, decim,sets);
-stat_data = struct.pack("!II", 0x0000, 0x0000)
-
-data = raw_data;
-
-#TCPSock.sendto(data, (host,port))
-TCPSock.send(data);
-
-print "sent"
-
-
-
-count = 0;
-while(1):
-	data,addr = TCPSock.recvfrom(buf);
-	
-	print "got response"
-	
-	print "Data length: %d bytes."%(len(data));
-	if(len(data)==12):
-		a,b,c = struct.unpack("!III",data);
-		print "%x,%x,%x"%(a,b,c);
-
-	datavector = [];
-
-	for d in data:
-		a = struct.unpack("<b",d);
-		datavector.append(a);
-
-	print datavector;
-		
-	count = count + 1;
-	
-	if(count > 1):
-		sets = 3;
-		raw_data_2 = struct.pack("<IIIIIIII", 0x01, 0x18, f_mhz, f_hz, gain,samples, decim,sets);
-		TCPSock.send(raw_data_2);
-		
-		
-		
-TCPSock.close();
-
-
-
diff --git a/gr-msdd6000/src/python_test/test_tcp_fft.py b/gr-msdd6000/src/python_test/test_tcp_fft.py
deleted file mode 100644
index b02db815d..000000000
--- a/gr-msdd6000/src/python_test/test_tcp_fft.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-
-myport = random.randint(1025,65535);
-
-port = 10000
-host = "10.45.4.43"
-myaddr = ("10.45.1.229",myport);
-
-buf = 100000;
-
-TCPSock = socket(AF_INET,SOCK_STREAM);
-#TCPSock = socket(AF_INET,SOCK_DGRAM);
-TCPSock.bind(myaddr);
-TCPSock.connect((host,port));
-
-f_mhz = 2400;	
-f_hz = 0;	
-gain = 2; 	
-window = 3; 	#0=rect, 1=hanning, 2=hamming, 3=blackman
-#samples = 0xffffffff; 	#8-15	fft:(returns 2^number[8-15]) raw:(returns number)
-samples = 2; 	#8-15	fft:(returns 2^number[8-15]) raw:(returns number)
-decim = 2; 	#0-8  
-#decim = decim+16;	# +16 to use 16bit instead of 32 bit 
-mode = 1; 	#0=IQ, 1=MAG, 2=MAGDB
-sets = 0xffffffff;	
-#sets = 1;
-
-fft_data = struct.pack("<IIIIIIIIII", 0x02, 0x20, f_mhz, f_hz, gain,window, samples, decim, mode,sets);
-raw_data = struct.pack("<IIIIIIII", 0x01, 0x18, f_mhz, f_hz, gain,samples, decim,sets);
-stat_data = struct.pack("!II", 0x0000, 0x0000)
-
-data = raw_data;
-
-#TCPSock.sendto(data, (host,port))
-TCPSock.send(data);
-
-print "sent"
-
-
-
-count = 0;
-while(1):
-	data,addr = TCPSock.recvfrom(buf);
-	
-	print "got response"
-	
-	print "Data length: %d bytes."%(len(data));
-	if(len(data)==12):
-		a,b,c = struct.unpack("!III",data);
-		print "%x,%x,%x"%(a,b,c);
-
-	datavector = [];
-
-	for d in data:
-		a = struct.unpack("<b",d);
-		datavector.append(a);
-
-	print datavector;
-		
-	count = count + 1;
-	
-	if(count > 1):
-		sets = 3;
-		raw_data_2 = struct.pack("<IIIIIIII", 0x01, 0x18, f_mhz, f_hz, gain,samples, decim,sets);
-		TCPSock.send(raw_data_2);
-		
-		
-		
-TCPSock.close();
-
-
-
diff --git a/gr-msdd6000/src/python_test/test_udp.py b/gr-msdd6000/src/python_test/test_udp.py
deleted file mode 100755
index fd93847e9..000000000
--- a/gr-msdd6000/src/python_test/test_udp.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-
-msdd_port = 10001
-msdd_host = "10.45.4.43"
-
-my_udp_addr = ("10.45.1.229",10001);
-
-buf = 1024;
-
-#myport = random.randint(1025,65535);
-#my_tcp_addr = ("10.45.1.229",myport);
-#TCPSock = socket(AF_INET,SOCK_STREAM);
-#TCPSock.bind(my_tcp_addr);
-#TCPSock.connect((msdd_host,msdd_port));
-
-UDPSock = socket(AF_INET,SOCK_DGRAM);
-UDPSock.bind(my_udp_addr);
-
-SETS_STREAM = 0xffffffff;
-
-f_mhz = 2400;
-f_hz = 1;
-gain = 3;
-samples = 512;
-
-decim = 2;
-
-#sets = 16;
-sets = SETS_STREAM;
-window =  3;
-mode = 1;
-
-
-# construct the 3 different request type packets
-fft_data = struct.pack("<IIIIIIIIII", 0x02, 0x20, f_mhz, f_hz, gain,window, samples, decim, mode,sets);
-raw_data = struct.pack("<IIIIIIII", 0x01, 0x18, f_mhz, f_hz, gain,samples, decim,sets);
-stat_data = struct.pack("!II", 0x0000, 0x0000)
-
-# send appropriate udp request packet
-UDPSock.sendto(raw_data, (msdd_host,msdd_port))
-
-#TCPSock.send(raw_data);
-
-
-print "sent request"
-
-
-print "waiting for response"
-data,addr = UDPSock.recvfrom(buf);
-
-print "got response"
-
-print data;
diff --git a/gr-msdd6000/src/python_test/udp_stream_cap.py b/gr-msdd6000/src/python_test/udp_stream_cap.py
deleted file mode 100644
index 6326f27c5..000000000
--- a/gr-msdd6000/src/python_test/udp_stream_cap.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-import array;
-import cmath;
-from numpy import *;
-from numpy.fft import *;
-from pylab import *;
-
-myport = random.randint(1025,65535);
-filename = "output.dat";
-
-msdd_port = 10001
-msdd_host = "10.45.4.43"
-
-buf = 100000;
-
-my_udp_addr = ('',10001);
-my_udp_addr = ('10.45.1.229 ',10001);
-
-UDPSock = socket(AF_INET,SOCK_DGRAM);
-UDPSock.bind(my_udp_addr);
-
-#f_mhz = 3500;	
-#f_mhz = 3500;	
-f_mhz = 1000;	
-f_hz = 0;	
-gain = 0; 	
-window = 3; 	#0=rect, 1=hanning, 2=hamming, 3=blackman
-
-#samples = 65535;
-samples = 16384;
-#samples = samples*4; 	#bytes of data we are requesting
-
-decim = 4;	#0-8   (3 => 2^3 = 8)  
-decim = decim+16;	# +16 to use 16bit floats instead of 32 bit floats
-mode = 0; 	#0=IQ, 1=MAG, 2=MAGDB
-#sets = 0;
-sets = 0xffffffff;
-
-size_int = 4;
-request_len = 6*size_int;	# 6 int items not including the 8 bytes for opcode and length fields
-print "request len = %d"%(request_len);
-
-raw_data = struct.pack("<IIIIIIII", 0x01, request_len, f_mhz, f_hz, gain, samples, decim, sets);
-
-data = raw_data;
-
-UDPSock.sendto(data, (msdd_host, msdd_port));
-
-print "sent"
-
-
-
-count = 0;
-
-total_data = [];
-
-state = 0;
-
-vals = [];
-mags = [];
-re = [];
-
-sample_count = 0;
-IQ_bytes=0;
-
-
-numtocap = 1000;
-IQ_bytes = 4 * numtocap;
-
-numbytes = 100 * 65536;
-
-num_rx = 0;
-start =  time.time();
-
-d = [];
-while(num_rx < numbytes):
-	data = UDPSock.recv(65536);
-	num_rx = num_rx + len(data);
-	d.append(data);
-
-mags = [];
-for i in range(0, len(d)/4):
-	v = struct.unpack_from("<f",d, i*4);
-	mags.append(abs(v));
-plot(mags);
-show();
-
-end = time.time();
-print "recieved %d bytes in %f sec"%(numbytes, end-start);
-
-bytes_per_sec = numbytes / (end-start);
-samples_per_sec = bytes_per_sec / 4;
-MSPS = samples_per_sec / 1000000.0;
-
-print "Got %f MSPS"%(MSPS);
-print "Expected %f MSPS"%(102.4/math.pow(2,(1+decim-16)));
-	
-
-halt_data = struct.pack("<II", 0x04, 0x00);
-UDPSock.sendto(halt_data, (msdd_host, msdd_port));
-
-
-UDPSock.close();
-
diff --git a/gr-msdd6000/src/python_test/udp_stream_rate_test.py b/gr-msdd6000/src/python_test/udp_stream_rate_test.py
deleted file mode 100644
index 0b75f2372..000000000
--- a/gr-msdd6000/src/python_test/udp_stream_rate_test.py
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-import array;
-import cmath;
-from numpy import *;
-from numpy.fft import *;
-from pylab import *;
-
-myport = random.randint(1025,65535);
-filename = "output.dat";
-
-msdd_port = 10001
-msdd_host = "10.45.4.46"
-
-buf = 100000;
-
-my_udp_addr = ('',10001);
-my_udp_addr = ('10.45.1.229 ',10001);
-
-UDPSock = socket(AF_INET,SOCK_DGRAM);
-UDPSock.bind(my_udp_addr);
-
-#f_mhz = 3500;	
-#f_mhz = 3500;	
-f_mhz = 1000;	
-f_hz = 0;	
-gain = 0; 	
-window = 3; 	#0=rect, 1=hanning, 2=hamming, 3=blackman
-
-#samples = 65535;
-samples = 16384;
-#samples = samples*4; 	#bytes of data we are requesting
-
-decim = 2;	#0-8   (3 => 2^3 = 8)   # ok
-decim = decim+16;	# +16 to use 16bit floats instead of 32 bit floats
-mode = 0; 	#0=IQ, 1=MAG, 2=MAGDB
-#sets = 0;
-sets = 0xffffffff;
-
-size_int = 4;
-request_len = 6*size_int;	# 6 int items not including the 8 bytes for opcode and length fields
-print "request len = %d"%(request_len);
-
-raw_data = struct.pack("<IIIIIIII", 0x01, request_len, f_mhz, f_hz, gain, samples, decim, sets);
-
-data = raw_data;
-
-UDPSock.sendto(data, (msdd_host, msdd_port));
-
-print "sent"
-
-
-
-count = 0;
-
-total_data = [];
-
-state = 0;
-
-vals = [];
-mags = [];
-re = [];
-
-sample_count = 0;
-IQ_bytes=0;
-
-
-numtocap = 1000;
-IQ_bytes = numtocap * numtocap;
-
-numbytes = 1000 * 65536;
-
-num_rx = 0;
-start = -1;
-while(num_rx < numbytes):
-	data = UDPSock.recv(65536);
-
-	if(start==-1):
-		start =  time.time();
-
-	num_rx = num_rx + len(data);
-#	print num_rx;
-
-
-end = time.time();
-print "recieved %d bytes in %f sec"%(numbytes, end-start);
-
-bytes_per_sec = numbytes / (end-start);
-samples_per_sec = bytes_per_sec / 4;
-MSPS = samples_per_sec / 1000000.0;
-
-print "Got %f MSPS"%(MSPS);
-print "Expected %f MSPS"%(102.4/math.pow(2,(decim-16)));
-	
-
-halt_data = struct.pack("<II", 0x04, 0x00);
-UDPSock.sendto(halt_data, (msdd_host, msdd_port));
-
-
-UDPSock.close();
-
diff --git a/gr-msdd6000/src/python_test/udp_stream_rate_test_plot.py b/gr-msdd6000/src/python_test/udp_stream_rate_test_plot.py
deleted file mode 100644
index eef78f51b..000000000
--- a/gr-msdd6000/src/python_test/udp_stream_rate_test_plot.py
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-from random import *;
-import array;
-import cmath;
-from numpy import *;
-from numpy.fft import *;
-from pylab import *;
-
-myport = randint(1025,65535);
-filename = "output.dat";
-
-msdd_port = 10001
-msdd_host = "10.45.4.46"
-
-buf = 100000;
-
-my_udp_addr = ('',randint(1025,65535));
-
-UDPSock = socket(AF_INET,SOCK_DGRAM);
-UDPSock.bind(my_udp_addr);
-
-f_mhz = 2500;	
-
-print "fc = %d"%(f_mhz);
-
-f_hz = 0;	
-gain = 20; 	# attenuation
-window = 3; 	#0=rect, 1=hanning, 2=hamming, 3=blackman
-
-samples = 65535*4*2;
-#samples = 16384;
-#samples = 16*1024*1024;
-#samples = samples*4; 	#bytes of data we are requesting
-
-# decim 0-8 ( 3 - 8 )
-#decim = 5;	# rate ok
-decim = 8;
-decim = decim+16;	# +16 to use 16bit floats instead of 32 bit floats
-mode = 0; 	#0=IQ, 1=MAG, 2=MAGDB
-#sets = 0;
-sets = 0xffffffff;
-
-size_int = 4;
-request_len = 6*size_int;	# 6 int items not including the 8 bytes for opcode and length fields
-print "request len = %d"%(request_len);
-
-raw_data = struct.pack("<IIIIIIII", 0x01, request_len, f_mhz, f_hz, gain, samples, decim, sets);
-
-data = raw_data;
-
-UDPSock.sendto(data, (msdd_host, msdd_port));
-
-print "sent"
-
-
-
-count = 0;
-
-total_data = [];
-
-state = 0;
-
-vals = [];
-mags = [];
-re = [];
-
-sample_count = 0;
-IQ_bytes=0;
-
-
-numtocap = 1000;
-IQ_bytes = 4 * numtocap;
-
-numbytes = 65536*100;
-#numbytes = 65536*2;
-#numbytes = 1024;
-
-num_rx = 0;
-start =  time.time();
-l = [];
-arr = [];
-
-while(num_rx < numbytes):
-	data = UDPSock.recv(1024);
-	l.append(data);
-	num_rx = num_rx + len(data);
-
-
-end = time.time();
-
-# send stop command
-halt_data = struct.pack(">II", 0x04, 0x00);
-UDPSock.sendto(halt_data, (msdd_host, msdd_port));
-
-# perform timing analysis
-print "recieved %d bytes in %f sec"%(numbytes, end-start);
-bytes_per_sec = numbytes / (end-start);
-samples_per_sec = bytes_per_sec / 4;
-MSPS = samples_per_sec / 1000000.0;
-
-print "Got %f MSPS"%(MSPS);
-print "Expected %f MSPS"%(102.4/math.pow(2,(decim-16)));
-
-
-# plot data
-val_arr = [];
-mag_arr = [];
-mag_arr2 = [];
-
-print "Repacking data..."
-f = open("out.dat","w");
-for li in l:
-	for p in range(0, len(li)/4):
-		[i,q] = struct.unpack_from("<hh", li, p*4);
-		val = complex(i,q);
-		mag_arr.append((val*conj(val)).real);
-		val_arr.append(val);
-	        binchunk = struct.pack("<ff",float(val.real), float(val.imag) );
-		f.write(binchunk);
-f.close();
-		
-
-dlen = len(val_arr)-1;
-fft_data = [];
-for i in range(1, dlen-1024, 1024*1024):
-
-        t_in = [];
-        for ind in range(i, i+1024):
-                t_in.append(val_arr[ind]);
-
-        tmp = 20*log10(fftshift(fft(t_in)));
-        #tmp = (fftshift(fft(t_in)));
-
-        if(len(fft_data) == 0):
-                for ind in range(0,1024):
-                        fft_data.append( tmp[ind] );
-        else:
-                for ind in range(0,1024):
-                        fft_data[ind] = fft_data[ind] + tmp[ind];
-
-
-
-
-print "Plotting..."
-subplot(2,1,1);
-plot(mag_arr);
-title("T power");
-subplot(2,1,2);
-plot(10*log10(fft_data));
-title("PSD");
-show();
-
-
-
-UDPSock.close();
-
diff --git a/gr-msdd6000/src/python_test/udp_stream_rate_test_plot_loop.py b/gr-msdd6000/src/python_test/udp_stream_rate_test_plot_loop.py
deleted file mode 100644
index 185afc48c..000000000
--- a/gr-msdd6000/src/python_test/udp_stream_rate_test_plot_loop.py
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-import array;
-import cmath;
-from numpy import *;
-from numpy.fft import *;
-from pylab import *;
-
-myport = random.randint(1025,65535);
-filename = "output.dat";
-
-msdd_port = 10001
-#msdd_host = "10.45.4.43"
-msdd_host = "10.45.4.45"
-
-buf = 100000;
-
-my_udp_addr = ('',10001);
-my_udp_addr = ('10.45.1.229 ',10001);
-
-UDPSock = socket(AF_INET,SOCK_DGRAM);
-UDPSock.bind(my_udp_addr);
-
-#f_mhz = 3500;	
-f_mhz = 1500;	
-#f_mhz = 1000;	
-f_hz = 0;	
-gain = 80; 	
-window = 3; 	#0=rect, 1=hanning, 2=hamming, 3=blackman
-
-#samples = 65535;
-samples = 16384;
-#samples = samples*4; 	#bytes of data we are requesting
-
-# decim 0-8 ( 3 - 8 )
-#decim = 5;	# rate ok
-decim = 4;
-decim = decim+16;	# +16 to use 16bit floats instead of 32 bit floats
-mode = 0; 	#0=IQ, 1=MAG, 2=MAGDB
-#sets = 0;
-sets = 0xffffffff;
-
-size_int = 4;
-request_len = 6*size_int;	# 6 int items not including the 8 bytes for opcode and length fields
-print "request len = %d"%(request_len);
-
-raw_data = struct.pack("<IIIIIIII", 0x01, request_len, f_mhz, f_hz, gain, samples, decim, sets);
-
-data = raw_data;
-
-UDPSock.sendto(data, (msdd_host, msdd_port));
-start =  time.time();
-
-print "sent"
-
-
-
-count = 0;
-
-total_data = [];
-
-state = 0;
-
-vals = [];
-mags = [];
-re = [];
-
-sample_count = 0;
-IQ_bytes=0;
-
-
-numtocap = 1000;
-IQ_bytes = 4 * numtocap;
-
-#numbytes = 65536*100;
-numbytes = 65536;
-
-
-
-while(True):
-
-	data = [];
-	l = [];
-	num_rx = 0;
-	while(num_rx < numbytes):
-		data = UDPSock.recv(65536);
-		num_rx = num_rx + len(data);
-		l.append(data);
-
-	end = time.time();
-	
-	# send stop command
-	#halt_data = struct.pack("<II", 0x04, 0x00);
-	#UDPSock.sendto(halt_data, (msdd_host, msdd_port));
-	
-	# perform timing analysis
-	print "recieved %d bytes in %f sec"%(numbytes, end-start);
-	bytes_per_sec = numbytes / (end-start);
-	samples_per_sec = bytes_per_sec / 4;
-	MSPS = samples_per_sec / 1000000.0;
-	
-	print "Got %f MSPS"%(MSPS);
-	print "Expected %f MSPS"%(102.4/math.pow(2,(decim-16)));
-	
-	
-	# plot data
-	val_arr = [];
-	mag_arr = [];
-	
-	print "Repacking data..."
-	for li in l:
-		for p in range(0, len(li)/4):
-			[i,q] = struct.unpack_from("<hh", li, p);
-			val = complex(i,q);
-			mag_arr.append(abs(val));
-			val_arr.append(val);
-	
-	
-	print "Calculating Time Domain Power..."
-	tpwr = [];
-	for i in val_arr:
-		tpwr.append( (i*conj(i)).real );
-	
-	print "Calculating PSD..."
-	freqz = fft(val_arr);
-	
-	#freqz = [];
-	#
-	#for i in range(0, floor(len(val_arr)/2048)):
-	#	tmp = val_arr(range(i,i+2048));
-	#	if len(freqz) == 0:
-	#		freqz = tmp;
-	#	
-	
-	psd = (freqz * conj(freqz)).real;
-	
-	print "Plotting..."
-	subplot(2,1,1);
-	plot(tpwr);
-	subplot(2,1,2);
-	plot(10*log10(psd));
-	show();
-	
-UDPSock.close();
-
diff --git a/gr-msdd6000/src/python_test/udp_stream_test.py b/gr-msdd6000/src/python_test/udp_stream_test.py
deleted file mode 100644
index 6136d16c5..000000000
--- a/gr-msdd6000/src/python_test/udp_stream_test.py
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/python
-
-from socket import *
-import string
-import time
-import struct;
-import random;
-import array;
-import cmath;
-from numpy import *;
-from numpy.fft import *;
-from pylab import *;
-
-myport = random.randint(1025,65535);
-filename = "output.dat";
-
-msdd_port = 10001
-msdd_host = "10.45.4.46"
-
-buf = 100000;
-
-my_udp_addr = ('',10001);
-my_udp_addr = ('10.45.1.229 ',10001);
-
-UDPSock = socket(AF_INET,SOCK_DGRAM);
-UDPSock.bind(my_udp_addr);
-
-#f_mhz = 3500;	
-#f_mhz = 3500;	
-f_mhz = 2500;	
-f_hz = 0;	
-gain = 0; 	
-window = 3; 	#0=rect, 1=hanning, 2=hamming, 3=blackman
-
-samples = 65535;
-samples = samples*4; 	#bytes of data we are requesting
-
-decim = 2;	#0-8   (3 => 2^3 = 8)  
-decim = decim+16;	# +16 to use 16bit floats instead of 32 bit floats
-mode = 0; 	#0=IQ, 1=MAG, 2=MAGDB
-#sets = 0;
-sets = 0xffffffff;
-
-size_int = 4;
-request_len = 6*size_int;	# 6 int items not including the 8 bytes for opcode and length fields
-print "request len = %d"%(request_len);
-
-raw_data = struct.pack("<IIIIIIII", 0x01, request_len, f_mhz, f_hz, gain, samples, decim, sets);
-
-data = raw_data;
-
-UDPSock.sendto(data, (msdd_host, msdd_port));
-
-print "sent"
-
-
-
-count = 0;
-
-total_data = [];
-
-state = 0;
-
-vals = [];
-mags = [];
-re = [];
-
-sample_count = 0;
-IQ_bytes=0;
-
-
-numtocap = 1000;
-IQ_bytes = 4 * numtocap;
-
-while(True):
-	data = UDPSock.recv(4);
-	[i,q] = struct.unpack("<hh", data);
-	tmp = complex(i,q);
-
-	re.append(i);
-	vals.append(tmp);
-	mags.append(abs(tmp));
-
-
-	sample_count = sample_count + 1;
-#	print "sample count %d"%(sample_count)	
-
-	IQ_bytes = IQ_bytes - 4;
-	if(IQ_bytes % 200 == 0):
-		print IQ_bytes;
-	if(IQ_bytes < 4):
-		print "got all data (total %d)"%(sample_count);
-		print "remaining: %d"%(IQ_bytes);
-		break;
-
-
-halt_data = struct.pack("<II", 0x04, 0x00);
-UDPSock.sendto(halt_data, (msdd_host, msdd_port));
-
-
-
-UDPSock.close();
-
-print "done"
-nmags = []
-for i in mags:
-	if i == 0:
-		i=1;
-	nmags.append(i);
-
-
-subplot(2,1,1);
-plot(20*log10(nmags));
-
-fft_data = 20*log10(fftshift(fft(vals)));
-
-subplot(2,1,2);
-plot(fft_data);
-show();
-
-f = open(filename, "w");
-for sample in vals:
-	binchunk = struct.pack("<ff",float(sample.real), float(sample.imag) );
-	f.write(binchunk);
-f.close();
-
-
diff --git a/gr-msdd6000/src/qa_msdd_source_simple.py b/gr-msdd6000/src/qa_msdd_source_simple.py
deleted file mode 100755
index 5262fcef0..000000000
--- a/gr-msdd6000/src/qa_msdd_source_simple.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/python
-
-from pylab import *;
-#from scipy.fftpack import fftshift;
-
-import math;
-
-from gnuradio import msdd,gr;
-
-
-tb = gr.top_block();
-
-
-src = msdd.source_simple("10.45.4.43",0);
-convert = gr.interleaved_short_to_complex();
-sink = gr.vector_sink_c();
-
-gain = 40;
-
-fc = 2.4e9;
-
-src.set_decim_rate(8);
-#src.set_rx_freq(0,3500000000);
-src.set_rx_freq(0,fc);
-src.set_pga(0,gain);
-
-
-tb.connect(src, convert, sink);
-
-
-tb.start();
-
-v = []
-for i in range(0,10000):
-	b = math.sqrt(i);
-	v.append(b);
-
-tb.stop();
-
-#print sink.data();
-
-data = sink.data();
-
-plot(10*log10(fftshift(fft(sink.data()))));
-show();
diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt
new file mode 100644
index 000000000..621dd5d6e
--- /dev/null
+++ b/gr-noaa/CMakeLists.txt
@@ -0,0 +1,87 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-noaa" ENABLE_GR_NOAA
+    Boost_FOUND
+    ENABLE_GR_CORE
+)
+
+GR_SET_GLOBAL(GR_NOAA_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_NOAA)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_NOAA_DESCRIPTION "GNU Radio NOAA Blocks")
+
+CPACK_COMPONENT("noaa_runtime"
+    GROUP        "NOAA"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("noaa_devel"
+    GROUP        "NOAA"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("noaa_python"
+    GROUP        "NOAA"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "core_python;noaa_runtime"
+)
+
+CPACK_COMPONENT("noaa_swig"
+    GROUP        "NOAA"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;noaa_python;noaa_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(lib)
+if(ENABLE_PYTHON)
+    add_subdirectory(swig)
+    add_subdirectory(grc)
+    add_subdirectory(apps)
+endif(ENABLE_PYTHON)
+
+endif(ENABLE_GR_NOAA)
diff --git a/gr-noaa/apps/.gitignore b/gr-noaa/apps/.gitignore
index cd8d543cc..be02dd265 100644
--- a/gr-noaa/apps/.gitignore
+++ b/gr-noaa/apps/.gitignore
@@ -1,3 +1,3 @@
 *.dat
-*.txt
+#*.txt
 *.hrpt
diff --git a/gr-usrp/grc/__init__.py b/gr-noaa/apps/CMakeLists.txt
index 1956bbd5b..37d07ffa0 100644
--- a/gr-usrp/grc/__init__.py
+++ b/gr-noaa/apps/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -16,11 +16,18 @@
 # 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.
-#
 
-from simple_usrp import \
-	simple_source_c, simple_source_s, \
-	simple_sink_c, simple_sink_s
-from dual_usrp import \
-	dual_source_c, dual_source_s, \
-	dual_sink_c, dual_sink_s
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    hrpt_decode.py
+    hrpt_demod.py
+    file_rx_hrpt.py
+    file_rx_lrit.py
+    usrp_rx_hrpt.py
+    usrp_rx_hrpt_nogui.py
+    usrp_rx_lrit.py
+    DESTINATION ${GR_RUNTIME_DIR}
+    COMPONENT "noaa_python"
+)
diff --git a/gnuradio-examples/python/digital_voice/Makefile.am b/gr-noaa/grc/CMakeLists.txt
index 60f363b90..92d707477 100644
--- a/gnuradio-examples/python/digital_voice/Makefile.am
+++ b/gr-noaa/grc/CMakeLists.txt
@@ -1,5 +1,4 @@
-#
-# Copyright 2004,2005,2009 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -17,12 +16,11 @@
 # 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-ourdatadir = $(exampledir)/digital_voice
 
-dist_ourdata_SCRIPTS =	\
-	encdec.py	\
-	cvsd_test.py
+install(FILES
+    noaa_hrpt_decoder.xml
+    noaa_hrpt_deframer.xml
+    noaa_hrpt_pll_cf.xml
+    DESTINATION ${GRC_BLOCKS_DIR}
+    COMPONENT "noaa_python"
+)
diff --git a/gr-noaa/lib/CMakeLists.txt b/gr-noaa/lib/CMakeLists.txt
new file mode 100644
index 000000000..7bac21e4a
--- /dev/null
+++ b/gr-noaa/lib/CMakeLists.txt
@@ -0,0 +1,59 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_NOAA_INCLUDE_DIRS}
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gr_noaa_sources
+    noaa_hrpt_decoder.cc
+    noaa_hrpt_deframer.cc
+    noaa_hrpt_pll_cf.cc
+)
+
+list(APPEND noaa_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+)
+
+add_library(gnuradio-noaa SHARED ${gr_noaa_sources})
+target_link_libraries(gnuradio-noaa ${noaa_libs})
+GR_LIBRARY_FOO(gnuradio-noaa RUNTIME_COMPONENT "noaa_runtime" DEVEL_COMPONENT "noaa_devel")
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+    noaa_api.h
+    noaa_hrpt_decoder.h
+    noaa_hrpt_deframer.h
+    noaa_hrpt_pll_cf.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "noaa_devel"
+)
diff --git a/gr-noaa/lib/Makefile.am b/gr-noaa/lib/Makefile.am
index ba660a398..8eedbbb18 100644
--- a/gr-noaa/lib/Makefile.am
+++ b/gr-noaa/lib/Makefile.am
@@ -42,6 +42,7 @@ libgnuradio_noaa_la_LIBADD = \
 libgnuradio_noaa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
 grinclude_HEADERS = \
+	noaa_api.h \
 	noaa_hrpt_decoder.h \
 	noaa_hrpt_deframer.h \
 	noaa_hrpt_pll_cf.h
diff --git a/gr-noaa/lib/noaa_api.h b/gr-noaa/lib/noaa_api.h
new file mode 100644
index 000000000..d3c3fbf2d
--- /dev/null
+++ b/gr-noaa/lib/noaa_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_NOAA_API_H
+#define INCLUDED_NOAA_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_noaa_EXPORTS
+#  define NOAA_API __GR_ATTR_EXPORT
+#else
+#  define NOAA_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_NOAA_API_H */
diff --git a/gr-noaa/lib/noaa_hrpt_decoder.h b/gr-noaa/lib/noaa_hrpt_decoder.h
index 9d67d7108..4db09106e 100644
--- a/gr-noaa/lib/noaa_hrpt_decoder.h
+++ b/gr-noaa/lib/noaa_hrpt_decoder.h
@@ -23,17 +23,18 @@
 #ifndef INCLUDED_NOAA_HRPT_DECODER_H
 #define INCLUDED_NOAA_HRPT_DECODER_H
 
+#include <noaa_api.h>
 #include <gr_sync_block.h>
 
 class noaa_hrpt_decoder;
 typedef boost::shared_ptr<noaa_hrpt_decoder> noaa_hrpt_decoder_sptr;
 
-noaa_hrpt_decoder_sptr
+NOAA_API noaa_hrpt_decoder_sptr
 noaa_make_hrpt_decoder(bool verbose, bool output_files);
 
-class noaa_hrpt_decoder : public gr_sync_block
+class NOAA_API noaa_hrpt_decoder : public gr_sync_block
 {
-  friend noaa_hrpt_decoder_sptr noaa_make_hrpt_decoder(bool verbose, bool output_files);
+  friend NOAA_API noaa_hrpt_decoder_sptr noaa_make_hrpt_decoder(bool verbose, bool output_files);
   noaa_hrpt_decoder(bool verbose, bool output_files);
 
   // Configuration
diff --git a/gr-noaa/lib/noaa_hrpt_deframer.h b/gr-noaa/lib/noaa_hrpt_deframer.h
index b11d0fa2b..d254746af 100644
--- a/gr-noaa/lib/noaa_hrpt_deframer.h
+++ b/gr-noaa/lib/noaa_hrpt_deframer.h
@@ -23,17 +23,18 @@
 #ifndef INCLUDED_NOAA_HRPT_DEFRAMER_H
 #define INCLUDED_NOAA_HRPT_DEFRAMER_H
 
+#include <noaa_api.h>
 #include <gr_block.h>
 
 class noaa_hrpt_deframer;
 typedef boost::shared_ptr<noaa_hrpt_deframer> noaa_hrpt_deframer_sptr;
 
-noaa_hrpt_deframer_sptr
+NOAA_API noaa_hrpt_deframer_sptr
 noaa_make_hrpt_deframer();
 
-class noaa_hrpt_deframer : public gr_block
+class NOAA_API noaa_hrpt_deframer : public gr_block
 {
-  friend noaa_hrpt_deframer_sptr noaa_make_hrpt_deframer();
+  friend NOAA_API noaa_hrpt_deframer_sptr noaa_make_hrpt_deframer();
   noaa_hrpt_deframer();
 
   unsigned int       d_state;
diff --git a/gr-noaa/lib/noaa_hrpt_pll_cf.h b/gr-noaa/lib/noaa_hrpt_pll_cf.h
index 507d47fe7..8d3e8f8d5 100644
--- a/gr-noaa/lib/noaa_hrpt_pll_cf.h
+++ b/gr-noaa/lib/noaa_hrpt_pll_cf.h
@@ -23,17 +23,18 @@
 #ifndef INCLUDED_NOAA_HRPT_PLL_CF_H
 #define INCLUDED_NOAA_HRPT_PLL_CF_H
 
+#include <noaa_api.h>
 #include <gr_sync_block.h>
 
 class noaa_hrpt_pll_cf;
 typedef boost::shared_ptr<noaa_hrpt_pll_cf> noaa_hrpt_pll_cf_sptr;
 
-noaa_hrpt_pll_cf_sptr
+NOAA_API noaa_hrpt_pll_cf_sptr
 noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset);
 
-class noaa_hrpt_pll_cf : public gr_sync_block
+class NOAA_API noaa_hrpt_pll_cf : public gr_sync_block
 {
-  friend noaa_hrpt_pll_cf_sptr noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset);
+  friend NOAA_API noaa_hrpt_pll_cf_sptr noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset);
   noaa_hrpt_pll_cf(float alpha, float beta, float max_offset);
 
   float d_alpha;		// 1st order loop constant
diff --git a/gr-noaa/swig/CMakeLists.txt b/gr-noaa/swig/CMakeLists.txt
new file mode 100644
index 000000000..1d754aabb
--- /dev/null
+++ b/gr-noaa/swig/CMakeLists.txt
@@ -0,0 +1,56 @@
+# 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_NOAA_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_LIBRARIES gnuradio-noaa)
+
+GR_SWIG_MAKE(noaa_swig noaa_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS noaa_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/noaa
+    COMPONENT "noaa_python"
+)
+
+install(
+    FILES
+    noaa_swig.i
+    noaa_hrpt_decoder.i
+    noaa_hrpt_deframer.i
+    noaa_hrpt_pll_cf.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "noaa_swig"
+)
+
+GR_PYTHON_INSTALL(
+    FILES
+    __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/noaa
+    COMPONENT "noaa_python"
+)
diff --git a/gr-noaa/swig/Makefile.swig.gen b/gr-noaa/swig/Makefile.swig.gen
index f5e778811..757c368f5 100644
--- a/gr-noaa/swig/Makefile.swig.gen
+++ b/gr-noaa/swig/Makefile.swig.gen
@@ -105,7 +105,7 @@ _noaa_swig_la_CXXFLAGS =			\
 	$(noaa_swig_la_swig_cxxflags)
 
 python/noaa_swig.cc: noaa_swig.py
-noaa_swig.py: noaa_swig.i
+noaa_swig.py: noaa_swig.i 
 
 # Include the python dependencies for this file
 -include python/noaa_swig.d
diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt
new file mode 100644
index 000000000..8dfecced7
--- /dev/null
+++ b/gr-pager/CMakeLists.txt
@@ -0,0 +1,102 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-pager" ENABLE_GR_PAGER
+    Boost_FOUND
+    ENABLE_GR_CORE
+)
+
+GR_SET_GLOBAL(GR_PAGER_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_PAGER)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_PAGER_DESCRIPTION "GNU Radio Pager Blocks")
+
+CPACK_COMPONENT("pager_runtime"
+    GROUP        "Pager"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("pager_devel"
+    GROUP        "Pager"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("pager_python"
+    GROUP        "Pager"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "core_python;pager_runtime"
+)
+
+CPACK_COMPONENT("pager_swig"
+    GROUP        "Pager"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;pager_python;pager_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(lib)
+if(ENABLE_PYTHON)
+    add_subdirectory(python)
+    add_subdirectory(swig)
+    add_subdirectory(grc)
+    add_subdirectory(apps)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-pager.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-pager.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-pager.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "pager_devel"
+)
+
+endif(ENABLE_GR_PAGER)
diff --git a/gnuradio-examples/python/multi-antenna/Makefile.am b/gr-pager/apps/CMakeLists.txt
index 0cb944589..1965c6e66 100644
--- a/gnuradio-examples/python/multi-antenna/Makefile.am
+++ b/gr-pager/apps/CMakeLists.txt
@@ -1,5 +1,4 @@
-#
-# Copyright 2006,2009 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -17,13 +16,14 @@
 # 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.
-# 
-
-include $(top_srcdir)/Makefile.common
 
-ourdatadir = $(exampledir)/multi-antenna
+include(GrPython)
 
-dist_ourdata_SCRIPTS =	\
-    multi_fft.py	\
-    multi_file.py	\
-    multi_scope.py
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    usrp_flex.py
+    usrp_flex_all.py
+    usrp_flex_band.py
+    DESTINATION ${GR_RUNTIME_DIR}
+    COMPONENT "pager_python"
+)
diff --git a/gr-pager/apps/usrp_flex.py b/gr-pager/apps/usrp_flex.py
index f8d9d25b1..7c90d9296 100755
--- a/gr-pager/apps/usrp_flex.py
+++ b/gr-pager/apps/usrp_flex.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2006,2007,2009 Free Software Foundation, Inc.
+# Copyright 2006,2007,2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,32 +20,11 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, usrp, optfir, eng_notation, pager
+from gnuradio import gr, gru, uhd, optfir, eng_notation, pager
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 import time, os, sys
 
-"""
-This example application demonstrates receiving and demodulating the
-FLEX pager protocol.
-
-The following are required command line parameters:
-
--f FREQ	    USRP receive frequency
-
-The following are optional command line parameters:
-
--R SUBDEV   Daughter board specification, defaults to first found
--F FILE     Read samples from a file instead of USRP.
--c FREQ     Calibration offset.  Gets added to receive frequency.
-            Defaults to 0.0 Hz.
--g GAIN     Daughterboard gain setting. Defaults to mid-range.
--l          Log flow graph to files (LOTS of data)
--v          Verbose output
-
-Once the program is running, ctrl-break (Ctrl-C) stops operation.
-"""
-
 class app_top_block(gr.top_block):
     def __init__(self, options, queue):
         gr.top_block.__init__(self, "usrp_flex")
@@ -55,43 +34,46 @@ class app_top_block(gr.top_block):
 	self.verbose = options.verbose
 			
 	if options.from_file is None:
-            # Set up USRP source with specified RX daughterboard
-            self.src = usrp.source_c()
-            if options.rx_subdev_spec == None:
-                options.rx_subdev_spec = usrp.pick_rx_subdevice(self.src)
-            self.subdev = usrp.selected_subdev(self.src, options.rx_subdev_spec)
-            self.src.set_mux(usrp.determine_rx_mux_value(self.src, options.rx_subdev_spec))
-
-            # Grab 250 KHz of spectrum (sample rate becomes 250 ksps complex)
-            self.src.set_decim_rate(256)
-	    	    
-            # If no gain specified, set to midrange
-            if options.gain is None:
-                g = self.subdev.gain_range()
-                options.gain = (g[0]+g[1])/2.0
-            self.subdev.set_gain(options.gain)
-
+            # Set up USRP source
+            self.u = uhd.usrp_source(device_addr=options.address,
+                                     io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                     num_channels=1)
+
+            # Grab 250 KHz of spectrum
+            # (A UHD facility to get sample rate range and granularity would be useful)
+            self.u.set_samp_rate(250e3)
+            rate = self.u.get_samp_rate()
+            if rate != 250e3:
+                print "Unable to set required sample rate of 250 Ksps (got %f)" % rate
+                sys.exit(1)
+                
             # Tune daughterboard
-            actual_frequency = options.frequency+options.calibration
-            tune_result = usrp.tune(self.src, 0, self.subdev, actual_frequency)
-            if not tune_result:
-                sys.stderr.write("Failed to set center frequency to "+`actual_frequency`+"\n")
+            r = self.u.set_center_freq(options.freq+options.calibration, 0)
+            if not r:
+                frange = self.u.get_freq_range()
+                sys.stderr.write(("\nRequested frequency (%f) out or range [%f, %f]\n") % \
+                                     (freq, frange.start(), frange.stop()))
                 sys.exit(1)
 
-            if options.verbose:
-                print "Using RX daughterboard", self.subdev.side_and_name()
-                print "USRP gain is", options.gain
-                print "USRP tuned to", actual_frequency
-            
+            # if no gain was specified, use the mid-point in dB
+            if options.rx_gain is None:
+                grange = self.u.get_gain_range()
+                options.rx_gain = float(grange.start()+grange.stop())/2.0
+                print "\nNo gain specified."
+                print "Setting gain to %f (from [%f, %f])" % \
+                    (options.rx_gain, grange.start(), grange.stop())
+        
+            self.u.set_gain(options.rx_gain, 0)
+	    	    
         else:
             # Use supplied file as source of samples
-            self.src = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+            self.u = gr.file_source(gr.sizeof_gr_complex, options.from_file)
             if options.verbose:
                 print "Reading samples from", options.from_file
 	    
         if options.log and not options.from_file:
             usrp_sink = gr.file_sink(gr.sizeof_gr_complex, 'usrp.dat')
-            self.connect(self.src, usrp_sink)
+            self.connect(self.u, usrp_sink)
 
         # Set up 22KHz-wide bandpass about center frequency. Decimate by 10
         # to get channel rate of 25Ksps
@@ -115,9 +97,9 @@ class app_top_block(gr.top_block):
 	    self.connect(self.chan, chan_sink)
 
         # FLEX protocol demodulator
-        self.flex = pager.flex_demod(queue, options.frequency, options.verbose, options.log)
+        self.flex = pager.flex_demod(queue, options.freq, options.verbose, options.log)
 
-        self.connect(self.src, self.chan, self.flex)
+        self.connect(self.u, self.chan, self.flex)
 
     def freq_offset(self):
 	return self.flex.dc_offset()*1600
@@ -130,30 +112,42 @@ class app_top_block(gr.top_block):
 	    if self.verbose:
 		print "Channel frequency offset (Hz):", int(self.offset)
 	    		
-def main():
+
+def get_options():
     parser = OptionParser(option_class=eng_option)
-    parser.add_option("-f", "--frequency", type="eng_float", default=None,
-                      help="set receive frequency to Hz", metavar="Hz")
-    parser.add_option("-R", "--rx-subdev-spec", type="subdev",
-                      help="select USRP Rx side A or B", metavar="SUBDEV")
+
+    parser.add_option('-f', '--freq', type="eng_float", default=None,
+                      help="Set receive frequency to FREQ [default=%default]",
+                      metavar="FREQ")
+    parser.add_option("-a", "--address", type="string", default="addr=192.168.10.2",
+                      help="Address of UHD device, [default=%default]")
+    parser.add_option("-A", "--antenna", type="string", default=None,
+                      help="select Rx Antenna where appropriate")
+    parser.add_option("", "--rx-gain", type="eng_float", default=None,
+                      help="set receive gain in dB (default is midpoint)")
     parser.add_option("-c",   "--calibration", type="eng_float", default=0.0,
                       help="set frequency offset to Hz", metavar="Hz")
-    parser.add_option("-g", "--gain", type="int", default=None,
-                      help="set RF gain", metavar="dB")
+    parser.add_option("-v", "--verbose", action="store_true", default=False)
     parser.add_option("-l", "--log", action="store_true", default=False,
                       help="log flowgraph to files (LOTS of data)")
-    parser.add_option("-v", "--verbose", action="store_true", default=False,
-                      help="display debug output")
     parser.add_option("-F", "--from-file", default=None,
                       help="read samples from file instead of USRP")
+
     (options, args) = parser.parse_args()
 
-    if len(args) > 0 or (options.frequency == None and options.from_file == None):
+    if len(args) > 0:
 	print "Run 'usrp_flex.py -h' for options."
 	sys.exit(1)
 
-    if options.frequency == None:
-	options.frequency = 0.0
+    if (options.freq is None):
+        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
+        sys.exit(1)
+        
+    return (options, args)
+
+if __name__ == "__main__":
+
+    (options, args) = get_options()
 
     # Flow graph emits pages into message queue
     queue = gr.msg_queue()
@@ -167,6 +161,3 @@ def main():
 
     runner.end()
 
-
-if __name__ == "__main__":
-    main()
diff --git a/gr-pager/apps/usrp_flex_band.py b/gr-pager/apps/usrp_flex_band.py
index 06c2488c0..8ea76c229 100755
--- a/gr-pager/apps/usrp_flex_band.py
+++ b/gr-pager/apps/usrp_flex_band.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2006,2007,2009 Free Software Foundation, Inc.
+# Copyright 2006,2007,2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,32 +20,52 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, usrp, optfir, eng_notation, blks2, pager
+from gnuradio import gr, gru, uhd, optfir, eng_notation, blks2, pager
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
+import sys
 
 class app_top_block(gr.top_block):
     def __init__(self, options, queue):
 	gr.top_block.__init__(self, "usrp_flex_all")
-        self.subdev = None
 
         if options.from_file is not None:
-            self.src = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+            self.u = gr.file_source(gr.sizeof_gr_complex, options.from_file)
             if options.verbose:
                 print "Reading samples from file", options.from_file
         else:
-            self.src = usrp.source_c()
-            if options.rx_subdev_spec is None:
-                options.rx_subdev_spec = usrp.pick_rx_subdevice(self.src)
-            self.subdev = usrp.selected_subdev(self.src, options.rx_subdev_spec)
-            self.src.set_mux(usrp.determine_rx_mux_value(self.src, options.rx_subdev_spec))
-            self.src.set_decim_rate(64)
-	    frequency = options.frequency+options.calibration
-            result = usrp.tune(self.src, 0, self.subdev, frequency)
-            if options.verbose:
-                print "Using", self.subdev.name(), " for receiving."
-                print "Tuned USRP to", frequency
+            # Set up USRP source
+            self.u = uhd.usrp_source(device_addr=options.address,
+                                     io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                     num_channels=1)
+
+            # Grab 1 MHz of spectrum
+            # (A UHD facility to get sample rate range and granularity would be useful)
+            self.u.set_samp_rate(1e6)
+            rate = self.u.get_samp_rate()
+            if rate != 1e6:
+                print "Unable to set required sample rate of 1 Msps (got %f)" % rate
+                sys.exit(1)
                 
+            # Tune daughterboard
+            r = self.u.set_center_freq(options.freq+options.calibration, 0)
+            if not r:
+                frange = self.u.get_freq_range()
+                sys.stderr.write(("\nRequested frequency (%f) out or range [%f, %f]\n") % \
+                                     (freq, frange.start(), frange.stop()))
+                sys.exit(1)
+
+            # if no gain was specified, use the mid-point in dB
+            if options.rx_gain is None:
+                grange = self.u.get_gain_range()
+                options.rx_gain = float(grange.start()+grange.stop())/2.0
+                print "\nNo gain specified."
+                print "Setting gain to %f (from [%f, %f])" % \
+                    (options.rx_gain, grange.start(), grange.stop())
+        
+            self.u.set_gain(options.rx_gain, 0)
+
+
         taps = gr.firdes.low_pass(1.0,
                                   1.0,
                                   1.0/40.0*0.4,
@@ -56,43 +76,59 @@ class app_top_block(gr.top_block):
             print "Channel filter has", len(taps), "taps"
 
         bank = blks2.analysis_filterbank(40, taps)
-        self.connect(self.src, bank)
+        self.connect(self.u, bank)
 
         if options.log and options.from_file == None:
             src_sink = gr.file_sink(gr.sizeof_gr_complex, 'usrp.dat')
-            self.connect(self.src, src_sink)
+            self.connect(self.u, src_sink)
 
         for i in range(40):
 	    if i < 20:
-		freq = options.frequency+i*25e3
+		freq = options.freq+i*25e3
 	    else:
-		freq = options.frequency-0.5e6+(i-20)*25e3
+		freq = options.freq-0.5e6+(i-20)*25e3
 
 	    self.connect((bank, i), pager.flex_demod(queue, freq, options.verbose, options.log))
 	    if options.log:
 		self.connect((bank, i), gr.file_sink(gr.sizeof_gr_complex, 'chan_'+'%3.3f'%(freq/1e6)+'.dat'))
 
 
-def main():
+def get_options():
     parser = OptionParser(option_class=eng_option)
-    parser.add_option("-f", "--frequency", type="eng_float", default=929.5e6,
-                      help="set receive center frequency to Hz", metavar="Hz")
-    parser.add_option("-R", "--rx-subdev-spec", type="subdev",
-                      help="select USRP Rx side A or B (default=first daughterboard found)")
-    parser.add_option("-c", "--calibration", type="eng_float", default=0.0,
+
+    parser.add_option('-f', '--freq', type="eng_float", default=None,
+                      help="Set receive frequency to FREQ [default=%default]",
+                      metavar="FREQ")
+    parser.add_option("-a", "--address", type="string", default="addr=192.168.10.2",
+                      help="Address of UHD device, [default=%default]")
+    parser.add_option("-A", "--antenna", type="string", default=None,
+                      help="select Rx Antenna where appropriate")
+    parser.add_option("", "--rx-gain", type="eng_float", default=None,
+                      help="set receive gain in dB (default is midpoint)")
+    parser.add_option("-c",   "--calibration", type="eng_float", default=0.0,
                       help="set frequency offset to Hz", metavar="Hz")
-    parser.add_option("-g", "--gain", type="int",
-                      help="set RF gain", metavar="dB")
-    parser.add_option("-F", "--from-file", default=None,
-                      help="Read from file instead of USRP")
+    parser.add_option("-v", "--verbose", action="store_true", default=False)
     parser.add_option("-l", "--log", action="store_true", default=False,
                       help="log flowgraph to files (LOTS of data)")
-    parser.add_option("-v", "--verbose", action="store_true", default=False,
-                      help="display debug output")
+    parser.add_option("-F", "--from-file", default=None,
+                      help="read samples from file instead of USRP")
+
     (options, args) = parser.parse_args()
 
-    if options.verbose:
-        print options
+    if len(args) > 0:
+	print "Run 'usrp_flex_band.py -h' for options."
+	sys.exit(1)
+
+    if (options.freq is None):
+        sys.stderr.write("You must specify -f FREQ or --freq FREQ\n")
+        sys.exit(1)
+        
+    return (options, args)
+
+    
+if __name__ == "__main__":
+
+    (options, args) = get_options()
 
     queue = gr.msg_queue()
     tb = app_top_block(options, queue)
@@ -105,6 +141,4 @@ def main():
 
     runner.end()
 
-    
-if __name__ == "__main__":
-    main()
+
diff --git a/gr-pager/gnuradio-pager.pc.in b/gr-pager/gnuradio-pager.pc.in
index 6fda2d2f2..408d94eb2 100644
--- a/gr-pager/gnuradio-pager.pc.in
+++ b/gr-pager/gnuradio-pager.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: gnuradio-comedi
+Name: gnuradio-pager
 Description: GNU Radio blocks implementing a FLEX pager decoder
 Requires: gnuradio-core
 Version: @LIBVER@
diff --git a/gr-cvsd-vocoder/Makefile.am b/gr-pager/grc/CMakeLists.txt
index 48807a34b..2b01a1e0b 100644
--- a/gr-cvsd-vocoder/Makefile.am
+++ b/gr-pager/grc/CMakeLists.txt
@@ -1,5 +1,4 @@
-#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -17,11 +16,11 @@
 # 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = src
 
-pkgconfigdir = $(libdir)/pkgconfig
-dist_pkgconfig_DATA = gnuradio-cvsd-vocoder.pc
+install(FILES
+    pager_slicer_fb.xml
+    pager_flex_sync.xml
+    pager_flex_deinterleave.xml
+    DESTINATION ${GRC_BLOCKS_DIR}
+    COMPONENT "pager_python"
+)
diff --git a/gr-pager/lib/CMakeLists.txt b/gr-pager/lib/CMakeLists.txt
new file mode 100644
index 000000000..7b91c5a33
--- /dev/null
+++ b/gr-pager/lib/CMakeLists.txt
@@ -0,0 +1,69 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_PAGER_INCLUDE_DIRS}
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gr_pager_sources
+    pager_flex_frame.cc
+    pager_slicer_fb.cc
+    pager_flex_sync.cc
+    pager_flex_deinterleave.cc
+    pager_flex_parse.cc
+    pageri_bch3221.cc
+    pageri_flex_modes.cc
+    pageri_util.cc
+)
+
+list(APPEND pager_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+)
+
+add_library(gnuradio-pager SHARED ${gr_pager_sources})
+target_link_libraries(gnuradio-pager ${pager_libs})
+GR_LIBRARY_FOO(gnuradio-pager RUNTIME_COMPONENT "pager_runtime" DEVEL_COMPONENT "pager_devel")
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+    pager_api.h
+    pager_slicer_fb.h
+    pager_flex_sync.h
+    pager_flex_deinterleave.h
+    pager_flex_parse.h
+    pager_flex_frame.h
+    pageri_bch3221.h
+    pageri_flex_modes.h
+    pageri_util.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "pager_devel"
+)
diff --git a/gr-pager/lib/Makefile.am b/gr-pager/lib/Makefile.am
index 29c82ebe8..b6131171d 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 000000000..4312c5ae3
--- /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 7211a71ad..87094490d 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 1f4999e2b..857b49d29 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 0f7cfb370..dcbd19eae 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 b401bf532..53b6f950a 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 75eea3cd3..b3d92780f 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);
diff --git a/gr-pager/python/CMakeLists.txt b/gr-pager/python/CMakeLists.txt
new file mode 100644
index 000000000..bbbf35a71
--- /dev/null
+++ b/gr-pager/python/CMakeLists.txt
@@ -0,0 +1,49 @@
+# 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.
+
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    FILES
+    __init__.py
+    pager_utils.py
+    flex_demod.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/pager
+    COMPONENT "pager_python"
+)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-pager/python
+        ${CMAKE_BINARY_DIR}/gr-pager/swig
+    )
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-pager)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gr-pager/swig/CMakeLists.txt b/gr-pager/swig/CMakeLists.txt
new file mode 100644
index 000000000..bfb34c929
--- /dev/null
+++ b/gr-pager/swig/CMakeLists.txt
@@ -0,0 +1,51 @@
+# 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_PAGER_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_LIBRARIES gnuradio-pager)
+
+GR_SWIG_MAKE(pager_swig pager_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS pager_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/pager
+    COMPONENT "pager_python"
+)
+
+install(
+    FILES
+    pager_swig.i
+    pager_flex_deinterleave.i
+    pager_flex_frame.i
+    pager_flex_parse.i
+    pager_flex_sync.i
+    pager_slicer_fb.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "pager_swig"
+)
diff --git a/gr-pager/swig/Makefile.swig.gen b/gr-pager/swig/Makefile.swig.gen
index 70d215384..9f7467c1c 100644
--- a/gr-pager/swig/Makefile.swig.gen
+++ b/gr-pager/swig/Makefile.swig.gen
@@ -105,7 +105,7 @@ _pager_swig_la_CXXFLAGS =			\
 	$(pager_swig_la_swig_cxxflags)
 
 python/pager_swig.cc: pager_swig.py
-pager_swig.py: pager_swig.i
+pager_swig.py: pager_swig.i 
 
 # Include the python dependencies for this file
 -include python/pager_swig.d
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt
new file mode 100644
index 000000000..3e870eee9
--- /dev/null
+++ b/gr-qtgui/CMakeLists.txt
@@ -0,0 +1,127 @@
+# Copyright 2010-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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+find_package(Qt4 4.2.0 COMPONENTS QtCore QtGui)
+include(${QT_USE_FILE}) #sets up the environment
+
+find_package(Qwt)
+
+find_package(PythonLibs)
+
+include(GrPython)
+GR_PYTHON_CHECK_MODULE("PyQt4" PyQt4 True PYQT4_FOUND)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+if(NOT CMAKE_CROSSCOMPILING)
+    set(qt_gui_python_deps
+        PYQT4_FOUND
+        #we could check for pyqwt, but its not strictly required
+    )
+endif(NOT CMAKE_CROSSCOMPILING)
+
+GR_REGISTER_COMPONENT("gr-qtgui" ENABLE_GR_QTGUI
+    Boost_FOUND
+    QT4_FOUND
+    QWT_FOUND
+    ENABLE_GR_CORE
+    PYTHONLIBS_FOUND
+    ${qt_gui_python_deps}
+)
+
+GR_SET_GLOBAL(GR_QTGUI_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/lib
+    ${CMAKE_CURRENT_BINARY_DIR}/lib
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_QTGUI)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_QTGUI_DESCRIPTION "GNU Radio QtGUI Blocks")
+
+CPACK_COMPONENT("qtgui_runtime"
+    GROUP        "QtGUI"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("qtgui_devel"
+    GROUP        "QtGUI"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("qtgui_python"
+    GROUP        "QtGUI"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "core_python;qtgui_runtime"
+)
+
+CPACK_COMPONENT("qtgui_swig"
+    GROUP        "QtGUI"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;qtgui_python;qtgui_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(include)
+add_subdirectory(lib)
+add_subdirectory(doc)
+if(ENABLE_PYTHON)
+    add_subdirectory(grc)
+    add_subdirectory(swig)
+    add_subdirectory(python)
+    add_subdirectory(examples)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-qtgui.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-qtgui.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-qtgui.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "qtgui_devel"
+)
+
+endif(ENABLE_GR_QTGUI)
diff --git a/gr-qtgui/Makefile.am b/gr-qtgui/Makefile.am
index cc194e4c0..e850567cc 100644
--- a/gr-qtgui/Makefile.am
+++ b/gr-qtgui/Makefile.am
@@ -21,10 +21,10 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = lib
+SUBDIRS = include lib doc
 
 if PYTHON
-SUBDIRS += swig python apps grc
+SUBDIRS += swig python apps grc examples
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/gr-qtgui/apps/Makefile.am b/gr-qtgui/apps/Makefile.am
index 7b35d949e..4d0c550a1 100644
--- a/gr-qtgui/apps/Makefile.am
+++ b/gr-qtgui/apps/Makefile.am
@@ -28,13 +28,9 @@ nodist_bin_SCRIPTS =		\
 	usrp_display_qtgui.ui
 
 noinst_PYTHON = 		\
-	pyqt_example_f.py 	\
-	pyqt_example_c.py	\
-	pyqt_time_c.py		\
 	qt_digital.py		\
 	qt_digital_window.py    \
-	usrp2_display.py	\
-	usrp_display.py		\
+	uhd_display.py		\
 	qt_digital_window.py	\
 	usrp_display_qtgui.py
 
diff --git a/gr-qtgui/apps/usrp2_display.py b/gr-qtgui/apps/uhd_display.py
index 497bcc00e..806914797 100755
--- a/gr-qtgui/apps/usrp2_display.py
+++ b/gr-qtgui/apps/uhd_display.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,7 +21,7 @@
 # 
 
 from gnuradio import gr
-from gnuradio import usrp2
+from gnuradio import uhd
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from gnuradio.qtgui import qtgui
@@ -163,53 +163,40 @@ class main_window(QtGui.QMainWindow):
 
         
 class my_top_block(gr.top_block):
-    def __init__(self):
+    def __init__(self, options):
         gr.top_block.__init__(self)
 
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-e", "--interface", type="string", default="eth0",
-                          help="select Ethernet interface, default is eth0")
-        parser.add_option("-m", "--mac-addr", type="string", default="",
-                          help="select USRP by MAC address, default is auto-select")
-        parser.add_option("-W", "--bw", type="eng_float", default=1e6,
-                          help="set bandwidth of receiver [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=2412e6,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("--fft-size", type="int", default=2048,
-                          help="Set number of FFT bins [default=%default]")
-        (options, args) = parser.parse_args()
-
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-	self.options = options
+        self.options = options
         self.show_debug_info = True
         
         self.qapp = QtGui.QApplication(sys.argv)
 
-        self.u = usrp2.source_32fc(options.interface, options.mac_addr)
-        self._adc_rate = self.u.adc_rate()
-        self.set_bandwidth(options.bw)
+        self.u = uhd.usrp_source(device_addr=options.address,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
+        self.set_bandwidth(options.samp_rate)
 
         if options.gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.u.gain_range()
-            options.gain = float(g[0]+g[1])/2
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2
         self.set_gain(options.gain)
 
         if options.freq is None:
-            # if no frequency was specified, use the mid-point of the subdev
-            f = self.u.freq_range()
-            options.freq = float(f[0]+f[1])/2
+            # if no freq was specified, use the mid-point
+            r = self.u.get_freq_range()
+            options.freq = float(r.start()+r.stop())/2
         self.set_frequency(options.freq)
 
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         self._fftsize = options.fft_size
 
-        self.snk = qtgui.sink_c(options.fft_size, gr.firdes.WIN_BLACKMAN_hARRIS,
+        self.snk = qtgui.sink_c(options.fft_size,
+                                gr.firdes.WIN_BLACKMAN_hARRIS,
                                 self._freq, self._bandwidth,
-                                "USRP2 Display",
+                                "UHD Display",
                                 True, True, True, False)
 
         # Set up internal amplifier
@@ -225,9 +212,9 @@ class my_top_block(gr.top_block):
         self.connect(self.u, self.amp, self.snk)
 
         if self.show_debug_info:
-            print "Decimation rate: ", self._decim
-            print "Bandwidth: ", self._bandwidth
-            print "D'board: ", self.u.daughterboard_id()
+            print "Bandwidth: ", self.u.get_samp_rate()
+            print "Center Freq: ", self.u.get_center_freq()
+            print "Freq Range: ", self.u.get_freq_range()
 
         # Get the reference pointer to the SpectrumDisplayForm QWidget
         # Wrap the pointer as a PyQt SIP object
@@ -268,8 +255,7 @@ class my_top_block(gr.top_block):
 
     def set_bandwidth(self, bw):
         self._bandwidth = bw
-        self._decim = int(self._adc_rate / self._bandwidth)
-        self.u.set_decim(self._decim)
+        self.u.set_samp_rate(self._bandwidth)
 
         try:
             self.snk.set_frequency_range(self._freq, self._bandwidth)
@@ -301,7 +287,26 @@ class my_top_block(gr.top_block):
         self.unlock()
 
 def main ():
-    tb = my_top_block()
+    parser = OptionParser(option_class=eng_option)
+    parser.add_option("-a", "--address", type="string", default="addr=192.168.10.2",
+                      help="Address of UHD device, [default=%default]")
+    parser.add_option("-A", "--antenna", type="string", default=None,
+                      help="select Rx Antenna where appropriate")
+    parser.add_option("-s", "--samp-rate", type="eng_float", default=1e6,
+                      help="set sample rate (bandwidth) [default=%default]")
+    parser.add_option("-f", "--freq", type="eng_float", default=2412e6,
+                      help="set frequency to FREQ", metavar="FREQ")
+    parser.add_option("-g", "--gain", type="eng_float", default=None,
+                      help="set gain in dB (default is midpoint)")
+    parser.add_option("--fft-size", type="int", default=2048,
+                      help="Set number of FFT bins [default=%default]")
+    (options, args) = parser.parse_args()
+    
+    if len(args) != 0:
+        parser.print_help()
+        sys.exit(1)
+
+    tb = my_top_block(options)
     tb.start()
     tb.snk.exec_();
 
diff --git a/gr-qtgui/apps/usrp_display.py b/gr-qtgui/apps/usrp_display.py
deleted file mode 100755
index 888bb6338..000000000
--- a/gr-qtgui/apps/usrp_display.py
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2009 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.
-# 
-
-from gnuradio import gr
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.qtgui import qtgui
-from optparse import OptionParser
-import sys
-
-try:
-    from gnuradio.qtgui import qtgui
-    from PyQt4 import QtGui, QtCore
-    import sip
-except ImportError:
-    print "Error: Program requires PyQt4 and gr-qtgui."
-    sys.exit(1)
-
-try:
-    from usrp_display_qtgui import Ui_MainWindow
-except ImportError:
-    print "Error: could not find usrp_display_qtgui.py:"
-    print "\t\"pyuic4 usrp_display_qtgui.ui -o usrp_display_qtgui.py\""
-    sys.exit(1)
-
-
-
-# ////////////////////////////////////////////////////////////////////
-#        Define the QT Interface and Control Dialog
-# ////////////////////////////////////////////////////////////////////
-
-
-class main_window(QtGui.QMainWindow):
-    def __init__(self, snk, fg, parent=None):
-
-        QtGui.QWidget.__init__(self, parent)
-        self.gui = Ui_MainWindow()
-        self.gui.setupUi(self)
-
-        self.fg = fg
-
-        # Add the qtsnk widgets to the layout box
-        self.gui.sinkLayout.addWidget(snk)
-
-        # Connect up some signals
-        self.connect(self.gui.pauseButton, QtCore.SIGNAL("clicked()"),
-                     self.pauseFg)
-        self.connect(self.gui.frequencyEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.frequencyEditText)
-        self.connect(self.gui.gainEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.gainEditText)
-        self.connect(self.gui.bandwidthEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.bandwidthEditText)
-        self.connect(self.gui.amplifierEdit, QtCore.SIGNAL("editingFinished()"),
-                     self.amplifierEditText)
-
-        self.connect(self.gui.actionSaveData, QtCore.SIGNAL("activated()"),
-                     self.saveData)
-        self.gui.actionSaveData.setShortcut(QtGui.QKeySequence.Save)
-
-    def pauseFg(self):
-        if(self.gui.pauseButton.text() == "Pause"):
-            self.fg.stop()
-            self.fg.wait()
-            self.gui.pauseButton.setText("Unpause")
-        else:
-            self.fg.start()
-            self.gui.pauseButton.setText("Pause")
-      
-
-    # Functions to set the values in the GUI
-    def set_frequency(self, freq):
-        self.freq = freq
-        sfreq = eng_notation.num_to_str(self.freq)
-        self.gui.frequencyEdit.setText(QtCore.QString("%1").arg(sfreq))
-        
-    def set_gain(self, gain):
-        self.gain = gain
-        self.gui.gainEdit.setText(QtCore.QString("%1").arg(self.gain))
-
-    def set_bandwidth(self, bw):
-        self.bw = bw
-        sbw = eng_notation.num_to_str(self.bw)
-        self.gui.bandwidthEdit.setText(QtCore.QString("%1").arg(sbw))
-
-    def set_amplifier(self, amp):
-        self.amp = amp
-        self.gui.amplifierEdit.setText(QtCore.QString("%1").arg(self.amp))
-
-
-    # Functions called when signals are triggered in the GUI
-    def frequencyEditText(self):
-        try:
-            freq = eng_notation.str_to_num(self.gui.frequencyEdit.text().toAscii()) 
-            self.fg.set_frequency(freq)
-            self.freq = freq
-        except RuntimeError:
-            pass
-
-    def gainEditText(self):
-        try:
-            gain = float(self.gui.gainEdit.text())
-            self.fg.set_gain(gain)
-            self.gain = gain
-        except ValueError:
-            pass
-                
-    def bandwidthEditText(self):
-        try:
-            bw = eng_notation.str_to_num(self.gui.bandwidthEdit.text().toAscii())
-            self.fg.set_bandwidth(bw)
-            self.bw = bw
-        except ValueError:
-            pass
-        
-    def amplifierEditText(self):
-        try:
-            amp = float(self.gui.amplifierEdit.text())
-            self.fg.set_amplifier_gain(amp)
-            self.amp = amp
-        except ValueError:
-            pass
-
-    def saveData(self):
-        fileName = QtGui.QFileDialog.getSaveFileName(self, "Save data to file", ".");
-        if(len(fileName)):
-            self.fg.save_to_file(str(fileName))
-
-        
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    If there's a daughterboard on A, select A.
-    If there's a daughterboard on B, select B.
-    Otherwise, select A.
-    """
-    if u.db(0, 0).dbid() >= 0:       # dbid is < 0 if there's no d'board or a problem
-        return (0, 0)
-    if u.db(0, 0).dbid() >= 0:
-        return (1, 0)
-    return (0, 0)
-
-class my_top_block(gr.top_block):
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-w", "--which", type="int", default=0,
-                          help="select which USRP (0, 1, ...) default is %default",
-			  metavar="NUM")
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=first one with a daughterboard)")
-        parser.add_option("-A", "--antenna", default=None,
-                          help="select Rx Antenna (only on RFX-series boards)")
-        parser.add_option("-W", "--bw", type="float", default=1e6,
-                          help="set bandwidth of receiver [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB [default is midpoint]")
-        parser.add_option("-8", "--width-8", action="store_true", default=False,
-                          help="Enable 8-bit samples across USB")
-        parser.add_option( "--no-hb", action="store_true", default=False,
-                          help="don't use halfband filter in usrp")
-        parser.add_option("-S", "--oscilloscope", action="store_true", default=False,
-                          help="Enable oscilloscope display")
-	parser.add_option("", "--avg-alpha", type="eng_float", default=1e-1,
-			  help="Set fftsink averaging factor, [default=%default]")
-	parser.add_option("", "--ref-scale", type="eng_float", default=13490.0,
-			  help="Set dBFS=0dB input value, [default=%default]")
-        parser.add_option("", "--fft-size", type="int", default=2048,
-                          help="Set FFT frame size, [default=%default]");
-
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-	self.options = options
-        self.show_debug_info = True
-
-        # Call this before creating the Qt sink
-        self.qapp = QtGui.QApplication(sys.argv)
-
-        self._fftsize = options.fft_size
-
-        self.u = usrp.source_c(which=options.which)
-        self._adc_rate = self.u.converter_rate()
-        self.set_bandwidth(options.bw)
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-        self._rx_subdev_spec = options.rx_subdev_spec
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, self._rx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, self._rx_subdev_spec)
-
-        self._gain_range = self.subdev.gain_range()
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self._gain_range
-            options.gain = float(g[0]+g[1])/2
-        self.set_gain(options.gain)
-
-        if options.freq is None:
-            # if no frequency was specified, use the mid-point of the subdev
-            f = self.subdev.freq_range()
-            options.freq = float(f[0]+f[1])/2
-        self.set_frequency(options.freq)
-
-        self.snk = qtgui.sink_c(self._fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                self._freq, self._bandwidth,
-                                "USRP Display",
-                                True, True, True, False)
-
-        # Set up internal amplifier
-        self.amp = gr.multiply_const_cc(0.0)
-        self.set_amplifier_gain(0.001)
-
-        # Connect the flow graph
-        self.connect(self.u, self.amp, self.snk)
-
-
-        # Get the reference pointer to the SpectrumDisplayForm QWidget
-        # Wrap the pointer as a PyQt SIP object
-        #     This can now be manipulated as a PyQt4.QtGui.QWidget
-        self.pysink = sip.wrapinstance(self.snk.pyqwidget(), QtGui.QWidget)
-
-        self.main_win = main_window(self.pysink, self)
-
-        self.main_win.set_frequency(self._freq)
-        self.main_win.set_gain(self._gain)
-        self.main_win.set_bandwidth(self._bandwidth)
-        self.main_win.set_amplifier(self._amp_value)
-
-        self.main_win.show()
-
-    def save_to_file(self, name):
-        # Pause the flow graph
-        self.stop()
-        self.wait()
-
-        # Add file sink to save data
-        self.file_sink = gr.file_sink(gr.sizeof_gr_complex, name)
-        self.connect(self.amp, self.file_sink)
-
-        # Restart flow graph
-        self.start()
-
-    def set_gain(self, gain):
-        self._gain = gain
-        self.subdev.set_gain(self._gain)
-
-    def set_frequency(self, freq):
-        self._freq = freq
-        self.u.tune(0, self.subdev, self._freq)
-
-        try:
-            self.snk.set_frequency_range(self._freq, self._bandwidth)
-        except:
-            pass
-
-    def set_bandwidth(self, bw):
-        self._bandwidth = bw
-        self._decim = int(self._adc_rate / self._bandwidth)
-        self.u.set_decim_rate(self._decim)
-
-        try:
-            self.snk.set_frequency_range(self._freq, self._bandwidth)
-        except:
-            pass
-
-    def set_amplifier_gain(self, amp):
-            self._amp_value = amp
-            self.amp.set_k(self._amp_value)
-
-       
-if __name__ == "__main__":
-    tb = my_top_block();
-    tb.start()
-    tb.qapp.exec_()
diff --git a/gnuradio-examples/python/usrp2/.gitignore b/gr-qtgui/doc/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gnuradio-examples/python/usrp2/.gitignore
+++ b/gr-qtgui/doc/.gitignore
diff --git a/gr-gpio/src/Makefile.am b/gr-qtgui/doc/CMakeLists.txt
index 5071c2273..e6d01b8b0 100644
--- a/gr-gpio/src/Makefile.am
+++ b/gr-qtgui/doc/CMakeLists.txt
@@ -1,5 +1,4 @@
-#
-# Copyright 2007,2009 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -17,10 +16,8 @@
 # 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.
-# 
-
-SUBDIRS = fpga
-if PYTHON
-SUBDIRS += python
-endif
 
+install(
+    FILES README.qtgui
+    DESTINATION ${GR_PKG_DOC_DIR}
+)
diff --git a/gr-radar-mono/doc/Makefile.am b/gr-qtgui/doc/Makefile.am
index 77d603f55..b65eb062f 100644
--- a/gr-radar-mono/doc/Makefile.am
+++ b/gr-qtgui/doc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,4 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST += registers.ods
+SUBDIRS = 
+
+dist_gr_doc_DATA =		\
+	README.qtgui
diff --git a/gr-qtgui/doc/README.qtgui b/gr-qtgui/doc/README.qtgui
new file mode 100644
index 000000000..e54c3d907
--- /dev/null
+++ b/gr-qtgui/doc/README.qtgui
@@ -0,0 +1,12 @@
+This is the gr-qtgui package. It contains various QT-based graphical
+user interface blocks that add graphical sinks to a GNU Radio
+flowgraph. The Python namespaces is in gnuradio.qtgui, which would be normally
+imported as:
+
+    from gnuradio import qtgui
+
+See the Doxygen documentation for details about the blocks available
+in this package. A quick listing of the details can be found in Python
+after importing by using: 
+
+    help(qtgui)
diff --git a/gr-qtgui/doc/qtgui.dox b/gr-qtgui/doc/qtgui.dox
new file mode 100644
index 000000000..c7f4b7146
--- /dev/null
+++ b/gr-qtgui/doc/qtgui.dox
@@ -0,0 +1,77 @@
+/*! \page page_qtgui QT Graphical User Interface
+
+\section Introduction
+
+This is the gr-qtgui package. It contains various QT-based graphical
+user interface blocks that add graphical sinks to a GNU Radio
+flowgraph. The Python namespaces is in gnuradio.qtgui, which would be normally
+imported as:
+
+\code
+    from gnuradio import qtgui
+\endcode
+
+See the Doxygen documentation for details about the blocks available
+in this package. The relevant blocks are listed in the \ref
+qtgui_blk group.
+
+A quick listing of the details can be found in Python after importing
+by using:
+
+\code
+    help(qtgui)
+\endcode
+
+
+\section Dependencies
+
+The QT GUI blocks require the following dependencies.
+
+\li QtCore (version >= 4.4)
+\li QtGui (version >= 4.4)
+\li QtOpenGL (version >= 4.4)
+\li PyQt4 for Qt4 (version >= 4.4)
+\li Qwt (version >= 5.2)
+\li PyQwt5 for Qt4 (version >= 5.2)
+
+\section Usage
+
+To use the qtgui interface, a bit of boiler-plate lines must be
+included. First, the sink is defined, then it must be exposed from C++
+into Python using the "sip.wrapinstance" command, and finally, the
+"show" method is run on the new Python object. This sets up the QT
+environment to show the widget, but the qApplication must also be
+launched.
+
+In the "main" function of the code, the qApp is retrieved. Then, after
+the GNU Radio top block is started (remember that start() is a
+non-blocking call to launch the main thread of the flowgraph), the
+qapp's "exec_()" function is called. This function is a blocking call
+while the GUI is alive.
+
+\code
+from PyQt4 import Qt
+from gnuradio.qtgui import qtgui
+import sys, sip
+
+class grclass(gr.top_block):
+    ....
+
+    self.snk = qtgui.sink_c(1024,           #fftsize
+    	       		    samp_rate,      #bw
+			    "QT GUI Plot")  #name
+			     
+    self.snk_win = sip.wrapinstance(self.snk.pyqwidget(), Qt.QWidget)
+    self.snk_win.show()
+
+def main():
+    qapp = Qt.QApplication(sys.argv)
+    tb = grclass()
+    tb.start()
+    qapp.exec_()
+    tb.stop()
+
+
+\endcode
+
+*/
diff --git a/gr-cvsd-vocoder/src/.gitignore b/gr-qtgui/examples/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gr-cvsd-vocoder/src/.gitignore
+++ b/gr-qtgui/examples/.gitignore
diff --git a/gr-qtgui/examples/CMakeLists.txt b/gr-qtgui/examples/CMakeLists.txt
new file mode 100644
index 000000000..30fdc5e75
--- /dev/null
+++ b/gr-qtgui/examples/CMakeLists.txt
@@ -0,0 +1,29 @@
+# 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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+  pyqt_example_c.py
+  pyqt_example_f.py
+  pyqt_time_c.py
+  pyqt_time_f.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/qt-gui
+  COMPONENT "gnuradio_examples"
+)
diff --git a/gnuradio-examples/python/multi_usrp/Makefile.am b/gr-qtgui/examples/Makefile.am
index 2ef10b6e8..a204d1fcc 100644
--- a/gnuradio-examples/python/multi_usrp/Makefile.am
+++ b/gr-qtgui/examples/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2006,2009 Free Software Foundation, Inc.
+# Copyright 2008-2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,11 +21,14 @@
 
 include $(top_srcdir)/Makefile.common
 
-ourdatadir = $(exampledir)/multi_usrp
-
-dist_ourdata_DATA =	\
-	README
+if PYTHON
+ourdatadir = $(exampledir)/qt-gui
 
 dist_ourdata_SCRIPTS =		\
-	multi_usrp_oscope.py	\
-	multi_usrp_rx_cfile.py
+	pyqt_example_c.py	\
+	pyqt_example_f.py 	\
+	pyqt_time_c.py		\
+	pyqt_time_f.py
+endif
+
+EXTRA_DIST +=
diff --git a/gr-qtgui/apps/pyqt_example_c.py b/gr-qtgui/examples/pyqt_example_c.py
index 553d346c9..553d346c9 100755
--- a/gr-qtgui/apps/pyqt_example_c.py
+++ b/gr-qtgui/examples/pyqt_example_c.py
diff --git a/gr-qtgui/apps/pyqt_example_f.py b/gr-qtgui/examples/pyqt_example_f.py
index 5e432fe78..5e432fe78 100755
--- a/gr-qtgui/apps/pyqt_example_f.py
+++ b/gr-qtgui/examples/pyqt_example_f.py
diff --git a/gr-qtgui/apps/pyqt_time_c.py b/gr-qtgui/examples/pyqt_time_c.py
index a47302d19..a47302d19 100755
--- a/gr-qtgui/apps/pyqt_time_c.py
+++ b/gr-qtgui/examples/pyqt_time_c.py
diff --git a/gr-qtgui/apps/pyqt_time_f.py b/gr-qtgui/examples/pyqt_time_f.py
index 835b42a75..835b42a75 100755
--- a/gr-qtgui/apps/pyqt_time_f.py
+++ b/gr-qtgui/examples/pyqt_time_f.py
diff --git a/gr-qtgui/grc/CMakeLists.txt b/gr-qtgui/grc/CMakeLists.txt
new file mode 100644
index 000000000..370a71725
--- /dev/null
+++ b/gr-qtgui/grc/CMakeLists.txt
@@ -0,0 +1,22 @@
+# 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.
+
+########################################################################
+file(GLOB xml_files "*.xml")
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "qtgui_python")
diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml
index 8c470a1a5..83d6ec287 100644
--- a/gr-qtgui/grc/qtgui_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_sink_x.xml
@@ -57,6 +57,26 @@ $(gui_hint()($win))</make>
 			<name>Blackman-harris</name>
 			<key>firdes.WIN_BLACKMAN_hARRIS</key>
 		</option>
+		<option>
+			<name>Hamming</name>
+			<key>firdes.WIN_HAMMING</key>
+		</option>
+		<option>
+			<name>Hann</name>
+			<key>firdes.WIN_HANN</key>
+		</option>
+		<option>
+			<name>Blackman</name>
+			<key>firdes.WIN_BLACKMAN</key>
+		</option>
+		<option>
+			<name>Rectangular</name>
+			<key>firdes.WIN_RECTANGULAR</key>
+		</option>
+		<option>
+			<name>Kaiser</name>
+			<key>firdes.WIN_KAISER</key>
+		</option>
 	</param>
 	<param>
 		<name>Center Frequency (Hz)</name>
diff --git a/gr-gpio/.gitignore b/gr-qtgui/include/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gr-gpio/.gitignore
+++ b/gr-qtgui/include/.gitignore
diff --git a/gnuradio-examples/python/apps/README b/gr-qtgui/include/CMakeLists.txt
index b64b9d066..ef4cb1175 100644
--- a/gnuradio-examples/python/apps/README
+++ b/gr-qtgui/include/CMakeLists.txt
@@ -1,26 +1,32 @@
+# Copyright 2010-2011 Free Software Foundation, Inc.
 #
-# Copyright 2005 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.
-# 
 
-This directory servers as the parent directory for various and sundry
-applications such as scanners, HF radios, etc.  Each subdirectory
-shall have a README file that includes a short description of what the
-application does, and a list of hardware dependencies.  E.g., requires
-a USRP with an xyz daughterboard, connected to a footronics magic box.
+########################################################################
+# Install the header files
+########################################################################
+install(FILES
+    gr_qtgui_api.h
+    qtgui_time_sink_c.h
+    qtgui_time_sink_f.h
+    qtgui_sink_c.h
+    qtgui_sink_f.h
+    qtgui_util.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "qtgui_devel"
+)
diff --git a/gr-usrp2/grc/Makefile.am b/gr-qtgui/include/Makefile.am
index 2502bf363..59a030854 100644
--- a/gr-usrp2/grc/Makefile.am
+++ b/gr-qtgui/include/Makefile.am
@@ -21,13 +21,13 @@
 
 include $(top_srcdir)/Makefile.common
 
-dist_bin_SCRIPTS = usrp2_probe
+# These headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS = 		\
+	gr_qtgui_api.h		\
+	qtgui_time_sink_c.h	\
+	qtgui_time_sink_f.h	\
+	qtgui_sink_c.h		\
+	qtgui_sink_f.h		\
+	qtgui_util.h
 
-grcblocksdir = $(grc_blocksdir)
-dist_grcblocks_DATA = \
-	usrp2_probe.xml \
-	usrp2_source_xxxx.xml \
-	usrp2_sink_xxxx.xml
-
-ourdatadir = $(pkgdatadir)/grc/freedesktop
-dist_ourdata_DATA = gnuradio-usrp2_probe.desktop
+libgnuradio_digital_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
diff --git a/gr-qtgui/lib/gr_qtgui_api.h b/gr-qtgui/include/gr_qtgui_api.h
index 65033a093..c39add1e8 100644
--- a/gr-qtgui/lib/gr_qtgui_api.h
+++ b/gr-qtgui/include/gr_qtgui_api.h
@@ -24,7 +24,7 @@
 
 #include <gruel/attributes.h>
 
-#ifdef libgnuradio_qtgui_EXPORTS
+#ifdef gnuradio_qtgui_EXPORTS
 #  define GR_QTGUI_API __GR_ATTR_EXPORT
 #else
 #  define GR_QTGUI_API __GR_ATTR_IMPORT
diff --git a/gr-qtgui/lib/qtgui_sink_c.h b/gr-qtgui/include/qtgui_sink_c.h
index b0946885c..28c0f1372 100644
--- a/gr-qtgui/lib/qtgui_sink_c.h
+++ b/gr-qtgui/include/qtgui_sink_c.h
@@ -29,6 +29,7 @@
 #include <gr_firdes.h>
 #include <gri_fft.h>
 #include <qapplication.h>
+#include <gruel/high_res_timer.h>
 #include "SpectrumGUIClass.h"
 
 class qtgui_sink_c;
@@ -41,6 +42,17 @@ GR_QTGUI_API qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
 				     bool plottime=true, bool plotconst=true,
 				     QWidget *parent=NULL);
 
+/*!
+ * \brief A graphical sink to display freq, spec, time, and const plots.
+ * \ingroup qtgui_blk
+ *
+ * This is a QT-based graphical sink the takes a complex stream and
+ * plots it. The default action is to plot the signal as a PSD (FFT),
+ * spectrogram (waterfall), time domain I&Q, and constellation (I
+ * vs. Q) plots. The plots may be turned off by setting the
+ * appropriate boolean value in the constructor to False.  
+ */
+
 class GR_QTGUI_API qtgui_sink_c : public gr_block
 {
 private:
@@ -67,6 +79,8 @@ private:
   double d_center_freq;
   double d_bandwidth;
   std::string d_name;
+  gruel::high_res_timer_type  d_last_update;
+  bool d_update_active;
   
   bool d_shift;
   gri_fft_complex *d_fft;
diff --git a/gr-qtgui/lib/qtgui_sink_f.h b/gr-qtgui/include/qtgui_sink_f.h
index 6d43f18dd..2d79b5eef 100644
--- a/gr-qtgui/lib/qtgui_sink_f.h
+++ b/gr-qtgui/include/qtgui_sink_f.h
@@ -38,9 +38,20 @@ GR_QTGUI_API qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype,
 				     double fc=0, double bw=1.0,
 				     const std::string &name="Spectrum Display",
 				     bool plotfreq=true, bool plotwaterfall=true,
-				     bool plottime=true, bool plotconst=true,
+				     bool plottime=true, bool plotconst=false,
 				     QWidget *parent=NULL);
 
+/*!
+ * \brief A graphical sink to display freq, spec, and time.
+ * \ingroup qtgui_blk
+ *
+ * This is a QT-based graphical sink the takes a float stream and
+ * plots it. The default action is to plot the signal as a PSD (FFT),
+ * spectrogram (waterfall), and time domain plots. The plots may be
+ * turned off by setting the appropriate boolean value in the
+ * constructor to False.
+ */
+
 class GR_QTGUI_API qtgui_sink_f : public gr_block
 {
 private:
diff --git a/gr-qtgui/lib/qtgui_time_sink_c.h b/gr-qtgui/include/qtgui_time_sink_c.h
index 459423c40..ec7cc490b 100644
--- a/gr-qtgui/lib/qtgui_time_sink_c.h
+++ b/gr-qtgui/include/qtgui_time_sink_c.h
@@ -25,7 +25,7 @@
 
 #include <Python.h>
 #include <gr_qtgui_api.h>
-#include <gr_block.h>
+#include <gr_sync_block.h>
 #include <gr_firdes.h>
 #include <gri_fft.h>
 #include <qapplication.h>
@@ -35,24 +35,33 @@ class qtgui_time_sink_c;
 typedef boost::shared_ptr<qtgui_time_sink_c> qtgui_time_sink_c_sptr;
 
 GR_QTGUI_API qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw,
-					      const std::string &name,
-					      int nconnectons=1,
-					      QWidget *parent=NULL);
-
-class GR_QTGUI_API qtgui_time_sink_c : public gr_block
+							   const std::string &name,
+							   int nconnectons=1,
+							   QWidget *parent=NULL);
+
+/*!
+ * \brief A graphical sink to display multiple signals in time.
+ * \ingroup qtgui_blk
+ *
+ * This is a QT-based graphical sink the takes set of a complex
+ * streams and plots them in the time domain. For each signal, both
+ * the signal's I and Q parts are plotted, and they are all plotted
+ * with a different color, and the \a set_title and \a set_color
+ * functions can be used to change the lable and color for a given
+ * input number.
+ */
+class GR_QTGUI_API qtgui_time_sink_c : public gr_sync_block
 {
 private:
   friend GR_QTGUI_API qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw,
-						       const std::string &name,
-						       int nconnections,
-						       QWidget *parent);
+								    const std::string &name,
+								    int nconnections,
+								    QWidget *parent);
   qtgui_time_sink_c(int size, double bw,
 		    const std::string &name,
 		    int nconnections,
 		    QWidget *parent=NULL);
   
-  void forecast(int noutput_items, gr_vector_int &ninput_items_required);
-
   void initialize();
 
   int d_size;
@@ -84,10 +93,9 @@ public:
 
   QApplication *d_qApplication;
 
-  int general_work (int noutput_items,
-		    gr_vector_int &ninput_items,
-		    gr_vector_const_void_star &input_items,
-		    gr_vector_void_star &output_items);
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
 };
 
 #endif /* INCLUDED_QTGUI_TIME_SINK_C_H */
diff --git a/gr-qtgui/lib/qtgui_time_sink_f.h b/gr-qtgui/include/qtgui_time_sink_f.h
index 632246c6e..ff17f8a1b 100644
--- a/gr-qtgui/lib/qtgui_time_sink_f.h
+++ b/gr-qtgui/include/qtgui_time_sink_f.h
@@ -25,7 +25,7 @@
 
 #include <Python.h>
 #include <gr_qtgui_api.h>
-#include <gr_block.h>
+#include <gr_sync_block.h>
 #include <gr_firdes.h>
 #include <gri_fft.h>
 #include <qapplication.h>
@@ -39,7 +39,16 @@ GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw,
 					      int nconnectons=1,
 					      QWidget *parent=NULL);
 
-class GR_QTGUI_API qtgui_time_sink_f : public gr_block
+/*!
+ * \brief A graphical sink to display multiple signals in time.
+ * \ingroup qtgui_blk
+ *
+ * This is a QT-based graphical sink the takes set of a float streams
+ * and plots them in the time domain. Each signal is plotted with a
+ * different color, and the \a set_title and \a set_color functions
+ * can be used to change the lable and color for a given input number.
+ */
+class GR_QTGUI_API qtgui_time_sink_f : public gr_sync_block
 {
 private:
   friend GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw,
@@ -51,8 +60,6 @@ private:
 		    int nconnections,
 		    QWidget *parent=NULL);
   
-  void forecast(int noutput_items, gr_vector_int &ninput_items_required);
-
   void initialize();
 
   int d_size;
@@ -84,10 +91,9 @@ public:
 
   QApplication *d_qApplication;
 
-  int general_work (int noutput_items,
-		    gr_vector_int &ninput_items,
-		    gr_vector_const_void_star &input_items,
-		    gr_vector_void_star &output_items);
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
 };
 
 #endif /* INCLUDED_QTGUI_TIME_SINK_F_H */
diff --git a/gr-qtgui/lib/qtgui_util.h b/gr-qtgui/include/qtgui_util.h
index 7b3692e75..7b3692e75 100644
--- a/gr-qtgui/lib/qtgui_util.h
+++ b/gr-qtgui/include/qtgui_util.h
diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt
new file mode 100644
index 000000000..f60595ee6
--- /dev/null
+++ b/gr-qtgui/lib/CMakeLists.txt
@@ -0,0 +1,108 @@
+# Copyright 2010-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.
+
+########################################################################
+# Setup the QT file generations stuff
+########################################################################
+set(qtgui_moc_hdrs
+    spectrumdisplayform.h
+    timedisplayform.h
+    FrequencyDisplayPlot.h
+    TimeDomainDisplayPlot.h
+    WaterfallDisplayPlot.h
+    ConstellationDisplayPlot.h
+)
+QT4_WRAP_CPP(qtgui_moc_srcs ${qtgui_moc_hdrs})
+QT4_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui)
+
+#FIXME the sources expect <foo>.ui.h, but the macros generate ui_foo.h
+#avoid changing the sources by generating the header with the include
+set(spectrum_ui_hdr ${CMAKE_CURRENT_BINARY_DIR}/spectrumdisplayform.ui.h)
+if(NOT EXISTS ${spectrum_ui_hdr})
+    file(WRITE ${spectrum_ui_hdr} "#include <ui_spectrumdisplayform.h>\n")
+endif(NOT EXISTS ${spectrum_ui_hdr})
+
+set(qtgui_srcs
+    ${qtgui_moc_srcs}
+    ${qtgui_ui_hdrs}
+    FrequencyDisplayPlot.cc
+    TimeDomainDisplayPlot.cc
+    WaterfallDisplayPlot.cc
+    waterfallGlobalData.cc
+    ConstellationDisplayPlot.cc
+    spectrumdisplayform.cc
+    timedisplayform.cc
+    SpectrumGUIClass.cc
+    spectrumUpdateEvents.cc
+    plot_waterfall.cc
+    qtgui_sink_c.cc
+    qtgui_sink_f.cc
+    qtgui_time_sink_c.cc
+    qtgui_time_sink_f.cc
+    qtgui_util.cc
+)
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_QTGUI_INCLUDE_DIRS}
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+include_directories(${QWT_INCLUDE_DIRS})
+link_directories(${QWT_LIBRARY_DIRS})
+
+include_directories(${PYTHON_INCLUDE_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND qtgui_libs
+    gnuradio-core
+    ${QT_LIBRARIES}
+    ${QWT_LIBRARIES}
+    ${PYTHON_LIBRARIES}
+)
+
+add_definitions(-DQWT_DLL) #setup QWT library linkage
+add_library(gnuradio-qtgui SHARED ${qtgui_srcs})
+target_link_libraries(gnuradio-qtgui ${qtgui_libs})
+GR_LIBRARY_FOO(gnuradio-qtgui RUNTIME_COMPONENT "qtgui_runtime" DEVEL_COMPONENT "qtgui_devel")
+
+########################################################################
+# Install the header files
+########################################################################
+install(FILES
+    FrequencyDisplayPlot.h
+    TimeDomainDisplayPlot.h
+    WaterfallDisplayPlot.h
+    waterfallGlobalData.h
+    ConstellationDisplayPlot.h
+    plot_waterfall.h
+    spectrumdisplayform.h
+    timedisplayform.h
+    SpectrumGUIClass.h
+    spectrumUpdateEvents.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "qtgui_devel"
+)
diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc
index ca7eede36..fb549b697 100644
--- a/gr-qtgui/lib/ConstellationDisplayPlot.cc
+++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc
@@ -141,7 +141,7 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(QWidget* parent)
 	  this, SLOT(OnPickerPointSelected(const QwtDoublePoint &)));
 #else
   connect(_picker, SIGNAL(selected(const QPointF &)),
-	  this, SLOT(OnPickerPointSelected(const QPointF &)));
+	  this, SLOT(OnPickerPointSelected6(const QPointF &)));
 #endif
 
   connect(this, SIGNAL(legendChecked(QwtPlotItem *, bool ) ), 
@@ -236,7 +236,6 @@ ConstellationDisplayPlot::LegendEntryChecked(QwtPlotItem* plotItem, bool on)
   plotItem->setVisible(!on);
 }
 
-#if QWT_VERSION < 0x060000
 void
 ConstellationDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
 {
@@ -244,14 +243,13 @@ ConstellationDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
   //fprintf(stderr,"OnPickerPointSelected %f %f\n", point.x(), point.y());
   emit plotPointSelected(point);
 }
-#else
+
 void
-ConstellationDisplayPlot::OnPickerPointSelected(const QPointF & p)
+ConstellationDisplayPlot::OnPickerPointSelected6(const QPointF & p)
 {
   QPointF point = p;
   //fprintf(stderr,"OnPickerPointSelected %f %f\n", point.x(), point.y());
   emit plotPointSelected(point);
 }
-#endif
 
 #endif /* CONSTELLATION_DISPLAY_PLOT_C */
diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.h b/gr-qtgui/lib/ConstellationDisplayPlot.h
index d252a8c87..80ac3a63a 100644
--- a/gr-qtgui/lib/ConstellationDisplayPlot.h
+++ b/gr-qtgui/lib/ConstellationDisplayPlot.h
@@ -67,11 +67,11 @@ public:
 public slots:
   void resizeSlot( QSize *s );
 
-#if QWT_VERSION < 0x060000
+  // Because of the preprocessing of slots in QT, these are no
+  // easily separated by the version check. Make one for each
+  // version until it's worked out.
   void OnPickerPointSelected(const QwtDoublePoint & p);
-#else
-  void OnPickerPointSelected(const QPointF & p);
-#endif
+  void OnPickerPointSelected6(const QPointF & p);
 
 signals:
   void plotPointSelected(const QPointF p);
diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc
index 2e62f2b96..b48cd7233 100644
--- a/gr-qtgui/lib/FrequencyDisplayPlot.cc
+++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc
@@ -256,7 +256,7 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(QWidget* parent)
 	  this, SLOT(OnPickerPointSelected(const QwtDoublePoint &)));
 #else
   connect(_picker, SIGNAL(selected(const QPointF &)),
-	  this, SLOT(OnPickerPointSelected(const QPointF &)));
+	  this, SLOT(OnPickerPointSelected6(const QPointF &)));
 #endif
 
   // Configure magnify on mouse wheel
@@ -538,7 +538,7 @@ FrequencyDisplayPlot::ShowCFMarker (const bool show)
     _markerCF->hide();
 }
 
-#if QWT_VERSION < 0x060000
+
 void
 FrequencyDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
 {
@@ -547,15 +547,14 @@ FrequencyDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
   point.setX(point.x() * _xAxisMultiplier);
   emit plotPointSelected(point);
 }
-#else
+
 void
-FrequencyDisplayPlot::OnPickerPointSelected(const QPointF & p)
+FrequencyDisplayPlot::OnPickerPointSelected6(const QPointF & p)
 {
   QPointF point = p;
   //fprintf(stderr,"OnPickerPointSelected %f %f %d\n", point.x(), point.y(), _xAxisMultiplier);
   point.setX(point.x() * _xAxisMultiplier);
   emit plotPointSelected(point);
 }
-#endif
 
 #endif /* FREQUENCY_DISPLAY_PLOT_C */
diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.h b/gr-qtgui/lib/FrequencyDisplayPlot.h
index 961f30168..e79000789 100644
--- a/gr-qtgui/lib/FrequencyDisplayPlot.h
+++ b/gr-qtgui/lib/FrequencyDisplayPlot.h
@@ -80,11 +80,11 @@ public slots:
   void SetLowerIntensityLevel(const double);
   void SetUpperIntensityLevel(const double);
 
-#if QWT_VERSION < 0x060000
+  // Because of the preprocessing of slots in QT, these are no
+  // easily separated by the version check. Make one for each
+  // version until it's worked out.
   void OnPickerPointSelected(const QwtDoublePoint & p);
-#else
-  void OnPickerPointSelected(const QPointF & p);
-#endif
+  void OnPickerPointSelected6(const QPointF & p);
 
 signals:
   void plotPointSelected(const QPointF p);
diff --git a/gr-qtgui/lib/Makefile.am b/gr-qtgui/lib/Makefile.am
index 3257c3aae..aba311297 100644
--- a/gr-qtgui/lib/Makefile.am
+++ b/gr-qtgui/lib/Makefile.am
@@ -24,8 +24,8 @@ include $(top_srcdir)/Makefile.common
 EXTRA_DIST += spectrumdisplayform.ui
 
 AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
-              $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) \
-              -Dlibgnuradio_qtgui_EXPORTS
+	$(QT_INCLUDES) $(BOOST_CPPFLAGS) $(GR_QTGUI_INCLUDES) \
+	$(WITH_INCLUDES) -Dlibgnuradio_qtgui_EXPORTS
 
 # Only include these files in the build if qtgui passes configure checks
 # This is mostly to help make distcheck pass
@@ -73,14 +73,8 @@ grinclude_HEADERS =			\
 	spectrumdisplayform.h		\
 	timedisplayform.h		\
 	SpectrumGUIClass.h		\
-	spectrumUpdateEvents.h		\
 	plot_waterfall.h		\
-	gr_qtgui_api.h			\
-	qtgui_sink_c.h			\
-	qtgui_sink_f.h			\
-	qtgui_time_sink_c.h		\
-	qtgui_time_sink_f.h		\
-	qtgui_util.h
+	spectrumUpdateEvents.h
 
 #QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc
index af95e2bb2..1e9aa0169 100644
--- a/gr-qtgui/lib/SpectrumGUIClass.cc
+++ b/gr-qtgui/lib/SpectrumGUIClass.cc
@@ -29,7 +29,7 @@
 #include <QCustomEvent>
 
 const long SpectrumGUIClass::MAX_FFT_SIZE = 32768;
-const long SpectrumGUIClass::MIN_FFT_SIZE = 1024;
+const long SpectrumGUIClass::MIN_FFT_SIZE = 256;
 
 SpectrumGUIClass::SpectrumGUIClass(const uint64_t maxDataSize,
 				   const uint64_t fftSize,
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc
index eca6076b6..192ec82ee 100644
--- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc
+++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc
@@ -176,7 +176,7 @@ TimeDomainDisplayPlot::TimeDomainDisplayPlot(int nplots, QWidget* parent)
 	  this, SLOT(OnPickerPointSelected(const QwtDoublePoint &)));
 #else
   connect(_picker, SIGNAL(selected(const QPointF &)),
-	  this, SLOT(OnPickerPointSelected(const QPointF &)));
+	  this, SLOT(OnPickerPointSelected6(const QPointF &)));
 #endif
 
   // Configure magnify on mouse wheel
@@ -326,7 +326,6 @@ TimeDomainDisplayPlot::SetSampleRate(double sr, double units,
 }
 
 
-#if QWT_VERSION < 0x060000
 void
 TimeDomainDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
 {
@@ -334,14 +333,13 @@ TimeDomainDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
   //fprintf(stderr,"OnPickerPointSelected %f %f\n", point.x(), point.y());
   emit plotPointSelected(point);
 }
-#else
+
 void
-TimeDomainDisplayPlot::OnPickerPointSelected(const QPointF & p)
+TimeDomainDisplayPlot::OnPickerPointSelected6(const QPointF & p)
 {
   QPointF point = p;
   //fprintf(stderr,"OnPickerPointSelected %f %f\n", point.x(), point.y());
   emit plotPointSelected(point);
 }
-#endif
 
 #endif /* TIME_DOMAIN_DISPLAY_PLOT_C */
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.h b/gr-qtgui/lib/TimeDomainDisplayPlot.h
index 6c7fc4330..1f3f2c574 100644
--- a/gr-qtgui/lib/TimeDomainDisplayPlot.h
+++ b/gr-qtgui/lib/TimeDomainDisplayPlot.h
@@ -65,11 +65,11 @@ public slots:
   void SetSampleRate(double sr, double units, 
 		     const std::string &strunits);
 
-#if QWT_VERSION < 0x060000
+  // Because of the preprocessing of slots in QT, these are no
+  // easily separated by the version check. Make one for each
+  // version until it's worked out.
   void OnPickerPointSelected(const QwtDoublePoint & p);
-#else
-  void OnPickerPointSelected(const QPointF & p);
-#endif
+  void OnPickerPointSelected6(const QPointF & p);
 
 signals:
   void plotPointSelected(const QPointF p);
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc
index 94a8e6210..ffb27f2aa 100644
--- a/gr-qtgui/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc
@@ -349,7 +349,7 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(QWidget* parent)
 	  this, SLOT(OnPickerPointSelected(const QwtDoublePoint &)));
 #else
   connect(_picker, SIGNAL(selected(const QPointF &)),
-	  this, SLOT(OnPickerPointSelected(const QPointF &)));
+	  this, SLOT(OnPickerPointSelected6(const QPointF &)));
 #endif
 
   // Avoid jumping when labels with more/less digits
@@ -674,7 +674,6 @@ WaterfallDisplayPlot::_UpdateIntensityRangeDisplay()
   _lastReplot = gruel::high_res_timer_now();
 }
 
-#if QWT_VERSION < 0x060000
 void
 WaterfallDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
 {
@@ -683,15 +682,14 @@ WaterfallDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
   point.setX(point.x() * _xAxisMultiplier);
   emit plotPointSelected(point);
 }
-#else
+
 void
-WaterfallDisplayPlot::OnPickerPointSelected(const QPointF & p)
+WaterfallDisplayPlot::OnPickerPointSelected6(const QPointF & p)
 {
   QPointF point = p;
   //fprintf(stderr,"OnPickerPointSelected %f %f\n", point.x(), point.y());
   point.setX(point.x() * _xAxisMultiplier);
   emit plotPointSelected(point);
 }
-#endif
 
 #endif /* WATERFALL_DISPLAY_PLOT_C */
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.h b/gr-qtgui/lib/WaterfallDisplayPlot.h
index 0458597b0..b78c750ff 100644
--- a/gr-qtgui/lib/WaterfallDisplayPlot.h
+++ b/gr-qtgui/lib/WaterfallDisplayPlot.h
@@ -80,11 +80,11 @@ public:
 public slots:
   void resizeSlot( QSize *s );
 
-#if QWT_VERSION < 0x060000
+  // Because of the preprocessing of slots in QT, these are no
+  // easily separated by the version check. Make one for each
+  // version until it's worked out.
   void OnPickerPointSelected(const QwtDoublePoint & p);
-#else
-  void OnPickerPointSelected(const QPointF & p);
-#endif
+  void OnPickerPointSelected6(const QPointF & p);
  
 signals:
   void UpdatedLowerIntensityLevel(const double);
diff --git a/gr-qtgui/lib/qtgui_sink_c.cc b/gr-qtgui/lib/qtgui_sink_c.cc
index 965be0773..625ddbdf6 100644
--- a/gr-qtgui/lib/qtgui_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_sink_c.cc
@@ -125,6 +125,9 @@ qtgui_sink_c::initialize()
 
   // initialize update time to 10 times a second
   set_update_time(0.1);
+
+  d_last_update = gruel::high_res_timer_now();
+  d_update_active = false;
 }
 
 
@@ -270,6 +273,14 @@ qtgui_sink_c::general_work (int noutput_items,
     unsigned int datasize = noutput_items - i;
     unsigned int resid = d_fftsize-d_index;
 
+    if (!d_update_active && (gruel::high_res_timer_now() - d_last_update) < d_update_time) {
+      consume_each(noutput_items);
+      return noutput_items;
+    } else {
+      d_last_update = gruel::high_res_timer_now();
+      d_update_active = true;
+    }
+
     // If we have enough input for one full FFT, do it
     if(datasize >= resid) {
       const gruel::high_res_timer_type currentTime = gruel::high_res_timer_now();
@@ -284,6 +295,7 @@ qtgui_sink_c::general_work (int noutput_items,
       d_main_gui->UpdateWindow(true, d_fft->get_outbuf(), d_fftsize,
 			       NULL, 0, (float*)d_residbuf, d_fftsize,
 			       currentTime, true);
+      d_update_active = false;
     }
     // Otherwise, copy what we received into the residbuf for next time
     else {
diff --git a/gr-qtgui/lib/qtgui_time_sink_c.cc b/gr-qtgui/lib/qtgui_time_sink_c.cc
index 3d38419b2..207d4a924 100644
--- a/gr-qtgui/lib/qtgui_time_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_time_sink_c.cc
@@ -44,9 +44,9 @@ qtgui_time_sink_c::qtgui_time_sink_c (int size, double bw,
 				      const std::string &name,
 				      int nconnections,
 				      QWidget *parent)
-  : gr_block ("time_sink_c",
-	      gr_make_io_signature (nconnections, nconnections, sizeof(gr_complex)),
-	      gr_make_io_signature (0, 0, 0)),
+  : gr_sync_block ("time_sink_c",
+		   gr_make_io_signature (nconnections, nconnections, sizeof(gr_complex)),
+		   gr_make_io_signature (0, 0, 0)),
     d_size(size), d_bandwidth(bw), d_name(name),
     d_nconnections(2*nconnections), d_parent(parent)
 {
@@ -59,6 +59,7 @@ qtgui_time_sink_c::qtgui_time_sink_c (int size, double bw,
   }
 
   initialize();
+  set_output_multiple(d_size);
 }
 
 qtgui_time_sink_c::~qtgui_time_sink_c()
@@ -70,15 +71,6 @@ qtgui_time_sink_c::~qtgui_time_sink_c()
 }
 
 void
-qtgui_time_sink_c::forecast(int noutput_items, gr_vector_int &ninput_items_required)
-{
-  unsigned int ninputs = ninput_items_required.size();
-  for (unsigned int i = 0; i < ninputs; i++) {
-    ninput_items_required[i] = std::min(d_size, 8191);
-  }
-}
-
-void
 qtgui_time_sink_c::initialize()
 {
   if(qApp != NULL) {
@@ -144,10 +136,9 @@ qtgui_time_sink_c::set_color(int which, const std::string &color)
 }
 
 int
-qtgui_time_sink_c::general_work (int noutput_items,
-				 gr_vector_int &ninput_items,
-				 gr_vector_const_void_star &input_items,
-				 gr_vector_void_star &output_items)
+qtgui_time_sink_c::work (int noutput_items,
+			 gr_vector_const_void_star &input_items,
+			 gr_vector_void_star &output_items)
 {
   int n=0, j=0, idx=0;
   const gr_complex *in = (const gr_complex*)input_items[idx];
@@ -181,7 +172,9 @@ qtgui_time_sink_c::general_work (int noutput_items,
       j += resid;
     }
     // Otherwise, copy what we received into the residbufs for next time
+    // because we set the output_multiple, this should never need to be called
     else {
+      assert(0);
       for(n = 0; n < d_nconnections; n+=2) {
 	in = (const gr_complex*)input_items[idx++];
 	for(unsigned int k = 0; k < resid; k++) {
@@ -193,7 +186,6 @@ qtgui_time_sink_c::general_work (int noutput_items,
       j += datasize;
     }   
   }
-  
-  consume_each(j);
-  return j;
+
+  return noutput_items;
 }
diff --git a/gr-qtgui/lib/qtgui_time_sink_f.cc b/gr-qtgui/lib/qtgui_time_sink_f.cc
index 58cc7a38a..2fe99f43c 100644
--- a/gr-qtgui/lib/qtgui_time_sink_f.cc
+++ b/gr-qtgui/lib/qtgui_time_sink_f.cc
@@ -44,9 +44,9 @@ qtgui_time_sink_f::qtgui_time_sink_f (int size, double bw,
 				      const std::string &name,
 				      int nconnections,
 				      QWidget *parent)
-  : gr_block ("time_sink_f",
-	      gr_make_io_signature (nconnections, nconnections, sizeof(float)),
-	      gr_make_io_signature (0, 0, 0)),
+  : gr_sync_block ("time_sink_f",
+		   gr_make_io_signature (nconnections, nconnections, sizeof(float)),
+		   gr_make_io_signature (0, 0, 0)),
     d_size(size), d_bandwidth(bw), d_name(name),
     d_nconnections(nconnections), d_parent(parent)
 {
@@ -59,6 +59,7 @@ qtgui_time_sink_f::qtgui_time_sink_f (int size, double bw,
   }
 
   initialize();
+  set_output_multiple(d_size);
 }
 
 qtgui_time_sink_f::~qtgui_time_sink_f()
@@ -70,15 +71,6 @@ qtgui_time_sink_f::~qtgui_time_sink_f()
 }
 
 void
-qtgui_time_sink_f::forecast(int noutput_items, gr_vector_int &ninput_items_required)
-{
-  unsigned int ninputs = ninput_items_required.size();
-  for (unsigned int i = 0; i < ninputs; i++) {
-    ninput_items_required[i] = std::min(d_size, 8191);
-  }
-}
-
-void
 qtgui_time_sink_f::initialize()
 {
   if(qApp != NULL) {
@@ -144,10 +136,9 @@ qtgui_time_sink_f::set_color(int which, const std::string &color)
 }
 
 int
-qtgui_time_sink_f::general_work (int noutput_items,
-				 gr_vector_int &ninput_items,
-				 gr_vector_const_void_star &input_items,
-				 gr_vector_void_star &output_items)
+qtgui_time_sink_f::work (int noutput_items,
+			 gr_vector_const_void_star &input_items,
+			 gr_vector_void_star &output_items)
 {
   int n=0, j=0, idx=0;
   const float *in = (const float*)input_items[idx];
@@ -180,7 +171,9 @@ qtgui_time_sink_f::general_work (int noutput_items,
       j += resid;
     }
     // Otherwise, copy what we received into the residbufs for next time
+    // because we set the output_multiple, this should never need to be called
     else {
+      assert(0);
       for(n = 0; n < d_nconnections; n++) {
 	in = (const float*)input_items[idx++];
 	for(unsigned int k = 0; k < resid; k++) {
@@ -192,6 +185,5 @@ qtgui_time_sink_f::general_work (int noutput_items,
     }
   }
   
-  consume_each(j);
-  return j;
+  return noutput_items;
 }
diff --git a/gr-qtgui/python/CMakeLists.txt b/gr-qtgui/python/CMakeLists.txt
new file mode 100644
index 000000000..e61b54f08
--- /dev/null
+++ b/gr-qtgui/python/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Copyright 2010-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.
+
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    FILES __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui
+    COMPONENT "qtgui_python"
+)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-qtgui/python
+        ${CMAKE_BINARY_DIR}/gr-qtgui/swig
+    )
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-qtgui)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gr-qtgui/python/__init__.py b/gr-qtgui/python/__init__.py
index db113bbd3..236f211b1 100644
--- a/gr-qtgui/python/__init__.py
+++ b/gr-qtgui/python/__init__.py
@@ -19,6 +19,11 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+'''
+This is the gr-qtgui package. This package includes QT-based graphical
+sinks.
+'''
+
 # The presence of this file turns this directory into a Python package
 
 from qtgui_swig import *
diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
new file mode 100644
index 000000000..34b40fb7e
--- /dev/null
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -0,0 +1,50 @@
+# Copyright 2010-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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GR_QTGUI_INCLUDE_DIRS}
+    ${QWT_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_LIBRARIES gnuradio-qtgui)
+
+GR_SWIG_MAKE(qtgui_swig qtgui_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS qtgui_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui
+    COMPONENT "qtgui_python"
+)
+
+install(FILES
+    qtgui_swig.i
+    qtgui_sink_c.i
+    qtgui_sink_f.i
+    qtgui_time_sink_c.i
+    qtgui_time_sink_f.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "qtgui_swig"
+)
diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am
index 1d8319987..ad6f49e00 100644
--- a/gr-qtgui/swig/Makefile.am
+++ b/gr-qtgui/swig/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
 	$(STD_DEFINES_AND_INCLUDES) \
 	$(PYTHON_CPPFLAGS) \
 	$(QT_INCLUDES) \
+	$(GR_QTGUI_INCLUDES) \
 	$(WITH_INCLUDES)
 
 ##############################
diff --git a/gr-qtgui/swig/Makefile.swig.gen b/gr-qtgui/swig/Makefile.swig.gen
index 3659601c3..e343db374 100644
--- a/gr-qtgui/swig/Makefile.swig.gen
+++ b/gr-qtgui/swig/Makefile.swig.gen
@@ -105,7 +105,7 @@ _qtgui_swig_la_CXXFLAGS =			\
 	$(qtgui_swig_la_swig_cxxflags)
 
 python/qtgui_swig.cc: qtgui_swig.py
-qtgui_swig.py: qtgui_swig.i
+qtgui_swig.py: qtgui_swig.i 
 
 # Include the python dependencies for this file
 -include python/qtgui_swig.d
diff --git a/gr-qtgui/swig/qtgui_sink_f.i b/gr-qtgui/swig/qtgui_sink_f.i
index c5eb656b9..a34420461 100644
--- a/gr-qtgui/swig/qtgui_sink_f.i
+++ b/gr-qtgui/swig/qtgui_sink_f.i
@@ -32,7 +32,7 @@ qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype,
 				     double fc=0, double bw=0.0,
 				     const std::string &name="Display",
 				     bool plotfreq=true, bool plotwaterfall=true,
-				     bool plottime=true, bool plotconst=true,
+				     bool plottime=true, bool plotconst=false,
 				     QWidget *parent=NULL);
 
 class qtgui_sink_f : public gr_block
diff --git a/gr-qtgui/swig/qtgui_time_sink_c.i b/gr-qtgui/swig/qtgui_time_sink_c.i
index 8f5c9f4f0..e7240aa69 100644
--- a/gr-qtgui/swig/qtgui_time_sink_c.i
+++ b/gr-qtgui/swig/qtgui_time_sink_c.i
@@ -33,7 +33,7 @@ qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw,
 					      int nconnections=1,
 					      QWidget *parent=NULL);
 
-class qtgui_time_sink_c : public gr_block
+class qtgui_time_sink_c : public gr_sync_block
 {
 private:
   friend qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw,
diff --git a/gr-qtgui/swig/qtgui_time_sink_f.i b/gr-qtgui/swig/qtgui_time_sink_f.i
index b92efe7be..06af42da3 100644
--- a/gr-qtgui/swig/qtgui_time_sink_f.i
+++ b/gr-qtgui/swig/qtgui_time_sink_f.i
@@ -33,7 +33,7 @@ qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw,
 					      int nconnections=1,
 					      QWidget *parent=NULL);
 
-class qtgui_time_sink_f : public gr_block
+class qtgui_time_sink_f : public gr_sync_block
 {
 private:
   friend qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw,
diff --git a/gr-radar-mono/README b/gr-radar-mono/README
deleted file mode 100644
index 577c8e095..000000000
--- a/gr-radar-mono/README
+++ /dev/null
@@ -1,67 +0,0 @@
-This GNU Radio component implements a monostatic radar transmitter
-and receiver.  It uses a custom FPGA build to generate a linear 
-FM chirp waveform directly in the USRP. Echo returns are recorded 
-to a file for offline analysis.
-
-The LFM chirp can be up to 32 MHz in width, whose center frequency
-is set by which transmit daughter board is installed.  This gives
-a range resolution of approximately 5 meters.
-
-The script to run is placed in $prefix/bin:
-
-Usage: usrp_radar_mono.py [options]
-
-Options:
-  -h, --help            show this help message and exit
-  -T TX_SUBDEV_SPEC, --tx-subdev-spec=TX_SUBDEV_SPEC
-                        use transmitter board side A or B (default is first
-                        found)
-  -R RX_SUBDEV_SPEC, --rx-subdev-spec=RX_SUBDEV_SPEC
-                        use receiver board side A or B (default is first
-                        found)
-  -g GAIN, --gain=GAIN  set gain in dB (default is midpoint)
-  -f FREQ, --frequency=FREQ
-                        set transmitter center frequency to FREQ in Hz,
-                        default is 0.0
-  -w FREQ, --chirp-width=FREQ
-                        set LFM chirp bandwidth in Hz, default is 32M
-  -a AMPLITUDE, --amplitude=AMPLITUDE
-                        set waveform amplitude in % full scale, default is 15,
-  --ton=TON             set pulse on period in seconds, default is 5e-06,
-  --tsw=TSW             set transmitter switching period in seconds, default
-                        is 4.0625e-07,
-  --tlook=TLOOK         set receiver look time in seconds, default is 5e-06,
-  --prf=PRF             set pulse repetition frequency in Hz, default is
-                        10000.0,
-  -v, --verbose         enable verbose output, default is disabled
-  -D, --debug           enable debugging output, default is disabled
-  -F FILENAME, --filename=FILENAME
-                        log received echos to file
-
-The transmitter creates an LFM chirp, evenly centered on the supplied frequency.
-The four timing parameters are:
-
-ton	Chirp on time in seconds.  
-
-tsw     Transmitter switching time in seconds.  This the delay after the chirp
-        is transmitted before the receiver is enabled. These two (tsw and ton)
-        parameters determine the minimum range of the radar.
-
-tlook   The the amount of time in seconds the receiver is enabled to record
-        echo responses ("look" time). This parameter determines the maximum
-        radar range that can be measured, though transmitter power will also
-        limit return strength and practical range.
-
-prf     Pulse repetition frequency in Hz.  This establishes to overall pulse
-        repetition period, which results in idle time between when the receiver
-        is turned off and the next transmitted chirp begins.
-
-The transmitter is completed.  The receive path is logging echo data to a supplied
-file; however, no meta-data is logged.
-
-This is experimental code.
-
-Johnathan Corgan
-Corgan Enterprises LLC
-jcorgan@corganenterprises.com
-9/17/2007
diff --git a/gr-radar-mono/doc/.gitignore b/gr-radar-mono/doc/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-radar-mono/doc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-radar-mono/doc/registers.ods b/gr-radar-mono/doc/registers.ods
deleted file mode 100644
index 7bafe2c58..000000000
--- a/gr-radar-mono/doc/registers.ods
+++ /dev/null
diff --git a/gr-radar-mono/src/.gitignore b/gr-radar-mono/src/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-radar-mono/src/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-radar-mono/src/fpga/lib/.gitignore b/gr-radar-mono/src/fpga/lib/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-radar-mono/src/fpga/lib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-radar-mono/src/fpga/lib/Makefile.am b/gr-radar-mono/src/fpga/lib/Makefile.am
deleted file mode 100644
index e97ff1b6a..000000000
--- a/gr-radar-mono/src/fpga/lib/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright 2007,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += 			\
-		radar.v		\
-		radar_config.vh \
-		radar_control.v \
-		radar_tx.v	\
-		radar_rx.v	\
-		dac_interface.v	\
-		fifo32_2k.v	\
-		cordic_nco.v
-
-MOSTLYCLEANFILES += *.bak
diff --git a/gr-radar-mono/src/fpga/lib/cordic_nco.v b/gr-radar-mono/src/fpga/lib/cordic_nco.v
deleted file mode 100644
index b9858baf8..000000000
--- a/gr-radar-mono/src/fpga/lib/cordic_nco.v
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-module cordic_nco(clk_i,rst_i,ena_i,strobe_i,ampl_i,freq_i,phs_i,data_i_o,data_q_o);
-   input clk_i;
-   input rst_i;
-   input ena_i;
-   input strobe_i;
-
-   input [15:0] ampl_i;
-   input [31:0] freq_i;
-   input [31:0] phs_i;
-
-   output [15:0] data_i_o;
-   output [15:0] data_q_o;
-
-   reg [31:0] phase_reg;
-   wire [31:0] phase = phase_reg + phs_i;
-   wire [15:0] ampl;
-   
-   always @(posedge clk_i)
-     begin
-	if (rst_i | ~ena_i)
-	  phase_reg <= 32'b0;
-	else if (strobe_i)
-	  phase_reg <= phase_reg + freq_i;
-     end
-
-   assign ampl = ena_i ? ampl_i : 16'b0;
-
-   cordic tx_cordic
-     (.clock(clk_i),.reset(rst_i),.enable(strobe_i), 
-       .xi(ampl),.yi(16'b0),.zi(phase[31:16]),
-       .xo(data_i_o),.yo(data_q_o),.zo());
-	  
-endmodule // cordic_nco
diff --git a/gr-radar-mono/src/fpga/lib/dac_interface.v b/gr-radar-mono/src/fpga/lib/dac_interface.v
deleted file mode 100644
index 209aebd96..000000000
--- a/gr-radar-mono/src/fpga/lib/dac_interface.v
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- verilog -*-

-//

-//  USRP - Universal Software Radio Peripheral

-//

-//  Copyright (C) 2007 Corgan Enterprises LLC

-//

-//  This program 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 2 of the License, or

-//  (at your option) any later version.

-//

-//  This program 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 this program; if not, write to the Free Software

-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA

-//

-

-`include "../top/config.vh"

-

-module dac_interface(clk_i,rst_i,ena_i,strobe_i,tx_i_i,tx_q_i,tx_data_o,tx_sync_o);

-   input clk_i;

-   input rst_i;

-   input ena_i;

-   input strobe_i;

-   

-   input [13:0] tx_i_i;

-   input [13:0] tx_q_i;

-

-   output [13:0] tx_data_o;

-   output 	 tx_sync_o;

-

-`ifdef TX_RATE_MAX

-   wire clk128;

-   reg clk64_d;

-   reg [13:0] tx_data_o;

-   

-   // Create a 128 MHz clock

-   dacpll pll128(.areset(rst_i),.inclk0(clk_i),.c0(clk128));

-

-   // Register the clk64 clock in the clk128 domain

-   always @(posedge clk128)

-     clk64_d <= clk_i;

-

-   // Register the tx data in the clk128 domain

-   always @(posedge clk128)

-     tx_data_o <= clk64_d ? tx_i_i : tx_q_i;

-

-   assign tx_sync_o = clk64_d;

-   

-

-`else // !`ifdef TX_RATE_MAX

-   assign tx_data_o = strobe_i ? tx_i_i : tx_q_i;

-   assign tx_sync_o = strobe_i;

-`endif // !`ifdef TX_RATE_MAX

-   

-endmodule // dac_interface

diff --git a/gr-radar-mono/src/fpga/lib/fifo32_2k.v b/gr-radar-mono/src/fpga/lib/fifo32_2k.v
deleted file mode 100755
index c045b70e7..000000000
--- a/gr-radar-mono/src/fpga/lib/fifo32_2k.v
+++ /dev/null
@@ -1,161 +0,0 @@
-// megafunction wizard: %FIFO%

-// GENERATION: STANDARD

-// VERSION: WM1.0

-// MODULE: scfifo 

-

-// ============================================================

-// File Name: fifo32_2k.v

-// Megafunction Name(s):

-// 			scfifo

-//

-// Simulation Library Files(s):

-// 			altera_mf

-// ============================================================

-// ************************************************************

-// THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!

-//

-// 7.1 Build 178 06/25/2007 SP 1 SJ Web Edition

-// ************************************************************

-

-

-//Copyright (C) 1991-2007 Altera Corporation

-//Your use of Altera Corporation's design tools, logic functions 

-//and other software and tools, and its AMPP partner logic 

-//functions, and any output files from any of the foregoing 

-//(including device programming or simulation files), and any 

-//associated documentation or information are expressly subject 

-//to the terms and conditions of the Altera Program License 

-//Subscription Agreement, Altera MegaCore Function License 

-//Agreement, or other applicable license agreement, including, 

-//without limitation, that your use is for the sole purpose of 

-//programming logic devices manufactured by Altera and sold by 

-//Altera or its authorized distributors.  Please refer to the 

-//applicable agreement for further details.

-

-

-// synopsys translate_off

-`timescale 1 ps / 1 ps

-// synopsys translate_on

-module fifo32_2k (

-	clock,

-	data,

-	rdreq,

-	sclr,

-	wrreq,

-	empty,

-	q);

-

-	input	  clock;

-	input	[31:0]  data;

-	input	  rdreq;

-	input	  sclr;

-	input	  wrreq;

-	output	  empty;

-	output	[31:0]  q;

-

-	wire  sub_wire0;

-	wire [31:0] sub_wire1;

-	wire  empty = sub_wire0;

-	wire [31:0] q = sub_wire1[31:0];

-

-	scfifo	scfifo_component (

-				.rdreq (rdreq),

-				.sclr (sclr),

-				.clock (clock),

-				.wrreq (wrreq),

-				.data (data),

-				.empty (sub_wire0),

-				.q (sub_wire1)

-				// synopsys translate_off

-				,

-				.aclr (),

-				.almost_empty (),

-				.almost_full (),

-				.full (),

-				.usedw ()

-				// synopsys translate_on

-				);

-	defparam

-		scfifo_component.add_ram_output_register = "OFF",

-		scfifo_component.intended_device_family = "Cyclone",

-		scfifo_component.lpm_numwords = 2048,

-		scfifo_component.lpm_showahead = "OFF",

-		scfifo_component.lpm_type = "scfifo",

-		scfifo_component.lpm_width = 32,

-		scfifo_component.lpm_widthu = 11,

-		scfifo_component.overflow_checking = "OFF",

-		scfifo_component.underflow_checking = "OFF",

-		scfifo_component.use_eab = "ON";

-

-

-endmodule

-

-// ============================================================

-// CNX file retrieval info

-// ============================================================

-// Retrieval info: PRIVATE: AlmostEmpty NUMERIC "0"

-// Retrieval info: PRIVATE: AlmostEmptyThr NUMERIC "-1"

-// Retrieval info: PRIVATE: AlmostFull NUMERIC "0"

-// Retrieval info: PRIVATE: AlmostFullThr NUMERIC "-1"

-// Retrieval info: PRIVATE: CLOCKS_ARE_SYNCHRONIZED NUMERIC "0"

-// Retrieval info: PRIVATE: Clock NUMERIC "0"

-// Retrieval info: PRIVATE: Depth NUMERIC "2048"

-// Retrieval info: PRIVATE: Empty NUMERIC "1"

-// Retrieval info: PRIVATE: Full NUMERIC "0"

-// Retrieval info: PRIVATE: INTENDED_DEVICE_FAMILY STRING "Cyclone"

-// Retrieval info: PRIVATE: LE_BasedFIFO NUMERIC "0"

-// Retrieval info: PRIVATE: LegacyRREQ NUMERIC "1"

-// Retrieval info: PRIVATE: MAX_DEPTH_BY_9 NUMERIC "0"

-// Retrieval info: PRIVATE: OVERFLOW_CHECKING NUMERIC "1"

-// Retrieval info: PRIVATE: Optimize NUMERIC "2"

-// Retrieval info: PRIVATE: RAM_BLOCK_TYPE NUMERIC "0"

-// Retrieval info: PRIVATE: SYNTH_WRAPPER_GEN_POSTFIX STRING "0"

-// Retrieval info: PRIVATE: UNDERFLOW_CHECKING NUMERIC "1"

-// Retrieval info: PRIVATE: UsedW NUMERIC "0"

-// Retrieval info: PRIVATE: Width NUMERIC "32"

-// Retrieval info: PRIVATE: dc_aclr NUMERIC "0"

-// Retrieval info: PRIVATE: diff_widths NUMERIC "0"

-// Retrieval info: PRIVATE: msb_usedw NUMERIC "0"

-// Retrieval info: PRIVATE: output_width NUMERIC "32"

-// Retrieval info: PRIVATE: rsEmpty NUMERIC "1"

-// Retrieval info: PRIVATE: rsFull NUMERIC "0"

-// Retrieval info: PRIVATE: rsUsedW NUMERIC "0"

-// Retrieval info: PRIVATE: sc_aclr NUMERIC "0"

-// Retrieval info: PRIVATE: sc_sclr NUMERIC "1"

-// Retrieval info: PRIVATE: wsEmpty NUMERIC "0"

-// Retrieval info: PRIVATE: wsFull NUMERIC "1"

-// Retrieval info: PRIVATE: wsUsedW NUMERIC "0"

-// Retrieval info: CONSTANT: ADD_RAM_OUTPUT_REGISTER STRING "OFF"

-// Retrieval info: CONSTANT: INTENDED_DEVICE_FAMILY STRING "Cyclone"

-// Retrieval info: CONSTANT: LPM_NUMWORDS NUMERIC "2048"

-// Retrieval info: CONSTANT: LPM_SHOWAHEAD STRING "OFF"

-// Retrieval info: CONSTANT: LPM_TYPE STRING "scfifo"

-// Retrieval info: CONSTANT: LPM_WIDTH NUMERIC "32"

-// Retrieval info: CONSTANT: LPM_WIDTHU NUMERIC "11"

-// Retrieval info: CONSTANT: OVERFLOW_CHECKING STRING "OFF"

-// Retrieval info: CONSTANT: UNDERFLOW_CHECKING STRING "OFF"

-// Retrieval info: CONSTANT: USE_EAB STRING "ON"

-// Retrieval info: USED_PORT: clock 0 0 0 0 INPUT NODEFVAL clock

-// Retrieval info: USED_PORT: data 0 0 32 0 INPUT NODEFVAL data[31..0]

-// Retrieval info: USED_PORT: empty 0 0 0 0 OUTPUT NODEFVAL empty

-// Retrieval info: USED_PORT: q 0 0 32 0 OUTPUT NODEFVAL q[31..0]

-// Retrieval info: USED_PORT: rdreq 0 0 0 0 INPUT NODEFVAL rdreq

-// Retrieval info: USED_PORT: sclr 0 0 0 0 INPUT NODEFVAL sclr

-// Retrieval info: USED_PORT: wrreq 0 0 0 0 INPUT NODEFVAL wrreq

-// Retrieval info: CONNECT: @data 0 0 32 0 data 0 0 32 0

-// Retrieval info: CONNECT: q 0 0 32 0 @q 0 0 32 0

-// Retrieval info: CONNECT: @wrreq 0 0 0 0 wrreq 0 0 0 0

-// Retrieval info: CONNECT: @rdreq 0 0 0 0 rdreq 0 0 0 0

-// Retrieval info: CONNECT: @clock 0 0 0 0 clock 0 0 0 0

-// Retrieval info: CONNECT: empty 0 0 0 0 @empty 0 0 0 0

-// Retrieval info: CONNECT: @sclr 0 0 0 0 sclr 0 0 0 0

-// Retrieval info: LIBRARY: altera_mf altera_mf.altera_mf_components.all

-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo32_2k.v TRUE

-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo32_2k.inc FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo32_2k.cmp FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo32_2k.bsf FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo32_2k_inst.v FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo32_2k_bb.v FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo32_2k_waveforms.html FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL fifo32_2k_wave*.jpg FALSE

-// Retrieval info: LIB_FILE: altera_mf

diff --git a/gr-radar-mono/src/fpga/lib/radar.v b/gr-radar-mono/src/fpga/lib/radar.v
deleted file mode 100644
index 1023d2f25..000000000
--- a/gr-radar-mono/src/fpga/lib/radar.v
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`include "../lib/radar_config.vh"
-
-module radar(clk_i,saddr_i,sdata_i,s_strobe_i,
-	     tx_side_o,tx_strobe_o,tx_dac_i_o,tx_dac_q_o,
-	     rx_adc_i_i,rx_adc_q_i,
-	     rx_strobe_o,rx_ech_i_o,rx_ech_q_o,io_tx_ena_o);
-   
-   // System interface
-   input         clk_i;		// Master clock @ 64 MHz
-   input  [6:0]  saddr_i;	// Configuration bus address
-   input  [31:0] sdata_i;	// Configuration bus data
-   input 	 s_strobe_i;    // Configuration bus write
-   
-   // Transmit subsystem
-   output        tx_side_o;     // Transmitter slot
-   output        tx_strobe_o;	// Generate an transmitter output sample
-   output [13:0] tx_dac_i_o;	// I channel transmitter output to DAC
-   output [13:0] tx_dac_q_o;    // Q channel transmitter output to DAC
-   output        io_tx_ena_o;   // Transmit/Receive switching
-      
-   // Receive subsystem
-   input  [15:0] rx_adc_i_i;	// I channel input from ADC
-   input  [15:0] rx_adc_q_i;	// Q channel input from ADC
-   output 	 rx_strobe_o;	// Indicates output samples ready for Rx FIFO
-   output [15:0] rx_ech_i_o;	// I channel processed echos to Rx FIFO
-   output [15:0] rx_ech_q_o;	// Q channel processed echos to Rx FIFO
-
-   // Application control
-   wire          reset;		// Master application reset
-   wire          tx_side;	// Transmitter slot
-   wire          debug_enabled; // Enable debugging mode; 	 
-   wire 	 tx_enable;     // Transmitter enable
-   wire 	 rx_enable;     // Receiver enable
-   wire          tx_ctrl;       // Transmitter on control
-   wire          rx_ctrl;       // Receiver on control
-   wire [15:0] 	 pulse_num;     // Count of pulses since tx_enabled
- 	 
-   // Configuration
-   wire [15:0] 	 ampl;		// Pulse amplitude
-   wire [31:0] 	 fstart;	// Chirp start frequency
-   wire [31:0] 	 fincr;         // Chirp per strobe frequency increment
-
-   radar_control controller
-     (.clk_i(clk_i),.saddr_i(saddr_i),.sdata_i(sdata_i),.s_strobe_i(s_strobe_i),
-      .reset_o(reset),.tx_side_o(tx_side_o),.dbg_o(debug_enabled),
-      .tx_strobe_o(tx_strobe_o),.tx_ctrl_o(tx_ctrl),.rx_ctrl_o(rx_ctrl),
-      .ampl_o(ampl),.fstart_o(fstart),.fincr_o(fincr),.pulse_num_o(pulse_num),
-      .io_tx_ena_o(io_tx_ena_o));
-
-   radar_tx transmitter
-     ( .clk_i(clk_i),.rst_i(reset),.ena_i(tx_ctrl),.strobe_i(tx_strobe_o),
-       .ampl_i(ampl),.fstart_i(fstart),.fincr_i(fincr),
-       .tx_i_o(tx_dac_i_o),.tx_q_o(tx_dac_q_o) );
-   
-   radar_rx receiver
-     ( .clk_i(clk_i),.rst_i(reset),.ena_i(rx_ctrl),.dbg_i(debug_enabled),
-       .pulse_num_i(pulse_num),.rx_in_i_i(rx_adc_i_i),.rx_in_q_i(rx_adc_q_i),
-       .rx_strobe_o(rx_strobe_o),.rx_i_o(rx_ech_i_o),.rx_q_o(rx_ech_q_o) );
-   
-endmodule // radar
diff --git a/gr-radar-mono/src/fpga/lib/radar_config.vh b/gr-radar-mono/src/fpga/lib/radar_config.vh
deleted file mode 100644
index 89a336735..000000000
--- a/gr-radar-mono/src/fpga/lib/radar_config.vh
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`include "../../../../usrp/firmware/include/fpga_regs_common.v"
-`include "../../../../usrp/firmware/include/fpga_regs_standard.v"
-
-`define FR_RADAR_MODE           `FR_USER_0
-`define bmFR_RADAR_MODE_RESET	32'b1 << 0
-`define bmFR_RADAR_TXSIDE       32'b1 << 1
-`define bmFR_RADAR_LOOP         32'b1 << 2
-`define bmFR_RADAR_META         32'b1 << 3
-`define bmFR_RADAR_DERAMP       32'b1 << 4
-`define bmFR_RADAR_CHIRPS       32'b11 << 5
-`define bmFR_RADAR_DEBUG        32'b1 << 7
-
-`define FR_RADAR_TON            `FR_USER_1
-`define FR_RADAR_TSW            `FR_USER_2
-`define FR_RADAR_TLOOK          `FR_USER_3
-`define FR_RADAR_TIDLE          `FR_USER_4
-`define FR_RADAR_AMPL           `FR_USER_5
-`define FR_RADAR_FSTART         `FR_USER_6
-`define FR_RADAR_FINCR          `FR_USER_7
-`define FR_RADAR_ATRDEL         `FR_USER_8
diff --git a/gr-radar-mono/src/fpga/lib/radar_control.v b/gr-radar-mono/src/fpga/lib/radar_control.v
deleted file mode 100644
index 05b78198d..000000000
--- a/gr-radar-mono/src/fpga/lib/radar_control.v
+++ /dev/null
@@ -1,166 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`include "../lib/radar_config.vh"
-
-module radar_control(clk_i,saddr_i,sdata_i,s_strobe_i,reset_o,
-		     tx_side_o,dbg_o,tx_strobe_o,tx_ctrl_o,rx_ctrl_o,
-		     ampl_o,fstart_o,fincr_o,pulse_num_o,io_tx_ena_o);
-   
-   // System interface
-   input         clk_i;		// Master clock @ 64 MHz
-   input  [6:0]  saddr_i;	// Configuration bus address
-   input  [31:0] sdata_i;	// Configuration bus data
-   input 	 s_strobe_i;    // Configuration bus write
-
-   // Control and configuration outputs
-   output 	 reset_o;
-   output        tx_side_o;
-   output        dbg_o;
-   output        tx_strobe_o;
-   output        tx_ctrl_o;
-   output        rx_ctrl_o;
-   output [15:0] ampl_o;
-   output [31:0] fstart_o;
-   output [31:0] fincr_o;
-   output [15:0] pulse_num_o;
-   output        io_tx_ena_o;
-   
-   // Internal configuration
-   wire 	 lp_ena;
-   wire 	 md_ena;
-   wire 	 dr_ena;
-   wire   [1:0]  chirps;
-   wire   [15:0] t_on;
-   wire   [15:0] t_sw;
-   wire   [15:0] t_look;
-   wire   [31:0] t_idle;
-   wire   [31:0] atrdel;
-   
-   // Configuration from host
-   wire [31:0] 	 mode;
-   setting_reg #(`FR_RADAR_MODE)   sr_mode(.clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-					   .out(mode));
-   assign reset_o   = mode[0];
-   assign tx_side_o = mode[1];
-   assign lp_ena    = mode[2];
-   assign md_ena    = mode[3];
-   assign dr_ena    = mode[4];
-   assign chirps    = mode[6:5];
-   assign dbg_o     = mode[7];
-   
-   setting_reg #(`FR_RADAR_TON)    sr_ton(.clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-					  .out(t_on));
-   
-   setting_reg #(`FR_RADAR_TSW)    sr_tsw(.clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-					  .out(t_sw));
-   				     
-   setting_reg #(`FR_RADAR_TLOOK)  sr_tlook(.clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-					    .out(t_look));
-   				     
-   setting_reg #(`FR_RADAR_TIDLE)  sr_tidle(.clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-					    .out(t_idle));
-   				     
-   setting_reg #(`FR_RADAR_AMPL)   sr_ampl(.clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-					   .out(ampl_o));
-
-   setting_reg #(`FR_RADAR_FSTART) sr_fstart(.clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-					     .out(fstart_o));
-
-   setting_reg #(`FR_RADAR_FINCR)  sr_fincr(.clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-					    .out(fincr_o));
-
-   setting_reg #(`FR_RADAR_ATRDEL)  sr_atrdel(.clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-					    .out(atrdel));
-   
-   // Pulse state machine
-   `define ST_ON   4'b0001
-   `define ST_SW   4'b0010
-   `define ST_LOOK 4'b0100
-   `define ST_IDLE 4'b1000
-
-   reg [3:0]  state;
-   reg [31:0] count;
-   reg [15:0] pulse_num_o;
-   
-   always @(posedge clk_i)
-     if (reset_o)
-       begin
-	  state <= `ST_ON;
-	  count <= 32'b0;
-	  pulse_num_o <= 16'b0;
-       end
-     else
-       case (state)
-	 `ST_ON:
-	   if (count == {16'b0,t_on})
-	     begin
-	        state <= `ST_SW;
-	        count <= 32'b0;
-		pulse_num_o <= pulse_num_o + 16'b1;
-	     end
-	   else
-	     count <= count + 32'b1;
-	 
-	 `ST_SW:
-	   if (count == {16'b0,t_sw})
-	     begin
-		state <= `ST_LOOK;
-		count <= 32'b0;
-	     end
-	   else
-	     count <= count + 32'b1;
-
-	 `ST_LOOK:
-	   if (count == {16'b0,t_look})
-	     begin
-		state <= `ST_IDLE;
-		count <= 32'b0;
-	     end
-	   else
-	     count <= count + 32'b1;
-
-	 `ST_IDLE:
-	   if (count == t_idle)
-	     begin
-		state <= `ST_ON;
-		count <= 32'b0;
-	     end
-	   else
-	     count <= count + 32'b1;
-
-	 default:		  // Invalid state, reset state machine
-	   begin
-	      state <= `ST_ON;
-	      count <= 32'b0;
-	   end
-       endcase
-   
-   assign tx_strobe_o = count[0]; // Drive DAC inputs at 32 MHz
-   assign tx_ctrl_o = (state == `ST_ON);
-   assign rx_ctrl_o = (state == `ST_LOOK);
-
-   // Create delayed version of tx_ctrl_o to drive mixers and TX/RX switch
-   atr_delay atr_delay(.clk_i(clk_i),.rst_i(reset_o),.ena_i(1'b1),.tx_empty_i(!tx_ctrl_o),
-		       .tx_delay_i(atrdel[27:16]),.rx_delay_i(atrdel[11:0]),
-		       .atr_tx_o(io_tx_ena_o));
-   
-endmodule // radar_control
diff --git a/gr-radar-mono/src/fpga/lib/radar_rx.v b/gr-radar-mono/src/fpga/lib/radar_rx.v
deleted file mode 100644
index 4b0b83c49..000000000
--- a/gr-radar-mono/src/fpga/lib/radar_rx.v
+++ /dev/null
@@ -1,109 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`include "../../../../usrp/firmware/include/fpga_regs_common.v"
-`include "../../../../usrp/firmware/include/fpga_regs_standard.v"
-
-module radar_rx(clk_i,rst_i,ena_i,dbg_i,pulse_num_i,rx_in_i_i,
-		rx_in_q_i,rx_i_o,rx_q_o,rx_strobe_o);
-   
-   input clk_i;
-   input rst_i;
-   input ena_i;
-   input dbg_i;
-   
-   input [15:0] rx_in_i_i;
-   input [15:0] rx_in_q_i;
-   input [15:0] pulse_num_i;
-   
-   output [15:0] rx_i_o;
-   output [15:0] rx_q_o;
-   output reg    rx_strobe_o;
-   
-   reg [15:0] count;
-
-   always @(posedge clk_i)
-     if (rst_i | ~ena_i)
-       count <= 16'b0;
-     else
-       count <= count + 16'b1;
-
-   wire [31:0] fifo_inp = dbg_i ? {count[15:0],pulse_num_i[15:0]} : {rx_in_i_i,rx_in_q_i};
-
-   // Buffer incoming samples every clock
-   wire [31:0] fifo_out;
-   reg         fifo_ack;
-   wire        fifo_empty;
-
-// Use model if simulating, otherwise Altera Megacell
-`ifdef SIMULATION
-   fifo_1clk #(32, 2048) buffer(.clock(clk_i),.sclr(rst_i),
-				.data(fifo_inp),.wrreq(ena_i),
-				.rdreq(fifo_ack),.q(fifo_out),
-				.empty(fifo_empty));
-`else
-   fifo32_2k buffer(.clock(clk_i),.sclr(rst_i),
-		    .data(fifo_inp),.wrreq(ena_i),
-		    .rdreq(fifo_ack),.q(fifo_out),
-		    .empty(fifo_empty));
-`endif
-   
-   // Write samples to rx_fifo every third clock
-   `define ST_FIFO_IDLE   3'b001
-   `define ST_FIFO_STROBE 3'b010
-   `define ST_FIFO_ACK    3'b100
-
-   reg [2:0]   state;
-
-   always @(posedge clk_i)
-     if (rst_i)
-       begin
-	  state <= `ST_FIFO_IDLE;
-	  rx_strobe_o <= 1'b0;
-	  fifo_ack <= 1'b0;
-       end
-     else
-       case (state)
-	 `ST_FIFO_IDLE:
-	   if (!fifo_empty)
-	     begin
-		// Tell rx_fifo sample is ready
-		rx_strobe_o <= 1'b1;
-		state <= `ST_FIFO_STROBE;
-	     end
-	 `ST_FIFO_STROBE:
-	   begin
-	      rx_strobe_o <= 1'b0;
-	      // Ack our FIFO
-	      fifo_ack <= 1'b1;
-	      state <= `ST_FIFO_ACK;
-	   end
-	 `ST_FIFO_ACK:
-	   begin
-	      fifo_ack <= 1'b0;
-	      state <= `ST_FIFO_IDLE;
-	   end
-       endcase // case(state)
-
-   assign rx_i_o = fifo_out[31:16];
-   assign rx_q_o = fifo_out[15:0];
-   
-endmodule // radar_rx
diff --git a/gr-radar-mono/src/fpga/lib/radar_tx.v b/gr-radar-mono/src/fpga/lib/radar_tx.v
deleted file mode 100644
index c20dd0c1a..000000000
--- a/gr-radar-mono/src/fpga/lib/radar_tx.v
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-module radar_tx(clk_i,rst_i,ena_i,strobe_i,
-		ampl_i,fstart_i,fincr_i,
-		tx_i_o,tx_q_o);
-
-   // System control
-   input clk_i;
-   input rst_i;
-   input ena_i;
-   input strobe_i;
-   
-   // Configuration
-   input [15:0]  ampl_i;
-   input [31:0]  fstart_i;
-   input [31:0]  fincr_i;
-   
-   // Chirp output
-   output [13:0] tx_i_o;
-   output [13:0] tx_q_o;
-   wire   [15:0] cordic_i, cordic_q;
-
-   // Chirp generator
-   reg [31:0] freq;
-
-   always @(posedge clk_i)
-     if (rst_i | ~ena_i)
-       freq <= fstart_i;
-     else
-       if (strobe_i)
-	 freq <= freq + fincr_i;
-   
-   cordic_nco nco(.clk_i(clk_i),.rst_i(rst_i),.ena_i(ena_i),.strobe_i(strobe_i),
-		  .ampl_i(ampl_i),.freq_i(freq),.phs_i(0),
-		  .data_i_o(cordic_i),.data_q_o(cordic_q));
-
-   assign tx_i_o = cordic_i[13:0];
-   assign tx_q_o = cordic_q[13:0];
-	  
-endmodule // radar_tx
diff --git a/gr-radar-mono/src/fpga/models/.gitignore b/gr-radar-mono/src/fpga/models/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-radar-mono/src/fpga/models/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-radar-mono/src/fpga/models/Makefile.am b/gr-radar-mono/src/fpga/models/Makefile.am
deleted file mode 100644
index 8a1a09597..000000000
--- a/gr-radar-mono/src/fpga/models/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright 2007,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += \
-	fifo_1clk.v
diff --git a/gr-radar-mono/src/fpga/models/fifo_1clk.v b/gr-radar-mono/src/fpga/models/fifo_1clk.v
deleted file mode 100644
index 93ada6c8d..000000000
--- a/gr-radar-mono/src/fpga/models/fifo_1clk.v
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- verilog -*- */
-/*
- * Copyright (C) 2003 Matt Ettus
- * Copyright (C) 2007 Corgan Enterprises LLC
- * 
- * 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.
- */
-
-// Model of Altera FIFO with common clock domain
-
-module fifo_1clk(data, wrreq, rdreq, clock, sclr, q,
-		 full, empty, usedw);
-
-   parameter width = 32;
-   parameter depth = 4096;
-   //`define rd_req 0;  // Set this to 0 for rd_ack, 1 for rd_req
-      
-   input [31:0]  data;
-   input 	 wrreq;
-   input 	 rdreq;
-   input 	 clock;
-   input 	 sclr;
-   output [31:0] q;
-   output 	 full;
-   output 	 empty;
-   output [11:0] usedw;
-   
-   reg [width-1:0] mem [0:depth-1];
-   reg [7:0] 	   rdptr;
-   reg [7:0] 	   wrptr;
-   
-`ifdef rd_req
-   reg [width-1:0] q;
-`else
-   wire [width-1:0] q;
-`endif
-   
-   reg [11:0] 	  usedw;
-   
-   integer 	    i;
-   
-   always @( sclr)
-     begin
-	wrptr <= #1 0;
-	rdptr <= #1 0;
-	for(i=0;i<depth;i=i+1)
-	  mem[i] <= #1 0;
-     end
-   
-   always @(posedge clock)
-     if(wrreq)
-       begin
-	  wrptr <= #1 wrptr+1;
-	  mem[wrptr] <= #1 data;
-       end
-   
-   always @(posedge clock)
-     if(rdreq)
-       begin
-   	  rdptr <= #1 rdptr+1;
-`ifdef rd_req
-	  q <= #1 mem[rdptr];
-`endif
-       end
-   
-`ifdef rd_req
-`else
-   assign q = mem[rdptr];
-`endif
-   
-   always @(posedge clock)
-     usedw <= #1 wrptr - rdptr;
-   
-   assign empty = (wrptr == rdptr);
-endmodule
diff --git a/gr-radar-mono/src/fpga/tb/.gitignore b/gr-radar-mono/src/fpga/tb/.gitignore
deleted file mode 100644
index d709d8c29..000000000
--- a/gr-radar-mono/src/fpga/tb/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/Makefile
-/Makefile.in
-/radar_tb
-/out
-/*.out*
-/*.vcd
diff --git a/gr-radar-mono/src/fpga/tb/Makefile.am b/gr-radar-mono/src/fpga/tb/Makefile.am
deleted file mode 100644
index da45f497a..000000000
--- a/gr-radar-mono/src/fpga/tb/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2007,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += \
-	radar_tb.v \
-	radar_tb.sav \
-	radar_tb.sh \
-	radar_tb_wave.sh
-
-MOSTLYCLEANFILES += *.vcd *.out* radar_tb
diff --git a/gr-radar-mono/src/fpga/tb/radar_tb.sav b/gr-radar-mono/src/fpga/tb/radar_tb.sav
deleted file mode 100644
index 66289c07e..000000000
--- a/gr-radar-mono/src/fpga/tb/radar_tb.sav
+++ /dev/null
@@ -1,42 +0,0 @@
-*-24.712532 40200000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
-@28
-radar_tb.clk
-radar_tb.ena
-radar_tb.rst
-radar_tb.uut.reset
-@200
--
-@420
-radar_tb.uut.controller.ampl_o[15:0]
-@22
-radar_tb.uut.controller.fstart_o[31:0]
-radar_tb.uut.controller.fincr_o[31:0]
-radar_tb.uut.transmitter.freq[31:0]
-@200
--
-@28
-radar_tb.tx_strobe
-@8420
-radar_tb.uut.tx_dac_i_o[13:0]
-@8421
-radar_tb.uut.tx_dac_q_o[13:0]
-@200
--
-@28
-radar_tb.uut.io_tx_ena_o
-radar_tb.uut.controller.tx_ctrl_o
-radar_tb.uut.controller.rx_ctrl_o
-@200
--
-@28
-radar_tb.fifo_strobe
-@8024
-radar_tb.fifo_i[15:0]
-@22
-radar_tb.fifo_q[15:0]
-@200
--
-@22
-radar_tb.uut.pulse_num[15:0]
-@200
--
diff --git a/gr-radar-mono/src/fpga/tb/radar_tb.sh b/gr-radar-mono/src/fpga/tb/radar_tb.sh
deleted file mode 100755
index dabbe6754..000000000
--- a/gr-radar-mono/src/fpga/tb/radar_tb.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-iverilog \
-    -D SIMULATION \
-    -y ../lib/ \
-    -y ../../../../usrp/fpga/sdr_lib \
-    -y ../models/ \
-    radar_tb.v -o radar_tb && ./radar_tb > radar_tb.out
diff --git a/gr-radar-mono/src/fpga/tb/radar_tb.v b/gr-radar-mono/src/fpga/tb/radar_tb.v
deleted file mode 100644
index 3583b70e9..000000000
--- a/gr-radar-mono/src/fpga/tb/radar_tb.v
+++ /dev/null
@@ -1,215 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`timescale 1ns/1ps
-
-`include "../lib/radar.v"
-
-module radar_tb;
-
-   // System bus
-   reg         clk;
-   reg         rst;
-   reg         ena;
-   
-   // Configuration bus
-   reg [6:0]   saddr;
-   reg [31:0]  sdata;
-   reg 	       s_strobe;
-
-   // DAC bus
-   wire        tx_strobe;
-   wire [13:0] tx_dac_i;
-   wire [13:0] tx_dac_q;
-
-   // ADC bus
-   reg [15:0]  rx_adc_i;
-   reg [15:0]  rx_adc_q;
-   
-   // FIFO bus
-   wire        fifo_strobe;
-   wire [15:0] fifo_i;
-   wire [15:0] fifo_q;
-   
-   // Configuration shadow registers
-   reg [31:0]  mode;
-   
-   radar uut
-     (.clk_i(clk),.saddr_i(saddr),.sdata_i(sdata),.s_strobe_i(s_strobe),
-      .tx_strobe_o(tx_strobe),.tx_dac_i_o(tx_dac_i),.tx_dac_q_o(tx_dac_q),
-      .rx_adc_i_i(rx_adc_i),.rx_adc_q_i(rx_adc_q),
-      .rx_strobe_o(fifo_strobe),.rx_ech_i_o(fifo_i),.rx_ech_q_o(fifo_q));
-
-   // Start up initialization
-   initial
-     begin
-	clk = 0;
-	rst = 0;
-	ena = 0;
-	saddr = 0;
-	sdata = 0;
-	s_strobe = 0;
-	rx_adc_i = 0;
-	rx_adc_q = 0;
-	mode = 0;
-	
-	@(posedge clk);
-	rst = 1;
-	@(posedge clk);
-	rst = 0;
-	@(posedge clk);
-	ena = 1;
-     end
-   
-   always
-     #5 clk <= ~clk;
-   
-   initial
-     begin
-	//$monitor($time, " clk=%b rst=%b", clk, uut.reset);
-	
-	$dumpfile("radar_tb.vcd");
-	$dumpvars(0, radar_tb);
-     end
-
-   // Test tasks
-   task write_cfg_register;
-      input [6:0]  regno;
-      input [31:0] value;
-      
-      begin
-	 @(posedge clk);
-	 saddr <= regno;
-	 sdata <= value;
-	 s_strobe <= 1'b1;
-	 @(posedge clk);
-	 s_strobe <= 0;
-      end
-   endtask // write_cfg_register
-   
-   // Application reset line
-   task set_reset;
-      input reset;
-      
-      begin
-	 mode = reset ? (mode | `bmFR_RADAR_MODE_RESET) : (mode & ~`bmFR_RADAR_MODE_RESET);
-	 write_cfg_register(`FR_RADAR_MODE, mode);
-      end
-   endtask // reset
-   
-   // Waveform on time
-   task set_ton;
-      input [23:0] t_on;
-
-      begin
-	 write_cfg_register(`FR_RADAR_TON, t_on);
-      end
-   endtask // set_ton
-
-   // Transmitter switching time
-   task set_tsw;
-      input [23:0] t_sw;
-
-      begin
-	 write_cfg_register(`FR_RADAR_TSW, t_sw);
-      end
-   endtask // t_sw
-
-   // Receiver look time
-   task set_tlook;
-      input [23:0] t_look;
-
-      begin
-	 write_cfg_register(`FR_RADAR_TLOOK, t_look);
-      end
-   endtask // set_tlook
-
-   // Inter-pulse idle time
-   task set_tidle;
-      input [23:0] t_idle;
-
-      begin
-	 write_cfg_register(`FR_RADAR_TIDLE, t_idle);
-      end
-   endtask // set_tidle
-
-   // Chirp amplitude
-   task set_ampl;
-      input [31:0] ampl;
-
-      begin
-	 write_cfg_register(`FR_RADAR_AMPL, ampl);
-      end
-   endtask // set_ampl
-
-   // Chirp start frequency
-   task set_fstart;
-      input [31:0] fstart;
-
-      begin
-	 write_cfg_register(`FR_RADAR_FSTART, fstart);
-      end
-   endtask // set_fstart
-   
-   // Chirp frequency increment
-   task set_fincr;
-      input [31:0] fincr;
-
-      begin
-	 write_cfg_register(`FR_RADAR_FINCR, fincr);
-      end
-   endtask // set_fincr
-
-   // Chirp frequency increment
-   task set_atrdel;
-      input [31:0] atrdel;
-
-      begin
-	 write_cfg_register(`FR_RADAR_ATRDEL, atrdel);
-      end
-   endtask // set_fincr
-
-   // Test transmitter functionality
-   task test_tx;
-      begin
-	 #20 set_reset(1);
-
-	 #20 set_ton(320-1);	// 5us on time
-	 #20 set_tsw(26-1);	// 406ns switching time
-	 #20 set_tlook(640-1);  // 10us look time
-	 #20 set_tidle(2854-1); // 60us pulse period
-	 
-	 #20 set_ampl(16'd9946);
-	 #20 set_fstart(32'h80000000); // -16 to 16 MHz
-	 #20 set_fincr (32'h0199999A);
-	 #20 set_atrdel(32'h00400046); // 64 TX clks, 70 RX clks	 
-	 #20 set_reset(0);
-	 #200000;
-      end
-   endtask // test_tx
-   
-   // Execute tests
-   initial
-     begin
-        #20 test_tx;
-	#100 $finish;
-     end
-endmodule
diff --git a/gr-radar-mono/src/fpga/tb/radar_tb_wave.sh b/gr-radar-mono/src/fpga/tb/radar_tb_wave.sh
deleted file mode 100755
index 45bba9f5e..000000000
--- a/gr-radar-mono/src/fpga/tb/radar_tb_wave.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-gtkwave radar_tb.vcd radar_tb.sav
diff --git a/gr-radar-mono/src/fpga/top/.gitignore b/gr-radar-mono/src/fpga/top/.gitignore
deleted file mode 100644
index 40492321d..000000000
--- a/gr-radar-mono/src/fpga/top/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-/*.qmsg
-/*.qws
-/*.eqn
-/*.done
-/*.htm
-/*.rpt
-/*.ini
-/*.fsf
-/*.jam
-/*.jbc
-/*.pin
-/*.pof
-/*.rbf
-/*.smsg
-/*.sof
-/*.ttf
-/*.summary
-/undo_redo.txt
-/db
-/Makefile
-/Makefile.in
diff --git a/gr-radar-mono/src/fpga/top/config.vh b/gr-radar-mono/src/fpga/top/config.vh
deleted file mode 100644
index 176979412..000000000
--- a/gr-radar-mono/src/fpga/top/config.vh
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-// Uncomment to enable 64 MHz Tx clock, otherwise 32 MHz
-//`define TX_RATE_MAX
-
diff --git a/gr-radar-mono/src/fpga/top/dacpll.v b/gr-radar-mono/src/fpga/top/dacpll.v
deleted file mode 100644
index f3941bc67..000000000
--- a/gr-radar-mono/src/fpga/top/dacpll.v
+++ /dev/null
@@ -1,291 +0,0 @@
-// megafunction wizard: %ALTPLL%

-// GENERATION: STANDARD

-// VERSION: WM1.0

-// MODULE: altpll 

-

-// ============================================================

-// File Name: dacpll.v

-// Megafunction Name(s):

-// 			altpll

-//

-// Simulation Library Files(s):

-// 			altera_mf

-// ============================================================

-// ************************************************************

-// THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!

-//

-// 7.0 Build 33 02/05/2007 SJ Web Edition

-// ************************************************************

-

-

-//Copyright (C) 1991-2007 Altera Corporation

-//Your use of Altera Corporation's design tools, logic functions 

-//and other software and tools, and its AMPP partner logic 

-//functions, and any output files from any of the foregoing 

-//(including device programming or simulation files), and any 

-//associated documentation or information are expressly subject 

-//to the terms and conditions of the Altera Program License 

-//Subscription Agreement, Altera MegaCore Function License 

-//Agreement, or other applicable license agreement, including, 

-//without limitation, that your use is for the sole purpose of 

-//programming logic devices manufactured by Altera and sold by 

-//Altera or its authorized distributors.  Please refer to the 

-//applicable agreement for further details.

-

-

-// synopsys translate_off

-`timescale 1 ps / 1 ps

-// synopsys translate_on

-module dacpll (

-	areset,

-	inclk0,

-	c0);

-

-	input	  areset;

-	input	  inclk0;

-	output	  c0;

-

-	wire [5:0] sub_wire0;

-	wire [0:0] sub_wire4 = 1'h0;

-	wire [0:0] sub_wire1 = sub_wire0[0:0];

-	wire  c0 = sub_wire1;

-	wire  sub_wire2 = inclk0;

-	wire [1:0] sub_wire3 = {sub_wire4, sub_wire2};

-

-	altpll	altpll_component (

-				.inclk (sub_wire3),

-				.areset (areset),

-				.clk (sub_wire0),

-				.activeclock (),

-				.clkbad (),

-				.clkena ({6{1'b1}}),

-				.clkloss (),

-				.clkswitch (1'b0),

-				.configupdate (1'b1),

-				.enable0 (),

-				.enable1 (),

-				.extclk (),

-				.extclkena ({4{1'b1}}),

-				.fbin (1'b1),

-				.fbout (),

-				.locked (),

-				.pfdena (1'b1),

-				.phasecounterselect ({4{1'b1}}),

-				.phasedone (),

-				.phasestep (1'b1),

-				.phaseupdown (1'b1),

-				.pllena (1'b1),

-				.scanaclr (1'b0),

-				.scanclk (1'b0),

-				.scanclkena (1'b1),

-				.scandata (1'b0),

-				.scandataout (),

-				.scandone (),

-				.scanread (1'b0),

-				.scanwrite (1'b0),

-				.sclkout0 (),

-				.sclkout1 (),

-				.vcooverrange (),

-				.vcounderrange ());

-	defparam

-		altpll_component.clk0_divide_by = 1,

-		altpll_component.clk0_duty_cycle = 50,

-		altpll_component.clk0_multiply_by = 2,

-		altpll_component.clk0_phase_shift = "0000",

-		altpll_component.compensate_clock = "CLK0",

-		altpll_component.inclk0_input_frequency = 15625,

-		altpll_component.intended_device_family = "Cyclone",

-		altpll_component.lpm_type = "altpll",

-		altpll_component.operation_mode = "NORMAL",

-		altpll_component.pll_type = "AUTO",

-		altpll_component.port_activeclock = "PORT_UNUSED",

-		altpll_component.port_areset = "PORT_USED",

-		altpll_component.port_clkbad0 = "PORT_UNUSED",

-		altpll_component.port_clkbad1 = "PORT_UNUSED",

-		altpll_component.port_clkloss = "PORT_UNUSED",

-		altpll_component.port_clkswitch = "PORT_UNUSED",

-		altpll_component.port_configupdate = "PORT_UNUSED",

-		altpll_component.port_fbin = "PORT_UNUSED",

-		altpll_component.port_inclk0 = "PORT_USED",

-		altpll_component.port_inclk1 = "PORT_UNUSED",

-		altpll_component.port_locked = "PORT_UNUSED",

-		altpll_component.port_pfdena = "PORT_UNUSED",

-		altpll_component.port_phasecounterselect = "PORT_UNUSED",

-		altpll_component.port_phasedone = "PORT_UNUSED",

-		altpll_component.port_phasestep = "PORT_UNUSED",

-		altpll_component.port_phaseupdown = "PORT_UNUSED",

-		altpll_component.port_pllena = "PORT_UNUSED",

-		altpll_component.port_scanaclr = "PORT_UNUSED",

-		altpll_component.port_scanclk = "PORT_UNUSED",

-		altpll_component.port_scanclkena = "PORT_UNUSED",

-		altpll_component.port_scandata = "PORT_UNUSED",

-		altpll_component.port_scandataout = "PORT_UNUSED",

-		altpll_component.port_scandone = "PORT_UNUSED",

-		altpll_component.port_scanread = "PORT_UNUSED",

-		altpll_component.port_scanwrite = "PORT_UNUSED",

-		altpll_component.port_clk0 = "PORT_USED",

-		altpll_component.port_clk1 = "PORT_UNUSED",

-		altpll_component.port_clk3 = "PORT_UNUSED",

-		altpll_component.port_clk4 = "PORT_UNUSED",

-		altpll_component.port_clk5 = "PORT_UNUSED",

-		altpll_component.port_clkena0 = "PORT_UNUSED",

-		altpll_component.port_clkena1 = "PORT_UNUSED",

-		altpll_component.port_clkena3 = "PORT_UNUSED",

-		altpll_component.port_clkena4 = "PORT_UNUSED",

-		altpll_component.port_clkena5 = "PORT_UNUSED",

-		altpll_component.port_extclk0 = "PORT_UNUSED",

-		altpll_component.port_extclk1 = "PORT_UNUSED",

-		altpll_component.port_extclk2 = "PORT_UNUSED",

-		altpll_component.port_extclk3 = "PORT_UNUSED";

-

-

-endmodule

-

-// ============================================================

-// CNX file retrieval info

-// ============================================================

-// Retrieval info: PRIVATE: ACTIVECLK_CHECK STRING "0"

-// Retrieval info: PRIVATE: BANDWIDTH STRING "1.000"

-// Retrieval info: PRIVATE: BANDWIDTH_FEATURE_ENABLED STRING "0"

-// Retrieval info: PRIVATE: BANDWIDTH_FREQ_UNIT STRING "MHz"

-// Retrieval info: PRIVATE: BANDWIDTH_PRESET STRING "Low"

-// Retrieval info: PRIVATE: BANDWIDTH_USE_AUTO STRING "1"

-// Retrieval info: PRIVATE: BANDWIDTH_USE_CUSTOM STRING "0"

-// Retrieval info: PRIVATE: BANDWIDTH_USE_PRESET STRING "0"

-// Retrieval info: PRIVATE: CLKBAD_SWITCHOVER_CHECK STRING "0"

-// Retrieval info: PRIVATE: CLKLOSS_CHECK STRING "0"

-// Retrieval info: PRIVATE: CLKSWITCH_CHECK STRING "0"

-// Retrieval info: PRIVATE: CNX_NO_COMPENSATE_RADIO STRING "0"

-// Retrieval info: PRIVATE: CREATE_CLKBAD_CHECK STRING "0"

-// Retrieval info: PRIVATE: CREATE_INCLK1_CHECK STRING "0"

-// Retrieval info: PRIVATE: CUR_DEDICATED_CLK STRING "c0"

-// Retrieval info: PRIVATE: CUR_FBIN_CLK STRING "e0"

-// Retrieval info: PRIVATE: DEVICE_FAMILY NUMERIC "11"

-// Retrieval info: PRIVATE: DEVICE_SPEED_GRADE STRING "8"

-// Retrieval info: PRIVATE: DEV_FAMILY STRING "Cyclone"

-// Retrieval info: PRIVATE: DIV_FACTOR0 NUMERIC "1"

-// Retrieval info: PRIVATE: DUTY_CYCLE0 STRING "50.00000000"

-// Retrieval info: PRIVATE: EXT_FEEDBACK_RADIO STRING "0"

-// Retrieval info: PRIVATE: GLOCKED_COUNTER_EDIT_CHANGED STRING "1"

-// Retrieval info: PRIVATE: GLOCKED_FEATURE_ENABLED STRING "0"

-// Retrieval info: PRIVATE: GLOCKED_MODE_CHECK STRING "0"

-// Retrieval info: PRIVATE: GLOCK_COUNTER_EDIT NUMERIC "1048575"

-// Retrieval info: PRIVATE: HAS_MANUAL_SWITCHOVER STRING "1"

-// Retrieval info: PRIVATE: INCLK0_FREQ_EDIT STRING "64.000"

-// Retrieval info: PRIVATE: INCLK0_FREQ_UNIT_COMBO STRING "MHz"

-// Retrieval info: PRIVATE: INCLK1_FREQ_EDIT STRING "100.000"

-// Retrieval info: PRIVATE: INCLK1_FREQ_EDIT_CHANGED STRING "1"

-// Retrieval info: PRIVATE: INCLK1_FREQ_UNIT_CHANGED STRING "1"

-// Retrieval info: PRIVATE: INCLK1_FREQ_UNIT_COMBO STRING "MHz"

-// Retrieval info: PRIVATE: INT_FEEDBACK__MODE_RADIO STRING "1"

-// Retrieval info: PRIVATE: LOCKED_OUTPUT_CHECK STRING "0"

-// Retrieval info: PRIVATE: LOCK_LOSS_SWITCHOVER_CHECK STRING "0"

-// Retrieval info: PRIVATE: LONG_SCAN_RADIO STRING "1"

-// Retrieval info: PRIVATE: LVDS_MODE_DATA_RATE STRING "512.000"

-// Retrieval info: PRIVATE: LVDS_MODE_DATA_RATE_DIRTY NUMERIC "0"

-// Retrieval info: PRIVATE: LVDS_PHASE_SHIFT_UNIT0 STRING "deg"

-// Retrieval info: PRIVATE: MIRROR_CLK0 STRING "0"

-// Retrieval info: PRIVATE: MULT_FACTOR0 NUMERIC "2"

-// Retrieval info: PRIVATE: NORMAL_MODE_RADIO STRING "1"

-// Retrieval info: PRIVATE: OUTPUT_FREQ0 STRING "100.00000000"

-// Retrieval info: PRIVATE: OUTPUT_FREQ_MODE0 STRING "0"

-// Retrieval info: PRIVATE: OUTPUT_FREQ_UNIT0 STRING "MHz"

-// Retrieval info: PRIVATE: PHASE_RECONFIG_FEATURE_ENABLED STRING "0"

-// Retrieval info: PRIVATE: PHASE_RECONFIG_INPUTS_CHECK STRING "0"

-// Retrieval info: PRIVATE: PHASE_SHIFT0 STRING "0.00000000"

-// Retrieval info: PRIVATE: PHASE_SHIFT_UNIT0 STRING "ns"

-// Retrieval info: PRIVATE: PLL_ADVANCED_PARAM_CHECK STRING "0"

-// Retrieval info: PRIVATE: PLL_ARESET_CHECK STRING "1"

-// Retrieval info: PRIVATE: PLL_AUTOPLL_CHECK NUMERIC "1"

-// Retrieval info: PRIVATE: PLL_ENA_CHECK STRING "0"

-// Retrieval info: PRIVATE: PLL_ENHPLL_CHECK NUMERIC "0"

-// Retrieval info: PRIVATE: PLL_FASTPLL_CHECK NUMERIC "0"

-// Retrieval info: PRIVATE: PLL_LVDS_PLL_CHECK NUMERIC "0"

-// Retrieval info: PRIVATE: PLL_PFDENA_CHECK STRING "0"

-// Retrieval info: PRIVATE: PLL_TARGET_HARCOPY_CHECK NUMERIC "0"

-// Retrieval info: PRIVATE: PRIMARY_CLK_COMBO STRING "inclk0"

-// Retrieval info: PRIVATE: SACN_INPUTS_CHECK STRING "0"

-// Retrieval info: PRIVATE: SCAN_FEATURE_ENABLED STRING "0"

-// Retrieval info: PRIVATE: SELF_RESET_LOCK_LOSS STRING "0"

-// Retrieval info: PRIVATE: SHORT_SCAN_RADIO STRING "0"

-// Retrieval info: PRIVATE: SPREAD_FEATURE_ENABLED STRING "0"

-// Retrieval info: PRIVATE: SPREAD_FREQ STRING "50.000"

-// Retrieval info: PRIVATE: SPREAD_FREQ_UNIT STRING "KHz"

-// Retrieval info: PRIVATE: SPREAD_PERCENT STRING "0.500"

-// Retrieval info: PRIVATE: SPREAD_USE STRING "0"

-// Retrieval info: PRIVATE: SRC_SYNCH_COMP_RADIO STRING "0"

-// Retrieval info: PRIVATE: STICKY_CLK0 STRING "1"

-// Retrieval info: PRIVATE: SWITCHOVER_COUNT_EDIT NUMERIC "1"

-// Retrieval info: PRIVATE: SWITCHOVER_FEATURE_ENABLED STRING "0"

-// Retrieval info: PRIVATE: USE_CLK0 STRING "1"

-// Retrieval info: PRIVATE: USE_CLKENA0 STRING "0"

-// Retrieval info: PRIVATE: ZERO_DELAY_RADIO STRING "0"

-// Retrieval info: LIBRARY: altera_mf altera_mf.altera_mf_components.all

-// Retrieval info: CONSTANT: CLK0_DIVIDE_BY NUMERIC "1"

-// Retrieval info: CONSTANT: CLK0_DUTY_CYCLE NUMERIC "50"

-// Retrieval info: CONSTANT: CLK0_MULTIPLY_BY NUMERIC "2"

-// Retrieval info: CONSTANT: CLK0_PHASE_SHIFT STRING "0"

-// Retrieval info: CONSTANT: COMPENSATE_CLOCK STRING "CLK0"

-// Retrieval info: CONSTANT: INCLK0_INPUT_FREQUENCY NUMERIC "15625"

-// Retrieval info: CONSTANT: INTENDED_DEVICE_FAMILY STRING "Cyclone"

-// Retrieval info: CONSTANT: LPM_TYPE STRING "altpll"

-// Retrieval info: CONSTANT: OPERATION_MODE STRING "NORMAL"

-// Retrieval info: CONSTANT: PLL_TYPE STRING "AUTO"

-// Retrieval info: CONSTANT: PORT_ACTIVECLOCK STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_ARESET STRING "PORT_USED"

-// Retrieval info: CONSTANT: PORT_CLKBAD0 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_CLKBAD1 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_CLKLOSS STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_CLKSWITCH STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_CONFIGUPDATE STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_FBIN STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_INCLK0 STRING "PORT_USED"

-// Retrieval info: CONSTANT: PORT_INCLK1 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_LOCKED STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_PFDENA STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_PHASECOUNTERSELECT STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_PHASEDONE STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_PHASESTEP STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_PHASEUPDOWN STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_PLLENA STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_SCANACLR STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_SCANCLK STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_SCANCLKENA STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_SCANDATA STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_SCANDATAOUT STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_SCANDONE STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_SCANREAD STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_SCANWRITE STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_clk0 STRING "PORT_USED"

-// Retrieval info: CONSTANT: PORT_clk1 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_clk3 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_clk4 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_clk5 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_clkena0 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_clkena1 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_clkena3 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_clkena4 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_clkena5 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_extclk0 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_extclk1 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_extclk2 STRING "PORT_UNUSED"

-// Retrieval info: CONSTANT: PORT_extclk3 STRING "PORT_UNUSED"

-// Retrieval info: USED_PORT: @clk 0 0 6 0 OUTPUT_CLK_EXT VCC "@clk[5..0]"

-// Retrieval info: USED_PORT: @extclk 0 0 4 0 OUTPUT_CLK_EXT VCC "@extclk[3..0]"

-// Retrieval info: USED_PORT: areset 0 0 0 0 INPUT GND "areset"

-// Retrieval info: USED_PORT: c0 0 0 0 0 OUTPUT_CLK_EXT VCC "c0"

-// Retrieval info: USED_PORT: inclk0 0 0 0 0 INPUT_CLK_EXT GND "inclk0"

-// Retrieval info: CONNECT: @inclk 0 0 1 0 inclk0 0 0 0 0

-// Retrieval info: CONNECT: c0 0 0 0 0 @clk 0 0 1 0

-// Retrieval info: CONNECT: @inclk 0 0 1 1 GND 0 0 0 0

-// Retrieval info: CONNECT: @areset 0 0 0 0 areset 0 0 0 0

-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll.v TRUE FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll.ppf TRUE FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll.inc FALSE FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll.cmp FALSE FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll.bsf TRUE

-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll_inst.v TRUE FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll_bb.v TRUE FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll_waveforms.html TRUE FALSE

-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll_wave*.jpg FALSE FALSE

-// Retrieval info: LIB_FILE: altera_mf

diff --git a/gr-radar-mono/src/fpga/top/usrp_radar_mono.csf b/gr-radar-mono/src/fpga/top/usrp_radar_mono.csf
deleted file mode 100644
index 121b15aaf..000000000
--- a/gr-radar-mono/src/fpga/top/usrp_radar_mono.csf
+++ /dev/null
@@ -1,444 +0,0 @@
-COMPILER_SETTINGS
-{
-	IO_PLACEMENT_OPTIMIZATION = OFF;
-	ENABLE_DRC_SETTINGS = OFF;
-	PHYSICAL_SYNTHESIS_REGISTER_RETIMING = OFF;
-	PHYSICAL_SYNTHESIS_REGISTER_DUPLICATION = OFF;
-	PHYSICAL_SYNTHESIS_COMBO_LOGIC = OFF;
-	DRC_FANOUT_EXCEEDING = 30;
-	DRC_REPORT_FANOUT_EXCEEDING = OFF;
-	DRC_TOP_FANOUT = 50;
-	DRC_REPORT_TOP_FANOUT = OFF;
-	RUN_DRC_DURING_COMPILATION = OFF;
-	ADV_NETLIST_OPT_RETIME_CORE_AND_IO = ON;
-	ADV_NETLIST_OPT_SYNTH_USE_FITTER_INFO = OFF;
-	ADV_NETLIST_OPT_SYNTH_GATE_RETIME = OFF;
-	ADV_NETLIST_OPT_SYNTH_WYSIWYG_REMAP = OFF;
-	SMART_COMPILE_IGNORES_TDC_FOR_STRATIX_PLL_CHANGES = OFF;
-	MERGE_HEX_FILE = OFF;
-	TRUE_WYSIWYG_FLOW = OFF;
-	SEED = 1;
-	FINAL_PLACEMENT_OPTIMIZATION = AUTOMATICALLY;
-	FAMILY = Cyclone;
-	DPRAM_DUAL_PORT_MODE_OTHER_SIGNALS_EPXA1 = "DPRAM0 TO 1 DPRAM1 TO 2";
-	DPRAM_32BIT_SINGLE_PORT_MODE_OTHER_SIGNALS_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_8BIT_16BIT_SINGLE_PORT_MODE_OTHER_SIGNALS_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_DUAL_PORT_MODE_OUTPUT_EPXA1 = "DPRAM0 TO 1 DPRAM1 TO 2";
-	DPRAM_32BIT_SINGLE_PORT_MODE_OUTPUT_EPXA1 = "LOWER TO 1ESB UPPER TO 1";
-	DPRAM_8BIT_16BIT_SINGLE_PORT_MODE_OUTPUT_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_DUAL_PORT_MODE_INPUT_EPXA1 = "DPRAM0 TO 1 DPRAM1 TO 2";
-	DPRAM_32BIT_SINGLE_PORT_MODE_INPUT_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_8BIT_16BIT_SINGLE_PORT_MODE_INPUT_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_DUAL_PORT_MODE_OTHER_SIGNALS_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_SINGLE_PORT_MODE_OTHER_SIGNALS_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_WIDE_MODE_OTHER_SIGNALS_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_DEEP_MODE_OTHER_SIGNALS_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_DUAL_PORT_MODE_OUTPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4ESB";
-	DPRAM_SINGLE_PORT_MODE_OUTPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4ESB";
-	DPRAM_WIDE_MODE_OUTPUT_EPXA4_10 = "LOWER TO 3 UPPER TO 4ESB";
-	DPRAM_DEEP_MODE_OUTPUT_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_DUAL_PORT_MODE_INPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_SINGLE_PORT_MODE_INPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_WIDE_MODE_INPUT_EPXA4_10 = "LOWER TO 3 UPPER TO 4";
-	DPRAM_DEEP_MODE_INPUT_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_OTHER_SIGNALS_EPXA4_10 = "DEFAULT OTHER ROUTING OPTIONS";
-	DPRAM_OUTPUT_EPXA4_10 = "DEFAULT OUTPUT ROUTING OPTIONS";
-	DPRAM_INPUT_EPXA4_10 = "DEFAULT INPUT ROUTING OPTIONS";
-	STRIPE_TO_PLD_INTERRUPTS_EPXA4_10 = "MEGALAB COLUMN 2";
-	PLD_TO_STRIPE_INTERRUPTS_EPXA4_10 = "MEGALAB COLUMN 2";
-	PROCESSOR_DEBUG_EXTENSIONS_EPXA4_10 = "MEGALAB COLUMN 2";
-	STRIPE_TO_PLD_BRIDGE_EPXA4_10 = "MEGALAB COLUMN 1";
-	FAST_FIT_COMPILATION = OFF;
-	SIGNALPROBE_DURING_NORMAL_COMPILATION = OFF;
-	OPTIMIZE_IOC_REGISTER_PLACEMENT_FOR_TIMING = ON;
-	OPTIMIZE_TIMING = "NORMAL COMPILATION";
-	OPTIMIZE_HOLD_TIMING = OFF;
-	COMPILATION_LEVEL = FULL;
-	SAVE_DISK_SPACE = OFF;
-	SPEED_DISK_USAGE_TRADEOFF = NORMAL;
-	LOGICLOCK_INCREMENTAL_COMPILE_ASSIGNMENT = OFF;
-	SIGNALPROBE_ALLOW_OVERUSE = OFF;
-	FOCUS_ENTITY_NAME = |usrp_radar_mono;
-	ROUTING_BACK_ANNOTATION_MODE = OFF;
-	INC_PLC_MODE = OFF;
-	FIT_ONLY_ONE_ATTEMPT = OFF;
-}
-DEFAULT_DEVICE_OPTIONS
-{
-	GENERATE_CONFIG_HEXOUT_FILE = OFF;
-	GENERATE_CONFIG_JBC_FILE_COMPRESSED = ON;
-	GENERATE_CONFIG_JBC_FILE = OFF;
-	GENERATE_CONFIG_JAM_FILE = OFF;
-	GENERATE_CONFIG_ISC_FILE = OFF;
-	GENERATE_CONFIG_SVF_FILE = OFF;
-	GENERATE_JBC_FILE_COMPRESSED = ON;
-	GENERATE_JBC_FILE = OFF;
-	GENERATE_JAM_FILE = OFF;
-	GENERATE_ISC_FILE = OFF;
-	GENERATE_SVF_FILE = OFF;
-	RESERVE_PIN = "AS INPUT TRI-STATED";
-	RESERVE_ALL_UNUSED_PINS = "AS OUTPUT DRIVING GROUND";
-	HEXOUT_FILE_COUNT_DIRECTION = UP;
-	HEXOUT_FILE_START_ADDRESS = 0;
-	GENERATE_HEX_FILE = OFF;
-	GENERATE_RBF_FILE = OFF;
-	GENERATE_TTF_FILE = OFF;
-	RESERVE_ASDO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_DATA0_AFTER_CONFIGURATION = "AS INPUT TRI-STATED";
-	RESERVE_DATA7_THROUGH_DATA1_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_RDYNBUSY_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_NWS_NRS_NCS_CS_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	DISABLE_NCS_AND_OE_PULLUPS_ON_CONFIG_DEVICE = OFF;
-	AUTO_INCREMENT_CONFIG_DEVICE_JTAG_USER_CODE = ON;
-	EPROM_USE_CHECKSUM_AS_USERCODE = OFF;
-	FLEX10K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	MERCURY_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	APEX20K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_CONFIGURATION_DEVICE = AUTO;
-	CYCLONE_CONFIGURATION_DEVICE = AUTO;
-	FLEX10K_CONFIGURATION_DEVICE = AUTO;
-	FLEX6K_CONFIGURATION_DEVICE = AUTO;
-	MERCURY_CONFIGURATION_DEVICE = AUTO;
-	EXCALIBUR_CONFIGURATION_DEVICE = AUTO;
-	APEX20K_CONFIGURATION_DEVICE = AUTO;
-	USE_CONFIGURATION_DEVICE = ON;
-	ENABLE_INIT_DONE_OUTPUT = OFF;
-	FLEX10K_ENABLE_LOCK_OUTPUT = OFF;
-	ENABLE_DEVICE_WIDE_OE = OFF;
-	ENABLE_DEVICE_WIDE_RESET = OFF;
-	RELEASE_CLEARS_BEFORE_TRI_STATES = OFF;
-	AUTO_RESTART_CONFIGURATION = OFF;
-	ENABLE_VREFB_PIN = OFF;
-	ENABLE_VREFA_PIN = OFF;
-	SECURITY_BIT = OFF;
-	USER_START_UP_CLOCK = OFF;
-	APEXII_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX10K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX6K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	MERCURY_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	EXCALIBUR_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	CYCLONE_CONFIGURATION_SCHEME = "ACTIVE SERIAL";
-	STRATIX_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	APEX20K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	STRATIX_UPDATE_MODE = STANDARD;
-	USE_CHECKSUM_AS_USERCODE = OFF;
-	MAX7000_USE_CHECKSUM_AS_USERCODE = OFF;
-	MAX7000_JTAG_USER_CODE = FFFFFFFF;
-	FLEX10K_JTAG_USER_CODE = 7F;
-	MERCURY_JTAG_USER_CODE = FFFFFFFF;
-	APEX20K_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_JTAG_USER_CODE = FFFFFFFF;
-	MAX7000S_JTAG_USER_CODE = FFFF;
-	RESERVE_NCEO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	FLEX10K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	FLEX6K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = OFF;
-	ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	MAX7000_ENABLE_JTAG_BST_SUPPORT = ON;
-	ENABLE_JTAG_BST_SUPPORT = OFF;
-	CONFIGURATION_CLOCK_DIVISOR = 1;
-	CONFIGURATION_CLOCK_FREQUENCY = "10 MHZ";
-	CLOCK_SOURCE = INTERNAL;
-	COMPRESSION_MODE = OFF;
-	ON_CHIP_BITSTREAM_DECOMPRESSION = OFF;
-}
-AUTO_SLD_HUB_ENTITY
-{
-	AUTO_INSERT_SLD_HUB_ENTITY = ENABLE;
-	HUB_INSTANCE_NAME = SLD_HUB_INST;
-	HUB_ENTITY_NAME = SLD_HUB;
-}
-SIGNALTAP_LOGIC_ANALYZER_SETTINGS
-{
-	ENABLE_SIGNALTAP = Off;
-	AUTO_ENABLE_SMART_COMPILE = On;
-}
-CHIP(usrp_radar_mono)
-{
-	DEVICE = EP1C12Q240C8;
-	DEVICE_FILTER_PACKAGE = "ANY QFP";
-	DEVICE_FILTER_PIN_COUNT = 240;
-	DEVICE_FILTER_SPEED_GRADE = ANY;
-	AUTO_RESTART_CONFIGURATION = OFF;
-	RELEASE_CLEARS_BEFORE_TRI_STATES = OFF;
-	USER_START_UP_CLOCK = OFF;
-	ENABLE_DEVICE_WIDE_RESET = OFF;
-	ENABLE_DEVICE_WIDE_OE = OFF;
-	ENABLE_INIT_DONE_OUTPUT = OFF;
-	FLEX10K_ENABLE_LOCK_OUTPUT = OFF;
-	ENABLE_JTAG_BST_SUPPORT = OFF;
-	MAX7000_ENABLE_JTAG_BST_SUPPORT = ON;
-	APEX20K_JTAG_USER_CODE = FFFFFFFF;
-	MERCURY_JTAG_USER_CODE = FFFFFFFF;
-	FLEX10K_JTAG_USER_CODE = 7F;
-	MAX7000_JTAG_USER_CODE = FFFFFFFF;
-	MAX7000S_JTAG_USER_CODE = FFFF;
-	STRATIX_JTAG_USER_CODE = FFFFFFFF;
-	APEX20K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	MERCURY_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX6K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX10K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	EXCALIBUR_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	APEXII_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	STRATIX_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	CYCLONE_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	USE_CONFIGURATION_DEVICE = OFF;
-	APEX20K_CONFIGURATION_DEVICE = AUTO;
-	MERCURY_CONFIGURATION_DEVICE = AUTO;
-	FLEX6K_CONFIGURATION_DEVICE = AUTO;
-	FLEX10K_CONFIGURATION_DEVICE = AUTO;
-	EXCALIBUR_CONFIGURATION_DEVICE = AUTO;
-	STRATIX_CONFIGURATION_DEVICE = AUTO;
-	CYCLONE_CONFIGURATION_DEVICE = AUTO;
-	STRATIX_UPDATE_MODE = STANDARD;
-	APEX20K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	MERCURY_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	FLEX10K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	AUTO_INCREMENT_CONFIG_DEVICE_JTAG_USER_CODE = ON;
-	DISABLE_NCS_AND_OE_PULLUPS_ON_CONFIG_DEVICE = OFF;
-	COMPRESSION_MODE = OFF;
-	ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	FLEX6K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = OFF;
-	FLEX10K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	EPROM_USE_CHECKSUM_AS_USERCODE = OFF;
-	USE_CHECKSUM_AS_USERCODE = OFF;
-	MAX7000_USE_CHECKSUM_AS_USERCODE = OFF;
-	GENERATE_TTF_FILE = OFF;
-	GENERATE_RBF_FILE = ON;
-	GENERATE_HEX_FILE = OFF;
-	SECURITY_BIT = OFF;
-	ENABLE_VREFA_PIN = OFF;
-	ENABLE_VREFB_PIN = OFF;
-	GENERATE_SVF_FILE = OFF;
-	GENERATE_ISC_FILE = OFF;
-	GENERATE_JAM_FILE = OFF;
-	GENERATE_JBC_FILE = OFF;
-	GENERATE_JBC_FILE_COMPRESSED = ON;
-	GENERATE_CONFIG_SVF_FILE = OFF;
-	GENERATE_CONFIG_ISC_FILE = OFF;
-	GENERATE_CONFIG_JAM_FILE = OFF;
-	GENERATE_CONFIG_JBC_FILE = OFF;
-	GENERATE_CONFIG_JBC_FILE_COMPRESSED = ON;
-	GENERATE_CONFIG_HEXOUT_FILE = OFF;
-	ON_CHIP_BITSTREAM_DECOMPRESSION = OFF;
-	BASE_PIN_OUT_FILE_ON_SAMEFRAME_DEVICE = OFF;
-	HEXOUT_FILE_START_ADDRESS = 0;
-	HEXOUT_FILE_COUNT_DIRECTION = UP;
-	RESERVE_ALL_UNUSED_PINS = "AS INPUT TRI-STATED";
-	STRATIX_DEVICE_IO_STANDARD = LVTTL;
-	CLOCK_SOURCE = INTERNAL;
-	CONFIGURATION_CLOCK_FREQUENCY = "10 MHZ";
-	CONFIGURATION_CLOCK_DIVISOR = 1;
-	RESERVE_NWS_NRS_NCS_CS_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_RDYNBUSY_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_DATA7_THROUGH_DATA1_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_DATA0_AFTER_CONFIGURATION = "AS INPUT TRI-STATED";
-	RESERVE_NCEO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_ASDO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	SCLK : LOCATION = Pin_101;
-	SDI : LOCATION = Pin_100;
-	SEN : LOCATION = Pin_98;
-	SLD : LOCATION = Pin_95;
-	adc1_data[0] : LOCATION = Pin_5;
-	adc1_data[10] : LOCATION = Pin_235;
-	adc1_data[11] : LOCATION = Pin_234;
-	adc1_data[1] : LOCATION = Pin_4;
-	adc1_data[2] : LOCATION = Pin_3;
-	adc1_data[3] : LOCATION = Pin_2;
-	adc1_data[4] : LOCATION = Pin_1;
-	adc1_data[4] : IO_STANDARD = LVTTL;
-	adc1_data[5] : LOCATION = Pin_240;
-	adc1_data[6] : LOCATION = Pin_239;
-	adc1_data[7] : LOCATION = Pin_238;
-	adc1_data[8] : LOCATION = Pin_237;
-	adc1_data[9] : LOCATION = Pin_236;
-	adc2_data[0] : LOCATION = Pin_20;
-	adc2_data[10] : LOCATION = Pin_8;
-	adc2_data[11] : LOCATION = Pin_7;
-	adc2_data[1] : LOCATION = Pin_19;
-	adc2_data[2] : LOCATION = Pin_18;
-	adc2_data[3] : LOCATION = Pin_17;
-	adc2_data[4] : LOCATION = Pin_16;
-	adc2_data[5] : LOCATION = Pin_15;
-	adc2_data[6] : LOCATION = Pin_14;
-	adc2_data[7] : LOCATION = Pin_13;
-	adc2_data[8] : LOCATION = Pin_12;
-	adc2_data[9] : LOCATION = Pin_11;
-	adc3_data[0] : LOCATION = Pin_200;
-	adc3_data[10] : LOCATION = Pin_184;
-	adc3_data[11] : LOCATION = Pin_183;
-	adc3_data[1] : LOCATION = Pin_197;
-	adc3_data[2] : LOCATION = Pin_196;
-	adc3_data[3] : LOCATION = Pin_195;
-	adc3_data[4] : LOCATION = Pin_194;
-	adc3_data[5] : LOCATION = Pin_193;
-	adc3_data[6] : LOCATION = Pin_188;
-	adc3_data[7] : LOCATION = Pin_187;
-	adc3_data[8] : LOCATION = Pin_186;
-	adc3_data[9] : LOCATION = Pin_185;
-	adc4_data[0] : LOCATION = Pin_222;
-	adc4_data[10] : LOCATION = Pin_203;
-	adc4_data[11] : LOCATION = Pin_202;
-	adc4_data[1] : LOCATION = Pin_219;
-	adc4_data[2] : LOCATION = Pin_217;
-	adc4_data[3] : LOCATION = Pin_216;
-	adc4_data[4] : LOCATION = Pin_215;
-	adc4_data[5] : LOCATION = Pin_214;
-	adc4_data[6] : LOCATION = Pin_213;
-	adc4_data[7] : LOCATION = Pin_208;
-	adc4_data[8] : LOCATION = Pin_207;
-	adc4_data[9] : LOCATION = Pin_206;
-	adc_oeb[0] : LOCATION = Pin_228;
-	adc_oeb[1] : LOCATION = Pin_21;
-	adc_oeb[2] : LOCATION = Pin_181;
-	adc_oeb[3] : LOCATION = Pin_218;
-	adc_otr[0] : LOCATION = Pin_233;
-	adc_otr[1] : LOCATION = Pin_6;
-	adc_otr[2] : LOCATION = Pin_182;
-	adc_otr[3] : LOCATION = Pin_201;
-	adclk0 : LOCATION = Pin_224;
-	adclk1 : LOCATION = Pin_226;
-	clk0 : LOCATION = Pin_28;
-	clk0 : RESERVE_PIN = "AS INPUT TRI-STATED";
-	clk0 : IO_STANDARD = LVTTL;
-	clk1 : LOCATION = Pin_29;
-	clk1 : RESERVE_PIN = "AS INPUT TRI-STATED";
-	clk1 : IO_STANDARD = LVTTL;
-	clk3 : LOCATION = Pin_152;
-	clk3 : RESERVE_PIN = "AS INPUT TRI-STATED";
-	clk3 : IO_STANDARD = LVTTL;
-	clk_120mhz : LOCATION = Pin_153;
-	clk_120mhz : IO_STANDARD = LVTTL;
-	clk_out : LOCATION = Pin_63;
-	clk_out : IO_STANDARD = LVTTL;
-	dac1_data[0] : LOCATION = Pin_165;
-	dac1_data[10] : LOCATION = Pin_177;
-	dac1_data[11] : LOCATION = Pin_178;
-	dac1_data[12] : LOCATION = Pin_179;
-	dac1_data[13] : LOCATION = Pin_180;
-	dac1_data[1] : LOCATION = Pin_166;
-	dac1_data[2] : LOCATION = Pin_167;
-	dac1_data[3] : LOCATION = Pin_168;
-	dac1_data[4] : LOCATION = Pin_169;
-	dac1_data[5] : LOCATION = Pin_170;
-	dac1_data[6] : LOCATION = Pin_173;
-	dac1_data[7] : LOCATION = Pin_174;
-	dac1_data[8] : LOCATION = Pin_175;
-	dac1_data[9] : LOCATION = Pin_176;
-	dac2_data[0] : LOCATION = Pin_159;
-	dac2_data[10] : LOCATION = Pin_163;
-	dac2_data[11] : LOCATION = Pin_139;
-	dac2_data[12] : LOCATION = Pin_164;
-	dac2_data[13] : LOCATION = Pin_138;
-	dac2_data[1] : LOCATION = Pin_158;
-	dac2_data[2] : LOCATION = Pin_160;
-	dac2_data[3] : LOCATION = Pin_156;
-	dac2_data[4] : LOCATION = Pin_161;
-	dac2_data[5] : LOCATION = Pin_144;
-	dac2_data[6] : LOCATION = Pin_162;
-	dac2_data[7] : LOCATION = Pin_141;
-	dac2_data[8] : LOCATION = Pin_143;
-	dac2_data[9] : LOCATION = Pin_140;
-	dac3_data[0] : LOCATION = Pin_122;
-	dac3_data[10] : LOCATION = Pin_134;
-	dac3_data[11] : LOCATION = Pin_135;
-	dac3_data[12] : LOCATION = Pin_136;
-	dac3_data[13] : LOCATION = Pin_137;
-	dac3_data[1] : LOCATION = Pin_123;
-	dac3_data[2] : LOCATION = Pin_124;
-	dac3_data[3] : LOCATION = Pin_125;
-	dac3_data[4] : LOCATION = Pin_126;
-	dac3_data[5] : LOCATION = Pin_127;
-	dac3_data[6] : LOCATION = Pin_128;
-	dac3_data[7] : LOCATION = Pin_131;
-	dac3_data[8] : LOCATION = Pin_132;
-	dac3_data[9] : LOCATION = Pin_133;
-	dac4_data[0] : LOCATION = Pin_104;
-	dac4_data[10] : LOCATION = Pin_118;
-	dac4_data[11] : LOCATION = Pin_119;
-	dac4_data[12] : LOCATION = Pin_120;
-	dac4_data[13] : LOCATION = Pin_121;
-	dac4_data[1] : LOCATION = Pin_105;
-	dac4_data[2] : LOCATION = Pin_106;
-	dac4_data[3] : LOCATION = Pin_107;
-	dac4_data[4] : LOCATION = Pin_108;
-	dac4_data[5] : LOCATION = Pin_113;
-	dac4_data[6] : LOCATION = Pin_114;
-	dac4_data[7] : LOCATION = Pin_115;
-	dac4_data[8] : LOCATION = Pin_116;
-	dac4_data[9] : LOCATION = Pin_117;
-	enable_rx : LOCATION = Pin_88;
-	enable_tx : LOCATION = Pin_93;
-	gndbus[0] : LOCATION = Pin_223;
-	gndbus[0] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[0] : IO_STANDARD = LVTTL;
-	gndbus[1] : LOCATION = Pin_225;
-	gndbus[1] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[1] : IO_STANDARD = LVTTL;
-	gndbus[2] : LOCATION = Pin_227;
-	gndbus[2] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[2] : IO_STANDARD = LVTTL;
-	gndbus[3] : LOCATION = Pin_62;
-	gndbus[3] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[3] : IO_STANDARD = LVTTL;
-	gndbus[4] : LOCATION = Pin_64;
-	gndbus[4] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[4] : IO_STANDARD = LVTTL;
-	misc_pins[0] : LOCATION = Pin_87;
-	misc_pins[0] : IO_STANDARD = LVTTL;
-	misc_pins[10] : LOCATION = Pin_76;
-	misc_pins[10] : IO_STANDARD = LVTTL;
-	misc_pins[11] : LOCATION = Pin_74;
-	misc_pins[11] : IO_STANDARD = LVTTL;
-	misc_pins[1] : LOCATION = Pin_86;
-	misc_pins[1] : IO_STANDARD = LVTTL;
-	misc_pins[2] : LOCATION = Pin_85;
-	misc_pins[2] : IO_STANDARD = LVTTL;
-	misc_pins[3] : LOCATION = Pin_84;
-	misc_pins[3] : IO_STANDARD = LVTTL;
-	misc_pins[4] : LOCATION = Pin_83;
-	misc_pins[4] : IO_STANDARD = LVTTL;
-	misc_pins[5] : LOCATION = Pin_82;
-	misc_pins[5] : IO_STANDARD = LVTTL;
-	misc_pins[6] : LOCATION = Pin_79;
-	misc_pins[6] : IO_STANDARD = LVTTL;
-	misc_pins[7] : LOCATION = Pin_78;
-	misc_pins[7] : IO_STANDARD = LVTTL;
-	misc_pins[8] : LOCATION = Pin_77;
-	misc_pins[8] : IO_STANDARD = LVTTL;
-	misc_pins[9] : LOCATION = Pin_75;
-	misc_pins[9] : IO_STANDARD = LVTTL;
-	reset : LOCATION = Pin_94;
-	usbclk : LOCATION = Pin_55;
-	usbctl[0] : LOCATION = Pin_56;
-	usbctl[1] : LOCATION = Pin_54;
-	usbctl[2] : LOCATION = Pin_53;
-	usbctl[3] : LOCATION = Pin_58;
-	usbctl[4] : LOCATION = Pin_57;
-	usbctl[5] : LOCATION = Pin_44;
-	usbdata[0] : LOCATION = Pin_73;
-	usbdata[10] : LOCATION = Pin_41;
-	usbdata[11] : LOCATION = Pin_39;
-	usbdata[12] : LOCATION = Pin_38;
-	usbdata[12] : IO_STANDARD = LVTTL;
-	usbdata[13] : LOCATION = Pin_37;
-	usbdata[14] : LOCATION = Pin_24;
-	usbdata[15] : LOCATION = Pin_23;
-	usbdata[1] : LOCATION = Pin_68;
-	usbdata[2] : LOCATION = Pin_67;
-	usbdata[3] : LOCATION = Pin_66;
-	usbdata[4] : LOCATION = Pin_65;
-	usbdata[5] : LOCATION = Pin_61;
-	usbdata[6] : LOCATION = Pin_60;
-	usbdata[7] : LOCATION = Pin_59;
-	usbdata[8] : LOCATION = Pin_43;
-	usbdata[9] : LOCATION = Pin_42;
-	usbrdy[0] : LOCATION = Pin_45;
-	usbrdy[1] : LOCATION = Pin_46;
-	usbrdy[2] : LOCATION = Pin_47;
-	usbrdy[3] : LOCATION = Pin_48;
-	usbrdy[4] : LOCATION = Pin_49;
-	usbrdy[5] : LOCATION = Pin_50;
-	clear_status : LOCATION = Pin_99;
-}
diff --git a/gr-radar-mono/src/fpga/top/usrp_radar_mono.esf b/gr-radar-mono/src/fpga/top/usrp_radar_mono.esf
deleted file mode 100644
index 6a8aaae42..000000000
--- a/gr-radar-mono/src/fpga/top/usrp_radar_mono.esf
+++ /dev/null
@@ -1,14 +0,0 @@
-SIMULATOR_SETTINGS
-{
-	ESTIMATE_POWER_CONSUMPTION = OFF;
-	GLITCH_INTERVAL = 1NS;
-	GLITCH_DETECTION = OFF;
-	SIMULATION_COVERAGE = ON;
-	CHECK_OUTPUTS = OFF;
-	SETUP_HOLD_DETECTION = OFF;
-	POWER_ESTIMATION_START_TIME = "0 NS";
-	ADD_DEFAULT_PINS_TO_SIMULATION_OUTPUT_WAVEFORMS = ON;
-	SIMULATION_MODE = TIMING;
-	START_TIME = 0NS;
-	USE_COMPILER_SETTINGS = usrp_radar_mono;
-}
diff --git a/gr-radar-mono/src/fpga/top/usrp_radar_mono.psf b/gr-radar-mono/src/fpga/top/usrp_radar_mono.psf
deleted file mode 100644
index 064967399..000000000
--- a/gr-radar-mono/src/fpga/top/usrp_radar_mono.psf
+++ /dev/null
@@ -1,312 +0,0 @@
-DEFAULT_DESIGN_ASSISTANT_SETTINGS
-{
-	HCPY_ALOAD_SIGNALS = OFF;
-	HCPY_VREF_PINS = OFF;
-	HCPY_CAT = OFF;
-	HCPY_ILLEGAL_HC_DEV_PKG = OFF;
-	ACLK_RULE_IMSZER_ADOMAIN = OFF;
-	ACLK_RULE_SZER_BTW_ACLK_DOMAIN = OFF;
-	ACLK_RULE_NO_SZER_ACLK_DOMAIN = OFF;
-	ACLK_CAT = OFF;
-	SIGNALRACE_RULE_ASYNCHPIN_SYNCH_CLKPIN = OFF;
-	SIGNALRACE_CAT = OFF;
-	NONSYNCHSTRUCT_RULE_LATCH_UNIDENTIFIED = OFF;
-	NONSYNCHSTRUCT_RULE_SRLATCH = OFF;
-	NONSYNCHSTRUCT_RULE_DLATCH = OFF;
-	NONSYNCHSTRUCT_RULE_MULTI_VIBRATOR = OFF;
-	NONSYNCHSTRUCT_RULE_ILLEGAL_PULSE_GEN = OFF;
-	NONSYNCHSTRUCT_RULE_RIPPLE_CLK = OFF;
-	NONSYNCHSTRUCT_RULE_DELAY_CHAIN = OFF;
-	NONSYNCHSTRUCT_RULE_REG_LOOP = OFF;
-	NONSYNCHSTRUCT_RULE_COMBLOOP = OFF;
-	NONSYNCHSTRUCT_CAT = OFF;
-	NONSYNCHSTRUCT_RULE_COMB_DRIVES_RAM_WE = OFF;
-	TIMING_RULE_COIN_CLKEDGE = OFF;
-	TIMING_RULE_SHIFT_REG = OFF;
-	TIMING_RULE_HIGH_FANOUTS = OFF;
-	TIMING_CAT = OFF;
-	RESET_RULE_ALL = OFF;
-	RESET_RULE_IMSYNCH_ASYNCH_DOMAIN = OFF;
-	RESET_RULE_UNSYNCH_ASYNCH_DOMAIN = OFF;
-	RESET_RULE_REG_ASNYCH = OFF;
-	RESET_RULE_COMB_ASYNCH_RESET = OFF;
-	RESET_RULE_IMSYNCH_EXRESET = OFF;
-	RESET_RULE_UNSYNCH_EXRESET = OFF;
-	RESET_RULE_INPINS_RESETNET = OFF;
-	RESET_CAT = OFF;
-	CLK_RULE_ALL = OFF;
-	CLK_RULE_MIX_EDGES = OFF;
-	CLK_RULE_CLKNET_CLKSPINES = OFF;
-	CLK_RULE_INPINS_CLKNET = OFF;
-	CLK_RULE_GATING_SCHEME = OFF;
-	CLK_RULE_INV_CLOCK = OFF;
-	CLK_RULE_COMB_CLOCK = OFF;
-	CLK_CAT = OFF;
-	HCPY_EXCEED_USER_IO_USAGE = OFF;
-	HCPY_EXCEED_RAM_USAGE = OFF;
-	NONSYNCHSTRUCT_RULE_ASYN_RAM = OFF;
-	SIGNALRACE_RULE_TRISTATE = OFF;
-	ASSG_RULE_MISSING_TIMING = OFF;
-	ASSG_RULE_MISSING_FMAX = OFF;
-	ASSG_CAT = OFF;
-}
-SYNTHESIS_FITTING_SETTINGS
-{
-	AUTO_SHIFT_REGISTER_RECOGNITION = ON;
-	AUTO_DSP_RECOGNITION = ON;
-	AUTO_RAM_RECOGNITION = ON;
-	REMOVE_DUPLICATE_LOGIC = ON;
-	AUTO_TURBO_BIT = ON;
-	AUTO_MERGE_PLLS = ON;
-	AUTO_OPEN_DRAIN_PINS = ON;
-	AUTO_PARALLEL_EXPANDERS = ON;
-	AUTO_FAST_OUTPUT_ENABLE_REGISTERS = OFF;
-	AUTO_FAST_OUTPUT_REGISTERS = OFF;
-	AUTO_FAST_INPUT_REGISTERS = OFF;
-	AUTO_CASCADE_CHAINS = ON;
-	AUTO_CARRY_CHAINS = ON;
-	AUTO_DELAY_CHAINS = ON;
-	MAX7000_PARALLEL_EXPANDER_CHAIN_LENGTH = 4;
-	PARALLEL_EXPANDER_CHAIN_LENGTH = 16;
-	CASCADE_CHAIN_LENGTH = 2;
-	STRATIX_CARRY_CHAIN_LENGTH = 70;
-	MERCURY_CARRY_CHAIN_LENGTH = 48;
-	FLEX10K_CARRY_CHAIN_LENGTH = 32;
-	FLEX6K_CARRY_CHAIN_LENGTH = 32;
-	CARRY_CHAIN_LENGTH = 48;
-	CARRY_OUT_PINS_LCELL_INSERT = ON;
-	NORMAL_LCELL_INSERT = ON;
-	AUTO_LCELL_INSERTION = ON;
-	ALLOW_XOR_GATE_USAGE = ON;
-	AUTO_PACKED_REGISTERS_STRATIX = NORMAL;
-	AUTO_PACKED_REGISTERS = OFF;
-	AUTO_PACKED_REG_CYCLONE = NORMAL;
-	FLEX10K_OPTIMIZATION_TECHNIQUE = AREA;
-	FLEX6K_OPTIMIZATION_TECHNIQUE = AREA;
-	MERCURY_OPTIMIZATION_TECHNIQUE = AREA;
-	APEX20K_OPTIMIZATION_TECHNIQUE = SPEED;
-	MAX7000_OPTIMIZATION_TECHNIQUE = SPEED;
-	STRATIX_OPTIMIZATION_TECHNIQUE = SPEED;
-	CYCLONE_OPTIMIZATION_TECHNIQUE = AREA;
-	FLEX10K_TECHNOLOGY_MAPPER = LUT;
-	FLEX6K_TECHNOLOGY_MAPPER = LUT;
-	MERCURY_TECHNOLOGY_MAPPER = LUT;
-	APEX20K_TECHNOLOGY_MAPPER = LUT;
-	MAX7000_TECHNOLOGY_MAPPER = "PRODUCT TERM";
-	STRATIX_TECHNOLOGY_MAPPER = LUT;
-	AUTO_IMPLEMENT_IN_ROM = OFF;
-	AUTO_GLOBAL_MEMORY_CONTROLS = OFF;
-	AUTO_GLOBAL_REGISTER_CONTROLS = ON;
-	AUTO_GLOBAL_OE = ON;
-	AUTO_GLOBAL_CLOCK = ON;
-	USE_LPM_FOR_AHDL_OPERATORS = ON;
-	LIMIT_AHDL_INTEGERS_TO_32_BITS = OFF;
-	ENABLE_BUS_HOLD_CIRCUITRY = OFF;
-	WEAK_PULL_UP_RESISTOR = OFF;
-	TURBO_BIT = ON;
-	MAX7000_IGNORE_SOFT_BUFFERS = OFF;
-	IGNORE_SOFT_BUFFERS = ON;
-	MAX7000_IGNORE_LCELL_BUFFERS = AUTO;
-	IGNORE_LCELL_BUFFERS = OFF;
-	IGNORE_ROW_GLOBAL_BUFFERS = OFF;
-	IGNORE_GLOBAL_BUFFERS = OFF;
-	IGNORE_CASCADE_BUFFERS = OFF;
-	IGNORE_CARRY_BUFFERS = OFF;
-	REMOVE_DUPLICATE_REGISTERS = ON;
-	REMOVE_REDUNDANT_LOGIC_CELLS = OFF;
-	ALLOW_POWER_UP_DONT_CARE = ON;
-	PCI_IO = OFF;
-	NOT_GATE_PUSH_BACK = ON;
-	SLOW_SLEW_RATE = OFF;
-	DSP_BLOCK_BALANCING = AUTO;
-	STATE_MACHINE_PROCESSING = AUTO;
-}
-DEFAULT_HARDCOPY_SETTINGS
-{
-	HARDCOPY_EXTERNAL_CLOCK_JITTER = "0.0 NS";
-}
-DEFAULT_TIMING_REQUIREMENTS
-{
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	RUN_ALL_TIMING_ANALYSES = ON;
-	IGNORE_CLOCK_SETTINGS = OFF;
-	DEFAULT_HOLD_MULTICYCLE = "SAME AS MULTICYCLE";
-	CUT_OFF_IO_PIN_FEEDBACK = ON;
-	CUT_OFF_CLEAR_AND_PRESET_PATHS = ON;
-	CUT_OFF_READ_DURING_WRITE_PATHS = ON;
-	CUT_OFF_PATHS_BETWEEN_CLOCK_DOMAINS = ON;
-	DO_MIN_ANALYSIS = ON;
-	DO_MIN_TIMING = OFF;
-	NUMBER_OF_PATHS_TO_REPORT = 200;
-	NUMBER_OF_DESTINATION_TO_REPORT = 10;
-	NUMBER_OF_SOURCES_PER_DESTINATION_TO_REPORT = 10;
-	MAX_SCC_SIZE = 50;
-}
-HDL_SETTINGS
-{
-	VERILOG_INPUT_VERSION = VERILOG_2001;
-	ENABLE_IP_DEBUG = OFF;
-	VHDL_INPUT_VERSION = VHDL93;
-	VHDL_SHOW_LMF_MAPPING_MESSAGES = OFF;
-}
-PROJECT_INFO(usrp_radar_mono)
-{
-	ORIGINAL_QUARTUS_VERSION = 3.0;
-	PROJECT_CREATION_TIME_DATE = "00:14:04  JULY 13, 2003";
-	LAST_QUARTUS_VERSION = 3.0;
-	SHOW_REGISTRATION_MESSAGE = ON;
-	USER_LIBRARIES = "h:\\gnuradio\\trunk\\usrp\\fpga\\megacells";
-}
-THIRD_PARTY_EDA_TOOLS(usrp_radar_mono)
-{
-	EDA_DESIGN_ENTRY_SYNTHESIS_TOOL = "<NONE>";
-	EDA_SIMULATION_TOOL = "<NONE>";
-	EDA_TIMING_ANALYSIS_TOOL = "<NONE>";
-	EDA_BOARD_DESIGN_TOOL = "<NONE>";
-	EDA_FORMAL_VERIFICATION_TOOL = "<NONE>";
-	EDA_RESYNTHESIS_TOOL = "<NONE>";
-}
-EDA_TOOL_SETTINGS(eda_design_synthesis)
-{
-	EDA_INPUT_GND_NAME = GND;
-	EDA_INPUT_VCC_NAME = VCC;
-	EDA_SHOW_LMF_MAPPING_MESSAGES = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_INPUT_DATA_FORMAT = EDIF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_simulation)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_timing_analysis)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	EDA_LAUNCH_CMD_LINE_TOOL = OFF;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_board_design)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_formal_verification)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_palace)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	RESYNTHESIS_RETIMING = FULL;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-}
-CLOCK(clk_120mhz)
-{
-	FMAX_REQUIREMENT = "120.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(usbclk)
-{
-	FMAX_REQUIREMENT = "48.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(SCLK)
-{
-	FMAX_REQUIREMENT = "1.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(adclk0)
-{
-	FMAX_REQUIREMENT = "60.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(adclk1)
-{
-	FMAX_REQUIREMENT = "60.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
diff --git a/gr-radar-mono/src/fpga/top/usrp_radar_mono.qpf b/gr-radar-mono/src/fpga/top/usrp_radar_mono.qpf
deleted file mode 100644
index d85239e99..000000000
--- a/gr-radar-mono/src/fpga/top/usrp_radar_mono.qpf
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 1991-2004 Altera Corporation
-# Any  megafunction  design,  and related netlist (encrypted  or  decrypted),
-# support information,  device programming or simulation file,  and any other
-# associated  documentation or information  provided by  Altera  or a partner
-# under  Altera's   Megafunction   Partnership   Program  may  be  used  only
-# to program  PLD  devices (but not masked  PLD  devices) from  Altera.   Any
-# other  use  of such  megafunction  design,  netlist,  support  information,
-# device programming or simulation file,  or any other  related documentation
-# or information  is prohibited  for  any  other purpose,  including, but not
-# limited to  modification,  reverse engineering,  de-compiling, or use  with
-# any other  silicon devices,  unless such use is  explicitly  licensed under
-# a separate agreement with  Altera  or a megafunction partner.  Title to the
-# intellectual property,  including patents,  copyrights,  trademarks,  trade
-# secrets,  or maskworks,  embodied in any such megafunction design, netlist,
-# support  information,  device programming or simulation file,  or any other
-# related documentation or information provided by  Altera  or a megafunction
-# partner, remains with Altera, the megafunction partner, or their respective
-# licensors. No other licenses, including any licenses needed under any third
-# party's intellectual property, are provided herein.
-
-
-
-QUARTUS_VERSION = "4.0"
-DATE = "17:10:11  December 20, 2004"
-
-
-# Active Revisions
-
-PROJECT_REVISION = "usrp_radar_mono"
diff --git a/gr-radar-mono/src/fpga/top/usrp_radar_mono.qsf b/gr-radar-mono/src/fpga/top/usrp_radar_mono.qsf
deleted file mode 100644
index 9b13989c2..000000000
--- a/gr-radar-mono/src/fpga/top/usrp_radar_mono.qsf
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright (C) 1991-2007 Altera Corporation
-# Your use of Altera Corporation's design tools, logic functions 
-# and other software and tools, and its AMPP partner logic 
-# functions, and any output files from any of the foregoing 
-# (including device programming or simulation files), and any 
-# associated documentation or information are expressly subject 
-# to the terms and conditions of the Altera Program License 
-# Subscription Agreement, Altera MegaCore Function License 
-# Agreement, or other applicable license agreement, including, 
-# without limitation, that your use is for the sole purpose of 
-# programming logic devices manufactured by Altera and sold by 
-# Altera or its authorized distributors.  Please refer to the 
-# applicable agreement for further details.
-
-
-# The default values for assignments are stored in the file
-#		usrp_radar_mono_assignment_defaults.qdf
-# If this file doesn't exist, and for assignments not listed, see file
-#		assignment_defaults.qdf
-
-# Altera recommends that you do not modify this file. This
-# file is updated automatically by the Quartus II software
-# and any changes you make may be lost or overwritten.
-
-
-
-# Project-Wide Assignments
-# ========================
-set_global_assignment -name ORIGINAL_QUARTUS_VERSION 3.0
-set_global_assignment -name PROJECT_CREATION_TIME_DATE "00:14:04  JULY 13, 2003"
-set_global_assignment -name LAST_QUARTUS_VERSION "7.1 SP1"
-set_global_assignment -name MESSAGE_SUPPRESSION_RULE_FILE usrp_radar_mono.srf
-
-# Pin & Location Assignments
-# ==========================
-set_global_assignment -name RESERVE_PIN "AS INPUT TRI-STATED"
-set_location_assignment PIN_29 -to SCLK
-set_location_assignment PIN_117 -to SDI
-set_location_assignment PIN_28 -to usbclk
-set_location_assignment PIN_107 -to usbctl[0]
-set_location_assignment PIN_106 -to usbctl[1]
-set_location_assignment PIN_105 -to usbctl[2]
-set_location_assignment PIN_100 -to usbdata[0]
-set_location_assignment PIN_84 -to usbdata[10]
-set_location_assignment PIN_83 -to usbdata[11]
-set_location_assignment PIN_82 -to usbdata[12]
-set_location_assignment PIN_79 -to usbdata[13]
-set_location_assignment PIN_78 -to usbdata[14]
-set_location_assignment PIN_77 -to usbdata[15]
-set_location_assignment PIN_99 -to usbdata[1]
-set_location_assignment PIN_98 -to usbdata[2]
-set_location_assignment PIN_95 -to usbdata[3]
-set_location_assignment PIN_94 -to usbdata[4]
-set_location_assignment PIN_93 -to usbdata[5]
-set_location_assignment PIN_88 -to usbdata[6]
-set_location_assignment PIN_87 -to usbdata[7]
-set_location_assignment PIN_86 -to usbdata[8]
-set_location_assignment PIN_85 -to usbdata[9]
-set_location_assignment PIN_104 -to usbrdy[0]
-set_location_assignment PIN_101 -to usbrdy[1]
-set_location_assignment PIN_76 -to FX2_1
-set_location_assignment PIN_75 -to FX2_2
-set_location_assignment PIN_74 -to FX2_3
-set_location_assignment PIN_116 -to io_rx_a[0]
-set_location_assignment PIN_115 -to io_rx_a[1]
-set_location_assignment PIN_114 -to io_rx_a[2]
-set_location_assignment PIN_113 -to io_rx_a[3]
-set_location_assignment PIN_108 -to io_rx_a[4]
-set_location_assignment PIN_195 -to io_rx_a[5]
-set_location_assignment PIN_196 -to io_rx_a[6]
-set_location_assignment PIN_197 -to io_rx_a[7]
-set_location_assignment PIN_200 -to io_rx_a[8]
-set_location_assignment PIN_201 -to io_rx_a[9]
-set_location_assignment PIN_202 -to io_rx_a[10]
-set_location_assignment PIN_203 -to io_rx_a[11]
-set_location_assignment PIN_206 -to io_rx_a[12]
-set_location_assignment PIN_207 -to io_rx_a[13]
-set_location_assignment PIN_208 -to io_rx_a[14]
-set_location_assignment PIN_214 -to io_rx_b[0]
-set_location_assignment PIN_215 -to io_rx_b[1]
-set_location_assignment PIN_216 -to io_rx_b[2]
-set_location_assignment PIN_217 -to io_rx_b[3]
-set_location_assignment PIN_218 -to io_rx_b[4]
-set_location_assignment PIN_219 -to io_rx_b[5]
-set_location_assignment PIN_222 -to io_rx_b[6]
-set_location_assignment PIN_223 -to io_rx_b[7]
-set_location_assignment PIN_224 -to io_rx_b[8]
-set_location_assignment PIN_225 -to io_rx_b[9]
-set_location_assignment PIN_226 -to io_rx_b[10]
-set_location_assignment PIN_227 -to io_rx_b[11]
-set_location_assignment PIN_228 -to io_rx_b[12]
-set_location_assignment PIN_233 -to io_rx_b[13]
-set_location_assignment PIN_234 -to io_rx_b[14]
-set_location_assignment PIN_175 -to io_tx_a[0]
-set_location_assignment PIN_176 -to io_tx_a[1]
-set_location_assignment PIN_177 -to io_tx_a[2]
-set_location_assignment PIN_178 -to io_tx_a[3]
-set_location_assignment PIN_179 -to io_tx_a[4]
-set_location_assignment PIN_180 -to io_tx_a[5]
-set_location_assignment PIN_181 -to io_tx_a[6]
-set_location_assignment PIN_182 -to io_tx_a[7]
-set_location_assignment PIN_183 -to io_tx_a[8]
-set_location_assignment PIN_184 -to io_tx_a[9]
-set_location_assignment PIN_185 -to io_tx_a[10]
-set_location_assignment PIN_186 -to io_tx_a[11]
-set_location_assignment PIN_187 -to io_tx_a[12]
-set_location_assignment PIN_188 -to io_tx_a[13]
-set_location_assignment PIN_193 -to io_tx_a[14]
-set_location_assignment PIN_73 -to io_tx_b[0]
-set_location_assignment PIN_68 -to io_tx_b[1]
-set_location_assignment PIN_67 -to io_tx_b[2]
-set_location_assignment PIN_66 -to io_tx_b[3]
-set_location_assignment PIN_65 -to io_tx_b[4]
-set_location_assignment PIN_64 -to io_tx_b[5]
-set_location_assignment PIN_63 -to io_tx_b[6]
-set_location_assignment PIN_62 -to io_tx_b[7]
-set_location_assignment PIN_61 -to io_tx_b[8]
-set_location_assignment PIN_60 -to io_tx_b[9]
-set_location_assignment PIN_59 -to io_tx_b[10]
-set_location_assignment PIN_58 -to io_tx_b[11]
-set_location_assignment PIN_57 -to io_tx_b[12]
-set_location_assignment PIN_56 -to io_tx_b[13]
-set_location_assignment PIN_55 -to io_tx_b[14]
-set_location_assignment PIN_152 -to master_clk
-set_location_assignment PIN_144 -to rx_a_a[0]
-set_location_assignment PIN_143 -to rx_a_a[1]
-set_location_assignment PIN_141 -to rx_a_a[2]
-set_location_assignment PIN_140 -to rx_a_a[3]
-set_location_assignment PIN_139 -to rx_a_a[4]
-set_location_assignment PIN_138 -to rx_a_a[5]
-set_location_assignment PIN_137 -to rx_a_a[6]
-set_location_assignment PIN_136 -to rx_a_a[7]
-set_location_assignment PIN_135 -to rx_a_a[8]
-set_location_assignment PIN_134 -to rx_a_a[9]
-set_location_assignment PIN_133 -to rx_a_a[10]
-set_location_assignment PIN_132 -to rx_a_a[11]
-set_location_assignment PIN_23 -to rx_a_b[0]
-set_location_assignment PIN_21 -to rx_a_b[1]
-set_location_assignment PIN_20 -to rx_a_b[2]
-set_location_assignment PIN_19 -to rx_a_b[3]
-set_location_assignment PIN_18 -to rx_a_b[4]
-set_location_assignment PIN_17 -to rx_a_b[5]
-set_location_assignment PIN_16 -to rx_a_b[6]
-set_location_assignment PIN_15 -to rx_a_b[7]
-set_location_assignment PIN_14 -to rx_a_b[8]
-set_location_assignment PIN_13 -to rx_a_b[9]
-set_location_assignment PIN_12 -to rx_a_b[10]
-set_location_assignment PIN_11 -to rx_a_b[11]
-set_location_assignment PIN_131 -to rx_b_a[0]
-set_location_assignment PIN_128 -to rx_b_a[1]
-set_location_assignment PIN_127 -to rx_b_a[2]
-set_location_assignment PIN_126 -to rx_b_a[3]
-set_location_assignment PIN_125 -to rx_b_a[4]
-set_location_assignment PIN_124 -to rx_b_a[5]
-set_location_assignment PIN_123 -to rx_b_a[6]
-set_location_assignment PIN_122 -to rx_b_a[7]
-set_location_assignment PIN_121 -to rx_b_a[8]
-set_location_assignment PIN_120 -to rx_b_a[9]
-set_location_assignment PIN_119 -to rx_b_a[10]
-set_location_assignment PIN_118 -to rx_b_a[11]
-set_location_assignment PIN_8 -to rx_b_b[0]
-set_location_assignment PIN_7 -to rx_b_b[1]
-set_location_assignment PIN_6 -to rx_b_b[2]
-set_location_assignment PIN_5 -to rx_b_b[3]
-set_location_assignment PIN_4 -to rx_b_b[4]
-set_location_assignment PIN_3 -to rx_b_b[5]
-set_location_assignment PIN_2 -to rx_b_b[6]
-set_location_assignment PIN_240 -to rx_b_b[7]
-set_location_assignment PIN_239 -to rx_b_b[8]
-set_location_assignment PIN_238 -to rx_b_b[9]
-set_location_assignment PIN_237 -to rx_b_b[10]
-set_location_assignment PIN_236 -to rx_b_b[11]
-set_location_assignment PIN_156 -to SDO
-set_location_assignment PIN_153 -to SEN_FPGA
-set_location_assignment PIN_159 -to tx_a[0]
-set_location_assignment PIN_160 -to tx_a[1]
-set_location_assignment PIN_161 -to tx_a[2]
-set_location_assignment PIN_162 -to tx_a[3]
-set_location_assignment PIN_163 -to tx_a[4]
-set_location_assignment PIN_164 -to tx_a[5]
-set_location_assignment PIN_165 -to tx_a[6]
-set_location_assignment PIN_166 -to tx_a[7]
-set_location_assignment PIN_167 -to tx_a[8]
-set_location_assignment PIN_168 -to tx_a[9]
-set_location_assignment PIN_169 -to tx_a[10]
-set_location_assignment PIN_170 -to tx_a[11]
-set_location_assignment PIN_173 -to tx_a[12]
-set_location_assignment PIN_174 -to tx_a[13]
-set_location_assignment PIN_38 -to tx_b[0]
-set_location_assignment PIN_39 -to tx_b[1]
-set_location_assignment PIN_41 -to tx_b[2]
-set_location_assignment PIN_42 -to tx_b[3]
-set_location_assignment PIN_43 -to tx_b[4]
-set_location_assignment PIN_44 -to tx_b[5]
-set_location_assignment PIN_45 -to tx_b[6]
-set_location_assignment PIN_46 -to tx_b[7]
-set_location_assignment PIN_47 -to tx_b[8]
-set_location_assignment PIN_48 -to tx_b[9]
-set_location_assignment PIN_49 -to tx_b[10]
-set_location_assignment PIN_50 -to tx_b[11]
-set_location_assignment PIN_53 -to tx_b[12]
-set_location_assignment PIN_54 -to tx_b[13]
-set_location_assignment PIN_158 -to TXSYNC_A
-set_location_assignment PIN_37 -to TXSYNC_B
-set_location_assignment PIN_235 -to io_rx_b[15]
-set_location_assignment PIN_24 -to io_tx_b[15]
-set_location_assignment PIN_213 -to io_rx_a[15]
-set_location_assignment PIN_194 -to io_tx_a[15]
-set_location_assignment PIN_1 -to MYSTERY_SIGNAL
-
-# Classic Timing Assignments
-# ==========================
-set_global_assignment -name INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS OFF
-set_global_assignment -name MAX_SCC_SIZE 50
-
-# Analysis & Synthesis Assignments
-# ================================
-set_global_assignment -name SAVE_DISK_SPACE OFF
-set_global_assignment -name DEVICE_FILTER_PACKAGE "ANY QFP"
-set_global_assignment -name DEVICE_FILTER_PIN_COUNT 240
-set_global_assignment -name EDA_DESIGN_ENTRY_SYNTHESIS_TOOL "<None>"
-set_global_assignment -name FAMILY Cyclone
-set_global_assignment -name CYCLONE_OPTIMIZATION_TECHNIQUE BALANCED
-set_global_assignment -name STRATIX_OPTIMIZATION_TECHNIQUE SPEED
-set_global_assignment -name APEX20K_OPTIMIZATION_TECHNIQUE SPEED
-set_global_assignment -name VHDL_SHOW_LMF_MAPPING_MESSAGES OFF
-set_global_assignment -name USER_LIBRARIES "h:\\gnuradio\\trunk\\usrp\\fpga\\megacells"
-set_global_assignment -name AUTO_ENABLE_SMART_COMPILE ON
-set_global_assignment -name TOP_LEVEL_ENTITY usrp_radar_mono
-
-# Fitter Assignments
-# ==================
-set_global_assignment -name DEVICE EP1C12Q240C8
-set_global_assignment -name CYCLONE_CONFIGURATION_SCHEME "PASSIVE SERIAL"
-set_global_assignment -name RESERVE_ALL_UNUSED_PINS "AS INPUT TRI-STATED"
-set_global_assignment -name OPTIMIZE_HOLD_TIMING OFF
-set_global_assignment -name OPTIMIZE_TIMING "NORMAL COMPILATION"
-set_global_assignment -name PHYSICAL_SYNTHESIS_COMBO_LOGIC OFF
-set_global_assignment -name PHYSICAL_SYNTHESIS_REGISTER_DUPLICATION OFF
-set_global_assignment -name PHYSICAL_SYNTHESIS_REGISTER_RETIMING OFF
-set_global_assignment -name IO_PLACEMENT_OPTIMIZATION ON
-set_global_assignment -name PHYSICAL_SYNTHESIS_EFFORT NORMAL
-set_global_assignment -name INC_PLC_MODE OFF
-set_global_assignment -name ROUTING_BACK_ANNOTATION_MODE OFF
-set_instance_assignment -name IO_STANDARD LVTTL -to usbdata[12]
-set_global_assignment -name STRATIX_DEVICE_IO_STANDARD LVTTL
-set_global_assignment -name ERROR_CHECK_FREQUENCY_DIVISOR 1
-
-# EDA Netlist Writer Assignments
-# ==============================
-set_global_assignment -name EDA_SIMULATION_TOOL "<None>"
-set_global_assignment -name EDA_TIMING_ANALYSIS_TOOL "<NONE>"
-set_global_assignment -name EDA_BOARD_DESIGN_TOOL "<NONE>"
-set_global_assignment -name EDA_FORMAL_VERIFICATION_TOOL "<NONE>"
-set_global_assignment -name EDA_RESYNTHESIS_TOOL "<NONE>"
-
-# Assembler Assignments
-# =====================
-set_global_assignment -name USE_CONFIGURATION_DEVICE OFF
-set_global_assignment -name GENERATE_RBF_FILE ON
-set_global_assignment -name RESERVE_ALL_UNUSED_PINS_NO_OUTPUT_GND "AS INPUT TRI-STATED"
-set_global_assignment -name AUTO_RESTART_CONFIGURATION OFF
-
-# Simulator Assignments
-# =====================
-set_global_assignment -name START_TIME "0 ns"
-set_global_assignment -name VECTOR_COMPARE_TRIGGER_MODE INPUT_EDGE
-
-# Design Assistant Assignments
-# ============================
-set_global_assignment -name DRC_REPORT_TOP_FANOUT OFF
-set_global_assignment -name DRC_REPORT_FANOUT_EXCEEDING OFF
-set_global_assignment -name ASSG_CAT OFF
-set_global_assignment -name ASSG_RULE_MISSING_FMAX OFF
-set_global_assignment -name ASSG_RULE_MISSING_TIMING OFF
-set_global_assignment -name NONSYNCHSTRUCT_RULE_ASYN_RAM OFF
-set_global_assignment -name CLK_CAT OFF
-set_global_assignment -name CLK_RULE_COMB_CLOCK OFF
-set_global_assignment -name CLK_RULE_INV_CLOCK OFF
-set_global_assignment -name CLK_RULE_GATING_SCHEME OFF
-set_global_assignment -name CLK_RULE_INPINS_CLKNET OFF
-set_global_assignment -name CLK_RULE_CLKNET_CLKSPINES OFF
-set_global_assignment -name CLK_RULE_MIX_EDGES OFF
-set_global_assignment -name RESET_CAT OFF
-set_global_assignment -name RESET_RULE_INPINS_RESETNET OFF
-set_global_assignment -name RESET_RULE_UNSYNCH_EXRESET OFF
-set_global_assignment -name RESET_RULE_IMSYNCH_EXRESET OFF
-set_global_assignment -name RESET_RULE_COMB_ASYNCH_RESET OFF
-set_global_assignment -name RESET_RULE_UNSYNCH_ASYNCH_DOMAIN OFF
-set_global_assignment -name RESET_RULE_IMSYNCH_ASYNCH_DOMAIN OFF
-set_global_assignment -name TIMING_CAT OFF
-set_global_assignment -name TIMING_RULE_SHIFT_REG OFF
-set_global_assignment -name TIMING_RULE_COIN_CLKEDGE OFF
-set_global_assignment -name NONSYNCHSTRUCT_RULE_COMB_DRIVES_RAM_WE OFF
-set_global_assignment -name NONSYNCHSTRUCT_CAT OFF
-set_global_assignment -name NONSYNCHSTRUCT_RULE_COMBLOOP OFF
-set_global_assignment -name NONSYNCHSTRUCT_RULE_REG_LOOP OFF
-set_global_assignment -name NONSYNCHSTRUCT_RULE_DELAY_CHAIN OFF
-set_global_assignment -name NONSYNCHSTRUCT_RULE_RIPPLE_CLK OFF
-set_global_assignment -name NONSYNCHSTRUCT_RULE_ILLEGAL_PULSE_GEN OFF
-set_global_assignment -name NONSYNCHSTRUCT_RULE_MULTI_VIBRATOR OFF
-set_global_assignment -name NONSYNCHSTRUCT_RULE_SRLATCH OFF
-set_global_assignment -name NONSYNCHSTRUCT_RULE_LATCH_UNIDENTIFIED OFF
-set_global_assignment -name SIGNALRACE_CAT OFF
-set_global_assignment -name ACLK_CAT OFF
-set_global_assignment -name ACLK_RULE_NO_SZER_ACLK_DOMAIN OFF
-set_global_assignment -name ACLK_RULE_SZER_BTW_ACLK_DOMAIN OFF
-set_global_assignment -name ACLK_RULE_IMSZER_ADOMAIN OFF
-set_global_assignment -name HCPY_CAT OFF
-set_global_assignment -name HCPY_VREF_PINS OFF
-set_global_assignment -name ENABLE_DA_RULE "C101, C102, C103, C104, C105, C106, R101, R102, R103, R104, R105, T101, T102, A101, A102, A103, A104, A105, A106, A107, A108, A109, A110, S101, S102, D101, D102, D103, H102"
-set_global_assignment -name DISABLE_DA_RULE H101
-
-# SignalTap II Assignments
-# ========================
-set_global_assignment -name HUB_ENTITY_NAME SLD_HUB
-set_global_assignment -name HUB_INSTANCE_NAME SLD_HUB_INST
-set_global_assignment -name ENABLE_SIGNALTAP OFF
-
-# LogicLock Region Assignments
-# ============================
-set_global_assignment -name LOGICLOCK_INCREMENTAL_COMPILE_ASSIGNMENT OFF
-
-# start CLOCK(SCLK)
-# -----------------
-
-	# Classic Timing Assignments
-	# ==========================
-set_global_assignment -name DUTY_CYCLE 50 -section_id SCLK
-set_global_assignment -name FMAX_REQUIREMENT "1 MHz" -section_id SCLK
-
-# end CLOCK(SCLK)
-# ---------------
-
-# start CLOCK(master_clk)
-# -----------------------
-
-	# Classic Timing Assignments
-	# ==========================
-set_global_assignment -name DUTY_CYCLE 50 -section_id master_clk
-set_global_assignment -name FMAX_REQUIREMENT "64 MHz" -section_id master_clk
-
-# end CLOCK(master_clk)
-# ---------------------
-
-# start CLOCK(usbclk)
-# -------------------
-
-	# Classic Timing Assignments
-	# ==========================
-set_global_assignment -name DUTY_CYCLE 50 -section_id usbclk
-set_global_assignment -name FMAX_REQUIREMENT "48 MHz" -section_id usbclk
-
-# end CLOCK(usbclk)
-# -----------------
-
-# -----------------------------
-# start ENTITY(usrp_radar_mono)
-
-	# Classic Timing Assignments
-	# ==========================
-set_instance_assignment -name CLOCK_SETTINGS SCLK -to SCLK
-set_instance_assignment -name CLOCK_SETTINGS usbclk -to usbclk
-set_instance_assignment -name CLOCK_SETTINGS master_clk -to master_clk
-
-	# start DESIGN_PARTITION(Top)
-	# ---------------------------
-
-		# Incremental Compilation Assignments
-		# ===================================
-set_instance_assignment -name PARTITION_HIERARCHY no_file_for_top_partition -to | -section_id Top
-set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top
-
-	# end DESIGN_PARTITION(Top)
-	# -------------------------
-
-# end ENTITY(usrp_radar_mono)
-# ---------------------------
-set_global_assignment -name VERILOG_FILE usrp_radar_mono.v
-set_global_assignment -name VERILOG_FILE dacpll.v
-set_global_assignment -name VERILOG_FILE ../lib/cordic_nco.v
-set_global_assignment -name VERILOG_FILE ../lib/dac_interface.v
-set_global_assignment -name VERILOG_FILE ../lib/fifo32_2k.v
-set_global_assignment -name VERILOG_FILE ../lib/radar_control.v
-set_global_assignment -name VERILOG_FILE ../lib/radar_rx.v
-set_global_assignment -name VERILOG_FILE ../lib/radar_tx.v
-set_global_assignment -name VERILOG_FILE ../lib/radar.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/adc_interface.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/atr_delay.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/bidir_reg.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/clk_divider.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/cordic_stage.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/cordic.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/gen_sync.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/io_pins.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/master_control.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rssi.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rx_buffer.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rx_dcoffset.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/serial_io.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/setting_reg.v
-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/strobe_gen.v
\ No newline at end of file
diff --git a/gr-radar-mono/src/fpga/top/usrp_radar_mono.rbf b/gr-radar-mono/src/fpga/top/usrp_radar_mono.rbf
deleted file mode 100644
index ee8859b1b..000000000
--- a/gr-radar-mono/src/fpga/top/usrp_radar_mono.rbf
+++ /dev/null
diff --git a/gr-radar-mono/src/fpga/top/usrp_radar_mono.srf b/gr-radar-mono/src/fpga/top/usrp_radar_mono.srf
deleted file mode 100644
index e5645322b..000000000
--- a/gr-radar-mono/src/fpga/top/usrp_radar_mono.srf
+++ /dev/null
@@ -1,65 +0,0 @@
-{ "Warning" "WSGN_SEARCH_FILE" "../../../../../trunk/usrp/fpga/megacells/bustri.v 1 1 " "Warning: Using design file ../../../../../trunk/usrp/fpga/megacells/bustri.v, which is not specified as a design file for the current project, but contains definitions for 1 design units and 1 entities in project" {  } {  } 0 0 "Using design file %1!s!, which is not specified as a design file for the current project, but contains definitions for %2!d! design units and %3!d! entities in project" 1 0 "" 0}

-{ "Warning" "WSGN_SEARCH_FILE" "../../../../../trunk/usrp/fpga/megacells/fifo_4k.v 10 10 " "Warning: Using design file ../../../../../trunk/usrp/fpga/megacells/fifo_4k.v, which is not specified as a design file for the current project, but contains definitions for 10 design units and 10 entities in project" {  } {  } 0 0 "Using design file %1!s!, which is not specified as a design file for the current project, but contains definitions for %2!d! design units and %3!d! entities in project" 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_rx_delay 12 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_rx_delay\" is connected to a signal of width 12. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_rx_delay" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 138 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_tx_delay 12 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_tx_delay\" is connected to a signal of width 12. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_tx_delay" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 137 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_rxval_3 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_rxval_3\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_rxval_3" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 134 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_txval_3 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_txval_3\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_txval_3" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 133 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_mask_3 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_mask_3\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_mask_3" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 132 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_rxval_2 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_rxval_2\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_rxval_2" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 130 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_txval_2 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_txval_2\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_txval_2" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 129 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_mask_2 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_mask_2\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_mask_2" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 128 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_rxval_1 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_rxval_1\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_rxval_1" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 126 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_txval_1 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_txval_1\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_txval_1" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 125 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_mask_1 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_mask_1\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_mask_1" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 124 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_rxval_0 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_rxval_0\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_rxval_0" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 122 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_txval_0 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_txval_0\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_txval_0" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 121 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_atr_mask_0 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_atr_mask_0\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_atr_mask_0" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 120 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_WIDE" "ratio clk_div_3 7 8 " "Warning: Port \"ratio\" on the entity instantiation of \"clk_div_3\" is connected to a signal of width 7. The formal width of the signal in the module is 8.  Extra bits will be driven by GND." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "clk_div_3" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 98 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be driven by GND." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_WIDE" "ratio clk_div_2 7 8 " "Warning: Port \"ratio\" on the entity instantiation of \"clk_div_2\" is connected to a signal of width 7. The formal width of the signal in the module is 8.  Extra bits will be driven by GND." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "clk_div_2" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 97 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be driven by GND." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_WIDE" "ratio clk_div_1 7 8 " "Warning: Port \"ratio\" on the entity instantiation of \"clk_div_1\" is connected to a signal of width 7. The formal width of the signal in the module is 8.  Extra bits will be driven by GND." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "clk_div_1" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 96 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be driven by GND." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_WIDE" "ratio clk_div_0 7 8 " "Warning: Port \"ratio\" on the entity instantiation of \"clk_div_0\" is connected to a signal of width 7. The formal width of the signal in the module is 8.  Extra bits will be driven by GND." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "clk_div_0" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 95 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be driven by GND." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_debugen 4 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_debugen\" is connected to a signal of width 4. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_debugen" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 93 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_rxbref 8 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_rxbref\" is connected to a signal of width 8. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_rxbref" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 91 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_txbref 8 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_txbref\" is connected to a signal of width 8. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_txbref" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 90 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_rxaref 8 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_rxaref\" is connected to a signal of width 8. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_rxaref" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 89 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_txaref 8 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_txaref\" is connected to a signal of width 8. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_txaref" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 88 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_decim 8 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_decim\" is connected to a signal of width 8. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_decim" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 51 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_interp 8 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_interp\" is connected to a signal of width 8. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_interp" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 50 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_mstr_ctrl 8 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_mstr_ctrl\" is connected to a signal of width 8. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/master_control.v" "sr_mstr_ctrl" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/master_control.v" 42 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage11 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage11\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage11" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 100 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage10 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage10\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage10" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 99 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage9 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage9\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage9" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 98 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage8 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage8\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage8" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 97 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage7 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage7\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage7" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 96 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage6 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage6\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage6" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 95 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage5 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage5\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage5" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 94 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage4 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage4\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage4" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 93 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage3 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage3\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage3" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 92 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage2 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage2\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage2" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 91 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage1 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage1\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage1" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 90 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_INPUT_PORT_TOO_NARROW" "ordered port 6 cordic_stage0 16 15 " "Warning: Port \"ordered port 6\" on the entity instantiation of \"cordic_stage0\" is connected to a signal of width 16. The formal width of the signal in the module is 15.  Extra bits will be ignored." {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "cordic_stage0" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 89 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be ignored." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_ampl 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_ampl\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../lib/radar_control.v" "sr_ampl" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/lib/radar_control.v" 81 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_tlook 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_tlook\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../lib/radar_control.v" "sr_tlook" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/lib/radar_control.v" 75 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_tsw 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_tsw\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../lib/radar_control.v" "sr_tsw" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/lib/radar_control.v" 72 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_ton 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_ton\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../lib/radar_control.v" "sr_ton" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/lib/radar_control.v" 69 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_rxformat 11 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_rxformat\" is connected to a signal of width 11. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/rx_buffer.v" "sr_rxformat" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/rx_buffer.v" 66 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_rxmux 20 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_rxmux\" is connected to a signal of width 20. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/adc_interface.v" "sr_rxmux" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/adc_interface.v" 54 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_dco_en 4 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_dco_en\" is connected to a signal of width 4. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../../../../usrp/fpga/sdr_lib/adc_interface.v" "sr_dco_en" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/adc_interface.v" 32 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WCDB_SGATE_CDB_WARN_TRIVIAL_REG" "radar:radar_mono\|radar_tx:transmitter\|cordic_nco:nco\|cordic:tx_cordic\|y0\[0\] data_in GND " "Warning: Reduced register \"radar:radar_mono\|radar_tx:transmitter\|cordic_nco:nco\|cordic:tx_cordic\|y0\[0\]\" with stuck data_in port to stuck value GND" {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 64 -1 0 } }  } 0 0 "Reduced register \"%1!s!\" with stuck %2!s! port to stuck value %3!s!" 1 0 "" 0}

-{ "Warning" "WCDB_SGATE_CDB_WARN_TRIVIAL_REG" "radar:radar_mono\|radar_tx:transmitter\|cordic_nco:nco\|cordic:tx_cordic\|y0\[1\] data_in GND " "Warning: Reduced register \"radar:radar_mono\|radar_tx:transmitter\|cordic_nco:nco\|cordic:tx_cordic\|y0\[1\]\" with stuck data_in port to stuck value GND" {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 64 -1 0 } }  } 0 0 "Reduced register \"%1!s!\" with stuck %2!s! port to stuck value %3!s!" 1 0 "" 0}

-{ "Warning" "WCDB_SGATE_CDB_WARN_TRIVIAL_REG" "master_control:master_control\|atr_delay:atr_delay\|state.0001 data_in GND " "Warning: Reduced register \"master_control:master_control\|atr_delay:atr_delay\|state.0001\" with stuck data_in port to stuck value GND" {  } { { "../../../../usrp/fpga/sdr_lib/atr_delay.v" "" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/atr_delay.v" 31 -1 0 } }  } 0 0 "Reduced register \"%1!s!\" with stuck %2!s! port to stuck value %3!s!" 1 0 "" 0}

-{ "Warning" "WOPT_MLS_STUCK_PIN_HDR" "" "Warning: Output pins are stuck at VCC or GND" { { "Warning" "WOPT_MLS_STUCK_PIN" "MYSTERY_SIGNAL GND " "Warning: Pin \"MYSTERY_SIGNAL\" stuck at GND" {  } { { "usrp_radar_mono.v" "" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/top/usrp_radar_mono.v" 24 -1 0 } }  } 0 0 "Pin \"%1!s!\" stuck at %2!s!" 1 0 "" 0}  } {  } 0 0 "Output pins are stuck at VCC or GND" 0 0 "" 0}

-{ "Warning" "WOPT_MLS_STUCK_PIN_HDR" "" "Warning: Output pins are stuck at VCC or GND" { { "Warning" "WOPT_MLS_STUCK_PIN" "FX2_3 GND " "Warning: Pin \"FX2_3\" stuck at GND" {  } { { "usrp_radar_mono.v" "" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/top/usrp_radar_mono.v" 33 -1 0 } }  } 0 0 "Pin \"%1!s!\" stuck at %2!s!" 1 0 "" 0}  } {  } 0 0 "Output pins are stuck at VCC or GND" 0 0 "" 0}

-{ "Warning" "WOPT_MLS_STUCK_PIN_HDR" "" "Warning: Output pins are stuck at VCC or GND" { { "Warning" "WOPT_MLS_STUCK_PIN" "usbrdy\[0\] GND " "Warning: Pin \"usbrdy\[0\]\" stuck at GND" {  } { { "usrp_radar_mono.v" "" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/top/usrp_radar_mono.v" 49 -1 0 } }  } 0 0 "Pin \"%1!s!\" stuck at %2!s!" 1 0 "" 0}  } {  } 0 0 "Output pins are stuck at VCC or GND" 0 0 "" 0}

-{ "Warning" "WCUT_CUT_UNNECESSARY_INPUT_PIN_HDR" "1 " "Warning: Design contains * input pin(s) that do not drive logic" { { "Warning" "WCUT_CUT_UNNECESSARY_INPUT_PIN" "usbctl\[0\] " "Warning: No output dependent on input pin \"usbctl\[0\]\"" {  } { { "usrp_radar_mono.v" "" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/top/usrp_radar_mono.v" 48 -1 0 } }  } 0 0 "No output dependent on input pin \"%1!s!\"" 1 0 "" 0}  } {  } 0 0 "Design contains %1!d! input pin(s) that do not drive logic" 0 0 "" 0}

-{ "Warning" "WFIOMGR_BIDIR_OR_OUTPUT_WITH_TRIVIAL_DATAIN" "3 " "Warning: Following * pins have nothing, GND, or VCC driving datain port -- changes to this connectivity may change fitting results" { { "Info" "IFIOMGR_BIDIR_OR_OUTPUT_WITH_TRIVIAL_DATAIN_SUB" "MYSTERY_SIGNAL GND " "Info: Pin MYSTERY_SIGNAL has GND driving its datain port" {  } { { "usrp_radar_mono.v" "" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/top/usrp_radar_mono.v" 24 -1 0 } } { "c:/altera/71sp1/quartus/bin/Assignment Editor.qase" "" { Assignment "c:/altera/71sp1/quartus/bin/Assignment Editor.qase" 1 { { 0 "MYSTERY_SIGNAL" } } } } { "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" { Floorplan "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" "" { MYSTERY_SIGNAL } "NODE_NAME" } } { "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" { Floorplan "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" "" { MYSTERY_SIGNAL } "NODE_NAME" } }  } 0 0 "Pin %1!s! has %2!s! driving its datain port" 1 0 "" 0}  } {  } 0 0 "Following %1!d! pins have nothing, GND, or VCC driving datain port -- changes to this connectivity may change fitting results" 0 0 "" 0}

-{ "Warning" "WFIOMGR_BIDIR_OR_OUTPUT_WITH_TRIVIAL_DATAIN" "3 " "Warning: Following * pins have nothing, GND, or VCC driving datain port -- changes to this connectivity may change fitting results" { { "Info" "IFIOMGR_BIDIR_OR_OUTPUT_WITH_TRIVIAL_DATAIN_SUB" "FX2_3 GND " "Info: Pin FX2_3 has GND driving its datain port" {  } { { "usrp_radar_mono.v" "" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/top/usrp_radar_mono.v" 33 -1 0 } } { "c:/altera/71sp1/quartus/bin/Assignment Editor.qase" "" { Assignment "c:/altera/71sp1/quartus/bin/Assignment Editor.qase" 1 { { 0 "FX2_3" } } } } { "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" { Floorplan "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" "" { FX2_3 } "NODE_NAME" } } { "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" { Floorplan "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" "" { FX2_3 } "NODE_NAME" } }  } 0 0 "Pin %1!s! has %2!s! driving its datain port" 1 0 "" 0}  } {  } 0 0 "Following %1!d! pins have nothing, GND, or VCC driving datain port -- changes to this connectivity may change fitting results" 0 0 "" 0}

-{ "Warning" "WFIOMGR_BIDIR_OR_OUTPUT_WITH_TRIVIAL_DATAIN" "3 " "Warning: Following * pins have nothing, GND, or VCC driving datain port -- changes to this connectivity may change fitting results" { { "Info" "IFIOMGR_BIDIR_OR_OUTPUT_WITH_TRIVIAL_DATAIN_SUB" "usbrdy\[0\] GND " "Info: Pin usbrdy\[0\] has GND driving its datain port" {  } { { "usrp_radar_mono.v" "" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/top/usrp_radar_mono.v" 49 -1 0 } } { "c:/altera/71sp1/quartus/bin/Assignment Editor.qase" "" { Assignment "c:/altera/71sp1/quartus/bin/Assignment Editor.qase" 1 { { 0 "usbrdy\[0\]" } } } } { "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" { Floorplan "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" "" { usbrdy[0] } "NODE_NAME" } } { "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" { Floorplan "c:/altera/71sp1/quartus/bin/TimingClosureFloorplan.fld" "" "" { usbrdy[0] } "NODE_NAME" } }  } 0 0 "Pin %1!s! has %2!s! driving its datain port" 1 0 "" 0}  } {  } 0 0 "Following %1!d! pins have nothing, GND, or VCC driving datain port -- changes to this connectivity may change fitting results" 0 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_ampl 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_ampl\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../lib/radar_control.v" "sr_ampl" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/lib/radar_control.v" 79 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_tlook 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_tlook\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../lib/radar_control.v" "sr_tlook" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/lib/radar_control.v" 73 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_tsw 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_tsw\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../lib/radar_control.v" "sr_tsw" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/lib/radar_control.v" 70 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WSGN_WIDTH_MISMATCH_OUTPUT_PORT" "out sr_ton 16 32 " "Warning: Port \"out\" on the entity instantiation of \"sr_ton\" is connected to a signal of width 16. The formal width of the signal in the module is 32.  Extra bits will be left dangling without any fanout logic." {  } { { "../lib/radar_control.v" "sr_ton" { Text "H:/gnuradio/radar/gr-radar-mono/src/fpga/lib/radar_control.v" 67 0 0 } }  } 0 0 "Port \"%1!s!\" on the entity instantiation of \"%2!s!\" is connected to a signal of width %3!d!. The formal width of the signal in the module is %4!d!.  Extra bits will be left dangling without any fanout logic." 1 0 "" 0}

-{ "Warning" "WVRFX_L2_VERI_EXPRESSION_TRUNCATED_TO_FIT" "32 12 atr_delay.v(58) " "Warning (10230): Verilog HDL assignment warning at atr_delay.v(58): truncated value with size 32 to match size of target (12)" {  } { { "../../../../usrp/fpga/sdr_lib/atr_delay.v" "" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/atr_delay.v" 58 0 0 } }  } 0 10230 "Verilog HDL assignment warning at %3!s!: truncated value with size %1!d! to match size of target (%2!d!)" 1 0 "" 0}

-{ "Warning" "WVRFX_L2_VERI_EXPRESSION_TRUNCATED_TO_FIT" "32 12 atr_delay.v(71) " "Warning (10230): Verilog HDL assignment warning at atr_delay.v(71): truncated value with size 32 to match size of target (12)" {  } { { "../../../../usrp/fpga/sdr_lib/atr_delay.v" "" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/atr_delay.v" 71 0 0 } }  } 0 10230 "Verilog HDL assignment warning at %3!s!: truncated value with size %1!d! to match size of target (%2!d!)" 1 0 "" 0}

-{ "Warning" "WVRFX_L2_HDL_OBJECT_ASSIGNED_NOT_READ" "write_done serial_io.v(48) " "Warning (10036): Verilog HDL or VHDL warning at serial_io.v(48): object \"write_done\" assigned a value but never read" {  } { { "../../../../usrp/fpga/sdr_lib/serial_io.v" "" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/serial_io.v" 48 0 0 } }  } 0 10036 "Verilog HDL or VHDL warning at %2!s!: object \"%1!s!\" assigned a value but never read" 1 0 "" 0}

-{ "Warning" "WCDB_SGATE_CDB_WARN_TRIVIAL_REG" "radar:radar_mono\|radar_tx:transmitter\|cordic_nco:nco\|cordic:tx_cordic\|y0\[2\] data_in GND " "Warning: Reduced register \"radar:radar_mono\|radar_tx:transmitter\|cordic_nco:nco\|cordic:tx_cordic\|y0\[2\]\" with stuck data_in port to stuck value GND" {  } { { "../../../../usrp/fpga/sdr_lib/cordic.v" "" { Text "H:/gnuradio/radar/usrp/fpga/sdr_lib/cordic.v" 64 -1 0 } }  } 0 0 "Reduced register \"%1!s!\" with stuck %2!s! port to stuck value %3!s!" 1 0 "" 0}

diff --git a/gr-radar-mono/src/fpga/top/usrp_radar_mono.v b/gr-radar-mono/src/fpga/top/usrp_radar_mono.v
deleted file mode 100644
index 2620a3288..000000000
--- a/gr-radar-mono/src/fpga/top/usrp_radar_mono.v
+++ /dev/null
@@ -1,213 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2003,2004 Matt Ettus
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-module usrp_radar_mono
-(output MYSTERY_SIGNAL,
- input master_clk,
- input SCLK,
- input SDI,
- inout SDO,
- input SEN_FPGA,
-
- input FX2_1,
- output FX2_2,
- output FX2_3,
- 
- input wire [11:0] rx_a_a,
- input wire [11:0] rx_b_a,
- input wire [11:0] rx_a_b,
- input wire [11:0] rx_b_b,
-
- output wire [13:0] tx_a,
- output wire [13:0] tx_b,
-
- output wire TXSYNC_A,
- output wire TXSYNC_B,
- 
-  // USB interface
- input usbclk,
- input wire [2:0] usbctl,
- output wire [1:0] usbrdy,
- inout [15:0] usbdata,  // NB Careful, inout
-
- // These are the general purpose i/o's that go to the daughterboard slots
- inout wire [15:0] io_tx_a,
- inout wire [15:0] io_tx_b,
- inout wire [15:0] io_rx_a,
- inout wire [15:0] io_rx_b
- );	
-   wire [15:0] debugdata,debugctrl;
-   assign MYSTERY_SIGNAL = 1'b0;
-   
-   wire clk64;
-   
-   // wire WR = usbctl[0];
-   wire RD = usbctl[1];
-   wire OE = usbctl[2];
-
-   wire have_pkt_rdy;
-   assign usbrdy[0] = 1'b0; // have_space;
-   assign usbrdy[1] = have_pkt_rdy;
-
-   wire   tx_underrun, rx_overrun;    
-   wire   clear_status = FX2_1;
-   assign FX2_2 = rx_overrun;
-   assign FX2_3 = 1'b0; // tx_underrun;
-      
-   wire [15:0] usbdata_out;
-   
-   wire [3:0]  rx_numchan;
-   wire        enable_tx, enable_rx;
-   wire        tx_dsp_reset, rx_dsp_reset, tx_bus_reset, rx_bus_reset;
-   
-   // Tri-state bus macro
-   bustri bustri( .data(usbdata_out),.enabledt(OE),.tridata(usbdata) );
-
-   assign      clk64 = master_clk;
-
-   // TX
-   wire        tx_sample_strobe;
-   wire        io_tx_ena;
-   
-   wire        serial_strobe;
-   wire [6:0]  serial_addr;
-   wire [31:0] serial_data;
-
-   ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Transmit Side
-   
-   wire        tx_side;
-   wire [13:0] tx_i, tx_q;
-   wire [13:0] tx_dac;
-   wire        tx_sync;
-   
-   dac_interface dac(.clk_i(clk64),.rst_i(tx_dsp_reset),.ena_i(enable_tx),
-		     .strobe_i(tx_sample_strobe),.tx_i_i(tx_i),.tx_q_i(tx_q),
-		     .tx_data_o(tx_dac),.tx_sync_o(tx_sync));
-
-   // Route transmitted signal to side A or side B
-   assign tx_a = tx_side ? 14'b0 : tx_dac;
-   assign tx_b = tx_side ? tx_dac : 14'b0;
-   assign TXSYNC_A = tx_side ? 1'b0 : tx_sync;
-   assign TXSYNC_B = tx_side ? tx_sync : 1'b0;
-   
-   /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Receive Side
-   wire        rx_strobe;
-   wire [15:0] rx_adc0_i, rx_adc0_q;
-   wire [15:0] rx_buf_i, rx_buf_q;
-   
-   adc_interface adc_interface(.clock(clk64),.reset(rx_dsp_reset),.enable(enable_rx),
-			       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-			       .rx_a_a(rx_a_a),.rx_b_a(rx_b_a),.rx_a_b(rx_a_b),.rx_b_b(rx_b_b),
-			       .rssi_0(),.rssi_1(),.rssi_2(),.rssi_3(),
-			       .ddc0_in_i(rx_adc0_i),.ddc0_in_q(rx_adc0_q),
-			       .ddc1_in_i(),.ddc1_in_q(),
-			       .ddc2_in_i(),.ddc2_in_q(),
-			       .ddc3_in_i(),.ddc3_in_q(),.rx_numchan(rx_numchan) );
-
-   rx_buffer rx_buffer
-     ( .usbclk(usbclk),.bus_reset(rx_bus_reset),.reset(rx_dsp_reset),
-       .reset_regs(rx_dsp_reset),
-       .usbdata(usbdata_out),.RD(RD),.have_pkt_rdy(have_pkt_rdy),.rx_overrun(rx_overrun),
-       .channels(rx_numchan),
-       .ch_0(rx_buf_i),.ch_1(rx_buf_q),
-       .ch_2(),.ch_3(),
-       .ch_4(),.ch_5(),
-       .ch_6(),.ch_7(),
-       .rxclk(clk64),.rxstrobe(rx_strobe),
-       .clear_status(clear_status),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .debugbus() );
-   
-
-   ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Top level application
-   radar radar_mono ( .clk_i(clk64),.saddr_i(serial_addr),.sdata_i(serial_data),.s_strobe_i(serial_strobe),
-	     .tx_side_o(tx_side),.tx_strobe_o(tx_sample_strobe),.tx_dac_i_o(tx_i),.tx_dac_q_o(tx_q),
-	     .rx_adc_i_i(rx_adc0_i),.rx_adc_q_i(rx_adc0_q),
-	     .rx_strobe_o(rx_strobe),.rx_ech_i_o(rx_buf_i),.rx_ech_q_o(rx_buf_q),.io_tx_ena_o(io_tx_ena)
-	   );
-
-   // Route TX enable out to RFX transmit mixer enable
-   assign io_tx_a[5] = tx_side ? 1'bz : io_tx_ena;
-   assign io_tx_b[5] = tx_side ? io_tx_ena : 1'bz;
-
-   // Route opposite of TX enable out to RFX receive mixer
-   //assign io_rx_a[5] = tx_side ? 1'bz : ~io_tx_ena;
-   //assign io_rx_b[5] = tx_side ? ~io_tx_ena : 1'bz;
-   assign io_rx_a[5] = 1'b1;
-   assign io_rx_b[5] = 1'b1;
-   
-   
-   // Route TX enable out to RX/TX switch
-   assign io_tx_a[6] = tx_side ? 1'bz : ~io_tx_ena;
-   assign io_tx_b[6] = tx_side ? ~io_tx_ena : 1'bz;
-
-   // Enable common RX/TX antenna
-   assign io_rx_a[6] = tx_side ? 1'bz : 1'b0;
-   assign io_rx_b[6] = tx_side ? 1'b0 : 1'bz;
-   
-   ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Control Functions
-
-   wire [31:0] capabilities;
-   assign capabilities[7]   = 0;  // `TX_CAP_HB;
-   assign capabilities[6:4] = 1;  // `TX_CAP_NCHAN;
-   assign capabilities[3]   = 0;  // `RX_CAP_HB;
-   assign capabilities[2:0] = 2;  // `RX_CAP_NCHAN;
-
-   serial_io serial_io
-     ( .master_clk(clk64),.serial_clock(SCLK),.serial_data_in(SDI),
-       .enable(SEN_FPGA),.reset(1'b0),.serial_data_out(SDO),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .readback_0({io_rx_a,io_tx_a}),.readback_1({io_rx_b,io_tx_b}),.readback_2(capabilities),.readback_3(32'hf0f0931a),
-       .readback_4(),.readback_5(),.readback_6(),.readback_7()
-       );
-
-   wire [15:0] reg_0,reg_1,reg_2,reg_3;
-   master_control master_control
-     ( .master_clk(clk64),.usbclk(usbclk),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .tx_bus_reset(tx_bus_reset),.rx_bus_reset(rx_bus_reset),
-       .tx_dsp_reset(tx_dsp_reset),.rx_dsp_reset(rx_dsp_reset),
-       .enable_tx(enable_tx),.enable_rx(enable_rx),
-       .interp_rate(),.decim_rate(),
-       .tx_sample_strobe(),.strobe_interp(),
-       .rx_sample_strobe(),.strobe_decim(),
-       .tx_empty(),
-       .debug_0(),.debug_1(),
-       .debug_2(),.debug_3(),
-       .reg_0(reg_0),.reg_1(reg_1),.reg_2(reg_2),.reg_3(reg_3) );
-
-   wire [1:0] dummy_io = 2'bz;
-   
-   io_pins io_pins
-     (.io_0({io_tx_a[15:7],dummy_io,io_tx_a[4:0]}), // Don't connect pins used above
-      .io_1({io_rx_a[15:7],dummy_io,io_rx_a[4:0]}),
-      .io_2({io_tx_b[15:7],dummy_io,io_tx_b[4:0]}),
-      .io_3({io_rx_b[15:7],dummy_io,io_rx_b[4:0]}),
-      .reg_0(reg_0),.reg_1(reg_1),.reg_2(reg_2),.reg_3(reg_3),
-      .clock(clk64),.rx_reset(rx_dsp_reset),.tx_reset(tx_dsp_reset),
-      .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe));
-   
-endmodule // usrp_radar_mono
diff --git a/gr-radar-mono/src/lib/.gitignore b/gr-radar-mono/src/lib/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-radar-mono/src/lib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-radar-mono/src/python/.gitignore b/gr-radar-mono/src/python/.gitignore
deleted file mode 100644
index f104c5892..000000000
--- a/gr-radar-mono/src/python/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/Makefile
-/Makefile.in
-/run_tests
-/*.pyc
diff --git a/gr-radar-mono/src/python/Makefile.am b/gr-radar-mono/src/python/Makefile.am
deleted file mode 100644
index 535bb85a4..000000000
--- a/gr-radar-mono/src/python/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2007,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-radar_mono_pythondir = $(grpythondir)
-
-dist_bin_SCRIPTS = 	\
-	usrp_radar_mono.py
-
-radar_mono_python_PYTHON =	\
-	radar_mono.py
diff --git a/gr-radar-mono/src/python/qa_nothing.py b/gr-radar-mono/src/python/qa_nothing.py
deleted file mode 100644
index e69de29bb..000000000
--- a/gr-radar-mono/src/python/qa_nothing.py
+++ /dev/null
diff --git a/gr-radar-mono/src/python/radar_mono.py b/gr-radar-mono/src/python/radar_mono.py
deleted file mode 100644
index 1a7b9260a..000000000
--- a/gr-radar-mono/src/python/radar_mono.py
+++ /dev/null
@@ -1,330 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 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.
-# 
-
-from gnuradio import gr, usrp
-from gnuradio import eng_notation
-from gr import gr_threading as _threading
-
-n2s = eng_notation.num_to_str
-
-txp_delay = 60 # Pipeline delay to turn on transmit mixer
-rxp_delay = 76 # Pipeline delay to turn off transmit mixer
-
-#-----------------------------------------------------------------------
-# FPGA Register Definitions
-#-----------------------------------------------------------------------
-FR_RADAR_MODE           = usrp.FR_USER_0    # Operational mode
-bmFR_RADAR_MODE_RESET   = 1 << 0	# bit 0: active high reset
-bmFR_RADAR_TXSIDE       = 1 << 1        # bit 1: use TX side A or B
-#bmFR_RADAR_MODE_LP      = 1 << 2	# bit 2: enable digital loopback
-#bmFR_RADAR_MODE_DR      = 1 << 3	# bit 3: enable on-board deramping
-#bmFR_RADAR_MODE_MD      = 1 << 4   	# bit 4: enable echo metadata
-#bmFR_RADAR_MODE_CHIRPS  = 3 << 5   	# bit 5,6: number of chirp center frequencies
-bmFR_RADAR_DEBUG        = 1 << 7        # bit 7: enable debugging mode
-
-FR_RADAR_TON    = usrp.FR_USER_1	# 16-bit transmitter on time in clocks
-FR_RADAR_TSW    = usrp.FR_USER_2	# 16-bit transmitter switch time in clocks
-FR_RADAR_TLOOK  = usrp.FR_USER_3	# 16-bit receiver look time in clocks
-FR_RADAR_TIDLE  = usrp.FR_USER_4	# 32-bit inter-pulse idle time
-FR_RADAR_AMPL   = usrp.FR_USER_5  	# 16-bit pulse amplitude (2s complement) into CORDIC
-FR_RADAR_FSTART = usrp.FR_USER_6  	# 32-bit FTW for chirp start frequency
-FR_RADAR_FINCR  = usrp.FR_USER_7  	# 32-bit FTW increment per transmit clock
-FR_RADAR_ATRDEL = usrp.FR_USER_8        # 16-bit TX delay in clocks, 16-bit RX delay in clocks
-
-# These are for phase II development (need to renumber)
-#FR_RADAR_FREQ1N = usrp.FR_USER_8  # 24-bit N register for chirp #1
-#FR_RADAR_FREQ1R = usrp.FR_USER_9  # 24-bit R register for chirp #1
-#FR_RADAR_FREQ1C = usrp.FR_USER_10 # 24-bit C register for chirp #1
-#FR_RADAR_FREQ2N = usrp.FR_USER_11 # 24-bit N register for chirp #2
-#FR_RADAR_FREQ2R = usrp.FR_USER_12 # 24-bit R register for chirp #2
-#FR_RADAR_FREQ2C = usrp.FR_USER_13 # 24-bit C register for chirp #2
-#FR_RADAR_FREQ3N = usrp.FR_USER_14 # 24-bit N register for chirp #3
-#FR_RADAR_FREQ3R = usrp.FR_USER_15 # 24-bit R register for chirp #3
-#FR_RADAR_FREQ3C = usrp.FR_USER_16 # 24-bit C register for chirp #3
-#FR_RADAR_FREQ4N = usrp.FR_USER_17 # 24-bit N register for chirp #4
-#FR_RADAR_FREQ4R = usrp.FR_USER_18 # 24-bit R register for chirp #4
-#FR_RADAR_FREQ4C = usrp.FR_USER_19 # 24-bit C register for chirp #4
-
-#-----------------------------------------------------------------------
-# Transmitter object.  Uses usrp_sink, but only for a handle to the
-# FPGA registers.
-#-----------------------------------------------------------------------
-class radar_tx(object):
-    def __init__(self, options):
-        self._subdev_spec = options.tx_subdev_spec
-	self._verbose = options.verbose
-	self._debug = options.debug
-        self._u = usrp.sink_s(fpga_filename='usrp_radar_mono.rbf')
-
-        if self._subdev_spec == None:
-            self._subdev_spec = usrp.pick_tx_subdevice(self._u)
-
-        self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
-	self._subdev.set_lo_offset(0.0)
-	self._ton_ticks = 0
-	self._tsw_ticks = 0
-	self._tlook_ticks = 0
-	self._tidle_ticks = 0
-	
-        if self._verbose:
-            print "Using", self._subdev.name(), "for radar transmitter."            
-	    
-    def set_ton(self, ton):
-	self._ton_ticks = 2*(int(ton*64e6)/2)-1  # Even number, then subtract 1
-	if self._verbose:
-	    print "Setting pulse on time to", ton, " sec ("+`self._ton_ticks+1`+" ticks)"
-	self._u._write_fpga_reg(FR_RADAR_TON, self._ton_ticks)
-
-    def set_tsw(self, tsw):
-	self._tsw_ticks = 2*(int(tsw*64e6)/2)-1+rxp_delay  # Even number, then subtract 1
-	if self._verbose:
-	    print "Setting pulse switching time to", tsw, " sec ("+`self._tsw_ticks+1`+" ticks)"
-	self._u._write_fpga_reg(FR_RADAR_TSW, self._tsw_ticks)
-
-    def set_tlook(self, tlook):
-	self._tlook_ticks = 2*(int(tlook*64e6)/2)-1  # Even number, then subtract 1
-	if self._verbose:
-	    print "Setting receiver look time to", tlook, " sec ("+`self._tlook_ticks+1`+" ticks)"
-	self._u._write_fpga_reg(FR_RADAR_TLOOK, self._tlook_ticks)
-
-    def set_prf(self, prf):
-	period = 2*int(32e6/prf)
-	self._tidle_ticks = period-(self._ton_ticks+self._tsw_ticks+self._tlook_ticks+3)-1
-	if self._verbose:
-	    print "Setting PRF to", prf, "Hz ("+`self._tidle_ticks+1`+" ticks idle time)"
-	self._u._write_fpga_reg(FR_RADAR_TIDLE, self._tidle_ticks)
-
-    def set_amplitude(self, ampl):
-	self._amplitude = int(ampl*9946/100.0) # CORDIC gain correction
-        self._u._write_fpga_reg(FR_RADAR_AMPL, self._amplitude)
-
-    def set_freq(self, center_freq, chirp_width):
-        self._center_freq = center_freq
-        self._chirp_width = chirp_width
-	self._fstart = -int((chirp_width/2)*(2**32)/32e6)
-        self._fincr = int((chirp_width/16e6)*(2**32)/(self._ton_ticks+1))
-                          
-        if self._verbose:
-            print "Setting transmitter center frequency to", n2s(center_freq)
-            print "Setting chirp width to", n2s(chirp_width), "Hz "+"("+hex(self._fstart)+", "+hex(self._fincr)+")"
-
-        result = self._u.tune(0, self._subdev, center_freq)
-        if result == False:
-            raise RuntimeError("Failed to set transmitter frequency.")
-	self._u._write_fpga_reg(FR_RADAR_FSTART, self._fstart)
-        self._u._write_fpga_reg(FR_RADAR_FINCR, self._fincr)
-
-    def start(self):
-        self._u.start()
-	self._subdev.set_enable(True)
-	
-    def stop(self):
-	self._subdev.set_enable(False)
-	self._u.stop()
-
-    def subdev_spec(self):
-        return self._subdev_spec
-    
-    def echo_length(self):
-        return self._tlook_ticks+1
-
-    def __del__(self):
-	del self._subdev # Avoid weak reference error
-	
-#-----------------------------------------------------------------------
-# Receiver object.  Uses usrp_source_c to receive echo records.
-#-----------------------------------------------------------------------
-class radar_rx(gr.top_block):
-    def __init__(self, options, callback):
-	gr.top_block.__init__(self, "radar_rx")
-
-	self._u = None
-        self._subdev_spec = options.rx_subdev_spec
-        self._gain = options.gain
-	self._verbose = options.verbose
-        self._debug = options.debug
-        self._callback = callback
-	self._length_set = False
-	self._connected = False
-	self._frequency = 0.0
-        self._msgq = gr.msg_queue()
-        self._watcher = _queue_watcher_thread(self._msgq, self._callback)
-	        
-    def set_echo_length(self, length):
-        # Only call once
-	if self._length_set is True:
-	    raise RuntimeError("Can only set echo length once.")
-	self._length = length
-	self._length_set = True
-
-    def tune(self, frequency):
-        if self._verbose:
-            print "Setting receiver frequency to", n2s(frequency)
-	self._frequency = frequency
-	if (self._u):
-            result = self._u.tune(0, self._subdev, frequency)
-	    if result == False:
-    	        raise RuntimeError("Failed to set receiver frequency.")
-
-    def set_gain(self, gain):
-        self._gain = gain
-        if self._gain == None:
-            # if no gain was specified, use the mid-point in dB
-            g = self._subdev.gain_range()
-            self._gain = float(g[0]+g[1])/2
-        self._subdev.set_gain(self._gain)
-
-    def begin(self):
-	if not self._connected:
-	    self._setup_connections()
-	    
-        if self._verbose:
-            print "Starting receiver..."
-        self.start()
-
-    def end(self):
-        if self._verbose:
-            print "Stopping receiver..."
-        self.stop()
-	self.wait()
-        if self._verbose:
-            print "Receiver stopped."
-
-    def _setup_usrp(self):
-        self._u = usrp.source_c(fpga_filename='usrp_radar_mono.rbf')
-        if self._subdev_spec == None:
-            self._subdev_spec = usrp.pick_rx_subdevice(self._u)
-        self._u.set_mux(usrp.determine_rx_mux_value(self._u, self._subdev_spec))
-        self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
-
-        if self._verbose:
-            print "Using", self._subdev.side_and_name(), "for radar receiver."
-            print "Setting receiver gain to", self._gain
-        self.set_gain(self._gain)
-	self.tune(self._frequency)
-			
-    def _setup_connections(self):
-	if not self._length_set:
-	    raise RuntimeError("Echo length not set.")
-	self._setup_usrp()
-        self._vblen = gr.sizeof_gr_complex*self._length
-	self._s2v = gr.stream_to_vector(gr.sizeof_gr_complex, self._length)
-        self._sink = gr.message_sink(self._vblen, self._msgq, False)
-        self.connect(self._u, self._s2v, self._sink)
-
-        if self._verbose:
-            print "Generating echo vectors of length", self._length, \
-                  "(samples)", self._vblen, "(bytes)"
-
-	self._connected = True
-
-class radar(object):
-    def __init__(self, options, callback):
-	 
-        self._verbose = options.verbose
-        self._debug = options.debug
-
-	self._mode = 0
-        self._trans = radar_tx(options)	
-        self._rcvr = radar_rx(options, callback)
-	self.set_reset(True)
-	self.set_tx_board(self._trans.subdev_spec())
-        self.set_debug(self._debug)
-	self.set_atrdel()
-	        
-    def _write_mode(self):
-        self._trans._u._write_fpga_reg(FR_RADAR_MODE, self._mode)
-
-    def set_reset(self, value):
-	if value:
-	    self._mode |= bmFR_RADAR_MODE_RESET
-	else:
-	    self._mode &= ~bmFR_RADAR_MODE_RESET
-	self._write_mode()
-
-    def set_tx_board(self, tx_subdev_spec):
-	if tx_subdev_spec[0] == 1:
-	    self._mode |= bmFR_RADAR_TXSIDE
-	else:
-	    self._mode &= ~bmFR_RADAR_TXSIDE
-	self._write_mode()
-	
-    def set_debug(self, value):
-	if value:
-	    self._mode |= bmFR_RADAR_DEBUG
-	else:
-	    self._mode &= ~bmFR_RADAR_DEBUG
-	self._write_mode()
-    
-    def set_ton(self, ton):
-	self._trans.set_ton(ton)
-	
-    def set_tsw(self, tsw):
-	self._trans.set_tsw(tsw)
-	
-    def set_tlook(self, tlook):
-	self._trans.set_tlook(tlook)
-	self._rcvr.set_echo_length(self._trans.echo_length())
-	
-    def set_prf(self, prf):
-	self._trans.set_prf(prf)
-
-    def set_amplitude(self, ampl):
-        self._trans.set_amplitude(ampl)
-
-    def set_freq(self, center_freq, chirp_width):
-        self._trans.set_freq(center_freq, chirp_width)
-	self._rcvr.tune(center_freq)
-	        
-    def set_atrdel(self, tx_delay=txp_delay, rx_delay=rxp_delay):
-        if self._verbose:
-	    print "Setting TX delay of", tx_delay, "clocks, RX delay of", rx_delay
-        self._trans._u._write_fpga_reg(FR_RADAR_ATRDEL, tx_delay << 16 | rx_delay)
-
-    def start(self):
-	self.set_reset(False)
-	self._trans.start()
-	self._rcvr.begin()
-	
-    def stop(self):
-	self._rcvr.end()
-	self._trans.stop()
-	self.set_reset(True)
-
-#-----------------------------------------------------------------------
-# Queue watcher.  Dispatches received echos to callback.
-#-----------------------------------------------------------------------
-class _queue_watcher_thread(_threading.Thread):
-    def __init__(self, msgq, callback):
-        _threading.Thread.__init__(self)
-        self.setDaemon(1)
-        self._msgq = msgq
-        self._callback = callback
-        self._keep_running = True
-        self.start()
-
-    def run(self):
-        while self._keep_running == True:
-            msg = self._msgq.delete_head()
-            if self._callback:
-                self._callback(msg.to_string())
-
diff --git a/gr-radar-mono/src/python/usrp_radar_mono.py b/gr-radar-mono/src/python/usrp_radar_mono.py
deleted file mode 100755
index 3f2ad28e2..000000000
--- a/gr-radar-mono/src/python/usrp_radar_mono.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 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.
-# 
-
-from gnuradio import gr
-from gnuradio.radar_mono import radar
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys, time
-
-n2s = eng_notation.num_to_str
-logfile = None
-
-def process_echo(echo):
-    global logfile
-    if logfile is not None:
-        logfile.write(echo)
-        
-def main():
-    global logfile
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
-		      help="use transmitter board side A or B (default is first found)")
-    parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-		      help="use receiver board side A or B (default is first found)")
-    parser.add_option("-g", "--gain", type="eng_float", default=None,
-                      help="set gain in dB (default is midpoint)")
-    parser.add_option("-f", "--frequency", type="eng_float", default=0.0,
-                      help="set transmitter center frequency to FREQ in Hz, default is %default", metavar="FREQ")
-    parser.add_option("-w", "--chirp-width", type="eng_float", default=32e6,
-                      help="set LFM chirp bandwidth in Hz, default is %default", metavar="FREQ")
-    parser.add_option("-a", "--amplitude", type="eng_float", default=15,
-                      help="set waveform amplitude in % full scale, default is %default,")
-    parser.add_option("",   "--ton", type="eng_float", default=5e-6,
-		      help="set pulse on period in seconds, default is %default,")
-    parser.add_option("",   "--tsw", type="eng_float", default=0.0,
-		      help="set transmitter switching period in seconds, default is %default,")
-    parser.add_option("",   "--tlook", type="eng_float", default=5e-6,
-		      help="set receiver look time in seconds, default is %default,")
-    parser.add_option("",   "--prf", type="eng_float", default=100,
-		      help="set pulse repetition frequency in Hz, default is %default,")
-    parser.add_option("-v", "--verbose", action="store_true", default=False,
-                      help="enable verbose output, default is disabled")
-    parser.add_option("-D", "--debug", action="store_true", default=False,
-                      help="enable debugging output, default is disabled")
-    parser.add_option("-F", "--filename", default=None,
-                      help="log received echos to file")
-
-    (options, args) = parser.parse_args()
-
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
-
-    if options.filename is not None:
-        if options.verbose:
-            print "Logging echo records to file: ", options.filename
-	logfile = open(options.filename, 'wb')
-        
-    r = radar(options, process_echo)
-
-    r.set_ton(options.ton)
-    r.set_tsw(options.tsw)
-    r.set_tlook(options.tlook)
-    r.set_prf(options.prf)
-    r.set_amplitude(options.amplitude)
-    r.set_freq(options.frequency, options.chirp_width)
-    
-    r.start()
-    raw_input("Press ENTER to stop.")
-    r.stop()
-
-    if logfile is not None:
-        logfile.close()
-            
-if __name__ == "__main__":
-    main()
diff --git a/gr-radar-mono/src/utils/calc_avg.m b/gr-radar-mono/src/utils/calc_avg.m
deleted file mode 100644
index b240d245e..000000000
--- a/gr-radar-mono/src/utils/calc_avg.m
+++ /dev/null
@@ -1,8 +0,0 @@
-function avg = calc_avg(rlen, mintime)
-    avg = read_avg('echos.dat', rlen);
-    x = 1:rlen;
-    x = (x/64e6+mintime)*3e8/2;
-    plot(x, abs(avg), "^;Amplitude;");
-    xlabel("Range (meters)");
-    axis([max(x) 0])
-endfunction
diff --git a/gr-radar-mono/src/utils/czpad.m b/gr-radar-mono/src/utils/czpad.m
deleted file mode 100644
index e2131030d..000000000
--- a/gr-radar-mono/src/utils/czpad.m
+++ /dev/null
@@ -1,8 +0,0 @@
-# Center and zero pad v to length n
-function pad = czpad(v, n)
-    c = n/2;
-    l = length(v);
-    pad(c-l/2+1:c+l/2) = v;
-    pad(c+l/2+1:n) = 0;
-endfunction
- 
\ No newline at end of file
diff --git a/gr-radar-mono/src/utils/echo_image.m b/gr-radar-mono/src/utils/echo_image.m
deleted file mode 100644
index 2e066aef5..000000000
--- a/gr-radar-mono/src/utils/echo_image.m
+++ /dev/null
@@ -1,6 +0,0 @@
-function echo_image(filename, data)
-    d = abs(data);
-    d = d-min(min(d));
-    d = d/(max(max(d)))*255;
-    pngwrite(filename, d, d, d, ones(size(d)));
-endfunction
\ No newline at end of file
diff --git a/gr-radar-mono/src/utils/fftcorr.m b/gr-radar-mono/src/utils/fftcorr.m
deleted file mode 100644
index 548988973..000000000
--- a/gr-radar-mono/src/utils/fftcorr.m
+++ /dev/null
@@ -1,4 +0,0 @@
-# Perform circular correlation via FFT
-function corr = fftcorr(v,ref)
-    corr = ifft(conj(fft(ref)).*fft(v));
-endfunction
diff --git a/gr-radar-mono/src/utils/pulse b/gr-radar-mono/src/utils/pulse
deleted file mode 100644
index 887558d1e..000000000
--- a/gr-radar-mono/src/utils/pulse
+++ /dev/null
@@ -1,396 +0,0 @@
-# Created by Octave 2.1.73, Tue Sep 25 14:17:22 2007 EDT <jcorgan@mobile>
-# name: __nargin__
-# type: scalar
-0
-# name: pulse321
-# type: complex matrix
-# rows: 64
-# columns: 1
- (-0.0003662109375,0.9998779296875)
- (-0.0003662109375,0.9998779296875)
- (0,-0.9996337890625)
- (0,-0.9996337890625)
- (-0.0010986328125,-0.961181640625)
- (-0.0010986328125,-0.961181640625)
- (0.0072021484375,0.882568359375)
- (0.0072021484375,0.882568359375)
- (-0.0279541015625,-0.7666015625)
- (-0.0279541015625,-0.7666015625)
- (0.0765380859375,0.616943359375)
- (0.0765380859375,0.616943359375)
- (-0.1688232421875,-0.4447021484375)
- (-0.1688232421875,-0.4447021484375)
- (0.3212890625,0.26611328125)
- (0.3212890625,0.26611328125)
- (-0.54638671875,-0.1092529296875)
- (-0.54638671875,-0.1092529296875)
- (0.843994140625,0.012451171875)
- (0.843994140625,0.012451171875)
- (0.8046875,-0.019775390625)
- (0.8046875,-0.019775390625)
- (-0.444580078125,0.1688232421875)
- (-0.444580078125,0.1688232421875)
- (0.147705078125,-0.477294921875)
- (0.147705078125,-0.477294921875)
- (-0.0032958984375,0.921142578125)
- (-0.0032958984375,0.921142578125)
- (0.09228515625,0.5811767578125)
- (0.09228515625,0.5811767578125)
- (-0.4447021484375,-0.1688232421875)
- (-0.4447021484375,-0.1688232421875)
- (0.9996337890625,0.000244140625)
- (0.9996337890625,0.000244140625)
- (0.4127197265625,-0.19140625)
- (0.4127197265625,-0.19140625)
- (-0.0379638671875,0.728759765625)
- (-0.0379638671875,0.728759765625)
- (0.09228515625,0.5811767578125)
- (0.09228515625,0.5811767578125)
- (-0.617919921875,-0.0762939453125)
- (-0.617919921875,-0.0762939453125)
- (-0.6170654296875,0.0765380859375)
- (-0.6170654296875,0.0765380859375)
- (0.0621337890625,-0.654296875)
- (0.0621337890625,-0.654296875)
- (-0.127685546875,-0.511962890625)
- (-0.127685546875,-0.511962890625)
- (0.843994140625,0.012451171875)
- (0.843994140625,0.012451171875)
- (0.29296875,-0.293212890625)
- (0.29296875,-0.293212890625)
- (-0.01953125,-0.8046875)
- (-0.01953125,-0.8046875)
- (0.654296875,0.0618896484375)
- (0.654296875,0.0618896484375)
- (0.3505859375,-0.239990234375)
- (0.3505859375,-0.239990234375)
- (-0.0279541015625,-0.7666015625)
- (-0.0279541015625,-0.7666015625)
- (0.805419921875,0.01953125)
- (0.805419921875,0.01953125)
- (0.1688232421875,-0.444580078125)
- (0.1688232421875,-0.444580078125)
-# name: pulse325
-# type: complex matrix
-# rows: 320
-# columns: 1
- (-0.0003662109375,0.9998779296875)
- (-0.0003662109375,0.9998779296875)
- (0,-0.9996337890625)
- (0,-0.9996337890625)
- (-0.0010986328125,-0.961181640625)
- (-0.0010986328125,-0.961181640625)
- (0.0072021484375,0.882568359375)
- (0.0072021484375,0.882568359375)
- (-0.0279541015625,-0.7666015625)
- (-0.0279541015625,-0.7666015625)
- (0.0765380859375,0.616943359375)
- (0.0765380859375,0.616943359375)
- (-0.1688232421875,-0.4447021484375)
- (-0.1688232421875,-0.4447021484375)
- (0.3212890625,0.26611328125)
- (0.3212890625,0.26611328125)
- (-0.54638671875,-0.1092529296875)
- (-0.54638671875,-0.1092529296875)
- (0.843994140625,0.012451171875)
- (0.843994140625,0.012451171875)
- (0.8046875,-0.019775390625)
- (0.8046875,-0.019775390625)
- (-0.444580078125,0.1688232421875)
- (-0.444580078125,0.1688232421875)
- (0.147705078125,-0.477294921875)
- (0.147705078125,-0.477294921875)
- (-0.0032958984375,0.921142578125)
- (-0.0032958984375,0.921142578125)
- (0.09228515625,0.5811767578125)
- (0.09228515625,0.5811767578125)
- (-0.4447021484375,-0.1688232421875)
- (-0.4447021484375,-0.1688232421875)
- (0.9996337890625,0.000244140625)
- (0.9996337890625,0.000244140625)
- (0.4127197265625,-0.19140625)
- (0.4127197265625,-0.19140625)
- (-0.0379638671875,0.728759765625)
- (-0.0379638671875,0.728759765625)
- (0.09228515625,0.5811767578125)
- (0.09228515625,0.5811767578125)
- (-0.617919921875,-0.0762939453125)
- (-0.617919921875,-0.0762939453125)
- (-0.6170654296875,0.0765380859375)
- (-0.6170654296875,0.0765380859375)
- (0.0621337890625,-0.654296875)
- (0.0621337890625,-0.654296875)
- (-0.127685546875,-0.511962890625)
- (-0.127685546875,-0.511962890625)
- (0.843994140625,0.012451171875)
- (0.843994140625,0.012451171875)
- (0.29296875,-0.293212890625)
- (0.29296875,-0.293212890625)
- (-0.01953125,-0.8046875)
- (-0.01953125,-0.8046875)
- (0.654296875,0.0618896484375)
- (0.654296875,0.0618896484375)
- (0.3505859375,-0.239990234375)
- (0.3505859375,-0.239990234375)
- (-0.0279541015625,-0.7666015625)
- (-0.0279541015625,-0.7666015625)
- (0.805419921875,0.01953125)
- (0.805419921875,0.01953125)
- (0.1688232421875,-0.444580078125)
- (0.1688232421875,-0.444580078125)
- (-0.1910400390625,-0.4127197265625)
- (-0.1910400390625,-0.4127197265625)
- (-0.6912841796875,0.049072265625)
- (-0.6912841796875,0.049072265625)
- (0.0009765625,0.9613037109375)
- (0.0009765625,0.9613037109375)
- (-0.8055419921875,-0.0194091796875)
- (-0.8055419921875,-0.0194091796875)
- (-0.076171875,0.6177978515625)
- (-0.076171875,0.6177978515625)
- (0.4771728515625,0.14794921875)
- (0.4771728515625,0.14794921875)
- (0.2144775390625,-0.3812255859375)
- (0.2144775390625,-0.3812255859375)
- (-0.3214111328125,-0.2659912109375)
- (-0.3214111328125,-0.2659912109375)
- (-0.29296875,0.293212890625)
- (-0.29296875,0.293212890625)
- (0.293212890625,0.29296875)
- (0.293212890625,0.29296875)
- (0.265869140625,-0.3212890625)
- (0.265869140625,-0.3212890625)
- (-0.3814697265625,-0.2144775390625)
- (-0.3814697265625,-0.2144775390625)
- (-0.1480712890625,0.4774169921875)
- (-0.1480712890625,0.4774169921875)
- (0.617919921875,0.0760498046875)
- (0.617919921875,0.0760498046875)
- (0.019287109375,-0.805419921875)
- (0.019287109375,-0.805419921875)
- (0.961181640625,-0.0009765625)
- (0.961181640625,-0.0009765625)
- (-0.049072265625,-0.6915283203125)
- (-0.049072265625,-0.6915283203125)
- (-0.412353515625,0.19091796875)
- (-0.412353515625,0.19091796875)
- (0.4444580078125,0.1689453125)
- (0.4444580078125,0.1689453125)
- (0.019287109375,-0.805419921875)
- (0.019287109375,-0.805419921875)
- (0.7664794921875,-0.02783203125)
- (0.7664794921875,-0.02783203125)
- (-0.2401123046875,-0.3507080078125)
- (-0.2401123046875,-0.3507080078125)
- (-0.06201171875,0.6541748046875)
- (-0.06201171875,0.6541748046875)
- (-0.804443359375,0.0194091796875)
- (-0.804443359375,0.0194091796875)
- (0.293212890625,0.29296875)
- (0.293212890625,0.29296875)
- (0.012451171875,-0.843994140625)
- (0.012451171875,-0.843994140625)
- (0.5118408203125,-0.127685546875)
- (0.5118408203125,-0.127685546875)
- (-0.6541748046875,-0.062255859375)
- (-0.6541748046875,-0.062255859375)
- (-0.07666015625,-0.6170654296875)
- (-0.07666015625,-0.6170654296875)
- (-0.076171875,0.6177978515625)
- (-0.076171875,0.6177978515625)
- (-0.581298828125,0.0921630859375)
- (-0.581298828125,0.0921630859375)
- (0.7286376953125,0.037841796875)
- (0.7286376953125,0.037841796875)
- (0.1912841796875,0.412353515625)
- (0.1912841796875,0.412353515625)
- (0,-0.9996337890625)
- (0,-0.9996337890625)
- (0.1688232421875,-0.444580078125)
- (0.1688232421875,-0.444580078125)
- (0.581298828125,-0.0924072265625)
- (0.581298828125,-0.0924072265625)
- (-0.9212646484375,-0.003662109375)
- (-0.9212646484375,-0.003662109375)
- (-0.4775390625,-0.1478271484375)
- (-0.4775390625,-0.1478271484375)
- (-0.1688232421875,-0.4447021484375)
- (-0.1688232421875,-0.4447021484375)
- (-0.01953125,-0.8046875)
- (-0.01953125,-0.8046875)
- (-0.012451171875,0.8438720703125)
- (-0.012451171875,0.8438720703125)
- (-0.109375,0.5462646484375)
- (-0.109375,0.5462646484375)
- (-0.26611328125,0.321533203125)
- (-0.26611328125,0.321533203125)
- (-0.444580078125,0.1688232421875)
- (-0.444580078125,0.1688232421875)
- (-0.6170654296875,0.0765380859375)
- (-0.6170654296875,0.0765380859375)
- (-0.7666015625,0.02783203125)
- (-0.7666015625,0.02783203125)
- (-0.882568359375,0.00732421875)
- (-0.882568359375,0.00732421875)
- (-0.9613037109375,0.0010986328125)
- (-0.9613037109375,0.0010986328125)
- (0.9996337890625,0.000244140625)
- (0.9996337890625,0.000244140625)
- (0.9996337890625,0.000244140625)
- (0.9996337890625,0.000244140625)
- (-0.9613037109375,0.0010986328125)
- (-0.9613037109375,0.0010986328125)
- (-0.882568359375,0.00732421875)
- (-0.882568359375,0.00732421875)
- (-0.7666015625,0.02783203125)
- (-0.7666015625,0.02783203125)
- (-0.6170654296875,0.0765380859375)
- (-0.6170654296875,0.0765380859375)
- (-0.444580078125,0.1688232421875)
- (-0.444580078125,0.1688232421875)
- (-0.26611328125,0.321533203125)
- (-0.26611328125,0.321533203125)
- (-0.109375,0.5462646484375)
- (-0.109375,0.5462646484375)
- (-0.012451171875,0.8438720703125)
- (-0.012451171875,0.8438720703125)
- (-0.01953125,-0.8046875)
- (-0.01953125,-0.8046875)
- (-0.1688232421875,-0.4447021484375)
- (-0.1688232421875,-0.4447021484375)
- (-0.4775390625,-0.1478271484375)
- (-0.4775390625,-0.1478271484375)
- (-0.9212646484375,-0.003662109375)
- (-0.9212646484375,-0.003662109375)
- (0.581298828125,-0.0924072265625)
- (0.581298828125,-0.0924072265625)
- (0.1688232421875,-0.444580078125)
- (0.1688232421875,-0.444580078125)
- (0,-0.9996337890625)
- (0,-0.9996337890625)
- (0.1912841796875,0.412353515625)
- (0.1912841796875,0.412353515625)
- (0.7286376953125,0.037841796875)
- (0.7286376953125,0.037841796875)
- (-0.581298828125,0.0921630859375)
- (-0.581298828125,0.0921630859375)
- (-0.076171875,0.6177978515625)
- (-0.076171875,0.6177978515625)
- (-0.07666015625,-0.6170654296875)
- (-0.07666015625,-0.6170654296875)
- (-0.6541748046875,-0.062255859375)
- (-0.6541748046875,-0.062255859375)
- (0.5118408203125,-0.127685546875)
- (0.5118408203125,-0.127685546875)
- (0.012451171875,-0.843994140625)
- (0.012451171875,-0.843994140625)
- (0.293212890625,0.29296875)
- (0.293212890625,0.29296875)
- (-0.804443359375,0.0194091796875)
- (-0.804443359375,0.0194091796875)
- (-0.06201171875,0.6541748046875)
- (-0.06201171875,0.6541748046875)
- (-0.2401123046875,-0.3507080078125)
- (-0.2401123046875,-0.3507080078125)
- (0.7664794921875,-0.02783203125)
- (0.7664794921875,-0.02783203125)
- (0.019287109375,-0.805419921875)
- (0.019287109375,-0.805419921875)
- (0.4444580078125,0.1689453125)
- (0.4444580078125,0.1689453125)
- (-0.412353515625,0.19091796875)
- (-0.412353515625,0.19091796875)
- (-0.049072265625,-0.6915283203125)
- (-0.049072265625,-0.6915283203125)
- (0.961181640625,-0.0009765625)
- (0.961181640625,-0.0009765625)
- (0.019287109375,-0.805419921875)
- (0.019287109375,-0.805419921875)
- (0.617919921875,0.0760498046875)
- (0.617919921875,0.0760498046875)
- (-0.1480712890625,0.4774169921875)
- (-0.1480712890625,0.4774169921875)
- (-0.3814697265625,-0.2144775390625)
- (-0.3814697265625,-0.2144775390625)
- (0.265869140625,-0.3212890625)
- (0.265869140625,-0.3212890625)
- (0.293212890625,0.29296875)
- (0.293212890625,0.29296875)
- (-0.29296875,0.293212890625)
- (-0.29296875,0.293212890625)
- (-0.3214111328125,-0.2659912109375)
- (-0.3214111328125,-0.2659912109375)
- (0.2144775390625,-0.3812255859375)
- (0.2144775390625,-0.3812255859375)
- (0.4771728515625,0.14794921875)
- (0.4771728515625,0.14794921875)
- (-0.076171875,0.6177978515625)
- (-0.076171875,0.6177978515625)
- (-0.8055419921875,-0.0194091796875)
- (-0.8055419921875,-0.0194091796875)
- (0.0009765625,0.9613037109375)
- (0.0009765625,0.9613037109375)
- (-0.6912841796875,0.049072265625)
- (-0.6912841796875,0.049072265625)
- (-0.1910400390625,-0.4127197265625)
- (-0.1910400390625,-0.4127197265625)
- (0.1688232421875,-0.444580078125)
- (0.1688232421875,-0.444580078125)
- (0.805419921875,0.01953125)
- (0.805419921875,0.01953125)
- (-0.0279541015625,-0.7666015625)
- (-0.0279541015625,-0.7666015625)
- (0.3505859375,-0.239990234375)
- (0.3505859375,-0.239990234375)
- (0.654296875,0.0618896484375)
- (0.654296875,0.0618896484375)
- (-0.01953125,-0.8046875)
- (-0.01953125,-0.8046875)
- (0.29296875,-0.293212890625)
- (0.29296875,-0.293212890625)
- (0.843994140625,0.012451171875)
- (0.843994140625,0.012451171875)
- (-0.127685546875,-0.511962890625)
- (-0.127685546875,-0.511962890625)
- (0.0621337890625,-0.654296875)
- (0.0621337890625,-0.654296875)
- (-0.6170654296875,0.0765380859375)
- (-0.6170654296875,0.0765380859375)
- (-0.617919921875,-0.0762939453125)
- (-0.617919921875,-0.0762939453125)
- (0.09228515625,0.5811767578125)
- (0.09228515625,0.5811767578125)
- (-0.0379638671875,0.728759765625)
- (-0.0379638671875,0.728759765625)
- (0.4127197265625,-0.19140625)
- (0.4127197265625,-0.19140625)
- (0.9996337890625,0.000244140625)
- (0.9996337890625,0.000244140625)
- (-0.4447021484375,-0.1688232421875)
- (-0.4447021484375,-0.1688232421875)
- (0.09228515625,0.5811767578125)
- (0.09228515625,0.5811767578125)
- (-0.0032958984375,0.921142578125)
- (-0.0032958984375,0.921142578125)
- (0.147705078125,-0.477294921875)
- (0.147705078125,-0.477294921875)
- (-0.444580078125,0.1688232421875)
- (-0.444580078125,0.1688232421875)
- (0.8046875,-0.019775390625)
- (0.8046875,-0.019775390625)
- (0.843994140625,0.012451171875)
- (0.843994140625,0.012451171875)
- (-0.54638671875,-0.1092529296875)
- (-0.54638671875,-0.1092529296875)
- (0.3212890625,0.26611328125)
- (0.3212890625,0.26611328125)
- (-0.1688232421875,-0.4447021484375)
- (-0.1688232421875,-0.4447021484375)
- (0.0765380859375,0.616943359375)
- (0.0765380859375,0.616943359375)
- (-0.0279541015625,-0.7666015625)
- (-0.0279541015625,-0.7666015625)
- (0.0072021484375,0.882568359375)
- (0.0072021484375,0.882568359375)
- (-0.0010986328125,-0.961181640625)
- (-0.0010986328125,-0.961181640625)
diff --git a/gr-radar-mono/src/utils/read_avg.m b/gr-radar-mono/src/utils/read_avg.m
deleted file mode 100644
index 7df3d4cdd..000000000
--- a/gr-radar-mono/src/utils/read_avg.m
+++ /dev/null
@@ -1,22 +0,0 @@
-function avg = read_avg(name, vlen)
-
-    f = fopen(name, "rb");
-    s = zeros(1, vlen);
-    n = 0;
-        
-    while (!feof(f))
-       t = fread(f, [2, vlen], "float");
-       if (size(t) == [2, vlen])
-          n = n+1;
-          c = t(1,:)+t(2,:)*j;
-	  if (n > 10)
-             s = s+c;
-	  endif
-       endif
-    endwhile
-
-    avg = s/(n-1);
-    
-    fclose(f);
-    
-endfunction
diff --git a/gr-radar-mono/src/utils/read_avg_sec.m b/gr-radar-mono/src/utils/read_avg_sec.m
deleted file mode 100644
index 7aa77675d..000000000
--- a/gr-radar-mono/src/utils/read_avg_sec.m
+++ /dev/null
@@ -1,25 +0,0 @@
-function avg = read_avg_sec(name, vlen)
-
-    f = fopen(name, "rb");
-    s = zeros(1, vlen);
-    n = 0;
-    m = 0;
-        
-    while (!feof(f))
-       t = fread(f, [2, vlen], "float");
-       if (size(t) == [2, vlen])
-          n = n+1;
-          c = t(1,:)+t(2,:)*j;
-          s = s+c;
-	  m = m+1;	  
-	  if (m == 1000)
-	     avg(n/1000,:) = s/1000;
-	     s = zeros(1, vlen);
-	     m = 0;
-	  endif
-       endif
-    endwhile
-    
-    fclose(f);
-
-endfunction
diff --git a/gr-radar-mono/src/utils/read_echos.m b/gr-radar-mono/src/utils/read_echos.m
deleted file mode 100644
index 3fae47b4e..000000000
--- a/gr-radar-mono/src/utils/read_echos.m
+++ /dev/null
@@ -1,7 +0,0 @@
-# Read echos from file into array
-function echos = read_echos(filename, len, drop)
-    e = read_complex_binary(filename);
-    n = length(e)/len-drop;
-    start = drop*len+1;
-    echos = reshape(e(start:end), len, n).';
-endfunction
diff --git a/gr-radio-astronomy/.gitignore b/gr-radio-astronomy/.gitignore
deleted file mode 100644
index 8736aba7f..000000000
--- a/gr-radio-astronomy/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/configure
-/config.h.in
-/stamp-h.in
-/libtool
-/config.log
-/config.h
-/config.cache
-/config.status
-/missing
-/stamp-h
-/stamp-h1
-/.deps
-/.libs
-/*.la
-/*.lo
-/autom4te.cache
-/*.cache
-/missing
-/make.log
diff --git a/gr-radio-astronomy/Makefile.am b/gr-radio-astronomy/Makefile.am
deleted file mode 100644
index b3cecff96..000000000
--- a/gr-radio-astronomy/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright 2004 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = src
diff --git a/gr-radio-astronomy/src/.gitignore b/gr-radio-astronomy/src/.gitignore
deleted file mode 100644
index bb3f27777..000000000
--- a/gr-radio-astronomy/src/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/howto.cc
-/howto.py
diff --git a/gr-radio-astronomy/src/Makefile.am b/gr-radio-astronomy/src/Makefile.am
deleted file mode 100644
index be38b7c1a..000000000
--- a/gr-radio-astronomy/src/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright 2004 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.
-# 
-
-SUBDIRS = lib
-if PYTHON
-SUBDIRS += python
-endif
diff --git a/gr-radio-astronomy/src/lib/.gitignore b/gr-radio-astronomy/src/lib/.gitignore
deleted file mode 100644
index 711bfef2c..000000000
--- a/gr-radio-astronomy/src/lib/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/howto.cc
-/howto.py
-/ra.cc
-/ra.py
-/*.pyc
-/gnuradio
-/guile
-/python
diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am
deleted file mode 100644
index 1b6b854ea..000000000
--- a/gr-radio-astronomy/src/lib/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright 2004,2005,2006,2008,2009,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
-TOP_SWIG_IFILES =		\
-	ra.i
-
-# Install so that they end up available as:
-#   import gnuradio.ra
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-ra_pythondir_category =		\
-	gnuradio
diff --git a/gr-radio-astronomy/src/lib/Makefile.swig.gen b/gr-radio-astronomy/src/lib/Makefile.swig.gen
deleted file mode 100644
index d560e3919..000000000
--- a/gr-radio-astronomy/src/lib/Makefile.swig.gen
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright 2009 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.
-# 
-
-# Makefile.swig.gen for ra.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/ra
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/ra
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-ra_pythondir_category ?= gnuradio/ra
-ra_pylibdir_category ?= $(ra_pythondir_category)
-ra_pythondir = $(pythondir)/$(ra_pythondir_category)
-ra_pylibdir = $(pyexecdir)/$(ra_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-ra_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/ra
-# FIXME: determince whether these should be installed with gnuradio.
-ra_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-ra_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-ra_swiginclude_HEADERS =		\
-	ra.i			\
-	$(ra_swiginclude_headers)
-
-if PYTHON
-ra_pylib_LTLIBRARIES =		\
-	_ra.la
-
-_ra_la_SOURCES = 			\
-	python/ra.cc		\
-	$(ra_la_swig_sources)
-
-ra_python_PYTHON =			\
-	ra.py			\
-	$(ra_python)
-
-_ra_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(ra_la_swig_libadd)
-
-_ra_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(ra_la_swig_ldflags)
-
-_ra_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(ra_la_swig_cxxflags)
-
-python/ra.cc: ra.py
-ra.py: ra.i
-
-# Include the python dependencies for this file
--include python/ra.d
-
-endif		# end of if python
-
-if GUILE
-
-ra_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-ra.la
-libguile_gnuradio_ra_la_SOURCES =	\
-	guile/ra.cc			\
-	$(ra_la_swig_sources)
-nobase_ra_scm_DATA = 		\
-	gnuradio/ra.scm 		\
-	gnuradio/ra-primitive.scm
-libguile_gnuradio_ra_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(ra_la_swig_libadd)
-libguile_gnuradio_ra_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(ra_la_swig_ldflags)
-libguile_gnuradio_ra_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(ra_la_swig_cxxflags)
-
-guile/ra.cc: gnuradio/ra.scm
-gnuradio/ra.scm: ra.i
-gnuradio/ra-primitive.scm: gnuradio/ra.scm
-
-# Include the guile dependencies for this file
--include guile/ra.d
-
-endif				# end of GUILE
-
-
diff --git a/gr-radio-astronomy/src/lib/ra.i b/gr-radio-astronomy/src/lib/ra.i
deleted file mode 100644
index 3e8f409e3..000000000
--- a/gr-radio-astronomy/src/lib/ra.i
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 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.
- */
-
-%include "gnuradio.i"			// the common stuff
-
-// We'll need something like this if we add C++ blocks...
-// See the gr-howto-write-a-block tarball for examples
-
-// ----------------------------------------------------------------
-
-/*
- * First arg is the package prefix.
- * Second arg is the name of the class minus the prefix.
- *
- * This does some behind-the-scenes magic so we can
- * access ra_square_ff from python as ra.square_ff
- */
-// GR_SWIG_BLOCK_MAGIC(ra,square_ff);
-
-// ra_square_ff_sptr ra_make_square_ff ();
-// 
-// class ra_square_ff : public gr_block
-// {
-// private:
-//   ra_square_ff ();
-// };
-// 
-// // ----------------------------------------------------------------
-// 
-// GR_SWIG_BLOCK_MAGIC(ra,square2_ff);
-// 
-// ra_square2_ff_sptr ra_make_square2_ff ();
-// 
-// class ra_square2_ff : public gr_sync_block
-// {
-// private:
-//   ra_square2_ff ();
-// };
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-ra" "scm_init_gnuradio_ra_module")
-%}
-
-%goops %{
-(use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gr-radio-astronomy/src/python/.gitignore b/gr-radio-astronomy/src/python/.gitignore
deleted file mode 100644
index bf03975bb..000000000
--- a/gr-radio-astronomy/src/python/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.pyc
-/*.pyo
-/run_tests
diff --git a/gr-radio-astronomy/src/python/Makefile.am b/gr-radio-astronomy/src/python/Makefile.am
deleted file mode 100644
index 2518e0647..000000000
--- a/gr-radio-astronomy/src/python/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright 2004,2006,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# Install this stuff so that it ends up as the gnuradio.ra module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
-
-# wxgui stuff here
-wxguipythondir  = $(grpythondir)/wxgui
-wxguilibdir     = $(grpyexecdir)/wxgui
-
-EXTRA_DIST +=				\
-	run_tests.in
-
-TESTS = run_tests
-
-
-noinst_PYTHON = 			\
-	qa_ra.py			
-
-ourpython_PYTHON =			\
-	local_calibrator.py
-
-wxguipython_PYTHON =			\
-	ra_stripchartsink.py		\
-	ra_fftsink.py			\
-	ra_waterfallsink.py
-
-
-# and here for applications you want installed in prefix/bin
-dist_bin_SCRIPTS = 			\
-	usrp_ra_receiver.py		\
-	usrp_psr_receiver.py
diff --git a/gr-radio-astronomy/src/python/local_calibrator.py b/gr-radio-astronomy/src/python/local_calibrator.py
deleted file mode 100755
index d76060c0f..000000000
--- a/gr-radio-astronomy/src/python/local_calibrator.py
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2003,2004,2005 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.
-# 
-
-import Numeric
-import math
-import ephem
-import time
-
-#
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# NO LONGER USED
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#
-#
-
-
-#
-# Simple class for allowing local definition of a calibration function
-#  for raw samples coming from the RA detector chain.  Each observatory
-#  is different, and rather than hacking up the main code in usrp_ra_receiver
-#  we define the appropriate function here.
-#
-# For example, one could calibrate the output in Janskys, rather than
-#  dB.
-#
-#
-
-def calib_default_total_power(data):
-    r = 10.0*math.log10(data)
-    return(r)
-
-def calib_numogate_ridge_observatory_total_power(data):
-
-    me = ephem.Observer()
-
-    #
-    # PyEphem wants lat/long as strings, rather than floats--took me quite
-    #  a long time to figure that out.  If they don't arrive as strings,
-    #  the calculations for sidereal time are complete garbage
-    #
-    me.long = globals()["calib_long"]
-    me.lat = globals()["calib_lat"]
-
-    me.date = ephem.now()
-    sidtime = me.sidereal_time()
-
-    foo = time.localtime()
-    if not "calib_prefix" in globals():
-        pfx = "./"
-    else:
-        pfx = globals()["calib_prefix"]
-    filenamestr = "%s/%04d%02d%02d%02d" % (pfx, foo.tm_year, 
-       foo.tm_mon, foo.tm_mday, foo.tm_hour)
-
-    numogate_file = open (filenamestr+".tpdat","a")
-  
-    r = (data / 409.6)
-    flt = "%6.3f" % r
-    #r = calib_default_total_power(data)
-    inter = globals()["calib_decln"]
-    integ = globals()["calib_integ_setting"]
-    fc = globals()["calib_freq_setting"]
-    fc = fc / 1000000
-    bw = globals()["calib_bw_setting"]
-    bw = bw / 1000000
-    ga = globals()["calib_gain_setting"]
-
-    now = time.time()
-
-    if not "calib_then_tpdat" in globals():
-        globals()["calib_then_tpdat"] = now
-
-    if (now - globals()["calib_then_tpdat"]) >= 20:
-        globals()["calib_then_tpdat"] = now
-    
-        numogate_file.write(str(ephem.hours(sidtime))+" "+flt+" Dn="+str(inter)+",")
-        numogate_file.write("Ti="+str(integ)+",Fc="+str(fc)+",Bw="+str(bw))
-        numogate_file.write(",Ga="+str(ga)+"\n")
-    else:
-        numogate_file.write(str(ephem.hours(sidtime))+" "+flt+"\n")
-
-    numogate_file.close()
-    return(r)
-
-def calib_numogate_ridge_observatory_fft(data,l):
-
-    me = ephem.Observer()
-
-    #
-    # PyEphem wants lat/long as strings, rather than floats--took me quite
-    #  a long time to figure that out.  If they don't arrive as strings,
-    #  the calculations for sidereal time are complete garbage
-    #
-    me.long = globals()["calib_long"]
-    me.lat = globals()["calib_lat"]
-
-    me.date = ephem.now()
-    sidtime = me.sidereal_time()
-
-    foo = time.localtime()
-    
-    if not "calib_prefix" in globals():
-        pfx = "./"
-    else:
-        pfx = globals()["calib_prefix"]
-    filenamestr = "%s/%04d%02d%02d%02d" % (pfx, foo.tm_year, 
-       foo.tm_mon, foo.tm_mday, foo.tm_hour)
-
-    now = time.time()
-
-    if not "calib_then" in globals():
-        globals()["calib_then"] = now
-
-    delta = (l/1024)*5
-		
-    if (now - globals()["calib_then"]) >= delta:
-
-        globals()["calib_then"] = now
-        numogate_file = open (filenamestr+".sdat","a")
-  
-        r = data
-        inter = globals()["calib_decln"]
-        fc = globals()["calib_freq_setting"]
-        fc = fc / 1000000
-        bw = globals()["calib_bw_setting"]
-        bw = bw / 1000000
-        av = globals()["calib_avg_alpha"]
-        numogate_file.write("data:"+str(ephem.hours(sidtime))+" Dn="+str(inter)+",Fc="+str(fc)+",Bw="+str(bw)+",Av="+str(av))
-        numogate_file.write(" "+str(r)+"\n")
-        numogate_file.close()
-        return(r)
-
-    return(data)
-
-def calib_default_fft(db,l):
-    return(db)
-
-#
-# We capture various parameters from the receive chain here, because
-#  they can affect the calibration equations.
-#
-#
-def calib_set_gain(gain):
-    globals()["calib_gain_setting"] = gain
-    globals()["calib_then_tpdat"] = time.time() - 50
-
-def calib_set_integ(integ):
-    globals()["calib_integ_setting"] = integ
-    globals()["calib_then_tpdat"] = time.time() - 50
-
-def calib_set_bw(bw):
-    globals()["calib_bw_setting"] = bw
-    globals()["calib_then_tpdat"] = time.time() - 50
-
-def calib_set_freq(freq):
-    globals()["calib_freq_setting"] = freq
-    globals()["calib_then_tpdat"] = time.time() - 50
-
-def calib_set_avg_alpha(alpha):
-    globals()["calib_avg_alpha"] = alpha
-
-def calib_set_interesting(inter):
-    globals()["calib_is_interesting"] = inter
-
-def calib_set_decln(dec):
-    globals()["calib_decln"] = dec
-    globals()["calib_then_tpdat"] = time.time() - 50
-
-def calib_set_prefix(pfx):
-    globals()["calib_prefix"] = pfx
-
-def calib_set_long(long):
-    globals()["calib_long"] = long
-
-def calib_set_lat(lat):
-    globals()["calib_lat"] = lat
diff --git a/gr-radio-astronomy/src/python/ra_fftsink.py b/gr-radio-astronomy/src/python/ra_fftsink.py
deleted file mode 100755
index 4733027c1..000000000
--- a/gr-radio-astronomy/src/python/ra_fftsink.py
+++ /dev/null
@@ -1,501 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2003,2004,2005,2007 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.
-# 
-
-from gnuradio import gr, gru, window
-from gnuradio.wxgui import stdgui2
-import wx
-import gnuradio.wxgui.plot as plot
-import numpy
-import threading
-import math    
-import random
-
-default_ra_fftsink_size = (640,140)
-
-
-
-class ra_fft_sink_base(object):
-    def __init__(self, input_is_real=False, baseband_freq=0, y_per_div=10, sc_y_per_div=0.5, ref_level=50, sc_ref_level=20,
-                 sample_rate=1, fft_size=512, fft_rate=15,
-                 average=False, avg_alpha=None, title='', peak_hold=False, ofunc=None, xydfunc=None):
-
-        # initialize common attributes
-        self.baseband_freq = baseband_freq
-        self.y_divs = 8
-        self.y_per_div=y_per_div
-        self.sc_y_per_div=sc_y_per_div
-        self.ref_level = ref_level
-        self.autoscale = False
-        self.sc_ref_level = sc_ref_level
-        self.sample_rate = sample_rate
-        self.fft_size = fft_size
-        self.fft_rate = fft_rate
-        self.binwidth = float(sample_rate/fft_size)
-        self.average = average
-        self.ofunc = ofunc
-        self.xydfunc = xydfunc
-        self.ofunc = ofunc
-        if avg_alpha is None:
-            self.avg_alpha = 2.0 / fft_rate
-        else:
-            self.avg_alpha = avg_alpha
-        self.title = title
-        self.peak_hold = peak_hold
-        self.input_is_real = input_is_real
-        self.msgq = gr.msg_queue(2)         # queue that holds a maximum of 2 messages
-
-    def set_y_per_div(self, y_per_div):
-        self.y_per_div = y_per_div
-
-
-    def set_ref_level(self, ref_level):
-        self.ref_level = ref_level
-
-    def set_average(self, average):
-        self.average = average
-        if average:
-            self.avg.set_taps(self.avg_alpha)
-            self.set_peak_hold(False)
-        else:
-            self.avg.set_taps(1.0)
-
-    def set_peak_hold(self, enable):
-        self.peak_hold = enable
-        if enable:
-            self.set_average(False)
-        self.win.set_peak_hold(enable)
-
-    def set_autoscale(self, auto):
-        self.autoscale = auto
-
-    def set_avg_alpha(self, avg_alpha):
-        self.avg_alpha = avg_alpha
-
-    def set_baseband_freq(self, baseband_freq):
-        self.baseband_freq = baseband_freq
-        
-
-class ra_fft_sink_f(gr.hier_block2, ra_fft_sink_base):
-    def __init__(self, parent, baseband_freq=0,
-                 y_per_div=10, sc_y_per_div=0.5, sc_ref_level=40, ref_level=50, sample_rate=1, fft_size=512,
-                 fft_rate=15, average=False, avg_alpha=None, title='',
-                 size=default_ra_fftsink_size, peak_hold=False, ofunc=None,
-                 xydfunc=None):
-	gr.hier_block2.__init__(self, "ra_fft_sink_f",
-				gr.io_signature(1, 1, gr.sizeof_float),
-				gr.io_signature(0, 0, 0))
-				
-        ra_fft_sink_base.__init__(self, input_is_real=True, baseband_freq=baseband_freq,
-                               y_per_div=y_per_div, sc_y_per_div=sc_y_per_div,
-                               sc_ref_level=sc_ref_level, ref_level=ref_level,
-                               sample_rate=sample_rate, fft_size=fft_size,
-                               fft_rate=fft_rate,
-                               average=average, avg_alpha=avg_alpha, title=title,
-                               peak_hold=peak_hold, ofunc=ofunc, 
-                               xydfunc=xydfunc)
-                               
-        self.binwidth = float(sample_rate/2.0)/float(fft_size)
-        s2p = gr.serial_to_parallel(gr.sizeof_float, fft_size)
-        one_in_n = gr.keep_one_in_n(gr.sizeof_float * fft_size,
-                                    max(1, int(sample_rate/fft_size/fft_rate)))
-        mywindow = window.blackmanharris(fft_size)
-        fft = gr.fft_vfc(fft_size, True, mywindow)
-        c2mag = gr.complex_to_mag(fft_size)
-        self.avg = gr.single_pole_iir_filter_ff(1.0, fft_size)
-        log = gr.nlog10_ff(20, fft_size, -20*math.log10(fft_size))
-        sink = gr.message_sink(gr.sizeof_float * fft_size, self.msgq, True)
-
-        self.connect (self, s2p, one_in_n, fft, c2mag, self.avg, log, sink)
-
-        self.win = fft_window(self, parent, size=size)
-        self.set_average(self.average)
-
-class ra_fft_sink_c(gr.hier_block2, ra_fft_sink_base):
-    def __init__(self, parent, baseband_freq=0,
-                 y_per_div=10, sc_y_per_div=0.5, sc_ref_level=40,
-                 ref_level=50, sample_rate=1, fft_size=512,
-                 fft_rate=15, average=False, avg_alpha=None, title='',
-                 size=default_ra_fftsink_size, peak_hold=False, ofunc=None, xydfunc=None):
-
-	gr.hier_block2.__init__(self, "ra_fft_sink_c",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex),
-				gr.io_signature(0, 0, 0))
-				
-
-        ra_fft_sink_base.__init__(self, input_is_real=False, baseband_freq=baseband_freq,
-                               y_per_div=y_per_div, sc_y_per_div=sc_y_per_div,
-                               sc_ref_level=sc_ref_level, ref_level=ref_level,
-                               sample_rate=sample_rate, fft_size=fft_size,
-                               fft_rate=fft_rate,
-                               average=average, avg_alpha=avg_alpha, 
-                               title=title,
-                               peak_hold=peak_hold, ofunc=ofunc, 
-                               xydfunc=xydfunc)
-
-        s2p = gr.serial_to_parallel(gr.sizeof_gr_complex, fft_size)
-        one_in_n = gr.keep_one_in_n(gr.sizeof_gr_complex * fft_size,
-                                    max(1, int(sample_rate/fft_size/fft_rate)))
-        mywindow = window.blackmanharris(fft_size)
-        fft = gr.fft_vcc(fft_size, True, mywindow)
-        c2mag = gr.complex_to_mag(fft_size)
-        self.avg = gr.single_pole_iir_filter_ff(1.0, fft_size)
-        log = gr.nlog10_ff(20, fft_size, -20*math.log10(fft_size))
-        sink = gr.message_sink(gr.sizeof_float * fft_size, self.msgq, True)
-
-        self.connect(self, s2p, one_in_n, fft, c2mag, self.avg, log, sink)
-
-        self.win = fft_window(self, parent, size=size)
-        self.set_average(self.average)
-
-
-# ------------------------------------------------------------------------
-
-myDATA_EVENT = wx.NewEventType()
-EVT_DATA_EVENT = wx.PyEventBinder (myDATA_EVENT, 0)
-
-
-class DataEvent(wx.PyEvent):
-    def __init__(self, data):
-        wx.PyEvent.__init__(self)
-        self.SetEventType (myDATA_EVENT)
-        self.data = data
-
-    def Clone (self): 
-        self.__class__ (self.GetId())
-
-
-class input_watcher (threading.Thread):
-    def __init__ (self, msgq, fft_size, event_receiver, **kwds):
-        threading.Thread.__init__ (self, **kwds)
-        self.setDaemon (1)
-        self.msgq = msgq
-        self.fft_size = fft_size
-        self.event_receiver = event_receiver
-        self.keep_running = True
-        self.start ()
-
-    def run (self):
-        while (self.keep_running):
-            msg = self.msgq.delete_head()  # blocking read of message queue
-            itemsize = int(msg.arg1())
-            nitems = int(msg.arg2())
-
-            s = msg.to_string()            # get the body of the msg as a string
-
-            # There may be more than one FFT frame in the message.
-            # If so, we take only the last one
-            if nitems > 1:
-                start = itemsize * (nitems - 1)
-                s = s[start:start+itemsize]
-
-            complex_data = numpy.fromstring (s, numpy.float32)
-            de = DataEvent (complex_data)
-            wx.PostEvent (self.event_receiver, de)
-            del de
-    
-
-class fft_window (plot.PlotCanvas):
-    def __init__ (self, ra_fftsink, parent, id = -1,
-                  pos = wx.DefaultPosition, size = wx.DefaultSize,
-                  style = wx.DEFAULT_FRAME_STYLE, name = ""):
-        plot.PlotCanvas.__init__ (self, parent, id, pos, size, style, name)
-
-        self.y_range = None
-        self.ra_fftsink = ra_fftsink
-        self.peak_hold = False
-        self.peak_vals = None
-
-        self.SetEnableGrid (True)
-        # self.SetEnableZoom (True)
-        # self.SetBackgroundColour ('black')
-        
-        self.build_popup_menu()
-        
-        EVT_DATA_EVENT (self, self.set_data)
-        wx.EVT_CLOSE (self, self.on_close_window)
-        self.Bind(wx.EVT_RIGHT_UP, self.on_right_click)
-        self.Bind(wx.EVT_LEFT_UP, self.on_left_click)
-        self.Bind(wx.EVT_MOTION, self.on_motion)
-
-        self.input_watcher = input_watcher(ra_fftsink.msgq, ra_fftsink.fft_size, self)
-
-
-    def on_close_window (self, event):
-        print "fft_window:on_close_window"
-        self.keep_running = False
-
-            
-    def set_data (self, evt):
-        calc_min = 99e10
-        calc_max = -99e10
-        dB = evt.data
-        L = len (dB)
-
-        calc_min = min(dB)
-        calc_max = max(dB)
-
-        if (self.ra_fftsink.ofunc != None):
-            self.ra_fftsink.ofunc(evt.data,L)
-        
-        if self.peak_hold:
-            if self.peak_vals is None:
-                self.peak_vals = dB
-            else:
-                self.peak_vals = numpy.maximum(dB, self.peak_vals)
-                dB = self.peak_vals
-
-        x = max(abs(self.ra_fftsink.sample_rate), abs(self.ra_fftsink.baseband_freq))
-        if x >= 1e9:
-            sf = 1e-9
-            units = "GHz"
-        elif x >= 1e6:
-            sf = 1e-6
-            units = "MHz"
-        elif x >= 1e3:
-            sf = 1e-3
-            units = "kHz"
-        else:
-            sf = 1.0
-            units = "Hz"
-
-        if self.ra_fftsink.input_is_real:     # only plot 1/2 the points
-            x_vals = ((numpy.arange (L/2)
-                       * (self.ra_fftsink.sample_rate * sf / L))
-                      + self.ra_fftsink.baseband_freq * sf)
-            points = numpy.zeros((len(x_vals), 2), numpy.float64)
-            points[:,0] = x_vals
-            points[:,1] = dB[0:L/2]
-        else:
-            # the "negative freqs" are in the second half of the array
-            x_vals = ((numpy.arange(-L/2, L/2)
-                       * (self.ra_fftsink.sample_rate * sf / L))
-                      + self.ra_fftsink.baseband_freq * sf)
-            points = numpy.zeros((len(x_vals), 2), numpy.float64)
-            points[:,0] = x_vals
-            points[:,1] = numpy.concatenate ((dB[L/2:], dB[0:L/2]))
-
-        lines = plot.PolyLine (points, colour='BLUE')
-        graphics = plot.PlotGraphics ([lines],
-                                      title=self.ra_fftsink.title,
-                                      xLabel = units, yLabel = "dB")
-
-        self.Draw (graphics, xAxis=None, yAxis=self.y_range)
-        d = calc_max - calc_min
-        d = d * 0.1
-        if self.ra_fftsink.autoscale == True:
-            self.y_range = self._axisInterval ('min', calc_min-d, calc_max+d)
-        else:
-            self.update_y_range ()
-
-    def set_peak_hold(self, enable):
-        self.peak_hold = enable
-        self.peak_vals = None
-
-    def update_y_range (self):
-        ymax = self.ra_fftsink.ref_level
-        ymin = self.ra_fftsink.ref_level - self.ra_fftsink.y_per_div * self.ra_fftsink.y_divs
-        self.y_range = self._axisInterval ('min', ymin, ymax)
-
-    def on_average(self, evt):
-        # print "on_average"
-        self.ra_fftsink.set_average(evt.IsChecked())
-
-    def on_peak_hold(self, evt):
-        # print "on_peak_hold"
-        self.ra_fftsink.set_peak_hold(evt.IsChecked())
-
-    def on_autoscale(self, evt):
-        self.ra_fftsink.set_autoscale(evt.IsChecked())
-
-    def on_incr_ref_level(self, evt):
-        # print "on_incr_ref_level"
-        self.ra_fftsink.set_ref_level(self.ra_fftsink.ref_level
-                                   + self.ra_fftsink.y_per_div)
-
-    def on_decr_ref_level(self, evt):
-        # print "on_decr_ref_level"
-        self.ra_fftsink.set_ref_level(self.ra_fftsink.ref_level
-                                   - self.ra_fftsink.y_per_div)
-
-    def on_incr_y_per_div(self, evt):
-        # print "on_incr_y_per_div"
-        self.ra_fftsink.set_y_per_div(next_up(self.ra_fftsink.y_per_div, (0.5,1,2,5,10)))
-
-    def on_decr_y_per_div(self, evt):
-        # print "on_decr_y_per_div"
-        self.ra_fftsink.set_y_per_div(next_down(self.ra_fftsink.y_per_div, (0.5,1,2,5,10)))
-
-    def on_y_per_div(self, evt):
-        # print "on_y_per_div"
-        Id = evt.GetId()
-        if Id == self.id_y_per_div_1:
-            self.ra_fftsink.set_y_per_div(0.5)
-        elif Id == self.id_y_per_div_2:
-            self.ra_fftsink.set_y_per_div(1.0)
-        elif Id == self.id_y_per_div_5:
-            self.ra_fftsink.set_y_per_div(2.0)
-        elif Id == self.id_y_per_div_10:
-            self.ra_fftsink.set_y_per_div(5.0)
-        elif Id == self.id_y_per_div_20:
-            self.ra_fftsink.set_y_per_div(10)
-
-        
-    def on_right_click(self, event):
-        menu = self.popup_menu
-        for id, pred in self.checkmarks.items():
-            item = menu.FindItemById(id)
-            item.Check(pred())
-        self.PopupMenu(menu, event.GetPosition())
-
-    def on_motion(self, event):
-        if not self.ra_fftsink.xydfunc == None:
-            xy = self.GetXY(event)
-            self.ra_fftsink.xydfunc (0,xy)
-	
-    def on_left_click(self,event):
-        if not self.ra_fftsink.xydfunc == None:
-            xy = self.GetXY(event)
-            self.ra_fftsink.xydfunc (1,xy)
-
-    def build_popup_menu(self):
-        self.id_incr_ref_level = wx.NewId()
-        self.id_decr_ref_level = wx.NewId()
-        self.id_autoscale = wx.NewId()
-        self.id_incr_y_per_div = wx.NewId()
-        self.id_decr_y_per_div = wx.NewId()
-        self.id_y_per_div_1 = wx.NewId()
-        self.id_y_per_div_2 = wx.NewId()
-        self.id_y_per_div_5 = wx.NewId()
-        self.id_y_per_div_10 = wx.NewId()
-        self.id_y_per_div_20 = wx.NewId()
-        self.id_average = wx.NewId()
-        self.id_peak_hold = wx.NewId()
-
-        self.Bind(wx.EVT_MENU, self.on_average, id=self.id_average)
-        self.Bind(wx.EVT_MENU, self.on_peak_hold, id=self.id_peak_hold)
-        self.Bind(wx.EVT_MENU, self.on_autoscale, id=self.id_autoscale)
-        self.Bind(wx.EVT_MENU, self.on_incr_ref_level, id=self.id_incr_ref_level)
-        self.Bind(wx.EVT_MENU, self.on_decr_ref_level, id=self.id_decr_ref_level)
-        self.Bind(wx.EVT_MENU, self.on_incr_y_per_div, id=self.id_incr_y_per_div)
-        self.Bind(wx.EVT_MENU, self.on_decr_y_per_div, id=self.id_decr_y_per_div)
-        self.Bind(wx.EVT_MENU, self.on_y_per_div, id=self.id_y_per_div_1)
-        self.Bind(wx.EVT_MENU, self.on_y_per_div, id=self.id_y_per_div_2)
-        self.Bind(wx.EVT_MENU, self.on_y_per_div, id=self.id_y_per_div_5)
-        self.Bind(wx.EVT_MENU, self.on_y_per_div, id=self.id_y_per_div_10)
-        self.Bind(wx.EVT_MENU, self.on_y_per_div, id=self.id_y_per_div_20)
-
-
-        # make a menu
-        menu = wx.Menu()
-        self.popup_menu = menu
-        menu.AppendCheckItem(self.id_average, "Average")
-        menu.AppendCheckItem(self.id_peak_hold, "Peak Hold")
-        menu.Append(self.id_incr_ref_level, "Incr Ref Level")
-        menu.Append(self.id_decr_ref_level, "Decr Ref Level")
-        # menu.Append(self.id_incr_y_per_div, "Incr dB/div")
-        # menu.Append(self.id_decr_y_per_div, "Decr dB/div")
-        menu.AppendSeparator()
-        # we'd use RadioItems for these, but they're not supported on Mac
-        menu.AppendCheckItem(self.id_autoscale, "Autoscale")
-        menu.AppendCheckItem(self.id_y_per_div_1, "0.5 dB/div")
-        menu.AppendCheckItem(self.id_y_per_div_2, "1.0 dB/div")
-        menu.AppendCheckItem(self.id_y_per_div_5, "2.0 dB/div")
-        menu.AppendCheckItem(self.id_y_per_div_10, "5.0 dB/div")
-        menu.AppendCheckItem(self.id_y_per_div_20, "10.0 dB/div")
-
-        self.checkmarks = {
-            self.id_average : lambda : self.ra_fftsink.average,
-            self.id_peak_hold : lambda : self.ra_fftsink.peak_hold,
-            self.id_autoscale : lambda : self.ra_fftsink.autoscale,
-            self.id_y_per_div_1 : lambda : self.ra_fftsink.y_per_div == 0.5,
-            self.id_y_per_div_2 : lambda : self.ra_fftsink.y_per_div == 1.0,
-            self.id_y_per_div_5 : lambda : self.ra_fftsink.y_per_div == 2.0,
-            self.id_y_per_div_10 : lambda : self.ra_fftsink.y_per_div == 5.0,
-            self.id_y_per_div_20 : lambda : self.ra_fftsink.y_per_div == 10.0,
-            }
-
-
-def next_up(v, seq):
-    """
-    Return the first item in seq that is > v.
-    """
-    for s in seq:
-        if s > v:
-            return s
-    return v
-
-def next_down(v, seq):
-    """
-    Return the last item in seq that is < v.
-    """
-    rseq = list(seq[:])
-    rseq.reverse()
-
-    for s in rseq:
-        if s < v:
-            return s
-    return v
-
-
-# ----------------------------------------------------------------
-# Standalone test app
-# ----------------------------------------------------------------
-
-class test_app_flow_graph (stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__ (self, frame, panel, vbox, argv)
-
-        fft_size = 256
-
-        # build our flow graph
-        input_rate = 20.000e3
-
-        # Generate a complex sinusoid
-        src1 = gr.sig_source_c (input_rate, gr.GR_SIN_WAVE, 5.75e3, 1000)
-        #src1 = gr.sig_source_c (input_rate, gr.GR_CONST_WAVE, 5.75e3, 1000)
-
-        # We add these throttle blocks so that this demo doesn't
-        # suck down all the CPU available.  Normally you wouldn't use these.
-        thr1 = gr.throttle(gr.sizeof_gr_complex, input_rate)
-
-        sink1 = ra_fft_sink_c (panel, title="Complex Data", fft_size=fft_size,
-                            sample_rate=input_rate, baseband_freq=100e3,
-                            ref_level=60, y_per_div=10)
-        vbox.Add (sink1.win, 1, wx.EXPAND)
-        self.connect (src1, thr1, sink1)
-
-        src2 = gr.sig_source_f (input_rate, gr.GR_SIN_WAVE, 5.75e3, 1000)
-        #src2 = gr.sig_source_f (input_rate, gr.GR_CONST_WAVE, 5.75e3, 1000)
-        thr2 = gr.throttle(gr.sizeof_float, input_rate)
-        sink2 = ra_fft_sink_f (panel, title="Real Data", fft_size=fft_size*2,
-                            sample_rate=input_rate, baseband_freq=100e3,
-                            ref_level=60, y_per_div=10)
-        vbox.Add (sink2.win, 1, wx.EXPAND)
-        self.connect (src2, thr2, sink2)
-
-def main ():
-    app = stdgui2.stdapp (test_app_flow_graph,
-                         "FFT Sink Test App")
-    app.MainLoop ()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-radio-astronomy/src/python/ra_stripchartsink.py b/gr-radio-astronomy/src/python/ra_stripchartsink.py
deleted file mode 100755
index 76988f8f0..000000000
--- a/gr-radio-astronomy/src/python/ra_stripchartsink.py
+++ /dev/null
@@ -1,400 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2003,2004,2005,2007 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.
-# 
-
-from gnuradio import gr, gru
-from gnuradio.wxgui import stdgui2
-import wx
-import gnuradio.wxgui.plot as plot
-import Numeric
-import threading
-import math    
-import ephem
-import time
-
-default_stripchartsink_size = (640,140)
-global_yvalues = []
-
-class stripchart_sink_base(object):
-    def __init__(self, input_is_real=False, y_per_div=10, ref_level=50,
-                 sample_rate=1, stripsize=4,
-                 title='',xlabel="X", ylabel="Y", divbase=0.025,
-                 parallel=False, scaling=1.0, autoscale=False):
-
-        # initialize common attributes
-        self.y_divs = 8
-        self.y_per_div=y_per_div
-        self.ref_level = ref_level
-        self.autoscale = autoscale
-        self.sample_rate = sample_rate
-        self.parallel = parallel
-        self.title = title
-        self.xlabel = xlabel
-        self.ylabel = ylabel
-        self.divbase = divbase
-        self.scaling = scaling
-        self.input_is_real = input_is_real
-        self.msgq = gr.msg_queue(2)         # queue that holds a maximum of 2 messages
-        self.vector=Numeric.zeros(stripsize,Numeric.Float64)
-        self.wcnt = 0
-        self.timecnt = 0
-        self.stripsize=stripsize
-
-    def set_y_per_div(self, y_per_div):
-        self.y_per_div = y_per_div
-
-    def set_ref_level(self, ref_level):
-        self.ref_level = ref_level
-
-    def set_autoscale(self, auto):
-        self.autoscale = auto
-
-class stripchart_sink_f(gr.hier_block2, stripchart_sink_base):
-    def __init__(self, parent,
-                 y_per_div=10, ref_level=50, sample_rate=1,
-                 title='', stripsize=4,
-                 size=default_stripchartsink_size,xlabel="X", 
-                 ylabel="Y", divbase=0.025,
-                 parallel=False, scaling=1.0, autoscale=False):
-
-	if parallel == False:
-		gr.hier_block2.__init__(self, "stripchart_sink_f",
-				gr.io_signature(1, 1, gr.sizeof_float),
-				gr.io_signature(0, 0, 0))
-	else:
-		gr.hier_block2.__init__(self, "stripchart_sink_f",
-				gr.io_signature(1, 1, gr.sizeof_float*stripsize),
-				gr.io_signature(0, 0, 0))
-		
-	
-        stripchart_sink_base.__init__(self, input_is_real=True,
-                               y_per_div=y_per_div, ref_level=ref_level,
-                               sample_rate=sample_rate,
-                               stripsize=stripsize,
-                               xlabel=xlabel, ylabel=ylabel, 
-                               divbase=divbase, title=title,
-                               parallel=parallel, 
-                               scaling=scaling, autoscale=autoscale)
-                               
-        if (parallel == True):
-            one = gr.keep_one_in_n (gr.sizeof_float*stripsize, 1)
-            sink = gr.message_sink(gr.sizeof_float*stripsize, self.msgq, True)
-        else:
-            one = gr.keep_one_in_n (gr.sizeof_float, 1)
-            sink = gr.message_sink(gr.sizeof_float, self.msgq, True)
-        self.connect (self, one, sink)
-
-        self.win = stripchart_window(self, parent, size=size)
-
-
-
-# ------------------------------------------------------------------------
-
-myDATA_EVENT = wx.NewEventType()
-EVT_DATA_EVENT = wx.PyEventBinder (myDATA_EVENT, 0)
-
-
-class DataEvent(wx.PyEvent):
-    def __init__(self, data):
-        wx.PyEvent.__init__(self)
-        self.SetEventType (myDATA_EVENT)
-        self.data = data
-
-    def Clone (self): 
-        self.__class__ (self.GetId())
-
-
-class input_watcher (threading.Thread):
-    def __init__ (self, msgq, evsize, event_receiver, **kwds):
-        threading.Thread.__init__ (self, **kwds)
-        self.setDaemon (1)
-        self.msgq = msgq
-        self.evsize = evsize
-        self.event_receiver = event_receiver
-        self.keep_running = True
-        self.start ()
-
-    def run (self):
-        while (self.keep_running):
-            msg = self.msgq.delete_head()  # blocking read of message queue
-            itemsize = int(msg.arg1())
-            nitems = int(msg.arg2())
-
-            s = msg.to_string()            # get the body of the msg as a string
-
-            # There may be more than one frame in the message.
-            # If so, we take only the last one
-            if nitems > 1:
-                start = itemsize * (nitems - 1)
-                s = s[start:start+itemsize]
-
-            complex_data = Numeric.fromstring (s, Numeric.Float32)
-            de = DataEvent (complex_data)
-            wx.PostEvent (self.event_receiver, de)
-            del de
-
-class stripchart_window(plot.PlotCanvas):
-    def __init__ (self, stripchartsink, parent, id = -1,
-                  pos = wx.DefaultPosition, size = wx.DefaultSize,
-                  style = wx.DEFAULT_FRAME_STYLE, name = ""):
-        plot.PlotCanvas.__init__ (self, parent, id, pos, size, style, name)
-
-        self.y_range = None
-        self.stripchartsink = stripchartsink
-
-        self.SetEnableGrid (True)
-        # self.SetEnableZoom (True)
-        # self.SetBackgroundColour ('black')
-        
-        self.build_popup_menu()
-        
-        EVT_DATA_EVENT (self, self.set_data)
-
-        wx.EVT_CLOSE (self, self.on_close_window)
-        self.Bind(wx.EVT_RIGHT_UP, self.on_right_click)
-
-        self.input_watcher = input_watcher(stripchartsink.msgq, 1, self)
-
-
-    def on_close_window (self, event):
-        print "stripchart_window:on_close_window"
-        self.keep_running = False
-
-
-    def set_data (self, evt):
-        indata = evt.data
-        L = len (indata)
-
-        calc_min = min(indata)
-        calc_max = max(indata)
-        d = calc_max - calc_min
-        d = d * 0.1
-        if self.stripchartsink.autoscale == True and self.stripchartsink.parallel == True:
-            self.y_range = self._axisInterval ('min', calc_min-d, calc_max+d)
-
-        N = self.stripchartsink.stripsize
-        if self.stripchartsink.parallel != True:
-    	    for i in range(1,N):
-                pooey = N-i
-                self.stripchartsink.vector[pooey] = self.stripchartsink.vector[pooey-1]
-    
-            self.stripchartsink.vector[0] = indata
-
-        else:
-            self.stripchartsink.vector = indata
-
-        if self.stripchartsink.parallel == True:
-            avg = 0
-            for i in range(0,self.stripchartsink.stripsize):
-                if self.stripchartsink.vector[i] > 0:
-                    avg += self.stripchartsink.vector[i]
-                if self.stripchartsink.vector[i] < calc_min:
-                    calc_min = self.stripchartsink.vector[i]
-                if self.stripchartsink.vector[i] > calc_max:
-                    calc_max = self.stripchartsink.vector[i]
-
-            avg /= self.stripchartsink.stripsize
-            markers = []
-            placedmarkers = 0
-            for i in range(0,self.stripchartsink.stripsize):
-                if (self.stripchartsink.vector[i] > 0 and
-                    self.stripchartsink.vector[i] > (avg*5)):
-                       markers.append((i*self.stripchartsink.scaling,
-                       self.stripchartsink.vector[i]))
-                       placedmarkers += 1
-            
-        points = Numeric.zeros((N,2), Numeric.Float64)
-        for i in range(0,N):
-            if self.stripchartsink.scaling == 1.0:
-                points[i,0] = i
-            else:
-                points[i,0] = i * self.stripchartsink.scaling
-            points[i,1] = self.stripchartsink.vector[i]
-
-        if self.stripchartsink.parallel == True and placedmarkers > 1:
-            for i in range(0,N):
-                self.stripchartsink.vector[i] = 0
-
-            marks = plot.PolyMarker(markers, colour='BLACK', marker='triangle_down')
-
-        lines = plot.PolyLine (points, colour='RED')
-
-        # Temporary--I'm find the markers distracting
-        placedmarkers = 0
-        xlab = self.stripchartsink.xlabel
-        ylab = self.stripchartsink.ylabel
-        if (self.stripchartsink.parallel == False) or (placedmarkers <= 1):
-            graphics = plot.PlotGraphics ([lines],
-                                      title=self.stripchartsink.title,
-                                      xLabel = xlab, yLabel = ylab)
-
-        else:
-            graphics = plot.PlotGraphics ([lines,marks],
-                                      title=self.stripchartsink.title,
-                                      xLabel = xlab, yLabel = ylab)
-
-        self.Draw (graphics, xAxis=None, yAxis=self.y_range)
-
-        if self.stripchartsink.autoscale == False or self.stripchartsink.parallel == False:
-            self.update_y_range ()
-
-
-    def update_y_range (self):
-        ymax = self.stripchartsink.ref_level
-        ymin = self.stripchartsink.ref_level - self.stripchartsink.y_per_div * self.stripchartsink.y_divs
-        self.y_range = self._axisInterval ('min', ymin, ymax)
-
-    def on_incr_ref_level(self, evt):
-        # print "on_incr_ref_level"
-        self.stripchartsink.set_ref_level(self.stripchartsink.ref_level
-                                   + self.stripchartsink.y_per_div)
-
-    def on_decr_ref_level(self, evt):
-        # print "on_decr_ref_level"
-        self.stripchartsink.set_ref_level(self.stripchartsink.ref_level
-                                   - self.stripchartsink.y_per_div)
-
-    def on_autoscale(self, evt):
-        self.stripchartsink.set_autoscale(evt.IsChecked())
-
-    def on_incr_y_per_div(self, evt):
-        divbase = self.stripchartsink.divbase
-        x1 = 1 * divbase
-        x2 = 2 * divbase
-        x4 = 4 * divbase
-        x10 = 10 * divbase
-        x20 = 20 * divbase
-        # print "on_incr_y_per_div"
-        self.stripchartsink.set_y_per_div(next_up(self.stripchartsink.y_per_div, (x1,x2,x4,x10,x20)))
-
-    def on_decr_y_per_div(self, evt):
-        # print "on_decr_y_per_div"
-        divbase = self.stripchartsink.divbase
-        x1 = 1 * divbase
-        x2 = 2 * divbase
-        x4 = 4 * divbase
-        x10 = 10 * divbase
-        x20 = 20 * divbase
-        self.stripchartsink.set_y_per_div(next_down(self.stripchartsink.y_per_div, (x1,x2,x4,x10,x20)))
-
-    def on_y_per_div(self, evt):
-        # print "on_y_per_div"
-        divbase=self.stripchartsink.divbase
-        Id = evt.GetId()
-        if Id == self.id_y_per_div_1:
-            self.stripchartsink.set_y_per_div(1*divbase)
-        elif Id == self.id_y_per_div_2:
-            self.stripchartsink.set_y_per_div(2*divbase)
-        elif Id == self.id_y_per_div_5:
-            self.stripchartsink.set_y_per_div(4*divbase)
-        elif Id == self.id_y_per_div_10:
-            self.stripchartsink.set_y_per_div(10*divbase)
-        elif Id == self.id_y_per_div_20:
-            self.stripchartsink.set_y_per_div(20*divbase)
-
-        
-    def on_right_click(self, event):
-        menu = self.popup_menu
-        for id, pred in self.checkmarks.items():
-            item = menu.FindItemById(id)
-            item.Check(pred())
-        self.PopupMenu(menu, event.GetPosition())
-
-
-    def build_popup_menu(self):
-        divbase=self.stripchartsink.divbase
-        self.id_incr_ref_level = wx.NewId()
-        self.id_decr_ref_level = wx.NewId()
-        self.id_autoscale = wx.NewId()
-        self.id_incr_y_per_div = wx.NewId()
-        self.id_decr_y_per_div = wx.NewId()
-        self.id_y_per_div_1 = wx.NewId()
-        self.id_y_per_div_2 = wx.NewId()
-        self.id_y_per_div_5 = wx.NewId()
-        self.id_y_per_div_10 = wx.NewId()
-        self.id_y_per_div_20 = wx.NewId()
-
-        self.Bind(wx.EVT_MENU, self.on_incr_ref_level, id=self.id_incr_ref_level)
-        self.Bind(wx.EVT_MENU, self.on_decr_ref_level, id=self.id_decr_ref_level)
-        self.Bind(wx.EVT_MENU, self.on_autoscale, id=self.id_autoscale)
-        self.Bind(wx.EVT_MENU, self.on_incr_y_per_div, id=self.id_incr_y_per_div)
-        self.Bind(wx.EVT_MENU, self.on_decr_y_per_div, id=self.id_decr_y_per_div)
-        self.Bind(wx.EVT_MENU, self.on_y_per_div, id=self.id_y_per_div_1)
-        self.Bind(wx.EVT_MENU, self.on_y_per_div, id=self.id_y_per_div_2)
-        self.Bind(wx.EVT_MENU, self.on_y_per_div, id=self.id_y_per_div_5)
-        self.Bind(wx.EVT_MENU, self.on_y_per_div, id=self.id_y_per_div_10)
-        self.Bind(wx.EVT_MENU, self.on_y_per_div, id=self.id_y_per_div_20)
-
-
-        # make a menu
-        menu = wx.Menu()
-        self.popup_menu = menu
-        menu.Append(self.id_incr_ref_level, "Incr Ref Level")
-        menu.Append(self.id_decr_ref_level, "Decr Ref Level")
-        menu.AppendSeparator()
-        menu.AppendCheckItem(self.id_autoscale, "Auto Scale")
-        # we'd use RadioItems for these, but they're not supported on Mac
-        v = 1.0*divbase
-        s = "%.3f" % v
-        menu.AppendCheckItem(self.id_y_per_div_1, s)
-        v = 2.0*divbase
-        s = "%.3f" % v
-        menu.AppendCheckItem(self.id_y_per_div_2, s)
-        v = 4.0*divbase
-        s = "%.3f" % v
-        menu.AppendCheckItem(self.id_y_per_div_5, s)
-        v = 10*divbase
-        s = "%.3f" % v
-        menu.AppendCheckItem(self.id_y_per_div_10, s)
-        v = 20*divbase
-        s = "%.3f" % v
-        menu.AppendCheckItem(self.id_y_per_div_20, s)
-
-        self.checkmarks = {
-            self.id_autoscale : lambda : self.stripchartsink.autoscale,
-            self.id_y_per_div_1 : lambda : self.stripchartsink.y_per_div == 1*divbase,
-            self.id_y_per_div_2 : lambda : self.stripchartsink.y_per_div == 2*divbase,
-            self.id_y_per_div_5 : lambda : self.stripchartsink.y_per_div == 4*divbase,
-            self.id_y_per_div_10 : lambda : self.stripchartsink.y_per_div == 10*divbase,
-            self.id_y_per_div_20 : lambda : self.stripchartsink.y_per_div == 20*divbase,
-            }
-
-
-def next_up(v, seq):
-    """
-    Return the first item in seq that is > v.
-    """
-    for s in seq:
-        if s > v:
-            return s
-    return v
-
-def next_down(v, seq):
-    """
-    Return the last item in seq that is < v.
-    """
-    rseq = list(seq[:])
-    rseq.reverse()
-
-    for s in rseq:
-        if s < v:
-            return s
-    return v
diff --git a/gr-radio-astronomy/src/python/ra_waterfallsink.py b/gr-radio-astronomy/src/python/ra_waterfallsink.py
deleted file mode 100755
index e946f3a10..000000000
--- a/gr-radio-astronomy/src/python/ra_waterfallsink.py
+++ /dev/null
@@ -1,646 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2003,2004,2005,2007 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 2, 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.
-# 
-
-from gnuradio import gr, gru, window
-from gnuradio.wxgui import stdgui2
-import wx
-import gnuradio.wxgui.plot as plot
-import numpy
-import os
-import threading
-import math    
-
-default_fftsink_size = (640,240)
-default_fft_rate = gr.prefs().get_long('wxgui', 'fft_rate', 15)
-
-def axis_design( x1, x2, nx ):
-    # Given start, end, and number of labels, return value of first label,
-    # increment between labels, number of unlabeled division between labels,
-    # and scale factor.
-
-    dx = abs( x2 - x1 )/float(nx+1)  # allow for space at each end
-    ldx = math.log10(dx)
-    l2 = math.log10(2.)
-    l5 = math.log10(5.)
-    le = math.floor(ldx)
-    lf = ldx - le
-    if lf < l2/2:
-        c = 1
-        dt = 10
-    elif lf < (l2+l5)/2:
-        c = 2
-        dt = 4
-    elif lf < (l5+1)/2:
-        c = 5
-        dt = 5
-    else:
-        c = 1
-        dt = 10
-        le += 1
-    inc = c*pow( 10., le )
-    first = math.ceil( x1/inc )*inc
-    scale = 1.
-    while ( abs(x1*scale) >= 1e5 ) or ( abs(x2*scale) >= 1e5 ):
-        scale *= 1e-3
-    return ( first, inc, dt, scale )
-    
-
-class waterfall_sink_base(object):
-    def __init__(self, input_is_real=False, baseband_freq=0,
-                 sample_rate=1, fft_size=512,
-                 fft_rate=default_fft_rate,
-                 average=False, avg_alpha=None, title='', ofunc=None, xydfunc=None):
-
-        # initialize common attributes
-        self.baseband_freq = baseband_freq
-        self.sample_rate = sample_rate
-        self.fft_size = fft_size
-        self.fft_rate = fft_rate
-        self.average = average
-        self.ofunc = ofunc
-        self.xydfunc = xydfunc
-        if avg_alpha is None:
-            self.avg_alpha = 2.0 / fft_rate
-        else:
-            self.avg_alpha = avg_alpha
-        self.title = title
-        self.input_is_real = input_is_real
-        self.msgq = gr.msg_queue(2)         # queue up to 2 messages
-
-    def set_average(self, average):
-        self.average = average
-        if average:
-            self.avg.set_taps(self.avg_alpha)
-        else:
-            self.avg.set_taps(1.0)
-
-    def set_avg_alpha(self, avg_alpha):
-        self.avg_alpha = avg_alpha
-
-    def set_baseband_freq(self, baseband_freq):
-        self.baseband_freq = baseband_freq
-
-    def set_sample_rate(self, sample_rate):
-        self.sample_rate = sample_rate
-        self._set_n()
-
-    def _set_n(self):
-        self.one_in_n.set_n(max(1, int(self.sample_rate/self.fft_size/self.fft_rate)))
-        
-class waterfall_sink_f(gr.hier_block2, waterfall_sink_base):
-    def __init__(self, parent, baseband_freq=0,
-                 ref_level=0, sample_rate=1, fft_size=512,
-                 fft_rate=default_fft_rate, average=False, avg_alpha=None,
-                 title='', size=default_fftsink_size, report=None, span=40, ofunc=None, xydfunc=None):
-
-	gr.hier_block2.__init__(self, "waterfall_sink_f",
-				gr.io_signature(1, 1, gr.sizeof_float),
-				gr.io_signature(0, 0, 0))
-				
-        waterfall_sink_base.__init__(self, input_is_real=True,
-                                     baseband_freq=baseband_freq,
-                                     sample_rate=sample_rate,
-                                     fft_size=fft_size, fft_rate=fft_rate,
-                                     average=average, avg_alpha=avg_alpha,
-                                     title=title)
-                               
-        s2p = gr.serial_to_parallel(gr.sizeof_float, self.fft_size)
-        self.one_in_n = gr.keep_one_in_n(gr.sizeof_float * self.fft_size,
-                                         max(1, int(self.sample_rate/self.fft_size/self.fft_rate)))
-        mywindow = window.blackmanharris(self.fft_size)
-        fft = gr.fft_vfc(self.fft_size, True, mywindow)
-        c2mag = gr.complex_to_mag(self.fft_size)
-        self.avg = gr.single_pole_iir_filter_ff(1.0, self.fft_size)
-        log = gr.nlog10_ff(20, self.fft_size, -20*math.log10(self.fft_size))
-        sink = gr.message_sink(gr.sizeof_float * self.fft_size, self.msgq, True)
-
-	self.connect(self, s2p, self.one_in_n, fft, c2mag, self.avg, log, sink)
-        self.win = waterfall_window(self, parent, size=size, report=report,
-                                    ref_level=ref_level, span=span, ofunc=ofunc, xydfunc=xydfunc)
-        self.set_average(self.average)
-
-
-class waterfall_sink_c(gr.hier_block2, waterfall_sink_base):
-    def __init__(self, parent, baseband_freq=0,
-                 ref_level=0, sample_rate=1, fft_size=512,
-                 fft_rate=default_fft_rate, average=False, avg_alpha=None, 
-                 title='', size=default_fftsink_size, report=None, span=40, ofunc=None, xydfunc=None):
-
-	gr.hier_block2.__init__(self, "waterfall_sink_c",
-				gr.io_signature(1, 1, gr.sizeof_gr_complex),
-				gr.io_signature(0, 0, 0))
-				
-        waterfall_sink_base.__init__(self, input_is_real=False,
-                                     baseband_freq=baseband_freq,
-                                     sample_rate=sample_rate,
-                                     fft_size=fft_size,
-                                     fft_rate=fft_rate,
-                                     average=average, avg_alpha=avg_alpha,
-                                     title=title)
-
-        s2p = gr.serial_to_parallel(gr.sizeof_gr_complex, self.fft_size)
-        self.one_in_n = gr.keep_one_in_n(gr.sizeof_gr_complex * self.fft_size,
-                                         max(1, int(self.sample_rate/self.fft_size/self.fft_rate)))
-
-        mywindow = window.blackmanharris(self.fft_size)
-        fft = gr.fft_vcc(self.fft_size, True, mywindow)
-        c2mag = gr.complex_to_mag(self.fft_size)
-        self.avg = gr.single_pole_iir_filter_ff(1.0, self.fft_size)
-        log = gr.nlog10_ff(20, self.fft_size, -20*math.log10(self.fft_size))
-        sink = gr.message_sink(gr.sizeof_float * self.fft_size, self.msgq, True)
-
-	self.connect(self, s2p, self.one_in_n, fft, c2mag, self.avg, log, sink)
-        self.win = waterfall_window(self, parent, size=size, report=report,
-                                    ref_level=ref_level, span=span, ofunc=ofunc, xydfunc=xydfunc)
-        self.set_average(self.average)
-
-
-# ------------------------------------------------------------------------
-
-myDATA_EVENT = wx.NewEventType()
-EVT_DATA_EVENT = wx.PyEventBinder (myDATA_EVENT, 0)
-
-
-class DataEvent(wx.PyEvent):
-    def __init__(self, data):
-        wx.PyEvent.__init__(self)
-        self.SetEventType (myDATA_EVENT)
-        self.data = data
-
-    def Clone (self): 
-        self.__class__ (self.GetId())
-
-
-class input_watcher (threading.Thread):
-    def __init__ (self, msgq, fft_size, event_receiver, **kwds):
-        threading.Thread.__init__ (self, **kwds)
-        self.setDaemon (1)
-        self.msgq = msgq
-        self.fft_size = fft_size
-        self.event_receiver = event_receiver
-        self.keep_running = True
-        self.start ()
-
-    def run (self):
-        while (self.keep_running):
-            msg = self.msgq.delete_head()  # blocking read of message queue
-            itemsize = int(msg.arg1())
-            nitems = int(msg.arg2())
-
-            s = msg.to_string()            # get the body of the msg as a string
-
-            # There may be more than one FFT frame in the message.
-            # If so, we take only the last one
-            if nitems > 1:
-                start = itemsize * (nitems - 1)
-                s = s[start:start+itemsize]
-
-            complex_data = numpy.fromstring (s, numpy.float32)
-            de = DataEvent (complex_data)
-            wx.PostEvent (self.event_receiver, de)
-            del de
-    
-
-class waterfall_window (wx.ScrolledWindow):
-    def __init__ (self, fftsink, parent, id = -1,
-                  pos = wx.DefaultPosition, size = wx.DefaultSize,
-                  style = wx.DEFAULT_FRAME_STYLE, name = "", report=None,
-                  ref_level = 0, span = 50, ofunc=None, xydfunc=None):
-        wx.ScrolledWindow.__init__(self, parent, id, pos, size,
-                                   style|wx.HSCROLL, name)
-        self.parent = parent
-        self.SetCursor(wx.StockCursor(wx.CURSOR_IBEAM))
-        self.ref_level = ref_level
-        self.scale_factor = 256./span
-
-        self.ppsh = 128  # pixels per scroll, horizontal
-        self.SetScrollbars( self.ppsh, 0, fftsink.fft_size/self.ppsh, 0 )
-
-        self.fftsink = fftsink
-        self.size = size
-        self.report = report
-        self.ofunc = ofunc
-        self.xydfunc = xydfunc
-
-        dc1 = wx.MemoryDC()
-        dc1.SetFont( wx.SMALL_FONT )
-        self.h_scale = dc1.GetCharHeight() + 3
-        #self.bm_size = ( self.fftsink.fft_size, self.size[1] - self.h_scale )
-        self.im_size = ( self.fftsink.fft_size, self.size[1] - self.h_scale )
-        #self.bm = wx.EmptyBitmap( self.bm_size[0], self.bm_size[1], -1)
-        self.im = wx.EmptyImage( self.im_size[0], self.im_size[1], True )
-        self.im_cur = 0
-
-        self.baseband_freq = None
-
-        self.make_pens()
-
-        wx.EVT_PAINT( self, self.OnPaint )
-        wx.EVT_CLOSE (self, self.on_close_window)
-        #wx.EVT_LEFT_UP(self, self.on_left_up)
-        #wx.EVT_LEFT_DOWN(self, self.on_left_down)
-        EVT_DATA_EVENT (self, self.set_data)
-        
-        self.build_popup_menu()
-        
-        wx.EVT_CLOSE (self, self.on_close_window)
-        self.Bind(wx.EVT_RIGHT_UP, self.on_right_click)
-        self.Bind(wx.EVT_MOTION, self.on_motion)
-
-        self.down_pos = None
-
-        self.input_watcher = input_watcher(fftsink.msgq, fftsink.fft_size, self)
-
-    def on_close_window (self, event):
-        self.keep_running = False
-
-    def on_left_down( self, evt ):
-        self.down_pos = evt.GetPosition()
-        self.down_time = evt.GetTimestamp()
-
-    def on_left_up( self, evt ):
-        if self.down_pos:
-            dt = ( evt.GetTimestamp() - self.down_time )/1000.
-            pph = self.fftsink.fft_size/float(self.fftsink.sample_rate)
-            dx =  evt.GetPosition()[0] - self.down_pos[0]
-            if dx != 0:
-                rt = pph/dx
-            else:
-                rt = 0
-            t = 'Down time: %f  Delta f: %f  Period: %f' % ( dt, dx/pph, rt )
-            print t
-            if self.report:
-                self.report(t)
-
-    def on_motion(self, event):
-        if self.xydfunc:
-            pos = event.GetPosition()
-            self.xydfunc(pos)
-
-
-    def const_list(self,const,len):
-        return [const] * len
-
-    def make_colormap(self):
-        r = []
-        r.extend(self.const_list(0,96))
-        r.extend(range(0,255,4))
-        r.extend(self.const_list(255,64))
-        r.extend(range(255,128,-4))
-        
-        g = []
-        g.extend(self.const_list(0,32))
-        g.extend(range(0,255,4))
-        g.extend(self.const_list(255,64))
-        g.extend(range(255,0,-4))
-        g.extend(self.const_list(0,32))
-        
-        b = range(128,255,4)
-        b.extend(self.const_list(255,64))
-        b.extend(range(255,0,-4))
-        b.extend(self.const_list(0,96))
-        return (r,g,b)
-
-    def make_pens(self):
-        (r,g,b) = self.make_colormap()
-        self.rgb = numpy.transpose( numpy.array( (r,g,b) ).astype(numpy.int8) )
-        
-    def OnPaint(self, event):
-        dc = wx.BufferedPaintDC(self)
-        self.DoDrawing( dc )
-
-    def DoDrawing(self,dc):
-        w, h = self.GetClientSizeTuple()
-        w = min( w, self.fftsink.fft_size )
-        if w <= 0:
-            return
-
-        if dc is None:
-            dc = wx.BufferedDC( wx.ClientDC(self), (w,h) )
-
-        dc.SetBackground( wx.Brush( self.GetBackgroundColour(), wx.SOLID ) )
-        dc.Clear()
-
-        x, y = self.GetViewStart()
-        x *= self.ppsh
-
-        ih = min( h - self.h_scale, self.im_size[1] - self.im_cur )
-        r = wx.Rect( x, self.im_cur, w, ih )
-        bm = wx.BitmapFromImage( self.im.GetSubImage(r) )
-        dc.DrawBitmap( bm, 0, self.h_scale )
-        rem = min( self.im_size[1] - ih, h - ih - self.h_scale )
-        if( rem > 0 ):
-            r = wx.Rect( x, 0, w, rem )
-            bm = wx.BitmapFromImage( self.im.GetSubImage(r) )
-            dc.DrawBitmap( bm, 0, ih + self.h_scale )
-        
-        # Draw axis
-        if self.baseband_freq != self.fftsink.baseband_freq:
-            self.baseband_freq = self.fftsink.baseband_freq
-            t = self.fftsink.sample_rate*w/float(self.fftsink.fft_size)
-            self.ax_spec = axis_design( self.baseband_freq - t/2,
-                                        self.baseband_freq + t/2, 7 )
-        dc.SetFont( wx.SMALL_FONT )
-        fo = self.baseband_freq
-        po = self.fftsink.fft_size/2
-        pph = self.fftsink.fft_size/float(self.fftsink.sample_rate)
-        f = math.floor((fo-po/pph)/self.ax_spec[1])*self.ax_spec[1]
-        while True:
-            t = po + ( f - fo )*pph
-            s = str( f*self.ax_spec[3] )
-            e = dc.GetTextExtent( s )
-            if t - e[1]/2 >= x + w:
-                break
-            dc.DrawText( s, t - x - e[0]/2, 0 )
-            dc.DrawLine( t - x, e[1] - 1, t - x, self.h_scale )
-            dt = self.ax_spec[1]/self.ax_spec[2]*pph
-            for i in range(self.ax_spec[2]-1):
-                t += dt
-                if t >= x + w:
-                    break
-                dc.DrawLine( t - x, e[1] + 1, t - x, self.h_scale )
-            f += self.ax_spec[1]
-
-    def const_list(self,const,len):
-        a = [const]
-        for i in range(1,len):
-            a.append(const)
-        return a
-
-    def make_colormap(self):
-        r = []
-        r.extend(self.const_list(0,96))
-        r.extend(range(0,255,4))
-        r.extend(self.const_list(255,64))
-        r.extend(range(255,128,-4))
-        
-        g = []
-        g.extend(self.const_list(0,32))
-        g.extend(range(0,255,4))
-        g.extend(self.const_list(255,64))
-        g.extend(range(255,0,-4))
-        g.extend(self.const_list(0,32))
-        
-        b = range(128,255,4)
-        b.extend(self.const_list(255,64))
-        b.extend(range(255,0,-4))
-        b.extend(self.const_list(0,96))
-        return (r,g,b)
-
-    def set_data (self, evt):
-        dB = evt.data
-        L = len (dB)
-
-        if self.ofunc != None:
-            self.ofunc(evt.data, L)
-        #dc1 = wx.MemoryDC()
-        #dc1.SelectObject(self.bm)
-
-        # Scroll existing bitmap
-        if 1:
-            #dc1.Blit(0,1,self.bm_size[0],self.bm_size[1]-1,dc1,0,0,
-            #         wx.COPY,False,-1,-1)
-            pass
-        else:
-            for i in range( self.bm_size[1]-1, 0, -1 ):
-                dc1.Blit( 0, i, self.bm_size[0], 1, dc1, 0, i-1 )
-
-        x = max(abs(self.fftsink.sample_rate), abs(self.fftsink.baseband_freq))
-        if x >= 1e9:
-            sf = 1e-9
-            units = "GHz"
-        elif x >= 1e6:
-            sf = 1e-6
-            units = "MHz"
-        else:
-            sf = 1e-3
-            units = "kHz"
-
-
-        if self.fftsink.input_is_real:     # only plot 1/2 the points
-            d_max = L/2
-            p_width = 2
-        else:
-            d_max = L/2
-            p_width = 1
-
-        scale_factor = self.scale_factor
-        dB -= self.ref_level
-        dB *= scale_factor
-        dB = dB.astype(numpy.int_).clip( min=0, max=255 )
-        if self.fftsink.input_is_real:     # real fft
-            dB = numpy.array( ( dB[0:d_max][::-1], dB[0:d_max] ) )
-        else:                               # complex fft
-            dB = numpy.concatenate( ( dB[d_max:L], dB[0:d_max] ) )
-
-        dB = self.rgb[dB]
-        img = wx.ImageFromData( L, 1, dB.ravel().tostring() )
-        #bm = wx.BitmapFromImage( img )
-        #dc1.DrawBitmap( bm, 0, 0 )
-        ibuf = self.im.GetDataBuffer()
-        self.im_cur -= 1
-        if self.im_cur < 0:
-            self.im_cur = self.im_size[1] - 1
-        start = 3*self.im_cur*self.im_size[0]
-        ibuf[start:start+3*self.im_size[0]] = img.GetData()
-
-        #del dc1
-        self.DoDrawing(None)
-
-    def on_average(self, evt):
-        # print "on_average"
-        self.fftsink.set_average(evt.IsChecked())
-
-    def on_right_click(self, event):
-        menu = self.popup_menu
-        self.PopupMenu(menu, event.GetPosition())
-
-
-    def build_popup_menu(self):
-        id_ref_gain = wx.NewId()
-        self.Bind( wx.EVT_MENU, self.on_ref_gain, id=id_ref_gain )
-
-        # make a menu
-        menu = wx.Menu()
-        self.popup_menu = menu
-        menu.Append( id_ref_gain, "Ref Level and Gain" )
-        self.rg_dialog = None
-
-        self.checkmarks = {
-            #self.id_average : lambda : self.fftsink.average
-            }
-
-    def on_ref_gain( self, evt ):
-        if self.rg_dialog == None:
-            self.rg_dialog = rg_dialog( self.parent, self.set_ref_gain,
-                                        ref=self.ref_level,
-                                        span=256./self.scale_factor )
-        self.rg_dialog.Show( True )
-
-    def set_ref_gain( self, ref, span ):
-        self.ref_level = ref
-        self.scale_factor = 256/span
-
-class rg_dialog( wx.Dialog ):
-    def __init__( self, parent, set_function, ref=0, span=256./5. ):
-        wx.Dialog.__init__( self, parent, -1, "Waterfall Settings" )
-        self.set_function = set_function
-        #status_bar = wx.StatusBar( self, -1 )
-
-        d_sizer = wx.BoxSizer( wx.VERTICAL )  # dialog sizer
-        f_sizer = wx.BoxSizer( wx.VERTICAL )  # form sizer
-        vs = 10
-
-        #f_sizer.Add( fn_sizer, 0, flag=wx.TOP, border=10 )
-
-        h_sizer = wx.BoxSizer( wx.HORIZONTAL )
-        self.ref = tab_item( self, "Ref Level:", 4, "dB" )
-        self.ref.ctrl.SetValue( "%d" % ref )
-        h_sizer.Add((0,0),1)
-        h_sizer.Add( self.ref, 0 )
-        h_sizer.Add((0,0),1)
-        self.span = tab_item( self, "Range:", 4, "dB" )
-        self.span.ctrl.SetValue( "%d" % span )
-        h_sizer.Add( self.span, 0 )
-        h_sizer.Add((0,0),1)
-        f_sizer.Add( h_sizer, 0, flag=wx.TOP|wx.EXPAND, border=vs )
-
-        d_sizer.Add((0,0),1)
-        d_sizer.Add( f_sizer, 0, flag=wx.ALIGN_CENTER_HORIZONTAL|wx.EXPAND )
-        d_sizer.Add((0,0),1)
-        d_sizer.Add((0,0),1)
-
-        button_sizer = wx.BoxSizer( wx.HORIZONTAL )
-        apply_button = wx.Button( self, -1, "Apply" )
-        apply_button.Bind( wx.EVT_BUTTON, self.apply_evt )
-        cancel_button = wx.Button( self, -1, "Cancel" )
-        cancel_button.Bind( wx.EVT_BUTTON, self.cancel_evt )
-        ok_button = wx.Button( self, -1, "OK" )
-        ok_button.Bind( wx.EVT_BUTTON, self.ok_evt )
-        button_sizer.Add((0,0),1)
-        button_sizer.Add( apply_button, 0,
-                          flag=wx.ALIGN_CENTER_HORIZONTAL )
-        button_sizer.Add((0,0),1)
-        button_sizer.Add( cancel_button, 0,
-                          flag=wx.ALIGN_CENTER_HORIZONTAL )
-        button_sizer.Add((0,0),1)
-        button_sizer.Add( ok_button, 0,
-                          flag=wx.ALIGN_CENTER_HORIZONTAL )
-        button_sizer.Add((0,0),1)
-        d_sizer.Add( button_sizer, 0,
-                     flag=wx.EXPAND|wx.ALIGN_CENTER|wx.BOTTOM, border=30 )
-        self.SetSizer( d_sizer )
-
-    def apply_evt( self, evt ):
-        self.do_apply()
-
-    def cancel_evt( self, evt ):
-        self.Show( False )
-
-    def ok_evt( self, evt ):
-        self.do_apply()
-        self.Show( False )
-
-    def do_apply( self ):
-        r = float( self.ref.ctrl.GetValue() )
-        g = float( self.span.ctrl.GetValue() )
-        self.set_function( r, g )
-
-def next_up(v, seq):
-    """
-    Return the first item in seq that is > v.
-    """
-    for s in seq:
-        if s > v:
-            return s
-    return v
-
-def next_down(v, seq):
-    """
-    Return the last item in seq that is < v.
-    """
-    rseq = list(seq[:])
-    rseq.reverse()
-
-    for s in rseq:
-        if s < v:
-            return s
-    return v
-
-# One of many copies that should be consolidated . . .
-def tab_item( parent, label, chars, units, style=wx.TE_RIGHT, value="" ):
-    s = wx.BoxSizer( wx.HORIZONTAL )
-    s.Add( wx.StaticText( parent, -1, label ), 0,
-           flag=wx.ALIGN_CENTER_VERTICAL )
-    s.ctrl = wx.TextCtrl( parent, -1, style=style, value=value )
-    s.ctrl.SetMinSize( ( (1.00+chars)*s.ctrl.GetCharWidth(),
-                                 1.25*s.ctrl.GetCharHeight() ) )
-    s.Add( s.ctrl, -1, flag=wx.LEFT, border=3 )
-    s.Add( wx.StaticText( parent, -1, units ), 0,
-           flag=wx.ALIGN_CENTER_VERTICAL|wx.LEFT, border=1 )
-    return s
-
-
-# ----------------------------------------------------------------
-# Standalone test app
-# ----------------------------------------------------------------
-
-class test_app_flow_graph (stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__ (self, frame, panel, vbox, argv)
-
-        fft_size = 512
-
-        # build our flow graph
-        input_rate = 20.000e3
-
-        # Generate a complex sinusoid
-        src1 = gr.sig_source_c (input_rate, gr.GR_SIN_WAVE, 5.75e3, 1000)
-        #src1 = gr.sig_source_c (input_rate, gr.GR_CONST_WAVE, 5.75e3, 1000)
-
-        # We add these throttle blocks so that this demo doesn't
-        # suck down all the CPU available.  Normally you wouldn't use these.
-        thr1 = gr.throttle(gr.sizeof_gr_complex, input_rate)
-
-        sink1 = waterfall_sink_c (panel, title="Complex Data",
-                                  fft_size=fft_size,
-                                  sample_rate=input_rate, baseband_freq=0,
-                                  size=(600,144) )
-        vbox.Add (sink1.win, 1, wx.EXPAND)
-        self.connect (src1, thr1, sink1)
-
-        # generate a real sinusoid
-        src2 = gr.sig_source_f (input_rate, gr.GR_SIN_WAVE, 5.75e3, 1000)
-        #src2 = gr.sig_source_f (input_rate, gr.GR_CONST_WAVE, 5.75e3, 1000)
-        thr2 = gr.throttle(gr.sizeof_float, input_rate)
-        sink2 = waterfall_sink_f (panel, title="Real Data", fft_size=fft_size,
-                                  sample_rate=input_rate, baseband_freq=0)
-        vbox.Add (sink2.win, 1, wx.EXPAND)
-        self.connect (src2, thr2, sink2)
-
-def main ():
-    app = stdgui2.stdapp (test_app_flow_graph,
-                         "Waterfall Sink Test App")
-    app.MainLoop ()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-radio-astronomy/src/python/run_tests.in b/gr-radio-astronomy/src/python/run_tests.in
deleted file mode 100644
index c382145a6..000000000
--- a/gr-radio-astronomy/src/python/run_tests.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# 1st parameter is absolute path to component source directory
-# 2nd parameter is absolute path to component build directory
-# 3rd parameter is path to Python QA directory
-
-@top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-radio-astronomy \
-    @abs_top_builddir@/gr-radio-astronomy \
-    @srcdir@
diff --git a/gr-radio-astronomy/src/python/usrp_psr_receiver.help b/gr-radio-astronomy/src/python/usrp_psr_receiver.help
deleted file mode 100644
index 5801f3fbb..000000000
--- a/gr-radio-astronomy/src/python/usrp_psr_receiver.help
+++ /dev/null
@@ -1,111 +0,0 @@
-This program is used to analyse pulsars of known parameters.  It contains
-  both a post-detector spectral display, and a "pulse profile" display.
-  It has a built-in de-dispersion filter that will work up to DM=100 for
-  21cm observing, and up to DM=5 for 327Mhz observing.
-
-The program takes the following options:
-
-  --rx-subdev-spec     which USRP Rx side?  A or B
-
-  --decim              USRP decimation rate use either 64 or 128
-
-  --freq               USRP daughtercard frequency
-
-  --observing          Actual observing frequency (default is to use the
-                       setting for --freq)
-
-  --avg                Averaging setting for spectral display--higher numbers
-                       equal more averaging.  25 to 40 is typical.
-
-  --favg               Pulse folding averaging.  2 to 5 is typical.
-
-  --gain               USRP daughtercard gain control
-
-  --reflevel           Reference level on pulse profile display
-
-  --lowest             Lowest spectral bin that is considered valid, in Hz
-
-  --longitude          Observer longitude: West is negative
-
-  --latitude           Observer latitude:  South is negative
-
-  --fft_size           Size of FFT for post-detector spectrum: default is 1024
-
-  --threshold          Threshold (dB) to be considered a spectral "peak"
-                       This is relative to the average spectral level
-
-  --lowpass            Low pass frequency for post-detector spectral display
-                       20-100 is typical
-
-  --prefix             Filename prefix to use for recording files
-                       Default is ./
-
-  --pulsefreq          The frequency of the expected pulses
-                       For sentimental reasons, this defaults to 0.748Hz
-
-  --dm                 The DM
-
-  --doppler            The doppler shift, as a ratio
-
-  --divbase            The base of the Y/Div menu in pulsar display
-
-  --division           The initial Y/Div in pulsar display
-
-DM, Doppler, Gain, Frequency, and the averaging parameters can all be
-  changed using the GUI at runtime.
-
-If latitude and longitude are set correctly, and the system time is
-  correct, then the current LMST is displayed below the frequency
-  input, updated once per second.
-
-Moving the mouse in the post-detector spectrum display shows you that
-  point in the post-detector spectrum, both frequency and signal level.
-
-The post-detector spectrum is analysed, with results shown below
-  "Best freq".  It shows the spectral peaks, and computes their relationship.
-  It shows the harmonic compliance among the peaks, as well as the average
-  peak-to-peak distance.
-
-
-Here's a complete example for observing a pulsar with a frequency of
-  1.35Hz, at 431.5Mhz, using an IF of 10.7Mhz, and a DM of 12.431, using
-  1Mhz observing bandwidth:
-
-./usrp_psr_receiver.py --freq 10.7e6 --decim 64 --dm 12.431 --avg 35 \
-  --pulsefreq 1.35 --fft_size 2048 --lowest 1.00 --gain 75 --threshold 11.5 \
-  --observing 431.5e6 --reflevel 200 --division 100 --divbase 10 --favg 3 \
-  --lowpass 20 --longitude -76.02 --latitude 44.95
-
-Since the observed pulsar is at 1.35Hz, a lowpass cutoff for the
-  post-detector spectral display of 20Hz will be adequate.  We
-  tell the spectral analyser to use a threshold of 11.5dB above
-  average when analysing spectral data, and set the epoch folder
-  averager (pulse profile display) to use an average from 3 samples.
-  Notice that our actual USRP/Daughtercard frequency is 10.7Mhz, while
-  our observing frequency is 431.5Mhz--this is important in order for
-  the DM de-dispersion calculations to be correct. We also set our
-  latitude and longitude, so that logfiles and the LMST display
-  will have the correct LMST in them.
-
-The entire complex baseband can be recorded, if the "Recording baseband"
-  button is pressed.  Filenames are generated dynamically, and a header
-  file is produced giving observation parameters.  The baseband data are
-  recorded as octet pairs: one for I and one for Q.  Pressing the button again
-  turns off baseband recording.  This baseband is "raw", so it will
-  not have been de-dispersed.  The data rate will be whatever the
-  USRP was programmed to at the time (based on --decim).
-
-  The files are:  YYYYMMDDHHMM.pdat  and YYYYMMDDHHMM.phdr
-
-  The .phdr file contains ASCII header information describing the
-  contents of the .pdat file.
-
-Similarly the raw, pre-folded, band-limited post-detector "audio" data can be
-  recorded using the "Record Pulses" button.  The data rate for these is
-  currently 20Khz, recorded as short integers.  Just like baseband recording,
-  pressing the button again turns off pulse recording.
-
-  The files are: YYYYMMDDHHMM.padat  and YYMMDDHHMM.pahdr
-
-  The .pahdr file is ascii text providing information about the contents
-  of the corresponding .padat file.
diff --git a/gr-radio-astronomy/src/python/usrp_psr_receiver.py b/gr-radio-astronomy/src/python/usrp_psr_receiver.py
deleted file mode 100755
index 6ce4325a2..000000000
--- a/gr-radio-astronomy/src/python/usrp_psr_receiver.py
+++ /dev/null
@@ -1,1096 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,2007 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.
-# 
-
-
-#
-#
-# Pulsar receiver application
-#
-# Performs both harmonic folding analysis
-#  and epoch folding analysis
-#
-#
-from gnuradio import gr, gru, blks2, audio
-from usrpm import usrp_dbid
-from gnuradio import usrp, optfir
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui2, ra_fftsink, ra_stripchartsink, form, slider
-from optparse import OptionParser
-import wx
-import sys
-import Numeric
-import numpy.fft
-import ephem
-import time
-import os
-import math
-
-
-class app_flow_graph(stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        self.frame = frame
-        self.panel = panel
-        
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=(0, 0),
-                          help="select USRP Rx side A or B (default=A)")
-        parser.add_option("-d", "--decim", type="int", default=16,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-Q", "--observing", type="eng_float", default=0.0,
-                          help="set observing frequency to FREQ")
-        parser.add_option("-a", "--avg", type="eng_float", default=1.0,
-		help="set spectral averaging alpha")
-        parser.add_option("-V", "--favg", type="eng_float", default=2.0,
-                help="set folder averaging alpha")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-l", "--reflevel", type="eng_float", default=30.0,
-                          help="Set pulse display reference level")
-        parser.add_option("-L", "--lowest", type="eng_float", default=1.5,
-                          help="Lowest valid frequency bin")
-        parser.add_option("-e", "--longitude", type="eng_float", default=-76.02,                          help="Set Observer Longitude")
-        parser.add_option("-c", "--latitude", type="eng_float", default=44.85,                          help="Set Observer Latitude")
-        parser.add_option("-F", "--fft_size", type="eng_float", default=1024, help="Size of FFT")
-
-        parser.add_option ("-t", "--threshold", type="eng_float", default=2.5, help="pulsar threshold")
-        parser.add_option("-p", "--lowpass", type="eng_float", default=100, help="Pulse spectra cutoff freq")
-        parser.add_option("-P", "--prefix", default="./", help="File prefix")
-        parser.add_option("-u", "--pulsefreq", type="eng_float", default=0.748, help="Observation pulse rate")
-        parser.add_option("-D", "--dm", type="eng_float", default=1.0e-5, help="Dispersion Measure")
-        parser.add_option("-O", "--doppler", type="eng_float", default=1.0, help="Doppler ratio")
-        parser.add_option("-B", "--divbase", type="eng_float", default=20, help="Y/Div menu base")
-        parser.add_option("-I", "--division", type="eng_float", default=100, help="Y/Div")
-        parser.add_option("-A", "--audio_source", default="plughw:0,0", help="Audio input device spec")
-        parser.add_option("-N", "--num_pulses", default=1, type="eng_float", help="Number of display pulses")
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-
-        self.show_debug_info = True
-
-        self.reflevel = options.reflevel
-        self.divbase = options.divbase
-        self.division = options.division
-        self.audiodev = options.audio_source
-        self.mult = int(options.num_pulses)
-
-        # Low-pass cutoff for post-detector filter
-        # Set to 100Hz usually, since lots of pulsars fit in this
-        #   range
-        self.lowpass = options.lowpass
-
-        # What is lowest valid frequency bin in post-detector FFT?
-        # There's some pollution very close to DC
-        self.lowest_freq = options.lowest
-
-        # What (dB) threshold to use in determining spectral candidates
-        self.threshold = options.threshold
-
-        # Filename prefix for recording file
-        self.prefix = options.prefix
-
-        # Dispersion Measure (DM)
-        self.dm = options.dm
-
-        # Doppler shift, as a ratio
-        #  1.0 == no doppler shift
-        #  1.005 == a little negative shift
-        #  0.995 == a little positive shift
-        self.doppler = options.doppler
-
-        #
-        # Input frequency and observing frequency--not necessarily the
-        #   same thing, if we're looking at the IF of some downconverter
-        #   that's ahead of the USRP and daughtercard.  This distinction
-        #   is important in computing the correct de-dispersion filter.
-        #
-        self.frequency = options.freq
-        if options.observing <= 0:
-            self.observing_freq = options.freq
-        else:
-            self.observing_freq = options.observing
-        
-        # build the graph
-        self.u = usrp.source_c(decim_rate=options.decim)
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-
-        #
-        # Recording file, in case we ever need to record baseband data
-        #
-        self.recording = gr.file_sink(gr.sizeof_char, "/dev/null")
-        self.recording_state = False
-
-        self.pulse_recording = gr.file_sink(gr.sizeof_short, "/dev/null")
-        self.pulse_recording_state = False
-
-        #
-        # We come up with recording turned off, but the user may
-        #  request recording later on
-        self.recording.close()
-        self.pulse_recording.close()
-
-        #
-        # Need these two for converting 12-bit baseband signals to 8-bit
-        #
-        self.tofloat = gr.complex_to_float()
-        self.tochar = gr.float_to_char()
-
-        # Need this for recording pulses (post-detector)
-        self.toshort = gr.float_to_short()
-
-
-        #
-        # The spectral measurer sets this when it has a valid
-        #   average spectral peak-to-peak distance
-        # We can then use this to program the parameters for the epoch folder
-        #
-        # We set a sentimental value here
-        self.pulse_freq = options.pulsefreq
-
-        # Folder runs at this raw sample rate
-        self.folder_input_rate = 20000
-
-        # Each pulse in the epoch folder is sampled at 128 times the nominal
-        #  pulse rate
-        self.folding = 128
-
- 
-        #
-        # Try to find candidate parameters for rational resampler
-        #
-        save_i = 0
-        candidates = []
-        for i in range(20,300):
-            input_rate = self.folder_input_rate
-            output_rate = int(self.pulse_freq * i)
-            interp = gru.lcm(input_rate, output_rate) / input_rate
-            decim = gru.lcm(input_rate, output_rate) / output_rate
-            if (interp < 500 and decim < 250000):
-                 candidates.append(i)
-
-        # We didn't find anything, bail!
-        if (len(candidates) < 1):
-            print "Couldn't converge on resampler parameters"
-            sys.exit(1)
-
-        #
-        # Now try to find candidate with the least sampling error
-        #
-        mindiff = 999.999
-        for i in candidates:
-            diff = self.pulse_freq * i
-            diff = diff - int(diff)
-            if (diff < mindiff):
-                mindiff = diff
-                save_i = i
-
-        # Recompute rates
-        input_rate = self.folder_input_rate
-        output_rate = int(self.pulse_freq * save_i)
-
-        # Compute new interp and decim, based on best candidate
-        interp = gru.lcm(input_rate, output_rate) / input_rate
-        decim = gru.lcm(input_rate, output_rate) / output_rate
-
-        # Save optimized folding parameters, used later
-        self.folding = save_i
-        self.interp = int(interp)
-        self.decim = int(decim)
-
-        # So that we can view N pulses in the pulse viewer window
-        FOLD_MULT=self.mult
-
-        # determine the daughterboard subdevice we're using
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        self.cardtype = self.u.daughterboard_id(0)
-
-        # Compute raw input rate
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-
-        # BW==input_rate for complex data
-        self.bw = input_rate
-
-        #
-        # Set baseband filter bandwidth if DBS_RX:
-        #
-        if self.cardtype == usrp_dbid.DBS_RX:
-            lbw = input_rate / 2
-            if lbw < 1.0e6:
-                lbw = 1.0e6
-            self.subdev.set_bw(lbw)
-
-        #
-        # We use this as a crude volume control for the audio output
-        #
-        #self.volume = gr.multiply_const_ff(10**(-1))
-        
-
-        #
-        # Create location data for ephem package
-        #
-        self.locality = ephem.Observer()
-        self.locality.long = str(options.longitude)
-        self.locality.lat = str(options.latitude)
-
-        #
-        # What is the post-detector LPF cutoff for the FFT?
-        #
-        PULSAR_MAX_FREQ=int(options.lowpass)
-
-        # First low-pass filters down to input_rate/FIRST_FACTOR
-        #   and decimates appropriately
-        FIRST_FACTOR=int(input_rate/(self.folder_input_rate/2))
-        first_filter = gr.firdes.low_pass (1.0,
-                                          input_rate,
-                                          input_rate/FIRST_FACTOR,
-                                          input_rate/(FIRST_FACTOR*20),         
-                                          gr.firdes.WIN_HAMMING)
-
-        # Second filter runs at the output rate of the first filter,
-        #  And low-pass filters down to PULSAR_MAX_FREQ*10
-        #
-        second_input_rate =  int(input_rate/(FIRST_FACTOR/2))
-        second_filter = gr.firdes.band_pass(1.0, second_input_rate,
-                                          0.10,
-                                          PULSAR_MAX_FREQ*10,
-                                          PULSAR_MAX_FREQ*1.5,
-                                          gr.firdes.WIN_HAMMING)
-
-        # Third filter runs at PULSAR_MAX_FREQ*20
-        #   and filters down to PULSAR_MAX_FREQ
-        #
-        third_input_rate = PULSAR_MAX_FREQ*20
-        third_filter = gr.firdes_band_pass(1.0, third_input_rate,
-                                           0.10, PULSAR_MAX_FREQ,
-                                           PULSAR_MAX_FREQ/10.0,
-                                           gr.firdes.WIN_HAMMING)
-
-
-        #
-        # Create the appropriate FFT scope
-        #
-        self.scope = ra_fftsink.ra_fft_sink_f (panel, 
-           fft_size=int(options.fft_size), sample_rate=PULSAR_MAX_FREQ*2,
-           title="Post-detector spectrum",  
-           ofunc=self.pulsarfunc, xydfunc=self.xydfunc, fft_rate=200)
-
-        #
-        # Tell scope we're looking from DC to PULSAR_MAX_FREQ
-        #
-        self.scope.set_baseband_freq (0.0)
-
-
-        #
-        # Setup stripchart for showing pulse profiles
-        #
-        hz = "%5.3fHz " % self.pulse_freq
-        per = "(%5.3f sec)" % (1.0/self.pulse_freq)
-        sr = "%d sps" % (int(self.pulse_freq*self.folding))
-        times = " %d Pulse Intervals" % self.mult
-        self.chart = ra_stripchartsink.stripchart_sink_f (panel,
-               sample_rate=1,
-               stripsize=self.folding*FOLD_MULT, parallel=True, title="Pulse Profiles: "+hz+per+times, 
-               xlabel="Seconds @ "+sr, ylabel="Level", autoscale=True,
-               divbase=self.divbase, scaling=1.0/(self.folding*self.pulse_freq))
-        self.chart.set_ref_level(self.reflevel)
-        self.chart.set_y_per_div(self.division)
-
-        # De-dispersion filter setup
-        #
-        # Do this here, just before creating the filter
-        #  that will use the taps.
-        #
-        ntaps = self.compute_disp_ntaps(self.dm,self.bw,self.observing_freq)
-
-        # Taps for the de-dispersion filter
-        self.disp_taps = Numeric.zeros(ntaps,Numeric.Complex64)
-
-        # Compute the de-dispersion filter now
-        self.compute_dispfilter(self.dm,self.doppler,
-            self.bw,self.observing_freq)
-
-        #
-        # Call constructors for receive chains
-        #
-
-        #
-        # Now create the FFT filter using the computed taps
-        self.dispfilt = gr.fft_filter_ccc(1, self.disp_taps)
-
-        #
-        # Audio sink
-        #
-        #print "input_rate ", second_input_rate, "audiodev ", self.audiodev
-        #self.audio = audio.sink(second_input_rate, self.audiodev)
-
-        #
-        # The three post-detector filters
-        # Done this way to allow an audio path (up to 10Khz)
-        # ...and also because going from xMhz down to ~100Hz
-        # In a single filter doesn't seem to work.
-        #
-        self.first = gr.fir_filter_fff (FIRST_FACTOR/2, first_filter)
-
-        p = second_input_rate / (PULSAR_MAX_FREQ*20)
-        self.second = gr.fir_filter_fff (int(p), second_filter)
-        self.third = gr.fir_filter_fff (10, third_filter)
-
-        # Detector
-        self.detector = gr.complex_to_mag_squared()
-
-        self.enable_comb_filter = False
-        # Epoch folder comb filter
-        if self.enable_comb_filter == True:
-            bogtaps = Numeric.zeros(512, Numeric.Float64)
-            self.folder_comb = gr.fft_filter_ccc(1,bogtaps)
-
-        # Rational resampler
-        self.folder_rr = blks2.rational_resampler_fff(self.interp, self.decim)
-
-        # Epoch folder bandpass
-        bogtaps = Numeric.zeros(1, Numeric.Float64)
-        self.folder_bandpass = gr.fir_filter_fff (1, bogtaps)
-
-        # Epoch folder F2C/C2F
-        self.folder_f2c = gr.float_to_complex()
-        self.folder_c2f = gr.complex_to_float()
-
-        # Epoch folder S2P
-        self.folder_s2p = gr.serial_to_parallel (gr.sizeof_float, 
-             self.folding*FOLD_MULT)
-
-        # Epoch folder IIR Filter (produces average pulse profiles)
-        self.folder_iir = gr.single_pole_iir_filter_ff(1.0/options.favg,
-             self.folding*FOLD_MULT)
-
-        #
-        # Set all the epoch-folder goop up
-        #
-        self.set_folding_params()
-
-        # 
-        # Start connecting configured modules in the receive chain
-        #
-
-        # Connect raw USRP to de-dispersion filter, detector
-        self.connect(self.u, self.dispfilt, self.detector)
-
-        # Connect detector output to FIR LPF
-        #  in two stages, followed by the FFT scope
-        self.connect(self.detector, self.first,
-            self.second, self.third, self.scope)
-
-        # Connect audio output
-        #self.connect(self.first, self.volume)
-        #self.connect(self.volume, (self.audio, 0))
-        #self.connect(self.volume, (self.audio, 1))
-
-        # Connect epoch folder
-        if self.enable_comb_filter == True:
-            self.connect (self.first, self.folder_bandpass, self.folder_rr,
-                self.folder_f2c,
-                self.folder_comb, self.folder_c2f,
-                self.folder_s2p, self.folder_iir,
-                self.chart)
-
-        else:
-            self.connect (self.first, self.folder_bandpass, self.folder_rr,
-                self.folder_s2p, self.folder_iir, self.chart)
-
-        # Connect baseband recording file (initially /dev/null)
-        self.connect(self.u, self.tofloat, self.tochar, self.recording)
-
-        # Connect pulse recording file (initially /dev/null)
-        self.connect(self.first, self.toshort, self.pulse_recording)
-
-        #
-        # Build the GUI elements
-        #
-        self._build_gui(vbox)
-
-        # Make GUI agree with command-line
-        self.myform['average'].set_value(int(options.avg))
-        self.myform['foldavg'].set_value(int(options.favg))
-
-
-        # Make spectral averager agree with command line
-        if options.avg != 1.0:
-            self.scope.set_avg_alpha(float(1.0/options.avg))
-            self.scope.set_average(True)
-
-
-        # set initial values
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-        if options.freq is None:
-            # if no freq was specified, use the mid-point
-            r = self.subdev.freq_range()
-            options.freq = float(r[0]+r[1])/2
-
-        self.set_gain(options.gain)
-        #self.set_volume(-10.0)
-
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-
-        self.myform['decim'].set_value(self.u.decim_rate())
-        self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-        self.myform['dbname'].set_value(self.subdev.name())
-        self.myform['DM'].set_value(self.dm)
-        self.myform['Doppler'].set_value(self.doppler)
-
-        #
-        # Start the timer that shows current LMST on the GUI
-        #
-        self.lmst_timer.Start(1000)
-
-
-    def _set_status_msg(self, msg):
-        self.frame.GetStatusBar().SetStatusText(msg, 0)
-
-    def _build_gui(self, vbox):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-
-        def _form_set_dm(kv):
-            return self.set_dm(kv['DM'])
-
-        def _form_set_doppler(kv):
-            return self.set_doppler(kv['Doppler'])
-
-        # Position the FFT or Waterfall
-        vbox.Add(self.scope.win, 5, wx.EXPAND)
-        vbox.Add(self.chart.win, 5, wx.EXPAND)
-
-        # add control area at the bottom
-        self.myform = myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((7,0), 0, wx.EXPAND)
-        vbox1 = wx.BoxSizer(wx.VERTICAL)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=vbox1, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-        vbox1.Add((3,0), 0, 0)
-
-        # To show current Local Mean Sidereal Time
-        myform['lmst_high'] = form.static_text_field(
-            parent=self.panel, sizer=vbox1, label="Current LMST", weight=1)
-        vbox1.Add((3,0), 0, 0)
-
-        # To show current spectral cursor data
-        myform['spec_data'] = form.static_text_field(
-            parent=self.panel, sizer=vbox1, label="Pulse Freq", weight=1)
-        vbox1.Add((3,0), 0, 0)
-
-        # To show best pulses found in FFT output
-        myform['best_pulse'] = form.static_text_field(
-            parent=self.panel, sizer=vbox1, label="Best freq", weight=1)
-        vbox1.Add((3,0), 0, 0)
-
-        vboxBogus = wx.BoxSizer(wx.VERTICAL)
-        vboxBogus.Add ((2,0), 0, wx.EXPAND)
-        vbox2 = wx.BoxSizer(wx.VERTICAL)
-        g = self.subdev.gain_range()
-        myform['gain'] = form.slider_field(parent=self.panel, sizer=vbox2, label="RF Gain",
-                                           weight=1,
-                                           min=int(g[0]), max=int(g[1]),
-                                           callback=self.set_gain)
-
-        vbox2.Add((6,0), 0, 0)
-        myform['average'] = form.slider_field(parent=self.panel, sizer=vbox2, 
-                    label="Spectral Averaging", weight=1, min=1, max=200, callback=self.set_averaging)
-        vbox2.Add((6,0), 0, 0)
-        myform['foldavg'] = form.slider_field(parent=self.panel, sizer=vbox2,
-                    label="Folder Averaging", weight=1, min=1, max=20, callback=self.set_folder_averaging)
-        vbox2.Add((6,0), 0, 0)
-        #myform['volume'] = form.quantized_slider_field(parent=self.panel, sizer=vbox2,
-                    #label="Audio Volume", weight=1, range=(-20, 0, 0.5), callback=self.set_volume)
-        #vbox2.Add((6,0), 0, 0)
-        myform['DM'] = form.float_field(
-            parent=self.panel, sizer=vbox2, label="DM", weight=1,
-            callback=myform.check_input_and_call(_form_set_dm))
-        vbox2.Add((6,0), 0, 0)
-        myform['Doppler'] = form.float_field(
-            parent=self.panel, sizer=vbox2, label="Doppler", weight=1,
-            callback=myform.check_input_and_call(_form_set_doppler))
-        vbox2.Add((6,0), 0, 0)
-
-
-        # Baseband recording control
-        buttonbox = wx.BoxSizer(wx.HORIZONTAL)
-        self.record_control = form.button_with_callback(self.panel,
-              label="Recording baseband: Off                           ",
-              callback=self.toggle_recording)
-        self.record_pulse_control = form.button_with_callback(self.panel,
-              label="Recording pulses: Off                              ",
-              callback=self.toggle_pulse_recording)
-
-        buttonbox.Add(self.record_control, 0, wx.CENTER)
-        buttonbox.Add(self.record_pulse_control, 0, wx.CENTER)
-        vbox.Add(buttonbox, 0, wx.CENTER)
-        hbox.Add(vbox1, 0, 0)
-        hbox.Add(vboxBogus, 0, 0)
-	hbox.Add(vbox2, wx.ALIGN_RIGHT, 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        self._build_subpanel(vbox)
-
-        self.lmst_timer = wx.PyTimer(self.lmst_timeout)
-        self.lmst_timeout()
-
-
-    def _build_subpanel(self, vbox_arg):
-        # build a secondary information panel (sometimes hidden)
-
-        # FIXME figure out how to have this be a subpanel that is always
-        # created, but has its visibility controlled by foo.Show(True/False)
-        
-        if not(self.show_debug_info):
-            return
-
-        panel = self.panel
-        vbox = vbox_arg
-        myform = self.myform
-
-        #panel = wx.Panel(self.panel, -1)
-        #vbox = wx.BoxSizer(wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-        myform['decim'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Decim")
-
-        hbox.Add((5,0), 1)
-        myform['fs@usb'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Fs@USB")
-
-        hbox.Add((5,0), 1)
-        myform['dbname'] = form.static_text_field(
-            parent=panel, sizer=hbox)
-
-        hbox.Add((5,0), 1)
-        myform['baseband'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Analog BB")
-
-        hbox.Add((5,0), 1)
-        myform['ddc'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC")
-
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        
-        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        r = usrp.tune(self.u, 0, self.subdev, target_freq)
-
-        if r:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-            self.myform['baseband'].set_value(r.baseband_freq)
-            self.myform['ddc'].set_value(r.dxc_freq)
-            # Adjust self.frequency, and self.observing_freq
-            # We pick up the difference between the current self.frequency
-            #   and the just-programmed one, and use this to adjust
-            #   self.observing_freq.  We have to do it this way to
-            #   make the dedispersion filtering work out properly.
-            delta = target_freq - self.frequency
-            self.frequency = target_freq
-            self.observing_freq += delta
-
-            # Now that we're adjusted, compute a new dispfilter, and
-            #   set the taps for the FFT filter.
-            ntaps = self.compute_disp_ntaps(self.dm, self.bw, self.observing_freq)
-            self.disp_taps = Numeric.zeros(ntaps, Numeric.Complex64)
-            self.compute_dispfilter(self.dm,self.doppler,self.bw,
-                self.observing_freq)
-            self.dispfilt.set_taps(self.disp_taps)
-
-            return True
-
-        return False
-
-    # Callback for gain-setting slider
-    def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
-
-
-    #def set_volume(self, vol):
-        #self.myform['volume'].set_value(vol)
-        #self.volume.set_k((10**(vol/10))/8192)
-
-    # Callback for spectral-averaging slider
-    def set_averaging(self, avval):
-        self.myform['average'].set_value(avval)
-        self.scope.set_avg_alpha(1.0/(avval))
-        self.scope.set_average(True)
-
-    def set_folder_averaging(self, avval):
-        self.myform['foldavg'].set_value(avval)
-        self.folder_iir.set_taps(1.0/avval)
-
-    # Timer callback to update LMST display
-    def lmst_timeout(self):
-         self.locality.date = ephem.now()
-         sidtime = self.locality.sidereal_time()
-         self.myform['lmst_high'].set_value(str(ephem.hours(sidtime)))
-
-    #
-    # Turn recording on/off
-    # Called-back by "Recording" button
-    #
-    def toggle_recording(self):
-        # Pick up current LMST
-        self.locality.date = ephem.now()
-        sidtime = self.locality.sidereal_time()
-
-        # Pick up localtime, for generating filenames
-        foo = time.localtime()
-
-        # Generate filenames for both data and header file
-        filename = "%04d%02d%02d%02d%02d.pdat" % (foo.tm_year, foo.tm_mon,
-           foo.tm_mday, foo.tm_hour, foo.tm_min)
-        hdrfilename = "%04d%02d%02d%02d%02d.phdr" % (foo.tm_year, foo.tm_mon,
-           foo.tm_mday, foo.tm_hour, foo.tm_min)
-
-        # Current recording?  Flip state
-        if (self.recording_state == True):
-          self.recording_state = False
-          self.record_control.SetLabel("Recording baseband: Off                           ")
-          self.recording.close()
-        # Not recording?
-        else:
-          self.recording_state = True
-          self.record_control.SetLabel("Recording baseband to: "+filename)
-
-          # Cause gr_file_sink object to accept new filename
-          #   note use of self.prefix--filename prefix from
-          #   command line (defaults to ./)
-          #
-          self.recording.open (self.prefix+filename)
-
-          #
-          # We open the header file as a regular file, write header data,
-          #   then close
-          hdrf = open(self.prefix+hdrfilename, "w")
-          hdrf.write("receiver center frequency: "+str(self.frequency)+"\n")
-          hdrf.write("observing frequency: "+str(self.observing_freq)+"\n")
-          hdrf.write("DM: "+str(self.dm)+"\n")
-          hdrf.write("doppler: "+str(self.doppler)+"\n")
-
-          hdrf.write("sidereal: "+str(ephem.hours(sidtime))+"\n")
-          hdrf.write("bandwidth: "+str(self.u.adc_freq() / self.u.decim_rate())+"\n")
-          hdrf.write("sample type: complex_char\n")
-          hdrf.write("sample size: "+str(gr.sizeof_char*2)+"\n")
-          hdrf.close()
-    #
-    # Turn recording on/off
-    # Called-back by "Recording" button
-    #
-    def toggle_pulse_recording(self):
-        # Pick up current LMST
-        self.locality.date = ephem.now()
-        sidtime = self.locality.sidereal_time()
-
-        # Pick up localtime, for generating filenames
-        foo = time.localtime()
-
-        # Generate filenames for both data and header file
-        filename = "%04d%02d%02d%02d%02d.padat" % (foo.tm_year, foo.tm_mon,
-           foo.tm_mday, foo.tm_hour, foo.tm_min)
-        hdrfilename = "%04d%02d%02d%02d%02d.pahdr" % (foo.tm_year, foo.tm_mon,
-           foo.tm_mday, foo.tm_hour, foo.tm_min)
-
-        # Current recording?  Flip state
-        if (self.pulse_recording_state == True):
-          self.pulse_recording_state = False
-          self.record_pulse_control.SetLabel("Recording pulses: Off                           ")
-          self.pulse_recording.close()
-        # Not recording?
-        else:
-          self.pulse_recording_state = True
-          self.record_pulse_control.SetLabel("Recording pulses to: "+filename)
-
-          # Cause gr_file_sink object to accept new filename
-          #   note use of self.prefix--filename prefix from
-          #   command line (defaults to ./)
-          #
-          self.pulse_recording.open (self.prefix+filename)
-
-          #
-          # We open the header file as a regular file, write header data,
-          #   then close
-          hdrf = open(self.prefix+hdrfilename, "w")
-          hdrf.write("receiver center frequency: "+str(self.frequency)+"\n")
-          hdrf.write("observing frequency: "+str(self.observing_freq)+"\n")
-          hdrf.write("DM: "+str(self.dm)+"\n")
-          hdrf.write("doppler: "+str(self.doppler)+"\n")
-          hdrf.write("pulse rate: "+str(self.pulse_freq)+"\n")
-          hdrf.write("pulse sps: "+str(self.pulse_freq*self.folding)+"\n")
-          hdrf.write("file sps: "+str(self.folder_input_rate)+"\n")
-
-          hdrf.write("sidereal: "+str(ephem.hours(sidtime))+"\n")
-          hdrf.write("bandwidth: "+str(self.u.adc_freq() / self.u.decim_rate())+"\n")
-          hdrf.write("sample type: short\n")
-          hdrf.write("sample size: 1\n")
-          hdrf.close()
-
-    # We get called at startup, and whenever the GUI "Set Folding params"
-    #   button is pressed
-    #
-    def set_folding_params(self):
-        if (self.pulse_freq <= 0):
-            return
-
-        # Compute required sample rate
-        self.sample_rate = int(self.pulse_freq*self.folding)
-
-        # And the implied decimation rate
-        required_decimation = int(self.folder_input_rate / self.sample_rate)
-
-        # We also compute a new FFT comb filter, based on the expected
-        #  spectral profile of our pulse parameters
-        #
-        # FFT-based comb filter
-        #
-        N_COMB_TAPS=int(self.sample_rate*4)
-        if N_COMB_TAPS > 2000:
-            N_COMB_TAPS = 2000
-        self.folder_comb_taps = Numeric.zeros(N_COMB_TAPS,Numeric.Complex64)
-        fincr = (self.sample_rate)/float(N_COMB_TAPS)
-        for i in range(0,len(self.folder_comb_taps)):
-            self.folder_comb_taps[i] = complex(0.0, 0.0)
-
-        freq = 0.0
-        harmonics = [1.0,2.0,3.0,4.0,5.0,6.0,7.0]
-        for i in range(0,len(self.folder_comb_taps)/2):
-            for j in range(0,len(harmonics)):
-                 if abs(freq - harmonics[j]*self.pulse_freq) <= fincr:
-                     self.folder_comb_taps[i] = complex(4.0, 0.0)
-                     if harmonics[j] == 1.0:
-                         self.folder_comb_taps[i] = complex(8.0, 0.0)
-            freq += fincr
-
-        if self.enable_comb_filter == True:
-            # Set the just-computed FFT comb filter taps
-            self.folder_comb.set_taps(self.folder_comb_taps)
-
-        # And compute a new decimated bandpass filter, to go in front
-        #   of the comb.  Primary function is to decimate and filter down
-        #   to an exact-ish multiple of the target pulse rate
-        #
-        self.folding_taps = gr.firdes_band_pass (1.0, self.folder_input_rate,
-            0.10, self.sample_rate/2, 10, 
-            gr.firdes.WIN_HAMMING)
-
-        # Set the computed taps for the bandpass/decimate filter
-        self.folder_bandpass.set_taps (self.folding_taps)
-    #
-    # Record a spectral "hit" of a possible pulsar spectral profile
-    #
-    def record_hit(self,hits, hcavg, hcmax):
-        # Pick up current LMST
-        self.locality.date = ephem.now()
-        sidtime = self.locality.sidereal_time()
-
-        # Pick up localtime, for generating filenames
-        foo = time.localtime()
-
-        # Generate filenames for both data and header file
-        hitfilename = "%04d%02d%02d%02d.phit" % (foo.tm_year, foo.tm_mon,
-           foo.tm_mday, foo.tm_hour)
-
-        hitf = open(self.prefix+hitfilename, "a")
-        hitf.write("receiver center frequency: "+str(self.frequency)+"\n")
-        hitf.write("observing frequency: "+str(self.observing_freq)+"\n")
-        hitf.write("DM: "+str(self.dm)+"\n")
-        hitf.write("doppler: "+str(self.doppler)+"\n")
-
-        hitf.write("sidereal: "+str(ephem.hours(sidtime))+"\n")
-        hitf.write("bandwidth: "+str(self.u.adc_freq() / self.u.decim_rate())+"\n")
-        hitf.write("spectral peaks: "+str(hits)+"\n")
-        hitf.write("HCM: "+str(hcavg)+" "+str(hcmax)+"\n")
-        hitf.close()
-
-    # This is a callback used by ra_fftsink.py (passed on creation of
-    #   ra_fftsink)
-    # Whenever the user moves the cursor within the FFT display, this
-    #   shows the coordinate data
-    #
-    def xydfunc(self,xyv):
-        s = "%.6fHz\n%.3fdB" % (xyv[0], xyv[1])
-        if self.lowpass >= 500:
-            s = "%.6fHz\n%.3fdB" % (xyv[0]*1000, xyv[1])
-        
-        self.myform['spec_data'].set_value(s)
-
-    # This is another callback used by ra_fftsink.py (passed on creation
-    #   of ra_fftsink).  We pass this as our "calibrator" function, but
-    #   we create interesting side-effects in the GUI.
-    #
-    # This function finds peaks in the FFT output data, and reports
-    #  on them through the "Best" text object in the GUI
-    #  It also computes the Harmonic Compliance Measure (HCM), and displays
-    #  that also.
-    #
-    def pulsarfunc(self,d,l):
-       x = range(0,l)
-       incr = float(self.lowpass)/float(l)
-       incr = incr * 2.0
-       bestdb = -50.0
-       bestfreq = 0.0
-       avg = 0
-       dcnt = 0
-       #
-       # First, we need to find the average signal level
-       #
-       for i in x:
-           if (i * incr) > self.lowest_freq and (i*incr) < (self.lowpass-2):
-               avg += d[i]
-               dcnt += 1
-       # Set average signal level
-       avg /= dcnt
-       s2=" "
-       findcnt = 0
-       #
-       # Then we find candidates that are greater than the user-supplied
-       #   threshold.
-       #
-       # We try to cluster "hits" whose whole-number frequency is the
-       #   same, and compute an average "hit" frequency.
-       #
-       lastint = 0
-       hits=[]
-       intcnt = 0
-       freqavg = 0
-       for i in x:
-           freq = i*incr
-           # If frequency within bounds, and the (dB-avg) value is above our
-           #   threshold
-           if freq > self.lowest_freq and freq < self.lowpass-2 and (d[i] - avg) > self.threshold:
-               # If we're finding a new whole-number frequency
-               if lastint != int(freq):
-                   # Record "center" of this hit, if this is a new hit
-                   if lastint != 0:
-                       s2 += "%5.3fHz " % (freqavg/intcnt)
-                       hits.append(freqavg/intcnt)
-                       findcnt += 1
-                   lastint = int(freq)
-                   intcnt = 1
-                   freqavg = freq
-               else:
-                   intcnt += 1
-                   freqavg += freq
-           if (findcnt >= 14):
-               break
-
-       if intcnt > 1:
-           s2 += "%5.3fHz " % (freqavg/intcnt)
-           hits.append(freqavg/intcnt)
-
-       #
-       # Compute the HCM, by dividing each of the "hits" by each of the
-       #   other hits, and comparing the difference between a "perfect"
-       #   harmonic, and the observed frequency ratio.
-       #
-       measure = 0
-       max_measure=0
-       mcnt = 0
-       avg_dist = 0
-       acnt = 0
-       for i in range(1,len(hits)):
-           meas = hits[i]/hits[0] - int(hits[i]/hits[0])
-           if abs((hits[i]-hits[i-1])-hits[0]) < 0.1:
-               avg_dist += hits[i]-hits[i-1]
-               acnt += 1
-           if meas > 0.98 and meas < 1.0:
-               meas = 1.0 - meas
-           meas *= hits[0]
-           if meas >= max_measure:
-               max_measure = meas
-           measure += meas
-           mcnt += 1
-       if mcnt > 0:
-           measure /= mcnt
-           if acnt > 0:
-               avg_dist /= acnt
-       if len(hits) > 1:
-           measure /= mcnt
-           s3="\nHCM: Avg %5.3fHz(%d) Max %5.3fHz Dist %5.3fHz(%d)" % (measure,mcnt,max_measure, avg_dist, acnt)
-           if max_measure < 0.5 and len(hits) >= 2:
-               self.record_hit(hits, measure, max_measure)
-               self.avg_dist = avg_dist
-       else:
-           s3="\nHCM: --"
-       s4="\nAvg dB: %4.2f" % avg
-       self.myform['best_pulse'].set_value("("+s2+")"+s3+s4)
-
-       # Since we are nominally a calibrator function for ra_fftsink, we
-       #  simply return what they sent us, untouched.  A "real" calibrator
-       #  function could monkey with the data before returning it to the
-       #  FFT display function.
-       return(d)
-
-    #
-    # Callback for the "DM" gui object
-    #
-    # We call compute_dispfilter() as appropriate to compute a new filter,
-    #   and then set that new filter into self.dispfilt.
-    #
-    def set_dm(self,dm):
-       self.dm = dm
-
-       ntaps = self.compute_disp_ntaps (self.dm, self.bw, self.observing_freq)
-       self.disp_taps = Numeric.zeros(ntaps, Numeric.Complex64)
-       self.compute_dispfilter(self.dm,self.doppler,self.bw,self.observing_freq)
-       self.dispfilt.set_taps(self.disp_taps)
-       self.myform['DM'].set_value(dm)
-       return(dm)
-
-    #
-    # Callback for the "Doppler" gui object
-    #
-    # We call compute_dispfilter() as appropriate to compute a new filter,
-    #   and then set that new filter into self.dispfilt.
-    #
-    def set_doppler(self,doppler):
-       self.doppler = doppler
-
-       ntaps = self.compute_disp_ntaps (self.dm, self.bw, self.observing_freq)
-       self.disp_taps = Numeric.zeros(ntaps, Numeric.Complex64)
-       self.compute_dispfilter(self.dm,self.doppler,self.bw,self.observing_freq)
-       self.dispfilt.set_taps(self.disp_taps)
-       self.myform['Doppler'].set_value(doppler)
-       return(doppler)
-
-    #
-    # Compute a de-dispersion filter
-    #  From Hankins, et al, 1975
-    #
-    # This code translated from dedisp_filter.c from Swinburne
-    #   pulsar software repository
-    #
-    def compute_dispfilter(self,dm,doppler,bw,centerfreq):
-        npts = len(self.disp_taps)
-        tmp = Numeric.zeros(npts, Numeric.Complex64)
-        M_PI = 3.14159265358
-        DM = dm/2.41e-10
-
-        #
-        # Because astronomers are a crazy bunch, the "standard" calcultion
-        #   is in Mhz, rather than Hz
-        #
-        centerfreq = centerfreq / 1.0e6
-        bw = bw / 1.0e6
-        
-        isign = int(bw / abs (bw))
-        
-        # Center frequency may be doppler shifted
-        cfreq     = centerfreq / doppler
-
-        # As well as the bandwidth..
-        bandwidth = bw / doppler
-
-        # Bandwidth divided among bins
-        binwidth  = bandwidth / npts
-
-        # Delay is an "extra" parameter, in usecs, and largely
-        #  untested in the Swinburne code.
-        delay = 0.0
-        
-        # This determines the coefficient of the frequency response curve
-        # Linear in DM, but quadratic in center frequency
-        coeff = isign * 2.0*M_PI * DM / (cfreq*cfreq)
-        
-        # DC to nyquist/2
-        n = 0
-        for i in range(0,int(npts/2)):
-            freq = (n + 0.5) * binwidth
-            phi = coeff*freq*freq/(cfreq+freq) + (2.0*M_PI*freq*delay)
-            tmp[i] = complex(math.cos(phi), math.sin(phi))
-            n += 1
-
-        # -nyquist/2 to DC
-        n = int(npts/2)
-        n *= -1
-        for i in range(int(npts/2),npts):
-            freq = (n + 0.5) * binwidth
-            phi = coeff*freq*freq/(cfreq+freq) + (2.0*M_PI*freq*delay)
-            tmp[i] = complex(math.cos(phi), math.sin(phi))
-            n += 1
-        
-        self.disp_taps = numpy.fft.ifft(tmp)
-        return(self.disp_taps)
-
-    #
-    # Compute minimum number of taps required in de-dispersion FFT filter
-    #
-    def compute_disp_ntaps(self,dm,bw,freq):
-        #
-        # Dt calculations are in Mhz, rather than Hz
-        #    crazy astronomers....
-        mbw = bw/1.0e6
-        mfreq = freq/1.0e6
-
-        f_lower = mfreq-(mbw/2)
-        f_upper = mfreq+(mbw/2)
-
-        # Compute smear time
-        Dt = dm/2.41e-4 * (1.0/(f_lower*f_lower)-1.0/(f_upper*f_upper))
-
-        # ntaps is now bandwidth*smeartime
-        # Should be bandwidth*smeartime*2, but the Gnu Radio FFT filter
-        #   already expands it by a factor of 2
-        ntaps = bw*Dt
-        if ntaps < 64:
-            ntaps = 64
-        return(int(ntaps))
-
-def main ():
-    app = stdgui2.stdapp(app_flow_graph, "RADIO ASTRONOMY PULSAR RECEIVER: $Revision$", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-radio-astronomy/src/python/usrp_ra_receiver.help b/gr-radio-astronomy/src/python/usrp_ra_receiver.help
deleted file mode 100644
index 45a21e297..000000000
--- a/gr-radio-astronomy/src/python/usrp_ra_receiver.help
+++ /dev/null
@@ -1,90 +0,0 @@
-This program is used to take spectra and total power measurements.
-  It records spectral and total-power data to external datalogging
-  files.
-
-The program takes the following options:
-
-  --rx-subdev-spec     which USRP Rx side?  A or B
-
-  --decim              USRP decimation rate: 8, 16, 32, and 64 are good
-                       (8Mhz, 4Mhz, 2Mhz, and 1Mhz bandwidth)
-
-  --freq               USRP daughtercard frequency
-
-  --observing          Actual observing frequency (default is to use the
-                       setting for --freq)
-
-  --avg                Averaging setting for spectral display--higher numbers
-                       equal more averaging.  25 to 40 is typical.
-
-  --integ              Total power integration time: seconds
-
-  --gain               USRP daughtercard gain control
-
-  --reflevel           Reference level on pulse profile display
-
-  --longitude          Observer longitude: West is negative
-
-  --latitude           Observer latitude:  South is negative
-
-  --fft_size           Size of FFT for post-detector spectrum: default is 1024
-
-  --prefix             Filename prefix to use for data logging files
-                       Default is ./
-
-  --divbase            The base of the Y/Div menu in pulsar display
-
-  --division           The initial Y/Div in pulsar display
-
-  --ylabel             Y axis label
-
-  --cfunc              The function name prefix for the spectral and
-                       calibrator functions
-
-  --waterfall          Use waterfall, rather than regular spectral display
-                       NOT TESTED IN THIS APPLICATION
-
-  --stripsize          Size of the total-power stripchart, in samples
-
-There are two windows--a spectral window, and the total-power window.
-  Moving the cursor around in the spectral window shows you the
-  corresponding frequency and doppler shift.  Left clicking in this
-  window sets an interference marker, which sets a "zero" in the
-  interference filter.  Use the "clear interference" button to clear this.
-
-The total power window is updated at a fixed 2Hz rate, and grows from
-  the left of the display.
-
-If latitude and longitude are set correctly, and system time is correct,
-  then the current LMST is displayed, updated once per second.
-
-Averaging parameters, gain, and frequency can all be set from the GUI using
-  the appropriate controls.  You can also enter the current declination, which
-  will appear in the datalogging files.  This is useful both for mapping,
-  and housekeeping purposes, particularly when you haven't looked at a datafile
-  for quite some time.
-
-There are two datalog files produced by this program:
-
-     YYYYMMDDHH.tpdat      Total power data
-
-     The date/time portion of the filename is referred to local time,
-     rather than UTC or sidereal.
-
-     First field is sidereal time when sample was taken
-     Second field is total power datum
-     Third field is declination in decimal degrees
-
-     Samples are written once per second
-
-     YYYYMMDDHH.sdat       Spectral data
-
-     The date/time portion of the filename is referred to local time,
-     rather than UTC or sidereal.
-
-     First field is sidereal time when spectrum was taken
-     Second field is declination in decimal degrees
-     Third field is complex spectral data--in the same order that FFTW3 library
-         places bins:  DC to bandwidth/2, followed by -bandwidth/2 to DC.
-
-     Spectral snapshots are written once every 5 seconds
diff --git a/gr-radio-astronomy/src/python/usrp_ra_receiver.py b/gr-radio-astronomy/src/python/usrp_ra_receiver.py
deleted file mode 100755
index c37355d28..000000000
--- a/gr-radio-astronomy/src/python/usrp_ra_receiver.py
+++ /dev/null
@@ -1,1384 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,2007 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.
-# 
-
-from gnuradio import gr, gru
-from gnuradio import usrp
-from usrpm import usrp_dbid
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui2, ra_fftsink, ra_stripchartsink, ra_waterfallsink, form, slider
-from optparse import OptionParser
-import wx
-import sys
-import Numeric 
-import time
-import numpy.fft
-import ephem
-
-class app_flow_graph(stdgui2.std_top_block):
-	def __init__(self, frame, panel, vbox, argv):
-		stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-		self.frame = frame
-		self.panel = panel
-		
-		parser = OptionParser(option_class=eng_option)
-		parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=(0, 0),
-			help="select USRP Rx side A or B (default=A)")
-		parser.add_option("-d", "--decim", type="int", default=16,
-			help="set fgpa decimation rate to DECIM [default=%default]")
-		parser.add_option("-f", "--freq", type="eng_float", default=None,
-			help="set frequency to FREQ", metavar="FREQ")
-		parser.add_option("-a", "--avg", type="eng_float", default=1.0,
-			help="set spectral averaging alpha")
-		parser.add_option("-i", "--integ", type="eng_float", default=1.0,
-			help="set integration time")
-		parser.add_option("-g", "--gain", type="eng_float", default=None,
-			help="set gain in dB (default is midpoint)")
-		parser.add_option("-l", "--reflevel", type="eng_float", default=30.0,
-			help="Set Total power reference level")
-		parser.add_option("-y", "--division", type="eng_float", default=0.5,
-			help="Set Total power Y division size")
-		parser.add_option("-e", "--longitude", type="eng_float", default=-76.02,help="Set Observer Longitude")
-		parser.add_option("-c", "--latitude", type="eng_float", default=44.85,help="Set Observer Latitude")
-		parser.add_option("-o", "--observing", type="eng_float", default=0.0,
-			help="Set observing frequency")
-		parser.add_option("-x", "--ylabel", default="dB", help="Y axis label") 
-		parser.add_option("-z", "--divbase", type="eng_float", default=0.025, help="Y Division increment base") 
-		parser.add_option("-v", "--stripsize", type="eng_float", default=2400, help="Size of stripchart, in 2Hz samples") 
-		parser.add_option("-F", "--fft_size", type="eng_float", default=1024, help="Size of FFT")
-		parser.add_option("-N", "--decln", type="eng_float", default=999.99, help="Observing declination")
-		parser.add_option("-X", "--prefix", default="./")
-		parser.add_option("-M", "--fft_rate", type="eng_float", default=8.0, help="FFT Rate")
-		parser.add_option("-A", "--calib_coeff", type="eng_float", default=1.0, help="Calibration coefficient")
-		parser.add_option("-B", "--calib_offset", type="eng_float", default=0.0, help="Calibration coefficient")
-		parser.add_option("-W", "--waterfall", action="store_true", default=False, help="Use Waterfall FFT display")
-		parser.add_option("-S", "--setimode", action="store_true", default=False, help="Enable SETI processing of spectral data")
-		parser.add_option("-K", "--setik", type="eng_float", default=1.5, help="K value for SETI analysis")
-		parser.add_option("-T", "--setibandwidth", type="eng_float", default=12500, help="Instantaneous SETI observing bandwidth--must be divisor of 250Khz")
-		parser.add_option("-Q", "--seti_range", type="eng_float", default=1.0e6, help="Total scan width, in Hz for SETI scans")
-		parser.add_option("-Z", "--dual_mode", action="store_true",
-			default=False, help="Dual-polarization mode")
-		parser.add_option("-I", "--interferometer", action="store_true", default=False, help="Interferometer mode")
-		parser.add_option("-D", "--switch_mode", action="store_true", default=False, help="Dicke Switching mode")
-		parser.add_option("-P", "--reference_divisor", type="eng_float", default=1.0, help="Reference Divisor")
-		parser.add_option("-U", "--ref_fifo", default=None)
-		parser.add_option("-k", "--notch_taps", type="int", default=64, help="Number of notch taps")
-		parser.add_option("-n", "--notches", action="store_true", 
-		    default=False, help="Notch frequencies after all other args")
-		parser.add_option("-Y", "--interface", default=None)
-		parser.add_option("-H", "--mac_addr", default=None)
-
-		# Added this documentation
-		
-		(options, args) = parser.parse_args()
-
-		self.setimode = options.setimode
-		self.dual_mode = options.dual_mode
-		self.interferometer = options.interferometer
-		self.normal_mode = False
-		self.switch_mode = options.switch_mode
-		self.switch_state = 0
-		self.reference_divisor = options.reference_divisor
-		self.ref_fifo = options.ref_fifo
-		self.usrp2 = False
-		self.decim = options.decim
-		self.rx_subdev_spec = options.rx_subdev_spec
-		
-		if (options.interface != None and options.mac_addr != None):
-			self.mac_addr = options.mac_addr
-			self.interface = options.interface
-			self.usrp2 = True
-		
-		self.NOTCH_TAPS = options.notch_taps
-		self.notches = Numeric.zeros(self.NOTCH_TAPS,Numeric.Float64)
-		# Get notch locations
-		j = 0
-		for i in args:
-			self.notches[j] = float(i)
-			j = j + 1
-		
-		self.use_notches = options.notches
-		
-		if (self.ref_fifo != None):
-			self.ref_fifo_file = open (self.ref_fifo, "r")
-		
-		modecount = 0
-		for modes in (self.dual_mode, self.interferometer):
-			if (modes == True):
-				modecount = modecount + 1
-				
-		if (modecount > 1):
-			print "must select only 1 of --dual_mode, or --interferometer"
-			sys.exit(1)
-			
-		self.chartneeded = True
-		
-		if (self.setimode == True):
-			self.chartneeded = False
-			
-		if (self.setimode == True and self.interferometer == True):
-			print "can't pick both --setimode and --interferometer"
-			sys.exit(1)
-			
-		if (self.setimode == True and self.switch_mode == True):
-			print "can't pick both --setimode and --switch_mode"
-			sys.exit(1)
-		
-		if (self.interferometer == True and self.switch_mode == True):
-			print "can't pick both --interferometer and --switch_mode"
-			sys.exit(1)
-		
-		if (modecount == 0):
-			self.normal_mode = True
-
-		self.show_debug_info = True
-		
-		# Pick up waterfall option
-		self.waterfall = options.waterfall
-
-		# SETI mode stuff
-		self.setimode = options.setimode
-		self.seticounter = 0
-		self.setik = options.setik
-		self.seti_fft_bandwidth = int(options.setibandwidth)
-
-		# Calculate binwidth
-		binwidth = self.seti_fft_bandwidth / options.fft_size
-
-		# Use binwidth, and knowledge of likely chirp rates to set reasonable
-		#  values for SETI analysis code.	We assume that SETI signals will
-		#  chirp at somewhere between 0.10Hz/sec and 0.25Hz/sec.
-		#
-		# upper_limit is the "worst case"--that is, the case for which we have
-		#  to wait the longest to actually see any drift, due to the quantizing
-		#  on FFT bins.
-		upper_limit = binwidth / 0.10
-		self.setitimer = int(upper_limit * 2.00)
-		self.scanning = True
-
-		# Calculate the CHIRP values based on Hz/sec
-		self.CHIRP_LOWER = 0.10 * self.setitimer
-		self.CHIRP_UPPER = 0.25 * self.setitimer
-
-		# Reset hit counters to 0
-		self.hitcounter = 0
-		self.s1hitcounter = 0
-		self.s2hitcounter = 0
-		self.avgdelta = 0
-		# We scan through 2Mhz of bandwidth around the chosen center freq
-		self.seti_freq_range = options.seti_range
-		# Calculate lower edge
-		self.setifreq_lower = options.freq - (self.seti_freq_range/2)
-		self.setifreq_current = options.freq
-		# Calculate upper edge
-		self.setifreq_upper = options.freq + (self.seti_freq_range/2)
-
-		# Maximum "hits" in a line
-		self.nhits = 20
-
-		# Number of lines for analysis
-		self.nhitlines = 4
-
-		# We change center frequencies based on nhitlines and setitimer
-		self.setifreq_timer = self.setitimer * (self.nhitlines * 5)
-
-		# Create actual timer
-		self.seti_then = time.time()
-
-		# The hits recording array
-		self.hits_array = Numeric.zeros((self.nhits,self.nhitlines), Numeric.Float64)
-		self.hit_intensities = Numeric.zeros((self.nhits,self.nhitlines), Numeric.Float64)
-		# Calibration coefficient and offset
-		self.calib_coeff = options.calib_coeff
-		self.calib_offset = options.calib_offset
-		if self.calib_offset < -750:
-			self.calib_offset = -750
-		if self.calib_offset > 750:
-			self.calib_offset = 750
-
-		if self.calib_coeff < 1:
-			self.calib_coeff = 1
-		if self.calib_coeff > 100:
-			self.calib_coeff = 100
-
-		self.integ = options.integ
-		self.avg_alpha = options.avg
-		self.gain = options.gain
-		self.decln = options.decln
-
-		# Set initial values for datalogging timed-output
-		self.continuum_then = time.time()
-		self.spectral_then = time.time()
-		
-	  
-		# build the graph
-
-		self.subdev = [(0, 0), (0,0)]
-		
-		#
-		# If SETI mode, we always run at maximum USRP decimation
-		#
-		if (self.setimode):
-			options.decim = 256
-		
-		if (self.dual_mode == True and self.decim <= 4):
-			print "Cannot use decim <= 4 with dual_mode"
-			sys.exit(1)
-		
-		self.setup_usrp()
-		
-		# Set initial declination
-		self.decln = options.decln
-
-		input_rate = self.u.adc_freq() / self.u.decim_rate()
-		self.bw = input_rate
-		#
-		# Set prefix for data files
-		#
-		self.prefix = options.prefix
-
-		#
-		# The lower this number, the fewer sample frames are dropped
-		#  in computing the FFT.  A sampled approach is taken to
-		#  computing the FFT of the incoming data, which reduces
-		#  sensitivity.	 Increasing sensitivity inreases CPU loading.
-		#
-		self.fft_rate = options.fft_rate
-
-		self.fft_size = int(options.fft_size)
-
-		# This buffer is used to remember the most-recent FFT display
-		#	values.	 Used later by self.write_spectral_data() to write
-		#	spectral data to datalogging files, and by the SETI analysis
-		#	function.
-		#
-		self.fft_outbuf = Numeric.zeros(self.fft_size, Numeric.Float64)
-
-		#
-		# If SETI mode, only look at seti_fft_bandwidth
-		#	at a time.
-		#
-		if (self.setimode):
-			self.fft_input_rate = self.seti_fft_bandwidth
-
-			#
-			# Build a decimating bandpass filter
-			#
-			self.fft_input_taps = gr.firdes.complex_band_pass (1.0,
-			   input_rate,
-			   -(int(self.fft_input_rate/2)), int(self.fft_input_rate/2), 200,
-			   gr.firdes.WIN_HAMMING, 0)
-
-			#
-			# Compute required decimation factor
-			#
-			decimation = int(input_rate/self.fft_input_rate)
-			self.fft_bandpass = gr.fir_filter_ccc (decimation, 
-				self.fft_input_taps)
-		else:
-			self.fft_input_rate = input_rate
-
-		# Set up FFT display
-		if self.waterfall == False:
-		   self.scope = ra_fftsink.ra_fft_sink_c (panel, 
-			   fft_size=int(self.fft_size), sample_rate=self.fft_input_rate,
-			   fft_rate=int(self.fft_rate), title="Spectral",  
-			   ofunc=self.fft_outfunc, xydfunc=self.xydfunc)
-		else:
-			self.scope = ra_waterfallsink.waterfall_sink_c (panel,
-				fft_size=int(self.fft_size), sample_rate=self.fft_input_rate,
-				fft_rate=int(self.fft_rate), title="Spectral", ofunc=self.fft_outfunc, size=(1100, 600), xydfunc=self.xydfunc, ref_level=0, span=10)
-
-		# Set up ephemeris data
-		self.locality = ephem.Observer()
-		self.locality.long = str(options.longitude)
-		self.locality.lat = str(options.latitude)
-		
-		# We make notes about Sunset/Sunrise in Continuum log files
-		self.sun = ephem.Sun()
-		self.sunstate = "??"
-
-		# Set up stripchart display
-		tit = "Continuum"
-		if (self.dual_mode != False):
-			tit = "H+V Continuum"
-		if (self.interferometer != False):
-			tit = "East x West Correlation"
-		self.stripsize = int(options.stripsize)
-		if self.chartneeded == True:
-			self.chart = ra_stripchartsink.stripchart_sink_f (panel,
-				stripsize=self.stripsize,
-				title=tit,
-				xlabel="LMST Offset (Seconds)",
-				scaling=1.0, ylabel=options.ylabel,
-				divbase=options.divbase)
-
-		# Set center frequency
-		self.centerfreq = options.freq
-
-		# Set observing frequency (might be different from actual programmed
-		#	 RF frequency)
-		if options.observing == 0.0:
-			self.observing = options.freq
-		else:
-			self.observing = options.observing
-
-		# Remember our input bandwidth
-		self.bw = input_rate
-		
-		#
-		# 
-		# The strip chart is fed at a constant 1Hz rate
-		#
-
-		#
-		# Call constructors for receive chains
-		#
-		
-		if (self.dual_mode == True):
-			self.setup_dual (self.setimode)
-			
-		if (self.interferometer == True):
-			self.setup_interferometer(self.setimode)
-				
-		if (self.normal_mode == True):
-			self.setup_normal(self.setimode)
-			
-		if (self.setimode == True):
-			self.setup_seti()
-
-		self._build_gui(vbox)
-
-		# Make GUI agree with command-line
-		self.integ = options.integ
-		if self.setimode == False:
-			self.myform['integration'].set_value(int(options.integ))
-			self.myform['offset'].set_value(self.calib_offset)
-			self.myform['dcgain'].set_value(self.calib_coeff)
-		self.myform['average'].set_value(int(options.avg))
-
-
-		if self.setimode == False:
-			# Make integrator agree with command line
-			self.set_integration(int(options.integ))
-
-		self.avg_alpha = options.avg
-
-		# Make spectral averager agree with command line
-		if options.avg != 1.0:
-			self.scope.set_avg_alpha(float(1.0/options.avg))
-			self.scope.set_average(True)
-
-		if self.setimode == False:
-			# Set division size
-			self.chart.set_y_per_div(options.division)
-			# Set reference(MAX) level
-			self.chart.set_ref_level(options.reflevel)
-
-		# set initial values
-
-		if options.gain is None:
-			# if no gain was specified, use the mid-point in dB
-			g = self.subdev[0].gain_range()
-			options.gain = float(g[0]+g[1])/2
-
-		if options.freq is None:
-			# if no freq was specified, use the mid-point
-			r = self.subdev[0].freq_range()
-			options.freq = float(r[0]+r[1])/2
-
-		# Set the initial gain control
-		self.set_gain(options.gain)
-
-		if not(self.set_freq(options.freq)):
-			self._set_status_msg("Failed to set initial frequency")
-
-		# Set declination
-		self.set_decln (self.decln)
-
-
-		# RF hardware information
-		self.myform['decim'].set_value(self.u.decim_rate())
-		self.myform['USB BW'].set_value(self.u.adc_freq() / self.u.decim_rate())
-		if (self.dual_mode == True):
-			self.myform['dbname'].set_value(self.subdev[0].name()+'/'+self.subdev[1].name())
-		else:
-			self.myform['dbname'].set_value(self.subdev[0].name())
-
-		# Set analog baseband filtering, if DBS_RX
-		if self.cardtype == usrp_dbid.DBS_RX:
-			lbw = (self.u.adc_freq() / self.u.decim_rate()) / 2
-			if lbw < 1.0e6:
-				lbw = 1.0e6
-			self.subdev[0].set_bw(lbw)
-			self.subdev[1].set_bw(lbw)
-			
-		# Start the timer for the LMST display and datalogging
-		self.lmst_timer.Start(1000)
-		if (self.switch_mode == True):
-			self.other_timer.Start(330)
-
-
-	def _set_status_msg(self, msg):
-		self.frame.GetStatusBar().SetStatusText(msg, 0)
-
-	def _build_gui(self, vbox):
-
-		def _form_set_freq(kv):
-			# Adjust current SETI frequency, and limits
-			self.setifreq_lower = kv['freq'] - (self.seti_freq_range/2)
-			self.setifreq_current = kv['freq']
-			self.setifreq_upper = kv['freq'] + (self.seti_freq_range/2)
-
-			# Reset SETI analysis timer
-			self.seti_then = time.time()
-			# Zero-out hits array when changing frequency
-			self.hits_array[:,:] = 0.0
-			self.hit_intensities[:,:] = -60.0
-
-			return self.set_freq(kv['freq'])
-
-		def _form_set_decln(kv):
-			return self.set_decln(kv['decln'])
-
-		# Position the FFT display
-		vbox.Add(self.scope.win, 15, wx.EXPAND)
-
-		if self.setimode == False:
-			# Position the Total-power stripchart
-			vbox.Add(self.chart.win, 15, wx.EXPAND)
-		
-		# add control area at the bottom
-		self.myform = myform = form.form()
-		hbox = wx.BoxSizer(wx.HORIZONTAL)
-		hbox.Add((7,0), 0, wx.EXPAND)
-		vbox1 = wx.BoxSizer(wx.VERTICAL)
-		myform['freq'] = form.float_field(
-			parent=self.panel, sizer=vbox1, label="Center freq", weight=1,
-			callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-		vbox1.Add((4,0), 0, 0)
-
-		myform['lmst_high'] = form.static_text_field(
-			parent=self.panel, sizer=vbox1, label="Current LMST", weight=1)
-		vbox1.Add((4,0), 0, 0)
-
-		if self.setimode == False:
-			myform['spec_data'] = form.static_text_field(
-				parent=self.panel, sizer=vbox1, label="Spectral Cursor", weight=1)
-			vbox1.Add((4,0), 0, 0)
-
-		vbox2 = wx.BoxSizer(wx.VERTICAL)
-		if self.setimode == False:
-			vbox3 = wx.BoxSizer(wx.VERTICAL)
-		g = self.subdev[0].gain_range()
-		myform['gain'] = form.slider_field(parent=self.panel, sizer=vbox2, label="RF Gain",
-										   weight=1,
-										   min=int(g[0]), max=int(g[1]),
-										   callback=self.set_gain)
-
-		vbox2.Add((4,0), 0, 0)
-		if self.setimode == True:
-			max_savg = 100
-		else:
-			max_savg = 3000
-		myform['average'] = form.slider_field(parent=self.panel, sizer=vbox2, 
-					label="Spectral Averaging (FFT frames)", weight=1, min=1, max=max_savg, callback=self.set_averaging)
-
-		# Set up scan control button when in SETI mode
-		if (self.setimode == True):
-			# SETI scanning control
-			buttonbox = wx.BoxSizer(wx.HORIZONTAL)
-			self.scan_control = form.button_with_callback(self.panel,
-				  label="Scan: On ",
-				  callback=self.toggle_scanning)
-	
-			buttonbox.Add(self.scan_control, 0, wx.CENTER)
-			vbox2.Add(buttonbox, 0, wx.CENTER)
-
-		vbox2.Add((4,0), 0, 0)
-
-		if self.setimode == False:
-			myform['integration'] = form.slider_field(parent=self.panel, sizer=vbox2,
-				   label="Continuum Integration Time (sec)", weight=1, min=1, max=180, callback=self.set_integration)
-
-			vbox2.Add((4,0), 0, 0)
-
-		myform['decln'] = form.float_field(
-			parent=self.panel, sizer=vbox2, label="Current Declination", weight=1,
-			callback=myform.check_input_and_call(_form_set_decln))
-		vbox2.Add((4,0), 0, 0)
-
-		if self.setimode == False:
-			myform['offset'] = form.slider_field(parent=self.panel, sizer=vbox3,
-				label="Post-Detector Offset", weight=1, min=-750, max=750, 
-				callback=self.set_pd_offset)
-			vbox3.Add((2,0), 0, 0)
-			myform['dcgain'] = form.slider_field(parent=self.panel, sizer=vbox3,
-				label="Post-Detector Gain", weight=1, min=1, max=100, 
-				callback=self.set_pd_gain)
-			vbox3.Add((2,0), 0, 0)
-		hbox.Add(vbox1, 0, 0)
-		hbox.Add(vbox2, wx.ALIGN_RIGHT, 0)
-
-		if self.setimode == False:
-			hbox.Add(vbox3, wx.ALIGN_RIGHT, 0)
-
-		vbox.Add(hbox, 0, wx.EXPAND)
-
-		self._build_subpanel(vbox)
-
-		self.lmst_timer = wx.PyTimer(self.lmst_timeout)
-		self.other_timer = wx.PyTimer(self.other_timeout)
-
-
-	def _build_subpanel(self, vbox_arg):
-		# build a secondary information panel (sometimes hidden)
-
-		# FIXME figure out how to have this be a subpanel that is always
-		# created, but has its visibility controlled by foo.Show(True/False)
-		
-		if not(self.show_debug_info):
-			return
-
-		panel = self.panel
-		vbox = vbox_arg
-		myform = self.myform
-
-		#panel = wx.Panel(self.panel, -1)
-		#vbox = wx.BoxSizer(wx.VERTICAL)
-
-		hbox = wx.BoxSizer(wx.HORIZONTAL)
-		hbox.Add((5,0), 0)
-		myform['decim'] = form.static_float_field(
-			parent=panel, sizer=hbox, label="Decim")
-
-		hbox.Add((5,0), 1)
-		myform['USB BW'] = form.static_float_field(
-			parent=panel, sizer=hbox, label="USB BW")
-
-		hbox.Add((5,0), 1)
-		myform['dbname'] = form.static_text_field(
-			parent=panel, sizer=hbox)
-
-		hbox.Add((5,0), 1)
-		myform['baseband'] = form.static_float_field(
-			parent=panel, sizer=hbox, label="Analog BB")
-
-		hbox.Add((5,0), 1)
-		myform['ddc'] = form.static_float_field(
-			parent=panel, sizer=hbox, label="DDC")
-
-		hbox.Add((5,0), 0)
-		vbox.Add(hbox, 0, wx.EXPAND)
-
-		
-		
-	def set_freq(self, target_freq):
-		"""
-		Set the center frequency we're interested in.
-
-		@param target_freq: frequency in Hz
-
-		"""
-		#
-		#
-		r = usrp.tune(self.u, self.subdev[0].which(), self.subdev[0], target_freq)
-		r = usrp.tune(self.u, self.subdev[1].which(), self.subdev[1], target_freq)
-		if r:
-			self.myform['freq'].set_value(target_freq)	   # update displayed value
-			#
-			# Make sure calibrator knows our target freq
-			#
-
-			# Remember centerfreq---used for doppler calcs
-			delta = self.centerfreq - target_freq
-			self.centerfreq = target_freq
-			self.observing -= delta
-			self.scope.set_baseband_freq (self.observing)
-			self.myform['baseband'].set_value(r.baseband_freq)
-			self.myform['ddc'].set_value(r.dxc_freq)
-			
-			if (self.use_notches):
-				self.compute_notch_taps(self.notches)
-				if self.dual_mode == False and self.interferometer == False:
-					self.notch_filt.set_taps(self.notch_taps)
-				else:
-					self.notch_filt1.set_taps(self.notch_taps)
-					self.notch_filt2.set_taps(self.notch_taps)
-
-			return True
-
-		return False
-
-	def set_decln(self, dec):
-		self.decln = dec
-		self.myform['decln'].set_value(dec)		# update displayed value
-
-	def set_gain(self, gain):
-		self.myform['gain'].set_value(gain)		# update displayed value
-		self.subdev[0].set_gain(gain)
-		self.subdev[1].set_gain(gain)
-		self.gain = gain
-
-	def set_averaging(self, avval):
-		self.myform['average'].set_value(avval)
-		self.scope.set_avg_alpha(1.0/(avval))
-		self.scope.set_average(True)
-		self.avg_alpha = avval
-
-	def set_integration(self, integval):
-		if self.setimode == False:
-			self.integrator.set_taps(1.0/((integval)*(self.bw/2)))
-		self.myform['integration'].set_value(integval)
-		self.integ = integval
-
-	#
-	# Timeout function
-	# Used to update LMST display, as well as current
-	#  continuum value
-	#
-	# We also write external data-logging files here
-	#
-	def lmst_timeout(self):
-		self.locality.date = ephem.now()
-		if self.setimode == False:
-		 x = self.probe.level()
-		sidtime = self.locality.sidereal_time()
-		# LMST
-		s = str(ephem.hours(sidtime)) + " " + self.sunstate
-		# Continuum detector value
-		if self.setimode == False:
-		 sx = "%7.4f" % x
-		 s = s + "\nDet: " + str(sx)
-		else:
-		 sx = "%2d" % self.hitcounter
-		 s1 = "%2d" % self.s1hitcounter
-		 s2 = "%2d" % self.s2hitcounter
-		 sa = "%4.2f" % self.avgdelta
-		 sy = "%3.1f-%3.1f" % (self.CHIRP_LOWER, self.CHIRP_UPPER)
-		 s = s + "\nHits: " + str(sx) + "\nS1:" + str(s1) + " S2:" + str(s2)
-		 s = s + "\nAv D: " + str(sa) + "\nCh lim: " + str(sy)
-
-		self.myform['lmst_high'].set_value(s)
-
-		#
-		# Write data out to recording files
-		#
-		if self.setimode == False:
-		 self.write_continuum_data(x,sidtime)
-		 self.write_spectral_data(self.fft_outbuf,sidtime)
-
-		else:
-		 self.seti_analysis(self.fft_outbuf,sidtime)
-		 now = time.time()
-		 if ((self.scanning == True) and ((now - self.seti_then) > self.setifreq_timer)):
-			 self.seti_then = now
-			 self.setifreq_current = self.setifreq_current + self.fft_input_rate
-			 if (self.setifreq_current > self.setifreq_upper):
-				 self.setifreq_current = self.setifreq_lower
-			 self.set_freq(self.setifreq_current)
-			 # Make sure we zero-out the hits array when changing
-			 #	 frequency.
-			 self.hits_array[:,:] = 0.0
-			 self.hit_intensities[:,:] = 0.0
-	
-	def other_timeout(self):
-		if (self.switch_state == 0):
-			self.switch_state = 1
-			
-		elif (self.switch_state == 1):
-			self.switch_state = 0
-			
-		if (self.switch_state == 0):
-			self.mute.set_n(1)
-			self.cmute.set_n(int(1.0e9))
-			
-		elif (self.switch_state == 1):
-			self.mute.set_n(int(1.0e9))
-			self.cmute.set_n(1)
-			
-		if (self.ref_fifo != "@@@@"):
-			self.ref_fifo_file.write(str(self.switch_state)+"\n")
-			self.ref_fifo_file.flush()
-
-		self.avg_reference_value = self.cprobe.level()
-			
-		#
-		# Set reference value
-		#
-		self.reference_level.set_k(-1.0 * (self.avg_reference_value/self.reference_divisor))
-
-	def fft_outfunc(self,data,l):
-		self.fft_outbuf=data
-
-	def write_continuum_data(self,data,sidtime):
-	
-		# Create localtime structure for producing filename
-		foo = time.localtime()
-		pfx = self.prefix
-		filenamestr = "%s/%04d%02d%02d%02d" % (pfx, foo.tm_year, 
-		   foo.tm_mon, foo.tm_mday, foo.tm_hour)
-	
-		# Open the data file, appending
-		continuum_file = open (filenamestr+".tpdat","a")
-	  
-		flt = "%6.3f" % data
-		inter = self.decln
-		integ = self.integ
-		fc = self.observing
-		fc = fc / 1000000
-		bw = self.bw
-		bw = bw / 1000000
-		ga = self.gain
-	
-		now = time.time()
-	
-		#
-		# If time to write full header info (saves storage this way)
-		#
-		if (now - self.continuum_then > 20):
-			self.sun.compute(self.locality)
-			enow = ephem.now()
-			sunset = self.locality.next_setting(self.sun)
-			sunrise = self.locality.next_rising(self.sun)
-			sun_insky = "Down"
-			self.sunstate = "Dn"
-			if ((sunrise < enow) and (enow < sunset)):
-			   sun_insky = "Up"
-			   self.sunstate = "Up"
-			self.continuum_then = now
-		
-			continuum_file.write(str(ephem.hours(sidtime))+" "+flt+" Dn="+str(inter)+",")
-			continuum_file.write("Ti="+str(integ)+",Fc="+str(fc)+",Bw="+str(bw))
-			continuum_file.write(",Ga="+str(ga)+",Sun="+str(sun_insky)+"\n")
-		else:
-			continuum_file.write(str(ephem.hours(sidtime))+" "+flt+"\n")
-	
-		continuum_file.close()
-		return(data)
-
-	def write_spectral_data(self,data,sidtime):
-	
-		now = time.time()
-		delta = 10
-			
-		# If time to write out spectral data
-		# We don't write this out every time, in order to
-		#	save disk space.  Since the spectral data are
-		#	typically heavily averaged, writing this data
-		#	"once in a while" is OK.
-		#
-		if (now - self.spectral_then >= delta):
-			self.spectral_then = now
-
-			# Get localtime structure to make filename from
-			foo = time.localtime()
-		
-			pfx = self.prefix
-			filenamestr = "%s/%04d%02d%02d%02d" % (pfx, foo.tm_year, 
-			   foo.tm_mon, foo.tm_mday, foo.tm_hour)
-	
-			# Open the file
-			spectral_file = open (filenamestr+".sdat","a")
-	  
-			# Setup data fields to be written
-			r = data
-			inter = self.decln
-			fc = self.observing
-			fc = fc / 1000000
-			bw = self.bw
-			bw = bw / 1000000
-			av = self.avg_alpha
-
-			# Write those fields
-			spectral_file.write("data:"+str(ephem.hours(sidtime))+" Dn="+str(inter)+",Fc="+str(fc)+",Bw="+str(bw)+",Av="+str(av))
-			spectral_file.write (" [ ")
-			for r in data:
-				spectral_file.write(" "+str(r))
-
-			spectral_file.write(" ]\n")
-			spectral_file.close()
-			return(data)
-	
-		return(data)
-
-	def seti_analysis(self,fftbuf,sidtime):
-		l = len(fftbuf)
-		x = 0
-		hits = []
-		hit_intensities = []
-		if self.seticounter < self.setitimer:
-			self.seticounter = self.seticounter + 1
-			return
-		else:
-			self.seticounter = 0
-
-		# Run through FFT output buffer, computing standard deviation (Sigma)
-		avg = 0
-		# First compute average
-		for i in range(0,l):
-			avg = avg + fftbuf[i]
-		avg = avg / l
-
-		sigma = 0.0
-		# Then compute standard deviation (Sigma)
-		for i in range(0,l):
-			d = fftbuf[i] - avg
-			sigma = sigma + (d*d)
-
-		sigma = Numeric.sqrt(sigma/l)
-
-		#
-		# Snarfle through the FFT output buffer again, looking for
-		#	 outlying data points
-
-		start_f = self.observing - (self.fft_input_rate/2)
-		current_f = start_f
-		l = len(fftbuf)
-		f_incr = self.fft_input_rate / l
-		hit = -1
-
-		# -nyquist to DC
-		for i in range(l/2,l):
-			#
-			# If current FFT buffer has an item that exceeds the specified
-			#  sigma
-			#
-			if ((fftbuf[i] - avg) > (self.setik * sigma)):
-				hits.append(current_f)
-				hit_intensities.append(fftbuf[i])
-			current_f = current_f + f_incr
-
-		# DC to nyquist
-		for i in range(0,l/2):
-			#
-			# If current FFT buffer has an item that exceeds the specified
-			#  sigma
-			#
-			if ((fftbuf[i] - avg) > (self.setik * sigma)):
-				hits.append(current_f)
-				hit_intensities.append(fftbuf[i])
-			current_f = current_f + f_incr
-
-		# No hits
-		if (len(hits) <= 0):
-			return
-
-
-		#
-		# OK, so we have some hits in the FFT buffer
-		#	They'll have a rather substantial gauntlet to run before
-		#	being declared a real "hit"
-		#
-
-		# Update stats
-		self.s1hitcounter = self.s1hitcounter + len(hits)
-
-		# Weed out buffers with an excessive number of
-		#	signals above Sigma
-		if (len(hits) > self.nhits):
-			return
-
-
-		# Weed out FFT buffers with apparent multiple narrowband signals
-		#	separated significantly in frequency.  This means that a
-		#	single signal spanning multiple bins is OK, but a buffer that
-		#	has multiple, apparently-separate, signals isn't OK.
-		#
-		last = hits[0]
-		ns2 = 1
-		for i in range(1,len(hits)):
-			if ((hits[i] - last) > (f_incr*3.0)):
-				return
-			last = hits[i]
-			ns2 = ns2 + 1
-
-		self.s2hitcounter = self.s2hitcounter + ns2
-
-		#
-		# Run through all available hit buffers, computing difference between
-		#	frequencies found there, if they're all within the chirp limits
-		#	declare a good hit
-		#
-		good_hit = False
-		f_ds = Numeric.zeros(self.nhitlines, Numeric.Float64)
-		avg_delta = 0
-		k = 0
-		for i in range(0,min(len(hits),len(self.hits_array[:,0]))):
-			f_ds[0] = abs(self.hits_array[i,0] - hits[i])
-			for j in range(1,len(f_ds)):
-			   f_ds[j] = abs(self.hits_array[i,j] - self.hits_array[i,0])
-			   avg_delta = avg_delta + f_ds[j]
-			   k = k + 1
-
-			if (self.seti_isahit (f_ds)):
-				good_hit = True
-				self.hitcounter = self.hitcounter + 1
-				break
-
-		if (avg_delta/k < (self.seti_fft_bandwidth/2)):
-			self.avgdelta = avg_delta / k
-
-		# Save 'n shuffle hits
-		#  Old hit buffers percolate through the hit buffers
-		#  (there are self.nhitlines of these buffers)
-		#  and then drop off the end
-		#  A consequence is that while the nhitlines buffers are filling,
-		#  you can get some absurd values for self.avgdelta, because some
-		#  of the buffers are full of zeros
-		for i in range(self.nhitlines,1):
-			self.hits_array[:,i] = self.hits_array[:,i-1]
-			self.hit_intensities[:,i] = self.hit_intensities[:,i-1]
-
-		for i in range(0,len(hits)):
-			self.hits_array[i,0] = hits[i]
-			self.hit_intensities[i,0] = hit_intensities[i]
-
-		# Finally, write the hits/intensities buffer
-		if (good_hit):
-			self.write_hits(sidtime)
-
-		return
-
-	def seti_isahit(self,fdiffs):
-		truecount = 0
-
-		for i in range(0,len(fdiffs)):
-			if (fdiffs[i] >= self.CHIRP_LOWER and fdiffs[i] <= self.CHIRP_UPPER):
-				truecount = truecount + 1
-
-		if truecount == len(fdiffs):
-			return (True)
-		else:
-			return (False)
-
-	def write_hits(self,sidtime):
-		# Create localtime structure for producing filename
-		foo = time.localtime()
-		pfx = self.prefix
-		filenamestr = "%s/%04d%02d%02d%02d" % (pfx, foo.tm_year, 
-		   foo.tm_mon, foo.tm_mday, foo.tm_hour)
-	
-		# Open the data file, appending
-		hits_file = open (filenamestr+".seti","a")
-
-		# Write sidtime first
-		hits_file.write(str(ephem.hours(sidtime))+" "+str(self.decln)+" ")
-
-		#
-		# Then write the hits/hit intensities buffers with enough
-		#	"syntax" to allow parsing by external (not yet written!)
-		#	"stuff".
-		#
-		for i in range(0,self.nhitlines):
-			hits_file.write(" ")
-			for j in range(0,self.nhits):
-				hits_file.write(str(self.hits_array[j,i])+":")
-				hits_file.write(str(self.hit_intensities[j,i])+",")
-		hits_file.write("\n")
-		hits_file.close()
-		return
-
-	def xydfunc(self,func,xyv):
-		if self.setimode == True:
-			return
-		magn = int(Numeric.log10(self.observing))
-		if (magn == 6 or magn == 7 or magn == 8):
-			magn = 6
-		dfreq = xyv[0] * pow(10.0,magn)
-		if func == 0:
-			ratio = self.observing / dfreq
-			vs = 1.0 - ratio
-			vs *= 299792.0
-			if magn >= 9:
-			   xhz = "Ghz"
-			elif magn >= 6:
-			   xhz = "Mhz"
-			elif magn <= 5:
-			   xhz =  "Khz"
-			s = "%.6f%s\n%.3fdB" % (xyv[0], xhz, xyv[1])
-			s2 = "\n%.3fkm/s" % vs
-			self.myform['spec_data'].set_value(s+s2)
-		else:
-			tmpnotches = Numeric.zeros(self.NOTCH_TAPS,Numeric.Float64)
-			delfreq = -1
-			if self.use_notches == True:
-				for i in range(0,len(self.notches)):
-					if self.notches[i] != 0 and abs(self.notches[i] - dfreq) < ((self.bw/self.NOTCH_TAPS)/2.0):
-						delfreq = i
-						break
-				j = 0
-				for i in range(0,len(self.notches)):
-					if (i != delfreq):
-						tmpnotches[j] = self.notches[i]
-						j = j + 1
-				if (delfreq == -1):
-					for i in range(0,len(tmpnotches)):
-						if (int(tmpnotches[i]) == 0):
-							tmpnotches[i] = dfreq
-							break
-				self.notches = tmpnotches
-				self.compute_notch_taps(self.notches)
-				if self.dual_mode == False and self.interferometer == False:
-					self.notch_filt.set_taps(self.notch_taps)
-				else:
-					self.notch_filt1.set_taps(self.notch_taps)
-					self.notch_filt2.set_taps(self.notch_taps)
-
-	def xydfunc_waterfall(self,pos):
-		lower = self.observing - (self.seti_fft_bandwidth / 2)
-		upper = self.observing + (self.seti_fft_bandwidth / 2)
-		binwidth = self.seti_fft_bandwidth / 1024
-		s = "%.6fMHz" % ((lower + (pos.x*binwidth)) / 1.0e6)
-		self.myform['spec_data'].set_value(s)
-
-	def toggle_cal(self):
-		if (self.calstate == True):
-		  self.calstate = False
-		  self.u.write_io(0,0,(1<<15))
-		  self.calibrator.SetLabel("Calibration Source: Off")
-		else:
-		  self.calstate = True
-		  self.u.write_io(0,(1<<15),(1<<15))
-		  self.calibrator.SetLabel("Calibration Source: On")
-
-	def toggle_annotation(self):
-		if (self.annotate_state == True):
-		  self.annotate_state = False
-		  self.annotation.SetLabel("Annotation: Off")
-		else:
-		  self.annotate_state = True
-		  self.annotation.SetLabel("Annotation: On")
-	#
-	# Turn scanning on/off
-	# Called-back by "Recording" button
-	#
-	def toggle_scanning(self):
-		# Current scanning?	 Flip state
-		if (self.scanning == True):
-		  self.scanning = False
-		  self.scan_control.SetLabel("Scan: Off")
-		# Not scanning
-		else:
-		  self.scanning = True
-		  self.scan_control.SetLabel("Scan: On ")
-
-	def set_pd_offset(self,offs):
-		 self.myform['offset'].set_value(offs)
-		 self.calib_offset=offs
-		 x = self.calib_coeff / 100.0
-		 self.cal_offs.set_k(offs*(x*8000))
-
-	def set_pd_gain(self,gain):
-		 self.myform['dcgain'].set_value(gain)
-		 self.cal_mult.set_k(gain*0.01)
-		 self.calib_coeff = gain
-		 x = gain/100.0
-		 self.cal_offs.set_k(self.calib_offset*(x*8000))
-
-	def compute_notch_taps(self,notchlist):
-		 tmptaps = Numeric.zeros(self.NOTCH_TAPS,Numeric.Complex64)
-		 binwidth = self.bw / self.NOTCH_TAPS
- 
-		 for i in range(0,self.NOTCH_TAPS):
-			 tmptaps[i] = complex(1.0,0.0)
- 
-		 for i in notchlist:
-			 diff = i - self.observing
-			 if int(i) == 0:
-				 break
-			 if ((i < (self.observing - self.bw/2)) or (i > (self.observing + self.bw/2))):
-				 continue
-			 if (diff > 0):
-				 idx = diff / binwidth
-				 idx = round(idx)
-				 idx = int(idx)
-				 if (idx < 0 or idx > (self.NOTCH_TAPS/2)):
-					 break
-				 tmptaps[idx] = complex(0.0, 0.0)
-
-			 if (diff < 0):
-				 idx = -diff / binwidth
-				 idx = round(idx)
-				 idx = (self.NOTCH_TAPS/2) - idx
-				 idx = int(idx+(self.NOTCH_TAPS/2))
-				 if (idx < 0 or idx >= (self.NOTCH_TAPS)):
-					 break
-				 tmptaps[idx] = complex(0.0, 0.0)
-
-		 self.notch_taps = numpy.fft.ifft(tmptaps)
-	
-	#
-	# Setup common pieces of radiometer mode
-	#
-	def setup_radiometer_common(self,n):
-		# The IIR integration filter for post-detection
-		self.integrator = gr.single_pole_iir_filter_ff(1.0)
-		self.integrator.set_taps (1.0/self.bw)
-		
-		if (self.use_notches == True):
-			self.compute_notch_taps(self.notches)
-			if (n == 2):
-				self.notch_filt1 = gr.fft_filter_ccc(1, self.notch_taps)
-				self.notch_filt2 = gr.fft_filter_ccc(1, self.notch_taps)
-			else:
-				self.notch_filt = gr.fft_filter_ccc(1, self.notch_taps)
-
-
-		# Signal probe
-		self.probe = gr.probe_signal_f()
-
-		#
-		# Continuum calibration stuff
-		#
-		x = self.calib_coeff/100.0
-		self.cal_mult = gr.multiply_const_ff(self.calib_coeff/100.0)
-		self.cal_offs = gr.add_const_ff(self.calib_offset*(x*8000))
-		
-		#
-		# Mega decimator after IIR filter
-		#
-		if (self.switch_mode == False):
-			self.keepn = gr.keep_one_in_n(gr.sizeof_float, self.bw)
-		else:
-			self.keepn = gr.keep_one_in_n(gr.sizeof_float, int(self.bw/2))
-		
-		#
-		# For the Dicke-switching scheme
-		#
-		#self.switch = gr.multiply_const_ff(1.0)
-		
-		#
-		if (self.switch_mode == True):
-			self.vector = gr.vector_sink_f()
-			self.swkeep = gr.keep_one_in_n(gr.sizeof_float, int(self.bw/3))
-			self.mute = gr.keep_one_in_n(gr.sizeof_float, 1)
-			self.cmute = gr.keep_one_in_n(gr.sizeof_float, int(1.0e9))
-			self.cintegrator = gr.single_pole_iir_filter_ff(1.0/(self.bw/2))	
-			self.cprobe = gr.probe_signal_f()
-		else:
-			self.mute = gr.multiply_const_ff(1.0)
-			
-			
-		self.avg_reference_value = 0.0
-		self.reference_level = gr.add_const_ff(0.0)
-		
-	#
-	# Setup ordinary single-channel radiometer mode
-	#	 
-	def setup_normal(self, setimode):
-		
-		self.setup_radiometer_common(1)
-		
-		self.head = self.u
-		if (self.use_notches == True):
-			self.shead = self.notch_filt
-		else:
-			self.shead = self.u
-		
-		if setimode == False:
-				
-			self.detector = gr.complex_to_mag_squared()
-			self.connect(self.shead, self.scope)
-
-			if (self.use_notches == False):
-				self.connect(self.head, self.detector, self.mute, self.reference_level,
-					self.integrator, self.keepn, self.cal_mult, self.cal_offs, self.chart)
-			else:
-				self.connect(self.head, self.notch_filt, self.detector, self.mute, self.reference_level,
-					self.integrator, self.keepn, self.cal_mult, self.cal_offs, self.chart)
-				
-			self.connect(self.cal_offs, self.probe)
-			
-			#
-			# Add a side-chain detector chain, with a different integrator, for sampling
-			#   The reference channel data
-			# This is used to derive the offset value for self.reference_level, used above
-			#
-			if (self.switch_mode == True):		
-				self.connect(self.detector, self.cmute, self.cintegrator, self.swkeep, self.cprobe)
-			
-		return
-	
-	#
-	# Setup dual-channel (two antenna, usual orthogonal polarity probes in the same waveguide)
-	#
-	def setup_dual(self, setimode):
-		
-		self.setup_radiometer_common(2)
-		
-		self.di = gr.deinterleave(gr.sizeof_gr_complex)
-		self.addchans = gr.add_cc ()
-		self.detector = gr.add_ff ()
-		self.h_power = gr.complex_to_mag_squared()
-		self.v_power = gr.complex_to_mag_squared()
-		self.connect (self.u, self.di)
-		
-		if (self.use_notches == True):
-			self.connect((self.di, 0), self.notch_filt1, (self.addchans, 0))
-			self.connect((self.di, 1), self.notch_filt2, (self.addchans, 1))
-		else:
-			#
-			# For spectral, adding the two channels works, assuming no gross
-			#	phase or amplitude error
-			self.connect ((self.di, 0), (self.addchans, 0))
-			self.connect ((self.di, 1), (self.addchans, 1))
-		
-		#
-		# Connect heads of spectral and total-power chains
-		#
-		if (self.use_notches == False):
-			self.head = self.di
-		else:
-			self.head = (self.notch_filt1, self.notch_filt2)
-			
-		self.shead = self.addchans
-		
-		if (setimode == False):
-			#
-			# For dual-polarization mode, we compute the sum of the
-			#	powers on each channel, after they've been detected
-			#
-			self.detector = gr.add_ff()
-			
-			#
-			# In dual-polarization mode, we compute things a little differently
-			# In effect, we have two radiometer chains, terminating in an adder
-			#
-			if self.use_notches == True:
-				self.connect(self.notch_filt1, self.h_power)
-				self.connect(self.notch_filt2, self.v_power)
-			else:
-				self.connect((self.head, 0), self.h_power)
-				self.connect((self.head, 1), self.v_power)
-			self.connect(self.h_power, (self.detector, 0))
-			self.connect(self.v_power, (self.detector, 1))
-			self.connect(self.detector, self.mute, self.reference_level,
-				self.integrator, self.keepn, self.cal_mult, self.cal_offs, self.chart)
-			self.connect(self.cal_offs, self.probe)
-			self.connect(self.shead, self.scope)
-			
-			#
-			# Add a side-chain detector chain, with a different integrator, for sampling
-			#   The reference channel data
-			# This is used to derive the offset value for self.reference_level, used above
-			#
-			if (self.switch_mode == True):
-				self.connect(self.detector, self.cmute, self.cintegrator, self.swkeep, self.cprobe)			
-		return
-	
-	#
-	# Setup correlating interferometer mode
-	#
-	def setup_interferometer(self, setimode):
-		self.setup_radiometer_common(2)
-		
-		self.di = gr.deinterleave(gr.sizeof_gr_complex)
-		self.connect (self.u, self.di)
-		self.corr = gr.multiply_cc()
-		self.c2f = gr.complex_to_float()
-		
-		self.shead = (self.di, 0)
-		
-		# Channel 0 to multiply port 0
-		# Channel 1 to multiply port 1
-		if (self.use_notches == False):
-			self.connect((self.di, 0), (self.corr, 0))
-			self.connect((self.di, 1), (self.corr, 1))
-		else:
-			self.connect((self.di, 0), self.notch_filt1, (self.corr, 0))
-			self.connect((self.di, 1), self.notch_filt2, (self.corr, 0))
-		
-		#
-		# Multiplier (correlator) to complex-to-float, followed by integrator, etc
-		#
-		self.connect(self.corr, self.c2f, self.integrator, self.keepn, self.cal_mult, self.cal_offs, self.chart)
-		
-		#
-		# FFT scope gets only 1 channel
-		#  FIX THIS, by cross-correlating the *outputs* of two different FFTs, then display
-		#  Funky!
-		#
-		self.connect(self.shead, self.scope)
-		
-		#
-		# Output of correlator/integrator chain to probe
-		#
-		self.connect(self.cal_offs, self.probe)
-		
-		return
-	
-	#
-	# Setup SETI mode
-	#
-	def setup_seti(self):
-		self.connect (self.shead, self.fft_bandpass, self.scope)
-		return
-	
-	def setup_usrp(self):
-		
-		if (self.usrp2 == False):
-			if (self.dual_mode == False and self.interferometer == False):
-				if (self.decim > 4):
-					self.u = usrp.source_c(decim_rate=self.decim,fusb_block_size=8192)
-				else:
-					self.u = usrp.source_c(decim_rate=self.decim,fusb_block_size=8192, fpga_filename="std_4rx_0tx.rbf")
-				self.u.set_mux(usrp.determine_rx_mux_value(self.u, self.rx_subdev_spec))
-				# determine the daughterboard subdevice we're using
-				self.subdev[0] = usrp.selected_subdev(self.u, self.rx_subdev_spec)
-				self.subdev[1] = self.subdev[0]
-				self.cardtype = self.subdev[0].dbid()
-			else:
-				self.u=usrp.source_c(decim_rate=self.decim, nchan=2,fusb_block_size=8192)
-				self.subdev[0] = usrp.selected_subdev(self.u, (0, 0))
-				self.subdev[1] = usrp.selected_subdev(self.u, (1, 0))
-				self.cardtype = self.subdev[0].dbid()
-				self.u.set_mux(0x32103210)
-				c1 = self.subdev[0].name()
-				c2 = self.subdev[1].name()
-				if (c1 != c2):
-					print "Must have identical cardtypes for --dual_mode or --interferometer"
-					sys.exit(1)
-				#
-				# Set 8-bit mode
-				#
-				
-				width = 8
-				shift = 8
-				format = self.u.make_format(width, shift)
-				r = self.u.set_format(format)
-		else:
-			if (self.dual_mode == True or self.interferometer == True):
-				print "Cannot use dual_mode or interferometer with single USRP2"
-				sys.exit(1)
-			self.u = usrp2.source_32fc(self.interface, self.mac_addr)
-			self.u.set_decim (self.decim)
-			self.cardtype = self.u.daughterboard_id()
-
-def main ():
-	app = stdgui2.stdapp(app_flow_graph, "RADIO ASTRONOMY SPECTRAL/CONTINUUM RECEIVER: $Revision$", nstatus=1)
-	app.MainLoop()
-
-if __name__ == '__main__':
-	main ()
diff --git a/gr-shd/CMakeLists.txt b/gr-shd/CMakeLists.txt
new file mode 100644
index 000000000..de9daf540
--- /dev/null
+++ b/gr-shd/CMakeLists.txt
@@ -0,0 +1,127 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+PKG_CHECK_MODULES(PC_SHD shd QUIET)
+FIND_PATH(
+    SHD_INCLUDE_DIRS
+    NAMES shd/config.hpp
+    HINTS $ENV{SHD_DIR}/include
+        ${PC_SHD_INCLUDE_DIRS}
+    PATHS /usr/local/include
+          /usr/include
+)
+
+FIND_LIBRARY(
+    SHD_LIBRARIES
+    NAMES shd
+    HINTS $ENV{SHD_DIR}/lib
+        ${PC_SHD_LIBRARIES}
+    PATHS /usr/local/lib
+          /usr/lib
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SHD DEFAULT_MSG SHD_LIBRARIES SHD_INCLUDE_DIRS)
+MARK_AS_ADVANCED(SHD_LIBRARIES SHD_INCLUDE_DIRS)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-shd" ENABLE_GR_SHD
+    Boost_FOUND
+    SHD_FOUND
+    ENABLE_GR_CORE
+)
+
+GR_SET_GLOBAL(GR_SHD_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${SHD_INCLUDE_DIRS}
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_SHD)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_SHD_DESCRIPTION "GNU Radio SHD Blocks")
+
+CPACK_COMPONENT("shd_runtime"
+    GROUP        "SHD"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("shd_devel"
+    GROUP        "SHD"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("shd_python"
+    GROUP        "SHD"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "core_python;shd_runtime"
+)
+
+CPACK_COMPONENT("shd_swig"
+    GROUP        "SHD"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;shd_python;shd_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(include)
+add_subdirectory(lib)
+if(ENABLE_PYTHON)
+    add_subdirectory(swig)
+    add_subdirectory(grc)
+    add_subdirectory(apps)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-shd.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-shd.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-shd.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "shd_devel"
+)
+
+endif(ENABLE_GR_SHD)
diff --git a/gr-shd/apps/CMakeLists.txt b/gr-shd/apps/CMakeLists.txt
new file mode 100644
index 000000000..3930abb57
--- /dev/null
+++ b/gr-shd/apps/CMakeLists.txt
@@ -0,0 +1,32 @@
+# 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.
+
+include(GrPython)
+
+########################################################################
+# Install some shd apps
+########################################################################
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    shd_fft.py
+    shd_rx_cfile.py
+    shd_siggen.py
+    DESTINATION ${GR_RUNTIME_DIR}
+    COMPONENT "shd_python"
+)
diff --git a/gr-shd/apps/Makefile.am b/gr-shd/apps/Makefile.am
index 16837f575..ac50e892e 100644
--- a/gr-shd/apps/Makefile.am
+++ b/gr-shd/apps/Makefile.am
@@ -28,5 +28,6 @@ ourpythondir = $(grpythondir)
 
 bin_SCRIPTS = \
     shd_fft.py \
-    shd_rx_cfile.py
+    shd_rx_cfile.py \
+    shd_siggen.py
 
diff --git a/gr-shd/grc/CMakeLists.txt b/gr-shd/grc/CMakeLists.txt
new file mode 100644
index 000000000..f35d36ba3
--- /dev/null
+++ b/gr-shd/grc/CMakeLists.txt
@@ -0,0 +1,45 @@
+# 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.
+
+########################################################################
+# Rules for generating the source and sink xml wrappers
+########################################################################
+include(GrPython)
+
+macro(GEN_BLOCK_XML _generator _xml_block)
+    set(generator ${CMAKE_CURRENT_SOURCE_DIR}/${_generator})
+    set(xml_block ${CMAKE_CURRENT_BINARY_DIR}/${_xml_block})
+    list(APPEND xml_blocks ${xml_block})
+    add_custom_command(
+        DEPENDS ${generator} OUTPUT ${xml_block}
+        COMMAND ${PYTHON_EXECUTABLE} ${generator} ${xml_block}
+    )
+endmacro(GEN_BLOCK_XML)
+
+GEN_BLOCK_XML(gen_shd_smini_blocks.py    shd_smini_source.xml)
+GEN_BLOCK_XML(gen_shd_smini_blocks.py    shd_smini_sink.xml)
+
+add_custom_target(shd_grc_xml_blocks ALL DEPENDS ${xml_blocks})
+
+install(FILES
+    ${xml_blocks}
+    shd_block_tree.xml
+    DESTINATION ${GRC_BLOCKS_DIR}
+    COMPONENT "shd_python"
+)
diff --git a/gr-shd/include/CMakeLists.txt b/gr-shd/include/CMakeLists.txt
new file mode 100644
index 000000000..c4db1fd22
--- /dev/null
+++ b/gr-shd/include/CMakeLists.txt
@@ -0,0 +1,29 @@
+# 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.
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+    gr_shd_api.h
+    gr_shd_smini_source.h
+    gr_shd_smini_sink.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "shd_devel"
+)
diff --git a/gr-shd/lib/CMakeLists.txt b/gr-shd/lib/CMakeLists.txt
new file mode 100644
index 000000000..e8528fddb
--- /dev/null
+++ b/gr-shd/lib/CMakeLists.txt
@@ -0,0 +1,50 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_SHD_INCLUDE_DIRS}
+)
+
+include_directories(${SHD_INCLUDE_DIRS})
+link_directories(${SHD_LIBRARY_DIRS})
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gr_shd_sources
+    gr_shd_smini_source.cc
+    gr_shd_smini_sink.cc
+)
+
+list(APPEND shd_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+    ${SHD_LIBRARIES}
+)
+
+add_library(gnuradio-shd SHARED ${gr_shd_sources})
+target_link_libraries(gnuradio-shd ${shd_libs})
+GR_LIBRARY_FOO(gnuradio-shd RUNTIME_COMPONENT "shd_runtime" DEVEL_COMPONENT "shd_devel")
diff --git a/gr-shd/swig/CMakeLists.txt b/gr-shd/swig/CMakeLists.txt
new file mode 100644
index 000000000..e2c345be7
--- /dev/null
+++ b/gr-shd/swig/CMakeLists.txt
@@ -0,0 +1,53 @@
+# 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_FLAGS -DGR_HAVE_SHD) #needed to parse shd_swig.i
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_SHD_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+link_directories(${SHD_LIBRARY_DIRS})
+set(GR_SWIG_LIBRARIES gnuradio-shd ${SHD_LIBRARIES})
+
+GR_SWIG_MAKE(shd_swig shd_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS shd_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/shd
+    COMPONENT "shd_python"
+)
+
+install(
+    FILES shd_swig.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "shd_swig"
+)
+
+GR_PYTHON_INSTALL(
+    FILES __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/shd
+    COMPONENT "shd_python"
+)
diff --git a/gr-sounder/.gitignore b/gr-sounder/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-sounder/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-sounder/Makefile.am b/gr-sounder/Makefile.am
deleted file mode 100644
index 40b11dcea..000000000
--- a/gr-sounder/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright 2007 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = src doc
diff --git a/gr-sounder/README b/gr-sounder/README
deleted file mode 100644
index 3c5df21d4..000000000
--- a/gr-sounder/README
+++ /dev/null
@@ -1,91 +0,0 @@
-This is a work-in-progress implementation of a m-sequence based channel 
-sounder for GNU Radio and the USRP.
-
-In typical use, the user would run the sounder as a transmitter on one
-USRP, and a receiver on another at a different location.  The receiver
-will determine the impulse response of the RF channel in between.
-
-The sounder uses a custom FPGA bitstream that is able to generate and
-receive a sounder waveform across a full 32 MHz wide swath of RF spectrum;
-the waveform generation and impulse response processing occur in logic in
-the USRP FPGA and not in the host PC.  This avoids the USB throughput 
-bottleneck entirely.  Unfortunately, there is still roll-off in the AD9862
-digital up-converter interpolation filter that impacts the outer 20% of
-bandwidth, but this can be compensated for by measuring and subtracting
-out this response during calibration.
-
-The sounder is based on sending a maximal-length PN code modulated as BPSK
-with the supplied center frequency, with a chip-rate of 32 MHz. The
-receiver correlates the received signal across all phases of the PN code 
-and outputs an impulse response vector.  As auto-correlation of an m-sequence
-is near zero for any relative phase shift, the actual measured energy at a 
-particular phase shift is related to the impulse response for that time delay.
-This is the same principle used in spread-spectrum RAKE receivers such as are
-used with GPS and CDMA.
-
-The transmitter is designed to work only with the board in side A.  The 
-receiver may be in side A or side B.  The boards may be standalone LFTX/LFRXs
-or RFX daughterboards.
-
-To use, the following script is installed into $prefix/bin:
-
-Usage: usrp_sounder.py [options]
-
-Options:
-  -h, --help            show this help message and exit
-  -R RX_SUBDEV_SPEC, --rx-subdev-spec=RX_SUBDEV_SPEC
-                        select USRP Rx side A or B
-  -f FREQ, --frequency=FREQ
-                        set frequency to FREQ in Hz, default is 0.0
-  -d DEGREE, --degree=DEGREE
-                        set sounding sequence degree (2-12), default is 12,
-  -t, --transmit        enable sounding transmitter
-  -r, --receive         enable sounding receiver
-  -l, --loopback        enable digital loopback, default is disabled
-  -v, --verbose         enable verbose output, default is disabled
-  -D, --debug           enable debugging output, default is disabled
-  -F FILENAME, --filename=FILENAME
-                        log received impulse responses to file
-
-To use with an LFTX board, set the center frequency to 16M:
-
-$ usrp_sounder.py -f 16M -t
-
-The sounder receiver command line is:
-
-$ usrp_sounder.py -f 16M -r -F output.dat
-
-You can vary the m-sequence degree between 2 and 12, which will create
-sequence lengths between 3 and 4095 (128 us).  This will affect
-how frequently the receiver can calculate impulse response vectors.
-
-The correlator uses an O(N^2) algorithm, by using an entire PN period
-of the received signal to correlate at each lag value.  Thus, using a
-degree 12 PN code of length 4095, it takes 4095*4095/32e6 seconds to
-calculate a single impulse response vector, about a half a second.  One
-can reduce this time by a factor of 4 for each decrement in PN code
-degree, but this also reduces the inherent processing gain by 6 dB as
-well.
-
-The impulse response vectors are written to a file in complex float
-format, and consist of the actual impulse response with a noise floor
-dependent on the PN code degree in use.
-
-There is a loopback test mode that causes the sounding waveform to be
-routed back to the receiver inside the USRP:
-
-$ usrp_sounder.py -r -t -l -F output.dat
-
-The resulting impulse response will be a spike followed by a near zero
-value for the rest of the period.
-
-Synchronization at the receiver is not yet implemented, so the actual
-impulse response may be time shifted an arbitrary value within the the
-impulse response vector.  If one assumes the first to arrive signal is
-the strongest, then one can circularly rotate the vector until the peak
-is at time zero.
-
-Johnathan Corgan
-Corgan Enterprises LLC
-jcorgan@corganenterprises.com
-5/28/07
diff --git a/gr-sounder/doc/.gitignore b/gr-sounder/doc/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-sounder/doc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-sounder/src/.gitignore b/gr-sounder/src/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-sounder/src/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-sounder/src/Makefile.am b/gr-sounder/src/Makefile.am
deleted file mode 100644
index d546da7f8..000000000
--- a/gr-sounder/src/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright 2007 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = fpga lib
-if PYTHON
-SUBDIRS += python
-endif
diff --git a/gr-sounder/src/fpga/.gitignore b/gr-sounder/src/fpga/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-sounder/src/fpga/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-sounder/src/fpga/Makefile.am b/gr-sounder/src/fpga/Makefile.am
deleted file mode 100644
index 85256cb5e..000000000
--- a/gr-sounder/src/fpga/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright 2007 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = top lib tb
diff --git a/gr-sounder/src/fpga/lib/.gitignore b/gr-sounder/src/fpga/lib/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-sounder/src/fpga/lib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-sounder/src/fpga/lib/Makefile.am b/gr-sounder/src/fpga/lib/Makefile.am
deleted file mode 100644
index a9586ebcc..000000000
--- a/gr-sounder/src/fpga/lib/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2007,2009,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += \
-	dac_interface.v \
-	dacpll.v \
-	sounder.v \
-	sounder_ctrl.v \
-	sounder_rx.v \
-	sounder_tx.v
diff --git a/gr-sounder/src/fpga/lib/dac_interface.v b/gr-sounder/src/fpga/lib/dac_interface.v
deleted file mode 100644
index 93c72cca6..000000000
--- a/gr-sounder/src/fpga/lib/dac_interface.v
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`include "../top/config.vh"
-
-module dac_interface(clk_i,rst_i,ena_i,strobe_i,tx_i_i,tx_q_i,tx_data_o,tx_sync_o);
-   input clk_i;
-   input rst_i;
-   input ena_i;
-   input strobe_i;
-   
-   input [13:0] tx_i_i;
-   input [13:0] tx_q_i;
-
-   output [13:0] tx_data_o;
-   output 	 tx_sync_o;
-
-`ifdef TX_RATE_MAX
-   wire clk128;
-   reg clk64_d;
-   reg [13:0] tx_data_o;
-   
-   // Create a 128 MHz clock
-   dacpll pll128(.areset(rst_i),.inclk0(clk_i),.c0(clk128));
-
-   // Register the clk64 clock in the clk128 domain
-   always @(posedge clk128)
-     clk64_d <= #1 clk_i;
-
-   // Register the tx data in the clk128 domain
-   always @(posedge clk128)
-     tx_data_o <= #1 clk64_d ? tx_i_i : tx_q_i;
-
-   assign tx_sync_o = clk64_d;
-   
-
-`else // !`ifdef TX_RATE_MAX
-   assign tx_data_o = strobe_i ? tx_q_i : tx_i_i;
-   assign tx_sync_o = strobe_i;
-`endif // !`ifdef TX_RATE_MAX
-   
-endmodule // dac_interface
diff --git a/gr-sounder/src/fpga/lib/dacpll.v b/gr-sounder/src/fpga/lib/dacpll.v
deleted file mode 100644
index 25f584f4f..000000000
--- a/gr-sounder/src/fpga/lib/dacpll.v
+++ /dev/null
@@ -1,291 +0,0 @@
-// megafunction wizard: %ALTPLL%
-// GENERATION: STANDARD
-// VERSION: WM1.0
-// MODULE: altpll 
-
-// ============================================================
-// File Name: dacpll.v
-// Megafunction Name(s):
-// 			altpll
-//
-// Simulation Library Files(s):
-// 			altera_mf
-// ============================================================
-// ************************************************************
-// THIS IS A WIZARD-GENERATED FILE. DO NOT EDIT THIS FILE!
-//
-// 7.0 Build 33 02/05/2007 SJ Web Edition
-// ************************************************************
-
-
-//Copyright (C) 1991-2007 Altera Corporation
-//Your use of Altera Corporation's design tools, logic functions 
-//and other software and tools, and its AMPP partner logic 
-//functions, and any output files from any of the foregoing 
-//(including device programming or simulation files), and any 
-//associated documentation or information are expressly subject 
-//to the terms and conditions of the Altera Program License 
-//Subscription Agreement, Altera MegaCore Function License 
-//Agreement, or other applicable license agreement, including, 
-//without limitation, that your use is for the sole purpose of 
-//programming logic devices manufactured by Altera and sold by 
-//Altera or its authorized distributors.  Please refer to the 
-//applicable agreement for further details.
-
-
-// synopsys translate_off
-`timescale 1 ps / 1 ps
-// synopsys translate_on
-module dacpll (
-	areset,
-	inclk0,
-	c0);
-
-	input	  areset;
-	input	  inclk0;
-	output	  c0;
-
-	wire [5:0] sub_wire0;
-	wire [0:0] sub_wire4 = 1'h0;
-	wire [0:0] sub_wire1 = sub_wire0[0:0];
-	wire  c0 = sub_wire1;
-	wire  sub_wire2 = inclk0;
-	wire [1:0] sub_wire3 = {sub_wire4, sub_wire2};
-
-	altpll	altpll_component (
-				.inclk (sub_wire3),
-				.areset (areset),
-				.clk (sub_wire0),
-				.activeclock (),
-				.clkbad (),
-				.clkena ({6{1'b1}}),
-				.clkloss (),
-				.clkswitch (1'b0),
-				.configupdate (1'b1),
-				.enable0 (),
-				.enable1 (),
-				.extclk (),
-				.extclkena ({4{1'b1}}),
-				.fbin (1'b1),
-				.fbout (),
-				.locked (),
-				.pfdena (1'b1),
-				.phasecounterselect ({4{1'b1}}),
-				.phasedone (),
-				.phasestep (1'b1),
-				.phaseupdown (1'b1),
-				.pllena (1'b1),
-				.scanaclr (1'b0),
-				.scanclk (1'b0),
-				.scanclkena (1'b1),
-				.scandata (1'b0),
-				.scandataout (),
-				.scandone (),
-				.scanread (1'b0),
-				.scanwrite (1'b0),
-				.sclkout0 (),
-				.sclkout1 (),
-				.vcooverrange (),
-				.vcounderrange ());
-	defparam
-		altpll_component.clk0_divide_by = 1,
-		altpll_component.clk0_duty_cycle = 50,
-		altpll_component.clk0_multiply_by = 2,
-		altpll_component.clk0_phase_shift = "0000",
-		altpll_component.compensate_clock = "CLK0",
-		altpll_component.inclk0_input_frequency = 15625,
-		altpll_component.intended_device_family = "Cyclone",
-		altpll_component.lpm_type = "altpll",
-		altpll_component.operation_mode = "NORMAL",
-		altpll_component.pll_type = "AUTO",
-		altpll_component.port_activeclock = "PORT_UNUSED",
-		altpll_component.port_areset = "PORT_USED",
-		altpll_component.port_clkbad0 = "PORT_UNUSED",
-		altpll_component.port_clkbad1 = "PORT_UNUSED",
-		altpll_component.port_clkloss = "PORT_UNUSED",
-		altpll_component.port_clkswitch = "PORT_UNUSED",
-		altpll_component.port_configupdate = "PORT_UNUSED",
-		altpll_component.port_fbin = "PORT_UNUSED",
-		altpll_component.port_inclk0 = "PORT_USED",
-		altpll_component.port_inclk1 = "PORT_UNUSED",
-		altpll_component.port_locked = "PORT_UNUSED",
-		altpll_component.port_pfdena = "PORT_UNUSED",
-		altpll_component.port_phasecounterselect = "PORT_UNUSED",
-		altpll_component.port_phasedone = "PORT_UNUSED",
-		altpll_component.port_phasestep = "PORT_UNUSED",
-		altpll_component.port_phaseupdown = "PORT_UNUSED",
-		altpll_component.port_pllena = "PORT_UNUSED",
-		altpll_component.port_scanaclr = "PORT_UNUSED",
-		altpll_component.port_scanclk = "PORT_UNUSED",
-		altpll_component.port_scanclkena = "PORT_UNUSED",
-		altpll_component.port_scandata = "PORT_UNUSED",
-		altpll_component.port_scandataout = "PORT_UNUSED",
-		altpll_component.port_scandone = "PORT_UNUSED",
-		altpll_component.port_scanread = "PORT_UNUSED",
-		altpll_component.port_scanwrite = "PORT_UNUSED",
-		altpll_component.port_clk0 = "PORT_USED",
-		altpll_component.port_clk1 = "PORT_UNUSED",
-		altpll_component.port_clk3 = "PORT_UNUSED",
-		altpll_component.port_clk4 = "PORT_UNUSED",
-		altpll_component.port_clk5 = "PORT_UNUSED",
-		altpll_component.port_clkena0 = "PORT_UNUSED",
-		altpll_component.port_clkena1 = "PORT_UNUSED",
-		altpll_component.port_clkena3 = "PORT_UNUSED",
-		altpll_component.port_clkena4 = "PORT_UNUSED",
-		altpll_component.port_clkena5 = "PORT_UNUSED",
-		altpll_component.port_extclk0 = "PORT_UNUSED",
-		altpll_component.port_extclk1 = "PORT_UNUSED",
-		altpll_component.port_extclk2 = "PORT_UNUSED",
-		altpll_component.port_extclk3 = "PORT_UNUSED";
-
-
-endmodule
-
-// ============================================================
-// CNX file retrieval info
-// ============================================================
-// Retrieval info: PRIVATE: ACTIVECLK_CHECK STRING "0"
-// Retrieval info: PRIVATE: BANDWIDTH STRING "1.000"
-// Retrieval info: PRIVATE: BANDWIDTH_FEATURE_ENABLED STRING "0"
-// Retrieval info: PRIVATE: BANDWIDTH_FREQ_UNIT STRING "MHz"
-// Retrieval info: PRIVATE: BANDWIDTH_PRESET STRING "Low"
-// Retrieval info: PRIVATE: BANDWIDTH_USE_AUTO STRING "1"
-// Retrieval info: PRIVATE: BANDWIDTH_USE_CUSTOM STRING "0"
-// Retrieval info: PRIVATE: BANDWIDTH_USE_PRESET STRING "0"
-// Retrieval info: PRIVATE: CLKBAD_SWITCHOVER_CHECK STRING "0"
-// Retrieval info: PRIVATE: CLKLOSS_CHECK STRING "0"
-// Retrieval info: PRIVATE: CLKSWITCH_CHECK STRING "0"
-// Retrieval info: PRIVATE: CNX_NO_COMPENSATE_RADIO STRING "0"
-// Retrieval info: PRIVATE: CREATE_CLKBAD_CHECK STRING "0"
-// Retrieval info: PRIVATE: CREATE_INCLK1_CHECK STRING "0"
-// Retrieval info: PRIVATE: CUR_DEDICATED_CLK STRING "c0"
-// Retrieval info: PRIVATE: CUR_FBIN_CLK STRING "e0"
-// Retrieval info: PRIVATE: DEVICE_FAMILY NUMERIC "11"
-// Retrieval info: PRIVATE: DEVICE_SPEED_GRADE STRING "8"
-// Retrieval info: PRIVATE: DEV_FAMILY STRING "Cyclone"
-// Retrieval info: PRIVATE: DIV_FACTOR0 NUMERIC "1"
-// Retrieval info: PRIVATE: DUTY_CYCLE0 STRING "50.00000000"
-// Retrieval info: PRIVATE: EXT_FEEDBACK_RADIO STRING "0"
-// Retrieval info: PRIVATE: GLOCKED_COUNTER_EDIT_CHANGED STRING "1"
-// Retrieval info: PRIVATE: GLOCKED_FEATURE_ENABLED STRING "0"
-// Retrieval info: PRIVATE: GLOCKED_MODE_CHECK STRING "0"
-// Retrieval info: PRIVATE: GLOCK_COUNTER_EDIT NUMERIC "1048575"
-// Retrieval info: PRIVATE: HAS_MANUAL_SWITCHOVER STRING "1"
-// Retrieval info: PRIVATE: INCLK0_FREQ_EDIT STRING "64.000"
-// Retrieval info: PRIVATE: INCLK0_FREQ_UNIT_COMBO STRING "MHz"
-// Retrieval info: PRIVATE: INCLK1_FREQ_EDIT STRING "100.000"
-// Retrieval info: PRIVATE: INCLK1_FREQ_EDIT_CHANGED STRING "1"
-// Retrieval info: PRIVATE: INCLK1_FREQ_UNIT_CHANGED STRING "1"
-// Retrieval info: PRIVATE: INCLK1_FREQ_UNIT_COMBO STRING "MHz"
-// Retrieval info: PRIVATE: INT_FEEDBACK__MODE_RADIO STRING "1"
-// Retrieval info: PRIVATE: LOCKED_OUTPUT_CHECK STRING "0"
-// Retrieval info: PRIVATE: LOCK_LOSS_SWITCHOVER_CHECK STRING "0"
-// Retrieval info: PRIVATE: LONG_SCAN_RADIO STRING "1"
-// Retrieval info: PRIVATE: LVDS_MODE_DATA_RATE STRING "512.000"
-// Retrieval info: PRIVATE: LVDS_MODE_DATA_RATE_DIRTY NUMERIC "0"
-// Retrieval info: PRIVATE: LVDS_PHASE_SHIFT_UNIT0 STRING "deg"
-// Retrieval info: PRIVATE: MIRROR_CLK0 STRING "0"
-// Retrieval info: PRIVATE: MULT_FACTOR0 NUMERIC "2"
-// Retrieval info: PRIVATE: NORMAL_MODE_RADIO STRING "1"
-// Retrieval info: PRIVATE: OUTPUT_FREQ0 STRING "100.00000000"
-// Retrieval info: PRIVATE: OUTPUT_FREQ_MODE0 STRING "0"
-// Retrieval info: PRIVATE: OUTPUT_FREQ_UNIT0 STRING "MHz"
-// Retrieval info: PRIVATE: PHASE_RECONFIG_FEATURE_ENABLED STRING "0"
-// Retrieval info: PRIVATE: PHASE_RECONFIG_INPUTS_CHECK STRING "0"
-// Retrieval info: PRIVATE: PHASE_SHIFT0 STRING "0.00000000"
-// Retrieval info: PRIVATE: PHASE_SHIFT_UNIT0 STRING "ns"
-// Retrieval info: PRIVATE: PLL_ADVANCED_PARAM_CHECK STRING "0"
-// Retrieval info: PRIVATE: PLL_ARESET_CHECK STRING "1"
-// Retrieval info: PRIVATE: PLL_AUTOPLL_CHECK NUMERIC "1"
-// Retrieval info: PRIVATE: PLL_ENA_CHECK STRING "0"
-// Retrieval info: PRIVATE: PLL_ENHPLL_CHECK NUMERIC "0"
-// Retrieval info: PRIVATE: PLL_FASTPLL_CHECK NUMERIC "0"
-// Retrieval info: PRIVATE: PLL_LVDS_PLL_CHECK NUMERIC "0"
-// Retrieval info: PRIVATE: PLL_PFDENA_CHECK STRING "0"
-// Retrieval info: PRIVATE: PLL_TARGET_HARCOPY_CHECK NUMERIC "0"
-// Retrieval info: PRIVATE: PRIMARY_CLK_COMBO STRING "inclk0"
-// Retrieval info: PRIVATE: SACN_INPUTS_CHECK STRING "0"
-// Retrieval info: PRIVATE: SCAN_FEATURE_ENABLED STRING "0"
-// Retrieval info: PRIVATE: SELF_RESET_LOCK_LOSS STRING "0"
-// Retrieval info: PRIVATE: SHORT_SCAN_RADIO STRING "0"
-// Retrieval info: PRIVATE: SPREAD_FEATURE_ENABLED STRING "0"
-// Retrieval info: PRIVATE: SPREAD_FREQ STRING "50.000"
-// Retrieval info: PRIVATE: SPREAD_FREQ_UNIT STRING "KHz"
-// Retrieval info: PRIVATE: SPREAD_PERCENT STRING "0.500"
-// Retrieval info: PRIVATE: SPREAD_USE STRING "0"
-// Retrieval info: PRIVATE: SRC_SYNCH_COMP_RADIO STRING "0"
-// Retrieval info: PRIVATE: STICKY_CLK0 STRING "1"
-// Retrieval info: PRIVATE: SWITCHOVER_COUNT_EDIT NUMERIC "1"
-// Retrieval info: PRIVATE: SWITCHOVER_FEATURE_ENABLED STRING "0"
-// Retrieval info: PRIVATE: USE_CLK0 STRING "1"
-// Retrieval info: PRIVATE: USE_CLKENA0 STRING "0"
-// Retrieval info: PRIVATE: ZERO_DELAY_RADIO STRING "0"
-// Retrieval info: LIBRARY: altera_mf altera_mf.altera_mf_components.all
-// Retrieval info: CONSTANT: CLK0_DIVIDE_BY NUMERIC "1"
-// Retrieval info: CONSTANT: CLK0_DUTY_CYCLE NUMERIC "50"
-// Retrieval info: CONSTANT: CLK0_MULTIPLY_BY NUMERIC "2"
-// Retrieval info: CONSTANT: CLK0_PHASE_SHIFT STRING "0"
-// Retrieval info: CONSTANT: COMPENSATE_CLOCK STRING "CLK0"
-// Retrieval info: CONSTANT: INCLK0_INPUT_FREQUENCY NUMERIC "15625"
-// Retrieval info: CONSTANT: INTENDED_DEVICE_FAMILY STRING "Cyclone"
-// Retrieval info: CONSTANT: LPM_TYPE STRING "altpll"
-// Retrieval info: CONSTANT: OPERATION_MODE STRING "NORMAL"
-// Retrieval info: CONSTANT: PLL_TYPE STRING "AUTO"
-// Retrieval info: CONSTANT: PORT_ACTIVECLOCK STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_ARESET STRING "PORT_USED"
-// Retrieval info: CONSTANT: PORT_CLKBAD0 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_CLKBAD1 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_CLKLOSS STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_CLKSWITCH STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_CONFIGUPDATE STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_FBIN STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_INCLK0 STRING "PORT_USED"
-// Retrieval info: CONSTANT: PORT_INCLK1 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_LOCKED STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_PFDENA STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_PHASECOUNTERSELECT STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_PHASEDONE STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_PHASESTEP STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_PHASEUPDOWN STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_PLLENA STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_SCANACLR STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_SCANCLK STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_SCANCLKENA STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_SCANDATA STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_SCANDATAOUT STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_SCANDONE STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_SCANREAD STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_SCANWRITE STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_clk0 STRING "PORT_USED"
-// Retrieval info: CONSTANT: PORT_clk1 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_clk3 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_clk4 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_clk5 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_clkena0 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_clkena1 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_clkena3 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_clkena4 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_clkena5 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_extclk0 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_extclk1 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_extclk2 STRING "PORT_UNUSED"
-// Retrieval info: CONSTANT: PORT_extclk3 STRING "PORT_UNUSED"
-// Retrieval info: USED_PORT: @clk 0 0 6 0 OUTPUT_CLK_EXT VCC "@clk[5..0]"
-// Retrieval info: USED_PORT: @extclk 0 0 4 0 OUTPUT_CLK_EXT VCC "@extclk[3..0]"
-// Retrieval info: USED_PORT: areset 0 0 0 0 INPUT GND "areset"
-// Retrieval info: USED_PORT: c0 0 0 0 0 OUTPUT_CLK_EXT VCC "c0"
-// Retrieval info: USED_PORT: inclk0 0 0 0 0 INPUT_CLK_EXT GND "inclk0"
-// Retrieval info: CONNECT: @inclk 0 0 1 0 inclk0 0 0 0 0
-// Retrieval info: CONNECT: c0 0 0 0 0 @clk 0 0 1 0
-// Retrieval info: CONNECT: @inclk 0 0 1 1 GND 0 0 0 0
-// Retrieval info: CONNECT: @areset 0 0 0 0 areset 0 0 0 0
-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll.v TRUE FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll.ppf TRUE FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll.inc FALSE FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll.cmp FALSE FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll.bsf TRUE
-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll_inst.v TRUE FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll_bb.v TRUE FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll_waveforms.html TRUE FALSE
-// Retrieval info: GEN_FILE: TYPE_NORMAL dacpll_wave*.jpg FALSE FALSE
-// Retrieval info: LIB_FILE: altera_mf
diff --git a/gr-sounder/src/fpga/lib/lfsr.v b/gr-sounder/src/fpga/lib/lfsr.v
deleted file mode 100644
index bd0743e9c..000000000
--- a/gr-sounder/src/fpga/lib/lfsr.v
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-module lfsr(clk_i,rst_i,ena_i,strobe_i,mask_i,pn_o);
-   parameter width = 16;
-
-   input clk_i;
-   input rst_i;
-   input ena_i;
-   input strobe_i;
-   input [width-1:0] mask_i;
-   
-   output pn_o;
-
-   reg  [width-1:0] shifter;
-
-   wire parity = ^(shifter & mask_i);
-   
-   always @(posedge clk_i)
-     if (rst_i | ~ena_i)
-       shifter <= #5 1;
-     else
-       if (strobe_i)
-	 shifter <= #5 {shifter[width-2:0],parity};
-
-   assign pn_o = shifter[0];
-   
-endmodule // lfsr
diff --git a/gr-sounder/src/fpga/lib/lfsr_constants.v b/gr-sounder/src/fpga/lib/lfsr_constants.v
deleted file mode 100644
index e23ed6601..000000000
--- a/gr-sounder/src/fpga/lib/lfsr_constants.v
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-module lfsr_constants(clk_i,rst_i,degree_i,mask_o,len_o);
-   input             clk_i;
-   input             rst_i;
-   input      [4:0]  degree_i;
-   output reg [15:0] mask_o;
-   output reg [16:0] len_o;
-
-   integer len;
-   
-   always @(posedge clk_i)
-     if (rst_i)
-       begin
-	  len_o <= #5 17'b0;
-	  mask_o <= #5 16'b0;
-       end
-     else
-       begin
-	  len_o <= #5 ((1 << degree_i) << 1)-3;
-	  
-	  case (degree_i)
-	    5'd00: mask_o <= #5 16'h0000;
-	    5'd01: mask_o <= #5 16'h0001;
-	    5'd02: mask_o <= #5 16'h0003;
-	    5'd03: mask_o <= #5 16'h0005;
-	    5'd04: mask_o <= #5 16'h0009;
-	    5'd05: mask_o <= #5 16'h0012;
-	    5'd06: mask_o <= #5 16'h0021;
-	    5'd07: mask_o <= #5 16'h0041;
-	    5'd08: mask_o <= #5 16'h008E;
-	    5'd09: mask_o <= #5 16'h0108;
-	    5'd10: mask_o <= #5 16'h0204;
-	    5'd11: mask_o <= #5 16'h0402;
-	    5'd12: mask_o <= #5 16'h0829;
-	    5'd13: mask_o <= #5 16'h100D;
-	    5'd14: mask_o <= #5 16'h2015;
-	    5'd15: mask_o <= #5 16'h4001;
-	    5'd16: mask_o <= #5 16'h8016;
-	    default: mask_o <= #5 16'h0000;
-          endcase // case(degree_i)
-       end // else: !if(rst_i)
-
-endmodule // lfsr_constants
diff --git a/gr-sounder/src/fpga/lib/sounder.v b/gr-sounder/src/fpga/lib/sounder.v
deleted file mode 100644
index 675be8881..000000000
--- a/gr-sounder/src/fpga/lib/sounder.v
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`include "../../../../usrp/firmware/include/fpga_regs_common.v"
-`include "../../../../usrp/firmware/include/fpga_regs_standard.v"
-
-module sounder(clk_i, saddr_i, sdata_i, s_strobe_i,
-	       tx_strobe_o, tx_dac_i_o, tx_dac_q_o,
-	       rx_adc_i_i,rx_adc_q_i,
-	       rx_strobe_o, rx_imp_i_o,rx_imp_q_o);
-
-   // System interface
-   input         clk_i;		// Master clock @ 64 MHz
-   input  [6:0]  saddr_i;	// Configuration bus address
-   input  [31:0] sdata_i;	// Configuration bus data
-   input 	 s_strobe_i;    // Configuration bus write
-   
-   // Transmit subsystem
-   output        tx_strobe_o;	// Generate an transmitter output sample
-   output [13:0] tx_dac_i_o;	// I channel transmitter output to DAC
-   output [13:0] tx_dac_q_o;    // Q channel transmitter output to DAC
-
-   // Receive subsystem
-   output 	 rx_strobe_o;	// Indicates output samples ready for Rx FIFO
-   input  [15:0] rx_adc_i_i;	// I channel input from ADC interface module
-   input  [15:0] rx_adc_q_i;	// Q channel input from ADC interface module
-   output [15:0] rx_imp_i_o;	// I channel impulse response to Rx FIFO
-   output [15:0] rx_imp_q_o;	// Q channel impulse response to Rx FIFO
- 	 
-   // Internal variables
-   wire          reset;
-   wire 	 transmit;
-   wire 	 receive;
-   wire 	 loopback;
-
-   wire [4:0] 	 degree;
-   wire [13:0] 	 ampl;
-   wire [15:0] 	 mask;
-
-   wire          ref_strobe;
-   wire 	 sum_strobe;
-   sounder_ctrl  master(.clk_i(clk_i),.rst_i(reset),.saddr_i(saddr_i),
-			.sdata_i(sdata_i),.s_strobe_i(s_strobe_i),
-			.reset_o(reset),.transmit_o(transmit),.receive_o(receive),.loopback_o(loopback),
-			.degree_o(degree),.ampl_o(ampl),.mask_o(mask),.tx_strobe_o(tx_strobe_o),
-			.rx_strobe_o(rx_strobe_o),.sum_strobe_o(sum_strobe),.ref_strobe_o(ref_strobe));
-      
-   // Loopback implementation
-   wire [13:0] tx_i, tx_q;      
-   wire [15:0] tx_i_ext, tx_q_ext;
-   wire [15:0] rx_i, rx_q; 
-
-   sign_extend #(14,16) tx_i_extender(tx_i, tx_i_ext);
-   sign_extend #(14,16) tx_q_extender(tx_q, tx_q_ext);
-
-   assign tx_dac_i_o = loopback ? 14'b0 : tx_i;
-   assign tx_dac_q_o = loopback ? 14'b0 : tx_q;
-   assign rx_i       = loopback ? tx_i_ext : rx_adc_i_i;
-   assign rx_q       = loopback ? tx_q_ext : rx_adc_q_i;
-   
-   sounder_tx transmitter
-     ( .clk_i(clk_i),.rst_i(reset),.ena_i(transmit),
-       .strobe_i(tx_strobe_o),.mask_i(mask),.ampl_i(ampl),
-       .tx_i_o(tx_i),.tx_q_o(tx_q) );
-   
-   sounder_rx receiver
-     ( .clk_i(clk_i),.rst_i(reset),.ena_i(receive),
-       .sum_strobe_i(sum_strobe),.ref_strobe_i(ref_strobe),
-       .mask_i(mask),.degree_i(degree),
-       .rx_in_i_i(rx_i),.rx_in_q_i(rx_q),.rx_i_o(rx_imp_i_o),.rx_q_o(rx_imp_q_o));
-
-endmodule // sounder
diff --git a/gr-sounder/src/fpga/lib/sounder_ctrl.v b/gr-sounder/src/fpga/lib/sounder_ctrl.v
deleted file mode 100644
index 6e967a5ba..000000000
--- a/gr-sounder/src/fpga/lib/sounder_ctrl.v
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`include "../../../../usrp/firmware/include/fpga_regs_common.v"
-`include "../../../../usrp/firmware/include/fpga_regs_standard.v"
-
-module sounder_ctrl(clk_i,rst_i,saddr_i,sdata_i,s_strobe_i,
-		    reset_o,transmit_o,receive_o,loopback_o,
-		    degree_o,ampl_o,mask_o,
-		    tx_strobe_o,rx_strobe_o,sum_strobe_o,ref_strobe_o);
-
-   input         clk_i;         // Master clock @ 64 MHz
-   input         rst_i;         // Master synchronous reset
-   input  [6:0]  saddr_i;	// Configuration bus address
-   input  [31:0] sdata_i;	// Configuration bus data
-   input 	 s_strobe_i;    // Configuration bus write
-   output 	 reset_o;
-   output 	 transmit_o;
-   output 	 receive_o;
-   output 	 loopback_o;
-   output [4:0]  degree_o;
-   output [13:0] ampl_o;
-   output [15:0] mask_o;
-   output 	 tx_strobe_o;
-   output        rx_strobe_o;
-   output        sum_strobe_o;
-   output        ref_strobe_o;
-   
-   setting_reg #(`FR_USER_0) sr_mode
-     ( .clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-       .out({loopback_o,receive_o,transmit_o,reset_o}) );
-
-   setting_reg #(`FR_USER_1) sr_lfsr_degree
-     ( .clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-       .out(degree_o) );
-   
-   setting_reg #(`FR_USER_2) sr_lfsr_ampl
-     ( .clock(clk_i),.reset(1'b0),.strobe(s_strobe_i),.addr(saddr_i),.in(sdata_i),
-       .out(ampl_o) );
-   
-   wire [16:0] len;
-   lfsr_constants constants
-     (.clk_i(clk_i),.rst_i(rst_i),.degree_i(degree_o),.mask_o(mask_o),
-      .len_o(len) );
-
-   reg [15:0] phase;
-   assign tx_strobe_o = ~phase[0];
-   assign ref_strobe_o = tx_strobe_o & !(phase>>1 == len>>1);
-   assign sum_strobe_o = (phase == len);
-   
-   reg 	  rx_strobe_o;
-   always @(posedge clk_i)
-     if (rst_i)
-       begin
-	  phase <= #5 16'hFFFF;
-	  rx_strobe_o <= #5 0;
-       end
-     else
-       if (sum_strobe_o)
-	 begin
-	    phase <= #5 0;
-	    rx_strobe_o <= #5 1'b1;
-	 end
-       else
-	 begin
-	    phase <= #5 phase + 16'b1;
-	    rx_strobe_o <= #5 0;
-	 end
-
-
-
-
-
-
-
-
-
-   
-endmodule // sounder_ctrl
diff --git a/gr-sounder/src/fpga/lib/sounder_rx.v b/gr-sounder/src/fpga/lib/sounder_rx.v
deleted file mode 100644
index 18038a3a1..000000000
--- a/gr-sounder/src/fpga/lib/sounder_rx.v
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-module sounder_rx(clk_i,rst_i,ena_i,sum_strobe_i,ref_strobe_i,
-		  mask_i,degree_i,rx_in_i_i,rx_in_q_i,rx_i_o,rx_q_o);
-   
-   input         clk_i;		// Master clock
-   input         rst_i;         // Subsystem reset
-   input         ena_i;		// Subsystem enable
-   input         sum_strobe_i;  // Strobe on last sample per period
-   input         ref_strobe_i;  // PN code reference retarded one sample per period
-    
-   input  [15:0] mask_i;	// PN code LFSR mask
-   input  [4:0]  degree_i;	// PN code LFSR sequency degree
-   
-   input  [15:0] rx_in_i_i;	// I channel on receive
-   input  [15:0] rx_in_q_i;	// Q channel on receive
-
-   output [15:0] rx_i_o;	// I channel of impulse response
-   output [15:0] rx_q_o;	// Q channel of impulse response
-
-   reg  [31:0] sum_i, sum_q;
-   reg  [31:0] total_i, total_q;
-   wire [31:0] i_ext, q_ext;
-
-   sign_extend #(16,32) i_extender(rx_in_i_i, i_ext);
-   sign_extend #(16,32) q_extender(rx_in_q_i, q_ext);
-
-   wire pn_ref;
-   lfsr ref_code
-     ( .clk_i(clk_i),.rst_i(rst_i),.ena_i(ena_i),.strobe_i(ref_strobe_i),.mask_i(mask_i),.pn_o(pn_ref) );
-
-   wire [31:0] prod_i = pn_ref ? i_ext : -i_ext;
-   wire [31:0] prod_q = pn_ref ? q_ext : -q_ext;
-
-   always @(posedge clk_i)
-     if (rst_i | ~ena_i)
-       begin
-	  sum_i <= #5 0;
-	  sum_q <= #5 0;
-	  total_i <= #5 0;
-	  total_q <= #5 0;
-       end
-     else
-       if (sum_strobe_i)
-	 begin
-	    total_i <= #5 sum_i;
-	    total_q <= #5 sum_q;
-	    sum_i <= #5 prod_i;
-	    sum_q <= #5 prod_q;
-	 end
-       else
-	 begin
-	    sum_i <= #5 sum_i + prod_i;
-	    sum_q <= #5 sum_q + prod_q;
-	 end
-
-   wire [5:0]  offset = (5'd16-degree_i);
-   wire [31:0] scaled_i = total_i << offset;
-   wire [31:0] scaled_q = total_q << offset;
-   assign rx_i_o = scaled_i[31:16];
-   assign rx_q_o = scaled_q[31:16];
-   
-endmodule // sounder_rx
-
diff --git a/gr-sounder/src/fpga/lib/sounder_tx.v b/gr-sounder/src/fpga/lib/sounder_tx.v
deleted file mode 100644
index 148b1e500..000000000
--- a/gr-sounder/src/fpga/lib/sounder_tx.v
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`include "../../../../usrp/firmware/include/fpga_regs_common.v"
-`include "../../../../usrp/firmware/include/fpga_regs_standard.v"
-
-module sounder_tx(clk_i,rst_i,ena_i,strobe_i,ampl_i,mask_i,tx_i_o,tx_q_o);
-   input         clk_i;
-   input         rst_i;
-   input         ena_i;
-   input         strobe_i;
-   input  [13:0] ampl_i;
-   input  [15:0] mask_i;
-   output [13:0] tx_i_o;
-   output [13:0] tx_q_o;
-
-   wire          pn;
-   wire   [13:0] min_value = (~ampl_i)+14'b1;
-   
-   lfsr pn_code
-     ( .clk_i(clk_i),.rst_i(rst_i),.ena_i(ena_i),.strobe_i(strobe_i),.mask_i(mask_i),.pn_o(pn) );
-
-   assign tx_i_o = ena_i ? (pn ? ampl_i : min_value) : 14'b0; // Bipolar
-   assign tx_q_o = 14'b0;
-
-endmodule // sounder_tx
diff --git a/gr-sounder/src/fpga/tb/.gitignore b/gr-sounder/src/fpga/tb/.gitignore
deleted file mode 100644
index b05ab62aa..000000000
--- a/gr-sounder/src/fpga/tb/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Makefile
-/Makefile.in
-/*.vcd
-/sounder_tb
-/*.out*
diff --git a/gr-sounder/src/fpga/tb/Makefile.am b/gr-sounder/src/fpga/tb/Makefile.am
deleted file mode 100644
index b21cb5f96..000000000
--- a/gr-sounder/src/fpga/tb/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2007,2009,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += \
-	sounder_tb.v \
-	sounder_tb.sav \
-	sounder_tb.sh \
-	sounder_tb_wave.sh
-
-MOSTLYCLEANFILES += *.vcd *.out* sounder_tb
diff --git a/gr-sounder/src/fpga/tb/sounder_tb.sav b/gr-sounder/src/fpga/tb/sounder_tb.sav
deleted file mode 100644
index 25bc512bc..000000000
--- a/gr-sounder/src/fpga/tb/sounder_tb.sav
+++ /dev/null
@@ -1,57 +0,0 @@
-*-29.807737 317080000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
-@200
--
-@28
-sounder_tb.s_strobe
-@22
-sounder_tb.saddr[6:0]
-@200
--
-@28
-sounder_tb.uut.reset
-sounder_tb.uut.transmit
-sounder_tb.uut.receive
-sounder_tb.uut.loopback
-@200
--
-@22
-sounder_tb.uut.degree[4:0]
-sounder_tb.uut.mask[15:0]
-sounder_tb.uut.ampl[13:0]
-sounder_tb.uut.receiver.offset[5:0]
-@200
--
-@8420
-sounder_tb.tx_dac_i[13:0]
-@28
-sounder_tb.tx_strobe
-@200
--
-@8420
-sounder_tb.fifo_i[15:0]
-@28
-sounder_tb.fifo_strobe
-@200
--
-@28
-sounder_tb.uut.ref_strobe
-sounder_tb.uut.sum_strobe
-@200
--
-@28
-sounder_tb.clk
-sounder_tb.uut.transmitter.pn
-sounder_tb.uut.receiver.pn_ref
-@8420
-sounder_tb.uut.receiver.prod_i[31:0]
-sounder_tb.uut.receiver.scaled_i[31:0]
-@8421
-sounder_tb.uut.receiver.sum_i[31:0]
-@8420
-sounder_tb.uut.receiver.total_i[31:0]
-@200
--
-@22
-sounder_tb.uut.master.len[16:0]
-@200
--
diff --git a/gr-sounder/src/fpga/tb/sounder_tb.sh b/gr-sounder/src/fpga/tb/sounder_tb.sh
deleted file mode 100755
index 28efc8d31..000000000
--- a/gr-sounder/src/fpga/tb/sounder_tb.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-iverilog -y ../lib/ -y ../../../../usrp/fpga/sdr_lib 	        \
-    sounder_tb.v -o sounder_tb 				     && \
-./sounder_tb > sounder_tb.out  && \
-    grep 'r=0' sounder_tb.out | grep 'c=1' > sounder_tb.out2
-    
diff --git a/gr-sounder/src/fpga/tb/sounder_tb.v b/gr-sounder/src/fpga/tb/sounder_tb.v
deleted file mode 100644
index 0e0cb55c2..000000000
--- a/gr-sounder/src/fpga/tb/sounder_tb.v
+++ /dev/null
@@ -1,238 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-`timescale 1ns/100ps
-
-`include "../lib/sounder.v"
-
-`define FR_MODE 		7'd64
-`define bmFR_MODE_RESET		32'h0001
-`define bmFR_MODE_TX            32'h0002
-`define bmFR_MODE_RX            32'h0004
-`define bmFR_MODE_LP            32'h0008
-
-`define FR_DEGREE		7'd65
-`define FR_AMPL                 7'd66
-
-module sounder_tb;
-
-   // System bus
-   reg         clk;
-   reg         rst;
-   reg         ena;
-   
-   // Configuration bus
-   reg [6:0]   saddr;
-   reg [31:0]  sdata;
-   reg 	       s_strobe;
-
-   // DAC bus
-   wire        tx_strobe;
-   wire [13:0] tx_dac_i;
-   wire [13:0] tx_dac_q;
-
-   // ADC bus
-   reg [15:0]  rx_adc_i;
-   reg [15:0]  rx_adc_q;
-   
-   // FIFO bus
-   wire        fifo_strobe;
-   wire [15:0] fifo_i;
-   wire [15:0] fifo_q;
-   
-   // Configuration shadow registers
-   reg [31:0]  mode;
-   reg [31:0]  degree;
-   
-   sounder uut
-     (.clk_i(clk),.saddr_i(saddr),.sdata_i(sdata),.s_strobe_i(s_strobe),
-      .tx_strobe_o(tx_strobe),.tx_dac_i_o(tx_dac_i),.tx_dac_q_o(tx_dac_q),
-      .rx_strobe_o(fifo_strobe),.rx_adc_i_i(rx_adc_i),.rx_adc_q_i(rx_adc_q),
-      .rx_imp_i_o(fifo_i),.rx_imp_q_o(fifo_q));
-
-   // Start up initialization
-   initial
-     begin
-	clk = 0;
-	rst = 0;
-	ena = 0;
-	saddr = 0;
-	sdata = 0;
-	s_strobe = 0;
-	rx_adc_i = 0;
-	rx_adc_q = 0;
-	mode = 0;
-	degree = 0;
-	
-	@(posedge clk);
-	rst = 1;
-	@(posedge clk);
-	rst = 0;
-	@(posedge clk);
-	ena = 1;
-     end
-   
-   always
-     #5 clk <= ~clk;
-   
-   initial
-     begin
-	$monitor($time, " c=%b r=%b phs=%d txs=%b rfs=%b rxs=%b sms=%b pn=%b pnr=%b prd=%x sum=%x tot=%x",
-		 clk, rst, uut.master.phase, uut.tx_strobe_o, uut.ref_strobe, uut.rx_strobe_o, 
-		 uut.sum_strobe, uut.transmitter.pn, uut.receiver.pn_ref, uut.receiver.prod_i,
-		 uut.receiver.sum_i, uut.receiver.total_i);
-
-	$dumpfile("sounder_tb.vcd");
-	$dumpvars(0, sounder_tb);
-     end
-
-   // Test tasks
-   task write_cfg_register;
-      input [6:0]  regno;
-      input [31:0] value;
-      
-      begin
-	 @(posedge clk);
-	 saddr <= #5 regno;
-	 sdata <= #5 value;
-	 s_strobe <= #5 1'b1;
-	 @(posedge clk);
-	 s_strobe <= #5 0;
-      end
-   endtask // write_cfg_register
-   
-   // Application reset line
-   task set_reset;
-      input reset;
-      
-      begin
-	 mode = reset ? (mode | `bmFR_MODE_RESET) : (mode & ~`bmFR_MODE_RESET);
-	 write_cfg_register(`FR_MODE, mode);
-      end
-   endtask // reset
-   
-   // Set the PN code degree
-   task set_degree;
-      input [5:0] degree;
-      begin
-	 write_cfg_register(`FR_DEGREE, degree);
-      end
-   endtask // set_degree
-   
-   // Set the PN amplitude
-   task set_amplitude;
-      input [13:0] ampl;
-      begin
-	 write_cfg_register(`FR_AMPL, ampl);
-      end
-   endtask // set_ampl
-   
-   // Turn on or off the transmitter
-   task enable_tx;
-      input tx;
-
-      begin
-	 mode = tx ? (mode | `bmFR_MODE_TX) : (mode & ~`bmFR_MODE_TX);
-	 write_cfg_register(`FR_MODE, mode);
-      end
-   endtask // enable_tx
-
-   // Turn on or off the receiver
-   task enable_rx;
-      input rx;
-
-      begin
-	 mode = rx ? (mode | `bmFR_MODE_RX) : (mode & ~`bmFR_MODE_RX);
-	 write_cfg_register(`FR_MODE, mode);
-      end
-   endtask // enable_rx
-
-
-   // Turn on or off digital loopback
-   task enable_lp;
-      input lp;
-
-      begin
-	 mode = lp ? (mode | `bmFR_MODE_LP) : (mode & ~`bmFR_MODE_LP);
-	 write_cfg_register(`FR_MODE, mode);
-      end
-   endtask // enable_lp
-   
-   // Test transmitter functionality
-   task test_tx;
-      input [5:0] degree;
-      input [31:0] test_len;
-      
-      begin
-	 #20 set_reset(1);
-	 #20 set_degree(degree);
-	 #20 set_amplitude(14'h1000);
-	 #20 enable_tx(1);
-	 #20 enable_rx(0);
-	 #20 enable_lp(0);
-	 #20 set_reset(0);
-	 #(test_len);
-      end
-   endtask // test_tx
-   
-   // Test loopback functionality
-   task test_lp;
-      input [5:0] degree;
-      input [31:0] test_len;
-      
-      begin
-	 #20 set_reset(1);
-	 #20 set_degree(degree);
-	 #20 enable_tx(1);
-	 #20 enable_rx(1);
-	 #20 enable_lp(1);
-	 #20 set_reset(0);
-	 #(test_len);
-      end
-   endtask // test_lp
-   
-   // Test receiver only functionality
-   task test_rx;
-      input [5:0] degree;
-      input [31:0] test_len;
-      
-      begin
-	 #20 set_reset(1);
-	 #20 set_degree(degree);
-	 #20 enable_tx(0);
-	 #20 enable_rx(1);
-	 #20 enable_lp(0);
-	 #20 set_reset(0);
-	 #(test_len);
-      end
-   endtask // test_rx
-   
-   // Execute tests
-   initial
-     begin
-        #20 test_tx(8,255*20);
-	#20 test_lp(8,255*255*20*5);
-	//#20 test_rx(8,255*255*20*5);
-	#500 $finish;
-     end
-
-endmodule
-
diff --git a/gr-sounder/src/fpga/tb/sounder_tb_wave.sh b/gr-sounder/src/fpga/tb/sounder_tb_wave.sh
deleted file mode 100755
index 4551d5c59..000000000
--- a/gr-sounder/src/fpga/tb/sounder_tb_wave.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-gtkwave sounder_tb.vcd sounder_tb.sav
diff --git a/gr-sounder/src/fpga/top/.gitignore b/gr-sounder/src/fpga/top/.gitignore
deleted file mode 100644
index 2c9458cf2..000000000
--- a/gr-sounder/src/fpga/top/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/Makefile
-/Makefile.in
-/db
-/*.rpt
-/*.summary
-/*.rbf
-/*.qws
-/*.smsg
-/*.done
-/*.pin
-/*.sof
diff --git a/gr-sounder/src/fpga/top/Makefile.am b/gr-sounder/src/fpga/top/Makefile.am
deleted file mode 100644
index f559991de..000000000
--- a/gr-sounder/src/fpga/top/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright 2007,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-RBFS = usrp_sounder.rbf
-
-rbf2datadir = $(prefix)/share/usrp/rev2
-dist_rbf2data_DATA = $(RBFS)
-
-rbf4datadir = $(prefix)/share/usrp/rev4
-dist_rbf4data_DATA = $(RBFS)
-
-EXTRA_DIST +=			\
-	config.vh		\
-	usrp_sounder.v		\
-	usrp_sounder.csf	\
-	usrp_sounder.esf	\
-	usrp_sounder.psf	\
-	usrp_sounder.qpf
-
-MOSTLYCLEANFILES += 	\
-	db/*		\
-	*.rpt		\
-	*.summary	\
-	*.qws		\
-	*.smsg		\
-	*.done		\
-	*.pin		\
-	*.sof
diff --git a/gr-sounder/src/fpga/top/config.vh b/gr-sounder/src/fpga/top/config.vh
deleted file mode 100644
index 06445e9af..000000000
--- a/gr-sounder/src/fpga/top/config.vh
+++ /dev/null
@@ -1,22 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-// Uncomment to enable 64 MHz Tx clock, otherwise 32 MHz
-//`define TX_RATE_MAX
diff --git a/gr-sounder/src/fpga/top/usrp_sounder.csf b/gr-sounder/src/fpga/top/usrp_sounder.csf
deleted file mode 100644
index 544f278e3..000000000
--- a/gr-sounder/src/fpga/top/usrp_sounder.csf
+++ /dev/null
@@ -1,444 +0,0 @@
-COMPILER_SETTINGS
-{
-	IO_PLACEMENT_OPTIMIZATION = OFF;
-	ENABLE_DRC_SETTINGS = OFF;
-	PHYSICAL_SYNTHESIS_REGISTER_RETIMING = OFF;
-	PHYSICAL_SYNTHESIS_REGISTER_DUPLICATION = OFF;
-	PHYSICAL_SYNTHESIS_COMBO_LOGIC = OFF;
-	DRC_FANOUT_EXCEEDING = 30;
-	DRC_REPORT_FANOUT_EXCEEDING = OFF;
-	DRC_TOP_FANOUT = 50;
-	DRC_REPORT_TOP_FANOUT = OFF;
-	RUN_DRC_DURING_COMPILATION = OFF;
-	ADV_NETLIST_OPT_RETIME_CORE_AND_IO = ON;
-	ADV_NETLIST_OPT_SYNTH_USE_FITTER_INFO = OFF;
-	ADV_NETLIST_OPT_SYNTH_GATE_RETIME = OFF;
-	ADV_NETLIST_OPT_SYNTH_WYSIWYG_REMAP = OFF;
-	SMART_COMPILE_IGNORES_TDC_FOR_STRATIX_PLL_CHANGES = OFF;
-	MERGE_HEX_FILE = OFF;
-	TRUE_WYSIWYG_FLOW = OFF;
-	SEED = 1;
-	FINAL_PLACEMENT_OPTIMIZATION = AUTOMATICALLY;
-	FAMILY = Cyclone;
-	DPRAM_DUAL_PORT_MODE_OTHER_SIGNALS_EPXA1 = "DPRAM0 TO 1 DPRAM1 TO 2";
-	DPRAM_32BIT_SINGLE_PORT_MODE_OTHER_SIGNALS_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_8BIT_16BIT_SINGLE_PORT_MODE_OTHER_SIGNALS_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_DUAL_PORT_MODE_OUTPUT_EPXA1 = "DPRAM0 TO 1 DPRAM1 TO 2";
-	DPRAM_32BIT_SINGLE_PORT_MODE_OUTPUT_EPXA1 = "LOWER TO 1ESB UPPER TO 1";
-	DPRAM_8BIT_16BIT_SINGLE_PORT_MODE_OUTPUT_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_DUAL_PORT_MODE_INPUT_EPXA1 = "DPRAM0 TO 1 DPRAM1 TO 2";
-	DPRAM_32BIT_SINGLE_PORT_MODE_INPUT_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_8BIT_16BIT_SINGLE_PORT_MODE_INPUT_EPXA1 = "MEGALAB COLUMN 1";
-	DPRAM_DUAL_PORT_MODE_OTHER_SIGNALS_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_SINGLE_PORT_MODE_OTHER_SIGNALS_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_WIDE_MODE_OTHER_SIGNALS_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_DEEP_MODE_OTHER_SIGNALS_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_DUAL_PORT_MODE_OUTPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4ESB";
-	DPRAM_SINGLE_PORT_MODE_OUTPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4ESB";
-	DPRAM_WIDE_MODE_OUTPUT_EPXA4_10 = "LOWER TO 3 UPPER TO 4ESB";
-	DPRAM_DEEP_MODE_OUTPUT_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_DUAL_PORT_MODE_INPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_SINGLE_PORT_MODE_INPUT_EPXA4_10 = "DPRAM0 TO 3 DPRAM1 TO 4";
-	DPRAM_WIDE_MODE_INPUT_EPXA4_10 = "LOWER TO 3 UPPER TO 4";
-	DPRAM_DEEP_MODE_INPUT_EPXA4_10 = "MEGALAB COLUMN 3";
-	DPRAM_OTHER_SIGNALS_EPXA4_10 = "DEFAULT OTHER ROUTING OPTIONS";
-	DPRAM_OUTPUT_EPXA4_10 = "DEFAULT OUTPUT ROUTING OPTIONS";
-	DPRAM_INPUT_EPXA4_10 = "DEFAULT INPUT ROUTING OPTIONS";
-	STRIPE_TO_PLD_INTERRUPTS_EPXA4_10 = "MEGALAB COLUMN 2";
-	PLD_TO_STRIPE_INTERRUPTS_EPXA4_10 = "MEGALAB COLUMN 2";
-	PROCESSOR_DEBUG_EXTENSIONS_EPXA4_10 = "MEGALAB COLUMN 2";
-	STRIPE_TO_PLD_BRIDGE_EPXA4_10 = "MEGALAB COLUMN 1";
-	FAST_FIT_COMPILATION = OFF;
-	SIGNALPROBE_DURING_NORMAL_COMPILATION = OFF;
-	OPTIMIZE_IOC_REGISTER_PLACEMENT_FOR_TIMING = ON;
-	OPTIMIZE_TIMING = "NORMAL COMPILATION";
-	OPTIMIZE_HOLD_TIMING = OFF;
-	COMPILATION_LEVEL = FULL;
-	SAVE_DISK_SPACE = OFF;
-	SPEED_DISK_USAGE_TRADEOFF = NORMAL;
-	LOGICLOCK_INCREMENTAL_COMPILE_ASSIGNMENT = OFF;
-	SIGNALPROBE_ALLOW_OVERUSE = OFF;
-	FOCUS_ENTITY_NAME = |usrp_sounder;
-	ROUTING_BACK_ANNOTATION_MODE = OFF;
-	INC_PLC_MODE = OFF;
-	FIT_ONLY_ONE_ATTEMPT = OFF;
-}
-DEFAULT_DEVICE_OPTIONS
-{
-	GENERATE_CONFIG_HEXOUT_FILE = OFF;
-	GENERATE_CONFIG_JBC_FILE_COMPRESSED = ON;
-	GENERATE_CONFIG_JBC_FILE = OFF;
-	GENERATE_CONFIG_JAM_FILE = OFF;
-	GENERATE_CONFIG_ISC_FILE = OFF;
-	GENERATE_CONFIG_SVF_FILE = OFF;
-	GENERATE_JBC_FILE_COMPRESSED = ON;
-	GENERATE_JBC_FILE = OFF;
-	GENERATE_JAM_FILE = OFF;
-	GENERATE_ISC_FILE = OFF;
-	GENERATE_SVF_FILE = OFF;
-	RESERVE_PIN = "AS INPUT TRI-STATED";
-	RESERVE_ALL_UNUSED_PINS = "AS OUTPUT DRIVING GROUND";
-	HEXOUT_FILE_COUNT_DIRECTION = UP;
-	HEXOUT_FILE_START_ADDRESS = 0;
-	GENERATE_HEX_FILE = OFF;
-	GENERATE_RBF_FILE = OFF;
-	GENERATE_TTF_FILE = OFF;
-	RESERVE_ASDO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_DATA0_AFTER_CONFIGURATION = "AS INPUT TRI-STATED";
-	RESERVE_DATA7_THROUGH_DATA1_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_RDYNBUSY_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_NWS_NRS_NCS_CS_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	DISABLE_NCS_AND_OE_PULLUPS_ON_CONFIG_DEVICE = OFF;
-	AUTO_INCREMENT_CONFIG_DEVICE_JTAG_USER_CODE = ON;
-	EPROM_USE_CHECKSUM_AS_USERCODE = OFF;
-	FLEX10K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	MERCURY_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	APEX20K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_CONFIGURATION_DEVICE = AUTO;
-	CYCLONE_CONFIGURATION_DEVICE = AUTO;
-	FLEX10K_CONFIGURATION_DEVICE = AUTO;
-	FLEX6K_CONFIGURATION_DEVICE = AUTO;
-	MERCURY_CONFIGURATION_DEVICE = AUTO;
-	EXCALIBUR_CONFIGURATION_DEVICE = AUTO;
-	APEX20K_CONFIGURATION_DEVICE = AUTO;
-	USE_CONFIGURATION_DEVICE = ON;
-	ENABLE_INIT_DONE_OUTPUT = OFF;
-	FLEX10K_ENABLE_LOCK_OUTPUT = OFF;
-	ENABLE_DEVICE_WIDE_OE = OFF;
-	ENABLE_DEVICE_WIDE_RESET = OFF;
-	RELEASE_CLEARS_BEFORE_TRI_STATES = OFF;
-	AUTO_RESTART_CONFIGURATION = OFF;
-	ENABLE_VREFB_PIN = OFF;
-	ENABLE_VREFA_PIN = OFF;
-	SECURITY_BIT = OFF;
-	USER_START_UP_CLOCK = OFF;
-	APEXII_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX10K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX6K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	MERCURY_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	EXCALIBUR_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	CYCLONE_CONFIGURATION_SCHEME = "ACTIVE SERIAL";
-	STRATIX_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	APEX20K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	STRATIX_UPDATE_MODE = STANDARD;
-	USE_CHECKSUM_AS_USERCODE = OFF;
-	MAX7000_USE_CHECKSUM_AS_USERCODE = OFF;
-	MAX7000_JTAG_USER_CODE = FFFFFFFF;
-	FLEX10K_JTAG_USER_CODE = 7F;
-	MERCURY_JTAG_USER_CODE = FFFFFFFF;
-	APEX20K_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_JTAG_USER_CODE = FFFFFFFF;
-	MAX7000S_JTAG_USER_CODE = FFFF;
-	RESERVE_NCEO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	FLEX10K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	FLEX6K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = OFF;
-	ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	MAX7000_ENABLE_JTAG_BST_SUPPORT = ON;
-	ENABLE_JTAG_BST_SUPPORT = OFF;
-	CONFIGURATION_CLOCK_DIVISOR = 1;
-	CONFIGURATION_CLOCK_FREQUENCY = "10 MHZ";
-	CLOCK_SOURCE = INTERNAL;
-	COMPRESSION_MODE = OFF;
-	ON_CHIP_BITSTREAM_DECOMPRESSION = OFF;
-}
-AUTO_SLD_HUB_ENTITY
-{
-	AUTO_INSERT_SLD_HUB_ENTITY = ENABLE;
-	HUB_INSTANCE_NAME = SLD_HUB_INST;
-	HUB_ENTITY_NAME = SLD_HUB;
-}
-SIGNALTAP_LOGIC_ANALYZER_SETTINGS
-{
-	ENABLE_SIGNALTAP = Off;
-	AUTO_ENABLE_SMART_COMPILE = On;
-}
-CHIP(usrp_sounder)
-{
-	DEVICE = EP1C12Q240C8;
-	DEVICE_FILTER_PACKAGE = "ANY QFP";
-	DEVICE_FILTER_PIN_COUNT = 240;
-	DEVICE_FILTER_SPEED_GRADE = ANY;
-	AUTO_RESTART_CONFIGURATION = OFF;
-	RELEASE_CLEARS_BEFORE_TRI_STATES = OFF;
-	USER_START_UP_CLOCK = OFF;
-	ENABLE_DEVICE_WIDE_RESET = OFF;
-	ENABLE_DEVICE_WIDE_OE = OFF;
-	ENABLE_INIT_DONE_OUTPUT = OFF;
-	FLEX10K_ENABLE_LOCK_OUTPUT = OFF;
-	ENABLE_JTAG_BST_SUPPORT = OFF;
-	MAX7000_ENABLE_JTAG_BST_SUPPORT = ON;
-	APEX20K_JTAG_USER_CODE = FFFFFFFF;
-	MERCURY_JTAG_USER_CODE = FFFFFFFF;
-	FLEX10K_JTAG_USER_CODE = 7F;
-	MAX7000_JTAG_USER_CODE = FFFFFFFF;
-	MAX7000S_JTAG_USER_CODE = FFFF;
-	STRATIX_JTAG_USER_CODE = FFFFFFFF;
-	APEX20K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	MERCURY_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX6K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	FLEX10K_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	EXCALIBUR_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	APEXII_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	STRATIX_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	CYCLONE_CONFIGURATION_SCHEME = "PASSIVE SERIAL";
-	USE_CONFIGURATION_DEVICE = OFF;
-	APEX20K_CONFIGURATION_DEVICE = AUTO;
-	MERCURY_CONFIGURATION_DEVICE = AUTO;
-	FLEX6K_CONFIGURATION_DEVICE = AUTO;
-	FLEX10K_CONFIGURATION_DEVICE = AUTO;
-	EXCALIBUR_CONFIGURATION_DEVICE = AUTO;
-	STRATIX_CONFIGURATION_DEVICE = AUTO;
-	CYCLONE_CONFIGURATION_DEVICE = AUTO;
-	STRATIX_UPDATE_MODE = STANDARD;
-	APEX20K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	MERCURY_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	FLEX10K_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	STRATIX_CONFIG_DEVICE_JTAG_USER_CODE = FFFFFFFF;
-	AUTO_INCREMENT_CONFIG_DEVICE_JTAG_USER_CODE = ON;
-	DISABLE_NCS_AND_OE_PULLUPS_ON_CONFIG_DEVICE = OFF;
-	COMPRESSION_MODE = OFF;
-	ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	FLEX6K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = OFF;
-	FLEX10K_ENABLE_LOW_VOLTAGE_MODE_ON_CONFIG_DEVICE = ON;
-	EPROM_USE_CHECKSUM_AS_USERCODE = OFF;
-	USE_CHECKSUM_AS_USERCODE = OFF;
-	MAX7000_USE_CHECKSUM_AS_USERCODE = OFF;
-	GENERATE_TTF_FILE = OFF;
-	GENERATE_RBF_FILE = ON;
-	GENERATE_HEX_FILE = OFF;
-	SECURITY_BIT = OFF;
-	ENABLE_VREFA_PIN = OFF;
-	ENABLE_VREFB_PIN = OFF;
-	GENERATE_SVF_FILE = OFF;
-	GENERATE_ISC_FILE = OFF;
-	GENERATE_JAM_FILE = OFF;
-	GENERATE_JBC_FILE = OFF;
-	GENERATE_JBC_FILE_COMPRESSED = ON;
-	GENERATE_CONFIG_SVF_FILE = OFF;
-	GENERATE_CONFIG_ISC_FILE = OFF;
-	GENERATE_CONFIG_JAM_FILE = OFF;
-	GENERATE_CONFIG_JBC_FILE = OFF;
-	GENERATE_CONFIG_JBC_FILE_COMPRESSED = ON;
-	GENERATE_CONFIG_HEXOUT_FILE = OFF;
-	ON_CHIP_BITSTREAM_DECOMPRESSION = OFF;
-	BASE_PIN_OUT_FILE_ON_SAMEFRAME_DEVICE = OFF;
-	HEXOUT_FILE_START_ADDRESS = 0;
-	HEXOUT_FILE_COUNT_DIRECTION = UP;
-	RESERVE_ALL_UNUSED_PINS = "AS INPUT TRI-STATED";
-	STRATIX_DEVICE_IO_STANDARD = LVTTL;
-	CLOCK_SOURCE = INTERNAL;
-	CONFIGURATION_CLOCK_FREQUENCY = "10 MHZ";
-	CONFIGURATION_CLOCK_DIVISOR = 1;
-	RESERVE_NWS_NRS_NCS_CS_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_RDYNBUSY_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_DATA7_THROUGH_DATA1_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_DATA0_AFTER_CONFIGURATION = "AS INPUT TRI-STATED";
-	RESERVE_NCEO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	RESERVE_ASDO_AFTER_CONFIGURATION = "USE AS REGULAR IO";
-	SCLK : LOCATION = Pin_101;
-	SDI : LOCATION = Pin_100;
-	SEN : LOCATION = Pin_98;
-	SLD : LOCATION = Pin_95;
-	adc1_data[0] : LOCATION = Pin_5;
-	adc1_data[10] : LOCATION = Pin_235;
-	adc1_data[11] : LOCATION = Pin_234;
-	adc1_data[1] : LOCATION = Pin_4;
-	adc1_data[2] : LOCATION = Pin_3;
-	adc1_data[3] : LOCATION = Pin_2;
-	adc1_data[4] : LOCATION = Pin_1;
-	adc1_data[4] : IO_STANDARD = LVTTL;
-	adc1_data[5] : LOCATION = Pin_240;
-	adc1_data[6] : LOCATION = Pin_239;
-	adc1_data[7] : LOCATION = Pin_238;
-	adc1_data[8] : LOCATION = Pin_237;
-	adc1_data[9] : LOCATION = Pin_236;
-	adc2_data[0] : LOCATION = Pin_20;
-	adc2_data[10] : LOCATION = Pin_8;
-	adc2_data[11] : LOCATION = Pin_7;
-	adc2_data[1] : LOCATION = Pin_19;
-	adc2_data[2] : LOCATION = Pin_18;
-	adc2_data[3] : LOCATION = Pin_17;
-	adc2_data[4] : LOCATION = Pin_16;
-	adc2_data[5] : LOCATION = Pin_15;
-	adc2_data[6] : LOCATION = Pin_14;
-	adc2_data[7] : LOCATION = Pin_13;
-	adc2_data[8] : LOCATION = Pin_12;
-	adc2_data[9] : LOCATION = Pin_11;
-	adc3_data[0] : LOCATION = Pin_200;
-	adc3_data[10] : LOCATION = Pin_184;
-	adc3_data[11] : LOCATION = Pin_183;
-	adc3_data[1] : LOCATION = Pin_197;
-	adc3_data[2] : LOCATION = Pin_196;
-	adc3_data[3] : LOCATION = Pin_195;
-	adc3_data[4] : LOCATION = Pin_194;
-	adc3_data[5] : LOCATION = Pin_193;
-	adc3_data[6] : LOCATION = Pin_188;
-	adc3_data[7] : LOCATION = Pin_187;
-	adc3_data[8] : LOCATION = Pin_186;
-	adc3_data[9] : LOCATION = Pin_185;
-	adc4_data[0] : LOCATION = Pin_222;
-	adc4_data[10] : LOCATION = Pin_203;
-	adc4_data[11] : LOCATION = Pin_202;
-	adc4_data[1] : LOCATION = Pin_219;
-	adc4_data[2] : LOCATION = Pin_217;
-	adc4_data[3] : LOCATION = Pin_216;
-	adc4_data[4] : LOCATION = Pin_215;
-	adc4_data[5] : LOCATION = Pin_214;
-	adc4_data[6] : LOCATION = Pin_213;
-	adc4_data[7] : LOCATION = Pin_208;
-	adc4_data[8] : LOCATION = Pin_207;
-	adc4_data[9] : LOCATION = Pin_206;
-	adc_oeb[0] : LOCATION = Pin_228;
-	adc_oeb[1] : LOCATION = Pin_21;
-	adc_oeb[2] : LOCATION = Pin_181;
-	adc_oeb[3] : LOCATION = Pin_218;
-	adc_otr[0] : LOCATION = Pin_233;
-	adc_otr[1] : LOCATION = Pin_6;
-	adc_otr[2] : LOCATION = Pin_182;
-	adc_otr[3] : LOCATION = Pin_201;
-	adclk0 : LOCATION = Pin_224;
-	adclk1 : LOCATION = Pin_226;
-	clk0 : LOCATION = Pin_28;
-	clk0 : RESERVE_PIN = "AS INPUT TRI-STATED";
-	clk0 : IO_STANDARD = LVTTL;
-	clk1 : LOCATION = Pin_29;
-	clk1 : RESERVE_PIN = "AS INPUT TRI-STATED";
-	clk1 : IO_STANDARD = LVTTL;
-	clk3 : LOCATION = Pin_152;
-	clk3 : RESERVE_PIN = "AS INPUT TRI-STATED";
-	clk3 : IO_STANDARD = LVTTL;
-	clk_120mhz : LOCATION = Pin_153;
-	clk_120mhz : IO_STANDARD = LVTTL;
-	clk_out : LOCATION = Pin_63;
-	clk_out : IO_STANDARD = LVTTL;
-	dac1_data[0] : LOCATION = Pin_165;
-	dac1_data[10] : LOCATION = Pin_177;
-	dac1_data[11] : LOCATION = Pin_178;
-	dac1_data[12] : LOCATION = Pin_179;
-	dac1_data[13] : LOCATION = Pin_180;
-	dac1_data[1] : LOCATION = Pin_166;
-	dac1_data[2] : LOCATION = Pin_167;
-	dac1_data[3] : LOCATION = Pin_168;
-	dac1_data[4] : LOCATION = Pin_169;
-	dac1_data[5] : LOCATION = Pin_170;
-	dac1_data[6] : LOCATION = Pin_173;
-	dac1_data[7] : LOCATION = Pin_174;
-	dac1_data[8] : LOCATION = Pin_175;
-	dac1_data[9] : LOCATION = Pin_176;
-	dac2_data[0] : LOCATION = Pin_159;
-	dac2_data[10] : LOCATION = Pin_163;
-	dac2_data[11] : LOCATION = Pin_139;
-	dac2_data[12] : LOCATION = Pin_164;
-	dac2_data[13] : LOCATION = Pin_138;
-	dac2_data[1] : LOCATION = Pin_158;
-	dac2_data[2] : LOCATION = Pin_160;
-	dac2_data[3] : LOCATION = Pin_156;
-	dac2_data[4] : LOCATION = Pin_161;
-	dac2_data[5] : LOCATION = Pin_144;
-	dac2_data[6] : LOCATION = Pin_162;
-	dac2_data[7] : LOCATION = Pin_141;
-	dac2_data[8] : LOCATION = Pin_143;
-	dac2_data[9] : LOCATION = Pin_140;
-	dac3_data[0] : LOCATION = Pin_122;
-	dac3_data[10] : LOCATION = Pin_134;
-	dac3_data[11] : LOCATION = Pin_135;
-	dac3_data[12] : LOCATION = Pin_136;
-	dac3_data[13] : LOCATION = Pin_137;
-	dac3_data[1] : LOCATION = Pin_123;
-	dac3_data[2] : LOCATION = Pin_124;
-	dac3_data[3] : LOCATION = Pin_125;
-	dac3_data[4] : LOCATION = Pin_126;
-	dac3_data[5] : LOCATION = Pin_127;
-	dac3_data[6] : LOCATION = Pin_128;
-	dac3_data[7] : LOCATION = Pin_131;
-	dac3_data[8] : LOCATION = Pin_132;
-	dac3_data[9] : LOCATION = Pin_133;
-	dac4_data[0] : LOCATION = Pin_104;
-	dac4_data[10] : LOCATION = Pin_118;
-	dac4_data[11] : LOCATION = Pin_119;
-	dac4_data[12] : LOCATION = Pin_120;
-	dac4_data[13] : LOCATION = Pin_121;
-	dac4_data[1] : LOCATION = Pin_105;
-	dac4_data[2] : LOCATION = Pin_106;
-	dac4_data[3] : LOCATION = Pin_107;
-	dac4_data[4] : LOCATION = Pin_108;
-	dac4_data[5] : LOCATION = Pin_113;
-	dac4_data[6] : LOCATION = Pin_114;
-	dac4_data[7] : LOCATION = Pin_115;
-	dac4_data[8] : LOCATION = Pin_116;
-	dac4_data[9] : LOCATION = Pin_117;
-	enable_rx : LOCATION = Pin_88;
-	enable_tx : LOCATION = Pin_93;
-	gndbus[0] : LOCATION = Pin_223;
-	gndbus[0] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[0] : IO_STANDARD = LVTTL;
-	gndbus[1] : LOCATION = Pin_225;
-	gndbus[1] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[1] : IO_STANDARD = LVTTL;
-	gndbus[2] : LOCATION = Pin_227;
-	gndbus[2] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[2] : IO_STANDARD = LVTTL;
-	gndbus[3] : LOCATION = Pin_62;
-	gndbus[3] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[3] : IO_STANDARD = LVTTL;
-	gndbus[4] : LOCATION = Pin_64;
-	gndbus[4] : RESERVE_PIN = "AS INPUT TRI-STATED";
-	gndbus[4] : IO_STANDARD = LVTTL;
-	misc_pins[0] : LOCATION = Pin_87;
-	misc_pins[0] : IO_STANDARD = LVTTL;
-	misc_pins[10] : LOCATION = Pin_76;
-	misc_pins[10] : IO_STANDARD = LVTTL;
-	misc_pins[11] : LOCATION = Pin_74;
-	misc_pins[11] : IO_STANDARD = LVTTL;
-	misc_pins[1] : LOCATION = Pin_86;
-	misc_pins[1] : IO_STANDARD = LVTTL;
-	misc_pins[2] : LOCATION = Pin_85;
-	misc_pins[2] : IO_STANDARD = LVTTL;
-	misc_pins[3] : LOCATION = Pin_84;
-	misc_pins[3] : IO_STANDARD = LVTTL;
-	misc_pins[4] : LOCATION = Pin_83;
-	misc_pins[4] : IO_STANDARD = LVTTL;
-	misc_pins[5] : LOCATION = Pin_82;
-	misc_pins[5] : IO_STANDARD = LVTTL;
-	misc_pins[6] : LOCATION = Pin_79;
-	misc_pins[6] : IO_STANDARD = LVTTL;
-	misc_pins[7] : LOCATION = Pin_78;
-	misc_pins[7] : IO_STANDARD = LVTTL;
-	misc_pins[8] : LOCATION = Pin_77;
-	misc_pins[8] : IO_STANDARD = LVTTL;
-	misc_pins[9] : LOCATION = Pin_75;
-	misc_pins[9] : IO_STANDARD = LVTTL;
-	reset : LOCATION = Pin_94;
-	usbclk : LOCATION = Pin_55;
-	usbctl[0] : LOCATION = Pin_56;
-	usbctl[1] : LOCATION = Pin_54;
-	usbctl[2] : LOCATION = Pin_53;
-	usbctl[3] : LOCATION = Pin_58;
-	usbctl[4] : LOCATION = Pin_57;
-	usbctl[5] : LOCATION = Pin_44;
-	usbdata[0] : LOCATION = Pin_73;
-	usbdata[10] : LOCATION = Pin_41;
-	usbdata[11] : LOCATION = Pin_39;
-	usbdata[12] : LOCATION = Pin_38;
-	usbdata[12] : IO_STANDARD = LVTTL;
-	usbdata[13] : LOCATION = Pin_37;
-	usbdata[14] : LOCATION = Pin_24;
-	usbdata[15] : LOCATION = Pin_23;
-	usbdata[1] : LOCATION = Pin_68;
-	usbdata[2] : LOCATION = Pin_67;
-	usbdata[3] : LOCATION = Pin_66;
-	usbdata[4] : LOCATION = Pin_65;
-	usbdata[5] : LOCATION = Pin_61;
-	usbdata[6] : LOCATION = Pin_60;
-	usbdata[7] : LOCATION = Pin_59;
-	usbdata[8] : LOCATION = Pin_43;
-	usbdata[9] : LOCATION = Pin_42;
-	usbrdy[0] : LOCATION = Pin_45;
-	usbrdy[1] : LOCATION = Pin_46;
-	usbrdy[2] : LOCATION = Pin_47;
-	usbrdy[3] : LOCATION = Pin_48;
-	usbrdy[4] : LOCATION = Pin_49;
-	usbrdy[5] : LOCATION = Pin_50;
-	clear_status : LOCATION = Pin_99;
-}
diff --git a/gr-sounder/src/fpga/top/usrp_sounder.esf b/gr-sounder/src/fpga/top/usrp_sounder.esf
deleted file mode 100644
index c7d828b2b..000000000
--- a/gr-sounder/src/fpga/top/usrp_sounder.esf
+++ /dev/null
@@ -1,14 +0,0 @@
-SIMULATOR_SETTINGS
-{
-	ESTIMATE_POWER_CONSUMPTION = OFF;
-	GLITCH_INTERVAL = 1NS;
-	GLITCH_DETECTION = OFF;
-	SIMULATION_COVERAGE = ON;
-	CHECK_OUTPUTS = OFF;
-	SETUP_HOLD_DETECTION = OFF;
-	POWER_ESTIMATION_START_TIME = "0 NS";
-	ADD_DEFAULT_PINS_TO_SIMULATION_OUTPUT_WAVEFORMS = ON;
-	SIMULATION_MODE = TIMING;
-	START_TIME = 0NS;
-	USE_COMPILER_SETTINGS = usrp_sounder;
-}
diff --git a/gr-sounder/src/fpga/top/usrp_sounder.psf b/gr-sounder/src/fpga/top/usrp_sounder.psf
deleted file mode 100644
index 7bd32ff59..000000000
--- a/gr-sounder/src/fpga/top/usrp_sounder.psf
+++ /dev/null
@@ -1,312 +0,0 @@
-DEFAULT_DESIGN_ASSISTANT_SETTINGS
-{
-	HCPY_ALOAD_SIGNALS = OFF;
-	HCPY_VREF_PINS = OFF;
-	HCPY_CAT = OFF;
-	HCPY_ILLEGAL_HC_DEV_PKG = OFF;
-	ACLK_RULE_IMSZER_ADOMAIN = OFF;
-	ACLK_RULE_SZER_BTW_ACLK_DOMAIN = OFF;
-	ACLK_RULE_NO_SZER_ACLK_DOMAIN = OFF;
-	ACLK_CAT = OFF;
-	SIGNALRACE_RULE_ASYNCHPIN_SYNCH_CLKPIN = OFF;
-	SIGNALRACE_CAT = OFF;
-	NONSYNCHSTRUCT_RULE_LATCH_UNIDENTIFIED = OFF;
-	NONSYNCHSTRUCT_RULE_SRLATCH = OFF;
-	NONSYNCHSTRUCT_RULE_DLATCH = OFF;
-	NONSYNCHSTRUCT_RULE_MULTI_VIBRATOR = OFF;
-	NONSYNCHSTRUCT_RULE_ILLEGAL_PULSE_GEN = OFF;
-	NONSYNCHSTRUCT_RULE_RIPPLE_CLK = OFF;
-	NONSYNCHSTRUCT_RULE_DELAY_CHAIN = OFF;
-	NONSYNCHSTRUCT_RULE_REG_LOOP = OFF;
-	NONSYNCHSTRUCT_RULE_COMBLOOP = OFF;
-	NONSYNCHSTRUCT_CAT = OFF;
-	NONSYNCHSTRUCT_RULE_COMB_DRIVES_RAM_WE = OFF;
-	TIMING_RULE_COIN_CLKEDGE = OFF;
-	TIMING_RULE_SHIFT_REG = OFF;
-	TIMING_RULE_HIGH_FANOUTS = OFF;
-	TIMING_CAT = OFF;
-	RESET_RULE_ALL = OFF;
-	RESET_RULE_IMSYNCH_ASYNCH_DOMAIN = OFF;
-	RESET_RULE_UNSYNCH_ASYNCH_DOMAIN = OFF;
-	RESET_RULE_REG_ASNYCH = OFF;
-	RESET_RULE_COMB_ASYNCH_RESET = OFF;
-	RESET_RULE_IMSYNCH_EXRESET = OFF;
-	RESET_RULE_UNSYNCH_EXRESET = OFF;
-	RESET_RULE_INPINS_RESETNET = OFF;
-	RESET_CAT = OFF;
-	CLK_RULE_ALL = OFF;
-	CLK_RULE_MIX_EDGES = OFF;
-	CLK_RULE_CLKNET_CLKSPINES = OFF;
-	CLK_RULE_INPINS_CLKNET = OFF;
-	CLK_RULE_GATING_SCHEME = OFF;
-	CLK_RULE_INV_CLOCK = OFF;
-	CLK_RULE_COMB_CLOCK = OFF;
-	CLK_CAT = OFF;
-	HCPY_EXCEED_USER_IO_USAGE = OFF;
-	HCPY_EXCEED_RAM_USAGE = OFF;
-	NONSYNCHSTRUCT_RULE_ASYN_RAM = OFF;
-	SIGNALRACE_RULE_TRISTATE = OFF;
-	ASSG_RULE_MISSING_TIMING = OFF;
-	ASSG_RULE_MISSING_FMAX = OFF;
-	ASSG_CAT = OFF;
-}
-SYNTHESIS_FITTING_SETTINGS
-{
-	AUTO_SHIFT_REGISTER_RECOGNITION = ON;
-	AUTO_DSP_RECOGNITION = ON;
-	AUTO_RAM_RECOGNITION = ON;
-	REMOVE_DUPLICATE_LOGIC = ON;
-	AUTO_TURBO_BIT = ON;
-	AUTO_MERGE_PLLS = ON;
-	AUTO_OPEN_DRAIN_PINS = ON;
-	AUTO_PARALLEL_EXPANDERS = ON;
-	AUTO_FAST_OUTPUT_ENABLE_REGISTERS = OFF;
-	AUTO_FAST_OUTPUT_REGISTERS = OFF;
-	AUTO_FAST_INPUT_REGISTERS = OFF;
-	AUTO_CASCADE_CHAINS = ON;
-	AUTO_CARRY_CHAINS = ON;
-	AUTO_DELAY_CHAINS = ON;
-	MAX7000_PARALLEL_EXPANDER_CHAIN_LENGTH = 4;
-	PARALLEL_EXPANDER_CHAIN_LENGTH = 16;
-	CASCADE_CHAIN_LENGTH = 2;
-	STRATIX_CARRY_CHAIN_LENGTH = 70;
-	MERCURY_CARRY_CHAIN_LENGTH = 48;
-	FLEX10K_CARRY_CHAIN_LENGTH = 32;
-	FLEX6K_CARRY_CHAIN_LENGTH = 32;
-	CARRY_CHAIN_LENGTH = 48;
-	CARRY_OUT_PINS_LCELL_INSERT = ON;
-	NORMAL_LCELL_INSERT = ON;
-	AUTO_LCELL_INSERTION = ON;
-	ALLOW_XOR_GATE_USAGE = ON;
-	AUTO_PACKED_REGISTERS_STRATIX = NORMAL;
-	AUTO_PACKED_REGISTERS = OFF;
-	AUTO_PACKED_REG_CYCLONE = NORMAL;
-	FLEX10K_OPTIMIZATION_TECHNIQUE = AREA;
-	FLEX6K_OPTIMIZATION_TECHNIQUE = AREA;
-	MERCURY_OPTIMIZATION_TECHNIQUE = AREA;
-	APEX20K_OPTIMIZATION_TECHNIQUE = SPEED;
-	MAX7000_OPTIMIZATION_TECHNIQUE = SPEED;
-	STRATIX_OPTIMIZATION_TECHNIQUE = SPEED;
-	CYCLONE_OPTIMIZATION_TECHNIQUE = AREA;
-	FLEX10K_TECHNOLOGY_MAPPER = LUT;
-	FLEX6K_TECHNOLOGY_MAPPER = LUT;
-	MERCURY_TECHNOLOGY_MAPPER = LUT;
-	APEX20K_TECHNOLOGY_MAPPER = LUT;
-	MAX7000_TECHNOLOGY_MAPPER = "PRODUCT TERM";
-	STRATIX_TECHNOLOGY_MAPPER = LUT;
-	AUTO_IMPLEMENT_IN_ROM = OFF;
-	AUTO_GLOBAL_MEMORY_CONTROLS = OFF;
-	AUTO_GLOBAL_REGISTER_CONTROLS = ON;
-	AUTO_GLOBAL_OE = ON;
-	AUTO_GLOBAL_CLOCK = ON;
-	USE_LPM_FOR_AHDL_OPERATORS = ON;
-	LIMIT_AHDL_INTEGERS_TO_32_BITS = OFF;
-	ENABLE_BUS_HOLD_CIRCUITRY = OFF;
-	WEAK_PULL_UP_RESISTOR = OFF;
-	TURBO_BIT = ON;
-	MAX7000_IGNORE_SOFT_BUFFERS = OFF;
-	IGNORE_SOFT_BUFFERS = ON;
-	MAX7000_IGNORE_LCELL_BUFFERS = AUTO;
-	IGNORE_LCELL_BUFFERS = OFF;
-	IGNORE_ROW_GLOBAL_BUFFERS = OFF;
-	IGNORE_GLOBAL_BUFFERS = OFF;
-	IGNORE_CASCADE_BUFFERS = OFF;
-	IGNORE_CARRY_BUFFERS = OFF;
-	REMOVE_DUPLICATE_REGISTERS = ON;
-	REMOVE_REDUNDANT_LOGIC_CELLS = OFF;
-	ALLOW_POWER_UP_DONT_CARE = ON;
-	PCI_IO = OFF;
-	NOT_GATE_PUSH_BACK = ON;
-	SLOW_SLEW_RATE = OFF;
-	DSP_BLOCK_BALANCING = AUTO;
-	STATE_MACHINE_PROCESSING = AUTO;
-}
-DEFAULT_HARDCOPY_SETTINGS
-{
-	HARDCOPY_EXTERNAL_CLOCK_JITTER = "0.0 NS";
-}
-DEFAULT_TIMING_REQUIREMENTS
-{
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	RUN_ALL_TIMING_ANALYSES = ON;
-	IGNORE_CLOCK_SETTINGS = OFF;
-	DEFAULT_HOLD_MULTICYCLE = "SAME AS MULTICYCLE";
-	CUT_OFF_IO_PIN_FEEDBACK = ON;
-	CUT_OFF_CLEAR_AND_PRESET_PATHS = ON;
-	CUT_OFF_READ_DURING_WRITE_PATHS = ON;
-	CUT_OFF_PATHS_BETWEEN_CLOCK_DOMAINS = ON;
-	DO_MIN_ANALYSIS = ON;
-	DO_MIN_TIMING = OFF;
-	NUMBER_OF_PATHS_TO_REPORT = 200;
-	NUMBER_OF_DESTINATION_TO_REPORT = 10;
-	NUMBER_OF_SOURCES_PER_DESTINATION_TO_REPORT = 10;
-	MAX_SCC_SIZE = 50;
-}
-HDL_SETTINGS
-{
-	VERILOG_INPUT_VERSION = VERILOG_2001;
-	ENABLE_IP_DEBUG = OFF;
-	VHDL_INPUT_VERSION = VHDL93;
-	VHDL_SHOW_LMF_MAPPING_MESSAGES = OFF;
-}
-PROJECT_INFO(usrp_sounder)
-{
-	ORIGINAL_QUARTUS_VERSION = 3.0;
-	PROJECT_CREATION_TIME_DATE = "00:14:04  JULY 13, 2003";
-	LAST_QUARTUS_VERSION = 3.0;
-	SHOW_REGISTRATION_MESSAGE = ON;
-	USER_LIBRARIES = "h:\\gnuradio\\trunk\\usrp\\fpga\\megacells";
-}
-THIRD_PARTY_EDA_TOOLS(usrp_sounder)
-{
-	EDA_DESIGN_ENTRY_SYNTHESIS_TOOL = "<NONE>";
-	EDA_SIMULATION_TOOL = "<NONE>";
-	EDA_TIMING_ANALYSIS_TOOL = "<NONE>";
-	EDA_BOARD_DESIGN_TOOL = "<NONE>";
-	EDA_FORMAL_VERIFICATION_TOOL = "<NONE>";
-	EDA_RESYNTHESIS_TOOL = "<NONE>";
-}
-EDA_TOOL_SETTINGS(eda_design_synthesis)
-{
-	EDA_INPUT_GND_NAME = GND;
-	EDA_INPUT_VCC_NAME = VCC;
-	EDA_SHOW_LMF_MAPPING_MESSAGES = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_INPUT_DATA_FORMAT = EDIF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_simulation)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_timing_analysis)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	EDA_LAUNCH_CMD_LINE_TOOL = OFF;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_board_design)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_formal_verification)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	RESYNTHESIS_RETIMING = FULL;
-}
-EDA_TOOL_SETTINGS(eda_palace)
-{
-	EDA_INCLUDE_VHDL_CONFIGURATION_DECLARATION = OFF;
-	EDA_TRUNCATE_LONG_HIERARCHY_PATHS = OFF;
-	EDA_MAINTAIN_DESIGN_HIERARCHY = OFF;
-	EDA_WRITE_DEVICE_CONTROL_PORTS = OFF;
-	EDA_GENERATE_FUNCTIONAL_NETLIST = OFF;
-	EDA_FLATTEN_BUSES = OFF;
-	EDA_MAP_ILLEGAL_CHARACTERS = OFF;
-	EDA_EXCALIBUR_ATOMS_AS_SINGLE_STRIPE = OFF;
-	EDA_RUN_TOOL_AUTOMATICALLY = OFF;
-	EDA_OUTPUT_DATA_FORMAT = NONE;
-	RESYNTHESIS_RETIMING = FULL;
-	RESYNTHESIS_PHYSICAL_SYNTHESIS = NORMAL;
-	RESYNTHESIS_OPTIMIZATION_EFFORT = NORMAL;
-	USE_GENERATED_PHYSICAL_CONSTRAINTS = ON;
-}
-CLOCK(clk_120mhz)
-{
-	FMAX_REQUIREMENT = "120.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(usbclk)
-{
-	FMAX_REQUIREMENT = "48.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(SCLK)
-{
-	FMAX_REQUIREMENT = "1.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(adclk0)
-{
-	FMAX_REQUIREMENT = "60.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
-CLOCK(adclk1)
-{
-	FMAX_REQUIREMENT = "60.0 MHz";
-	INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS = OFF;
-	DUTY_CYCLE = 50;
-	DIVIDE_BASE_CLOCK_PERIOD_BY = 1;
-	MULTIPLY_BASE_CLOCK_PERIOD_BY = 1;
-	INVERT_BASE_CLOCK = OFF;
-}
diff --git a/gr-sounder/src/fpga/top/usrp_sounder.qpf b/gr-sounder/src/fpga/top/usrp_sounder.qpf
deleted file mode 100644
index aa75e962b..000000000
--- a/gr-sounder/src/fpga/top/usrp_sounder.qpf
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 1991-2004 Altera Corporation
-# Any  megafunction  design,  and related netlist (encrypted  or  decrypted),
-# support information,  device programming or simulation file,  and any other
-# associated  documentation or information  provided by  Altera  or a partner
-# under  Altera's   Megafunction   Partnership   Program  may  be  used  only
-# to program  PLD  devices (but not masked  PLD  devices) from  Altera.   Any
-# other  use  of such  megafunction  design,  netlist,  support  information,
-# device programming or simulation file,  or any other  related documentation
-# or information  is prohibited  for  any  other purpose,  including, but not
-# limited to  modification,  reverse engineering,  de-compiling, or use  with
-# any other  silicon devices,  unless such use is  explicitly  licensed under
-# a separate agreement with  Altera  or a megafunction partner.  Title to the
-# intellectual property,  including patents,  copyrights,  trademarks,  trade
-# secrets,  or maskworks,  embodied in any such megafunction design, netlist,
-# support  information,  device programming or simulation file,  or any other
-# related documentation or information provided by  Altera  or a megafunction
-# partner, remains with Altera, the megafunction partner, or their respective
-# licensors. No other licenses, including any licenses needed under any third
-# party's intellectual property, are provided herein.
-
-
-
-QUARTUS_VERSION = "7.0"
-DATE = "09:00:00  April 17, 2007"
-
-
-# Active Revisions
-
-PROJECT_REVISION = "usrp_sounder"
diff --git a/gr-sounder/src/fpga/top/usrp_sounder.qsf b/gr-sounder/src/fpga/top/usrp_sounder.qsf
deleted file mode 100644
index 4d60f5f13..000000000
--- a/gr-sounder/src/fpga/top/usrp_sounder.qsf
+++ /dev/null
@@ -1,396 +0,0 @@
-# Copyright (C) 1991-2005 Altera Corporation

-# Your use of Altera Corporation's design tools, logic functions 

-# and other software and tools, and its AMPP partner logic       

-# functions, and any output files any of the foregoing           

-# (including device programming or simulation files), and any    

-# associated documentation or information are expressly subject  

-# to the terms and conditions of the Altera Program License      

-# Subscription Agreement, Altera MegaCore Function License       

-# Agreement, or other applicable license agreement, including,   

-# without limitation, that your use is for the sole purpose of   

-# programming logic devices manufactured by Altera and sold by   

-# Altera or its authorized distributors.  Please refer to the    

-# applicable agreement for further details.

-

-

-# The default values for assignments are stored in the file

-#		usrp_sounder_assignment_defaults.qdf

-# If this file doesn't exist, and for assignments not listed, see file

-#		assignment_defaults.qdf

-

-# Altera recommends that you do not modify this file. This

-# file is updated automatically by the Quartus II software

-# and any changes you make may be lost or overwritten.

-

-

-# Project-Wide Assignments

-# ========================

-set_global_assignment -name ORIGINAL_QUARTUS_VERSION 3.0

-set_global_assignment -name PROJECT_CREATION_TIME_DATE "00:14:04  JULY 13, 2003"

-set_global_assignment -name LAST_QUARTUS_VERSION 7.0

-

-# Pin & Location Assignments

-# ==========================

-set_global_assignment -name RESERVE_PIN "AS INPUT TRI-STATED"

-set_location_assignment PIN_29 -to SCLK

-set_location_assignment PIN_117 -to SDI

-set_location_assignment PIN_28 -to usbclk

-set_location_assignment PIN_107 -to usbctl[0]

-set_location_assignment PIN_106 -to usbctl[1]

-set_location_assignment PIN_105 -to usbctl[2]

-set_location_assignment PIN_100 -to usbdata[0]

-set_location_assignment PIN_84 -to usbdata[10]

-set_location_assignment PIN_83 -to usbdata[11]

-set_location_assignment PIN_82 -to usbdata[12]

-set_location_assignment PIN_79 -to usbdata[13]

-set_location_assignment PIN_78 -to usbdata[14]

-set_location_assignment PIN_77 -to usbdata[15]

-set_location_assignment PIN_99 -to usbdata[1]

-set_location_assignment PIN_98 -to usbdata[2]

-set_location_assignment PIN_95 -to usbdata[3]

-set_location_assignment PIN_94 -to usbdata[4]

-set_location_assignment PIN_93 -to usbdata[5]

-set_location_assignment PIN_88 -to usbdata[6]

-set_location_assignment PIN_87 -to usbdata[7]

-set_location_assignment PIN_86 -to usbdata[8]

-set_location_assignment PIN_85 -to usbdata[9]

-set_location_assignment PIN_104 -to usbrdy[0]

-set_location_assignment PIN_101 -to usbrdy[1]

-set_location_assignment PIN_76 -to FX2_1

-set_location_assignment PIN_75 -to FX2_2

-set_location_assignment PIN_74 -to FX2_3

-set_location_assignment PIN_116 -to io_rx_a[0]

-set_location_assignment PIN_115 -to io_rx_a[1]

-set_location_assignment PIN_114 -to io_rx_a[2]

-set_location_assignment PIN_113 -to io_rx_a[3]

-set_location_assignment PIN_108 -to io_rx_a[4]

-set_location_assignment PIN_195 -to io_rx_a[5]

-set_location_assignment PIN_196 -to io_rx_a[6]

-set_location_assignment PIN_197 -to io_rx_a[7]

-set_location_assignment PIN_200 -to io_rx_a[8]

-set_location_assignment PIN_201 -to io_rx_a[9]

-set_location_assignment PIN_202 -to io_rx_a[10]

-set_location_assignment PIN_203 -to io_rx_a[11]

-set_location_assignment PIN_206 -to io_rx_a[12]

-set_location_assignment PIN_207 -to io_rx_a[13]

-set_location_assignment PIN_208 -to io_rx_a[14]

-set_location_assignment PIN_214 -to io_rx_b[0]

-set_location_assignment PIN_215 -to io_rx_b[1]

-set_location_assignment PIN_216 -to io_rx_b[2]

-set_location_assignment PIN_217 -to io_rx_b[3]

-set_location_assignment PIN_218 -to io_rx_b[4]

-set_location_assignment PIN_219 -to io_rx_b[5]

-set_location_assignment PIN_222 -to io_rx_b[6]

-set_location_assignment PIN_223 -to io_rx_b[7]

-set_location_assignment PIN_224 -to io_rx_b[8]

-set_location_assignment PIN_225 -to io_rx_b[9]

-set_location_assignment PIN_226 -to io_rx_b[10]

-set_location_assignment PIN_227 -to io_rx_b[11]

-set_location_assignment PIN_228 -to io_rx_b[12]

-set_location_assignment PIN_233 -to io_rx_b[13]

-set_location_assignment PIN_234 -to io_rx_b[14]

-set_location_assignment PIN_175 -to io_tx_a[0]

-set_location_assignment PIN_176 -to io_tx_a[1]

-set_location_assignment PIN_177 -to io_tx_a[2]

-set_location_assignment PIN_178 -to io_tx_a[3]

-set_location_assignment PIN_179 -to io_tx_a[4]

-set_location_assignment PIN_180 -to io_tx_a[5]

-set_location_assignment PIN_181 -to io_tx_a[6]

-set_location_assignment PIN_182 -to io_tx_a[7]

-set_location_assignment PIN_183 -to io_tx_a[8]

-set_location_assignment PIN_184 -to io_tx_a[9]

-set_location_assignment PIN_185 -to io_tx_a[10]

-set_location_assignment PIN_186 -to io_tx_a[11]

-set_location_assignment PIN_187 -to io_tx_a[12]

-set_location_assignment PIN_188 -to io_tx_a[13]

-set_location_assignment PIN_193 -to io_tx_a[14]

-set_location_assignment PIN_73 -to io_tx_b[0]

-set_location_assignment PIN_68 -to io_tx_b[1]

-set_location_assignment PIN_67 -to io_tx_b[2]

-set_location_assignment PIN_66 -to io_tx_b[3]

-set_location_assignment PIN_65 -to io_tx_b[4]

-set_location_assignment PIN_64 -to io_tx_b[5]

-set_location_assignment PIN_63 -to io_tx_b[6]

-set_location_assignment PIN_62 -to io_tx_b[7]

-set_location_assignment PIN_61 -to io_tx_b[8]

-set_location_assignment PIN_60 -to io_tx_b[9]

-set_location_assignment PIN_59 -to io_tx_b[10]

-set_location_assignment PIN_58 -to io_tx_b[11]

-set_location_assignment PIN_57 -to io_tx_b[12]

-set_location_assignment PIN_56 -to io_tx_b[13]

-set_location_assignment PIN_55 -to io_tx_b[14]

-set_location_assignment PIN_152 -to master_clk

-set_location_assignment PIN_144 -to rx_a_a[0]

-set_location_assignment PIN_143 -to rx_a_a[1]

-set_location_assignment PIN_141 -to rx_a_a[2]

-set_location_assignment PIN_140 -to rx_a_a[3]

-set_location_assignment PIN_139 -to rx_a_a[4]

-set_location_assignment PIN_138 -to rx_a_a[5]

-set_location_assignment PIN_137 -to rx_a_a[6]

-set_location_assignment PIN_136 -to rx_a_a[7]

-set_location_assignment PIN_135 -to rx_a_a[8]

-set_location_assignment PIN_134 -to rx_a_a[9]

-set_location_assignment PIN_133 -to rx_a_a[10]

-set_location_assignment PIN_132 -to rx_a_a[11]

-set_location_assignment PIN_23 -to rx_a_b[0]

-set_location_assignment PIN_21 -to rx_a_b[1]

-set_location_assignment PIN_20 -to rx_a_b[2]

-set_location_assignment PIN_19 -to rx_a_b[3]

-set_location_assignment PIN_18 -to rx_a_b[4]

-set_location_assignment PIN_17 -to rx_a_b[5]

-set_location_assignment PIN_16 -to rx_a_b[6]

-set_location_assignment PIN_15 -to rx_a_b[7]

-set_location_assignment PIN_14 -to rx_a_b[8]

-set_location_assignment PIN_13 -to rx_a_b[9]

-set_location_assignment PIN_12 -to rx_a_b[10]

-set_location_assignment PIN_11 -to rx_a_b[11]

-set_location_assignment PIN_131 -to rx_b_a[0]

-set_location_assignment PIN_128 -to rx_b_a[1]

-set_location_assignment PIN_127 -to rx_b_a[2]

-set_location_assignment PIN_126 -to rx_b_a[3]

-set_location_assignment PIN_125 -to rx_b_a[4]

-set_location_assignment PIN_124 -to rx_b_a[5]

-set_location_assignment PIN_123 -to rx_b_a[6]

-set_location_assignment PIN_122 -to rx_b_a[7]

-set_location_assignment PIN_121 -to rx_b_a[8]

-set_location_assignment PIN_120 -to rx_b_a[9]

-set_location_assignment PIN_119 -to rx_b_a[10]

-set_location_assignment PIN_118 -to rx_b_a[11]

-set_location_assignment PIN_8 -to rx_b_b[0]

-set_location_assignment PIN_7 -to rx_b_b[1]

-set_location_assignment PIN_6 -to rx_b_b[2]

-set_location_assignment PIN_5 -to rx_b_b[3]

-set_location_assignment PIN_4 -to rx_b_b[4]

-set_location_assignment PIN_3 -to rx_b_b[5]

-set_location_assignment PIN_2 -to rx_b_b[6]

-set_location_assignment PIN_240 -to rx_b_b[7]

-set_location_assignment PIN_239 -to rx_b_b[8]

-set_location_assignment PIN_238 -to rx_b_b[9]

-set_location_assignment PIN_237 -to rx_b_b[10]

-set_location_assignment PIN_236 -to rx_b_b[11]

-set_location_assignment PIN_156 -to SDO

-set_location_assignment PIN_153 -to SEN_FPGA

-set_location_assignment PIN_159 -to tx_a[0]

-set_location_assignment PIN_160 -to tx_a[1]

-set_location_assignment PIN_161 -to tx_a[2]

-set_location_assignment PIN_162 -to tx_a[3]

-set_location_assignment PIN_163 -to tx_a[4]

-set_location_assignment PIN_164 -to tx_a[5]

-set_location_assignment PIN_165 -to tx_a[6]

-set_location_assignment PIN_166 -to tx_a[7]

-set_location_assignment PIN_167 -to tx_a[8]

-set_location_assignment PIN_168 -to tx_a[9]

-set_location_assignment PIN_169 -to tx_a[10]

-set_location_assignment PIN_170 -to tx_a[11]

-set_location_assignment PIN_173 -to tx_a[12]

-set_location_assignment PIN_174 -to tx_a[13]

-set_location_assignment PIN_38 -to tx_b[0]

-set_location_assignment PIN_39 -to tx_b[1]

-set_location_assignment PIN_41 -to tx_b[2]

-set_location_assignment PIN_42 -to tx_b[3]

-set_location_assignment PIN_43 -to tx_b[4]

-set_location_assignment PIN_44 -to tx_b[5]

-set_location_assignment PIN_45 -to tx_b[6]

-set_location_assignment PIN_46 -to tx_b[7]

-set_location_assignment PIN_47 -to tx_b[8]

-set_location_assignment PIN_48 -to tx_b[9]

-set_location_assignment PIN_49 -to tx_b[10]

-set_location_assignment PIN_50 -to tx_b[11]

-set_location_assignment PIN_53 -to tx_b[12]

-set_location_assignment PIN_54 -to tx_b[13]

-set_location_assignment PIN_158 -to TXSYNC_A

-set_location_assignment PIN_37 -to TXSYNC_B

-set_location_assignment PIN_235 -to io_rx_b[15]

-set_location_assignment PIN_24 -to io_tx_b[15]

-set_location_assignment PIN_213 -to io_rx_a[15]

-set_location_assignment PIN_194 -to io_tx_a[15]

-set_location_assignment PIN_1 -to MYSTERY_SIGNAL

-

-# Timing Assignments

-# ==================

-set_global_assignment -name INCLUDE_EXTERNAL_PIN_DELAYS_IN_FMAX_CALCULATIONS OFF

-

-# Analysis & Synthesis Assignments

-# ================================

-set_global_assignment -name SAVE_DISK_SPACE OFF

-set_global_assignment -name DEVICE_FILTER_PACKAGE "ANY QFP"

-set_global_assignment -name DEVICE_FILTER_PIN_COUNT 240

-set_global_assignment -name EDA_DESIGN_ENTRY_SYNTHESIS_TOOL "<None>"

-set_global_assignment -name FAMILY Cyclone

-set_global_assignment -name CYCLONE_OPTIMIZATION_TECHNIQUE BALANCED

-set_global_assignment -name STRATIX_OPTIMIZATION_TECHNIQUE SPEED

-set_global_assignment -name APEX20K_OPTIMIZATION_TECHNIQUE SPEED

-set_global_assignment -name TOP_LEVEL_ENTITY usrp_sounder

-set_global_assignment -name VHDL_SHOW_LMF_MAPPING_MESSAGES OFF

-set_global_assignment -name USER_LIBRARIES "h:\\gnuradio\\trunk\\usrp\\fpga\\megacells"

-set_global_assignment -name AUTO_ENABLE_SMART_COMPILE ON

-

-# Fitter Assignments

-# ==================

-set_global_assignment -name DEVICE EP1C12Q240C8

-set_global_assignment -name CYCLONE_CONFIGURATION_SCHEME "PASSIVE SERIAL"

-set_global_assignment -name RESERVE_ALL_UNUSED_PINS "AS INPUT TRI-STATED"

-set_global_assignment -name OPTIMIZE_HOLD_TIMING OFF

-set_global_assignment -name OPTIMIZE_TIMING "NORMAL COMPILATION"

-set_global_assignment -name PHYSICAL_SYNTHESIS_COMBO_LOGIC OFF

-set_global_assignment -name PHYSICAL_SYNTHESIS_REGISTER_DUPLICATION OFF

-set_global_assignment -name PHYSICAL_SYNTHESIS_REGISTER_RETIMING OFF

-set_global_assignment -name IO_PLACEMENT_OPTIMIZATION OFF

-set_global_assignment -name PHYSICAL_SYNTHESIS_EFFORT EXTRA

-set_global_assignment -name INC_PLC_MODE OFF

-set_global_assignment -name ROUTING_BACK_ANNOTATION_MODE OFF

-set_instance_assignment -name IO_STANDARD LVTTL -to usbdata[12]

-set_global_assignment -name STRATIX_DEVICE_IO_STANDARD LVTTL

-set_global_assignment -name ERROR_CHECK_FREQUENCY_DIVISOR 1

-

-# Timing Analysis Assignments

-# ===========================

-set_global_assignment -name MAX_SCC_SIZE 50

-

-# EDA Netlist Writer Assignments

-# ==============================

-set_global_assignment -name EDA_SIMULATION_TOOL "<None>"

-set_global_assignment -name EDA_TIMING_ANALYSIS_TOOL "<NONE>"

-set_global_assignment -name EDA_BOARD_DESIGN_TOOL "<NONE>"

-set_global_assignment -name EDA_FORMAL_VERIFICATION_TOOL "<NONE>"

-set_global_assignment -name EDA_RESYNTHESIS_TOOL "<NONE>"

-

-# Assembler Assignments

-# =====================

-set_global_assignment -name USE_CONFIGURATION_DEVICE OFF

-set_global_assignment -name GENERATE_RBF_FILE ON

-set_global_assignment -name RESERVE_ALL_UNUSED_PINS_NO_OUTPUT_GND "AS INPUT TRI-STATED"

-set_global_assignment -name AUTO_RESTART_CONFIGURATION OFF

-

-# Simulator Assignments

-# =====================

-set_global_assignment -name START_TIME "0 ns"

-set_global_assignment -name GLITCH_INTERVAL "1 ns"

-

-# Design Assistant Assignments

-# ============================

-set_global_assignment -name DRC_REPORT_TOP_FANOUT OFF

-set_global_assignment -name DRC_REPORT_FANOUT_EXCEEDING OFF

-set_global_assignment -name ASSG_CAT OFF

-set_global_assignment -name ASSG_RULE_MISSING_FMAX OFF

-set_global_assignment -name ASSG_RULE_MISSING_TIMING OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_ASYN_RAM OFF

-set_global_assignment -name CLK_CAT OFF

-set_global_assignment -name CLK_RULE_COMB_CLOCK OFF

-set_global_assignment -name CLK_RULE_INV_CLOCK OFF

-set_global_assignment -name CLK_RULE_GATING_SCHEME OFF

-set_global_assignment -name CLK_RULE_INPINS_CLKNET OFF

-set_global_assignment -name CLK_RULE_CLKNET_CLKSPINES OFF

-set_global_assignment -name CLK_RULE_MIX_EDGES OFF

-set_global_assignment -name RESET_CAT OFF

-set_global_assignment -name RESET_RULE_INPINS_RESETNET OFF

-set_global_assignment -name RESET_RULE_UNSYNCH_EXRESET OFF

-set_global_assignment -name RESET_RULE_IMSYNCH_EXRESET OFF

-set_global_assignment -name RESET_RULE_COMB_ASYNCH_RESET OFF

-set_global_assignment -name RESET_RULE_UNSYNCH_ASYNCH_DOMAIN OFF

-set_global_assignment -name RESET_RULE_IMSYNCH_ASYNCH_DOMAIN OFF

-set_global_assignment -name TIMING_CAT OFF

-set_global_assignment -name TIMING_RULE_SHIFT_REG OFF

-set_global_assignment -name TIMING_RULE_COIN_CLKEDGE OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_COMB_DRIVES_RAM_WE OFF

-set_global_assignment -name NONSYNCHSTRUCT_CAT OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_COMBLOOP OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_REG_LOOP OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_DELAY_CHAIN OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_RIPPLE_CLK OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_ILLEGAL_PULSE_GEN OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_MULTI_VIBRATOR OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_SRLATCH OFF

-set_global_assignment -name NONSYNCHSTRUCT_RULE_LATCH_UNIDENTIFIED OFF

-set_global_assignment -name SIGNALRACE_CAT OFF

-set_global_assignment -name ACLK_CAT OFF

-set_global_assignment -name ACLK_RULE_NO_SZER_ACLK_DOMAIN OFF

-set_global_assignment -name ACLK_RULE_SZER_BTW_ACLK_DOMAIN OFF

-set_global_assignment -name ACLK_RULE_IMSZER_ADOMAIN OFF

-set_global_assignment -name HCPY_CAT OFF

-set_global_assignment -name HCPY_VREF_PINS OFF

-

-# SignalTap II Assignments

-# ========================

-set_global_assignment -name HUB_ENTITY_NAME SLD_HUB

-set_global_assignment -name HUB_INSTANCE_NAME SLD_HUB_INST

-set_global_assignment -name ENABLE_SIGNALTAP OFF

-

-# LogicLock Region Assignments

-# ============================

-set_global_assignment -name LOGICLOCK_INCREMENTAL_COMPILE_ASSIGNMENT OFF

-

-# -----------------

-# start CLOCK(SCLK)

-

-	# Timing Assignments

-	# ==================

-set_global_assignment -name DUTY_CYCLE 50 -section_id SCLK

-set_global_assignment -name FMAX_REQUIREMENT "1 MHz" -section_id SCLK

-

-# end CLOCK(SCLK)

-# ---------------

-

-# -----------------------

-# start CLOCK(master_clk)

-

-	# Timing Assignments

-	# ==================

-set_global_assignment -name DUTY_CYCLE 50 -section_id master_clk

-set_global_assignment -name FMAX_REQUIREMENT "64 MHz" -section_id master_clk

-

-# end CLOCK(master_clk)

-# ---------------------

-

-# -------------------

-# start CLOCK(usbclk)

-

-	# Timing Assignments

-	# ==================

-set_global_assignment -name DUTY_CYCLE 50 -section_id usbclk

-set_global_assignment -name FMAX_REQUIREMENT "48 MHz" -section_id usbclk

-

-# end CLOCK(usbclk)

-# -----------------

-

-# ----------------------

-# start ENTITY(usrp_sounder)

-

-	# Timing Assignments

-	# ==================

-set_instance_assignment -name CLOCK_SETTINGS SCLK -to SCLK

-set_instance_assignment -name CLOCK_SETTINGS usbclk -to usbclk

-set_instance_assignment -name CLOCK_SETTINGS master_clk -to master_clk

-

-# end ENTITY(usrp_sounder)

-# --------------------

-

-set_instance_assignment -name PARTITION_HIERARCHY no_file_for_top_partition -to | -section_id Top

-set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top

-

-set_global_assignment -name PHYSICAL_SYNTHESIS_ASYNCHRONOUS_SIGNAL_PIPELINING OFF

-set_global_assignment -name FITTER_EARLY_TIMING_ESTIMATE_MODE REALISTIC

-set_global_assignment -name VERILOG_FILE ../lib/lfsr_constants.v

-set_global_assignment -name VERILOG_FILE ../lib/lfsr.v

-set_global_assignment -name VERILOG_FILE ../lib/dac_interface.v

-set_global_assignment -name VERILOG_FILE ../lib/dacpll.v

-set_global_assignment -name VERILOG_FILE ../lib/sounder_rx.v

-set_global_assignment -name VERILOG_FILE ../lib/sounder_tx.v

-set_global_assignment -name VERILOG_FILE ../lib/sounder_ctrl.v

-set_global_assignment -name VERILOG_FILE ../lib/sounder.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/atr_delay.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/sign_extend.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rx_buffer.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/setting_reg.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/strobe_gen.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/clk_divider.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/bidir_reg.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/adc_interface.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/gen_sync.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/io_pins.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/master_control.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rssi.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/rx_dcoffset.v

-set_global_assignment -name VERILOG_FILE ../../../../usrp/fpga/sdr_lib/serial_io.v

-set_global_assignment -name VERILOG_FILE usrp_sounder.v

-set_global_assignment -name FITTER_EFFORT "STANDARD FIT"
\ No newline at end of file
diff --git a/gr-sounder/src/fpga/top/usrp_sounder.rbf b/gr-sounder/src/fpga/top/usrp_sounder.rbf
deleted file mode 100755
index e2c9db6c4..000000000
--- a/gr-sounder/src/fpga/top/usrp_sounder.rbf
+++ /dev/null
diff --git a/gr-sounder/src/fpga/top/usrp_sounder.v b/gr-sounder/src/fpga/top/usrp_sounder.v
deleted file mode 100644
index a88b2388e..000000000
--- a/gr-sounder/src/fpga/top/usrp_sounder.v
+++ /dev/null
@@ -1,198 +0,0 @@
-// -*- verilog -*-
-//
-//  USRP - Universal Software Radio Peripheral
-//
-//  Copyright (C) 2003,2004 Matt Ettus
-//  Copyright (C) 2007 Corgan Enterprises LLC
-//
-//  This program 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 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program 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 this program; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-//
-
-// Top level module for a full setup with DUCs and DDCs
-
-// Define DEBUG_OWNS_IO_PINS if we're using the daughterboard i/o pins
-// for debugging info.  NB, This can kill the m'board and/or d'board if you
-// have anything except basic d'boards installed.
-
-// Uncomment the following to include optional circuitry
-
-module usrp_sounder
-(output MYSTERY_SIGNAL,
- input master_clk,
- input SCLK,
- input SDI,
- inout SDO,
- input SEN_FPGA,
-
- input FX2_1,
- output FX2_2,
- output FX2_3,
- 
- input wire [11:0] rx_a_a,
- input wire [11:0] rx_b_a,
- input wire [11:0] rx_a_b,
- input wire [11:0] rx_b_b,
-
- output wire [13:0] tx_a,
- output wire [13:0] tx_b,
-
- output wire TXSYNC_A,
- output wire TXSYNC_B,
- 
-  // USB interface
- input usbclk,
- input wire [2:0] usbctl,
- output wire [1:0] usbrdy,
- inout [15:0] usbdata,  // NB Careful, inout
-
- // These are the general purpose i/o's that go to the daughterboard slots
- inout wire [15:0] io_tx_a,
- inout wire [15:0] io_tx_b,
- inout wire [15:0] io_rx_a,
- inout wire [15:0] io_rx_b
- );	
-   wire [15:0] debugdata,debugctrl;
-   assign MYSTERY_SIGNAL = 1'b0;
-   
-   wire clk64;
-   
-   // wire WR = usbctl[0];
-   wire RD = usbctl[1];
-   wire OE = usbctl[2];
-
-   wire have_pkt_rdy;
-   assign usbrdy[0] = 1'b0; // have_space;
-   assign usbrdy[1] = have_pkt_rdy;
-
-   wire   tx_underrun, rx_overrun;    
-   wire   clear_status = FX2_1;
-   assign FX2_2 = rx_overrun;
-   assign FX2_3 = 1'b0; // tx_underrun;
-      
-   wire [15:0] usbdata_out;
-   
-   wire [3:0]  rx_numchan;
-   wire        enable_tx, enable_rx;
-   wire        tx_dsp_reset, rx_dsp_reset, tx_bus_reset, rx_bus_reset;
-   
-   // Tri-state bus macro
-   bustri bustri( .data(usbdata_out),.enabledt(OE),.tridata(usbdata) );
-
-   assign      clk64 = master_clk;
-
-   // TX
-   wire        tx_sample_strobe;
-   wire        tx_empty;
-   
-   wire        serial_strobe;
-   wire [6:0]  serial_addr;
-   wire [31:0] serial_data;
-
-   ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Transmit Side
-   
-   wire [13:0] tx_i, tx_q;
-   wire [13:0] tx_dac;
-   
-   dac_interface dac(.clk_i(clk64),.rst_i(tx_dsp_reset),.ena_i(enable_tx),
-		     .strobe_i(tx_sample_strobe),.tx_i_i(tx_i),.tx_q_i(tx_q),
-		     .tx_data_o(tx_dac),.tx_sync_o(TXSYNC_A));
-
-   assign tx_a = tx_dac;
-
-   // Wedge DAC #2 at zero
-   assign TXSYNC_B = 1'b0;
-   assign tx_b = 14'b0;
-   
-   /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Receive Side
-   wire        rx_sample_strobe, rx_strobe;
-   wire [15:0] rx_adc0_i, rx_adc0_q;
-   wire [15:0] rx_buf_i, rx_buf_q;
-   
-   adc_interface adc_interface(.clock(clk64),.reset(rx_dsp_reset),.enable(enable_rx),
-			       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-			       .rx_a_a(rx_a_a),.rx_b_a(rx_b_a),.rx_a_b(),.rx_b_b(),
-			       .rssi_0(),.rssi_1(),.rssi_2(),.rssi_3(),
-			       .ddc0_in_i(rx_adc0_i),.ddc0_in_q(rx_adc0_q),
-			       .ddc1_in_i(),.ddc1_in_q(),
-			       .ddc2_in_i(),.ddc2_in_q(),
-			       .ddc3_in_i(),.ddc3_in_q(),.rx_numchan(rx_numchan) );
-
-   rx_buffer rx_buffer
-     ( .usbclk(usbclk),.bus_reset(rx_bus_reset),.reset(rx_dsp_reset),
-       .reset_regs(rx_dsp_reset),
-       .usbdata(usbdata_out),.RD(RD),.have_pkt_rdy(have_pkt_rdy),.rx_overrun(rx_overrun),
-       .channels(rx_numchan),
-       .ch_0(rx_buf_i),.ch_1(rx_buf_q),
-       .ch_2(),.ch_3(),
-       .ch_4(),.ch_5(),
-       .ch_6(),.ch_7(),
-       .rxclk(clk64),.rxstrobe(rx_strobe),
-       .clear_status(clear_status),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .debugbus() );
-   
-
-   ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Top level application
-
-   sounder sounder
-     ( .clk_i(clk64),.saddr_i(serial_addr),.sdata_i(serial_data),.s_strobe_i(serial_strobe),
-       .tx_strobe_o(tx_sample_strobe),.tx_dac_i_o(tx_i),.tx_dac_q_o(tx_q),
-       .rx_adc_i_i(rx_adc0_i),.rx_adc_q_i(rx_adc0_q),
-       .rx_strobe_o(rx_strobe),.rx_imp_i_o(rx_buf_i),.rx_imp_q_o(rx_buf_q)
-       );
-
-   
-   ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // Control Functions
-
-   wire [31:0] capabilities;
-   assign capabilities[7]   = 0;  // `TX_CAP_HB;
-   assign capabilities[6:4] = 2;  // `TX_CAP_NCHAN;
-   assign capabilities[3]   = 0;  // `RX_CAP_HB;
-   assign capabilities[2:0] = 2;  // `RX_CAP_NCHAN;
-
-   serial_io serial_io
-     ( .master_clk(clk64),.serial_clock(SCLK),.serial_data_in(SDI),
-       .enable(SEN_FPGA),.reset(1'b0),.serial_data_out(SDO),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .readback_0({io_rx_a,io_tx_a}),.readback_1({io_rx_b,io_tx_b}),.readback_2(capabilities),.readback_3(32'hf0f0931a),
-       .readback_4(),.readback_5(),.readback_6(),.readback_7()
-       );
-
-   wire [15:0] reg_0,reg_1,reg_2,reg_3;
-   master_control master_control
-     ( .master_clk(clk64),.usbclk(usbclk),
-       .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe),
-       .tx_bus_reset(tx_bus_reset),.rx_bus_reset(rx_bus_reset),
-       .tx_dsp_reset(tx_dsp_reset),.rx_dsp_reset(rx_dsp_reset),
-       .enable_tx(enable_tx),.enable_rx(enable_rx),
-       .interp_rate(),.decim_rate(),
-       .tx_sample_strobe(),.strobe_interp(),
-       .rx_sample_strobe(rx_sample_strobe),.strobe_decim(),
-       .tx_empty(tx_empty),
-       .debug_0(),.debug_1(),
-       .debug_2(),.debug_3(),
-       .reg_0(reg_0),.reg_1(reg_1),.reg_2(reg_2),.reg_3(reg_3) );
-   
-   io_pins io_pins
-     (.io_0(io_tx_a),.io_1(io_rx_a),.io_2(io_tx_b),.io_3(io_rx_b),
-      .reg_0(reg_0),.reg_1(reg_1),.reg_2(reg_2),.reg_3(reg_3),
-      .clock(clk64),.rx_reset(rx_dsp_reset),.tx_reset(tx_dsp_reset),
-      .serial_addr(serial_addr),.serial_data(serial_data),.serial_strobe(serial_strobe));
-   
-endmodule // usrp_sounder
diff --git a/gr-sounder/src/lib/.gitignore b/gr-sounder/src/lib/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-sounder/src/lib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-sounder/src/lib/Makefile.am b/gr-sounder/src/lib/Makefile.am
deleted file mode 100644
index 4f35e3aef..000000000
--- a/gr-sounder/src/lib/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright 2007 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.
-# 
-
-include $(top_srcdir)/Makefile.common
diff --git a/gr-sounder/src/python/.gitignore b/gr-sounder/src/python/.gitignore
deleted file mode 100644
index 8ac573ba1..000000000
--- a/gr-sounder/src/python/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Makefile
-/Makefile.in
-/run_tests
-/*.pyc
-/loopback.dat
diff --git a/gr-sounder/src/python/Makefile.am b/gr-sounder/src/python/Makefile.am
deleted file mode 100644
index 1d9b25254..000000000
--- a/gr-sounder/src/python/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright 2007,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# Install this stuff so that it ends up as the gnuradio.sounder module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-
-sounder_pythondir = $(grpythondir)
-
-EXTRA_DIST += 		\
-	sounder_loopback.sh \
-	qa_nothing.py	\
-	run_tests.in
-
-dist_bin_SCRIPTS = 		\
-	usrp_sounder.py
-
-sounder_python_PYTHON =	\
-	sounder.py
diff --git a/gr-sounder/src/python/qa_nothing.py b/gr-sounder/src/python/qa_nothing.py
deleted file mode 100644
index e69de29bb..000000000
--- a/gr-sounder/src/python/qa_nothing.py
+++ /dev/null
diff --git a/gr-sounder/src/python/sounder.py b/gr-sounder/src/python/sounder.py
deleted file mode 100644
index 85c03b0e1..000000000
--- a/gr-sounder/src/python/sounder.py
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 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.
-# 
-
-from gnuradio import gr, usrp
-from gnuradio import eng_notation
-
-n2s = eng_notation.num_to_str
-
-FR_MODE = usrp.FR_USER_0
-bmFR_MODE_RESET = 1 << 0	# bit 0: active high reset
-bmFR_MODE_TX    = 1 << 1	# bit 1: enable transmitter
-bmFR_MODE_RX    = 1 << 2	# bit 2: enable receiver
-bmFR_MODE_LP    = 1 << 3	# bit 3: enable digital loopback
-
-FR_DEGREE = usrp.FR_USER_1
-FR_AMPL = usrp.FR_USER_2
-
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    If there's a daughterboard on A, select A.
-    If there's a daughterboard on B, select B.
-    Otherwise, select A.
-    """
-    if u.db[0][0].dbid() >= 0:       # dbid is < 0 if there's no d'board or a problem
-        return (0, 0)
-    if u.db[1][0].dbid() >= 0:
-        return (1, 0)
-    return (0, 0)
-
-class sounder_tx:
-    def __init__(self, loopback=False,ampl=4096,verbose=False,debug=False):
-	self._loopback=loopback
-        self._amplitude = ampl
-	self._verbose = verbose
-	self._debug = debug
-        self._u = usrp.sink_s(fpga_filename='usrp_sounder.rbf')
-	if not self._loopback:
-            self._subdev_spec = usrp.pick_tx_subdevice(self._u)
-            self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
-            if self._verbose:
-                print "Using", self._subdev.name(), "for sounder transmitter."            
-        self.set_amplitude(ampl)
-	if not self._loopback:
-          self._subdev.set_lo_offset(0.0)
-        self._u.start()
-	if not self._loopback:
-	  self._subdev.set_enable(True)
-	    
-    def tune(self, frequency):
-        if self._verbose:
-            print "Setting transmitter frequency to", n2s(frequency)
-        result = self._u.tune(0, self._subdev, frequency)
-        if result == False:
-            raise RuntimeError("Failed to set transmitter frequency.")
-
-    def set_amplitude(self, ampl):
-	self._amplitude = ampl
-        if self._debug:
-            print "Writing amplitude register with:", hex(self._mode)
-        self._u._write_fpga_reg(FR_AMPL, self._amplitude)
-
-class sounder_rx:
-    def __init__(self,subdev_spec=None,gain=None,length=1,alpha=1.0,msgq=None,loopback=False,verbose=False,debug=False):
-	self._subdev_spec = subdev_spec
-        self._gain = gain
-        self._length = length
-        self._alpha = alpha
-        self._msgq = msgq
-	self._loopback = loopback
-	self._verbose = verbose
-	self._debug = debug
-		
-        self._tb = gr.top_block()
-        self._u = usrp.source_c(fpga_filename='usrp_sounder.rbf')
-	if not self._loopback:
-            if self._subdev_spec == None:
-                self._subdev_spec = pick_subdevice(self._u)
-            self._u.set_mux(usrp.determine_rx_mux_value(self._u, self._subdev_spec))
-            self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
-            if self._verbose:
-	        print "Using", self._subdev.name(), "for sounder receiver."
-
-        self.set_gain(self._gain)
-        self._vblen = gr.sizeof_gr_complex*self._length
-	if self._debug:
-            print "Generating impulse vectors of length", self._length, "byte length", self._vblen
-            
-        self._s2v = gr.stream_to_vector(gr.sizeof_gr_complex, self._length)
-	if self._verbose:
-	    print "Using smoothing alpha of", self._alpha
-        self._lpf = gr.single_pole_iir_filter_cc(self._alpha, self._length)
-        self._sink = gr.message_sink(self._vblen, self._msgq, True)
-        self._tb.connect(self._u, self._s2v, self._lpf, self._sink)
-
-    def tune(self, frequency):
-        if self._verbose:
-            print "Setting receiver frequency to", n2s(frequency)
-        result = self._u.tune(0, self._subdev, frequency)
-        if result == False:
-            raise RuntimeError("Failed to set receiver frequency.")
-
-    def set_gain(self, gain):
-        self._gain = gain
-	if self._loopback:
-	    return
-	    
-        if self._gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self._subdev.gain_range()
-            self._gain = float(g[0]+g[1])/2
-        if self._verbose:
-            print "Setting receiver gain to", gain
-        self._subdev.set_gain(self._gain)
-
-    def start(self):
-        if self._debug:
-            print "Starting receiver flow graph."
-        self._tb.start()
-
-    def wait(self):
-        if self._debug:
-            print "Waiting for threads..."
-        self._tb.wait()
-
-    def stop(self):
-        if self._debug:
-            print "Stopping receiver flow graph."
-        self._tb.stop()
-        self.wait()
-        if self._debug:
-            print "Receiver flow graph stopped."
-
-
-class sounder:
-    def __init__(self,transmit=False,receive=False,loopback=False,rx_subdev_spec=None,ampl=0x1FFF,
-                 frequency=0.0,rx_gain=None,degree=12,length=1,alpha=1.0,msgq=None,verbose=False,debug=False):
-        self._transmit = transmit
-        self._receive = receive
-        self._loopback = loopback
-        self._rx_subdev_spec = rx_subdev_spec
-        self._frequency = frequency
-        self._amplitude = ampl
-        self._rx_gain = rx_gain
-        self._degree = degree
-        self._length = length
-        self._alpha = alpha
-        self._msgq = msgq
-        self._verbose = verbose
-        self._debug = debug
-	self._mode = 0
-	self._u = None
-	self._trans = None
-	self._rcvr = None
-	self._transmitting = False
-	self._receiving = False
-		
-	if self._transmit:
-	    self._trans = sounder_tx(loopback=self._loopback,ampl=self._amplitude,
-                                     verbose=self._verbose)
-            self._u = self._trans._u
-            
-	if self._receive:
-            self._rcvr = sounder_rx(subdev_spec=self._rx_subdev_spec,length=self._length,
-                                    gain=self._rx_gain,alpha=self._alpha,msgq=self._msgq,
-                                    loopback=self._loopback,verbose=self._verbose, 
-				    debug=self._debug)
-	    self._u = self._rcvr._u # either receiver or transmitter object will do
-	
-	self.set_reset(True)
-        if self._loopback == False:
-            self.tune(self._frequency)
-	self.set_degree(self._degree)
-	self.set_loopback(self._loopback)	
-	self.set_reset(False)
-		
-    def tune(self, frequency):
-        self._frequency = frequency
-	if self._rcvr:
-            self._rcvr.tune(frequency)
-	if self._trans:
-	    self._trans.tune(frequency)
-
-    def set_degree(self, degree):
-        if self._verbose:
-            print "Setting PN code degree to", degree
-        self._u._write_fpga_reg(FR_DEGREE, degree);
-	    
-    def _write_mode(self):
-        if self._debug:
-            print "Writing mode register with:", hex(self._mode)
-        self._u._write_fpga_reg(FR_MODE, self._mode)
-
-    def enable_tx(self, value):
-	if value:
-            if self._verbose:
-                print "Enabling transmitter."
-	    self._mode |= bmFR_MODE_TX
-	    self._transmitting = True
-	else:
-            if self._verbose:
-                print "Disabling transmitter."
-	    self._mode &= ~bmFR_MODE_TX
-	self._write_mode()
-		    
-    def enable_rx(self, value):
-	if value:
-	    self._mode |= bmFR_MODE_RX
-	    self._write_mode()
-	    self._rcvr.start()
-	    self._receiving = True
-	else:
-            self._rcvr.stop()
-	    self._mode &= ~bmFR_MODE_RX
-	    self._write_mode()
-	    self._receiving = False
-	        
-    def set_loopback(self, value):
-	if value:
-            if self._verbose:
-                print "Enabling digital loopback."
-	    self._mode |= bmFR_MODE_LP
-	else:
-            if self._verbose:
-                print "Disabling digital loopback."
-	    self._mode &= ~bmFR_MODE_LP
-	self._write_mode()
-
-    def set_reset(self, value):
-	if value:
-            if self._debug:
-                print "Asserting reset."
-	    self._mode |= bmFR_MODE_RESET
-	else:
-            if self._debug:
-                print "De-asserting reset."
-	    self._mode &= ~bmFR_MODE_RESET
-	self._write_mode()
-
-    def start(self):
-        if self._transmit:
-            self.enable_tx(True)
-        if self._receive:
-            self.enable_rx(True)
-
-    def __del__(self):
-	if self._transmitting:
-	    self.enable_tx(False)
-	    
-	if self._receiving:
-	    self.enable_rx(False)
-	    
diff --git a/gr-sounder/src/python/sounder_loopback.sh b/gr-sounder/src/python/sounder_loopback.sh
deleted file mode 100755
index a97a8fdcf..000000000
--- a/gr-sounder/src/python/sounder_loopback.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Note this runs the installed script, not the one in the tree
-usrp_sounder.py -r -l -t -d12 -v -F loopback.dat -D
diff --git a/gr-sounder/src/python/usrp_sounder.py b/gr-sounder/src/python/usrp_sounder.py
deleted file mode 100755
index c183ee85a..000000000
--- a/gr-sounder/src/python/usrp_sounder.py
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 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.
-# 
-
-from gnuradio import gr
-from gnuradio.sounder import sounder
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import numpy
-import sys
-
-n2s = eng_notation.num_to_str
-
-def main():
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=(0, 0),
-                      help="select USRP Rx side A or B")
-    parser.add_option("-g", "--gain", type="eng_float", default=None,
-                      help="set gain in dB (default is midpoint)")
-    parser.add_option("-f", "--frequency", type="eng_float", default=0.0,
-                      help="set frequency to FREQ in Hz, default is %default", metavar="FREQ")
-    parser.add_option("-d", "--degree", type="int", default=12,
-                      help="set sounding sequence degree (2-12), default is %default,")
-    parser.add_option("-a", "--amplitude", type="int", default=4096,
-                      help="set waveform amplitude, default is %default,")
-    parser.add_option("-t", "--transmit", action="store_true", default=False,
-                      help="enable sounding transmitter")
-    parser.add_option("-r", "--receive", action="store_true", default=False,
-                      help="enable sounding receiver")
-    parser.add_option("-l", "--loopback", action="store_true", default=False,
-                      help="enable digital loopback, default is disabled")
-    parser.add_option("-v", "--verbose", action="store_true", default=False,
-                      help="enable verbose output, default is disabled")
-    parser.add_option("-D", "--debug", action="store_true", default=False,
-                      help="enable debugging output, default is disabled")
-    parser.add_option("-F", "--filename", default=None,
-		      help="log received impulse responses to file")
-    parser.add_option("", "--alpha", type="eng_float", default=1.0,
-		      help="smoothing factor (0.0-1.0), default is %default (none)")
-		      
-    (options, args) = parser.parse_args()
-
-    if len(args) != 0 or not (options.transmit | options.receive):
-        parser.print_help()
-        sys.exit(1)
-
-    if options.receive and (options.filename == None):
-	print "Must supply filename when receiving."
-	sys.exit(1)
-
-    if options.degree > 12 or options.degree < 2:
-	print "PN code degree must be between 2 and 12"
-	sys.exit(1)
-
-    length = int(2**options.degree-1)
-    if options.verbose:
-        print "Using PN code degree of", options.degree, "length", length
-	if options.loopback == False:
-            print "Sounding frequency range is", n2s(options.frequency-16e6), "to", n2s(options.frequency+16e6)
-	if options.filename != None:
-	    print "Logging impulse records to file: ", options.filename
-	    
-    msgq = gr.msg_queue()
-    s = sounder(transmit=options.transmit,receive=options.receive,
-                loopback=options.loopback,rx_subdev_spec=options.rx_subdev_spec,
-                frequency=options.frequency,rx_gain=options.gain,
-                degree=options.degree,length=length,alpha=options.alpha,
-                msgq=msgq,verbose=options.verbose,ampl=options.amplitude,
-                debug=options.debug)
-    s.start()
-
-    if options.receive:
-	f = open(options.filename, "wb")
-	print "Enter CTRL-C to stop."
-        try:
-            while (1):
-                msg = msgq.delete_head()
-		if msg.type() == 1:
-		    break
-		rec = msg.to_string()[:length*gr.sizeof_gr_complex]
-		if options.debug:
-		    print "Received impulse vector of length", len(rec)
-
-		f.write(rec)
-		
-        except KeyboardInterrupt:
-            pass
-    else:
-        if options.transmit:
-            raw_input("Press return to exit.")
-        
-if __name__ == "__main__":
-    main()
diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt
new file mode 100644
index 000000000..dc077571c
--- /dev/null
+++ b/gr-trellis/CMakeLists.txt
@@ -0,0 +1,117 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-trellis" ENABLE_GR_TRELLIS
+    Boost_FOUND
+    ENABLE_GR_CORE
+    ENABLE_GR_DIGITAL
+)
+
+GR_SET_GLOBAL(GR_TRELLIS_INCLUDE_DIRS
+    ${CMAKE_CURRENT_BINARY_DIR}/src/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_TRELLIS)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_TRELLIS_DESCRIPTION "GNU Radio Trellis Blocks")
+
+CPACK_COMPONENT("trellis_docs"
+    GROUP        "Trellis"
+    DISPLAY_NAME "Documentation"
+    DESCRIPTION  "Doxygen HTML and XML"
+)
+
+CPACK_COMPONENT("trellis_runtime"
+    GROUP        "Trellis"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Dynamic link libraries"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("trellis_devel"
+    GROUP        "Trellis"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("trellis_python"
+    GROUP        "Trellis"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime"
+    DEPENDS      "core_python;trellis_runtime"
+)
+
+CPACK_COMPONENT("trellis_examples"
+    GROUP        "Trellis"
+    DISPLAY_NAME "Examples"
+    DESCRIPTION  "Python examples for trellis"
+    DEPENDS      "trellis_python"
+)
+
+CPACK_COMPONENT("trellis_swig"
+    GROUP        "Trellis"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;trellis_python;trellis_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(src/lib)
+add_subdirectory(doc)
+if(ENABLE_PYTHON)
+    add_subdirectory(grc)
+    add_subdirectory(src/python)
+    add_subdirectory(src/examples)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-trellis.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "trellis_devel"
+)
+
+endif(ENABLE_GR_TRELLIS)
diff --git a/gr-trellis/doc/CMakeLists.txt b/gr-trellis/doc/CMakeLists.txt
new file mode 100644
index 000000000..a45202861
--- /dev/null
+++ b/gr-trellis/doc/CMakeLists.txt
@@ -0,0 +1,73 @@
+# 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.
+
+include(GrPython)
+
+########################################################################
+# Generate HTML doc with xmlto
+########################################################################
+find_program(XMLTO_EXECUTABLE xmlto)
+
+if(XMLTO_EXECUTABLE)
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gr-trellis.xml
+    COMMAND ${XMLTO_EXECUTABLE} html-nochunks
+        ${CMAKE_CURRENT_SOURCE_DIR}/gr-trellis.xml
+)
+add_custom_target(gr_trellis_html ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html)
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html
+    DESTINATION ${GR_PKG_DOC_DIR}/html
+    COMPONENT "trellis_docs"
+
+)
+endif(XMLTO_EXECUTABLE)
+
+########################################################################
+# Generate xml doc
+########################################################################
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/test_tcm.py
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/make_numbered_listing.py
+    COMMAND ${PYTHON_EXECUTABLE}
+        ${CMAKE_CURRENT_SOURCE_DIR}/make_numbered_listing.py
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_tcm.py
+)
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/test_viterbi_equalization1.py
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/make_numbered_listing.py
+    COMMAND ${PYTHON_EXECUTABLE}
+        ${CMAKE_CURRENT_SOURCE_DIR}/make_numbered_listing.py
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_viterbi_equalization1.py
+)
+
+add_custom_target(gr_trellis_xml ALL DEPENDS
+    ${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml
+    ${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml
+)
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml
+    ${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml
+    DESTINATION ${GR_PKG_DOC_DIR}/xml
+    COMPONENT "trellis_docs"
+)
diff --git a/gr-trellis/grc/CMakeLists.txt b/gr-trellis/grc/CMakeLists.txt
new file mode 100644
index 000000000..d60d64872
--- /dev/null
+++ b/gr-trellis/grc/CMakeLists.txt
@@ -0,0 +1,36 @@
+# 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.
+
+install(FILES
+    trellis_encoder_xx.xml
+    trellis_siso_combined_f.xml
+    trellis_viterbi_x.xml
+    trellis_metrics_x.xml
+    trellis_siso_f.xml
+    trellis_permutation.xml
+    trellis_viterbi_combined_xx.xml
+    trellis_sccc_encoder_xx.xml
+    trellis_sccc_decoder_x.xml
+    trellis_sccc_decoder_combined_xx.xml
+    trellis_pccc_encoder_xx.xml
+    trellis_pccc_decoder_x.xml
+    trellis_pccc_decoder_combined_xx.xml
+    DESTINATION ${GRC_BLOCKS_DIR}
+    COMPONENT "trellis_python"
+)
diff --git a/gr-trellis/src/examples/CMakeLists.txt b/gr-trellis/src/examples/CMakeLists.txt
new file mode 100644
index 000000000..0d9589908
--- /dev/null
+++ b/gr-trellis/src/examples/CMakeLists.txt
@@ -0,0 +1,64 @@
+# 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.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    fsm_utils.py
+    test_tcm.py
+    test_tcm_parallel.py
+    test_tcm_combined.py
+    test_sccc_hard.py
+    test_sccc_soft.py
+    test_sccc_turbo.py
+    test_viterbi_equalization1.py
+    test_viterbi_equalization.py
+    test_turbo_equalization.py
+    test_turbo_equalization1.py
+    test_turbo_equalization2.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/trellis
+    COMPONENT "trellis_examples"
+)
+
+install(
+    FILES README
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/trellis
+    COMPONENT "trellis_examples"
+)
+
+install(
+    FILES
+    fsm_files/awgn1o2_128.fsm
+    fsm_files/awgn1o2_16.fsm
+    fsm_files/awgn1o2_4.fsm
+    fsm_files/awgn1o2_8.fsm
+    fsm_files/awgn2o3_16.fsm
+    fsm_files/awgn2o3_4.fsm
+    fsm_files/awgn2o3_4_msb.fsm
+    fsm_files/awgn2o3_4_msbG.fsm
+    fsm_files/awgn2o3_8.fsm
+    fsm_files/awgn2o4_4.fsm
+    fsm_files/disconnected.fsm
+    fsm_files/rep3.fsm
+    fsm_files/rep5.fsm
+    fsm_files/simple.fsm
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/trellis/fsm_files
+    COMPONENT "trellis_examples"
+)
diff --git a/gr-trellis/src/lib/CMakeLists.txt b/gr-trellis/src/lib/CMakeLists.txt
new file mode 100644
index 000000000..61cc0d650
--- /dev/null
+++ b/gr-trellis/src/lib/CMakeLists.txt
@@ -0,0 +1,229 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_TRELLIS_INCLUDE_DIRS}
+    ${GR_DIGITAL_INCLUDE_DIRS}
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# generate the python helper script which calls into the build utils
+########################################################################
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
+#!${PYTHON_EXECUTABLE}
+
+import sys, os, re
+sys.path.append('${GR_CORE_PYTHONPATH}')
+sys.path.append('${CMAKE_CURRENT_SOURCE_DIR}')
+os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
+os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
+
+if __name__ == '__main__':
+    import build_utils, generate_trellis
+    root, inp = sys.argv[1:3]
+    for sig in sys.argv[3:]:
+        name = re.sub ('X+', sig, root)
+        d = generate_trellis.standard_dict(name, sig)
+        build_utils.expand_template(d, inp)
+
+")
+
+########################################################################
+# generation helper macro to generate various files from template
+########################################################################
+macro(expand_h_cc_i root)
+
+    foreach(ext h cc i)
+        #make a list of all the generated files
+        unset(expanded_files_${ext})
+        foreach(sig ${ARGN})
+            string(REGEX REPLACE "X+" ${sig} name ${root})
+            list(APPEND expanded_files_${ext} ${CMAKE_CURRENT_BINARY_DIR}/${name}.${ext})
+        endforeach(sig)
+
+        #create a command to generate the files
+        add_custom_command(
+            OUTPUT ${expanded_files_${ext}}
+            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.${ext}.t
+            COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+                ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
+                ${root} ${root}.${ext}.t ${ARGN}
+        )
+    endforeach(ext)
+
+    #make source files depends on headers to force generation
+    set_source_files_properties(${expanded_files_cc}
+        PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
+    )
+
+    #install rules for the generated cc, h, and i files
+    list(APPEND generated_trellis_sources ${expanded_files_cc})
+    list(APPEND generated_trellis_includes ${expanded_files_h})
+    list(APPEND generated_trellis_swigs ${expanded_files_i})
+
+endmacro(expand_h_cc_i)
+
+########################################################################
+# Invoke macro to generate various sources
+########################################################################
+expand_h_cc_i(trellis_encoder_XX                 bb bs bi ss si ii)
+expand_h_cc_i(trellis_sccc_encoder_XX            bb bs bi ss si ii)
+expand_h_cc_i(trellis_pccc_encoder_XX            bb bs bi ss si ii)
+expand_h_cc_i(trellis_metrics_X                  s i f c)
+expand_h_cc_i(trellis_viterbi_X                  b s i)
+expand_h_cc_i(trellis_viterbi_combined_XX        sb ss si ib is ii fb fs fi cb cs ci)
+expand_h_cc_i(trellis_sccc_decoder_X             b s i)
+expand_h_cc_i(trellis_sccc_decoder_combined_XX   fb fs fi cb cs ci)
+expand_h_cc_i(trellis_pccc_decoder_X             b s i)
+expand_h_cc_i(trellis_pccc_decoder_combined_XX   fb fs fi cb cs ci)
+
+add_custom_target(trellis_generated DEPENDS
+    ${generated_trellis_includes}
+    ${generated_trellis_swigs}
+)
+
+########################################################################
+# Create the master trellis swig include files
+########################################################################
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.py "
+import os, sys
+if __name__ == '__main__':
+    incs = sys.argv[2:]
+    h_incs = '\\n'.join(['#include<%s.h>'%(os.path.splitext(os.path.basename(inc))[0]) for inc in incs])
+    i_incs = '\\n'.join(['%%include<%s>'%(os.path.basename(inc)) for inc in incs])
+    open(sys.argv[1], 'w').write('''
+//
+// This file is machine generated.  All edits will be overwritten
+//
+
+%%{
+%s
+%%}
+
+%s
+
+'''%(h_incs, i_incs))
+")
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i
+    DEPENDS ${generated_trellis_swigs}
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+        ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.py
+        ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i
+        ${generated_trellis_swigs}
+)
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gr_trellis_sources
+    fsm.cc
+    quicksort_index.cc
+    base.cc
+    interleaver.cc
+    calc_metric.cc
+    core_algorithms.cc
+    trellis_permutation.cc
+    trellis_siso_f.cc
+    trellis_siso_combined_f.cc
+    trellis_constellation_metrics_cf.cc
+    ${generated_trellis_sources}
+)
+
+list(APPEND trellis_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+)
+
+add_library(gnuradio-trellis SHARED ${gr_trellis_sources})
+target_link_libraries(gnuradio-trellis ${trellis_libs})
+GR_LIBRARY_FOO(gnuradio-trellis RUNTIME_COMPONENT "trellis_runtime" DEVEL_COMPONENT "trellis_devel")
+
+########################################################################
+# Handle the generated sources + a few non-generated ones
+########################################################################
+install(FILES
+    ${generated_trellis_includes}
+    trellis_api.h
+    fsm.h
+    quicksort_index.h
+    base.h
+    interleaver.h
+    calc_metric.h
+    core_algorithms.h
+    trellis_permutation.h
+    siso_type.h
+    trellis_siso_f.h
+    trellis_siso_combined_f.h
+    trellis_constellation_metrics_cf.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "trellis_devel"
+)
+
+if(ENABLE_PYTHON)
+    install(FILES
+        ${generated_trellis_swigs}
+        fsm.i
+        interleaver.i
+        trellis_permutation.i
+        trellis_siso_f.i
+        trellis_siso_combined_f.i
+        trellis_constellation_metrics_cf.i
+        ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i
+        DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+        COMPONENT "trellis_swig"
+    )
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_SOURCE_DEPS ${CMAKE_CURRENT_BINARY_DIR}/trellis_generated.i)
+set(GR_SWIG_TARGET_DEPS trellis_generated trellis_generated_index)
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_TRELLIS_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GR_DIGITAL_SWIG_INCLUDE_DIRS}
+)
+set(GR_SWIG_LIBRARIES gnuradio-trellis)
+GR_SWIG_MAKE(trellis trellis.i)
+
+GR_SWIG_INSTALL(
+    TARGETS trellis
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio
+    COMPONENT "trellis_python"
+)
+
+install(
+    FILES trellis.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "trellis_swig"
+)
+
+endif(ENABLE_PYTHON)
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 8f703c92a..435a093d6 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -29,7 +29,9 @@ EXTRA_DIST += \
 	trellis.test
 
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
+	$(GR_DIGITAL_INCLUDES) \
+	$(WITH_INCLUDES)
 
 # ----------------------------------------------------------------
 # these scripts generate trellis codes from template files
@@ -80,17 +82,18 @@ EXTRA_DIST += 			\
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =			\
+        trellis_api.h				\
         fsm.h				\
         quicksort_index.h		\
         base.h				\
         interleaver.h			\
-        metric_type.h		\
         calc_metric.h		\
         core_algorithms.h		\
         trellis_permutation.h		\
         siso_type.h		\
 	trellis_siso_f.h		\
 	trellis_siso_combined_f.h	\
+	trellis_constellation_metrics_cf.h \
 	$(GENERATED_H)
 
 lib_LTLIBRARIES = libgnuradio-trellis.la
@@ -105,6 +108,7 @@ libgnuradio_trellis_la_SOURCES = 	\
         trellis_permutation.cc		\
 	trellis_siso_f.cc		\
 	trellis_siso_combined_f.cc	\
+	trellis_constellation_metrics_cf.cc \
 	$(GENERATED_CC)
 
 libgnuradio_trellis_la_LIBADD =	\
@@ -139,6 +143,7 @@ trellis_swiginclude_headers = 		\
 	trellis_permutation.i		\
 	trellis_siso_f.i		\
 	trellis_siso_combined_f.i	\
+	trellis_constellation_metrics_cf.i \
 	trellis_generated.i
 
 # Do creation and inclusion of other Makefiles last
@@ -160,6 +165,10 @@ include $(top_srcdir)/Makefile.par.gen
 
 BUILT_SOURCES += $(python_built_sources)
 
+# Location of non-standard SWIG interface files
+trellis_swig_args =    \
+	$(GR_DIGITAL_INCLUDES)
+
 if GUILE
 TESTS += run_guile_tests
 endif
diff --git a/gr-trellis/src/lib/Makefile.swig.gen b/gr-trellis/src/lib/Makefile.swig.gen
index 784c146cf..2d014b946 100644
--- a/gr-trellis/src/lib/Makefile.swig.gen
+++ b/gr-trellis/src/lib/Makefile.swig.gen
@@ -105,7 +105,7 @@ _trellis_la_CXXFLAGS =			\
 	$(trellis_la_swig_cxxflags)
 
 python/trellis.cc: trellis.py
-trellis.py: trellis.i
+trellis.py: trellis.i 
 
 # Include the python dependencies for this file
 -include python/trellis.d
diff --git a/gr-trellis/src/lib/calc_metric.h b/gr-trellis/src/lib/calc_metric.h
index d628f44e0..fd20f8d36 100644
--- a/gr-trellis/src/lib/calc_metric.h
+++ b/gr-trellis/src/lib/calc_metric.h
@@ -25,7 +25,7 @@
 
 #include <vector>
 #include <gr_complex.h>
-#include <metric_type.h>
+#include <digital_metric_type.h>
 
 
 template <class T> 
diff --git a/gr-trellis/src/lib/core_algorithms.h b/gr-trellis/src/lib/core_algorithms.h
index 0ce4f3f4e..cab7086ba 100644
--- a/gr-trellis/src/lib/core_algorithms.h
+++ b/gr-trellis/src/lib/core_algorithms.h
@@ -26,7 +26,7 @@
 #include <cmath>
 #include <vector>
 //#include <gr_complex.h>
-#include "metric_type.h"
+#include "digital_metric_type.h"
 #include "fsm.h"
 #include "interleaver.h"
 
diff --git a/gr-trellis/src/lib/fsm.cc b/gr-trellis/src/lib/fsm.cc
index 5950b56b9..71e54b05a 100644
--- a/gr-trellis/src/lib/fsm.cc
+++ b/gr-trellis/src/lib/fsm.cc
@@ -132,7 +132,7 @@ fsm::fsm(int k, int n, const std::vector<int> &G)
     for(int j=0;j<n;j++) {
       int mem = -1;
       if(G[i*n+j]!=0)
-        mem=(int)(log(G[i*n+j])/log(2.0));
+        mem=(int)(log(double(G[i*n+j]))/log(2.0));
       if(mem>max_mem_x[i])
         max_mem_x[i]=mem;
       if(mem>max_mem)
@@ -417,7 +417,7 @@ void fsm::generate_TM()
       done = find_es(s);
       attempts ++;
     }
-    if (done == false) {
+    if (done == false && d_S > 1) {
       //throw std::runtime_error ("fsm::generate_TM(): FSM appears to be disconnected\n");
       printf("fsm::generate_TM(): FSM appears to be disconnected\n");
       printf("state %d cannot be reached from all other states\n",s);
diff --git a/gr-trellis/src/lib/fsm.h b/gr-trellis/src/lib/fsm.h
index 0a90b2cd3..7dc7e0d9d 100644
--- a/gr-trellis/src/lib/fsm.h
+++ b/gr-trellis/src/lib/fsm.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2002 Free Software Foundation, Inc.
+ * Copyright 2002,2011 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -23,35 +23,119 @@
 #ifndef INCLUDED_TRELLIS_FSM_H
 #define INCLUDED_TRELLIS_FSM_H
 
+#include <trellis_api.h>
 #include <vector>
 #include <iosfwd>
 
 /*!
- * \brief  FSM class
+ * \brief  Finite State Machine Specification class.
+ *
+ * An instance of this class represents a finite state machine specification (FSMS)
+ * rather than the FSM itself.  It particular the state of the FSM
+ * is not stored within an instance of this class.
  */
-class fsm {
+class TRELLIS_API fsm {
 private:
+  // Input alphabet cardinality.
   int d_I;
+  // Number of states.
   int d_S;
+  // Output alphabet cardinality.
   int d_O;
+  // NS means Next State.
+  // next_state = d_NS[current_state * d_I + input_symbol]
   std::vector<int> d_NS;
+  // OS means Output Symbol.
+  // output_symbol = d_OS[current_state * d_I + input_symbol]          
   std::vector<int> d_OS;
+  // PS means Previous State.
   std::vector< std::vector<int> > d_PS;
+  // PI means Previous Input Symbol.
+  // d_PS[current_state][k] and d_PI[current_state][k], is a pair of the form
+  // (previous_state, previous_input_symbol) that could have produced the
+  // current state.
   std::vector< std::vector<int> > d_PI;
-  std::vector<int> d_TMi;
+  // TM means Termination matrix.
+  // d_TMl[s*d_S+es] is the shortest number of steps to get from state s to
+  // state es.
   std::vector<int> d_TMl;
+  // d_TMi[s*d_S+es] is the input symbol required to set off on the shortest
+  // path from state s to es.
+  std::vector<int> d_TMi;
   void generate_PS_PI ();
   void generate_TM ();
   bool find_es(int es);
 public:
+ /*!
+   * \brief Constructor to create an uninitialized FSMS.
+   */
   fsm();
+ /*!
+   * \brief Constructor to copy an FSMS.
+   */
   fsm(const fsm &FSM);
+ /*!
+   * \brief Constructor to to create an FSMS.
+   *
+   * \param I	        The number of possible input symbols.
+   * \param S           The number of possible FSM states.
+   * \param O           The number of possible output symbols.
+   * \param NS          A mapping from (current state, input symbol) to next state.
+   *                    next_state = NS[current_state * I + input_symbol]
+   * \param OS          A mapping from (current state, input symbol) to output symbol.
+   *                    output_symbol = OS[current_state * I + input_symbol]          
+   *
+   */
   fsm(int I, int S, int O, const std::vector<int> &NS, const std::vector<int> &OS);
+ /*!
+   * \brief Constructor to create an FSMS from file contents.
+   *
+   * \param name        filename
+   *
+   */
   fsm(const char *name);
+ /*!
+   * \brief Creates an FSMS from the generator matrix of a (n, k) binary convolutional code.
+   *
+   * \param k      ???
+   * \param n      ???
+   * \param G      ???
+   *
+   */
   fsm(int k, int n, const std::vector<int> &G);
+  /*!
+   * \brief Creates an FSMS describing ISI.
+   *
+   * \param mod_size    modulation size
+   * \param ch_length   channel length
+   *
+   */
   fsm(int mod_size, int ch_length);
+  /*!
+   * \brief Creates an FSMS describing the trellis for a CPM.
+   *
+   * \param P    ???? h=K/P (relatively prime)
+   * \param M    alphabet size
+   * \param L    pulse duration
+   *
+   * This FSM is based on the paper by B. Rimoldi
+   * "A decomposition approach to CPM", IEEE Trans. Info Theory, March 1988
+   * See also my own notes at http://www.eecs.umich.edu/~anastas/docs/cpm.pdf
+   */
   fsm(int P, int M, int L);
+  /*!
+   * \brief Creates an FSMS describing the joint trellis of two FSMs.
+   *
+   * \param FSM1  first FSMS
+   * \param FSM2  second FSMS
+   */
   fsm(const fsm &FSM1, const fsm &FSM2);
+  /*!
+   * \brief Creates an FSMS representing n stages through the originial FSM (AKA radix-n FSM).
+   *
+   * \param FSM      Original FSMs
+   * \param n        Number of stages.
+   */
   fsm(const fsm &FSM, int n);
   int I () const { return d_I; }
   int S () const { return d_S; }
@@ -62,7 +146,20 @@ public:
   const std::vector< std::vector<int> > & PI () const { return d_PI; }
   const std::vector<int> & TMi () const { return d_TMi; }
   const std::vector<int> & TMl () const { return d_TMl; }
+  /*!
+   * \brief Creates an svg image of the trellis representation.
+   *
+   * \param filename         filename
+   * \param number_stages    ????
+   *
+   */  
   void write_trellis_svg(std::string filename ,int number_stages);
+  /*!
+   * \brief Write the FSMS to a file.
+   *
+   * \param filename   filename
+   *
+   */
   void write_fsm_txt(std::string filename);
 };
 
diff --git a/gr-trellis/src/lib/interleaver.h b/gr-trellis/src/lib/interleaver.h
index f6a289c52..fbd378d62 100644
--- a/gr-trellis/src/lib/interleaver.h
+++ b/gr-trellis/src/lib/interleaver.h
@@ -23,12 +23,13 @@
 #ifndef INCLUDED_TRELLIS_INTERLEAVER_H
 #define INCLUDED_TRELLIS_INTERLEAVER_H
 
+#include <trellis_api.h>
 #include <vector>
 
 /*!
  * \brief  INTERLEAVER class
  */
-class interleaver {
+class TRELLIS_API interleaver {
 private:
   int d_K;
   std::vector<int> d_INTER;
diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index 8d1118436..d01ab529a 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -28,8 +28,11 @@
 #include "trellis_permutation.h"
 #include "trellis_siso_f.h"
 #include "trellis_siso_combined_f.h"
+#include "trellis_constellation_metrics_cf.h"
+#include "digital_constellation.h"
 %}
 
+
 // ----------------------------------------------------------------
 
 %include "fsm.i"
@@ -38,12 +41,19 @@
 %include "trellis_siso_f.i"
 %include "trellis_siso_combined_f.i"
 
-%include "metric_type.h"
 %include "siso_type.h"
 
+%include "trellis_constellation_metrics_cf.i"
 
 %include "trellis_generated.i"
 
+%import "digital_metric_type.h"
+%import "digital_constellation.i"
+
+ //%pythoncode %{
+ //  from gnuradio.gr import TRELLIS_EUCLIDEAN, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
+ //  %}
+
 #if SWIGGUILE
 %scheme %{
 (load-extension-global "libguile-gnuradio-trellis" "scm_init_gnuradio_trellis_module")
diff --git a/gr-trellis/src/lib/trellis_api.h b/gr-trellis/src/lib/trellis_api.h
new file mode 100644
index 000000000..c09b340d6
--- /dev/null
+++ b/gr-trellis/src/lib/trellis_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_TRELLIS_API_H
+#define INCLUDED_TRELLIS_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_trellis_EXPORTS
+#  define TRELLIS_API __GR_ATTR_EXPORT
+#else
+#  define TRELLIS_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_TRELLIS_API_H */
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc b/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc
new file mode 100644
index 000000000..91520e4ce
--- /dev/null
+++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc
@@ -0,0 +1,90 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010,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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <trellis_constellation_metrics_cf.h>
+#include <gr_io_signature.h>
+#include <assert.h>
+#include <stdexcept>
+#include <iostream>
+
+
+
+trellis_constellation_metrics_cf_sptr
+trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE)
+{
+  return gnuradio::get_initial_sptr (new trellis_constellation_metrics_cf (constellation, TYPE));
+}
+
+
+
+trellis_constellation_metrics_cf::trellis_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE)
+  : gr_block ("constellation_metrics_cf",
+	      gr_make_io_signature (1, -1, sizeof (gr_complex)),
+	      gr_make_io_signature (1, -1, sizeof (float))),
+    d_constellation (constellation),
+    d_TYPE (TYPE),
+    d_O (constellation->arity()),
+    d_D (constellation->dimensionality())
+{
+  set_relative_rate (1.0 * d_O / ((double) d_D));
+  set_output_multiple ((int)d_O);
+}
+
+void
+trellis_constellation_metrics_cf::forecast (int noutput_items, gr_vector_int &ninput_items_required)
+{
+  assert (noutput_items % d_O == 0);
+  unsigned int input_required =  d_D * noutput_items / d_O;
+  unsigned int ninputs = ninput_items_required.size();
+  for (unsigned int i = 0; i < ninputs; i++)
+    ninput_items_required[i] = input_required;
+}
+
+
+
+int
+trellis_constellation_metrics_cf::general_work (int noutput_items,
+				gr_vector_int &ninput_items,
+				gr_vector_const_void_star &input_items,
+				gr_vector_void_star &output_items)
+{
+
+  assert (noutput_items % d_O == 0);
+  assert (input_items.size() == output_items.size());
+  unsigned int nstreams = input_items.size();
+
+for (unsigned int m=0;m<nstreams;m++) {
+  const gr_complex *in = (gr_complex *) input_items[m];
+  float *out = (float *) output_items[m];
+
+  for (unsigned int i = 0; i < noutput_items / d_O ; i++){
+    d_constellation->calc_metric(&(in[i*d_D]), &(out[i*d_O]), d_TYPE); 
+  } 
+}
+
+  consume_each (d_D * noutput_items / d_O);
+  return noutput_items;
+}
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
new file mode 100644
index 000000000..1851bb89c
--- /dev/null
+++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2010,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_TRELLIS_CONSTELLATION_METRICS_CF_H
+#define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H
+
+#include <trellis_api.h>
+#include <gr_block.h>
+#include <digital_constellation.h>
+#include <digital_metric_type.h>
+
+class trellis_constellation_metrics_cf;
+typedef boost::shared_ptr<trellis_constellation_metrics_cf> trellis_constellation_metrics_cf_sptr;
+
+TRELLIS_API trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE);
+
+/*!
+ * \brief Evaluate metrics for use by the Viterbi algorithm.
+ * \ingroup coding_blk
+ */
+class TRELLIS_API trellis_constellation_metrics_cf : public gr_block
+{
+ public:
+  void forecast (int noutput_items,
+		 gr_vector_int &ninput_items_required);
+  int general_work (int noutput_items,
+		    gr_vector_int &ninput_items,
+		    gr_vector_const_void_star &input_items,
+		    gr_vector_void_star &output_items);
+ protected:
+  trellis_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE);
+ 
+ private:
+  digital_constellation_sptr d_constellation;
+  trellis_metric_type_t d_TYPE;
+  unsigned int d_O;
+  unsigned int d_D;
+  friend TRELLIS_API trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE);
+
+};
+
+
+#endif
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.i b/gr-trellis/src/lib/trellis_constellation_metrics_cf.i
new file mode 100644
index 000000000..c17522b11
--- /dev/null
+++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.i
@@ -0,0 +1,33 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,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.
+ */
+
+// WARNING: this file is machine generated.  Edits will be over written
+
+GR_SWIG_BLOCK_MAGIC(trellis,constellation_metrics_cf);
+
+trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE);
+
+class trellis_constellation_metrics_cf : public gr_block
+{
+private:
+  trellis_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE);
+};
diff --git a/gr-trellis/src/lib/trellis_encoder_XX.h.t b/gr-trellis/src/lib/trellis_encoder_XX.h.t
index b56fde0bf..4038caac9 100644
--- a/gr-trellis/src/lib/trellis_encoder_XX.h.t
+++ b/gr-trellis/src/lib/trellis_encoder_XX.h.t
@@ -25,22 +25,23 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <trellis_api.h>
 #include "fsm.h"
 #include <gr_sync_block.h>
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ trellis_make_@BASE_NAME@ (const fsm &FSM, int ST);
+TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (const fsm &FSM, int ST);
 
 /*!
  * \brief Convolutional encoder.
  * \ingroup coding_blk
  */
-class @NAME@ : public gr_sync_block
+class TRELLIS_API @NAME@ : public gr_sync_block
 {
 private:
-  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (const fsm &FSM, int ST);
+  friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (const fsm &FSM, int ST);
   fsm d_FSM;
   int d_ST;
   @NAME@ (const fsm &FSM, int ST); 
diff --git a/gr-trellis/src/lib/trellis_metrics_X.h.t b/gr-trellis/src/lib/trellis_metrics_X.h.t
index 45d4ace10..809c27e65 100644
--- a/gr-trellis/src/lib/trellis_metrics_X.h.t
+++ b/gr-trellis/src/lib/trellis_metrics_X.h.t
@@ -25,26 +25,27 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <trellis_api.h>
 #include <gr_block.h>
 #include "calc_metric.h"
 
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ trellis_make_@BASE_NAME@ (int O, int D,  const std::vector<@I_TYPE@> &TABLE, trellis_metric_type_t TYPE);
+TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (int O, int D,  const std::vector<@I_TYPE@> &TABLE, trellis_metric_type_t TYPE);
 
 /*!
  * \brief Evaluate metrics for use by the Viterbi algorithm.
  * \ingroup coding_blk
  */
-class @NAME@ : public gr_block
+class TRELLIS_API @NAME@ : public gr_block
 {
   int d_O;
   int d_D;
   trellis_metric_type_t d_TYPE;
   std::vector<@I_TYPE@> d_TABLE;
 
-  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (int O, int D,  const std::vector<@I_TYPE@> &TABLE, trellis_metric_type_t TYPE);
+  friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (int O, int D,  const std::vector<@I_TYPE@> &TABLE, trellis_metric_type_t TYPE);
   @NAME@ (int O, int D,  const std::vector<@I_TYPE@> &TABLE, trellis_metric_type_t TYPE);
 
 public:
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
index 2a5b43df6..a58a03264 100644
--- a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
+++ b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t
@@ -25,6 +25,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <trellis_api.h>
 #include "fsm.h"
 #include "interleaver.h"
 #include <gr_block.h>
@@ -34,7 +35,7 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
   const fsm &FSM1, int ST10, int ST1K,
   const fsm &FSM2, int ST20, int ST2K,
   const interleaver &INTERLEAVER,
@@ -47,7 +48,7 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 /*!
  *  \ingroup coding_blk
  */
-class @NAME@ : public gr_block
+class TRELLIS_API @NAME@ : public gr_block
 {
   fsm d_FSM1;
   int d_ST10;
@@ -61,7 +62,7 @@ class @NAME@ : public gr_block
   trellis_siso_type_t d_SISO_TYPE;
   std::vector<float> d_buffer;
 
-  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
     const fsm &FSM1, int ST10, int ST1K,
     const fsm &FSM2, int ST20, int ST2K,
     const interleaver &INTERLEAVER,
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t
index dd9979af9..6d177cca2 100644
--- a/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t
+++ b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t
@@ -25,6 +25,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <trellis_api.h>
 #include "fsm.h"
 #include "interleaver.h"
 #include <gr_block.h>
@@ -35,7 +36,7 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
   const fsm &FSMo, int STo0, int SToK,
   const fsm &FSMi, int STi0, int STiK,
   const interleaver &INTERLEAVER,
@@ -52,7 +53,7 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 /*!
  *  \ingroup coding_blk
  */
-class @NAME@ : public gr_block
+class TRELLIS_API @NAME@ : public gr_block
 {
   fsm d_FSMo;
   fsm d_FSMi;
@@ -70,7 +71,7 @@ class @NAME@ : public gr_block
   float d_scaling;
   std::vector<float> d_buffer;
 
-  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
     const fsm &FSMo, int STo0, int SToK,
     const fsm &FSMi, int STi0, int STiK,
     const interleaver &INTERLEAVER,
diff --git a/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t b/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t
index 68ccf75db..2b6110e37 100644
--- a/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t
+++ b/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t
@@ -25,6 +25,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <trellis_api.h>
 #include <vector>
 #include "fsm.h"
 #include "interleaver.h"
@@ -33,7 +34,7 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
   const fsm &FSM1, int ST1,
   const fsm &FSM2, int ST2,
   const interleaver &INTERLEAVER,
@@ -44,10 +45,10 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  * \brief SCCC encoder.
  * \ingroup coding_blk
  */
-class @NAME@ : public gr_sync_block
+class TRELLIS_API @NAME@ : public gr_sync_block
 {
 private:
-  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
     const fsm &FSM1, int ST1,
     const fsm &FSM2, int ST2,
     const interleaver &INTERLEAVER,
diff --git a/gr-trellis/src/lib/trellis_permutation.h b/gr-trellis/src/lib/trellis_permutation.h
index a5c858a8b..2786de29a 100644
--- a/gr-trellis/src/lib/trellis_permutation.h
+++ b/gr-trellis/src/lib/trellis_permutation.h
@@ -24,22 +24,23 @@
 #ifndef INCLUDED_TRELLIS_PERMUTATION_H
 #define INCLUDED_TRELLIS_PERMUTATION_H
 
+#include <trellis_api.h>
 #include <vector>
 #include <gr_sync_block.h>
 
 class trellis_permutation;
 typedef boost::shared_ptr<trellis_permutation> trellis_permutation_sptr;
 
-trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL);
+TRELLIS_API trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL);
 
 /*!
  * \brief Permutation.
  * \ingroup coding_blk
  */
-class trellis_permutation : public gr_sync_block
+class TRELLIS_API trellis_permutation : public gr_sync_block
 {
 private:
-  friend trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL);
+  friend TRELLIS_API trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL);
   int d_K;
   std::vector<int> d_TABLE;
   int d_SYMS_PER_BLOCK;
diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
index 93c9ac9b8..9857c6a34 100644
--- a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t
@@ -25,6 +25,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <trellis_api.h>
 #include "fsm.h"
 #include "interleaver.h"
 #include <gr_block.h>
@@ -34,7 +35,7 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
   const fsm &FSMo, int STo0, int SToK,
   const fsm &FSMi, int STi0, int STiK,
   const interleaver &INTERLEAVER,
@@ -47,7 +48,7 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 /*!
  *  \ingroup coding_blk
  */
-class @NAME@ : public gr_block
+class TRELLIS_API @NAME@ : public gr_block
 {
   fsm d_FSMo;
   int d_STo0;
@@ -61,7 +62,7 @@ class @NAME@ : public gr_block
   trellis_siso_type_t d_SISO_TYPE;
   std::vector<float> d_buffer;
 
-  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
     const fsm &FSMo, int STo0, int SToK,
     const fsm &FSMi, int STi0, int STiK,
     const interleaver &INTERLEAVER,
diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
index 225a07ffe..5d2c2b85c 100644
--- a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t
@@ -25,6 +25,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <trellis_api.h>
 #include "fsm.h"
 #include "interleaver.h"
 #include <gr_block.h>
@@ -35,7 +36,7 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
   const fsm &FSMo, int STo0, int SToK,
   const fsm &FSMi, int STi0, int STiK,
   const interleaver &INTERLEAVER,
@@ -52,7 +53,7 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 /*!
  *  \ingroup coding_blk
  */
-class @NAME@ : public gr_block
+class TRELLIS_API @NAME@ : public gr_block
 {
   fsm d_FSMo;
   int d_STo0;
@@ -70,7 +71,7 @@ class @NAME@ : public gr_block
   float d_scaling;
   std::vector<float> d_buffer;
 
-  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
     const fsm &FSMo, int STo0, int SToK,
     const fsm &FSMi, int STi0, int STiK,
     const interleaver &INTERLEAVER,
diff --git a/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t b/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t
index a9e4dc454..0e8ff45a4 100644
--- a/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t
+++ b/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t
@@ -25,6 +25,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <trellis_api.h>
 #include <vector>
 #include "fsm.h"
 #include "interleaver.h"
@@ -33,7 +34,7 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
   const fsm &FSMo, int STo,
   const fsm &FSMi, int STi,
   const interleaver &INTERLEAVER,
@@ -44,10 +45,10 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
  * \brief SCCC encoder.
  * \ingroup coding_blk
  */
-class @NAME@ : public gr_sync_block
+class TRELLIS_API @NAME@ : public gr_sync_block
 {
 private:
-  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
     const fsm &FSMo, int STo,
     const fsm &FSMi, int STi,
     const interleaver &INTERLEAVER,
diff --git a/gr-trellis/src/lib/trellis_siso_combined_f.h b/gr-trellis/src/lib/trellis_siso_combined_f.h
index 786e79386..2d043df62 100644
--- a/gr-trellis/src/lib/trellis_siso_combined_f.h
+++ b/gr-trellis/src/lib/trellis_siso_combined_f.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_TRELLIS_SISO_COMBINED_F_H
 #define INCLUDED_TRELLIS_SISO_COMBINED_F_H
 
+#include <trellis_api.h>
 #include "fsm.h"
 #include "siso_type.h"
 #include "calc_metric.h"
@@ -32,7 +33,7 @@
 class trellis_siso_combined_f;
 typedef boost::shared_ptr<trellis_siso_combined_f> trellis_siso_combined_f_sptr;
 
-trellis_siso_combined_f_sptr trellis_make_siso_combined_f (
+TRELLIS_API trellis_siso_combined_f_sptr trellis_make_siso_combined_f (
     const fsm &FSM, 	// underlying FSM
     int K,		// block size in trellis steps
     int S0,		// initial state (put -1 if not specified)
@@ -48,7 +49,7 @@ trellis_siso_combined_f_sptr trellis_make_siso_combined_f (
 /*!
  *  \ingroup coding_blk
  */
-class trellis_siso_combined_f : public gr_block
+class TRELLIS_API trellis_siso_combined_f : public gr_block
 {
   fsm d_FSM;
   int d_K;
@@ -63,7 +64,7 @@ class trellis_siso_combined_f : public gr_block
   //std::vector<float> d_alpha;
   //std::vector<float> d_beta;
 
-  friend trellis_siso_combined_f_sptr trellis_make_siso_combined_f (
+  friend TRELLIS_API trellis_siso_combined_f_sptr trellis_make_siso_combined_f (
     const fsm &FSM,
     int K,
     int S0,
diff --git a/gr-trellis/src/lib/trellis_siso_f.h b/gr-trellis/src/lib/trellis_siso_f.h
index 0e2cba67a..b3d02ad05 100644
--- a/gr-trellis/src/lib/trellis_siso_f.h
+++ b/gr-trellis/src/lib/trellis_siso_f.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_TRELLIS_SISO_F_H
 #define INCLUDED_TRELLIS_SISO_F_H
 
+#include <trellis_api.h>
 #include "fsm.h"
 #include "siso_type.h"
 #include "core_algorithms.h"
@@ -31,7 +32,7 @@
 class trellis_siso_f;
 typedef boost::shared_ptr<trellis_siso_f> trellis_siso_f_sptr;
 
-trellis_siso_f_sptr trellis_make_siso_f (
+TRELLIS_API trellis_siso_f_sptr trellis_make_siso_f (
     const fsm &FSM, 	// underlying FSM
     int K,		// block size in trellis steps
     int S0,		// initial state (put -1 if not specified)
@@ -45,7 +46,7 @@ trellis_siso_f_sptr trellis_make_siso_f (
 /*!
  *  \ingroup coding_blk
  */
-class trellis_siso_f : public gr_block
+class TRELLIS_API trellis_siso_f : public gr_block
 {
   fsm d_FSM;
   int d_K;
@@ -57,7 +58,7 @@ class trellis_siso_f : public gr_block
   //std::vector<float> d_alpha;
   //std::vector<float> d_beta;
 
-  friend trellis_siso_f_sptr trellis_make_siso_f (
+  friend TRELLIS_API trellis_siso_f_sptr trellis_make_siso_f (
     const fsm &FSM,
     int K,
     int S0,
diff --git a/gr-trellis/src/lib/trellis_viterbi_X.h.t b/gr-trellis/src/lib/trellis_viterbi_X.h.t
index 362d3f57e..c679649bb 100644
--- a/gr-trellis/src/lib/trellis_viterbi_X.h.t
+++ b/gr-trellis/src/lib/trellis_viterbi_X.h.t
@@ -25,6 +25,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <trellis_api.h>
 #include "fsm.h"
 #include <gr_block.h>
 #include "core_algorithms.h"
@@ -32,7 +33,7 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
     const fsm &FSM, 
     int K,
     int S0,
@@ -43,7 +44,7 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 /*!
  *  \ingroup coding_blk
  */
-class @NAME@ : public gr_block
+class TRELLIS_API @NAME@ : public gr_block
 {
   fsm d_FSM;
   int d_K;
@@ -51,7 +52,7 @@ class @NAME@ : public gr_block
   int d_SK;
   //std::vector<int> d_trace;
 
-  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
     const fsm &FSM,
     int K,
     int S0,
diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t b/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t
index 35e6c4ce0..072f66158 100644
--- a/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t
@@ -25,6 +25,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
+#include <trellis_api.h>
 #include "fsm.h"
 #include <gr_block.h>
 #include "calc_metric.h"
@@ -33,7 +34,7 @@
 class @NAME@;
 typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 
-@SPTR_NAME@ trellis_make_@BASE_NAME@ (
+TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
     const fsm &FSM,
     int K,
     int S0,
@@ -46,7 +47,7 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
 /*!
  *  \ingroup coding_blk
  */
-class @NAME@ : public gr_block
+class TRELLIS_API @NAME@ : public gr_block
 {
   fsm d_FSM;
   int d_K;
@@ -57,7 +58,7 @@ class @NAME@ : public gr_block
   trellis_metric_type_t d_TYPE;
   //std::vector<int> d_trace;
 
-  friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (
+  friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
     const fsm &FSM,
     int K,
     int S0,
diff --git a/gr-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt
new file mode 100644
index 000000000..9a9cc6aed
--- /dev/null
+++ b/gr-trellis/src/python/CMakeLists.txt
@@ -0,0 +1,37 @@
+# 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.
+
+########################################################################
+# Handle the unit tests
+########################################################################
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-digital/swig
+        ${CMAKE_BINARY_DIR}/gr-trellis/src/lib
+    )
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-digital gnuradio-trellis)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gr-trellis/src/python/qa_trellis.py b/gr-trellis/src/python/qa_trellis.py
index cfeefea06..b50679f27 100755
--- a/gr-trellis/src/python/qa_trellis.py
+++ b/gr-trellis/src/python/qa_trellis.py
@@ -20,46 +20,50 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
+import math
+
+
+from gnuradio import gr, gr_unittest, blks2
+# It's pretty ugly that we can't import trellis from gnuradio in this test
+# but because it runs on the non-installed python code it's all a mess.
 import trellis
 
-class test_trellis (gr_unittest.TestCase):
+import os
+import digital_swig
 
-    def setUp (self):
-        self.tb = gr.top_block ()
+fsm_args = {"awgn1o2_4": (2, 4, 4,
+                          (0, 2, 0, 2, 1, 3, 1, 3),
+                          (0, 3, 3, 0, 1, 2, 2, 1),
+                          ),
+            "rep2": (2, 1, 4, (0, 0), (0, 3)),
+            "nothing": (2, 1, 2, (0, 0), (0, 1)),
+            }
 
-    def tearDown (self):
-        self.tb = None
+constells = {2: digital_swig.constellation_bpsk(),
+             4: digital_swig.constellation_qpsk(),
+             }
+
+class test_trellis (gr_unittest.TestCase):
 
     def test_001_fsm (self):
-        I = 2
-        S = 4
-        O = 4
-        NS = (0, 2, 0, 2, 1, 3, 1, 3)
-        OS = (0, 3, 3, 0, 1, 2, 2, 1)
-        f = trellis.fsm(I,S,O,NS,OS)
-        self.assertEqual((I,S,O,NS,OS),(f.I(),f.S(),f.O(),f.NS(),f.OS()))
+        f = trellis.fsm(*fsm_args["awgn1o2_4"])
+        self.assertEqual(fsm_args["awgn1o2_4"],(f.I(),f.S(),f.O(),f.NS(),f.OS()))
 
     def test_002_fsm (self):
-        I = 2
-        S = 4
-        O = 4
-        NS = (0, 2, 0, 2, 1, 3, 1, 3)
-        OS = (0, 3, 3, 0, 1, 2, 2, 1)
-        f = trellis.fsm(I,S,O,NS,OS)
+        f = trellis.fsm(*fsm_args["awgn1o2_4"])
         g = trellis.fsm(f)
         self.assertEqual((g.I(),g.S(),g.O(),g.NS(),g.OS()),(f.I(),f.S(),f.O(),f.NS(),f.OS()))
 
     def test_003_fsm (self):
-        I = 2
-        S = 4
-        O = 4
-        NS = (0, 2, 0, 2, 1, 3, 1, 3)
-        OS = (0, 3, 3, 0, 1, 2, 2, 1)
+        # FIXME: no file "awgn1o2_4.fsm"
         #f = trellis.fsm("awgn1o2_4.fsm")
-        #self.assertEqual((I,S,O,NS,OS),(f.I(),f.S(),f.O(),f.NS(),f.OS()))
-        # temporary fix so that make distcheck does not fail on this
-        self.assertEqual(0,0)
+        #self.assertEqual(fsm_args["awgn1o2_4"],(f.I(),f.S(),f.O(),f.NS(),f.OS()))
+        pass
+
+    def test_004_fsm(self):
+        """ Test to make sure fsm works with a single state fsm."""
+        # Just checking that it initializes properly.
+        f = trellis.fsm(*fsm_args["rep2"])
 
     def test_001_interleaver (self):
         K = 5
@@ -68,5 +72,69 @@ class test_trellis (gr_unittest.TestCase):
         i = trellis.interleaver(K,IN)
         self.assertEqual((K,IN,DIN),(i.K(),i.INTER(),i.DEINTER()))
 
+    def test_001_viterbi(self):
+        """
+        Runs some coding/decoding tests with a few different FSM
+        specs.
+        """
+        for name, args in fsm_args.items():
+            constellation = constells[args[2]]
+            fsms = trellis.fsm(*args)
+            noise = 0.1
+            tb = trellis_tb(constellation, fsms, noise)
+            tb.run()
+            # Make sure all packets succesfully transmitted.
+            self.assertEqual(tb.dst.ntotal(), tb.dst.nright())
+
+
+class trellis_tb(gr.top_block):
+    """
+    A simple top block for use testing gr-trellis.
+    """
+    def __init__(self, constellation, f, N0=0.25, seed=-666L):
+        """
+        constellation - a constellation object used for modulation.
+        f - a finite state machine specification used for coding.
+        N0 - noise level
+        seed - random seed
+        """
+        super(trellis_tb, self).__init__()
+        # packet size in bits (make it multiple of 16 so it can be packed in a short)
+        packet_size = 1024*16
+        # bits per FSM input symbol
+        bitspersymbol = int(round(math.log(f.I())/math.log(2))) # bits per FSM input symbol
+        # packet size in trellis steps
+        K = packet_size/bitspersymbol
+
+        # TX
+        src = gr.lfsr_32k_source_s()
+        # packet size in shorts
+        src_head = gr.head (gr.sizeof_short, packet_size/16)
+        # unpack shorts to symbols compatible with the FSM input cardinality
+        s2fsmi = gr.packed_to_unpacked_ss(bitspersymbol, gr.GR_MSB_FIRST) 
+        # initial FSM state = 0
+        enc = trellis.encoder_ss(f, 0) 
+        mod = gr.chunks_to_symbols_sc(constellation.points(), 1)
+
+        # CHANNEL
+        add = gr.add_cc()
+        noise = gr.noise_source_c(gr.GR_GAUSSIAN,math.sqrt(N0/2),seed)
+
+        # RX
+        # data preprocessing to generate metrics for Viterbi
+        metrics = trellis.constellation_metrics_cf(constellation.base(), digital_swig.TRELLIS_EUCLIDEAN) 
+        # Put -1 if the Initial/Final states are not set.
+        va = trellis.viterbi_s(f, K, 0, -1)
+        # pack FSM input symbols to shorts
+        fsmi2s = gr.unpacked_to_packed_ss(bitspersymbol, gr.GR_MSB_FIRST) 
+        # check the output
+        self.dst = gr.check_lfsr_32k_s()
+    
+        self.connect (src, src_head, s2fsmi, enc, mod)
+        self.connect (mod, (add, 0))
+        self.connect (noise, (add, 1))
+        self.connect (add, metrics, va, fsmi2s, self.dst)
+
+
 if __name__ == '__main__':
     gr_unittest.run(test_trellis, "test_trellis.xml")
diff --git a/gr-trellis/src/python/run_tests.in b/gr-trellis/src/python/run_tests.in
index 0da3fc1f1..fcb078663 100644
--- a/gr-trellis/src/python/run_tests.in
+++ b/gr-trellis/src/python/run_tests.in
@@ -4,6 +4,8 @@
 # 2nd parameter is absolute path to component build directory
 # 3rd parameter is path to Python QA directory
 
+PYTHONPATH=@top_builddir@/gr-digital/swig:@top_builddir@/gr-digital/swig/.libs:@top_srcdir@/gr-digital/swig:$PYTHONPATH
+
 @top_builddir@/run_tests.sh \
     @abs_top_srcdir@/gr-trellis \
     @abs_top_builddir@/gr-trellis \
diff --git a/gr-uhd/CMakeLists.txt b/gr-uhd/CMakeLists.txt
new file mode 100644
index 000000000..4f4503234
--- /dev/null
+++ b/gr-uhd/CMakeLists.txt
@@ -0,0 +1,108 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+find_package(UHD)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-uhd" ENABLE_GR_UHD
+    Boost_FOUND
+    UHD_FOUND
+    ENABLE_GR_CORE
+)
+
+GR_SET_GLOBAL(GR_UHD_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${UHD_INCLUDE_DIRS}
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_UHD)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_UHD_DESCRIPTION "GNU Radio UHD Blocks")
+
+CPACK_COMPONENT("uhd_runtime"
+    GROUP        "UHD"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("uhd_devel"
+    GROUP        "UHD"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("uhd_python"
+    GROUP        "UHD"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "core_python;uhd_runtime"
+)
+
+CPACK_COMPONENT("uhd_swig"
+    GROUP        "UHD"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;uhd_python;uhd_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(include)
+add_subdirectory(lib)
+add_subdirectory(examples)
+add_subdirectory(doc)
+if(ENABLE_PYTHON)
+    add_subdirectory(swig)
+    add_subdirectory(grc)
+    add_subdirectory(apps)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-uhd.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "uhd_devel"
+)
+
+endif(ENABLE_GR_UHD)
diff --git a/gr-uhd/Makefile.am b/gr-uhd/Makefile.am
index ea16c863c..56829e9c4 100644
--- a/gr-uhd/Makefile.am
+++ b/gr-uhd/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = include lib apps
+SUBDIRS = include lib apps examples doc
 
 if PYTHON
 SUBDIRS += swig grc
diff --git a/gr-uhd/apps/CMakeLists.txt b/gr-uhd/apps/CMakeLists.txt
new file mode 100644
index 000000000..20ae8993f
--- /dev/null
+++ b/gr-uhd/apps/CMakeLists.txt
@@ -0,0 +1,84 @@
+# 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.
+
+include(GrPython)
+
+########################################################################
+# Install some uhd apps
+########################################################################
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    uhd_fft.py
+    uhd_rx_cfile.py
+    uhd_siggen.py
+    uhd_siggen_gui.py
+    uhd_rx_nogui.py
+    DESTINATION ${GR_RUNTIME_DIR}
+    COMPONENT "uhd_python"
+)
+
+########################################################################
+# Install hf radio apps
+########################################################################
+install(
+    FILES
+    hf_radio/hfir.sci
+    hf_radio/radio.xml
+    hf_radio/README.TXT
+    hf_radio/ssb_taps
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio
+    COMPONENT "uhd_python"
+)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    hf_radio/input.py
+    hf_radio/output.py
+    hf_radio/ssbagc.py
+    hf_radio/ssbdemod.py
+    hf_radio/startup.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio
+    COMPONENT "uhd_python"
+)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    hf_radio/radio.py
+    hf_radio/ui.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_radio
+    COMPONENT "uhd_python"
+)
+
+########################################################################
+# Install hf explorer
+########################################################################
+install(
+    FILES
+    hf_explorer/README
+    hf_explorer/hfx_help
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_explorer
+    COMPONENT "uhd_python"
+)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    hf_explorer/hfx.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/hf_explorer
+    COMPONENT "uhd_python"
+)
diff --git a/gr-uhd/apps/Makefile.am b/gr-uhd/apps/Makefile.am
index 9bb9b6cdd..c30a143c2 100644
--- a/gr-uhd/apps/Makefile.am
+++ b/gr-uhd/apps/Makefile.am
@@ -24,9 +24,13 @@ include $(top_srcdir)/Makefile.common
 EXTRA_DIST += \
     $(bin_SCRIPTS)
 
+SUBDIRS = hf_explorer hf_radio
+
 ourpythondir = $(grpythondir)
 
 bin_SCRIPTS = \
-    uhd_fft.py \
-    uhd_rx_cfile.py
-
+	uhd_fft.py 		\
+	uhd_rx_cfile.py		\
+	uhd_siggen.py		\
+	uhd_siggen_gui.py	\
+	uhd_rx_nogui.py
diff --git a/gnuradio-examples/python/apps/hf_explorer/.gitignore b/gr-uhd/apps/hf_explorer/.gitignore
index b6950912c..b6950912c 100644
--- a/gnuradio-examples/python/apps/hf_explorer/.gitignore
+++ b/gr-uhd/apps/hf_explorer/.gitignore
diff --git a/gnuradio-examples/python/apps/hf_explorer/Makefile.am b/gr-uhd/apps/hf_explorer/Makefile.am
index 88ad52128..c8e7ecb25 100644
--- a/gnuradio-examples/python/apps/hf_explorer/Makefile.am
+++ b/gr-uhd/apps/hf_explorer/Makefile.am
@@ -28,4 +28,4 @@ dist_ourdata_DATA =	\
     hfx_help
 
 dist_ourdata_SCRIPTS = 	\
-    hfx2.py
+    hfx.py
diff --git a/gr-uhd/apps/hf_explorer/README b/gr-uhd/apps/hf_explorer/README
new file mode 100644
index 000000000..57f45ceba
--- /dev/null
+++ b/gr-uhd/apps/hf_explorer/README
@@ -0,0 +1,42 @@
+hfx.py is meant to be a full-featured Long Wave / Medium Wave
+and Short Wave (250kHz to 30Mhz) AM and Single Sideband receiver.
+It uses the USRP with a Basic RX board, and will need an
+antenna and some preamps, about 30db gain will work. See the
+'Help' menu or hfx_help for more info.
+
+----------------------------------------------------------
+
+Powermate knob supported but not required, tooltip frequency display,
+single click tuning, AGC, record to disk, play from disk and record
+audio.  Ability to tailor the audio passband with two sliders over the
+spectrum display. The sliders almost align with the actual
+frequency. Preset filter settings for LSB (-3000 to 0kHz), USB (0 to
++3000kHz), CW (-400 to -800Hz) and AM (-5kHz from carrier to +5kHz).
+
+AM now switches in a synchronous PLL detector with the carriers at
+7.5kHz. The PLL carrier is displayed in the bottom display and helps
+show where on the upper spectrum the demodulated signal
+lies. Everything gets shifted up 7.5kHz in AM, center frequency,
+tooltips, etc.  The target AM carrier needs to be closely tuned in, it
+will have a hollow sound untill it is locked, and then the PLL carrier
+in the bottom display will jump up and remain relatively
+constant. There is a slider "AM sync carrier" to play with different
+levels to mix with the signal for demodulation.  The filter in AM is
+preset to 2500/12500 (7.5kHz +/- 5kHz) and is handy for removing
+adjacent channel interference.  Change AM_SYNC_DISPLAY in script for
+whether to show AM Sync carrier or not.
+
+Run with "-h" for command line help with setting USRP ddc center
+frequency, decimation, rf data record, playback and audio data
+recording.
+
+There are some controls for controlling a varactor and tuning an
+antenna - just ignore them unless you want to build a voltage tuned
+antenna to track frequency.
+
+There is also code for Web based control of frequency and volume - so
+I can tune the radio with an Ipaq from bed.  Disabled by default - it
+takes a web server, some directories and scripts to use.
+
+
+
diff --git a/gnuradio-examples/python/apps/hf_explorer/hfx2.py b/gr-uhd/apps/hf_explorer/hfx.py
index 00a3b9047..687adf82b 100755
--- a/gnuradio-examples/python/apps/hf_explorer/hfx2.py
+++ b/gr-uhd/apps/hf_explorer/hfx.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
-# -*- coding: ANSI_X3.4-1968 -*-
 # generated by wxGlade 0.4 on Tue Mar 14 10:16:06 2006
 #
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2011 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -81,10 +80,13 @@ AM_SYNC_DISPLAY = False
 import os, wx, sys, math
 import wx.lib.evtmgr as em
 from gnuradio.wxgui import powermate, fftsink2
-from gnuradio import gr, audio, eng_notation, usrp, gru
+from gnuradio import gr, audio, eng_notation
 from gnuradio.eng_option import eng_option
+from gnuradio import uhd
 from optparse import OptionParser
 
+n2s = eng_notation.num_to_str
+
 ID_BUTTON_1 = wx.NewId()	# LSB button
 ID_BUTTON_2 = wx.NewId()	# USB
 ID_BUTTON_3 = wx.NewId()	# AM
@@ -111,20 +113,6 @@ ID_SLIDER_7 = wx.NewId()	# AT control voltage output
 ID_EXIT	= wx.NewId()		# Menu Exit
 
 
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    If there's a daughterboard on A, select A.
-    If there's a daughterboard on B, select B.
-    Otherwise, select A.
-    """
-    if u.db(0, 0).dbid() >= 0:       # dbid is < 0 if there's no d'board or a problem
-        return (0, 0)
-    if u.db(1, 0).dbid() >= 0:
-        return (1, 0)
-    return (0, 0)
-
-
 class MyFrame(wx.Frame):
     def __init__(self, *args, **kwds):
         # begin wxGlade: MyFrame.__init__
@@ -135,7 +123,8 @@ class MyFrame(wx.Frame):
         self.frame_1_menubar = wx.MenuBar()
         self.SetMenuBar(self.frame_1_menubar)
         wxglade_tmp_menu = wx.Menu()
-        self.Exit = wx.MenuItem(wxglade_tmp_menu, ID_EXIT, "Exit", "Exit", wx.ITEM_NORMAL)
+        self.Exit = wx.MenuItem(wxglade_tmp_menu, ID_EXIT, "Exit",
+                                "Exit", wx.ITEM_NORMAL)
         wxglade_tmp_menu.AppendItem(self.Exit)
         self.frame_1_menubar.Append(wxglade_tmp_menu, "File")
         # Menu Bar end
@@ -145,9 +134,11 @@ class MyFrame(wx.Frame):
         self.button_3 = wx.Button(self, ID_BUTTON_3, "AM")
         self.button_4 = wx.Button(self, ID_BUTTON_4, "CW")
         self.button_5 = wx.ToggleButton(self, ID_BUTTON_5, "Upper")
-        self.slider_1 = wx.Slider(self, ID_SLIDER_1, 0, -15799, 15799, style=wx.SL_HORIZONTAL|wx.SL_LABELS)
+        self.slider_fcutoff_hi = wx.Slider(self, ID_SLIDER_1, 0, -15798, 15799,
+                                  style=wx.SL_HORIZONTAL|wx.SL_LABELS)
         self.button_6 = wx.ToggleButton(self, ID_BUTTON_6, "Lower")
-        self.slider_2 = wx.Slider(self, ID_SLIDER_2, 0, -15799, 15799, style=wx.SL_HORIZONTAL|wx.SL_LABELS)
+        self.slider_fcutoff_lo = wx.Slider(self, ID_SLIDER_2, 0, -15799, 15798,
+                                  style=wx.SL_HORIZONTAL|wx.SL_LABELS)
         self.panel_5 = wx.Panel(self, -1)
         self.label_1 = wx.StaticText(self, -1, " Band\nCenter")
         self.text_ctrl_1 = wx.TextCtrl(self, ID_TEXT_1, "")
@@ -169,9 +160,11 @@ class MyFrame(wx.Frame):
         self.panel_8 = wx.Panel(self, -1)
         self.panel_9 = wx.Panel(self, -1)
         self.label_3 = wx.StaticText(self, -1, "AM Sync\nCarrier")
-        self.slider_6 = wx.Slider(self, ID_SLIDER_6, 50, 0, 200, style=wx.SL_HORIZONTAL|wx.SL_LABELS)
+        self.slider_6 = wx.Slider(self, ID_SLIDER_6, 50, 0, 200,
+                                  style=wx.SL_HORIZONTAL|wx.SL_LABELS)
         self.label_4 = wx.StaticText(self, -1, "Antenna Tune")
-        self.slider_7 = wx.Slider(self, ID_SLIDER_7, 1575, 950, 2200, style=wx.SL_HORIZONTAL|wx.SL_LABELS)
+        self.slider_7 = wx.Slider(self, ID_SLIDER_7, 1575, 950, 2200,
+                                  style=wx.SL_HORIZONTAL|wx.SL_LABELS)
         self.panel_10 = wx.Panel(self, -1)
         self.button_12 = wx.ToggleButton(self, ID_BUTTON_12, "Auto Tune")
         self.button_13 = wx.Button(self, ID_BUTTON_13, "Calibrate")
@@ -184,26 +177,30 @@ class MyFrame(wx.Frame):
         # end wxGlade
 
         parser = OptionParser (option_class=eng_option)
+        parser.add_option("", "--address", type="string", default="addr=192.168.10.2",
+                          help="Address of UHD device, [default=%default]")
         parser.add_option ("-c", "--ddc-freq", type="eng_float", default=3.9e6,
                            help="set Rx DDC frequency to FREQ", metavar="FREQ")
+        parser.add_option ("-s", "--samp-rate", type="eng_float", default=256e3,
+                           help="set sample rate (bandwidth) [default=%default]")
         parser.add_option ("-a", "--audio_file", default="",
                            help="audio output file", metavar="FILE")
         parser.add_option ("-r", "--radio_file", default="",
                            help="radio output file", metavar="FILE")
         parser.add_option ("-i", "--input_file", default="",
                            help="radio input file", metavar="FILE")
-        parser.add_option ("-d", "--decim", type="int", default=250,
-                           help="USRP decimation")
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,                          help="select USRP Rx side A or B (default=first one with a daughterboard)")
+        parser.add_option ("-O", "--audio-output", type="string", default="",
+                           help="audio output device name. E.g., hw:0,0, /dev/dsp, or pulse")
+
         (options, args) = parser.parse_args ()
 
         self.usrp_center = options.ddc_freq
-        usb_rate = 64e6 / options.decim
-        self.slider_range = usb_rate * 0.9375
+        input_rate = options.samp_rate
+        self.slider_range = input_rate * 0.9375
         self.f_lo = self.usrp_center - (self.slider_range/2)
         self.f_hi = self.usrp_center + (self.slider_range/2)
 	self.af_sample_rate = 32000
-	fir_decim = long (usb_rate / self.af_sample_rate)
+	fir_decim = long (input_rate / self.af_sample_rate)
 
         # data point arrays for antenna tuner
         self.xdata = []
@@ -215,7 +212,7 @@ class MyFrame(wx.Frame):
         self.frequency = self.usrp_center
         # these map the frequency slider (0-6000) to the actual range
         self.f_slider_offset = self.f_lo
-        self.f_slider_scale = 10000/options.decim
+        self.f_slider_scale = 10000
         self.spin_ctrl_1.SetRange(self.f_lo,self.f_hi)
         self.text_ctrl_1.SetValue(str(int(self.usrp_center)))
         self.slider_5.SetValue(0) 
@@ -245,40 +242,40 @@ class MyFrame(wx.Frame):
         else: self.PLAY_FROM_USRP = False
 
         if self.PLAY_FROM_USRP:
-           self.src = usrp.source_s(decim_rate=options.decim)
-	   if options.rx_subdev_spec is None:
-              options.rx_subdev_spec = pick_subdevice(self.src)
-           self.src.set_mux(usrp.determine_rx_mux_value(self.src, options.rx_subdev_spec))
-	   self.subdev = usrp.selected_subdev(self.src, options.rx_subdev_spec)
-           self.src.tune(0, self.subdev, self.usrp_center)
-           self.tune_offset = 0 # -self.usrp_center - self.src.rx_freq(0)
+            self.src = uhd.usrp_source(device_addr=options.address,
+                                       io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                       num_channels=1)
+            self.src.set_samp_rate(input_rate)
+            input_rate = self.src.get_samp_rate()
+
+            self.src.set_center_freq(self.usrp_center, 0)
+            self.tune_offset = 0
 
         else:
            self.src = gr.file_source (gr.sizeof_short,options.input_file)
            self.tune_offset = 2200 # 2200 works for 3.5-4Mhz band
 
+           # convert rf data in interleaved short int form to complex
+           s2ss = gr.stream_to_streams(gr.sizeof_short,2)
+           s2f1 = gr.short_to_float()
+           s2f2 = gr.short_to_float()
+           src_f2c = gr.float_to_complex()
+           self.tb.connect(self.src,s2ss)
+           self.tb.connect((s2ss,0),s2f1)
+           self.tb.connect((s2ss,1),s2f2)
+           self.tb.connect(s2f1,(src_f2c,0))
+           self.tb.connect(s2f2,(src_f2c,1))
+           
         # save radio data to a file
         if SAVE_RADIO_TO_FILE:
-           file = gr.file_sink(gr.sizeof_short, options.radio_file)
-           self.tb.connect (self.src, file)
+           radio_file = gr.file_sink(gr.sizeof_short, options.radio_file)
+           self.tb.connect (self.src, radio_file)
 
 	# 2nd DDC
         xlate_taps = gr.firdes.low_pass ( \
-           1.0, usb_rate, 16e3, 4e3, gr.firdes.WIN_HAMMING )
+           1.0, input_rate, 16e3, 4e3, gr.firdes.WIN_HAMMING )
         self.xlate = gr.freq_xlating_fir_filter_ccf ( \
-           fir_decim, xlate_taps, self.tune_offset, usb_rate )
-
-        # convert rf data in interleaved short int form to complex
-        s2ss = gr.stream_to_streams(gr.sizeof_short,2)
-        s2f1 = gr.short_to_float()
-        s2f2 = gr.short_to_float()
-        src_f2c = gr.float_to_complex()
-        self.tb.connect(self.src,s2ss)
-        self.tb.connect((s2ss,0),s2f1)
-        self.tb.connect((s2ss,1),s2f2)
-        self.tb.connect(s2f1,(src_f2c,0))
-        self.tb.connect(s2f2,(src_f2c,1))
-
+           fir_decim, xlate_taps, self.tune_offset, input_rate )
 
 	# Complex Audio filter
         audio_coeffs = gr.firdes.complex_band_pass (
@@ -288,17 +285,22 @@ class MyFrame(wx.Frame):
                 0,   # high cutoff
                 100,    # transition
                 gr.firdes.WIN_HAMMING)  # window
-	self.slider_1.SetValue(0)
-	self.slider_2.SetValue(-3000)
+	self.slider_fcutoff_hi.SetValue(0)
+	self.slider_fcutoff_lo.SetValue(-3000)
 
-        self.audio_filter = gr.fir_filter_ccc ( 1, audio_coeffs)
+        self.audio_filter = gr.fir_filter_ccc(1, audio_coeffs)
 
 	# Main +/- 16Khz spectrum display
-        self.fft = fftsink2.fft_sink_c (self.panel_2, fft_size=512, sample_rate=self.af_sample_rate, average=True, size=(640,240))
+        self.fft = fftsink2.fft_sink_c(self.panel_2, fft_size=512,
+                                       sample_rate=self.af_sample_rate,
+                                       average=True, size=(640,240))
 
 	# AM Sync carrier 
 	if AM_SYNC_DISPLAY:
-	   self.fft2 = fftsink.fft_sink_c (self.tb, self.panel_9, y_per_div=20, fft_size=512, sample_rate=self.af_sample_rate, average=True, size=(640,240))
+	   self.fft2 = fftsink.fft_sink_c(self.tb, self.panel_9,
+                                          y_per_div=20, fft_size=512,
+                                          sample_rate=self.af_sample_rate,
+                                          average=True, size=(640,240))
 
         c2f = gr.complex_to_float()
 
@@ -307,7 +309,8 @@ class MyFrame(wx.Frame):
 	# the following frequencies turn out to be in radians/sample
 	# gr.pll_refout_cc(alpha,beta,min_freq,max_freq)
 	# suggested alpha = X, beta = .25 * X * X
-	pll = gr.pll_refout_cc(.5,.0625,(2.*math.pi*7.5e3/self.af_sample_rate),(2.*math.pi*6.5e3/self.af_sample_rate))
+	pll = gr.pll_refout_cc(.5,.0625,(2.*math.pi*7.5e3/self.af_sample_rate),
+                                (2.*math.pi*6.5e3/self.af_sample_rate))
 	self.pll_carrier_scale = gr.multiply_const_cc(complex(10,0))
 	am_det = gr.multiply_cc()
 	# these are for converting +7.5kHz to -7.5kHz
@@ -327,7 +330,7 @@ class MyFrame(wx.Frame):
                 100,    # transition
                 gr.firdes.WIN_HAMMING)  # window
 
-        self.pll_carrier_filter = gr.fir_filter_ccc ( 1, pll_carrier_coeffs)
+        self.pll_carrier_filter = gr.fir_filter_ccc (1, pll_carrier_coeffs)
 
 	self.sel_sb = gr.multiply_const_ff(1)
 	combine = gr.add_ff()
@@ -338,20 +341,29 @@ class MyFrame(wx.Frame):
 	offset = gr.add_const_ff(1)
 	agc = gr.divide_ff()
 
-
         self.scale = gr.multiply_const_ff(0.00001)
-        dst = audio.sink(long(self.af_sample_rate))
+        dst = audio.sink(long(self.af_sample_rate),
+                         options.audio_output)
+
+
+        if self.PLAY_FROM_USRP:
+            self.tb.connect(self.src, self.xlate, self.fft)
+        else:
+            self.tb.connect(src_f2c, self.xlate, self.fft)
 
-        self.tb.connect(src_f2c,self.xlate,self.fft)
         self.tb.connect(self.xlate,self.audio_filter,self.sel_am,(am_det,0))
-	self.tb.connect(self.sel_am,pll,self.pll_carrier_scale,self.pll_carrier_filter,c2f3)
+	self.tb.connect(self.sel_am,pll,self.pll_carrier_scale,
+                        self.pll_carrier_filter,c2f3)
 	self.tb.connect((c2f3,0),phaser1,(f2c,0))
 	self.tb.connect((c2f3,1),phaser2,(f2c,1))
 	self.tb.connect(f2c,(am_det,1))
 	self.tb.connect(am_det,c2f2,(combine,0))
-	self.tb.connect(self.audio_filter,c2f,self.sel_sb,(combine,1))
+	self.tb.connect(self.audio_filter,c2f,
+                        self.sel_sb,(combine,1))
+
 	if AM_SYNC_DISPLAY:
 	  self.tb.connect(self.pll_carrier_filter,self.fft2)
+
 	self.tb.connect(combine,self.scale)
 	self.tb.connect(self.scale,(sqr1,0))
 	self.tb.connect(self.scale,(sqr1,1))
@@ -368,9 +380,9 @@ class MyFrame(wx.Frame):
         self.tb.start()
 
         # for mouse position reporting on fft display
-        em.eventManager.Register(self.Mouse, wx.EVT_MOTION, self.fft.win)
+        self.fft.win.Bind(wx.EVT_LEFT_UP, self.Mouse)
         # and left click to re-tune
-        em.eventManager.Register(self.Click, wx.EVT_LEFT_DOWN, self.fft.win)
+        self.fft.win.Bind(wx.EVT_LEFT_DOWN, self.Click)
 
         # start a timer to check for web commands
         if WEB_CONTROL:
@@ -403,9 +415,9 @@ class MyFrame(wx.Frame):
 
     def __set_properties(self):
         # begin wxGlade: MyFrame.__set_properties
-        self.SetTitle("HF Explorer 2")
-        self.slider_1.SetMinSize((450, 38))
-        self.slider_2.SetMinSize((450, 38))
+        self.SetTitle("HF Explorer")
+        self.slider_fcutoff_hi.SetMinSize((450, 38))
+        self.slider_fcutoff_lo.SetMinSize((450, 38))
         self.panel_2.SetMinSize((640, 240))
         self.button_7.SetValue(1)
         self.slider_3.SetMinSize((450, 19))
@@ -434,11 +446,14 @@ class MyFrame(wx.Frame):
         sizer_2.Add(self.button_4, 0, wx.ADJUST_MINSIZE, 0)
         grid_sizer_1.Add(sizer_2, 1, wx.EXPAND, 0)
         grid_sizer_1.Add(self.button_5, 0, wx.ADJUST_MINSIZE, 0)
-        grid_sizer_1.Add(self.slider_1, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0)
+        grid_sizer_1.Add(self.slider_fcutoff_hi, 0,
+                         wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0)
         grid_sizer_1.Add(self.button_6, 0, wx.ADJUST_MINSIZE, 0)
-        grid_sizer_1.Add(self.slider_2, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0)
+        grid_sizer_1.Add(self.slider_fcutoff_lo, 0,
+                         wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0)
         sizer_6.Add(self.panel_5, 1, wx.EXPAND, 0)
-        sizer_6.Add(self.label_1, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0)
+        sizer_6.Add(self.label_1, 0,
+                    wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0)
         sizer_6.Add(self.text_ctrl_1, 0, wx.ADJUST_MINSIZE, 0)
         sizer_6.Add(self.panel_6, 1, wx.EXPAND, 0)
         sizer_6.Add(self.panel_7, 1, wx.EXPAND, 0)
@@ -461,9 +476,11 @@ class MyFrame(wx.Frame):
         grid_sizer_1.Add(sizer_5, 1, wx.EXPAND, 0)
         grid_sizer_1.Add(self.panel_8, 1, wx.EXPAND, 0)
         grid_sizer_1.Add(self.panel_9, 1, wx.EXPAND, 0)
-        grid_sizer_1.Add(self.label_3, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
+        grid_sizer_1.Add(self.label_3, 0,
+                         wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
         grid_sizer_1.Add(self.slider_6, 0, wx.ADJUST_MINSIZE, 0)
-        grid_sizer_1.Add(self.label_4, 0, wx.ALIGN_BOTTOM|wx.ADJUST_MINSIZE, 0)
+        grid_sizer_1.Add(self.label_4, 0,
+                         wx.ALIGN_BOTTOM|wx.ADJUST_MINSIZE, 0)
         grid_sizer_1.Add(self.slider_7, 0, wx.ADJUST_MINSIZE, 0)
         grid_sizer_1.Add(self.panel_10, 1, wx.EXPAND, 0)
         sizer_7.Add(self.button_12, 0, wx.ADJUST_MINSIZE, 0)
@@ -488,14 +505,14 @@ class MyFrame(wx.Frame):
     # Powermate being turned
     def on_rotate(self, event):
 	if self.active_button == 5:
-	   self.slider_1.SetValue(self.slider_1.GetValue()+event.delta)
-           if self.slider_2.GetValue() > (self.slider_1.GetValue() - 200) :
-              self.slider_2.SetValue(self.slider_1.GetValue() - 200)
+	   self.slider_fcutoff_hi.SetValue(self.slider_fcutoff_hi.GetValue()+event.delta)
+           if self.slider_fcutoff_lo.GetValue() > (self.slider_fcutoff_hi.GetValue() - 200) :
+              self.slider_fcutoff_lo.SetValue(self.slider_fcutoff_hi.GetValue() - 200)
 	   self.filter()
 	if self.active_button == 6:
-	   self.slider_2.SetValue(self.slider_2.GetValue()+event.delta)
-	   if self.slider_1.GetValue() < (self.slider_2.GetValue() + 200) :
-	      self.slider_1.SetValue(self.slider_2.GetValue() + 200)
+	   self.slider_fcutoff_lo.SetValue(self.slider_fcutoff_lo.GetValue()+event.delta)
+	   if self.slider_fcutoff_hi.GetValue() < (self.slider_fcutoff_lo.GetValue() + 200) :
+	      self.slider_fcutoff_hi.SetValue(self.slider_fcutoff_lo.GetValue() + 200)
 	   self.filter()
 	if self.active_button == 7:
            new = max(0, min(6000, self.slider_3.GetValue() + event.delta))
@@ -581,14 +598,14 @@ class MyFrame(wx.Frame):
     # Make sure filter settings are legal
     def set_filter(self, event):
         slider = event.GetId()
-        slider1 = self.slider_1.GetValue()
-        slider2 = self.slider_2.GetValue()
+        slider1 = self.slider_fcutoff_hi.GetValue()
+        slider2 = self.slider_fcutoff_lo.GetValue()
         if slider == ID_SLIDER_1:
-           if slider2 > (self.slider_1.GetValue() - 200) :
-              self.slider_2.SetValue(slider1 - 200)
+           if slider2 > (self.slider_fcutoff_hi.GetValue() - 200) :
+              self.slider_fcutoff_lo.SetValue(slider1 - 200)
         elif slider == ID_SLIDER_2:
-           if slider1 < (self.slider_2.GetValue() + 200) :
-              self.slider_1.SetValue(slider2 + 200)
+           if slider1 < (self.slider_fcutoff_lo.GetValue() + 200) :
+              self.slider_fcutoff_hi.SetValue(slider2 + 200)
 	self.filter()
 
     # Calculate taps and apply
@@ -596,8 +613,8 @@ class MyFrame(wx.Frame):
         audio_coeffs = gr.firdes.complex_band_pass (
                 1.0,    # gain
                 self.af_sample_rate, # sample rate
-                self.slider_2.GetValue(),    # low cutoff
-                self.slider_1.GetValue(),   # high cutoff
+                self.slider_fcutoff_lo.GetValue(),   # low cutoff
+                self.slider_fcutoff_hi.GetValue(),   # high cutoff
                 100,    # transition
                 gr.firdes.WIN_HAMMING)  # window
         self.audio_filter.set_taps(audio_coeffs)
@@ -607,8 +624,8 @@ class MyFrame(wx.Frame):
 	self.xlate.set_center_freq( self.usrp_center - (self.frequency - self.tune_offset))
 	self.sel_sb.set_k(1)
 	self.sel_am.set_k(0)
-	self.slider_1.SetValue(0)
-	self.slider_2.SetValue(-3000)
+	self.slider_fcutoff_hi.SetValue(0)
+	self.slider_fcutoff_lo.SetValue(-3000)
 	self.filter()
 
     def set_usb(self, event):
@@ -616,8 +633,8 @@ class MyFrame(wx.Frame):
 	self.xlate.set_center_freq( self.usrp_center - (self.frequency - self.tune_offset))
 	self.sel_sb.set_k(1)
 	self.sel_am.set_k(0)
-	self.slider_1.SetValue(3000)
-	self.slider_2.SetValue(0)
+	self.slider_fcutoff_hi.SetValue(3000)
+	self.slider_fcutoff_lo.SetValue(0)
 	self.filter()
 
     def set_am(self, event):
@@ -625,8 +642,8 @@ class MyFrame(wx.Frame):
 	self.xlate.set_center_freq( self.usrp_center - (self.frequency - self.tune_offset - 7.5e3))
 	self.sel_sb.set_k(0)
 	self.sel_am.set_k(1)
-	self.slider_1.SetValue(12500)
-	self.slider_2.SetValue(2500)
+	self.slider_fcutoff_hi.SetValue(12500)
+	self.slider_fcutoff_lo.SetValue(2500)
 	self.filter()
 
     def set_cw(self, event):
@@ -635,8 +652,8 @@ class MyFrame(wx.Frame):
 	self.AM_mode = False
 	self.sel_sb.set_k(1)
 	self.sel_am.set_k(0)
-	self.slider_1.SetValue(-400)
-	self.slider_2.SetValue(-800)
+	self.slider_fcutoff_hi.SetValue(-400)
+	self.slider_fcutoff_lo.SetValue(-800)
 	self.filter()
 
     def set_volume(self, event):
@@ -644,7 +661,7 @@ class MyFrame(wx.Frame):
 
     def set_pga(self,event):
 	if self.PLAY_FROM_USRP:
-	   self.subdev.set_gain(self.slider_5.GetValue())
+	   self.src.set_gain(self.slider_5.GetValue())
 
     def slide_tune(self, event):
         self.frequency = (self.f_slider_scale * self.slider_3.GetValue()) + self.f_slider_offset
@@ -731,8 +748,11 @@ class MyFrame(wx.Frame):
     # Slider to set loop antenna capacitance
     def antenna_tune(self, evt):
         if self.PLAY_FROM_USRP:
-           self.src.write_aux_dac(0,3,self.slider_7.GetValue())
-
+            dev = self.src.get_dboard_iface()
+            dev.write_aux_dac(uhd.dboard_iface.UNIT_RX,
+                              uhd.dboard_iface.AUX_DAC_C,
+                              float(self.slider_7.GetValue()))
+            
     # Timer events - check for web commands
     def OnUpdate(self):
       cmds = os.listdir("/var/www/cgi-bin/commands/")
@@ -791,11 +811,13 @@ class UpdateTimer(wx.Timer):
 
 class MyApp(wx.App):
   def OnInit(self):
-    frame = MyFrame(None, -1, "HF Explorer 2")
+    frame = MyFrame(None, -1, "HF Explorer")
     frame.Show(True)
     self.SetTopWindow(frame)
     return True
 
-app = MyApp(0)
-app.MainLoop()
+
+if __name__ == "__main__":
+    app = MyApp(0)
+    app.MainLoop()
 
diff --git a/gnuradio-examples/python/apps/hf_explorer/hfx_help b/gr-uhd/apps/hf_explorer/hfx_help
index 9a52dd2bb..9a52dd2bb 100644
--- a/gnuradio-examples/python/apps/hf_explorer/hfx_help
+++ b/gr-uhd/apps/hf_explorer/hfx_help
diff --git a/gnuradio-examples/python/apps/hf_radio/.gitignore b/gr-uhd/apps/hf_radio/.gitignore
index b6950912c..b6950912c 100644
--- a/gnuradio-examples/python/apps/hf_radio/.gitignore
+++ b/gr-uhd/apps/hf_radio/.gitignore
diff --git a/gnuradio-examples/python/apps/hf_radio/Makefile.am b/gr-uhd/apps/hf_radio/Makefile.am
index e514076f6..e514076f6 100644
--- a/gnuradio-examples/python/apps/hf_radio/Makefile.am
+++ b/gr-uhd/apps/hf_radio/Makefile.am
diff --git a/gnuradio-examples/python/apps/hf_radio/README.TXT b/gr-uhd/apps/hf_radio/README.TXT
index 7c7edf5e0..7c7edf5e0 100644
--- a/gnuradio-examples/python/apps/hf_radio/README.TXT
+++ b/gr-uhd/apps/hf_radio/README.TXT
diff --git a/gnuradio-examples/python/apps/hf_radio/hfir.sci b/gr-uhd/apps/hf_radio/hfir.sci
index a2d5e2a62..a2d5e2a62 100644
--- a/gnuradio-examples/python/apps/hf_radio/hfir.sci
+++ b/gr-uhd/apps/hf_radio/hfir.sci
diff --git a/gr-uhd/apps/hf_radio/input.py b/gr-uhd/apps/hf_radio/input.py
new file mode 100644
index 000000000..2626ddfb5
--- /dev/null
+++ b/gr-uhd/apps/hf_radio/input.py
@@ -0,0 +1,78 @@
+# 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.
+# 
+
+# Basic USRP setup and control.
+# It's only ever been tried with a basic rx daughter card.
+#
+# Imagine that the gnuradio boilerplate is here.
+#
+# M. Revnell 2005-Dec
+ 
+from gnuradio import gr
+from gnuradio import uhd
+
+class uhd_input(gr.hier_block2):
+    def __init__( self, address, samp_rate):
+        gr.hier_block2.__init__(self, "uhd_input",
+                                gr.io_signature(0,0,0),
+                                gr.io_signature(1,1,gr.sizeof_gr_complex))
+        
+        self.src = uhd.usrp_source(device_addr=address,
+                                   io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                   num_channels=1)
+
+        self.src.set_samp_rate(samp_rate)
+        self.usrp_rate = self.src.get_samp_rate()
+
+        self.connect(self.src, self)
+
+    def set_freq(self, target_freq):
+        """
+        Set the center frequency.
+
+        @param target_freq: frequency in Hz
+        @type: bool
+        """
+        r = self.src.set_center_freq(target_freq, 0)
+
+        if r:
+            self.freq = target_freq
+     	    return True
+        else:
+            return False
+
+    def get_freq(self):
+        return self.src.get_center_freq(0)
+
+    def set_gain(self, gain):
+        self.gain = gain
+        self.src.set_gain(gain, 0)
+
+    def add_options(parser):        
+        parser.add_option("-a", "--address", type="string",
+                          default="addr=192.168.10.2",
+                          help="Address of UHD device, [default=%default]")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("-f", "--freq", type="eng_float", default=None,
+                          help="set frequency to FREQ", metavar="FREQ")
+        parser.add_option("-g", "--gain", type="eng_float", default=None,
+                          help="set gain in dB (default is midpoint)")
+    add_options = staticmethod(add_options)
diff --git a/gr-uhd/apps/hf_radio/output.py b/gr-uhd/apps/hf_radio/output.py
new file mode 100644
index 000000000..8ee7dc54c
--- /dev/null
+++ b/gr-uhd/apps/hf_radio/output.py
@@ -0,0 +1,42 @@
+# 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.
+# 
+
+
+# Audio output with a volume control.
+#
+# M. Revnell 2005-Dec
+
+from gnuradio import gr, gru
+from gnuradio import audio
+
+class output( gr.hier_block2 ):
+    def __init__( self, rate, device ):
+        gr.hier_block2.__init__(self, "output",
+                                gr.io_signature(1,1,gr.sizeof_float),
+                                gr.io_signature(0,0,0))
+        
+        self.vol = gr.multiply_const_ff( 0.1 )
+        self.out = audio.sink( int(rate), device )
+
+        self.connect( self, self.vol, self.out )
+
+    def set( self, val ):
+        self.vol.set_k( val )
+        
diff --git a/gnuradio-examples/python/apps/hf_radio/radio.py b/gr-uhd/apps/hf_radio/radio.py
index 9f444b916..32e26c7eb 100755
--- a/gnuradio-examples/python/apps/hf_radio/radio.py
+++ b/gr-uhd/apps/hf_radio/radio.py
@@ -1,11 +1,29 @@
 #!/usr/bin/env python
+#
+# 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.
+# 
 
 # GUI interactions and high level connections handled here.
 #
 # Interacts with classes defined by wxGlade in ui.py.
 #
-# The usual gnuradio copyright boilerplate incorperated here by reference.
-#
 # M. Revnell 2006-Jan
 
 from threading import *
@@ -15,11 +33,11 @@ import time
 
 from gnuradio import gr, gru, eng_notation, optfir
 from gnuradio import audio
-from gnuradio import usrp
-from gnuradio import blks
-from gnuradio.wxgui import fftsink
-from gnuradio.wxgui import waterfallsink
-from gnuradio.wxgui import scopesink
+from gnuradio import uhd
+from gnuradio import blks2
+from gnuradio.wxgui import fftsink2
+from gnuradio.wxgui import waterfallsink2
+from gnuradio.wxgui import scopesink2
 
 from input    import *
 from output   import *
@@ -28,35 +46,36 @@ from ssbagc   import *
 from ui       import *
 from math     import log10
 
-class graph( gr.hier_block ):
-    def __init__( self, fg ):
-        self.graph        = fg
-        self.fe_decim     = 250
-        self.src          = input( self.fe_decim )
-        self.adc_rate     = self.src.adc_rate
-        self.fe_rate      = self.adc_rate / self.fe_decim
+class radio_top_block( gr.top_block ):
+    def __init__( self ):
+        gr.top_block.__init__(self, "radio_top_block")
+
+        self.address      = "addr=192.168.11.2"
+        self.samp_rate    = 256e3
+        self.freq         = -2.5e6
+        self.gain         = 0
+        self.src          = uhd_input( self.address,
+                                       self.samp_rate)
+        self.src.set_freq(self.freq)
+        self.src.set_gain(self.gain)
+
+        self.fe_rate      = self.src.usrp_rate
         self.filter_decim = 1
         self.audio_decim  = 16
         self.demod_rate   = self.fe_rate / self.filter_decim
         self.audio_rate   = self.demod_rate / self.audio_decim
+        self.audio_dev    = "pulse"
 
-        self.demod        = ssb_demod( fg, self.demod_rate, self.audio_rate )
-        self.agc          = agc( fg )
-        #self.agc          = gr.agc_ff()
-        self.out          = output( fg, self.audio_rate )
+        self.demod        = ssb_demod( self.demod_rate, self.audio_rate )
+        self.agc          = agc()
+        self.out          = output( self.audio_rate, self.audio_dev )
 
-        fg.connect( self.src.src,
-                    self.demod,
-                    self.agc,
-                    self.out )
-
-        gr.hier_block.__init__( self, fg, None, None )
+        self.connect( self.src, self.demod, self.agc, self.out )
 
     def tune( self, freq ):
         fe_target = -freq
         self.src.set_freq( fe_target )
-        fe_freq = self.src.src.rx_freq( 0 )
-        demod_cf = fe_target - fe_freq
+        demod_cf = fe_target - self.src.get_freq()
         self.demod.tune( demod_cf )
 
 class radio_frame( ui_frame ):
@@ -88,35 +107,30 @@ class radio_frame( ui_frame ):
         agc_ref = self.block.agc.offs.k()
         self.agc_ref.SetValue( str( agc_ref ) )
         self.agc_ref_s.SetValue( 5 )
-
-        self.fespectrum = fftsink.fft_sink_c(
-            self.block.graph,
+        
+        self.fespectrum = fftsink2.fft_sink_c(
             self.fe_panel,
             fft_size=512,
             sample_rate = block.fe_rate,
-            baseband_freq = 0,
-            average = False,
-            size = ( 680, 140 ) )
+            ref_scale = 1.0,
+            ref_level = 20.0,
+            y_divs = 12,
+            avg_alpha = 0.1)
 
-        self.ifspectrum = fftsink.fft_sink_c(
-            self.block.graph,
+        self.ifspectrum = fftsink2.fft_sink_c(
             self.if_panel,
             fft_size=512,
             sample_rate = block.audio_rate,
-            baseband_freq = 0,
-            average = False,
-            size = ( 680, 140 ) )
-
-        em.eventManager.Register( self.fe_mouse,
-                                  wx.EVT_MOTION,
-                                  self.fespectrum.win )
+            ref_scale = 1.0,
+            ref_level = 20.0,
+            y_divs = 12,
+            avg_alpha = 0.1)
 
-        em.eventManager.Register( self.fe_click,
-                                  wx.EVT_LEFT_DOWN,
-                                  self.fespectrum.win )
+        self.fespectrum.win.Bind( wx.EVT_MOTION, self.fe_mouse)
+        self.fespectrum.win.Bind( wx.EVT_LEFT_DOWN, self.fe_click)
 
-        block.graph.connect( block.src.src, self.fespectrum )
-        block.graph.connect( block.demod.xlate, self.ifspectrum )
+        block.connect( block.src.src, self.fespectrum )
+        block.connect( block.demod.xlate, self.ifspectrum )
 
     def agc_ref_up( self, event ):
         self.agc_ref_s.SetValue( 5 )
@@ -232,7 +246,7 @@ class radio_frame( ui_frame ):
         self.tune( self.freq_disp.GetValue() - 1e6 )
 
     def event_pga( self, event ):
-        self.block.src.src.set_pga( 0, self.pga.GetValue())
+        self.block.src.set_gain(self.pga.GetValue())
         
     def event_vol( self, event ):
         self.block.out.set( self.volume.GetValue()/20.0 )
@@ -267,38 +281,39 @@ class radio_frame( ui_frame ):
 
 class radio( wx.App ):
     def OnInit( self ):
-        self.graph = gr.flow_graph()
-        self.block = graph( self.graph )
-        self.frame = radio_frame( self.block, None, -1, "Title" )
+        self.block = radio_top_block()
+        self.frame = radio_frame( self.block, None, -1, "HF Receiver" )
         self.frame.Show( True )
         self.SetTopWindow( self.frame )
+        self.block.start()
         return True
 
-a=radio( 0 )
-
-l=gr.probe_signal_f()
-#l=gr.probe_avg_mag_sqrd_f(1,.001)
-a.graph.connect(a.block.agc.offs,l )
-#a.graph.connect(a.block.demod,l)
-
-def main_function():
-    global a
-    a.MainLoop()
-
-
 def rssi_function():
-    global a
-    global l
-    while 1:
-        level = l.level()
-        wx.CallAfter( a.frame.setrssi, level )
-        time.sleep( .1 )
-
-thread1 = Thread( target = main_function )
-thread2 = Thread( target = rssi_function )
-
-thread1.start()
-thread2.start()
-
-a.graph.start()
+    global radio_obj
+    global sig_probe
+
+    go = True
+    while go:
+        try:
+            level = sig_probe.level()
+            wx.CallAfter( radio_obj.frame.setrssi, level )
+            time.sleep( .1 )
+        except:
+            go = False
+
+def main():
+    global radio_obj, sig_probe
+
+    radio_obj = radio( 0 )
+    sig_probe = gr.probe_signal_f()
+    radio_obj.block.connect(radio_obj.block.agc.offs, sig_probe)
+
+    thread2 = Thread( target = rssi_function )
+    thread2.start()
+      
+    radio_obj.MainLoop()
+    
+
+if __name__ == "__main__":
+    main()
 
diff --git a/gnuradio-examples/python/apps/hf_radio/radio.xml b/gr-uhd/apps/hf_radio/radio.xml
index 81daa19b0..81daa19b0 100644
--- a/gnuradio-examples/python/apps/hf_radio/radio.xml
+++ b/gr-uhd/apps/hf_radio/radio.xml
diff --git a/gnuradio-examples/python/apps/hf_radio/ssb_taps b/gr-uhd/apps/hf_radio/ssb_taps
index 0ef3bbf26..0ef3bbf26 100644
--- a/gnuradio-examples/python/apps/hf_radio/ssb_taps
+++ b/gr-uhd/apps/hf_radio/ssb_taps
diff --git a/gr-uhd/apps/hf_radio/ssbagc.py b/gr-uhd/apps/hf_radio/ssbagc.py
new file mode 100644
index 000000000..494712863
--- /dev/null
+++ b/gr-uhd/apps/hf_radio/ssbagc.py
@@ -0,0 +1,70 @@
+# 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.
+ 
+
+# post detection agc processing
+#
+# This agc strategy is copied more or less verbatim from
+# weaver_isb_am1_usrp3.py by cswiger.
+#
+# Thanks.
+#
+# Then modified in a variety of ways.
+#
+# There doesn't appear to be a way to hook multiple blocks to the
+# input port when building a hier block like this. Thus the
+# split below.
+#
+# Basic operation.
+# Power is estimated by squaring the input.
+# Low pass filter using a 1 pole iir.
+# The time constant can be tweaked by changing the taps.
+# Currently there is no implementation to change this while operating
+#   a potentially useful addition.
+# The log block turns this into dB
+# gain adjusts the agc authority.
+#
+# M. Revnell 2006-Jan
+
+from gnuradio import gr
+
+class agc( gr.hier_block2 ):
+    def __init__( self ):
+        gr.hier_block2.__init__(self, "agc",
+                                gr.io_signature(1,1,gr.sizeof_float),
+                                gr.io_signature(1,1,gr.sizeof_float))
+
+        self.split = gr.multiply_const_ff( 1 )
+        self.sqr   = gr.multiply_ff( )
+        self.int0  = gr.iir_filter_ffd( [.004, 0], [0, .999] )
+        self.offs  = gr.add_const_ff( -30 )
+        self.gain  = gr.multiply_const_ff( 70 )
+        self.log   = gr.nlog10_ff( 10, 1 )
+        self.agc   = gr.divide_ff( )
+
+        self.connect(self,       self.split)
+        self.connect(self.split, (self.agc, 0))
+        self.connect(self.split, (self.sqr, 0))
+        self.connect(self.split, (self.sqr, 1))
+        self.connect(self.sqr,    self.int0)
+        self.connect(self.int0,   self.log)
+        self.connect(self.log,    self.offs)
+        self.connect(self.offs,   self.gain)
+        self.connect(self.gain,  (self.agc, 1))
+        self.connect(self.agc,    self)
diff --git a/gnuradio-examples/python/apps/hf_radio/ssbdemod.py b/gr-uhd/apps/hf_radio/ssbdemod.py
index c73567b66..072d317a2 100644
--- a/gnuradio-examples/python/apps/hf_radio/ssbdemod.py
+++ b/gr-uhd/apps/hf_radio/ssbdemod.py
@@ -1,8 +1,26 @@
+# 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.
+# 
+
 # This tries to push the hilbert transform for ssb demod back into the
 # freq. xlating filter.
 #
-# The usual gnuradio copyright notice is hereby included by reference.
-#
 # The starting point for this was weaver_isb_am1_usrp3.py.
 #
 # The tap coefficients for freq_xlating_fir_filter_ccf were generated
@@ -13,16 +31,17 @@
 # They were generated using Scilab which I am already familiar with.
 # M. Revnell Jan 06
 
-from gnuradio import gr, gru
-from gnuradio import audio
-from gnuradio import usrp
+from gnuradio import gr
 
-class ssb_demod( gr.hier_block ):
-    def __init__( self, fg, if_rate, af_rate ):
+class ssb_demod( gr.hier_block2 ):
+    def __init__( self, if_rate, af_rate ):
+        gr.hier_block2.__init__(self, "ssb_demod",
+                                gr.io_signature(1,1,gr.sizeof_gr_complex),
+                                gr.io_signature(1,1,gr.sizeof_float))
 
-        self.if_rate  = if_rate
-        self.af_rate  = af_rate
-        self.if_decim = if_rate / af_rate
+        self.if_rate  = int(if_rate)
+        self.af_rate  = int(af_rate)
+        self.if_decim = int(if_rate / af_rate)
         self.sideband = 1
 
         self.xlate_taps = ([complex(v) for v in file('ssb_taps').readlines()])
@@ -51,17 +70,17 @@ class ssb_demod( gr.hier_block ):
         self.mixer  = gr.add_ff()
         self.am_det = gr.complex_to_mag()
                 
-        fg.connect(   self.xlate,       self.split      )
-        fg.connect( ( self.split,0 ), ( self.sum,0    ) )
-        fg.connect( ( self.split,1 ), ( self.sum,1    ) )
-        fg.connect(    self.sum,        self.sb_sel     )
-        fg.connect(    self.xlate,      self.am_det     )
-        fg.connect(    self.sb_sel,   ( self.mixer, 0 ) )
-        fg.connect(    self.am_det,     self.am_sel     )
-        fg.connect(    self.am_sel,   ( self.mixer, 1 ) )
-        fg.connect(    self.mixer,      self.lpf        )
-        
-        gr.hier_block.__init__( self, fg, self.xlate, self.lpf )
+        self.connect(self,             self.xlate)
+        self.connect(self.xlate,       self.split)
+        self.connect((self.split, 0), (self.sum, 0))
+        self.connect((self.split, 1), (self.sum, 1))
+        self.connect(self.sum,         self.sb_sel)
+        self.connect(self.xlate,       self.am_det)
+        self.connect(self.sb_sel,     (self.mixer, 0))
+        self.connect(self.am_det,      self.am_sel)
+        self.connect(self.am_sel,     (self.mixer, 1))
+        self.connect(self.mixer,       self.lpf)
+        self.connect(self.lpf,         self)
 
     def upper_sb( self ):
         self.xlate.set_taps([v.conjugate() for v in self.xlate_taps])    
diff --git a/gnuradio-examples/python/apps/hf_radio/startup.py b/gr-uhd/apps/hf_radio/startup.py
index 093369b57..093369b57 100644
--- a/gnuradio-examples/python/apps/hf_radio/startup.py
+++ b/gr-uhd/apps/hf_radio/startup.py
diff --git a/gnuradio-examples/python/apps/hf_radio/ui.py b/gr-uhd/apps/hf_radio/ui.py
index 71b73c128..551a30415 100755
--- a/gnuradio-examples/python/apps/hf_radio/ui.py
+++ b/gr-uhd/apps/hf_radio/ui.py
@@ -1,4 +1,25 @@
 #!/usr/bin/env python
+#
+# 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.
+# 
+
 # -*- coding: UTF-8 -*-
 # generated by wxGlade 0.4 on Mon Jan  2 19:02:03 2006
 
diff --git a/gr-uhd/apps/uhd_fft.py b/gr-uhd/apps/uhd_fft.py
index 87952ef3a..7f529a528 100755
--- a/gr-uhd/apps/uhd_fft.py
+++ b/gr-uhd/apps/uhd_fft.py
@@ -20,16 +20,23 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru
+from gnuradio import gr
 from gnuradio import uhd
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider
 from optparse import OptionParser
-import wx
+
 import sys
 import numpy
 
+try:
+    from gnuradio.wxgui import stdgui2, form, slider
+    from gnuradio.wxgui import fftsink2, waterfallsink2, scopesink2
+    import wx
+except ImportError:
+    sys.stderr.write("Error importing GNU Radio's wxgui. Please make sure gr-wxgui is installed.\n")
+    sys.exit(1)
+
 class app_top_block(stdgui2.std_top_block):
     def __init__(self, frame, panel, vbox, argv):
         stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
@@ -38,8 +45,10 @@ class app_top_block(stdgui2.std_top_block):
         self.panel = panel
         
         parser = OptionParser(option_class=eng_option)
-        parser.add_option("-a", "--address", type="string", default="addr=192.168.10.2",
-                          help="Address of UHD device, [default=%default]")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args , [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
         parser.add_option("-A", "--antenna", type="string", default=None,
                           help="select Rx Antenna where appropriate")
         parser.add_option("-s", "--samp-rate", type="eng_float", default=1e6,
@@ -65,7 +74,7 @@ class app_top_block(stdgui2.std_top_block):
 	self.options = options
         self.show_debug_info = True
         
-        self.u = uhd.usrp_source(device_addr=options.address,
+        self.u = uhd.usrp_source(device_addr=options.args,
                                  io_type=uhd.io_type.COMPLEX_FLOAT32,
                                  num_channels=1)
 
@@ -74,7 +83,8 @@ class app_top_block(stdgui2.std_top_block):
         
         if options.waterfall:
             self.scope = \
-              waterfallsink2.waterfall_sink_c (panel, fft_size=1024, sample_rate=input_rate)
+              waterfallsink2.waterfall_sink_c (panel, fft_size=1024,
+                                               sample_rate=input_rate)
             self.frame.SetMinSize((800, 420))
         elif options.oscilloscope:
             self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate)
@@ -109,14 +119,18 @@ class app_top_block(stdgui2.std_top_block):
             
         self.set_gain(options.gain)
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
         if(options.antenna):
             self.u.set_antenna(options.antenna, 0)
 
         if self.show_debug_info:
             self.myform['samprate'].set_value(self.u.get_samp_rate())
-            self.myform['fs@gbe'].set_value(input_rate)
-            self.myform['baseband'].set_value(0)
-            self.myform['ddc'].set_value(0)
+            self.myform['rffreq'].set_value(0)
+            self.myform['dspfreq'].set_value(0)
 
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
@@ -137,14 +151,16 @@ class app_top_block(stdgui2.std_top_block):
         hbox.Add((5,0), 0, 0)
         myform['freq'] = form.float_field(
             parent=self.panel, sizer=hbox, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
+            callback=myform.check_input_and_call(_form_set_freq,
+                                                 self._set_status_msg))
 
         hbox.Add((5,0), 0, 0)
         g = self.u.get_gain_range()
 
 	# some configurations don't have gain control
 	if g.stop() > g.start():
-    	    myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
+    	    myform['gain'] = form.slider_field(parent=self.panel,
+                                               sizer=hbox, label="Gain",
                                                weight=3,
                                                min=int(g.start()), max=int(g.stop()),
                                                callback=self.set_gain)
@@ -175,19 +191,16 @@ class app_top_block(stdgui2.std_top_block):
         hbox.Add((5,0), 0)
         myform['samprate'] = form.float_field(
             parent=panel, sizer=hbox, label="Sample Rate",
-            callback=myform.check_input_and_call(_form_set_samp_rate, self._set_status_msg))
+            callback=myform.check_input_and_call(_form_set_samp_rate,
+                                                 self._set_status_msg))
 
         hbox.Add((5,0), 1)
-        myform['fs@gbe'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Fs@GbE")
+        myform['rffreq'] = form.static_float_field(
+            parent=panel, sizer=hbox, label="RF Freq.")
 
         hbox.Add((5,0), 1)
-        myform['baseband'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Analog BB")
-
-        hbox.Add((5,0), 1)
-        myform['ddc'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC")
+        myform['dspfreq'] = form.static_float_field(
+            parent=panel, sizer=hbox, label="DSP Freq.")
 
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -198,19 +211,13 @@ class app_top_block(stdgui2.std_top_block):
 
         @param target_freq: frequency in Hz
         @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
         """
         r = self.u.set_center_freq(target_freq, 0)
 
         if r:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-            if self.show_debug_info:
-                self.myform['baseband'].set_value(r.actual_rf_freq)
-                self.myform['ddc'].set_value(r.actual_dsp_freq)
+            self.myform['freq'].set_value(self.u.get_center_freq())
+            self.myform['rffreq'].set_value(r.actual_rf_freq)
+            self.myform['dspfreq'].set_value(r.actual_dsp_freq)
 	    if not self.options.oscilloscope:
 		self.scope.set_baseband_freq(target_freq)
     	    return True
@@ -228,7 +235,6 @@ class app_top_block(stdgui2.std_top_block):
         self.scope.set_sample_rate(input_rate)
         if self.show_debug_info:  # update displayed values
             self.myform['samprate'].set_value(self.u.get_samp_rate())
-            self.myform['fs@gbe'].set_value(input_rate)
 
         # uhd set_samp_rate never fails; always falls back to closest requested.
         return True  
diff --git a/gr-uhd/apps/uhd_rx_cfile.py b/gr-uhd/apps/uhd_rx_cfile.py
index f49052d9c..625de36d3 100755
--- a/gr-uhd/apps/uhd_rx_cfile.py
+++ b/gr-uhd/apps/uhd_rx_cfile.py
@@ -41,12 +41,12 @@ class rx_cfile_block(gr.top_block):
 
         # Create a UHD device source
         if options.output_shorts:
-            self._u = uhd.usrp_source(device_addr=options.address,
+            self._u = uhd.usrp_source(device_addr=options.args,
                                      io_type=uhd.io_type.COMPLEX_INT16,
                                      num_channels=1)
             self._sink = gr.file_sink(gr.sizeof_short*2, filename)
         else:
-            self._u = uhd.usrp_source(device_addr=options.address,
+            self._u = uhd.usrp_source(device_addr=options.args,
                                      io_type=uhd.io_type.COMPLEX_FLOAT32,
                                      num_channels=1)
             self._sink = gr.file_sink(gr.sizeof_gr_complex, filename)
@@ -61,6 +61,10 @@ class rx_cfile_block(gr.top_block):
 	    print "Using mid-point gain of", options.gain, "(", g.start(), "-", g.stop(), ")"
         self._u.set_gain(options.gain)
 
+        # Set the subdevice spec
+        if(options.spec):
+            self._u.set_subdev_spec(options.spec, 0)
+
         # Set the antenna
         if(options.antenna):
             self._u.set_antenna(options.antenna, 0)
@@ -89,7 +93,7 @@ class rx_cfile_block(gr.top_block):
         input_rate = self._u.get_samp_rate()
         
         if options.verbose:
-            print "Address:", options.address
+            print "Args: ", options.args
             print "Rx gain:", options.gain
             print "Rx baseband frequency:", n2s(tr.actual_rf_freq)
             print "Rx DDC frequency:", n2s(tr.actual_dsp_freq)
@@ -107,8 +111,10 @@ class rx_cfile_block(gr.top_block):
 def get_options():
     usage="%prog: [options] output_filename"
     parser = OptionParser(option_class=eng_option, usage=usage)
-    parser.add_option("-a", "--address", type="string", default="addr=192.168.10.2",
-                      help="Address of UHD device, [default=%default]")
+    parser.add_option("-a", "--args", type="string", default="",
+                      help="UHD device address args , [default=%default]")
+    parser.add_option("", "--spec", type="string", default=None,
+                      help="Subdevice of UHD device where appropriate")
     parser.add_option("-A", "--antenna", type="string", default=None,
                       help="select Rx Antenna where appropriate")
     parser.add_option("", "--samp-rate", type="eng_float", default=1e6,
diff --git a/gr-utils/src/python/usrp_rx_nogui.py b/gr-uhd/apps/uhd_rx_nogui.py
index a5d792c8b..25068b3ac 100755
--- a/gr-utils/src/python/usrp_rx_nogui.py
+++ b/gr-uhd/apps/uhd_rx_nogui.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2006,2007 Free Software Foundation, Inc.
+# Copyright 2006,2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,7 +20,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, usrp, optfir, audio, eng_notation, blks2
+from gnuradio import gr, gru, uhd, optfir, audio, blks2
+from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 import sys
@@ -66,75 +67,89 @@ Please see fm_demod.py and am_demod.py for details of the demodulation
 blocks.
 """
 
-# (usrp_decim, channel_decim, audio_decim, channel_pass, channel_stop, demod)
+# (device_rate, channel_rate, audio_rate, channel_pass, channel_stop, demod)
 demod_params = {
-		'AM'  : (250, 16, 1,  5000,   8000, blks2.demod_10k0a3e_cf),
-		'FM'  : (250,  8, 4,  8000,   9000, blks2.demod_20k0f3e_cf),
-		'WFM' : (250,  1, 8, 90000, 100000, blks2.demod_200kf3e_cf)
+		'AM'  : (256e3,  16e3, 16e3,  5000,   8000, blks2.demod_10k0a3e_cf),
+		'FM'  : (256e3,  32e3,  8e3,  8000,   9000, blks2.demod_20k0f3e_cf),
+		'WFM' : (320e3, 320e3, 32e3, 80000, 115000, blks2.demod_200kf3e_cf)
 	       }
 
-class usrp_src(gr.hier_block2):
+class uhd_src(gr.hier_block2):
     """
-    Create a USRP source object supplying complex floats.
+    Create a UHD source object supplying complex floats.
     
     Selects user supplied subdevice or chooses first available one.
 
     Calibration value is the offset from the tuned frequency to 
     the actual frequency.       
     """
-    def __init__(self, subdev_spec, decim, gain=None, calibration=0.0):
-	gr.hier_block2.__init__(self, "usrp_src",
+    def __init__(self, args, spec, antenna, samp_rate, gain=None, calibration=0.0):
+	gr.hier_block2.__init__(self, "uhd_src",
 				gr.io_signature(0, 0, 0),                    # Input signature
 				gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
 
-	self._decim = decim
-        self._src = usrp.source_c()
-        if subdev_spec is None:
-            subdev_spec = usrp.pick_rx_subdevice(self._src)
-        self._subdev = usrp.selected_subdev(self._src, subdev_spec)
-        self._src.set_mux(usrp.determine_rx_mux_value(self._src, subdev_spec))
-        self._src.set_decim_rate(self._decim)
-
+        self._src = uhd.usrp_source(device_addr=args,
+                                    io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                    num_channels=1)
+
+        self._src.set_samp_rate(samp_rate)
+	dev_rate = self._src.get_samp_rate()
+        self._samp_rate = samp_rate
+        
+        # Resampler to get to exactly samp_rate no matter what dev_rate is
+        self._rrate = samp_rate / dev_rate
+        self._resamp = blks2.pfb_arb_resampler_ccf(self._rrate)
+        
 	# If no gain specified, set to midrange
 	if gain is None:
-	    g = self._subdev.gain_range()
-	    gain = (g[0]+g[1])/2.0
-
-        self._subdev.set_gain(gain)
+	    g = self._src.get_gain_range()
+	    gain = (g.start()+g.stop())/2.0
+            print "Using gain: ", gain
+        self._src.set_gain(gain)
+
+        # Set the subdevice spec
+        if(spec):
+            self._src.set_subdev_spec(spec, 0)
+            
+        # Set the antenna
+        if(antenna):
+            self._src.set_antenna(antenna, 0)
+        
         self._cal = calibration
-	self.connect(self._src, self)
+	self.connect(self._src, self._resamp, self)
 
     def tune(self, freq):
-    	result = usrp.tune(self._src, 0, self._subdev, freq+self._cal)
-    	# TODO: deal with residual
+        r = self._src.set_center_freq(freq+self._cal, 0)
 
     def rate(self):
-	return self._src.adc_rate()/self._decim
-
+        return self._samp_rate
+        
 class app_top_block(gr.top_block):
     def __init__(self, options):
 	gr.top_block.__init__(self)
 	self.options = options
 
-	(usrp_decim, channel_decim, audio_decim, 
+	(dev_rate, channel_rate, audio_rate,
 	 channel_pass, channel_stop, demod) = demod_params[options.modulation]
 
-        USRP = usrp_src(options.rx_subdev_spec, # Daugherboard spec
-	                usrp_decim,     	# IF decimation ratio
-			options.gain, 	    	# Receiver gain
-			options.calibration)    # Frequency offset
-	USRP.tune(options.frequency)
-
-	if_rate = USRP.rate()
-        channel_rate = if_rate // channel_decim
-	audio_rate = channel_rate // audio_decim
-
-	CHAN_taps = optfir.low_pass(1.0,         # Filter gain
-				   if_rate, 	 # Sample rate
-				   channel_pass, # One sided modulation bandwidth
-	                           channel_stop, # One sided channel bandwidth
-				   0.1, 	 # Passband ripple
-				   60) 		 # Stopband attenuation
+        DEV = uhd_src(options.args,             # UHD device address
+                      options.spec,             # device subdev spec
+                      options.antenna,          # device antenna
+                      dev_rate,         	# device sample rate
+                      options.gain, 	    	# Receiver gain
+                      options.calibration)      # Frequency offset
+	DEV.tune(options.frequency)
+
+	if_rate = DEV.rate()
+        channel_decim = int(if_rate // channel_rate)
+	audio_decim = int(channel_rate // audio_rate)
+
+	CHAN_taps = optfir.low_pass(1.0,          # Filter gain
+                                    if_rate, 	  # Sample rate
+                                    channel_pass, # One sided modulation bandwidth
+                                    channel_stop, # One sided channel bandwidth
+                                    0.1, 	  # Passband ripple
+                                    60) 	  # Stopband attenuation
 
 	CHAN = gr.freq_xlating_fir_filter_ccf(channel_decim, # Decimation rate
 	                                      CHAN_taps,     # Filter taps
@@ -143,7 +158,7 @@ class app_top_block(gr.top_block):
 
 	RFSQL = gr.pwr_squelch_cc(options.rf_squelch,    # Power threshold
 	                          125.0/channel_rate, 	 # Time constant
-				  channel_rate/20,       # 50ms rise/fall
+				  int(channel_rate/20),  # 50ms rise/fall
 				  False)		 # Zero, not gate output
 
 	AGC = gr.agc_cc(1.0/channel_rate,  # Time constant
@@ -154,7 +169,8 @@ class app_top_block(gr.top_block):
 	DEMOD = demod(channel_rate, audio_decim)
 
 	# From RF to audio
-        self.connect(USRP, CHAN, RFSQL, AGC, DEMOD)
+        #self.connect(DEV, CHAN, RFSQL, AGC, DEMOD)
+        self.connect(DEV, CHAN, DEMOD)
 
 	# Optionally add CTCSS and RSAMP if needed
 	tail = DEMOD
@@ -172,37 +188,52 @@ class app_top_block(gr.top_block):
 	    self.connect(tail, RSAMP)
 	    tail = RSAMP 
 
-	# Send to default audio output
-        AUDIO = audio.sink(options.output_rate, "")
+	# Send to audio output device
+        AUDIO = audio.sink(int(options.output_rate),
+                           options.audio_output)
 	self.connect(tail, AUDIO)
 	
 def main():
     parser = OptionParser(option_class=eng_option)
-    parser.add_option("-f", "--frequency", type="eng_float", default=None,
-                      help="set receive frequency to Hz", metavar="Hz")
-    parser.add_option("-R", "--rx-subdev-spec", type="subdev",
-                      help="select USRP Rx side A or B", metavar="SUBDEV")
-    parser.add_option("-c",   "--calibration", type="eng_float", default=0.0,
-                      help="set frequency offset to Hz", metavar="Hz")
-    parser.add_option("-g", "--gain", type="int", default=None,
-                      help="set RF gain", metavar="dB")
+    parser.add_option("-a", "--args", type="string", default="",
+                      help="UHD device address args , [default=%default]")
+    parser.add_option("", "--spec", type="string", default=None,
+                      help="Subdevice of UHD device where appropriate")
+    parser.add_option("-A", "--antenna", type="string", default=None,
+                      help="select Rx Antenna where appropriate [default=%default]")
+    parser.add_option("-f", "--frequency", type="eng_float",
+                      default=None, metavar="Hz",
+                      help="set receive frequency to Hz [default=%default]")
+    parser.add_option("-c",   "--calibration", type="eng_float",
+                      default=0.0, metavar="Hz",
+                      help="set frequency offset to Hz [default=%default]")
+    parser.add_option("-g", "--gain", type="int",
+                      metavar="dB", default=None,
+                      help="set RF gain [default is midpoint]")
     parser.add_option("-m", "--modulation", type="choice", choices=('AM','FM','WFM'),
-                      help="set modulation type (AM,FM)", metavar="TYPE")
-    parser.add_option("-o", "--output-rate", type="int", default=32000,
-                      help="set audio output rate to RATE", metavar="RATE")
-    parser.add_option("-r", "--rf-squelch", type="eng_float", default=-50.0,
-                      help="set RF squelch to dB", metavar="dB")
+                      metavar="TYPE", default=None,
+                      help="set modulation type (AM,FM) [default=%default]")
+    parser.add_option("-o", "--output-rate", type="eng_float",
+                      default=32000, metavar="RATE",
+                      help="set audio output rate to RATE [default=%default]")
+    parser.add_option("-r", "--rf-squelch", type="eng_float",
+                      default=-50.0, metavar="dB",
+                      help="set RF squelch to dB [default=%default]")
     parser.add_option("-p", "--ctcss", type="float",
-		      help="set CTCSS squelch to FREQ", metavar="FREQ")
+                      default=None, metavar="FREQ",
+		      help="set CTCSS squelch to FREQ [default=%default]")
+    parser.add_option("-O", "--audio-output", type="string", default="",
+                      help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
     (options, args) = parser.parse_args()
 
     if options.frequency is None:
-	print "Must supply receive frequency with -f"
+	sys.stderr.write("Must supply receive frequency with -f.\n")
 	sys.exit(1)
 
-    if options.frequency < 1e6:
-	options.frequency *= 1e6
-	
+    if options.modulation is None:
+        sys.stderr.write("Must supply a modulation type (AM, FM, WFM).\n")
+        sys.exit(1)
+        
     tb = app_top_block(options)
     try:
         tb.run()
diff --git a/gr-utils/src/python/usrp_siggen.py b/gr-uhd/apps/uhd_siggen.py
index da83da770..4b7060460 100755
--- a/gr-utils/src/python/usrp_siggen.py
+++ b/gr-uhd/apps/uhd_siggen.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2008,2009 Free Software Foundation, Inc.
+# Copyright 2008,2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -23,12 +23,10 @@
 DESC_KEY = 'desc'
 SAMP_RATE_KEY = 'samp_rate'
 LINK_RATE_KEY = 'link_rate'
-DAC_RATE_KEY = 'dac_rate'
-INTERP_KEY = 'interp'
 GAIN_KEY = 'gain'
 TX_FREQ_KEY = 'tx_freq'
-DDC_FREQ_KEY = 'ddc_freq'
-BB_FREQ_KEY = 'bb_freq'
+DSP_FREQ_KEY = 'dsp_freq'
+RF_FREQ_KEY = 'rf_freq'
 AMPLITUDE_KEY = 'amplitude'
 AMPL_RANGE_KEY = 'ampl_range'
 WAVEFORM_FREQ_KEY = 'waveform_freq'
@@ -40,10 +38,9 @@ TYPE_KEY = 'type'
 
 def setter(ps, key, val): ps[key] = val
 
-from gnuradio import gr, eng_notation
+from gnuradio import gr, uhd, eng_notation
 from gnuradio.gr.pubsub import pubsub
 from gnuradio.eng_option import eng_option
-from gnuradio import usrp_options
 from optparse import OptionParser
 import sys
 import math
@@ -66,40 +63,54 @@ class top_block(gr.top_block, pubsub):
         gr.top_block.__init__(self)
         pubsub.__init__(self)
         self._verbose = options.verbose
+
         #initialize values from options
         self._setup_usrpx(options)
-        self.subscribe(INTERP_KEY, lambda i: setter(self, SAMP_RATE_KEY, self[DAC_RATE_KEY]/i))
-        self.subscribe(SAMP_RATE_KEY, lambda e: setter(self, LINK_RATE_KEY, e*32))
-        self[INTERP_KEY] = options.interp or 16
+        self[SAMP_RATE_KEY] = options.samp_rate
         self[TX_FREQ_KEY] = options.tx_freq
         self[AMPLITUDE_KEY] = options.amplitude
         self[WAVEFORM_FREQ_KEY] = options.waveform_freq
         self[WAVEFORM_OFFSET_KEY] = options.offset
         self[WAVEFORM2_FREQ_KEY] = options.waveform2_freq
-        self[BB_FREQ_KEY] = 0
-        self[DDC_FREQ_KEY] = 0
+        self[DSP_FREQ_KEY] = 0
+        self[RF_FREQ_KEY] = 0
+
         #subscribe set methods
-        self.subscribe(INTERP_KEY, self.set_interp)
+        self.subscribe(SAMP_RATE_KEY, self.set_samp_rate)
         self.subscribe(GAIN_KEY, self.set_gain)
         self.subscribe(TX_FREQ_KEY, self.set_freq)
         self.subscribe(AMPLITUDE_KEY, self.set_amplitude)
         self.subscribe(WAVEFORM_FREQ_KEY, self.set_waveform_freq)
         self.subscribe(WAVEFORM2_FREQ_KEY, self.set_waveform2_freq)
         self.subscribe(TYPE_KEY, self.set_waveform)
+
         #force update on pubsub keys
-        for key in (INTERP_KEY, GAIN_KEY, TX_FREQ_KEY,
-            AMPLITUDE_KEY, WAVEFORM_FREQ_KEY, WAVEFORM_OFFSET_KEY, WAVEFORM2_FREQ_KEY):
+        for key in (SAMP_RATE_KEY, GAIN_KEY, TX_FREQ_KEY, 
+                    AMPLITUDE_KEY, WAVEFORM_FREQ_KEY,
+                    WAVEFORM_OFFSET_KEY, WAVEFORM2_FREQ_KEY):
             self[key] = self[key]
         self[TYPE_KEY] = options.type #set type last
 
     def _setup_usrpx(self, options):
-        self._u = usrp_options.create_usrp_sink(options)
+        self._u = uhd.usrp_sink(device_addr=options.args,
+                                io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                num_channels=1)
+        self._u.set_samp_rate(options.samp_rate)
+
+        # Set the subdevice spec
+        if(options.spec):
+            self._u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self._u.set_antenna(options.antenna, 0)
+
         self.publish(DESC_KEY, lambda: str(self._u))
-        self.publish(DAC_RATE_KEY, self._u.dac_rate)
-        self.publish(FREQ_RANGE_KEY, self._u.freq_range)
-        self.publish(GAIN_RANGE_KEY, self._u.gain_range)
-        self.publish(GAIN_KEY, self._u.gain)
-        if self._verbose: print str(self._u)
+        self.publish(FREQ_RANGE_KEY, self._u.get_freq_range)
+        self.publish(GAIN_RANGE_KEY, self._u.get_gain_range)
+        self.publish(GAIN_KEY, self._u.get_gain)
+        if self._verbose:
+            print str(self._u)
 
     def _set_tx_amplitude(self, ampl):
         """
@@ -107,16 +118,13 @@ class top_block(gr.top_block, pubsub):
         @param ampl the amplitude or None for automatic
         """
         ampl_range = self[AMPL_RANGE_KEY]
-        if ampl is None: ampl = (ampl_range[1] - ampl_range[0])*0.15 + ampl_range[0]
+        if ampl is None:
+            ampl = (ampl_range[1] - ampl_range[0])*0.15 + ampl_range[0]
         self[AMPLITUDE_KEY] = max(ampl_range[0], min(ampl, ampl_range[1]))
 
-    def set_interp(self, interp):
-        if not self._u.set_interp(interp):
-            raise RuntimeError("Failed to set interpolation rate %i" % (interp,))
-
-        if self._verbose:
-            print "USRP interpolation rate:", interp
-            print "USRP IF bandwidth: %sHz" % (n2s(self[SAMP_RATE_KEY]),)
+    def set_samp_rate(self, sr):
+        self._u.set_samp_rate(sr)
+        sr = self._u.get_samp_rate()
 
         if self[TYPE_KEY] in (gr.GR_SIN_WAVE, gr.GR_CONST_WAVE):
             self._src.set_sampling_freq(self[SAMP_RATE_KEY])
@@ -129,7 +137,9 @@ class top_block(gr.top_block, pubsub):
         else:
             return True # Waveform not yet set
         
-        if self._verbose: print "Set interpolation rate to:", interp
+        if self._verbose:
+            print "Set sample rate to:", sr
+
         return True
 
     def set_gain(self, gain):
@@ -158,14 +168,14 @@ class top_block(gr.top_block, pubsub):
         fs = "%sHz" % (n2s(target_freq),)
         if tr is not None:
             self._freq = target_freq
-            self[DDC_FREQ_KEY] = tr.dxc_freq
-            self[BB_FREQ_KEY] = tr.baseband_freq
+            self[DSP_FREQ_KEY] = tr.actual_dsp_freq
+            self[RF_FREQ_KEY] = tr.actual_rf_freq
             if self._verbose:
-                print "Set center frequency to", fs
-                print "Tx baseband frequency: %sHz" % (n2s(tr.baseband_freq),)
-                print "Tx DDC frequency: %sHz" % (n2s(tr.dxc_freq),)
-                print "Tx residual frequency: %sHz" % (n2s(tr.residual_freq),)
-        elif self._verbose: print "Failed to set freq." 
+                print "Set center frequency to", self._u.get_center_freq()
+                print "Tx RF frequency:  %sHz" % (n2s(tr.actual_rf_freq),)
+                print "Tx DSP frequency: %sHz" % (n2s(tr.actual_dsp_freq),)
+        elif self._verbose:
+            print "Failed to set freq." 
         return tr
 
     def set_waveform_freq(self, freq):
@@ -254,7 +264,8 @@ class top_block(gr.top_block, pubsub):
 
     def set_amplitude(self, amplitude):
         if amplitude < 0.0 or amplitude > 1.0:
-            if self._verbose: print "Amplitude out of range:", amplitude
+            if self._verbose:
+                print "Amplitude out of range:", amplitude
             return False
 
         if self[TYPE_KEY] in (gr.GR_SIN_WAVE, gr.GR_CONST_WAVE, gr.GR_GAUSSIAN, gr.GR_UNIFORM):
@@ -267,22 +278,34 @@ class top_block(gr.top_block, pubsub):
         else:
             return True # Waveform not yet set
         
-        if self._verbose: print "Set amplitude to:", amplitude
+        if self._verbose:
+            print "Set amplitude to:", amplitude
         return True
 
 def get_options():
     usage="%prog: [options]"
 
     parser = OptionParser(option_class=eng_option, usage=usage)
-    usrp_options.add_tx_options(parser)
+    parser.add_option("-a", "--args", type="string", default="",
+                      help="UHD device address args , [default=%default]")
+    parser.add_option("", "--spec", type="string", default=None,
+                      help="Subdevice of UHD device where appropriate")
+    parser.add_option("-A", "--antenna", type="string", default=None,
+                      help="select Rx Antenna where appropriate")
+    parser.add_option("-s", "--samp-rate", type="eng_float", default=1e6,
+                      help="set sample rate (bandwidth) [default=%default]")
+    parser.add_option("-g", "--gain", type="eng_float", default=None,
+                      help="set gain in dB (default is midpoint)")
     parser.add_option("-f", "--tx-freq", type="eng_float", default=None,
-                      help="Set carrier frequency to FREQ [default=mid-point]", metavar="FREQ")
+                      help="Set carrier frequency to FREQ [default=mid-point]",
+                      metavar="FREQ")
     parser.add_option("-x", "--waveform-freq", type="eng_float", default=0,
                       help="Set baseband waveform frequency to FREQ [default=%default]")
     parser.add_option("-y", "--waveform2-freq", type="eng_float", default=None,
                       help="Set 2nd waveform frequency to FREQ [default=%default]")
     parser.add_option("--sine", dest="type", action="store_const", const=gr.GR_SIN_WAVE,
-                      help="Generate a carrier modulated by a complex sine wave", default=gr.GR_SIN_WAVE)
+                      help="Generate a carrier modulated by a complex sine wave",
+                      default=gr.GR_SIN_WAVE)
     parser.add_option("--const", dest="type", action="store_const", const=gr.GR_CONST_WAVE, 
                       help="Generate a constant carrier")
     parser.add_option("--offset", type="eng_float", default=0,
@@ -295,8 +318,9 @@ def get_options():
                       help="Generate Two Tone signal for IMD testing")
     parser.add_option("--sweep", dest="type", action="store_const", const="sweep",
                       help="Generate a swept sine wave")
-    parser.add_option("-A", "--amplitude", type="eng_float", default=0.15,
-                      help="Set output amplitude to AMPL (0.0-1.0) [default=%default]", metavar="AMPL")
+    parser.add_option("", "--amplitude", type="eng_float", default=0.15,
+                      help="Set output amplitude to AMPL (0.0-1.0) [default=%default]",
+                      metavar="AMPL")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Use verbose console output [default=%default]")
 
@@ -304,7 +328,8 @@ def get_options():
 
     return (options, args)
 
-# If this script is executed, the following runs. If it is imported, the below does not run.
+# If this script is executed, the following runs. If it is imported,
+# the below does not run.
 def main():
     if gr.enable_realtime_scheduling() != gr.RT_OK:
         print "Note: failed to enable realtime scheduling, continuing"
@@ -328,4 +353,5 @@ def main():
 # which will call the decontructor on usrp and stop transmit.
 # Whats odd is that grc works fine with tb in the __main__,
 # perhaps its because the try/except clauses around tb.
-if __name__ == "__main__": main()
+if __name__ == "__main__":
+    main()
diff --git a/gr-utils/src/python/usrp_siggen_gui.py b/gr-uhd/apps/uhd_siggen_gui.py
index 47d47bdb3..2ef6ea40f 100755
--- a/gr-utils/src/python/usrp_siggen_gui.py
+++ b/gr-uhd/apps/uhd_siggen_gui.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -24,7 +24,7 @@ import wx
 from gnuradio import gr
 from gnuradio.gr.pubsub import pubsub
 from gnuradio.wxgui import gui, forms
-import usrp_siggen
+import uhd_siggen
 import sys, math
 
 class app_gui(pubsub):
@@ -62,14 +62,14 @@ class app_gui(pubsub):
             sweep_bb_hbox.ShowItems(type == 'sweep')
             tone_bb_hbox.ShowItems(type == '2tone')
             self.vbox.Layout()
-        self.tb.subscribe(usrp_siggen.TYPE_KEY, set_type)
+        self.tb.subscribe(uhd_siggen.TYPE_KEY, set_type)
         #create sine forms
         sine_bb_hbox.AddSpacer(10)
         forms.text_box(
             parent=self.panel, sizer=sine_bb_hbox,
             label='Frequency (Hz)',
             ps=self.tb,
-            key=usrp_siggen.WAVEFORM_FREQ_KEY,
+            key=uhd_siggen.WAVEFORM_FREQ_KEY,
             converter=forms.float_converter(),
         )
         sine_bb_hbox.AddStretchSpacer()
@@ -79,7 +79,7 @@ class app_gui(pubsub):
             parent=self.panel, sizer=sweep_bb_hbox,
             label='Sweep Width (Hz)',
             ps=self.tb,
-            key=usrp_siggen.WAVEFORM_FREQ_KEY,
+            key=uhd_siggen.WAVEFORM_FREQ_KEY,
             converter=forms.float_converter(),
         )
         sweep_bb_hbox.AddStretchSpacer()
@@ -87,7 +87,7 @@ class app_gui(pubsub):
             parent=self.panel, sizer=sweep_bb_hbox,
             label='Sweep Rate (Hz)',
             ps=self.tb,
-            key=usrp_siggen.WAVEFORM2_FREQ_KEY,
+            key=uhd_siggen.WAVEFORM2_FREQ_KEY,
             converter=forms.float_converter(),
         )
         sweep_bb_hbox.AddStretchSpacer()
@@ -97,7 +97,7 @@ class app_gui(pubsub):
             parent=self.panel, sizer=tone_bb_hbox,
             label='Tone 1 (Hz)',
             ps=self.tb,
-            key=usrp_siggen.WAVEFORM_FREQ_KEY,
+            key=uhd_siggen.WAVEFORM_FREQ_KEY,
             converter=forms.float_converter(),
         )
         tone_bb_hbox.AddStretchSpacer()
@@ -105,27 +105,31 @@ class app_gui(pubsub):
             parent=self.panel, sizer=tone_bb_hbox,
             label='Tone 2 (Hz)',
             ps=self.tb,
-            key=usrp_siggen.WAVEFORM2_FREQ_KEY,
+            key=uhd_siggen.WAVEFORM2_FREQ_KEY,
             converter=forms.float_converter(),
         )
         tone_bb_hbox.AddStretchSpacer()
         forms.radio_buttons(
             parent=self.panel, sizer=bb_vbox,
-            choices=usrp_siggen.waveforms.keys(),
-            labels=usrp_siggen.waveforms.values(),
+            choices=uhd_siggen.waveforms.keys(),
+            labels=uhd_siggen.waveforms.values(),
             ps=self.tb,
-            key=usrp_siggen.TYPE_KEY,
+            key=uhd_siggen.TYPE_KEY,
             style=wx.NO_BORDER | wx.RA_HORIZONTAL,
         )
         bb_vbox.AddSpacer(10)
         bb_vbox.Add(sine_bb_hbox, 0, wx.EXPAND)
         bb_vbox.Add(sweep_bb_hbox, 0, wx.EXPAND)
         bb_vbox.Add(tone_bb_hbox, 0, wx.EXPAND)
-        set_type(self.tb[usrp_siggen.TYPE_KEY])
+        set_type(self.tb[uhd_siggen.TYPE_KEY])
+
         ##################################################
         # Frequency controls
         ##################################################
-        fc_vbox = forms.static_box_sizer(parent=self.panel, label="Center Frequency", orient=wx.VERTICAL, bold=True)
+        fc_vbox = forms.static_box_sizer(parent=self.panel,
+                                         label="Center Frequency",
+                                         orient=wx.VERTICAL,
+                                         bold=True)
         fc_vbox.AddSpacer(5)
         # First row of frequency controls (center frequency)
         freq_hbox = wx.BoxSizer(wx.HORIZONTAL)
@@ -145,42 +149,47 @@ class app_gui(pubsub):
             proportion=1,
             converter=forms.float_converter(),
             ps=self.tb,
-            key=usrp_siggen.TX_FREQ_KEY,
+            key=uhd_siggen.TX_FREQ_KEY,
         )
         freq_hbox.AddSpacer(10)
+        
         forms.slider(
             parent=self.panel, sizer=freq_hbox,
             proportion=2,
             ps=self.tb,
-            key=usrp_siggen.TX_FREQ_KEY,
-            minimum=self.tb[usrp_siggen.FREQ_RANGE_KEY][0],
-            maximum=self.tb[usrp_siggen.FREQ_RANGE_KEY][1],
+            key=uhd_siggen.TX_FREQ_KEY,
+            minimum=self.tb[uhd_siggen.FREQ_RANGE_KEY].start(),
+            maximum=self.tb[uhd_siggen.FREQ_RANGE_KEY].stop(),
             num_steps=100,
         )
         freq_hbox.AddSpacer(5)
         tr_hbox.AddSpacer(5)
         forms.static_text(
             parent=self.panel, sizer=tr_hbox,
-            label='Daughterboard (Hz)',
+            label='RF Frequency',
             ps=self.tb,
-            key=usrp_siggen.BB_FREQ_KEY,
+            key=uhd_siggen.RF_FREQ_KEY,
             converter=forms.float_converter(),
             proportion=1,
         )
         tr_hbox.AddSpacer(10)
         forms.static_text(
             parent=self.panel, sizer=tr_hbox,
-            label='USRP DDC (Hz)',
+            label='DSP Frequency',
             ps=self.tb,
-            key=usrp_siggen.DDC_FREQ_KEY,
+            key=uhd_siggen.DSP_FREQ_KEY,
             converter=forms.float_converter(),
             proportion=1,
         )
         tr_hbox.AddSpacer(5)
+
         ##################################################
         # Amplitude controls
         ##################################################
-        amp_hbox = forms.static_box_sizer(parent=self.panel, label="Amplitude", orient=wx.VERTICAL, bold=True)
+        amp_hbox = forms.static_box_sizer(parent=self.panel,
+                                          label="Amplitude",
+                                          orient=wx.VERTICAL,
+                                          bold=True)
         amp_hbox.AddSpacer(5)
         # First row of amp controls (ampl)
         lvl_hbox = wx.BoxSizer(wx.HORIZONTAL)
@@ -199,7 +208,7 @@ class app_gui(pubsub):
             proportion=1,
             converter=forms.float_converter(),
             ps=self.tb,
-            key=usrp_siggen.AMPLITUDE_KEY,
+            key=uhd_siggen.AMPLITUDE_KEY,
             label="Level (0.0-1.0)",
         )
         lvl_hbox.AddSpacer(10)
@@ -207,21 +216,21 @@ class app_gui(pubsub):
             parent=self.panel, sizer=lvl_hbox,
             proportion=2,
             ps=self.tb,
-            key=usrp_siggen.AMPLITUDE_KEY,
+            key=uhd_siggen.AMPLITUDE_KEY,
             min_exp=-6,
             max_exp=0,
             base=10,
             num_steps=100,
         )
         lvl_hbox.AddSpacer(5)
-        if self.tb[usrp_siggen.GAIN_RANGE_KEY][0] < self.tb[usrp_siggen.GAIN_RANGE_KEY][1]:
+        if self.tb[uhd_siggen.GAIN_RANGE_KEY].start() < self.tb[uhd_siggen.GAIN_RANGE_KEY].stop():
             gain_hbox.AddSpacer(5)
             forms.text_box(
                 parent=self.panel, sizer=gain_hbox,
                 proportion=1,
                 converter=forms.float_converter(),
                 ps=self.tb,
-                key=usrp_siggen.GAIN_KEY,
+                key=uhd_siggen.GAIN_KEY,
                 label="TX Gain (dB)",
             )
             gain_hbox.AddSpacer(10)
@@ -229,48 +238,40 @@ class app_gui(pubsub):
                 parent=self.panel, sizer=gain_hbox,
                 proportion=2,
                 ps=self.tb,
-                key=usrp_siggen.GAIN_KEY,
-                minimum=self.tb[usrp_siggen.GAIN_RANGE_KEY][0],
-                maximum=self.tb[usrp_siggen.GAIN_RANGE_KEY][1],
-                step_size=self.tb[usrp_siggen.GAIN_RANGE_KEY][2],
+                key=uhd_siggen.GAIN_KEY,
+                minimum=self.tb[uhd_siggen.GAIN_RANGE_KEY].start(),
+                maximum=self.tb[uhd_siggen.GAIN_RANGE_KEY].stop(),
+                step_size=self.tb[uhd_siggen.GAIN_RANGE_KEY].step(),
             )
             gain_hbox.AddSpacer(5)
+
         ##################################################
         # Sample Rate controls
         ##################################################
-        sam_hbox = forms.static_box_sizer(parent=self.panel, label="Sample Rate", orient=wx.HORIZONTAL, bold=True)
+        sam_hbox = forms.static_box_sizer(parent=self.panel,
+                                          label="Sample Rate",
+                                          orient=wx.HORIZONTAL,
+                                          bold=True)
         self.vbox.Add(sam_hbox, 0, wx.EXPAND)
         self.vbox.AddSpacer(10)
         self.vbox.AddStretchSpacer()
-        sam_hbox.AddSpacer(5)
-        forms.text_box(
-            parent=self.panel, sizer=sam_hbox,
-            converter=forms.int_converter(),
-            ps=self.tb,
-            key=usrp_siggen.INTERP_KEY,
-            label="Interpolation",
-        )
         sam_hbox.AddStretchSpacer(20)
         forms.static_text(
             parent=self.panel, sizer=sam_hbox,
             label='Sample Rate (sps)',
             ps=self.tb,
-            key=usrp_siggen.SAMP_RATE_KEY,
+            key=uhd_siggen.SAMP_RATE_KEY,
             converter=forms.float_converter(),
         )
         sam_hbox.AddStretchSpacer(20)
-        forms.static_text(
-            parent=self.panel, sizer=sam_hbox,
-            label='Link Rate (bits/sec)',
-            ps=self.tb,
-            key=usrp_siggen.LINK_RATE_KEY,
-            converter=forms.float_converter(),
-        )
-        sam_hbox.AddSpacer(5)
+
         ##################################################
-        # USRP status
+        # UHD status
         ##################################################
-        u2_hbox = forms.static_box_sizer(parent=self.panel, label="USRP Status", orient=wx.HORIZONTAL, bold=True)
+        u2_hbox = forms.static_box_sizer(parent=self.panel,
+                                         label="UHD Status",
+                                         orient=wx.HORIZONTAL,
+                                         bold=True)
         self.vbox.Add(u2_hbox, 0, wx.EXPAND)
         self.vbox.AddSpacer(10)
         self.vbox.AddStretchSpacer()
@@ -278,7 +279,7 @@ class app_gui(pubsub):
         forms.static_text(
             parent=self.panel, sizer=u2_hbox,
             ps=self.tb,
-            key=usrp_siggen.DESC_KEY,
+            key=uhd_siggen.DESC_KEY,
             converter=forms.str_converter(),
         )
         self.vbox.AddSpacer(5)
@@ -287,17 +288,17 @@ class app_gui(pubsub):
 def main():
     try:
         # Get command line parameters
-        (options, args) = usrp_siggen.get_options()
+        (options, args) = uhd_siggen.get_options()
 
         # Create the top block using these
-        tb = usrp_siggen.top_block(options, args)
+        tb = uhd_siggen.top_block(options, args)
 
         # Create the GUI application
         app = gui.app(top_block=tb,                    # Constructed top block
                       gui=app_gui,                     # User interface class
                       options=options,                 # Command line options
                       args=args,                       # Command line args
-                      title="USRP Signal Generator",  # Top window title
+                      title="UHD Signal Generator",  # Top window title
                       nstatus=1,                       # Number of status lines
                       start=True,                      # Whether to start flowgraph
                       realtime=True)                   # Whether to set realtime priority
@@ -309,9 +310,9 @@ def main():
         print e
         sys.exit(1)
 
-# Make sure to create the top block (tb) within a function:
-# That code in main will allow tb to go out of scope on return,
-# which will call the decontructor on usrp and stop transmit.
-# Whats odd is that grc works fine with tb in the __main__,
-# perhaps its because the try/except clauses around tb.
+# Make sure to create the top block (tb) within a function: That code
+# in main will allow tb to go out of scope on return, which will call
+# the decontructor on uhd device and stop transmit.  Whats odd is that
+# grc works fine with tb in the __main__, perhaps its because the
+# try/except clauses around tb.
 if __name__ == "__main__": main()
diff --git a/gr-gpio/src/.gitignore b/gr-uhd/doc/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gr-gpio/src/.gitignore
+++ b/gr-uhd/doc/.gitignore
diff --git a/gr-gpio/src/fpga/Makefile.am b/gr-uhd/doc/CMakeLists.txt
index 2b6f2585e..da3021776 100644
--- a/gr-gpio/src/fpga/Makefile.am
+++ b/gr-uhd/doc/CMakeLists.txt
@@ -1,5 +1,4 @@
-#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -17,7 +16,8 @@
 # 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.
-# 
-
-SUBDIRS = include lib top rbf
 
+install(
+    FILES README.uhd
+    DESTINATION ${GR_PKG_DOC_DIR}
+)
diff --git a/gr-radar-mono/src/fpga/Makefile.am b/gr-uhd/doc/Makefile.am
index fb2a09c9c..eee3ebcf6 100644
--- a/gr-radar-mono/src/fpga/Makefile.am
+++ b/gr-uhd/doc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,4 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = lib top tb models
+SUBDIRS =
+
+dist_gr_doc_DATA =		\
+	README.uhd
diff --git a/gr-uhd/doc/README.uhd b/gr-uhd/doc/README.uhd
new file mode 100644
index 000000000..ec8024c09
--- /dev/null
+++ b/gr-uhd/doc/README.uhd
@@ -0,0 +1,14 @@
+This is the GNU Radio UHD package. It is the interface to the UHD
+library to connect to and send and receive data between the Ettus
+Research, LLC product line. To use the UHD blocks, the Python
+namespaces is in gnuradio.uhd, which would be normally imported
+as:
+
+    from gnuradio import uhd
+
+See the Doxygen documentation for details about the blocks available
+in this package. A quick listing of the details can be found in Python
+after importing by using: 
+
+    help(uhd)
+
diff --git a/gr-uhd/doc/uhd.dox b/gr-uhd/doc/uhd.dox
new file mode 100644
index 000000000..92ad7db4c
--- /dev/null
+++ b/gr-uhd/doc/uhd.dox
@@ -0,0 +1,101 @@
+/*! \page page_uhd UHD Interface
+
+\section Introduction
+This is the GNU Radio UHD package. It is the interface to the UHD
+library to connect to and send and receive data between the Ettus
+Research, LLC product line. To use the UHD blocks, the Python
+namespaces is in gnuradio.uhd, which would be normally imported
+as:
+
+\code
+    from gnuradio import uhd
+\endcode
+
+The relevant blocks are listed in the \ref uhd_blk group.
+
+A quick listing of the details can be found in Python after importing
+by using:
+
+\code
+    help(uhd)
+\endcode
+
+
+\section External Documentation
+
+Ettus Research keeps the comprehensive documentation to the underlying UHD driver, which can be found:
+
+    http://files.ettus.com/uhd_docs/manual/html/
+
+The UHD Doxygen page is located:
+
+    http://files.ettus.com/uhd_docs/doxygen/html/index.html
+
+
+\section Typical Setup
+
+A typical option parser setup for a UHD device looks like
+
+\code
+    parser = OptionParser(option_class=eng_option)
+    parser.add_option("-a", "--args", type="string", default="",
+                      help="UHD device address args , [default=%default]")
+    parser.add_option("", "--spec", type="string", default=None,
+                      help="Subdevice of UHD device where appropriate")
+    parser.add_option("-A", "--antenna", type="string", default=None,
+                      help="select Rx Antenna where appropriate")
+    parser.add_option("-s", "--samp-rate", type="eng_float", default=1e6,
+                      help="set sample rate (bandwidth) [default=%default]")
+    parser.add_option("-f", "--freq", type="eng_float", default=None,
+                      help="set frequency to FREQ", metavar="FREQ")
+    parser.add_option("-g", "--gain", type="eng_float", default=None,
+                      help="set gain in dB (default is midpoint)")
+\endcode
+
+To use these options to create a UHD source object:
+
+\code
+    self.u = uhd.usrp_source(device_addr=options.args,
+                             io_type=uhd.io_type.COMPLEX_FLOAT32,
+                             num_channels=1)
+
+    self.u.set_samp_rate(options.samp_rate)
+
+    # if no gain was specified, use the mid-point in dB
+    if options.gain is None:
+        g = self.u.get_gain_range()
+        options.gain = float(g.start()+g.stop())/2
+    self.u.set_gain(options.gain, 0)
+    
+    # Set the center frequency
+    self.u.set_center_freq(options.freq, 0)
+
+    # Set the subdevice spec
+    if(options.spec):
+        self.u.set_subdev_spec(options.spec, 0)
+
+     # Set the antenna
+     if(options.antenna):
+        self.u.set_antenna(options.antenna, 0)
+\endcode
+
+Frequently, your application may need a sample rate that is not
+supported by the UHD device. If you have extra CPU power to spare, you
+can easily set the sample rate you want, then ask the device what the
+actual sample rate set was. Then, you can easily create an arbitrary
+resampler to take care of the difference.
+
+\code
+    self.u.set_samp_rate(options.samp_rate)
+
+    desired_rate = options.samp_rate
+    actual_rate = self.u.get_samp_rate()
+    resample = desired_rate / actual_rate
+
+    # Use the blks2 version and pass only the resample factor.
+    # This block builds a half-band filter for you
+
+    self.resampler = blks2.pfb_arb_resampler_ccf(resample)
+\endcode
+
+*/
diff --git a/gnuradio-examples/python/ofdm/.gitignore b/gr-uhd/examples/.gitignore
index 2f6a10e95..ad8a13c08 100644
--- a/gnuradio-examples/python/ofdm/.gitignore
+++ b/gr-uhd/examples/.gitignore
@@ -1,4 +1,5 @@
 /Makefile
 /Makefile.in
-/*.pyc
-/*.dat
+*.dat
+*.32f
+*.32fc
diff --git a/gr-uhd/examples/CMakeLists.txt b/gr-uhd/examples/CMakeLists.txt
new file mode 100644
index 000000000..91e2dfdaf
--- /dev/null
+++ b/gr-uhd/examples/CMakeLists.txt
@@ -0,0 +1,67 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_UHD_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+include_directories(${UHD_INCLUDE_DIRS})
+link_directories(${UHD_LIBRARY_DIRS})
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# Build executable
+########################################################################
+add_executable(tags_demo tags_demo.cc)
+target_link_libraries(tags_demo gnuradio-uhd)
+
+########################################################################
+# Python examples
+########################################################################
+if(ENABLE_PYTHON)
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    fm_tx4.py
+    fm_tx_2_daughterboards.py
+    max_power.py
+    usrp_am_mw_rcv.py
+    usrp_nbfm_ptt.py
+    usrp_nbfm_rcv.py
+    usrp_spectrum_sense.py
+    usrp_tv_rcv_nogui.py
+    usrp_tv_rcv.py
+    usrp_wfm_rcv2_nogui.py
+    usrp_wfm_rcv_fmdet.py
+    usrp_wfm_rcv_nogui.py
+    usrp_wfm_rcv_pll.py
+    usrp_wfm_rcv.py
+    usrp_wfm_rcv_sca.py
+    usrp_wxapt_rcv.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/uhd
+    COMPONENT "uhd_python"
+)
+
+endif(ENABLE_PYTHON)
diff --git a/gr-usrp/grc/Makefile.am b/gr-uhd/examples/Makefile.am
index 11a5f40dc..a5dc177c4 100644
--- a/gr-usrp/grc/Makefile.am
+++ b/gr-uhd/examples/Makefile.am
@@ -21,22 +21,24 @@
 
 include $(top_srcdir)/Makefile.common
 
-usrp_pythondir = $(pythondir)/grc_gnuradio/usrp
-usrp_python_PYTHON = \
-	__init__.py \
-	common.py \
-	dual_usrp.py \
-	simple_usrp.py
+SUBDIRS = 
 
-dist_bin_SCRIPTS = usrp_probe
+ourdatadir = $(exampledir)/uhd
 
-grcblocksdir = $(grc_blocksdir)
-dist_grcblocks_DATA = \
-	usrp_dual_sink_x.xml \
-	usrp_simple_sink_x.xml \
-	usrp_dual_source_x.xml \
-	usrp_simple_source_x.xml \
-	usrp_probe.xml
-
-ourdatadir = $(pkgdatadir)/grc/freedesktop
-dist_ourdata_DATA = gnuradio-usrp_probe.desktop
+dist_ourdata_SCRIPTS =		\
+	fm_tx4.py		\
+	fm_tx_2_daughterboards.py \
+	max_power.py		\
+	usrp_am_mw_rcv.py	\
+	usrp_nbfm_ptt.py	\
+	usrp_nbfm_rcv.py	\
+	usrp_spectrum_sense.py	\
+	usrp_tv_rcv_nogui.py	\
+	usrp_tv_rcv.py		\
+	usrp_wfm_rcv2_nogui.py	\
+	usrp_wfm_rcv_fmdet.py	\
+	usrp_wfm_rcv_nogui.py	\
+	usrp_wfm_rcv_pll.py	\
+	usrp_wfm_rcv.py		\
+	usrp_wfm_rcv_sca.py	\
+	usrp_wxapt_rcv.py
diff --git a/gnuradio-examples/python/usrp/fm_tx4.py b/gr-uhd/examples/fm_tx4.py
index a51668dde..11148ea63 100755
--- a/gnuradio-examples/python/usrp/fm_tx4.py
+++ b/gr-uhd/examples/fm_tx4.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -33,8 +33,7 @@ audio_to_file.py
 """
 
 from gnuradio import gr, eng_notation
-from gnuradio import usrp
-from gnuradio import audio
+from gnuradio import uhd
 from gnuradio import blks2
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
@@ -43,7 +42,6 @@ import math
 import sys
 
 from gnuradio.wxgui import stdgui2, fftsink2
-#from gnuradio import tx_debug_gui
 import wx
 
 
@@ -54,10 +52,17 @@ class pipeline(gr.hier_block2):
     def __init__(self, filename, lo_freq, audio_rate, if_rate):
 
         gr.hier_block2.__init__(self, "pipeline",
-                                gr.io_signature(0, 0, 0),                    # Input signature
-                                gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-
-        src = gr.file_source (gr.sizeof_float, filename, True)
+                                gr.io_signature(0, 0, 0),
+                                gr.io_signature(1, 1, gr.sizeof_gr_complex))
+
+        try:
+            src = gr.file_source (gr.sizeof_float, filename, True)
+        except RuntimeError:
+            sys.stderr.write(("\nError: Could not open file '%s'\n\n" % \
+                                  filename))
+            sys.exit(1)
+            
+        print audio_rate, if_rate
         fmtx = blks2.nbfm_tx (audio_rate, if_rate, max_dev=5e3, tau=75e-6)
         
         # Local oscillator
@@ -78,10 +83,18 @@ class fm_tx_block(stdgui2.std_top_block):
         stdgui2.std_top_block.__init__ (self, frame, panel, vbox, argv)
 
         parser = OptionParser (option_class=eng_option)
-        parser.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Tx side A or B")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("-s", "--samp-rate", type="eng_float", default=400e3,
+                          help="set sample rate (bandwidth) [default=%default]")
         parser.add_option("-f", "--freq", type="eng_float", default=None,
-                           help="set Tx frequency to FREQ [required]", metavar="FREQ")
+                          help="set frequency to FREQ", metavar="FREQ")
+        parser.add_option("-g", "--gain", type="eng_float", default=None,
+                          help="set gain in dB (default is midpoint)")
         parser.add_option("-n", "--nchannels", type="int", default=4,
                            help="number of Tx channels [1,4]")
         #parser.add_option("","--debug", action="store_true", default=False,
@@ -104,57 +117,59 @@ class fm_tx_block(stdgui2.std_top_block):
         # ----------------------------------------------------------------
         # Set up constants and parameters
 
-        self.u = usrp.sink_c ()       # the USRP sink (consumes samples)
+        self.u = uhd.usrp_sink(device_addr=options.args,
+                               io_type=uhd.io_type.COMPLEX_FLOAT32,
+                               num_channels=1)
+
+        self.usrp_rate = options.samp_rate
+        self.u.set_samp_rate(self.usrp_rate)
+        self.usrp_rate = self.u.get_samp_rate()
 
-        self.dac_rate = self.u.dac_rate()                    # 128 MS/s
-        self.usrp_interp = 400
-        self.u.set_interp_rate(self.usrp_interp)
-        self.usrp_rate = self.dac_rate / self.usrp_interp    # 320 kS/s
         self.sw_interp = 10
         self.audio_rate = self.usrp_rate / self.sw_interp    # 32 kS/s
 
-        # determine the daughterboard subdevice we're using
-        if options.tx_subdev_spec is None:
-            options.tx_subdev_spec = usrp.pick_tx_subdevice(self.u)
+        if options.gain is None:
+            # if no gain was specified, use the mid-point in dB
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2
+
+        self.set_gain(options.gain)
+        self.set_freq(options.freq)
 
-        m = usrp.determine_tx_mux_value(self.u, options.tx_subdev_spec)
-        #print "mux = %#04x" % (m,)
-        self.u.set_mux(m)
-        self.subdev = usrp.selected_subdev(self.u, options.tx_subdev_spec)
-        print "Using TX d'board %s" % (self.subdev.side_and_name(),)
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
 
-        self.subdev.set_gain(self.subdev.gain_range()[1])    # set max Tx gain
-        if not self.set_freq(options.freq):
-            freq_range = self.subdev.freq_range()
-            print "Failed to set frequency to %s.  Daughterboard supports %s to %s" % (
-                eng_notation.num_to_str(options.freq),
-                eng_notation.num_to_str(freq_range[0]),
-                eng_notation.num_to_str(freq_range[1]))
-            raise SystemExit
-        self.subdev.set_enable(True)                         # enable transmitter
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
 
-        sum = gr.add_cc ()
+        self.sum = gr.add_cc ()
 
         # Instantiate N NBFM channels
         step = 25e3
-        offset = (0 * step, 1 * step, -1 * step, 2 * step, -2 * step, 3 * step, -3 * step)
+        offset = (0 * step, 1 * step, -1 * step,
+                  2 * step, -2 * step, 3 * step, -3 * step)
+
         for i in range (options.nchannels):
             t = pipeline("audio-%d.dat" % (i % 4), offset[i],
                          self.audio_rate, self.usrp_rate)
-            self.connect(t, (sum, i))
+            self.connect(t, (self.sum, i))
 
-        gain = gr.multiply_const_cc (4000.0 / options.nchannels)
+        self.gain = gr.multiply_const_cc (1.0 / options.nchannels)
 
         # connect it all
-        self.connect (sum, gain)
-        self.connect (gain, self.u)
+        self.connect (self.sum, self.gain)
+        self.connect (self.gain, self.u)
 
         # plot an FFT to verify we are sending what we want
         if 1:
             post_mod = fftsink2.fft_sink_c(panel, title="Post Modulation",
-                                           fft_size=512, sample_rate=self.usrp_rate,
-                                           y_per_div=20, ref_level=40)
-            self.connect (sum, post_mod)
+                                           fft_size=512,
+                                           sample_rate=self.usrp_rate,
+                                           y_per_div=20,
+                                           ref_level=40)
+            self.connect (self.gain, post_mod)
             vbox.Add (post_mod.win, 1, wx.EXPAND)
             
 
@@ -177,18 +192,17 @@ class fm_tx_block(stdgui2.std_top_block):
         any residual_freq to the s/w freq translater.
         """
 
-        r = self.u.tune(self.subdev.which(), self.subdev, target_freq)
+        r = self.u.set_center_freq(target_freq, 0)
         if r:
-            print "r.baseband_freq =", eng_notation.num_to_str(r.baseband_freq)
-            print "r.dxc_freq      =", eng_notation.num_to_str(r.dxc_freq)
-            print "r.residual_freq =", eng_notation.num_to_str(r.residual_freq)
-            print "r.inverted      =", r.inverted
-            
-            # Could use residual_freq in s/w freq translator
+            print "Frequency =", eng_notation.num_to_str(self.u.get_center_freq())
             return True
 
         return False
 
+    def set_gain(self, gain):
+        self.u.set_gain(gain, 0)
+
+
 def main ():
     app = stdgui2.stdapp(fm_tx_block, "Multichannel FM Tx", nstatus=1)
     app.MainLoop ()
diff --git a/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py b/gr-uhd/examples/fm_tx_2_daughterboards.py
index 15fdf2831..61c437a98 100755
--- a/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
+++ b/gr-uhd/examples/fm_tx_2_daughterboards.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -30,14 +30,10 @@ Side A is 600 Hz tone.
 Side B is 350 + 440 Hz tones.
 """
 
-from gnuradio import gr
+from gnuradio import gr, uhd, blks2
 from gnuradio.eng_notation import num_to_str, str_to_num
-from gnuradio import usrp
-from gnuradio import audio
-from gnuradio import blks2
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-from usrpm import usrp_dbid
 import math
 import sys
 
@@ -90,8 +86,18 @@ class my_top_block(gr.top_block):
     def __init__(self):
         gr.top_block.__init__(self)
 
-        usage="%prog: [options] side-A-tx-freq side-B-tx-freq"
+        usage="%prog: [options] tx-freq0 tx-freq1"
         parser = OptionParser (option_class=eng_option, usage=usage)
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("-s", "--samp-rate", type="eng_float", default=320e3,
+                          help="set sample rate [default=%default]")
+        parser.add_option("-g", "--gain", type="eng_float", default=None,
+                          help="set gain in dB (default is midpoint)")
         (options, args) = parser.parse_args ()
 
         if len(args) != 2:
@@ -104,32 +110,45 @@ class my_top_block(gr.top_block):
         # ----------------------------------------------------------------
         # Set up USRP to transmit on both daughterboards
 
-        self.u = usrp.sink_c(nchan=2)          # say we want two channels
+        d = uhd.find_devices(uhd.device_addr(options.args))
+        uhd_type = d[0].get('type')
 
-        self.dac_rate = self.u.dac_rate()                    # 128 MS/s
-        self.usrp_interp = 400
-        self.u.set_interp_rate(self.usrp_interp)
-        self.usrp_rate = self.dac_rate / self.usrp_interp    # 320 kS/s
+        self.u = uhd.usrp_sink(device_addr=options.args,
+                               io_type=uhd.io_type.COMPLEX_FLOAT32,
+                               num_channels=2)
 
-        # we're using both daughterboard slots, thus subdev is a 2-tuple
-        self.subdev = (self.u.db(0, 0), self.u.db(1, 0))
-        print "Using TX d'board %s" % (self.subdev[0].side_and_name(),)
-        print "Using TX d'board %s" % (self.subdev[1].side_and_name(),)
-        
-        # set up the Tx mux so that
-        #  channel 0 goes to Slot A I&Q and channel 1 to Slot B I&Q
-        self.u.set_mux(0xba98)
+        # Set up USRP system based on type
+        if(uhd_type == "usrp"):
+            self.u.set_subdev_spec("A:0 B:0")
+            tr0 = uhd.tune_request(freq0)
+            tr1 = uhd.tune_request(freq1)
 
-        self.subdev[0].set_gain(self.subdev[0].gain_range()[1])    # set max Tx gain
-        self.subdev[1].set_gain(self.subdev[1].gain_range()[1])    # set max Tx gain
+        else:
+            if abs(freq0 - freq1) > 5.5e6:
+                sys.stderr.write("\nError: When not using two separate d'boards, frequencies must bewithin 5.5MHz of each other.\n")
+                raise SystemExit
+
+            self.u.set_subdev_spec("A:0 A:0")
+
+            mid_freq = (freq0 + freq1)/2.0
+            tr0 = uhd.tune_request(freq0, rf_freq=mid_freq,
+                                   rf_freq_policy=uhd.tune_request.POLICY_MANUAL)
+
+            tr1 = uhd.tune_request(freq1, rf_freq=mid_freq,
+                                   rf_freq_policy=uhd.tune_request.POLICY_MANUAL)
+
+        # Use the tune requests to tune each channel
+        self.set_freq(tr0, 0)
+        self.set_freq(tr1, 1)
+
+        self.usrp_rate  = options.samp_rate
 
-        self.set_freq(0, freq0)
-        self.set_freq(1, freq1)
-        self.subdev[0].set_enable(True)             # enable transmitter
-        self.subdev[1].set_enable(True)             # enable transmitter
+        self.u.set_samp_rate(self.usrp_rate)
+        dev_rate = self.u.get_samp_rate()
 
         # ----------------------------------------------------------------
-        # build two signal sources, interleave them, amplify and connect them to usrp
+        # build two signal sources, interleave them, amplify and
+        # connect them to usrp
 
         sig0 = example_signal_0(self.usrp_rate)
         sig1 = example_signal_1(self.usrp_rate)
@@ -138,43 +157,54 @@ class my_top_block(gr.top_block):
         self.connect(sig0, (intl, 0))
         self.connect(sig1, (intl, 1))
 
-        # apply some gain
-        if_gain = 10000
-        ifamp = gr.multiply_const_cc(if_gain)
-        
-        # and wire them up
-        self.connect(intl, ifamp, self.u)
-        
+        # Correct for any difference in requested and actual rates
+        rrate = self.usrp_rate / dev_rate
+        resamp = blks2.pfb_arb_resampler_ccf(rrate)
 
-    def set_freq(self, side, target_freq):
+        # and wire them up
+        self.connect(intl, resamp, self.u)
+
+        if options.gain is None:
+            # if no gain was specified, use the mid-point in dB
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2.0
+
+        self.set_gain(options.gain, 0)
+        self.set_gain(options.gain, 1)
+
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+            self.u.set_antenna(options.antenna, 1)
+       
+    def set_freq(self, target_freq, chan):
         """
         Set the center frequency we're interested in.
 
         @param side: 0 = side A, 1 = side B
         @param target_freq: frequency in Hz
         @rtype: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.
         """
 
-        print "Tuning side %s to %sHz" % (("A", "B")[side], num_to_str(target_freq))
-        r = self.u.tune(self.subdev[side].which(), self.subdev[side], target_freq)
+        print "Tuning channel %s to %sHz" % \
+            (chan, num_to_str(target_freq))
+
+        r = self.u.set_center_freq(target_freq, chan)
+
         if r:
-            print "  r.baseband_freq =", num_to_str(r.baseband_freq)
-            print "  r.dxc_freq      =", num_to_str(r.dxc_freq)
-            print "  r.residual_freq =", num_to_str(r.residual_freq)
-            print "  r.inverted      =", r.inverted
-            print "  OK"
             return True
 
         else:
-            print "  Failed!"
+            print "  Set Frequency Failed!"
             
         return False
 
+    def set_gain(self, gain, chan):
+        self.u.set_gain(gain, chan)
 
 if __name__ == '__main__':
     try:
diff --git a/gr-uhd/examples/max_power.py b/gr-uhd/examples/max_power.py
new file mode 100755
index 000000000..53e1b413c
--- /dev/null
+++ b/gr-uhd/examples/max_power.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,2007,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.
+# 
+
+"""
+Setup USRP for maximum power consumption.
+"""
+
+
+from gnuradio import gr
+from gnuradio import uhd
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+
+from gnuradio import eng_notation
+
+n2s = eng_notation.num_to_str
+
+# Set this to a huge number; UHD will adjust to the
+# maximum the USRP xxxx device can handle
+MAX_RATE = 1000e6
+
+class build_block(gr.top_block):
+    def __init__(self, args, tx_enable, rx_enable):
+        gr.top_block.__init__(self)
+
+        d = uhd.find_devices(uhd.device_addr(args))
+        uhd_type = d[0].get('type')
+
+        print "\nFound '%s' at args '%s'" % \
+            (uhd_type, args)
+
+        # Test the type of USRP; if it's a USRP (v1), it has
+        # 2 channels; otherwise, it has 1 channel
+        if uhd_type == "usrp":
+            tx_nchan = 2
+            rx_nchan = 2
+        else:
+            tx_nchan = 1
+            rx_nchan = 1
+        
+        if tx_enable:
+            print "\nTRANSMIT CHAIN"
+            self.u_tx = uhd.usrp_sink(device_addr=args,
+                                      io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                      num_channels=tx_nchan)
+            self.u_tx.set_samp_rate(MAX_RATE)
+
+            self.tx_src0 = gr.sig_source_c(self.u_tx.get_samp_rate(),
+                                           gr.GR_CONST_WAVE,
+                                           0, 1.0, 0)
+
+            # Get dboard gain range and select maximum
+            tx_gain_range = self.u_tx.get_gain_range()
+            tx_gain = tx_gain_range.stop()
+
+            # Get dboard freq range and select midpoint
+            tx_freq_range = self.u_tx.get_freq_range()
+            tx_freq_mid = (tx_freq_range.start() + tx_freq_range.stop())/2.0
+
+            for i in xrange(tx_nchan):
+                self.u_tx.set_center_freq (tx_freq_mid + i*1e6, i)
+                self.u_tx.set_gain(tx_gain, i)
+
+            print "\nTx Sample Rate: %ssps" % (n2s(self.u_tx.get_samp_rate()))
+            for i in xrange(tx_nchan):
+                print "Tx Channel %d: " % (i)
+                print "\tFrequency = %sHz" % \
+                    (n2s(self.u_tx.get_center_freq(i)))
+                print "\tGain = %f dB" % (self.u_tx.get_gain(i))
+            print ""
+
+            self.connect (self.tx_src0, self.u_tx)
+
+        if rx_enable:
+            print "\nRECEIVE CHAIN"
+            self.u_rx = uhd.usrp_source(device_addr=args,
+                                        io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                        num_channels=rx_nchan)
+            self.rx_dst0 = gr.null_sink (gr.sizeof_gr_complex)
+
+            self.u_rx.set_samp_rate(MAX_RATE)
+
+            # Get dboard gain range and select maximum
+            rx_gain_range = self.u_rx.get_gain_range()
+            rx_gain = rx_gain_range.stop()
+
+            # Get dboard freq range and select midpoint
+            rx_freq_range = self.u_rx.get_freq_range()
+            rx_freq_mid = (rx_freq_range.start() + rx_freq_range.stop())/2.0
+
+            for i in xrange(tx_nchan):
+                self.u_rx.set_center_freq (rx_freq_mid + i*1e6, i)
+                self.u_rx.set_gain(rx_gain, i)
+
+            print "\nRx Sample Rate: %ssps" % (n2s(self.u_rx.get_samp_rate()))
+            for i in xrange(rx_nchan):
+                print "Rx Channel %d: " % (i)
+                print "\tFrequency = %sHz" % \
+                    (n2s(self.u_rx.get_center_freq(i)))
+                print "\tGain = %f dB" % (self.u_rx.get_gain(i))
+            print ""
+
+            self.connect (self.u_rx, self.rx_dst0)
+
+def main ():
+    parser = OptionParser (option_class=eng_option)
+    parser.add_option("-a", "--args", type="string", default="",
+                      help="UHD device address args [default=%default]")
+    parser.add_option("-t", action="store_true", dest="tx_enable",
+                      default=False, help="enable Tx path")
+    parser.add_option("-r", action="store_true", dest="rx_enable",
+                      default=False, help="enable Rx path")
+    (options, args) = parser.parse_args ()
+
+    tb = build_block (options.args, options.tx_enable, options.rx_enable)
+
+    tb.start ()
+    raw_input ('Press Enter to quit: ')
+    tb.stop ()
+
+if __name__ == '__main__':
+    main ()
diff --git a/gr-uhd/examples/tag_sink_demo.h b/gr-uhd/examples/tag_sink_demo.h
index 84baf0a9c..524f0ae0f 100644
--- a/gr-uhd/examples/tag_sink_demo.h
+++ b/gr-uhd/examples/tag_sink_demo.h
@@ -21,7 +21,6 @@
 
 #include <gr_sync_block.h>
 #include <gr_io_signature.h>
-#include <gr_tag_info.h>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <iostream>
@@ -47,13 +46,13 @@ public:
     ){
         //grab all "rx time" tags in this work call
         const uint64_t samp0_count = this->nitems_read(0);
-        std::vector<pmt::pmt_t> rx_time_tags;
+        std::vector<gr_tag_t> rx_time_tags;
         get_tags_in_range(rx_time_tags, 0, samp0_count, samp0_count + ninput_items, pmt::pmt_string_to_symbol("rx_time"));
 
         //print all tags
-        BOOST_FOREACH(const pmt::pmt_t &rx_time_tag, rx_time_tags){
-            const uint64_t count = gr_tags::get_nitems(rx_time_tag);
-            const pmt::pmt_t &value = gr_tags::get_value(rx_time_tag);
+        BOOST_FOREACH(const gr_tag_t &rx_time_tag, rx_time_tags){
+            const uint64_t count = rx_time_tag.offset;
+            const pmt::pmt_t &value = rx_time_tag.value;
 
             std::cout << boost::format("Full seconds %u, Frac seconds %f")
                 % pmt::pmt_to_uint64(pmt_tuple_ref(value, 0))
diff --git a/gr-uhd/examples/tag_source_demo.h b/gr-uhd/examples/tag_source_demo.h
index c7c0884d3..a995762f7 100644
--- a/gr-uhd/examples/tag_source_demo.h
+++ b/gr-uhd/examples/tag_source_demo.h
@@ -21,7 +21,6 @@
 
 #include <gr_sync_block.h>
 #include <gr_io_signature.h>
-#include <gr_tag_info.h>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py b/gr-uhd/examples/usrp_am_mw_rcv.py
index 60f6c5825..db3b35760 100755
--- a/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py
+++ b/gr-uhd/examples/usrp_am_mw_rcv.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,9 +20,9 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, eng_notation, optfir
+from gnuradio import gr, eng_notation, optfir
 from gnuradio import audio
-from gnuradio import usrp
+from gnuradio import uhd
 from gnuradio import blks2
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
@@ -33,30 +33,19 @@ import sys
 import math
 import wx
 
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    Try for one of these, in order: BASIC_RX,TV_RX, BASIC_RX, whatever is on side A.
-
-    @return a subdev_spec
-    """
-    return usrp.pick_subdev(u, (usrp_dbid.BASIC_RX,
-                                usrp_dbid.LF_RX,
-                                usrp_dbid.TV_RX,
-                                usrp_dbid.TV_RX_REV_2,
-				usrp_dbid.TV_RX_REV_3,
-				usrp_dbid.TV_RX_MIMO,
-                                usrp_dbid.TV_RX_REV_2_MIMO,
-				usrp_dbid.TV_RX_REV_3_MIMO))
-
-
 class wfm_rx_block (stdgui2.std_top_block):
-    def __init__(self,frame,panel,vbox,argv):
-        stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv)
+    def __init__(self, frame, panel, vbox, argv):
+        stdgui2.std_top_block.__init__ (self, frame, panel, vbox, argv)
 
         parser=OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=A)")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("-s", "--samp-rate", type="eng_float", default=1e6,
+                          help="set sample rate (bandwidth) [default=%default]")
         parser.add_option("-f", "--freq", type="eng_float", default=1008.0e3,
                           help="set frequency to FREQ", metavar="FREQ")
         parser.add_option("-I", "--use-if-freq", action="store_true", default=False,
@@ -86,77 +75,72 @@ class wfm_rx_block (stdgui2.std_top_block):
         self.freq = 0
 
         # build graph
+        self.u = uhd.usrp_source(device_addr=options.args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
+
+        usrp_rate  = 256e3
+        demod_rate = 64e3
+        audio_rate = 32e3
+        chanfilt_decim = int(usrp_rate // demod_rate)
+        audio_decim = int(demod_rate // audio_rate)
+        
+        self.u.set_samp_rate(usrp_rate)
+        dev_rate = self.u.get_samp_rate()
 
-        #TODO: add an AGC after the channel filter and before the AM_demod
+        # Resample signal to exactly self.usrp_rate
+        # FIXME: make one of the follow-on filters an arb resampler
+        rrate = usrp_rate / dev_rate
+        self.resamp = blks2.pfb_arb_resampler_ccf(rrate)
         
-        self.u = usrp.source_c()                    # usrp is data source
-
-        adc_rate = self.u.adc_rate()                # 64 MS/s
-        usrp_decim = 250
-        self.u.set_decim_rate(usrp_decim)
-        usrp_rate = adc_rate / usrp_decim           # 256 kS/s
-        chanfilt_decim = 4
-        demod_rate = usrp_rate / chanfilt_decim     # 64 kHz
-        audio_decimation = 2
-        audio_rate = demod_rate / audio_decimation  # 32 kHz
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        print "Using RX d'board %s" % (self.subdev.side_and_name(),)
-
-
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
-                                            usrp_rate,   # sampling rate
-                                            8e3,        # passband cutoff
-                                            12e3,       # stopband cutoff
-                                            1.0,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-        self.chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
+        chan_filt_coeffs = gr.firdes.low_pass_2 (1,          # gain
+                                                 usrp_rate,  # sampling rate
+                                                 8e3,        # passband cutoff
+                                                 4e3,        # transition bw
+                                                 60)         # stopband attenuation
+
         if self.use_IF:
           # Turn If to baseband and filter.
-          self.chan_filt = gr.freq_xlating_fir_filter_ccf (chanfilt_decim, chan_filt_coeffs, self.IF_freq, usrp_rate)
+          self.chan_filt = gr.freq_xlating_fir_filter_ccf (chanfilt_decim,
+                                                           chan_filt_coeffs,
+                                                           self.IF_freq,
+                                                           usrp_rate)
         else:
           self.chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
-        self.am_demod = gr.complex_to_mag()
 
+        self.agc = gr.agc_cc(0.1, 1, 1, 100000)
+        self.am_demod = gr.complex_to_mag()
         self.volume_control = gr.multiply_const_ff(self.vol)
 
-        audio_filt_coeffs = optfir.low_pass (1,           # gain
-                                            demod_rate,   # sampling rate
-                                            8e3,        # passband cutoff
-                                            10e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        self.audio_filt=gr.fir_filter_fff(audio_decimation,audio_filt_coeffs)
+        audio_filt_coeffs = gr.firdes.low_pass_2 (1,          # gain
+                                                  demod_rate, # sampling rate
+                                                  8e3,        # passband cutoff
+                                                  2e3,        # transition bw
+                                                  60)         # stopband attenuation
+        self.audio_filt=gr.fir_filter_fff(audio_decim, audio_filt_coeffs)
+
         # sound card as final sink
-        audio_sink = audio.sink (int (audio_rate),
-                                 options.audio_output,
-                                 False)  # ok_to_block
+        self.audio_sink = audio.sink (int (audio_rate),
+                                      options.audio_output,
+                                      False)  # ok_to_block
         
         # now wire it all together
-        self.connect (self.u, self.chan_filt, self.am_demod, self.audio_filt, self.volume_control, audio_sink)
+        self.connect (self.u, self.resamp, self.chan_filt, self.agc,
+                      self.am_demod, self.audio_filt, 
+                      self.volume_control, self.audio_sink)
 
         self._build_gui(vbox, usrp_rate, demod_rate, audio_rate)
 
         if options.gain is None:
-            g = self.subdev.gain_range()
+            g = self.u.get_gain_range()
             if True:
-              # if no gain was specified, use the maximum gain available 
-              # (usefull for Basic_RX which is relatively deaf and the most probable board to be used for AM)
-              # TODO: check db type to decide on default gain.
-              options.gain = float(g[1])
-            else:
-              # if no gain was specified, use the mid-point in dB
-              options.gain = float(g[0]+g[1])/2
-
+                # if no gain was specified, use the mid gain
+                options.gain = (g.start() + g.stop())/2.0
+                options.gain = g.stop()
 
         if options.volume is None:
-            g = self.volume_range()
-            options.volume = float(g[0]*3+g[1])/4
+            v = self.volume_range()
+            options.volume = float(v[0]*3+v[1])/4.0
             
         if abs(options.freq) < 1e3:
             options.freq *= 1e3
@@ -168,6 +152,13 @@ class wfm_rx_block (stdgui2.std_top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
 
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
@@ -179,7 +170,7 @@ class wfm_rx_block (stdgui2.std_top_block):
             return self.set_freq(kv['freq'])
 
 
-        if 1:
+        if 0:
             self.src_fft = fftsink2.fft_sink_c(self.panel, title="Data from USRP",
                                                fft_size=512, sample_rate=usrp_rate,
 					       ref_scale=32768.0, ref_level=0.0, y_divs=12)
@@ -233,9 +224,10 @@ class wfm_rx_block (stdgui2.std_top_block):
                                         callback=self.set_vol)
         hbox.Add((5,0), 1)
 
+        g = self.u.get_gain_range()
         myform['gain'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                        weight=3, range=self.subdev.gain_range(),
+                                        weight=3, range=(g.start(), g.stop(), g.step()),
                                         callback=self.set_gain)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -291,14 +283,8 @@ class wfm_rx_block (stdgui2.std_top_block):
 
         @param target_freq: frequency in Hz
         @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
         """
-        r = usrp.tune(self.u, 0, self.subdev, target_freq  + self.IF_freq)
-        #TODO: check if db is inverting the spectrum or not to decide if we should do + self.IF_freq  or - self.IF_freq
+        r = self.u.set_center_freq(target_freq  + self.IF_freq, 0)
         
         if r:
             self.freq = target_freq
@@ -313,7 +299,7 @@ class wfm_rx_block (stdgui2.std_top_block):
 
     def set_gain(self, gain):
         self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
+        self.u.set_gain(gain)
 
     def update_status_bar (self):
         msg = "Volume:%r  Setting:%s" % (self.vol, self.state)
diff --git a/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py b/gr-uhd/examples/usrp_nbfm_ptt.py
index 3ce1e0c49..8f7ddee7d 100755
--- a/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
+++ b/gr-uhd/examples/usrp_nbfm_ptt.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2007 Free Software Foundation, Inc.
+# Copyright 2005,2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -25,10 +25,7 @@ import sys
 import wx
 from optparse import OptionParser
 
-from gnuradio import gr, gru, eng_notation
-from gnuradio import usrp
-from gnuradio import audio
-from gnuradio import blks2
+from gnuradio import gr, audio, blks2, uhd
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import stdgui2, fftsink2, scopesink2, slider, form
 from usrpm import usrp_dbid
@@ -51,14 +48,18 @@ class ptt_block(stdgui2.std_top_block):
         self.space_bar_pressed = False
         
         parser = OptionParser (option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B")
-        parser.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Tx side A or B")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
         parser.add_option ("-f", "--freq", type="eng_float", default=442.1e6,
                            help="set Tx and Rx frequency to FREQ", metavar="FREQ")
         parser.add_option ("-g", "--rx-gain", type="eng_float", default=None,
                            help="set rx gain [default=midpoint in dB]")
+        parser.add_option ("", "--tx-gain", type="eng_float", default=None,
+                           help="set tx gain [default=midpoint in dB]")
         parser.add_option("-I", "--audio-input", type="string", default="",
                           help="pcm input device name.  E.g., hw:0,0 or /dev/dsp")
         parser.add_option("-O", "--audio-output", type="string", default="",
@@ -73,8 +74,12 @@ class ptt_block(stdgui2.std_top_block):
         if options.freq < 1e6:
             options.freq *= 1e6
             
-        self.txpath = transmit_path(options.tx_subdev_spec, options.audio_input)
-        self.rxpath = receive_path(options.rx_subdev_spec, options.rx_gain, options.audio_output)
+        self.txpath = transmit_path(options.args, options.spec,
+                                    options.antenna, options.tx_gain,
+                                    options.audio_input)
+        self.rxpath = receive_path(options.args, options.spec,
+                                   options.antenna, options.rx_gain,
+                                   options.audio_output)
 	self.connect(self.txpath)
 	self.connect(self.rxpath)
 
@@ -152,10 +157,10 @@ class ptt_block(stdgui2.std_top_block):
             vbox.Add (rx_fft.win, 1, wx.EXPAND)
 
         if 1 and not(no_gui):
-            rx_fft = fftsink2.fft_sink_c(panel, title="Post s/w DDC",
+            rx_fft = fftsink2.fft_sink_c(panel, title="Post s/w Resampler",
                                          fft_size=512, sample_rate=self.rxpath.quad_rate,
                                          ref_level=80, y_per_div=20)
-            self.connect (self.rxpath.ddc, rx_fft)
+            self.connect (self.rxpath.resamp, rx_fft)
             vbox.Add (rx_fft.win, 1, wx.EXPAND)
 
         if 0 and not(no_gui):
@@ -199,10 +204,12 @@ class ptt_block(stdgui2.std_top_block):
             form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Squelch",
                                         weight=3, range=self.rxpath.squelch_range(),
                                         callback=self.set_squelch)
+            
+        g = self.rxpath.u.get_gain_range()
         hbox.Add((5,0), 0)
         myform['rx_gain'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Rx Gain",
-                                        weight=3, range=self.rxpath.subdev.gain_range(),
+                                        weight=3, range=(g.start(), g.stop(), g.step()),
                                         callback=self.set_rx_gain)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -269,19 +276,20 @@ class ptt_block(stdgui2.std_top_block):
 # ////////////////////////////////////////////////////////////////////////
 
 class transmit_path(gr.hier_block2):
-    def __init__(self, subdev_spec, audio_input):
+    def __init__(self, args, spec, antenna, gain, audio_input):
 	gr.hier_block2.__init__(self, "transmit_path",
 				gr.io_signature(0, 0, 0), # Input signature
 				gr.io_signature(0, 0, 0)) # Output signature
 				
-        self.u = usrp.sink_c ()
+        self.u = uhd.usrp_sink(device_addr=args,
+                               io_type=uhd.io_type.COMPLEX_FLOAT32,
+                               num_channels=1)
+
+        self.if_rate = 320e3
+        self.audio_rate = 32e3
 
-        dac_rate = self.u.dac_rate();
-        self.if_rate = 320e3                               # 320 kS/s
-        self.usrp_interp = int(dac_rate // self.if_rate)
-        self.u.set_interp_rate(self.usrp_interp)
-        self.sw_interp = 10
-        self.audio_rate = self.if_rate // self.sw_interp   #  32 kS/s
+        self.u.set_samp_rate(self.if_rate)
+        dev_rate = self.u.get_samp_rate()
 
         self.audio_gain = 10
         self.normal_gain = 32000
@@ -289,16 +297,16 @@ class transmit_path(gr.hier_block2):
         self.audio = audio.source(int(self.audio_rate), audio_input)
         self.audio_amp = gr.multiply_const_ff(self.audio_gain)
 
-        lpf = gr.firdes.low_pass (1,                # gain
-                                  self.audio_rate,            # sampling rate
+        lpf = gr.firdes.low_pass (1,                  # gain
+                                  self.audio_rate,    # sampling rate
                                   3800,               # low pass cutoff freq
                                   300,                # width of trans. band
                                   gr.firdes.WIN_HANN) # filter type 
 
-        hpf = gr.firdes.high_pass (1,                # gain
-                                  self.audio_rate,            # sampling rate
-                                  325,               # low pass cutoff freq
-                                  50,                # width of trans. band
+        hpf = gr.firdes.high_pass (1,                 # gain
+                                  self.audio_rate,    # sampling rate
+                                  325,                # low pass cutoff freq
+                                  50,                 # width of trans. band
                                   gr.firdes.WIN_HANN) # filter type 
 
         audio_taps = convolve(array(lpf),array(hpf))
@@ -311,18 +319,29 @@ class transmit_path(gr.hier_block2):
         self.fmtx = blks2.nbfm_tx(self.audio_rate, self.if_rate)
         self.amp = gr.multiply_const_cc (self.normal_gain)
 
-        # determine the daughterboard subdevice we're using
-        if subdev_spec is None:
-            subdev_spec = usrp.pick_tx_subdevice(self.u)
-        self.u.set_mux(usrp.determine_tx_mux_value(self.u, subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, subdev_spec)
-        print "TX using", self.subdev.name()
+        rrate = dev_rate / self.if_rate
+        self.resamp = blks2.pfb_arb_resampler_ccf(rrate)
 
         self.connect(self.audio, self.audio_amp, self.audio_filt,
-                     (self.add_pl,0), self.fmtx, self.amp, self.u)
+                     (self.add_pl,0), self.fmtx, self.amp,
+                     self.resamp, self.u)
 
-        self.set_gain(self.subdev.gain_range()[1])  # set max Tx gain
+        if gain is None:
+            # if no gain was specified, use the mid-point in dB
+            g = self.u.get_gain_range()
+            gain = float(g.start() + g.stop())/2.0
 
+        self.set_gain(gain)
+
+        self.set_enable(False)
+
+        # Set the subdevice spec
+        if(spec):
+            self.u.set_subdev_spec(spec, 0)
+
+        # Set the antenna
+        if(antenna):
+            self.u.set_antenna(antenna, 0)
 
     def set_freq(self, target_freq):
         """
@@ -330,26 +349,17 @@ class transmit_path(gr.hier_block2):
 
         @param target_freq: frequency in Hz
         @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.  Finally, we feed
-        any residual_freq to the s/w freq translater.
         """
-        r = self.u.tune(self.subdev.which(), self.subdev, target_freq)
+        r = self.u.set_center_freq(target_freq)
         if r:
-            # Use residual_freq in s/w freq translator
             return True
-
         return False
 
     def set_gain(self, gain):
         self.gain = gain
-        self.subdev.set_gain(gain)
+        self.u.set_gain(gain)
 
     def set_enable(self, enable):
-        self.subdev.set_enable(enable)            # set H/W Tx enable
         if enable:
             self.amp.set_k (self.normal_gain)
         else:
@@ -362,64 +372,53 @@ class transmit_path(gr.hier_block2):
 # ////////////////////////////////////////////////////////////////////////
 
 class receive_path(gr.hier_block2):
-    def __init__(self, subdev_spec, gain, audio_output):
+    def __init__(self, args, gain, audio_output):
 	gr.hier_block2.__init__(self, "receive_path",
 				gr.io_signature(0, 0, 0), # Input signature
 				gr.io_signature(0, 0, 0)) # Output signature
 
-        self.u = usrp.source_c ()
-        adc_rate = self.u.adc_rate()
-
-        self.if_rate = 256e3                         # 256 kS/s
-        usrp_decim = int(adc_rate // self.if_rate)
-        if_decim = 4
-        self.u.set_decim_rate(usrp_decim)
-        self.quad_rate = self.if_rate // if_decim    #  64 kS/s
-        audio_decim = 2
-        audio_rate = self.quad_rate // audio_decim   #  32 kS/s
+        self.u = uhd.usrp_source(device_addr=args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
 
-        if subdev_spec is None:
-            subdev_spec = usrp.pick_rx_subdevice(self.u)
-        self.subdev = usrp.selected_subdev(self.u, subdev_spec)
-        print "RX using", self.subdev.name()
+        self.if_rate    = 256e3
+        self.quad_rate  = 64e3
+        self.audio_rate = 32e3
 
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, subdev_spec))
+        self.u.set_samp_rate(self.if_rate)
+        dev_rate = self.u.get_samp_rate()
 
         # Create filter to get actual channel we want
-        chan_coeffs = gr.firdes.low_pass (1.0,                # gain
-                                          self.if_rate,       # sampling rate
+        nfilts = 32
+        chan_coeffs = gr.firdes.low_pass (nfilts,             # gain
+                                          nfilts*dev_rate,    # sampling rate
                                           13e3,               # low pass cutoff freq
                                           4e3,                # width of trans. band
                                           gr.firdes.WIN_HANN) # filter type 
 
-        print "len(rx_chan_coeffs) =", len(chan_coeffs)
-
-        # Decimating Channel filter with frequency translation
-        # complex in and out, float taps
-        self.ddc = gr.freq_xlating_fir_filter_ccf(if_decim,       # decimation rate
-                                                  chan_coeffs,    # taps
-                                                  0,              # frequency translation amount
-                                                  self.if_rate)   # input sample rate
+        rrate = self.quad_rate / dev_rate
+        self.resamp = blks2.pfb_arb_resampler_ccf(rrate, chan_coeffs, nfilts)
 
         # instantiate the guts of the single channel receiver
-        self.fmrx = blks2.nbfm_rx(audio_rate, self.quad_rate)
+        self.fmrx = blks2.nbfm_rx(self.audio_rate, self.quad_rate)
 
         # standard squelch block
-        self.squelch = blks2.standard_squelch(audio_rate)
+        self.squelch = blks2.standard_squelch(self.audio_rate)
 
         # audio gain / mute block
         self._audio_gain = gr.multiply_const_ff(1.0)
 
         # sound card as final sink
-        audio_sink = audio.sink (int(audio_rate), audio_output)
+        audio_sink = audio.sink (int(self.audio_rate), audio_output)
         
         # now wire it all together
-        self.connect (self.u, self.ddc, self.fmrx, self.squelch, self._audio_gain, audio_sink)
+        self.connect (self.u, self.resamp, self.fmrx, self.squelch,
+                      self._audio_gain, audio_sink)
 
         if gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            gain = float(g[0]+g[1])/2
+            g = self.u.get_gain_range()
+            gain = float(g.start() + g.stop())/2.0
 
         self.enabled = True
         self.set_gain(gain)
@@ -428,7 +427,14 @@ class receive_path(gr.hier_block2):
         s = self.squelch_range()
         self.set_squelch((s[0]+s[1])/2)
         
-        
+        # Set the subdevice spec
+        if(spec):
+            self.u.set_subdev_spec(spec, 0)
+
+        # Set the antenna
+        if(antenna):
+            self.u.set_antenna(antenna, 0)
+
     def volume_range(self):
         return (-20.0, 0.0, 0.5)
 
@@ -463,26 +469,15 @@ class receive_path(gr.hier_block2):
 
         @param target_freq: frequency in Hz
         @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter in the
-        FPGA.  Finally, we feed any residual_freq to the s/w freq
-        translator.
         """
-        r = self.u.tune(0, self.subdev, target_freq)
+        r = self.u.set_center_freq(target_freq)
         if r:
-            # Use residual_freq in s/w freq translater
-            # print "residual_freq =", r.residual_freq
-            self.ddc.set_center_freq(-r.residual_freq)
             return True
-
         return False
 
     def set_gain(self, gain):
         self.gain = gain
-        self.subdev.set_gain(gain)
+        self.u.set_gain(gain)
 
 
 # ////////////////////////////////////////////////////////////////////////
diff --git a/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py b/gr-uhd/examples/usrp_nbfm_rcv.py
index 4c66fc970..a558b9347 100755
--- a/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py
+++ b/gr-uhd/examples/usrp_nbfm_rcv.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2007 Free Software Foundation, Inc.
+# Copyright 2005,2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,20 +20,15 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import audio
-from gnuradio import usrp
-from gnuradio import blks2
+from gnuradio import gr, audio, blks2, uhd
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui2, fftsink2, form
 from optparse import OptionParser
-from usrpm import usrp_dbid
 import sys
 import math
 import wx
 
-
 #////////////////////////////////////////////////////////////////////////
 #                           Control Stuff
 #////////////////////////////////////////////////////////////////////////
@@ -43,8 +38,12 @@ class my_top_block (stdgui2.std_top_block):
         stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv)
 
         parser=OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=A)")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
         parser.add_option("-f", "--freq", type="eng_float", default=146.585e6,
                           help="set frequency to FREQ", metavar="FREQ")
         parser.add_option("-g", "--gain", type="eng_float", default=None,
@@ -70,7 +69,8 @@ class my_top_block (stdgui2.std_top_block):
         self.freq = 0
         self.freq_step = 25e3
 
-        self.rxpath = receive_path(options.rx_subdev_spec, options.gain, options.audio_output)
+        self.rxpath = receive_path(options.args, options.spec, options.antenna,
+                                   options.gain, options.audio_output)
 	self.connect(self.rxpath)
 	
         self._build_gui(vbox, options.no_gui)
@@ -99,34 +99,47 @@ class my_top_block (stdgui2.std_top_block):
 
 
         self.src_fft = None
-        if 1 and not(no_gui):
-            self.src_fft = fftsink2.fft_sink_c(self.panel, title="Data from USRP",
-                                               fft_size=512, sample_rate=self.rxpath.if_rate,
-                                               ref_scale=32768.0, ref_level=0, y_per_div=10, y_divs=12)
+        if 0 and not(no_gui):
+            self.src_fft = fftsink2.fft_sink_c(self.panel,
+                                               title="Data from USRP",
+                                               fft_size=512,
+                                               sample_rate=self.rxpath.if_rate,
+                                               ref_scale=32768.0,
+                                               ref_level=0,
+                                               y_per_div=10,
+                                               y_divs=12)
             self.connect (self.rxpath.u, self.src_fft)
             vbox.Add (self.src_fft.win, 4, wx.EXPAND)
         if 1 and not(no_gui):
-            rx_fft = fftsink2.fft_sink_c(self.panel, title="Post s/w DDC",
-                                         fft_size=512, sample_rate=self.rxpath.quad_rate,
-                                         ref_level=80, y_per_div=20)
-            self.connect (self.rxpath.ddc, rx_fft)
+            rx_fft = fftsink2.fft_sink_c(self.panel,
+                                         title="Post s/w Resampling",
+                                         fft_size=512,
+                                         sample_rate=self.rxpath.quad_rate,
+                                         ref_level=80,
+                                         y_per_div=20)
+            self.connect (self.rxpath.resamp, rx_fft)
             vbox.Add (rx_fft.win, 4, wx.EXPAND)
         
         if 1 and not(no_gui):
-            post_deemph_fft = fftsink2.fft_sink_f(self.panel, title="Post Deemph",
-                                                  fft_size=512, sample_rate=self.rxpath.audio_rate,
-                                                  y_per_div=10, ref_level=-40)
+            post_deemph_fft = fftsink2.fft_sink_f(self.panel,
+                                                  title="Post Deemph",
+                                                  fft_size=512,
+                                                  sample_rate=self.rxpath.audio_rate,
+                                                  y_per_div=10,
+                                                  ref_level=-40)
             self.connect (self.rxpath.fmrx.deemph, post_deemph_fft)
             vbox.Add (post_deemph_fft.win, 4, wx.EXPAND)
 
         if 0:
-            post_filt_fft = fftsink2.fft_sink_f(self.panel, title="Post Filter", 
-                                                fft_size=512, sample_rate=audio_rate,
-                                                y_per_div=10, ref_level=-40)
+            post_filt_fft = fftsink2.fft_sink_f(self.panel,
+                                                title="Post Filter", 
+                                                fft_size=512,
+                                                sample_rate=audio_rate,
+                                                y_per_div=10,
+                                                ref_level=-40)
             self.connect (self.guts.audio_filter, post_filt)
             vbox.Add (fft_win4, 4, wx.EXPAND)
 
-        
         # control area form at bottom
         self.myform = myform = form.form()
 
@@ -134,7 +147,8 @@ class my_top_block (stdgui2.std_top_block):
         hbox.Add((5,0), 0)
         myform['freq'] = form.float_field(
             parent=self.panel, sizer=hbox, label="Freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
+            callback=myform.check_input_and_call(_form_set_freq,
+                                                 self._set_status_msg))
 
         #hbox.Add((5,0), 0)
         #myform['freq_slider'] = \
@@ -157,10 +171,11 @@ class my_top_block (stdgui2.std_top_block):
             form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Squelch",
                                         weight=3, range=self.rxpath.squelch_range(),
                                         callback=self.set_squelch)
+        g = self.rxpath.u.get_gain_range()
         hbox.Add((5,0), 0)
         myform['gain'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                        weight=3, range=self.rxpath.subdev.gain_range(),
+                                        weight=3, range=(g.start(), g.stop(), g.step()),
                                         callback=self.set_gain)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -246,45 +261,31 @@ class my_top_block (stdgui2.std_top_block):
 USE_SIMPLE_SQUELCH = False
 
 class receive_path(gr.hier_block2):
-    def __init__(self, subdev_spec, gain, audio_output):
+    def __init__(self, args, spec, antenna, gain, audio_output):
 	gr.hier_block2.__init__(self, "receive_path",
 				gr.io_signature(0, 0, 0), # Input signature
 				gr.io_signature(0, 0, 0)) # Output signature
 
-        self.u = usrp.source_c ()
-        adc_rate = self.u.adc_rate()
+        self.u = uhd.usrp_source(device_addr=args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
 
-        self.if_rate = 256e3                              # 256 kS/s
-        usrp_decim = int(adc_rate // self.if_rate)
-        if_decim = 4
-        self.u.set_decim_rate(usrp_decim)
-        self.quad_rate = self.if_rate // if_decim         #  64 kS/s
-        audio_decim = 2
-        self.audio_rate = self.quad_rate // audio_decim   #  32 kS/s
+        self.if_rate    = 256e3
+        self.quad_rate  = 64e3
+        self.audio_rate = 32e3
 
-
-        if subdev_spec is None:
-            subdev_spec = usrp.pick_rx_subdevice(self.u)
-        self.subdev = usrp.selected_subdev(self.u, subdev_spec)
-        print "Using RX d'board %s" % (self.subdev.side_and_name(),)
-
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, subdev_spec))
+        self.u.set_samp_rate(self.if_rate)
+        dev_rate = self.u.get_samp_rate()
 
         # Create filter to get actual channel we want
-        chan_coeffs = gr.firdes.low_pass (1.0,                # gain
-                                          self.if_rate,       # sampling rate
-                                          8e3,               # low pass cutoff freq
-                                          2e3,                # width of trans. band
-                                          gr.firdes.WIN_HANN) # filter type 
-
-        print "len(rx_chan_coeffs) =", len(chan_coeffs)
-
-        # Decimating Channel filter with frequency translation
-        # complex in and out, float taps
-        self.ddc = gr.freq_xlating_fir_filter_ccf(if_decim,       # decimation rate
-                                                  chan_coeffs,    # taps
-                                                  0,              # frequency translation amount
-                                                  self.if_rate)   # input sample rate
+        nfilts = 32
+        chan_coeffs = gr.firdes.low_pass (nfilts,              # gain
+                                          nfilts*dev_rate,     # sampling rate
+                                          8e3,                 # low pass cutoff freq
+                                          2e3,                 # width of trans. band
+                                          gr.firdes.WIN_HANN)  # filter type 
+        rrate = self.quad_rate / dev_rate
+        self.resamp = blks2.pfb_arb_resampler_ccf(rrate, chan_coeffs, nfilts)
 
         if USE_SIMPLE_SQUELCH:
             self.squelch = gr.simple_squelch_cc(20)
@@ -302,24 +303,33 @@ class receive_path(gr.hier_block2):
         
         # now wire it all together
         if USE_SIMPLE_SQUELCH:
-            self.connect (self.u, self.ddc, self.squelch, self.fmrx,
+            self.connect (self.u, self.resamp, self.squelch, self.fmrx,
                           self._audio_gain, audio_sink)
         else:
-            self.connect (self.u, self.ddc, self.fmrx, self.squelch,
+            self.connect (self.u, self.resamp, self.fmrx, self.squelch,
                           self._audio_gain, audio_sink)
 
         if gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            gain = float(g[0]+g[1])/2
+            g = self.u.get_gain_range()
+            gain = float(g.start()+g.stop())/2
 
         self.set_gain(gain)
 
         v = self.volume_range()
         self.set_volume((v[0]+v[1])/2)
+
         s = self.squelch_range()
         self.set_squelch((s[0]+s[1])/2)
 
+        # Set the subdevice spec
+        if(spec):
+            self.u.set_subdev_spec(spec, 0)
+
+        # Set the antenna
+        if(antenna):
+            self.u.set_antenna(antenna, 0)
+
     def volume_range(self):
         return (-20.0, 0.0, 0.5)
 
@@ -351,27 +361,16 @@ class receive_path(gr.hier_block2):
 
         @param target_freq: frequency in Hz
         @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter in the
-        FPGA.  Finally, we feed any residual_freq to the s/w freq
-        translator.
         """
 
-        r = usrp.tune(self.u, 0, self.subdev, target_freq)
+        r = self.u.set_center_freq(target_freq)
         if r:
-            # Use residual_freq in s/w freq translater
-            # print "residual_freq =", r.residual_freq
-            self.ddc.set_center_freq(-r.residual_freq)
             return True
-
         return False
 
     def set_gain(self, gain):
         self.gain = gain
-        self.subdev.set_gain(gain)
+        self.u.set_gain(gain)
 
 
 # ////////////////////////////////////////////////////////////////////////
diff --git a/gnuradio-examples/python/usrp/usrp_spectrum_sense.py b/gr-uhd/examples/usrp_spectrum_sense.py
index 90adf1671..01ca60396 100755
--- a/gnuradio-examples/python/usrp/usrp_spectrum_sense.py
+++ b/gr-uhd/examples/usrp_spectrum_sense.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2007 Free Software Foundation, Inc.
+# Copyright 2005,2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,16 +20,16 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, eng_notation, optfir, window
+from gnuradio import gr, eng_notation, window
 from gnuradio import audio
-from gnuradio import usrp
+from gnuradio import uhd
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-from usrpm import usrp_dbid
 import sys
 import math
 import struct
 
+sys.stderr.write("Warning: this is known to have issues on some machines+Python version combinations to seg fault due to the callback in bin_statitics. If you figure out why, we'd love to hear about it!\n")
 
 class tune(gr.feval_dd):
     """
@@ -41,17 +41,20 @@ class tune(gr.feval_dd):
 
     def eval(self, ignore):
         """
-        This method is called from gr.bin_statistics_f when it wants to change
-        the center frequency.  This method tunes the front end to the new center
-        frequency, and returns the new frequency as its result.
+        This method is called from gr.bin_statistics_f when it wants
+        to change the center frequency.  This method tunes the front
+        end to the new center frequency, and returns the new frequency
+        as its result.
         """
+
         try:
-            # We use this try block so that if something goes wrong from here 
-            # down, at least we'll have a prayer of knowing what went wrong.
-            # Without this, you get a very mysterious:
+            # We use this try block so that if something goes wrong
+            # from here down, at least we'll have a prayer of knowing
+            # what went wrong.  Without this, you get a very
+            # mysterious:
             #
-            #   terminate called after throwing an instance of 'Swig::DirectorMethodException'
-            #   Aborted
+            #   terminate called after throwing an instance of
+            #   'Swig::DirectorMethodException' Aborted
             #
             # message on stderr.  Not exactly helpful ;)
 
@@ -68,7 +71,7 @@ class parse_msg(object):
         self.vlen = int(msg.arg2())
         assert(msg.length() == self.vlen * gr.sizeof_float)
 
-        # FIXME consider using Numarray or NumPy vector
+        # FIXME consider using NumPy array
         t = msg.to_string()
         self.raw_data = t
         self.data = struct.unpack('%df' % (self.vlen,), t)
@@ -81,24 +84,26 @@ class my_top_block(gr.top_block):
 
         usage = "usage: %prog [options] min_freq max_freq"
         parser = OptionParser(option_class=eng_option, usage=usage)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=(0,0),
-                          help="select USRP Rx side A or B (default=A)")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("-s", "--samp-rate", type="eng_float", default=1e6,
+                          help="set sample rate [default=%default]")
         parser.add_option("-g", "--gain", type="eng_float", default=None,
                           help="set gain in dB (default is midpoint)")
-        parser.add_option("", "--tune-delay", type="eng_float", default=1e-3, metavar="SECS",
+        parser.add_option("", "--tune-delay", type="eng_float",
+                          default=1e-3, metavar="SECS",
                           help="time to delay (in seconds) after changing frequency [default=%default]")
-        parser.add_option("", "--dwell-delay", type="eng_float", default=10e-3, metavar="SECS",
+        parser.add_option("", "--dwell-delay", type="eng_float",
+                          default=10e-3, metavar="SECS",
                           help="time to dwell (in seconds) at a given frequncy [default=%default]")
         parser.add_option("-F", "--fft-size", type="int", default=256,
                           help="specify number of FFT bins [default=%default]")
-        parser.add_option("-d", "--decim", type="intx", default=16,
-                          help="set decimation to DECIM [default=%default]")
         parser.add_option("", "--real-time", action="store_true", default=False,
                           help="Attempt to enable real-time scheduling")
-        parser.add_option("-B", "--fusb-block-size", type="int", default=0,
-                          help="specify fast usb block size [default=%default]")
-        parser.add_option("-N", "--fusb-nblocks", type="int", default=0,
-                          help="specify number of fast usb blocks [default=%default]")
 
         (options, args) = parser.parse_args()
         if len(args) != 2:
@@ -109,11 +114,11 @@ class my_top_block(gr.top_block):
         self.max_freq = eng_notation.str_to_num(args[1])
 
         if self.min_freq > self.max_freq:
-            self.min_freq, self.max_freq = self.max_freq, self.min_freq   # swap them
+            # swap them
+            self.min_freq, self.max_freq = self.max_freq, self.min_freq
 
 	self.fft_size = options.fft_size
 
-
         if not options.real_time:
             realtime = False
         else:
@@ -125,36 +130,14 @@ class my_top_block(gr.top_block):
                 realtime = False
                 print "Note: failed to enable realtime scheduling"
 
-        # If the user hasn't set the fusb_* parameters on the command line,
-        # pick some values that will reduce latency.
-
-        if 1:
-            if options.fusb_block_size == 0 and options.fusb_nblocks == 0:
-                if realtime:                        # be more aggressive
-                    options.fusb_block_size = gr.prefs().get_long('fusb', 'rt_block_size', 1024)
-                    options.fusb_nblocks    = gr.prefs().get_long('fusb', 'rt_nblocks', 16)
-                else:
-                    options.fusb_block_size = gr.prefs().get_long('fusb', 'block_size', 4096)
-                    options.fusb_nblocks    = gr.prefs().get_long('fusb', 'nblocks', 16)
-    
-        #print "fusb_block_size =", options.fusb_block_size
-	#print "fusb_nblocks    =", options.fusb_nblocks
-
         # build graph
-        
-        self.u = usrp.source_c(fusb_block_size=options.fusb_block_size,
-                               fusb_nblocks=options.fusb_nblocks)
-
-
-        adc_rate = self.u.adc_rate()                # 64 MS/s
-        usrp_decim = options.decim
-        self.u.set_decim_rate(usrp_decim)
-        usrp_rate = adc_rate / usrp_decim
-
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        print "Using RX d'board %s" % (self.subdev.side_and_name(),)
+        self.u = uhd.usrp_source(device_addr=options.args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
 
+        usrp_rate = options.samp_rate
+        self.u.set_samp_rate(usrp_rate)
+        dev_rate = self.u.get_samp_rate()
 
 	s2v = gr.stream_to_vector(gr.sizeof_gr_complex, self.fft_size)
 
@@ -186,7 +169,8 @@ class my_top_block(gr.top_block):
         self.msgq = gr.msg_queue(16)
         self._tune_callback = tune(self)        # hang on to this to keep it from being GC'd
         stats = gr.bin_statistics_f(self.fft_size, self.msgq,
-                                    self._tune_callback, tune_delay, dwell_delay)
+                                    self._tune_callback, tune_delay,
+                                    dwell_delay)
 
         # FIXME leave out the log10 until we speed it up
 	#self.connect(self.u, s2v, fft, c2mag, log, stats)
@@ -194,12 +178,19 @@ class my_top_block(gr.top_block):
 
         if options.gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2.0
 
         self.set_gain(options.gain)
 	print "gain =", options.gain
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
 
     def set_next_freq(self):
         target_freq = self.next_freq
@@ -209,6 +200,7 @@ class my_top_block(gr.top_block):
 
         if not self.set_freq(target_freq):
             print "Failed to set frequency to", target_freq
+            sys.exit(1)
 
         return target_freq
                           
@@ -219,17 +211,15 @@ class my_top_block(gr.top_block):
 
         @param target_freq: frequency in Hz
         @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
         """
-        return self.u.tune(0, self.subdev, target_freq)
+        r = self.u.set_center_freq(target_freq)
+        if r:
+            return True
 
+        return False
 
     def set_gain(self, gain):
-        self.subdev.set_gain(gain)
+        self.u.set_gain(gain)
 
 
 def main_loop(tb):
@@ -254,7 +244,7 @@ def main_loop(tb):
 if __name__ == '__main__':
     tb = my_top_block()
     try:
-        tb.start()              # start executing flow graph in another thread...
+        tb.start()
         main_loop(tb)
         
     except KeyboardInterrupt:
diff --git a/gnuradio-examples/python/usrp/usrp_tv_rcv.py b/gr-uhd/examples/usrp_tv_rcv.py
index 4e13a83ab..22493dd00 100755
--- a/gnuradio-examples/python/usrp/usrp_tv_rcv.py
+++ b/gr-uhd/examples/usrp_tv_rcv.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,51 +22,38 @@
 
 """
 Realtime capture and display of analog Tv stations.
+
 Can also use a file as source or sink
-When you use an output file you can show the results frame-by-frame using ImageMagick
-When you want to use the realtime sdl display window you must first install gr-video-sdl (is in gnuradio cvs).
-When you use a file source, in stead of the usrp, make sure you capture interleaved shorts.
-(Use usrp_rx_file.py, or use usrp_rx_cfile.py --output-shorts if you have a recent enough usrp_rx_cfile.py)
-There is no synchronisation yet. The sync blocks are in development but not yet in cvs.
 
+When you use an output file you can show the results frame-by-frame
+using ImageMagick
+
+When you want to use the realtime sdl display window you must first
+install gr-video-sdl.
+
+When you use a file source, instead of the usrp, make sure you
+capture interleaved shorts.  (Use usrp_rx_file.py, or use
+usrp_rx_cfile.py --output-shorts if you have a recent enough
+usrp_rx_cfile.py)
+
+There is no synchronisation yet. The sync blocks are in development
+but not yet in cvs.
 """
-from gnuradio import gr, gru, eng_notation, optfir
+
+from gnuradio import gr
 try:
   from gnuradio import video_sdl
 except:
   print "FYI: gr-video-sdl is not installed"
   print "realtime SDL video output window will not be available"
-from gnuradio import usrp
+from gnuradio import uhd
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui2, fftsink2, form
 from optparse import OptionParser
-from usrpm import usrp_dbid
 import sys
-import math
 import wx
 
-# To debug, insert this in your test code...
-#import os
-#print 'Blocked waiting for GDB attach (pid = %d)' % (os.getpid(),)
-#raw_input ('Press Enter to continue: ')
-# remainder of your test code follows...
-
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    Try for one of these, in order: TV_RX, BASIC_RX, whatever is on side A.
-
-    @return a subdev_spec
-    """
-    return usrp.pick_subdev(u, (usrp_dbid.TV_RX,
-                                usrp_dbid.TV_RX_REV_2,
-				usrp_dbid.TV_RX_REV_3,
-				usrp_dbid.TV_RX_MIMO,
-                                usrp_dbid.TV_RX_REV_2_MIMO,
-				usrp_dbid.TV_RX_REV_3_MIMO,
-                                usrp_dbid.BASIC_RX))
-
 
 class tv_rx_block (stdgui2.std_top_block):
     def __init__(self,frame,panel,vbox,argv):
@@ -74,11 +61,15 @@ class tv_rx_block (stdgui2.std_top_block):
 
         usage="%prog: [options] [input_filename]. \n If you don't specify an input filename the usrp will be used as source\n " \
               "Make sure your input capture file containes interleaved shorts not complex floats"
-        parser=OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=A)")
-        parser.add_option("-d", "--decim", type="int", default=64,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
+        parser=OptionParser(option_class=eng_option, usage=usage)
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("-s", "--samp-rate", type="eng_float", default=1e6,
+                          help="set sample rate")
         parser.add_option("-f", "--freq", type="eng_float", default=519.25e6,
                           help="set frequency to FREQ", metavar="FREQ")
         parser.add_option("-g", "--gain", type="eng_float", default=None,
@@ -87,8 +78,6 @@ class tv_rx_block (stdgui2.std_top_block):
                           help="set contrast (default is 1.0)")
         parser.add_option("-b", "--brightness", type="eng_float", default=0.0,
                           help="set brightness (default is 0)")
-        parser.add_option("-8", "--width-8", action="store_true", default=False,
-                          help="Enable 8-bit samples across USB")
         parser.add_option("-p", "--pal", action="store_true", default=False,
                           help="PAL video format (this is the default)")
         parser.add_option("-n", "--ntsc", action="store_true", default=False,
@@ -97,8 +86,10 @@ class tv_rx_block (stdgui2.std_top_block):
                           help="For example out_raw_uchar.gray. If you don't specify an output filename you will get a video_sink_sdl realtime output window. You then need to have gr-video-sdl installed)")
         parser.add_option("-r", "--repeat", action="store_false", default=True,
                           help="repeat file in a loop")
-        parser.add_option("-N", "--no-hb", action="store_true", default=False,
-                          help="don't use halfband filter in usrp")
+        parser.add_option("", "--freq-min", type="eng_float", default=50.25e6,
+                          help="Set a minimum frequency [default=%default]")
+        parser.add_option("", "--freq-max", type="eng_float", default=900.25e6,
+                          help="Set a maximum frequency [default=%default]")
 
         (options, args) = parser.parse_args()
         if not ((len(args) == 1) or (len(args) == 0)):
@@ -118,68 +109,78 @@ class tv_rx_block (stdgui2.std_top_block):
         self.state = "FREQ"
         self.freq = 0
 
-        # build graph
+        self.tv_freq_min = options.freq_min
+        self.tv_freq_max = options.freq_max
 
+        # build graph
         self.u=None
 
-        usrp_decim = options.decim # 32
-
         if not (options.out_filename=="sdl"):
           options.repeat=False
 
+        usrp_rate = options.samp_rate
+
         if not ((filename is None) or (filename=="usrp")):
-          self.filesource = gr.file_source(gr.sizeof_short,filename,options.repeat) # file is data source
+          # file is data source
+          self.filesource = gr.file_source(gr.sizeof_short,filename,options.repeat)
           self.istoc = gr.interleaved_short_to_complex()
           self.connect(self.filesource,self.istoc)
-          adc_rate=64e6
           self.src=self.istoc
+
           options.gain=0.0
           self.gain=0.0
-        else:
-          if options.no_hb or (options.decim<8):
-            self.fpga_filename="std_4rx_0tx.rbf" #contains 4 Rx paths without halfbands and 0 tx paths
-          else:
-            self.fpga_filename="std_2rxhb_2tx.rbf" # contains 2 Rx paths with halfband filters and 2 tx paths (the default)
-          self.u = usrp.source_c(0,fpga_filename=self.fpga_filename)                    # usrp is data source
-          if options.width_8:
-              sample_width = 8
-              sample_shift = 8
-              format = self.u.make_format(sample_width, sample_shift)
-              r = self.u.set_format(format)
-          adc_rate = self.u.adc_rate()                # 64 MS/s
-          self.u.set_decim_rate(usrp_decim)
-          if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-          self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-          self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-          print "Using RX d'board %s" % (self.subdev.side_and_name(),)
+
+        else: # use a UHD device
+          self.u = uhd.usrp_source(device_addr=options.args,
+                                   io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                   num_channels=1)
+
+          self.u.set_samp_rate(usrp_rate)
+          dev_rate = self.u.get_samp_rate()
+
           if options.gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2.0
+
           self.src=self.u
 
-        usrp_rate = adc_rate / usrp_decim           # 320 kS/s
+          # Set the subdevice spec
+          if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+            
+          # Set the antenna
+          if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
+        self.gain = options.gain        
 
         f2uc=gr.float_to_uchar()
+
         # sdl window as final sink
         if not (options.pal or options.ntsc):
           options.pal=True #set default to PAL
+
         if options.pal:
           lines_per_frame=625.0
           frames_per_sec=25.0
           show_width=768
+
         elif options.ntsc:
           lines_per_frame=525.0
           frames_per_sec=29.97002997
           show_width=640
+
         width=int(usrp_rate/(lines_per_frame*frames_per_sec))
         height=int(lines_per_frame)
 
         if (options.out_filename=="sdl"):
-          #Here comes the tv screen, you have to build and install gr-video-sdl for this (subproject of gnuradio, only in cvs for now)
+          #Here comes the tv screen, you have to build and install
+          #gr-video-sdl for this (subproject of gnuradio, only in cvs
+          #for now)
           try:
-            video_sink = video_sdl.sink_uc ( frames_per_sec, width, height,0,show_width,height)
+            video_sink = video_sdl.sink_uc ( frames_per_sec, width, height, 0,
+                                             show_width, height)
           except:
             print "gr-video-sdl is not installed"
             print "realtime \"sdl\" video output window is not available"
@@ -188,7 +189,8 @@ class tv_rx_block (stdgui2.std_top_block):
         else:
           print "You can use the imagemagick display tool to show the resulting imagesequence"
           print "use the following line to show the demodulated TV-signal:"
-          print "display -depth 8 -size " +str(width)+ "x" + str(height) + " gray:" + options.out_filename
+          print "display -depth 8 -size " +str(width)+ "x" + str(height) \
+              + " gray:" + options.out_filename
           print "(Use the spacebar to advance to next frames)" 
           options.repeat=False
           file_sink=gr.file_sink(gr.sizeof_char, options.out_filename)
@@ -204,11 +206,23 @@ class tv_rx_block (stdgui2.std_top_block):
 
         process_type='do_no_sync'
         if process_type=='do_no_sync':
-          self.connect (self.src, self.agc,self.am_demod,self.invert_and_scale, self.set_blacklevel,f2uc,self.dst)
+          self.connect (self.src, self.agc,self.am_demod,
+                        self.invert_and_scale, self.set_blacklevel,
+                        f2uc,self.dst)
         elif process_type=='do_tv_sync_adv':
-          #defaults: gr.tv_sync_adv (double sampling_freq, unsigned int tv_format,bool output_active_video_only=false, bool do_invert=false, double wanted_black_level=0.0, double wanted_white_level=255.0, double avg_alpha=0.1, double initial_gain=1.0, double initial_offset=0.0,bool debug=false)
-          self.tv_sync_adv=gr.tv_sync_adv(usrp_rate,0,False,False,0.0,255.0,0.01,1.0,0.0,False) #note, this block is not yet in cvs
-          self.connect (self.src, self.am_demod,self.invert_and_scale,self.tv_sync_adv,s2f,f2uc,self.dst) 
+          #defaults: gr.tv_sync_adv (double sampling_freq, unsigned
+          #int tv_format,bool output_active_video_only=false, bool
+          #do_invert=false, double wanted_black_level=0.0, double
+          #wanted_white_level=255.0, double avg_alpha=0.1, double
+          #initial_gain=1.0, double initial_offset=0.0,bool
+          #debug=false)
+
+          #note, this block is not yet in cvs
+          self.tv_sync_adv=gr.tv_sync_adv(usrp_rate, 0, False, False,
+                                          0.0, 255.0, 0.01, 1.0, 0.0, False)
+          self.connect (self.src, self.am_demod, self.invert_and_scale,
+                        self.tv_sync_adv, s2f, f2uc, self.dst) 
+
         elif process_type=='do_nullsink':
           #self.connect (self.src, self.am_demod,self.invert_and_scale,f2uc,video_sink)
           c2r=gr.complex_to_real()
@@ -221,18 +235,30 @@ class tv_rx_block (stdgui2.std_top_block):
           debug=False
           video_alpha=0.3 #0.1
           corr_alpha=0.3
-          tv_corr=gr.tv_correlator_ff(frame_size,nframes, search_window, video_alpha, corr_alpha,debug) #Note: this block is not yet in cvs
+          
+          #Note: this block is not yet in cvs
+          tv_corr=gr.tv_correlator_ff(frame_size,nframes, search_window,
+                                      video_alpha, corr_alpha,debug) 
           shift=gr.add_const_ff(-0.7)
-          self.connect (self.src, self.agc,self.am_demod,tv_corr,self.invert_and_scale, self.set_blacklevel,f2uc,self.dst) #self.agc,
+          
+          self.connect (self.src, self.agc, self.am_demod, tv_corr,
+                        self.invert_and_scale, self.set_blacklevel,
+                        f2uc, self.dst)
         else: # process_type=='do_test_image':
-          src_vertical_bars = gr.sig_source_f (usrp_rate, gr.GR_SIN_WAVE, 10.0 *usrp_rate/320, 255,128)
-          self.connect(src_vertical_bars,f2uc,self.dst)
+          src_vertical_bars = gr.sig_source_f (usrp_rate, gr.GR_SIN_WAVE,
+                                               10.0 *usrp_rate/320, 255,128)
+          self.connect(src_vertical_bars, f2uc, self.dst)
 
         self._build_gui(vbox, usrp_rate, usrp_rate, usrp_rate)
+ 
 
-   
-        if abs(options.freq) < 1e6:
-            options.freq *= 1e6
+        frange = self.u.get_freq_range()
+        if(frange.start() > self.tv_freq_max or frange.stop() <  self.tv_freq_min):
+            sys.stderr.write("Radio does not support required frequency range.\n")
+            sys.exit(1)
+        if(options.freq < self.tv_freq_min or options.freq > self.tv_freq_max):
+            sys.stderr.write("Requested frequency is outside of required frequency range.\n")
+            sys.exit(1)
 
         # set initial values
         self.set_gain(options.gain)
@@ -286,7 +312,7 @@ class tv_rx_block (stdgui2.std_top_block):
           hbox.Add((5,0), 0)
           myform['freq_slider'] = \
               form.quantized_slider_field(parent=self.panel, sizer=hbox, weight=3,
-                                        range=(50.25e6, 900.25e6, 0.25e6),
+                                        range=(self.tv_freq_min, self.tv_freq_max, 0.25e6),
                                         callback=self.set_freq)
           hbox.Add((5,0), 0)
           vbox.Add(hbox, 0, wx.EXPAND)
@@ -307,9 +333,10 @@ class tv_rx_block (stdgui2.std_top_block):
         hbox.Add((5,0), 0)
 
         if not (self.u is None):
+          g = self.u.get_gain_range()
           myform['gain'] = \
               form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                        weight=3, range=self.subdev.gain_range(),
+                                        weight=3, range=(g.start(), g.stop(), g.step()),
                                         callback=self.set_gain)
           hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -387,7 +414,7 @@ class tv_rx_block (stdgui2.std_top_block):
         determine the value for the digital down converter.
         """
         if not (self.u is None):
-          r = usrp.tune(self.u, 0, self.subdev, target_freq)
+          r = self.u.set_center_freq(target_freq)
           if r:
               self.freq = target_freq
               self.myform['freq'].set_value(target_freq)         # update displayed value
@@ -400,17 +427,17 @@ class tv_rx_block (stdgui2.std_top_block):
         return False
 
     def set_gain(self, gain):
-        if not (self.u is None):
-          self.gain=gain
-          self.myform['gain'].set_value(gain)     # update displayed value
-          self.subdev.set_gain(gain)
-          self.update_status_bar()
-
+      if not (self.u is None):
+        self.gain=gain
+        self.myform['gain'].set_value(gain)     # update displayed value
+        self.u.set_gain(gain)
+        self.update_status_bar()
+        
     def update_status_bar (self):
-        msg = "Setting:%s Contrast:%r Brightness:%r Gain: %r" % (self.state, self.contrast,self.brightness,self.gain)
-        self._set_status_msg(msg, 1)
+      msg = "Setting:%s Contrast:%r Brightness:%r Gain: %r" % \
+          (self.state, self.contrast,self.brightness,self.gain)
+      self._set_status_msg(msg, 1)
         #self.src_fft.set_baseband_freq(self.freq)
-
         
 
 if __name__ == '__main__':
diff --git a/gnuradio-examples/python/usrp/usrp_tv_rcv_nogui.py b/gr-uhd/examples/usrp_tv_rcv_nogui.py
index e6a8de1be..2324eb29e 100755
--- a/gnuradio-examples/python/usrp/usrp_tv_rcv_nogui.py
+++ b/gr-uhd/examples/usrp_tv_rcv_nogui.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,17 +22,21 @@
 
 """
 Reads from a file and generates PAL TV pictures in black and white
-which can be displayed using ImageMagick or realtime using gr-video-sdl
-(To capture the input file Use usrp_rx_file.py, or use usrp_rx_cfile.py --output-shorts if you have a recent enough usrp_rx_cfile.py)
-Can also use usrp directly as capture source, but then you need a higher decimation factor (64)
-and thus get a lower horizontal resulution.
-There is no synchronisation yet. The sync blocks are in development but not yet in cvs.
+which can be displayed using ImageMagick or realtime using
+gr-video-sdl (To capture the input file Use usrp_rx_file.py, or use
+usrp_rx_cfile.py --output-shorts if you have a recent enough
+usrp_rx_cfile.py)
+
+Can also use usrp directly as capture source, but then you need a
+higher decimation factor (64) and thus get a lower horizontal
+resulution.  There is no synchronisation yet. The sync blocks are in
+development but not yet in cvs.
 
 """
 
 from gnuradio import gr, eng_notation
 from gnuradio import audio
-from gnuradio import usrp
+from gnuradio import uhd
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 import sys
@@ -49,24 +53,32 @@ class my_top_block(gr.top_block):
     def __init__(self):
         gr.top_block.__init__(self)
 
-        usage="%prog: [options] output_filename. \n Special output_filename \"sdl\" will use video_sink_sdl as realtime output window. " \
-              "You then need to have gr-video-sdl installed. \n" \
-              "Make sure your input capture file containes interleaved shorts not complex floats"
+        usage=("%prog: [options] output_filename.\nSpecial output_filename" + \
+            "\"sdl\" will use video_sink_sdl as realtime output window. " + \
+            "You then need to have gr-video-sdl installed.\n" +\
+            "Make sure your input capture file containes interleaved " + \
+            "shorts not complex floats")
         parser = OptionParser(option_class=eng_option, usage=usage)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=(0, 0),
-                          help="select USRP Rx side A or B (default=A)")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("-s", "--samp-rate", type="eng_float", default=1e6,
+                          help="set sample rate")
         parser.add_option("-c", "--contrast", type="eng_float", default=1.0,
                           help="set contrast (default is 1.0)")
         parser.add_option("-b", "--brightness", type="eng_float", default=0.0,
                           help="set brightness (default is 0)")
-        parser.add_option("-d", "--decim", type="int", default=8,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
         parser.add_option("-i", "--in-filename", type="string", default=None,
-                          help="Use input file as source. samples must be interleaved shorts \n " +
-                               "Use usrp_rx_file.py or usrp_rx_cfile.py --output-shorts. \n"
-                               "Special name \"usrp\"  results in realtime capturing and processing using usrp. \n" +
-                               "You then probably need a decimation factor of 64 or higher.")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
+                          help="Use input file as source. samples must be " + \
+                            "interleaved shorts \n Use usrp_rx_file.py or " + \
+                            "usrp_rx_cfile.py --output-shorts.\n Special " + \
+                            "name \"usrp\" results in realtime capturing " + \
+                            "and processing using usrp.\n" + \
+                            "You then probably need a decimation factor of 64 or higher.")
+        parser.add_option("-f", "--freq", type="eng_float", default=519.25e6,
                           help="set frequency to FREQ.\nNote that the frequency of the video carrier is not at the middle of the TV channel", metavar="FREQ")
         parser.add_option("-g", "--gain", type="eng_float", default=None,
                           help="set gain in dB (default is midpoint)")
@@ -76,12 +88,12 @@ class my_top_block(gr.top_block):
                           help="NTSC video format")
         parser.add_option("-r", "--repeat", action="store_false", default=True,
                           help="repeat in_file in a loop")
-        parser.add_option("-8", "--width-8", action="store_true", default=False,
-                          help="Enable 8-bit samples across USB")
         parser.add_option("-N", "--nframes", type="eng_float", default=None,
                           help="number of frames to collect [default=+inf]")
-        parser.add_option( "--no-hb", action="store_true", default=False,
-                          help="don't use halfband filter in usrp")
+        parser.add_option("", "--freq-min", type="eng_float", default=50.25e6,
+                          help="Set a minimum frequency [default=%default]")
+        parser.add_option("", "--freq-max", type="eng_float", default=900.25e6,
+                          help="Set a maximum frequency [default=%default]")
         (options, args) = parser.parse_args ()
         if not (len(args) == 1):
             parser.print_help()
@@ -90,6 +102,9 @@ class my_top_block(gr.top_block):
         
         filename = args[0]
 
+        self.tv_freq_min = options.freq_min
+        self.tv_freq_max = options.freq_max
+
         if options.in_filename is None:
             parser.print_help()
             sys.stderr.write('You must specify the input -i FILENAME or -i usrp\n');
@@ -98,61 +113,60 @@ class my_top_block(gr.top_block):
         if not (filename=="sdl"):
           options.repeat=False
 
+        input_rate = options.samp_rate
+        print "video sample rate %s" % (eng_notation.num_to_str(input_rate))
+
         if not (options.in_filename=="usrp"):
-          self.filesource = gr.file_source(gr.sizeof_short,options.in_filename,options.repeat) # file is data source, capture with usr_rx_csfile.py
+          # file is data source, capture with usr_rx_csfile.py
+          self.filesource = gr.file_source(gr.sizeof_short,
+                                           options.in_filename,
+                                           options.repeat) 
           self.istoc = gr.interleaved_short_to_complex()
           self.connect(self.filesource,self.istoc)
-          self.adc_rate=64e6
           self.src=self.istoc
         else:
           if options.freq is None:
             parser.print_help()
             sys.stderr.write('You must specify the frequency with -f FREQ\n');
             raise SystemExit, 1
-          if abs(options.freq) < 1e6:
-              options.freq *= 1e6
-          if options.no_hb or (options.decim<8):
-            self.fpga_filename="std_4rx_0tx.rbf" #contains 4 Rx paths without halfbands and 0 tx paths
-          else:
-            self.fpga_filename="std_2rxhb_2tx.rbf" # contains 2 Rx paths with halfband filters and 2 tx paths (the default)
 
           # build the graph
-          self.u = usrp.source_c(decim_rate=options.decim,fpga_filename=self.fpga_filename)
+          self.u = uhd.usrp_source(device_addr=options.args,
+                                   io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                   num_channels=1)
+
+          self.u.set_samp_rate(input_rate)
+          dev_rate = self.u.get_samp_rate()
+
           self.src=self.u
-          if options.width_8:
-              sample_width = 8
-              sample_shift = 8
-              format = self.u.make_format(sample_width, sample_shift)
-              r = self.u.set_format(format)
-          self.adc_rate=self.u.adc_freq()
-          if options.rx_subdev_spec is None:
-              options.rx_subdev_spec = usrp.pick_rx_subdevice(self.u)
-          self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-          # determine the daughterboard subdevice we're using
-          self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-          print "Using RX d'board %s" % (self.subdev.side_and_name(),)
 
           if options.gain is None:
               # if no gain was specified, use the mid-point in dB
-              g = self.subdev.gain_range()
-              options.gain = float(g[0]+g[1])/2
-          self.subdev.set_gain(options.gain)
+              g = self.u.get_gain_range()
+              options.gain = float(g.start()+g.stop())/2.0
+          self.u.set_gain(options.gain)
 
-          r = self.u.tune(0, self.subdev, options.freq)
+          r = self.u.set_center_freq(options.freq)
           if not r:
               sys.stderr.write('Failed to set frequency\n')
               raise SystemExit, 1
+          
+          # Set the subdevice spec
+          if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
 
-        input_rate = self.adc_rate / options.decim
-        print "video sample rate %s" % (eng_notation.num_to_str(input_rate))
+          # Set the antenna
+          if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+          
 
-        self.agc=gr.agc_cc(1e-7,1.0,1.0) #1e-7
+        self.agc = gr.agc_cc(1e-7,1.0,1.0) #1e-7
         self.am_demod = gr.complex_to_mag ()
-        self.set_blacklevel=gr.add_const_ff(options.brightness +255.0)
+        self.set_blacklevel = gr.add_const_ff(options.brightness +255.0)
         self.invert_and_scale = gr.multiply_const_ff (-options.contrast *128.0*255.0/(200.0))
-        self.f2uc=gr.float_to_uchar()
+        self.f2uc = gr.float_to_uchar()
 
-          # sdl window as final sink
+        # sdl window as final sink
         if not (options.pal or options.ntsc):
           options.pal=True #set default to PAL
         if options.pal:
@@ -167,9 +181,12 @@ class my_top_block(gr.top_block):
         height=int(lines_per_frame)
 
         if filename=="sdl":
-          #Here comes the tv screen, you have to build and install gr-video-sdl for this (subproject of gnuradio, only in cvs for now)
+          #Here comes the tv screen, you have to build and install
+          #gr-video-sdl for this (subproject of gnuradio, only in cvs
+          #for now)
           try:
-            video_sink = video_sdl.sink_uc ( frames_per_sec, width, height,0,show_width,height)
+            video_sink = video_sdl.sink_uc(frames_per_sec, width, height, 0,
+                                           show_width,height)
           except:
             print "gr-video-sdl is not installed"
             print "realtime \"sdl\" video output window is not available"
@@ -189,9 +206,9 @@ class my_top_block(gr.top_block):
             self.head = gr.head(gr.sizeof_gr_complex, int(options.nframes*width*height))
             self.connect(self.src, self.head, self.agc)
 
-        self.connect (self.agc,self.am_demod,self.invert_and_scale, self.set_blacklevel,self.f2uc,self.dst)
+        self.connect (self.agc, self.am_demod, self.invert_and_scale,
+                      self.set_blacklevel, self.f2uc, self.dst)
 
-        
 if __name__ == '__main__':
     try:
         my_top_block().run()
diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py b/gr-uhd/examples/usrp_wfm_rcv.py
index fba2a1210..cfdaa6d6f 100755
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
+++ b/gr-uhd/examples/usrp_wfm_rcv.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc.
+# Copyright 2005-2007,2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,42 +20,26 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import audio
-from gnuradio import usrp
-from gnuradio import blks2
+from gnuradio import gr, optfir, audio, blks2, uhd
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui2, fftsink2, form
 from optparse import OptionParser
-from usrpm import usrp_dbid
 import sys
-import math
 import wx
 
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    Try for one of these, in order: TV_RX, BASIC_RX, whatever is on side A.
-
-    @return a subdev_spec
-    """
-    return usrp.pick_subdev(u, (usrp_dbid.TV_RX,
-                                usrp_dbid.TV_RX_REV_2,
-				usrp_dbid.TV_RX_REV_3,
-				usrp_dbid.TV_RX_MIMO,
-                                usrp_dbid.TV_RX_REV_2_MIMO,
-				usrp_dbid.TV_RX_REV_3_MIMO,
-                                usrp_dbid.BASIC_RX))
-
 
 class wfm_rx_block (stdgui2.std_top_block):
     def __init__(self,frame,panel,vbox,argv):
         stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv)
 
         parser=OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=A)")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
         parser.add_option("-f", "--freq", type="eng_float", default=100.1e6,
                           help="set frequency to FREQ", metavar="FREQ")
         parser.add_option("-g", "--gain", type="eng_float", default=40,
@@ -64,6 +48,10 @@ class wfm_rx_block (stdgui2.std_top_block):
                           help="set volume (default is midpoint)")
         parser.add_option("-O", "--audio-output", type="string", default="",
                           help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
+        parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
+                          help="Set a minimum frequency [default=%default]")
+        parser.add_option("", "--freq-max", type="eng_float", default=108.1e6,
+                          help="Set a maximum frequency [default=%default]")
 
         (options, args) = parser.parse_args()
         if len(args) != 0:
@@ -77,72 +65,64 @@ class wfm_rx_block (stdgui2.std_top_block):
         self.state = "FREQ"
         self.freq = 0
 
+        self.fm_freq_min = options.freq_min
+        self.fm_freq_max = options.freq_max
+
         # build graph
-        
-        self.u = usrp.source_c()                    # usrp is data source
-
-        adc_rate = self.u.adc_rate()                # 64 MS/s
-        usrp_decim = 200
-        self.u.set_decim_rate(usrp_decim)
-        usrp_rate = adc_rate / usrp_decim           # 320 kS/s
-        chanfilt_decim = 1
-        demod_rate = usrp_rate / chanfilt_decim
-        audio_decimation = 10
-        audio_rate = demod_rate / audio_decimation  # 32 kHz
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        print "Using RX d'board %s" % (self.subdev.side_and_name(),)
-        dbid = self.subdev.dbid()
-        if not (dbid == usrp_dbid.BASIC_RX or
-                dbid == usrp_dbid.TV_RX or
-                dbid == usrp_dbid.TV_RX_REV_2 or
-                dbid == usrp_dbid.TV_RX_REV_3 or
-                dbid == usrp_dbid.TV_RX_MIMO or
-                dbid == usrp_dbid.TV_RX_REV_2_MIMO or
-                dbid == usrp_dbid.TV_RX_REV_3_MIMO
-):
-            print "This daughterboard does not cover the required frequency range"
-            print "for this application.  Please use a BasicRX or TVRX daughterboard."
-            raw_input("Press ENTER to continue anyway, or Ctrl-C to exit.")
-
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
-                                            usrp_rate,   # sampling rate
-                                            80e3,        # passband cutoff
-                                            115e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-        chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
-
-        self.guts = blks2.wfm_rcv (demod_rate, audio_decimation)
+        self.u = uhd.usrp_source(device_addr=options.args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
+
+        usrp_rate  = 320e3
+        demod_rate = 320e3
+        audio_rate = 32e3
+        audio_decim = int(demod_rate / audio_rate)
+
+        self.u.set_samp_rate(usrp_rate)
+        dev_rate = self.u.get_samp_rate()
+
+        nfilts = 32
+        chan_coeffs = optfir.low_pass (nfilts,           # gain
+                                       nfilts*usrp_rate, # sampling rate
+                                       80e3,             # passband cutoff
+                                       115e3,            # stopband cutoff
+                                       0.1,              # passband ripple
+                                       60)               # stopband attenuation
+        rrate = usrp_rate / dev_rate
+        self.chan_filt = blks2.pfb_arb_resampler_ccf(rrate, chan_coeffs, nfilts)
+
+        self.guts = blks2.wfm_rcv (demod_rate, audio_decim)
 
         self.volume_control = gr.multiply_const_ff(self.vol)
 
         # sound card as final sink
-        audio_sink = audio.sink (int (audio_rate),
-                                 options.audio_output,
-                                 False)  # ok_to_block
+        self.audio_sink = audio.sink (int (audio_rate),
+                                      options.audio_output,
+                                      False)  # ok_to_block
         
         # now wire it all together
-        self.connect (self.u, chan_filt, self.guts, self.volume_control, audio_sink)
+        self.connect (self.u, self.chan_filt, self.guts,
+                      self.volume_control, self.audio_sink)
 
         self._build_gui(vbox, usrp_rate, demod_rate, audio_rate)
 
         if options.gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2
 
         if options.volume is None:
             g = self.volume_range()
             options.volume = float(g[0]+g[1])/2
+        
+        frange = self.u.get_freq_range()
+        if(frange.start() > self.fm_freq_max or frange.stop() <  self.fm_freq_min):
+            sys.stderr.write("Radio does not support required frequency range.\n")
+            sys.exit(1)
+        if(options.freq < self.fm_freq_min or options.freq > self.fm_freq_max):
+            sys.stderr.write("Requested frequency is outside of required frequency range.\n")
+            sys.exit(1)
             
-        if abs(options.freq) < 1e6:
-            options.freq *= 1e6
 
         # set initial values
 
@@ -151,6 +131,13 @@ class wfm_rx_block (stdgui2.std_top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
 
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
@@ -196,7 +183,7 @@ class wfm_rx_block (stdgui2.std_top_block):
         hbox.Add((5,0), 0)
         myform['freq_slider'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, weight=3,
-                                        range=(87.9e6, 108.1e6, 0.1e6),
+                                        range=(self.fm_freq_min, self.fm_freq_max, 0.1e6),
                                         callback=self.set_freq)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -210,9 +197,10 @@ class wfm_rx_block (stdgui2.std_top_block):
                                         callback=self.set_vol)
         hbox.Add((5,0), 1)
 
+        g = self.u.get_gain_range()        
         myform['gain'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                        weight=3, range=self.subdev.gain_range(),
+                                        weight=3, range=(g.start(), g.stop(), g.step()),
                                         callback=self.set_gain)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -268,14 +256,9 @@ class wfm_rx_block (stdgui2.std_top_block):
 
         @param target_freq: frequency in Hz
         @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
         """
-        r = usrp.tune(self.u, 0, self.subdev, target_freq)
-        
+
+        r = self.u.set_center_freq(target_freq)
         if r:
             self.freq = target_freq
             self.myform['freq'].set_value(target_freq)         # update displayed value
@@ -289,7 +272,7 @@ class wfm_rx_block (stdgui2.std_top_block):
 
     def set_gain(self, gain):
         self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
+        self.u.set_gain(gain)
 
     def update_status_bar (self):
         msg = "Volume:%r  Setting:%s" % (self.vol, self.state)
diff --git a/gr-uhd/examples/usrp_wfm_rcv2_nogui.py b/gr-uhd/examples/usrp_wfm_rcv2_nogui.py
new file mode 100755
index 000000000..8cbd18475
--- /dev/null
+++ b/gr-uhd/examples/usrp_wfm_rcv2_nogui.py
@@ -0,0 +1,156 @@
+#!/usr/bin/env python
+#
+# Copyright 2005-2007,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.
+# 
+
+from gnuradio import gr, optfir, audio, blks2, uhd
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+from usrpm import usrp_dbid
+import sys
+import math
+
+class wfm_rx_block (gr.top_block):
+
+    def __init__(self):
+        gr.top_block.__init__(self)
+
+        parser=OptionParser(option_class=eng_option)
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default="A:0 A:0",
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("", "--f1", type="eng_float", default=100.7e6,
+                          help="set 1st station frequency to FREQ", metavar="FREQ")
+        parser.add_option("", "--f2", type="eng_float", default=102.5e6,
+                          help="set 2nd station freq to FREQ", metavar="FREQ")
+        parser.add_option("-g", "--gain", type="eng_float", default=40,
+                          help="set gain in dB (default is midpoint)")
+        parser.add_option("-O", "--audio-output", type="string", default="",
+                          help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
+        parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
+                          help="Set a minimum frequency [default=%default]")
+        parser.add_option("", "--freq-max", type="eng_float", default=108.1e6,
+                          help="Set a maximum frequency [default=%default]")
+
+        (options, args) = parser.parse_args()
+        if len(args) != 0:
+            parser.print_help()
+            sys.exit(1)
+        
+        if abs(options.f1 - options.f2) > 5.5e6:
+            print "Sorry, two stations must be within 5.5MHz of each other"
+            raise SystemExit
+
+        f = (options.f1, options.f2)
+        
+        self.vol = .1
+        self.state = "FREQ"
+
+        self.fm_freq_min = options.freq_min
+        self.fm_freq_max = options.freq_max
+
+        # build graph
+        self.u = uhd.usrp_source(device_addr=options.args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=2)
+
+        # Set front end channel mapping
+        self.u.set_subdev_spec(options.spec)
+
+        usrp_rate  = 320e3
+        demod_rate = 320e3
+        audio_rate = 32e3
+        audio_decim = int(demod_rate / audio_rate)
+
+        self.u.set_samp_rate(usrp_rate)
+        dev_rate = self.u.get_samp_rate()
+
+        # Make sure dboard can suppor the required frequencies
+        frange = self.u.get_freq_range()
+        if(frange.start() > self.fm_freq_max or frange.stop() <  self.fm_freq_min):
+            sys.stderr.write("Radio does not support required frequency range.\n")
+            sys.exit(1)
+
+        # sound card as final sink
+        self.audio_sink = audio.sink(int(audio_rate), options.audio_output)
+
+        # taps for channel filter
+        nfilts = 32
+        chan_coeffs = optfir.low_pass (nfilts,           # gain
+                                       nfilts*usrp_rate, # sampling rate
+                                       80e3,             # passband cutoff
+                                       115e3,            # stopband cutoff
+                                       0.1,              # passband ripple
+                                       60)               # stopband attenuation
+        rrate = usrp_rate / dev_rate
+
+        # set front end PLL to middle frequency
+        mid_freq = (f[0] + f[1]) / 2.0
+
+        if options.gain is None:
+            # if no gain was specified, use the mid-point in dB
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2.0
+
+        for n in range(2):
+           chan_filt = blks2.pfb_arb_resampler_ccf(rrate, chan_coeffs, nfilts)
+           guts = blks2.wfm_rcv (demod_rate, audio_decim)
+           volume_control = gr.multiply_const_ff(self.vol)
+
+           #self.connect((self.di, n), chan_filt)
+           self.connect((self.u, n), chan_filt)
+           self.connect(chan_filt, guts, volume_control)
+           self.connect(volume_control, (self.audio_sink, n))
+
+           # Test the the requested frequencies are in range
+           if(f[n] < self.fm_freq_min or f[n] > self.fm_freq_max):
+              sys.stderr.write("Requested frequency is outside of required frequency range.\n")
+              sys.exit(1)
+
+           # Tune each channel by setting the RF freq to mid_freq and the
+           # DDC freq to f[n].
+           tr = uhd.tune_request(f[n], rf_freq=mid_freq,
+                                 rf_freq_policy=uhd.tune_request.POLICY_MANUAL)
+           self.u.set_center_freq(tr, n)
+           
+           # Set gain for each channel
+           self.set_gain(options.gain, n)
+
+           # Set the antenna
+           if(options.antenna):
+               self.u.set_antenna(options.antenna, n)
+
+    def set_vol (self, vol):
+        self.vol = vol
+        self.volume_control.set_k(self.vol)
+
+
+    def set_gain(self, gain, n):
+        self.u.set_gain(gain, n)
+
+if __name__ == '__main__':
+    tb = wfm_rx_block()
+    try:
+        tb.run()
+    except KeyboardInterrupt:
+        pass
diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_fmdet.py b/gr-uhd/examples/usrp_wfm_rcv_fmdet.py
index 30744ee01..39c711a6d 100755
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_fmdet.py
+++ b/gr-uhd/examples/usrp_wfm_rcv_fmdet.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,41 +20,25 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import audio
-from gnuradio import usrp
-from gnuradio import blks2
+from gnuradio import gr, optfir, audio, blks2, uhd
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui2, fftsink2, form, scopesink2
 from optparse import OptionParser
-from usrpm import usrp_dbid
 import sys
-import math
 import wx
 
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    Try for one of these, in order: TV_RX, BASIC_RX, whatever is on side A.
-
-    @return a subdev_spec
-    """
-    return usrp.pick_subdev(u, (usrp_dbid.TV_RX,
-                                usrp_dbid.TV_RX_REV_2,
-				usrp_dbid.TV_RX_REV_3,
-				usrp_dbid.TV_RX_MIMO,
-                                usrp_dbid.TV_RX_REV_2_MIMO,
-				usrp_dbid.TV_RX_REV_3_MIMO,
-                                usrp_dbid.BASIC_RX))
-
 class wfm_rx_block (stdgui2.std_top_block):
     def __init__(self,frame,panel,vbox,argv):
         stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv)
 
         parser=OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=A)")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
         parser.add_option("-f", "--freq", type="eng_float", default=100.1e6,
                           help="set frequency to FREQ", metavar="FREQ")
         parser.add_option("-g", "--gain", type="eng_float", default=65,
@@ -65,6 +49,10 @@ class wfm_rx_block (stdgui2.std_top_block):
                           help="set volume (default is midpoint)")
         parser.add_option("-O", "--audio-output", type="string", default="",
                           help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
+        parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
+                          help="Set a minimum frequency [default=%default]")
+        parser.add_option("", "--freq-max", type="eng_float", default=108.1e6,
+                          help="Set a maximum frequency [default=%default]")
 
 
         (options, args) = parser.parse_args()
@@ -79,55 +67,52 @@ class wfm_rx_block (stdgui2.std_top_block):
         self.state = "FREQ"
         self.freq = 0
 
-        # build graph
-        
-        self.u = usrp.source_c()                    # usrp is data source
-
-        adc_rate = self.u.adc_rate()                # 64 MS/s
-        usrp_decim = 200
-        self.u.set_decim_rate(usrp_decim)
-        usrp_rate = adc_rate / usrp_decim           #  320 kS/s
-        chanfilt_decim = 1
-        demod_rate = usrp_rate / chanfilt_decim
-        audio_decimation = 10
-        audio_rate = 3*demod_rate / audio_decimation/2  # 48 kHz
+        self.fm_freq_min = options.freq_min
+        self.fm_freq_max = options.freq_max
 
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
+        # build graph
+        self.u = uhd.usrp_source(device_addr=options.args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
 
+        usrp_rate  = 320e3
+        demod_rate = 320e3
+        audio_rate = 48e3
+        audio_decim = 10
 
-        chan_filt_coeffs = gr.firdes.low_pass_2     (1,         # gain
-                                            usrp_rate,   # sampling rate
-                                            90e3,        # passband cutoff
-                                            30e3,        # transition bandwidth
-                                            70,          # stopband attenuation
-                                            gr.firdes.WIN_BLACKMAN)
-        print len(chan_filt_coeffs)
-        chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
+        self.u.set_samp_rate(usrp_rate)
+        dev_rate = self.u.get_samp_rate()
 
-        self.rchan_sample = blks2.rational_resampler_fff(3,2)
-        self.lchan_sample = blks2.rational_resampler_fff(3,2)
+        nfilts = 32
+        chan_coeffs = gr.firdes.low_pass_2(10*nfilts,           # gain
+                                           nfilts*usrp_rate, # sampling rate
+                                           90e3,             # passband cutoff
+                                           30e3,             # transition bw
+                                           70)               # stopband attenuation
+        rrate = usrp_rate / dev_rate
+        self.chan_filt = blks2.pfb_arb_resampler_ccf(rrate, chan_coeffs, nfilts)
 
+        self.guts = blks2.wfm_rcv_fmdet (demod_rate, audio_decim)
 
-        #self.guts = blks2.wfm_rcv (demod_rate, audio_decimation)
-        self.guts = blks2.wfm_rcv_fmdet (demod_rate, audio_decimation)
+        chan_rate = audio_rate / (demod_rate/audio_decim)
+        self.rchan_filt = blks2.pfb_arb_resampler_fff(chan_rate)
+        self.lchan_filt = blks2.pfb_arb_resampler_fff(chan_rate)
 
         # FIXME rework {add,multiply}_const_* to handle multiple streams
         self.volume_control_l = gr.multiply_const_ff(self.vol)
         self.volume_control_r = gr.multiply_const_ff(self.vol)
 
         # sound card as final sink
-        audio_sink = audio.sink (int (audio_rate),
-                                 options.audio_output,
-                                 False)   # ok_to_block
+        self.audio_sink = audio.sink (int (audio_rate),
+                                      options.audio_output,
+                                      False)   # ok_to_block
         
         # now wire it all together
-        self.connect (self.u, chan_filt, self.guts)
-        self.connect((self.guts, 0), self.lchan_sample,self.volume_control_l,(audio_sink,0))
-        self.connect((self.guts, 1), self.rchan_sample,self.volume_control_r,(audio_sink,1))
+        self.connect (self.u, self.chan_filt, self.guts)
+        self.connect((self.guts, 0), self.lchan_filt,
+                     self.volume_control_l, (self.audio_sink,0))
+        self.connect((self.guts, 1), self.rchan_filt,
+                     self.volume_control_r, (self.audio_sink,1))
 
         try:
           self.guts.stereo_carrier_pll_recovery.squelch_enable(True)
@@ -139,8 +124,8 @@ class wfm_rx_block (stdgui2.std_top_block):
 
         if options.gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2.0
 
         if options.volume is None:
             g = self.volume_range()
@@ -149,8 +134,15 @@ class wfm_rx_block (stdgui2.std_top_block):
         if abs(options.freq) < 1e6:
             options.freq *= 1e6
 
-        # set initial values
+        frange = self.u.get_freq_range()
+        if(frange.start() > self.fm_freq_max or frange.stop() <  self.fm_freq_min):
+            sys.stderr.write("Radio does not support required frequency range.\n")
+            sys.exit(1)
+        if(options.freq < self.fm_freq_min or options.freq > self.fm_freq_max):
+            sys.stderr.write("Requested frequency is outside of required frequency range.\n")
+            sys.exit(1)
 
+        # set initial values
         self.set_gain(options.gain)
         self.set_vol(options.volume)
         try:
@@ -161,6 +153,13 @@ class wfm_rx_block (stdgui2.std_top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
 
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
@@ -232,7 +231,7 @@ class wfm_rx_block (stdgui2.std_top_block):
         hbox.Add((5,0), 0)
         myform['freq_slider'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, weight=3,
-                                        range=(87.9e6, 108.1e6, 0.1e6),
+                                        range=(self.fm_freq_min, self.fm_freq_max, 0.1e6),
                                         callback=self.set_freq)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -246,9 +245,10 @@ class wfm_rx_block (stdgui2.std_top_block):
                                         callback=self.set_vol)
         hbox.Add((5,0), 1)
 
+        g = self.u.get_gain_range()        
         myform['gain'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                        weight=3, range=self.subdev.gain_range(),
+                                        weight=3, range=(g.start(), g.stop(), g.step()),
                                         callback=self.set_gain)
         hbox.Add((5,0), 0)
 
@@ -311,20 +311,17 @@ class wfm_rx_block (stdgui2.std_top_block):
         except:
           print "FYI: This implementation of the stereo_carrier_pll_recovery has no squelch implementation yet"
                                         
+
     def set_freq(self, target_freq):
         """
         Set the center frequency we're interested in.
 
         @param target_freq: frequency in Hz
         @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
         """
-        r = usrp.tune(self.u, 0, self.subdev, target_freq)
         
+        r = self.u.set_center_freq(target_freq)
+
         if r:
             self.freq = target_freq
             self.myform['freq'].set_value(target_freq)         # update displayed value
@@ -335,10 +332,10 @@ class wfm_rx_block (stdgui2.std_top_block):
 
         self._set_status_msg("Failed", 0)
         return False
-
+        
     def set_gain(self, gain):
         self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
+        self.u.set_gain(gain)
 
     def update_status_bar (self):
         msg = "Volume:%r  Setting:%s" % (self.vol, self.state)
diff --git a/gr-uhd/examples/usrp_wfm_rcv_nogui.py b/gr-uhd/examples/usrp_wfm_rcv_nogui.py
new file mode 100755
index 000000000..90caf7d08
--- /dev/null
+++ b/gr-uhd/examples/usrp_wfm_rcv_nogui.py
@@ -0,0 +1,177 @@
+#!/usr/bin/env python
+#
+# Copyright 2005-2007,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.
+# 
+
+from gnuradio import gr, optfir, audio, blks2, uhd
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+import sys
+
+class wfm_rx_block (gr.top_block):
+
+    def __init__(self):
+        gr.top_block.__init__(self)
+
+        parser=OptionParser(option_class=eng_option)
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("-f", "--freq", type="eng_float", default=100.1e6,
+                          help="set frequency to FREQ", metavar="FREQ")
+        parser.add_option("-g", "--gain", type="eng_float", default=None,
+                          help="set gain in dB (default is midpoint)")
+        parser.add_option("-V", "--volume", type="eng_float", default=None,
+                          help="set volume (default is midpoint)")
+        parser.add_option("-O", "--audio-output", type="string", default="",
+                          help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
+        parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
+                          help="Set a minimum frequency [default=%default]")
+        parser.add_option("", "--freq-max", type="eng_float", default=108.1e6,
+                          help="Set a maximum frequency [default=%default]")
+
+        (options, args) = parser.parse_args()
+        if len(args) != 0:
+            parser.print_help()
+            sys.exit(1)
+        
+        self.state = "FREQ"
+        self.freq = 0
+
+        self.fm_freq_min = options.freq_min
+        self.fm_freq_max = options.freq_max
+
+        # build graph
+        self.u = uhd.usrp_source(device_addr=options.args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
+
+        usrp_rate  = 320e3
+        demod_rate = 320e3
+        audio_rate = 32e3
+        audio_decim = int(demod_rate / audio_rate)
+
+        self.u.set_samp_rate(usrp_rate)
+        dev_rate = self.u.get_samp_rate()
+
+        nfilts = 32
+        chan_coeffs = optfir.low_pass (nfilts,           # gain
+                                       nfilts*usrp_rate, # sampling rate
+                                       80e3,             # passband cutoff
+                                       115e3,            # stopband cutoff
+                                       0.1,              # passband ripple
+                                       60)               # stopband attenuation
+        rrate = usrp_rate / dev_rate
+        self.chan_filt = blks2.pfb_arb_resampler_ccf(rrate, chan_coeffs, nfilts)
+
+        self.guts = blks2.wfm_rcv (demod_rate, audio_decim)
+
+        self.volume_control = gr.multiply_const_ff(1)
+
+        # sound card as final sink
+        self.audio_sink = audio.sink(int(audio_rate),
+                                     options.audio_output,
+                                     False)  # ok_to_block
+        
+        # now wire it all together
+        self.connect (self.u, self.chan_filt, self.guts,
+                      self.volume_control, self.audio_sink)
+
+        if options.gain is None:
+            # if no gain was specified, use the mid-point in dB
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2.0
+
+        if options.volume is None:
+            g = self.volume_range()
+            options.volume = float(g[0]+g[1])/2
+
+        frange = self.u.get_freq_range()
+        if(frange.start() > self.fm_freq_max or frange.stop() <  self.fm_freq_min):
+            sys.stderr.write("Radio does not support required frequency range.\n")
+            sys.exit(1)
+        if(options.freq < self.fm_freq_min or options.freq > self.fm_freq_max):
+            sys.stderr.write("Requested frequency is outside of required frequency range.\n")
+            sys.exit(1)
+
+        # set initial values
+        self.set_gain(options.gain)
+        self.set_vol(options.volume)
+        if not(self.set_freq(options.freq)):
+            self._set_status_msg("Failed to set initial frequency")
+
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
+    def set_vol (self, vol):
+        g = self.volume_range()
+        self.vol = max(g[0], min(g[1], vol))
+        self.volume_control.set_k(10**(self.vol/10))
+        self.update_status_bar ()
+
+    def set_freq(self, target_freq):
+        """
+        Set the center frequency we're interested in.
+
+        @param target_freq: frequency in Hz
+        @rypte: bool
+        """
+        
+        r = self.u.set_center_freq(target_freq)
+
+        if r:
+            self.freq = target_freq
+            self.update_status_bar()
+            self._set_status_msg("OK", 0)
+            return True
+
+        self._set_status_msg("Failed", 0)
+        return False
+
+    def set_gain(self, gain):
+        self.u.set_gain(gain)
+
+    def update_status_bar (self):
+        msg = "Freq: %s  Volume:%f  Setting:%s" % (
+            eng_notation.num_to_str(self.freq), self.vol, self.state)
+        self._set_status_msg(msg, 1)
+        
+    def _set_status_msg(self, msg, which=0):
+        print msg
+
+    def volume_range(self):
+        return (-20.0, 0.0, 0.5)
+
+    
+if __name__ == '__main__':
+    tb = wfm_rx_block()
+    try:
+        tb.run()
+    except KeyboardInterrupt:
+        pass
diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py b/gr-uhd/examples/usrp_wfm_rcv_pll.py
index 0d52ed7ee..2901bf735 100755
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
+++ b/gr-uhd/examples/usrp_wfm_rcv_pll.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,41 +20,26 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import audio
-from gnuradio import usrp
-from gnuradio import blks2
+from gnuradio import gr, optfir, audio, blks2, uhd
+from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui2, fftsink2, form, scopesink2
 from optparse import OptionParser
-from usrpm import usrp_dbid
 import sys
-import math
 import wx
 
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    Try for one of these, in order: TV_RX, BASIC_RX, whatever is on side A.
-
-    @return a subdev_spec
-    """
-    return usrp.pick_subdev(u, (usrp_dbid.TV_RX,
-                                usrp_dbid.TV_RX_REV_2,
-				usrp_dbid.TV_RX_REV_3,
-				usrp_dbid.TV_RX_MIMO,
-                                usrp_dbid.TV_RX_REV_2_MIMO,
-				usrp_dbid.TV_RX_REV_3_MIMO,
-                                usrp_dbid.BASIC_RX))
-
 class wfm_rx_block (stdgui2.std_top_block):
     def __init__(self,frame,panel,vbox,argv):
         stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv)
 
         parser=OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=A)")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
         parser.add_option("-f", "--freq", type="eng_float", default=100.1e6,
                           help="set frequency to FREQ", metavar="FREQ")
         parser.add_option("-g", "--gain", type="eng_float", default=65,
@@ -65,7 +50,10 @@ class wfm_rx_block (stdgui2.std_top_block):
                           help="set volume (default is midpoint)")
         parser.add_option("-O", "--audio-output", type="string", default="",
                           help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
-
+        parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
+                          help="Set a minimum frequency [default=%default]")
+        parser.add_option("", "--freq-max", type="eng_float", default=108.1e6,
+                          help="Set a maximum frequency [default=%default]")
 
         (options, args) = parser.parse_args()
         if len(args) != 0:
@@ -79,55 +67,53 @@ class wfm_rx_block (stdgui2.std_top_block):
         self.state = "FREQ"
         self.freq = 0
 
+        self.fm_freq_min = options.freq_min
+        self.fm_freq_max = options.freq_max
+
         # build graph
+        self.u = uhd.usrp_source(device_addr=options.args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
+
+        usrp_rate  = 320e3
+        demod_rate = 320e3
+        audio_rate = 48e3
+        audio_decim = 10
+
+        self.u.set_samp_rate(usrp_rate)
+        dev_rate = self.u.get_samp_rate()
+
+        nfilts = 32
+        chan_coeffs = gr.firdes.low_pass_2 (nfilts,           # gain
+                                            nfilts*usrp_rate, # sampling rate
+                                            90e3,             # passband cutoff
+                                            30e3,             # stopband cutoff
+                                            70)               # stopband attenuation
+        rrate = usrp_rate / dev_rate
+        self.chan_filt = blks2.pfb_arb_resampler_ccf(rrate, chan_coeffs, nfilts)
         
-        self.u = usrp.source_c()                    # usrp is data source
-
-        adc_rate = self.u.adc_rate()                # 64 MS/s
-        usrp_decim = 200
-        self.u.set_decim_rate(usrp_decim)
-        usrp_rate = adc_rate / usrp_decim           #  320 kS/s
-        chanfilt_decim = 1
-        demod_rate = usrp_rate / chanfilt_decim
-        audio_decimation = 10
-        audio_rate = 3*demod_rate / audio_decimation/2  # 48 kHz
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-
-
-        chan_filt_coeffs = gr.firdes.low_pass_2     (1,         # gain
-                                            usrp_rate,   # sampling rate
-                                            90e3,        # passband cutoff
-                                            30e3,        # transition bandwidth
-                                            70,          # stopband attenuation
-                                            gr.firdes.WIN_BLACKMAN)
-        print len(chan_filt_coeffs)
-        chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
-
-        self.rchan_sample = blks2.rational_resampler_fff(3,2)
-        self.lchan_sample = blks2.rational_resampler_fff(3,2)
 
+        self.guts = blks2.wfm_rcv_pll (demod_rate, audio_decim)
 
-        #self.guts = blks2.wfm_rcv (demod_rate, audio_decimation)
-        self.guts = blks2.wfm_rcv_pll (demod_rate, audio_decimation)
+        chan_rate = audio_rate / (demod_rate/audio_decim)
+        self.rchan_filt = blks2.pfb_arb_resampler_fff(chan_rate)
+        self.lchan_filt = blks2.pfb_arb_resampler_fff(chan_rate)
 
         # FIXME rework {add,multiply}_const_* to handle multiple streams
         self.volume_control_l = gr.multiply_const_ff(self.vol)
         self.volume_control_r = gr.multiply_const_ff(self.vol)
 
         # sound card as final sink
-        audio_sink = audio.sink (int (audio_rate),
-                                 options.audio_output,
-                                 False)   # ok_to_block
+        self.audio_sink = audio.sink (int (audio_rate),
+                                      options.audio_output,
+                                      False)   # ok_to_block
         
         # now wire it all together
-        self.connect (self.u, chan_filt, self.guts)
-        self.connect((self.guts, 0), self.lchan_sample,self.volume_control_l,(audio_sink,0))
-        self.connect((self.guts, 1), self.rchan_sample,self.volume_control_r,(audio_sink,1))
+        self.connect (self.u, self.chan_filt, self.guts)
+        self.connect((self.guts, 0), self.lchan_filt,
+                     self.volume_control_l, (self.audio_sink,0))
+        self.connect((self.guts, 1), self.rchan_filt,
+                     self.volume_control_r, (self.audio_sink,1))
 
         try:
           self.guts.stereo_carrier_pll_recovery.squelch_enable(True)
@@ -139,18 +125,22 @@ class wfm_rx_block (stdgui2.std_top_block):
 
         if options.gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2.0
 
         if options.volume is None:
             g = self.volume_range()
             options.volume = float(g[0]+g[1])/2
 
-        if abs(options.freq) < 1e6:
-            options.freq *= 1e6
+        frange = self.u.get_freq_range()
+        if(frange.start() > self.fm_freq_max or frange.stop() <  self.fm_freq_min):
+            sys.stderr.write("Radio does not support required frequency range.\n")
+            sys.exit(1)
+        if(options.freq < self.fm_freq_min or options.freq > self.fm_freq_max):
+            sys.stderr.write("Requested frequency is outside of required frequency range.\n")
+            sys.exit(1)
 
         # set initial values
-
         self.set_gain(options.gain)
         self.set_vol(options.volume)
         try:
@@ -161,6 +151,13 @@ class wfm_rx_block (stdgui2.std_top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
 
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
@@ -232,7 +229,7 @@ class wfm_rx_block (stdgui2.std_top_block):
         hbox.Add((5,0), 0)
         myform['freq_slider'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, weight=3,
-                                        range=(87.9e6, 108.1e6, 0.1e6),
+                                        range=(self.fm_freq_min, self.fm_freq_max, 0.1e6),
                                         callback=self.set_freq)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -246,9 +243,10 @@ class wfm_rx_block (stdgui2.std_top_block):
                                         callback=self.set_vol)
         hbox.Add((5,0), 1)
 
+        g = self.u.get_gain_range()        
         myform['gain'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                        weight=3, range=self.subdev.gain_range(),
+                                        weight=3, range=(g.start(), g.stop(), g.step()),
                                         callback=self.set_gain)
         hbox.Add((5,0), 0)
 
@@ -317,14 +315,10 @@ class wfm_rx_block (stdgui2.std_top_block):
 
         @param target_freq: frequency in Hz
         @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
         """
-        r = usrp.tune(self.u, 0, self.subdev, target_freq)
         
+        r = self.u.set_center_freq(target_freq)
+
         if r:
             self.freq = target_freq
             self.myform['freq'].set_value(target_freq)         # update displayed value
@@ -335,10 +329,10 @@ class wfm_rx_block (stdgui2.std_top_block):
 
         self._set_status_msg("Failed", 0)
         return False
-
+        
     def set_gain(self, gain):
         self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
+        self.u.set_gain(gain)
 
     def update_status_bar (self):
         msg = "Volume:%r  Setting:%s" % (self.vol, self.state)
diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py b/gr-uhd/examples/usrp_wfm_rcv_sca.py
index 39547b3ae..9caef7499 100755
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py
+++ b/gr-uhd/examples/usrp_wfm_rcv_sca.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2006,2007 Free Software Foundation, Inc.
+# Copyright 2006,2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -50,42 +50,26 @@ OFDM.
 """
 
 
-from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import audio
-from gnuradio import usrp
-from gnuradio.blks2impl.fm_emph import fm_deemph
+from gnuradio import gr, optfir, audio, blks2, uhd
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui2, fftsink2, form
 from optparse import OptionParser
-from usrpm import usrp_dbid
 import sys
 import math
 import wx
 
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    Try for one of these, in order: TV_RX, BASIC_RX, whatever is on side A.
-
-    @return a subdev_spec
-    """
-    return usrp.pick_subdev(u, (usrp_dbid.TV_RX,
-                                usrp_dbid.TV_RX_REV_2,
-				usrp_dbid.TV_RX_REV_3,
-				usrp_dbid.TV_RX_MIMO,
-                                usrp_dbid.TV_RX_REV_2_MIMO,
-				usrp_dbid.TV_RX_REV_3_MIMO,
-                                usrp_dbid.BASIC_RX))
-
-
 class wfm_rx_sca_block (stdgui2.std_top_block):
     def __init__(self,frame,panel,vbox,argv):
         stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv)
 
         parser=OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=A)")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
         parser.add_option("-f", "--freq", type="eng_float", default=100.1e6,
                           help="set frequency to FREQ", metavar="FREQ")
         parser.add_option("-g", "--gain", type="eng_float", default=40,
@@ -94,6 +78,10 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
                           help="set volume (default is midpoint)")
         parser.add_option("-O", "--audio-output", type="string", default="",
                           help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
+        parser.add_option("", "--freq-min", type="eng_float", default=87.9e6,
+                          help="Set a minimum frequency [default=%default]")
+        parser.add_option("", "--freq-max", type="eng_float", default=108.1e6,
+                          help="Set a maximum frequency [default=%default]")
 
         (options, args) = parser.parse_args()
         if len(args) != 0:
@@ -107,58 +95,57 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
         self.state = "FREQ"
         self.freq = 0
 
+        self.fm_freq_min = options.freq_min
+        self.fm_freq_max = options.freq_max
+
         # build graph
 
-        self.u = usrp.source_c()                    # usrp is data source
-
-        adc_rate = self.u.adc_rate()                # 64 MS/s
-        usrp_decim = 200
-        self.u.set_decim_rate(usrp_decim)
-        usrp_rate = adc_rate / usrp_decim           # 320 kS/s
-        chanfilt_decim = 1
-        demod_rate = usrp_rate / chanfilt_decim
-        sca_chanfilt_decim = 5
-        sca_demod_rate = demod_rate / sca_chanfilt_decim  #64 kHz
-        audio_decimation = 2
-        audio_rate = sca_demod_rate / audio_decimation  # 32 kHz
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        print "Using RX d'board %s" % (self.subdev.side_and_name(),)
-
-        #Create filter to get main FM Channel we want
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
-                                            usrp_rate,   # sampling rate
-                                            100e3,        # passband cutoff
-                                            140e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-        chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
+        self.u = uhd.usrp_source(device_addr=options.args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
+
+        usrp_rate  = 320e3
+        demod_rate = 320e3
+        audio_rate = 32e3
+        sca_demod_rate = 64e3
+        audio_decim = int(demod_rate / audio_rate)
+        sca_chanfilt_decim = int(demod_rate / sca_demod_rate)
+
+        self.u.set_samp_rate(usrp_rate)
+        dev_rate = self.u.get_samp_rate()
+
+        nfilts = 32
+        chan_coeffs = optfir.low_pass (nfilts,           # gain
+                                       nfilts*usrp_rate, # sampling rate
+                                       100e3,            # passband cutoff
+                                       140e3,            # stopband cutoff
+                                       0.1,              # passband ripple
+                                       60)               # stopband attenuation
+        rrate = usrp_rate / dev_rate
+        self.chan_filt = blks2.pfb_arb_resampler_ccf(rrate, chan_coeffs, nfilts)
 
         #Create demodulator block for Main FM Channel
 	max_dev = 75e3
         fm_demod_gain = demod_rate/(2*math.pi*max_dev)
         self.fm_demod = gr.quadrature_demod_cf (fm_demod_gain)
 
-        # Note - deemphasis is not applied to the Main FM Channel as main audio is not decoded
+        # Note - deemphasis is not applied to the Main FM Channel as
+        # main audio is not decoded
 
-        # SCA Devation is 10% of carrier but some references say 20% if mono with one SCA (6 KHz seems typical)
+        # SCA Devation is 10% of carrier but some references say 20%
+        # if mono with one SCA (6 KHz seems typical)
         max_sca_dev = 6e3
 
 	# Create filter to get SCA channel we want
         sca_chan_coeffs = gr.firdes.low_pass (1.0,                # gain
-                                          demod_rate,       # sampling rate
-                                          max_sca_dev,      # low pass cutoff freq
-                                          max_sca_dev/3,    # width of trans. band
-                                          gr.firdes.WIN_HANN) # filter type
+                                              demod_rate,         # sampling rate
+                                              max_sca_dev,        # cutoff freq
+                                              max_sca_dev/3,      # trans. band
+                                              gr.firdes.WIN_HANN) # filter type
 
-        self.ddc = gr.freq_xlating_fir_filter_fcf(sca_chanfilt_decim,       # decimation rate
+        self.ddc = gr.freq_xlating_fir_filter_fcf(sca_chanfilt_decim, # decim rate
                                                   sca_chan_coeffs,    # taps
-                                                  0,              # frequency translation amount (Gets set by the UI)
+                                                  0,                  # freq translation amount (Gets set by the UI)
                                                   demod_rate)   # input sample rate
 
         #Create demodulator block for SCA Channel
@@ -168,46 +155,55 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
 
         # SCA analog audio is bandwidth limited to 5 KHz
         max_sca_audio_freq = 5.0e3
+
         # SCA analog deephasis is 150 uS (75 uS may be used)
         sca_tau = 150e-6
 
         # compute FIR filter taps for SCA audio filter
-        audio_coeffs = gr.firdes.low_pass (1.0,         # gain
-                                           sca_demod_rate,      # sampling rate
-                                           max_sca_audio_freq, # low pass cutoff freq
-                                           max_sca_audio_freq/2.5,             # width of trans. band
+        audio_coeffs = gr.firdes.low_pass (1.0,                    # gain
+                                           sca_demod_rate,         # sampling rate
+                                           max_sca_audio_freq,     # cutoff freq
+                                           max_sca_audio_freq/2.5, # trans. band
                                            gr.firdes.WIN_HAMMING)
 
         # input: float; output: float
-        self.audio_filter = gr.fir_filter_fff (audio_decimation, audio_coeffs)
+        self.audio_filter = gr.fir_filter_fff (audio_decim, audio_coeffs)
 
 	# Create deemphasis block that is applied after SCA demodulation
-        self.deemph = fm_deemph (audio_rate, sca_tau)
+        self.deemph = blks2.fm_deemph (audio_rate, sca_tau)
 
         self.volume_control = gr.multiply_const_ff(self.vol)
 
         # sound card as final sink
-        audio_sink = audio.sink (int (audio_rate),
-                                 options.audio_output,
-                                 False)  # ok_to_block
+        self.audio_sink = audio.sink (int (audio_rate),
+                                      options.audio_output,
+                                      False)  # ok_to_block
 
         # now wire it all together
-        self.connect (self.u, chan_filt, self.fm_demod, self.ddc, self.fm_demod_sca)
-        self.connect (self.fm_demod_sca, self.audio_filter, self.deemph, self.volume_control, audio_sink)
+        self.connect (self.u, self.chan_filt, self.fm_demod,
+                      self.ddc, self.fm_demod_sca)
+        self.connect (self.fm_demod_sca, self.audio_filter,
+                      self.deemph, self.volume_control,
+                      self.audio_sink)
 
         self._build_gui(vbox, usrp_rate, demod_rate, sca_demod_rate, audio_rate)
 
         if options.gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2
 
         if options.volume is None:
             g = self.volume_range()
             options.volume = float(g[0]+g[1])/2
 
-        if abs(options.freq) < 1e6:
-            options.freq *= 1e6
+        frange = self.u.get_freq_range()
+        if(frange.start() > self.fm_freq_max or frange.stop() <  self.fm_freq_min):
+            sys.stderr.write("Radio does not support required frequency range.\n")
+            sys.exit(1)
+        if(options.freq < self.fm_freq_min or options.freq > self.fm_freq_max):
+            sys.stderr.write("Requested frequency is outside of required frequency range.\n")
+            sys.exit(1)
 
         # set initial values
 
@@ -217,7 +213,14 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
             self._set_status_msg("Failed to set initial frequency")
         self.set_sca_freq(67000)  # A common SCA Frequency
 
-
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+            
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+            
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
 
@@ -271,7 +274,7 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
         hbox.Add((5,0), 0)
         myform['freq_slider'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, weight=3,
-                                        range=(87.9e6, 108.1e6, 0.1e6),
+                                        range=(self.fm_freq_min, self.fm_freq_max, 0.1e6),
                                         callback=self.set_freq)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -299,9 +302,10 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
                                         callback=self.set_vol)
         hbox.Add((5,0), 1)
 
+        g = self.u.get_gain_range()        
         myform['gain'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                        weight=3, range=self.subdev.gain_range(),
+                                        weight=3, range=(g.start(), g.stop(), g.step()),
                                         callback=self.set_gain)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -363,8 +367,7 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
         the result of that operation and our target_frequency to
         determine the value for the digital down converter.
         """
-        r = usrp.tune(self.u, 0, self.subdev, target_freq)
-
+        r = self.u.set_center_freq(target_freq)
         if r:
             self.freq = target_freq
             self.myform['freq'].set_value(target_freq)         # update displayed value
@@ -372,7 +375,6 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
             self.update_status_bar()
             self._set_status_msg("OK", 0)
             return True
-
         self._set_status_msg("Failed", 0)
         return False
 
@@ -387,7 +389,7 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
 
     def set_gain(self, gain):
         self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
+        self.u.set_gain(gain)
 
     def update_status_bar (self):
         msg = "Volume:%r  Setting:%s" % (self.vol, self.state)
diff --git a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py b/gr-uhd/examples/usrp_wxapt_rcv.py
index b356702a6..1da51d363 100755
--- a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
+++ b/gr-uhd/examples/usrp_wxapt_rcv.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,42 +20,26 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, eng_notation, optfir
-from gnuradio import audio
-from gnuradio import usrp
-from gnuradio import blks2
+from gnuradio import gr, audio, blks2, uhd
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui2, fftsink2, form
 from optparse import OptionParser
-from usrpm import usrp_dbid
 import sys
-import math
 import wx
 
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    Try for one of these, in order: TV_RX, BASIC_RX, whatever is on side A.
-
-    @return a subdev_spec
-    """
-    return usrp.pick_subdev(u, (usrp_dbid.TV_RX,
-                                usrp_dbid.TV_RX_REV_2,
-				usrp_dbid.TV_RX_REV_3,
-				usrp_dbid.TV_RX_MIMO,
-                                usrp_dbid.TV_RX_REV_2_MIMO,
-				usrp_dbid.TV_RX_REV_3_MIMO,
-                                usrp_dbid.BASIC_RX))
-
 
 class wxapt_rx_block (stdgui2.std_top_block):
     def __init__(self,frame,panel,vbox,argv):
         stdgui2.std_top_block.__init__ (self,frame,panel,vbox,argv)
 
         parser=OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=A)")
+        parser.add_option("-a", "--args", type="string", default="",
+                          help="UHD device address args, [default=%default]")
+        parser.add_option("", "--spec", type="string", default=None,
+	                  help="Subdevice of UHD device where appropriate")
+        parser.add_option("-A", "--antenna", type="string", default=None,
+                          help="select Rx Antenna where appropriate")
         parser.add_option("-f", "--freq", type="eng_float", default=137.5e6,
                           help="set frequency to FREQ", metavar="FREQ")
         parser.add_option("-g", "--gain", type="eng_float", default=None,
@@ -64,6 +48,10 @@ class wxapt_rx_block (stdgui2.std_top_block):
                           help="set volume (default is midpoint)")
         parser.add_option("-O", "--audio-output", type="string", default="",
                           help="pcm device name.  E.g., hw:0,0 or surround51 or /dev/dsp")
+        parser.add_option("", "--freq-min", type="eng_float", default=137e6,
+                          help="Set a minimum frequency [default=%default]")
+        parser.add_option("", "--freq-max", type="eng_float", default=138e6,
+                          help="Set a maximum frequency [default=%default]")
 
         (options, args) = parser.parse_args()
         if len(args) != 0:
@@ -77,67 +65,74 @@ class wxapt_rx_block (stdgui2.std_top_block):
         self.state = "FREQ"
         self.freq = 0
 
-        # build graph
-        
-        self.u = usrp.source_c()                    # usrp is data source
-
-        adc_rate = self.u.adc_rate()                # 64 MS/s
-        usrp_decim = 200
-        self.u.set_decim_rate(usrp_decim)
-        usrp_rate = adc_rate / usrp_decim           # 320 kS/s
-        chanfilt_decim = 4
-        demod_rate = usrp_rate / chanfilt_decim
-        audio_decimation = 10
-        audio_rate = demod_rate / audio_decimation  # 32 kHz
+        self.freq_min = options.freq_min
+        self.freq_max = options.freq_max
 
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
+        # build graph
+        self.u = uhd.usrp_source(device_addr=options.args,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
 
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        print "Using RX d'board %s" % (self.subdev.side_and_name(),)
+        usrp_rate  = 320e3
+        demod_rate = 320e3
+        audio_rate = 32e3
+        audio_decim = int(demod_rate / audio_rate)
 
+        self.u.set_samp_rate(usrp_rate)
+        dev_rate = self.u.get_samp_rate()
 
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
-                                            usrp_rate,   # sampling rate
-                                            40e3,        # passband cutoff
-                                            60e3,       # stopband cutoff
-                                            0.1,         # passband ripple
-                                            60)          # stopband attenuation
-        #print len(chan_filt_coeffs)
-        chan_filt = gr.fir_filter_ccf (chanfilt_decim, chan_filt_coeffs)
+        nfilts = 32
+        chan_coeffs = gr.firdes.low_pass_2 (nfilts,           # gain
+                                            nfilts*usrp_rate, # sampling rate
+                                            40e3,             # passband cutoff
+                                            20e3,             # transition bw
+                                            60)               # stopband attenuation
+        rrate = usrp_rate / dev_rate
+        self.chan_filt = blks2.pfb_arb_resampler_ccf(rrate, chan_coeffs, nfilts)
 
-        self.guts = blks2.wfm_rcv (demod_rate, audio_decimation)
+        self.guts = blks2.wfm_rcv (demod_rate, audio_decim)
 
         self.volume_control = gr.multiply_const_ff(self.vol)
 
         # sound card as final sink
-        audio_sink = audio.sink (int (audio_rate), options.audio_output)
+        self.audio_sink = audio.sink (int (audio_rate), options.audio_output)
         
         # now wire it all together
-        self.connect (self.u, chan_filt, self.guts, self.volume_control, audio_sink)
+        self.connect (self.u, self.chan_filt, self.guts,
+                      self.volume_control, self.audio_sink)
 
         self._build_gui(vbox, usrp_rate, demod_rate, audio_rate)
 
         if options.gain is None:
             # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
+            g = self.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2.0
 
         if options.volume is None:
             g = self.volume_range()
             options.volume = float(g[0]+g[1])/2
-            
-        if abs(options.freq) < 1e6:
-            options.freq *= 1e6
 
-        # set initial values
+        frange = self.u.get_freq_range()
+        if(frange.start() > self.freq_max or frange.stop() <  self.freq_min):
+            sys.stderr.write("Radio does not support required frequency range.\n")
+            sys.exit(1)
+        if(options.freq < self.freq_min or options.freq > self.freq_max):
+            sys.stderr.write("Requested frequency is outside of required frequency range.\n")
+            sys.exit(1)
 
+        # set initial values
         self.set_gain(options.gain)
         self.set_vol(options.volume)
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
 
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
@@ -183,7 +178,7 @@ class wxapt_rx_block (stdgui2.std_top_block):
         hbox.Add((5,0), 0)
         myform['freq_slider'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, weight=3,
-                                        range=(137.0e6, 138.0e6, 0.0005e6),
+                                        range=(self.freq_min, self.freq_max, 0.0005e6),
                                         callback=self.set_freq)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -197,9 +192,10 @@ class wxapt_rx_block (stdgui2.std_top_block):
                                         callback=self.set_vol)
         hbox.Add((5,0), 1)
 
+        g = self.u.get_gain_range()
         myform['gain'] = \
             form.quantized_slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                        weight=3, range=self.subdev.gain_range(),
+                                        weight=3, range=(g.start(), g.start(), g.step()),
                                         callback=self.set_gain)
         hbox.Add((5,0), 0)
         vbox.Add(hbox, 0, wx.EXPAND)
@@ -255,14 +251,10 @@ class wxapt_rx_block (stdgui2.std_top_block):
 
         @param target_freq: frequency in Hz
         @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
         """
-        r = usrp.tune(self.u, 0, self.subdev, target_freq)
-        
+
+        r = self.u.set_center_freq(target_freq)
+
         if r:
             self.freq = target_freq
             self.myform['freq'].set_value(target_freq)         # update displayed value
@@ -276,7 +268,7 @@ class wxapt_rx_block (stdgui2.std_top_block):
 
     def set_gain(self, gain):
         self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
+        self.u.set_gain(gain)
 
     def update_status_bar (self):
         msg = "Volume:%r  Setting:%s" % (self.vol, self.state)
diff --git a/gr-uhd/grc/CMakeLists.txt b/gr-uhd/grc/CMakeLists.txt
new file mode 100644
index 000000000..3297db8d7
--- /dev/null
+++ b/gr-uhd/grc/CMakeLists.txt
@@ -0,0 +1,46 @@
+# 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.
+
+########################################################################
+# Rules for generating the source and sink xml wrappers
+########################################################################
+include(GrPython)
+
+macro(GEN_BLOCK_XML _generator _xml_block)
+    set(generator ${CMAKE_CURRENT_SOURCE_DIR}/${_generator})
+    set(xml_block ${CMAKE_CURRENT_BINARY_DIR}/${_xml_block})
+    list(APPEND xml_blocks ${xml_block})
+    add_custom_command(
+        DEPENDS ${generator} OUTPUT ${xml_block}
+        COMMAND ${PYTHON_EXECUTABLE} ${generator} ${xml_block}
+    )
+endmacro(GEN_BLOCK_XML)
+
+GEN_BLOCK_XML(gen_uhd_usrp_blocks.py    uhd_usrp_source.xml)
+GEN_BLOCK_XML(gen_uhd_usrp_blocks.py    uhd_usrp_sink.xml)
+
+add_custom_target(uhd_grc_xml_blocks ALL DEPENDS ${xml_blocks})
+
+install(FILES
+    ${xml_blocks}
+    uhd_amsg_source.xml
+    uhd_block_tree.xml
+    DESTINATION ${GRC_BLOCKS_DIR}
+    COMPONENT "uhd_python"
+)
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index b6bc5fb79..7116dad3b 100644
--- a/gr-uhd/grc/gen_uhd_usrp_blocks.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -23,6 +23,7 @@ MAIN_TMPL = """\
 <block>
 	<name>UHD: USRP $sourk.title()</name>
 	<key>uhd_usrp_$(sourk)</key>
+	<throttle>1</throttle>
 	<import>from gnuradio import uhd</import>
 	<make>uhd.usrp_$(sourk)(
 	device_addr=\$dev_addr,
diff --git a/gr-uhd/include/CMakeLists.txt b/gr-uhd/include/CMakeLists.txt
new file mode 100644
index 000000000..fdd384d58
--- /dev/null
+++ b/gr-uhd/include/CMakeLists.txt
@@ -0,0 +1,30 @@
+# 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.
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+    gr_uhd_api.h
+    gr_uhd_usrp_source.h
+    gr_uhd_usrp_sink.h
+    gr_uhd_amsg_source.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "uhd_devel"
+)
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.
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt
new file mode 100644
index 000000000..432ed1ab6
--- /dev/null
+++ b/gr-uhd/lib/CMakeLists.txt
@@ -0,0 +1,51 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_UHD_INCLUDE_DIRS}
+)
+
+include_directories(${UHD_INCLUDE_DIRS})
+link_directories(${UHD_LIBRARY_DIRS})
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gr_uhd_sources
+    gr_uhd_usrp_source.cc
+    gr_uhd_usrp_sink.cc
+    gr_uhd_amsg_source.cc
+)
+
+list(APPEND uhd_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+    ${UHD_LIBRARIES}
+)
+
+add_library(gnuradio-uhd SHARED ${gr_uhd_sources})
+target_link_libraries(gnuradio-uhd ${uhd_libs})
+GR_LIBRARY_FOO(gnuradio-uhd RUNTIME_COMPONENT "uhd_runtime" DEVEL_COMPONENT "uhd_devel")
diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc
index a780f0551..1a6595293 100644
--- a/gr-uhd/lib/gr_uhd_usrp_sink.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc
@@ -21,7 +21,6 @@
 
 #include <gr_uhd_usrp_sink.h>
 #include <gr_io_signature.h>
-#include <gr_tag_info.h>
 #include <stdexcept>
 
 static const pmt::pmt_t SOB_KEY = pmt::pmt_string_to_symbol("tx_sob");
@@ -185,7 +184,7 @@ public:
         gr_vector_void_star &output_items
     ){
         int ninput_items = noutput_items; //cuz its a sync block
-	
+
         //send a mid-burst packet with time spec
         _metadata.start_of_burst = false;
         _metadata.end_of_burst = false;
@@ -211,11 +210,11 @@ public:
  **********************************************************************/
     inline void tag_work(int &ninput_items){
         //the for loop below assumes tags sorted by count low -> high
-        std::sort(_tags.begin(), _tags.end(), gr_tags::nitems_compare);
+        std::sort(_tags.begin(), _tags.end(), gr_tag_t::offset_compare);
 
         //extract absolute sample counts
-        const pmt::pmt_t &tag0 = _tags.front();
-        const uint64_t tag0_count = gr_tags::get_nitems(tag0);
+        const gr_tag_t &tag0 = _tags.front();
+        const uint64_t tag0_count = tag0.offset;
         const uint64_t samp0_count = this->nitems_read(0);
 
         //only transmit nsamples from 0 to the first tag
@@ -229,10 +228,10 @@ public:
         _metadata.has_time_spec = false;
 
         //process all of the tags found with the same count as tag0
-        BOOST_FOREACH(const pmt::pmt_t &my_tag, _tags){
-            const uint64_t my_tag_count = gr_tags::get_nitems(my_tag);
-            const pmt::pmt_t &key = gr_tags::get_key(my_tag);
-            const pmt::pmt_t &value = gr_tags::get_value(my_tag);
+        BOOST_FOREACH(const gr_tag_t &my_tag, _tags){
+            const uint64_t my_tag_count = my_tag.offset;
+            const pmt::pmt_t &key = my_tag.key;
+            const pmt::pmt_t &value = my_tag.value;
 
             //determine how many samples to send...
             //from zero until the next tag or end of work
@@ -301,7 +300,7 @@ private:
     double _sample_rate;
 
     //stream tags related stuff
-    std::vector<pmt::pmt_t> _tags;
+    std::vector<gr_tag_t> _tags;
 };
 
 /***********************************************************************
diff --git a/gr-uhd/swig/CMakeLists.txt b/gr-uhd/swig/CMakeLists.txt
new file mode 100644
index 000000000..4c778b05c
--- /dev/null
+++ b/gr-uhd/swig/CMakeLists.txt
@@ -0,0 +1,53 @@
+# 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_FLAGS -DGR_HAVE_UHD) #needed to parse uhd_swig.i
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_UHD_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+link_directories(${UHD_LIBRARY_DIRS})
+set(GR_SWIG_LIBRARIES gnuradio-uhd ${UHD_LIBRARIES})
+
+GR_SWIG_MAKE(uhd_swig uhd_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS uhd_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/uhd
+    COMPONENT "uhd_python"
+)
+
+install(
+    FILES uhd_swig.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "uhd_swig"
+)
+
+GR_PYTHON_INSTALL(
+    FILES __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/uhd
+    COMPONENT "uhd_python"
+)
diff --git a/gr-uhd/swig/Makefile.swig.gen b/gr-uhd/swig/Makefile.swig.gen
index b73ccd3c4..62adf8958 100644
--- a/gr-uhd/swig/Makefile.swig.gen
+++ b/gr-uhd/swig/Makefile.swig.gen
@@ -105,7 +105,7 @@ _uhd_swig_la_CXXFLAGS =			\
 	$(uhd_swig_la_swig_cxxflags)
 
 python/uhd_swig.cc: uhd_swig.py
-uhd_swig.py: uhd_swig.i
+uhd_swig.py: uhd_swig.i 
 
 # Include the python dependencies for this file
 -include python/uhd_swig.d
diff --git a/gr-uhd/swig/__init__.py b/gr-uhd/swig/__init__.py
index 1f82b4a26..7745b4b79 100644
--- a/gr-uhd/swig/__init__.py
+++ b/gr-uhd/swig/__init__.py
@@ -19,6 +19,12 @@
 # Boston, MA 02110-1301, USA.
 #
 
+'''
+This is the GNU Radio UHD package. It is the interface to the UHD
+library to connect to and send and receive data between the Ettus
+Research, LLC product line.
+'''
+
 ########################################################################
 # Prepare uhd swig module to make it more pythonic
 ########################################################################
@@ -63,6 +69,15 @@ def _prepare_uhd_swig():
         if hasattr(myobj, 'to_real'):      myobj.__float__    = lambda o: o.to_real()
         if attr.endswith('_t'): setattr(uhd_swig, attr[:-2], myobj)
 
+    #make a new find devices that casts everything with the pythonized device_addr_t which has __str__
+    def find_devices(*args, **kwargs):
+        def to_pythonized_dev_addr(dev_addr):
+            new_dev_addr = uhd_swig.device_addr_t()
+            for key in dev_addr.keys(): new_dev_addr[key] = dev_addr.get(key)
+            return new_dev_addr
+        return map(to_pythonized_dev_addr, uhd_swig.find_devices_raw(*args, **kwargs))
+    setattr(uhd_swig, 'find_devices', find_devices)
+
     #Cast constructor args (FIXME swig handle overloads?)
     for attr in ('usrp_source', 'usrp_sink', 'amsg_source'):
         def constructor_factory(old_constructor):
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i
index f8381ae64..7e612907c 100644
--- a/gr-uhd/swig/uhd_swig.i
+++ b/gr-uhd/swig/uhd_swig.i
@@ -102,6 +102,17 @@ GR_SWIG_BLOCK_MAGIC(uhd,amsg_source)
 %include <gr_uhd_amsg_source.h>
 
 ////////////////////////////////////////////////////////////////////////
+// device discovery (no need to %include device.hpp)
+////////////////////////////////////////////////////////////////////////
+%{
+static uhd::device_addrs_t find_devices_raw(const uhd::device_addr_t &dev_addr = uhd::device_addr_t()){
+    return uhd::device::find(dev_addr);
+}
+%}
+
+static uhd::device_addrs_t find_devices_raw(const uhd::device_addr_t &dev_addr = uhd::device_addr_t());
+
+////////////////////////////////////////////////////////////////////////
 // helpful constants
 ////////////////////////////////////////////////////////////////////////
 %{
diff --git a/gr-usrp/.gitignore b/gr-usrp/.gitignore
deleted file mode 100644
index cdcf41b15..000000000
--- a/gr-usrp/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.cache
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/make.log
-/missing
-/missing
-/mkinstalldirs
-/py-compile
-/stamp-h
-/stamp-h.in
-/stamp-h1
diff --git a/gr-usrp/README_MULTI_USRP.txt b/gr-usrp/README_MULTI_USRP.txt
deleted file mode 100644
index 4ed7a15b3..000000000
--- a/gr-usrp/README_MULTI_USRP.txt
+++ /dev/null
@@ -1,251 +0,0 @@
-Multi usrp
-
-With this code you can connect two or more usrps (with a locked clock) and get synchronised samples.
-You must connect a (flat)cable between a dboard on the master in RXA and a dboard on the slave in RXA.
-You then put one usrp in master mode, put the other in slave mode.
-
-For a quick start using the examples look at gnuradio-examples/python/multi_usrp/README
-
-Use the usrp_multi block which is installed by gr-usrp.
-instantiate in the following way:
-
-        self.multi=usrp_multi.multi_source_align( fg=self, master_serialno=options.master_serialno, decim=options.decim, nchan=options.nchan )
-
-nchan should be 2 or 4.
-
-You determine which is the master by master_serialno (this is a text string a hexadecimal number).
-If you enter a serial number which is not found it will print the serial numbers which are available.
-If you give no serial number  (master_serialno=None), the code will pick a Master for you.
-
-You can get a reference to the master and the slave usrp in the following way:
-
-        self.um=self.multi.get_master_usrp()
-        self.us=self.multi.get_slave_usrp()
-
-You only need these references for setting freqs/gains or getting info about daughterboards.
-Don't use the output directly but use the aligned output from multi.get_master_source_c() and multi.get_slave_source_c()
-
-You get references to the aligned output samples in the following way:
-aligned_master_source_c=self.multi.get_master_source_c()
-aligned_slave_source_c=self.multi.get_slave_source_c()
-
-These blocks have multiple outputs.
-output 0 is the sample counter (high bits in I, low bits in Q)
-You normally don't need the samplecounters so you can ignore output 0
-
-output 1 is the first aligend output channel (if you enable 2 or 4 channels)
-output 2 is the second output channel (only if you enable 4 channels)
-
-so the usefull 4 channels are:
-self.aligned_master_chan1=(self.multi.get_master_source_c(),1)
-self.aligned_master_chan2=(self.multi.get_master_source_c(),2)
-self.aligned_slave_chan1=(self.multi.get_slave_source_c(),1)
-self.aligned_slave_chan2=(self.multi.get_slave_source_c(),2)
-
-The two samplecounters are:
-self.aligned_master_samplecounter=(self.multi.get_master_source_c(),0)
-self.aligned_slave_samplecounter=(self.multi.get_slave_source_c(),0)
-
-You can set the gain or tune the frequency for all 4 receive daughetrboards at once:
-        self.multi.set_gain_all_rx(options.gain)
-        result,r1,r2,r3,r4 = self.multi.tune_all_rx(options.freq)
-
-This will only work reliably when you have all the same daughterboards.
-Otherwise set all freqs and gains individually.
-
-You must call self.multi.sync() at least once AFTER the flowgraph has started running.
-(This will synchronise the streams of the two usrps)
-
-This work was funded by Toby Oliver at Sensus Analytics / Path Intelligence.
-Many Thanks for making this possible.
-
-It was written by Martin Dudok van Heel at Olifantasia.
-
-Quick start multi-usrp:
-Unpack, build and install usrp, gnuradio-core and gr-usrp
-Versions need to be more recent then 2.7cvs/svn 11 may 2006
-
-Make sure usrp/fpga/rbf/rev2/multi*.rbf is installed in /usr/local/share/usrp/rev2/
-Make sure usrp/fpga/rbf/rev4/multi*.rbf is installed in /usr/local/share/usrp/rev4/
-(If in doubt, copy manually)
- 
-build and install gr-wxgui gr-audio-xxx  and so on.
-
-unpack gnuradio-examples.
-
-There is a gnuradio-examples/python/multi_usrp directory which contains examples and a README
-
-
-Put at least a basic RX or dbsrx board in RXA of the master and RXA of the slave board.
-Make sure that the usrps have a serial or unique identifier programmed in their eeprom.
-(All new rev 4.1 boards have this)
-You can do without a serial but then you never know which usrp is the master and which is the slave.
-
-
-CONNECTING THE CABLES
-Now connect the 64MHz clocks between the boards with a short sma coax cable.
-(See the wiki on how to enable clock-out and clock-in 
-http://comsec.com/wiki?USRPClockingNotes )
-
-You need one board with a clock out and one board with a clock in.
-
-You can choose any of the two boards as master or slave, this is not dependant on which board has the clock-out or in.
-In my experiments I had fewer problems when the board that has the clock-in will be the master board.
-
-You can use a standard 16-pole flatcable to connect tvrx, basic-rx or dbsrx boards.
-Of this 16pin flatcable only two pins are used (io15 and ground)
-For all new daughterboards which use up a lot of io pins you have to use a cable with fewer connections.
-The savest is using a 2pin headercable connected to io15,gnd (a cable like the ones used to connect frontpanel leds to the mainboard of a PC)
-
-If using basic rx board:
-  Connect a 16-pole flatcable from J25 on basicrx/dbs_rx in rxa of the master usrp to J25 on basicrx/dbsrx in RXA of the slave usrp
-  Don't twist the cable (Make sure the pin1 marker (red line on the flatcable) is on the same side of the connector (at io-8 on the master and at io8 on the slave.))
-  For basic_rx this means the marker should be on the side of the dboard with the sma connectors. 
-  For dbs_rx this means the marker should be on the side of the dboard with the two little chips.
-  In other words, don't twist the cable, you will burn your board if you do.
-
-You can also connect a flatcable with multiple connectors from master-J25 to slave1-J25 to slave2-J25 to ...
-You will however have to think of something to create a common 64Mhz clock for more then two usrps.
-
-For all other daughterboards, connect a 2wire cable from masterRXA J25 io15,gnd to slaveRXA J25 io15,gnd 
-
-
-So now the hardware is setup, software is setup. Lets do some tests.
-
-Connect power to both usrps.
-unpack the gnuradio_examples somewhere (cvs version later then 11 may 2006) 
-go to the gnuradio-examples/python/multi_usrp folder.
-
-Now run 
- ./multi_usrp_oscope.py -x 12345678
-
-It should tell you that usrp 12345678 is not found and tell you which serials are available.
-
-Now run  ./multi_usrp_oscope.py -x actualserialnum 
-You should now get an oscope with two channels, one is from the master and one is from the slave
-It will which show the I-signal from channel 0 of the master usrp and I-signal from channel 0 of the slave usrp.
-(For testing connect the same signal source to the inputs of both boards)
-The signals should be aligned.
-If you click the sync button, it will resync the master and slave (should never be needed)
-
-Now run
-./multi_usrp_oscope.py --help
-To see all available options.
-
-
-Now you are ready to do phase-locked aligned signal processing.
-
-You can also capture to file with:
-./multi_usrp_rx_cfile.py 
-
-run ./multi_usrp_rx_cfile.py --help to see all available options.
-
-
-Here follows a brief of the new blocks and (changes)functionality for multi-usrp.
-You can also look at the generated documentation in  
-/usr/local/share/doc/gnuradio-core-X.X
-/usr/local/share/doc/usrp-X.X
-(Make sure to build and install the documentation, go to the doc directory of the sourcetree and issue make doc; make install)
- 
-
-gnuradio-examples:
-new/changed files:
-multi_usrp/multi_usrp_oscope.py
-multi_usrp/multi_usrp_rx_cfile.py
-
-
-gnuradio-core:
-gr.align_on_samplenumbers_ss (int nchan,int align_interval) 
-
-align several complex short (interleaved short) input channels with corresponding unsigned 32 bit sample_counters (provided as interleaved 16 bit values)
-
-Parameters:
-    	nchan 	number of complex_short input channels (including the 32 bit counting channel)
-    	align_interval 	interval at which the samples are aligned, ignored for now.
-
-Pay attention on how you connect this block It expects a minimum of 2 usrp_source_s with nchan number of channels and as mode  usrp_prims.bmFR_MODE_RX_COUNTING_32BIT enabled. This means that the first complex_short channel is an interleaved 32 bit counter. The samples are aligned by dropping samples untill the samplenumbers match.
-
-files:
-gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc
-gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h
-gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.i
-
-
-gr-usrp
-   added _write_fpga_reg_masked
-   added usrp_multi.py
-  new usrp_multi block which can instantiate two linked usrps as master and slave and alignes their output.
-  It has a sync() function which should be called AFTER the flowgraph has started running.
-  bool sync();
-     \brief Call this on a master usrp to sync master and slave by outputing a sync pulse on rx_a_io[15].
-        The 32 bit samplecounter of master and slave will be reset to zero and all phase and buffer related things in the usrps are reset.
-        Call this only after the flowgraph has been started, otherwise there will be no effect since everything is kept in reset state as long as the flowgraph is not running.
-     \returns true if successfull.
-
-files:
-configure.ac
-src/Makefile.am
-src/usrp1.i
-src/usrp1_source_base.cc
-src/usrp1_source_base.h
-src/usrp_multi.py
-
-usrp-0.11cvsmulti:
-usrp:
-   new constant bmFR_MODE_RX_COUNTING_32BIT    (could also be added as extra mode like FPGA_MODE_COUNTING_32BIT)
-   Use this for the mode parameter when creating a usrp when you want to use the master/slave setup or if you want to use the 32 bit counter for other things, like testing with gr.check_counting_s(True)
-
-  added register FR_RX_MASTER_SLAVE
-  added bitno and bitmaskes:
-   bmFR_MODE_RX_COUNTING_32BIT
-
-   bitnoFR_RX_SYNC 
-   bitnoFR_RX_SYNC_MASTER
-   bitnoFR_RX_SYNC_SLAVE
-
-   bitnoFR_RX_SYNC_INPUT_IOPIN 15
-   bmFR_RX_SYNC_INPUT_IOPIN  (1<<bitnoFR_RX_SYNC_INPUT_IOPIN)
-   bitnoFR_RX_SYNC_OUTPUT_IOPIN 15
-   bmFR_RX_SYNC_OUTPUT_IOPIN (1<<bitnoFR_RX_SYNC_OUTPUT_IOPIN)
- 
-   added _write_fpga_reg_masked()
-   added new toplevel folder usrp_multi
-   added usrp_multi.v and master_control_multi.v
-   added new MULTI_ON and COUNTER_32BIT_ON defines
-      If these are turned off usrp_multi.v will behave exactly as usrp_std.v
-
-   added setting_reg_masked.v
-   changed reset behaviour of phase_acc.v and rx_buffer.v
-
-   changed generate_regs.py to handle bm and bitno defines
-
-
-files:
-firmware/include/fpga_regs_standard.v
-firmware/include/fpga_regs_common.h
-firmware/include/generate_regs.py
-firmware/include/fpga_regs_standard.h
-host/lib/usrp_basic.h
-host/lib/usrp_basic.cc
-host/lib/usrp_standard.h
-fpga/rbf/Makefile.am
-fpga/toplevel/usrp_std/usrp_std.v
-fpga/toplevel/usrp_multi/usrp_multi.esf
-fpga/toplevel/usrp_multi/usrp_multi.vh
-fpga/toplevel/usrp_multi/usrp_std.vh
-fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_0tx.vh
-fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_2tx.vh
-fpga/toplevel/usrp_multi/usrp_multi.v
-fpga/toplevel/usrp_multi/usrp_multi.qpf
-fpga/toplevel/usrp_multi/usrp_multi.psf
-fpga/toplevel/usrp_multi/usrp_multi_config_2rx_0tx.vh
-fpga/toplevel/usrp_multi/usrp_multi.qsf
-fpga/toplevel/usrp_multi/usrp_multi_config_4rx_0tx.vh
-fpga/toplevel/usrp_multi/usrp_multi.csf
-fpga/toplevel/usrp_multi/.cvsignore
-fpga/sdr_lib/rx_buffer.v
-fpga/sdr_lib/master_control_multi.v
-fpga/sdr_lib/phase_acc.v
-fpga/sdr_lib/setting_reg_masked.v
-
-
diff --git a/gr-usrp/apps/.gitignore b/gr-usrp/apps/.gitignore
deleted file mode 100644
index 2d01df25f..000000000
--- a/gr-usrp/apps/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/Makefile
-/Makefile.in
-/.libs
-/.deps
-/usrp_siggen
-/usrp_rx_cfile
diff --git a/gr-usrp/apps/Makefile.am b/gr-usrp/apps/Makefile.am
deleted file mode 100644
index b45f3f79c..000000000
--- a/gr-usrp/apps/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Copyright 2008,2009,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# For compiling within the GNU Radio build tree
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/gr-usrp/src \
-	$(USRP_INCLUDES) \
-	$(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_INCLUDES)
-
-GR_USRP_LA=$(top_builddir)/gr-usrp/src/libgnuradio-usrp.la
-
-# For compiling outside the tree, these will get fished out by pkgconfig
-
-LDADD = \
-	$(GNURADIO_CORE_LA) \
-	$(USRP_LA) \
-	$(GR_USRP_LA) \
-	$(BOOST_LDFLAGS) \
-	$(BOOST_PROGRAM_OPTIONS_LIB) \
-	$(BOOST_FILESYSTEM_LIB)
-
-noinst_PROGRAMS = \
-	usrp_rx_cfile \
-	usrp_siggen
-
-noinst_HEADERS = 	\
-	usrp_rx_cfile.h	\
-	usrp_siggen.h
-
-usrp_rx_cfile_SOURCES = 	\
-    usrp_rx_cfile.cc
-
-usrp_siggen_SOURCES = 	\
-    usrp_siggen.cc
-
-if PYTHON
-
-bin_SCRIPTS = \
-    lsusrp \
-    usrp_print_db.py \
-    usrp_rx_cfile.py \
-    usrp_test_counting.py \
-    usrp_test_loopback.py
-
-EXTRA_DIST += $(bin_SCRIPTS)
-
-endif
diff --git a/gr-usrp/apps/lsusrp b/gr-usrp/apps/lsusrp
deleted file mode 100755
index d2eab33fe..000000000
--- a/gr-usrp/apps/lsusrp
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 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.
-# 
-
-MAX_USRPS = 8
-
-from gnuradio import usrp
-from optparse import OptionParser
-
-def disp_usrp(which, serial=None):
-    u_source = usrp.source_c(which=which)
-    u_sink = usrp.sink_c(which=which)
-    u_serial = u_source.serial_number()
-    
-    if serial is not None:
-        if serial != u_serial:
-            raise ValueError
-	
-    print "USRP", which, "serial number", u_source.serial_number()
-    subdev_A_rx = usrp.selected_subdev(u_source, (0,0))
-    subdev_B_rx = usrp.selected_subdev(u_source, (1,0))
-    subdev_A_tx = usrp.selected_subdev(u_sink,   (0,0))
-    subdev_B_tx = usrp.selected_subdev(u_sink,   (1,0))
-    print "  RX d'board %s" % (subdev_A_rx.side_and_name(),)
-    print "  RX d'board %s" % (subdev_B_rx.side_and_name(),)
-    print "  TX d'board %s" % (subdev_A_tx.side_and_name(),)
-    print "  TX d'board %s" % (subdev_B_tx.side_and_name(),)
-
-if __name__ == "__main__":
-    parser = OptionParser()
-    parser.add_option("-w", "--which", type="int", default=None,
-                      help="select which USRP (0, 1, ...) default is all found",
-		      metavar="NUM")
-    parser.add_option("-s", "--serial", default=None,
-                      help="select USRP by serial number",
-		      metavar="SER")
-    (options, args) = parser.parse_args()
-    if len(args) > 0:
-	print parser.print_help()
-	raise SystemExit, 1
-
-    if options.serial is not None and options.which is not None:
-       print "Use of --which or --serial is exclusive"
-       raise SystemExit, 1
-
-    if options.which is not None:
-	try:	
-    	    disp_usrp(options.which)
-	except:
-	    print "USRP", options.which, "not found."
-    else:
-	for n in range(MAX_USRPS):
-	    try:
-		disp_usrp(n, options.serial)
-	    except:
-		pass
-
diff --git a/gr-usrp/apps/usrp_print_db.py b/gr-usrp/apps/usrp_print_db.py
deleted file mode 100755
index b082cb073..000000000
--- a/gr-usrp/apps/usrp_print_db.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006,2007 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.
-# 
-
-#!/usr/bin/env python
-
-from gnuradio import gr
-from gnuradio import usrp
-from optparse import OptionParser
-from usrpm import usrp_dbid
-
-u_source = usrp.source_c()
-u_sink = usrp.sink_c()
-
-subdev_Ar = usrp.selected_subdev(u_source, (0,0))
-subdev_Br = usrp.selected_subdev(u_source, (1,0))
-subdev_At = usrp.selected_subdev(u_sink, (0,0))
-subdev_Bt = usrp.selected_subdev(u_sink, (1,0))
-
-print "RX d'board %s" % (subdev_Ar.side_and_name(),)
-print "RX d'board %s" % (subdev_Br.side_and_name(),)
-print "TX d'board %s" % (subdev_At.side_and_name(),)
-print "TX d'board %s" % (subdev_Bt.side_and_name(),)
-
diff --git a/gr-usrp/apps/usrp_rx_cfile.cc b/gr-usrp/apps/usrp_rx_cfile.cc
deleted file mode 100644
index d40ca58f7..000000000
--- a/gr-usrp/apps/usrp_rx_cfile.cc
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright 2008 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.
- */
-
-#include <usrp_rx_cfile.h>
-#include <gr_io_signature.h>
-#include <gr_head.h>
-#include <stdexcept>
-#include <iostream>
-#include <boost/program_options.hpp>
-
-namespace po = boost::program_options;
-
-usrp_subdev_spec
-str_to_subdev(std::string spec_str)
-{
-  usrp_subdev_spec spec;
-  if(spec_str == "A" || spec_str == "A:0" || spec_str == "0:0") {
-    spec.side = 0;
-    spec.subdev = 0;
-  }
-  else if(spec_str == "A:1" || spec_str == "0:1") {
-    spec.side = 0;
-    spec.subdev = 1;
-  }
-  else if(spec_str == "B" || spec_str == "B:0" || spec_str == "1:0") {
-    spec.side = 1;
-    spec.subdev = 0;
-  }
-  else if(spec_str == "B:1" || spec_str == "1:1") {
-    spec.side = 1;
-    spec.subdev = 1;
-  }
-  else {
-    throw std::range_error("Incorrect subdevice specifications.\n");
-  }
-
-  return spec;
-}
-
-
-// Shared pointer constructor
-usrp_rx_cfile_sptr make_usrp_rx_cfile(int which, usrp_subdev_spec spec, 
-				      int decim, double freq, float gain,
-				      bool width8, bool nohb,
-				      bool output_shorts, int nsamples,
-				      const std::string &filename)
-{
-  return gnuradio::get_initial_sptr(new usrp_rx_cfile(which, spec, 
-						      decim, freq, gain,
-						      width8, nohb,
-						      output_shorts, 
-						      nsamples,
-						      filename));
-}
-
-// Hierarchical block constructor, with no inputs or outputs
-usrp_rx_cfile::usrp_rx_cfile(int which, usrp_subdev_spec spec, 
-			     int decim, double freq, float gain,
-			     bool width8, bool nohb,
-			     bool output_shorts, int nsamples,
-			     const std::string &filename) : 
-  gr_top_block("usrp_rx_cfile"),
-  d_which(which),  d_spec(spec), d_decim(decim), d_freq(freq), 
-  d_gain(gain), d_width8(width8), d_nohb(nohb), d_nsamples(nsamples), 
-  d_filename(filename)
-{
-  usrp_source_c_sptr usrp;
-
-  if(d_nohb || (d_decim<8)) {
-    // Min decimation of this firmware is 4. 
-    // contains 4 Rx paths without halfbands and 0 tx paths.
-    std::string fpga_filename="std_4rx_0tx.rbf";
-
-    // use default values and add fpga_filename
-    usrp = usrp_make_source_c(d_which, d_decim,
-			      1, -1, 0, 0, 0,
-			      fpga_filename.c_str());
-  }
-  else {
-    // standard fpga firmware "std_2rxhb_2tx.rbf" contains 
-    // 2 Rx paths with halfband filters and 2 tx paths 
-    //(the default) min decimation 8
-    usrp = usrp_make_source_c(d_which, d_decim);
-  }
-
-  if(d_width8) {
-    int sample_width = 8;
-    int sample_shift = 8;
-    int format = usrp->make_format(sample_width, sample_shift);
-    int r = usrp->set_format(format);
-    printf("width8: format=%d  r=%d\n", format, r);
-  }
-
-
-  /* Get subdevice and process it */
-  db_base_sptr subdev = usrp->selected_subdev(d_spec);
-  printf("\nSubdevice name is %s\n", subdev->side_and_name().c_str());
-  printf("Subdevice freq range: (%g, %g)\n", 
-	 subdev->freq_min(), subdev->freq_max());
-
-  unsigned int mux = usrp->determine_rx_mux_value(d_spec);
-  printf("mux: %#08x\n",  mux);
-  usrp->set_mux(mux);
-
-  float gain_min = subdev->gain_min();
-  float gain_max = subdev->gain_max();
-  if(d_gain == -1) {
-    d_gain = (gain_min + gain_max)/2.0;
-  }
-  printf("gain: %g\n", d_gain);
-  subdev->set_gain(d_gain);
-
-    
-  /* Set the USRP/dboard frequency */
-  usrp_tune_result r;
-  bool ok = usrp->tune(0, subdev, freq, &r); //DDC 0
-  
-  if(!ok) {
-    throw std::runtime_error("Could not set frequency.");
-  }
-
-  /* The rest */
-  d_dst = gr_make_file_sink(sizeof(gr_complex), d_filename.c_str());
-
-  if(d_nsamples == -1) {
-    connect(usrp, 0, d_dst, 0);
-  }
-  else {
-    d_head = gr_make_head(sizeof(gr_complex), d_nsamples*2);
-    connect(usrp, 0, d_head, 0);
-    connect(d_head, 0, d_dst, 0);
-  }
-}
-
-
-int main(int argc, char *argv[])
-{
-  int which = 0;                       // specify which USRP board
-  usrp_subdev_spec spec(0,0);          // specify the d'board side
-  int decim = 16;                      // set the decimation rate
-  double freq = 0;                     // set the frequency
-  float gain = -1;                     // set the gain; -1 will set the mid-point gain
-  int nsamples = -1;                   // set the number of samples to collect; -1 will continue
-  bool width8 = false;                 // use 8-bit samples across USB
-  bool nohb = false;                   // don't use halfband filter in USRP
-  bool output_shorts = false;          // use shorts
-  std::string filename = "received.dat";
-
-  po::options_description cmdconfig("Program options: usrp_text_rx [options] filename");
-  cmdconfig.add_options()
-    ("help,h", "produce help message")
-    ("which,W", po::value<int>(&which), "select which USRP board")
-    ("rx-subdev-spec,R", po::value<std::string>(), "select USRP Rx side A or B (default=A)")
-    ("decim,d", po::value<int>(&decim), "set fgpa decimation rate to DECIM")
-    ("freq,f", po::value<double>(), "set frequency to FREQ")
-    ("gain,g", po::value<float>(), "set gain in dB (default is midpoint)")
-    ("width-8,8", "Enable 8-bit samples across USB")
-    ("no-hb", "don't use halfband filter in usrp")
-    //("output-shorts,s", "output interleaved shorts in stead of complex floats")
-    ("nsamples,N", po::value<int>(&nsamples), "number of samples to collect")
-    ;
-
-  po::options_description fileconfig("Input file options");
-  fileconfig.add_options()
-    ("filename", po::value<std::string>(), "input file")
-    ;
-
-  po::positional_options_description inputfile;
-  inputfile.add("filename", -1);
-
-  po::options_description config;
-  config.add(cmdconfig).add(fileconfig);
-  
-  po::variables_map vm;
-  po::store(po::command_line_parser(argc, argv).
-	    options(config).positional(inputfile).run(), vm);
-  po::notify(vm);
-  
-  if (vm.count("help")) {
-    std::cout << cmdconfig << "\n";
-    return 1;
-  }
-
-  if(vm.count("filename")) {
-    filename = vm["filename"].as<std::string>();
-  }
-  
-  if(vm.count("freq")) {
-    freq = vm["freq"].as<double>();
-  }
-  else {
-    fprintf(stderr, "You must specify a frequency.\n");
-    return -1;
-  }
-
-  if(vm.count("rx-subdev-spec")) {
-    std::string s = vm["rx-subdev-spec"].as<std::string>();
-    spec = str_to_subdev(s);
-  }
-
-  if(vm.count("width-8")) {
-    width8 = true;
-  }
-  if(vm.count("nohb")) {
-    nohb = true;
-  }
-  if(vm.count("output-shorts")) {
-    output_shorts = true;
-  }
-
-  std::cout << "which:   " << which << std::endl;
-  std::cout << "decim:   " << decim << std::endl;
-  std::cout << "freq:    " << freq << std::endl;
-  std::cout << "gain:    " << gain << std::endl;
-  std::cout << "width-8  " << (width8 ? "Yes" : "No") << std::endl;
-  std::cout << "no-hb    " << (nohb ? "Yes" : "no") << std::endl;
-  std::cout << "shorts:  " << (output_shorts ? "Yes" : "No") << std::endl;
-  std::cout << "samples: " << nsamples << std::endl;
-
-  usrp_rx_cfile_sptr top_block = make_usrp_rx_cfile(which, spec, decim, freq, 
-						    gain, width8, nohb, 
-						    output_shorts, nsamples,
-						    filename);
-  top_block->run();
-    
-  return 0;
-}
diff --git a/gr-usrp/apps/usrp_rx_cfile.h b/gr-usrp/apps/usrp_rx_cfile.h
deleted file mode 100644
index 3a42972ca..000000000
--- a/gr-usrp/apps/usrp_rx_cfile.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2008 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.
- */
-
-#include <gr_top_block.h>
-#include <usrp_source_base.h>
-#include <usrp_source_c.h>
-#include <usrp_source_s.h>
-#include <gr_file_sink.h>
-
-class usrp_rx_cfile;
-typedef boost::shared_ptr<usrp_rx_cfile> usrp_rx_cfile_sptr;
-usrp_rx_cfile_sptr make_usrp_rx_cfile(int which, usrp_subdev_spec spec, 
-				      int decim, double freq, float gain,
-				      bool width8, bool nohb,
-				      bool output_shorts, int nsamples,
-				      const std::string &filename);
-
-class usrp_rx_cfile : public gr_top_block
-{
-private:
-    usrp_rx_cfile(int which, usrp_subdev_spec spec, 
-		  int decim, double freq, float gain,
-		  bool width8, bool nohb,
-		  bool output_shorts, int nsamples,
-		  const std::string &filename);
-    friend usrp_rx_cfile_sptr make_usrp_rx_cfile(int which, usrp_subdev_spec spec, 
-						 int decim, double freq, float gain,
-						 bool width8, bool nohb,
-						 bool output_shorts, int nsamples,
-						 const std::string &filename);
-
-    int d_which;
-    usrp_subdev_spec d_spec;
-    int d_decim;
-    double d_freq;
-    float d_gain;
-    bool d_width8, d_nohb;
-    int d_nsamples;
-    std::string d_filename;
-
- public:
-    gr_block_sptr d_head;
-    gr_block_sptr d_dst;
-};
diff --git a/gr-usrp/apps/usrp_rx_cfile.py b/gr-usrp/apps/usrp_rx_cfile.py
deleted file mode 100755
index 3ac9fb56f..000000000
--- a/gr-usrp/apps/usrp_rx_cfile.py
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Read samples from the USRP and write to file formatted as binary
-outputs single precision complex float values or complex short values (interleaved 16 bit signed short integers).
-
-"""
-
-from gnuradio import gr, eng_notation
-from gnuradio import audio
-from gnuradio import usrp
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys
-
-class my_top_block(gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        usage="%prog: [options] output_filename"
-        parser = OptionParser(option_class=eng_option, usage=usage)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=(0, 0),
-                          help="select USRP Rx side A or B (default=A)")
-        parser.add_option("-d", "--decim", type="int", default=16,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-8", "--width-8", action="store_true", default=False,
-                          help="Enable 8-bit samples across USB")
-        parser.add_option( "--no-hb", action="store_true", default=False,
-                          help="don't use halfband filter in usrp")
-        parser.add_option( "-s","--output-shorts", action="store_true", default=False,
-                          help="output interleaved shorts in stead of complex floats")
-        parser.add_option("-N", "--nsamples", type="eng_float", default=None,
-                          help="number of samples to collect [default=+inf]")
-        (options, args) = parser.parse_args ()
-        if len(args) != 1:
-            parser.print_help()
-            raise SystemExit, 1
-        filename = args[0]
-
-        if options.freq is None:
-            parser.print_help()
-            sys.stderr.write('You must specify the frequency with -f FREQ\n');
-            raise SystemExit, 1
-
-        # build the graph
-        if options.no_hb or (options.decim<8):
-          self.fpga_filename="std_4rx_0tx.rbf" #Min decimation of this firmware is 4. contains 4 Rx paths without halfbands and 0 tx paths.
-          if options.output_shorts:
-            self.u = usrp.source_s(decim_rate=options.decim,fpga_filename=self.fpga_filename)
-          else:
-            self.u = usrp.source_c(decim_rate=options.decim,fpga_filename=self.fpga_filename)
-        else:
-          #standard fpga firmware "std_2rxhb_2tx.rbf" contains 2 Rx paths with halfband filters and 2 tx paths (the default) min decimation 8
-          if options.output_shorts:
-            self.u = usrp.source_s(decim_rate=options.decim)
-          else:
-            self.u = usrp.source_c(decim_rate=options.decim)
-        if options.width_8:
-            sample_width = 8
-            sample_shift = 8
-            format = self.u.make_format(sample_width, sample_shift)
-            r = self.u.set_format(format)
-        if options.output_shorts:
-          self.dst = gr.file_sink(gr.sizeof_short, filename)
-        else:
-          self.dst = gr.file_sink(gr.sizeof_gr_complex, filename)
-        if options.nsamples is None:
-            self.connect(self.u, self.dst)
-        else:
-            if options.output_shorts:
-              self.head = gr.head(gr.sizeof_short, int(options.nsamples)*2)
-            else:
-              self.head = gr.head(gr.sizeof_gr_complex, int(options.nsamples))
-            self.connect(self.u, self.head, self.dst)
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = usrp.pick_rx_subdevice(self.u)
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-
-        # determine the daughterboard subdevice we're using
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        print "Using RX d'board %s" % (self.subdev.side_and_name(),)
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-        print "USB sample rate %s" % (eng_notation.num_to_str(input_rate))
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-        self.subdev.set_gain(options.gain)
-
-        r = self.u.tune(0, self.subdev, options.freq)
-        if not r:
-            sys.stderr.write('Failed to set frequency\n')
-            raise SystemExit, 1
-
-
-if __name__ == '__main__':
-    try:
-        my_top_block().run()
-    except KeyboardInterrupt:
-        pass
diff --git a/gr-usrp/apps/usrp_siggen.cc b/gr-usrp/apps/usrp_siggen.cc
deleted file mode 100644
index 5fb66348f..000000000
--- a/gr-usrp/apps/usrp_siggen.cc
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright 2008 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.
- */
-
-#include <usrp_siggen.h>
-#include <gr_io_signature.h>
-#include <gr_head.h>
-#include <gr_noise_type.h>
-#include <stdexcept>
-#include <iostream>
-#include <cstdio>
-#include <boost/program_options.hpp>
-
-namespace po = boost::program_options;
-
-usrp_subdev_spec
-str_to_subdev(std::string spec_str)
-{
-  usrp_subdev_spec spec;
-  if(spec_str == "A" || spec_str == "A:0" || spec_str == "0:0") {
-    spec.side = 0;
-    spec.subdev = 0;
-  }
-  else if(spec_str == "A:1" || spec_str == "0:1") {
-    spec.side = 0;
-    spec.subdev = 1;
-  }
-  else if(spec_str == "B" || spec_str == "B:0" || spec_str == "1:0") {
-    spec.side = 1;
-    spec.subdev = 0;
-  }
-  else if(spec_str == "B:1" || spec_str == "1:1") {
-    spec.side = 1;
-    spec.subdev = 1;
-  }
-  else {
-    throw std::range_error("Incorrect subdevice specifications.\n");
-  }
-
-  return spec;
-}
-
-// Shared pointer constructor
-usrp_siggen_sptr make_usrp_siggen(int which, usrp_subdev_spec spec, 
-				  double rf_freq, int interp, double wfreq,
-				  int waveform, float amp, float gain, 
-				  float offset, long long nsamples)
-{
-  return gnuradio::get_initial_sptr(new usrp_siggen(which, spec, 
-						    rf_freq, interp, wfreq,
-						    waveform, amp, gain, 
-						    offset, nsamples));
-}
-
-// Hierarchical block constructor, with no inputs or outputs
-usrp_siggen::usrp_siggen(int which, usrp_subdev_spec spec, 
-			 double rf_freq, int interp, double wfreq,
-			 int waveform, float amp, float gain, 
-			 float offset, long long nsamples)
-  : gr_top_block("usrp_siggen")
-{
-  usrp_sink_c_sptr usrp = usrp_make_sink_c(which, interp);
-
-  db_base_sptr subdev = usrp->selected_subdev(spec);
-  printf("Subdevice name is %s\n", subdev->name().c_str());
-  printf("Subdevice freq range: (%g, %g)\n", 
-	 subdev->freq_min(), subdev->freq_max());
-
-  unsigned int mux = usrp->determine_tx_mux_value(spec);
-  printf("mux: %#08x\n",  mux);
-  usrp->set_mux(mux);
-
-  if(gain == -1) {
-    gain = subdev->gain_max();
-  }
-  subdev->set_gain(gain);
-
-  float input_rate = usrp->dac_freq() / usrp->interp_rate();
-  printf("baseband rate: %g\n",  input_rate);
-
-  usrp_tune_result r;
-  double target_freq = rf_freq;
-  bool ok = usrp->tune(subdev->which(), subdev, target_freq, &r);
-
-  if(!ok) {
-    throw std::runtime_error("Could not set frequency.");
-  }
-
-  subdev->set_enable(true);
-  
-  printf("target_freq:     %f\n", target_freq);
-  printf("ok:              %s\n", ok ? "true" : "false");
-  printf("r.baseband_freq: %f\n", r.baseband_freq);
-  printf("r.dxc_freq:      %f\n", r.dxc_freq);
-  printf("r.residual_freq: %f\n", r.residual_freq);
-  printf("r.inverted:      %d\n", r.inverted);
-
-  /* Set up the signal source */
-  siggen = gr_make_sig_source_c(input_rate, GR_SIN_WAVE, wfreq, amp);
-  noisegen = gr_make_noise_source_c (GR_UNIFORM, amp);
-  if(waveform == GR_SIN_WAVE || waveform == GR_CONST_WAVE) {
-    source = siggen;
-  }
-  else if(waveform == GR_UNIFORM || waveform == GR_GAUSSIAN) {
-    source = noisegen;
-  }
-  else {
-    throw std::range_error("Unknown waveform type.\n");
-  }
-
-  siggen->set_waveform((gr_waveform_t)waveform);
-
-  if (nsamples > 0){
-    gr_block_sptr head = gr_make_head(sizeof(gr_complex), nsamples);
-    connect(source, 0, head, 0);
-    connect(head, 0, usrp, 0);
-  }
-  else {
-    connect(source, 0, usrp, 0);
-  }
-}
-
-int main(int argc, char *argv[])
-{
-  int which = 0;                       // specify which USRP board
-  usrp_subdev_spec spec(0,0);          // specify the d'board side
-  int interp = 128;                    // set the interpolation rate
-  double rf_freq = 0;                  // set the frequency
-  double wfreq = 100e3;                // set the waveform frequency
-  float amp = 5;                       // set the amplitude of the output
-  float gain = -1;                     // set the d'board PGA gain
-  float offset = 0;                    // set waveform offset
-  int waveform;
-  double nsamples = 0;		       // set the number of samples to transmit (0 -> inf)
-
-  po::options_description cmdconfig("Program options");
-  cmdconfig.add_options()
-    ("help,h", "produce help message")
-    ("which,W", po::value<int>(&which), "select which USRP board")
-    ("tx-subdev-spec,T", po::value<std::string>(), "select USRP Tx side A or B")
-    ("rf-freq,f", po::value<double>(), "set RF center frequency to FREQ")
-    ("interp,i", po::value<int>(&interp), "set fgpa interpolation rate to INTERP")
-
-    ("sine", "generate a complex sinusoid [default]")
-    ("const", "generate a constant output")
-    ("gaussian", "generate Gaussian random output")
-    ("uniform", "generate Uniform random output")
-
-    ("waveform-freq,w", po::value<double>(&wfreq), "set waveform frequency to FREQ")
-    ("amplitude,a", po::value<float>(&amp), "set amplitude")
-    ("gain,g", po::value<float>(&gain), "set output gain to GAIN")
-    ("offset,o", po::value<float>(&offset), "set waveform offset to OFFSET")
-    ("nsamples,N", po::value<double>(&nsamples), "number of samples to send [default=+inf]")
-    ;
-  
-  po::variables_map vm;
-  po::store(po::command_line_parser(argc, argv).
-	    options(cmdconfig).run(), vm);
-  po::notify(vm);
-  
-  if (vm.count("help")) {
-    std::cout << cmdconfig << "\n";
-    return 1;
-  }
-  
-  if(vm.count("rf-freq")) {
-    rf_freq = vm["rf-freq"].as<double>();
-  }
-  else {
-    fprintf(stderr, "You must specify a frequency.\n");
-    return -1;
-  }
-
-  if(vm.count("tx-subdev-spec")) {
-    std::string s = vm["tx-subdev-spec"].as<std::string>();
-    spec = str_to_subdev(s);
-  }
-
-  if(vm.count("sine")) {
-    waveform = GR_SIN_WAVE;
-  }
-  else if(vm.count("const")) {
-    waveform = GR_CONST_WAVE;
-  }
-  else if(vm.count("gaussian")) {
-    waveform = GR_GAUSSIAN;
-  }
-  else if(vm.count("uniform")) {
-    waveform = GR_UNIFORM;
-  }
-  else {
-    waveform = GR_SIN_WAVE;
-  }
-
-  printf("which:    %d\n", which);
-  printf("interp:   %d\n", interp);
-  printf("rf_freq:  %g\n", rf_freq);
-  printf("amp:      %f\n", amp);
-  printf("nsamples: %g\n", nsamples);
-
-  usrp_siggen_sptr top_block = make_usrp_siggen(which, spec, rf_freq, 
-						interp, wfreq, waveform,
-						amp, gain, offset, (long long) nsamples);
-
-  top_block->run();
-  
-  return 0;
-}
diff --git a/gr-usrp/apps/usrp_siggen.h b/gr-usrp/apps/usrp_siggen.h
deleted file mode 100644
index 053c4bdfa..000000000
--- a/gr-usrp/apps/usrp_siggen.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2008 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.
- */
-
-#include <gr_top_block.h>
-#include <usrp_sink_c.h>
-#include <gr_sig_source_c.h>
-#include <gr_noise_source_c.h>
-
-usrp_subdev_spec str_to_subdev(std::string spec_str);
-
-class usrp_siggen;
-typedef boost::shared_ptr<usrp_siggen> usrp_siggen_sptr;
-usrp_siggen_sptr make_usrp_siggen(int which, usrp_subdev_spec spec, 
-				  double rf_freq, int interp, double wfreq,
-				  int waveform, float amp, float gain, 
-				  float offset, long long nsamples);
-
-class usrp_siggen : public gr_top_block
-{
-private:
-    usrp_siggen(int which, usrp_subdev_spec spec, 
-		double rf_freq, int interp, double wfreq,
-		int waveform, float amp, float gain, 
-		float offset, long long nsamples);
-    friend usrp_siggen_sptr make_usrp_siggen(int which, usrp_subdev_spec spec, 
-					     double rf_freq, int interp, double wfreq,
-					     int waveform, float amp, float gain, 
-					     float offset,
-					     long long nsamples);
-    
- public:
-    gr_block_sptr source;
-    gr_sig_source_c_sptr siggen;
-    gr_noise_source_c_sptr noisegen;
-};
diff --git a/gr-usrp/apps/usrp_test_loopback.py b/gr-usrp/apps/usrp_test_loopback.py
deleted file mode 100755
index b58ac06ae..000000000
--- a/gr-usrp/apps/usrp_test_loopback.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2007 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.
-# 
-
-"""
-Digital loopback (Tx to Rx) for the USRP Rev1.
-"""
-
-
-from gnuradio import gr
-from gnuradio import usrp
-
-
-def ramp_source (tb):
-    period = 2**16
-    src = gr.vector_source_s (range (-period/2, period/2, 1), True)
-    return src
-
-def build_graph ():
-    tx_interp =  32       # tx should be twice rx
-    rx_decim  =  16
-    
-    tb = gr.top_block ()
-
-    data_src = ramp_source (tb)
-    # usrp_tx = usrp.sink_s (0, tx_interp, 1, 0x98)
-    usrp_tx = usrp.sink_s (0, tx_interp)
-    tb.connect (data_src, usrp_tx)
-
-    usrp_rx = usrp.source_s (0, rx_decim, 1, 0x32103210, usrp.FPGA_MODE_LOOPBACK)
-    sink = gr.check_counting_s ()
-    tb.connect (usrp_rx, sink)
-
-    # file_sink = gr.file_sink (gr.sizeof_short, "loopback.dat")
-    # tb.connect (usrp_rx, file_sink)
-    
-    return tb
-    
-def main ():
-    tb = build_graph ()
-    try:
-        tb.run()
-    except KeyboardInterrupt:
-        pass
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-usrp/gnuradio-usrp.pc.in b/gr-usrp/gnuradio-usrp.pc.in
deleted file mode 100644
index b1f33f41b..000000000
--- a/gr-usrp/gnuradio-usrp.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gnuradio
-
-Name: gnuradio-usrp
-Description: GNU Software Radio support for Universal Software Radio Peripheral
-Requires: gnuradio-core usrp
-Version: @LIBVER@
-Libs: -L${libdir} -lgnuradio-usrp
-Cflags: -I${includedir}
diff --git a/gr-usrp/grc/.gitignore b/gr-usrp/grc/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-usrp/grc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-usrp/grc/common.py b/gr-usrp/grc/common.py
deleted file mode 100644
index 65c1e7e29..000000000
--- a/gr-usrp/grc/common.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2009 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.
-#
-
-import sys
-from gnuradio import usrp, gr
-
-##################################################
-# USRP base class with common methods
-##################################################
-class usrp_helper(object):
-	def _make_usrp(self, *args, **kwargs): self._u = self._usrp_args[0](*args, **kwargs)
-	def _get_u(self): return self._u
-	def _get_io_size(self): return self._usrp_args[1]
-	def _set_frequency(self, chan, subdev, frequency, verbose=False):
-		"""
-		Set the carrier frequency for the given subdevice.
-		@param chan specifies the DDC/DUC number
-		@param frequency the carrier frequency in Hz
-		@param verbose if true, print usrp tuning information
-		"""
-		r = self._get_u().tune(chan, subdev, frequency)
-		if not verbose: return
-		print subdev.side_and_name()
-		if r:
-			print "\tr.baseband_frequency =", r.baseband_freq
-			print "\tr.dxc_frequency =", r.dxc_freq
-			print "\tr.residual_frequency =", r.residual_freq
-			print "\tr.inverted =", r.inverted, "\n"
-		else: print >> sys.stderr, 'Error calling tune on subdevice.'
-	def set_format(self, width, shift): self._get_u().set_format(self._get_u().make_format(width, shift))
-
-##################################################
-# Classes to associate usrp constructor w/ io size
-##################################################
-class usrp_source_c(usrp_helper): _usrp_args = (usrp.source_c, gr.sizeof_gr_complex)
-class usrp_source_s(usrp_helper): _usrp_args = (usrp.source_s, gr.sizeof_short)
-class usrp_sink_c(usrp_helper): _usrp_args = (usrp.sink_c, gr.sizeof_gr_complex)
-class usrp_sink_s(usrp_helper): _usrp_args = (usrp.sink_s, gr.sizeof_short)
-
-##################################################
-# Side spec and antenna spec functions
-##################################################
-def is_flex(rx_ant): return rx_ant.upper() in ('TX/RX', 'RX2')
-def to_spec(side, rx_ant='RXA'):
-	"""
-	Convert the side to a spec number.
-	@param side A or B
-	@param rx_ant antenna type
-	@return the spec (0/1, 0/1/2)
-	"""
-	#determine the side spec
-	try: side_spec = {'A': 0, 'B': 1}[side.upper()]
-	except: raise ValueError, 'Side A or B expected.'
-	#determine the subdevice spec
-	if rx_ant.upper() == 'RXB': subdev_spec = 1
-	elif rx_ant.upper() == 'RXAB': subdev_spec = 2
-	else: subdev_spec = 0
-	return (side_spec, subdev_spec)
diff --git a/gr-usrp/grc/dual_usrp.py b/gr-usrp/grc/dual_usrp.py
deleted file mode 100644
index 66b76b2df..000000000
--- a/gr-usrp/grc/dual_usrp.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2009, 2010 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.
-#
-
-import common
-from gnuradio import gr
-
-####################################################################
-# Dual USRP Source
-####################################################################
-class _dual_source(gr.hier_block2):
-	"""A dual usrp source of IO type short or complex."""
-
-	def __init__(self, which, rx_ant_a='RXA', rx_ant_b='RXA', rx_source_a='A', rx_source_b='B'):
-		"""
-		USRP dual source contructor.
-		@param which the unit number
-		@param rx_ant_a the antenna choice
-		@param rx_ant_b the antenna choice
-		"""
-		#initialize hier2 block
-		gr.hier_block2.__init__(
-			self, 'usrp_dual_source',
-			gr.io_signature(0, 0, 0),
-			gr.io_signature(2, 2, self._get_io_size()),
-		)
-		#create usrp object
-		self._make_usrp(which=which, nchan=2)
-		subdev_spec_a = common.to_spec(rx_source_a, rx_ant_a)
-		subdev_spec_b = common.to_spec(rx_source_b, rx_ant_b)
-		self._get_u().set_mux(self._get_u().determine_rx_mux_value(subdev_spec_a, subdev_spec_b))
-		self._subdev_a = self._get_u().selected_subdev(subdev_spec_a)
-		self._subdev_b = self._get_u().selected_subdev(subdev_spec_b)
-		#connect
-		deinter = gr.deinterleave(self._get_io_size())
-		self.connect(self._get_u(), deinter)
-		for i in range(2): self.connect((deinter, i), (self, i))
-
-	def set_decim_rate(self, decim): self._get_u().set_decim_rate(int(decim))
-	def set_frequency_a(self, frequency, verbose=False, lo_offset=None):
-		if lo_offset is not None: self._subdev_a.set_lo_offset(lo_offset)
-		self._set_frequency(
-			chan=0, #ddc0
-			subdev=self._subdev_a,
-			frequency=frequency,
-			verbose=verbose,
-		)
-	def set_frequency_b(self, frequency, verbose=False, lo_offset=None):
-		if lo_offset is not None: self._subdev_b.set_lo_offset(lo_offset)
-		self._set_frequency(
-			chan=1, #ddc1
-			subdev=self._subdev_b,
-			frequency=frequency,
-			verbose=verbose,
-		)
-	def set_gain_a(self, gain): self._subdev_a.set_gain(gain)
-	def set_gain_b(self, gain): self._subdev_b.set_gain(gain)
-
-class dual_source_c(_dual_source, common.usrp_source_c): pass
-class dual_source_s(_dual_source, common.usrp_source_s): pass
-
-####################################################################
-# Dual USRP Sink
-####################################################################
-class _dual_sink(gr.hier_block2):
-	"""A dual usrp sink of IO type short or complex."""
-
-	def __init__(self, which):
-		"""
-		USRP simple sink contructor.
-		@param which the unit number
-		"""
-		#initialize hier2 block
-		gr.hier_block2.__init__(
-			self, 'usrp_dual_sink',
-			gr.io_signature(2, 2, self._get_io_size()),
-			gr.io_signature(0, 0, 0),
-		)
-		#create usrp object
-		self._make_usrp(which=which, nchan=2)
-		subdev_spec_a = common.to_spec('A')
-		subdev_spec_b = common.to_spec('B')
-		self._get_u().set_mux(self._get_u().determine_tx_mux_value(subdev_spec_a, subdev_spec_b))
-		self._subdev_a = self._get_u().selected_subdev(subdev_spec_a)
-		self._subdev_b = self._get_u().selected_subdev(subdev_spec_b)
-		#connect
-		inter = gr.interleave(self._get_io_size())
-		self.connect(inter, self._get_u())
-		for i in range(2): self.connect((self, i), (inter, i))
-
-	def set_interp_rate(self, interp): self._get_u().set_interp_rate(int(interp))
-	def set_frequency_a(self, frequency, verbose=False, lo_offset=None):
-		if lo_offset is not None: self._subdev_a.set_lo_offset(lo_offset)
-		self._set_frequency(
-			chan=self._subdev_a.which(),
-			subdev=self._subdev_a,
-			frequency=frequency,
-			verbose=verbose,
-		)
-	def set_frequency_b(self, frequency, verbose=False, lo_offset=None):
-		if lo_offset is not None: self._subdev_b.set_lo_offset(lo_offset)
-		self._set_frequency(
-			chan=self._subdev_b.which(),
-			subdev=self._subdev_b,
-			frequency=frequency,
-			verbose=verbose,
-		)
-	def set_gain_a(self, gain): self._subdev_a.set_gain(gain)
-	def set_gain_b(self, gain): self._subdev_b.set_gain(gain)
-	def set_enable_a(self, enable): self._subdev_a.set_enable(enable)
-	def set_enable_b(self, enable): self._subdev_b.set_enable(enable)
-	def set_auto_tr_a(self, auto_tr): self._subdev_a.set_auto_tr(auto_tr)
-	def set_auto_tr_b(self, auto_tr): self._subdev_b.set_auto_tr(auto_tr)
-
-class dual_sink_c(_dual_sink, common.usrp_sink_c): pass
-class dual_sink_s(_dual_sink, common.usrp_sink_s): pass
diff --git a/gr-usrp/grc/gnuradio-usrp_probe.desktop b/gr-usrp/grc/gnuradio-usrp_probe.desktop
deleted file mode 100644
index 136321994..000000000
--- a/gr-usrp/grc/gnuradio-usrp_probe.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=USRP Probe
-Exec=usrp_probe
-Categories=Development;
-Icon=gnuradio-grc
diff --git a/gr-usrp/grc/simple_usrp.py b/gr-usrp/grc/simple_usrp.py
deleted file mode 100644
index fb7a39570..000000000
--- a/gr-usrp/grc/simple_usrp.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2009 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.
-#
-
-import common
-from gnuradio import gr
-
-####################################################################
-# Simple USRP Source
-####################################################################
-class _simple_source(gr.hier_block2):
-	"""A single usrp source of IO type short or complex."""
-
-	def __init__(self, which, side='A', rx_ant='RXA', no_hb=False):
-		"""
-		USRP simple source contructor.
-		@param which the unit number
-		@param side the usrp side A or B
-		@param rx_ant the antenna choice
-		@param no_hb disable half band filters
-		"""
-		self._no_hb = no_hb
-		#initialize hier2 block
-		gr.hier_block2.__init__(
-			self, 'usrp_simple_source',
-			gr.io_signature(0, 0, 0),
-			gr.io_signature(1, 1, self._get_io_size()),
-		)
-		#create usrp object
-		if self._no_hb: self._make_usrp(which=which, nchan=1, fpga_filename="std_4rx_0tx.rbf")
-		else: self._make_usrp(which=which, nchan=1)
-		subdev_spec = common.to_spec(side, rx_ant)
-		self._get_u().set_mux(self._get_u().determine_rx_mux_value(subdev_spec))
-		self._subdev = self._get_u().selected_subdev(subdev_spec)
-		if common.is_flex(rx_ant): self._subdev.select_rx_antenna(rx_ant)
-		#connect
-		self.connect(self._get_u(), self)
-
-	def set_decim_rate(self, decim):
-		self._get_u().set_decim_rate(int(decim))
-		if self._no_hb: #set the BW to half the sample rate
-			self._subdev.set_bw(self._get_u().converter_rate()/decim/2)
-	def set_frequency(self, frequency, verbose=False, lo_offset=None):
-		if lo_offset is not None: self._subdev.set_lo_offset(lo_offset)
-		self._set_frequency(
-			chan=0, #ddc0
-			subdev=self._subdev,
-			frequency=frequency,
-			verbose=verbose,
-		)
-	def set_gain(self, gain): self._subdev.set_gain(gain)
-
-class simple_source_c(_simple_source, common.usrp_source_c): pass
-class simple_source_s(_simple_source, common.usrp_source_s): pass
-
-####################################################################
-# Simple USRP Sink
-####################################################################
-class _simple_sink(gr.hier_block2):
-	"""A single usrp sink of IO type short or complex."""
-
-	def __init__(self, which, side='A'):
-		"""
-		USRP simple sink contructor.
-		@param which the unit number
-		@param side the usrp side A or B
-		"""
-		#initialize hier2 block
-		gr.hier_block2.__init__(
-			self, 'usrp_simple_sink',
-			gr.io_signature(1, 1, self._get_io_size()),
-			gr.io_signature(0, 0, 0),
-		)
-		#create usrp object
-		self._make_usrp(which=which, nchan=1)
-		subdev_spec = common.to_spec(side)
-		self._get_u().set_mux(self._get_u().determine_tx_mux_value(subdev_spec))
-		self._subdev = self._get_u().selected_subdev(subdev_spec)
-		#connect
-		self.connect(self, self._get_u())
-
-	def set_interp_rate(self, interp): self._get_u().set_interp_rate(int(interp))
-	def set_frequency(self, frequency, verbose=False, lo_offset=None):
-		if lo_offset is not None: self._subdev.set_lo_offset(lo_offset)
-		self._set_frequency(
-			chan=self._subdev.which(),
-			subdev=self._subdev,
-			frequency=frequency,
-			verbose=verbose,
-		)
-	def set_gain(self, gain): self._subdev.set_gain(gain)
-	def set_enable(self, enable): self._subdev.set_enable(enable)
-	def set_auto_tr(self, auto_tr): self._subdev.set_auto_tr(auto_tr)
-
-class simple_sink_c(_simple_sink, common.usrp_sink_c): pass
-class simple_sink_s(_simple_sink, common.usrp_sink_s): pass
-
diff --git a/gr-usrp/grc/usrp_dual_sink_x.xml b/gr-usrp/grc/usrp_dual_sink_x.xml
deleted file mode 100644
index babc124d0..000000000
--- a/gr-usrp/grc/usrp_dual_sink_x.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##USRP Dual Sink
-###################################################
- -->
-<block>
-	<name>USRP1 Dual Sink</name>
-	<key>usrp_dual_sink_x</key>
-	<category>USRP</category>
-	<import>from grc_gnuradio import usrp as grc_usrp</import>
-	<make>grc_usrp.dual_sink_$(type.fcn)(which=$which)
-self.$(id).set_interp_rate($interpolation)
-self.$(id).set_frequency_a($frequency_a, verbose=True#slurp
-#if $lo_offset_a() != float('inf')
-, lo_offset=$lo_offset_a#slurp
-#end if
-)
-self.$(id).set_frequency_b($frequency_b, verbose=True#slurp
-#if $lo_offset_b() != float('inf')
-, lo_offset=$lo_offset_b#slurp
-#end if
-)
-self.$(id).set_gain_a($gain_a)
-self.$(id).set_gain_b($gain_b)
-##################################################
-## Flex RF A
-##################################################
-#if $transmit_a.tx_enb
-self.$(id).set_enable_a(True)
-#end if
-#if $transmit_a.auto_tr
-self.$(id).set_auto_tr_a(True)
-#end if
-##################################################
-## Flex RF B
-##################################################
-#if $transmit_b.tx_enb
-self.$(id).set_enable_b(True)
-#end if
-#if $transmit_b.auto_tr
-self.$(id).set_auto_tr_b(True)
-#end if</make>
-	<callback>set_interp_rate($interpolation)</callback>
-	<callback>set_frequency_a($frequency_a#slurp
-#if $lo_offset_a() != float('inf')
-, lo_offset=$lo_offset_a#slurp
-#end if
-)</callback>
-	<callback>set_frequency_b($frequency_b#slurp
-#if $lo_offset_b() != float('inf')
-, lo_offset=$lo_offset_b#slurp
-#end if
-)</callback>
-	<callback>set_gain_a($gain_a)</callback>
-	<callback>set_gain_b($gain_b)</callback>
-	<param>
-		<name>Input Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-	</param>
-	<param>
-		<name>Unit Number</name>
-		<key>which</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Interpolation</name>
-		<key>interpolation</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Frequency A (Hz)</name>
-		<key>frequency_a</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Frequency B (Hz)</name>
-		<key>frequency_b</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>LO Offset A (Hz)</name>
-		<key>lo_offset_a</key>
-		<value>float('inf')</value>
-		<type>real</type>
-		<hide>#if $lo_offset_a() == float('inf') then 'part' else 'none'#</hide>
-		<option>
-			<name>Default</name>
-			<key>float('inf')</key>
-		</option>
-	</param>
-	<param>
-		<name>LO Offset B (Hz)</name>
-		<key>lo_offset_b</key>
-		<value>float('inf')</value>
-		<type>real</type>
-		<hide>#if $lo_offset_b() == float('inf') then 'part' else 'none'#</hide>
-		<option>
-			<name>Default</name>
-			<key>float('inf')</key>
-		</option>
-	</param>
-	<param>
-		<name>Gain A (dB)</name>
-		<key>gain_a</key>
-		<value>0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Gain B (dB)</name>
-		<key>gain_b</key>
-		<value>0</value>
-		<type>real</type>
-	</param>
-<!--
-###################################################
-## Flex RF A
-###################################################
- -->
-	<param>
-		<name>Transmit A</name>
-		<key>transmit_a</key>
-		<value></value>
-		<type>enum</type>
-		<hide>#if $transmit_a.tx_enb then 'none' else 'part'#</hide>
-		<option>
-			<name>Unconfigured</name>
-			<key></key>
-			<opt>tx_enb:</opt>
-			<opt>auto_tr:</opt>
-		</option>
-		<option>
-			<name>Enable</name>
-			<key>tx_enb</key>
-			<opt>tx_enb:1</opt>
-			<opt>auto_tr:</opt>
-		</option>
-		<option>
-			<name>Auto T/R</name>
-			<key>auto_tr</key>
-			<opt>tx_enb:1</opt>
-			<opt>auto_tr:1</opt>
-		</option>
-	</param>
-<!--
-###################################################
-## Flex RF B
-###################################################
- -->
-	<param>
-		<name>Transmit B</name>
-		<key>transmit_b</key>
-		<value></value>
-		<type>enum</type>
-		<hide>#if $transmit_b.tx_enb then 'none' else 'part'#</hide>
-		<option>
-			<name>Unconfigured</name>
-			<key></key>
-			<opt>tx_enb:</opt>
-			<opt>auto_tr:</opt>
-		</option>
-		<option>
-			<name>Enable</name>
-			<key>tx_enb</key>
-			<opt>tx_enb:1</opt>
-			<opt>auto_tr:</opt>
-		</option>
-		<option>
-			<name>Auto T/R</name>
-			<key>auto_tr</key>
-			<opt>tx_enb:1</opt>
-			<opt>auto_tr:1</opt>
-		</option>
-	</param>
-	<sink>
-		<name>Ain</name>
-		<type>$type</type>
-	</sink>
-	<sink>
-		<name>Bin</name>
-		<type>$type</type>
-	</sink>
-	<doc>
-The USRP sink inputs 128 Megasamples per second / interpolation.
-
-Input amplitude should be between 0 and 32767.
-
-Flex RF boards only: The "Transmit Setting" must be configured. \
-When set to "Enable" the transmitter is always on. \
-When set to "Auto Transmit/Receive", the transmitter is disabled while receiving.
-	</doc>
-</block>
diff --git a/gr-usrp/grc/usrp_dual_source_x.xml b/gr-usrp/grc/usrp_dual_source_x.xml
deleted file mode 100644
index 4e1fa81d8..000000000
--- a/gr-usrp/grc/usrp_dual_source_x.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##USRP Dual Source
-###################################################
- -->
-<block>
-	<name>USRP1 Dual Source</name>
-	<key>usrp_dual_source_x</key>
-	<category>USRP</category>
-	<import>from grc_gnuradio import usrp as grc_usrp</import>
-	<make>grc_usrp.dual_source_$(type.fcn)(
-	which=$which,
-	rx_ant_a=$rx_ant_a, rx_ant_b=$rx_ant_b,
-	rx_source_a=$rx_source_a, rx_source_b=$rx_source_b,
-)
-#if $format()
-self.$(id).set_format(width=$format.width, shift=$format.shift)
-#end if
-self.$(id).set_decim_rate($decimation)
-self.$(id).set_frequency_a($frequency_a, verbose=True#slurp
-#if $lo_offset_a() != float('inf')
-, lo_offset=$lo_offset_a#slurp
-#end if
-)
-self.$(id).set_frequency_b($frequency_b, verbose=True#slurp
-#if $lo_offset_b() != float('inf')
-, lo_offset=$lo_offset_b#slurp
-#end if
-)
-self.$(id).set_gain_a($gain_a)
-self.$(id).set_gain_b($gain_b)</make>
-	<callback>set_decim_rate($decimation)</callback>
-	<callback>set_frequency_a($frequency_a#slurp
-#if $lo_offset_a() != float('inf')
-, lo_offset=$lo_offset_a#slurp
-#end if
-)</callback>
-	<callback>set_frequency_b($frequency_b#slurp
-#if $lo_offset_b() != float('inf')
-, lo_offset=$lo_offset_b#slurp
-#end if
-)</callback>
-	<callback>set_gain_a($gain_a)</callback>
-	<callback>set_gain_b($gain_b)</callback>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-	</param>
-	<param>
-		<name>Format</name>
-		<key>format</key>
-		<value></value>
-		<type>enum</type>
-		<hide>#if $format() then '' else 'part'#</hide>
-		<option>
-			<name>16 Bits (Default)</name>
-			<key></key>
-			<opt>width:16</opt>
-			<opt>shift:0</opt>
-		</option>
-		<option>
-			<name>8 Bits, Shift 8</name>
-			<key>w8_s8</key>
-			<opt>width:8</opt>
-			<opt>shift:8</opt>
-		</option>
-	</param>
-	<param>
-		<name>Unit Number</name>
-		<key>which</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Decimation</name>
-		<key>decimation</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Frequency A (Hz)</name>
-		<key>frequency_a</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Frequency B (Hz)</name>
-		<key>frequency_b</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>LO Offset A (Hz)</name>
-		<key>lo_offset_a</key>
-		<value>float('inf')</value>
-		<type>real</type>
-		<hide>#if $lo_offset_a() == float('inf') then 'part' else 'none'#</hide>
-		<option>
-			<name>Default</name>
-			<key>float('inf')</key>
-		</option>
-	</param>
-	<param>
-		<name>LO Offset B (Hz)</name>
-		<key>lo_offset_b</key>
-		<value>float('inf')</value>
-		<type>real</type>
-		<hide>#if $lo_offset_b() == float('inf') then 'part' else 'none'#</hide>
-		<option>
-			<name>Default</name>
-			<key>float('inf')</key>
-		</option>
-	</param>
-	<param>
-		<name>Gain A (dB)</name>
-		<key>gain_a</key>
-		<value>0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Gain B (dB)</name>
-		<key>gain_b</key>
-		<value>0</value>
-		<type>real</type>
-	</param>
-<!--
-###################################################
-## Antenna A
-###################################################
- -->
-	<param>
-		<name>RX Antenna A</name>
-		<key>rx_ant_a</key>
-		<value>RXA</value>
-		<type>string</type>
-		<option>
-			<name>RXA</name>
-			<key>RXA</key>
-		</option>
-		<option>
-			<name>RXB</name>
-			<key>RXB</key>
-		</option>
-		<option>
-			<name>RXAB</name>
-			<key>RXAB</key>
-		</option>
-		<option>
-			<name>TX/RX</name>
-			<key>TX/RX</key>
-		</option>
-		<option>
-			<name>RX2</name>
-			<key>RX2</key>
-		</option>
-	</param>
-<!--
-###################################################
-## Antenna B
-###################################################
- -->
-	<param>
-		<name>RX Antenna B</name>
-		<key>rx_ant_b</key>
-		<value>RXA</value>
-		<type>string</type>
-		<option>
-			<name>RXA</name>
-			<key>RXA</key>
-		</option>
-		<option>
-			<name>RXB</name>
-			<key>RXB</key>
-		</option>
-		<option>
-			<name>RXAB</name>
-			<key>RXAB</key>
-		</option>
-		<option>
-			<name>TX/RX</name>
-			<key>TX/RX</key>
-		</option>
-		<option>
-			<name>RX2</name>
-			<key>RX2</key>
-		</option>
-	</param>
-	<param>
-		<name>RX Source A</name>
-		<key>rx_source_a</key>
-		<value>A</value>
-		<type>string</type>
-		<hide>#if $rx_source_a() == 'A' then 'part' else 'none'#</hide>
-		<option>
-			<name>Side A</name>
-			<key>A</key>
-		</option>
-		<option>
-			<name>Side B</name>
-			<key>B</key>
-		</option>
-	</param>
-	<param>
-		<name>RX Source B</name>
-		<key>rx_source_b</key>
-		<value>B</value>
-		<type>string</type>
-		<hide>#if $rx_source_b() == 'B' then 'part' else 'none'#</hide>
-		<option>
-			<name>Side A</name>
-			<key>A</key>
-		</option>
-		<option>
-			<name>Side B</name>
-			<key>B</key>
-		</option>
-	</param>
-	<source>
-		<name>Aout</name>
-		<type>$type</type>
-	</source>
-	<source>
-		<name>Bout</name>
-		<type>$type</type>
-	</source>
-	<doc>
-The USRP source outputs 64 Megasamples per second / decimation.
-
-The "Receive Antenna Setting" selects one of the SMA connectors as the data source. \
-Flex RF boards use the "TX/RX" and "RX2" settings. \
-Basic RX and LFRX use the "RXA", "RXB", and "RXAB" settings. \
-All other boards use the "RXA" setting.
-	</doc>
-</block>
diff --git a/gr-usrp/grc/usrp_probe b/gr-usrp/grc/usrp_probe
deleted file mode 100755
index d2e92e753..000000000
--- a/gr-usrp/grc/usrp_probe
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env python
-"""
-Copyright 2009 Free Software Foundation, Inc.
-This file is part of GNU Radio
-
-GNU Radio Companion 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 2
-of the License, or (at your option) any later version.
-
-GNU Radio Companion 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 this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-"""
-
-from gnuradio import usrp
-import os
-
-import pygtk
-pygtk.require('2.0')
-import gtk
-
-from gnuradio.grc.gui.Dialogs import TextDisplay
-
-from gnuradio.grc.python.Platform import Platform
-platform = Platform()
-
-flow_graph = platform.get_new_flow_graph()
-block = flow_graph.get_new_block('usrp_probe')
-
-##all params
-usrp_which_param = block.get_param('which')
-usrp_dboard_param = block.get_param('dboard')
-
-def get_input(param):
-	param.validate()
-	input = param.get_input()
-	return input
-
-class USRPProbeWindow(gtk.Window):
-	"""
-	The main window for USRP Dignostics.
-	"""
-
-	def delete_event(self, widget, event, data=None): return False
-
-	def destroy(self, widget, data=None): gtk.main_quit()
-
-	def __init__(self):
-		"""
-		USRPProbeWindow contructor.
-		Create a new gtk Dialog with a close button, USRP input paramaters, and output labels.
-		"""
-		gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
-		#quit signals
-		self.connect("delete_event", self.delete_event)
-		self.connect("destroy", self.destroy)
-		#set the title
-		self.set_title('USRP Probe')
-		#create decorative frame
-		frame = gtk.Frame()
-		self.add(frame)
-		#create vbox for storage
-		vbox = gtk.VBox()
-		frame.add(vbox)
-		vbox.pack_start(get_input(usrp_which_param), False)
-		vbox.pack_start(get_input(usrp_dboard_param), False)
-		self.probe_button = gtk.Button('Probe')
-		self.probe_button.connect('clicked', self._probe_usrp)
-		vbox.pack_start(self.probe_button, False)
-		#Create a text box for USRP queries
-		self.query_buffer = TextDisplay()
-		self.query_buffer.set_text(block.get_doc())
-		vbox.pack_start(self.query_buffer)
-		self.show_all()
-
-	def _probe_usrp(self, widget=None):
-		"""Probe the USRP device and copy the results into the query text box."""
-		dboard = usrp_dboard_param.evaluate()
-		side = {'a': 0, 'b': 1}[dboard[-1]]
-		if dboard.startswith('rx'): make = usrp.source_c
-		elif dboard.startswith('tx'): make = usrp.sink_c
-		try:
-			u = make(which=usrp_which_param.evaluate())
-			subdev_spec = (side, 0)
-			subdev = usrp.selected_subdev(u, subdev_spec) #get the subdev
-			msg = ">>> USRP Probe\n"
-			msg = "%s\nName:\n\t%s\n"%(msg, str(subdev.name()))
-			msg = "%s\nConverter Rate:\n\t%s\n"%(msg, u.converter_rate())
-			msg = "%s\nUses Quadrature:\n\t%s\n"%(msg, str(subdev.is_quadrature()))
-			gain_min, gain_max, gain_step = subdev.gain_range()
-			msg = "%s\nGain Range (min, max, step size):\n\t%s\n\t%s\n\t%s\n"%(msg, gain_min, gain_max, gain_step)
-			freq_min, freq_max, freq_step = subdev.freq_range()
-			msg = "%s\nFreq Range (min, max, step size):\n\t%s\n\t%s\n\t%s\n"%(msg, freq_min, freq_max, freq_step)
-			self.query_buffer.set_text(msg)
-		except Exception, e: #display the error message
-			self.query_buffer.set_text('''\
->>> Error\n%s
-
-If the USRP cannot be found, make sure that the USRP is plugged-in and restart this program. \
-If the problem persists, there may be a problem with you gnuradio installation or USB 2.0.
-'''%str(e))
-
-if __name__ == '__main__':
-	#setup icon using icon theme
-	try: gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
-	except: pass
-	#enter the mainloop
-	USRPProbeWindow()
-	gtk.main()
diff --git a/gr-usrp/grc/usrp_probe.xml b/gr-usrp/grc/usrp_probe.xml
deleted file mode 100644
index ee207c28d..000000000
--- a/gr-usrp/grc/usrp_probe.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##USRP Probe:
-##	This block should not appear in the tree.
-###################################################
- -->
-<block>
-	<name>USRP Probe</name>
-	<key>usrp_probe</key>
-	<make></make>
-	<param>
-		<name>Unit Number</name>
-		<key>which</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Daughter Board</name>
-		<key>dboard</key>
-		<type>enum</type>
-		<option>
-			<name>RX A</name>
-			<key>rx_a</key>
-		</option>
-		<option>
-			<name>RX B</name>
-			<key>rx_b</key>
-		</option>
-		<option>
-			<name>TX A</name>
-			<key>tx_a</key>
-		</option>
-		<option>
-			<name>TX B</name>
-			<key>tx_b</key>
-		</option>
-	</param>
-	<doc>Press "Probe" to retrieve USRP information...</doc>
-</block>
diff --git a/gr-usrp/grc/usrp_simple_sink_x.xml b/gr-usrp/grc/usrp_simple_sink_x.xml
deleted file mode 100644
index e52b5f047..000000000
--- a/gr-usrp/grc/usrp_simple_sink_x.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##USRP Simple Sink
-###################################################
- -->
-<block>
-	<name>USRP1 Sink</name>
-	<key>usrp_simple_sink_x</key>
-	<category>USRP</category>
-	<import>from grc_gnuradio import usrp as grc_usrp</import>
-	<make>grc_usrp.simple_sink_$(type.fcn)(which=$which, side=$side)
-self.$(id).set_interp_rate($interpolation)
-self.$(id).set_frequency($frequency, verbose=True#slurp
-#if $lo_offset() != float('inf')
-, lo_offset=$lo_offset#slurp
-#end if
-)
-self.$(id).set_gain($gain)
-#if $transmit.tx_enb
-self.$(id).set_enable(True)
-#end if
-#if $transmit.auto_tr
-self.$(id).set_auto_tr(True)
-#end if</make>
-	<callback>set_interp_rate($interpolation)</callback>
-	<callback>set_frequency($frequency#slurp
-#if $lo_offset() != float('inf')
-, lo_offset=$lo_offset#slurp
-#end if
-)</callback>
-	<callback>set_gain($gain)</callback>
-	<param>
-		<name>Input Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-	</param>
-	<param>
-		<name>Unit Number</name>
-		<key>which</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Interpolation</name>
-		<key>interpolation</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Frequency (Hz)</name>
-		<key>frequency</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>LO Offset (Hz)</name>
-		<key>lo_offset</key>
-		<value>float('inf')</value>
-		<type>real</type>
-		<hide>#if $lo_offset() == float('inf') then 'part' else 'none'#</hide>
-		<option>
-			<name>Default</name>
-			<key>float('inf')</key>
-		</option>
-	</param>
-	<param>
-		<name>Gain (dB)</name>
-		<key>gain</key>
-		<value>0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Side</name>
-		<key>side</key>
-		<value>A</value>
-		<type>string</type>
-		<option>
-			<name>A</name>
-			<key>A</key>
-		</option>
-		<option>
-			<name>B</name>
-			<key>B</key>
-		</option>
-	</param>
-	<param>
-		<name>Transmit</name>
-		<key>transmit</key>
-		<value></value>
-		<type>enum</type>
-		<hide>#if $transmit.tx_enb then 'none' else 'part'#</hide>
-		<option>
-			<name>Unconfigured</name>
-			<key></key>
-			<opt>tx_enb:</opt>
-			<opt>auto_tr:</opt>
-		</option>
-		<option>
-			<name>Enable</name>
-			<key>tx_enb</key>
-			<opt>tx_enb:1</opt>
-			<opt>auto_tr:</opt>
-		</option>
-		<option>
-			<name>Auto T/R</name>
-			<key>auto_tr</key>
-			<opt>tx_enb:1</opt>
-			<opt>auto_tr:1</opt>
-		</option>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-	</sink>
-	<doc>
-The USRP sink inputs 128 Megasamples per second / interpolation.
-
-Input amplitude should be between 0 and 32767.
-
-Flex RF boards only: The "Transmit Setting" must be configured. \
-When set to "Enable" the transmitter is always on. \
-When set to "Auto Transmit/Receive", the transmitter is disabled while receiving.
-	</doc>
-</block>
diff --git a/gr-usrp/grc/usrp_simple_source_x.xml b/gr-usrp/grc/usrp_simple_source_x.xml
deleted file mode 100644
index a79c78c20..000000000
--- a/gr-usrp/grc/usrp_simple_source_x.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##USRP Simple Source
-###################################################
- -->
-<block>
-	<name>USRP1 Source</name>
-	<key>usrp_simple_source_x</key>
-	<category>USRP</category>
-	<import>from grc_gnuradio import usrp as grc_usrp</import>
-	<make>grc_usrp.simple_source_$(type.fcn)(which=$which, side=$side, rx_ant=$rx_ant#if $hb_filters() then ', no_hb=True' else ''#)
-#if $format()
-self.$(id).set_format(width=$format.width, shift=$format.shift)
-#end if
-self.$(id).set_decim_rate($decimation)
-self.$(id).set_frequency($frequency, verbose=True#slurp
-#if $lo_offset() != float('inf')
-, lo_offset=$lo_offset#slurp
-#end if
-)
-self.$(id).set_gain($gain)</make>
-	<callback>set_decim_rate($decimation)</callback>
-	<callback>set_frequency($frequency#slurp
-#if $lo_offset() != float('inf')
-, lo_offset=$lo_offset#slurp
-#end if
-)</callback>
-	<callback>set_gain($gain)</callback>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-	</param>
-	<param>
-		<name>Format</name>
-		<key>format</key>
-		<value></value>
-		<type>enum</type>
-		<hide>#if $format() then '' else 'part'#</hide>
-		<option>
-			<name>16 Bits (Default)</name>
-			<key></key>
-			<opt>width:16</opt>
-			<opt>shift:0</opt>
-		</option>
-		<option>
-			<name>8 Bits, Shift 8</name>
-			<key>w8_s8</key>
-			<opt>width:8</opt>
-			<opt>shift:8</opt>
-		</option>
-	</param>
-	<param>
-		<name>Unit Number</name>
-		<key>which</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Decimation</name>
-		<key>decimation</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Frequency (Hz)</name>
-		<key>frequency</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>LO Offset (Hz)</name>
-		<key>lo_offset</key>
-		<value>float('inf')</value>
-		<type>real</type>
-		<hide>#if $lo_offset() == float('inf') then 'part' else 'none'#</hide>
-		<option>
-			<name>Default</name>
-			<key>float('inf')</key>
-		</option>
-	</param>
-	<param>
-		<name>Gain (dB)</name>
-		<key>gain</key>
-		<value>0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Side</name>
-		<key>side</key>
-		<value>A</value>
-		<type>string</type>
-		<option>
-			<name>A</name>
-			<key>A</key>
-		</option>
-		<option>
-			<name>B</name>
-			<key>B</key>
-		</option>
-	</param>
-	<param>
-		<name>RX Antenna</name>
-		<key>rx_ant</key>
-		<value>RXA</value>
-		<type>string</type>
-		<option>
-			<name>RXA</name>
-			<key>RXA</key>
-		</option>
-		<option>
-			<name>RXB</name>
-			<key>RXB</key>
-		</option>
-		<option>
-			<name>RXAB</name>
-			<key>RXAB</key>
-		</option>
-		<option>
-			<name>TX/RX</name>
-			<key>TX/RX</key>
-		</option>
-		<option>
-			<name>RX2</name>
-			<key>RX2</key>
-		</option>
-	</param>
-	<param>
-		<name>Halfband Filters</name>
-		<key>hb_filters</key>
-		<value></value>
-		<type>enum</type>
-		<hide>#if $hb_filters() then 'none' else 'part'#</hide>
-		<option>
-			<name>Enable</name>
-			<key></key>
-		</option>
-		<option>
-			<name>Disable</name>
-			<key>1</key>
-		</option>
-	</param>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-	</source>
-	<doc>
-The USRP source outputs 64 Megasamples per second / decimation.
-
-The "Receive Antenna Setting" selects one of the SMA connectors as the data source. \
-Flex RF boards use the "TX/RX" and "RX2" settings. \
-Basic RX and LFRX use the "RXA", "RXB", and "RXAB" settings. \
-All other boards use the "RXA" setting.
-
-With the format set to 8 bits and the halfband filters disabled, the USRP can acheive a decimation rate of 4. \
-Disabling the halfband filters requires a special USRP firmware without halfband filters or TX paths. \
-For this reason, the USRP cannot transmit with the halfband filters disabled.
-	</doc>
-</block>
diff --git a/gr-usrp/src/.gitignore b/gr-usrp/src/.gitignore
deleted file mode 100644
index 96caf587f..000000000
--- a/gr-usrp/src/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
-/usrp_swig.cc
-/usrp_swig.py
-/usrp_swig.scm
-/run_tests
-/run_guile_tests
-/usrp_dbids.py
-/*.pyc
-/gnuradio
-/guile
-/python
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
deleted file mode 100644
index 29cedc96a..000000000
--- a/gr-usrp/src/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# Copyright 2004,2005,2006,2008,2009,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-
-TESTS =
-EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA)
-DISTCLEANFILES += run_tests run_guile_tests
-
-noinst_PYTHON =	qa_usrp.py
-noinst_GUILE  = usrp.test
-
-if GUILE
-nobase_guile_DATA = gnuradio/usrp.scm
-endif
-
-# ----------------------------------------------------------------
-# The straight C++ library
-
-AM_CPPFLAGS = \
-	$(USRP_INCLUDES) \
-	$(STD_DEFINES_AND_INCLUDES) \
-	$(PYTHON_CPPFLAGS) \
-	$(USB_INCLUDES) \
-	$(WITH_INCLUDES)
-
-lib_LTLIBRARIES = \
-	libgnuradio-usrp.la
-
-libgnuradio_usrp_la_SOURCES = \
-	usrp_base.cc \
-	usrp_sink_base.cc \
-	usrp_sink_c.cc \
-	usrp_sink_s.cc \
-	usrp_source_base.cc \
-	usrp_source_c.cc \
-	usrp_source_s.cc
-
-libgnuradio_usrp_la_LIBADD = \
-	$(GNURADIO_CORE_LA) \
-	$(USRP_LA)			
-
-libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
-
-grinclude_HEADERS = \
-	usrp_base.h \
-	usrp_sink_base.h \
-	usrp_sink_c.h \
-	usrp_sink_s.h \
-	usrp_source_base.h \
-	usrp_source_c.h \
-	usrp_source_s.h
-
-# ----------------------------------------------------------------
-# The SWIG library
-
-TOP_SWIG_IFILES =		\
-	usrp_swig.i
-
-# Install so that they end up available as:
-#   import gnuradio.usrp
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp
-usrp_swig_pythondir_category = 	\
-	gnuradio/usrp
-
-# additional arguments to the SWIG command
-usrp_swig_swig_args =		\
-	$(DEFAULT_INCLUDES)	\
-	$(USRP_INCLUDES)
-
-# additional libraries for linking with the SWIG-generated library
-usrp_swig_la_swig_libadd =	\
-	libgnuradio-usrp.la
-
-# additional Python files to be installed along with the SWIG-generated one
-usrp_swig_python =		\
-	__init__.py
-
-# additional SWIG files to be installed
-usrp_swig_swiginclude_headers =	\
-	usrp_base.i		\
-	usrp_source_base.i	\
-	usrp_source_c.i		\
-	usrp_source_s.i		\
-	usrp_sink_base.i	\
-	usrp_sink_c.i		\
-	usrp_sink_s.i		\
-	usrp_standard.i
-
-
-if PYTHON
-TESTS += run_tests
-endif
-
-if GUILE
-TESTS += run_guile_tests
-endif
-
diff --git a/gr-usrp/src/Makefile.swig.gen b/gr-usrp/src/Makefile.swig.gen
deleted file mode 100644
index c122d6dd9..000000000
--- a/gr-usrp/src/Makefile.swig.gen
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright 2009 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.
-# 
-
-# Makefile.swig.gen for usrp_swig.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/usrp_swig
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/usrp_swig
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-usrp_swig_pythondir_category ?= gnuradio/usrp_swig
-usrp_swig_pylibdir_category ?= $(usrp_swig_pythondir_category)
-usrp_swig_pythondir = $(pythondir)/$(usrp_swig_pythondir_category)
-usrp_swig_pylibdir = $(pyexecdir)/$(usrp_swig_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-usrp_swig_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/usrp_swig
-# FIXME: determince whether these should be installed with gnuradio.
-usrp_swig_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-usrp_swig_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-usrp_swig_swiginclude_HEADERS =		\
-	usrp_swig.i			\
-	$(usrp_swig_swiginclude_headers)
-
-if PYTHON
-usrp_swig_pylib_LTLIBRARIES =		\
-	_usrp_swig.la
-
-_usrp_swig_la_SOURCES = 			\
-	python/usrp_swig.cc		\
-	$(usrp_swig_la_swig_sources)
-
-usrp_swig_python_PYTHON =			\
-	usrp_swig.py			\
-	$(usrp_swig_python)
-
-_usrp_swig_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(usrp_swig_la_swig_libadd)
-
-_usrp_swig_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(usrp_swig_la_swig_ldflags)
-
-_usrp_swig_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(usrp_swig_la_swig_cxxflags)
-
-python/usrp_swig.cc: usrp_swig.py
-usrp_swig.py: usrp_swig.i
-
-# Include the python dependencies for this file
--include python/usrp_swig.d
-
-endif		# end of if python
-
-if GUILE
-
-usrp_swig_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-usrp_swig.la
-libguile_gnuradio_usrp_swig_la_SOURCES =	\
-	guile/usrp_swig.cc			\
-	$(usrp_swig_la_swig_sources)
-nobase_usrp_swig_scm_DATA = 		\
-	gnuradio/usrp_swig.scm 		\
-	gnuradio/usrp_swig-primitive.scm
-libguile_gnuradio_usrp_swig_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(usrp_swig_la_swig_libadd)
-libguile_gnuradio_usrp_swig_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(usrp_swig_la_swig_ldflags)
-libguile_gnuradio_usrp_swig_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(usrp_swig_la_swig_cxxflags)
-
-guile/usrp_swig.cc: gnuradio/usrp_swig.scm
-gnuradio/usrp_swig.scm: usrp_swig.i
-gnuradio/usrp_swig-primitive.scm: gnuradio/usrp_swig.scm
-
-# Include the guile dependencies for this file
--include guile/usrp_swig.d
-
-endif				# end of GUILE
-
-
diff --git a/gr-usrp/src/__init__.py b/gr-usrp/src/__init__.py
deleted file mode 100644
index c81b2f2b0..000000000
--- a/gr-usrp/src/__init__.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright 2008 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.
-# 
-
-# The presence of this file turns this directory into a Python package
-
-# Add SWIG generated code to this namespace
-from usrp_swig import *
-
-# Add other content from pure-Python modules here
-
diff --git a/gr-usrp/src/flexrf_debug_gui.py b/gr-usrp/src/flexrf_debug_gui.py
deleted file mode 100755
index ff32900a5..000000000
--- a/gr-usrp/src/flexrf_debug_gui.py
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005 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.
-# 
-
-import sys
-import wx
-from gnuradio.wxgui import form
-
-class flexrf_debug_gui(wx.Frame):
-    def __init__(self, flexrf, title="Flexrf Debug"):
-        wx.Frame.__init__(self, None, -1, title)
-
-        self.flexrf = flexrf
-        
-        self.CreateStatusBar (1)
-
-        self.panel = wx.Panel(self, -1)
-        self.vbox = wx.BoxSizer(wx.VERTICAL)
-        self.panel.SetSizer(self.vbox)
-        self.panel.SetAutoLayout(True)
-
-        self._create_form()
-
-        self.vbox.Fit(self.panel)
-
-        self.frame_vbox = wx.BoxSizer(wx.VERTICAL)
-        self.frame_vbox.Add(self.panel, 1, wx.EXPAND)
-        self.SetSizer(self.frame_vbox)
-        self.SetAutoLayout(True)
-        self.frame_vbox.Fit(self)
-        
-    def _create_form(self):
-        self._create_set_freq()
-        self._create_write_fpga()
-        self._create_write_all()
-        self._create_write_it()
-        #self._create_set_gain()
-        
-    # ----------------------------------------------------------------
-
-    def _create_set_freq(self):
-
-        def _set_freq(kv):
-            return self.flexrf.set_freq(kv['freq'])[0]
-
-        sbs = wx.StaticBoxSizer(wx.StaticBox(self.panel), wx.HORIZONTAL)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        #sbs.Add(wx.StaticText(self.panel, -1, "set_freq "), 0, 0)
-        #sbs.Add((5,0), 0.1)       # stretchy space
-        myform = form.form()
-        myform['freq'] = form.float_field(self.panel, sbs, "Set Frequency")
-        sbs.Add((5,0), 0.1)       # stretchy space
-        sbs.Add(form.button_with_callback(self.panel, "Do It!",
-                                          self._generic_doit(_set_freq, myform)), 1, wx.EXPAND)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        self.vbox.Add(sbs, 0, wx.EXPAND)
-
-
-    def _create_write_fpga(self):
-
-        def _write_fpga(kv):
-            return self.flexrf._u._write_fpga_reg(kv['regno'], kv['value'])
-
-        sbs = wx.StaticBoxSizer(wx.StaticBox(self.panel), wx.HORIZONTAL)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        sbs.Add(wx.StaticText(self.panel, -1, "write_fpga_reg "), 0, 0)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        myform = form.form()
-        myform['regno'] = form.int_field(self.panel, sbs, "regno")
-        sbs.Add((5,0), 0.1)       # stretchy space
-        myform['value'] = form.int_field(self.panel, sbs, "value")
-        sbs.Add((5,0), 0.1)       # stretchy space
-        sbs.Add(form.button_with_callback(self.panel, "Do It!",
-                                          self._generic_doit(_write_fpga, myform)), 1, wx.EXPAND)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        self.vbox.Add(sbs, 0, wx.EXPAND)
-
-
-    def _create_write_all(self):
-
-        def _write_all(kv):
-            self.flexrf._write_all(kv['R'], kv['control'], kv['N'])   # void
-            return  True
-
-        sbs = wx.StaticBoxSizer(wx.StaticBox(self.panel), wx.HORIZONTAL)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        sbs.Add(wx.StaticText(self.panel, -1, "write_all "), 0, 0)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        myform = form.form()
-        myform['R'] = form.int_field(self.panel, sbs, "R")
-        sbs.Add((5,0), 0.1)       # stretchy space
-        myform['control'] = form.int_field(self.panel, sbs, "control")
-        sbs.Add((5,0), 0.1)       # stretchy space
-        myform['N'] = form.int_field(self.panel, sbs, "N")
-        sbs.Add((5,0), 0.1)       # stretchy space
-        sbs.Add(form.button_with_callback(self.panel, "Do It!",
-                                          self._generic_doit(_write_all, myform)), 1, wx.EXPAND)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        self.vbox.Add(sbs, 0, wx.EXPAND)
-
-
-    def _create_write_it(self):
-
-        def _write_it(kv):
-            self.flexrf._write_it(kv['v'])      # void
-            return True
-
-        sbs = wx.StaticBoxSizer(wx.StaticBox(self.panel), wx.HORIZONTAL)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        sbs.Add(wx.StaticText(self.panel, -1, "write_it "), 0, 0)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        myform = form.form()
-        myform['v'] = form.int_field(self.panel, sbs, "24-bit value")
-        sbs.Add((5,0), 0.1)       # stretchy space
-        sbs.Add(form.button_with_callback(self.panel, "Do It!",
-                                          self._generic_doit(_write_it, myform)), 1, wx.EXPAND)
-        sbs.Add((5,0), 0.1)       # stretchy space
-        self.vbox.Add(sbs, 0, wx.EXPAND)
-
-
-    # ----------------------------------------------------------------
-    
-    def _set_status_msg(self, msg):
-        self.GetStatusBar().SetStatusText(msg, 0)
-
-    def _generic_doit(self, callback, form):
-
-        def button_callback():
-            errors = form.check_input_for_errors()
-            if errors:
-                self._set_status_msg(errors[0])
-                print '\n'.join(tuple(errors))
-            else:
-                kv = form.get_key_vals()
-                if callback(kv):
-                    self._set_status_msg("OK")
-                else:
-                    self._set_status_msg("Failed")
-
-        return button_callback
-
-
-        
-if False and __name__ == '__main__':
-
-    class demo_app (wx.App):
-        def __init__ (self):
-            wx.App.__init__(self)
-
-        def OnInit (self):
-            frame = flexrf_debug_gui(None, "Debug FlexRF TX")
-            frame.Show(True)
-            self.SetTopWindow (frame)
-            return True
-
-    app = demo_app()
-    app.MainLoop()
-
diff --git a/gr-usrp/src/gnuradio/.gitignore b/gr-usrp/src/gnuradio/.gitignore
deleted file mode 100644
index 0c4d489ab..000000000
--- a/gr-usrp/src/gnuradio/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-usrp_swig-primitive.scm
-usrp_swig.scm
diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in
deleted file mode 100644
index c03f96e0b..000000000
--- a/gr-usrp/src/run_tests.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# 1st parameter is absolute path to component source directory
-# 2nd parameter is absolute path to component build directory
-# 3rd parameter is path to Python QA directory
-
-# For OS/X
-DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp/host/lib:@abs_top_builddir@/usrp/host/lib/.libs:$DYLD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-
-# For Win32
-PATH=@abs_top_builddir@/usrp/host/lib:@abs_top_builddir@/usrp/host/lib/.libs:$PATH
-
-@top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-usrp \
-    @abs_top_builddir@/gr-usrp \
-    @srcdir@
diff --git a/gr-usrp/src/tx_debug_gui.py b/gr-usrp/src/tx_debug_gui.py
deleted file mode 100755
index 6b2a0c259..000000000
--- a/gr-usrp/src/tx_debug_gui.py
+++ /dev/null
@@ -1,187 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005 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.
-# 
-
-import sys
-import wx
-from gnuradio.wxgui import form
-
-class tx_debug_gui(wx.Frame):
-    def __init__(self, tx_subdev, title="Tx Debug"):
-        wx.Frame.__init__(self, None, -1, title)
-
-        self.subdev = tx_subdev
-        self.subdev._u.set_verbose(True)
-        
-        self.CreateStatusBar (1)
-
-        self.panel = wx.Panel(self, -1)
-        self.vbox = wx.BoxSizer(wx.VERTICAL)
-        self.panel.SetSizer(self.vbox)
-        self.panel.SetAutoLayout(True)
-
-        self._create_form()
-
-        self.vbox.Fit(self.panel)
-
-        self.frame_vbox = wx.BoxSizer(wx.VERTICAL)
-        self.frame_vbox.Add(self.panel, 1, wx.EXPAND)
-        self.SetSizer(self.frame_vbox)
-        self.SetAutoLayout(True)
-        self.frame_vbox.Fit(self)
-        
-    # ----------------------------------------------------------------
-
-    def _write_9862(self, regno, v):
-        return self.subdev._u._write_9862(self.subdev._which, regno, v)
-
-    def _set_dac_offset(self, i_or_q, offset, offset_pin):
-        return self.subdev._u.set_dac_offset(self.subdev._which * 2 + i_or_q, offset, offset_pin)
-
-    def _set_dac_fine_gain(self, i_or_q, gain, coarse):
-        return self._write_9862(14 + i_or_q, (coarse & 0xC0) | (gain & 0x3f))
-
-    def _create_form(self):
-        self._create_dac_offset()
-        self._create_dac_fine_gain()
-        self._create_pga()
-        
-    # ----------------------------------------------------------------
-
-    def _create_dac_offset(self):
-
-        sbs = wx.StaticBoxSizer(wx.StaticBox(self.panel), wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add(wx.StaticText(self.panel, -1, "DAC Offset"), 5, 0)
-        sbs.Add(hbox, 0, 1)
-
-
-        self._create_dac_offset_helper(sbs, 0)
-        self._create_dac_offset_helper(sbs, 1)
-
-        self.vbox.Add(sbs, 0, wx.EXPAND)
-
-    def _create_dac_offset_helper(self, vbox, i_or_q):
-
-        def doit(kv):
-            drive_positive = kv['drive_positive']
-            dac_offset = kv['dac_offset']
-            print "drive_positive =", drive_positive
-            print "dac_offset[%d] = %4d" % (i_or_q, dac_offset)
-            
-            # FIXME signed magnitude??
-            # dac_offset = signed_mag10(dac_offset)
-            return self._set_dac_offset(i_or_q, dac_offset, int(drive_positive))
-        
-        def signed_mag10(x):
-            # not clear from doc if this is really 2's comp or 10-bit signed magnitude
-            # we'll guess it's 10-bit signed mag
-            if x < 0:
-                return (1 << 9) | min(511, max(0, abs(x)))
-            else:
-                return (0 << 9) | min(511, max(0, abs(x)))
-
-        myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        vbox.Add(hbox, 0, wx.EXPAND)
-        myform['drive_positive'] = form.checkbox_field(parent=self.panel, sizer=hbox,
-                                                       callback=myform.check_input_and_call(doit),
-                                                       weight=0,
-                                                       label="drive +ve")
-        myform['dac_offset'] = form.slider_field(parent=self.panel, sizer=hbox,
-                                                 callback=myform.check_input_and_call(doit),
-                                                 min=-512, max=511, value=0,
-                                                 weight=5)
-        
-    # ----------------------------------------------------------------
-
-    def _create_dac_fine_gain(self):
-        sbs = wx.StaticBoxSizer(wx.StaticBox(self.panel), wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add(wx.StaticText(self.panel, -1, "DAC Gain"), 5, 0)
-        sbs.Add(hbox, 0, 1)
-
-        self._create_dac_gain_helper(sbs, 0)
-        self._create_dac_gain_helper(sbs, 1)
-
-        self.vbox.Add(sbs, 0, wx.EXPAND)
-
-    def _create_dac_gain_helper(self, vbox, i_or_q):
-
-        d = { "1/1"  : 0xC0,
-              "1/2"  : 0x40,
-              "1/11" : 0x00 }
-
-        def doit(kv):
-            dac_gain = kv['dac_gain']
-            coarse_s = kv['coarse']
-            print "dac_gain[%d] = %4d" % (i_or_q, dac_gain)
-            print "coarse = ", coarse_s
-            return self._set_dac_fine_gain(i_or_q, dac_gain, d[coarse_s])
-        
-        myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        vbox.Add(hbox, 0, wx.EXPAND)
-        myform['coarse'] = form.radiobox_field(parent=self.panel, sizer=hbox,
-                                               callback=myform.check_input_and_call(doit),
-                                               choices=['1/11', '1/2', '1/1'],
-                                               weight=1, value='1/1')
-        myform['dac_gain'] = form.slider_field(parent=self.panel, sizer=hbox,
-                                               callback=myform.check_input_and_call(doit),
-                                               min=-32, max=31, value=0,
-                                               weight=4)
-
-
-    # ----------------------------------------------------------------
-
-    def _create_pga(self):
-        sbs = wx.StaticBoxSizer(wx.StaticBox(self.panel), wx.VERTICAL)
-
-        form.quantized_slider_field(parent=self.panel, sizer=sbs, label="PGA",
-                                    weight=3, range=self.subdev.gain_range(),
-                                    callback=self.subdev.set_gain)
-
-        self.vbox.Add(sbs, 0, wx.EXPAND)
-
-
-    # ----------------------------------------------------------------
-
-    
-    def _set_status_msg(self, msg):
-        self.GetStatusBar().SetStatusText(msg, 0)
-
-        
-if False and __name__ == '__main__':
-
-    class demo_app (wx.App):
-        def __init__ (self):
-            wx.App.__init__(self)
-
-        def OnInit (self):
-            frame = tx_debug_gui(None, "Debug TX")
-            frame.Show(True)
-            self.SetTopWindow (frame)
-            return True
-
-    app = demo_app()
-    app.MainLoop()
diff --git a/gr-usrp/src/usrp.test b/gr-usrp/src/usrp.test
deleted file mode 100644
index 740fe3055..000000000
--- a/gr-usrp/src/usrp.test
+++ /dev/null
@@ -1,37 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(define-module (test-module)
-  #:use-module (oop goops)
-  #:use-module (gnuradio core)
-  #:use-module (gnuradio test-suite lib)
-  #:duplicates (merge-generics replace check))
-
-;;; Just see if we can import the module...
-;;; They may not have a USRP attached and powered up
-
-(use-modules (gnuradio usrp))
diff --git a/gr-usrp/src/usrp_base.cc b/gr-usrp/src/usrp_base.cc
deleted file mode 100644
index 1d632a567..000000000
--- a/gr-usrp/src/usrp_base.cc
+++ /dev/null
@@ -1,322 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <usrp_base.h>
-#include <usrp/usrp_basic.h>
-
-class truth_table_element_t 
-{
-public:
-  truth_table_element_t(int side, unsigned int uses, bool swap_iq, unsigned int mux_val);
-  bool operator==(const truth_table_element_t &in);
-  bool operator!=(const truth_table_element_t &in);
-
-  unsigned int mux_val() { return d_mux_val; }
-
-private:
-  int          d_side;
-  unsigned int d_uses;
-  bool         d_swap_iq;
-  unsigned int d_mux_val;
-};
-
-
-usrp_base::~usrp_base()
-{
-}
-
-void
-usrp_base::set_usrp_basic(boost::shared_ptr<usrp_basic> u)
-{
-  d_usrp_basic = u;
-}
-
-std::vector<std::vector<db_base_sptr> >
-usrp_base::db()
-{
-  return d_usrp_basic->db();
-}
-
-std::vector<db_base_sptr> 
-usrp_base::db(int which_side)
-{
-  return d_usrp_basic->db(which_side);
-}
-
-db_base_sptr
-usrp_base::db(int which_side, int which_dev)
-{
-  return d_usrp_basic->selected_subdev(usrp_subdev_spec(which_side, which_dev));
-}
-
-db_base_sptr
-usrp_base::selected_subdev(usrp_subdev_spec ss)
-{
-  return d_usrp_basic->selected_subdev(ss);
-}
-
-long
-usrp_base::fpga_master_clock_freq() const
-{
-  return d_usrp_basic->fpga_master_clock_freq();
-}
-
-void
-usrp_base::set_fpga_master_clock_freq(long master_clock)
-{
-  d_usrp_basic->set_fpga_master_clock_freq(master_clock);
-}
-
-void
-usrp_base::set_verbose (bool verbose)
-{  
-  d_usrp_basic->set_verbose (verbose);
-}
-
-bool
-usrp_base::write_eeprom (int i2c_addr, int eeprom_offset, const std::string buf)
-{
-  return d_usrp_basic->write_eeprom (i2c_addr, eeprom_offset, buf);
-}
-
-std::string
-usrp_base::read_eeprom (int i2c_addr, int eeprom_offset, int len)
-{
-  return d_usrp_basic->read_eeprom (i2c_addr, eeprom_offset, len);
-}
-
-bool
-usrp_base::write_i2c (int i2c_addr, const std::string buf)
-{
-  return d_usrp_basic->write_i2c (i2c_addr, buf);
-}
-
-std::string
-usrp_base::read_i2c (int i2c_addr, int len)
-{
-  return d_usrp_basic->read_i2c (i2c_addr, len);
-}
-
-bool
-usrp_base::set_adc_offset (int which, int offset)
-{
-  return d_usrp_basic->set_adc_offset (which, offset);
-}
-
-bool
-usrp_base::set_dac_offset (int which, int offset, int offset_pin)
-{
-  return d_usrp_basic->set_dac_offset (which, offset, offset_pin);
-}
-
-bool
-usrp_base::set_adc_buffer_bypass (int which, bool bypass)
-{
-  return d_usrp_basic->set_adc_buffer_bypass (which, bypass);
-}
-
-bool
-usrp_base::set_dc_offset_cl_enable(int bits, int mask)
-{
-  return d_usrp_basic->set_dc_offset_cl_enable(bits, mask);
-}
-
-std::string
-usrp_base::serial_number()
-{
-  return d_usrp_basic->serial_number();
-}
-
-int
-usrp_base::daughterboard_id (int which) const
-{
-  return d_usrp_basic->daughterboard_id (which);
-}
-
-bool
-usrp_base::write_atr_tx_delay(int value)
-{
-  return d_usrp_basic->write_atr_tx_delay(value);
-}
-
-bool
-usrp_base::write_atr_rx_delay(int value)
-{
-  return d_usrp_basic->write_atr_rx_delay(value);
-}
-
-bool
-usrp_base::set_pga (int which, double gain)
-{
-  return d_usrp_basic->set_pga (which, gain);
-}
-
-double
-usrp_base::pga (int which) const
-{
-  return d_usrp_basic->pga (which);
-}
-
-double
-usrp_base::pga_min () const
-{
-  return d_usrp_basic->pga_min ();
-}
-
-double
-usrp_base::pga_max () const
-{
-  return d_usrp_basic->pga_max ();
-}
-
-double
-usrp_base::pga_db_per_step () const
-{
-  return d_usrp_basic->pga_db_per_step ();
-}
-
-bool
-usrp_base::_write_oe (int which_dboard, int value, int mask)
-{
-  return d_usrp_basic->_write_oe (which_dboard, value, mask);
-}
-
-bool
-usrp_base::write_io (int which_dboard, int value, int mask)
-{
-  return d_usrp_basic->write_io (which_dboard, value, mask);
-}
-
-int
-usrp_base::read_io (int which_dboard)
-{
-  return d_usrp_basic->read_io (which_dboard);
-}
-
-bool
-usrp_base::write_atr_mask(int which_side, int value)
-{
-  return d_usrp_basic->write_atr_mask(which_side, value);
-}
-
-bool
-usrp_base::write_atr_txval(int which_side, int value)
-{
-  return d_usrp_basic->write_atr_txval(which_side, value);
-}
-
-bool
-usrp_base::write_atr_rxval(int which_side, int value)
-{
-  return d_usrp_basic->write_atr_rxval(which_side, value);
-}
-
-bool
-usrp_base::write_aux_dac (int which_dboard, int which_dac, int value)
-{
-  return d_usrp_basic->write_aux_dac (which_dboard, which_dac, value);
-}
-
-int
-usrp_base::read_aux_adc (int which_dboard, int which_adc)
-{
-  return d_usrp_basic->read_aux_adc (which_dboard, which_adc);
-}
-
-long
-usrp_base::converter_rate() const
-{
-  return d_usrp_basic->converter_rate();
-}
-
-bool
-usrp_base::_set_led(int which_led, bool on)
-{
-  return d_usrp_basic->_set_led(which_led, on);
-}
-
-bool
-usrp_base::_write_fpga_reg (int regno, int value)
-{
-  return d_usrp_basic->_write_fpga_reg (regno, value);
-}
-
-bool
-usrp_base::_write_fpga_reg_masked (int regno, int value, int mask)
-{
-  return d_usrp_basic->_write_fpga_reg_masked (regno, value, mask);
-}
-
-int
-usrp_base::_read_fpga_reg (int regno)
-{
-  return d_usrp_basic->_read_fpga_reg (regno);
-}
-
-bool
-usrp_base::_write_9862 (int which_codec, int regno, unsigned char value)
-{
-  return d_usrp_basic->_write_9862 (which_codec, regno, value);
-}
-
-int
-usrp_base::_read_9862 (int which_codec, int regno) const
-{
-  return d_usrp_basic->_read_9862 (which_codec, regno);
-}
-
-bool
-usrp_base::_write_spi (int optional_header, int enables,
-			       int format, std::string buf)
-{
-  return d_usrp_basic->_write_spi (optional_header, enables, format, buf);
-}
-
-std::string
-usrp_base::_read_spi (int optional_header, int enables, int format, int len)
-{
-  return d_usrp_basic->_read_spi (optional_header, enables, format, len);
-}
-
-usrp_subdev_spec
-usrp_base::pick_subdev(std::vector<int> candidates)
-{
-  int dbid0 = db(0, 0)->dbid();
-  int dbid1 = db(1, 0)->dbid();
-
-  for (int i = 0; i < candidates.size(); i++) {
-    int dbid = candidates[i];
-    if (dbid0 == dbid)
-      return usrp_subdev_spec(0, 0);
-    if (dbid1 == dbid)
-      return usrp_subdev_spec(1, 0);
-  }
-
-  if (dbid0 >= 0)
-    return usrp_subdev_spec(0, 0);
-  if (dbid1 >= 0)
-    return usrp_subdev_spec(1, 0);
-
-  throw std::runtime_error("No suitable daughterboard found!");
-}
diff --git a/gr-usrp/src/usrp_base.h b/gr-usrp/src/usrp_base.h
deleted file mode 100644
index 7947723fb..000000000
--- a/gr-usrp/src/usrp_base.h
+++ /dev/null
@@ -1,452 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_USRP_BASE_H
-#define INCLUDED_USRP_BASE_H
-
-#include <gr_sync_block.h>
-#include <stdexcept>
-#include <boost/shared_ptr.hpp>
-#include <usrp/db_base.h>
-#include <usrp/usrp_subdev_spec.h>
-
-class usrp_basic;
-
-/*!
- * \brief base class for GNU Radio interface to the USRP
- */
-class usrp_base : public gr_sync_block {
-private:
-  boost::shared_ptr<usrp_basic>	d_usrp_basic;
-
-protected:
-  usrp_base(const std::string &name,
-	    gr_io_signature_sptr input_signature,
-	    gr_io_signature_sptr output_signature)
-    : gr_sync_block(name, input_signature, output_signature) {}
-    
-
-  void set_usrp_basic(boost::shared_ptr<usrp_basic> u);
-
-public:
-  virtual ~usrp_base();
-
-  /* !
-   * Return a vector of vectors of daughterboard instances associated with
-   * the USRP source or sink.  The first dimension of the returned vector
-   * corresponds to the side of the USRP, the second dimension, the subdevice
-   * on the particular daughterboard.
-   *
-   * N.B. To ensure proper lifetime management, the caller should
-   * continue to hold these as weak pointers, not shared pointers.  
-   * As long as the caller does not attempt to directly use the weak
-   * pointers after this usrp object has been destroyed, everything
-   * will work out fine.
-   */
-   std::vector<std::vector<db_base_sptr> > db();
-
-  /*!
-   * Return a vector of size 1 or 2 that contains shared pointers
-   * to the daughterboard instance(s) associated with the specified side.
-   *
-   * \param which_side	[0,1] which daughterboard
-   *
-   * N.B. To ensure proper lifetime management, the caller should
-   * continue to hold these as weak pointers, not shared pointers.  
-   * As long as the caller does not attempt to directly use the weak
-   * pointers after this usrp object has been destroyed, everything
-   * will work out fine.
-   */
-  std::vector<db_base_sptr> db(int which_side);
-
-  /*!
-   * Return the daughterboard instance corresponding to the selected
-   * side of the USRP and selected daughterboard subdevice.
-   * N.B. To ensure proper lifetime management, the caller should
-   * continue to hold these as weak pointers, not shared pointers.  
-   * As long as the caller does not attempt to directly use the weak
-   * pointers after this usrp object has been destroyed, everything
-   * will work out fine.
-   */
-  db_base_sptr db(int which_side, int which_dev);
-
-  /*!
-   * \brief given a usrp_subdev_spec, return the corresponding daughterboard object.
-   * \throws std::invalid_argument if ss is invalid.
-   *
-   * \param ss specifies the side and subdevice
-   */
-  db_base_sptr selected_subdev(usrp_subdev_spec ss);
-
-  /*!
-   * \brief return frequency of master oscillator on USRP
-   */
-  long fpga_master_clock_freq() const;
-
-  /*!
-   * Tell API that the master oscillator on the USRP is operating at a non-standard 
-   * fixed frequency. This is only needed for custom USRP hardware modified to 
-   * operate at a different frequency from the default factory configuration. This
-   * function must be called prior to any other API function.
-   * \param master_clock USRP2 FPGA master clock frequency in Hz (10..64 MHz)
-   */
-  void set_fpga_master_clock_freq (long master_clock);
-
-  void set_verbose (bool on);
-
-  //! magic value used on alternate register read interfaces
-  static const int READ_FAILED = -99999;
-
-  /*!
-   * \brief Write EEPROM on motherboard or any daughterboard.
-   * \param i2c_addr		I2C bus address of EEPROM
-   * \param eeprom_offset	byte offset in EEPROM to begin writing
-   * \param buf			the data to write
-   * \returns true iff sucessful
-   */
-  bool write_eeprom (int i2c_addr, int eeprom_offset, const std::string buf);
-
-  /*!
-   * \brief Read EEPROM on motherboard or any daughterboard.
-   * \param i2c_addr		I2C bus address of EEPROM
-   * \param eeprom_offset	byte offset in EEPROM to begin reading
-   * \param len			number of bytes to read
-   * \returns the data read if successful, else a zero length string.
-   */
-  std::string read_eeprom (int i2c_addr, int eeprom_offset, int len);
-
-  /*!
-   * \brief Write to I2C peripheral
-   * \param i2c_addr		I2C bus address (7-bits)
-   * \param buf			the data to write
-   * \returns true iff successful
-   * Writes are limited to a maximum of of 64 bytes.
-   */
-  bool write_i2c (int i2c_addr, const std::string buf);
-
-  /*!
-   * \brief Read from I2C peripheral
-   * \param i2c_addr		I2C bus address (7-bits)
-   * \param len			number of bytes to read
-   * \returns the data read if successful, else a zero length string.
-   * Reads are limited to a maximum of 64 bytes.
-   */
-  std::string read_i2c (int i2c_addr, int len);
-
-  /*!
-   * \brief Set ADC offset correction
-   * \param which_adc	which ADC[0,3]: 0 = RX_A I, 1 = RX_A Q...
-   * \param offset	16-bit value to subtract from raw ADC input.
-   */
-  bool set_adc_offset (int which_adc, int offset);
-
-  /*!
-   * \brief Set DAC offset correction
-   * \param which_dac	which DAC[0,3]: 0 = TX_A I, 1 = TX_A Q...
-   * \param offset	10-bit offset value (ambiguous format:  See AD9862 datasheet).
-   * \param offset_pin	1-bit value.  If 0 offset applied to -ve differential pin;
-   *                                  If 1 offset applied to +ve differential pin.
-   */
-  bool set_dac_offset (int which_dac, int offset, int offset_pin);
-
-  /*!
-   * \brief Control ADC input buffer
-   * \param which_adc 	which ADC[0,3]
-   * \param bypass	if non-zero, bypass input buffer and connect input
-   *	                directly to switched cap SHA input of RxPGA.
-   */
-  bool set_adc_buffer_bypass (int which_adc, bool bypass);
-
-  /*!
-   * \brief Enable/disable automatic DC offset removal control loop in FPGA
-   *
-   * \param bits  which control loops to enable
-   * \param mask  which \p bits to pay attention to
-   *
-   * If the corresponding bit is set, enable the automatic DC
-   * offset correction control loop.
-   *
-   * <pre>
-   * The 4 low bits are significant:
-   *
-   *   ADC0 = (1 << 0)
-   *   ADC1 = (1 << 1)
-   *   ADC2 = (1 << 2)
-   *   ADC3 = (1 << 3)
-   * </pre>
-   *
-   * By default the control loop is enabled on all ADC's.
-   */
-  bool set_dc_offset_cl_enable(int bits, int mask);
-
-  /*!
-   * \brief return the usrp's serial number.
-   *
-   * \returns non-zero length string iff successful.
-   */
-  std::string serial_number();
-
-  /*!
-   * \brief Return daughterboard ID for given side [0,1].
-   *
-   * \param which_side	[0,1] which daughterboard
-   *
-   * \return daughterboard id >= 0 if successful
-   * \return -1 if no daugherboard
-   * \return -2 if invalid EEPROM on daughterboard
-   */
-  virtual int daughterboard_id (int which_side) const;
-
-  /*!
-   * \brief Clock ticks to delay rising of T/R signal
-   * \sa write_atr_mask, write_atr_txval, write_atr_rxval
-   */
-  bool write_atr_tx_delay(int value);
-
-  /*!
-   * \brief Clock ticks to delay falling edge of T/R signal
-   * \sa write_atr_mask, write_atr_txval, write_atr_rxval
-   */
-  bool write_atr_rx_delay(int value);
-
-  /*!
-   * \brief Set Programmable Gain Amplifier (PGA)
-   *
-   * \param which_amp	which amp [0,3]
-   * \param gain_in_db	gain value (linear in dB)
-   *
-   * gain is rounded to closest setting supported by hardware.
-   *
-   * \returns true iff sucessful.
-   *
-   * \sa pga_min(), pga_max(), pga_db_per_step()
-   */
-  bool set_pga (int which_amp, double gain_in_db);
-
-  /*!
-   * \brief Return programmable gain amplifier gain setting in dB.
-   *
-   * \param which_amp	which amp [0,3]
-   */
-  double pga (int which_amp) const;
-
-  /*!
-   * \brief Return minimum legal PGA gain in dB.
-   */
-  double pga_min () const;
-
-  /*!
-   * \brief Return maximum legal PGA gain in dB.
-   */
-  double pga_max () const;
-
-  /*!
-   * \brief Return hardware step size of PGA (linear in dB).
-   */
-  double pga_db_per_step () const;
-
-  /*!
-   * \brief Write direction register (output enables) for pins that go to daughterboard.
-   *
-   * \param which_side	[0,1] which size
-   * \param value	value to write into register
-   * \param mask	which bits of value to write into reg
-   *
-   * Each d'board has 16-bits of general purpose i/o.
-   * Setting the bit makes it an output from the FPGA to the d'board.
-   *
-   * This register is initialized based on a value stored in the
-   * d'board EEPROM.  In general, you shouldn't be using this routine
-   * without a very good reason.  Using this method incorrectly will
-   * kill your USRP motherboard and/or daughterboard.
-   */
-  bool _write_oe (int which_side, int value, int mask);
-
-  /*!
-   * \brief Write daughterboard i/o pin value
-   *
-   * \param which_side	[0,1] which d'board
-   * \param value	value to write into register
-   * \param mask	which bits of value to write into reg
-   */
-  bool write_io (int which_side, int value, int mask);
-
-  /*!
-   * \brief Read daughterboard i/o pin value
-   *
-   * \param which_side	[0,1] which d'board
-   * \returns register value if successful, else READ_FAILED
-   */
-  int read_io (int which_side);
-
-  /*!
-   * \brief Write daughterboard refclk config register
-   *
-   * \param which_side	[0,1] which d'board
-   * \param value	value to write into register, see below
-   *
-   * <pre>
-   * Control whether a reference clock is sent to the daughterboards,
-   * and what frequency.  The refclk is sent on d'board i/o pin 0.
-   * 
-   *     3                   2                   1                       
-   *   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   *  +-----------------------------------------------+-+------------+
-   *  |             Reserved (Must be zero)           |E|   DIVISOR  |
-   *  +-----------------------------------------------+-+------------+
-   * 
-   *  Bit 7  -- 1 turns on refclk, 0 allows IO use
-   *  Bits 6:0 Divider value
-   * </pre>
-   */
-  bool write_refclk(int which_side, int value);
-
-  bool write_atr_mask(int which_side, int value);
-  bool write_atr_txval(int which_side, int value);
-  bool write_atr_rxval(int which_side, int value);
-
-  /*!
-   * \brief Write auxiliary digital to analog converter.
-   *
-   * \param which_side	[0,1] which d'board
-   *    		N.B., SLOT_TX_A and SLOT_RX_A share the same AUX DAC's.
-   *          		SLOT_TX_B and SLOT_RX_B share the same AUX DAC's.
-   * \param which_dac	[2,3] TX slots must use only 2 and 3.
-   * \param value	[0,4095]
-   * \returns true iff successful
-   */
-  bool write_aux_dac (int which_side, int which_dac, int value);
-
-  /*!
-   * \brief Read auxiliary analog to digital converter.
-   *
-   * \param which_side	[0,1] which d'board
-   * \param which_adc	[0,1]
-   * \returns value in the range [0,4095] if successful, else READ_FAILED.
-   */
-  int read_aux_adc (int which_side, int which_adc);
-
-  /*!
-   * \brief returns A/D or D/A converter rate in Hz
-   */
-  long converter_rate() const;
-
-
-  // ----------------------------------------------------------------
-  // Low level implementation routines.
-  // You probably shouldn't be using these...
-  //
-
-  bool _set_led (int which_led, bool on);
-
-  /*!
-   * \brief Write FPGA register.
-   * \param regno	7-bit register number
-   * \param value	32-bit value
-   * \returns true iff successful
-   */
-  bool _write_fpga_reg (int regno, int value);	//< 7-bit regno, 32-bit value
-
-  /*!
-   * \brief Read FPGA register.
-   * \param regno	7-bit register number
-   * \param value	32-bit value
-   * \returns true iff successful
-   */
-  bool _read_fpga_reg (int regno, int *value);	//< 7-bit regno, 32-bit value
-
-  /*!
-   * \brief Read FPGA register.
-   * \param regno	7-bit register number
-   * \returns register value if successful, else READ_FAILED
-   */
-  int  _read_fpga_reg (int regno);
-
-  /*!
-   * \brief Write FPGA register with mask.
-   * \param regno	7-bit register number
-   * \param value	16-bit value
-   * \param mask 	16-bit value
-   * \returns true if successful
-   * Only use this for registers who actually implement a mask in the verilog firmware, like FR_RX_MASTER_SLAVE
-   */
-  bool _write_fpga_reg_masked (int regno, int value, int mask);
-
-  /*!
-   * \brief Write AD9862 register.
-   * \param which_codec 0 or 1
-   * \param regno	6-bit register number
-   * \param value	8-bit value
-   * \returns true iff successful
-   */
-  bool _write_9862 (int which_codec, int regno, unsigned char value);
-
-  /*!
-   * \brief Read AD9862 register.
-   * \param which_codec 0 or 1
-   * \param regno	6-bit register number
-   * \returns register value if successful, else READ_FAILED
-   */
-  int  _read_9862 (int which_codec, int regno) const;
-
-  /*!
-   * \brief Write data to SPI bus peripheral.
-   *
-   * \param optional_header	0,1 or 2 bytes to write before buf.
-   * \param enables		bitmask of peripherals to write. See usrp_spi_defs.h
-   * \param format		transaction format.  See usrp_spi_defs.h SPI_FMT_*
-   * \param buf			the data to write
-   * \returns true iff successful
-   * Writes are limited to a maximum of 64 bytes.
-   *
-   * If \p format specifies that optional_header bytes are present, they are
-   * written to the peripheral immediately prior to writing \p buf.
-   */
-  bool _write_spi (int optional_header, int enables, int format, std::string buf);
-
-  /*
-   * \brief Read data from SPI bus peripheral.
-   *
-   * \param optional_header	0,1 or 2 bytes to write before buf.
-   * \param enables		bitmask of peripheral to read. See usrp_spi_defs.h
-   * \param format		transaction format.  See usrp_spi_defs.h SPI_FMT_*
-   * \param len			number of bytes to read.  Must be in [0,64].
-   * \returns the data read if sucessful, else a zero length string.
-   *
-   * Reads are limited to a maximum of 64 bytes.
-   *
-   * If \p format specifies that optional_header bytes are present, they
-   * are written to the peripheral first.  Then \p len bytes are read from
-   * the peripheral and returned.
-   */
-  std::string _read_spi (int optional_header, int enables, int format, int len);
-
-  /*!
-   * Return an existing daughterboard from list of candidate dbids, or the first found
-   * on side A or side B.
-   *
-   * \param candidates          Vector of candidate dbids
-   * 
-   * Throws std::runtime_error if not found
-   */
-  usrp_subdev_spec pick_subdev(std::vector<int> candidates=std::vector<int>(0));
-};
-
-#endif /* INCLUDED_USRP_BASE_H */
diff --git a/gr-usrp/src/usrp_base.i b/gr-usrp/src/usrp_base.i
deleted file mode 100644
index 0fd62911f..000000000
--- a/gr-usrp/src/usrp_base.i
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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.
- */
-
-%{
-#include "usrp_base.h"
-%}
-
-%ignore usrp_base;
-class usrp_base : public gr_sync_block 
-{
-protected:
-  usrp_base(const std::string &name,
-	    gr_io_signature_sptr input_signature,
-	    gr_io_signature_sptr output_signature)
-    : gr_sync_block(name, input_signature, output_signature) {}
-    
-public:
-  std::vector<std::vector<db_base_sptr> > db();
-  std::vector<db_base_sptr> db(int which_side);
-  db_base_sptr db(int which_side, int which_dev);
-  %rename (_real_selected_subdev) selected_subdev;
-  db_base_sptr selected_subdev(usrp_subdev_spec ss);
-  long fpga_master_clock_freq() const;
-  void set_fpga_master_clock_freq(long master_clock);
-  void set_verbose (bool on);
-  static const int READ_FAILED = -99999;
-  bool write_eeprom (int i2c_addr, int eeprom_offset, const std::string buf);
-  std::string read_eeprom (int i2c_addr, int eeprom_offset, int len);
-  bool write_i2c (int i2c_addr, const std::string buf);
-  std::string read_i2c (int i2c_addr, int len);
-  bool set_adc_offset (int which_adc, int offset);
-  bool set_dac_offset (int which_dac, int offset, int offset_pin);
-  bool set_adc_buffer_bypass (int which_adc, bool bypass);
-  bool set_dc_offset_cl_enable(int bits, int mask);
-  std::string serial_number();
-  virtual int daughterboard_id (int which_side) const;
-  bool write_atr_tx_delay(int value);
-  bool write_atr_rx_delay(int value);
-  bool set_pga (int which_amp, double gain_in_db);
-  double pga (int which_amp) const;
-  double pga_min () const;
-  double pga_max () const;
-  double pga_db_per_step () const;
-  bool _write_oe (int which_side, int value, int mask);
-  bool write_io (int which_side, int value, int mask);
-  int read_io (int which_side);
-  //bool write_refclk(int which_side, int value);
-  bool write_atr_mask(int which_side, int value);
-  bool write_atr_txval(int which_side, int value);
-  bool write_atr_rxval(int which_side, int value);
-  bool write_aux_dac (int which_side, int which_dac, int value);
-  int read_aux_adc (int which_side, int which_adc);
-  long converter_rate() const;
-  bool _set_led (int which_led, bool on);
-  bool _write_fpga_reg (int regno, int value);
-  //bool _read_fpga_reg (int regno, int *value);
-  int  _read_fpga_reg (int regno);
-  bool _write_fpga_reg_masked (int regno, int value, int mask);
-  bool _write_9862 (int which_codec, int regno, unsigned char value);
-  int  _read_9862 (int which_codec, int regno) const;
-  bool _write_spi (int optional_header, int enables, int format, std::string buf);
-  std::string _read_spi (int optional_header, int enables, int format, int len);
-  %rename(_real_pick_subdev) pick_subdev;
-  usrp_subdev_spec pick_subdev(std::vector<int> candidates=std::vector<int>(0))
-    throw (std::runtime_error);
-};
diff --git a/gr-usrp/src/usrp_multi.py b/gr-usrp/src/usrp_multi.py
deleted file mode 100644
index c04d73124..000000000
--- a/gr-usrp/src/usrp_multi.py
+++ /dev/null
@@ -1,233 +0,0 @@
-#
-# Copyright 2005,2008 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.
-# 
-
-import math
-from gnuradio import gr, gru
-from gnuradio.gr import hier_block2
-from gnuradio import usrp
-from usrpm import usrp_prims
-import sys
-
-
-class multi_source_align(object):
-    def __init__(self, fg, master_serialno, decim, nchan=2, pga_gain=0.0,
-                 cordic_freq=0.0, mux=None, align_interval=-1,
-                 fpga_filename="multi_2rxhb_2tx.rbf"):
-        """
-        Align multiple sources (usrps) using samplenumbers in the first channel.
-
-        Takes two ore more sources producing interleaved shorts.
-				produces nchan * nsources gr_complex output streams.
-
-        @param nchan: number of interleaved channels in source
-        @param align_interval: number of samples to minimally skip between alignments
-				                       default = -1 which means align only once per work call.
-        @param master_serial_no: serial number of the source which must be the master.
-
-
-        Exported sub-blocks (attributes):
-          master_source
-          slave_source
-          usrp_master
-          usrp_slave
-        """
-        mode=usrp.FPGA_MODE_NORMAL
-        mode = mode | usrp_prims.bmFR_MODE_RX_COUNTING_32BIT #(1 << 2) #usrp1.FPGA_MODE_COUNTING_32BIT
-        align=gr.align_on_samplenumbers_ss (nchan,align_interval) 
-        self.usrp_master = None
-        self.usrp_slave = None
-        # um is master usrp
-        # us is slave usrp
-        if mux is None:
-          mux=self.get_default_mux()  #Note that all channels have shifted left because of the added 32 bit counter channel
-        
-        u1 = usrp.source_s (1, decim, nchan, gru.hexint(mux), mode,fpga_filename=fpga_filename )
-        u0 = usrp.source_s (0, decim, nchan, gru.hexint(mux), mode,fpga_filename=fpga_filename )
-        print 'usrp[0] serial',u0.serial_number()
-        print 'usrp[1] serial',u1.serial_number()
-        #default, choose the second found usrp as master (which is usually the usrp which was first plugged in)
-        um_index=1
-        um=u1
-        us_index=0
-        us=u0
-        if (not (master_serialno is None)): #((master_serialno>0) | (master_serialno <-2)):
-          if (u0.serial_number() == master_serialno):
-            um_index=0
-            um=u0
-            us_index=1
-            us=u1
-          elif (u1.serial_number() != master_serialno):              
-              errorstring = 'Error. requested master_serialno ' + master_serialno +' not found\n'
-              errorstring = errorstring + 'Available are:\n'
-              errorstring = errorstring + 'usrp[1] serial_no = ' + u1.serial_number() +'\n' 
-              errorstring = errorstring + 'usrp[0] serial_no = ' + u0.serial_number() +'\n'
-              print errorstring
-              raise ValueError, errorstring
-          else: #default, just choose the first found usrp as master
-            um_index=1
-            um=u1
-            us_index=0
-            us=u0
-
-        self.usrp_master=um
-        self.usrp_slave=us
-        print 'usrp_master=usrp[%i] serial_no = %s' % (um_index,self.usrp_master.serial_number() ,)
-        print 'usrp_slave=usrp[%i] serial_no = %s' % (us_index,self.usrp_slave.serial_number() ,)
-        self.subdev_mAr = usrp.selected_subdev(self.usrp_master, (0,0))
-        self.subdev_mBr = usrp.selected_subdev(self.usrp_master, (1,0))
-        self.subdev_sAr = usrp.selected_subdev(self.usrp_slave, (0,0))
-        self.subdev_sBr = usrp.selected_subdev(self.usrp_slave, (1,0))
-        #throttle = gr.throttle(gr.sizeof_gr_complex, input_rate)
-        if not (pga_gain is None):
-          um.set_pga (0, pga_gain)
-          um.set_pga (1, pga_gain)
-
-          us.set_pga (0, pga_gain)
-          us.set_pga (1, pga_gain)
-
-        self.input_rate = um.adc_freq () / um.decim_rate ()
-        deintm=gr.deinterleave(gr.sizeof_gr_complex) 
-        deints=gr.deinterleave(gr.sizeof_gr_complex)
-        nullsinkm=gr.null_sink(gr.sizeof_gr_complex)
-        nullsinks=gr.null_sink(gr.sizeof_gr_complex)
-
-        tocomplexm=gr.interleaved_short_to_complex()
-        tocomplexs=gr.interleaved_short_to_complex()
-
-        fg.connect(um,(align,0))
-        fg.connect(us,(align,1))
-        fg.connect((align,0),tocomplexm)
-        fg.connect((align,1),tocomplexs)
-        fg.connect(tocomplexm,deintm)
-        fg.connect(tocomplexs,deints)
-        fg.connect((deintm,0),nullsinkm) #The counters are not usefull for the user but must be connected to something
-        fg.connect((deints,0),nullsinks) #The counters are not usefull for the user but must be connected to something
-        if 4==nchan:
-          nullsinkm3=gr.null_sink(gr.sizeof_gr_complex)
-          nullsinks3=gr.null_sink(gr.sizeof_gr_complex)
-          fg.connect((deintm,3), nullsinkm3) #channel 4 is not used but must be connected
-          fg.connect((deints,3), nullsinks3) #channel 4 is not used but must be connected
-
-        self.fg=fg
-        self.master_source=deintm
-        self.slave_source=deints
-
-        if not (cordic_freq is None):
-          um.set_rx_freq (1, cordic_freq)
-          um.set_rx_freq (0, cordic_freq)
-          us.set_rx_freq (1, cordic_freq)
-          us.set_rx_freq (0, cordic_freq)
-
-        self.enable_master_and_slave()
-        # add an idle handler
-        self.unsynced=True
-
-        # wire the block together
-        #hier_block_multi_tail.__init__(self, fg, nchan,deintm,deints)
- 
-    def get_default_mux(self):
-        return 0x10321032     # Note that all channels have shifted left because of the added 32 bit counter channel  
-
-    def get_master_source_c(self):
-        return self.master_source
-
-    def get_slave_source_c(self):
-        return self.slave_source
-
-    def get_master_usrp(self):
-        return self.usrp_master
-
-    def get_slave_usrp(self):
-        return self.usrp_slave
-
-    def enable_master_and_slave(self):
-        # Warning, allways FIRST enable the slave before you enable the master
-        # This is to be sure you don't have two masters connecting to each other
-        # Otherwise you could ruin your hardware because the two sync outputs would be connected together
-
-        #SLAVE
-        #disable master, enable slave and set sync pulse to zero
-        reg_mask = usrp_prims.bmFR_RX_SYNC_SLAVE | usrp_prims.bmFR_RX_SYNC_MASTER | usrp_prims.bmFR_RX_SYNC
-        self.usrp_slave._u._write_fpga_reg_masked(usrp_prims.FR_RX_MASTER_SLAVE, usrp_prims.bmFR_RX_SYNC_SLAVE,reg_mask)
-        #set SYNC slave iopin on daughterboards RXA as input
-        oe = 0 # set rx_a_io[bitnoFR_RX_SYNC_INPUT_IOPIN] as input
-        oe_mask = usrp_prims.bmFR_RX_SYNC_INPUT_IOPIN 
-        self.usrp_slave._u._write_oe(0,oe,oe_mask)
-        #Now it is save to enable the master
-
-        #MASTER
-        #enable master, disable slave and set sync pulse to zero
-        reg_mask = usrp_prims.bmFR_RX_SYNC_SLAVE | usrp_prims.bmFR_RX_SYNC_MASTER | usrp_prims.bmFR_RX_SYNC
-        self.usrp_master._u._write_fpga_reg_masked(usrp_prims.FR_RX_MASTER_SLAVE,usrp_prims.bmFR_RX_SYNC_MASTER,reg_mask)
-        #set SYNC master iopin on daughterboards RXA as output
-        oe = usrp_prims.bmFR_RX_SYNC_OUTPUT_IOPIN # set rx_a_io[bitnoFR_RX_SYNC_OUTPUT_IOPIN] as output
-        oe_mask = usrp_prims.bmFR_RX_SYNC_OUTPUT_IOPIN 
-        self.usrp_master._u._write_oe(0,oe,oe_mask)
-
-    def sync_usrps(self, evt):
-        self.sync()
-
-    def sync(self):
-        result=False
-        result = self.usrp_master._u._write_fpga_reg_masked (usrp_prims.FR_RX_MASTER_SLAVE, usrp_prims.bmFR_RX_SYNC, usrp_prims.bmFR_RX_SYNC )
-        #There should be a small delay here, but the time it takes to get the sync to the usrp is long enough
-        #turn sync pulse off
-        result  = result & self.usrp_master._u._write_fpga_reg_masked (usrp_prims.FR_RX_MASTER_SLAVE,0 ,usrp_prims.bmFR_RX_SYNC);
-        return result;
-
-    def nullsink_counters(self):
-        nullsinkm=gr.null_sink(gr.sizeof_gr_complex)
-        nullsinks=gr.null_sink(gr.sizeof_gr_complex)
-        self.fg.connect((self.master_source,0),nullsinkm)
-        self.fg.connect((self.slave_source,0),nullsinks)
-
-
-    def print_db_info(self):
-        print "MASTER RX d'board %s" % (self.subdev_mAr.side_and_name(),)
-        print "MASTER RX d'board %s" % (self.subdev_mBr.side_and_name(),)
-        #print "TX d'board %s" % (self.subdev_At.side_and_name(),)
-        #print "TX d'board %s" % (self.subdev_Bt.side_and_name(),)
-        print "SLAVE RX d'board %s" % (self.subdev_sAr.side_and_name(),)
-        print "SLAVE RX d'board %s" % (self.subdev_sBr.side_and_name(),)
-        #print "TX d'board %s" % (self.subdev_At.side_and_name(),)
-        #print "TX d'board %s" % (self.subdev_Bt.side_and_name(),)
-
-    def tune_all_rx(self,target_freq):
-        result = True
-        r1 =  usrp.tune(self.usrp_master, 0, self.subdev_mAr, target_freq)
-        if r1 is None:
-          result=False
-        r2 = usrp.tune(self.usrp_master, 1, self.subdev_mBr, target_freq)
-        if r2 is None:
-          result=False
-        r3 = usrp.tune(self.usrp_slave, 0, self.subdev_sAr, target_freq)
-        if r3 is None:
-          result=False
-        r4 = usrp.tune(self.usrp_slave, 1, self.subdev_sBr, target_freq)
-        if r4 is None:
-          result=False
-        return result,r1,r2,r3,r4
-
-    def set_gain_all_rx(self, gain):
-        self.subdev_mAr.set_gain(gain)
-        self.subdev_mBr.set_gain(gain)
-        self.subdev_sAr.set_gain(gain)
-        self.subdev_sBr.set_gain(gain)
diff --git a/gr-usrp/src/usrp_sink_base.cc b/gr-usrp/src/usrp_sink_base.cc
deleted file mode 100644
index 635d9345f..000000000
--- a/gr-usrp/src/usrp_sink_base.cc
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp_sink_base.h>
-#include <gr_io_signature.h>
-#include <usrp/usrp_standard.h>
-#include <assert.h>
-#include <cstdio>
-
-static const int OUTPUT_MULTIPLE_SAMPLES = 128;		// DON'T CHANGE THIS VALUE!
-
-usrp_sink_base::usrp_sink_base (const std::string &name,
-				  gr_io_signature_sptr input_signature,
-				  int which_board,
-				  unsigned int interp_rate,
-				  int nchan,
-				  int mux,
-				  int fusb_block_size,
-				  int fusb_nblocks,
-				  const std::string fpga_filename,
-				  const std::string firmware_filename
-				  ) throw (std::runtime_error)
-  : usrp_base(name,
-	      input_signature,
-	      gr_make_io_signature (0, 0, 0)),
-    d_nunderruns (0)
-{
-  d_usrp = usrp_standard_tx::make (which_board,
-				   interp_rate,
-				   nchan, mux,
-				   fusb_block_size,
-				   fusb_nblocks,
-				   fpga_filename,
-				   firmware_filename
-				   );
-  if (d_usrp == 0)
-    throw std::runtime_error ("can't open usrp");
-
-  set_usrp_basic(d_usrp);
-
-  // All calls to d_usrp->write must be multiples of 512 bytes.
-
-  set_output_multiple (OUTPUT_MULTIPLE_SAMPLES);
-}
-
-usrp_sink_base::~usrp_sink_base ()
-{
-}
-
-int
-usrp_sink_base::work (int noutput_items,
-		       gr_vector_const_void_star &input_items,
-		       gr_vector_void_star &output_items)
-{
-  static const int BUFSIZE = 16 * (1L << 10);	// 16kB
-  unsigned char outbuf[BUFSIZE];
-  int		obi = 0;
-  int		input_index = 0;
-  int		input_items_consumed;
-  int		bytes_written;
-  bool		underrun;
-  
-
-  while (input_index < noutput_items){
-  
-    copy_to_usrp_buffer (input_items,
-			 input_index,
-			 noutput_items - input_index,	// input_items_available
-			 input_items_consumed,		// [out]
-			 &outbuf[obi],			// [out] usrp_buffer
-			 BUFSIZE - obi,			// usrp_buffer_length
-			 bytes_written);		// [out]
-
-    assert (input_index + input_items_consumed <= noutput_items);
-    assert (obi + bytes_written <= BUFSIZE);
-    
-    input_index += input_items_consumed;
-    obi += bytes_written;
-
-    if (obi >= BUFSIZE){	// flush
-      if (d_usrp->write (outbuf, obi, &underrun) != obi)
-	return -1;		// indicate we're done
-
-      if (underrun){
-	d_nunderruns++;
-	// fprintf (stderr, "usrp_sink: underrun\n");
-	fputs ("uU", stderr);
-      }
-      obi = 0;
-    }
-  }
-
-  if (obi != 0){
-    assert (obi % 512 == 0);
-    if (d_usrp->write (outbuf, obi, &underrun) != obi)
-      return -1;	// indicate we're done
-
-    if (underrun){
-      d_nunderruns++;
-      // fprintf (stderr, "usrp_sink: underrun\n");
-      fputs ("uU", stderr);
-    }
-  }
-
-  return noutput_items;
-}
-
-bool
-usrp_sink_base::set_interp_rate (unsigned int rate)
-{
-  return d_usrp->set_interp_rate (rate);
-}
-
-bool
-usrp_sink_base::set_nchannels (int nchan)
-{
-  return d_usrp->set_nchannels (nchan);
-}
-
-bool
-usrp_sink_base::set_mux (int mux)
-{
-  return d_usrp->set_mux (mux);
-}
-
-int
-usrp_sink_base::determine_tx_mux_value(usrp_subdev_spec ss)
-{
-  return d_usrp->determine_tx_mux_value(ss);
-}
-
-int
-usrp_sink_base::determine_tx_mux_value(usrp_subdev_spec ss_a, usrp_subdev_spec ss_b)
-{
-  return d_usrp->determine_tx_mux_value(ss_a, ss_b);
-}
-
-bool
-usrp_sink_base::set_tx_freq (int channel, double freq)
-{
-  return d_usrp->set_tx_freq (channel, freq);
-}
-
-unsigned int
-usrp_sink_base::interp_rate () const
-{
-  return d_usrp->interp_rate ();
-}
-
-int
-usrp_sink_base::nchannels () const
-{
-  return d_usrp->nchannels ();
-}
-
-int
-usrp_sink_base::mux () const
-{
-  return d_usrp->mux ();
-}
-
-
-double
-usrp_sink_base::tx_freq (int channel) const
-{
-  return d_usrp->tx_freq (channel);
-}
-
-bool
-usrp_sink_base::has_rx_halfband()
-{
-  return d_usrp->has_rx_halfband();
-}
- 
-bool
-usrp_sink_base::has_tx_halfband()
-{
-  return d_usrp->has_tx_halfband();
-}
-
-int
-usrp_sink_base::nddcs()
-{
-  return d_usrp->nddcs();
-}
-
-int
-usrp_sink_base::nducs()
-{
-  return d_usrp->nducs();
-}
-
-bool
-usrp_sink_base::start()
-{
-  return d_usrp->start();
-}
-
-bool
-usrp_sink_base::stop()
-{
-  return d_usrp->stop();
-}
-
-
-bool
-usrp_sink_base::tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result *result)
-{
-  return d_usrp->tune(chan, db, target_freq, result);
-}
-
-usrp_subdev_spec
-usrp_sink_base::pick_tx_subdevice()
-{
-  int dbids[] = {
-    USRP_DBID_FLEX_400_TX,
-    USRP_DBID_FLEX_900_TX,
-    USRP_DBID_FLEX_1200_TX,
-    USRP_DBID_FLEX_2400_TX,
-    USRP_DBID_BASIC_TX
-  };
-
-  std::vector<int> candidates(dbids, dbids+(sizeof(dbids)/sizeof(int)));
-  return pick_subdev(candidates);
-}
diff --git a/gr-usrp/src/usrp_sink_base.h b/gr-usrp/src/usrp_sink_base.h
deleted file mode 100644
index 8d573af1b..000000000
--- a/gr-usrp/src/usrp_sink_base.h
+++ /dev/null
@@ -1,152 +0,0 @@
-
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006,2008,2009 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_USRP_SINK_BASE_H
-#define INCLUDED_USRP_SINK_BASE_H
-
-#include <usrp_base.h>
-#include <stdexcept>
-#include <usrp/usrp_tune_result.h>
-#include <usrp/usrp_dbid.h>
-
-class usrp_standard_tx;
-
-/*!
- * \brief abstract interface to Universal Software Radio Peripheral Tx path (Rev 1)
- */
-class usrp_sink_base : public usrp_base {
- private:
-  boost::shared_ptr<usrp_standard_tx>	d_usrp;
-  int			 d_nunderruns;
-  
- protected:
-  usrp_sink_base (const std::string &name,
-		   gr_io_signature_sptr input_signature,
-		   int which_board,
-		   unsigned int interp_rate,
-		   int nchan,
-		   int mux,
-		   int fusb_block_size,
-		   int fusb_nblocks,
-		   const std::string fpga_filename,
-		   const std::string firmware_filename
-		   ) throw (std::runtime_error);
-
-  /*!
-   * \brief convert between input item format and usrp native format
-   *
-   * \param[in] input_items		stream(s) of input items
-   * \param[in] input_index		starting index in input_items
-   * \param[in] input_items_available	number of items available starting at item[index]
-   * \param[out] input_items_consumed  	number of input items consumed by copy
-   * \param[out] usrp_buffer		destination buffer
-   * \param[in] usrp_buffer_length 	\p usrp_buffer length in bytes
-   * \param[out] bytes_written		number of bytes written into \p usrp_buffer
-   */
-  virtual void copy_to_usrp_buffer (gr_vector_const_void_star &input_items,
-				    int  input_index,
-				    int	 input_items_available,
-				    int  &input_items_consumed,
-				    void *usrp_buffer,
-				    int  usrp_buffer_length,
-				    int	 &bytes_written) = 0;
-
- public:
-  ~usrp_sink_base ();
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-
-  /*!
-   * \brief Set interpolator rate.  \p rate must be in [4, 1024] and a multiple of 4.
-   *
-   * The final complex sample rate across the USB is
-   *   dac_freq () / interp_rate () * nchannels ()
-   */
-  bool set_interp_rate (unsigned int rate);
-  bool set_nchannels (int nchan);
-  bool set_mux (int mux);
-  int determine_tx_mux_value(usrp_subdev_spec ss);
-  int determine_tx_mux_value(usrp_subdev_spec ss_a, usrp_subdev_spec ss_b);
-
-  /*!
-   * \brief set the frequency of the digital up converter.
-   *
-   * \p channel must be 0.  \p freq is the center frequency in Hz.
-   * It must be in the range [-44M, 44M].  The frequency specified is
-   * quantized.  Use tx_freq to retrieve the actual value used.
-   */
-  bool set_tx_freq (int channel, double freq);
-
-  long dac_rate() const { return converter_rate(); }	// alias
-  long dac_freq() const { return converter_rate(); }	// deprecated alias
-
-  unsigned int interp_rate () const;
-  int nchannels () const;
-  int mux () const;
-  double tx_freq (int channel) const;
-  int nunderruns () const { return d_nunderruns; }
-
-  bool has_rx_halfband();
-  bool has_tx_halfband();
-  int nddcs();
-  int nducs();
-
-  /*!
-   * \brief Called to enable drivers, etc for i/o devices.
-   *
-   * This allows a block to enable an associated driver to begin
-   * transfering data just before we start to execute the scheduler.
-   * The end result is that this reduces latency in the pipeline when
-   * dealing with audio devices, usrps, etc.
-   */
-  bool start();
-
-  /*!
-   * \brief Called to disable drivers, etc for i/o devices.
-   */
-  bool stop();
-
-  /*!
-   * \brief High-level "tune" method.  Works for the single channel case.
-   *
-   * This method adjusts both the daughterboard LO and the DUC so that
-   * DC in the complex baseband samples ends up at RF target_freq.
-   *
-   * \param chan  which DUC channel we're controlling (usually == which_side).
-   * \param db    the daughterboard we're controlling.
-   * \param target_freq the RF frequency we want our baseband translated to.
-   * \param[out] result details how the hardware was configured.
-   *
-   * \returns true iff everything was successful.
-   */
-  bool tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result *result);
-
-  /*!
-   * \brief Select suitable Tx daughterboard
-   */
-  usrp_subdev_spec pick_tx_subdevice();
-};
-
-#endif /* INCLUDED_USRP_SINK_BASE_H */
diff --git a/gr-usrp/src/usrp_sink_base.i b/gr-usrp/src/usrp_sink_base.i
deleted file mode 100644
index 17fca441d..000000000
--- a/gr-usrp/src/usrp_sink_base.i
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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.
- */
-
-%{
-#include "usrp_sink_base.h"
-%}
-
-class usrp_sink_base : public usrp_base 
-{
-private:
-  usrp_sink_base() throw (std::runtime_error);
-
-public:
-  bool set_interp_rate (unsigned int rate);
-  bool set_nchannels (int nchan);
-  bool set_mux (int mux);
-  %rename(_real_determine_tx_mux_value) determine_tx_mux_value;
-  int determine_tx_mux_value(usrp_subdev_spec ss);
-  int determine_tx_mux_value(usrp_subdev_spec ss_a, usrp_subdev_spec ss_b);
-  bool set_tx_freq (int channel, double freq);
-  long dac_rate() const { return converter_rate(); }
-  long dac_freq() const { return converter_rate(); }
-  unsigned int interp_rate () const;
-  int nchannels () const;
-  int mux () const;
-  double tx_freq (int channel) const;
-  int nunderruns () const { return d_nunderruns; }
-  bool has_rx_halfband();
-  bool has_tx_halfband();
-  int nddcs();
-  int nducs();
-  %rename(_real_tune) tune;
-  bool tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result *result);
-  %rename(_real_pick_tx_subdevice) pick_tx_subdevice();
-  usrp_subdev_spec pick_tx_subdevice();
-};
diff --git a/gr-usrp/src/usrp_sink_c.cc b/gr-usrp/src/usrp_sink_c.cc
deleted file mode 100644
index 7054158d8..000000000
--- a/gr-usrp/src/usrp_sink_c.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006,2009,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp_sink_c.h>
-#include <gr_io_signature.h>
-#include <usrp/usrp_standard.h>
-#include <usrp/usrp_bytesex.h>
-
-usrp_sink_c_sptr
-usrp_make_sink_c (int which_board,
-		   unsigned int interp_rate,
-		   int nchan,
-		   int mux,
-		   int fusb_block_size,
-		   int fusb_nblocks,
-		   const std::string fpga_filename,
-		   const std::string firmware_filename
-		   ) throw (std::runtime_error)
-{
-  return gnuradio::get_initial_sptr(new usrp_sink_c (which_board,
-					      interp_rate,
-					      nchan,
-					      mux,
-					      fusb_block_size,
-					      fusb_nblocks,
-					      fpga_filename,
-					      firmware_filename
-					      ));
-}
-
-
-usrp_sink_c::usrp_sink_c (int which_board,
-			    unsigned int interp_rate,
-			    int nchan,
-			    int mux,
-			    int fusb_block_size,
-			    int fusb_nblocks,
-			    const std::string fpga_filename,
-			    const std::string firmware_filename
-			    ) throw (std::runtime_error)
-  : usrp_sink_base ("usrp_sink_c",
-		     gr_make_io_signature (1, 1, sizeof (gr_complex)),
-		     which_board, interp_rate, nchan, mux,
-		     fusb_block_size, fusb_nblocks,
-		     fpga_filename, firmware_filename)
-{
-}
-
-usrp_sink_c::~usrp_sink_c ()
-{
-  // NOP
-}
-
-/*
- * Take one complex input stream and format it into interleaved short I & Q
- * for the usrp.
- */
-void
-usrp_sink_c::copy_to_usrp_buffer (gr_vector_const_void_star &input_items,
-				   int  input_index,
-				   int	input_items_available,
-				   int  &input_items_consumed,	// out
-				   void *usrp_buffer,
-				   int  usrp_buffer_length,
-				   int	&bytes_written)		// out
-{
-  gr_complex *in = &((gr_complex *) input_items[0])[input_index];
-  short *dst = (short *) usrp_buffer;
-
-  static const int usrp_bytes_per_input_item = 2 * sizeof (short); // I & Q
-
-  int nitems = std::min (input_items_available,
-			 usrp_buffer_length / usrp_bytes_per_input_item);
-
-  for (int i = 0; i < nitems; i++){
-    dst[2*i + 0] = host_to_usrp_short((short) real(in[i]));	// FIXME saturate?
-    dst[2*i + 1] = host_to_usrp_short((short) imag(in[i])); 	// FIXME saturate?
-  }
-
-  input_items_consumed = nitems;
-  bytes_written = nitems * usrp_bytes_per_input_item;
-}
-
diff --git a/gr-usrp/src/usrp_sink_c.h b/gr-usrp/src/usrp_sink_c.h
deleted file mode 100644
index 59ebace38..000000000
--- a/gr-usrp/src/usrp_sink_c.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_USRP_SINK_C_H
-#define INCLUDED_USRP_SINK_C_H
-
-#include <usrp_sink_base.h>
-
-class usrp_sink_c;
-typedef boost::shared_ptr<usrp_sink_c> usrp_sink_c_sptr;
-
-
-// public shared_ptr constructor
-
-usrp_sink_c_sptr
-usrp_make_sink_c (int which_board=0,
-		  unsigned int interp_rate=32,
-		  int nchan=1,
-		  int mux=-1,
-		  int fusb_block_size=0,
-		  int fusb_nblocks=0,
-		  const std::string fpga_filename="",
-		  const std::string firmware_filename=""
-		  ) throw (std::runtime_error);
-
-
-/*!
- * \brief Interface to Universal Software Radio Peripheral Tx path
- * \ingroup usrp
- * \ingroup sink_blk
- *
- * input: gr_complex
- */
-class usrp_sink_c : public usrp_sink_base {
- private:
-
-  friend usrp_sink_c_sptr
-  usrp_make_sink_c (int which_board,
-		     unsigned int interp_rate,
-		     int nchan,
-		     int mux,
-		     int fusb_block_size,
-		     int fusb_nblocks,
-		     const std::string fpga_filename,
-		     const std::string firmware_filename
-		     ) throw (std::runtime_error);
-
- protected:
-  usrp_sink_c (int which_board,
-		unsigned int interp_rate,
-		int nchan,
-		int mux,
-		int fusb_block_size,
-		int fusb_nblocks,
-		const std::string fpga_filename,
-		const std::string firmware_filename
-		) throw (std::runtime_error);
-
-  virtual void copy_to_usrp_buffer (gr_vector_const_void_star &input_items,
-				    int  input_index,
-				    int	 input_items_available,
-				    int  &input_items_consumed,
-				    void *usrp_buffer,
-				    int  usrp_buffer_length,
-				    int	 &bytes_written);
- public:
-  ~usrp_sink_c ();
-};
-
-#endif /* INCLUDED_USRP_SINK_C_H */
diff --git a/gr-usrp/src/usrp_sink_s.cc b/gr-usrp/src/usrp_sink_s.cc
deleted file mode 100644
index 1ffaeed96..000000000
--- a/gr-usrp/src/usrp_sink_s.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006,2009,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp_sink_s.h>
-#include <gr_io_signature.h>
-#include <usrp/usrp_standard.h>
-#include <usrp/usrp_bytesex.h>
-
-usrp_sink_s_sptr
-usrp_make_sink_s (int which_board,
-		   unsigned int interp_rate,
-		   int nchan,
-		   int mux,
-		   int fusb_block_size,
-		   int fusb_nblocks,
-		   const std::string fpga_filename,
-		   const std::string firmware_filename
-		   ) throw (std::runtime_error)
-{
-  return gnuradio::get_initial_sptr(new usrp_sink_s (which_board,
-					      interp_rate,
-					      nchan,
-					      mux,
-					      fusb_block_size,
-					      fusb_nblocks,
-					      fpga_filename,
-					      firmware_filename
-					      ));
-}
-
-
-usrp_sink_s::usrp_sink_s (int which_board,
-			    unsigned int interp_rate,
-			    int nchan,
-			    int mux,
-			    int fusb_block_size,
-			    int fusb_nblocks,
-			    const std::string fpga_filename,
-			    const std::string firmware_filename
-			    ) throw (std::runtime_error)
-  : usrp_sink_base ("usrp_sink_s",
-		     gr_make_io_signature (1, 1, sizeof (short)),
-		     which_board, interp_rate, nchan, mux,
-		     fusb_block_size, fusb_nblocks,
-		     fpga_filename, firmware_filename)
-{
-  set_output_multiple (512 / sizeof(short));	// don't change
-}
-
-usrp_sink_s::~usrp_sink_s ()
-{
-  // NOP
-}
-
-/*
- * Take one short input stream and format it into interleaved short I & Q
- * for the usrp.
- */
-void
-usrp_sink_s::copy_to_usrp_buffer (gr_vector_const_void_star &input_items,
-				   int  input_index,
-				   int	input_items_available,
-				   int  &input_items_consumed,	// out
-				   void *usrp_buffer,
-				   int  usrp_buffer_length,
-				   int	&bytes_written)		// out
-{
-  short *in = &((short *) input_items[0])[input_index];
-  short *dst = (short *) usrp_buffer;
-
-  static const int usrp_bytes_per_input_item = sizeof (short);
-
-  int nitems = std::min (input_items_available,
-			 usrp_buffer_length / usrp_bytes_per_input_item);
-
-  for (int i = 0; i < nitems; i++){	// FIXME unroll
-    dst[i] = host_to_usrp_short(in[i]);
-  }
-
-  input_items_consumed = nitems;
-  bytes_written = nitems * usrp_bytes_per_input_item;
-}
-
diff --git a/gr-usrp/src/usrp_sink_s.h b/gr-usrp/src/usrp_sink_s.h
deleted file mode 100644
index f23b86125..000000000
--- a/gr-usrp/src/usrp_sink_s.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_USRP_SINK_S_H
-#define INCLUDED_USRP_SINK_S_H
-
-#include <usrp_sink_base.h>
-
-class usrp_sink_s;
-typedef boost::shared_ptr<usrp_sink_s> usrp_sink_s_sptr;
-
-
-// public shared_ptr constructor
-
-usrp_sink_s_sptr
-usrp_make_sink_s (int which_board=0,
-		  unsigned int interp_rate=32,
-		  int nchan=1,
-		  int mux=-1,
-		  int fusb_block_size=0,
-		  int fusb_nblocks=0,
-		  const std::string fpga_filename="",
-		  const std::string firmware_filename=""
-		  ) throw (std::runtime_error);
-
-/*!
- * \brief Interface to Universal Software Radio Peripheral Tx path
- * \ingroup usrp
- * \ingroup sink_blk
- *
- * input: short
- */
-class usrp_sink_s : public usrp_sink_base {
- private:
-
-  friend usrp_sink_s_sptr
-  usrp_make_sink_s (int which_board,
-		     unsigned int interp_rate,
-		     int nchan,
-		     int mux,
-		     int fusb_block_size,
-		     int fusb_nblocks,
-		     const std::string fpga_filename,
-		     const std::string firmware_filename
-		     ) throw (std::runtime_error);
-
- protected:
-  usrp_sink_s (int which_board,
-		unsigned int interp_rate,
-		int nchan,
-		int mux,
-		int fusb_block_size,
-		int fusb_nblocks,
-		const std::string fpga_filename,
-		const std::string firmware_filename
-		) throw (std::runtime_error);
-
-  virtual void copy_to_usrp_buffer (gr_vector_const_void_star &input_items,
-				    int  input_index,
-				    int	 input_items_available,
-				    int  &input_items_consumed,
-				    void *usrp_buffer,
-				    int  usrp_buffer_length,
-				    int	 &bytes_written);
- public:
-  ~usrp_sink_s ();
-};
-
-#endif /* INCLUDED_USRP_SINK_S_H */
diff --git a/gr-usrp/src/usrp_source_base.cc b/gr-usrp/src/usrp_source_base.cc
deleted file mode 100644
index 5a5e20f3e..000000000
--- a/gr-usrp/src/usrp_source_base.cc
+++ /dev/null
@@ -1,305 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp_source_base.h>
-#include <gr_io_signature.h>
-#include <usrp/usrp_standard.h>
-#include <assert.h>
-#include <cstdio>
-
-static const int OUTPUT_MULTIPLE_BYTES = 4 * 1024;
-
-usrp_source_base::usrp_source_base (const std::string &name,
-				      gr_io_signature_sptr output_signature,
-				      int which_board,
-				      unsigned int decim_rate,
-				      int nchan,
-				      int mux,
-				      int mode,
-				      int fusb_block_size,
-				      int fusb_nblocks,
-				      const std::string fpga_filename,
-				      const std::string firmware_filename
-				      ) throw (std::runtime_error)
-  : usrp_base(name,
-	      gr_make_io_signature (0, 0, 0),
-	      output_signature),
-    d_noverruns (0)
-{
-  d_usrp = usrp_standard_rx::make (which_board, decim_rate,
-				   nchan, mux, mode,
-				   fusb_block_size,
-				   fusb_nblocks,
-				   fpga_filename,
-				   firmware_filename);
-  if (d_usrp == 0)
-    throw std::runtime_error ("can't open usrp");
-
-  set_usrp_basic(d_usrp);
-
-  // All calls to d_usrp->read must be multiples of 512 bytes.
-  // We jack this up to 4k to reduce overhead.
-
-  set_output_multiple (OUTPUT_MULTIPLE_BYTES / output_signature->sizeof_stream_item (0));
-}
-
-usrp_source_base::~usrp_source_base ()
-{
-}
-
-unsigned int
-usrp_source_base::sizeof_basic_sample() const
-{
-  return usrp_standard_rx::format_width(d_usrp->format()) / 8;
-}
-
-int
-usrp_source_base::work (int noutput_items,
-			 gr_vector_const_void_star &input_items,
-			 gr_vector_void_star &output_items)
-{
-  static const int BUFSIZE = 4 * OUTPUT_MULTIPLE_BYTES;
-  unsigned char buf[BUFSIZE];
-  int output_index = 0;
-  int output_items_produced;
-  int bytes_read;
-  bool overrun;
-
-  while (output_index < noutput_items){
-    int nbytes = ninput_bytes_reqd_for_noutput_items (noutput_items - output_index);
-    nbytes = std::min (nbytes, BUFSIZE);
-
-    int result_nbytes = d_usrp->read (buf, nbytes, &overrun);
-    if (overrun){
-      // fprintf (stderr, "usrp_source: overrun\n");
-      fputs ("uO", stderr);
-      d_noverruns++;
-    }
-
-    if (result_nbytes < 0)	// We've got a problem.  Usually board unplugged or powered down.
-      return -1;		// Indicate we're done.
-
-    if (result_nbytes != nbytes){	// not really an error, but unexpected
-      fprintf (stderr, "usrp_source: short read.  Expected %d, got %d\n",
-	       nbytes, result_nbytes);
-    }
-
-    copy_from_usrp_buffer (output_items,
-			   output_index,
-			   noutput_items - output_index,   // output_items_available
-			   output_items_produced,	   // [out]
-			   buf,				   // usrp_buffer
-			   result_nbytes,		   // usrp_buffer_length
-			   bytes_read);			   // [out]
-
-    assert (output_index + output_items_produced <= noutput_items);
-    assert (bytes_read == result_nbytes);
-
-    output_index += output_items_produced;
-  }
-
-  return noutput_items;
-}
-
-
-bool
-usrp_source_base::set_decim_rate (unsigned int rate)
-{
-  return d_usrp->set_decim_rate (rate);
-}
-
-bool
-usrp_source_base::set_nchannels (int nchan)
-{
-  return d_usrp->set_nchannels (nchan);
-}
-
-bool
-usrp_source_base::set_mux (int mux)
-{
-  return d_usrp->set_mux (mux);
-}
-
-int
-usrp_source_base::determine_rx_mux_value(usrp_subdev_spec ss)
-{
-  return d_usrp->determine_rx_mux_value(ss);
-}
-
-int
-usrp_source_base::determine_rx_mux_value(usrp_subdev_spec ss_a, usrp_subdev_spec ss_b)
-{
-  return d_usrp->determine_rx_mux_value(ss_a, ss_b);
-}
-
-bool
-usrp_source_base::set_rx_freq (int channel, double freq)
-{
-  return d_usrp->set_rx_freq (channel, freq);
-}
-
-unsigned int
-usrp_source_base::decim_rate () const
-{
-  return d_usrp->decim_rate ();
-}
-
-int
-usrp_source_base::nchannels () const
-{
-  return d_usrp->nchannels ();
-}
-
-int
-usrp_source_base::mux () const
-{
-  return d_usrp->mux ();
-}
-
-double
-usrp_source_base::rx_freq (int channel) const
-{
-  return d_usrp->rx_freq (channel);
-}
-
-bool
-usrp_source_base::set_fpga_mode (int mode)
-{
-  return d_usrp->set_fpga_mode (mode);
-}
-
-bool
-usrp_source_base::set_ddc_phase (int channel, int phase)
-{
-  return d_usrp->set_ddc_phase(channel, phase);
-}
-
-
-bool
-usrp_source_base::set_format(unsigned int format)
-{
-  return d_usrp->set_format(format);
-}
-
-unsigned int
-usrp_source_base::format() const
-{
-  return d_usrp->format();
-}
-
-unsigned int
-usrp_source_base::make_format(int width, int shift, bool want_q, bool bypass_halfband)
-{
-  return usrp_standard_rx::make_format(width, shift, want_q, bypass_halfband);
-}
-
-int
-usrp_source_base::format_width(unsigned int format)
-{
-  return usrp_standard_rx::format_width(format);
-}
-
-int
-usrp_source_base::format_shift(unsigned int format)
-{
-  return usrp_standard_rx::format_shift(format);
-}
-
-bool
-usrp_source_base::format_want_q(unsigned int format)
-{
-  return usrp_standard_rx::format_want_q(format);
-}
-
-bool
-usrp_source_base::format_bypass_halfband(unsigned int format)
-{
-  return usrp_standard_rx::format_bypass_halfband(format);
-}
-
-bool
-usrp_source_base::has_rx_halfband()
-{
-  return d_usrp->has_rx_halfband();
-}
- 
-bool
-usrp_source_base::has_tx_halfband()
-{
-  return d_usrp->has_tx_halfband();
-}
-
-int
-usrp_source_base::nddcs()
-{
-  return d_usrp->nddcs();
-}
-
-int
-usrp_source_base::nducs()
-{
-  return d_usrp->nducs();
-}
-
-bool
-usrp_source_base::start()
-{
-  return d_usrp->start();
-}
-
-bool
-usrp_source_base::stop()
-{
-  return d_usrp->stop();
-}
-
-bool
-usrp_source_base::tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result *result)
-{
-  return d_usrp->tune(chan, db, target_freq, result);
-}
-
-usrp_subdev_spec
-usrp_source_base::pick_rx_subdevice()
-{
-  int dbids[] = {
-    USRP_DBID_FLEX_400_RX,
-    USRP_DBID_FLEX_900_RX,
-    USRP_DBID_FLEX_1200_RX,
-    USRP_DBID_FLEX_2400_RX,
-    USRP_DBID_TV_RX,
-    USRP_DBID_TV_RX_REV_2,
-    USRP_DBID_TV_RX_REV_3,
-    USRP_DBID_TV_RX_MIMO,
-    USRP_DBID_TV_RX_REV_2_MIMO,
-    USRP_DBID_TV_RX_REV_3_MIMO,
-    USRP_DBID_DBS_RX,
-    USRP_DBID_BASIC_RX
-  };
-
-  std::vector<int> candidates(dbids, dbids+(sizeof(dbids)/sizeof(int)));
-  return pick_subdev(candidates);
-}
diff --git a/gr-usrp/src/usrp_source_base.h b/gr-usrp/src/usrp_source_base.h
deleted file mode 100644
index 4def48e24..000000000
--- a/gr-usrp/src/usrp_source_base.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2009 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_USRP_SOURCE_BASE_H
-#define INCLUDED_USRP_SOURCE_BASE_H
-
-#include <usrp_base.h>
-#include <stdexcept>
-#include <usrp/usrp_tune_result.h>
-#include <usrp/usrp_dbid.h>
-
-class usrp_standard_rx;
-
-/*!
- * \brief abstract interface to Universal Software Radio Peripheral Rx path (Rev 1)
- */
-class usrp_source_base : public usrp_base {
- private:
-  boost::shared_ptr<usrp_standard_rx>	d_usrp;
-  int			 d_noverruns;
-  
- protected:
-  usrp_source_base (const std::string &name,
-		     gr_io_signature_sptr output_signature,
-		     int which_board,
-		     unsigned int decim_rate,
-		     int nchan,
-		     int mux,
-		     int mode,
-		     int fusb_block_size,
-		     int fusb_nblocks,
-		     const std::string fpga_filename,
-		     const std::string firmware_filename
-		     ) throw (std::runtime_error);
-
-  /*!
-   * \brief return number of usrp input bytes required to produce noutput items.
-   */
-  virtual int ninput_bytes_reqd_for_noutput_items (int noutput_items) = 0;
-
-  /*!
-   * \brief number of bytes in a low-level sample
-   */
-  unsigned int sizeof_basic_sample() const;
-
-  /*!
-   * \brief convert between native usrp format and output item format
-   *
-   * \param[out] output_items		stream(s) of output items
-   * \param[in] output_index		starting index in output_items
-   * \param[in] output_items_available	number of empty items available at item[index]
-   * \param[out] output_items_produced	number of items produced by copy
-   * \param[in] usrp_buffer		source buffer
-   * \param[in] usrp_buffer_length	number of bytes available in \p usrp_buffer
-   * \param[out] bytes_read		number of bytes read from \p usrp_buffer
-   *
-   * The copy must consume all bytes available.  That is, \p bytes_read must equal
-   * \p usrp_buffer_length.
-   */
-  virtual void copy_from_usrp_buffer (gr_vector_void_star &output_items,
-				      int output_index,
-				      int output_items_available,
-				      int &output_items_produced,
-				      const void *usrp_buffer,
-				      int usrp_buffer_length,
-				      int &bytes_read) = 0;
-
- public:
-  ~usrp_source_base ();
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-
-  /*!
-   * \brief Set decimator rate.  \p rate must be EVEN and in [8, 256].
-   *
-   * The final complex sample rate across the USB is
-   *   adc_freq () / decim_rate ()
-   */
-  bool set_decim_rate (unsigned int rate);
-  bool set_nchannels (int nchan);
-  bool set_mux (int mux);
-  int determine_rx_mux_value(usrp_subdev_spec ss);
-  int determine_rx_mux_value(usrp_subdev_spec ss_a, usrp_subdev_spec ss_b);
-
-  /*!
-   * \brief set the center frequency of the digital down converter.
-   *
-   * \p channel must be 0.  \p freq is the center frequency in Hz.
-   * It must be in the range [-FIXME, FIXME].  The frequency specified is
-   * quantized.  Use rx_freq to retrieve the actual value used.
-   */
-  bool set_rx_freq (int channel, double freq);
-
-  /*!
-   * \brief set fpga special modes
-   */
-  bool set_fpga_mode (int mode);
-
-  /*!
-   * \brief Set the digital down converter phase register.
-   *
-   * \param channel	which ddc channel [0, 3]
-   * \param phase	32-bit integer phase value.
-   */
-  bool set_ddc_phase(int channel, int phase);
-
-  long adc_rate() const { return converter_rate(); }   // alias
-  long adc_freq() const { return converter_rate(); }   // deprecated alias
-
-  unsigned int decim_rate () const;
-  int nchannels () const;
-  int mux () const;
-  double rx_freq (int channel) const;
-  int noverruns () const { return d_noverruns; }
-
-  bool has_rx_halfband();
-  bool has_tx_halfband();
-  int nddcs();
-  int nducs();
-
-  /*!
-   * \brief Called to enable drivers, etc for i/o devices.
-   *
-   * This allows a block to enable an associated driver to begin
-   * transfering data just before we start to execute the scheduler.
-   * The end result is that this reduces latency in the pipeline when
-   * dealing with audio devices, usrps, etc.
-   */
-  bool start();
-
-  /*!
-   * \brief Called to disable drivers, etc for i/o devices.
-   */
-  bool stop();
-
-  /*!
-   * \brief Specify Rx data format.
-   *
-   * \param format	format specifier
-   *
-   * Rx data format control register
-   *
-   *     3                   2                   1                       
-   *   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   *  +-----------------------------------------+-+-+---------+-------+
-   *  |          Reserved (Must be zero)        |B|Q|  WIDTH  | SHIFT |
-   *  +-----------------------------------------+-+-+---------+-------+
-   *
-   *  SHIFT specifies arithmetic right shift [0, 15]
-   *  WIDTH specifies bit-width of I & Q samples across the USB [1, 16] (not all valid)
-   *  Q     if set deliver both I & Q, else just I
-   *  B     if set bypass half-band filter.
-   *
-   * Right now the acceptable values are:
-   *
-   *   B  Q  WIDTH  SHIFT
-   *   0  1    16     0
-   *   0  1     8     8
-   *
-   * More valid combos to come.
-   *
-   * Default value is 0x00000300  16-bits, 0 shift, deliver both I & Q.
-   */
-  bool set_format(unsigned int format);
-
-  /*!
-   * \brief return current format
-   */
-  unsigned int format () const;
-
-  static unsigned int make_format(int width=16, int shift=0,
-				  bool want_q=true, bool bypass_halfband=false);
-  static int format_width(unsigned int format);
-  static int format_shift(unsigned int format);
-  static bool format_want_q(unsigned int format);
-  static bool format_bypass_halfband(unsigned int format);
-
-  /*!
-   * \brief High-level "tune" method.  Works for the single channel case.
-   *
-   * This method adjusts both the daughterboard LO and the DDC so that
-   * target_freq ends up at DC in the complex baseband samples.
-   *
-   * \param chan  which DDC channel we're controlling (almost always 0).
-   * \param db    the daughterboard we're controlling.
-   * \param target_freq the RF frequency we want at DC in the complex baseband.
-   * \param[out] result details how the hardware was configured.
-   *
-   * \returns true iff everything was successful.
-   */
-  bool tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result *result);
-
-  /*!
-   * \brief Select suitable Rx daughterboard
-   */
-  usrp_subdev_spec pick_rx_subdevice();
-};
-
-#endif /* INCLUDED_USRP_SOURCE_BASE_H */
diff --git a/gr-usrp/src/usrp_source_base.i b/gr-usrp/src/usrp_source_base.i
deleted file mode 100644
index aed751de9..000000000
--- a/gr-usrp/src/usrp_source_base.i
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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.
- */
-
-%{
-#include "usrp_source_base.h"
-%}
-
-class usrp_source_base : public usrp_base 
-{
-private:
-  usrp_source_base() throw (std::runtime_error);
-
-public:
-  bool set_decim_rate (unsigned int rate);
-  bool set_nchannels (int nchan);
-  bool set_mux (int mux);
-  %rename(_real_determine_rx_mux_value) determine_rx_mux_value;
-  int determine_rx_mux_value(usrp_subdev_spec ss);
-  int determine_rx_mux_value(usrp_subdev_spec ss_a, usrp_subdev_spec ss_b);
-  bool set_rx_freq (int channel, double freq);
-  bool set_fpga_mode (int mode);
-  bool set_ddc_phase(int channel, int phase);
-  long adc_rate() const { return converter_rate(); }
-  long adc_freq() const { return converter_rate(); }
-  unsigned int decim_rate () const;
-  int nchannels () const;
-  int mux () const;
-  double rx_freq (int channel) const;
-  int noverruns () const { return d_noverruns; }
-  bool has_rx_halfband();
-  bool has_tx_halfband();
-  int nddcs();
-  int nducs();
-  bool set_format(unsigned int format);
-  static unsigned int make_format(int width=16, int shift=0,
-				  bool want_q=true, bool bypass_halfband=false);
-  static int format_width(unsigned int format);
-  static int format_shift(unsigned int format);
-  static bool format_want_q(unsigned int format);
-  static bool format_bypass_halfband(unsigned int format);
-  %rename(_real_tune) tune;
-  bool tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result *result);
-  %rename(_real_pick_rx_subdevice) pick_rx_subdevice();
-  usrp_subdev_spec pick_rx_subdevice();
-};
diff --git a/gr-usrp/src/usrp_source_c.cc b/gr-usrp/src/usrp_source_c.cc
deleted file mode 100644
index 9055f3ee7..000000000
--- a/gr-usrp/src/usrp_source_c.cc
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006,2009,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp_source_c.h>
-#include <gr_io_signature.h>
-#include <usrp/usrp_standard.h>
-#include <usrp/usrp_bytesex.h>
-
-static const int NBASIC_SAMPLES_PER_ITEM = 2;	// I & Q
-
-usrp_source_c_sptr
-usrp_make_source_c (int which_board,
-		     unsigned int decim_rate,
-		     int nchan,
-		     int mux,
-		     int mode,
-		     int fusb_block_size,
-		     int fusb_nblocks,
-		     const std::string fpga_filename,
-		     const std::string firmware_filename
-		     ) throw (std::runtime_error)
-{
-  return gnuradio::get_initial_sptr(new usrp_source_c (which_board,
-						  decim_rate,
-						  nchan,
-						  mux,
-						  mode,
-						  fusb_block_size,
-						  fusb_nblocks,
-						  fpga_filename,
-						  firmware_filename
-						  ));
-}
-
-
-usrp_source_c::usrp_source_c (int which_board,
-				unsigned int decim_rate,
-				int nchan,
-				int mux,
-				int mode,
-				int fusb_block_size,
-				int fusb_nblocks,
-				const std::string fpga_filename,
-				const std::string firmware_filename
-				) throw (std::runtime_error)
-  : usrp_source_base ("usrp_source_c",
-		       gr_make_io_signature (1, 1, sizeof (gr_complex)),
-		       which_board, decim_rate, nchan, mux, mode,
-		       fusb_block_size, fusb_nblocks,
-		       fpga_filename, firmware_filename)
-{
-}
-
-usrp_source_c::~usrp_source_c ()
-{
-  // NOP
-}
-
-int
-usrp_source_c::ninput_bytes_reqd_for_noutput_items (int noutput_items)
-{
-  return noutput_items * NBASIC_SAMPLES_PER_ITEM * sizeof_basic_sample();
-}
-
-/*
- * Convert interleaved 8 or 16-bit I & Q from usrp buffer into a single
- * complex output stream.
- */
-void
-usrp_source_c::copy_from_usrp_buffer (gr_vector_void_star &output_items,
-				       int output_index,
-				       int output_items_available,
-				       int &output_items_produced,
-				       const void *usrp_buffer,
-				       int usrp_buffer_length,
-				       int &bytes_read)
-{
-  gr_complex *out = &((gr_complex *) output_items[0])[output_index];
-  unsigned sbs = sizeof_basic_sample();
-  unsigned nusrp_bytes_per_item = NBASIC_SAMPLES_PER_ITEM * sbs;
-
-  int nitems = std::min (output_items_available,
-			 (int)(usrp_buffer_length / nusrp_bytes_per_item));
-
-  signed char *s8 = (signed char *) usrp_buffer;
-  short *s16 = (short *) usrp_buffer;
-
-  switch (sbs){
-  case 1:
-    for (int i = 0; i < nitems; i++){
-      out[i] = gr_complex ((float)(s8[2*i+0] << 8), (float)(s8[2*i+1] << 8));
-    }
-    break;
-
-  case 2:
-    for (int i = 0; i < nitems; i++){
-      out[i] = gr_complex ((float) usrp_to_host_short(s16[2*i+0]),
-			   (float) usrp_to_host_short(s16[2*i+1]));
-    }
-    break;
-
-  default:
-    assert(0);
-  }
-
-  output_items_produced = nitems;
-  bytes_read = nitems * nusrp_bytes_per_item;
-}
diff --git a/gr-usrp/src/usrp_source_c.h b/gr-usrp/src/usrp_source_c.h
deleted file mode 100644
index 3fb04d657..000000000
--- a/gr-usrp/src/usrp_source_c.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_USRP_SOURCE_C_H
-#define INCLUDED_USRP_SOURCE_C_H
-
-#include <usrp_source_base.h>
-#include <stdexcept>
-
-class usrp_standard_rx;
-
-
-class usrp_source_c;
-typedef boost::shared_ptr<usrp_source_c> usrp_source_c_sptr;
-
-
-// public shared_ptr constructor
-
-usrp_source_c_sptr
-usrp_make_source_c (int which_board=0,
-		     unsigned int decim_rate=16,
-		     int nchan = 1,
-		     int mux = -1,
-		     int mode = 0,
-		     int fusb_block_size = 0,
-		     int fusb_nblocks = 0,
-		     const std::string fpga_filename = "",
-		     const std::string firmware_filename = ""
-		     ) throw (std::runtime_error);
-
-/*!
- * \brief Interface to Universal Software Radio Peripheral Rx path
- * \ingroup usrp
- * \ingroup source_blk
- *
- * output: 1 stream of complex<float>
- */
-class usrp_source_c : public usrp_source_base {
- private:
-  friend usrp_source_c_sptr
-  usrp_make_source_c (int which_board,
-		       unsigned int decim_rate,
-		       int nchan,
-		       int mux,
-		       int mode,
-		       int fusb_block_size,
-		       int fusb_nblocks,
-		       const std::string fpga_filename,
-		       const std::string firmware_filename
-		       ) throw (std::runtime_error);
-
- protected:
-  usrp_source_c (int which_board,
-		  unsigned int decim_rate,
-		  int nchan,
-		  int mux,
-		  int mode,
-		  int fusb_block_size,
-		  int fusb_nblocks,
-		  const std::string fpga_filename,
-		  const std::string firmware_filename
-		  ) throw (std::runtime_error);
-
-  virtual int ninput_bytes_reqd_for_noutput_items (int noutput_items);
-
-  virtual void copy_from_usrp_buffer (gr_vector_void_star &output_items,
-				      int output_index,
-				      int output_items_available,
-				      int &output_items_produced,
-				      const void *usrp_buffer,
-				      int usrp_buffer_length,
-				      int &bytes_read);
-
- public:
-  ~usrp_source_c ();
-};
-
-#endif /* INCLUDED_USRP_SOURCE_C_H */
diff --git a/gr-usrp/src/usrp_source_s.cc b/gr-usrp/src/usrp_source_s.cc
deleted file mode 100644
index 8e1c2f188..000000000
--- a/gr-usrp/src/usrp_source_s.cc
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2006,2009,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp_source_s.h>
-#include <gr_io_signature.h>
-#include <usrp/usrp_standard.h>
-#include <usrp/usrp_bytesex.h>
-
-static const int NBASIC_SAMPLES_PER_ITEM = 1;
-
-usrp_source_s_sptr
-usrp_make_source_s (int which_board, 
-		     unsigned int decim_rate,
-		     int nchan,
-		     int mux,
-		     int mode,
-		     int fusb_block_size,
-		     int fusb_nblocks,
-		     const std::string fpga_filename,
-		     const std::string firmware_filename
-		     ) throw (std::runtime_error)
-{
-  return gnuradio::get_initial_sptr(new usrp_source_s (which_board,
-						  decim_rate, 
-						  nchan,
-						  mux,
-						  mode,
-						  fusb_block_size,
-						  fusb_nblocks,
-						  fpga_filename,
-						  firmware_filename
-						  ));
-}
-
-
-usrp_source_s::usrp_source_s (int which_board,
-				unsigned int decim_rate,
-				int nchan,
-				int mux,
-				int mode,
-				int fusb_block_size,
-				int fusb_nblocks,
-				const std::string fpga_filename,
-				const std::string firmware_filename
-				) throw (std::runtime_error)
-  : usrp_source_base ("usrp_source_s",
-		       gr_make_io_signature (1, 1, sizeof (short)),
-		       which_board, decim_rate, nchan, mux, mode,
-		       fusb_block_size,
-		       fusb_nblocks,
-		       fpga_filename, firmware_filename)
-{
-}
-
-usrp_source_s::~usrp_source_s ()
-{
-  // NOP
-}
-
-int
-usrp_source_s::ninput_bytes_reqd_for_noutput_items (int noutput_items)
-{
-  return noutput_items * NBASIC_SAMPLES_PER_ITEM * sizeof_basic_sample();
-}
-
-/*
- * Convert interleaved 8 or 16-bit I & Q from usrp buffer into a single
- * short output stream.
- */
-void
-usrp_source_s::copy_from_usrp_buffer (gr_vector_void_star &output_items,
-				       int output_index,
-				       int output_items_available,
-				       int &output_items_produced,
-				       const void *usrp_buffer,
-				       int usrp_buffer_length,
-				       int &bytes_read)
-{
-  short *out = &((short *) output_items[0])[output_index];
-  unsigned sbs = sizeof_basic_sample();
-  unsigned nusrp_bytes_per_item = NBASIC_SAMPLES_PER_ITEM * sbs;
-
-  int nitems = std::min (output_items_available,
-			 (int)(usrp_buffer_length / nusrp_bytes_per_item));
-
-  signed char *s8 = (signed char *) usrp_buffer;
-  short *s16 = (short *) usrp_buffer;
-
-  switch(sbs){
-  case 1:
-    for (int i = 0; i < nitems; i++){
-      out[i] = s8[i] << 8;
-    }
-    break;
-
-  case 2:
-    for (int i = 0; i < nitems; i++){
-      out[i] = usrp_to_host_short(s16[i]);
-    }
-    break;
-    
-  default:
-    assert(0);
-  }
-
-  output_items_produced = nitems;
-  bytes_read = nitems * nusrp_bytes_per_item;
-}
diff --git a/gr-usrp/src/usrp_source_s.h b/gr-usrp/src/usrp_source_s.h
deleted file mode 100644
index 9118b4e0f..000000000
--- a/gr-usrp/src/usrp_source_s.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_USRP_SOURCE_S_H
-#define INCLUDED_USRP_SOURCE_S_H
-
-#include <usrp_source_base.h>
-#include <stdexcept>
-
-class usrp_standard_rx;
-
-
-class usrp_source_s;
-typedef boost::shared_ptr<usrp_source_s> usrp_source_s_sptr;
-
-
-// public shared_ptr constructor
-
-usrp_source_s_sptr
-usrp_make_source_s (int which_board=0, 
-		    unsigned int decim_rate=16,
-		    int nchan=1,
-		    int mux=-1,
-		    int mode=0,
-		    int fusb_block_size=0,
-		    int fusb_nblocks=0,
-		    const std::string fpga_filename="",
-		    const std::string firmware_filename=""
-		    ) throw (std::runtime_error);
-
-/*!
- * \brief Interface to Universal Software Radio Peripheral Rx path
- * \ingroup usrp
- * \ingroup source_blk
- *
- * output: 1 stream of short
- */
-class usrp_source_s : public usrp_source_base {
- private:
-  friend usrp_source_s_sptr
-  usrp_make_source_s (int which_board, 
-		       unsigned int decim_rate,
-		       int nchan,
-		       int mux,
-		       int mode,
-		       int fusb_block_size,
-		       int fusb_nblocks,
-		       const std::string fpga_filename,
-		       const std::string firmware_filename
-		       ) throw (std::runtime_error);
-
- protected:
-  usrp_source_s (int which_board, 
-		  unsigned int decim_rate,
-		  int nchan,
-		  int mux,
-		  int mode,
-		  int fusb_block_size,
-		  int fusb_nblocks,
-		  const std::string fpga_filename,
-		  const std::string firmware_filename
-		  ) throw (std::runtime_error);
-
-  virtual int ninput_bytes_reqd_for_noutput_items (int noutput_items);
-
-  virtual void copy_from_usrp_buffer (gr_vector_void_star &output_items,
-				      int output_index,
-				      int output_items_available,
-				      int &output_items_produced,
-				      const void *usrp_buffer,
-				      int usrp_buffer_length,
-				      int &bytes_read);
- public:
-  ~usrp_source_s ();
-};
-
-#endif /* INCLUDED_USRP_SOURCE_S_H */
diff --git a/gr-usrp/src/usrp_standard.i b/gr-usrp/src/usrp_standard.i
deleted file mode 100644
index 61053bb3b..000000000
--- a/gr-usrp/src/usrp_standard.i
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 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.
- */
-
-// FIXME: move to usrp/usrpm component
-
-%{
-#include <usrp/usrp_standard.h>
-#include <usrp_spi_defs.h>
-#include <usrp/usrp_dbid.h>
-%}
-
-%include <usrp_spi_defs.h>
-%include <usrp/usrp_dbid.h>
-
-%constant int FPGA_MODE_NORMAL   = usrp_standard_rx::FPGA_MODE_NORMAL;
-%constant int FPGA_MODE_LOOPBACK = usrp_standard_rx::FPGA_MODE_LOOPBACK;
-%constant int FPGA_MODE_COUNTING = usrp_standard_rx::FPGA_MODE_COUNTING;
diff --git a/gr-usrp/src/usrp_swig.i b/gr-usrp/src/usrp_swig.i
deleted file mode 100644
index 80d59abc9..000000000
--- a/gr-usrp/src/usrp_swig.i
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 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.
- */
-
-%include "gnuradio.i"	// the common stuff
-
-%{
-#include "config.h"    // for NOMINMAX
-#include <vector>
-%}
-
-%include <usrp/usrp_subdev_spec.h>
-%include <usrp/db_base.i>
-%include <fpga_regs_common.h>
-%include <fpga_regs_standard.h>
-%include "usrp_standard.i"
-%include "usrp_base.i"
-%include "usrp_source_base.i"
-%include "usrp_source_c.i"
-%include "usrp_source_s.i"
-%include "usrp_sink_base.i"
-%include "usrp_sink_c.i"
-%include "usrp_sink_s.i"
-
-#ifdef SWIGPYTHON
-//---Allow a more Pythonic interface
-%pythoncode %{
-
-# Allow subdev_spec to be tuple
-def __selected_subdev(self, subdev_spec):
-  ss = usrp_subdev_spec(subdev_spec[0], subdev_spec[1])
-  return self._real_selected_subdev(ss)
-
-# Allow subdev_spec to be tuple
-def __determine_tx_mux_value(self, subdev_spec, subdev_spec_=None):
-    ss = usrp_subdev_spec(subdev_spec[0], subdev_spec[1])
-    if subdev_spec_ is None: return self._real_determine_tx_mux_value(ss)
-    ss_ = usrp_subdev_spec(subdev_spec_[0], subdev_spec_[1])
-    return self._real_determine_tx_mux_value(ss, ss_)
-
-# Allow subdev_spec to be tuple
-def __determine_rx_mux_value(self, subdev_spec, subdev_spec_=None):
-    ss = usrp_subdev_spec(subdev_spec[0], subdev_spec[1])
-    if subdev_spec_ is None: return self._real_determine_rx_mux_value(ss)
-    ss_ = usrp_subdev_spec(subdev_spec_[0], subdev_spec_[1])
-    return self._real_determine_rx_mux_value(ss, ss_)
-
-# Allow subdev_spec to be tuple
-def __pick_subdev(self, candidates=[]):
-    ss = self._real_pick_subdev(candidates)
-    return (ss.side, ss.subdev)
-
-# Allow subdev_spec to be tuple
-def __pick_tx_subdevice(self):
-    ss = self._real_pick_tx_subdevice()
-    return (ss.side, ss.subdev)
-
-# Allow subdev_spec to be tuple
-def __pick_rx_subdevice(self):
-    ss = self._real_pick_rx_subdevice()
-    return (ss.side, ss.subdev)
-
-# Make return tune_result or None on failure
-def __tune(self, chan, db, target_freq):
-    tr = usrp_tune_result()
-    r = self._real_tune(chan, db, target_freq, tr)
-    if r:
-        return tr
-    else:
-        return None
-
-# Allow to be called as a free function
-def tune(u, chan, subdev, target_freq):
-    return u.tune(chan, subdev, target_freq)
-
-# Allow to be called as free function
-def determine_tx_mux_value(u, subdev_spec, subdev_spec_=None):
-    return u.determine_tx_mux_value(subdev_spec, subdev_spec_)
-
-# Allow to be called as free function
-def determine_rx_mux_value(u, subdev_spec, subdev_spec_=None):
-    return u.determine_rx_mux_value(subdev_spec, subdev_spec_)
-
-# Allow to be called as free function
-def selected_subdev(u, subdev_spec):
-    return u.selected_subdev(subdev_spec)
-
-# Allow to be called as free function
-def pick_subdev(u, candidates=[]):
-    return u.pick_subdev(candidates);
-
-# Allow to be called as free function
-def pick_tx_subdevice(u):
-    return u.pick_tx_subdevice();
-
-# Allow to be called as free function
-def pick_rx_subdevice(u):
-    return u.pick_rx_subdevice();
-
-# Jam into Python objects
-usrp_sink_c_sptr.determine_tx_mux_value   = __determine_tx_mux_value
-usrp_sink_s_sptr.determine_tx_mux_value   = __determine_tx_mux_value
-
-usrp_source_c_sptr.determine_rx_mux_value = __determine_rx_mux_value
-usrp_source_s_sptr.determine_rx_mux_value = __determine_rx_mux_value
-
-usrp_sink_c_sptr.selected_subdev          = __selected_subdev
-usrp_sink_s_sptr.selected_subdev          = __selected_subdev
-usrp_source_c_sptr.selected_subdev        = __selected_subdev
-usrp_source_s_sptr.selected_subdev        = __selected_subdev
-
-usrp_sink_c_sptr.tune                     = __tune
-usrp_sink_s_sptr.tune                     = __tune
-usrp_source_c_sptr.tune                   = __tune
-usrp_source_s_sptr.tune                   = __tune
-
-usrp_sink_c_sptr.pick_subdev              = __pick_subdev
-usrp_sink_s_sptr.pick_subdev              = __pick_subdev
-usrp_source_c_sptr.pick_subdev            = __pick_subdev
-usrp_source_s_sptr.pick_subdev            = __pick_subdev
-
-usrp_sink_c_sptr.pick_tx_subdevice        = __pick_tx_subdevice
-usrp_sink_s_sptr.pick_tx_subdevice        = __pick_tx_subdevice
-usrp_source_c_sptr.pick_rx_subdevice      = __pick_rx_subdevice
-usrp_source_s_sptr.pick_rx_subdevice      = __pick_rx_subdevice
-
-%}
-#endif
-
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-usrp_swig" "scm_init_gnuradio_usrp_swig_module")
-%}
-
-%goops %{
-(use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gr-usrp2/.gitignore b/gr-usrp2/.gitignore
deleted file mode 100644
index a43ae9c69..000000000
--- a/gr-usrp2/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile
-/Makefile.in
-/gnuradio-usrp2.pc
diff --git a/gr-usrp2/apps/.gitignore b/gr-usrp2/apps/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-usrp2/apps/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-usrp2/apps/usrp2_rx_cfile.py b/gr-usrp2/apps/usrp2_rx_cfile.py
deleted file mode 100755
index 1f23eee4e..000000000
--- a/gr-usrp2/apps/usrp2_rx_cfile.py
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,2007,2008,2009 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.
-# 
-
-"""
-Read samples from the USRP2 and write to file formatted as binary
-outputs single precision complex float values or complex short values 
-(interleaved 16 bit signed short integers).
-"""
-
-from gnuradio import gr, eng_notation
-from gnuradio import usrp2
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys
-
-n2s = eng_notation.num_to_str
-
-class rx_cfile_block(gr.top_block):
-
-    def __init__(self, options, filename):
-        gr.top_block.__init__(self)
-
-        # Create a USRP2 source
-        if options.output_shorts:
-            self._u = usrp2.source_16sc(options.interface, options.mac_addr)
-            self._sink = gr.file_sink(gr.sizeof_short*2, filename)
-        else:
-            self._u = usrp2.source_32fc(options.interface, options.mac_addr)
-            self._sink = gr.file_sink(gr.sizeof_gr_complex, filename)
-
-        # Set receiver decimation rate
-        self._u.set_decim(options.decim)
-
-        # Set receive daughterboard gain
-        if options.gain is None:
-            g = self._u.gain_range()
-            options.gain = float(g[0]+g[1])/2
-	    print "Using mid-point gain of", options.gain, "(", g[0], "-", g[1], ")"
-        self._u.set_gain(options.gain)
-
-        # Set receive frequency
-        if options.lo_offset is not None:
-            self._u.set_lo_offset(options.lo_offset)
-
-        tr = self._u.set_center_freq(options.freq)
-        if tr == None:
-            sys.stderr.write('Failed to set center frequency\n')
-            raise SystemExit, 1
-
-        # Create head block if needed and wire it up
-        if options.nsamples is None:
-            self.connect(self._u, self._sink)
-        else:
-            if options.output_shorts:
-                self._head = gr.head(gr.sizeof_short*2, int(options.nsamples))
-            else:
-                self._head = gr.head(gr.sizeof_gr_complex, int(options.nsamples))
-
-            self.connect(self._u, self._head, self._sink)
-
-        input_rate = self._u.adc_rate()/self._u.decim()
-        
-        if options.verbose:
-            print "Network interface:", options.interface
-            print "USRP2 address:", self._u.mac_addr()
-            print "Using RX d'board id 0x%04X" % (self._u.daughterboard_id(),)
-            print "Rx gain:", options.gain
-            print "Rx baseband frequency:", n2s(tr.baseband_freq)
-            print "Rx DDC frequency:", n2s(tr.dxc_freq)
-            print "Rx residual frequency:", n2s(tr.residual_freq)
-            print "Rx decimation rate:", options.decim
-            print "Rx sample rate:", n2s(input_rate)
-            if options.nsamples is None:
-                print "Receiving samples until Ctrl-C"
-            else:
-                print "Receving", n2s(options.nsamples), "samples"
-            if options.output_shorts:
-                print "Writing 16-bit complex shorts"
-            else:
-                print "Writing 32-bit complex floats"
-            print "Output filename:", filename
-        
-def get_options():
-    usage="%prog: [options] output_filename"
-    parser = OptionParser(option_class=eng_option, usage=usage)
-    parser.add_option("-e", "--interface", type="string", default="eth0",
-                      help="use specified Ethernet interface [default=%default]")
-    parser.add_option("-m", "--mac-addr", type="string", default="",
-                      help="use USRP2 at specified MAC address [default=None]")  
-    parser.add_option("-d", "--decim", type="int", default=16,
-                      help="set fgpa decimation rate to DECIM [default=%default]")
-    parser.add_option("-f", "--freq", type="eng_float", default=None,
-                      help="set frequency to FREQ", metavar="FREQ")
-    parser.add_option("-g", "--gain", type="eng_float", default=None,
-                      help="set gain in dB (default is midpoint)")
-    parser.add_option( "-s","--output-shorts", action="store_true", default=False,
-                      help="output interleaved shorts instead of complex floats")
-    parser.add_option("-N", "--nsamples", type="eng_float", default=None,
-                      help="number of samples to collect [default=+inf]")
-    parser.add_option("-v", "--verbose", action="store_true", default=False,
-                      help="verbose output")
-    parser.add_option("", "--lo-offset", type="eng_float", default=None,
-                      help="set daughterboard LO offset to OFFSET [default=hw default]")
-
-    (options, args) = parser.parse_args ()
-    if len(args) != 1:
-        parser.print_help()
-        raise SystemExit, 1
-    
-    if options.freq is None:
-        parser.print_help()
-        sys.stderr.write('You must specify the frequency with -f FREQ\n');
-        raise SystemExit, 1
-    
-    return (options, args[0])
-
-
-if __name__ == '__main__':
-    (options, filename) = get_options()
-    tb = rx_cfile_block(options, filename)
-    
-    try:
-        tb.run()
-    except KeyboardInterrupt:
-        pass
diff --git a/gr-usrp2/gnuradio-usrp2.pc.in b/gr-usrp2/gnuradio-usrp2.pc.in
deleted file mode 100644
index 2222badd7..000000000
--- a/gr-usrp2/gnuradio-usrp2.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gnuradio
-
-Name: gnuradio-usrp2
-Description: GNU Software Radio support for Universal Software Radio Peripheral 2
-Requires: gnuradio-core usrp2
-Version: @LIBVER@
-Libs: -L${libdir} -lgnuradio-usrp2
-Cflags: -I${includedir}
diff --git a/gr-usrp2/grc/.gitignore b/gr-usrp2/grc/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/gr-usrp2/grc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/gr-usrp2/grc/gnuradio-usrp2_probe.desktop b/gr-usrp2/grc/gnuradio-usrp2_probe.desktop
deleted file mode 100644
index c71a092b1..000000000
--- a/gr-usrp2/grc/gnuradio-usrp2_probe.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=USRP2 Probe
-Exec=usrp2_probe
-Categories=Development;
-Icon=gnuradio-grc
diff --git a/gr-usrp2/grc/usrp2_probe b/gr-usrp2/grc/usrp2_probe
deleted file mode 100755
index 38c8f655c..000000000
--- a/gr-usrp2/grc/usrp2_probe
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/usr/bin/env python
-"""
-Copyright 2009 Free Software Foundation, Inc.
-This file is part of GNU Radio
-
-GNU Radio Companion 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 2
-of the License, or (at your option) any later version.
-
-GNU Radio Companion 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 this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-"""
-
-from gnuradio import usrp2
-import subprocess
-import os
-
-import pygtk
-pygtk.require('2.0')
-import gtk
-import gobject
-
-from gnuradio.grc.gui.Dialogs import TextDisplay
-
-from gnuradio.grc.python.Platform import Platform
-platform = Platform()
-
-flow_graph = platform.get_new_flow_graph()
-block = flow_graph.get_new_block('usrp2_probe')
-
-##all params
-usrp_interface_param = block.get_param('interface')
-usrp_type_param = block.get_param('type')
-
-def get_input(param):
-	param.validate()
-	input = param.get_input()
-	return input
-
-class USRP2ProbeWindow(gtk.Window):
-	"""
-	The main window for USRP Dignostics.
-	"""
-
-	def delete_event(self, widget, event, data=None): return False
-
-	def destroy(self, widget, data=None): gtk.main_quit()
-
-	def __init__(self):
-		"""
-		USRP2ProbeWindow contructor.
-		Create a new gtk Dialog with a close button, USRP2 input paramaters, and output labels.
-		"""
-		self.usrp2_macs = list()
-		gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
-		#quit signals
-		self.connect("delete_event", self.delete_event)
-		self.connect("destroy", self.destroy)
-		#set the title
-		self.set_title('USRP2 Probe')
-		#create decorative frame
-		frame = gtk.Frame()
-		self.add(frame)
-		#create vbox for storage
-		vbox = gtk.VBox()
-		frame.add(vbox)
-		vbox.pack_start(get_input(usrp_interface_param), False)
-		vbox.pack_start(get_input(usrp_type_param), False)
-		#make the tree model for holding mac addrs
-		self.treestore = gtk.TreeStore(gobject.TYPE_STRING)
-		self.treeview = gtk.TreeView(self.treestore)
-		self.treeview.set_enable_search(False) #disable pop up search box
-		self.treeview.add_events(gtk.gdk.BUTTON_PRESS_MASK)
-		self.treeview.connect('button_press_event', self._handle_selection)
-		selection = self.treeview.get_selection()
-		selection.set_mode('single')
-		selection.connect('changed', self._handle_selection)
-		renderer = gtk.CellRendererText()
-		column = gtk.TreeViewColumn('Select a USRP2 MAC Address', renderer, text=0)
-		self.treeview.append_column(column)
-		vbox.pack_start(self.treeview, False)
-		#create probe button
-		self.probe_button = gtk.Button('Probe')
-		self.probe_button.connect('clicked', self._probe_usrp2)
-		vbox.pack_start(self.probe_button, False)
-		#Create a text box for USRP queries
-		self.query_buffer = TextDisplay()
-		self.query_buffer.set_text(block.get_doc())
-		vbox.pack_start(self.query_buffer)
-		self.show_all()
-		self.treeview.hide()
-
-	def _probe_usrp2(self, widget=None):
-		"""Probe the USRP2 device and copy the results into the query text box."""
-		#call find usrps
-		args = ['find_usrps']
-		interface = usrp_interface_param.evaluate()
-		if interface: args.extend(['-e', interface])
-		p = subprocess.Popen(args=args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, universal_newlines=True)
-		msg = p.stdout.read()
-		#extract mac addrs
-		self.usrp2_macs = sorted(map(lambda l: l.split()[0], filter(lambda l: l.count(':') >= 5, msg.strip().splitlines())))
-		#set the tree store with the mac addrs
-		self.treestore.clear()
-		for usrp2_mac in self.usrp2_macs: self.treestore.append(None, (usrp2_mac,))
-		#set the text with the error message for 0 found, hide the list
-		#when only 1 usrp2, auto handle selection, hide the list
-		#for multiple usrp2, show the list
-		if not self.usrp2_macs:
-			self.treeview.hide()
-			self.query_buffer.set_text(msg)
-		elif len(self.usrp2_macs) == 1:
-			self.treeview.hide()
-			self.query_buffer.set_text('')
-			self._handle_selection()
-		else:
-			self.treeview.show()
-			self.query_buffer.set_text('')
-
-	def _handle_selection(self, *args, **kwargs):
-		"""A selection change or click occured."""
-		#get the mac addr
-		selection = self.treeview.get_selection()
-		treestore, iter = selection.get_selected()
-		mac_addr = iter and treestore.get_value(iter, 0) or ''
-		if not mac_addr and len(self.usrp2_macs) > 1:
-			return #no empty mac addrs for when multiple found
-		#make the usrp2 object
-		make, rate_attr = {
-			'rx': (usrp2.source_32fc, 'adc_rate'),
-			'tx': (usrp2.sink_32fc, 'dac_rate'),
-		}[usrp_type_param.evaluate()]
-		interface = usrp_interface_param.evaluate()
-		try:
-			if not interface and not mac_addr: u = make()
-			elif not mac_addr: u = make(interface)
-			else: u = make(interface, mac_addr)
-			msg = ">>> USRP2 Probe\n"
-			msg = "%s\nMAC Addr:\n\t%s\n"%(msg, u.mac_addr())
-			msg = "%s\nName (ID):\n\t%s\n"%(msg, u.daughterboard_id())
-			msg = "%s\nConverter Rate:\n\t%s Hz\n"%(msg, getattr(u, rate_attr)())
-			gain_min, gain_max, gain_step = u.gain_range()
-			msg = "%s\nGain Range (min, max, step size):\n\t%s\n\t%s\n\t%s\n"%(msg, gain_min, gain_max, gain_step)
-			freq_min, freq_max = u.freq_range()
-			msg = "%s\nFreq Range (min, max):\n\t%s Hz\n\t%s Hz\n"%(msg, freq_min, freq_max)
-			self.query_buffer.set_text(msg)
-		except Exception, e: #display the error message
-			self.query_buffer.set_text('>>> Error\n%s'%str(e))
-
-if __name__ == '__main__':
-	#setup icon using icon theme
-	try: gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
-	except: pass
-	#enter the mainloop
-	USRP2ProbeWindow()
-	gtk.main()
diff --git a/gr-usrp2/grc/usrp2_probe.xml b/gr-usrp2/grc/usrp2_probe.xml
deleted file mode 100644
index cc3f9c2fd..000000000
--- a/gr-usrp2/grc/usrp2_probe.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##USRP2 Probe:
-##	This block should not appear in the tree.
-###################################################
- -->
-<block>
-	<name>USRP2 Probe</name>
-	<key>usrp2_probe</key>
-	<make></make>
-	<param>
-		<name>Interface</name>
-		<key>interface</key>
-		<value></value>
-		<type>string</type>
-	</param>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<value>rx</value>
-		<type>enum</type>
-		<option>
-			<name>RX</name>
-			<key>rx</key>
-		</option>
-		<option>
-			<name>TX</name>
-			<key>tx</key>
-		</option>
-	</param>
-	<doc>Press "Probe" to retrieve USRP2 information...</doc>
-</block>
diff --git a/gr-usrp2/grc/usrp2_sink_xxxx.xml b/gr-usrp2/grc/usrp2_sink_xxxx.xml
deleted file mode 100644
index 74995da99..000000000
--- a/gr-usrp2/grc/usrp2_sink_xxxx.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##USRP2 Sink
-##  Note: the center freq must be set after the lo offset
-###################################################
- -->
-<block>
-	<name>USRP2 Sink</name>
-	<key>usrp2_sink_xxxx</key>
-	<category>USRP</category>
-	<import>from gnuradio import usrp2</import>
-	<make>#if not $interface() and not $mac_addr()
-usrp2.sink_$(type.fcn)()
-#elif not $mac_addr()
-usrp2.sink_$(type.fcn)($interface)
-#else
-usrp2.sink_$(type.fcn)($interface, $mac_addr)
-#end if
-self.$(id).set_interp($interpolation)
-#if $lo_offset() != float('inf')
-self.$(id).set_lo_offset($lo_offset)
-#end if
-self.$(id).set_center_freq($frequency)
-self.$(id).set_gain($gain)
-self.$(id).config_mimo($usrp2_clock_src)</make>
-	<callback>set_interp($interpolation)</callback>
-	<callback>#if $lo_offset() != float('inf')
-self.$(id).set_lo_offset($lo_offset)
-#end if
-self.$(id).set_center_freq($frequency)</callback>
-	<callback>set_gain($gain)</callback>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:32fc</opt>
-			<opt>vlen:1</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:16sc</opt>
-			<opt>vlen:2</opt>
-		</option>
-	</param>
-	<param>
-		<name>Interface</name>
-		<key>interface</key>
-		<value></value>
-		<type>string</type>
-	</param>
-	<param>
-		<name>MAC Addr</name>
-		<key>mac_addr</key>
-		<value></value>
-		<type>string</type>
-	</param>
-	<param>
-		<name>Interpolation</name>
-		<key>interpolation</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Frequency (Hz)</name>
-		<key>frequency</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>LO Offset (Hz)</name>
-		<key>lo_offset</key>
-		<value>float('inf')</value>
-		<type>real</type>
-		<hide>#if $lo_offset() == float('inf') then 'part' else 'none'#</hide>
-		<option>
-			<name>Default</name>
-			<key>float('inf')</key>
-		</option>
-	</param>
-	<param>
-		<name>Gain (dB)</name>
-		<key>gain</key>
-		<value>0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Clock Source</name>
-		<key>usrp2_clock_src</key>
-		<value>usrp2.MC_WE_DONT_LOCK</value>
-		<type>enum</type>
-		<option>
-			<name>Internal</name>
-			<key>usrp2.MC_WE_DONT_LOCK</key>
-		</option>
-		<option>
-			<name>External SMA</name>
-			<key>usrp2.MC_WE_LOCK_TO_SMA</key>
-		</option>
-		<option>
-			<name>External MIMO</name>
-			<key>usrp2.MC_WE_LOCK_TO_MIMO</key>
-		</option>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$type.vlen</vlen>
-	</sink>
-	<doc>
-The USRP2 sink inputs 100 Megasamples per second / interpolation.
-
-Input amplitude should be between 0.0 and 1.0.
-
-To use the default ethernet device, leave interface blank. \
-For systems with only 1 USRP2, you may leave the mac address blank. \
-For multi-USRP2 systems, specify the mac address in the form 00:50:C2:85:3x:xx.
-	</doc>
-</block>
diff --git a/gr-usrp2/grc/usrp2_source_xxxx.xml b/gr-usrp2/grc/usrp2_source_xxxx.xml
deleted file mode 100644
index a23c5bc5c..000000000
--- a/gr-usrp2/grc/usrp2_source_xxxx.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##USRP2 Source
-##  Note: the center freq must be set after the lo offset
-###################################################
- -->
-<block>
-	<name>USRP2 Source</name>
-	<key>usrp2_source_xxxx</key>
-	<category>USRP</category>
-	<import>from gnuradio import usrp2</import>
-	<make>#if not $interface() and not $mac_addr()
-usrp2.source_$(type.fcn)()
-#elif not $mac_addr()
-usrp2.source_$(type.fcn)($interface)
-#else
-usrp2.source_$(type.fcn)($interface, $mac_addr)
-#end if
-self.$(id).set_decim($decimation)
-#if $lo_offset() != float('inf')
-self.$(id).set_lo_offset($lo_offset)
-#end if
-self.$(id).set_center_freq($frequency)
-self.$(id).set_gain($gain)
-self.$(id).config_mimo($usrp2_clock_src)</make>
-	<callback>set_decim($decimation)</callback>
-	<callback>#if $lo_offset() != float('inf')
-self.$(id).set_lo_offset($lo_offset)
-#end if
-self.$(id).set_center_freq($frequency)</callback>
-	<callback>set_gain($gain)</callback>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:32fc</opt>
-			<opt>vlen:1</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:16sc</opt>
-			<opt>vlen:2</opt>
-		</option>
-	</param>
-	<param>
-		<name>Interface</name>
-		<key>interface</key>
-		<value></value>
-		<type>string</type>
-	</param>
-	<param>
-		<name>MAC Addr</name>
-		<key>mac_addr</key>
-		<value></value>
-		<type>string</type>
-	</param>
-	<param>
-		<name>Decimation</name>
-		<key>decimation</key>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Frequency (Hz)</name>
-		<key>frequency</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>LO Offset (Hz)</name>
-		<key>lo_offset</key>
-		<value>float('inf')</value>
-		<type>real</type>
-		<hide>#if $lo_offset() == float('inf') then 'part' else 'none'#</hide>
-		<option>
-			<name>Default</name>
-			<key>float('inf')</key>
-		</option>
-	</param>
-	<param>
-		<name>Gain (dB)</name>
-		<key>gain</key>
-		<value>0</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Clock Source</name>
-		<key>usrp2_clock_src</key>
-		<value>usrp2.MC_WE_DONT_LOCK</value>
-		<type>enum</type>
-		<option>
-			<name>Internal</name>
-			<key>usrp2.MC_WE_DONT_LOCK</key>
-		</option>
-		<option>
-			<name>External SMA</name>
-			<key>usrp2.MC_WE_LOCK_TO_SMA</key>
-		</option>
-		<option>
-			<name>External MIMO</name>
-			<key>usrp2.MC_WE_LOCK_TO_MIMO</key>
-		</option>
-	</param>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$type.vlen</vlen>
-	</source>
-	<doc>
-The USRP2 source outputs 100 Megasamples per second / decimation.
-
-To use the default ethernet device, leave interface blank. \
-For systems with only 1 USRP2, you may leave the mac address blank. \
-For multi-USRP2 systems, specify the mac address in the form 00:50:C2:85:3x:xx.
-	</doc>
-</block>
diff --git a/gr-usrp2/src/.gitignore b/gr-usrp2/src/.gitignore
deleted file mode 100644
index 71f825820..000000000
--- a/gr-usrp2/src/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/Makefile
-/Makefile.in
-/.libs
-/.deps
-/usrp2.py
-/usrp2.cc
-/usrp2_python.cc
-/run_tests
-/test_gr_usrp2
-/*.pyc
-/guile
-/python
-/usrp2_swig.py
-/run_guile_tests
diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am
deleted file mode 100644
index a84637f73..000000000
--- a/gr-usrp2/src/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# Copyright 2004,2005,2006,2008,2009,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-TESTS =
-EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA)
-DISTCLEANFILES += run_tests run_guile_tests
-
-noinst_PYTHON = qa_usrp2.py
-noinst_GUILE  = usrp2.test
-
-if GUILE
-nobase_guile_DATA = gnuradio/usrp2.scm
-endif
-
-# ----------------------------------------------------------------------
-# C++ block API interface librar(ies)
-#
-# libgr-usrp.so
-# ----------------------------------------------------------------------
-AM_CPPFLAGS = \
-	$(GRUEL_INCLUDES) \
-	$(USRP2_INCLUDES) \
-	$(STD_DEFINES_AND_INCLUDES)  \
-	$(PYTHON_CPPFLAGS) \
-	$(WITH_INCLUDES)
-
-lib_LTLIBRARIES = libgnuradio-usrp2.la
-
-libgnuradio_usrp2_la_LDFLAGS = $(LTVERSIONFLAGS)
-
-libgnuradio_usrp2_la_SOURCES = \
-	rx_16sc_handler.cc \
-	rx_32fc_handler.cc \
-	usrp2_base.cc \
-	usrp2_source_base.cc \
-	usrp2_source_16sc.cc \
-	usrp2_source_32fc.cc \
-	usrp2_sink_base.cc \
-	usrp2_sink_16sc.cc \
-	usrp2_sink_32fc.cc
-
-libgnuradio_usrp2_la_LIBADD = \
-	$(USRP2_LA) \
-	$(GNURADIO_CORE_LA) 
-
-grinclude_HEADERS = \
-	usrp2_base.h \
-	usrp2_source_base.h \
-	usrp2_source_32fc.h \
-	usrp2_source_16sc.h \
-	usrp2_sink_base.h \
-	usrp2_sink_16sc.h \
-	usrp2_sink_32fc.h
-
-noinst_HEADERS = \
-	rx_16sc_handler.h \
-	rx_32fc_handler.h
-
-# ----------------------------------------------------------------------
-# SWIG wrappers around C++ library
-#
-# usrp2.py
-# _usrp2.so
-# ----------------------------------------------------------------------
-
-TOP_SWIG_IFILES =		\
-	usrp2_swig.i
-
-# Install so that they end up available as:
-#   import gnuradio.usrp2
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp2
-usrp2_swig_pythondir_category =	\
-	gnuradio/usrp2
-
-# additional arguments to the SWIG command
-usrp2_swig_swig_args =		\
-	$(USRP2_INCLUDES)
-
-# additional libraries for linking with the SWIG-generated library
-usrp2_swig_la_swig_libadd =	\
-	libgnuradio-usrp2.la
-
-# additional Python files to be installed along with the SWIG-generated one
-usrp2_swig_python =		\
-	__init__.py
-
-if PYTHON
-TESTS += run_tests
-endif
-
-if GUILE
-TESTS += run_guile_tests
-endif
diff --git a/gr-usrp2/src/gnuradio/.gitignore b/gr-usrp2/src/gnuradio/.gitignore
deleted file mode 100644
index 3c1ff87f5..000000000
--- a/gr-usrp2/src/gnuradio/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-usrp2_swig.scm
-usrp2_swig-primitive.scm
diff --git a/gr-usrp2/src/gnuradio/usrp2.scm b/gr-usrp2/src/gnuradio/usrp2.scm
deleted file mode 100644
index 7ead5015d..000000000
--- a/gr-usrp2/src/gnuradio/usrp2.scm
+++ /dev/null
@@ -1,79 +0,0 @@
-;;;
-;;; Copyright 2010 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; Module that re-exports the usrp2_swig module and adds convenience functions
-
-(define-module (gnuradio usrp2)
-  #:use-module (oop goops)
-  #:use-module (gnuradio export-safely)
-  #:use-module (gnuradio usrp2_swig)
-  #:duplicates (merge-generics replace check))
-
-(re-export-all '(gnuradio usrp2_swig))
-
-;; Utilities (guaranteed not to leak the allocated object)
-(define (call-with-long-ptr fn)
-  (let ((ptr #f))
-    (dynamic-wind
-	(lambda () (set! ptr (gr:make-long-ptr)))
-	(lambda () (and (fn ptr) (gr:deref-long-ptr ptr)))
-	(lambda () (gr:free-long-ptr ptr)))))
-
-(define (call-with-int-ptr fn)
-  (let ((ptr #f))
-    (dynamic-wind
-	(lambda () (set! ptr (gr:make-int-ptr)))
-	(lambda () (and (fn ptr) (gr:deref-int-ptr ptr)))
-	(lambda () (gr:free-int-ptr ptr)))))
-
-(define (call-with-uint16-ptr fn)
-  (let ((ptr #f))
-    (dynamic-wind
-	(lambda () (set! ptr (gr:make-uint16-ptr)))
-	(lambda () (and (fn ptr) (gr:deref-uint16-ptr ptr)))
-	(lambda () (gr:free-uint16-ptr ptr)))))
-
-
-;;; scheme-ish convenience functions
-
-(define-method (gr:set-center-freq self freq)
-  (let ((tr (make <tune-result>)))
-    (if (gr:-real-set-center-freq self freq tr)
-	tr
-	#f)))
-
-(define-method (gr:fpga-master-clock-freq self)
-  (call-with-long-ptr (lambda (ptr) (gr:-real-fpga-master-clock-freq self ptr))))
-
-(define-method (gr:adc-rate self)
-  (call-with-long-ptr (lambda (ptr) (gr:-real-adc-rate self ptr))))
-
-(define-method (gr:dac-rate self)
-  (call-with-long-ptr (lambda (ptr) (gr:-real-dac-rate self ptr))))
-
-(define-method (gr:daughterboard-id self)
-  (call-with-int-ptr (lambda (ptr) (gr:-real-daugherboard-id self ptr))))
-
-;; (define-method (gr:default-tx-scale-iq self) ...)  FIXME
-
-(define-method (gr:read-gpio self)
-  (call-with-uint16-ptr (lambda (ptr) (gr:-real-read-gpio self ptr))))
-
-;; Export them
-(export-safely gr:set-center-freq gr:fpga-master-clock-freq gr:adc-rate gr:dac-rate gr:daughterboard-id gr:read-gpio)
diff --git a/gr-usrp2/src/run_tests.in b/gr-usrp2/src/run_tests.in
deleted file mode 100644
index 3f068256e..000000000
--- a/gr-usrp2/src/run_tests.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# 1st parameter is absolute path to component source directory
-# 2nd parameter is absolute path to component build directory
-# 3rd parameter is path to Python QA directory
-
-# For OS/X
-DYLD_LIBRARY_PATH=@abs_top_builddir@/usrp2/host/lib:@abs_top_builddir@/usrp2/host/lib/.libs:$DYLD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-
-# For Win32
-PATH=@abs_top_builddir@/usrp2/host/lib:@abs_top_builddir@/usrp2/host/lib/.libs:$PATH
-
-@top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-usrp2 \
-    @abs_top_builddir@/gr-usrp2 \
-    @srcdir@
diff --git a/gr-usrp2/src/rx_16sc_handler.h b/gr-usrp2/src/rx_16sc_handler.h
deleted file mode 100644
index 9d5b1f2e9..000000000
--- a/gr-usrp2/src/rx_16sc_handler.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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_RX_16SC_HANDLER_H
-#define INCLUDED_RX_16SC_HANDLER_H
-
-#include <usrp2/rx_nop_handler.h>
-#include <usrp2/copiers.h>
-
-class rx_16sc_handler : public usrp2::rx_nop_handler
-{
-  std::complex<int16_t> *d_dest;
-
-  // Private constructor
-  rx_16sc_handler(uint64_t max_samples, uint64_t max_quantum, std::complex<int16_t> *dest)
-    : rx_nop_handler(max_samples, max_quantum), d_dest(dest) {}
-
-public:
-  // Shared pointer to one of these
-  typedef boost::shared_ptr<rx_16sc_handler> sptr;
-
-  // Factory function to return a shared pointer to a new instance
-  static sptr make(uint64_t max_samples, uint64_t max_quantum, std::complex<int16_t> *dest) 
-  {
-    return sptr(new rx_16sc_handler(max_samples, max_quantum, dest));
-  }
-
-  // Invoked by USRP2 API when samples are available
-  bool operator()(const uint32_t *items, size_t nitems, const usrp2::rx_metadata *metadata)
-  {
-    // Copy/reformat/endian swap USRP2 data to destination buffer
-    usrp2::copy_u2_16sc_to_host_16sc(nitems, items, d_dest);
-    d_dest += nitems;
-
-    // FIXME: do something with metadata
-
-    // Call parent to determine if there is room to be called again
-    return rx_nop_handler::operator()(items, nitems, metadata);
-  }
-
-  ~rx_16sc_handler();
-};
-
-#endif /* INCLUDED_RX_16SC_HANDLER_H */
diff --git a/gr-usrp2/src/rx_32fc_handler.h b/gr-usrp2/src/rx_32fc_handler.h
deleted file mode 100644
index f2ce2b55d..000000000
--- a/gr-usrp2/src/rx_32fc_handler.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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_RX_32FC_HANDLER_H
-#define INCLUDED_RX_32FC_HANDLER_H
-
-#include <usrp2/rx_nop_handler.h>
-#include <usrp2/copiers.h>
-#include <gr_complex.h>
-
-class rx_32fc_handler : public usrp2::rx_nop_handler
-{
-  gr_complex *d_dest;
-
-  // Private constructor
-  rx_32fc_handler(uint64_t max_samples, uint64_t max_quantum, gr_complex *dest)
-    : rx_nop_handler(max_samples, max_quantum), d_dest(dest) {}
-
-public:
-  // Shared pointer to one of these
-  typedef boost::shared_ptr<rx_32fc_handler> sptr;
-
-  // Factory function to return a shared pointer to a new instance
-  static sptr make(uint64_t max_samples, uint64_t max_quantum, gr_complex *dest) 
-  {
-    return sptr(new rx_32fc_handler(max_samples, max_quantum, dest));
-  }
-
-  // Invoked by USRP2 API when samples are available
-  bool operator()(const uint32_t *items, size_t nitems, const usrp2::rx_metadata *metadata)
-  {
-    // Copy/reformat/endian swap USRP2 data to destination buffer
-    usrp2::copy_u2_16sc_to_host_32fc(nitems, items, d_dest);
-    d_dest += nitems;
-
-    // FIXME: do something with metadata
-
-    // Call parent to determine if there is room to be called again
-    return rx_nop_handler::operator()(items, nitems, metadata);
-  }
-
-  ~rx_32fc_handler();
-};
-
-#endif /* INCLUDED_RX_32FC_HANDLER_H */
diff --git a/gr-usrp2/src/usrp2.test b/gr-usrp2/src/usrp2.test
deleted file mode 100644
index 69544c5e6..000000000
--- a/gr-usrp2/src/usrp2.test
+++ /dev/null
@@ -1,37 +0,0 @@
-;;; -*- Scheme -*-
-;;;
-;;; Copyright 2010 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-;;;
-
-;;; If you're using Emacs's Scheme mode:
-;;;   (put 'with-test-prefix 'scheme-indent-function 1)
-
-;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests.
-;;; See also the very end of the file, where the test-equal, test-eqv
-;;; and test-eq macros are defined.
-
-(define-module (test-module)
-  #:use-module (oop goops)
-  #:use-module (gnuradio core)
-  #:use-module (gnuradio test-suite lib)
-  #:duplicates (merge-generics replace check))
-
-;;; Just see if we can import the module...
-;;; They may not have a USRP2 attached, powered up etc.
-
-(use-modules (gnuradio usrp2))
diff --git a/gr-usrp2/src/usrp2_base.cc b/gr-usrp2/src/usrp2_base.cc
deleted file mode 100644
index bb9959725..000000000
--- a/gr-usrp2/src/usrp2_base.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2_base.h>
-#include <gr_io_signature.h>
-#include <iostream>
-
-usrp2_base::usrp2_base(const char *name,
-		       gr_io_signature_sptr input_signature,
-		       gr_io_signature_sptr output_signature,
-		       const std::string &ifc,
-		       const std::string &mac) 
-  throw (std::runtime_error)
-  : gr_sync_block(name,
-		  input_signature,
-		  output_signature),
-    d_u2(usrp2::usrp2::sptr())
-{
-  d_u2 = usrp2::usrp2::make(ifc, mac);
-  if (!d_u2)
-    throw std::runtime_error("Unable to initialize USRP2!");
-}
-
-usrp2_base::~usrp2_base ()
-{
-  // NOP
-}
-
-std::string
-usrp2_base::mac_addr() const
-{
-  return d_u2->mac_addr();
-}
-
-std::string
-usrp2_base::interface_name() const
-{
-  return d_u2->interface_name();
-}
-
-bool
-usrp2_base::fpga_master_clock_freq(long *freq) const
-{
-  return d_u2->fpga_master_clock_freq(freq);
-}
-
-bool
-usrp2_base::config_mimo(int flags)
-{
-  return d_u2->config_mimo(flags);
-}
-
-bool
-usrp2_base::sync_to_pps()
-{
-  return d_u2->sync_to_pps();
-}
-
-bool
-usrp2_base::sync_every_pps(bool enable)
-{
-  return d_u2->sync_every_pps(enable);
-}
-
-std::vector<uint32_t>
-usrp2_base::peek32(uint32_t addr, uint32_t words)
-{
-  return d_u2->peek32(addr, words);
-}
-
-bool
-usrp2_base::poke32(uint32_t addr, const std::vector<uint32_t> &data)
-{
-  return d_u2->poke32(addr, data);
-}
-
-bool
-usrp2_base::start()
-{
-  // Default implementation is NOP
-  return true;
-}
-
-bool
-usrp2_base::stop()
-{
-  // Default implementation is NOP
-  return true;
-}
diff --git a/gr-usrp2/src/usrp2_base.h b/gr-usrp2/src/usrp2_base.h
deleted file mode 100644
index 67a62ba10..000000000
--- a/gr-usrp2/src/usrp2_base.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 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_USRP2_BASE_H
-#define INCLUDED_USRP2_BASE_H
-
-#include <gr_sync_block.h>
-#include <usrp2/usrp2.h>
-#include <stdexcept>
-
-// BIG ASS FIXME: get from lower layer MTU calculation
-#define USRP2_MIN_RX_SAMPLES 371
-
-/*!
- * Base class for all USRP2 blocks
- */
-class usrp2_base : public gr_sync_block
-{
-protected:
-  usrp2_base(const char *name,
-	     gr_io_signature_sptr input_signature,
-	     gr_io_signature_sptr output_signature,
-	     const std::string &ifc,
-	     const std::string &mac)
-    throw (std::runtime_error);
-
-  usrp2::usrp2::sptr d_u2;
-
-public:
-  ~usrp2_base();
-
-  /*!
-   * \brief Get USRP2 hardware MAC address
-   */
-  std::string mac_addr() const;
-  
-  /*!
-   * \brief Get interface name used to communicat with USRP2
-   */
-  std::string interface_name() const;
-
-  /*!
-   * \brief Get USRP2 master clock rate
-   */
-  bool fpga_master_clock_freq(long *freq) const;
-
-  /*!
-   * \brief MIMO configuration
-   */
-  bool config_mimo(int flags);
-  
-  /*!
-   * \brief Set master time to 0 at next PPS rising edge
-   */
-  bool sync_to_pps();
-
-  /*!
-   * Reset master time to 0 at every PPS edge
-   */
-  bool sync_every_pps(bool enable);
-
-  /*!
-   * \brief Read memory from Wishbone bus as words
-   */
-  std::vector<uint32_t> peek32(uint32_t addr, uint32_t words);
-
-  /*!
-   * \brief Write memory to Wishbone bus as words
-   */
-  bool poke32(uint32_t addr, const std::vector<uint32_t> &data);
-
-  /*!
-   * \brief Called by scheduler when starting flowgraph
-   */
-  virtual bool start();
-  
-  /*!
-   * \brief Called by scheduler when stopping flowgraph
-   */
-  virtual bool stop();
-
-  /*!
-   * \brief Derived class must override this
-   */
-  virtual int work(int noutput_items,
-		   gr_vector_const_void_star &input_items,
-		   gr_vector_void_star &output_items) = 0;
-};
-
-#endif /* INCLUDED_USRP2_BASE_H */
diff --git a/gr-usrp2/src/usrp2_sink_16sc.cc b/gr-usrp2/src/usrp2_sink_16sc.cc
deleted file mode 100644
index 75cc1f4a6..000000000
--- a/gr-usrp2/src/usrp2_sink_16sc.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2_sink_16sc.h>
-#include <usrp2/metadata.h>
-#include <gr_io_signature.h>
-#include <iostream>
-
-// FIXME hack until VRT replaces libusrp2
-#define U2_MIN_SAMPLES 9
-
-usrp2_sink_16sc_sptr
-usrp2_make_sink_16sc(const std::string &ifc, const std::string &mac_addr) 
-  throw (std::runtime_error)
-{
-  return gnuradio::get_initial_sptr(new usrp2_sink_16sc(ifc, mac_addr));
-}
-
-usrp2_sink_16sc::usrp2_sink_16sc(const std::string &ifc, const std::string &mac_addr) 
-  throw (std::runtime_error)
-  : usrp2_sink_base("usrp2_sink_16sc",
-		    gr_make_io_signature(1, 1, sizeof(std::complex<int16_t>)),
-		    ifc, mac_addr)
-{
-  // NOP
-}
-
-usrp2_sink_16sc::~usrp2_sink_16sc()
-{
-  // NOP
-}
-
-int
-usrp2_sink_16sc::work(int noutput_items,
-		      gr_vector_const_void_star &input_items,
-		      gr_vector_void_star &output_items)
-{
-  std::complex<int16_t> *in = (std::complex<int16_t> *)input_items[0];
-
-  // FIXME: Current libusrp2 can't handle short packets.
-  // Returning 0 assumes there will be more samples
-  // the next round...
-  if (noutput_items < U2_MIN_SAMPLES)
-    return 0;
-
-  usrp2::tx_metadata metadata;
-
-  // Set TX metadata to either start time or now
-  if (d_should_wait == true) {
-    metadata.timestamp = d_tx_time;
-    metadata.send_now = 0;
-    d_should_wait = false;
-  }
-  else {
-    metadata.timestamp = -1;
-    metadata.send_now = 1;
-  }
-  metadata.start_of_burst = 1;
-
-  bool ok = d_u2->tx_16sc(0, in, noutput_items, &metadata);
-  if (!ok){
-    std::cerr << "usrp2_sink_16sc: tx_16sc failed" << std::endl;
-    return -1;	// say we're done
-  }
-
-  return noutput_items;
-}
diff --git a/gr-usrp2/src/usrp2_sink_32fc.cc b/gr-usrp2/src/usrp2_sink_32fc.cc
deleted file mode 100644
index fa75b3805..000000000
--- a/gr-usrp2/src/usrp2_sink_32fc.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2_sink_32fc.h>
-#include <usrp2/metadata.h>
-#include <gr_io_signature.h>
-#include <iostream>
-
-// FIXME hack until VRT replaces libusrp2
-#define U2_MIN_SAMPLES 9
-
-usrp2_sink_32fc_sptr
-usrp2_make_sink_32fc(const std::string &ifc, const std::string &mac_addr) 
-  throw (std::runtime_error)
-{
-  return gnuradio::get_initial_sptr(new usrp2_sink_32fc(ifc, mac_addr));
-}
-
-usrp2_sink_32fc::usrp2_sink_32fc(const std::string &ifc, const std::string &mac_addr) 
-  throw (std::runtime_error)
-  : usrp2_sink_base("usrp2_sink_32fc",
-		    gr_make_io_signature(1, 1, sizeof(gr_complex)),
-		    ifc, mac_addr)
-{
-  // NOP
-}
-
-usrp2_sink_32fc::~usrp2_sink_32fc()
-{
-  // NOP
-}
-
-int
-usrp2_sink_32fc::work(int noutput_items,
-		      gr_vector_const_void_star &input_items,
-		      gr_vector_void_star &output_items)
-{
-  gr_complex *in = (gr_complex *)input_items[0];
-
-  // FIXME: Current libusrp2 can't handle short packets.
-  // Returning 0 assumes there will be more samples
-  // the next round...
-  if (noutput_items < U2_MIN_SAMPLES)
-    return 0;
-
-  usrp2::tx_metadata metadata;
-
-  // Set TX metadata to either start time or now
-  if (d_should_wait == true) {
-    metadata.timestamp = d_tx_time;
-    metadata.send_now = 0;
-    d_should_wait = false;
-  }
-  else {
-    metadata.timestamp = -1;
-    metadata.send_now = 1;
-  }
-  metadata.start_of_burst = 1;
-
-  bool ok = d_u2->tx_32fc(0, in, noutput_items, &metadata);
-  if (!ok){
-    std::cerr << "usrp2_sink_32fc: tx_32fc failed" << std::endl;
-    return -1;	// say we're done
-  }
-
-  return noutput_items;
-}
diff --git a/gr-usrp2/src/usrp2_sink_base.cc b/gr-usrp2/src/usrp2_sink_base.cc
deleted file mode 100644
index c9b34a54a..000000000
--- a/gr-usrp2/src/usrp2_sink_base.cc
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2_sink_base.h>
-#include <gr_io_signature.h>
-#include <iostream>
-
-usrp2_sink_base::usrp2_sink_base(const char *name,
-				 gr_io_signature_sptr input_signature,
-				 const std::string &ifc,
-				 const std::string &mac) 
-  throw (std::runtime_error)
-  : usrp2_base(name,
-               input_signature,
-	       gr_make_io_signature(0, 0, 0),
-	       ifc, mac),
-    d_should_wait(false),
-    d_tx_time(0)
-{
-  // NOP
-}
-
-usrp2_sink_base::~usrp2_sink_base ()
-{
-  // NOP
-}
-
-bool
-usrp2_sink_base::set_antenna(int ant)
-{
-  return d_u2->set_tx_antenna(ant);
-}
-
-bool
-usrp2_sink_base::set_gain(double gain)
-{
-  return d_u2->set_tx_gain(gain);
-}
-
-bool
-usrp2_sink_base::set_lo_offset(double frequency)
-{
-  return d_u2->set_tx_lo_offset(frequency);
-}
-
-bool
-usrp2_sink_base::set_center_freq(double frequency, usrp2::tune_result *tr)
-{
-  return d_u2->set_tx_center_freq(frequency, tr);
-}
-
-bool
-usrp2_sink_base::set_interp(int interp_factor)
-{
-  return d_u2->set_tx_interp(interp_factor);
-}
-
-void
-usrp2_sink_base::default_scale_iq(int interp_factor, int *scale_i, int *scale_q)
-{
-  return d_u2->default_tx_scale_iq(interp_factor, scale_i, scale_q);
-}
-
-bool 
-usrp2_sink_base::set_scale_iq(int scale_i, int scale_q)
-{
-  return d_u2->set_tx_scale_iq(scale_i, scale_q);
-}
-
-int
-usrp2_sink_base::interp()
-{
-  return d_u2->tx_interp();
-}
-
-bool
-usrp2_sink_base::dac_rate(long *rate)
-{
-  return d_u2->dac_rate(rate);
-}
-
-double
-usrp2_sink_base::gain_min()
-{
-  return d_u2->tx_gain_min();
-}
-
-double
-usrp2_sink_base::gain_max()
-{
-  return d_u2->tx_gain_max();
-}
-
-double
-usrp2_sink_base::gain_db_per_step()
-{
-  return d_u2->tx_gain_db_per_step();
-}
-  
-double
-usrp2_sink_base::freq_min()
-{
-  return d_u2->tx_freq_min();
-}
-
-double
-usrp2_sink_base::freq_max()
-{
-  return d_u2->tx_freq_max();
-}
-
-bool
-usrp2_sink_base::daughterboard_id(int *dbid)
-{
-  return d_u2->tx_daughterboard_id(dbid);
-}
-
-bool usrp2_sink_base::set_gpio_ddr(uint16_t value, uint16_t mask)
-{
-  return d_u2->set_gpio_ddr(usrp2::GPIO_TX_BANK, value, mask);
-}
-
-bool usrp2_sink_base::set_gpio_sels(std::string sels)
-{
-  return d_u2->set_gpio_sels(usrp2::GPIO_TX_BANK, sels);
-}
-
-bool usrp2_sink_base::write_gpio(uint16_t value, uint16_t mask)
-{
-  return d_u2->write_gpio(usrp2::GPIO_TX_BANK, value, mask);
-}
-
-bool usrp2_sink_base::read_gpio(uint16_t *value)
-{
-  return d_u2->read_gpio(usrp2::GPIO_TX_BANK, value);
-}
-
-bool usrp2_sink_base::start_streaming_at(usrp2::fpga_timestamp time)
-{
-  d_should_wait = true;
-  d_tx_time = time;
-  return true;
-}
diff --git a/gr-usrp2/src/usrp2_sink_base.h b/gr-usrp2/src/usrp2_sink_base.h
deleted file mode 100644
index d831d4df6..000000000
--- a/gr-usrp2/src/usrp2_sink_base.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2010 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_USRP2_SINK_BASE_H
-#define INCLUDED_USRP2_SINK_BASE_H
-
-#include <usrp2_base.h>
-
-/*!
- * Base class for all USRP2 transmit blocks
- */
-class usrp2_sink_base : public usrp2_base 
-{
-protected:
-  usrp2_sink_base(const char *name,
-		  gr_io_signature_sptr input_signature,
-		  const std::string &ifc,
-		  const std::string &mac)
-    throw (std::runtime_error);
-
-  bool d_should_wait;
-  usrp2::fpga_timestamp d_tx_time;
-
-public:
-  ~usrp2_sink_base();
-
-  /*!
-   * \brief Set antenna
-   */
-  bool set_antenna(int ant);
-
-  /*!
-   * \brief Set transmitter gain
-   */
-  bool set_gain(double gain);
-
-  /*!
-   * \brief Set transmitter LO offset frequency
-   */
-  bool set_lo_offset(double frequency);
-
-  /*!
-   * \brief Set transmitter center frequency
-   */
-  bool set_center_freq(double frequency, usrp2::tune_result *tr);
-   
-  /*!
-   * \brief Set transmit interpolation rate
-   */
-  bool set_interp(int interp_factor);
-
-  /*!
-   * \brief Calculate default scale_iq for given interpolation factor
-   */
-  void default_scale_iq(int interpolation_factor, int *scale_i, int *scale_q);
-
-  /*!
-   * \brief Set transmit IQ scale factors
-   */
-  bool set_scale_iq(int scale_i, int scale_q);
-
-  /*!
-   * \brief Get transmit interpolation rate
-   */
-  int interp();
-
-  /*!
-   * \brief Get DAC sample rate in Hz 
-   */
-  bool dac_rate(long *rate);
-
-  /*!
-   * \brief Returns minimum Tx gain 
-   */
-  double gain_min();
-
-  /*!
-   * \brief Returns maximum Tx gain 
-   */
-  double gain_max();
-  
-  /*!
-   * \brief Returns Tx gain db_per_step
-   */
-  double gain_db_per_step();
-
-  /*!
-   * \brief Returns minimum Tx center frequency
-   */
-  double freq_min();
-
-  /*!
-   * \brief Returns maximum Tx center frequency
-   */
-  double freq_max();
-
-  /*!
-   * \brief Get Tx daughterboard ID
-   *
-   * \param[out] dbid returns the daughterboard id.
-   *
-   * daughterboard id >= 0 if successful, -1 if no daugherboard installed,
-   * -2 if invalid EEPROM on daughterboard.
-   */
-  bool daughterboard_id(int *dbid);
-
-  /*!
-   * \brief Set daughterboard GPIO data direction register.
-   */
-  bool set_gpio_ddr(uint16_t value, uint16_t mask);
-
-  /*!
-   * \brief Set daughterboard GPIO output selection register.
-   */
-  bool set_gpio_sels(std::string sels);
-
-  /*!
-   * \brief Set daughterboard GPIO pin values.
-   */
-  bool write_gpio(uint16_t value, uint16_t mask);
-
-  /*!
-   * \brief Read daughterboard GPIO pin values
-   */
-  bool read_gpio(uint16_t *value);
-
-  /*!
-   * \brief First samples begin streaming to USRP2 at given time
-   */
-  bool start_streaming_at(usrp2::fpga_timestamp time);
-};
-
-#endif /* INCLUDED_USRP2_SINK_BASE_H */
diff --git a/gr-usrp2/src/usrp2_source_16sc.cc b/gr-usrp2/src/usrp2_source_16sc.cc
deleted file mode 100644
index 33114b51d..000000000
--- a/gr-usrp2/src/usrp2_source_16sc.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2_source_16sc.h>
-#include <rx_16sc_handler.h>
-#include <gr_io_signature.h>
-#include <iostream>
-
-usrp2_source_16sc_sptr
-usrp2_make_source_16sc(const std::string &ifc, const std::string &mac_addr) 
-  throw (std::runtime_error)
-{
-  return gnuradio::get_initial_sptr(new usrp2_source_16sc(ifc, mac_addr));
-}
-
-usrp2_source_16sc::usrp2_source_16sc(const std::string &ifc, const std::string &mac_addr) 
-  throw (std::runtime_error)
-  : usrp2_source_base("usrp2_source_16sc",
-		      gr_make_io_signature(1, 1, sizeof(std::complex<int16_t>)),
-		      ifc, mac_addr)
-{
-  set_output_multiple(USRP2_MIN_RX_SAMPLES);
-}
-
-usrp2_source_16sc::~usrp2_source_16sc()
-{
-  // NOP
-}
-
-int
-usrp2_source_16sc::work(int noutput_items,
-			gr_vector_const_void_star &input_items,
-			gr_vector_void_star &output_items)
-{
-  std::complex<int16_t> *out = (std::complex<int16_t> *)output_items[0];
-
-  rx_16sc_handler::sptr handler = rx_16sc_handler::make(noutput_items, USRP2_MIN_RX_SAMPLES, out);
-
-  bool ok = d_u2->rx_samples(0, handler.get()); // FIXME: channel number instead of 0
-  if (!ok){
-    std::cerr << "usrp2::rx_samples() failed" << std::endl;
-    return -1;	// say we're done
-  }
-
-  return handler->nsamples();
-}
diff --git a/gr-usrp2/src/usrp2_source_32fc.cc b/gr-usrp2/src/usrp2_source_32fc.cc
deleted file mode 100644
index 89b4bea0e..000000000
--- a/gr-usrp2/src/usrp2_source_32fc.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp2_source_32fc.h>
-#include <rx_32fc_handler.h>
-#include <gr_io_signature.h>
-#include <iostream>
-
-usrp2_source_32fc_sptr
-usrp2_make_source_32fc(const std::string &ifc, const std::string &mac_addr) 
-  throw (std::runtime_error)
-{
-  return gnuradio::get_initial_sptr(new usrp2_source_32fc(ifc, mac_addr));
-}
-
-usrp2_source_32fc::usrp2_source_32fc(const std::string &ifc, const std::string &mac_addr) 
-  throw (std::runtime_error)
-  : usrp2_source_base("usrp2_source_32fc",
-		      gr_make_io_signature(1, 1, sizeof(gr_complex)),
-		      ifc, mac_addr)
-{
-  set_output_multiple(USRP2_MIN_RX_SAMPLES);
-}
-
-usrp2_source_32fc::~usrp2_source_32fc()
-{
-  // NOP
-}
-
-int
-usrp2_source_32fc::work(int noutput_items,
-			gr_vector_const_void_star &input_items,
-			gr_vector_void_star &output_items)
-{
-  gr_complex *out = (gr_complex *)output_items[0];
-
-  rx_32fc_handler::sptr handler = rx_32fc_handler::make(noutput_items, USRP2_MIN_RX_SAMPLES, out);
-
-  bool ok = d_u2->rx_samples(0, handler.get()); // FIXME: channel number instead of 0
-  if (!ok){
-    std::cerr << "usrp2::rx_samples() failed" << std::endl;
-    return -1;	// say we're done
-  }
-
-  return handler->nsamples();
-}
diff --git a/gr-usrp2/src/usrp2_source_32fc.h b/gr-usrp2/src/usrp2_source_32fc.h
deleted file mode 100644
index 041416ded..000000000
--- a/gr-usrp2/src/usrp2_source_32fc.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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_USRP2_SOURCE_32FC_H
-#define INCLUDED_USRP2_SOURCE_32FC_H
-
-#include <usrp2_source_base.h>
-
-class usrp2_source_32fc;
-typedef boost::shared_ptr<usrp2_source_32fc> usrp2_source_32fc_sptr;
-
-usrp2_source_32fc_sptr
-usrp2_make_source_32fc(const std::string &ifc="eth0",
-		       const std::string &mac="")
-  throw (std::runtime_error);
-
-/*!
- * \ingroup source_blk
- * \ingroup usrp2
- */
-class usrp2_source_32fc : public usrp2_source_base
-{
-private:
-  friend usrp2_source_32fc_sptr
-  usrp2_make_source_32fc(const std::string &ifc,
-			 const std::string &mac) throw (std::runtime_error);
-  
-protected:
-  usrp2_source_32fc(const std::string &ifc, const std::string &mac) throw (std::runtime_error);
-
-public:
-  ~usrp2_source_32fc();
-
-  int work(int noutput_items,
-	   gr_vector_const_void_star &input_items,
-	   gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_USRP2_SOURCE_32FC_H */
diff --git a/gr-usrp2/src/usrp2_source_base.cc b/gr-usrp2/src/usrp2_source_base.cc
deleted file mode 100644
index d946991de..000000000
--- a/gr-usrp2/src/usrp2_source_base.cc
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2_source_base.h>
-#include <gr_io_signature.h>
-#include <iostream>
-
-usrp2_source_base::usrp2_source_base(const char *name,
-				     gr_io_signature_sptr output_signature,
-				     const std::string &ifc,
-				     const std::string &mac) 
-  throw (std::runtime_error)
-  : usrp2_base(name,
-               gr_make_io_signature(0, 0, 0),
-	       output_signature,
-	       ifc, mac)
-{
-  // NOP
-}
-
-usrp2_source_base::~usrp2_source_base ()
-{
-  // NOP
-}
-
-bool
-usrp2_source_base::set_antenna(int ant)
-{
-  return d_u2->set_rx_antenna(ant);
-}
-
-bool
-usrp2_source_base::set_gain(double gain)
-{
-  return d_u2->set_rx_gain(gain);
-}
-
-bool
-usrp2_source_base::set_lo_offset(double frequency)
-{
-  return d_u2->set_rx_lo_offset(frequency);
-}
-
-bool
-usrp2_source_base::set_center_freq(double frequency, usrp2::tune_result *tr)
-{
-  return d_u2->set_rx_center_freq(frequency, tr);
-}
-
-bool
-usrp2_source_base::set_decim(int decimation_factor)
-{
-  return d_u2->set_rx_decim(decimation_factor);
-}
-
-bool 
-usrp2_source_base::set_scale_iq(int scale_i, int scale_q)
-{
-  return d_u2->set_rx_scale_iq(scale_i, scale_q);
-}
-
-int
-usrp2_source_base::decim()
-{
-  return d_u2->rx_decim();
-}
-
-bool
-usrp2_source_base::adc_rate(long *rate)
-{
-  return d_u2->adc_rate(rate);
-}
-
-double
-usrp2_source_base::gain_min()
-{
-  return d_u2->rx_gain_min();
-}
-
-double
-usrp2_source_base::gain_max()
-{
-  return d_u2->rx_gain_max();
-}
-
-double
-usrp2_source_base::gain_db_per_step()
-{
-  return d_u2->rx_gain_db_per_step();
-}
-  
-double
-usrp2_source_base::freq_min()
-{
-  return d_u2->rx_freq_min();
-}
-
-double
-usrp2_source_base::freq_max()
-{
-  return d_u2->rx_freq_max();
-}
-
-bool
-usrp2_source_base::daughterboard_id(int *dbid)
-{
-  return d_u2->rx_daughterboard_id(dbid);
-}
-
-unsigned int
-usrp2_source_base::overruns()
-{
-  return d_u2->rx_overruns();
-}
-
-unsigned int
-usrp2_source_base::missing()
-{
-  return d_u2->rx_missing();
-}
-
-bool
-usrp2_source_base::start()
-{
-  return d_u2->start_rx_streaming(0); // FIXME: someday sources will have channel #s
-}
-
-bool
-usrp2_source_base::stop()
-{
-  return d_u2->stop_rx_streaming(0); // FIXME: someday sources will have channel #s
-}
-
-bool
-usrp2_source_base::set_gpio_ddr(uint16_t value, uint16_t mask)
-{
-  return d_u2->set_gpio_ddr(usrp2::GPIO_RX_BANK, value, mask);
-}
-
-bool
-usrp2_source_base::set_gpio_sels(std::string sels)
-{
-  return d_u2->set_gpio_sels(usrp2::GPIO_RX_BANK, sels);
-}
-
-bool
-usrp2_source_base::write_gpio(uint16_t value, uint16_t mask)
-{
-  return d_u2->write_gpio(usrp2::GPIO_RX_BANK, value, mask);
-}
-
-bool
-usrp2_source_base::read_gpio(uint16_t *value)
-{
-  return d_u2->read_gpio(usrp2::GPIO_RX_BANK, value);
-}
-
-bool
-usrp2_source_base::enable_gpio_streaming(int enable)
-{
-  return d_u2->enable_gpio_streaming(usrp2::GPIO_RX_BANK, enable);
-}
diff --git a/gr-usrp2/src/usrp2_source_base.h b/gr-usrp2/src/usrp2_source_base.h
deleted file mode 100644
index 9e35e2e93..000000000
--- a/gr-usrp2/src/usrp2_source_base.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009,2010 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_USRP2_SOURCE_BASE_H
-#define INCLUDED_USRP2_SOURCE_BASE_H
-
-#include <usrp2_base.h>
-
-/*!
- * Base class for all USRP2 source blocks
- */
-class usrp2_source_base : public usrp2_base 
-{
-protected:
-  usrp2_source_base(const char *name,
-		    gr_io_signature_sptr output_signature,
-		    const std::string &ifc,
-		    const std::string &mac)
-    throw (std::runtime_error);
-
-public:
-  ~usrp2_source_base();
-
-  /*!
-   * \brief Set antenna
-   */
-  bool set_antenna(int ant);
-
-  /*!
-   * \brief Set receiver gain
-   */
-  bool set_gain(double gain);
-
-  /*!
-   * \brief Set receive LO offset frequency
-   */
-  bool set_lo_offset(double frequency);
-
-  /*!
-   * \brief Set receiver center frequency
-   */
-  bool set_center_freq(double frequency, usrp2::tune_result *tr);
-   
-  /*!
-   * \brief Set receive decimation rate
-   */
-  bool set_decim(int decimation_factor);
-
-  /*!
-   * \brief Set receive IQ scale factors
-   */
-  bool set_scale_iq(int scale_i, int scale_q);
-
-  /*!
-   * \brief Get receive decimation rate
-   */
-  int decim();
-
-  /*!
-   * \brief Get the ADC sample rate
-   */
-  bool adc_rate(long *rate);
-
-  /*!
-   * \brief Returns minimum Rx gain 
-   */
-  double gain_min();
-
-  /*!
-   * \brief Returns maximum Rx gain 
-   */
-  double gain_max();
-  
-  /*!
-   * \brief Returns Rx gain db_per_step
-   */
-  double gain_db_per_step();
-  
-  /*!
-   * \brief Returns minimum Rx center frequency
-   */
-  double freq_min();
-
-  /*!
-   * \brief Returns maximum Rx center frequency
-   */
-  double freq_max();
-  
-  /*!
-   * \brief Get Rx daughterboard ID
-   *
-   * \param[out] dbid returns the daughterboard id.
-   *
-   * daughterboard id >= 0 if successful, -1 if no daugherboard installed,
-   * -2 if invalid EEPROM on daughterboard.
-   */
-  bool daughterboard_id(int *dbid);
-
-  /*!
-   * \brief Returns number of receiver overruns
-   */
-  unsigned int overruns();
-
-  /*!
-   * \brief Returns number of missing sequence numbers
-   */
-  unsigned int missing();
-
-  /*!
-   * \brief Called by scheduler when starting flowgraph
-   */
-  virtual bool start();
-  
-  /*!
-   * \brief Called by scheduler when stopping flowgraph
-   */
-  virtual bool stop();
-
-  /*!
-   * \brief Set daughterboard GPIO data direction register.
-   */
-  bool set_gpio_ddr(uint16_t value, uint16_t mask);
-
-  /*!
-   * \brief Set daughterboard GPIO output selection register.
-   */
-  bool set_gpio_sels(std::string sels);
-
-  /*!
-   * \brief Set daughterboard GPIO pin values.
-   */
-  bool write_gpio(uint16_t value, uint16_t mask);
-
-  /*!
-   * \brief Read daughterboard GPIO pin values
-   */
-  bool read_gpio(uint16_t *value);
-
-  /*!
-   * \brief Enable streaming GPIO in sample LSBs
-   */
-  bool enable_gpio_streaming(int enable);
-};
-
-#endif /* INCLUDED_USRP2_SOURCE_BASE_H */
diff --git a/gr-usrp2/src/usrp2_swig.i b/gr-usrp2/src/usrp2_swig.i
deleted file mode 100644
index 6e8fa1960..000000000
--- a/gr-usrp2/src/usrp2_swig.i
+++ /dev/null
@@ -1,361 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 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.
- */
-
-%include "gnuradio.i"	// the common stuff
-%import <stdint.i>
-
-%{
-#include "usrp2_source_16sc.h"
-#include "usrp2_source_32fc.h"
-#include "usrp2_sink_16sc.h"
-#include "usrp2_sink_32fc.h"
-%}
-
-%include <usrp2/tune_result.h>
-%include <usrp2/mimo_config.h>
-%include <usrp2/metadata.h>
-
-%template(uint32_t_vector) std::vector<uint32_t>;
-
-// ----------------------------------------------------------------
-
-class usrp2_base : public gr_sync_block 
-{
-protected:
-  usrp2_base() throw (std::runtime_error);
-
-public:
-  ~usrp2_base();
-
-  std::string mac_addr() const;
-  std::string interface_name() const;
-  %rename(_real_fpga_master_clock_freq) fpga_master_clock_freq;
-  bool fpga_master_clock_freq(long *freq);
-  bool config_mimo(int flags);
-  bool sync_to_pps();
-  bool sync_every_pps(bool enable);
-  std::vector<uint32_t> peek32(uint32_t addr, uint32_t words);
-  bool poke32(uint32_t addr, const std::vector<uint32_t> &data);
-};
-
-// ----------------------------------------------------------------
-
-class usrp2_source_base : public usrp2_base 
-{
-protected:
-  usrp2_source_base() throw (std::runtime_error);
-
-public:
-  ~usrp2_source_base();
-
-  bool set_antenna(int ant);
-  bool set_gain(double gain);
-  %rename(_real_set_center_freq) set_center_freq;
-  bool set_lo_offset(double frequency);
-  bool set_center_freq(double frequency, usrp2::tune_result *r);
-  bool set_decim(int decimation_factor);
-  bool set_scale_iq(int scale_i, int scale_q);
-  int decim();
-  %rename(_real_adc_rate) adc_rate;
-  bool adc_rate(long *rate);
-  double gain_min();
-  double gain_max();
-  double gain_db_per_step();
-  double freq_min();
-  double freq_max();
-  %rename(_real_daughterboard_id) daughterboard_id;
-  bool daughterboard_id(int *dbid);
-  unsigned int overruns();
-  unsigned int missing();
-  bool set_gpio_ddr(uint16_t value, uint16_t mask);
-  bool set_gpio_sels(std::string sels);
-  bool write_gpio(uint16_t value, uint16_t mask);
-  %rename(_real_read_gpio) read_gpio;
-  bool read_gpio(uint16_t *value);
-  bool enable_gpio_streaming(int enable);
-};
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(usrp2,source_32fc)
-
-usrp2_source_32fc_sptr
-usrp2_make_source_32fc(const std::string ifc="eth0", 
-                       const std::string mac="") 
-  throw (std::runtime_error);
-
-class usrp2_source_32fc : public usrp2_source_base 
-{
-protected:
-  usrp2_source_32fc(const std::string &ifc, const std::string &mac);
-
-public:
-  ~usrp2_source_32fc();
-};
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(usrp2,source_16sc)
-
-usrp2_source_16sc_sptr
-usrp2_make_source_16sc(const std::string ifc="eth0", 
-		       const std::string mac="") 
-  throw (std::runtime_error);
-
-class usrp2_source_16sc : public usrp2_source_base 
-{
-protected:
-  usrp2_source_16sc(const std::string &ifc, const std::string &mac);
-
-public:
-  ~usrp2_source_16sc();
-};
-
-// ----------------------------------------------------------------
-
-class usrp2_sink_base : public usrp2_base 
-{
-protected:
-  usrp2_sink_base() throw (std::runtime_error);
-
-public:
-  ~usrp2_sink_base();
-
-  bool set_antenna(int ant);
-  bool set_gain(double gain);
-  %rename(_real_set_center_freq) set_center_freq;
-  bool set_lo_offset(double frequency);
-  bool set_center_freq(double frequency, usrp2::tune_result *r);
-  bool set_interp(int interp_factor);
-  bool set_scale_iq(int scale_i, int scale_q);
-  int interp();
-  %rename(_real_default_tx_scale_iq) default_scale_iq;
-  void default_scale_iq(int interp, int *scale_i, int *scale_q);
-  %rename(_real_dac_rate) dac_rate;
-  bool dac_rate(long *rate);
-  double gain_min();
-  double gain_max();
-  double gain_db_per_step();
-  double freq_min();
-  double freq_max();
-  %rename(_real_daughterboard_id) daughterboard_id;
-  bool daughterboard_id(int *dbid);
-  bool set_gpio_ddr(uint16_t value, uint16_t mask);
-  bool set_gpio_sels(std::string sels);
-  bool write_gpio(uint16_t value, uint16_t mask);
-  %rename(_real_read_gpio) read_gpio;
-  bool read_gpio(uint16_t *value);
-  bool start_streaming_at(usrp2::fpga_timestamp time);
-};
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(usrp2,sink_32fc)
-
-usrp2_sink_32fc_sptr
-usrp2_make_sink_32fc(const std::string ifc="eth0", 
-		     const std::string mac="") 
-  throw (std::runtime_error);
-
-class usrp2_sink_32fc : public usrp2_sink_base 
-{
-protected:
-  usrp2_sink_32fc(const std::string &ifc, const std::string &mac);
-
-public:
-  ~usrp2_sink_32fc();
-};
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(usrp2,sink_16sc)
-
-usrp2_sink_16sc_sptr
-usrp2_make_sink_16sc(const std::string ifc="eth0", 
-		     const std::string mac="") 
-  throw (std::runtime_error);
-
-class usrp2_sink_16sc : public usrp2_sink_base 
-{
-protected:
-  usrp2_sink_16sc(const std::string &ifc, const std::string &mac);
-
-public:
-  ~usrp2_sink_16sc();
-};
-
-// ----------------------------------------------------------------
-
-// some utility functions to allow Python to deal with pointers
-%{
-  long *make_long_ptr() { return new long; }
-  long deref_long_ptr(long *l) { return *l; }
-  void free_long_ptr(long *l) { delete l; }
-  int *make_int_ptr() { return new int; }
-  int deref_int_ptr(int *l) { return *l; }
-  void free_int_ptr(int *l) { delete l; }
-  uint16_t *make_uint16_ptr() { return new uint16_t; }
-  int deref_uint16_ptr(uint16_t *l) { return *l; }
-  void free_uint16_ptr(uint16_t *l) { delete l; }
-%}
-
-long *make_long_ptr();
-long deref_long_ptr(long *l);
-void free_long_ptr(long *l);
-int *make_int_ptr();
-int deref_int_ptr(int *l);
-void free_int_ptr(int *l);
-uint16_t *make_uint16_ptr();
-int deref_uint16_ptr(uint16_t *l);
-void free_uint16_ptr(uint16_t *l);
-
-#ifdef SWIGPYTHON
-// create a more pythonic interface
-%pythoncode %{
-
-def __set_center_freq(self, freq):
-  tr = tune_result()
-  r = self._real_set_center_freq(freq, tr)
-  if r:
-    return tr
-  else:
-    return None
-
-def __fpga_master_clock_freq(self):
-  f = make_long_ptr();
-  r = self._real_fpga_master_clock_freq(f)
-  if r:
-    result = deref_long_ptr(f)
-  else:
-    result = None
-  free_long_ptr(f)
-  return result
-
-def __adc_rate(self):
-  rate = make_long_ptr();
-  r = self._real_adc_rate(rate)
-  if r:
-    result = deref_long_ptr(rate)
-  else:
-    result = None
-  free_long_ptr(rate)
-  return result
-
-def __dac_rate(self):
-  rate = make_long_ptr();
-  r = self._real_dac_rate(rate)
-  if r:
-    result = deref_long_ptr(rate)
-  else:
-    result = None
-  free_long_ptr(rate)
-  return result
-
-def __gain_range(self):
-  return [self.gain_min(),
-          self.gain_max(),
-          self.gain_db_per_step()]
-
-# NOTE: USRP1 uses a length three tuple here (3rd value is 'freq step'),
-#       but it's not really useful.  We let an index error happen here
-#       to identify code using it.
-def __freq_range(self):
-  return [self.freq_min(),
-          self.freq_max()]
-
-def __daughterboard_id(self):
-  dbid = make_int_ptr()
-  r = self._real_daughterboard_id(dbid)
-  if r:
-    result = deref_int_ptr(dbid)
-  else:
-    result = None
-  free_int_ptr(dbid)
-  return result
-
-def __default_tx_scale_iq(self, interp):
-  scale_i = make_int_ptr()
-  scale_q = make_int_ptr()
-  self._real_default_tx_scale_iq(interp, scale_i, scale_q)
-  return (deref_int_ptr(scale_i), deref_int_ptr(scale_q))
-
-def __read_gpio(self):
-  value = make_uint16_ptr()
-  r = self._real_read_gpio(value)
-  if r:
-    result = deref_uint16_ptr(value)
-  else:
-    result = None
-  free_uint16_ptr(value)
-  return result
-
-
-usrp2_source_32fc_sptr.set_center_freq = __set_center_freq
-usrp2_source_16sc_sptr.set_center_freq = __set_center_freq
-usrp2_sink_32fc_sptr.set_center_freq = __set_center_freq
-usrp2_sink_16sc_sptr.set_center_freq = __set_center_freq
-
-usrp2_source_32fc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq
-usrp2_source_16sc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq
-usrp2_sink_32fc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq
-usrp2_sink_16sc_sptr.fpga_master_clock_freq = __fpga_master_clock_freq
-
-usrp2_source_32fc_sptr.adc_rate = __adc_rate
-usrp2_source_16sc_sptr.adc_rate = __adc_rate
-usrp2_sink_32fc_sptr.dac_rate = __dac_rate
-usrp2_sink_16sc_sptr.dac_rate = __dac_rate
-
-usrp2_source_32fc_sptr.gain_range = __gain_range
-usrp2_source_16sc_sptr.gain_range = __gain_range
-usrp2_sink_32fc_sptr.gain_range = __gain_range
-usrp2_sink_16sc_sptr.gain_range = __gain_range
-
-usrp2_source_32fc_sptr.freq_range = __freq_range
-usrp2_source_16sc_sptr.freq_range = __freq_range
-usrp2_sink_32fc_sptr.freq_range = __freq_range
-usrp2_sink_16sc_sptr.freq_range = __freq_range
-
-usrp2_source_32fc_sptr.daughterboard_id = __daughterboard_id
-usrp2_source_16sc_sptr.daughterboard_id = __daughterboard_id
-usrp2_sink_32fc_sptr.daughterboard_id = __daughterboard_id
-usrp2_sink_16sc_sptr.daughterboard_id = __daughterboard_id
-
-usrp2_sink_32fc_sptr.default_scale_iq = __default_tx_scale_iq
-usrp2_sink_16sc_sptr.default_scale_iq = __default_tx_scale_iq
-
-usrp2_source_32fc_sptr.read_gpio = __read_gpio
-usrp2_source_16sc_sptr.read_gpio = __read_gpio
-usrp2_sink_32fc_sptr.read_gpio = __read_gpio
-usrp2_sink_16sc_sptr.read_gpio = __read_gpio
-
-%}
-#endif
-
-#if SWIGGUILE
-%scheme %{
-(load-extension-global "libguile-gnuradio-usrp2_swig" "scm_init_gnuradio_usrp2_swig_module")
-%}
-
-%goops %{
-(use-modules (gnuradio gnuradio_core_runtime))
-%}
-#endif
diff --git a/gr-utils/CMakeLists.txt b/gr-utils/CMakeLists.txt
new file mode 100644
index 000000000..38bb245c6
--- /dev/null
+++ b/gr-utils/CMakeLists.txt
@@ -0,0 +1,53 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-utils" ENABLE_GR_UTILS
+    ENABLE_GR_CORE
+    ENABLE_PYTHON
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_UTILS)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_COMPONENT("utils"
+    DISPLAY_NAME "Utils"
+    DESCRIPTION  "Misc gnuradio python utilities"
+    DEPENDS      "core_python"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(src/python)
+
+endif(ENABLE_GR_UTILS)
diff --git a/gr-utils/src/python/CMakeLists.txt b/gr-utils/src/python/CMakeLists.txt
new file mode 100644
index 000000000..fba0d57a5
--- /dev/null
+++ b/gr-utils/src/python/CMakeLists.txt
@@ -0,0 +1,53 @@
+# 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.
+
+########################################################################
+# Install python files and apps
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    FILES
+    plot_data.py
+    pyqt_plot.py
+    pyqt_filter.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio
+    COMPONENT "utils"
+)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    create-gnuradio-out-of-tree-project
+    gr_plot_char.py
+    gr_plot_const.py
+    gr_plot_fft.py
+    gr_plot_fft_c.py
+    gr_plot_fft_f.py
+    gr_plot_psd.py
+    gr_plot_psd_c.py
+    gr_plot_psd_f.py
+    gr_plot_float.py
+    gr_plot_int.py
+    gr_plot_iq.py
+    gr_plot_short.py
+    gr_plot_qt.py
+    gr_filter_design.py
+    DESTINATION ${GR_RUNTIME_DIR}
+    COMPONENT "utils"
+)
diff --git a/gr-utils/src/python/Makefile.am b/gr-utils/src/python/Makefile.am
index b422bfd05..11fb038f6 100644
--- a/gr-utils/src/python/Makefile.am
+++ b/gr-utils/src/python/Makefile.am
@@ -49,10 +49,4 @@ bin_SCRIPTS = \
     gr_plot_iq.py \
     gr_plot_short.py \
     gr_plot_qt.py \
-    gr_filter_design.py \
-    usrp_fft.py \
-    usrp_oscope.py \
-    usrp_rx_nogui.py \
-    usrp_siggen.py \
-    usrp_siggen_gui.py \
-    usrp2_fft.py
+    gr_filter_design.py
diff --git a/gr-utils/src/python/gr_plot_const.py b/gr-utils/src/python/gr_plot_const.py
index 5dd08c9a0..8873e5b7e 100755
--- a/gr-utils/src/python/gr_plot_const.py
+++ b/gr-utils/src/python/gr_plot_const.py
@@ -85,16 +85,23 @@ class draw_constellation:
         except MemoryError:
             print "End of File"
         else:
-            self.reals = scipy.array([r.real for r in iq])
-            self.imags = scipy.array([i.imag for i in iq])
+            # retesting length here as newer version of scipy does not throw a MemoryError, just
+            # returns a zero-length array
+            if(len(iq) > 0):
+                self.reals = scipy.array([r.real for r in iq])
+                self.imags = scipy.array([i.imag for i in iq])
+                
+                self.time = scipy.array([i*(1/self.sample_rate) for i in range(len(self.reals))])
+                return True
+            else:
+                print "End of File"
+                return False
 
-            self.time = scipy.array([i*(1/self.sample_rate) for i in range(len(self.reals))])
-            
     def make_plots(self):
         # if specified on the command-line, set file pointer
         self.hfile.seek(self.sizeof_data*self.start, 1)
 
-        self.get_data()
+        r = self.get_data()
         
         # Subplot for real and imaginary parts of signal
         self.sp_iq = self.fig.add_subplot(2,1,1, position=[0.075, 0.2, 0.4, 0.6])
@@ -175,8 +182,9 @@ class draw_constellation:
         self.step_forward()
 
     def step_forward(self):
-        self.get_data()
-        self.update_plots()
+        r = self.get_data()
+        if(r):
+            self.update_plots()
 
     def step_backward(self):
         # Step back in file position
@@ -184,8 +192,9 @@ class draw_constellation:
             self.hfile.seek(-2*self.sizeof_data*self.block_length, 1)
         else:
             self.hfile.seek(-self.hfile.tell(),1)
-        self.get_data()
-        self.update_plots()
+        r = self.get_data()
+        if(r):
+            self.update_plots()
     
         
     def mouse_button_callback(self, event):
diff --git a/gr-utils/src/python/usrp2_fft.py b/gr-utils/src/python/usrp2_fft.py
deleted file mode 100755
index 4276e389a..000000000
--- a/gr-utils/src/python/usrp2_fft.py
+++ /dev/null
@@ -1,273 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,2007,2008,2010 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.
-# 
-
-from gnuradio import gr, gru
-from gnuradio import usrp2
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider
-from optparse import OptionParser
-import wx
-import sys
-import numpy
-
-class app_top_block(stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        self.frame = frame
-        self.panel = panel
-        
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-e", "--interface", type="string", default="eth0",
-                          help="select Ethernet interface, default is eth0")
-        parser.add_option("-m", "--mac-addr", type="string", default="",
-                          help="select USRP by MAC address, default is auto-select")
-        #parser.add_option("-A", "--antenna", default=None,
-        #                  help="select Rx Antenna (only on RFX-series boards)")
-        parser.add_option("-d", "--decim", type="int", default=16,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-W", "--waterfall", action="store_true", default=False,
-                          help="Enable waterfall display")
-        parser.add_option("-S", "--oscilloscope", action="store_true", default=False,
-                          help="Enable oscilloscope display")
-	parser.add_option("", "--avg-alpha", type="eng_float", default=1e-1,
-			  help="Set fftsink averaging factor, default=[%default]")
-	parser.add_option("", "--ref-scale", type="eng_float", default=1.0,
-			  help="Set dBFS=0dB input value, default=[%default]")
-        parser.add_option("--fft-size", type="int", default=1024,
-                          help="Set number of FFT bins [default=%default]")
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-	self.options = options
-        self.show_debug_info = True
-        
-        self.u = usrp2.source_32fc(options.interface, options.mac_addr)
-        self.u.set_decim(options.decim)
-        
-        input_rate = self.u.adc_rate() / self.u.decim()
-        
-        if options.waterfall:
-            self.scope = \
-              waterfallsink2.waterfall_sink_c (panel, fft_size=1024, sample_rate=input_rate)
-        elif options.oscilloscope:
-            self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate)
-        else:
-            self.scope = fftsink2.fft_sink_c (panel,
-                                              fft_size=options.fft_size,
-                                              sample_rate=input_rate, 
-					      ref_scale=options.ref_scale,
-                                              ref_level=20.0,
-                                              y_divs = 12,
-					      avg_alpha=options.avg_alpha)
-
-        self.connect(self.u, self.scope)
-
-        self._build_gui(vbox)
-	self._setup_events()
-	
-        # set initial values
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.u.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-        if options.freq is None:
-            # if no freq was specified, use the mid-point
-            r = self.u.freq_range()
-            options.freq = float(r[0]+r[1])/2
-            
-        self.set_gain(options.gain)
-
-	#if options.antenna is not None:
-        #    print "Selecting antenna %s" % (options.antenna,)
-        #    self.subdev.select_rx_antenna(options.antenna)
-
-        if self.show_debug_info:
-            self.myform['decim'].set_value(self.u.decim())
-            self.myform['fs@gbe'].set_value(input_rate)
-            self.myform['dbname'].set_value("0x%04X" % (self.u.daughterboard_id(),)) # FIXME: add text name
-            self.myform['baseband'].set_value(0)
-            self.myform['ddc'].set_value(0)
-
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-
-    def _set_status_msg(self, msg):
-        self.frame.GetStatusBar().SetStatusText(msg, 0)
-
-    def _build_gui(self, vbox):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-            
-        vbox.Add(self.scope.win, 10, wx.EXPAND)
-        
-        # add control area at the bottom
-        self.myform = myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0, 0)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=hbox, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-        hbox.Add((5,0), 0, 0)
-        g = self.u.gain_range()
-
-	# some configurations don't have gain control
-	if g[1] > g[0]:
-    	    myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                           weight=3,
-                                           min=int(g[0]), max=int(g[1]),
-                                           callback=self.set_gain)
-
-        hbox.Add((5,0), 0, 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        self._build_subpanel(vbox)
-
-    def _build_subpanel(self, vbox_arg):
-        # build a secondary information panel (sometimes hidden)
-
-        # FIXME figure out how to have this be a subpanel that is always
-        # created, but has its visibility controlled by foo.Show(True/False)
-        
-        def _form_set_decim(kv):
-            return self.set_decim(kv['decim'])
-
-        if not(self.show_debug_info):
-            return
-
-        panel = self.panel
-        vbox = vbox_arg
-        myform = self.myform
-
-        #panel = wx.Panel(self.panel, -1)
-        #vbox = wx.BoxSizer(wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-
-        myform['decim'] = form.int_field(
-            parent=panel, sizer=hbox, label="Decim",
-            callback=myform.check_input_and_call(_form_set_decim, self._set_status_msg))
-
-        hbox.Add((5,0), 1)
-        myform['fs@gbe'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Fs@GbE")
-
-        hbox.Add((5,0), 1)
-        myform['dbname'] = form.static_text_field(
-            parent=panel, sizer=hbox)
-
-        hbox.Add((5,0), 1)
-        myform['baseband'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Analog BB")
-
-        hbox.Add((5,0), 1)
-        myform['ddc'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC")
-
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        r = self.u.set_center_freq(target_freq)
-        
-        if r:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-            if self.show_debug_info:
-                self.myform['baseband'].set_value(r.baseband_freq)
-                self.myform['ddc'].set_value(r.dxc_freq)
-	    if not self.options.oscilloscope:
-		self.scope.set_baseband_freq(target_freq)
-    	    return True
-
-        return False
-
-    def set_gain(self, gain):
-	if self.myform.has_key('gain'):
-    	    self.myform['gain'].set_value(gain)     # update displayed value
-        self.u.set_gain(gain)
-
-    def set_decim(self, decim):
-        ok = self.u.set_decim(decim)
-        if not ok:
-            print "set_decim failed"
-        input_rate = self.u.adc_rate() / self.u.decim()
-        self.scope.set_sample_rate(input_rate)
-        if self.show_debug_info:  # update displayed values
-            self.myform['decim'].set_value(self.u.decim())
-            self.myform['fs@gbe'].set_value(input_rate)
-        return ok
-
-    def _setup_events(self):
-	if not self.options.waterfall and not self.options.oscilloscope:
-	    self.scope.win.Bind(wx.EVT_LEFT_DCLICK, self.evt_left_dclick)
-	    
-    def evt_left_dclick(self, event):
-	(ux, uy) = self.scope.win.GetXY(event)
-	if event.CmdDown():
-	    # Re-center on maximum power
-	    points = self.scope.win._points
-	    if self.scope.win.peak_hold:
-		if self.scope.win.peak_vals is not None:
-		    ind = numpy.argmax(self.scope.win.peak_vals)
-		else:
-		    ind = int(points.shape()[0]/2)
-	    else:
-        	ind = numpy.argmax(points[:,1])
-            (freq, pwr) = points[ind]
-	    target_freq = freq/self.scope.win._scale_factor
-	    print ind, freq, pwr
-            self.set_freq(target_freq)            
-	else:
-	    # Re-center on clicked frequency
-	    target_freq = ux/self.scope.win._scale_factor
-	    self.set_freq(target_freq)
-	    
-	
-def main ():
-    app = stdgui2.stdapp(app_top_block, "USRP2 FFT", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-utils/src/python/usrp_fft.py b/gr-utils/src/python/usrp_fft.py
deleted file mode 100755
index eda9bd57c..000000000
--- a/gr-utils/src/python/usrp_fft.py
+++ /dev/null
@@ -1,309 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,2007,2008,2010 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.
-# 
-
-from gnuradio import gr, gru
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider
-from optparse import OptionParser
-import wx
-import sys
-import numpy
-
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    If there's a daughterboard on A, select A.
-    If there's a daughterboard on B, select B.
-    Otherwise, select A.
-    """
-    if u.db(0, 0).dbid() >= 0:       # dbid is < 0 if there's no d'board or a problem
-        return (0, 0)
-    if u.db(1, 0).dbid() >= 0:
-        return (1, 0)
-    return (0, 0)
-
-
-class app_top_block(stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        self.frame = frame
-        self.panel = panel
-        
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-w", "--which", type="int", default=0,
-                          help="select which USRP (0, 1, ...) default is %default",
-			  metavar="NUM")
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=first one with a daughterboard)")
-        parser.add_option("-A", "--antenna", default=None,
-                          help="select Rx Antenna (only on RFX-series boards)")
-        parser.add_option("-d", "--decim", type="int", default=16,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB [default is midpoint]")
-        parser.add_option("-W", "--waterfall", action="store_true", default=False,
-                          help="Enable waterfall display")
-        parser.add_option("-8", "--width-8", action="store_true", default=False,
-                          help="Enable 8-bit samples across USB")
-        parser.add_option( "--no-hb", action="store_true", default=False,
-                          help="don't use halfband filter in usrp")
-        parser.add_option("-S", "--oscilloscope", action="store_true", default=False,
-                          help="Enable oscilloscope display")
-	parser.add_option("", "--avg-alpha", type="eng_float", default=1e-1,
-			  help="Set fftsink averaging factor, [default=%default]")
-	parser.add_option("", "--ref-scale", type="eng_float", default=13490.0,
-			  help="Set dBFS=0dB input value, [default=%default]")
-        parser.add_option("", "--fft-size", type="int", default=1024,
-                          help="Set FFT frame size, [default=%default]");
-
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-	self.options = options
-        self.show_debug_info = True
-        
-        # build the graph
-        if options.no_hb or (options.decim<8):
-          #Min decimation of this firmware is 4. 
-          #contains 4 Rx paths without halfbands and 0 tx paths.
-          self.fpga_filename="std_4rx_0tx.rbf"
-          self.u = usrp.source_c(which=options.which, decim_rate=options.decim, fpga_filename=self.fpga_filename)
-        else:
-          #Min decimation of standard firmware is 8. 
-          #standard fpga firmware "std_2rxhb_2tx.rbf" 
-          #contains 2 Rx paths with halfband filters and 2 tx paths (the default)
-          self.u = usrp.source_c(which=options.which, decim_rate=options.decim)
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-
-        if options.width_8:
-            width = 8
-            shift = 8
-            format = self.u.make_format(width, shift)
-            print "format =", hex(format)
-            r = self.u.set_format(format)
-            print "set_format =", r
-            
-        # determine the daughterboard subdevice we're using
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-
-        if options.waterfall:
-            self.scope = \
-              waterfallsink2.waterfall_sink_c (panel, fft_size=options.fft_size, sample_rate=input_rate)
-        elif options.oscilloscope:
-            self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate)
-        else:
-            self.scope = fftsink2.fft_sink_c (panel, fft_size=options.fft_size, sample_rate=input_rate, 
-					      ref_scale=options.ref_scale, ref_level=0.0, y_divs = 10,
-					      avg_alpha=options.avg_alpha)
-
-        self.connect(self.u, self.scope)
-
-        self._build_gui(vbox)
-	self._setup_events()
-	
-        # set initial values
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-        if options.freq is None:
-            # if no freq was specified, use the mid-point
-            r = self.subdev.freq_range()
-            options.freq = float(r[0]+r[1])/2
-
-        self.set_gain(options.gain)
-
-	if options.antenna is not None:
-            print "Selecting antenna %s" % (options.antenna,)
-            self.subdev.select_rx_antenna(options.antenna)
-
-        if self.show_debug_info:
-            self.myform['decim'].set_value(self.u.decim_rate())
-            self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-            self.myform['dbname'].set_value(self.subdev.name())
-            self.myform['baseband'].set_value(0)
-            self.myform['ddc'].set_value(0)
-
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-
-    def _set_status_msg(self, msg):
-        self.frame.GetStatusBar().SetStatusText(msg, 0)
-
-    def _build_gui(self, vbox):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-            
-        vbox.Add(self.scope.win, 10, wx.EXPAND)
-        
-        # add control area at the bottom
-        self.myform = myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0, 0)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=hbox, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-        hbox.Add((5,0), 0, 0)
-        g = self.subdev.gain_range()
-        myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                           weight=3,
-                                           min=int(g[0]), max=int(g[1]),
-                                           callback=self.set_gain)
-
-        hbox.Add((5,0), 0, 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        self._build_subpanel(vbox)
-
-    def _build_subpanel(self, vbox_arg):
-        # build a secondary information panel (sometimes hidden)
-
-        # FIXME figure out how to have this be a subpanel that is always
-        # created, but has its visibility controlled by foo.Show(True/False)
-        
-        def _form_set_decim(kv):
-            return self.set_decim(kv['decim'])
-
-        if not(self.show_debug_info):
-            return
-
-        panel = self.panel
-        vbox = vbox_arg
-        myform = self.myform
-
-        #panel = wx.Panel(self.panel, -1)
-        #vbox = wx.BoxSizer(wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-
-        myform['decim'] = form.int_field(
-            parent=panel, sizer=hbox, label="Decim",
-            callback=myform.check_input_and_call(_form_set_decim, self._set_status_msg))
-
-        hbox.Add((5,0), 1)
-        myform['fs@usb'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Fs@USB")
-
-        hbox.Add((5,0), 1)
-        myform['dbname'] = form.static_text_field(
-            parent=panel, sizer=hbox)
-
-        hbox.Add((5,0), 1)
-        myform['baseband'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Analog BB")
-
-        hbox.Add((5,0), 1)
-        myform['ddc'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC")
-
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        r = self.u.tune(0, self.subdev, target_freq)
-        
-        if r:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-            if self.show_debug_info:
-                self.myform['baseband'].set_value(r.baseband_freq)
-                self.myform['ddc'].set_value(r.dxc_freq)
-	    if not self.options.oscilloscope:
-		self.scope.set_baseband_freq(target_freq)
-    	    return True
-
-        return False
-
-    def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
-
-    def set_decim(self, decim):
-        ok = self.u.set_decim_rate(decim)
-        if not ok:
-            print "set_decim failed"
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-        self.scope.set_sample_rate(input_rate)
-        if self.show_debug_info:  # update displayed values
-            self.myform['decim'].set_value(self.u.decim_rate())
-            self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-        return ok
-
-    def _setup_events(self):
-	if not self.options.waterfall and not self.options.oscilloscope:
-	    self.scope.win.Bind(wx.EVT_LEFT_DCLICK, self.evt_left_dclick)
-	    
-    def evt_left_dclick(self, event):
-	(ux, uy) = self.scope.win.GetXY(event)
-	if event.CmdDown():
-	    # Re-center on maximum power
-	    points = self.scope.win._points
-	    if self.scope.win.peak_hold:
-		if self.scope.win.peak_vals is not None:
-		    ind = numpy.argmax(self.scope.win.peak_vals)
-		else:
-		    ind = int(points.shape()[0]/2)
-	    else:
-        	ind = numpy.argmax(points[:,1])
-            (freq, pwr) = points[ind]
-	    target_freq = freq/self.scope.win._scale_factor
-	    print ind, freq, pwr
-            self.set_freq(target_freq)            
-	else:
-	    # Re-center on clicked frequency
-	    target_freq = ux/self.scope.win._scale_factor
-	    self.set_freq(target_freq)
-	    
-	
-def main ():
-    app = stdgui2.stdapp(app_top_block, "USRP FFT", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-utils/src/python/usrp_oscope.py b/gr-utils/src/python/usrp_oscope.py
deleted file mode 100755
index 9921e9873..000000000
--- a/gr-utils/src/python/usrp_oscope.py
+++ /dev/null
@@ -1,349 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,2006,2007 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.
-# 
-
-# print "Loading revised usrp_oscope with additional options for scopesink..."
-
-from gnuradio import gr, gru
-from gnuradio import usrp
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui2, scopesink2, form, slider
-from optparse import OptionParser
-import wx
-import sys
-from usrpm import usrp_dbid
-
-
-def pick_subdevice(u):
-    """
-    The user didn't specify a subdevice on the command line.
-    If there's a daughterboard on A, select A.
-    If there's a daughterboard on B, select B.
-    Otherwise, select A.
-    """
-    if u.db(0, 0).dbid() >= 0:       # dbid is < 0 if there's no d'board or a problem
-        return (0, 0)
-    if u.db(1, 0).dbid() >= 0:
-        return (1, 0)
-    return (0, 0)
-
-
-class app_top_block(stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        self.frame = frame
-        self.panel = panel
-        
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                          help="select USRP Rx side A or B (default=first one with a daughterboard)")
-        parser.add_option("-d", "--decim", type="int", default=16,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-g", "--gain", type="eng_float", default=None,
-                          help="set gain in dB (default is midpoint)")
-        parser.add_option("-8", "--width-8", action="store_true", default=False,
-                          help="Enable 8-bit samples across USB")
-        parser.add_option( "--no-hb", action="store_true", default=False,
-                          help="don't use halfband filter in usrp")
-        parser.add_option("-C", "--basic-complex", action="store_true", default=False,
-                          help="Use both inputs of a basicRX or LFRX as a single Complex input channel")
-        parser.add_option("-D", "--basic-dualchan", action="store_true", default=False,
-                          help="Use both inputs of a basicRX or LFRX as seperate Real input channels")
-        parser.add_option("-n", "--frame-decim", type="int", default=1,
-                          help="set oscope frame decimation factor to n [default=1]")
-        parser.add_option("-v", "--v-scale", type="eng_float", default=1000,
-                          help="set oscope initial V/div to SCALE [default=%default]")
-        parser.add_option("-t", "--t-scale", type="eng_float", default=49e-6,
-                          help="set oscope initial s/div to SCALE [default=50us]")
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-
-        self.show_debug_info = True
-        
-        # build the graph
-        if options.basic_dualchan:
-          self.num_inputs=2
-        else:
-          self.num_inputs=1
-        if options.no_hb or (options.decim<8):
-          #Min decimation of this firmware is 4. 
-          #contains 4 Rx paths without halfbands and 0 tx paths.
-          self.fpga_filename="std_4rx_0tx.rbf"
-          self.u = usrp.source_c(nchan=self.num_inputs,decim_rate=options.decim, fpga_filename=self.fpga_filename)
-        else:
-          #Min decimation of standard firmware is 8. 
-          #standard fpga firmware "std_2rxhb_2tx.rbf" 
-          #contains 2 Rx paths with halfband filters and 2 tx paths (the default)
-          self.u = usrp.source_c(nchan=self.num_inputs,decim_rate=options.decim)
-
-        if options.rx_subdev_spec is None:
-            options.rx_subdev_spec = pick_subdevice(self.u)
-
-        if options.width_8:
-            width = 8
-            shift = 8
-            format = self.u.make_format(width, shift)
-            #print "format =", hex(format)
-            r = self.u.set_format(format)
-            #print "set_format =", r
-            
-        # determine the daughterboard subdevice we're using
-        self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
-        if (options.basic_complex  or options.basic_dualchan ):
-          if ((self.subdev.dbid()==usrp_dbid.BASIC_RX) or (self.subdev.dbid()==usrp_dbid.LF_RX)):
-            side = options.rx_subdev_spec[0]  # side A = 0, side B = 1
-            if options.basic_complex:
-              #force Basic_RX and LF_RX in complex mode (use both I and Q channel)
-              print "Receiver daughterboard forced in complex mode. Both inputs will combined to form a single complex channel."
-              self.dualchan=False
-              if side==0:
-                self.u.set_mux(0x00000010) #enable adc 0 and 1 to form a single complex input on side A
-              else: #side ==1
-                self.u.set_mux(0x00000032) #enable adc 3 and 2 to form a single complex input on side B
-            elif options.basic_dualchan:
-              #force Basic_RX and LF_RX in dualchan mode (use input A  for channel 0 and input B for channel 1)
-              print "Receiver daughterboard forced in dualchannel mode. Each input will be used to form a seperate channel."
-              self.dualchan=True
-              if side==0:
-                self.u.set_mux(gru.hexint(0xf0f0f1f0)) #enable adc 0, side A to form a real input on channel 0 and adc1,side A to form a real input on channel 1
-              else: #side ==1
-                self.u.set_mux(0xf0f0f3f2) #enable adc 2, side B to form a real input on channel 0 and adc3,side B to form a real input on channel 1 
-          else:
-            sys.stderr.write('options basic_dualchan or basic_complex is only supported for Basic Rx or LFRX at the moment\n')
-            sys.exit(1)
-        else:
-          self.dualchan=False
-          self.u.set_mux(usrp.determine_rx_mux_value(self.u, options.rx_subdev_spec))
-
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-
-        self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate,
-                                            frame_decim=options.frame_decim,
-                                            v_scale=options.v_scale,
-                                            t_scale=options.t_scale,
-                                            num_inputs=self.num_inputs)
-        if self.dualchan:
-          # deinterleave two channels from FPGA
-          self.di = gr.deinterleave(gr.sizeof_gr_complex) 
-          self.connect(self.u,self.di) 
-          self.connect((self.di,0),(self.scope,0))
-          self.connect((self.di,1),(self.scope,1))
-        else:
-          self.connect(self.u, self.scope)
-
-        self._build_gui(vbox)
-
-        # set initial values
-
-        if options.gain is None:
-            # if no gain was specified, use the mid-point in dB
-            g = self.subdev.gain_range()
-            options.gain = float(g[0]+g[1])/2
-
-        if options.freq is None:
-            if ((self.subdev.dbid()==usrp_dbid.BASIC_RX) or (self.subdev.dbid()==usrp_dbid.LF_RX)):
-              #for Basic RX and LFRX if no freq is specified you probably want 0.0 Hz and not 45 GHz
-              options.freq=0.0
-            else:
-              # if no freq was specified, use the mid-point
-              r = self.subdev.freq_range()
-              options.freq = float(r[0]+r[1])/2
-
-        self.set_gain(options.gain)
-
-        if self.show_debug_info:
-            self.myform['decim'].set_value(self.u.decim_rate())
-            self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-            self.myform['dbname'].set_value(self.subdev.name())
-            self.myform['baseband'].set_value(0)
-            self.myform['ddc'].set_value(0)
-            if self.num_inputs==2:
-              self.myform['baseband2'].set_value(0)
-              self.myform['ddc2'].set_value(0)              
-                        
-        if not(self.set_freq(options.freq)):
-            self._set_status_msg("Failed to set initial frequency")
-        if self.num_inputs==2:
-          if not(self.set_freq2(options.freq)):
-            self._set_status_msg("Failed to set initial frequency for channel 2")          
-
-
-    def _set_status_msg(self, msg):
-        self.frame.GetStatusBar().SetStatusText(msg, 0)
-
-    def _build_gui(self, vbox):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-
-        def _form_set_freq2(kv):
-            return self.set_freq2(kv['freq2'])            
-        vbox.Add(self.scope.win, 10, wx.EXPAND)
-        
-        # add control area at the bottom
-        self.myform = myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0, 0)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=hbox, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-        if self.num_inputs==2:
-          myform['freq2'] = form.float_field(
-              parent=self.panel, sizer=hbox, label="Center freq2", weight=1,
-              callback=myform.check_input_and_call(_form_set_freq2, self._set_status_msg))          
-          hbox.Add((5,0), 0, 0)
-        g = self.subdev.gain_range()
-        myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
-                                           weight=3,
-                                           min=int(g[0]), max=int(g[1]),
-                                           callback=self.set_gain)
-
-        hbox.Add((5,0), 0, 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        self._build_subpanel(vbox)
-
-    def _build_subpanel(self, vbox_arg):
-        # build a secondary information panel (sometimes hidden)
-
-        # FIXME figure out how to have this be a subpanel that is always
-        # created, but has its visibility controlled by foo.Show(True/False)
-        
-        def _form_set_decim(kv):
-            return self.set_decim(kv['decim'])
-
-        if not(self.show_debug_info):
-            return
-
-        panel = self.panel
-        vbox = vbox_arg
-        myform = self.myform
-
-        #panel = wx.Panel(self.panel, -1)
-        #vbox = wx.BoxSizer(wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-
-        myform['decim'] = form.int_field(
-            parent=panel, sizer=hbox, label="Decim",
-            callback=myform.check_input_and_call(_form_set_decim, self._set_status_msg))
-
-        hbox.Add((5,0), 1)
-        myform['fs@usb'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Fs@USB")
-
-        hbox.Add((5,0), 1)
-        myform['dbname'] = form.static_text_field(
-            parent=panel, sizer=hbox)
-
-        hbox.Add((5,0), 1)
-        myform['baseband'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="Analog BB")
-
-        hbox.Add((5,0), 1)
-        myform['ddc'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC")
-        if self.num_inputs==2:
-          hbox.Add((1,0), 1)
-          myform['baseband2'] = form.static_float_field(
-              parent=panel, sizer=hbox, label="BB2")
-          hbox.Add((1,0), 1)
-          myform['ddc2'] = form.static_float_field(
-            parent=panel, sizer=hbox, label="DDC2")          
-
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        r = usrp.tune(self.u, 0, self.subdev, target_freq)
-        
-        if r:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-            if self.show_debug_info:
-                self.myform['baseband'].set_value(r.baseband_freq)
-                self.myform['ddc'].set_value(r.dxc_freq)
-            return True
-
-        return False
-
-    def set_freq2(self, target_freq):
-        """
-        Set the center frequency of we're interested in for the second channel.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        r = usrp.tune(self.u, 1, self.subdev, target_freq)
-        
-        if r:
-            self.myform['freq2'].set_value(target_freq)     # update displayed value
-            if self.show_debug_info:
-                self.myform['baseband2'].set_value(r.baseband_freq)
-                self.myform['ddc2'].set_value(r.dxc_freq)
-            return True
-
-        return False
-
-    def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-        self.subdev.set_gain(gain)
-
-    def set_decim(self, decim):
-        ok = self.u.set_decim_rate(decim)
-        if not ok:
-            print "set_decim failed"
-        input_rate = self.u.adc_freq() / self.u.decim_rate()
-        self.scope.set_sample_rate(input_rate)
-        if self.show_debug_info:  # update displayed values
-            self.myform['decim'].set_value(self.u.decim_rate())
-            self.myform['fs@usb'].set_value(self.u.adc_freq() / self.u.decim_rate())
-        return ok
-
-def main ():
-    app = stdgui2.stdapp(app_top_block, "USRP O'scope", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/gr-video-sdl/CMakeLists.txt b/gr-video-sdl/CMakeLists.txt
new file mode 100644
index 000000000..6b1d7f79e
--- /dev/null
+++ b/gr-video-sdl/CMakeLists.txt
@@ -0,0 +1,99 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+find_package(SDL)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-video-sdl" ENABLE_GR_VIDEO_SDL
+    SDL_FOUND
+    Boost_FOUND
+    ENABLE_GR_CORE
+)
+
+GR_SET_GLOBAL(GR_VIDEO_SDL_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_VIDEO_SDL)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_VIDEO_SDL_DESCRIPTION "GNU Radio Video SDL Blocks")
+
+CPACK_COMPONENT("video_sdl_runtime"
+    GROUP        "Video SDL"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("video_sdl_devel"
+    GROUP        "Video SDL"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("video_sdl_python"
+    GROUP        "Video SDL"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "core_python;video_sdl_runtime"
+)
+
+CPACK_COMPONENT("video_sdl_swig"
+    GROUP        "Video SDL"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;video_sdl_python;video_sdl_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(src)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-video-sdl.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "video_sdl_devel"
+)
+
+endif(ENABLE_GR_VIDEO_SDL)
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
new file mode 100644
index 000000000..9d0c2c457
--- /dev/null
+++ b/gr-video-sdl/src/CMakeLists.txt
@@ -0,0 +1,108 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_VIDEO_SDL_INCLUDE_DIRS}
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+include_directories(${SDL_INCLUDE_DIR})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gr_video_sdl_sources
+    video_sdl_sink_uc.cc
+    video_sdl_sink_s.cc
+)
+
+list(APPEND video_sdl_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+    ${SDL_LIBRARY}
+)
+
+add_library(gnuradio-video-sdl SHARED ${gr_video_sdl_sources})
+target_link_libraries(gnuradio-video-sdl ${video_sdl_libs})
+GR_LIBRARY_FOO(gnuradio-video-sdl RUNTIME_COMPONENT "video_sdl_runtime" DEVEL_COMPONENT "video_sdl_devel")
+
+########################################################################
+# Install public header files
+########################################################################
+install(FILES
+    video_sdl_api.h
+    video_sdl_sink_uc.h
+    video_sdl_sink_s.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "video_sdl_devel"
+)
+
+########################################################################
+# Setup swig generation
+########################################################################
+if(ENABLE_PYTHON)
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_COMEDI_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_LIBRARIES gnuradio-video-sdl)
+
+GR_SWIG_MAKE(video_sdl video_sdl.i)
+
+GR_SWIG_INSTALL(
+    TARGETS video_sdl
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio
+    COMPONENT "video_sdl_python"
+)
+
+install(
+    FILES video_sdl.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "video_sdl_swig"
+)
+
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+if(ENABLE_TESTING AND ENABLE_PYTHON)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-video-sdl/src
+    )
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-video-sdl)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING AND ENABLE_PYTHON)
diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 04c39542a..496671bea 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -33,6 +33,7 @@ noinst_PYTHON =				\
 	qa_video_sdl.py
 
 grinclude_HEADERS =			\
+	video_sdl_api.h			\
 	video_sdl_sink_uc.h		\
 	video_sdl_sink_s.h
 
diff --git a/gr-video-sdl/src/Makefile.swig.gen b/gr-video-sdl/src/Makefile.swig.gen
index d69203f79..ac66bc9a2 100644
--- a/gr-video-sdl/src/Makefile.swig.gen
+++ b/gr-video-sdl/src/Makefile.swig.gen
@@ -105,7 +105,7 @@ _video_sdl_la_CXXFLAGS =			\
 	$(video_sdl_la_swig_cxxflags)
 
 python/video_sdl.cc: video_sdl.py
-video_sdl.py: video_sdl.i
+video_sdl.py: video_sdl.i 
 
 # Include the python dependencies for this file
 -include python/video_sdl.d
diff --git a/gr-video-sdl/src/video_sdl_api.h b/gr-video-sdl/src/video_sdl_api.h
new file mode 100644
index 000000000..5418f86f0
--- /dev/null
+++ b/gr-video-sdl/src/video_sdl_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_VIDEO_SDL_API_H
+#define INCLUDED_VIDEO_SDL_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_video_sdl_EXPORTS
+#  define VIDEO_SDL_API __GR_ATTR_EXPORT
+#else
+#  define VIDEO_SDL_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_VIDEO_SDL_API_H */
diff --git a/gr-video-sdl/src/video_sdl_sink_s.h b/gr-video-sdl/src/video_sdl_sink_s.h
index 9d3651402..2ec15e36d 100644
--- a/gr-video-sdl/src/video_sdl_sink_s.h
+++ b/gr-video-sdl/src/video_sdl_sink_s.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_VIDEO_SDL_SINK_S_H
 #define INCLUDED_VIDEO_SDL_SINK_S_H
 
+#include <video_sdl_api.h>
 #include <gr_sync_block.h>
 #include <string>
 #include <SDL.h>
@@ -34,7 +35,7 @@
 class video_sdl_sink_s;
 typedef boost::shared_ptr<video_sdl_sink_s> video_sdl_sink_s_sptr;
 
-video_sdl_sink_s_sptr
+VIDEO_SDL_API video_sdl_sink_s_sptr
 video_sdl_make_sink_s (double framerate,int width=640, int height=480,unsigned int format=IMGFMT_YV12,int dst_width=-1,int dst_height=-1);
 
 /*!
@@ -47,8 +48,8 @@ video_sdl_make_sink_s (double framerate,int width=640, int height=480,unsigned i
  * Input samples must be in the range [0,255].
  */
 
-class video_sdl_sink_s : public gr_sync_block {
-  friend video_sdl_sink_s_sptr
+class VIDEO_SDL_API video_sdl_sink_s : public gr_sync_block {
+  friend VIDEO_SDL_API video_sdl_sink_s_sptr
   video_sdl_make_sink_s (double framerate,int width, int height,unsigned int format,int dst_width,int dst_height);
 
   int		d_chunk_size;
diff --git a/gr-video-sdl/src/video_sdl_sink_uc.h b/gr-video-sdl/src/video_sdl_sink_uc.h
index 955b003f8..435ddaa8f 100644
--- a/gr-video-sdl/src/video_sdl_sink_uc.h
+++ b/gr-video-sdl/src/video_sdl_sink_uc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_VIDEO_SDL_SINK_UC_H
 #define INCLUDED_VIDEO_SDL_SINK_UC_H
 
+#include <video_sdl_api.h>
 #include <gr_sync_block.h>
 #include <string>
 #include <SDL.h>
@@ -34,7 +35,7 @@
 class video_sdl_sink_uc;
 typedef boost::shared_ptr<video_sdl_sink_uc> video_sdl_sink_uc_sptr;
 
-video_sdl_sink_uc_sptr
+VIDEO_SDL_API video_sdl_sink_uc_sptr
 video_sdl_make_sink_uc (double framerate,int width=640, int height=480,unsigned int format=IMGFMT_YV12,int dst_width=-1,int dst_height=-1);
 
 /*!
@@ -47,8 +48,8 @@ video_sdl_make_sink_uc (double framerate,int width=640, int height=480,unsigned
  * Input samples must be in the range [0,255].
  */
 
-class video_sdl_sink_uc : public gr_sync_block {
-  friend video_sdl_sink_uc_sptr
+class VIDEO_SDL_API video_sdl_sink_uc : public gr_sync_block {
+  friend VIDEO_SDL_API video_sdl_sink_uc_sptr
   video_sdl_make_sink_uc (double framerate,int width, int height,unsigned int format,int dst_width,int dst_height);
 
   int		d_chunk_size;
diff --git a/gr-cvsd-vocoder/.gitignore b/gr-vocoder/.gitignore
index a37fc0c1a..a37fc0c1a 100644
--- a/gr-cvsd-vocoder/.gitignore
+++ b/gr-vocoder/.gitignore
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
new file mode 100644
index 000000000..f32ecdd9c
--- /dev/null
+++ b/gr-vocoder/CMakeLists.txt
@@ -0,0 +1,110 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gr-vocoder" ENABLE_GR_VOCODER
+    Boost_FOUND
+    ENABLE_GR_CORE
+)
+
+GR_SET_GLOBAL(GR_VOCODER_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_VOCODER)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_VOCODER_DESCRIPTION "GNU Radio Vocoder Blocks")
+
+CPACK_COMPONENT("vocoder_runtime"
+    GROUP        "Vocoder"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Dynamic link libraries"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("vocoder_devel"
+    GROUP        "Vocoder"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("vocoder_python"
+    GROUP        "Vocoder"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime"
+    DEPENDS      "core_python;vocoder_runtime"
+)
+
+CPACK_COMPONENT("vocoder_examples"
+    GROUP        "Vocoder"
+    DISPLAY_NAME "Examples"
+    DESCRIPTION  "Python examples for vocoder"
+    DEPENDS      "vocoder_python"
+)
+
+CPACK_COMPONENT("vocoder_swig"
+    GROUP        "Vocoder"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;vocoder_python;vocoder_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(lib)
+add_subdirectory(include)
+add_subdirectory(doc)
+if(ENABLE_PYTHON)
+    add_subdirectory(swig)
+    add_subdirectory(python)
+    add_subdirectory(examples)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-vocoder.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-vocoder.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-vocoder.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "vocoder_devel"
+)
+
+endif(ENABLE_GR_VOCODER)
diff --git a/gr-usrp/Makefile.am b/gr-vocoder/Makefile.am
index be4035dd4..c280358a8 100644
--- a/gr-usrp/Makefile.am
+++ b/gr-vocoder/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2011 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,15 +21,11 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST += \
-	README_MULTI_USRP.txt \
-	gnuradio-usrp.pc.in
-
-SUBDIRS = src apps
+SUBDIRS = include lib python swig grc apps examples doc
 
 if PYTHON
-SUBDIRS += grc
+SUBDIRS += python swig 
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnuradio-usrp.pc
+dist_pkgconfig_DATA = gnuradio-vocoder.pc
diff --git a/gr-gpio/src/fpga/.gitignore b/gr-vocoder/apps/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gr-gpio/src/fpga/.gitignore
+++ b/gr-vocoder/apps/.gitignore
diff --git a/gr-sounder/doc/Makefile.am b/gr-vocoder/apps/Makefile.am
index 714ed52b9..b1c7b44d5 100644
--- a/gr-sounder/doc/Makefile.am
+++ b/gr-vocoder/apps/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,3 +21,4 @@
 
 include $(top_srcdir)/Makefile.common
 
+SUBDIRS = 
diff --git a/gr-gpio/src/fpga/include/.gitignore b/gr-vocoder/doc/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gr-gpio/src/fpga/include/.gitignore
+++ b/gr-vocoder/doc/.gitignore
diff --git a/gr-vocoder/doc/CMakeLists.txt b/gr-vocoder/doc/CMakeLists.txt
new file mode 100644
index 000000000..bd610a372
--- /dev/null
+++ b/gr-vocoder/doc/CMakeLists.txt
@@ -0,0 +1,23 @@
+# 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.
+
+install(
+    FILES README.vocoder
+    DESTINATION ${GR_PKG_DOC_DIR}
+)
diff --git a/gr-radar-mono/Makefile.am b/gr-vocoder/doc/Makefile.am
index 98e3daf02..a277264fe 100644
--- a/gr-radar-mono/Makefile.am
+++ b/gr-vocoder/doc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,5 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST += README
-SUBDIRS = src doc
+SUBDIRS = 
+
+dist_gr_doc_DATA =		\
+	README.vocoder
diff --git a/gr-vocoder/doc/README.vocoder b/gr-vocoder/doc/README.vocoder
new file mode 100644
index 000000000..912d664ad
--- /dev/null
+++ b/gr-vocoder/doc/README.vocoder
@@ -0,0 +1,12 @@
+This is the gr-vocoder package. This package includes the various
+vocoder blocks in GNU Radio. To use the vocoder blocks, the Python
+namespaces is in gnuradio.vocoder, which would be normally imported
+as:
+
+    from gnuradio import vocoder
+
+See the Doxygen documentation for details about the blocks available
+in this package. A quick listing of the details can be found in Python
+after importing by using: 
+
+    help(vocoder)
diff --git a/gr-vocoder/doc/vocoder.dox b/gr-vocoder/doc/vocoder.dox
new file mode 100644
index 000000000..ff1c4b9dd
--- /dev/null
+++ b/gr-vocoder/doc/vocoder.dox
@@ -0,0 +1,24 @@
+/*! \page page_vocoder Voice Coders and Decoders (Vocoders)
+
+\section Introduction
+
+This is the gr-vocoder package. It contains all available vocoders in
+GNU Radio. The Python namespaces is in gnuradio.vocoder, which would be
+normally imported as:
+
+\code
+    from gnuradio import vocoder
+\endcode
+
+See the Doxygen documentation for details about the blocks available
+in this package. The relevant blocks are listed in the \ref
+vocoder_blk group.
+
+A quick listing of the details can be found in Python after importing
+by using:
+
+\code
+    help(vocoder)
+\endcode
+
+*/
diff --git a/gr-radar-mono/src/fpga/.gitignore b/gr-vocoder/examples/.gitignore
index b336cc7ce..0a864cc38 100644
--- a/gr-radar-mono/src/fpga/.gitignore
+++ b/gr-vocoder/examples/.gitignore
@@ -1,2 +1,3 @@
 /Makefile
 /Makefile.in
+
diff --git a/gr-vocoder/examples/CMakeLists.txt b/gr-vocoder/examples/CMakeLists.txt
new file mode 100644
index 000000000..76a757826
--- /dev/null
+++ b/gr-vocoder/examples/CMakeLists.txt
@@ -0,0 +1,37 @@
+# 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.
+
+########################################################################
+# Install Examples
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    PROGRAMS
+    alaw_audio_loopback.py
+    codec2_audio_loopback.py
+    cvsd_audio_loopback.py
+    g721_audio_loopback.py
+    g723_24_audio_loopback.py
+    g723_40_audio_loopback.py
+    gsm_audio_loopback.py
+    ulaw_audio_loopback.py
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/vocoder
+    COMPONENT "vocoder_examples"
+)
diff --git a/gr-vocoder/examples/Makefile.am b/gr-vocoder/examples/Makefile.am
new file mode 100644
index 000000000..32176cf23
--- /dev/null
+++ b/gr-vocoder/examples/Makefile.am
@@ -0,0 +1,34 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+ourdatadir = $(exampledir)/vocoder
+
+dist_ourdata_SCRIPTS = \
+	alaw_audio_loopback.py \
+	codec2_audio_loopback.py \
+	cvsd_audio_loopback.py \
+	g721_audio_loopback.py \
+	g723_24_audio_loopback.py \
+	g723_40_audio_loopback.py \
+	gsm_audio_loopback.py \
+	ulaw_audio_loopback.py
diff --git a/gr-gsm-fr-vocoder/src/python/encdec.py b/gr-vocoder/examples/alaw_audio_loopback.py
index 94e4e5b82..8fdd64d44 100755
--- a/gr-gsm-fr-vocoder/src/python/encdec.py
+++ b/gr-vocoder/examples/alaw_audio_loopback.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2007 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,15 +22,15 @@
 
 from gnuradio import gr
 from gnuradio import audio
-from gnuradio.vocoder import gsm_full_rate
+from gnuradio import vocoder
 
 def build_graph():
     tb = gr.top_block()
     src = audio.source(8000)
     src_scale = gr.multiply_const_ff(32767)
     f2s = gr.float_to_short ()
-    enc = gsm_full_rate.encode_sp()
-    dec = gsm_full_rate.decode_ps()
+    enc = vocoder.alaw_encode_sb()
+    dec = vocoder.alaw_decode_bs()
     s2f = gr.short_to_float ()
     sink_scale = gr.multiply_const_ff(1.0/32767.)
     sink = audio.sink(8000)
@@ -42,3 +42,4 @@ if __name__ == '__main__':
     tb.start()
     raw_input ('Press Enter to exit: ')
     tb.stop()
+    tb.wait()
diff --git a/gr-usrp/apps/usrp_test_counting.py b/gr-vocoder/examples/codec2_audio_loopback.py
index a8300afe2..54b453f8a 100755
--- a/gr-usrp/apps/usrp_test_counting.py
+++ b/gr-vocoder/examples/codec2_audio_loopback.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2007 Free Software Foundation, Inc.
+# Copyright 2005,2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,34 +20,26 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-"""
-Check Rx path or USRP Rev 1.
-
-This configures the USRP to return a periodic sequence of integers
-"""
-
 from gnuradio import gr
-from gnuradio import usrp
-
-def build_graph ():
-    rx_decim  = 32
-    
-    tb = gr.top_block ()
-    usrp_rx = usrp.source_s (0, rx_decim, 1, 0x32103210, usrp.FPGA_MODE_COUNTING)
-    sink = gr.check_counting_s ()
-    tb.connect (usrp_rx, sink)
-
-    # file_sink = gr.file_sink (gr.sizeof_short, 'counting.dat')
-    # tb.connect (usrp_rx, file_sink)
+from gnuradio import audio
+from gnuradio import vocoder
 
+def build_graph():
+    tb = gr.top_block()
+    src = audio.source(8000)
+    src_scale = gr.multiply_const_ff(32767)
+    f2s = gr.float_to_short ()
+    enc = vocoder.codec2_encode_sp()
+    dec = vocoder.codec2_decode_ps()
+    s2f = gr.short_to_float ()
+    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    sink = audio.sink(8000)
+    tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
     return tb
-    
-def main ():
-    tb = build_graph ()
-    try:
-        tb.run()
-    except KeyboardInterrupt:
-        pass
 
 if __name__ == '__main__':
-    main ()
+    tb = build_graph()
+    tb.start()
+    raw_input ('Press Enter to exit: ')
+    tb.stop()
+    tb.wait()
diff --git a/gr-cvsd-vocoder/src/python/encdec.py b/gr-vocoder/examples/cvsd_audio_loopback.py
index 34c153b06..7f2a00dbf 100755
--- a/gr-cvsd-vocoder/src/python/encdec.py
+++ b/gr-vocoder/examples/cvsd_audio_loopback.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,7 +22,7 @@
 
 from gnuradio import gr, blks2
 from gnuradio import audio
-from gnuradio.vocoder import cvsd_vocoder
+from gnuradio import vocoder
 
 def build_graph():
     sample_rate = 8000
@@ -35,8 +35,8 @@ def build_graph():
     interp = blks2.rational_resampler_fff(8, 1)
     f2s = gr.float_to_short ()
 
-    enc = cvsd_vocoder.encode_sb()
-    dec = cvsd_vocoder.decode_bs()
+    enc = vocoder.cvsd_encode_sb()
+    dec = vocoder.cvsd_decode_bs()
 
     s2f = gr.short_to_float ()
     decim = blks2.rational_resampler_fff(1, 8)
@@ -62,8 +62,7 @@ def build_graph():
 
 if __name__ == '__main__':
     tb = build_graph()
-    print "Enter CTRL-C to stop"
-    try:
-	tb.run()
-    except KeyboardInterrupt:
-	pass
+    tb.start()
+    raw_input ('Press Enter to exit: ')
+    tb.stop()
+    tb.wait()
diff --git a/gr-vocoder/examples/g721_audio_loopback.py b/gr-vocoder/examples/g721_audio_loopback.py
new file mode 100755
index 000000000..8b5bc8f33
--- /dev/null
+++ b/gr-vocoder/examples/g721_audio_loopback.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr
+from gnuradio import audio
+from gnuradio import vocoder
+
+def build_graph():
+    tb = gr.top_block()
+    src = audio.source(8000)
+    src_scale = gr.multiply_const_ff(32767)
+    f2s = gr.float_to_short ()
+    enc = vocoder.g721_encode_sb()
+    dec = vocoder.g721_decode_bs()
+    s2f = gr.short_to_float ()
+    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    sink = audio.sink(8000)
+    tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
+    return tb
+
+if __name__ == '__main__':
+    tb = build_graph()
+    tb.start()
+    raw_input ('Press Enter to exit: ')
+    tb.stop()
+    tb.wait()
diff --git a/gr-vocoder/examples/g723_24_audio_loopback.py b/gr-vocoder/examples/g723_24_audio_loopback.py
new file mode 100755
index 000000000..f125282dc
--- /dev/null
+++ b/gr-vocoder/examples/g723_24_audio_loopback.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr
+from gnuradio import audio
+from gnuradio import vocoder
+
+def build_graph():
+    tb = gr.top_block()
+    src = audio.source(8000)
+    src_scale = gr.multiply_const_ff(32767)
+    f2s = gr.float_to_short ()
+    enc = vocoder.g723_24_encode_sb()
+    dec = vocoder.g723_24_decode_bs()
+    s2f = gr.short_to_float ()
+    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    sink = audio.sink(8000)
+    tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
+    return tb
+
+if __name__ == '__main__':
+    tb = build_graph()
+    tb.start()
+    raw_input ('Press Enter to exit: ')
+    tb.stop()
+    tb.wait()
diff --git a/gr-vocoder/examples/g723_40_audio_loopback.py b/gr-vocoder/examples/g723_40_audio_loopback.py
new file mode 100755
index 000000000..cd2ea5ff1
--- /dev/null
+++ b/gr-vocoder/examples/g723_40_audio_loopback.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr
+from gnuradio import audio
+from gnuradio import vocoder
+
+def build_graph():
+    tb = gr.top_block()
+    src = audio.source(8000)
+    src_scale = gr.multiply_const_ff(32767)
+    f2s = gr.float_to_short ()
+    enc = vocoder.g723_40_encode_sb()
+    dec = vocoder.g723_40_decode_bs()
+    s2f = gr.short_to_float ()
+    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    sink = audio.sink(8000)
+    tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
+    return tb
+
+if __name__ == '__main__':
+    tb = build_graph()
+    tb.start()
+    raw_input ('Press Enter to exit: ')
+    tb.stop()
+    tb.wait()
diff --git a/gr-vocoder/examples/gsm_audio_loopback.py b/gr-vocoder/examples/gsm_audio_loopback.py
new file mode 100755
index 000000000..f4e96f471
--- /dev/null
+++ b/gr-vocoder/examples/gsm_audio_loopback.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#
+# Copyright 2005,2007,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.
+# 
+
+from gnuradio import gr
+from gnuradio import audio
+from gnuradio import vocoder
+
+def build_graph():
+    tb = gr.top_block()
+    src = audio.source(8000)
+    src_scale = gr.multiply_const_ff(32767)
+    f2s = gr.float_to_short ()
+    enc = vocoder.gsm_fr_encode_sp()
+    dec = vocoder.gsm_fr_decode_ps()
+    s2f = gr.short_to_float ()
+    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    sink = audio.sink(8000)
+    tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
+    return tb
+
+if __name__ == '__main__':
+    tb = build_graph()
+    tb.start()
+    raw_input ('Press Enter to exit: ')
+    tb.stop()
+    tb.wait()
diff --git a/gr-vocoder/examples/ulaw_audio_loopback.py b/gr-vocoder/examples/ulaw_audio_loopback.py
new file mode 100755
index 000000000..afe0921fa
--- /dev/null
+++ b/gr-vocoder/examples/ulaw_audio_loopback.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr
+from gnuradio import audio
+from gnuradio import vocoder
+
+def build_graph():
+    tb = gr.top_block()
+    src = audio.source(8000)
+    src_scale = gr.multiply_const_ff(32767)
+    f2s = gr.float_to_short ()
+    enc = vocoder.ulaw_encode_sb()
+    dec = vocoder.ulaw_decode_bs()
+    s2f = gr.short_to_float ()
+    sink_scale = gr.multiply_const_ff(1.0/32767.)
+    sink = audio.sink(8000)
+    tb.connect(src, src_scale, f2s, enc, dec, s2f, sink_scale, sink)
+    return tb
+
+if __name__ == '__main__':
+    tb = build_graph()
+    tb.start()
+    raw_input ('Press Enter to exit: ')
+    tb.stop()
+    tb.wait()
diff --git a/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in b/gr-vocoder/gnuradio-vocoder.pc.in
index f5f0c2e64..7ff4420b6 100644
--- a/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in
+++ b/gr-vocoder/gnuradio-vocoder.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: gnuradio-cvsd-vocoder
-Description: GNU Radio blocks implementing a CVSD vocoder
+Name: gnuradio-vocoder
+Description: GNU Radio blocks implementing voice codecs
 Requires: gnuradio-core
 Version: @LIBVER@
-Libs: -L${libdir} -lgnuradio-cvsd-vocoder
+Libs: -L${libdir} -lgnuradio-vocoder
 Cflags: -I${includedir}
diff --git a/gr-cvsd-vocoder/src/lib/.gitignore b/gr-vocoder/grc/.gitignore
index ea0a01678..d2e2e9ce8 100644
--- a/gr-cvsd-vocoder/src/lib/.gitignore
+++ b/gr-vocoder/grc/.gitignore
@@ -2,8 +2,6 @@
 /Makefile.in
 /.libs
 /.deps
-/cvsd_vocoder.cc
-/cvsd_vocoder.py*
 /gnuradio
 /guile
 /python
diff --git a/gr-radar-mono/src/lib/Makefile.am b/gr-vocoder/grc/Makefile.am
index 4f35e3aef..b1c7b44d5 100644
--- a/gr-radar-mono/src/lib/Makefile.am
+++ b/gr-vocoder/grc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,3 +20,5 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+
+SUBDIRS = 
diff --git a/gr-gpio/src/fpga/lib/.gitignore b/gr-vocoder/include/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gr-gpio/src/fpga/lib/.gitignore
+++ b/gr-vocoder/include/.gitignore
diff --git a/gr-vocoder/include/CMakeLists.txt b/gr-vocoder/include/CMakeLists.txt
new file mode 100644
index 000000000..23099f59e
--- /dev/null
+++ b/gr-vocoder/include/CMakeLists.txt
@@ -0,0 +1,43 @@
+# 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.
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+    vocoder_api.h
+    vocoder_alaw_decode_bs.h
+    vocoder_alaw_encode_sb.h
+    vocoder_codec2_decode_ps.h
+    vocoder_codec2_encode_sp.h
+    vocoder_cvsd_decode_bs.h
+    vocoder_cvsd_encode_sb.h
+    vocoder_g721_decode_bs.h
+    vocoder_g721_encode_sb.h
+    vocoder_g723_24_decode_bs.h
+    vocoder_g723_24_encode_sb.h
+    vocoder_g723_40_decode_bs.h
+    vocoder_g723_40_encode_sb.h
+    vocoder_gsm_fr_decode_ps.h
+    vocoder_gsm_fr_encode_sp.h
+    vocoder_ulaw_decode_bs.h
+    vocoder_ulaw_encode_sb.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "vocoder_devel"
+)
diff --git a/gr-vocoder/include/Makefile.am b/gr-vocoder/include/Makefile.am
new file mode 100644
index 000000000..b579333a3
--- /dev/null
+++ b/gr-vocoder/include/Makefile.am
@@ -0,0 +1,42 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+# C/C++ headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS = \
+	vocoder_api.h \
+	vocoder_alaw_decode_bs.h \
+	vocoder_alaw_encode_sb.h \
+	vocoder_codec2_decode_ps.h \
+	vocoder_codec2_encode_sp.h \
+	vocoder_cvsd_decode_bs.h \
+	vocoder_cvsd_encode_sb.h \
+	vocoder_g721_decode_bs.h \
+	vocoder_g721_encode_sb.h \
+	vocoder_g723_24_decode_bs.h \
+	vocoder_g723_24_encode_sb.h \
+	vocoder_g723_40_decode_bs.h \
+	vocoder_g723_40_encode_sb.h \
+	vocoder_gsm_fr_decode_ps.h \
+	vocoder_gsm_fr_encode_sp.h \
+	vocoder_ulaw_decode_bs.h \
+	vocoder_ulaw_encode_sb.h
diff --git a/gr-usrp2/src/usrp2_sink_32fc.h b/gr-vocoder/include/vocoder_alaw_decode_bs.h
index b63f96871..f20dfefdb 100644
--- a/gr-usrp2/src/usrp2_sink_32fc.h
+++ b/gr-vocoder/include/vocoder_alaw_decode_bs.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,41 +20,37 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_USRP2_SINK_32FC_H
-#define INCLUDED_USRP2_SINK_32FC_H
+#ifndef INCLUDED_VOCODER_ALAW_DECODE_BS_H
+#define INCLUDED_VOCODER_ALAW_DECODE_BS_H
 
-#include <usrp2_sink_base.h>
+#include <vocoder_api.h>
+#include <gr_sync_block.h>
 
-class usrp2_sink_32fc;
-typedef boost::shared_ptr<usrp2_sink_32fc> usrp2_sink_32fc_sptr;
+class vocoder_alaw_decode_bs;
 
-usrp2_sink_32fc_sptr
-usrp2_make_sink_32fc(const std::string &ifc="eth0",
-		     const std::string &mac="")
-  throw (std::runtime_error);
+typedef boost::shared_ptr<vocoder_alaw_decode_bs> vocoder_alaw_decode_bs_sptr;
+
+VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs();
 
 /*!
- * \ingroup sink_blk
- * \ingroup usrp2
+ * \brief This block performs alaw audio decoding. 
+ *
+ * \ingroup vocoder_blk
  */
-class usrp2_sink_32fc : public usrp2_sink_base 
+
+class VOCODER_API vocoder_alaw_decode_bs : public gr_sync_block
 {
 private:
-  friend usrp2_sink_32fc_sptr
-  usrp2_make_sink_32fc(const std::string &ifc,
-		       const std::string &mac) 
-    throw (std::runtime_error);
-  
-protected:
-  usrp2_sink_32fc(const std::string &ifc, const std::string &mac) 
-    throw (std::runtime_error);
-
-public:
-  ~usrp2_sink_32fc();
+  friend VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs();
+
+  vocoder_alaw_decode_bs();
+
+ public:
+  ~vocoder_alaw_decode_bs();
 
   int work(int noutput_items,
 	   gr_vector_const_void_star &input_items,
 	   gr_vector_void_star &output_items);
 };
 
-#endif /* INCLUDED_USRP2_SINK_32FC_H */
+#endif /* INCLUDED_VOCODER_ALAW_DECODE_BS_H */
diff --git a/gr-usrp2/src/usrp2_sink_16sc.h b/gr-vocoder/include/vocoder_alaw_encode_sb.h
index faacc447a..c00080fb7 100644
--- a/gr-usrp2/src/usrp2_sink_16sc.h
+++ b/gr-vocoder/include/vocoder_alaw_encode_sb.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,41 +20,36 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_USRP2_SINK_16SC_H
-#define INCLUDED_USRP2_SINK_16SC_H
+#ifndef INCLUDED_VOCODER_ALAW_ENCODER_SB_H
+#define INCLUDED_VOCODER_ALAW_ENCODER_SB_H
 
-#include <usrp2_sink_base.h>
+#include <vocoder_api.h>
+#include <gr_sync_block.h>
 
-class usrp2_sink_16sc;
-typedef boost::shared_ptr<usrp2_sink_16sc> usrp2_sink_16sc_sptr;
+class vocoder_alaw_encode_sb;
 
-usrp2_sink_16sc_sptr
-usrp2_make_sink_16sc(const std::string &ifc="eth0",
-		     const std::string &mac="")
-  throw (std::runtime_error);
+typedef boost::shared_ptr<vocoder_alaw_encode_sb> vocoder_alaw_encode_sb_sptr;
+
+VOCODER_API vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb();
 
 /*!
- * \ingroup sink_blk
- * \ingroup usrp2
+ * \brief This block performs g.711 alaw audio encoding. 
+ *
+ * \ingroup vocoder_blk
  */
-class usrp2_sink_16sc : public usrp2_sink_base 
+class VOCODER_API vocoder_alaw_encode_sb : public gr_sync_block
 {
 private:
-  friend usrp2_sink_16sc_sptr
-  usrp2_make_sink_16sc(const std::string &ifc,
-		       const std::string &mac) 
-    throw (std::runtime_error);
-  
-protected:
-  usrp2_sink_16sc(const std::string &ifc, const std::string &mac) 
-    throw (std::runtime_error);
-
-public:
-  ~usrp2_sink_16sc();
+  friend VOCODER_API vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb();
+
+  vocoder_alaw_encode_sb();
+
+ public:
+  ~vocoder_alaw_encode_sb();
 
   int work(int noutput_items,
 	   gr_vector_const_void_star &input_items,
 	   gr_vector_void_star &output_items);
 };
 
-#endif /* INCLUDED_USRP2_SINK_16SC_H */
+#endif /* INCLUDED_VOCODER_ALAW_ENCODE_SB_H */
diff --git a/gr-vocoder/include/vocoder_api.h b/gr-vocoder/include/vocoder_api.h
new file mode 100644
index 000000000..331cf5d0b
--- /dev/null
+++ b/gr-vocoder/include/vocoder_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_VOCODER_API_H
+#define INCLUDED_VOCODER_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_vocoder_EXPORTS
+#  define VOCODER_API __GR_ATTR_EXPORT
+#else
+#  define VOCODER_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_VOCODER_API_H */
diff --git a/gr-vocoder/include/vocoder_codec2_decode_ps.h b/gr-vocoder/include/vocoder_codec2_decode_ps.h
new file mode 100644
index 000000000..7e7ea2d5c
--- /dev/null
+++ b/gr-vocoder/include/vocoder_codec2_decode_ps.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * 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_VOCODER_CODEC2_DECODE_PS_H
+#define INCLUDED_VOCODER_CODEC2_DECODE_PS_H
+
+#include <vocoder_api.h>
+#include <gr_sync_interpolator.h>
+
+class vocoder_codec2_decode_ps;
+typedef boost::shared_ptr<vocoder_codec2_decode_ps> vocoder_codec2_decode_ps_sptr;
+
+VOCODER_API vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps ();
+
+/*!
+ * \brief CODEC2 Vocoder Decoder
+ * \ingroup vocoder_blk
+ */
+class VOCODER_API vocoder_codec2_decode_ps : public gr_sync_interpolator {
+  void *d_codec2;
+
+  friend VOCODER_API vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps ();
+  vocoder_codec2_decode_ps ();
+
+public:
+  ~vocoder_codec2_decode_ps ();
+
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_VOCODER_CODEC2_DECODE_PS_H */
diff --git a/gr-vocoder/include/vocoder_codec2_encode_sp.h b/gr-vocoder/include/vocoder_codec2_encode_sp.h
new file mode 100644
index 000000000..8d8588daf
--- /dev/null
+++ b/gr-vocoder/include/vocoder_codec2_encode_sp.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005 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_VOCODER_CODEC2_ENCODE_SP_H
+#define INCLUDED_VOCODER_CODEC2_ENCODE_SP_H
+
+#include <vocoder_api.h>
+#include <gr_sync_decimator.h>
+
+class vocoder_codec2_encode_sp;
+typedef boost::shared_ptr<vocoder_codec2_encode_sp> vocoder_codec2_encode_sp_sptr;
+
+VOCODER_API vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp ();
+
+/*!
+ * \brief CODEC2 Vocoder Encoder
+ * \ingroup vocoder_blk
+ */
+class VOCODER_API vocoder_codec2_encode_sp : public gr_sync_decimator {
+  void *d_codec2;
+
+  friend VOCODER_API vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp ();
+  vocoder_codec2_encode_sp ();
+
+public:
+  ~vocoder_codec2_encode_sp ();
+
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_VOCODER_CODEC2_ENCODE_SP_H */
diff --git a/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.h b/gr-vocoder/include/vocoder_cvsd_decode_bs.h
index f7b50909f..2ad2f096f 100644
--- a/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.h
+++ b/gr-vocoder/include/vocoder_cvsd_decode_bs.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -19,20 +19,24 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef INCLUDED_CVSD_DECODE_BS_H
-#define INCLUDED_CVSD_DECODE_BS_H
 
+#ifndef INCLUDED_VOCODER_CVSD_DECODE_BS_H
+#define INCLUDED_VOCODER_CVSD_DECODE_BS_H
+
+#include <vocoder_api.h>
 #include <gr_sync_interpolator.h>
 
-class cvsd_decode_bs;
+class vocoder_cvsd_decode_bs;
 
-typedef boost::shared_ptr<cvsd_decode_bs> cvsd_decode_bs_sptr;
+typedef boost::shared_ptr<vocoder_cvsd_decode_bs> vocoder_cvsd_decode_bs_sptr;
 
  /*!
   * \brief Constructor parameters to initialize the CVSD decoder.  The default
   * values are modeled after the Bluetooth standard and should not be changed,
   * except by an advanced user
   *
+  * \ingroup vocoder_blk
+  *
   * \param min_step       Minimum step size used to update the internal reference.  Default: "10"
   * \param max_step       Maximum step size used to update the internal reference.  Default: "1280"
   * \param step_decay     Decay factor applied to step size when there is not a run of J output 1s or 0s.  Default: "0.9990234375"  (i.e. 1-1/1024)
@@ -43,14 +47,14 @@ typedef boost::shared_ptr<cvsd_decode_bs> cvsd_decode_bs_sptr;
   * \param neg_accum_max  Minimum integer value allowed for the internal reference.  Default: "-32767" (-2^15 + 1 or MINSHORT+1)
   *
   */
-cvsd_decode_bs_sptr cvsd_make_decode_bs (short min_step=10,
-					   short max_step=1280,
-					   double step_decay=0.9990234375,
-					   double accum_decay= 0.96875,
-					   int K=32,
-					   int J=4,
-					   short pos_accum_max=32767,
-					   short neg_accum_max=-32767);
+VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step=10,
+							 short max_step=1280,
+							 double step_decay=0.9990234375,
+							 double accum_decay= 0.96875,
+							 int K=32,
+							 int J=4,
+							 short pos_accum_max=32767,
+							 short neg_accum_max=-32767);
 
 /*!
  * \brief This block performs CVSD audio decoding.  Its design and implementation
@@ -104,21 +108,21 @@ cvsd_decode_bs_sptr cvsd_make_decode_bs (short min_step=10,
  *
  */
 
-class cvsd_decode_bs : public gr_sync_interpolator
+class VOCODER_API vocoder_cvsd_decode_bs : public gr_sync_interpolator
 {
 private:
-  friend cvsd_decode_bs_sptr cvsd_make_decode_bs (short min_step,
-						  short max_step,
-						  double step_decay,
-						  double accum_decay,
-						  int K,
-						  int J,
-						  short pos_accum_max,
-						  short neg_accum_max);
-
-  cvsd_decode_bs (short min_step, short max_step, double step_decay,
-		  double accum_decay, int K, int J,
-		  short pos_accum_max, short neg_accum_max);
+  friend VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step,
+								  short max_step,
+								  double step_decay,
+								  double accum_decay,
+								  int K,
+								  int J,
+								  short pos_accum_max,
+								  short neg_accum_max);
+
+  vocoder_cvsd_decode_bs (short min_step, short max_step, double step_decay,
+			  double accum_decay, int K, int J,
+			  short pos_accum_max, short neg_accum_max);
 
   //! Member functions required by the encoder/decoder
   //! \brief Rounding function specific to CVSD
@@ -151,7 +155,7 @@ private:
   short d_stepsize;           //!< \brief Current value of the step sizer
 
  public:
-  ~cvsd_decode_bs ();	// public destructor
+  ~vocoder_cvsd_decode_bs ();	// public destructor
 
   short min_step() { return d_min_step; }
   short max_step() { return d_max_step; }
@@ -167,4 +171,4 @@ private:
 	    gr_vector_void_star &output_items);
 };
 
-#endif /* INCLUDED_CVSD_DECODE_BS_H */
+#endif /* INCLUDED_VOCODER_CVSD_DECODE_BS_H */
diff --git a/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.h b/gr-vocoder/include/vocoder_cvsd_encode_sb.h
index a7994d4ed..b36edaf8b 100644
--- a/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.h
+++ b/gr-vocoder/include/vocoder_cvsd_encode_sb.h
@@ -19,19 +19,22 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef INCLUDED_CVSD_ENCODER_SB_H
-#define INCLUDED_CVSD_ENCODER_SB_H
+#ifndef INCLUDED_VOCODER_CVSD_ENCODER_SB_H
+#define INCLUDED_VOCODER_CVSD_ENCODER_SB_H
 
+#include <vocoder_api.h>
 #include <gr_sync_decimator.h>
 
-class cvsd_encode_sb;
+class vocoder_cvsd_encode_sb;
 
-typedef boost::shared_ptr<cvsd_encode_sb> cvsd_encode_sb_sptr;
+typedef boost::shared_ptr<vocoder_cvsd_encode_sb> vocoder_cvsd_encode_sb_sptr;
 
  /*!
-  * \brief Constructor parameters to initialize the CVSD encoder.  The default
-  * values are modeled after the Bluetooth standard and should not be changed
-  * except by an advanced user
+  * \brief Constructor parameters to initialize the CVSD encoder.  The
+  * default values are modeled after the Bluetooth standard and should
+  * not be changed except by an advanced user
+  *
+  * \ingroup vocoder_blk
   *
   * \param min_step       Minimum step size used to update the internal reference.  Default: "10"
   * \param max_step       Maximum step size used to update the internal reference.  Default: "1280"
@@ -44,14 +47,14 @@ typedef boost::shared_ptr<cvsd_encode_sb> cvsd_encode_sb_sptr;
   *
   */
 
-cvsd_encode_sb_sptr cvsd_make_encode_sb (short min_step=10,
-					 short max_step=1280,
-					 double step_decay=0.9990234375,
-					 double accum_decay= 0.96875,
-					 int K=32,
-					 int J=4,
-					 short pos_accum_max=32767,
-					 short neg_accum_max=-32767);
+VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step=10,
+							short max_step=1280,
+							double step_decay=0.9990234375,
+							double accum_decay= 0.96875,
+							int K=32,
+							int J=4,
+							short pos_accum_max=32767,
+							short neg_accum_max=-32767);
 
 /*!
  * \brief This block performs CVSD audio encoding.  Its design and implementation
@@ -107,21 +110,21 @@ cvsd_encode_sb_sptr cvsd_make_encode_sb (short min_step=10,
  *
  */
 
-class cvsd_encode_sb : public gr_sync_decimator
+class VOCODER_API vocoder_cvsd_encode_sb : public gr_sync_decimator
 {
 private:
-  friend cvsd_encode_sb_sptr cvsd_make_encode_sb (short min_step,
-						  short max_step,
-						  double step_decay,
-						  double accum_decay,
-						  int K,
-						  int J,
-						  short pos_accum_max,
-						  short neg_accum_max);
+  friend VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step,
+								 short max_step,
+								 double step_decay,
+								 double accum_decay,
+								 int K,
+								 int J,
+								 short pos_accum_max,
+								 short neg_accum_max);
 
-  cvsd_encode_sb (short min_step, short max_step, double step_decay,
-		  double accum_decay, int K, int J,
-		  short pos_accum_max, short neg_accum_max);
+  vocoder_cvsd_encode_sb(short min_step, short max_step, double step_decay,
+			 double accum_decay, int K, int J,
+			 short pos_accum_max, short neg_accum_max);
   
   //! Member functions required by the encoder/decoder
   //! \brief Rounding function specific to CVSD
@@ -154,7 +157,7 @@ private:
   short d_stepsize;       //!< \brief Current value of the step sizer
 
  public:
-  ~cvsd_encode_sb ();	// public destructor
+  ~vocoder_cvsd_encode_sb ();	// public destructor
 
   short min_step() { return d_min_step; }
   short max_step() { return d_max_step; }
@@ -170,4 +173,4 @@ private:
 	    gr_vector_void_star &output_items);
 };
 
-#endif /* INCLUDED_CVSD_ENCODE_SB_H */
+#endif /* INCLUDED_VOCODER_CVSD_ENCODE_SB_H */
diff --git a/usrp/host/apps/time_stuff.h b/gr-vocoder/include/vocoder_g721_decode_bs.h
index 74b79f388..1ac7b993a 100644
--- a/usrp/host/apps/time_stuff.h
+++ b/gr-vocoder/include/vocoder_g721_decode_bs.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,29 +20,26 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _TIME_STUFF_H_
-#define _TIME_STUFF_H_
+#ifndef INCLUDED_VOCODER_G721_DECODE_BS_H
+#define INCLUDED_VOCODER_G721_DECODE_BS_H
 
+#include <vocoder_api.h>
+#include <gr_sync_block.h>
 
+class vocoder_g721_decode_bs;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+typedef boost::shared_ptr<vocoder_g721_decode_bs> vocoder_g721_decode_bs_sptr;
 
-/*
- * return USER + SYS cpu time in seconds
- */
-double get_cpu_usage (void);
+VOCODER_API vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs();
 
-/*
- * return elapsed time in seconds
+/*!
+ * \brief This block performs g721 audio decoding. 
+ *
+ * \ingroup vocoder_blk
  */
-double get_elapsed_time (void);
- 
-
-#ifdef __cplusplus
-}
-#endif
 
+class VOCODER_API vocoder_g721_decode_bs : virtual public gr_sync_block
+{
+};
 
-#endif /* _TIME_STUFF_H_ */
+#endif /* INCLUDED_VOCODER_G721_DECODE_BS_H */
diff --git a/gr-usrp/src/usrp_sink_c.i b/gr-vocoder/include/vocoder_g721_encode_sb.h
index 15480883e..a154537d0 100644
--- a/gr-usrp/src/usrp_sink_c.i
+++ b/gr-vocoder/include/vocoder_g721_encode_sb.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,28 +20,26 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%{
-#include "usrp_sink_c.h"
-%}
+#ifndef INCLUDED_VOCODER_G721_ENCODE_SB_H
+#define INCLUDED_VOCODER_G721_ENCODE_SB_H
 
-GR_SWIG_BLOCK_MAGIC(usrp,sink_c)
+#include <vocoder_api.h>
+#include <gr_sync_block.h>
 
-class usrp_sink_c;
-typedef boost::shared_ptr<usrp_sink_c> usrp_sink_c_sptr;
+class vocoder_g721_encode_sb;
 
-usrp_sink_c_sptr
-usrp_make_sink_c(int which=0,
-		 unsigned int interp_rate=32,
-		 int nchan=1,
-		 int mux=-1,
-		 int fusb_block_size=0,
-		 int fusb_nblocks=0,
-		 const std::string fpga_filename="",
-		 const std::string firmware_filename=""
-		 ) throw (std::runtime_error);
+typedef boost::shared_ptr<vocoder_g721_encode_sb> vocoder_g721_encode_sb_sptr;
 
-class usrp_sink_c : public usrp_sink_base 
+VOCODER_API vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb();
+
+/*!
+ * \brief This block performs g721 audio encoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class VOCODER_API vocoder_g721_encode_sb : virtual public gr_sync_block
 {
-private:
-  usrp_sink_c() throw (std::runtime_error);
 };
+
+#endif /* INCLUDED_VOCODER_G721_ENCODE_SB_H */
diff --git a/gr-vocoder/include/vocoder_g723_24_decode_bs.h b/gr-vocoder/include/vocoder_g723_24_decode_bs.h
new file mode 100644
index 000000000..80cdbddd4
--- /dev/null
+++ b/gr-vocoder/include/vocoder_g723_24_decode_bs.h
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * 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_VOCODER_G723_24_DECODE_BS_H
+#define INCLUDED_VOCODER_G723_24_DECODE_BS_H
+
+#include <vocoder_api.h>
+#include <gr_sync_block.h>
+
+class vocoder_g723_24_decode_bs;
+
+typedef boost::shared_ptr<vocoder_g723_24_decode_bs> vocoder_g723_24_decode_bs_sptr;
+
+VOCODER_API vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs();
+
+/*!
+ * \brief This block performs g723_24 audio decoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class VOCODER_API vocoder_g723_24_decode_bs : virtual public gr_sync_block
+{
+};
+
+#endif /* INCLUDED_VOCODER_G723_24_DECODE_BS_H */
diff --git a/gr-vocoder/include/vocoder_g723_24_encode_sb.h b/gr-vocoder/include/vocoder_g723_24_encode_sb.h
new file mode 100644
index 000000000..d290e0971
--- /dev/null
+++ b/gr-vocoder/include/vocoder_g723_24_encode_sb.h
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * 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_VOCODER_G723_24_ENCODE_SB_H
+#define INCLUDED_VOCODER_G723_24_ENCODE_SB_H
+
+#include <vocoder_api.h>
+#include <gr_sync_block.h>
+
+class vocoder_g723_24_encode_sb;
+
+typedef boost::shared_ptr<vocoder_g723_24_encode_sb> vocoder_g723_24_encode_sb_sptr;
+
+VOCODER_API vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb();
+
+/*!
+ * \brief This block performs g723_24 audio encoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class VOCODER_API vocoder_g723_24_encode_sb : virtual public gr_sync_block
+{
+};
+
+#endif /* INCLUDED_VOCODER_G723_24_ENCODE_SB_H */
diff --git a/gr-vocoder/include/vocoder_g723_40_decode_bs.h b/gr-vocoder/include/vocoder_g723_40_decode_bs.h
new file mode 100644
index 000000000..87a2f6892
--- /dev/null
+++ b/gr-vocoder/include/vocoder_g723_40_decode_bs.h
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * 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_VOCODER_G723_40_DECODE_BS_H
+#define INCLUDED_VOCODER_G723_40_DECODE_BS_H
+
+#include <vocoder_api.h>
+#include <gr_sync_block.h>
+
+class vocoder_g723_40_decode_bs;
+
+typedef boost::shared_ptr<vocoder_g723_40_decode_bs> vocoder_g723_40_decode_bs_sptr;
+
+VOCODER_API vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs();
+
+/*!
+ * \brief This block performs g723_40 audio decoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class VOCODER_API vocoder_g723_40_decode_bs : virtual public gr_sync_block
+{
+};
+
+#endif /* INCLUDED_VOCODER_G723_40_DECODE_BS_H */
diff --git a/gr-vocoder/include/vocoder_g723_40_encode_sb.h b/gr-vocoder/include/vocoder_g723_40_encode_sb.h
new file mode 100644
index 000000000..6ac0f6d05
--- /dev/null
+++ b/gr-vocoder/include/vocoder_g723_40_encode_sb.h
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * 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_VOCODER_G723_40_ENCODE_SB_H
+#define INCLUDED_VOCODER_G723_40_ENCODE_SB_H
+
+#include <vocoder_api.h>
+#include <gr_sync_block.h>
+
+class vocoder_g723_40_encode_sb;
+
+typedef boost::shared_ptr<vocoder_g723_40_encode_sb> vocoder_g723_40_encode_sb_sptr;
+
+VOCODER_API vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb();
+
+/*!
+ * \brief This block performs g723_40 audio encoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+
+class VOCODER_API vocoder_g723_40_encode_sb : virtual public gr_sync_block
+{
+};
+
+#endif /* INCLUDED_VOCODER_G723_40_ENCODE_SB_H */
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm_fr_decode_ps.h b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h
index 8002c2ce3..748ff5f0f 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm_fr_decode_ps.h
+++ b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -19,32 +19,34 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef INCLUDED_GSM_FR_DECODE_PS_H
-#define INCLUDED_GSM_FR_DECODE_PS_H
 
+#ifndef INCLUDED_VOCODER_GSM_FR_DECODE_PS_H
+#define INCLUDED_VOCODER_GSM_FR_DECODE_PS_H
+
+#include <vocoder_api.h>
 #include <gr_sync_interpolator.h>
 
-class gsm_fr_decode_ps;
-typedef boost::shared_ptr<gsm_fr_decode_ps> gsm_fr_decode_ps_sptr;
+class vocoder_gsm_fr_decode_ps;
+typedef boost::shared_ptr<vocoder_gsm_fr_decode_ps> vocoder_gsm_fr_decode_ps_sptr;
 
-gsm_fr_decode_ps_sptr gsm_fr_make_decode_ps ();
+VOCODER_API vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps ();
 
 /*!
  * \brief GSM 06.10 Full Rate Vocoder Decoder
  * \ingroup vocoder_blk
  */
-class gsm_fr_decode_ps : public gr_sync_interpolator {
+class VOCODER_API vocoder_gsm_fr_decode_ps : public gr_sync_interpolator {
   struct gsm_state	*d_gsm;
 
-  friend gsm_fr_decode_ps_sptr gsm_fr_make_decode_ps ();
-  gsm_fr_decode_ps ();
+  friend VOCODER_API vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps ();
+  vocoder_gsm_fr_decode_ps ();
 
 public:
-  ~gsm_fr_decode_ps ();
+  ~vocoder_gsm_fr_decode_ps ();
 
   int work (int noutput_items,
 	    gr_vector_const_void_star &input_items,
 	    gr_vector_void_star &output_items);
 };
 
-#endif /* INCLUDED_GSM_FR_DECODE_PS_H */
+#endif /* INCLUDED_VOCODER_GSM_FR_DECODE_PS_H */
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm_fr_encode_sp.h b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h
index f158a3d02..18f78f525 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm_fr_encode_sp.h
+++ b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -19,15 +19,17 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
-#ifndef INCLUDED_GSM_FR_ENCODE_SP_H
-#define INCLUDED_GSM_FR_ENCODE_SP_H
 
+#ifndef INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H
+#define INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H
+
+#include <vocoder_api.h>
 #include <gr_sync_decimator.h>
 
-class gsm_fr_encode_sp;
-typedef boost::shared_ptr<gsm_fr_encode_sp> gsm_fr_encode_sp_sptr;
+class vocoder_gsm_fr_encode_sp;
+typedef boost::shared_ptr<vocoder_gsm_fr_encode_sp> vocoder_gsm_fr_encode_sp_sptr;
 
-gsm_fr_encode_sp_sptr gsm_fr_make_encode_sp ();
+VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp ();
 
 /*!
  * \brief GSM 06.10 Full Rate Vocoder Encoder
@@ -35,18 +37,18 @@ gsm_fr_encode_sp_sptr gsm_fr_make_encode_sp ();
  *
  * shorts in; 33 byte packets out
  */
-class gsm_fr_encode_sp : public gr_sync_decimator {
+class VOCODER_API vocoder_gsm_fr_encode_sp : public gr_sync_decimator {
   struct gsm_state	*d_gsm;
 
-  friend gsm_fr_encode_sp_sptr gsm_fr_make_encode_sp ();
-  gsm_fr_encode_sp ();
+  friend VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp ();
+  vocoder_gsm_fr_encode_sp ();
 
 public:
-  ~gsm_fr_encode_sp ();
+  ~vocoder_gsm_fr_encode_sp ();
 
   int work (int noutput_items,
 	    gr_vector_const_void_star &input_items,
 	    gr_vector_void_star &output_items);
 };
 
-#endif /* INCLUDED_GSM_FR_ENCODE_SP_H */
+#endif /* INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H */
diff --git a/gr-usrp2/src/usrp2_source_16sc.h b/gr-vocoder/include/vocoder_ulaw_decode_bs.h
index d5a86be73..f69358168 100644
--- a/gr-usrp2/src/usrp2_source_16sc.h
+++ b/gr-vocoder/include/vocoder_ulaw_decode_bs.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,39 +20,37 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_USRP2_SOURCE_16SC_H
-#define INCLUDED_USRP2_SOURCE_16SC_H
+#ifndef INCLUDED_VOCODER_ULAW_DECODE_BS_H
+#define INCLUDED_VOCODER_ULAW_DECODE_BS_H
 
-#include <usrp2_source_base.h>
+#include <vocoder_api.h>
+#include <gr_sync_block.h>
 
-class usrp2_source_16sc;
-typedef boost::shared_ptr<usrp2_source_16sc> usrp2_source_16sc_sptr;
+class vocoder_ulaw_decode_bs;
 
-usrp2_source_16sc_sptr
-usrp2_make_source_16sc(const std::string &ifc="eth0",
-		       const std::string &mac="")
-  throw (std::runtime_error);
+typedef boost::shared_ptr<vocoder_ulaw_decode_bs> vocoder_ulaw_decode_bs_sptr;
+
+VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs();
 
 /*!
- * \ingroup source_blk
- * \ingroup usrp2
+ * \brief This block performs ulaw audio decoding. 
+ *
+ * \ingroup vocoder_blk
  */
-class usrp2_source_16sc : public usrp2_source_base
+
+class VOCODER_API vocoder_ulaw_decode_bs : public gr_sync_block
 {
 private:
-  friend usrp2_source_16sc_sptr
-  usrp2_make_source_16sc(const std::string &ifc,
-			 const std::string &mac) throw (std::runtime_error);
-  
-protected:
-  usrp2_source_16sc(const std::string &ifc, const std::string &mac) throw (std::runtime_error);
+  friend VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs();
+
+  vocoder_ulaw_decode_bs();
 
-public:
-  ~usrp2_source_16sc();
+ public:
+  ~vocoder_ulaw_decode_bs();
 
   int work(int noutput_items,
 	   gr_vector_const_void_star &input_items,
 	   gr_vector_void_star &output_items);
 };
 
-#endif /* INCLUDED_USRP2_SOURCE_16SC_H */
+#endif /* INCLUDED_VOCODER_ULAW_DECODE_BS_H */
diff --git a/gr-vocoder/include/vocoder_ulaw_encode_sb.h b/gr-vocoder/include/vocoder_ulaw_encode_sb.h
new file mode 100644
index 000000000..a1c2af05b
--- /dev/null
+++ b/gr-vocoder/include/vocoder_ulaw_encode_sb.h
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+/*
+ * 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_VOCODER_ULAW_ENCODER_SB_H
+#define INCLUDED_VOCODER_ULAW_ENCODER_SB_H
+
+#include <vocoder_api.h>
+#include <gr_sync_block.h>
+
+class vocoder_ulaw_encode_sb;
+
+typedef boost::shared_ptr<vocoder_ulaw_encode_sb> vocoder_ulaw_encode_sb_sptr;
+
+VOCODER_API vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb();
+
+/*!
+ * \brief This block performs g.711 ulaw audio encoding. 
+ *
+ * \ingroup vocoder_blk
+ */
+class VOCODER_API vocoder_ulaw_encode_sb : public gr_sync_block
+{
+private:
+  friend VOCODER_API vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb();
+
+  vocoder_ulaw_encode_sb();
+
+ public:
+  ~vocoder_ulaw_encode_sb();
+
+  int work(int noutput_items,
+	   gr_vector_const_void_star &input_items,
+	   gr_vector_void_star &output_items);
+};
+
+#endif /* INCLUDED_VOCODER_ULAW_ENCODE_SB_H */
diff --git a/gcell/lib/.gitignore b/gr-vocoder/lib/.gitignore
index 3531485fb..d2e2e9ce8 100644
--- a/gcell/lib/.gitignore
+++ b/gr-vocoder/lib/.gitignore
@@ -1,8 +1,7 @@
 /Makefile
 /Makefile.in
-/.deps
 /.libs
-/*.la
-/*.lo
-/*.a
-/*.o
+/.deps
+/gnuradio
+/guile
+/python
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
new file mode 100644
index 000000000..69219b03f
--- /dev/null
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -0,0 +1,67 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_VOCODER_INCLUDE_DIRS}
+)
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gr_vocoder_sources
+    vocoder_alaw_decode_bs.cc
+    vocoder_alaw_encode_sb.cc
+    vocoder_codec2_decode_ps.cc
+    vocoder_codec2_encode_sp.cc
+    vocoder_cvsd_decode_bs.cc
+    vocoder_cvsd_encode_sb.cc
+    vocoder_g721_decode_bs.cc
+    vocoder_g721_encode_sb.cc
+    vocoder_g723_24_decode_bs.cc
+    vocoder_g723_24_encode_sb.cc
+    vocoder_g723_40_decode_bs.cc
+    vocoder_g723_40_encode_sb.cc
+    vocoder_gsm_fr_decode_ps.cc
+    vocoder_gsm_fr_encode_sp.cc
+    vocoder_ulaw_decode_bs.cc
+    vocoder_ulaw_encode_sb.cc
+)
+
+########################################################################
+# Include subdirs rather to populate to the sources lists.
+########################################################################
+GR_INCLUDE_SUBDIRECTORY(codec2)
+GR_INCLUDE_SUBDIRECTORY(g7xx)
+GR_INCLUDE_SUBDIRECTORY(gsm)
+
+list(APPEND vocoder_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+)
+
+add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources})
+target_link_libraries(gnuradio-vocoder ${vocoder_libs})
+GR_LIBRARY_FOO(gnuradio-vocoder RUNTIME_COMPONENT "vocoder_runtime" DEVEL_COMPONENT "vocoder_devel")
diff --git a/gr-vocoder/lib/Makefile.am b/gr-vocoder/lib/Makefile.am
new file mode 100644
index 000000000..158347ffe
--- /dev/null
+++ b/gr-vocoder/lib/Makefile.am
@@ -0,0 +1,55 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = codec2 g7xx gsm .
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) \
+	      -I$(top_srcdir)/gr-vocoder/include
+
+lib_LTLIBRARIES = libgnuradio-vocoder.la
+
+libgnuradio_vocoder_la_SOURCES = \
+	vocoder_alaw_decode_bs.cc \
+	vocoder_alaw_encode_sb.cc \
+	vocoder_codec2_decode_ps.cc \
+	vocoder_codec2_encode_sp.cc \
+	vocoder_cvsd_decode_bs.cc \
+	vocoder_cvsd_encode_sb.cc \
+	vocoder_g721_decode_bs.cc \
+	vocoder_g721_encode_sb.cc \
+	vocoder_g723_24_decode_bs.cc \
+	vocoder_g723_24_encode_sb.cc \
+	vocoder_g723_40_decode_bs.cc \
+	vocoder_g723_40_encode_sb.cc \
+	vocoder_gsm_fr_decode_ps.cc \
+	vocoder_gsm_fr_encode_sp.cc \
+	vocoder_ulaw_decode_bs.cc \
+	vocoder_ulaw_encode_sb.cc
+
+libgnuradio_vocoder_la_LIBADD =	\
+	$(GNURADIO_CORE_LA) \
+	codec2/libcodec2.la \
+	g7xx/libg7xx.la \
+	gsm/libgsm.la
+
+libgnuradio_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
diff --git a/gr-gpio/src/fpga/rbf/.gitignore b/gr-vocoder/lib/codec2/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gr-gpio/src/fpga/rbf/.gitignore
+++ b/gr-vocoder/lib/codec2/.gitignore
diff --git a/gr-vocoder/lib/codec2/CMakeLists.txt b/gr-vocoder/lib/codec2/CMakeLists.txt
new file mode 100644
index 000000000..c9839bd96
--- /dev/null
+++ b/gr-vocoder/lib/codec2/CMakeLists.txt
@@ -0,0 +1,113 @@
+# 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.
+
+########################################################################
+# Create executable to generate other sources
+# http://www.vtk.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build
+########################################################################
+if(NOT CMAKE_CROSSCOMPILING)
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+    add_executable(generate_codebook ${CMAKE_CURRENT_SOURCE_DIR}/generate_codebook.c)
+    target_link_libraries(generate_codebook -lm)
+    export(TARGETS generate_codebook APPEND FILE ${EXPORT_FILE})
+endif()
+
+########################################################################
+# Create codebook
+########################################################################
+set(CODEBOOKS
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp1.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp2.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp3.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp4.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp5.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp6.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp7.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp8.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp9.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/lsp10.txt
+)
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebook.c
+    DEPENDS generate_codebook ${CODEBOOKS}
+    COMMAND generate_codebook lsp_cb ${CODEBOOKS} > ${CMAKE_CURRENT_BINARY_DIR}/codebook.c
+)
+
+########################################################################
+# Create codebookd
+########################################################################
+set(CODEBOOKSD
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp1.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp2.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp3.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp4.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp5.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp6.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp7.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp8.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp9.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp10.txt
+)
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebookd.c
+    DEPENDS generate_codebook ${CODEBOOKSD}
+    COMMAND generate_codebook lsp_cbd ${CODEBOOKSD} > ${CMAKE_CURRENT_BINARY_DIR}/codebookd.c
+)
+
+########################################################################
+# Create codebookdvq
+########################################################################
+set(CODEBOOKSDVQ
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp1.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp2.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp3.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp4.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/codebook/dlsp5.txt 
+)
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebookdvq.c
+    DEPENDS generate_codebook ${CODEBOOKSDVQ}
+    COMMAND generate_codebook lsp_cbdvq ${CODEBOOKSDVQ} > ${CMAKE_CURRENT_BINARY_DIR}/codebookdvq.c
+)
+
+########################################################################
+# Append all sources in this dir
+########################################################################
+list(APPEND gr_vocoder_sources
+    ${CMAKE_CURRENT_BINARY_DIR}/codebook.c
+    ${CMAKE_CURRENT_BINARY_DIR}/codebookd.c
+    ${CMAKE_CURRENT_BINARY_DIR}/codebookdvq.c
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/dump.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/lpc.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/nlp.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/postfilter.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/sine.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/codec2.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/fft.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/kiss_fft.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/interp.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/lsp.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/phase.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/quantise.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/pack.c
+)
diff --git a/gr-vocoder/lib/codec2/Makefile.am b/gr-vocoder/lib/codec2/Makefile.am
new file mode 100644
index 000000000..ae2094eff
--- /dev/null
+++ b/gr-vocoder/lib/codec2/Makefile.am
@@ -0,0 +1,125 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+AM_CFLAGS = -fPIC -O3
+
+# Helper program to create codebook source
+noinst_PROGRAMS = generate_codebook
+generate_codebook_LDFLAGS = -lm
+
+# lsp quantisers
+CODEBOOKS= \
+	$(srcdir)/codebook/lsp1.txt \
+	$(srcdir)/codebook/lsp2.txt \
+	$(srcdir)/codebook/lsp3.txt \
+	$(srcdir)/codebook/lsp4.txt \
+	$(srcdir)/codebook/lsp5.txt \
+	$(srcdir)/codebook/lsp6.txt \
+	$(srcdir)/codebook/lsp7.txt \
+	$(srcdir)/codebook/lsp8.txt \
+	$(srcdir)/codebook/lsp9.txt \
+	$(srcdir)/codebook/lsp10.txt
+
+# lspd quantisers
+CODEBOOKSD= \
+	$(srcdir)/codebook/dlsp1.txt \
+	$(srcdir)/codebook/dlsp2.txt \
+	$(srcdir)/codebook/dlsp3.txt \
+	$(srcdir)/codebook/dlsp4.txt \
+	$(srcdir)/codebook/dlsp5.txt \
+	$(srcdir)/codebook/dlsp6.txt \
+	$(srcdir)/codebook/dlsp7.txt \
+	$(srcdir)/codebook/dlsp8.txt \
+	$(srcdir)/codebook/dlsp9.txt \
+	$(srcdir)/codebook/dlsp10.txt
+
+# lspd VQ quantisers
+CODEBOOKSDVQ= \
+	$(srcdir)/codebook/dlsp1.txt \
+	$(srcdir)/codebook/dlsp2.txt \
+	$(srcdir)/codebook/dlsp3.txt \
+	$(srcdir)/codebook/dlsp4.txt \
+	$(srcdir)/codebook/dlsp5.txt 
+
+# Generate codebook sources from text files
+GENERATED_C = \
+	codebook.c \
+	codebookd.c \
+	codebookdvq.c
+
+BUILT_SOURCES += $(GENERATED_C)
+
+codebook.c: $(builddir)/generate_codebook $(CODEBOOKS)
+	$(builddir)/generate_codebook lsp_cb $(CODEBOOKS) > codebook.c
+
+codebookd.c: $(builddir)/generate_codebook $(CODEBOOKSD)
+	$(builddir)/generate_codebook lsp_cbd $(CODEBOOKSD) > codebookd.c
+
+codebookdvq.c: $(builddir)/generate_codebook $(CODEBOOKSDVQ)
+	$(builddir)/generate_codebook lsp_cbdvq $(CODEBOOKSDVQ) > codebookdvq.c
+
+# Convenience library for linking into blocks
+noinst_LTLIBRARIES = libcodec2.la
+
+libcodec2_la_CFLAGS = $(AM_CFLAGS)
+
+libcodec2_la_SOURCES = \
+	dump.c \
+	lpc.c \
+	nlp.c \
+	postfilter.c \
+	sine.c \
+	codec2.c \
+	fft.c \
+	kiss_fft.c \
+	interp.c \
+	lsp.c \
+	phase.c \
+	quantise.c \
+	pack.c \
+	$(GENERATED_C)
+
+# Evil inclusion of glottal.c by phase.c
+EXTRA_DIST += glottal.c
+
+# Headers used locally but not installed in system
+noinst_HEADERS = \
+	codec2.h \
+	codec2_internal.h \
+	defines.h \
+	kiss_fft.h\
+	_kiss_fft_guts.h \
+	fft.h \
+	interp.h \
+	lsp.h \
+	phase.h \
+	quantise.h \
+	comp.h \
+	dump.h \
+	lpc.h \
+	nlp.h  \
+	postfilter.h \
+	sine.h
+
+EXTRA_DIST += $(CODEBOOKS) $(CODEBOOKSD) $(CODEBOOKSDVQ)
+
diff --git a/gr-vocoder/lib/codec2/_kiss_fft_guts.h b/gr-vocoder/lib/codec2/_kiss_fft_guts.h
new file mode 100644
index 000000000..ba6614440
--- /dev/null
+++ b/gr-vocoder/lib/codec2/_kiss_fft_guts.h
@@ -0,0 +1,164 @@
+/*
+Copyright (c) 2003-2010, Mark Borgerding
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+    * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* kiss_fft.h
+   defines kiss_fft_scalar as either short or a float type
+   and defines
+   typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
+#include "kiss_fft.h"
+#include <limits.h>
+
+#define MAXFACTORS 32
+/* e.g. an fft of length 128 has 4 factors 
+ as far as kissfft is concerned
+ 4*4*4*2
+ */
+
+struct kiss_fft_state{
+    int nfft;
+    int inverse;
+    int factors[2*MAXFACTORS];
+    kiss_fft_cpx twiddles[1];
+};
+
+/*
+  Explanation of macros dealing with complex math:
+
+   C_MUL(m,a,b)         : m = a*b
+   C_FIXDIV( c , div )  : if a fixed point impl., c /= div. noop otherwise
+   C_SUB( res, a,b)     : res = a - b
+   C_SUBFROM( res , a)  : res -= a
+   C_ADDTO( res , a)    : res += a
+ * */
+#ifdef FIXED_POINT
+#if (FIXED_POINT==32)
+# define FRACBITS 31
+# define SAMPPROD int64_t
+#define SAMP_MAX 2147483647
+#else
+# define FRACBITS 15
+# define SAMPPROD int32_t 
+#define SAMP_MAX 32767
+#endif
+
+#define SAMP_MIN -SAMP_MAX
+
+#if defined(CHECK_OVERFLOW)
+#  define CHECK_OVERFLOW_OP(a,op,b)  \
+	if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \
+		fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) );  }
+#endif
+
+
+#   define smul(a,b) ( (SAMPPROD)(a)*(b) )
+#   define sround( x )  (kiss_fft_scalar)( ( (x) + (1<<(FRACBITS-1)) ) >> FRACBITS )
+
+#   define S_MUL(a,b) sround( smul(a,b) )
+
+#   define C_MUL(m,a,b) \
+      do{ (m).r = sround( smul((a).r,(b).r) - smul((a).i,(b).i) ); \
+          (m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0)
+
+#   define DIVSCALAR(x,k) \
+	(x) = sround( smul(  x, SAMP_MAX/k ) )
+
+#   define C_FIXDIV(c,div) \
+	do {    DIVSCALAR( (c).r , div);  \
+		DIVSCALAR( (c).i  , div); }while (0)
+
+#   define C_MULBYSCALAR( c, s ) \
+    do{ (c).r =  sround( smul( (c).r , s ) ) ;\
+        (c).i =  sround( smul( (c).i , s ) ) ; }while(0)
+
+#else  /* not FIXED_POINT*/
+
+#   define S_MUL(a,b) ( (a)*(b) )
+#define C_MUL(m,a,b) \
+    do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
+        (m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
+#   define C_FIXDIV(c,div) /* NOOP */
+#   define C_MULBYSCALAR( c, s ) \
+    do{ (c).r *= (s);\
+        (c).i *= (s); }while(0)
+#endif
+
+#ifndef CHECK_OVERFLOW_OP
+#  define CHECK_OVERFLOW_OP(a,op,b) /* noop */
+#endif
+
+#define  C_ADD( res, a,b)\
+    do { \
+	    CHECK_OVERFLOW_OP((a).r,+,(b).r)\
+	    CHECK_OVERFLOW_OP((a).i,+,(b).i)\
+	    (res).r=(a).r+(b).r;  (res).i=(a).i+(b).i; \
+    }while(0)
+#define  C_SUB( res, a,b)\
+    do { \
+	    CHECK_OVERFLOW_OP((a).r,-,(b).r)\
+	    CHECK_OVERFLOW_OP((a).i,-,(b).i)\
+	    (res).r=(a).r-(b).r;  (res).i=(a).i-(b).i; \
+    }while(0)
+#define C_ADDTO( res , a)\
+    do { \
+	    CHECK_OVERFLOW_OP((res).r,+,(a).r)\
+	    CHECK_OVERFLOW_OP((res).i,+,(a).i)\
+	    (res).r += (a).r;  (res).i += (a).i;\
+    }while(0)
+
+#define C_SUBFROM( res , a)\
+    do {\
+	    CHECK_OVERFLOW_OP((res).r,-,(a).r)\
+	    CHECK_OVERFLOW_OP((res).i,-,(a).i)\
+	    (res).r -= (a).r;  (res).i -= (a).i; \
+    }while(0)
+
+
+#ifdef FIXED_POINT
+#  define KISS_FFT_COS(phase)  floor(.5+SAMP_MAX * cos (phase))
+#  define KISS_FFT_SIN(phase)  floor(.5+SAMP_MAX * sin (phase))
+#  define HALF_OF(x) ((x)>>1)
+#elif defined(USE_SIMD)
+#  define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) )
+#  define KISS_FFT_SIN(phase) _mm_set1_ps( sin(phase) )
+#  define HALF_OF(x) ((x)*_mm_set1_ps(.5))
+#else
+#  define KISS_FFT_COS(phase) (kiss_fft_scalar) cos(phase)
+#  define KISS_FFT_SIN(phase) (kiss_fft_scalar) sin(phase)
+#  define HALF_OF(x) ((x)*.5)
+#endif
+
+#define  kf_cexp(x,phase) \
+	do{ \
+		(x)->r = KISS_FFT_COS(phase);\
+		(x)->i = KISS_FFT_SIN(phase);\
+	}while(0)
+
+
+/* a debugging function */
+#define pcpx(c)\
+    fprintf(stderr,"%g + %gi\n",(double)((c)->r),(double)((c)->i) )
+
+
+#ifdef KISS_FFT_USE_ALLOCA
+// define this to allow use of alloca instead of malloc for temporary buffers
+// Temporary buffers are used in two case: 
+// 1. FFT sizes that have "bad" factors. i.e. not 2,3 and 5
+// 2. "in-place" FFTs.  Notice the quotes, since kissfft does not really do an in-place transform.
+#include <alloca.h>
+#define  KISS_FFT_TMP_ALLOC(nbytes) alloca(nbytes)
+#define  KISS_FFT_TMP_FREE(ptr) 
+#else
+#define  KISS_FFT_TMP_ALLOC(nbytes) KISS_FFT_MALLOC(nbytes)
+#define  KISS_FFT_TMP_FREE(ptr) KISS_FFT_FREE(ptr)
+#endif
diff --git a/gr-vocoder/lib/codec2/c2dec.c b/gr-vocoder/lib/codec2/c2dec.c
new file mode 100644
index 000000000..b866d04d6
--- /dev/null
+++ b/gr-vocoder/lib/codec2/c2dec.c
@@ -0,0 +1,82 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: c2dec.c
+  AUTHOR......: David Rowe
+  DATE CREATED: 23/8/2010
+
+  Decodes a file of bits to a file of raw speech samples using codec2.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2010 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "codec2.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#define BITS_SIZE	((CODEC2_BITS_PER_FRAME + 7) / 8)
+
+int main(int argc, char *argv[])
+{
+    void *codec2;
+    FILE *fin;
+    FILE *fout;
+    short buf[CODEC2_SAMPLES_PER_FRAME];
+    unsigned char  bits[BITS_SIZE];
+
+    if (argc != 3) {
+	printf("usage: %s InputBitFile OutputRawSpeechFile\n", argv[0]);
+	exit(1);
+    }
+
+    if (strcmp(argv[1], "-")  == 0) fin = stdin;
+    else if ( (fin = fopen(argv[1],"rb")) == NULL ) {
+	fprintf(stderr, "Error opening input bit file: %s: %s.\n",
+         argv[1], strerror(errno));
+	exit(1);
+    }
+
+    if (strcmp(argv[2], "-") == 0) fout = stdout;
+    else if ( (fout = fopen(argv[2],"wb")) == NULL ) {
+	fprintf(stderr, "Error opening output speech file: %s: %s.\n",
+         argv[2], strerror(errno));
+	exit(1);
+    }
+
+    codec2 = codec2_create();
+
+    while(fread(bits, sizeof(char), BITS_SIZE, fin) == BITS_SIZE) {
+	codec2_decode(codec2, buf, bits);
+ 	fwrite(buf, sizeof(short), CODEC2_SAMPLES_PER_FRAME, fout);
+	//if this is in a pipeline, we probably don't want the usual
+        //buffering to occur
+        if (fout == stdout) fflush(stdout);
+        if (fin == stdin) fflush(stdin);
+          
+ }
+
+    codec2_destroy(codec2);
+
+    fclose(fin);
+    fclose(fout);
+
+    return 0;
+}
diff --git a/gr-vocoder/lib/codec2/c2demo.c b/gr-vocoder/lib/codec2/c2demo.c
new file mode 100644
index 000000000..efa8d6449
--- /dev/null
+++ b/gr-vocoder/lib/codec2/c2demo.c
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: c2demo.c
+  AUTHOR......: David Rowe
+  DATE CREATED: 15/11/2010
+
+  Encodes and decodes a file of raw speech samples using Codec 2.
+  Demonstrates use of Codec 2 function API.
+
+  Note to convert a wave file to raw and vice-versa:
+
+    $ sox file.wav -r 8000 -s -2 file.raw
+    $ sox -r 8000 -s -2 file.raw file.wav
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2010 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "codec2.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#define BITS_SIZE	((CODEC2_BITS_PER_FRAME + 7) / 8)
+
+int main(int argc, char *argv[])
+{
+    void *codec2;
+    FILE *fin;
+    FILE *fout;
+    short buf[CODEC2_SAMPLES_PER_FRAME];
+    unsigned char  bits[BITS_SIZE];
+
+    if (argc != 3) {
+	printf("usage: %s InputRawSpeechFile OutputRawSpeechFile\n", argv[0]);
+	exit(1);
+    }
+ 
+    if ( (fin = fopen(argv[1],"rb")) == NULL ) {
+	fprintf(stderr, "Error opening input speech file: %s: %s.\n",
+         argv[1], strerror(errno));
+	exit(1);
+    }
+
+    if ( (fout = fopen(argv[2],"wb")) == NULL ) {
+	fprintf(stderr, "Error opening output speech file: %s: %s.\n",
+         argv[2], strerror(errno));
+	exit(1);
+    }
+
+    /* Note only one set of Codec 2 states is required for an encoder
+       and decoder pair. */
+
+    codec2 = codec2_create();
+
+    while(fread(buf, sizeof(short), CODEC2_SAMPLES_PER_FRAME, fin) == 
+	  CODEC2_SAMPLES_PER_FRAME) {
+	codec2_encode(codec2, bits, buf);
+	codec2_decode(codec2, buf, bits);
+	fwrite(buf, sizeof(short), CODEC2_SAMPLES_PER_FRAME, fout);
+    }
+
+    codec2_destroy(codec2);
+
+    fclose(fin);
+    fclose(fout);
+
+    return 0;
+}
diff --git a/gr-vocoder/lib/codec2/c2enc.c b/gr-vocoder/lib/codec2/c2enc.c
new file mode 100644
index 000000000..4d1d019df
--- /dev/null
+++ b/gr-vocoder/lib/codec2/c2enc.c
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: c2enc.c
+  AUTHOR......: David Rowe
+  DATE CREATED: 23/8/2010
+
+  Encodes a file of raw speech samples using codec2 and outputs a file
+  of bits.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2010 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "codec2.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#define BITS_SIZE	((CODEC2_BITS_PER_FRAME + 7) / 8)
+
+int main(int argc, char *argv[])
+{
+    void *codec2;
+    FILE *fin;
+    FILE *fout;
+    short buf[CODEC2_SAMPLES_PER_FRAME];
+    unsigned char  bits[BITS_SIZE];
+
+    if (argc != 3) {
+	printf("usage: %s InputRawspeechFile OutputBitFile\n", argv[0]);
+	exit(1);
+    }
+ 
+    if (strcmp(argv[1], "-")  == 0) fin = stdin;
+    else if ( (fin = fopen(argv[1],"rb")) == NULL ) {
+	fprintf(stderr, "Error opening input bit file: %s: %s.\n",
+         argv[1], strerror(errno));
+	exit(1);
+    }
+
+    if (strcmp(argv[2], "-") == 0) fout = stdout;
+    else if ( (fout = fopen(argv[2],"wb")) == NULL ) {
+	fprintf(stderr, "Error opening output speech file: %s: %s.\n",
+         argv[2], strerror(errno));
+	exit(1);
+    }
+
+    codec2 = codec2_create();
+
+    while(fread(buf, sizeof(short), CODEC2_SAMPLES_PER_FRAME, fin) ==
+	  CODEC2_SAMPLES_PER_FRAME) {
+	codec2_encode(codec2, bits, buf);
+	fwrite(bits, sizeof(char), BITS_SIZE, fout);
+	//if this is in a pipeline, we probably don't want the usual
+        //buffering to occur
+        if (fout == stdout) fflush(stdout);
+        if (fin == stdin) fflush(stdin);
+    }
+
+    codec2_destroy(codec2);
+
+    fclose(fin);
+    fclose(fout);
+
+    return 0;
+}
diff --git a/gr-vocoder/lib/codec2/c2sim.c b/gr-vocoder/lib/codec2/c2sim.c
new file mode 100644
index 000000000..bb49c7899
--- /dev/null
+++ b/gr-vocoder/lib/codec2/c2sim.c
@@ -0,0 +1,469 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: c2sim.c
+  AUTHOR......: David Rowe
+  DATE CREATED: 20/8/2010
+
+  Codec2 simulation.  Combines encoder and decoder and allows switching in 
+  out various algorithms and quantisation steps. 
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <math.h>
+
+#include "defines.h"
+#include "sine.h"
+#include "nlp.h"
+#include "dump.h"
+#include "lpc.h"
+#include "lsp.h"
+#include "quantise.h"
+#include "phase.h"
+#include "postfilter.h"
+#include "interp.h"
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+ switch_present()                                                            
+                                                                             
+ Searches the command line arguments for a "switch".  If the switch is       
+ found, returns the command line argument where it ws found, else returns    
+ NULL.                                                                       
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+int switch_present(sw,argc,argv)
+register char sw[];     /* switch in string form */
+register int argc;      /* number of command line arguments */
+register char *argv[];  /* array of command line arguments in string form */
+{
+  register int i;       /* loop variable */
+
+  for(i=1; i<argc; i++)
+    if (!strcmp(sw,argv[i]))
+      return(i);
+
+  return 0;
+}
+
+void synth_one_frame(short buf[], MODEL *model, float Sn_[], float Pn[]);
+
+/*---------------------------------------------------------------------------*\
+                                                                          
+				MAIN                                        
+                                                                         
+\*---------------------------------------------------------------------------*/
+
+int main(int argc, char *argv[])
+{
+  FILE *fout;		/* output speech file                    */
+  FILE *fin;		/* input speech file                     */
+  short buf[N];		/* input/output buffer                   */
+  float Sn[M];	        /* float input speech samples            */
+  COMP  Sw[FFT_ENC];	/* DFT of Sn[]                           */
+  float w[M];	        /* time domain hamming window            */
+  COMP  W[FFT_ENC];	/* DFT of w[]                            */
+  MODEL model;
+  float Pn[2*N];	/* trapezoidal synthesis window          */
+  float Sn_[2*N];	/* synthesised speech */
+  int   i;		/* loop variable                         */
+  int   frames;
+  float prev_Wo;
+  float pitch;
+  int   voiced1 = 0;
+
+  char  out_file[MAX_STR];
+  int   arg;
+  float snr;
+  float sum_snr;
+
+  int lpc_model, order = LPC_ORD;
+  int lsp, lspd, lspdvq, lsp_quantiser;
+  float ak[LPC_MAX];
+  COMP  Sw_[FFT_ENC];
+  COMP  Ew[FFT_ENC]; 
+ 
+  int dump;
+  
+  int phase0;
+  float ex_phase[MAX_AMP+1];
+
+  int   postfilt;
+  float bg_est;
+
+  int   hand_voicing;
+  FILE *fvoicing = 0;
+
+  MODEL prev_model, interp_model;
+  int decimate;
+  float lsps[LPC_ORD];
+  float prev_lsps[LPC_ORD];
+  float e, prev_e;
+  float ak_interp[LPC_MAX];
+
+  void *nlp_states;
+  float hpf_states[2];
+  int   resample;
+  float AresdB_prev[MAX_AMP];
+
+  for(i=0; i<MAX_AMP; i++)
+      AresdB_prev[i] = 0.0; 
+
+  for(i=0; i<M; i++)
+      Sn[i] = 1.0;
+  for(i=0; i<2*N; i++)
+      Sn_[i] = 0;
+
+  prev_Wo = TWO_PI/P_MAX;
+
+  prev_model.Wo = TWO_PI/P_MIN;
+  prev_model.L = floor(PI/prev_model.Wo);
+  for(i=1; i<=prev_model.L; i++) {
+      prev_model.A[i] = 0.0;
+      prev_model.phi[i] = 0.0;
+  }
+  for(i=1; i<=MAX_AMP; i++) {
+      ex_phase[i] = 0.0;
+  }
+  for(i=0; i<LPC_ORD; i++) {
+      prev_lsps[i] = i*PI/(LPC_ORD+1);
+  }
+  e = prev_e = 1;
+  hpf_states[0] = hpf_states[1] = 0.0;
+
+  nlp_states = nlp_create();
+
+  if (argc < 2) {
+    fprintf(stderr, "\nCodec2 - 2400 bit/s speech codec - Simulation Program\n"
+     "\thttp://rowetel.com/codec2.html\n\n"
+     "usage: %s InputFile [-o OutputFile]\n"
+     "\t[--lpc Order]\n"
+     "\t[--lsp]\n"
+     "\t[--lspd]\n"
+     "\t[--lspdvq]\n"
+     "\t[--phase0]\n"
+     "\t[--postfilter]\n"
+     "\t[--hand_voicing]\n"
+     "\t[--dec]\n"
+     "\t[--dump DumpFilePrefix]\n", argv[0]);
+    exit(1);
+  }
+
+  /* Interpret command line arguments -------------------------------------*/
+
+  /* Input file */
+
+  if ((fin = fopen(argv[1],"rb")) == NULL) {
+    fprintf(stderr, "Error opening input speech file: %s: %s.\n",
+     argv[1], strerror(errno));
+    exit(1);
+  }
+
+  /* Output file */
+
+  if ((arg = switch_present("-o",argc,argv))) {
+    if ((fout = fopen(argv[arg+1],"wb")) == NULL) {
+      fprintf(stderr, "Error opening output speech file: %s: %s.\n",
+       argv[arg+1], strerror(errno));
+      exit(1);
+    }
+    strcpy(out_file,argv[arg+1]);
+  }
+  else
+    fout = NULL;
+
+  lpc_model = 0;
+  if ((arg = switch_present("--lpc",argc,argv))) {
+      lpc_model = 1;
+      order = atoi(argv[arg+1]);
+      if ((order < 4) || (order > 20)) {
+        fprintf(stderr, "Error in lpc order: %d\n", order);
+        exit(1);
+      }	  
+  }
+
+  dump = switch_present("--dump",argc,argv);
+#ifdef DUMP
+  if (dump) 
+      dump_on(argv[dump+1]);
+#endif
+
+  lsp = switch_present("--lsp",argc,argv);
+  lsp_quantiser = 0;
+  if (lsp)
+      assert(order == LPC_ORD);
+
+  lspd = switch_present("--lspd",argc,argv);
+  if (lspd)
+      assert(order == LPC_ORD);
+
+  lspdvq = switch_present("--lspdvq",argc,argv);
+  if (lspdvq)
+      assert(order == LPC_ORD);
+
+  phase0 = switch_present("--phase0",argc,argv);
+  if (phase0) {
+      ex_phase[0] = 0;
+  }
+
+  hand_voicing = switch_present("--hand_voicing",argc,argv);
+  if (hand_voicing) {
+      fvoicing = fopen(argv[hand_voicing+1],"rt");
+      assert(fvoicing != NULL);
+  }
+
+  bg_est = 0.0;
+  postfilt = switch_present("--postfilter",argc,argv);
+
+  decimate = switch_present("--dec",argc,argv);
+
+  arg = switch_present("--resample",argc,argv);
+  resample = atoi(argv[arg+1]);
+
+  /* Initialise ------------------------------------------------------------*/
+
+  make_analysis_window(w,W);
+  make_synthesis_window(Pn);
+  quantise_init();
+
+  /* Main loop ------------------------------------------------------------*/
+
+  frames = 0;
+  sum_snr = 0;
+  while(fread(buf,sizeof(short),N,fin)) {
+    frames++;
+    //printf("frame: %d", frames);
+
+    /* Read input speech */
+
+    for(i=0; i<M-N; i++)
+      Sn[i] = Sn[i+N];
+    for(i=0; i<N; i++) {
+	//Sn[i+M-N] = hpf((float)buf[i], hpf_states);
+	Sn[i+M-N] = (float)buf[i];
+    }
+ 
+    /* Estimate pitch */
+
+    nlp(nlp_states,Sn,N,M,P_MIN,P_MAX,&pitch,Sw,&prev_Wo);
+    model.Wo = TWO_PI/pitch;
+
+    /* estimate model parameters */
+
+    dft_speech(Sw, Sn, w); 
+    two_stage_pitch_refinement(&model, Sw);
+    estimate_amplitudes(&model, Sw, W);
+#ifdef DUMP 
+    dump_Sn(Sn); dump_Sw(Sw); dump_model(&model);
+#endif
+
+    /* optional zero-phase modelling */
+
+    if (phase0) {
+	float Wn[M];		        /* windowed speech samples */
+	float Rk[LPC_MAX+1];	        /* autocorrelation coeffs  */
+  	
+#ifdef DUMP
+	dump_phase(&model.phi[0], model.L);
+#endif
+
+	/* find aks here, these are overwritten if LPC modelling is enabled */
+
+	for(i=0; i<M; i++)
+	    Wn[i] = Sn[i]*w[i];
+	autocorrelate(Wn,Rk,M,order);
+	levinson_durbin(Rk,ak,order);
+
+#ifdef DUMP
+	dump_ak(ak, LPC_ORD);
+#endif
+	
+	/* determine voicing */
+
+	snr = est_voicing_mbe(&model, Sw, W, Sw_, Ew, prev_Wo);
+#ifdef DUMP
+	dump_Sw_(Sw_);
+	dump_Ew(Ew);
+	dump_snr(snr);
+#endif
+
+	/* just to make sure we are not cheating - kill all phases */
+
+	for(i=0; i<MAX_AMP; i++)
+	    model.phi[i] = 0;
+	
+	if (hand_voicing) {
+	    fscanf(fvoicing,"%d\n",&model.voiced);
+	}
+    }
+
+    /* optional LPC model amplitudes */
+
+    if (lpc_model) {
+	int   lsp_indexes[LPC_MAX];
+
+	e = speech_to_uq_lsps(lsps, ak, Sn, w, order);
+
+	if (lsp) {
+	    encode_lsps(lsp_indexes, lsps, LPC_ORD);
+	    decode_lsps(lsps, lsp_indexes, LPC_ORD);
+	    bw_expand_lsps(lsps, LPC_ORD);
+	    lsp_to_lpc(lsps, ak, LPC_ORD);
+	}
+
+	if (lspd) {
+	    float lsps_[LPC_ORD];
+
+	    lspd_quantise(lsps, lsps_, LPC_ORD);
+	    lsp_to_lpc(lsps_, ak, LPC_ORD);
+ 	}
+
+	if (lspdvq) {
+	    float lsps_[LPC_ORD];
+
+	    lspdvq_quantise(lsps, lsps_, LPC_ORD);
+	    lsp_to_lpc(lsps_, ak, LPC_ORD);
+ 	}
+
+	e = decode_energy(encode_energy(e));
+	model.Wo = decode_Wo(encode_Wo(model.Wo));
+
+	aks_to_M2(ak, order, &model, e, &snr, 1); 
+	apply_lpc_correction(&model);
+	sum_snr += snr;
+#ifdef DUMP
+        dump_quantised_model(&model);
+#endif
+    }
+
+    /* optional resampling of model amplitudes */
+
+    printf("frames=%d\n", frames);
+    if (resample) {
+	snr = resample_amp_nl(&model, resample, AresdB_prev);
+	sum_snr += snr;
+#ifdef DUMP
+        dump_quantised_model(&model);
+#endif
+    }
+
+    /* option decimation to 20ms rate, which enables interpolation
+       routine to synthesise in between frame */
+  
+    if (decimate) {
+	if (!phase0) {
+	    printf("needs --phase0 to resample phase for interpolated Wo\n");
+	    exit(0);
+	}
+	if (!lpc_model) {
+	    printf("needs --lpc 10 to resample amplitudes\n");
+	    exit(0);
+	}
+
+	/* odd frame - interpolate */
+
+	if (frames%2) {
+
+	    interp_model.voiced = voiced1;
+
+	    #ifdef LOG_LIN_INTERP
+	    interpolate(&interp_model, &prev_model, &model);
+	    #else
+	    interpolate_lsp(&interp_model, &prev_model, &model,
+			    prev_lsps, prev_e, lsps, e, ak_interp);
+	    apply_lpc_correction(&interp_model);
+	    #endif
+	    
+	    if (phase0)
+		phase_synth_zero_order(&interp_model, ak_interp, ex_phase,
+				       order);	
+	    if (postfilt)
+		postfilter(&interp_model, &bg_est);
+	    synth_one_frame(buf, &interp_model, Sn_, Pn);
+	    if (fout != NULL) fwrite(buf,sizeof(short),N,fout);
+
+	    if (phase0)
+		phase_synth_zero_order(&model, ak, ex_phase, order);	
+	    if (postfilt)
+		postfilter(&model, &bg_est);
+	    synth_one_frame(buf, &model, Sn_, Pn);
+	    if (fout != NULL) fwrite(buf,sizeof(short),N,fout);
+
+	    prev_model = model;
+	    for(i=0; i<LPC_ORD; i++)
+		prev_lsps[i] = lsps[i];
+	    prev_e = e;
+	}
+	else {
+	    voiced1 = model.voiced;
+	}
+    }
+    else {
+	if (phase0)
+	    phase_synth_zero_order(&model, ak, ex_phase, order);	
+	if (postfilt)
+	    postfilter(&model, &bg_est);
+	synth_one_frame(buf, &model, Sn_, Pn);
+	if (fout != NULL) fwrite(buf,sizeof(short),N,fout);
+    }
+    prev_Wo = TWO_PI/pitch;
+  }
+  fclose(fin);
+
+  if (fout != NULL)
+    fclose(fout);
+
+  if (lpc_model || resample)
+      printf("SNR av = %5.2f dB\n", sum_snr/frames);
+
+#ifdef DUMP
+  if (dump)
+      dump_off();
+#endif
+
+  if (hand_voicing)
+    fclose(fvoicing);
+
+  nlp_destroy(nlp_states);
+
+  return 0;
+}
+
+void synth_one_frame(short buf[], MODEL *model, float Sn_[], float Pn[])
+{
+    int     i;
+
+    synthesise(Sn_, model, Pn, 1);
+
+    for(i=0; i<N; i++) {
+	if (Sn_[i] > 32767.0)
+	    buf[i] = 32767;
+	else if (Sn_[i] < -32767.0)
+	    buf[i] = -32767;
+	else
+	    buf[i] = Sn_[i];
+    }
+
+}
diff --git a/gr-vocoder/lib/codec2/codebook/dlsp1.txt b/gr-vocoder/lib/codec2/codebook/dlsp1.txt
new file mode 100644
index 000000000..d126be771
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/dlsp1.txt
@@ -0,0 +1,17 @@
+1 16
+225
+250
+275
+300
+325
+350
+375
+400
+425
+450
+475
+500
+525
+550
+575
+600
diff --git a/gr-vocoder/lib/codec2/codebook/dlsp10.txt b/gr-vocoder/lib/codec2/codebook/dlsp10.txt
new file mode 100644
index 000000000..dea9dd9d8
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/dlsp10.txt
@@ -0,0 +1,9 @@
+1 8
+50
+100
+200
+300
+425
+550
+675
+800
diff --git a/gr-vocoder/lib/codec2/codebook/dlsp2.txt b/gr-vocoder/lib/codec2/codebook/dlsp2.txt
new file mode 100644
index 000000000..234bf2067
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/dlsp2.txt
@@ -0,0 +1,17 @@
+1 16
+25
+50
+75
+100
+125
+150
+175
+200
+225
+250
+275
+300
+325
+350
+375
+400
diff --git a/gr-vocoder/lib/codec2/codebook/dlsp3.txt b/gr-vocoder/lib/codec2/codebook/dlsp3.txt
new file mode 100644
index 000000000..b2ee06da4
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/dlsp3.txt
@@ -0,0 +1,9 @@
+1 8
+50
+75
+100
+120
+150
+250
+350
+450
diff --git a/gr-vocoder/lib/codec2/codebook/dlsp4.txt b/gr-vocoder/lib/codec2/codebook/dlsp4.txt
new file mode 100644
index 000000000..dea9dd9d8
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/dlsp4.txt
@@ -0,0 +1,9 @@
+1 8
+50
+100
+200
+300
+425
+550
+675
+800
diff --git a/gr-vocoder/lib/codec2/codebook/dlsp5.txt b/gr-vocoder/lib/codec2/codebook/dlsp5.txt
new file mode 100644
index 000000000..dea9dd9d8
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/dlsp5.txt
@@ -0,0 +1,9 @@
+1 8
+50
+100
+200
+300
+425
+550
+675
+800
diff --git a/gr-vocoder/lib/codec2/codebook/dlsp6.txt b/gr-vocoder/lib/codec2/codebook/dlsp6.txt
new file mode 100644
index 000000000..dea9dd9d8
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/dlsp6.txt
@@ -0,0 +1,9 @@
+1 8
+50
+100
+200
+300
+425
+550
+675
+800
diff --git a/gr-vocoder/lib/codec2/codebook/dlsp7.txt b/gr-vocoder/lib/codec2/codebook/dlsp7.txt
new file mode 100644
index 000000000..dea9dd9d8
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/dlsp7.txt
@@ -0,0 +1,9 @@
+1 8
+50
+100
+200
+300
+425
+550
+675
+800
diff --git a/gr-vocoder/lib/codec2/codebook/dlsp8.txt b/gr-vocoder/lib/codec2/codebook/dlsp8.txt
new file mode 100644
index 000000000..dea9dd9d8
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/dlsp8.txt
@@ -0,0 +1,9 @@
+1 8
+50
+100
+200
+300
+425
+550
+675
+800
diff --git a/gr-vocoder/lib/codec2/codebook/dlsp9.txt b/gr-vocoder/lib/codec2/codebook/dlsp9.txt
new file mode 100644
index 000000000..dea9dd9d8
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/dlsp9.txt
@@ -0,0 +1,9 @@
+1 8
+50
+100
+200
+300
+425
+550
+675
+800
diff --git a/gr-vocoder/lib/codec2/codebook/lsp1.txt b/gr-vocoder/lib/codec2/codebook/lsp1.txt
new file mode 100644
index 000000000..d126be771
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp1.txt
@@ -0,0 +1,17 @@
+1 16
+225
+250
+275
+300
+325
+350
+375
+400
+425
+450
+475
+500
+525
+550
+575
+600
diff --git a/gr-vocoder/lib/codec2/codebook/lsp10.txt b/gr-vocoder/lib/codec2/codebook/lsp10.txt
new file mode 100644
index 000000000..39aab7c56
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp10.txt
@@ -0,0 +1,6 @@
+1 4
+2900
+3100
+3300
+3500
+
diff --git a/gr-vocoder/lib/codec2/codebook/lsp2.txt b/gr-vocoder/lib/codec2/codebook/lsp2.txt
new file mode 100644
index 000000000..597f14965
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp2.txt
@@ -0,0 +1,17 @@
+1 16
+325
+350
+375
+400
+425
+450
+475
+500
+525
+550
+575
+600
+625
+650
+675
+700
diff --git a/gr-vocoder/lib/codec2/codebook/lsp3.txt b/gr-vocoder/lib/codec2/codebook/lsp3.txt
new file mode 100644
index 000000000..36a64b158
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp3.txt
@@ -0,0 +1,17 @@
+1 16
+500
+550
+600
+650
+700
+750
+800
+850
+900
+950
+1000
+1050
+1100
+1150
+1200
+1250
diff --git a/gr-vocoder/lib/codec2/codebook/lsp4.txt b/gr-vocoder/lib/codec2/codebook/lsp4.txt
new file mode 100644
index 000000000..53a90bd8c
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp4.txt
@@ -0,0 +1,17 @@
+1 16
+700
+800
+900
+1000
+1100
+1200
+1300
+1400
+1500
+1600
+1700
+1800
+1900
+2000
+2100
+2200
diff --git a/gr-vocoder/lib/codec2/codebook/lsp5.txt b/gr-vocoder/lib/codec2/codebook/lsp5.txt
new file mode 100644
index 000000000..94739b56e
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp5.txt
@@ -0,0 +1,19 @@
+1 16
+ 950
+1050
+1150
+1250
+1350
+1450
+1550
+1650
+1750
+1850
+1950
+2050
+2150
+2250
+2350
+2450
+
+
diff --git a/gr-vocoder/lib/codec2/codebook/lsp6.txt b/gr-vocoder/lib/codec2/codebook/lsp6.txt
new file mode 100644
index 000000000..992ea25c5
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp6.txt
@@ -0,0 +1,19 @@
+1 16
+1100
+1200
+1300
+1400
+1500
+1600
+1700
+1800
+1900
+2000
+2100
+2200
+2300
+2400
+2500
+2600
+
+
diff --git a/gr-vocoder/lib/codec2/codebook/lsp7.txt b/gr-vocoder/lib/codec2/codebook/lsp7.txt
new file mode 100644
index 000000000..839cbfdd5
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp7.txt
@@ -0,0 +1,19 @@
+1 16
+1500
+1600
+1700
+1800
+1900
+2000
+2100
+2200
+2300
+2400
+2500
+2600
+2700
+2800
+2900
+3000
+
+
diff --git a/gr-vocoder/lib/codec2/codebook/lsp8.txt b/gr-vocoder/lib/codec2/codebook/lsp8.txt
new file mode 100644
index 000000000..d9880c94e
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp8.txt
@@ -0,0 +1,11 @@
+1 8
+2300
+2400
+2500
+2600
+2700
+2800
+2900
+3000
+
+
diff --git a/gr-vocoder/lib/codec2/codebook/lsp8910.txt b/gr-vocoder/lib/codec2/codebook/lsp8910.txt
new file mode 100644
index 000000000..93cfdd81d
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp8910.txt
@@ -0,0 +1,65 @@
+3 64
+2.048073  2.534502  2.645915  
+2.019670  2.269744  2.605462  
+1.961101  2.329646  2.562857  
+1.968573  2.532712  2.616918  
+2.183480  2.514381  2.629582  
+2.259379  2.516615  2.620410  
+2.172791  2.462460  2.567064  
+2.097666  2.303933  2.421685  
+2.052990  2.353242  2.546992  
+2.043642  2.232362  2.499262  
+2.106151  2.393131  2.488401  
+2.099167  2.437862  2.558655  
+2.013877  2.422875  2.530071  
+2.033848  2.483776  2.584598  
+2.114474  2.516856  2.602372  
+2.229214  2.584056  2.678855  
+2.131151  2.584299  2.674845  
+1.472721  2.477091  2.630241  
+2.010907  2.598415  2.682989  
+2.353653  2.524066  2.619773  
+2.419897  2.623938  2.699605  
+2.319080  2.602148  2.689044  
+1.860342  2.503881  2.616576  
+1.910517  2.386693  2.610126  
+1.748689  2.371809  2.496542  
+1.618495  2.403425  2.554956  
+1.844073  2.437026  2.533443  
+1.924810  2.388543  2.502698  
+1.937227  2.258363  2.501697  
+1.687554  2.209123  2.545239  
+1.851950  2.278628  2.565632  
+1.868154  2.330150  2.444883  
+1.874180  2.213118  2.351940  
+1.757311  2.030626  2.433836  
+1.650306  2.152371  2.243421  
+1.612794  1.884686  2.339313  
+1.745431  2.278895  2.389449  
+1.590923  2.304155  2.408510  
+1.475982  2.275548  2.509897  
+1.508695  2.045463  2.455520  
+1.872054  2.061777  2.246202  
+1.983947  2.159155  2.445535  
+1.745180  2.483765  2.593698  
+1.900116  2.079600  2.407479  
+1.841672  2.167042  2.486827  
+1.932912  2.148464  2.569850  
+2.134174  2.363673  2.584252  
+2.106094  2.450645  2.638417  
+1.954135  2.460313  2.666512  
+1.907634  2.573801  2.674025  
+1.625579  2.539569  2.656363  
+1.785866  2.572616  2.676082  
+1.798447  2.376454  2.624298  
+2.020033  2.397244  2.619868  
+1.946581  2.468791  2.564185  
+2.008920  2.342400  2.469132  
+1.983846  2.271044  2.395408  
+1.988039  2.154150  2.317920  
+2.077197  2.216622  2.389101  
+2.117255  2.283907  2.512242  
+2.177233  2.334622  2.458268  
+2.214655  2.425510  2.620013  
+2.199931  2.390272  2.520731  
+2.271755  2.448682  2.552649  
diff --git a/gr-vocoder/lib/codec2/codebook/lsp9.txt b/gr-vocoder/lib/codec2/codebook/lsp9.txt
new file mode 100644
index 000000000..7e159af2f
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codebook/lsp9.txt
@@ -0,0 +1,11 @@
+1 8
+2500
+2600
+2700
+2800
+2900
+3000
+3100
+3200
+
+
diff --git a/gr-vocoder/lib/codec2/codec2.c b/gr-vocoder/lib/codec2/codec2.c
new file mode 100644
index 000000000..92708ee32
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codec2.c
@@ -0,0 +1,342 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: codec2.c
+  AUTHOR......: David Rowe
+  DATE CREATED: 21/8/2010
+
+  Codec2 fully quantised encoder and decoder functions.  If you want use 
+  codec2, the codec2_xxx functions are for you.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2010 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "defines.h"
+#include "sine.h"
+#include "nlp.h"
+#include "dump.h"
+#include "lpc.h"
+#include "quantise.h"
+#include "phase.h"
+#include "interp.h"
+#include "postfilter.h"
+#include "codec2.h"
+#include "codec2_internal.h"
+
+/*---------------------------------------------------------------------------*\
+                                                       
+                                FUNCTIONS
+
+\*---------------------------------------------------------------------------*/
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: codec2_create	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 21/8/2010 
+
+  Create and initialise an instance of the codec.  Returns a pointer
+  to the codec states or NULL on failure.  One set of states is
+  sufficient for a full duuplex codec (i.e. an encoder and decoder).
+  You don't need separate states for encoders and decoders.  See
+  c2enc.c and c2dec.c for examples.
+
+\*---------------------------------------------------------------------------*/
+
+void *codec2_create()
+{
+    CODEC2 *c2;
+    int     i,l;
+
+    c2 = (CODEC2*)malloc(sizeof(CODEC2));
+    if (c2 == NULL)
+	return NULL;
+
+    for(i=0; i<M; i++)
+	c2->Sn[i] = 1.0;
+    c2->hpf_states[0] = c2->hpf_states[1] = 0.0;
+    for(i=0; i<2*N; i++)
+	c2->Sn_[i] = 0;
+    make_analysis_window(c2->w,c2->W);
+    make_synthesis_window(c2->Pn);
+    quantise_init();
+    c2->prev_Wo = 0.0;
+    c2->bg_est = 0.0;
+    c2->ex_phase = 0.0;
+
+    for(l=1; l<MAX_AMP; l++)
+	c2->prev_model.A[l] = 0.0;
+    c2->prev_model.Wo = TWO_PI/P_MAX;
+    c2->prev_model.L = PI/c2->prev_model.Wo;
+    c2->prev_model.voiced = 0;
+
+    for(i=0; i<LPC_ORD; i++) {
+      c2->prev_lsps[i] = i*PI/(LPC_ORD+1);
+    }
+    c2->prev_energy = 1;
+
+    c2->nlp = nlp_create();
+    if (c2->nlp == NULL) {
+	free (c2);
+	return NULL;
+    }
+
+    return (void*)c2;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: codec2_create	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 21/8/2010 
+
+  Destroy an instance of the codec.
+
+\*---------------------------------------------------------------------------*/
+
+void codec2_destroy(void *codec2_state)
+{
+    CODEC2 *c2;
+    
+    assert(codec2_state != NULL);
+    c2 = (CODEC2*)codec2_state;
+    nlp_destroy(c2->nlp);
+    free(codec2_state);
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: codec2_encode	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 21/8/2010 
+
+  Encodes 160 speech samples (20ms of speech) into 51 bits.  
+
+  The codec2 algorithm actually operates internally on 10ms (80
+  sample) frames, so we run the encoding algorithm twice.  On the
+  first frame we just send the voicing bit.  One the second frame we
+  send all model parameters.
+
+  The bit allocation is:
+
+    Parameter                      bits/frame
+    --------------------------------------
+    Harmonic magnitudes (LSPs)     36
+    Low frequency LPC correction    1
+    Energy                          5
+    Wo (fundamental frequnecy)      7
+    Voicing (10ms update)           2
+    TOTAL                          51
+ 
+\*---------------------------------------------------------------------------*/
+
+void codec2_encode(void *codec2_state, unsigned char * bits, short speech[])
+{
+    CODEC2 *c2;
+    MODEL   model;
+    int     voiced1, voiced2;
+    int     lsp_indexes[LPC_ORD];
+    int     energy_index;
+    int     Wo_index;
+    int     i;
+    unsigned int nbit = 0;
+
+    assert(codec2_state != NULL);
+    c2 = (CODEC2*)codec2_state;
+
+    /* first 10ms analysis frame - we just want voicing */
+
+    analyse_one_frame(c2, &model, speech);
+    voiced1 = model.voiced;
+
+    /* second 10ms analysis frame */
+
+    analyse_one_frame(c2, &model, &speech[N]);
+    voiced2 = model.voiced;
+    
+    Wo_index = encode_Wo(model.Wo);
+    encode_amplitudes(lsp_indexes, 
+		      &energy_index,
+		      &model, 
+		       c2->Sn, 
+		       c2->w);   
+    memset(bits, '\0', ((CODEC2_BITS_PER_FRAME + 7) / 8));
+    pack(bits, &nbit, Wo_index, WO_BITS);
+    for(i=0; i<LPC_ORD; i++) {
+	pack(bits, &nbit, lsp_indexes[i], lsp_bits(i));
+    }
+    pack(bits, &nbit, energy_index, E_BITS);
+    pack(bits, &nbit, voiced1, 1);
+    pack(bits, &nbit, voiced2, 1);
+    
+    assert(nbit == CODEC2_BITS_PER_FRAME);
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: codec2_decode	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 21/8/2010 
+
+  Decodes frames of 51 bits into 160 samples (20ms) of speech.
+
+\*---------------------------------------------------------------------------*/
+
+void codec2_decode(void *codec2_state, short speech[],
+                   const unsigned char * bits)
+{
+    CODEC2 *c2;
+    MODEL   model;
+    int     voiced1, voiced2;
+    int     lsp_indexes[LPC_ORD];
+    float   lsps[LPC_ORD];
+    int     energy_index;
+    float   energy;
+    int     Wo_index;
+    float   ak[LPC_ORD+1];
+    float   ak_interp[LPC_ORD+1];
+    int     i;
+    unsigned int nbit = 0;
+    MODEL   model_interp;
+
+    assert(codec2_state != NULL);
+    c2 = (CODEC2*)codec2_state;
+
+    /* unpack bit stream to integer codes */
+
+    Wo_index = unpack(bits, &nbit, WO_BITS);
+    for(i=0; i<LPC_ORD; i++) {
+	lsp_indexes[i] = unpack(bits, &nbit, lsp_bits(i));
+    }
+    energy_index = unpack(bits, &nbit, E_BITS);
+    voiced1 = unpack(bits, &nbit, 1);
+    voiced2 = unpack(bits, &nbit, 1);
+    assert(nbit == CODEC2_BITS_PER_FRAME);
+
+    /* decode integer codes to model parameters */
+
+    model.Wo = decode_Wo(Wo_index);
+    model.L = PI/model.Wo;
+    memset(&model.A, 0, (model.L+1)*sizeof(model.A[0]));
+    decode_amplitudes(&model, 
+		      ak,
+		      lsp_indexes,
+		      energy_index,
+		      lsps,
+		      &energy);
+
+    model.voiced = voiced2;
+    model_interp.voiced = voiced1;
+    model_interp.Wo = P_MAX/2;
+    memset(&model_interp.A, 0, MAX_AMP*sizeof(model_interp.A[0]));
+
+    /* interpolate middle frame's model parameters for adjacent frames */
+
+    interpolate_lsp(&model_interp, &c2->prev_model, &model,
+    		    c2->prev_lsps, c2->prev_energy, lsps, energy, ak_interp);
+    apply_lpc_correction(&model_interp);
+
+    /* synthesis two 10ms frames */
+
+    synthesise_one_frame(c2, speech, &model_interp, ak_interp);
+    synthesise_one_frame(c2, &speech[N], &model, ak);
+
+    /* update memories (decode states) for next time */
+
+    memcpy(&c2->prev_model, &model, sizeof(MODEL));
+    memcpy(c2->prev_lsps, lsps, sizeof(lsps));
+    c2->prev_energy = energy;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: synthesise_one_frame()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 23/8/2010 
+
+  Synthesise 80 speech samples (10ms) from model parameters.
+
+\*---------------------------------------------------------------------------*/
+
+void synthesise_one_frame(CODEC2 *c2, short speech[], MODEL *model, float ak[])
+{
+    int     i;
+
+    phase_synth_zero_order(model, ak, &c2->ex_phase, LPC_ORD);
+    postfilter(model, &c2->bg_est);
+    synthesise(c2->Sn_, model, c2->Pn, 1);
+
+    for(i=0; i<N; i++) {
+	if (c2->Sn_[i] > 32767.0)
+	    speech[i] = 32767;
+	else if (c2->Sn_[i] < -32767.0)
+	    speech[i] = -32767;
+	else
+	    speech[i] = c2->Sn_[i];
+    }
+
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: analyse_one_frame()   
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 23/8/2010 
+
+  Extract sinusoidal model parameters from 80 speech samples (10ms of
+  speech).
+ 
+\*---------------------------------------------------------------------------*/
+
+void analyse_one_frame(CODEC2 *c2, MODEL *model, short speech[])
+{
+    COMP    Sw[FFT_ENC];
+    COMP    Sw_[FFT_ENC];
+    COMP    Ew[FFT_ENC];
+    float   pitch;
+    int     i;
+
+    /* Read input speech */
+
+    for(i=0; i<M-N; i++)
+      c2->Sn[i] = c2->Sn[i+N];
+    for(i=0; i<N; i++)
+      c2->Sn[i+M-N] = speech[i];
+
+    dft_speech(Sw, c2->Sn, c2->w);
+
+    /* Estimate pitch */
+
+    nlp(c2->nlp,c2->Sn,N,M,P_MIN,P_MAX,&pitch,Sw,&c2->prev_Wo);
+    model->Wo = TWO_PI/pitch;
+    model->L = PI/model->Wo;
+
+    /* estimate model parameters */
+
+    two_stage_pitch_refinement(model, Sw);
+    estimate_amplitudes(model, Sw, c2->W);
+    est_voicing_mbe(model, Sw, c2->W, Sw_, Ew, c2->prev_Wo);
+
+    c2->prev_Wo = model->Wo;
+}
diff --git a/gr-vocoder/lib/codec2/codec2.h b/gr-vocoder/lib/codec2/codec2.h
new file mode 100644
index 000000000..946dedca5
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codec2.h
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: codec2.h
+  AUTHOR......: David Rowe
+  DATE CREATED: 21/8/2010
+
+  Codec2 fully quantised encoder and decoder functions.  If you want use 
+  codec2, these are the functions you need to call.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2010 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __CODEC2__
+#define  __CODEC2__
+
+#define CODEC2_SAMPLES_PER_FRAME 160
+#define CODEC2_BITS_PER_FRAME     50
+
+void *codec2_create();
+void codec2_destroy(void *codec2_state);
+void codec2_encode(void *codec2_state, unsigned char * bits, short speech_in[]);
+void codec2_decode(void *codec2_state, short speech_out[],
+      const unsigned char * bits);
+
+#endif
diff --git a/gr-vocoder/lib/codec2/codec2_internal.h b/gr-vocoder/lib/codec2/codec2_internal.h
new file mode 100644
index 000000000..3943ac29d
--- /dev/null
+++ b/gr-vocoder/lib/codec2/codec2_internal.h
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: codec2_internal.h
+  AUTHOR......: David Rowe
+  DATE CREATED: 22 March 2011
+
+  Some internal structures and states broken out here as they are useful for
+  testing and development.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2011 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __CODEC2_INTERNAL__
+#define  __CODEC2_INTERNAL__
+
+/*---------------------------------------------------------------------------*\
+                                                       
+                             STATES
+
+\*---------------------------------------------------------------------------*/
+
+typedef struct {
+    float  w[M];	       /* time domain hamming window                */
+    COMP   W[FFT_ENC];	       /* DFT of w[]                                */
+    float  Pn[2*N];	       /* trapezoidal synthesis window              */
+    float  Sn[M];              /* input speech                              */
+    float  hpf_states[2];      /* high pass filter states                   */
+    void  *nlp;                /* pitch predictor states                    */
+    float  Sn_[2*N];	       /* synthesised output speech                 */
+    float  ex_phase;           /* excitation model phase track              */
+    float  bg_est;             /* background noise estimate for post filter */
+    float  prev_Wo;            /* previous frame's pitch estimate           */
+    MODEL  prev_model;         /* previous frame's model parameters         */
+    float  prev_lsps[LPC_ORD]; /* previous frame's LSPs                     */
+    float  prev_energy;        /* previous frame's LPC energy               */
+} CODEC2;
+
+/*---------------------------------------------------------------------------*\
+                                                       
+                             FUNCTION HEADERS
+
+\*---------------------------------------------------------------------------*/
+
+void analyse_one_frame(CODEC2 *c2, MODEL *model, short speech[]);
+void synthesise_one_frame(CODEC2 *c2, short speech[], MODEL *model,float ak[]);
+
+#endif
diff --git a/gr-vocoder/lib/codec2/comp.h b/gr-vocoder/lib/codec2/comp.h
new file mode 100644
index 000000000..cedcab37f
--- /dev/null
+++ b/gr-vocoder/lib/codec2/comp.h
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: comp.h
+  AUTHOR......: David Rowe                                                          
+  DATE CREATED: 24/08/09
+                                                                             
+  Complex number definition.
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __COMP__
+#define __COMP__
+
+/* Complex number */
+
+typedef struct {
+  float real;
+  float imag;
+} COMP;
+
+#endif
diff --git a/gr-vocoder/lib/codec2/defines.h b/gr-vocoder/lib/codec2/defines.h
new file mode 100644
index 000000000..2dcd527d3
--- /dev/null
+++ b/gr-vocoder/lib/codec2/defines.h
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: defines.h                                                     
+  AUTHOR......: David Rowe 
+  DATE CREATED: 23/4/93                                                       
+                                                                             
+  Defines and structures used throughout the codec.			     
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __DEFINES__
+#define __DEFINES__
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+				DEFINES                                       
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/* General defines */
+
+#define N          80		/* number of samples per frame          */
+#define MAX_AMP    80		/* maximum number of harmonics          */
+#define PI         3.141592654	/* mathematical constant                */
+#define TWO_PI     6.283185307	/* mathematical constant                */
+#define FS         8000		/* sample rate in Hz                    */
+#define MAX_STR    256          /* maximum string size                  */
+
+#define NW         279          /* analysis window size                 */
+#define FFT_ENC    512		/* size of FFT used for encoder         */
+#define FFT_DEC    512	    	/* size of FFT used in decoder          */
+#define TW         40		/* Trapezoidal synthesis window overlap */
+#define V_THRESH   6.0          /* voicing threshold in dB              */
+#define LPC_MAX    20		/* maximum LPC order                    */
+#define LPC_ORD    10		/* phase modelling LPC order            */
+
+/* Pitch estimation defines */
+
+#define M        320		/* pitch analysis frame size            */
+#define P_MIN    20		/* minimum pitch                        */
+#define P_MAX    160		/* maximum pitch                        */
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+				TYPEDEFS                                      
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/* Structure to hold model parameters for one frame */
+
+typedef struct {
+  float Wo;		/* fundamental frequency estimate in radians  */
+  int   L;		/* number of harmonics                        */
+  float A[MAX_AMP];	/* amplitiude of each harmonic                */
+  float phi[MAX_AMP];	/* phase of each harmonic                     */
+  int   voiced;	        /* non-zero if this frame is voiced           */
+} MODEL;
+
+/* describes each codebook  */
+
+struct lsp_codebook {
+    int			k;        /* dimension of vector	*/
+    int			log2m;    /* number of bits in m	*/
+    int			m;        /* elements in codebook	*/
+    const float	*	cb;	  /* The elements		*/
+};
+extern const struct lsp_codebook lsp_cb[];
+extern const struct lsp_codebook lsp_cbd[];
+extern const struct lsp_codebook lsp_cbdvq[];
+
+#endif
diff --git a/gr-vocoder/lib/codec2/dump.c b/gr-vocoder/lib/codec2/dump.c
new file mode 100644
index 000000000..73a378e23
--- /dev/null
+++ b/gr-vocoder/lib/codec2/dump.c
@@ -0,0 +1,469 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: dump.c
+  AUTHOR......: David Rowe          
+  DATE CREATED: 25/8/09                                                       
+                                                                             
+  Routines to dump data to text files for Octave analysis.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "defines.h"
+#include "comp.h"
+#include "dump.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
+#ifdef DUMP
+static int dumpon = 0;
+
+static FILE *fsn = NULL;
+static FILE *fsw = NULL;
+static FILE *few = NULL;
+static FILE *fsw_ = NULL;
+static FILE *fmodel = NULL;
+static FILE *fqmodel = NULL;
+static FILE *fpw = NULL;
+static FILE *flsp = NULL;
+static FILE *fphase = NULL;
+static FILE *fphase_ = NULL;
+static FILE *ffw = NULL;
+static FILE *fe = NULL;
+static FILE *fsq = NULL;
+static FILE *fdec = NULL;
+static FILE *fsnr = NULL;
+static FILE *fak = NULL;
+static FILE *fbg = NULL;
+static FILE *fE = NULL;
+static FILE *frk = NULL;
+static FILE *fres = NULL;
+
+static char  prefix[MAX_STR];
+
+void dump_on(char p[]) {
+    dumpon = 1;
+    strcpy(prefix, p);
+}
+
+void dump_off(){
+    if (fsn != NULL)
+	fclose(fsn);
+    if (fsw != NULL)
+	fclose(fsw);
+    if (fsw_ != NULL)
+	fclose(fsw_);
+    if (few != NULL)
+	fclose(few);
+    if (fmodel != NULL)
+	fclose(fmodel);
+    if (fqmodel != NULL)
+	fclose(fqmodel);
+    if (fpw != NULL)
+	fclose(fpw);
+    if (flsp != NULL)
+	fclose(flsp);
+    if (fphase != NULL)
+	fclose(fphase);
+    if (fphase_ != NULL)
+	fclose(fphase_);
+    if (ffw != NULL)
+	fclose(ffw);
+    if (fe != NULL)
+	fclose(fe);
+    if (fsq != NULL)
+	fclose(fsq);
+    if (fdec != NULL)
+	fclose(fdec);
+    if (fsnr != NULL)
+	fclose(fsnr);
+    if (fak != NULL)
+	fclose(fak);
+    if (fbg != NULL)
+	fclose(fbg);
+    if (fE != NULL)
+	fclose(fE);
+    if (frk != NULL)
+	fclose(frk);
+    if (fres != NULL)
+	fclose(fres);
+}
+
+void dump_Sn(float Sn[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fsn == NULL) {
+	sprintf(s,"%s_sn.txt", prefix);
+	fsn = fopen(s, "wt");
+	assert(fsn != NULL);
+    }
+
+    /* split across two lines to avoid max line length problems */
+    /* reconstruct in Octave */
+
+    for(i=0; i<M/2; i++)
+	fprintf(fsn,"%f\t",Sn[i]);
+    fprintf(fsn,"\n");    
+    for(i=M/2; i<M; i++)
+	fprintf(fsn,"%f\t",Sn[i]);
+    fprintf(fsn,"\n");    
+}
+
+void dump_Sw(COMP Sw[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fsw == NULL) {
+	sprintf(s,"%s_sw.txt", prefix);
+	fsw = fopen(s, "wt");
+	assert(fsw != NULL);
+    }
+
+    for(i=0; i<FFT_ENC/2; i++)
+	fprintf(fsw,"%f\t",
+		10.0*log10(Sw[i].real*Sw[i].real + Sw[i].imag*Sw[i].imag));
+    fprintf(fsw,"\n");    
+}
+
+void dump_Sw_(COMP Sw_[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fsw_ == NULL) {
+	sprintf(s,"%s_sw_.txt", prefix);
+	fsw_ = fopen(s, "wt");
+	assert(fsw_ != NULL);
+    }
+
+    for(i=0; i<FFT_ENC/2; i++)
+	fprintf(fsw_,"%f\t",
+		10.0*log10(Sw_[i].real*Sw_[i].real + Sw_[i].imag*Sw_[i].imag));
+    fprintf(fsw_,"\n");    
+}
+
+void dump_Ew(COMP Ew[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (few == NULL) {
+	sprintf(s,"%s_ew.txt", prefix);
+	few = fopen(s, "wt");
+	assert(few != NULL);
+    }
+
+    for(i=0; i<FFT_ENC/2; i++)
+	fprintf(few,"%f\t",
+		10.0*log10(Ew[i].real*Ew[i].real + Ew[i].imag*Ew[i].imag));
+    fprintf(few,"\n");    
+}
+
+void dump_model(MODEL *model) {
+    int l;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fmodel == NULL) {
+	sprintf(s,"%s_model.txt", prefix);
+	fmodel = fopen(s, "wt");
+	assert(fmodel != NULL);
+    }
+
+    fprintf(fmodel,"%f\t%d\t", model->Wo, model->L);    
+    for(l=1; l<=model->L; l++)
+	fprintf(fmodel,"%f\t",model->A[l]);
+    for(l=model->L+1; l<MAX_AMP; l++)
+	fprintf(fmodel,"0.0\t");
+    fprintf(fmodel,"%d\t",model->voiced);
+    fprintf(fmodel,"\n");    
+}
+
+void dump_quantised_model(MODEL *model) {
+    int l;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fqmodel == NULL) {
+	sprintf(s,"%s_qmodel.txt", prefix);
+	fqmodel = fopen(s, "wt");
+	assert(fqmodel != NULL);
+    }
+
+    fprintf(fqmodel,"%f\t%d\t", model->Wo, model->L);    
+    for(l=1; l<=model->L; l++)
+	fprintf(fqmodel,"%f\t",model->A[l]);
+    for(l=model->L+1; l<MAX_AMP; l++)
+	fprintf(fqmodel,"0.0\t");
+    fprintf(fqmodel,"\n");    
+}
+
+void dump_resample(float w[], float A[], int n) {
+    int l;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fres == NULL) {
+	sprintf(s,"%s_res.txt", prefix);
+	fres = fopen(s, "wt");
+	assert(fres != NULL);
+    }
+
+    fprintf(fres,"%d\t",n);
+    for(l=0; l<n; l++)
+	fprintf(fres,"%f\t",w[l]);
+    for(l=0; l<n; l++)
+	fprintf(fres,"%f\t",A[l]);
+    fprintf(fres,"\n");    
+}
+
+void dump_phase(float phase[], int L) {
+    int l;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fphase == NULL) {
+	sprintf(s,"%s_phase.txt", prefix);
+	fphase = fopen(s, "wt");
+	assert(fphase != NULL);
+    }
+
+    for(l=1; l<=L; l++)
+	fprintf(fphase,"%f\t",phase[l]);
+    for(l=L+1; l<MAX_AMP; l++)
+	fprintf(fphase,"%f\t",0.0);
+    fprintf(fphase,"\n");    
+}
+
+void dump_phase_(float phase_[], int L) {
+    int l;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fphase_ == NULL) {
+	sprintf(s,"%s_phase_.txt", prefix);
+	fphase_ = fopen(s, "wt");
+	assert(fphase_ != NULL);
+    }
+
+    for(l=1; l<=L; l++)
+	fprintf(fphase_,"%f\t",phase_[l]);
+    for(l=L+1; l<MAX_AMP; l++)
+	fprintf(fphase_,"%f\t",0.0);
+    fprintf(fphase_,"\n");    
+}
+
+void dump_snr(float snr) {
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fsnr == NULL) {
+	sprintf(s,"%s_snr.txt", prefix);
+	fsnr = fopen(s, "wt");
+	assert(fsnr != NULL);
+    }
+
+    fprintf(fsnr,"%f\n",snr);
+}
+
+void dump_Pw(COMP Pw[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fpw == NULL) {
+	sprintf(s,"%s_pw.txt", prefix);
+	fpw = fopen(s, "wt");
+	assert(fpw != NULL);
+    }
+
+    for(i=0; i<FFT_DEC/2; i++)
+	fprintf(fpw,"%f\t",Pw[i].real);
+    fprintf(fpw,"\n");    
+}
+
+void dump_lsp(float lsp[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (flsp == NULL) {
+	sprintf(s,"%s_lsp.txt", prefix);
+	flsp = fopen(s, "wt");
+	assert(flsp != NULL);
+    }
+
+    for(i=0; i<10; i++)
+	fprintf(flsp,"%f\t",lsp[i]);
+    fprintf(flsp,"\n");    
+}
+
+void dump_ak(float ak[], int order) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fak == NULL) {
+	sprintf(s,"%s_ak.txt", prefix);
+	fak = fopen(s, "wt");
+	assert(fak != NULL);
+    }
+
+    for(i=0; i<=order; i++)
+	fprintf(fak,"%f\t",ak[i]);
+    fprintf(fak,"\n");    
+}
+
+void dump_Fw(COMP Fw[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (ffw == NULL) {
+	sprintf(s,"%s_fw.txt", prefix);
+	ffw = fopen(s, "wt");
+	assert(ffw != NULL);
+    }
+
+    for(i=0; i<256; i++)
+	fprintf(ffw,"%f\t",Fw[i].real);
+    fprintf(ffw,"\n");    
+}
+
+void dump_e(float e_hz[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fe == NULL) {
+	sprintf(s,"%s_e.txt", prefix);
+	fe = fopen(s, "wt");
+	assert(fe != NULL);
+    }
+
+    for(i=0; i<500/2; i++)
+	fprintf(fe,"%f\t",e_hz[i]);
+    fprintf(fe,"\n");    
+    for(i=500/2; i<500; i++)
+	fprintf(fe,"%f\t",e_hz[i]);
+    fprintf(fe,"\n");    
+}
+
+void dump_sq(float sq[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fsq == NULL) {
+	sprintf(s,"%s_sq.txt", prefix);
+	fsq = fopen(s, "wt");
+	assert(fsq != NULL);
+    }
+
+    for(i=0; i<M/2; i++)
+	fprintf(fsq,"%f\t",sq[i]);
+    fprintf(fsq,"\n");    
+    for(i=M/2; i<M; i++)
+	fprintf(fsq,"%f\t",sq[i]);
+    fprintf(fsq,"\n");    
+}
+
+void dump_dec(COMP Fw[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fdec == NULL) {
+	sprintf(s,"%s_dec.txt", prefix);
+	fdec = fopen(s, "wt");
+	assert(fdec != NULL);
+    }
+
+    for(i=0; i<320/5; i++)
+	fprintf(fdec,"%f\t",Fw[i].real);
+    fprintf(fdec,"\n");    
+}
+
+void dump_bg(float e, float bg_est, float percent_uv) {
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fbg == NULL) {
+	sprintf(s,"%s_bg.txt", prefix);
+	fbg = fopen(s, "wt");
+	assert(fbg != NULL);
+    }
+
+    fprintf(fbg,"%f\t%f\t%f\n", e, bg_est, percent_uv);    
+}
+
+void dump_E(float E) {
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (fE == NULL) {
+	sprintf(s,"%s_E.txt", prefix);
+	fE = fopen(s, "wt");
+	assert(fE != NULL);
+    }
+
+    fprintf(fE,"%f\n", 10.0*log10(E));
+}
+
+void dump_Rk(float Rk[]) {
+    int i;
+    char s[MAX_STR];
+
+    if (!dumpon) return;
+
+    if (frk == NULL) {
+	sprintf(s,"%s_rk.txt", prefix);
+	frk = fopen(s, "wt");
+	assert(frk != NULL);
+    }
+
+    for(i=0; i<P_MAX; i++)
+	fprintf(frk,"%f\t",Rk[i]);
+    fprintf(frk,"\n");    
+}
+
+#endif
diff --git a/gr-vocoder/lib/codec2/dump.h b/gr-vocoder/lib/codec2/dump.h
new file mode 100644
index 000000000..eeddd3406
--- /dev/null
+++ b/gr-vocoder/lib/codec2/dump.h
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: dump.h
+  AUTHOR......: David Rowe                                                          
+  DATE CREATED: 25/8/09                                                       
+                                                                             
+  Routines to dump data to text files for Octave analysis.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __DUMP__
+#define __DUMP__
+
+#include "comp.h"
+
+void dump_on(char filename_prefix[]);
+void dump_off();
+
+void dump_Sn(float Sn[]);
+void dump_Sw(COMP Sw[]);
+void dump_Sw_(COMP Sw_[]);
+void dump_Ew(COMP Ew[]);
+
+/* amplitude modelling */
+
+void dump_model(MODEL *m);
+void dump_quantised_model(MODEL *m);
+void dump_Pw(COMP Pw[]);
+void dump_lsp(float lsp[]);
+void dump_ak(float ak[], int order);
+void dump_E(float E);
+void dump_resample(float w[], float A[], int n);
+
+/* phase modelling */
+
+void dump_snr(float snr);
+void dump_phase(float phase[], int L);
+void dump_phase_(float phase[], int L);
+
+/* NLP states */
+
+void dump_sq(float sq[]);
+void dump_dec(COMP Fw[]);
+void dump_Fw(COMP Fw[]);
+void dump_e(float e_hz[]);
+void dump_Rk(float Rk[]);
+
+/* post filter */
+
+void dump_bg(float e, float bg_est, float percent_uv);
+
+#endif
diff --git a/gr-vocoder/lib/codec2/fft.c b/gr-vocoder/lib/codec2/fft.c
new file mode 100644
index 000000000..a33e4d2c8
--- /dev/null
+++ b/gr-vocoder/lib/codec2/fft.c
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+                                                 
+  FILE........: fft.c                                                  
+  AUTHOR......: Bruce Robertson                                      
+  DATE CREATED: 20/11/2010                            
+                                                         
+  Bridging function to the kiss_fft package.      
+                                                               
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2010 Bruce Robertson
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <assert.h>
+#include "kiss_fft.h"
+
+/*---------------------------------------------------------------------------*\
+                                                                            
+                                GLOBALS                                       
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+kiss_fft_cpx *fin;
+kiss_fft_cpx *fout;
+kiss_fft_cfg cfg_forward;
+kiss_fft_cfg cfg_reverse;
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+  initialize_fft(int n)                                                                  
+                                                                             
+  Initialisation function for kiss_fft. This assumes that all calls to fft() 
+  use the same datatypes and are one arrays of the same size.
+
+\*---------------------------------------------------------------------------*/
+
+void
+initialize_fft (int n)
+{
+  fin = KISS_FFT_MALLOC (n * sizeof (kiss_fft_cpx));
+  assert(fin != NULL);
+  fout = KISS_FFT_MALLOC (n * sizeof (kiss_fft_cpx));
+  assert(fout != NULL);
+  cfg_forward = kiss_fft_alloc (n, 0, NULL, NULL);
+  assert(cfg_forward != NULL);
+  cfg_reverse = kiss_fft_alloc (n, 1, NULL, NULL);
+  assert(cfg_reverse != NULL);
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+  fft(float x[], int n, int isign)                                                
+  Function that calls kiss_fft with the signature of four1 from NRC.
+
+\*---------------------------------------------------------------------------*/
+
+
+void
+fft (float x[], int n, int isign)
+{
+  int isReverse = 0;
+  int c;
+  kiss_fft_cfg cfg;
+  if (cfg_forward == NULL)
+    {
+      initialize_fft (n);
+    }
+  for (c = 0; c < n * 2; c += 2)
+    {
+      fin[c / 2].r = x[c];
+      fin[c / 2].i = -x[c + 1];
+    }
+  if (isign == -1)
+    {
+      cfg = cfg_reverse;
+    }
+  else
+    {
+      cfg = cfg_forward;
+    }
+  kiss_fft (cfg, fin, fout);
+  for (c = 0; c < n * 2; c += 2)
+    {
+      x[c] = fout[(c) / 2].r;
+      x[c + 1] = -fout[(c) / 2].i;
+    }
+}
diff --git a/gr-vocoder/lib/codec2/fft.h b/gr-vocoder/lib/codec2/fft.h
new file mode 100644
index 000000000..84c6737bd
--- /dev/null
+++ b/gr-vocoder/lib/codec2/fft.h
@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------*\
+  
+  FILE........: fft.h
+  AUTHOR......: Bruce Robertson
+  DATE CREATED: 29/11/2010
+
+  Bridge between existing code and kiss_fft.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef __FFT__
+#define __FFT__
+void fft(float x[], int n, int isign);
+
+#endif	/* __FFT__ */
+
diff --git a/gr-vocoder/lib/codec2/fq20.sh b/gr-vocoder/lib/codec2/fq20.sh
new file mode 100755
index 000000000..b83784b43
--- /dev/null
+++ b/gr-vocoder/lib/codec2/fq20.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# fq20.shsh
+# David Rowe 27 July 2010
+# 
+# Decode a file with fully quantised codec at 20ms frame rate
+
+../src/sinedec ../raw/$1.raw $1.mdl -o $1_phase0_lsp_20_EWo2.raw --phase 0 --lpc 10 --lsp --postfilter --dec
+
diff --git a/gr-vocoder/lib/codec2/generate_codebook.c b/gr-vocoder/lib/codec2/generate_codebook.c
new file mode 100644
index 000000000..0bea80d85
--- /dev/null
+++ b/gr-vocoder/lib/codec2/generate_codebook.c
@@ -0,0 +1,179 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: generate_codebook.c
+  AUTHOR......: Bruce Perens                                        
+  DATE CREATED: 29 Sep 2010                                                     
+                                                                             
+  Generate header files containing LSP quantisers, runs at compile time.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <math.h>
+
+static const char usage[] =
+"Usage: %s filename array_name [filename ...]\n"
+"\tCreate C code for codebook tables.\n";
+
+static const char format[] =
+"The table format must be:\n"
+"\tTwo integers describing the dimensions of the codebook.\n"
+"\tThen, enough numbers to fill the specified dimensions.\n";
+
+static const char header[] =
+"/* THIS IS A GENERATED FILE. Edit generate_codebook.c and its input */\n\n"
+"/*\n"
+" * This intermediary file and the files that used to create it are under \n"
+" * The LGPL. See the file COPYING.\n"
+" */\n\n"
+"#include \"defines.h\"\n\n";
+
+struct codebook {
+  unsigned int	k;
+  unsigned int	log2m;
+  unsigned int	m;
+  float * cb;
+};
+
+static void
+dump_array(const struct codebook * b, int index)
+{
+  int	limit = b->k * b->m;
+  int	i;
+
+  printf("static const float codes%d[] = {\n", index);
+  for ( i = 0; i < limit; i++ ) {
+    printf("  %g", b->cb[i]);
+    if ( i < limit - 1 )
+      printf(",");
+
+    /* organise VQs by rows, looks prettier */
+    if ( ((i+1) % b->k) == 0 )
+	printf("\n");
+  }
+  printf("};\n");
+}
+
+static void
+dump_structure(const struct codebook * b, int index)
+{
+  printf("  {\n");
+  printf("    %d,\n", b->k);
+  printf("    %g,\n", log(b->m) / log(2));
+  printf("    %d,\n", b->m);
+  printf("    codes%d\n", index);
+  printf("  }");
+}
+
+float
+get_float(FILE * in, const char * name, char * * cursor, char * buffer,
+ int size)
+{
+  for ( ; ; ) {
+    char *	s = *cursor;
+    char	c;
+
+    while ( (c = *s) != '\0' && !isdigit(c) && c != '-' && c != '.' )
+      s++;
+     
+    /* Comments start with "#" and continue to the end of the line. */
+    if ( c != '\0' && c != '#' ) {
+      char *	end = 0;
+      float	f = 0;
+
+      f = strtod(s, &end);
+
+      if ( end != s )
+        *cursor = end;
+        return f;
+    }
+
+    if ( fgets(buffer, size, in) == NULL ) {
+      fprintf(stderr, "%s: Format error. %s\n", name, format);
+      exit(1);
+    }
+    *cursor = buffer;
+  }
+}
+
+static struct codebook *
+load(FILE * file, const char * name)
+{
+  char			line[1024];
+  char *		cursor = line;
+  struct codebook *	b = malloc(sizeof(struct codebook));
+  int			i;
+  int			size;
+
+  *cursor = '\0';
+
+  b->k = (int)get_float(file, name, &cursor, line, sizeof(line));
+  b->m = (int)get_float(file, name ,&cursor, line, sizeof(line));
+  size = b->k * b->m;
+
+  b->cb = (float *)malloc(size * sizeof(float));
+
+  for ( i = 0; i < size; i++ )
+    b->cb[i] = get_float(file, name, &cursor, line, sizeof(line));
+
+  return b;
+}
+
+int
+main(int argc, char * * argv)
+{
+  struct codebook * *	cb = malloc(argc * sizeof(struct codebook *));
+  int			i;
+
+  if ( argc < 2 ) {
+    fprintf(stderr, usage, argv[0]);
+    fprintf(stderr, format);
+    exit(1);
+  }
+
+  for ( i = 0; i < argc - 2; i++ ) {
+    FILE *	in = fopen(argv[i + 2], "r");
+
+    if ( in == NULL ) {
+      perror(argv[i + 2]);
+      exit(1);
+    }
+
+    cb[i] = load(in, argv[i + 2]);
+
+    fclose(in);
+  }
+
+  printf(header);
+  for ( i = 0; i < argc - 2; i++ ) {
+    printf("  /* %s */\n", argv[i + 2]);
+    dump_array(cb[i], i);
+  }
+  printf("\nconst struct lsp_codebook %s[] = {\n", argv[1]);
+  for ( i = 0; i < argc - 2; i++ ) {
+    printf("  /* %s */\n", argv[i + 2]);
+    dump_structure(cb[i], i);
+    printf(",\n");
+  }
+  printf("  { 0, 0, 0, 0 }\n");
+  printf("};\n");
+
+  return 0;
+}
diff --git a/gr-vocoder/lib/codec2/globals.c b/gr-vocoder/lib/codec2/globals.c
new file mode 100644
index 000000000..f2182f79a
--- /dev/null
+++ b/gr-vocoder/lib/codec2/globals.c
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+                                        
+  FILE........: globals.c
+  AUTHOR......: David Rowe                                                          
+  DATE CREATED: 11/5/94                          
+                                                                             
+  Globals for sinusoidal speech coder.		      
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "sine.h"	/* global defines for coder */
+
+/* Globals used in encoder and decoder */
+
+int frames;		/* number of frames processed so far */
+float Sn[M];	        /* float input speech samples */
+MODEL model;		/* model parameters for the current frame */
+int Nw;			/* number of samples in analysis window */
+float sig;		/* energy of current frame */
+
+/* Globals used in encoder */
+
+float w[M];	        /* time domain hamming window */
+COMP W[FFT_ENC];	/* DFT of w[] */
+COMP Sw[FFT_ENC];	/* DFT of current frame */
+
+/* Globals used in decoder */
+
+COMP Sw_[FFT_ENC];	/* DFT of all voiced synthesised signal */
+float Sn_[AW_DEC];	/* synthesised speech */
+float Pn[AW_DEC];	/* time domain Parzen (trapezoidal) window */
+
diff --git a/gr-vocoder/lib/codec2/globals.h b/gr-vocoder/lib/codec2/globals.h
new file mode 100644
index 000000000..cef720344
--- /dev/null
+++ b/gr-vocoder/lib/codec2/globals.h
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: globals.h
+  AUTHOR......: David Rowe
+  DATE CREATED: 1/11/94                                                       
+                                                                             
+  Globals for sinusoidal speech coder.					      
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* Globals used in encoder and decoder */
+
+extern int frames;	/* number of frames processed so far */
+extern float Sn[];	/* float input speech samples */
+extern MODEL model;	/* model parameters for the current frame */
+extern int Nw;		/* number of samples in analysis window */
+extern float sig;	/* energy of current frame */
+
+/* Globals used in encoder */
+
+extern float w[];	/* time domain hamming window */
+extern COMP W[];	/* frequency domain hamming window */
+extern COMP Sw[];	/* DFT of current frame */
+extern COMP Sw_[];	/* DFT of all voiced synthesised signal */
+
+/* Globals used in decoder */
+
+extern float Sn_[];	/* output synthesised speech samples */
+extern float Pn[];	/* time domain Parzen (trapezoidal) window */
+
diff --git a/gr-vocoder/lib/codec2/glottal.c b/gr-vocoder/lib/codec2/glottal.c
new file mode 100644
index 000000000..8ac3ff4a9
--- /dev/null
+++ b/gr-vocoder/lib/codec2/glottal.c
@@ -0,0 +1,257 @@
+const float glottal[]={
+  0.000000,
+  -0.057687,
+  -0.115338,
+  -0.172917,
+  -0.230385,
+  -0.287707,
+  -0.344845,
+  -0.401762,
+  -0.458419,
+  -0.514781,
+  -0.570809,
+  -0.626467,
+  -0.681721,
+  -0.736537,
+  -0.790884,
+  -0.844733,
+  -0.898057,
+  -0.950834,
+  -1.003044,
+  -1.054670,
+  -1.105700,
+  -1.156124,
+  -1.205936,
+  -1.255132,
+  -1.303711,
+  -1.351675,
+  -1.399026,
+  -1.445769,
+  -1.491908,
+  -1.537448,
+  -1.582393,
+  -1.626747,
+  -1.670514,
+  -1.713693,
+  -1.756285,
+  -1.798288,
+  -1.839697,
+  -1.880507,
+  -1.920712,
+  -1.960302,
+  -1.999269,
+  -2.037603,
+  -2.075295,
+  -2.112335,
+  -2.148716,
+  -2.184430,
+  -2.219472,
+  -2.253839,
+  -2.287531,
+  -2.320550,
+  -2.352900,
+  -2.384588,
+  -2.415623,
+  -2.446019,
+  -2.475788,
+  -2.504946,
+  -2.533512,
+  -2.561501,
+  -2.588934,
+  -2.615827,
+  -2.642198,
+  -2.668064,
+  -2.693439,
+  -2.718337,
+  -2.742767,
+  -2.766738,
+  -2.790256,
+  -2.813322,
+  -2.835936,
+  -2.858094,
+  -2.879790,
+  -2.901016,
+  -2.921759,
+  -2.942008,
+  -2.961747,
+  -2.980961,
+  -2.999632,
+  -3.017745,
+  -3.035282,
+  -3.052228,
+  -3.068567,
+  -3.084285,
+  -3.099371,
+  -3.113813,
+  -3.127605,
+  -3.140738,
+  3.129975,
+  3.118167,
+  3.107022,
+  3.096537,
+  3.086709,
+  3.077531,
+  3.068996,
+  3.061096,
+  3.053821,
+  3.047159,
+  3.041102,
+  3.035636,
+  3.030753,
+  3.026441,
+  3.022690,
+  3.019491,
+  3.016836,
+  3.014718,
+  3.013132,
+  3.012072,
+  3.011535,
+  3.011521,
+  3.012028,
+  3.013057,
+  3.014612,
+  3.016695,
+  3.019310,
+  3.022463,
+  3.026160,
+  3.030407,
+  3.035212,
+  3.040580,
+  3.046520,
+  3.053038,
+  3.060141,
+  3.067836,
+  3.076128,
+  3.085023,
+  3.094525,
+  3.104639,
+  3.115367,
+  3.126712,
+  3.138674,
+  -3.131930,
+  -3.118731,
+  -3.104915,
+  -3.090485,
+  -3.075444,
+  -3.059795,
+  -3.043543,
+  -3.026695,
+  -3.009254,
+  -2.991229,
+  -2.972625,
+  -2.953449,
+  -2.933710,
+  -2.913414,
+  -2.892567,
+  -2.871176,
+  -2.849248,
+  -2.826787,
+  -2.803798,
+  -2.780284,
+  -2.756247,
+  -2.731689,
+  -2.706609,
+  -2.681005,
+  -2.654875,
+  -2.628213,
+  -2.601015,
+  -2.573272,
+  -2.544977,
+  -2.516121,
+  -2.486694,
+  -2.456686,
+  -2.426084,
+  -2.394879,
+  -2.363060,
+  -2.330616,
+  -2.297538,
+  -2.263816,
+  -2.229444,
+  -2.194416,
+  -2.158727,
+  -2.122375,
+  -2.085359,
+  -2.047682,
+  -2.009347,
+  -1.970361,
+  -1.930732,
+  -1.890470,
+  -1.849587,
+  -1.808098,
+  -1.766017,
+  -1.723360,
+  -1.680145,
+  -1.636388,
+  -1.592105,
+  -1.547313,
+  -1.502025,
+  -1.456256,
+  -1.410016,
+  -1.363314,
+  -1.316157,
+  -1.268547,
+  -1.220486,
+  -1.171971,
+  -1.122997,
+  -1.073555,
+  -1.023636,
+  -0.973227,
+  -0.922312,
+  -0.870875,
+  -0.818899,
+  -0.766366,
+  -0.713257,
+  -0.659554,
+  -0.605242,
+  -0.550303,
+  -0.494723,
+  -0.438492,
+  -0.381598,
+  -0.324036,
+  -0.265800,
+  -0.206889,
+  -0.147303,
+  -0.087046,
+  -0.026121,
+  0.035463,
+  0.097698,
+  0.160576,
+  0.224087,
+  0.288221,
+  0.352969,
+  0.418323,
+  0.484276,
+  0.550822,
+  0.617958,
+  0.685681,
+  0.753991,
+  0.822889,
+  0.892378,
+  0.962462,
+  1.033144,
+  1.104430,
+  1.176325,
+  1.248833,
+  1.321956,
+  1.395696,
+  1.470051,
+  1.545019,
+  1.620593,
+  1.696763,
+  1.773516,
+  1.850837,
+  1.928705,
+  2.007097,
+  2.085987,
+  2.165347,
+  2.245145,
+  2.325347,
+  2.405919,
+  2.486824,
+  2.568025,
+  2.649485,
+  2.731167,
+  2.813033,
+  2.895045,
+  2.977167,
+  3.059362};
diff --git a/gr-vocoder/lib/codec2/interp.c b/gr-vocoder/lib/codec2/interp.c
new file mode 100644
index 000000000..135d8c9e7
--- /dev/null
+++ b/gr-vocoder/lib/codec2/interp.c
@@ -0,0 +1,472 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: interp.c
+  AUTHOR......: David Rowe
+  DATE CREATED: 9/10/09
+
+  Interpolation of 20ms frames to 10ms frames.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <assert.h>
+#include <math.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "defines.h"
+#include "interp.h"
+#include "lsp.h"
+#include "quantise.h"
+#include "dump.h"
+
+float sample_log_amp(MODEL *model, float w);
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: interp()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/10 
+        
+  Given two frames decribed by model parameters 20ms apart, determines
+  the model parameters of the 10ms frame between them.  Assumes
+  voicing is available for middle (interpolated) frame.  Outputs are
+  amplitudes and Wo for the interpolated frame.
+
+  This version can interpolate the amplitudes between two frames of
+  different Wo and L.
+
+  This version works by log linear interpolation, but listening tests
+  showed it creates problems in background noise, e.g. hts2a and mmt1.
+  When this function is used (--dec mode) bg noise appears to be
+  amplitude modulated, and gets louder.  The interp_lsp() function
+  below seems to do a better job.
+  
+\*---------------------------------------------------------------------------*/
+
+void interpolate(
+  MODEL *interp,    /* interpolated model params                     */
+  MODEL *prev,      /* previous frames model params                  */
+  MODEL *next       /* next frames model params                      */
+)
+{
+    int   l;
+    float w,log_amp;
+
+    /* Wo depends on voicing of this and adjacent frames */
+
+    if (interp->voiced) {
+	if (prev->voiced && next->voiced)
+	    interp->Wo = (prev->Wo + next->Wo)/2.0;
+	if (!prev->voiced && next->voiced)
+	    interp->Wo = next->Wo;
+	if (prev->voiced && !next->voiced)
+	    interp->Wo = prev->Wo;
+    }
+    else {
+	interp->Wo = TWO_PI/P_MAX;
+    }
+    interp->L = PI/interp->Wo;
+
+    /* Interpolate amplitudes using linear interpolation in log domain */
+
+    for(l=1; l<=interp->L; l++) {
+	w = l*interp->Wo;
+	log_amp = (sample_log_amp(prev, w) + sample_log_amp(next, w))/2.0;
+	interp->A[l] = pow(10.0, log_amp);
+    }
+}
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: sample_log_amp()
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/10 
+        
+  Samples the amplitude envelope at an arbitrary frequency w.  Uses
+  linear interpolation in the log domain to sample between harmonic
+  amplitudes.
+  
+\*---------------------------------------------------------------------------*/
+
+float sample_log_amp(MODEL *model, float w)
+{
+    int   m;
+    float f, log_amp;
+
+    assert(w > 0.0); assert (w <= PI);
+
+    m = 0;
+    while ((m+1)*model->Wo < w) m++;
+    f = (w - m*model->Wo)/model->Wo;
+    assert(f <= 1.0);
+
+    if (m < 1) {
+	log_amp = f*log10(model->A[1] + 1E-6);
+    }
+    else if ((m+1) > model->L) {
+	log_amp = (1.0-f)*log10(model->A[model->L] + 1E-6);
+    }
+    else {
+	log_amp = (1.0-f)*log10(model->A[m] + 1E-6) + 
+                  f*log10(model->A[m+1] + 1E-6);
+	//printf("m=%d A[m] %f A[m+1] %f x %f %f %f\n", m, model->A[m], 
+	//       model->A[m+1], pow(10.0, log_amp),
+	//       (1-f), f);
+    }
+
+    return log_amp;
+}
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: sample_log_amp_quad()
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 9 March 2011 
+        
+  Samples the amplitude envelope at an arbitrary frequency w.  Uses
+  quadratic interpolation in the log domain to sample between harmonic
+  amplitudes.
+  
+  y(x) = ax*x + bx + c
+
+  We assume three points are x=-1, x=0, x=1, which we map to m-1,m,m+1
+
+  c = y(0)
+  b = (y(1) - y(-1))/2
+  a = y(-1) + b - y(0)
+
+\*---------------------------------------------------------------------------*/
+
+float sample_log_amp_quad(MODEL *model, float w)
+{
+    int   m;
+    float a,b,c,x, log_amp;
+
+    assert(w > 0.0); assert (w <= PI);
+
+    m = floor(w/model->Wo + 0.5);
+    if (m < 2) m = 2;
+    if (m > (model->L-1)) m = model->L-1;
+    c = log10(model->A[m]+1E-6);
+    b = (log10(model->A[m+1]+1E-6) - log10(model->A[m-1]+1E-6))/2.0;
+    a = log10(model->A[m-1]+1E-6) + b - c;
+    x = (w - m*model->Wo)/model->Wo;
+
+    log_amp = a*x*x + b*x + c;
+    //printf("m=%d A[m-1] %f A[m] %f A[m+1] %f w %f x %f log_amp %f\n", m,
+    //	   model->A[m-1], 
+    //	   model->A[m], model->A[m+1], w, x, pow(10.0, log_amp));
+    return log_amp;
+}
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: sample_log_amp_quad_nl()
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 10 March 2011
+        
+  Samples the amplitude envelope at an arbitrary frequency w.  Uses
+  quadratic interpolation in the log domain to sample between harmonic
+  amplitudes.  This version can handle non-linear steps along a freq
+  axis defined by arbitrary steps.
+  
+  y(x) = ax*x + bx + c
+
+  We assume three points are (x_1,y_1), (0,y0) and (x1,y1).
+
+\*---------------------------------------------------------------------------*/
+
+float sample_log_amp_quad_nl(
+			     float w[],     /* frequency points            */
+			     float A[],     /* for these amplitude samples */
+			     int np,        /* number of frequency points  */
+			     float w_sample /* frequency of new samples    */
+)
+{
+    int   m,i;
+    float a,b,c,x, log_amp, best_dist;
+    float x_1, x1;
+    float y_1, y0, y1;
+
+    //printf("w_sample  %f\n", w_sample);
+    assert(w_sample >= 0.0); assert (w_sample <= 1.1*PI);
+
+    /* find closest point to centre quadratic interpolator */
+
+    best_dist = 1E32;
+    for (i=0; i<np; i++)
+	if (fabs(w[i] - w_sample) < best_dist) {
+	    best_dist = fabs(w[i] - w_sample);
+	    m = i; 
+	}
+    
+    /* stay one point away from edge of array */
+
+    if (m < 1) m = 1;
+    if (m > (np-2)) m = np - 2;
+
+    /* find polynomial coeffs */
+
+    x_1 = w[m-1]- w[m]; x1 = w[m+1] - w[m];
+    y_1 = log10(A[m-1]+1E-6);
+    y0  = log10(A[m]+1E-6);
+    y1  = log10(A[m+1]+1E-6);
+
+    c = y0;
+    a = (y_1*x1 - y1*x_1 + c*x_1 - c*x1)/(x_1*x_1*x1 - x1*x1*x_1);
+    b = (y1 -a*x1*x1 - c)/x1;
+    x = w_sample - w[m];
+    
+    //printf("%f   %f  %f\n", w[0], w[1], w[2]);
+    //printf("%f %f  %f %f  %f %f\n", x_1, y_1, 0.0, y0, x1, y1);
+    log_amp = a*x*x + b*x + c;
+    //printf("a %f  b %f  c %f\n", a, b, c);
+    //printf("m=%d A[m-1] %f A[m] %f A[m+1] %f w_sample %f w[m] %f x %f log_amp %f\n", m,
+    //	   A[m-1], 
+    //	   A[m], A[m+1], w_sample, w[m], x, log_amp);
+    //exit(0);
+    return log_amp;
+}
+
+#define M_MAX 40
+
+float fres[] = {100,   200,  300,  400,  500,  600,  700,  800,  900, 1000,
+		1200, 1400, 1600, 1850, 2100, 2350, 2600, 2900, 3400, 3800};
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: resample_amp_nl()
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 7 March 2011
+        
+  Converts the current model with L {Am} samples spaced Wo apart to 
+  RES_POINTS samples spaced Wo/RES_POINTS apart.  Then subtracts
+  from the previous frames samples to get the delta.
+
+\*---------------------------------------------------------------------------*/
+
+void resample_amp_fixed(MODEL *model, 
+			float w[], float A[],
+			float wres[], float Ares[],
+			float AresdB_prev[], 
+			float AresdB[], 
+			float deltat[])
+{
+    int   i;
+
+    for(i=1; i<=model->L; i++) {
+	w[i-1] = i*model->Wo;
+	A[i-1] = model->A[i];
+    }
+
+    for(i=0; i<RES_POINTS; i++) {
+	wres[i] = fres[i]*PI/4000.0;
+    }
+    
+    for(i=0; i<RES_POINTS; i++) {
+	Ares[i] = pow(10.0,sample_log_amp_quad_nl(w, A, model->L, wres[i]));
+    }
+
+    /* work out delta T vector for this frame */
+
+    for(i=0; i<RES_POINTS; i++) {
+	AresdB[i] = 20.0*log10(Ares[i]);
+	deltat[i] = AresdB[i] - AresdB_prev[i];
+    }
+
+}
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: resample_amp_nl()
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 7 March 2011
+        
+  Converts the current model with L {Am} samples spaced Wo apart to M
+  samples spaced Wo/M apart.  Then converts back to L {Am} samples.
+  used to prototype constant rate Amplitude encoding ideas.
+  
+  Returns the SNR in dB.
+
+\*---------------------------------------------------------------------------*/
+
+float resample_amp_nl(MODEL *model, int m, float AresdB_prev[])
+{
+    int   i;
+    float w[MAX_AMP], A[MAX_AMP];
+    float wres[MAX_AMP], Ares[MAX_AMP], AresdB[MAX_AMP];
+    float signal, noise, snr;
+    float new_A;
+    float deltat[MAX_AMP], deltat_q[MAX_AMP], AresdB_q[MAX_AMP];
+
+    resample_amp_fixed(model, w, A, wres, Ares, AresdB_prev, AresdB, deltat);
+
+    /* quantise delta T vector */
+
+    for(i=0; i<RES_POINTS; i++) {
+	noise = 3.0*(1.0 - 2.0*rand()/RAND_MAX);
+	//noise = 0.0;
+	deltat_q[i] = deltat[i] + noise;
+    }
+
+    /* recover Ares vector */
+
+    for(i=0; i<RES_POINTS; i++) {
+	AresdB_q[i] = AresdB_prev[i] + deltat_q[i];
+	Ares[i] = pow(10.0, AresdB_q[i]/20.0);
+	//printf("%d %f %f\n", i, AresdB[i], AresdB_q[i]);
+    }
+
+    /* update memory based on version at decoder */
+
+    for(i=0; i<RES_POINTS; i++) {
+	AresdB_prev[i] = AresdB_q[i];
+    }
+
+#ifdef DUMP
+    dump_resample(wres,Ares,M_MAX);
+#endif
+
+    signal = noise = 0.0;
+    
+    for(i=1; i<model->L; i++) {
+	new_A = pow(10.0,sample_log_amp_quad_nl(wres, Ares, RES_POINTS, model->Wo*i));
+	signal += pow(model->A[i], 2.0);
+	noise  += pow(model->A[i] - new_A, 2.0);
+	//printf("%f %f\n", model->A[i], new_A);
+	model->A[i] = new_A;
+    }
+
+    snr = 10.0*log10(signal/noise);
+    printf("snr = %3.2f\n", snr);
+    //exit(0);
+    return snr;
+}
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: resample_amp()
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 10 March 2011
+        
+  Converts the current model with L {Am} samples spaced Wo apart to M
+  samples with a non-linear spacing.  Then converts back to L {Am}
+  samples.  used to prototype constant rate Amplitude encoding ideas.
+  
+  Returns the SNR in dB.
+
+\*---------------------------------------------------------------------------*/
+
+float resample_amp(MODEL *model, int m)
+{
+    int   i;
+    MODEL model_m;
+    float new_A, signal, noise, snr, log_amp_dB;
+    float n_db = 0.0;
+
+    model_m.Wo = PI/(float)m;
+    model_m.L = PI/model_m.Wo;
+
+    for(i=1; i<=model_m.L; i++) {
+	log_amp_dB    = 20.0*sample_log_amp_quad(model, i*model_m.Wo);
+	log_amp_dB   += n_db*(1.0 - 2.0*rand()/RAND_MAX);
+	model_m.A[i]  = pow(10,log_amp_dB/20.0);
+    }
+
+    //dump_resample(&model_m);
+
+    signal = noise = 0.0;
+    
+    for(i=1; i<model->L/4; i++) {
+	new_A = pow(10,sample_log_amp_quad(&model_m, i*model->Wo));
+	signal += pow(model->A[i], 2.0);
+	noise  += pow(model->A[i] - new_A, 2.0);
+	//printf("%f %f\n", model->A[i], new_A);
+	model->A[i] = new_A;
+    }
+
+    snr = 10.0*log10(signal/noise);
+    //printf("snr = %3.2f\n", snr);
+    //exit(0);
+    return snr;
+}
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: interp_lsp()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 10 Nov 2010
+        
+  Given two frames decribed by model parameters 20ms apart, determines
+  the model parameters of the 10ms frame between them.  Assumes
+  voicing is available for middle (interpolated) frame.  Outputs are
+  amplitudes and Wo for the interpolated frame.
+
+  This version uses interpolation of LSPs, seems to do a better job
+  with bg noise.
+  
+\*---------------------------------------------------------------------------*/
+
+void interpolate_lsp(
+  MODEL *interp,    /* interpolated model params                     */
+  MODEL *prev,      /* previous frames model params                  */
+  MODEL *next,      /* next frames model params                      */
+  float *prev_lsps, /* previous frames LSPs                          */
+  float  prev_e,    /* previous frames LPC energy                    */
+  float *next_lsps, /* next frames LSPs                              */
+  float  next_e,    /* next frames LPC energy                        */
+  float *ak_interp  /* interpolated aks for this frame                */
+		     )
+{
+    int   l,i;
+    float lsps[LPC_ORD],e;
+    float snr;
+
+    /* Wo depends on voicing of this and adjacent frames */
+
+    if (interp->voiced) {
+	if (prev->voiced && next->voiced)
+	    interp->Wo = (prev->Wo + next->Wo)/2.0;
+	if (!prev->voiced && next->voiced)
+	    interp->Wo = next->Wo;
+	if (prev->voiced && !next->voiced)
+	    interp->Wo = prev->Wo;
+    }
+    else {
+	interp->Wo = TWO_PI/P_MAX;
+    }
+    interp->L = PI/interp->Wo;
+
+    /* interpolate LSPs */
+
+    for(i=0; i<LPC_ORD; i++) {
+	lsps[i] = (prev_lsps[i] + next_lsps[i])/2.0;
+    }
+
+    /* Interpolate LPC energy in log domain */
+
+    e = pow(10.0, (log10(prev_e) + log10(next_e))/2.0);
+
+    /* convert back to amplitudes */
+
+    lsp_to_lpc(lsps, ak_interp, LPC_ORD);
+    aks_to_M2(ak_interp, LPC_ORD, interp, e, &snr, 0); 
+}
diff --git a/gr-vocoder/lib/codec2/interp.h b/gr-vocoder/lib/codec2/interp.h
new file mode 100644
index 000000000..d41eac3f8
--- /dev/null
+++ b/gr-vocoder/lib/codec2/interp.h
@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: interp.h
+  AUTHOR......: David Rowe
+  DATE CREATED: 9/10/09
+
+  Interpolation of 20ms frames to 10ms frames.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __INTERP__
+#define __INTERP__
+
+#define RES_POINTS 20
+
+void interpolate(MODEL *interp, MODEL *prev, MODEL *next);
+void interpolate_lsp(MODEL *interp, MODEL *prev, MODEL *next, 
+		     float *prev_lsps, float  prev_e,
+		     float *next_lsps, float  next_e,
+		     float *ak_interp);
+float resample_amp(MODEL *model, int m);
+float resample_amp_nl(MODEL *model, int m, float Ares_prev[]);
+
+#endif
diff --git a/gr-vocoder/lib/codec2/kiss_fft.c b/gr-vocoder/lib/codec2/kiss_fft.c
new file mode 100644
index 000000000..465d6c97a
--- /dev/null
+++ b/gr-vocoder/lib/codec2/kiss_fft.c
@@ -0,0 +1,408 @@
+/*
+Copyright (c) 2003-2010, Mark Borgerding
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+    * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#include "_kiss_fft_guts.h"
+/* The guts header contains all the multiplication and addition macros that are defined for
+ fixed or floating point complex numbers.  It also delares the kf_ internal functions.
+ */
+
+static void kf_bfly2(
+        kiss_fft_cpx * Fout,
+        const size_t fstride,
+        const kiss_fft_cfg st,
+        int m
+        )
+{
+    kiss_fft_cpx * Fout2;
+    kiss_fft_cpx * tw1 = st->twiddles;
+    kiss_fft_cpx t;
+    Fout2 = Fout + m;
+    do{
+        C_FIXDIV(*Fout,2); C_FIXDIV(*Fout2,2);
+
+        C_MUL (t,  *Fout2 , *tw1);
+        tw1 += fstride;
+        C_SUB( *Fout2 ,  *Fout , t );
+        C_ADDTO( *Fout ,  t );
+        ++Fout2;
+        ++Fout;
+    }while (--m);
+}
+
+static void kf_bfly4(
+        kiss_fft_cpx * Fout,
+        const size_t fstride,
+        const kiss_fft_cfg st,
+        const size_t m
+        )
+{
+    kiss_fft_cpx *tw1,*tw2,*tw3;
+    kiss_fft_cpx scratch[6];
+    size_t k=m;
+    const size_t m2=2*m;
+    const size_t m3=3*m;
+
+
+    tw3 = tw2 = tw1 = st->twiddles;
+
+    do {
+        C_FIXDIV(*Fout,4); C_FIXDIV(Fout[m],4); C_FIXDIV(Fout[m2],4); C_FIXDIV(Fout[m3],4);
+
+        C_MUL(scratch[0],Fout[m] , *tw1 );
+        C_MUL(scratch[1],Fout[m2] , *tw2 );
+        C_MUL(scratch[2],Fout[m3] , *tw3 );
+
+        C_SUB( scratch[5] , *Fout, scratch[1] );
+        C_ADDTO(*Fout, scratch[1]);
+        C_ADD( scratch[3] , scratch[0] , scratch[2] );
+        C_SUB( scratch[4] , scratch[0] , scratch[2] );
+        C_SUB( Fout[m2], *Fout, scratch[3] );
+        tw1 += fstride;
+        tw2 += fstride*2;
+        tw3 += fstride*3;
+        C_ADDTO( *Fout , scratch[3] );
+
+        if(st->inverse) {
+            Fout[m].r = scratch[5].r - scratch[4].i;
+            Fout[m].i = scratch[5].i + scratch[4].r;
+            Fout[m3].r = scratch[5].r + scratch[4].i;
+            Fout[m3].i = scratch[5].i - scratch[4].r;
+        }else{
+            Fout[m].r = scratch[5].r + scratch[4].i;
+            Fout[m].i = scratch[5].i - scratch[4].r;
+            Fout[m3].r = scratch[5].r - scratch[4].i;
+            Fout[m3].i = scratch[5].i + scratch[4].r;
+        }
+        ++Fout;
+    }while(--k);
+}
+
+static void kf_bfly3(
+         kiss_fft_cpx * Fout,
+         const size_t fstride,
+         const kiss_fft_cfg st,
+         size_t m
+         )
+{
+     size_t k=m;
+     const size_t m2 = 2*m;
+     kiss_fft_cpx *tw1,*tw2;
+     kiss_fft_cpx scratch[5];
+     kiss_fft_cpx epi3;
+     epi3 = st->twiddles[fstride*m];
+
+     tw1=tw2=st->twiddles;
+
+     do{
+         C_FIXDIV(*Fout,3); C_FIXDIV(Fout[m],3); C_FIXDIV(Fout[m2],3);
+
+         C_MUL(scratch[1],Fout[m] , *tw1);
+         C_MUL(scratch[2],Fout[m2] , *tw2);
+
+         C_ADD(scratch[3],scratch[1],scratch[2]);
+         C_SUB(scratch[0],scratch[1],scratch[2]);
+         tw1 += fstride;
+         tw2 += fstride*2;
+
+         Fout[m].r = Fout->r - HALF_OF(scratch[3].r);
+         Fout[m].i = Fout->i - HALF_OF(scratch[3].i);
+
+         C_MULBYSCALAR( scratch[0] , epi3.i );
+
+         C_ADDTO(*Fout,scratch[3]);
+
+         Fout[m2].r = Fout[m].r + scratch[0].i;
+         Fout[m2].i = Fout[m].i - scratch[0].r;
+
+         Fout[m].r -= scratch[0].i;
+         Fout[m].i += scratch[0].r;
+
+         ++Fout;
+     }while(--k);
+}
+
+static void kf_bfly5(
+        kiss_fft_cpx * Fout,
+        const size_t fstride,
+        const kiss_fft_cfg st,
+        int m
+        )
+{
+    kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4;
+    int u;
+    kiss_fft_cpx scratch[13];
+    kiss_fft_cpx * twiddles = st->twiddles;
+    kiss_fft_cpx *tw;
+    kiss_fft_cpx ya,yb;
+    ya = twiddles[fstride*m];
+    yb = twiddles[fstride*2*m];
+
+    Fout0=Fout;
+    Fout1=Fout0+m;
+    Fout2=Fout0+2*m;
+    Fout3=Fout0+3*m;
+    Fout4=Fout0+4*m;
+
+    tw=st->twiddles;
+    for ( u=0; u<m; ++u ) {
+        C_FIXDIV( *Fout0,5); C_FIXDIV( *Fout1,5); C_FIXDIV( *Fout2,5); C_FIXDIV( *Fout3,5); C_FIXDIV( *Fout4,5);
+        scratch[0] = *Fout0;
+
+        C_MUL(scratch[1] ,*Fout1, tw[u*fstride]);
+        C_MUL(scratch[2] ,*Fout2, tw[2*u*fstride]);
+        C_MUL(scratch[3] ,*Fout3, tw[3*u*fstride]);
+        C_MUL(scratch[4] ,*Fout4, tw[4*u*fstride]);
+
+        C_ADD( scratch[7],scratch[1],scratch[4]);
+        C_SUB( scratch[10],scratch[1],scratch[4]);
+        C_ADD( scratch[8],scratch[2],scratch[3]);
+        C_SUB( scratch[9],scratch[2],scratch[3]);
+
+        Fout0->r += scratch[7].r + scratch[8].r;
+        Fout0->i += scratch[7].i + scratch[8].i;
+
+        scratch[5].r = scratch[0].r + S_MUL(scratch[7].r,ya.r) + S_MUL(scratch[8].r,yb.r);
+        scratch[5].i = scratch[0].i + S_MUL(scratch[7].i,ya.r) + S_MUL(scratch[8].i,yb.r);
+
+        scratch[6].r =  S_MUL(scratch[10].i,ya.i) + S_MUL(scratch[9].i,yb.i);
+        scratch[6].i = -S_MUL(scratch[10].r,ya.i) - S_MUL(scratch[9].r,yb.i);
+
+        C_SUB(*Fout1,scratch[5],scratch[6]);
+        C_ADD(*Fout4,scratch[5],scratch[6]);
+
+        scratch[11].r = scratch[0].r + S_MUL(scratch[7].r,yb.r) + S_MUL(scratch[8].r,ya.r);
+        scratch[11].i = scratch[0].i + S_MUL(scratch[7].i,yb.r) + S_MUL(scratch[8].i,ya.r);
+        scratch[12].r = - S_MUL(scratch[10].i,yb.i) + S_MUL(scratch[9].i,ya.i);
+        scratch[12].i = S_MUL(scratch[10].r,yb.i) - S_MUL(scratch[9].r,ya.i);
+
+        C_ADD(*Fout2,scratch[11],scratch[12]);
+        C_SUB(*Fout3,scratch[11],scratch[12]);
+
+        ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4;
+    }
+}
+
+/* perform the butterfly for one stage of a mixed radix FFT */
+static void kf_bfly_generic(
+        kiss_fft_cpx * Fout,
+        const size_t fstride,
+        const kiss_fft_cfg st,
+        int m,
+        int p
+        )
+{
+    int u,k,q1,q;
+    kiss_fft_cpx * twiddles = st->twiddles;
+    kiss_fft_cpx t;
+    int Norig = st->nfft;
+
+    kiss_fft_cpx * scratch = (kiss_fft_cpx*)KISS_FFT_TMP_ALLOC(sizeof(kiss_fft_cpx)*p);
+
+    for ( u=0; u<m; ++u ) {
+        k=u;
+        for ( q1=0 ; q1<p ; ++q1 ) {
+            scratch[q1] = Fout[ k  ];
+            C_FIXDIV(scratch[q1],p);
+            k += m;
+        }
+
+        k=u;
+        for ( q1=0 ; q1<p ; ++q1 ) {
+            int twidx=0;
+            Fout[ k ] = scratch[0];
+            for (q=1;q<p;++q ) {
+                twidx += fstride * k;
+                if (twidx>=Norig) twidx-=Norig;
+                C_MUL(t,scratch[q] , twiddles[twidx] );
+                C_ADDTO( Fout[ k ] ,t);
+            }
+            k += m;
+        }
+    }
+    KISS_FFT_TMP_FREE(scratch);
+}
+
+static
+void kf_work(
+        kiss_fft_cpx * Fout,
+        const kiss_fft_cpx * f,
+        const size_t fstride,
+        int in_stride,
+        int * factors,
+        const kiss_fft_cfg st
+        )
+{
+    kiss_fft_cpx * Fout_beg=Fout;
+    const int p=*factors++; /* the radix  */
+    const int m=*factors++; /* stage's fft length/p */
+    const kiss_fft_cpx * Fout_end = Fout + p*m;
+
+#ifdef _OPENMP
+    // use openmp extensions at the 
+    // top-level (not recursive)
+    if (fstride==1 && p<=5)
+    {
+        int k;
+
+        // execute the p different work units in different threads
+#       pragma omp parallel for
+        for (k=0;k<p;++k) 
+            kf_work( Fout +k*m, f+ fstride*in_stride*k,fstride*p,in_stride,factors,st);
+        // all threads have joined by this point
+
+        switch (p) {
+            case 2: kf_bfly2(Fout,fstride,st,m); break;
+            case 3: kf_bfly3(Fout,fstride,st,m); break; 
+            case 4: kf_bfly4(Fout,fstride,st,m); break;
+            case 5: kf_bfly5(Fout,fstride,st,m); break; 
+            default: kf_bfly_generic(Fout,fstride,st,m,p); break;
+        }
+        return;
+    }
+#endif
+
+    if (m==1) {
+        do{
+            *Fout = *f;
+            f += fstride*in_stride;
+        }while(++Fout != Fout_end );
+    }else{
+        do{
+            // recursive call:
+            // DFT of size m*p performed by doing
+            // p instances of smaller DFTs of size m, 
+            // each one takes a decimated version of the input
+            kf_work( Fout , f, fstride*p, in_stride, factors,st);
+            f += fstride*in_stride;
+        }while( (Fout += m) != Fout_end );
+    }
+
+    Fout=Fout_beg;
+
+    // recombine the p smaller DFTs 
+    switch (p) {
+        case 2: kf_bfly2(Fout,fstride,st,m); break;
+        case 3: kf_bfly3(Fout,fstride,st,m); break; 
+        case 4: kf_bfly4(Fout,fstride,st,m); break;
+        case 5: kf_bfly5(Fout,fstride,st,m); break; 
+        default: kf_bfly_generic(Fout,fstride,st,m,p); break;
+    }
+}
+
+/*  facbuf is populated by p1,m1,p2,m2, ...
+    where 
+    p[i] * m[i] = m[i-1]
+    m0 = n                  */
+static 
+void kf_factor(int n,int * facbuf)
+{
+    int p=4;
+    double floor_sqrt;
+    floor_sqrt = floor( sqrt((double)n) );
+
+    /*factor out powers of 4, powers of 2, then any remaining primes */
+    do {
+        while (n % p) {
+            switch (p) {
+                case 4: p = 2; break;
+                case 2: p = 3; break;
+                default: p += 2; break;
+            }
+            if (p > floor_sqrt)
+                p = n;          /* no more factors, skip to end */
+        }
+        n /= p;
+        *facbuf++ = p;
+        *facbuf++ = n;
+    } while (n > 1);
+}
+
+/*
+ *
+ * User-callable function to allocate all necessary storage space for the fft.
+ *
+ * The return value is a contiguous block of memory, allocated with malloc.  As such,
+ * It can be freed with free(), rather than a kiss_fft-specific function.
+ * */
+kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem )
+{
+    kiss_fft_cfg st=NULL;
+    size_t memneeded = sizeof(struct kiss_fft_state)
+        + sizeof(kiss_fft_cpx)*(nfft-1); /* twiddle factors*/
+
+    if ( lenmem==NULL ) {
+        st = ( kiss_fft_cfg)KISS_FFT_MALLOC( memneeded );
+    }else{
+        if (mem != NULL && *lenmem >= memneeded)
+            st = (kiss_fft_cfg)mem;
+        *lenmem = memneeded;
+    }
+    if (st) {
+        int i;
+        st->nfft=nfft;
+        st->inverse = inverse_fft;
+
+        for (i=0;i<nfft;++i) {
+            const double pi=3.141592653589793238462643383279502884197169399375105820974944;
+            double phase = -2*pi*i / nfft;
+            if (st->inverse)
+                phase *= -1;
+            kf_cexp(st->twiddles+i, phase );
+        }
+
+        kf_factor(nfft,st->factors);
+    }
+    return st;
+}
+
+
+void kiss_fft_stride(kiss_fft_cfg st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int in_stride)
+{
+    if (fin == fout) {
+        //NOTE: this is not really an in-place FFT algorithm.
+        //It just performs an out-of-place FFT into a temp buffer
+        kiss_fft_cpx * tmpbuf = (kiss_fft_cpx*)KISS_FFT_TMP_ALLOC( sizeof(kiss_fft_cpx)*st->nfft);
+        kf_work(tmpbuf,fin,1,in_stride, st->factors,st);
+        memcpy(fout,tmpbuf,sizeof(kiss_fft_cpx)*st->nfft);
+        KISS_FFT_TMP_FREE(tmpbuf);
+    }else{
+        kf_work( fout, fin, 1,in_stride, st->factors,st );
+    }
+}
+
+void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
+{
+    kiss_fft_stride(cfg,fin,fout,1);
+}
+
+
+void kiss_fft_cleanup(void)
+{
+    // nothing needed any more
+}
+
+int kiss_fft_next_fast_size(int n)
+{
+    while(1) {
+        int m=n;
+        while ( (m%2) == 0 ) m/=2;
+        while ( (m%3) == 0 ) m/=3;
+        while ( (m%5) == 0 ) m/=5;
+        if (m<=1)
+            break; /* n is completely factorable by twos, threes, and fives */
+        n++;
+    }
+    return n;
+}
diff --git a/gr-vocoder/lib/codec2/kiss_fft.h b/gr-vocoder/lib/codec2/kiss_fft.h
new file mode 100644
index 000000000..64c50f4aa
--- /dev/null
+++ b/gr-vocoder/lib/codec2/kiss_fft.h
@@ -0,0 +1,124 @@
+#ifndef KISS_FFT_H
+#define KISS_FFT_H
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ ATTENTION!
+ If you would like a :
+ -- a utility that will handle the caching of fft objects
+ -- real-only (no imaginary time component ) FFT
+ -- a multi-dimensional FFT
+ -- a command-line utility to perform ffts
+ -- a command-line utility to perform fast-convolution filtering
+
+ Then see kfc.h kiss_fftr.h kiss_fftnd.h fftutil.c kiss_fastfir.c
+  in the tools/ directory.
+*/
+
+#ifdef USE_SIMD
+# include <xmmintrin.h>
+# define kiss_fft_scalar __m128
+#define KISS_FFT_MALLOC(nbytes) _mm_malloc(nbytes,16)
+#define KISS_FFT_FREE _mm_free
+#else	
+#define KISS_FFT_MALLOC malloc
+#define KISS_FFT_FREE free
+#endif	
+
+
+#ifdef FIXED_POINT
+#include <sys/types.h>	
+# if (FIXED_POINT == 32)
+#  define kiss_fft_scalar int32_t
+# else	
+#  define kiss_fft_scalar int16_t
+# endif
+#else
+# ifndef kiss_fft_scalar
+/*  default is float */
+#   define kiss_fft_scalar float
+# endif
+#endif
+
+typedef struct {
+    kiss_fft_scalar r;
+    kiss_fft_scalar i;
+}kiss_fft_cpx;
+
+typedef struct kiss_fft_state* kiss_fft_cfg;
+
+/* 
+ *  kiss_fft_alloc
+ *  
+ *  Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
+ *
+ *  typical usage:      kiss_fft_cfg mycfg=kiss_fft_alloc(1024,0,NULL,NULL);
+ *
+ *  The return value from fft_alloc is a cfg buffer used internally
+ *  by the fft routine or NULL.
+ *
+ *  If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc.
+ *  The returned value should be free()d when done to avoid memory leaks.
+ *  
+ *  The state can be placed in a user supplied buffer 'mem':
+ *  If lenmem is not NULL and mem is not NULL and *lenmem is large enough,
+ *      then the function places the cfg in mem and the size used in *lenmem
+ *      and returns mem.
+ *  
+ *  If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough),
+ *      then the function returns NULL and places the minimum cfg 
+ *      buffer size in *lenmem.
+ * */
+
+kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem); 
+
+/*
+ * kiss_fft(cfg,in_out_buf)
+ *
+ * Perform an FFT on a complex input buffer.
+ * for a forward FFT,
+ * fin should be  f[0] , f[1] , ... ,f[nfft-1]
+ * fout will be   F[0] , F[1] , ... ,F[nfft-1]
+ * Note that each element is complex and can be accessed like
+    f[k].r and f[k].i
+ * */
+void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
+
+/*
+ A more generic version of the above function. It reads its input from every Nth sample.
+ * */
+void kiss_fft_stride(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride);
+
+/* If kiss_fft_alloc allocated a buffer, it is one contiguous 
+   buffer and can be simply free()d when no longer needed*/
+#define kiss_fft_free free
+
+/*
+ Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up 
+ your compiler output to call this before you exit.
+*/
+void kiss_fft_cleanup(void);
+	
+
+/*
+ * Returns the smallest integer k, such that k>=n and k has only "fast" factors (2,3,5)
+ */
+int kiss_fft_next_fast_size(int n);
+
+/* for real ffts, we need an even size */
+#define kiss_fftr_next_fast_size_real(n) \
+        (kiss_fft_next_fast_size( ((n)+1)>>1)<<1)
+
+#ifdef __cplusplus
+} 
+#endif
+
+#endif
diff --git a/gr-vocoder/lib/codec2/listensim.sh b/gr-vocoder/lib/codec2/listensim.sh
new file mode 100755
index 000000000..0b27a1b0c
--- /dev/null
+++ b/gr-vocoder/lib/codec2/listensim.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# listensim.sh
+# David Rowe 10 Sep 2009
+#
+# Listen to files processed with sim.sh
+
+../script/menu.sh ../raw/$1.raw $1_uq.raw $1_phase0.raw $1_lpc10.raw $1_phase0_lpc10.raw $1_phase0_lpc10_dec.raw $1_phase0_lsp_dec.raw $2 $3
+
+
diff --git a/gr-vocoder/lib/codec2/lpc.c b/gr-vocoder/lib/codec2/lpc.c
new file mode 100644
index 000000000..ba8011377
--- /dev/null
+++ b/gr-vocoder/lib/codec2/lpc.c
@@ -0,0 +1,279 @@
+/*---------------------------------------------------------------------------*\
+                                                                           
+  FILE........: lpc.c                                                              
+  AUTHOR......: David Rowe                                                      
+  DATE CREATED: 30/9/90                                                   
+                                                                          
+  Linear Prediction functions written in C.                                
+                                                                          
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#define LPC_MAX_N 512		/* maximum no. of samples in frame */
+#define PI 3.141592654		/* mathematical constant */
+
+#include <assert.h>
+#include <math.h>
+#include "defines.h"
+#include "lpc.h"
+
+/*---------------------------------------------------------------------------*\
+                                                                         
+  hanning_window()                                                        
+                                                                         
+  Hanning windows a frame of speech samples.                              
+                                                                           
+\*---------------------------------------------------------------------------*/
+
+void hanning_window(
+  float Sn[],	/* input frame of speech samples */
+  float Wn[],	/* output frame of windowed samples */
+  int Nsam	/* number of samples */
+)
+{
+  int i;	/* loop variable */
+
+  for(i=0; i<Nsam; i++)
+    Wn[i] = Sn[i]*(0.5 - 0.5*cos(2*PI*(float)i/(Nsam-1)));
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                           
+  autocorrelate()                                                          
+                                                                          
+  Finds the first P autocorrelation values of an array of windowed speech 
+  samples Sn[].                                                            
+                                                                          
+\*---------------------------------------------------------------------------*/
+
+void autocorrelate(
+  float Sn[],	/* frame of Nsam windowed speech samples */
+  float Rn[],	/* array of P+1 autocorrelation coefficients */
+  int Nsam,	/* number of windowed samples to use */
+  int order	/* order of LPC analysis */
+)
+{
+  int i,j;	/* loop variables */
+
+  for(j=0; j<order+1; j++) {
+    Rn[j] = 0.0;
+    for(i=0; i<Nsam-j; i++)
+      Rn[j] += Sn[i]*Sn[i+j];
+  }
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                           
+  autocorrelate_freq()                                                          
+                                                                          
+  Finds the first P autocorrelation values from an array of frequency domain
+  power samples.                                                            
+                                                                          
+\*---------------------------------------------------------------------------*/
+
+void autocorrelate_freq(
+  float Pw[],	/* Nsam frequency domain power spectrum samples    */
+  float  w[],	/* frequency of each sample in Pw[]                */
+  float  R[],	/* array of order+1 autocorrelation coefficients   */
+  int Nsam,	/* number of windowed samples to use               */
+  int order	/* order of LPC analysis                           */
+)
+{
+  int i,j;	/* loop variables */
+
+  for(j=0; j<order+1; j++) {
+    R[j] = 0.0;
+    for(i=0; i<Nsam; i++)
+	R[j] += Pw[i]*cos(j*w[i]);
+  }
+  R[j] /= Nsam;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                            
+  levinson_durbin()                                                        
+                                                                           
+  Given P+1 autocorrelation coefficients, finds P Linear Prediction Coeff. 
+  (LPCs) where P is the order of the LPC all-pole model. The Levinson-Durbin
+  algorithm is used, and is described in:                                   
+                                                                           
+    J. Makhoul                                                               
+    "Linear prediction, a tutorial review"                                   
+    Proceedings of the IEEE                                                
+    Vol-63, No. 4, April 1975                                               
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+void levinson_durbin(
+  float R[],		/* order+1 autocorrelation coeff */
+  float lpcs[],		/* order+1 LPC's */
+  int order		/* order of the LPC analysis */
+)
+{
+  float E[LPC_MAX+1];
+  float k[LPC_MAX+1];
+  float a[LPC_MAX+1][LPC_MAX+1];
+  float sum;
+  int i,j;				/* loop variables */
+
+  E[0] = R[0];				/* Equation 38a, Makhoul */
+
+  for(i=1; i<=order; i++) {
+    sum = 0.0;
+    for(j=1; j<=i-1; j++)
+      sum += a[i-1][j]*R[i-j];
+    k[i] = -1.0*(R[i] + sum)/E[i-1];	/* Equation 38b, Makhoul */
+    if (fabs(k[i]) > 1.0)
+      k[i] = 0.0;
+
+    a[i][i] = k[i];
+
+    for(j=1; j<=i-1; j++)
+      a[i][j] = a[i-1][j] + k[i]*a[i-1][i-j];	/* Equation 38c, Makhoul */
+
+    E[i] = (1-k[i]*k[i])*E[i-1];		/* Equation 38d, Makhoul */
+  }
+
+  for(i=1; i<=order; i++)
+    lpcs[i] = a[order][i];
+  lpcs[0] = 1.0;  
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+  inverse_filter()                                                          
+                                                                           
+  Inverse Filter, A(z).  Produces an array of residual samples from an array
+  of input samples and linear prediction coefficients.                      
+                                                                             
+  The filter memory is stored in the first order samples of the input array.
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+void inverse_filter(
+  float Sn[],	/* Nsam input samples */
+  float a[],	/* LPCs for this frame of samples */
+  int Nsam,	/* number of samples */
+  float res[],	/* Nsam residual samples */
+  int order	/* order of LPC */
+)
+{
+  int i,j;	/* loop variables */
+
+  for(i=0; i<Nsam; i++) {
+    res[i] = 0.0;
+    for(j=0; j<=order; j++)
+      res[i] += Sn[i-j]*a[j];
+  }    
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                            
+ synthesis_filter()                                                        
+                                                                           
+ C version of the Speech Synthesis Filter, 1/A(z).  Given an array of   
+ residual or excitation samples, and the the LP filter coefficients, this
+ function will produce an array of speech samples.  This filter structure is
+ IIR.                                                                       
+                                                                           
+ The synthesis filter has memory as well, this is treated in the same way 
+ as the memory for the inverse filter (see inverse_filter() notes above). 
+ The difference is that the memory for the synthesis filter is stored in  
+ the output array, wheras the memory of the inverse filter is stored in the
+ input array.                                                              
+                                                                           
+ Note: the calling function must update the filter memory.                
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+void synthesis_filter(
+  float res[],	/* Nsam input residual (excitation) samples */
+  float a[],	/* LPCs for this frame of speech samples */
+  int Nsam,	/* number of speech samples */
+  int order,	/* LPC order */
+  float Sn_[]	/* Nsam output synthesised speech samples */
+)
+{
+  int i,j;	/* loop variables */
+
+  /* Filter Nsam samples */
+
+  for(i=0; i<Nsam; i++) {
+    Sn_[i] = res[i]*a[0];
+    for(j=1; j<=order; j++)
+      Sn_[i] -= Sn_[i-j]*a[j];
+  }
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                            
+  find_aks()                                                                 
+                                                                            
+  This function takes a frame of samples, and determines the linear           
+  prediction coefficients for that frame of samples.                         
+                                                                            
+\*---------------------------------------------------------------------------*/
+
+void find_aks(
+  float Sn[],	/* Nsam samples with order sample memory */
+  float a[],	/* order+1 LPCs with first coeff 1.0 */
+  int Nsam,	/* number of input speech samples */
+  int order,	/* order of the LPC analysis */
+  float *E	/* residual energy */
+)
+{
+  float Wn[LPC_MAX_N];	/* windowed frame of Nsam speech samples */
+  float R[LPC_MAX+1];	/* order+1 autocorrelation values of Sn[] */
+  int i;
+
+  assert(order < LPC_MAX);
+  assert(Nsam < LPC_MAX_N);
+
+  hanning_window(Sn,Wn,Nsam);
+  autocorrelate(Wn,R,Nsam,order);
+  levinson_durbin(R,a,order);
+
+  *E = 0.0;
+  for(i=0; i<=order; i++)
+    *E += a[i]*R[i];
+  if (*E < 0.0)
+    *E = 1E-12;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                            
+  weight()                                                                  
+                                                                          
+  Weights a vector of LPCs.						   
+                                                                          
+\*---------------------------------------------------------------------------*/
+
+void weight(
+  float ak[],	/* vector of order+1 LPCs */
+  float gamma,	/* weighting factor */
+  int order,	/* num LPCs (excluding leading 1.0) */
+  float akw[]	/* weighted vector of order+1 LPCs */
+)
+{
+  int i;
+  
+  for(i=1; i<=order; i++)
+    akw[i] = ak[i]*pow(gamma,(float)i);
+}
+    
diff --git a/gr-vocoder/lib/codec2/lpc.h b/gr-vocoder/lib/codec2/lpc.h
new file mode 100644
index 000000000..ead05e1ba
--- /dev/null
+++ b/gr-vocoder/lib/codec2/lpc.h
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+                                                                           
+  FILE........: lpc.h                                                            
+  AUTHOR......: David Rowe                                                      
+  DATE CREATED: 24/8/09                                                   
+                                                                          
+  Linear Prediction functions written in C.                                
+                                                                          
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __LPC__
+#define __LPC__
+
+#define LPC_MAX_ORDER 20
+
+void hanning_window(float Sn[],	float Wn[], int Nsam);
+void autocorrelate(float Sn[], float Rn[], int Nsam, int order);
+void autocorrelate_freq(float Pw[], float w[], float  R[], int Nsam, int order);
+void levinson_durbin(float R[],	float lpcs[], int order);
+void inverse_filter(float Sn[], float a[], int Nsam, float res[], int order);
+void synthesis_filter(float res[], float a[], int Nsam,	int order, float Sn_[]);
+void find_aks(float Sn[], float a[], int Nsam, int order, float *E);
+void weight(float ak[],	float gamma, int order,	float akw[]);
+
+#endif
diff --git a/gr-vocoder/lib/codec2/lsp.c b/gr-vocoder/lib/codec2/lsp.c
new file mode 100644
index 000000000..47001c1ef
--- /dev/null
+++ b/gr-vocoder/lib/codec2/lsp.c
@@ -0,0 +1,325 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: lsp.c
+  AUTHOR......: David Rowe
+  DATE CREATED: 24/2/93
+
+
+  This file contains functions for LPC to LSP conversion and LSP to
+  LPC conversion. Note that the LSP coefficients are not in radians
+  format but in the x domain of the unit circle.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "defines.h"
+#include "lsp.h"
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+/* Only 10 gets used, so far. */
+#define LSP_MAX_ORDER	20
+
+/*---------------------------------------------------------------------------*\
+
+  Introduction to Line Spectrum Pairs (LSPs)
+  ------------------------------------------
+
+  LSPs are used to encode the LPC filter coefficients {ak} for
+  transmission over the channel.  LSPs have several properties (like
+  less sensitivity to quantisation noise) that make them superior to
+  direct quantisation of {ak}.
+
+  A(z) is a polynomial of order lpcrdr with {ak} as the coefficients.
+
+  A(z) is transformed to P(z) and Q(z) (using a substitution and some
+  algebra), to obtain something like:
+
+    A(z) = 0.5[P(z)(z+z^-1) + Q(z)(z-z^-1)]  (1)
+
+  As you can imagine A(z) has complex zeros all over the z-plane. P(z)
+  and Q(z) have the very neat property of only having zeros _on_ the
+  unit circle.  So to find them we take a test point z=exp(jw) and
+  evaluate P (exp(jw)) and Q(exp(jw)) using a grid of points between 0
+  and pi.
+
+  The zeros (roots) of P(z) also happen to alternate, which is why we
+  swap coefficients as we find roots.  So the process of finding the
+  LSP frequencies is basically finding the roots of 5th order
+  polynomials.
+
+  The root so P(z) and Q(z) occur in symmetrical pairs at +/-w, hence
+  the name Line Spectrum Pairs (LSPs).
+
+  To convert back to ak we just evaluate (1), "clocking" an impulse
+  thru it lpcrdr times gives us the impulse response of A(z) which is
+  {ak}.
+
+\*---------------------------------------------------------------------------*/
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: cheb_poly_eva()
+  AUTHOR......: David Rowe
+  DATE CREATED: 24/2/93
+
+  This function evalutes a series of chebyshev polynomials
+
+  FIXME: performing memory allocation at run time is very inefficient,
+  replace with stack variables of MAX_P size.
+
+\*---------------------------------------------------------------------------*/
+
+
+static float
+cheb_poly_eva(float *coef,float x,int m)
+/*  float coef[]  	coefficients of the polynomial to be evaluated 	*/
+/*  float x   		the point where polynomial is to be evaluated 	*/
+/*  int m 		order of the polynomial 			*/
+{
+    int i;
+    float *t,*u,*v,sum;
+    float T[(LSP_MAX_ORDER / 2) + 1];
+
+    /* Initialise pointers */
+
+    t = T;                          	/* T[i-2] 			*/
+    *t++ = 1.0;
+    u = t--;                        	/* T[i-1] 			*/
+    *u++ = x;
+    v = u--;                        	/* T[i] 			*/
+
+    /* Evaluate chebyshev series formulation using iterative approach 	*/
+
+    for(i=2;i<=m/2;i++)
+	*v++ = (2*x)*(*u++) - *t++;  	/* T[i] = 2*x*T[i-1] - T[i-2]	*/
+
+    sum=0.0;                        	/* initialise sum to zero 	*/
+    t = T;                          	/* reset pointer 		*/
+
+    /* Evaluate polynomial and return value also free memory space */
+
+    for(i=0;i<=m/2;i++)
+	sum+=coef[(m/2)-i]**t++;
+
+    return sum;
+}
+
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: lpc_to_lsp()
+  AUTHOR......: David Rowe
+  DATE CREATED: 24/2/93
+
+  This function converts LPC coefficients to LSP coefficients.
+
+\*---------------------------------------------------------------------------*/
+
+int lpc_to_lsp (float *a, int lpcrdr, float *freq, int nb, float delta)
+/*  float *a 		     	lpc coefficients			*/
+/*  int lpcrdr			order of LPC coefficients (10) 		*/
+/*  float *freq 	      	LSP frequencies in radians      	*/
+/*  int nb			number of sub-intervals (4) 		*/
+/*  float delta			grid spacing interval (0.02) 		*/
+{
+    float psuml,psumr,psumm,temp_xr,xl,xr,xm = 0;
+    float temp_psumr;
+    int i,j,m,flag,k;
+    float *px;                	/* ptrs of respective P'(z) & Q'(z)	*/
+    float *qx;
+    float *p;
+    float *q;
+    float *pt;                	/* ptr used for cheb_poly_eval()
+				   whether P' or Q' 			*/
+    int roots=0;              	/* number of roots found 	        */
+    float Q[LSP_MAX_ORDER + 1];
+    float P[LSP_MAX_ORDER + 1];
+
+    flag = 1;                	
+    m = lpcrdr/2;            	/* order of P'(z) & Q'(z) polynimials 	*/
+
+    /* Allocate memory space for polynomials */
+
+    /* determine P'(z)'s and Q'(z)'s coefficients where
+      P'(z) = P(z)/(1 + z^(-1)) and Q'(z) = Q(z)/(1-z^(-1)) */
+
+    px = P;                      /* initilaise ptrs */
+    qx = Q;
+    p = px;
+    q = qx;
+    *px++ = 1.0;
+    *qx++ = 1.0;
+    for(i=1;i<=m;i++){
+	*px++ = a[i]+a[lpcrdr+1-i]-*p++;
+	*qx++ = a[i]-a[lpcrdr+1-i]+*q++;
+    }
+    px = P;
+    qx = Q;
+    for(i=0;i<m;i++){
+	*px = 2**px;
+	*qx = 2**qx;
+	 px++;
+	 qx++;
+    }
+    px = P;             	/* re-initialise ptrs 			*/
+    qx = Q;
+
+    /* Search for a zero in P'(z) polynomial first and then alternate to Q'(z).
+    Keep alternating between the two polynomials as each zero is found 	*/
+
+    xr = 0;             	/* initialise xr to zero 		*/
+    xl = 1.0;               	/* start at point xl = 1 		*/
+
+
+    for(j=0;j<lpcrdr;j++){
+	if(j%2)            	/* determines whether P' or Q' is eval. */
+	    pt = qx;
+	else
+	    pt = px;
+
+	psuml = cheb_poly_eva(pt,xl,lpcrdr);	/* evals poly. at xl 	*/
+	flag = 1;
+	while(flag && (xr >= -1.0)){
+	    xr = xl - delta ;                  	/* interval spacing 	*/
+	    psumr = cheb_poly_eva(pt,xr,lpcrdr);/* poly(xl-delta_x) 	*/
+	    temp_psumr = psumr;
+	    temp_xr = xr;
+
+        /* if no sign change increment xr and re-evaluate
+           poly(xr). Repeat til sign change.  if a sign change has
+           occurred the interval is bisected and then checked again
+           for a sign change which determines in which interval the
+           zero lies in.  If there is no sign change between poly(xm)
+           and poly(xl) set interval between xm and xr else set
+           interval between xl and xr and repeat till root is located
+           within the specified limits  */
+
+	    if((psumr*psuml)<0.0){
+		roots++;
+
+		psumm=psuml;
+		for(k=0;k<=nb;k++){
+		    xm = (xl+xr)/2;        	/* bisect the interval 	*/
+		    psumm=cheb_poly_eva(pt,xm,lpcrdr);
+		    if(psumm*psuml>0.){
+			psuml=psumm;
+			xl=xm;
+		    }
+		    else{
+			psumr=psumm;
+			xr=xm;
+		    }
+		}
+
+	       /* once zero is found, reset initial interval to xr 	*/
+	       freq[j] = (xm);
+	       xl = xm;
+	       flag = 0;       		/* reset flag for next search 	*/
+	    }
+	    else{
+		psuml=temp_psumr;
+		xl=temp_xr;
+	    }
+	}
+    }
+
+    /* convert from x domain to radians */
+
+    for(i=0; i<lpcrdr; i++) {
+	freq[i] = acos(freq[i]);
+    }
+
+    return(roots);
+}
+
+/*---------------------------------------------------------------------------*\
+
+  FUNCTION....: lsp_to_lpc()
+  AUTHOR......: David Rowe
+  DATE CREATED: 24/2/93
+
+  This function converts LSP coefficients to LPC coefficients.  In the
+  Speex code we worked out a way to simplify this significantly.
+
+\*---------------------------------------------------------------------------*/
+
+void lsp_to_lpc(float *lsp, float *ak, int lpcrdr)
+/*  float *freq         array of LSP frequencies in radians     	*/
+/*  float *ak 		array of LPC coefficients 			*/
+/*  int lpcrdr  	order of LPC coefficients 			*/
+
+
+{
+    int i,j;
+    float xout1,xout2,xin1,xin2;
+    float *pw,*n1,*n2,*n3,*n4 = 0;
+    int m = lpcrdr/2;
+    float freq[LSP_MAX_ORDER];
+    float Wp[(LSP_MAX_ORDER * 4) + 2];
+    
+    /* convert from radians to the x=cos(w) domain */
+
+    for(i=0; i<lpcrdr; i++)
+	freq[i] = cos(lsp[i]);
+
+    pw = Wp;
+
+    /* initialise contents of array */
+
+    for(i=0;i<=4*m+1;i++){       	/* set contents of buffer to 0 */
+	*pw++ = 0.0;
+    }
+
+    /* Set pointers up */
+
+    pw = Wp;
+    xin1 = 1.0;
+    xin2 = 1.0;
+
+    /* reconstruct P(z) and Q(z) by cascading second order polynomials
+      in form 1 - 2xz(-1) +z(-2), where x is the LSP coefficient */
+
+    for(j=0;j<=lpcrdr;j++){
+	for(i=0;i<m;i++){
+	    n1 = pw+(i*4);
+	    n2 = n1 + 1;
+	    n3 = n2 + 1;
+	    n4 = n3 + 1;
+	    xout1 = xin1 - 2*(freq[2*i]) * *n1 + *n2;
+	    xout2 = xin2 - 2*(freq[2*i+1]) * *n3 + *n4;
+	    *n2 = *n1;
+	    *n4 = *n3;
+	    *n1 = xin1;
+	    *n3 = xin2;
+	    xin1 = xout1;
+	    xin2 = xout2;
+	}
+	xout1 = xin1 + *(n4+1);
+	xout2 = xin2 - *(n4+2);
+	ak[j] = (xout1 + xout2)*0.5;
+	*(n4+1) = xin1;
+	*(n4+2) = xin2;
+
+	xin1 = 0.0;
+	xin2 = 0.0;
+    }
+}
+
diff --git a/gr-vocoder/lib/codec2/lsp.h b/gr-vocoder/lib/codec2/lsp.h
new file mode 100644
index 000000000..5acef0184
--- /dev/null
+++ b/gr-vocoder/lib/codec2/lsp.h
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+
+  FILE........: lsp.c
+  AUTHOR......: David Rowe
+  DATE CREATED: 24/2/93
+
+
+  This file contains functions for LPC to LSP conversion and LSP to
+  LPC conversion. Note that the LSP coefficients are not in radians
+  format but in the x domain of the unit circle.
+
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __LSP__
+#define __LSP__
+
+int lpc_to_lsp (float *a, int lpcrdr, float *freq, int nb, float delta);
+void lsp_to_lpc(float *freq, float *ak, int lpcrdr);
+
+#endif
diff --git a/gr-vocoder/lib/codec2/nlp.c b/gr-vocoder/lib/codec2/nlp.c
new file mode 100644
index 000000000..42ae90919
--- /dev/null
+++ b/gr-vocoder/lib/codec2/nlp.c
@@ -0,0 +1,364 @@
+/*---------------------------------------------------------------------------*\
+                                                 
+  FILE........: nlp.c                                                   
+  AUTHOR......: David Rowe                                      
+  DATE CREATED: 23/3/93                                    
+                                                         
+  Non Linear Pitch (NLP) estimation functions.			  
+                                                               
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "defines.h"
+#include "nlp.h"
+#include "dump.h"
+#include "fft.h"
+
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+ 				DEFINES                                       
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+#define PMAX_M      600		/* maximum NLP analysis window size     */
+#define COEFF       0.95	/* notch filter parameter               */
+#define PE_FFT_SIZE 512		/* DFT size for pitch estimation        */
+#define DEC         5		/* decimation factor                    */
+#define SAMPLE_RATE 8000
+#define PI          3.141592654	/* mathematical constant                */
+#define T           0.1         /* threshold for local minima candidate */
+#define F0_MAX      500
+#define CNLP        0.3	        /* post processor constant              */
+#define NLP_NTAP 48	        /* Decimation LPF order */
+
+/*---------------------------------------------------------------------------*\
+                                                                            
+ 				GLOBALS                                       
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/* 48 tap 600Hz low pass FIR filter coefficients */
+
+const float nlp_fir[] = {
+  -1.0818124e-03,
+  -1.1008344e-03,
+  -9.2768838e-04,
+  -4.2289438e-04,
+   5.5034190e-04,
+   2.0029849e-03,
+   3.7058509e-03,
+   5.1449415e-03,
+   5.5924666e-03,
+   4.3036754e-03,
+   8.0284511e-04,
+  -4.8204610e-03,
+  -1.1705810e-02,
+  -1.8199275e-02,
+  -2.2065282e-02,
+  -2.0920610e-02,
+  -1.2808831e-02,
+   3.2204775e-03,
+   2.6683811e-02,
+   5.5520624e-02,
+   8.6305944e-02,
+   1.1480192e-01,
+   1.3674206e-01,
+   1.4867556e-01,
+   1.4867556e-01,
+   1.3674206e-01,
+   1.1480192e-01,
+   8.6305944e-02,
+   5.5520624e-02,
+   2.6683811e-02,
+   3.2204775e-03,
+  -1.2808831e-02,
+  -2.0920610e-02,
+  -2.2065282e-02,
+  -1.8199275e-02,
+  -1.1705810e-02,
+  -4.8204610e-03,
+   8.0284511e-04,
+   4.3036754e-03,
+   5.5924666e-03,
+   5.1449415e-03,
+   3.7058509e-03,
+   2.0029849e-03,
+   5.5034190e-04,
+  -4.2289438e-04,
+  -9.2768838e-04,
+  -1.1008344e-03,
+  -1.0818124e-03
+};
+
+typedef struct {
+    float sq[PMAX_M];	     /* squared speech samples */
+    float mem_x,mem_y;       /* memory for notch filter */
+    float mem_fir[NLP_NTAP]; /* decimation FIR filter memory */
+} NLP;
+
+float post_process_mbe(COMP Fw[], int pmin, int pmax, float gmax);
+float post_process_sub_multiples(COMP Fw[], 
+				 int pmin, int pmax, float gmax, int gmax_bin,
+				 float *prev_Wo);
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+  nlp_create()                                                                  
+                                                                             
+  Initialisation function for NLP pitch estimator.
+
+\*---------------------------------------------------------------------------*/
+
+void *nlp_create()
+{
+    NLP *nlp;
+    int  i;
+
+    nlp = (NLP*)malloc(sizeof(NLP));
+    if (nlp == NULL)
+	return NULL;
+
+    for(i=0; i<PMAX_M; i++)
+	nlp->sq[i] = 0.0;
+    nlp->mem_x = 0.0;
+    nlp->mem_y = 0.0;
+    for(i=0; i<NLP_NTAP; i++)
+	nlp->mem_fir[i] = 0.0;
+
+    return (void*)nlp;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+  nlp_destory()
+                                                                             
+  Initialisation function for NLP pitch estimator.
+
+\*---------------------------------------------------------------------------*/
+
+void nlp_destroy(void *nlp_state)
+{
+    assert(nlp_state != NULL);
+    free(nlp_state);
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+  nlp()                                                                  
+                                                                             
+  Determines the pitch in samples using the Non Linear Pitch (NLP)
+  algorithm [1]. Returns the fundamental in Hz.  Note that the actual
+  pitch estimate is for the centre of the M sample Sn[] vector, not
+  the current N sample input vector.  This is (I think) a delay of 2.5
+  frames with N=80 samples.  You should align further analysis using
+  this pitch estimate to be centred on the middle of Sn[].
+
+  Two post processors have been tried, the MBE version (as discussed
+  in [1]), and a post processor that checks sub-multiples.  Both
+  suffer occasional gross pitch errors (i.e. neither are perfect).  In
+  the presence of background noise the sub-multiple algorithm tends
+  towards low F0 which leads to better sounding background noise than
+  the MBE post processor.
+
+  A good way to test and develop the NLP pitch estimator is using the
+  tnlp (codec2/unittest) and the codec2/octave/plnlp.m Octave script.
+
+  A pitch tracker searching a few frames forward and backward in time
+  would be a useful addition.
+
+  References:
+
+    [1] http://www.itr.unisa.edu.au/~steven/thesis/dgr.pdf Chapter 4
+                                                              
+\*---------------------------------------------------------------------------*/
+
+float nlp(
+  void *nlp_state, 
+  float  Sn[],			/* input speech vector */
+  int    n,			/* frames shift (no. new samples in Sn[]) */
+  int    m,			/* analysis window size */
+  int    pmin,			/* minimum pitch value */
+  int    pmax,			/* maximum pitch value */
+  float *pitch,			/* estimated pitch period in samples */
+  COMP   Sw[],                  /* Freq domain version of Sn[] */
+  float *prev_Wo
+)
+{
+    NLP   *nlp;
+    float  notch;		    /* current notch filter output */
+    COMP   Fw[PE_FFT_SIZE];	    /* DFT of squared signal */
+    float  gmax;
+    int    gmax_bin;
+    int   i,j;
+    float best_f0;
+
+    assert(nlp_state != NULL);
+    nlp = (NLP*)nlp_state;
+
+    /* Square, notch filter at DC, and LP filter vector */
+
+    for(i=m-n; i<M; i++) 	    /* square latest speech samples */
+	nlp->sq[i] = Sn[i]*Sn[i];
+
+    for(i=m-n; i<m; i++) {	/* notch filter at DC */
+	notch = nlp->sq[i] - nlp->mem_x;
+	notch += COEFF*nlp->mem_y;
+	nlp->mem_x = nlp->sq[i];
+	nlp->mem_y = notch;
+	nlp->sq[i] = notch;
+    }
+
+    for(i=m-n; i<m; i++) {	/* FIR filter vector */
+
+	for(j=0; j<NLP_NTAP-1; j++)
+	    nlp->mem_fir[j] = nlp->mem_fir[j+1];
+	nlp->mem_fir[NLP_NTAP-1] = nlp->sq[i];
+
+	nlp->sq[i] = 0.0;
+	for(j=0; j<NLP_NTAP; j++)
+	    nlp->sq[i] += nlp->mem_fir[j]*nlp_fir[j];
+    }
+
+    /* Decimate and DFT */
+
+    for(i=0; i<PE_FFT_SIZE; i++) {
+	Fw[i].real = 0.0;
+	Fw[i].imag = 0.0;
+    }
+    for(i=0; i<m/DEC; i++) {
+	Fw[i].real = nlp->sq[i*DEC]*(0.5 - 0.5*cos(2*PI*i/(m/DEC-1)));
+    }
+#ifdef DUMP
+    dump_dec(Fw);
+#endif
+    fft(&Fw[0].real,PE_FFT_SIZE,1);
+    for(i=0; i<PE_FFT_SIZE; i++)
+	Fw[i].real = Fw[i].real*Fw[i].real + Fw[i].imag*Fw[i].imag;
+
+#ifdef DUMP
+    dump_sq(nlp->sq);
+    dump_Fw(Fw);
+#endif
+
+    /* find global peak */
+
+    gmax = 0.0;
+    gmax_bin = PE_FFT_SIZE*DEC/pmax;
+    for(i=PE_FFT_SIZE*DEC/pmax; i<=PE_FFT_SIZE*DEC/pmin; i++) {
+	if (Fw[i].real > gmax) {
+	    gmax = Fw[i].real;
+	    gmax_bin = i;
+	}
+    }
+
+    best_f0 = post_process_sub_multiples(Fw, pmin, pmax, gmax, gmax_bin, 
+					 prev_Wo);
+
+    /* Shift samples in buffer to make room for new samples */
+
+    for(i=0; i<m-n; i++)
+	nlp->sq[i] = nlp->sq[i+n];
+
+    /* return pitch and F0 estimate */
+
+    *pitch = (float)SAMPLE_RATE/best_f0;
+    return(best_f0);  
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+  post_process_sub_multiples() 
+                                                                           
+  Given the global maximma of Fw[] we search interger submultiples for
+  local maxima.  If local maxima exist and they are above an
+  experimentally derived threshold (OK a magic number I pulled out of
+  the air) we choose the submultiple as the F0 estimate.
+
+  The rational for this is that the lowest frequency peak of Fw[]
+  should be F0, as Fw[] can be considered the autocorrelation function
+  of Sw[] (the speech spectrum).  However sometimes due to phase
+  effects the lowest frequency maxima may not be the global maxima.
+
+  This works OK in practice and favours low F0 values in the presence
+  of background noise which means the sinusoidal codec does an OK job
+  of synthesising the background noise.  High F0 in background noise
+  tends to sound more periodic introducing annoying artifacts.
+
+\*---------------------------------------------------------------------------*/
+
+float post_process_sub_multiples(COMP Fw[], 
+				 int pmin, int pmax, float gmax, int gmax_bin,
+				 float *prev_Wo)
+{
+    int   min_bin, cmax_bin;
+    int   mult;
+    float thresh, best_f0;
+    int   b, bmin, bmax, lmax_bin;
+    float lmax, cmax;
+    int   prev_f0_bin;
+
+    /* post process estimate by searching submultiples */
+
+    mult = 2;
+    min_bin = PE_FFT_SIZE*DEC/pmax;
+    cmax_bin = gmax_bin;
+    prev_f0_bin = *prev_Wo*(4000.0/PI)*(PE_FFT_SIZE*DEC)/SAMPLE_RATE;
+
+    while(gmax_bin/mult >= min_bin) {
+
+	b = gmax_bin/mult;			/* determine search interval */
+	bmin = 0.8*b;
+	bmax = 1.2*b;
+	if (bmin < min_bin)
+	    bmin = min_bin;
+
+	/* lower threshold to favour previous frames pitch estimate,
+	    this is a form of pitch tracking */
+
+	if ((prev_f0_bin > bmin) && (prev_f0_bin < bmax))
+	    thresh = CNLP*0.5*gmax;
+	else
+	    thresh = CNLP*gmax;
+
+	lmax = 0;
+	lmax_bin = bmin;
+	for (b=bmin; b<=bmax; b++) 		/* look for maximum in interval */
+	    if (Fw[b].real > lmax) {
+		lmax = Fw[b].real;
+		lmax_bin = b;
+	    }
+
+	if (lmax > thresh)
+	    if ((lmax > Fw[lmax_bin-1].real) && (lmax > Fw[lmax_bin+1].real)) {
+		cmax = lmax;
+		cmax_bin = lmax_bin;
+	    }
+
+	mult++;
+    }
+
+    best_f0 = (float)cmax_bin*SAMPLE_RATE/(PE_FFT_SIZE*DEC);
+
+    return best_f0;
+}
+  
diff --git a/gr-vocoder/lib/codec2/nlp.h b/gr-vocoder/lib/codec2/nlp.h
new file mode 100644
index 000000000..88a3733dc
--- /dev/null
+++ b/gr-vocoder/lib/codec2/nlp.h
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------*\
+                                                 
+  FILE........: nlp.c                                                   
+  AUTHOR......: David Rowe                                      
+  DATE CREATED: 23/3/93                                    
+                                                         
+  Non Linear Pitch (NLP) estimation functions.			  
+                                                               
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __NLP__
+#define __NLP__
+
+#include "comp.h"
+
+void *nlp_create();
+void nlp_destroy(void *nlp_state);
+float nlp(void *nlp_state, float Sn[], int n, int m, int pmin, int pmax, 
+	  float *pitch, COMP Sw[], float *prev_Wo);
+float test_candidate_mbe(COMP Sw[], float f0, COMP Sw_[]);
+
+#endif
diff --git a/gr-vocoder/lib/codec2/pack.c b/gr-vocoder/lib/codec2/pack.c
new file mode 100644
index 000000000..31551dfc4
--- /dev/null
+++ b/gr-vocoder/lib/codec2/pack.c
@@ -0,0 +1,105 @@
+/*
+  Copyright (C) 2010 Perens LLC <bruce@perens.com>
+
+  This program 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 of the License, or
+  (at your option) any later version.
+
+  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ */
+#include "defines.h"
+#include "quantise.h"
+#include <stdio.h>
+
+/* Compile-time constants */
+/* Size of unsigned char in bits. Assumes 8 bits-per-char. */
+static const unsigned int	WordSize = 8;
+
+/* Mask to pick the bit component out of bitIndex. */
+static const unsigned int	IndexMask = 0x7;
+
+/* Used to pick the word component out of bitIndex. */
+static const unsigned int	ShiftRight = 3;
+
+/** Pack a bit field into a bit string, encoding the field in Gray code.
+ *
+ * The output is an array of unsigned char data. The fields are efficiently
+ * packed into the bit string. The Gray coding is a naive attempt to reduce
+ * the effect of single-bit errors, we expect to do a better job as the
+ * codec develops.
+ *
+ * This code would be simpler if it just set one bit at a time in the string,
+ * but would hit the same cache line more often. I'm not sure the complexity
+ * gains us anything here.
+ *
+ * Although field is currently of int type rather than unsigned for
+ * compatibility with the rest of the code, indices are always expected to
+ * be >= 0.
+ */
+void
+pack(
+ unsigned char *	bitArray, /* The output bit string. */
+ unsigned int *		bitIndex, /* Index into the string in BITS, not bytes.*/
+ int			field,	  /* The bit field to be packed. */
+ unsigned int		fieldWidth/* Width of the field in BITS, not bytes. */
+ )
+{
+  /* Convert the field to Gray code */
+  field = (field >> 1) ^ field;
+
+  do {
+    unsigned int  	bI = *bitIndex;
+    unsigned int	bitsLeft = WordSize - (bI & IndexMask);
+    unsigned int	sliceWidth =
+			 bitsLeft < fieldWidth ? bitsLeft : fieldWidth;
+    unsigned int	wordIndex = bI >> ShiftRight;
+
+    bitArray[wordIndex] |=
+     ((unsigned char)((field >> (fieldWidth - sliceWidth))
+     << (bitsLeft - sliceWidth)));
+    
+    *bitIndex = bI + sliceWidth;
+    fieldWidth -= sliceWidth;
+  } while ( fieldWidth != 0 );
+}
+
+/** Unpack a field from a bit string, converting from Gray code to binary.
+ *
+ */
+int
+unpack(
+ const unsigned char *	bitArray, /* The input bit string. */
+ unsigned int *		bitIndex, /* Index into the string in BITS, not bytes.*/
+ unsigned int		fieldWidth/* Width of the field in BITS, not bytes. */
+ )
+{
+  unsigned int	field = 0;
+  unsigned int	t;
+
+  do {
+    unsigned int  	bI = *bitIndex;
+    unsigned int	bitsLeft = WordSize - (bI & IndexMask);
+    unsigned int	sliceWidth =
+			 bitsLeft < fieldWidth ? bitsLeft : fieldWidth;
+
+    field |= (((bitArray[bI >> ShiftRight] >> (bitsLeft - sliceWidth)) & ((1 << sliceWidth) - 1)) << (fieldWidth - sliceWidth));
+    
+    *bitIndex = bI + sliceWidth;
+    fieldWidth -= sliceWidth;
+  } while ( fieldWidth != 0 );
+
+  /* Convert from Gray code to binary. Works for maximum 8-bit fields. */
+  t = field ^ (field >> 8);
+  t ^= (t >> 4);
+  t ^= (t >> 2);
+  t ^= (t >> 1);
+  return t;
+}
diff --git a/gr-vocoder/lib/codec2/phase.c b/gr-vocoder/lib/codec2/phase.c
new file mode 100644
index 000000000..0e1a14a60
--- /dev/null
+++ b/gr-vocoder/lib/codec2/phase.c
@@ -0,0 +1,262 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: phase.c                                           
+  AUTHOR......: David Rowe                                             
+  DATE CREATED: 1/2/09                                                 
+                                                                             
+  Functions for modelling and synthesising phase.
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not,see <http://www.gnu.org/licenses/>. 
+*/
+
+#include "defines.h"
+#include "phase.h"
+#include "fft.h"
+#include "comp.h"
+#include "glottal.c"
+
+#include <assert.h>
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define GLOTTAL_FFT_SIZE 512
+
+/*---------------------------------------------------------------------------*\
+
+  aks_to_H()
+
+  Samples the complex LPC synthesis filter spectrum at the harmonic
+  frequencies.
+
+\*---------------------------------------------------------------------------*/
+
+void aks_to_H(
+	      MODEL *model,	/* model parameters */
+	      float  aks[],	/* LPC's */
+	      float  G,	        /* energy term */
+	      COMP   H[],	/* complex LPC spectral samples */
+	      int    order
+)
+{
+  COMP  Pw[FFT_DEC];	/* power spectrum */
+  int   i,m;		/* loop variables */
+  int   am,bm;		/* limits of current band */
+  float r;		/* no. rads/bin */
+  float Em;		/* energy in band */
+  float Am;		/* spectral amplitude sample */
+  int   b;		/* centre bin of harmonic */
+  float phi_;		/* phase of LPC spectra */
+
+  r = TWO_PI/(FFT_DEC);
+
+  /* Determine DFT of A(exp(jw)) ------------------------------------------*/
+
+  for(i=0; i<FFT_DEC; i++) {
+    Pw[i].real = 0.0;
+    Pw[i].imag = 0.0;
+  }
+
+  for(i=0; i<=order; i++)
+    Pw[i].real = aks[i];
+
+  fft(&Pw[0].real,FFT_DEC,-1);
+
+  /* Sample magnitude and phase at harmonics */
+
+  for(m=1; m<=model->L; m++) {
+    am = floor((m - 0.5)*model->Wo/r + 0.5);
+    bm = floor((m + 0.5)*model->Wo/r + 0.5);
+    b = floor(m*model->Wo/r + 0.5);
+
+    Em = 0.0;
+    for(i=am; i<bm; i++)
+      Em += G/(Pw[i].real*Pw[i].real + Pw[i].imag*Pw[i].imag);
+    Am = sqrt(fabs(Em/(bm-am)));
+
+    phi_ = -atan2(Pw[b].imag,Pw[b].real);
+    H[m].real = Am*cos(phi_);
+    H[m].imag = Am*sin(phi_);
+  }
+}
+
+
+/*---------------------------------------------------------------------------*\
+
+   phase_synth_zero_order()
+
+   Synthesises phases based on SNR and a rule based approach.  No phase 
+   parameters are required apart from the SNR (which can be reduced to a
+   1 bit V/UV decision per frame).
+
+   The phase of each harmonic is modelled as the phase of a LPC
+   synthesis filter excited by an impulse.  Unlike the first order
+   model the position of the impulse is not transmitted, so we create
+   an excitation pulse train using a rule based approach.  
+
+   Consider a pulse train with a pulse starting time n=0, with pulses
+   repeated at a rate of Wo, the fundamental frequency.  A pulse train
+   in the time domain is equivalent to harmonics in the frequency
+   domain.  We can make an excitation pulse train using a sum of
+   sinsusoids:
+
+     for(m=1; m<=L; m++)
+       ex[n] = cos(m*Wo*n)
+
+   Note: the Octave script ../octave/phase.m is an example of this if
+   you would like to try making a pulse train.
+
+   The phase of each excitation harmonic is:
+
+     arg(E[m]) = mWo
+
+   where E[m] are the complex excitation (freq domain) samples,
+   arg(x), just returns the phase of a complex sample x.
+
+   As we don't transmit the pulse position for this model, we need to
+   synthesise it.  Now the excitation pulses occur at a rate of Wo.
+   This means the phase of the first harmonic advances by N samples
+   over a synthesis frame of N samples.  For example if Wo is pi/20
+   (200 Hz), then over a 10ms frame (N=80 samples), the phase of the
+   first harmonic would advance (pi/20)*80 = 4*pi or two complete
+   cycles.
+
+   We generate the excitation phase of the fundamental (first
+   harmonic):
+
+     arg[E[1]] = Wo*N;
+
+   We then relate the phase of the m-th excitation harmonic to the
+   phase of the fundamental as:
+
+     arg(E[m]) = m*arg(E[1])
+
+   This E[m] then gets passed through the LPC synthesis filter to
+   determine the final harmonic phase.
+     
+   Comparing to speech synthesised using original phases:
+
+   - Through headphones speech synthesised with this model is not as 
+     good. Through a loudspeaker it is very close to original phases.
+
+   - If there are voicing errors, the speech can sound clicky or
+     staticy.  If V speech is mistakenly declared UV, this model tends to
+     synthesise impulses or clicks, as there is usually very little shift or
+     dispersion through the LPC filter.
+
+   - When combined with LPC amplitude modelling there is an additional
+     drop in quality.  I am not sure why, theory is interformant energy
+     is raised making any phase errors more obvious.
+
+   NOTES:
+
+     1/ This synthesis model is effectively the same as a simple LPC-10
+     vocoders, and yet sounds much better.  Why? Conventional wisdom
+     (AMBE, MELP) says mixed voicing is required for high quality
+     speech.
+
+     2/ I am pretty sure the Lincoln Lab sinusoidal coding guys (like xMBE
+     also from MIT) first described this zero phase model, I need to look
+     up the paper.
+
+     3/ Note that this approach could cause some discontinuities in
+     the phase at the edge of synthesis frames, as no attempt is made
+     to make sure that the phase tracks are continuous (the excitation
+     phases are continuous, but not the final phases after filtering
+     by the LPC spectra).  Technically this is a bad thing.  However
+     this may actually be a good thing, disturbing the phase tracks a
+     bit.  More research needed, e.g. test a synthesis model that adds
+     a small delta-W to make phase tracks line up for voiced
+     harmonics.
+
+\*---------------------------------------------------------------------------*/
+
+void phase_synth_zero_order(
+    MODEL *model,
+    float  aks[],
+    float *ex_phase,            /* excitation phase of fundamental */
+    int    order
+)
+{
+  int   m;
+  float new_phi;
+  COMP  Ex[MAX_AMP];		/* excitation samples */
+  COMP  A_[MAX_AMP];		/* synthesised harmonic samples */
+  COMP  H[MAX_AMP];             /* LPC freq domain samples */
+  float G;
+  float jitter = 0.0;
+  float r;
+  int   b;
+
+  G = 1.0;
+  aks_to_H(model, aks, G, H, order);
+
+  /* 
+     Update excitation fundamental phase track, this sets the position
+     of each pitch pulse during voiced speech.  After much experiment
+     I found that using just this frame's Wo improved quality for UV
+     sounds compared to interpolating two frames Wo like this:
+     
+     ex_phase[0] += (*prev_Wo+mode->Wo)*N/2;
+  */
+  
+  ex_phase[0] += (model->Wo)*N;
+  ex_phase[0] -= TWO_PI*floor(ex_phase[0]/TWO_PI + 0.5);
+  r = TWO_PI/GLOTTAL_FFT_SIZE;
+
+  for(m=1; m<=model->L; m++) {
+	  
+      /* generate excitation */
+
+      if (model->voiced) {
+	  /* I think adding a little jitter helps improve low pitch
+	     males like hts1a. This moves the onset of each harmonic
+	     over at +/- 0.25 of a sample.
+	  */
+	  jitter = 0.25*(1.0 - 2.0*rand()/RAND_MAX);
+	  b = floor(m*model->Wo/r + 0.5);
+	  if (b > ((GLOTTAL_FFT_SIZE/2)-1)) {
+	      b = (GLOTTAL_FFT_SIZE/2)-1;
+	  }
+	  Ex[m].real = cos(ex_phase[0]*m - jitter*model->Wo*m + glottal[b]);
+	  Ex[m].imag = sin(ex_phase[0]*m - jitter*model->Wo*m + glottal[b]);
+      }
+      else {
+
+	  /* When a few samples were tested I found that LPC filter
+	     phase is not needed in the unvoiced case, but no harm in
+	     keeping it.
+	  */
+	  float phi = TWO_PI*(float)rand()/RAND_MAX;
+	  Ex[m].real = cos(phi);
+	  Ex[m].imag = sin(phi);
+      }
+
+      /* filter using LPC filter */
+
+      A_[m].real = H[m].real*Ex[m].real - H[m].imag*Ex[m].imag;
+      A_[m].imag = H[m].imag*Ex[m].real + H[m].real*Ex[m].imag;
+
+      /* modify sinusoidal phase */
+   
+      new_phi = atan2(A_[m].imag, A_[m].real+1E-12);
+      model->phi[m] = new_phi;
+  }
+
+}
diff --git a/gr-vocoder/lib/codec2/phase.h b/gr-vocoder/lib/codec2/phase.h
new file mode 100644
index 000000000..833bc7cdc
--- /dev/null
+++ b/gr-vocoder/lib/codec2/phase.h
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: phase.h                                          
+  AUTHOR......: David Rowe                                             
+  DATE CREATED: 1/2/09                                                 
+                                                                             
+  Functions for modelling phase.
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __PHASE__
+#define __PHASE__
+
+void phase_synth_zero_order(MODEL *model, float aks[], float *ex_phase, 
+			    int order);
+
+#endif
diff --git a/gr-vocoder/lib/codec2/postfilter.c b/gr-vocoder/lib/codec2/postfilter.c
new file mode 100644
index 000000000..6e17eeb87
--- /dev/null
+++ b/gr-vocoder/lib/codec2/postfilter.c
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: postfilter.c
+  AUTHOR......: David Rowe                                                          
+  DATE CREATED: 13/09/09
+                                                                             
+  Postfilter to improve sound quality for speech with high levels of
+  background noise.  Unlike mixed-excitation models requires no bits
+  to be transmitted to handle background noise.
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+
+#include "defines.h"
+#include "comp.h"
+#include "dump.h"
+#include "postfilter.h"
+
+/*---------------------------------------------------------------------------*\
+
+                                DEFINES
+
+\*---------------------------------------------------------------------------*/
+
+#define BG_THRESH 40.0     /* only consider low levels signals for bg_est */
+#define BG_BETA    0.1     /* averaging filter constant                   */
+
+/*---------------------------------------------------------------------------*\
+
+  postfilter()
+
+  The post filter is designed to help with speech corrupted by
+  background noise.  The zero phase model tends to make speech with
+  background noise sound "clicky".  With high levels of background
+  noise the low level inter-formant parts of the spectrum will contain
+  noise rather than speech harmonics, so modelling them as voiced
+  (i.e. a continuous, non-random phase track) is inaccurate.
+
+  Some codecs (like MBE) have a mixed voicing model that breaks the
+  spectrum into voiced and unvoiced regions.  Several bits/frame
+  (5-12) are required to transmit the frequency selective voicing
+  information.  Mixed excitation also requires accurate voicing
+  estimation (parameter estimators always break occasionally under
+  exceptional condition).
+
+  In our case we use a post filter approach which requires no
+  additional bits to be transmitted.  The decoder measures the average
+  level of the background noise during unvoiced frames.  If a harmonic
+  is less than this level it is made unvoiced by randomising it's
+  phases.
+
+  This idea is rather experimental.  Some potential problems that may
+  happen:
+ 
+  1/ If someone says "aaaaaaaahhhhhhhhh" will background estimator track
+     up to speech level?  This would be a bad thing.
+
+  2/ If background noise suddenly dissapears from the source speech does
+     estimate drop quickly?  What is noise suddenly re-appears?
+
+  3/ Background noise with a non-flat sepctrum.  Current algorithm just
+     comsiders scpetrum as a whole, but this could be broken up into
+     bands, each with their own estimator.
+
+  4/ Males and females with the same level of background noise.  Check
+     performance the same.  Changing Wo affects width of each band, may
+     affect bg energy estimates.
+
+  5/ Not sure what happens during long periods of voiced speech
+     e.g. "sshhhhhhh"
+  
+\*---------------------------------------------------------------------------*/
+
+void postfilter(
+  MODEL *model,
+  float *bg_est
+)	
+{
+  int   m, uv;
+  float e;
+
+  /* determine average energy across spectrum */
+
+  e = 0.0;
+  for(m=1; m<=model->L; m++)
+      e += model->A[m]*model->A[m];
+
+  e = 10.0*log10(e/model->L);
+
+  /* If beneath threhold, update bg estimate.  The idea
+     of the threshold is to prevent updating during high level
+     speech. */
+
+  if ((e < BG_THRESH) && !model->voiced)
+      *bg_est =  *bg_est*(1.0 - BG_BETA) + e*BG_BETA;
+
+  /* now mess with phases during voiced frames to make any harmonics
+     less then our background estimate unvoiced.
+  */
+
+  uv = 0;
+  if (model->voiced)
+      for(m=1; m<=model->L; m++)
+	  if (20.0*log10(model->A[m]) < *bg_est) {
+	      model->phi[m] = TWO_PI*(float)rand()/RAND_MAX;
+	      uv++;
+	  }
+
+#ifdef DUMP
+  dump_bg(e, *bg_est, 100.0*uv/model->L);
+#endif
+
+}
diff --git a/gr-vocoder/lib/codec2/postfilter.h b/gr-vocoder/lib/codec2/postfilter.h
new file mode 100644
index 000000000..bf080b1b6
--- /dev/null
+++ b/gr-vocoder/lib/codec2/postfilter.h
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: postfilter.h
+  AUTHOR......: David Rowe                                                          
+  DATE CREATED: 13/09/09
+                                                                             
+  Postfilter header file.
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __POSTFILTER__
+#define __POSTFILTER__
+
+void postfilter(MODEL *model, float *bg_est);
+
+#endif
diff --git a/gr-vocoder/lib/codec2/quantise.c b/gr-vocoder/lib/codec2/quantise.c
new file mode 100644
index 000000000..ff8d156b5
--- /dev/null
+++ b/gr-vocoder/lib/codec2/quantise.c
@@ -0,0 +1,851 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: quantise.c
+  AUTHOR......: David Rowe                                                     
+  DATE CREATED: 31/5/92                                                       
+                                                                             
+  Quantisation functions for the sinusoidal coder.  
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "defines.h"
+#include "dump.h"
+#include "quantise.h"
+#include "lpc.h"
+#include "lsp.h"
+#include "fft.h"
+
+#define LSP_DELTA1 0.01         /* grid spacing for LSP root searches */
+
+/*---------------------------------------------------------------------------*\
+									      
+                          FUNCTION HEADERS
+
+\*---------------------------------------------------------------------------*/
+
+float speech_to_uq_lsps(float lsp[], float ak[], float Sn[], float w[], 
+			int order);
+
+/*---------------------------------------------------------------------------*\
+									      
+                             FUNCTIONS
+
+\*---------------------------------------------------------------------------*/
+
+int lsp_bits(int i) {
+    return lsp_cb[i].log2m;
+}
+
+#if VECTOR_QUANTISATION
+/*---------------------------------------------------------------------------*\
+									      
+  quantise_uniform
+
+  Simulates uniform quantising of a float.
+
+\*---------------------------------------------------------------------------*/
+
+void quantise_uniform(float *val, float min, float max, int bits)
+{
+    int   levels = 1 << (bits-1);
+    float norm;
+    int   index;
+
+    /* hard limit to quantiser range */
+
+    printf("min: %f  max: %f  val: %f  ", min, max, val[0]);
+    if (val[0] < min) val[0] = min;
+    if (val[0] > max) val[0] = max;
+
+    norm = (*val - min)/(max-min);
+    printf("%f  norm: %f  ", val[0], norm);
+    index = fabs(levels*norm + 0.5);
+
+    *val = min + index*(max-min)/levels;
+
+    printf("index %d  val_: %f\n", index, val[0]);
+}
+
+#endif
+
+/*---------------------------------------------------------------------------*\
+
+  quantise_init
+
+  Loads the entire LSP quantiser comprised of several vector quantisers
+  (codebooks).
+
+\*---------------------------------------------------------------------------*/
+
+void quantise_init()
+{
+}
+
+/*---------------------------------------------------------------------------*\
+
+  quantise
+
+  Quantises vec by choosing the nearest vector in codebook cb, and
+  returns the vector index.  The squared error of the quantised vector
+  is added to se.
+
+\*---------------------------------------------------------------------------*/
+
+long quantise(const float * cb, float vec[], float w[], int k, int m, float *se)
+/* float   cb[][K];	current VQ codebook		*/
+/* float   vec[];	vector to quantise		*/
+/* float   w[];         weighting vector                */
+/* int	   k;		dimension of vectors		*/
+/* int     m;		size of codebook		*/
+/* float   *se;		accumulated squared error 	*/
+{
+   float   e;		/* current error		*/
+   long	   besti;	/* best index so far		*/
+   float   beste;	/* best error so far		*/
+   long	   j;
+   int     i;
+
+   besti = 0;
+   beste = 1E32;
+   for(j=0; j<m; j++) {
+	e = 0.0;
+	for(i=0; i<k; i++)
+	    e += pow((cb[j*k+i]-vec[i])*w[i],2.0);
+	if (e < beste) {
+	    beste = e;
+	    besti = j;
+	}
+   }
+
+   *se += beste;
+
+   return(besti);
+}
+
+/*---------------------------------------------------------------------------*\
+									      
+  lspd_quantise
+
+  Scalar lsp difference quantiser.
+
+\*---------------------------------------------------------------------------*/
+
+void lspd_quantise(
+  float lsp[], 
+  float lsp_[],
+  int   order
+) 
+{
+    int   i,k,m;
+    float lsp_hz[LPC_MAX];
+    float lsp__hz[LPC_MAX];
+    float dlsp[LPC_MAX];
+    float dlsp_[LPC_MAX];
+    float  wt[1];
+    const float *cb;
+    float se;
+    int   indexes[LPC_MAX];
+
+    /* convert from radians to Hz so we can use human readable
+       frequencies */
+
+    for(i=0; i<order; i++)
+	lsp_hz[i] = (4000.0/PI)*lsp[i];
+
+    dlsp[0] = lsp_hz[0];
+    for(i=1; i<order; i++)
+    	dlsp[i] = lsp_hz[i] - lsp_hz[i-1];
+
+    /* simple uniform scalar quantisers */
+
+    wt[0] = 1.0;
+    for(i=0; i<order; i++) {
+	if (i) 
+	    dlsp[i] = lsp_hz[i] - lsp__hz[i-1];	    
+	else
+	    dlsp[0] = lsp_hz[0];
+
+	k = lsp_cbd[i].k;
+	m = lsp_cbd[i].m;
+	cb = lsp_cbd[i].cb;
+	indexes[i] = quantise(cb, &dlsp[i], wt, k, m, &se);
+ 	dlsp_[i] = cb[indexes[i]*k];
+
+	if (i) 
+	    lsp__hz[i] = lsp__hz[i-1] + dlsp_[i];
+	else
+	    lsp__hz[0] = dlsp_[0];
+    }
+    for(; i<order; i++)
+    	lsp__hz[i] = lsp__hz[i-1] + dlsp[i];
+    
+    /* convert back to radians */
+
+    for(i=0; i<order; i++)
+	lsp_[i] = (PI/4000.0)*lsp__hz[i];
+}
+
+/*---------------------------------------------------------------------------*\
+									      
+  lspd_vq_quantise
+
+  Vector lsp difference quantiser.
+
+\*---------------------------------------------------------------------------*/
+
+void lspdvq_quantise(
+  float lsp[], 
+  float lsp_[],
+  int   order
+) 
+{
+    int   i,k,m,ncb, nlsp;
+    float dlsp[LPC_MAX];
+    float dlsp_[LPC_MAX];
+    float  wt[LPC_ORD];
+    const float *cb;
+    float se;
+    int   index;
+
+    dlsp[0] = lsp[0];
+    for(i=1; i<order; i++)
+    	dlsp[i] = lsp[i] - lsp[i-1];
+
+    for(i=0; i<order; i++)
+    	dlsp_[i] = dlsp[i];
+
+    for(i=0; i<order; i++)
+	wt[i] = 1.0;
+
+    /* scalar quantise dLSPs 1,2,3,4,5 */
+
+    for(i=0; i<5; i++) {
+	if (i) 
+	    dlsp[i] = (lsp[i] - lsp_[i-1])*4000.0/PI;	    
+	else
+	    dlsp[0] = lsp[0]*4000.0/PI;
+
+	k = lsp_cbdvq[i].k;
+	m = lsp_cbdvq[i].m;
+	cb = lsp_cbdvq[i].cb;
+	index = quantise(cb, &dlsp[i], wt, k, m, &se);
+ 	dlsp_[i] = cb[index*k]*PI/4000.0;
+	
+	if (i) 
+	    lsp_[i] = lsp_[i-1] + dlsp_[i];
+	else
+	    lsp_[0] = dlsp_[0];
+    }
+    dlsp[i] = lsp[i] - lsp_[i-1];
+    dlsp_[i] = dlsp[i];
+
+    //printf("lsp[0] %f lsp_[0] %f\n", lsp[0], lsp_[0]);
+    //printf("lsp[1] %f lsp_[1] %f\n", lsp[1], lsp_[1]);
+
+#ifdef TT
+    /* VQ dLSPs 3,4,5 */
+
+    ncb = 2;
+    nlsp = 2;
+    k = lsp_cbdvq[ncb].k;
+    m = lsp_cbdvq[ncb].m;
+    cb = lsp_cbdvq[ncb].cb;
+    index = quantise(cb, &dlsp[nlsp], wt, k, m, &se);
+    dlsp_[nlsp] = cb[index*k];
+    dlsp_[nlsp+1] = cb[index*k+1];
+    dlsp_[nlsp+2] = cb[index*k+2];
+
+    lsp_[0] = dlsp_[0];
+    for(i=1; i<5; i++)
+    	lsp_[i] = lsp_[i-1] + dlsp_[i];
+    dlsp[i] = lsp[i] - lsp_[i-1];
+    dlsp_[i] = dlsp[i];
+#endif
+    /* VQ dLSPs 6,7,8,9,10 */
+
+    ncb = 5;
+    nlsp = 5;
+    k = lsp_cbdvq[ncb].k;
+    m = lsp_cbdvq[ncb].m;
+    cb = lsp_cbdvq[ncb].cb;
+    index = quantise(cb, &dlsp[nlsp], wt, k, m, &se);
+    dlsp_[nlsp] = cb[index*k];
+    dlsp_[nlsp+1] = cb[index*k+1];
+    dlsp_[nlsp+2] = cb[index*k+2];
+    dlsp_[nlsp+3] = cb[index*k+3];
+    dlsp_[nlsp+4] = cb[index*k+4];
+
+    /* rebuild LSPs for dLSPs */
+
+    lsp_[0] = dlsp_[0];
+    for(i=1; i<order; i++)
+    	lsp_[i] = lsp_[i-1] + dlsp_[i];
+}
+
+void check_lsp_order(float lsp[], int lpc_order)
+{
+    int   i;
+    float tmp;
+
+    for(i=1; i<lpc_order; i++)
+	if (lsp[i] < lsp[i-1]) {
+	    printf("swap %d\n",i);
+	    tmp = lsp[i-1];
+	    lsp[i-1] = lsp[i]-0.05;
+	    lsp[i] = tmp+0.05;
+	}
+}
+
+void force_min_lsp_dist(float lsp[], int lpc_order)
+{
+    int   i;
+
+    for(i=1; i<lpc_order; i++)
+	if ((lsp[i]-lsp[i-1]) < 0.01) {
+	    lsp[i] += 0.01;
+	}
+}
+
+/*---------------------------------------------------------------------------*\
+									      
+  lpc_model_amplitudes
+
+  Derive a LPC model for amplitude samples then estimate amplitude samples
+  from this model with optional LSP quantisation.
+
+  Returns the spectral distortion for this frame.
+
+\*---------------------------------------------------------------------------*/
+
+float lpc_model_amplitudes(
+  float  Sn[],			/* Input frame of speech samples */
+  float  w[],			
+  MODEL *model,			/* sinusoidal model parameters */
+  int    order,                 /* LPC model order */
+  int    lsp_quant,             /* optional LSP quantisation if non-zero */
+  float  ak[]                   /* output aks */
+)
+{
+  float Wn[M];
+  float R[LPC_MAX+1];
+  float E;
+  int   i,j;
+  float snr;	
+  float lsp[LPC_MAX];
+  float lsp_hz[LPC_MAX];
+  float lsp_[LPC_MAX];
+  int   roots;                  /* number of LSP roots found */
+  int   index;
+  float se;
+  int   k,m;
+  const float * cb;
+  float wt[LPC_MAX];
+
+  for(i=0; i<M; i++)
+    Wn[i] = Sn[i]*w[i];
+  autocorrelate(Wn,R,M,order);
+  levinson_durbin(R,ak,order);
+  
+  E = 0.0;
+  for(i=0; i<=order; i++)
+      E += ak[i]*R[i];
+ 
+  for(i=0; i<order; i++)
+      wt[i] = 1.0;
+
+  if (lsp_quant) {
+    roots = lpc_to_lsp(ak, order, lsp, 5, LSP_DELTA1);
+    if (roots != order)
+	printf("LSP roots not found\n");
+
+    /* convert from radians to Hz to make quantisers more
+       human readable */
+
+    for(i=0; i<order; i++)
+	lsp_hz[i] = (4000.0/PI)*lsp[i];
+    
+    /* simple uniform scalar quantisers */
+
+    for(i=0; i<10; i++) {
+	k = lsp_cb[i].k;
+	m = lsp_cb[i].m;
+	cb = lsp_cb[i].cb;
+	index = quantise(cb, &lsp_hz[i], wt, k, m, &se);
+	lsp_hz[i] = cb[index*k];
+    }
+    
+    /* experiment: simulating uniform quantisation error
+    for(i=0; i<order; i++)
+	lsp[i] += PI*(12.5/4000.0)*(1.0 - 2.0*(float)rand()/RAND_MAX);
+    */
+
+    for(i=0; i<order; i++)
+	lsp[i] = (PI/4000.0)*lsp_hz[i];
+
+    /* Bandwidth Expansion (BW).  Prevents any two LSPs getting too
+       close together after quantisation.  We know from experiment
+       that LSP quantisation errors < 12.5Hz (25Hz setp size) are
+       inaudible so we use that as the minimum LSP separation.
+    */
+
+    for(i=1; i<5; i++) {
+	if (lsp[i] - lsp[i-1] < PI*(12.5/4000.0))
+	    lsp[i] = lsp[i-1] + PI*(12.5/4000.0);
+    }
+
+    /* as quantiser gaps increased, larger BW expansion was required
+       to prevent twinkly noises */
+
+    for(i=5; i<8; i++) {
+	if (lsp[i] - lsp[i-1] < PI*(25.0/4000.0))
+	    lsp[i] = lsp[i-1] + PI*(25.0/4000.0);
+    }
+    for(i=8; i<order; i++) {
+	if (lsp[i] - lsp[i-1] < PI*(75.0/4000.0))
+	    lsp[i] = lsp[i-1] + PI*(75.0/4000.0);
+    }
+
+    for(j=0; j<order; j++) 
+	lsp_[j] = lsp[j];
+
+    lsp_to_lpc(lsp_, ak, order);
+#ifdef DUMP
+    dump_lsp(lsp);
+#endif
+  }
+
+#ifdef DUMP
+  dump_E(E);
+#endif
+  #ifdef SIM_QUANT
+  /* simulated LPC energy quantisation */
+  {
+      float e = 10.0*log10(E);
+      e += 2.0*(1.0 - 2.0*(float)rand()/RAND_MAX);
+      E = pow(10.0,e/10.0);
+  }
+  #endif
+
+  aks_to_M2(ak,order,model,E,&snr, 1);   /* {ak} -> {Am} LPC decode */
+
+  return snr;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                         
+   aks_to_M2()                                                             
+                                                                         
+   Transforms the linear prediction coefficients to spectral amplitude    
+   samples.  This function determines A(m) from the average energy per    
+   band using an FFT.                                                     
+                                                                        
+\*---------------------------------------------------------------------------*/
+
+void aks_to_M2(
+  float  ak[],	/* LPC's */
+  int    order,
+  MODEL *model,	/* sinusoidal model parameters for this frame */
+  float  E,	/* energy term */
+  float *snr,	/* signal to noise ratio for this frame in dB */
+  int    dump   /* true to dump sample to dump file */
+)
+{
+  COMP Pw[FFT_DEC];	/* power spectrum */
+  int i,m;		/* loop variables */
+  int am,bm;		/* limits of current band */
+  float r;		/* no. rads/bin */
+  float Em;		/* energy in band */
+  float Am;		/* spectral amplitude sample */
+  float signal, noise;
+
+  r = TWO_PI/(FFT_DEC);
+
+  /* Determine DFT of A(exp(jw)) --------------------------------------------*/
+
+  for(i=0; i<FFT_DEC; i++) {
+    Pw[i].real = 0.0;
+    Pw[i].imag = 0.0; 
+  }
+
+  for(i=0; i<=order; i++)
+    Pw[i].real = ak[i];
+  fft(&Pw[0].real,FFT_DEC,1);
+
+  /* Determine power spectrum P(w) = E/(A(exp(jw))^2 ------------------------*/
+
+  for(i=0; i<FFT_DEC/2; i++)
+    Pw[i].real = E/(Pw[i].real*Pw[i].real + Pw[i].imag*Pw[i].imag);
+#ifdef DUMP
+  if (dump) 
+      dump_Pw(Pw);
+#endif
+
+  /* Determine magnitudes by linear interpolation of P(w) -------------------*/
+
+  signal = noise = 0.0;
+  for(m=1; m<=model->L; m++) {
+    am = floor((m - 0.5)*model->Wo/r + 0.5);
+    bm = floor((m + 0.5)*model->Wo/r + 0.5);
+    Em = 0.0;
+
+    for(i=am; i<bm; i++)
+      Em += Pw[i].real;
+    Am = sqrt(Em);
+
+    signal += pow(model->A[m],2.0);
+    noise  += pow(model->A[m] - Am,2.0);
+    model->A[m] = Am;
+  }
+  *snr = 10.0*log10(signal/noise);
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: encode_Wo()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  Encodes Wo using a WO_LEVELS quantiser.
+
+\*---------------------------------------------------------------------------*/
+
+int encode_Wo(float Wo)
+{
+    int   index;
+    float Wo_min = TWO_PI/P_MAX;
+    float Wo_max = TWO_PI/P_MIN;
+    float norm;
+
+    norm = (Wo - Wo_min)/(Wo_max - Wo_min);
+    index = floor(WO_LEVELS * norm + 0.5);
+    if (index < 0 ) index = 0;
+    if (index > (WO_LEVELS-1)) index = WO_LEVELS-1;
+
+    return index;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: decode_Wo()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  Decodes Wo using a WO_LEVELS quantiser.
+
+\*---------------------------------------------------------------------------*/
+
+float decode_Wo(int index)
+{
+    float Wo_min = TWO_PI/P_MAX;
+    float Wo_max = TWO_PI/P_MIN;
+    float step;
+    float Wo;
+
+    step = (Wo_max - Wo_min)/WO_LEVELS;
+    Wo   = Wo_min + step*(index);
+
+    return Wo;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: speech_to_uq_lsps()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  Analyse a windowed frame of time domain speech to determine LPCs
+  which are the converted to LSPs for quantisation and transmission
+  over the channel.
+
+\*---------------------------------------------------------------------------*/
+
+float speech_to_uq_lsps(float lsp[],
+			float ak[],
+		        float Sn[], 
+		        float w[],
+		        int   order
+)
+{
+    int   i, roots;
+    float Wn[M];
+    float R[LPC_MAX+1];
+    float E;
+
+    for(i=0; i<M; i++)
+	Wn[i] = Sn[i]*w[i];
+    autocorrelate(Wn, R, M, order);
+    levinson_durbin(R, ak, order);
+  
+    E = 0.0;
+    for(i=0; i<=order; i++)
+	E += ak[i]*R[i];
+ 
+    roots = lpc_to_lsp(ak, order, lsp, 5, LSP_DELTA1);
+    if (roots != order) {
+	/* for some reason LSP roots could not be found   */
+	/* some alpha testers are reporting this condition */
+	fprintf(stderr, "LSP roots not found!\nroots = %d\n", roots);
+	for(i=0; i<=order; i++)
+	    fprintf(stderr, "a[%d] = %f\n", i, ak[i]);	
+	
+	/* some benign LSP values we can use instead */
+	for(i=0; i<order; i++)
+	    lsp[i] = (PI/order)*(float)i;
+    }
+
+    return E;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: encode_lsps()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  From a vector of unquantised (floating point) LSPs finds the quantised
+  LSP indexes.
+
+\*---------------------------------------------------------------------------*/
+
+void encode_lsps(int indexes[], float lsp[], int order)
+{
+    int    i,k,m;
+    float  wt[1];
+    float  lsp_hz[LPC_MAX];
+    const float * cb;
+    float se;
+
+    /* convert from radians to Hz so we can use human readable
+       frequencies */
+
+    for(i=0; i<order; i++)
+	lsp_hz[i] = (4000.0/PI)*lsp[i];
+    
+    /* simple uniform scalar quantisers */
+
+    wt[0] = 1.0;
+    for(i=0; i<order; i++) {
+	k = lsp_cb[i].k;
+	m = lsp_cb[i].m;
+	cb = lsp_cb[i].cb;
+	indexes[i] = quantise(cb, &lsp_hz[i], wt, k, m, &se);
+    }
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: decode_lsps()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  From a vector of quantised LSP indexes, returns the quantised
+  (floating point) LSPs.
+
+\*---------------------------------------------------------------------------*/
+
+void decode_lsps(float lsp[], int indexes[], int order)
+{
+    int    i,k;
+    float  lsp_hz[LPC_MAX];
+    const float * cb;
+
+    for(i=0; i<order; i++) {
+	k = lsp_cb[i].k;
+	cb = lsp_cb[i].cb;
+	lsp_hz[i] = cb[indexes[i]*k];
+    }
+
+    /* convert back to radians */
+
+    for(i=0; i<order; i++)
+	lsp[i] = (PI/4000.0)*lsp_hz[i];
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: bw_expand_lsps()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  Applies Bandwidth Expansion (BW) to a vector of LSPs.  Prevents any
+  two LSPs getting too close together after quantisation.  We know
+  from experiment that LSP quantisation errors < 12.5Hz (25Hz setp
+  size) are inaudible so we use that as the minimum LSP separation.
+
+\*---------------------------------------------------------------------------*/
+
+void bw_expand_lsps(float lsp[],
+		    int   order
+)
+{
+    int i;
+
+    for(i=1; i<5; i++) {
+	if (lsp[i] - lsp[i-1] < PI*(12.5/4000.0))
+	    lsp[i] = lsp[i-1] + PI*(12.5/4000.0);
+    }
+
+    /* As quantiser gaps increased, larger BW expansion was required
+       to prevent twinkly noises.  This may need more experiment for
+       different quanstisers.
+    */
+
+    for(i=5; i<8; i++) {
+	if (lsp[i] - lsp[i-1] < PI*(25.0/4000.0))
+	    lsp[i] = lsp[i-1] + PI*(25.0/4000.0);
+    }
+    for(i=8; i<order; i++) {
+	if (lsp[i] - lsp[i-1] < PI*(75.0/4000.0))
+	    lsp[i] = lsp[i-1] + PI*(75.0/4000.0);
+    }
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: apply_lpc_correction()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  Apply first harmonic LPC correction at decoder.  This helps improve
+  low pitch males after LPC modelling, like hts1a and morig.
+
+\*---------------------------------------------------------------------------*/
+
+void apply_lpc_correction(MODEL *model)
+{
+    if (model->Wo < (PI*150.0/4000)) {
+	model->A[1] *= 0.032;
+    }
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: encode_energy()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  Encodes LPC energy using an E_LEVELS quantiser.
+
+\*---------------------------------------------------------------------------*/
+
+int encode_energy(float e)
+{
+    int   index;
+    float e_min = E_MIN_DB;
+    float e_max = E_MAX_DB;
+    float norm;
+
+    e = 10.0*log10(e);
+    norm = (e - e_min)/(e_max - e_min);
+    index = floor(E_LEVELS * norm + 0.5);
+    if (index < 0 ) index = 0;
+    if (index > (E_LEVELS-1)) index = E_LEVELS-1;
+
+    return index;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: decode_energy()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  Decodes energy using a WO_BITS quantiser.
+
+\*---------------------------------------------------------------------------*/
+
+float decode_energy(int index)
+{
+    float e_min = E_MIN_DB;
+    float e_max = E_MAX_DB;
+    float step;
+    float e;
+
+    step = (e_max - e_min)/E_LEVELS;
+    e    = e_min + step*(index);
+    e    = pow(10.0,e/10.0);
+
+    return e;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: encode_amplitudes()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  Time domain LPC is used model the amplitudes which are then
+  converted to LSPs and quantised.  So we don't actually encode the
+  amplitudes directly, rather we derive an equivalent representation
+  from the time domain speech.
+
+\*---------------------------------------------------------------------------*/
+
+void encode_amplitudes(int    lsp_indexes[], 
+		       int   *energy_index,
+		       MODEL *model, 
+		       float  Sn[], 
+		       float  w[])
+{
+    float lsps[LPC_ORD];
+    float ak[LPC_ORD+1];
+    float e;
+
+    e = speech_to_uq_lsps(lsps, ak, Sn, w, LPC_ORD);
+    encode_lsps(lsp_indexes, lsps, LPC_ORD);
+    *energy_index = encode_energy(e);
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: decode_amplitudes()	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 22/8/2010 
+
+  Given the amplitude quantiser indexes recovers the harmonic
+  amplitudes.
+
+\*---------------------------------------------------------------------------*/
+
+float decode_amplitudes(MODEL *model, 
+			float  ak[],
+		        int    lsp_indexes[], 
+		        int    energy_index,
+			float  lsps[],
+			float *e
+)
+{
+    float snr;
+
+    decode_lsps(lsps, lsp_indexes, LPC_ORD);
+    bw_expand_lsps(lsps, LPC_ORD);
+    lsp_to_lpc(lsps, ak, LPC_ORD);
+    *e = decode_energy(energy_index);
+    aks_to_M2(ak, LPC_ORD, model, *e, &snr, 1); 
+    apply_lpc_correction(model);
+
+    return snr;
+}
diff --git a/gr-vocoder/lib/codec2/quantise.h b/gr-vocoder/lib/codec2/quantise.h
new file mode 100644
index 000000000..90a3661ff
--- /dev/null
+++ b/gr-vocoder/lib/codec2/quantise.h
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: quantise.h
+  AUTHOR......: David Rowe                                                          
+  DATE CREATED: 31/5/92                                                       
+                                                                             
+  Quantisation functions for the sinusoidal coder.  
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __QUANTISE__
+#define __QUANTISE__
+
+#define WO_BITS   7
+#define WO_LEVELS (1<<WO_BITS)
+#define E_BITS    5
+#define E_LEVELS  (1<<E_BITS)
+#define E_MIN_DB -10.0
+#define E_MAX_DB  40.0
+
+void quantise_init();
+float lpc_model_amplitudes(float Sn[], float w[], MODEL *model, int order,
+			   int lsp,float ak[]);
+void aks_to_M2(float ak[], int order, MODEL *model, float E, float *snr, 
+	       int dump);
+
+int   encode_Wo(float Wo);
+float decode_Wo(int index);
+
+void encode_lsps(int indexes[], float lsp[], int order);
+void decode_lsps(float lsp[], int indexes[], int order);
+void lspd_quantise(float lsp[], float lsp_[], int order);
+void lspdvq_quantise(float lsp[], float lsp_[], int order); 
+
+int encode_energy(float e);
+float decode_energy(int index);
+
+void encode_amplitudes(int    lsp_indexes[], 
+		       int   *energy_index,
+		       MODEL *model, 
+		       float  Sn[], 
+		       float  w[]);
+
+float decode_amplitudes(MODEL *model,
+			float  ak[],
+			int lsp_indexes[],
+			int energy_index,
+			float  lsps[],
+			float *e);
+
+void pack(unsigned char * bits, unsigned int *nbit, int index, unsigned int index_bits);
+int  unpack(const unsigned char * bits, unsigned int *nbit, unsigned int index_bits);
+
+int lsp_bits(int i);
+
+void apply_lpc_correction(MODEL *model);
+float speech_to_uq_lsps(float lsp[],
+			float ak[],
+		        float Sn[], 
+		        float w[],
+		        int   order
+			);
+void bw_expand_lsps(float lsp[],
+		    int   order
+		    );
+void decode_lsps(float lsp[], int indexes[], int order);
+
+#endif
diff --git a/gr-vocoder/lib/codec2/sim.sh b/gr-vocoder/lib/codec2/sim.sh
new file mode 100755
index 000000000..10152d979
--- /dev/null
+++ b/gr-vocoder/lib/codec2/sim.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+# sim.sh
+# David Rowe 10 Sep 2009
+
+# Process a source file using the codec 2 simulation.  An output
+# speech file is generated for each major processing step, from the
+# unquantised siusoidal model to fully quantised.  This way we can
+# listen to the effect of each processing step.  Use listensim.sh to
+# test the output files.
+
+../src/c2sim ../raw/$1.raw -o $1_uq.raw
+../src/c2sim ../raw/$1.raw --phase0 -o $1_phase0.raw --postfilter
+../src/c2sim ../raw/$1.raw --lpc 10 -o $1_lpc10.raw --postfilter
+../src/c2sim ../raw/$1.raw --phase0 --lpc 10 -o $1_phase0_lpc10.raw --postfilter
+../src/c2sim ../raw/$1.raw --phase0 --lpc 10 --dec -o $1_phase0_lpc10_dec.raw --postfilter
+../src/c2sim ../raw/$1.raw --phase0 --lpc 10 --lsp --dec -o $1_phase0_lsp_dec.raw --postfilter
+
+#../src/c2sim ../raw/$1.raw --lpc 10 --lsp -o $1_lsp.raw
+#../src/c2sim ../raw/$1.raw --phase0 --lpc 10 -o $1_phase0_lpc10.raw --postfilter
+#../src/c2sim ../raw/$1.raw --phase0 --lpc 10 --lsp -o $1_phase0_lsp.raw --postfilter
+#../src/c2sim ../raw/$1.raw --phase0 --lpc 10 --lsp -o $1_phase0_lsp_dec.raw --postfilter --dec
+
diff --git a/gr-vocoder/lib/codec2/sine.c b/gr-vocoder/lib/codec2/sine.c
new file mode 100644
index 000000000..45cc9de71
--- /dev/null
+++ b/gr-vocoder/lib/codec2/sine.c
@@ -0,0 +1,638 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: sine.c
+  AUTHOR......: David Rowe                                           
+  DATE CREATED: 19/8/2010
+                                                                             
+  Sinusoidal analysis and synthesis functions.
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 1990-2010 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+				INCLUDES                                      
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+
+#include "defines.h"
+#include "sine.h"
+#include "fft.h"
+
+#define HPF_BETA 0.125
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+				HEADERS                                     
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+void hs_pitch_refinement(MODEL *model, COMP Sw[], float pmin, float pmax, 
+			 float pstep);
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+				FUNCTIONS                                     
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: make_analysis_window	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 11/5/94 
+
+  Init function that generates the time domain analysis window and it's DFT.
+
+\*---------------------------------------------------------------------------*/
+
+void make_analysis_window(float w[],COMP W[])
+{
+  float m;
+  COMP  temp;
+  int   i,j;
+
+  /* 
+     Generate Hamming window centered on M-sample pitch analysis window
+  
+  0            M/2           M-1
+  |-------------|-------------|
+        |-------|-------|
+            NW samples
+
+     All our analysis/synthsis is centred on the M/2 sample.               
+  */
+
+  m = 0.0;
+  for(i=0; i<M/2-NW/2; i++)
+    w[i] = 0.0;
+  for(i=M/2-NW/2,j=0; i<M/2+NW/2; i++,j++) {
+    w[i] = 0.5 - 0.5*cos(TWO_PI*j/(NW-1));
+    m += w[i]*w[i];
+  }
+  for(i=M/2+NW/2; i<M; i++)
+    w[i] = 0.0;
+ 
+  /* Normalise - makes freq domain amplitude estimation straight
+     forward */
+
+  m = 1.0/sqrt(m*FFT_ENC);
+  for(i=0; i<M; i++) {
+    w[i] *= m;
+  }
+
+  /* 
+     Generate DFT of analysis window, used for later processing.  Note
+     we modulo FFT_ENC shift the time domain window w[], this makes the
+     imaginary part of the DFT W[] equal to zero as the shifted w[] is
+     even about the n=0 time axis if NW is odd.  Having the imag part
+     of the DFT W[] makes computation easier.
+
+     0                      FFT_ENC-1
+     |-------------------------|
+
+      ----\               /----
+           \             / 
+            \           /          <- shifted version of window w[n]
+             \         /
+              \       /
+               -------
+
+     |---------|     |---------|      
+       NW/2              NW/2
+  */
+
+  for(i=0; i<FFT_ENC; i++) {
+    W[i].real = 0.0;
+    W[i].imag = 0.0;
+  }
+  for(i=0; i<NW/2; i++)
+    W[i].real = w[i+M/2];
+  for(i=FFT_ENC-NW/2,j=M/2-NW/2; i<FFT_ENC; i++,j++)
+    W[i].real = w[j];
+
+  fft(&W[0].real,FFT_ENC,-1);         /* "Numerical Recipes in C" FFT */
+
+  /* 
+      Re-arrange W[] to be symmetrical about FFT_ENC/2.  Makes later 
+      analysis convenient.
+
+   Before:
+
+
+     0                 FFT_ENC-1
+     |----------|---------|
+     __                   _       
+       \                 /          
+        \_______________/      
+
+   After:
+
+     0                 FFT_ENC-1
+     |----------|---------|
+               ___                        
+              /   \                
+     ________/     \_______     
+
+  */
+       
+      
+  for(i=0; i<FFT_ENC/2; i++) {
+    temp.real = W[i].real;
+    temp.imag = W[i].imag;
+    W[i].real = W[i+FFT_ENC/2].real;
+    W[i].imag = W[i+FFT_ENC/2].imag;
+    W[i+FFT_ENC/2].real = temp.real;
+    W[i+FFT_ENC/2].imag = temp.imag;
+  }
+
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: hpf	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 16 Nov 2010
+
+  High pass filter with a -3dB point of about 160Hz.
+
+    y(n) = -HPF_BETA*y(n-1) + x(n) - x(n-1)
+ 
+\*---------------------------------------------------------------------------*/
+
+float hpf(float x, float states[])
+{
+    states[0] += -HPF_BETA*states[0] + x - states[1];
+    states[1] = x;
+
+    return states[0];
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: dft_speech	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 27/5/94 
+
+  Finds the DFT of the current speech input speech frame.
+
+\*---------------------------------------------------------------------------*/
+
+void dft_speech(COMP Sw[], float Sn[], float w[])
+{
+  int i;
+  
+  for(i=0; i<FFT_ENC; i++) {
+    Sw[i].real = 0.0;
+    Sw[i].imag = 0.0;
+  }
+
+  /* Centre analysis window on time axis, we need to arrange input
+     to FFT this way to make FFT phases correct */
+  
+  /* move 2nd half to start of FFT input vector */
+
+  for(i=0; i<NW/2; i++)
+    Sw[i].real = Sn[i+M/2]*w[i+M/2];
+
+  /* move 1st half to end of FFT input vector */
+
+  for(i=0; i<NW/2; i++)
+    Sw[FFT_ENC-NW/2+i].real = Sn[i+M/2-NW/2]*w[i+M/2-NW/2];
+
+  fft(&Sw[0].real,FFT_ENC,-1);
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                     
+  FUNCTION....: two_stage_pitch_refinement			
+  AUTHOR......: David Rowe
+  DATE CREATED: 27/5/94				
+
+  Refines the current pitch estimate using the harmonic sum pitch
+  estimation technique.
+
+\*---------------------------------------------------------------------------*/
+
+void two_stage_pitch_refinement(MODEL *model, COMP Sw[])
+{
+  float pmin,pmax,pstep;	/* pitch refinment minimum, maximum and step */ 
+
+  /* Coarse refinement */
+
+  pmax = TWO_PI/model->Wo + 5;
+  pmin = TWO_PI/model->Wo - 5;
+  pstep = 1.0;
+  hs_pitch_refinement(model,Sw,pmin,pmax,pstep);
+  
+  /* Fine refinement */
+  
+  pmax = TWO_PI/model->Wo + 1;
+  pmin = TWO_PI/model->Wo - 1;
+  pstep = 0.25;
+  hs_pitch_refinement(model,Sw,pmin,pmax,pstep);
+  
+  /* Limit range */
+  
+  if (model->Wo < TWO_PI/P_MAX)
+    model->Wo = TWO_PI/P_MAX;
+  if (model->Wo > TWO_PI/P_MIN)
+    model->Wo = TWO_PI/P_MIN;
+
+  model->L = floor(PI/model->Wo);
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                
+ FUNCTION....: hs_pitch_refinement				
+ AUTHOR......: David Rowe			
+ DATE CREATED: 27/5/94							     
+									  
+ Harmonic sum pitch refinement function.			   
+									    
+ pmin   pitch search range minimum	    
+ pmax	pitch search range maximum	    
+ step   pitch search step size		    
+ model	current pitch estimate in model.Wo  
+									    
+ model 	refined pitch estimate in model.Wo  
+									     
+\*---------------------------------------------------------------------------*/
+
+void hs_pitch_refinement(MODEL *model, COMP Sw[], float pmin, float pmax, float pstep)
+{
+  int m;		/* loop variable */
+  int b;		/* bin for current harmonic centre */
+  float E;		/* energy for current pitch*/
+  float Wo;		/* current "test" fundamental freq. */
+  float Wom;		/* Wo that maximises E */
+  float Em;		/* mamimum energy */
+  float r;		/* number of rads/bin */
+  float p;		/* current pitch */
+  
+  /* Initialisation */
+  
+  model->L = PI/model->Wo;	/* use initial pitch est. for L */
+  Wom = model->Wo;
+  Em = 0.0;
+  r = TWO_PI/FFT_ENC;
+  
+  /* Determine harmonic sum for a range of Wo values */
+
+  for(p=pmin; p<=pmax; p+=pstep) {
+    E = 0.0;
+    Wo = TWO_PI/p;
+
+    /* Sum harmonic magnitudes */
+
+    for(m=1; m<=model->L; m++) {
+      b = floor(m*Wo/r + 0.5);
+      E += Sw[b].real*Sw[b].real + Sw[b].imag*Sw[b].imag;
+    }  
+
+    /* Compare to see if this is a maximum */
+    
+    if (E > Em) {
+      Em = E;
+      Wom = Wo;
+    }
+  }
+
+  model->Wo = Wom;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FUNCTION....: estimate_amplitudes 			      
+  AUTHOR......: David Rowe		
+  DATE CREATED: 27/5/94			       
+									      
+  Estimates the complex amplitudes of the harmonics.    
+									      
+\*---------------------------------------------------------------------------*/
+
+void estimate_amplitudes(MODEL *model, COMP Sw[], COMP W[])
+{
+  int   i,m;		/* loop variables */
+  int   am,bm;		/* bounds of current harmonic */
+  int   b;		/* DFT bin of centre of current harmonic */
+  float den;		/* denominator of amplitude expression */
+  float r;		/* number of rads/bin */
+  int   offset;
+  COMP  Am;
+
+  r = TWO_PI/FFT_ENC;
+
+  for(m=1; m<=model->L; m++) {
+    den = 0.0;
+    am = floor((m - 0.5)*model->Wo/r + 0.5);
+    bm = floor((m + 0.5)*model->Wo/r + 0.5);
+    b = floor(m*model->Wo/r + 0.5);
+
+    /* Estimate ampltude of harmonic */
+
+    den = 0.0;
+    Am.real = Am.imag = 0.0;
+    for(i=am; i<bm; i++) {
+      den += Sw[i].real*Sw[i].real + Sw[i].imag*Sw[i].imag;
+      offset = i + FFT_ENC/2 - floor(m*model->Wo/r + 0.5);
+      Am.real += Sw[i].real*W[offset].real;
+      Am.imag += Sw[i].imag*W[offset].real;
+    }
+
+    model->A[m] = sqrt(den);
+
+    /* Estimate phase of harmonic */
+
+    model->phi[m] = atan2(Sw[b].imag,Sw[b].real);
+  }
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+  est_voicing_mbe()          
+                                                                             
+  Returns the error of the MBE cost function for a fiven F0.
+
+  Note: I think a lot of the operations below can be simplified as
+  W[].imag = 0 and has been normalised such that den always equals 1.
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+float est_voicing_mbe(
+    MODEL *model,
+    COMP   Sw[],
+    COMP   W[],
+    COMP   Sw_[],         /* DFT of all voiced synthesised signal  */
+                          /* useful for debugging/dump file        */
+    COMP   Ew[],          /* DFT of error                          */
+    float prev_Wo)
+{
+    int   i,l,al,bl,m;    /* loop variables */
+    COMP  Am;             /* amplitude sample for this band */
+    int   offset;         /* centers Hw[] about current harmonic */
+    float den;            /* denominator of Am expression */
+    float error;          /* accumulated error between original and synthesised */
+    float Wo;            
+    float sig, snr;
+    float elow, ehigh, eratio;
+    float dF0, sixty;
+
+    sig = 0.0;
+    for(l=1; l<=model->L/4; l++) {
+	sig += model->A[l]*model->A[l];
+    }
+    for(i=0; i<FFT_ENC; i++) {
+	Sw_[i].real = 0.0;
+	Sw_[i].imag = 0.0;
+	Ew[i].real = 0.0;
+	Ew[i].imag = 0.0;
+    }
+
+    Wo = model->Wo;
+    error = 0.0;
+
+    /* Just test across the harmonics in the first 1000 Hz (L/4) */
+
+    for(l=1; l<=model->L/4; l++) {
+	Am.real = 0.0;
+	Am.imag = 0.0;
+	den = 0.0;
+	al = ceil((l - 0.5)*Wo*FFT_ENC/TWO_PI);
+	bl = ceil((l + 0.5)*Wo*FFT_ENC/TWO_PI);
+
+	/* Estimate amplitude of harmonic assuming harmonic is totally voiced */
+
+	for(m=al; m<bl; m++) {
+	    offset = FFT_ENC/2 + m - l*Wo*FFT_ENC/TWO_PI + 0.5;
+	    Am.real += Sw[m].real*W[offset].real + Sw[m].imag*W[offset].imag;
+	    Am.imag += Sw[m].imag*W[offset].real - Sw[m].real*W[offset].imag;
+	    den += W[offset].real*W[offset].real + W[offset].imag*W[offset].imag;
+        }
+
+        Am.real = Am.real/den;
+        Am.imag = Am.imag/den;
+
+        /* Determine error between estimated harmonic and original */
+
+        for(m=al; m<bl; m++) {
+	    offset = FFT_ENC/2 + m - l*Wo*FFT_ENC/TWO_PI + 0.5;
+	    Sw_[m].real = Am.real*W[offset].real - Am.imag*W[offset].imag;
+	    Sw_[m].imag = Am.real*W[offset].imag + Am.imag*W[offset].real;
+	    Ew[m].real = Sw[m].real - Sw_[m].real;
+	    Ew[m].imag = Sw[m].imag - Sw_[m].imag;
+	    error += Ew[m].real*Ew[m].real;
+	    error += Ew[m].imag*Ew[m].imag;
+	}
+    }
+    
+    snr = 10.0*log10(sig/error);
+    if (snr > V_THRESH)
+	model->voiced = 1;
+    else
+	model->voiced = 0;
+ 
+    /* post processing, helps clean up some voicing errors ------------------*/
+
+    /* 
+       Determine the ratio of low freancy to high frequency energy,
+       voiced speech tends to be dominated by low frequency energy,
+       unvoiced by high frequency. This measure can be used to
+       determine if we have made any gross errors.
+    */
+
+    elow = ehigh = 0.0;
+    for(l=1; l<=model->L/2; l++) {
+	elow += model->A[l]*model->A[l];
+    }
+    for(l=model->L/2; l<=model->L; l++) {
+	ehigh += model->A[l]*model->A[l];
+    }
+    eratio = 10.0*log10(elow/ehigh);
+    dF0 = 0.0;
+
+    /* Look for Type 1 errors, strongly V speech that has been
+       accidentally declared UV */
+
+    if (model->voiced == 0)
+	if (eratio > 10.0)
+	    model->voiced = 1;
+
+    /* Look for Type 2 errors, strongly UV speech that has been
+       accidentally declared V */
+
+    if (model->voiced == 1) {
+	if (eratio < -10.0)
+	    model->voiced = 0;
+
+	/* If pitch is jumping about it's likely this is UV */
+
+	dF0 = (model->Wo - prev_Wo)*FS/TWO_PI;
+	if (fabs(dF0) > 15.0) 
+	    model->voiced = 0;
+
+	/* A common source of Type 2 errors is the pitch estimator
+	   gives a low (50Hz) estimate for UV speech, which gives a
+	   good match with noise due to the close harmoonic spacing.
+	   These errors are much more common than people with 50Hz
+	   pitch, so we have just a small eratio threshold. */
+
+	sixty = 60.0*TWO_PI/FS;
+	if ((eratio < -4.0) && (model->Wo <= sixty))
+	    model->voiced = 0;
+    }
+    //printf(" v: %d snr: %f eratio: %3.2f %f\n",model->voiced,snr,eratio,dF0);
+
+    return snr;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                       
+  FUNCTION....: make_synthesis_window	     
+  AUTHOR......: David Rowe			      
+  DATE CREATED: 11/5/94 
+
+  Init function that generates the trapezoidal (Parzen) sythesis window.
+
+\*---------------------------------------------------------------------------*/
+
+void make_synthesis_window(float Pn[])
+{
+  int   i;
+  float win;
+
+  /* Generate Parzen window in time domain */
+
+  win = 0.0;
+  for(i=0; i<N/2-TW; i++)
+    Pn[i] = 0.0;
+  win = 0.0;
+  for(i=N/2-TW; i<N/2+TW; win+=1.0/(2*TW), i++ )
+    Pn[i] = win;
+  for(i=N/2+TW; i<3*N/2-TW; i++)
+    Pn[i] = 1.0;
+  win = 1.0;
+  for(i=3*N/2-TW; i<3*N/2+TW; win-=1.0/(2*TW), i++)
+    Pn[i] = win;
+  for(i=3*N/2+TW; i<2*N; i++)
+    Pn[i] = 0.0;
+}
+
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FUNCTION....: synthesise 			      
+  AUTHOR......: David Rowe		
+  DATE CREATED: 20/2/95		       
+									      
+  Synthesise a speech signal in the frequency domain from the
+  sinusodal model parameters.  Uses overlap-add with a trapezoidal
+  window to smoothly interpolate betwen frames.
+									      
+\*---------------------------------------------------------------------------*/
+
+void synthesise(
+  float  Sn_[],		/* time domain synthesised signal              */
+  MODEL *model,		/* ptr to model parameters for this frame      */
+  float  Pn[],		/* time domain Parzen window                   */
+  int    shift          /* flag used to handle transition frames       */
+)
+{
+    int   i,l,j,b;	/* loop variables */
+    COMP  Sw_[FFT_DEC];	/* DFT of synthesised signal */
+
+    if (shift) {
+	/* Update memories */
+
+	for(i=0; i<N-1; i++) {
+	    Sn_[i] = Sn_[i+N];
+	}
+	Sn_[N-1] = 0.0;
+    }
+
+    for(i=0; i<FFT_DEC; i++) {
+	Sw_[i].real = 0.0;
+	Sw_[i].imag = 0.0;
+    }
+
+    /*
+      Nov 2010 - found that synthesis using time domain cos() functions
+      gives better results for synthesis frames greater than 10ms.  Inverse
+      FFT synthesis using a 512 pt FFT works well for 10ms window.  I think
+      (but am not sure) that the problem is realted to the quantisation of
+      the harmonic frequencies to the FFT bin size, e.g. there is a 
+      8000/512 Hz step between FFT bins.  For some reason this makes
+      the speech from longer frame > 10ms sound poor.  The effect can also
+      be seen when synthesising test signals like single sine waves, some
+      sort of amplitude modulation at the frame rate.
+
+      Another possibility is using a larger FFT size (1024 or 2048).
+    */
+
+#define FFT_SYNTHESIS
+#ifdef FFT_SYNTHESIS
+    /* Now set up frequency domain synthesised speech */
+    for(l=1; l<=model->L; l++) {
+	b = floor(l*model->Wo*FFT_DEC/TWO_PI + 0.5);
+	if (b > ((FFT_DEC/2)-1)) {
+		b = (FFT_DEC/2)-1;
+	}
+	Sw_[b].real = model->A[l]*cos(model->phi[l]);
+	Sw_[b].imag = model->A[l]*sin(model->phi[l]);
+	Sw_[FFT_DEC-b].real = Sw_[b].real;
+	Sw_[FFT_DEC-b].imag = -Sw_[b].imag;
+    }
+
+    /* Perform inverse DFT */
+
+    fft(&Sw_[0].real,FFT_DEC,1);
+#else
+    /*
+       Direct time domain synthesis using the cos() function.  Works
+       well at 10ms and 20ms frames rates.  Note synthesis window is
+       still used to handle overlap-add between adjacent frames.  This
+       could be simplified as we don't need to synthesise where Pn[]
+       is zero.
+    */
+    for(l=1; l<=model->L; l++) {
+	for(i=0,j=-N+1; i<N-1; i++,j++) {
+	    Sw_[FFT_DEC-N+1+i].real += 2.0*model->A[l]*cos(j*model->Wo*l + model->phi[l]);
+	}
+ 	for(i=N-1,j=0; i<2*N; i++,j++)
+	    Sw_[j].real += 2.0*model->A[l]*cos(j*model->Wo*l + model->phi[l]);
+    }	
+#endif
+
+    /* Overlap add to previous samples */
+
+    for(i=0; i<N-1; i++) {
+	Sn_[i] += Sw_[FFT_DEC-N+1+i].real*Pn[i];
+    }
+
+    if (shift)
+	for(i=N-1,j=0; i<2*N; i++,j++)
+	    Sn_[i] = Sw_[j].real*Pn[i];
+    else
+	for(i=N-1,j=0; i<2*N; i++,j++)
+	    Sn_[i] += Sw_[j].real*Pn[i];
+}
+
diff --git a/gr-vocoder/lib/codec2/sine.h b/gr-vocoder/lib/codec2/sine.h
new file mode 100644
index 000000000..ae578bf70
--- /dev/null
+++ b/gr-vocoder/lib/codec2/sine.h
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+                                                                             
+  FILE........: sine.h
+  AUTHOR......: David Rowe                                                          
+  DATE CREATED: 1/11/94
+                                                                             
+  Header file for sinusoidal analysis and synthesis functions.
+                                                                             
+\*---------------------------------------------------------------------------*/
+
+/*
+  Copyright (C) 2009 David Rowe
+
+  All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License version 2.1, as
+  published by the Free Software Foundation.  This program 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 Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __SINE__
+#define __SINE__
+
+#include "defines.h"
+#include "comp.h"
+
+void make_analysis_window(float w[], COMP W[]);
+float hpf(float x, float states[]);
+void dft_speech(COMP Sw[], float Sn[], float w[]);
+void two_stage_pitch_refinement(MODEL *model, COMP Sw[]);
+void estimate_amplitudes(MODEL *model, COMP Sw[], COMP W[]);
+float est_voicing_mbe(MODEL *model, COMP Sw[], COMP W[], COMP Sw_[],COMP Ew[], 
+		      float prev_Wo);
+void make_synthesis_window(float Pn[]);
+void synthesise(float Sn_[], MODEL *model, float Pn[], int shift);
+
+#endif
diff --git a/gcell/ibm/.gitignore b/gr-vocoder/lib/g7xx/.gitignore
index a02b6ff73..a02b6ff73 100644
--- a/gcell/ibm/.gitignore
+++ b/gr-vocoder/lib/g7xx/.gitignore
diff --git a/gr-vocoder/lib/g7xx/CMakeLists.txt b/gr-vocoder/lib/g7xx/CMakeLists.txt
new file mode 100644
index 000000000..bde7538d2
--- /dev/null
+++ b/gr-vocoder/lib/g7xx/CMakeLists.txt
@@ -0,0 +1,30 @@
+# 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.
+
+########################################################################
+# Append all sources in this dir
+########################################################################
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+list(APPEND gr_vocoder_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/g711.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/g72x.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/g721.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/g723_24.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/g723_40.c
+)
diff --git a/gnuradio-core/src/lib/g72x/Makefile.am b/gr-vocoder/lib/g7xx/Makefile.am
index d2700376f..929fd23ba 100644
--- a/gnuradio-core/src/lib/g72x/Makefile.am
+++ b/gr-vocoder/lib/g7xx/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright 2001,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-noinst_LTLIBRARIES = libccitt.la
-libccitt_la_SOURCES = g711.c g72x.c g721.c g723_24.c g723_40.c g72x.h
+noinst_LTLIBRARIES = libg7xx.la
+libg7xx_la_SOURCES = g711.c g72x.c g721.c g723_24.c g723_40.c g72x.h
 
 EXTRA_DIST += encode.c decode.c
diff --git a/gnuradio-core/src/lib/g72x/README b/gr-vocoder/lib/g7xx/README
index 23b0e7dd5..23b0e7dd5 100644
--- a/gnuradio-core/src/lib/g72x/README
+++ b/gr-vocoder/lib/g7xx/README
diff --git a/gnuradio-core/src/lib/g72x/decode.c b/gr-vocoder/lib/g7xx/decode.c
index cf8c739c5..cf8c739c5 100644
--- a/gnuradio-core/src/lib/g72x/decode.c
+++ b/gr-vocoder/lib/g7xx/decode.c
diff --git a/gnuradio-core/src/lib/g72x/encode.c b/gr-vocoder/lib/g7xx/encode.c
index e74482869..e74482869 100644
--- a/gnuradio-core/src/lib/g72x/encode.c
+++ b/gr-vocoder/lib/g7xx/encode.c
diff --git a/gnuradio-core/src/lib/g72x/g711.c b/gr-vocoder/lib/g7xx/g711.c
index d4d60a5c2..d4d60a5c2 100644
--- a/gnuradio-core/src/lib/g72x/g711.c
+++ b/gr-vocoder/lib/g7xx/g711.c
diff --git a/gnuradio-core/src/lib/g72x/g721.c b/gr-vocoder/lib/g7xx/g721.c
index 445f177e8..445f177e8 100644
--- a/gnuradio-core/src/lib/g72x/g721.c
+++ b/gr-vocoder/lib/g7xx/g721.c
diff --git a/gnuradio-core/src/lib/g72x/g723_24.c b/gr-vocoder/lib/g7xx/g723_24.c
index 452f4daeb..452f4daeb 100644
--- a/gnuradio-core/src/lib/g72x/g723_24.c
+++ b/gr-vocoder/lib/g7xx/g723_24.c
diff --git a/gnuradio-core/src/lib/g72x/g723_40.c b/gr-vocoder/lib/g7xx/g723_40.c
index 4858baf40..4858baf40 100644
--- a/gnuradio-core/src/lib/g72x/g723_40.c
+++ b/gr-vocoder/lib/g7xx/g723_40.c
diff --git a/gnuradio-core/src/lib/g72x/g72x.c b/gr-vocoder/lib/g7xx/g72x.c
index 9a823c755..9a823c755 100644
--- a/gnuradio-core/src/lib/g72x/g72x.c
+++ b/gr-vocoder/lib/g7xx/g72x.c
diff --git a/gnuradio-core/src/lib/g72x/g72x.h b/gr-vocoder/lib/g7xx/g72x.h
index 33807171a..33807171a 100644
--- a/gnuradio-core/src/lib/g72x/g72x.h
+++ b/gr-vocoder/lib/g7xx/g72x.h
diff --git a/gcell/include/.gitignore b/gr-vocoder/lib/gsm/.gitignore
index a02b6ff73..a02b6ff73 100644
--- a/gcell/include/.gitignore
+++ b/gr-vocoder/lib/gsm/.gitignore
diff --git a/gr-vocoder/lib/gsm/CMakeLists.txt b/gr-vocoder/lib/gsm/CMakeLists.txt
new file mode 100644
index 000000000..8a4813a4f
--- /dev/null
+++ b/gr-vocoder/lib/gsm/CMakeLists.txt
@@ -0,0 +1,49 @@
+# 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.
+
+########################################################################
+# Append all sources in this dir
+########################################################################
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set(gsm_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/add.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/code.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/debug.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/decode.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gsm_create.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gsm_decode.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gsm_destroy.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gsm_encode.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gsm_explode.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gsm_implode.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gsm_option.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gsm_print.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/long_term.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/lpc.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/preprocess.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/rpe.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/short_term.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/table.c
+)
+
+set_source_files_properties(${gsm_sources}
+    PROPERTIES COMPILE_DEFINITION "NeedFunctionPrototypes=1"
+)
+list(APPEND gr_vocoder_sources ${gsm_sources})
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/COPYRIGHT b/gr-vocoder/lib/gsm/COPYRIGHT
index eba0e523b..eba0e523b 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/COPYRIGHT
+++ b/gr-vocoder/lib/gsm/COPYRIGHT
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am b/gr-vocoder/lib/gsm/Makefile.am
index d0872ff39..d0872ff39 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am
+++ b/gr-vocoder/lib/gsm/Makefile.am
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/README b/gr-vocoder/lib/gsm/README
index 1927d878a..1927d878a 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/README
+++ b/gr-vocoder/lib/gsm/README
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/README.gsm b/gr-vocoder/lib/gsm/README.gsm
index cb6af85cf..cb6af85cf 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/README.gsm
+++ b/gr-vocoder/lib/gsm/README.gsm
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/add.c b/gr-vocoder/lib/gsm/add.c
index 21ccfabe7..21ccfabe7 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/add.c
+++ b/gr-vocoder/lib/gsm/add.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/code.c b/gr-vocoder/lib/gsm/code.c
index 19af507b7..19af507b7 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/code.c
+++ b/gr-vocoder/lib/gsm/code.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/config.h b/gr-vocoder/lib/gsm/config.h
index 2a962ac7d..2a962ac7d 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/config.h
+++ b/gr-vocoder/lib/gsm/config.h
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/debug.c b/gr-vocoder/lib/gsm/debug.c
index e05210428..e05210428 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/debug.c
+++ b/gr-vocoder/lib/gsm/debug.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/decode.c b/gr-vocoder/lib/gsm/decode.c
index 34e558663..34e558663 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/decode.c
+++ b/gr-vocoder/lib/gsm/decode.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/gsm.h b/gr-vocoder/lib/gsm/gsm.h
index 990e42af5..990e42af5 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/gsm.h
+++ b/gr-vocoder/lib/gsm/gsm.h
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c b/gr-vocoder/lib/gsm/gsm_create.c
index de0b125b4..a59aa2f2a 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c
+++ b/gr-vocoder/lib/gsm/gsm_create.c
@@ -30,7 +30,6 @@ static char const	ident[] = "$Header$";
 #include "gsm.h"
 #include "private.h"
 #include "proto.h"
-#include <strings.h>
 
 gsm gsm_create P0()
 {
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_decode.c b/gr-vocoder/lib/gsm/gsm_decode.c
index 7318ba2d4..7318ba2d4 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_decode.c
+++ b/gr-vocoder/lib/gsm/gsm_decode.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_destroy.c b/gr-vocoder/lib/gsm/gsm_destroy.c
index 4807c0acd..4807c0acd 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_destroy.c
+++ b/gr-vocoder/lib/gsm/gsm_destroy.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_encode.c b/gr-vocoder/lib/gsm/gsm_encode.c
index 62338300e..62338300e 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_encode.c
+++ b/gr-vocoder/lib/gsm/gsm_encode.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_explode.c b/gr-vocoder/lib/gsm/gsm_explode.c
index a906fc2ed..a906fc2ed 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_explode.c
+++ b/gr-vocoder/lib/gsm/gsm_explode.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_implode.c b/gr-vocoder/lib/gsm/gsm_implode.c
index 453b8cf39..453b8cf39 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_implode.c
+++ b/gr-vocoder/lib/gsm/gsm_implode.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_option.c b/gr-vocoder/lib/gsm/gsm_option.c
index 280780132..280780132 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_option.c
+++ b/gr-vocoder/lib/gsm/gsm_option.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_print.c b/gr-vocoder/lib/gsm/gsm_print.c
index af745bc48..af745bc48 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/gsm_print.c
+++ b/gr-vocoder/lib/gsm/gsm_print.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/long_term.c b/gr-vocoder/lib/gsm/long_term.c
index fd67bda19..fd67bda19 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/long_term.c
+++ b/gr-vocoder/lib/gsm/long_term.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/lpc.c b/gr-vocoder/lib/gsm/lpc.c
index ac2b8a9eb..ac2b8a9eb 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/lpc.c
+++ b/gr-vocoder/lib/gsm/lpc.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/preprocess.c b/gr-vocoder/lib/gsm/preprocess.c
index 99c0709dc..1e1bbf8b0 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/preprocess.c
+++ b/gr-vocoder/lib/gsm/preprocess.c
@@ -93,11 +93,11 @@ void Gsm_Preprocess P3((S, s, so),
 
 		L_s2  += GSM_MULT_R( lsp, 32735 );
 		L_temp = (longword)msp * 32735; /* GSM_L_MULT(msp,32735) >> 1;*/
-		L_z2   = GSM_L_ADD( L_temp, L_s2 );
+		L_z2   = GSM_L_ADD( (ulongword)L_temp, (ulongword)L_s2 );
 
 		/*    Compute sof[k] with rounding
 		 */
-		L_temp = GSM_L_ADD( L_z2, 16384 );
+		L_temp = GSM_L_ADD( (ulongword)L_z2, 16384 );
 
 	/*   4.2.3  Preemphasis
 	 */
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/private.h b/gr-vocoder/lib/gsm/private.h
index 6b538cc27..6b538cc27 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/private.h
+++ b/gr-vocoder/lib/gsm/private.h
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/proto.h b/gr-vocoder/lib/gsm/proto.h
index 87cf05e8a..87cf05e8a 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/proto.h
+++ b/gr-vocoder/lib/gsm/proto.h
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/rpe.c b/gr-vocoder/lib/gsm/rpe.c
index 8a6b81fae..8a6b81fae 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/rpe.c
+++ b/gr-vocoder/lib/gsm/rpe.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/short_term.c b/gr-vocoder/lib/gsm/short_term.c
index 4f5fd7be7..4f5fd7be7 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/short_term.c
+++ b/gr-vocoder/lib/gsm/short_term.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/table.c b/gr-vocoder/lib/gsm/table.c
index 16a04118c..16a04118c 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/table.c
+++ b/gr-vocoder/lib/gsm/table.c
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/unproto.h b/gr-vocoder/lib/gsm/unproto.h
index ccd565109..ccd565109 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm/unproto.h
+++ b/gr-vocoder/lib/gsm/unproto.h
diff --git a/gr-vocoder/lib/vocoder_alaw_decode_bs.cc b/gr-vocoder/lib/vocoder_alaw_decode_bs.cc
new file mode 100644
index 000000000..7ffdddd81
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_alaw_decode_bs.cc
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vocoder_alaw_decode_bs.h>
+#include <gr_io_signature.h>
+#include <limits.h>
+
+extern "C" {
+#include "g7xx/g72x.h"
+}
+
+vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs()
+{
+  return gnuradio::get_initial_sptr(new vocoder_alaw_decode_bs());
+}
+
+vocoder_alaw_decode_bs::vocoder_alaw_decode_bs()
+  : gr_sync_block("vocoder_alaw_decode_bs",
+		  gr_make_io_signature (1, 1, sizeof (unsigned char)),
+		  gr_make_io_signature (1, 1, sizeof (short)))
+{
+}
+
+vocoder_alaw_decode_bs::~vocoder_alaw_decode_bs()
+{
+}
+
+
+
+int 
+vocoder_alaw_decode_bs::work(int noutput_items,
+			     gr_vector_const_void_star &input_items,
+			     gr_vector_void_star &output_items)
+{
+  const unsigned char *in = (const unsigned char *)input_items[0];
+  short *out = (short *)output_items[0];
+
+  for(int i = 0; i < noutput_items; i++)
+    out[i] = alaw2linear(in[i]);
+  
+  return noutput_items;
+}
diff --git a/gr-vocoder/lib/vocoder_alaw_encode_sb.cc b/gr-vocoder/lib/vocoder_alaw_encode_sb.cc
new file mode 100644
index 000000000..e4d975271
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_alaw_encode_sb.cc
@@ -0,0 +1,63 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vocoder_alaw_encode_sb.h>
+#include <gr_io_signature.h>
+#include <limits.h>
+
+extern "C" {
+#include "g7xx/g72x.h"
+}
+
+vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb()
+{
+  return gnuradio::get_initial_sptr(new vocoder_alaw_encode_sb());
+}
+
+vocoder_alaw_encode_sb::vocoder_alaw_encode_sb()
+  : gr_sync_block("vocoder_alaw_encode_sb",
+		  gr_make_io_signature (1, 1, sizeof(short)),
+		  gr_make_io_signature (1, 1, sizeof(unsigned char)))
+{
+}
+
+vocoder_alaw_encode_sb::~vocoder_alaw_encode_sb()
+{
+}
+
+int 
+vocoder_alaw_encode_sb::work(int noutput_items,
+			     gr_vector_const_void_star &input_items,
+			     gr_vector_void_star &output_items)
+{
+  const short *in = (const short *)input_items[0];
+  unsigned char *out = (unsigned char *)output_items[0];
+  
+  for(int i = 0; i < noutput_items; i++)
+    out[i] = linear2alaw(in[i]);
+
+  return noutput_items;
+}
diff --git a/gr-vocoder/lib/vocoder_codec2_decode_ps.cc b/gr-vocoder/lib/vocoder_codec2_decode_ps.cc
new file mode 100644
index 000000000..b1feb1aaf
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_codec2_decode_ps.cc
@@ -0,0 +1,75 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "vocoder_codec2_decode_ps.h"
+
+extern "C" {
+#include "codec2/codec2.h"
+}
+
+#include <gr_io_signature.h>
+#include <stdexcept>
+#include <assert.h>
+
+vocoder_codec2_decode_ps_sptr
+vocoder_make_codec2_decode_ps ()
+{
+  return gnuradio::get_initial_sptr(new vocoder_codec2_decode_ps ());
+}
+
+vocoder_codec2_decode_ps::vocoder_codec2_decode_ps ()
+  : gr_sync_interpolator ("vocoder_codec2_decode_ps",
+			  gr_make_io_signature (1, 1, CODEC2_BITS_PER_FRAME * sizeof (char)),
+			  gr_make_io_signature (1, 1, sizeof (short)),
+			  CODEC2_SAMPLES_PER_FRAME)
+{
+  if ((d_codec2 = codec2_create ()) == 0)
+    throw std::runtime_error ("vocoder_codec2_decode_ps: codec2_create failed");
+}
+
+vocoder_codec2_decode_ps::~vocoder_codec2_decode_ps ()
+{
+  codec2_destroy(d_codec2);
+}
+
+int
+vocoder_codec2_decode_ps::work (int noutput_items,
+				gr_vector_const_void_star &input_items,
+				gr_vector_void_star &output_items)
+{
+  const unsigned char *in = (const unsigned char *) input_items[0];
+  short *out = (short *) output_items[0];
+
+  assert ((noutput_items % CODEC2_SAMPLES_PER_FRAME) == 0);
+
+  for (int i = 0; i < noutput_items; i += CODEC2_SAMPLES_PER_FRAME){
+    codec2_decode (d_codec2, out, const_cast<unsigned char*>(in));
+    in += CODEC2_BITS_PER_FRAME * sizeof (char);
+    out += CODEC2_SAMPLES_PER_FRAME;
+  }
+
+  return noutput_items;
+}
diff --git a/gr-vocoder/lib/vocoder_codec2_encode_sp.cc b/gr-vocoder/lib/vocoder_codec2_encode_sp.cc
new file mode 100644
index 000000000..1f22e38b2
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_codec2_encode_sp.cc
@@ -0,0 +1,72 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "vocoder_codec2_encode_sp.h"
+
+extern "C" {
+#include "codec2/codec2.h"
+}
+
+#include <gr_io_signature.h>
+#include <stdexcept>
+
+vocoder_codec2_encode_sp_sptr
+vocoder_make_codec2_encode_sp ()
+{
+  return gnuradio::get_initial_sptr(new vocoder_codec2_encode_sp ());
+}
+
+vocoder_codec2_encode_sp::vocoder_codec2_encode_sp ()
+  : gr_sync_decimator ("vocoder_codec2_encode_sp",
+		       gr_make_io_signature (1, 1, sizeof (short)),
+		       gr_make_io_signature (1, 1, CODEC2_BITS_PER_FRAME * sizeof (char)),
+		       CODEC2_SAMPLES_PER_FRAME)
+{
+  if ((d_codec2 = codec2_create ()) == 0)
+    throw std::runtime_error ("vocoder_codec2_encode_sp: codec2_create failed");
+}
+
+vocoder_codec2_encode_sp::~vocoder_codec2_encode_sp ()
+{
+  codec2_destroy(d_codec2);
+}
+
+int
+vocoder_codec2_encode_sp::work (int noutput_items,
+				gr_vector_const_void_star &input_items,
+				gr_vector_void_star &output_items)
+{
+  const short *in = (const short *) input_items[0];
+  unsigned char *out = (unsigned char *) output_items[0];
+
+  for (int i = 0; i < noutput_items; i++){
+    codec2_encode (d_codec2, out, const_cast<short*>(in));
+    in += CODEC2_SAMPLES_PER_FRAME;
+    out += CODEC2_BITS_PER_FRAME * sizeof (char);
+  }
+
+  return noutput_items;
+}
diff --git a/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc b/gr-vocoder/lib/vocoder_cvsd_decode_bs.cc
index 26dcb29da..baf99f041 100644
--- a/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc
+++ b/gr-vocoder/lib/vocoder_cvsd_decode_bs.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2010 Free Software Foundation, Inc.
+ * Copyright 2007,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -29,28 +29,28 @@
 #include "config.h"
 #endif
 
-#include <cvsd_decode_bs.h>
+#include <vocoder_cvsd_decode_bs.h>
 #include <gr_io_signature.h>
 #include <limits.h>
 
 /*
- * Create a new instance of cvsd_decode_bs and return
+ * Create a new instance of vocoder_cvsd_decode_bs and return
  * a boost shared_ptr.  This is effectively the public constructor.
  */
-cvsd_decode_bs_sptr 
-cvsd_make_decode_bs (short min_step, short max_step, double step_decay,
-		     double accum_decay,  int K, int J,
-		     short pos_accum_max, short neg_accum_max)
+vocoder_cvsd_decode_bs_sptr 
+vocoder_make_cvsd_decode_bs (short min_step, short max_step, double step_decay,
+			     double accum_decay,  int K, int J,
+			     short pos_accum_max, short neg_accum_max)
 {
-  return gnuradio::get_initial_sptr(new cvsd_decode_bs (min_step, max_step,
-						  step_decay, accum_decay, K, J,
-						  pos_accum_max, neg_accum_max));
+  return gnuradio::get_initial_sptr(new vocoder_cvsd_decode_bs (min_step, max_step,
+								step_decay, accum_decay, K, J,
+								pos_accum_max, neg_accum_max));
 }
 
-cvsd_decode_bs::cvsd_decode_bs (short min_step, short max_step, double step_decay, 
-				double accum_decay, int K, int J,
-				short pos_accum_max, short neg_accum_max)
-  : gr_sync_interpolator ("cvsd_decode_bs",
+vocoder_cvsd_decode_bs::vocoder_cvsd_decode_bs (short min_step, short max_step, double step_decay, 
+						double accum_decay, int K, int J,
+						short pos_accum_max, short neg_accum_max)
+  : gr_sync_interpolator ("vocoder_cvsd_decode_bs",
 			  gr_make_io_signature (1, 1, sizeof (unsigned char)),
 			  gr_make_io_signature (1, 1, sizeof (short)),
 			  8),
@@ -69,12 +69,12 @@ cvsd_decode_bs::cvsd_decode_bs (short min_step, short max_step, double step_deca
 }
 
 
-cvsd_decode_bs::~cvsd_decode_bs ()
+vocoder_cvsd_decode_bs::~vocoder_cvsd_decode_bs ()
 {
   // nothing else required in this example
 }
 
-unsigned char cvsd_decode_bs::cvsd_bitwise_sum (unsigned int input)
+unsigned char vocoder_cvsd_decode_bs::cvsd_bitwise_sum (unsigned int input)
 {
   unsigned int temp=input;
   unsigned char bits=0;
@@ -86,7 +86,7 @@ unsigned char cvsd_decode_bs::cvsd_bitwise_sum (unsigned int input)
   return bits;
 }
 
-int cvsd_decode_bs::cvsd_round (double input)
+int vocoder_cvsd_decode_bs::cvsd_round (double input)
 {
   double temp;
   temp=input+0.5;
@@ -95,7 +95,7 @@ int cvsd_decode_bs::cvsd_round (double input)
   return (int)temp;
 }
 
-unsigned int cvsd_decode_bs::cvsd_pow (short radix, short power)
+unsigned int vocoder_cvsd_decode_bs::cvsd_pow (short radix, short power)
 {
   double d_radix = (double) radix;
   int i_power = (int) power;
@@ -107,9 +107,9 @@ unsigned int cvsd_decode_bs::cvsd_pow (short radix, short power)
 
 
 int 
-cvsd_decode_bs::work (int noutput_items,
-		      gr_vector_const_void_star &input_items,
-		      gr_vector_void_star &output_items)
+vocoder_cvsd_decode_bs::work (int noutput_items,
+			      gr_vector_const_void_star &input_items,
+			      gr_vector_void_star &output_items)
 {
  
 
diff --git a/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc b/gr-vocoder/lib/vocoder_cvsd_encode_sb.cc
index df867f3ba..71cf6df8c 100644
--- a/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc
+++ b/gr-vocoder/lib/vocoder_cvsd_encode_sb.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007,2010 Free Software Foundation, Inc.
+ * Copyright 2007,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -29,28 +29,28 @@
 #include "config.h"
 #endif
 
-#include <cvsd_encode_sb.h>
+#include <vocoder_cvsd_encode_sb.h>
 #include <gr_io_signature.h>
 #include <limits.h>
 
 /*
- * Create a new instance of cvsd_encode_sb and return
+ * Create a new instance of vocoder_cvsd_encode_sb and return
  * a boost shared_ptr.  This is effectively the public constructor.
  */
-cvsd_encode_sb_sptr 
-cvsd_make_encode_sb (short min_step, short max_step, double step_decay,
-		     double accum_decay,  int K, int J,
-		     short pos_accum_max, short neg_accum_max)
+vocoder_cvsd_encode_sb_sptr 
+vocoder_make_cvsd_encode_sb (short min_step, short max_step, double step_decay,
+			     double accum_decay,  int K, int J,
+			     short pos_accum_max, short neg_accum_max)
 {
-  return gnuradio::get_initial_sptr(new cvsd_encode_sb (min_step, max_step,
-						  step_decay, accum_decay, K, J,
-						  pos_accum_max, neg_accum_max));
+  return gnuradio::get_initial_sptr(new vocoder_cvsd_encode_sb (min_step, max_step,
+								step_decay, accum_decay, K, J,
+								pos_accum_max, neg_accum_max));
 }
 
-cvsd_encode_sb::cvsd_encode_sb (short min_step, short max_step, double step_decay, 
-				double accum_decay, int K, int J,
-				short pos_accum_max, short neg_accum_max)
-  : gr_sync_decimator ("cvsd_encode_sb",
+vocoder_cvsd_encode_sb::vocoder_cvsd_encode_sb (short min_step, short max_step, double step_decay, 
+						double accum_decay, int K, int J,
+						short pos_accum_max, short neg_accum_max)
+  : gr_sync_decimator ("vocoder_cvsd_encode_sb",
 		       gr_make_io_signature (1, 1, sizeof (short)),
 		       gr_make_io_signature (1, 1, sizeof (unsigned char)),
 		       8),
@@ -68,12 +68,12 @@ cvsd_encode_sb::cvsd_encode_sb (short min_step, short max_step, double step_deca
 }
 
 
-cvsd_encode_sb::~cvsd_encode_sb ()
+vocoder_cvsd_encode_sb::~vocoder_cvsd_encode_sb ()
 {
   // nothing else required in this example
 }
 
-unsigned char cvsd_encode_sb::cvsd_bitwise_sum (unsigned int input)
+unsigned char vocoder_cvsd_encode_sb::cvsd_bitwise_sum (unsigned int input)
 {
   unsigned int temp=input;
   unsigned char bits=0;
@@ -85,7 +85,7 @@ unsigned char cvsd_encode_sb::cvsd_bitwise_sum (unsigned int input)
   return bits;
 }
 
-int cvsd_encode_sb::cvsd_round (double input)
+int vocoder_cvsd_encode_sb::cvsd_round (double input)
 {
   double temp;
   temp=input+0.5;
@@ -94,7 +94,7 @@ int cvsd_encode_sb::cvsd_round (double input)
   return (int)temp;
 }
 
-unsigned int cvsd_encode_sb::cvsd_pow (short radix, short power)
+unsigned int vocoder_cvsd_encode_sb::cvsd_pow (short radix, short power)
 {
   double d_radix = (double) radix;
   int i_power = (int) power;
@@ -104,12 +104,10 @@ unsigned int cvsd_encode_sb::cvsd_pow (short radix, short power)
   return ( (unsigned int) cvsd_round(output));  
 }
 
-
-
 int 
-cvsd_encode_sb::work (int noutput_items,
-			     gr_vector_const_void_star &input_items,
-			     gr_vector_void_star &output_items)
+vocoder_cvsd_encode_sb::work (int noutput_items,
+			      gr_vector_const_void_star &input_items,
+			      gr_vector_void_star &output_items)
 {
   const short *in = (const short *) input_items[0];
   unsigned char *out = (unsigned char *) output_items[0];
diff --git a/gr-vocoder/lib/vocoder_g721_decode_bs.cc b/gr-vocoder/lib/vocoder_g721_decode_bs.cc
new file mode 100644
index 000000000..2abee8d14
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_g721_decode_bs.cc
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vocoder_g721_decode_bs.h>
+#include <gr_io_signature.h>
+#include <limits.h>
+
+extern "C" {
+#include "g7xx/g72x.h"
+}
+
+class vocoder_g721_decode_bs_impl : public vocoder_g721_decode_bs
+{
+public:
+
+  vocoder_g721_decode_bs_impl();
+  ~vocoder_g721_decode_bs_impl();
+
+  int work(int noutput_items,
+	   gr_vector_const_void_star &input_items,
+	   gr_vector_void_star &output_items);
+
+private:
+
+  g72x_state d_state;
+
+};
+
+vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs()
+{
+  return gnuradio::get_initial_sptr(new vocoder_g721_decode_bs_impl());
+}
+
+vocoder_g721_decode_bs_impl::vocoder_g721_decode_bs_impl()
+  : gr_sync_block("vocoder_g721_decode_bs",
+		  gr_make_io_signature (1, 1, sizeof (unsigned char)),
+		  gr_make_io_signature (1, 1, sizeof (short)))
+{
+  g72x_init_state(&d_state);
+}
+
+vocoder_g721_decode_bs_impl::~vocoder_g721_decode_bs_impl()
+{
+}
+
+int 
+vocoder_g721_decode_bs_impl::work(int noutput_items,
+				  gr_vector_const_void_star &input_items,
+				  gr_vector_void_star &output_items)
+{
+  const unsigned char *in = (const unsigned char *)input_items[0];
+  short *out = (short *)output_items[0];
+
+  for(int i = 0; i < noutput_items; i++)
+    out[i] = g721_decoder(in[i], AUDIO_ENCODING_LINEAR, &d_state);
+  
+  return noutput_items;
+}
diff --git a/gr-vocoder/lib/vocoder_g721_encode_sb.cc b/gr-vocoder/lib/vocoder_g721_encode_sb.cc
new file mode 100644
index 000000000..667e983dc
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_g721_encode_sb.cc
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vocoder_g721_encode_sb.h>
+#include <gr_io_signature.h>
+#include <limits.h>
+
+extern "C" {
+#include "g7xx/g72x.h"
+}
+
+class vocoder_g721_encode_sb_impl : public vocoder_g721_encode_sb
+{
+public:
+
+  vocoder_g721_encode_sb_impl();
+  ~vocoder_g721_encode_sb_impl();
+
+  int work(int noutput_items,
+	   gr_vector_const_void_star &input_items,
+	   gr_vector_void_star &output_items);
+
+private:
+
+  g72x_state d_state;
+
+};
+
+vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb()
+{
+  return gnuradio::get_initial_sptr(new vocoder_g721_encode_sb_impl());
+}
+
+vocoder_g721_encode_sb_impl::vocoder_g721_encode_sb_impl()
+  : gr_sync_block("vocoder_g721_encode_sb",
+		  gr_make_io_signature (1, 1, sizeof (short)),
+		  gr_make_io_signature (1, 1, sizeof (unsigned char)))
+{
+  g72x_init_state(&d_state);
+}
+
+vocoder_g721_encode_sb_impl::~vocoder_g721_encode_sb_impl()
+{
+}
+
+int 
+vocoder_g721_encode_sb_impl::work(int noutput_items,
+				  gr_vector_const_void_star &input_items,
+				  gr_vector_void_star &output_items)
+{
+  const short *in = (const short *)input_items[0];
+  unsigned char *out = (unsigned char *)output_items[0];
+
+  for(int i = 0; i < noutput_items; i++)
+    out[i] = g721_encoder(in[i], AUDIO_ENCODING_LINEAR, &d_state);
+  
+  return noutput_items;
+}
diff --git a/gr-vocoder/lib/vocoder_g723_24_decode_bs.cc b/gr-vocoder/lib/vocoder_g723_24_decode_bs.cc
new file mode 100644
index 000000000..2ea036c58
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_g723_24_decode_bs.cc
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vocoder_g723_24_decode_bs.h>
+#include <gr_io_signature.h>
+#include <limits.h>
+
+extern "C" {
+#include "g7xx/g72x.h"
+}
+
+class vocoder_g723_24_decode_bs_impl : public vocoder_g723_24_decode_bs
+{
+public:
+
+  vocoder_g723_24_decode_bs_impl();
+  ~vocoder_g723_24_decode_bs_impl();
+
+  int work(int noutput_items,
+	   gr_vector_const_void_star &input_items,
+	   gr_vector_void_star &output_items);
+
+private:
+
+  g72x_state d_state;
+
+};
+
+vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs()
+{
+  return gnuradio::get_initial_sptr(new vocoder_g723_24_decode_bs_impl());
+}
+
+vocoder_g723_24_decode_bs_impl::vocoder_g723_24_decode_bs_impl()
+  : gr_sync_block("vocoder_g723_24_decode_bs",
+		  gr_make_io_signature (1, 1, sizeof (unsigned char)),
+		  gr_make_io_signature (1, 1, sizeof (short)))
+{
+  g72x_init_state(&d_state);
+}
+
+vocoder_g723_24_decode_bs_impl::~vocoder_g723_24_decode_bs_impl()
+{
+}
+
+int 
+vocoder_g723_24_decode_bs_impl::work(int noutput_items,
+				     gr_vector_const_void_star &input_items,
+				     gr_vector_void_star &output_items)
+{
+  const unsigned char *in = (const unsigned char *)input_items[0];
+  short *out = (short *)output_items[0];
+
+  for(int i = 0; i < noutput_items; i++)
+    out[i] = g723_24_decoder(in[i], AUDIO_ENCODING_LINEAR, &d_state);
+  
+  return noutput_items;
+}
diff --git a/gr-vocoder/lib/vocoder_g723_24_encode_sb.cc b/gr-vocoder/lib/vocoder_g723_24_encode_sb.cc
new file mode 100644
index 000000000..7e6914223
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_g723_24_encode_sb.cc
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vocoder_g723_24_encode_sb.h>
+#include <gr_io_signature.h>
+#include <limits.h>
+
+extern "C" {
+#include "g7xx/g72x.h"
+}
+
+class vocoder_g723_24_encode_sb_impl : public vocoder_g723_24_encode_sb
+{
+public:
+
+  vocoder_g723_24_encode_sb_impl();
+  ~vocoder_g723_24_encode_sb_impl();
+
+  int work(int noutput_items,
+	   gr_vector_const_void_star &input_items,
+	   gr_vector_void_star &output_items);
+
+private:
+
+  g72x_state d_state;
+
+};
+
+vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb()
+{
+  return gnuradio::get_initial_sptr(new vocoder_g723_24_encode_sb_impl());
+}
+
+vocoder_g723_24_encode_sb_impl::vocoder_g723_24_encode_sb_impl()
+  : gr_sync_block("vocoder_g723_24_encode_sb",
+		  gr_make_io_signature (1, 1, sizeof (short)),
+		  gr_make_io_signature (1, 1, sizeof (unsigned char)))
+{
+  g72x_init_state(&d_state);
+}
+
+vocoder_g723_24_encode_sb_impl::~vocoder_g723_24_encode_sb_impl()
+{
+}
+
+int 
+vocoder_g723_24_encode_sb_impl::work(int noutput_items,
+				     gr_vector_const_void_star &input_items,
+				     gr_vector_void_star &output_items)
+{
+  const short *in = (const short *)input_items[0];
+  unsigned char *out = (unsigned char *)output_items[0];
+
+  for(int i = 0; i < noutput_items; i++)
+    out[i] = g723_24_encoder(in[i], AUDIO_ENCODING_LINEAR, &d_state);
+  
+  return noutput_items;
+}
diff --git a/gr-vocoder/lib/vocoder_g723_40_decode_bs.cc b/gr-vocoder/lib/vocoder_g723_40_decode_bs.cc
new file mode 100644
index 000000000..38fd0fb5e
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_g723_40_decode_bs.cc
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vocoder_g723_40_decode_bs.h>
+#include <gr_io_signature.h>
+#include <limits.h>
+
+extern "C" {
+#include "g7xx/g72x.h"
+}
+
+class vocoder_g723_40_decode_bs_impl : public vocoder_g723_40_decode_bs
+{
+public:
+
+  vocoder_g723_40_decode_bs_impl();
+  ~vocoder_g723_40_decode_bs_impl();
+
+  int work(int noutput_items,
+	   gr_vector_const_void_star &input_items,
+	   gr_vector_void_star &output_items);
+
+private:
+
+  g72x_state d_state;
+
+};
+
+vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs()
+{
+  return gnuradio::get_initial_sptr(new vocoder_g723_40_decode_bs_impl());
+}
+
+vocoder_g723_40_decode_bs_impl::vocoder_g723_40_decode_bs_impl()
+  : gr_sync_block("vocoder_g723_40_decode_bs",
+		  gr_make_io_signature (1, 1, sizeof (unsigned char)),
+		  gr_make_io_signature (1, 1, sizeof (short)))
+{
+  g72x_init_state(&d_state);
+}
+
+vocoder_g723_40_decode_bs_impl::~vocoder_g723_40_decode_bs_impl()
+{
+}
+
+int 
+vocoder_g723_40_decode_bs_impl::work(int noutput_items,
+				     gr_vector_const_void_star &input_items,
+				     gr_vector_void_star &output_items)
+{
+  const unsigned char *in = (const unsigned char *)input_items[0];
+  short *out = (short *)output_items[0];
+
+  for(int i = 0; i < noutput_items; i++)
+    out[i] = g723_40_decoder(in[i], AUDIO_ENCODING_LINEAR, &d_state);
+  
+  return noutput_items;
+}
diff --git a/gr-vocoder/lib/vocoder_g723_40_encode_sb.cc b/gr-vocoder/lib/vocoder_g723_40_encode_sb.cc
new file mode 100644
index 000000000..1089306e7
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_g723_40_encode_sb.cc
@@ -0,0 +1,81 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vocoder_g723_40_encode_sb.h>
+#include <gr_io_signature.h>
+#include <limits.h>
+
+extern "C" {
+#include "g7xx/g72x.h"
+}
+
+class vocoder_g723_40_encode_sb_impl : public vocoder_g723_40_encode_sb
+{
+public:
+
+  vocoder_g723_40_encode_sb_impl();
+  ~vocoder_g723_40_encode_sb_impl();
+
+  int work(int noutput_items,
+	   gr_vector_const_void_star &input_items,
+	   gr_vector_void_star &output_items);
+
+private:
+
+  g72x_state d_state;
+
+};
+
+vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb()
+{
+  return gnuradio::get_initial_sptr(new vocoder_g723_40_encode_sb_impl());
+}
+
+vocoder_g723_40_encode_sb_impl::vocoder_g723_40_encode_sb_impl()
+  : gr_sync_block("vocoder_g723_40_encode_sb",
+		  gr_make_io_signature (1, 1, sizeof (short)),
+		  gr_make_io_signature (1, 1, sizeof (unsigned char)))
+{
+  g72x_init_state(&d_state);
+}
+
+vocoder_g723_40_encode_sb_impl::~vocoder_g723_40_encode_sb_impl()
+{
+}
+
+int 
+vocoder_g723_40_encode_sb_impl::work(int noutput_items,
+				     gr_vector_const_void_star &input_items,
+				     gr_vector_void_star &output_items)
+{
+  const short *in = (const short *)input_items[0];
+  unsigned char *out = (unsigned char *)output_items[0];
+
+  for(int i = 0; i < noutput_items; i++)
+    out[i] = g723_40_encoder(in[i], AUDIO_ENCODING_LINEAR, &d_state);
+  
+  return noutput_items;
+}
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm_fr_decode_ps.cc b/gr-vocoder/lib/vocoder_gsm_fr_decode_ps.cc
index 9b788dedf..986e0814e 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm_fr_decode_ps.cc
+++ b/gr-vocoder/lib/vocoder_gsm_fr_decode_ps.cc
@@ -23,7 +23,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "gsm_fr_decode_ps.h"
+#include "vocoder_gsm_fr_decode_ps.h"
 extern "C"{
 #include "gsm/gsm.h"
 }
@@ -31,29 +31,29 @@ extern "C"{
 #include <stdexcept>
 #include <assert.h>
 
-gsm_fr_decode_ps_sptr
-gsm_fr_make_decode_ps ()
+vocoder_gsm_fr_decode_ps_sptr
+vocoder_make_gsm_fr_decode_ps ()
 {
-  return gnuradio::get_initial_sptr(new gsm_fr_decode_ps ());
+  return gnuradio::get_initial_sptr(new vocoder_gsm_fr_decode_ps ());
 }
 
-gsm_fr_decode_ps::gsm_fr_decode_ps ()
-  : gr_sync_interpolator ("gsm_fr_decode_ps",
+vocoder_gsm_fr_decode_ps::vocoder_gsm_fr_decode_ps ()
+  : gr_sync_interpolator ("vocoder_gsm_fr_decode_ps",
 			  gr_make_io_signature (1, 1, sizeof (gsm_frame)),
 			  gr_make_io_signature (1, 1, sizeof (short)),
 			  GSM_SAMPLES_PER_FRAME)
 {
   if ((d_gsm = gsm_create ()) == 0)
-    throw std::runtime_error ("gsm_fr_decode_ps: gsm_create failed");
+    throw std::runtime_error ("vocoder_gsm_fr_decode_ps: gsm_create failed");
 }
 
-gsm_fr_decode_ps::~gsm_fr_decode_ps ()
+vocoder_gsm_fr_decode_ps::~vocoder_gsm_fr_decode_ps ()
 {
   gsm_destroy (d_gsm);
 }
 
 int
-gsm_fr_decode_ps::work (int noutput_items,
+vocoder_gsm_fr_decode_ps::work (int noutput_items,
 			gr_vector_const_void_star &input_items,
 			gr_vector_void_star &output_items)
 {
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm_fr_encode_sp.cc b/gr-vocoder/lib/vocoder_gsm_fr_encode_sp.cc
index 10bd1fef8..7a69b856d 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm_fr_encode_sp.cc
+++ b/gr-vocoder/lib/vocoder_gsm_fr_encode_sp.cc
@@ -23,36 +23,36 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "gsm_fr_encode_sp.h"
+#include "vocoder_gsm_fr_encode_sp.h"
 extern "C"{
 #include "gsm/gsm.h"
 }
 #include <gr_io_signature.h>
 #include <stdexcept>
 
-gsm_fr_encode_sp_sptr
-gsm_fr_make_encode_sp ()
+vocoder_gsm_fr_encode_sp_sptr
+vocoder_make_gsm_fr_encode_sp ()
 {
-  return gnuradio::get_initial_sptr(new gsm_fr_encode_sp ());
+  return gnuradio::get_initial_sptr(new vocoder_gsm_fr_encode_sp ());
 }
 
-gsm_fr_encode_sp::gsm_fr_encode_sp ()
-  : gr_sync_decimator ("gsm_fr_encode_sp",
+vocoder_gsm_fr_encode_sp::vocoder_gsm_fr_encode_sp ()
+  : gr_sync_decimator ("vocoder_gsm_fr_encode_sp",
 		       gr_make_io_signature (1, 1, sizeof (short)),
 		       gr_make_io_signature (1, 1, sizeof (gsm_frame)),
 		       GSM_SAMPLES_PER_FRAME)
 {
   if ((d_gsm = gsm_create ()) == 0)
-    throw std::runtime_error ("gsm_fr_encode_sp: gsm_create failed");
+    throw std::runtime_error ("vocoder_gsm_fr_encode_sp: gsm_create failed");
 }
 
-gsm_fr_encode_sp::~gsm_fr_encode_sp ()
+vocoder_gsm_fr_encode_sp::~vocoder_gsm_fr_encode_sp ()
 {
   gsm_destroy (d_gsm);
 }
 
 int
-gsm_fr_encode_sp::work (int noutput_items,
+vocoder_gsm_fr_encode_sp::work (int noutput_items,
 			gr_vector_const_void_star &input_items,
 			gr_vector_void_star &output_items)
 {
diff --git a/gr-vocoder/lib/vocoder_ulaw_decode_bs.cc b/gr-vocoder/lib/vocoder_ulaw_decode_bs.cc
new file mode 100644
index 000000000..3ade9d3f0
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_ulaw_decode_bs.cc
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vocoder_ulaw_decode_bs.h>
+#include <gr_io_signature.h>
+#include <limits.h>
+
+extern "C" {
+#include "g7xx/g72x.h"
+}
+
+vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs()
+{
+  return gnuradio::get_initial_sptr(new vocoder_ulaw_decode_bs());
+}
+
+vocoder_ulaw_decode_bs::vocoder_ulaw_decode_bs()
+  : gr_sync_block("vocoder_ulaw_decode_bs",
+		  gr_make_io_signature (1, 1, sizeof (unsigned char)),
+		  gr_make_io_signature (1, 1, sizeof (short)))
+{
+}
+
+vocoder_ulaw_decode_bs::~vocoder_ulaw_decode_bs()
+{
+}
+
+
+
+int 
+vocoder_ulaw_decode_bs::work(int noutput_items,
+			     gr_vector_const_void_star &input_items,
+			     gr_vector_void_star &output_items)
+{
+  const unsigned char *in = (const unsigned char *)input_items[0];
+  short *out = (short *)output_items[0];
+
+  for(int i = 0; i < noutput_items; i++)
+    out[i] = ulaw2linear(in[i]);
+  
+  return noutput_items;
+}
diff --git a/gr-vocoder/lib/vocoder_ulaw_encode_sb.cc b/gr-vocoder/lib/vocoder_ulaw_encode_sb.cc
new file mode 100644
index 000000000..19c53d72c
--- /dev/null
+++ b/gr-vocoder/lib/vocoder_ulaw_encode_sb.cc
@@ -0,0 +1,63 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <vocoder_ulaw_encode_sb.h>
+#include <gr_io_signature.h>
+#include <limits.h>
+
+extern "C" {
+#include "g7xx/g72x.h"
+}
+
+vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb()
+{
+  return gnuradio::get_initial_sptr(new vocoder_ulaw_encode_sb());
+}
+
+vocoder_ulaw_encode_sb::vocoder_ulaw_encode_sb()
+  : gr_sync_block("vocoder_ulaw_encode_sb",
+		  gr_make_io_signature (1, 1, sizeof(short)),
+		  gr_make_io_signature (1, 1, sizeof(unsigned char)))
+{
+}
+
+vocoder_ulaw_encode_sb::~vocoder_ulaw_encode_sb()
+{
+}
+
+int 
+vocoder_ulaw_encode_sb::work(int noutput_items,
+			     gr_vector_const_void_star &input_items,
+			     gr_vector_void_star &output_items)
+{
+  const short *in = (const short *)input_items[0];
+  unsigned char *out = (unsigned char *)output_items[0];
+  
+  for(int i = 0; i < noutput_items; i++)
+    out[i] = linear2ulaw(in[i]);
+
+  return noutput_items;
+}
diff --git a/gr-gsm-fr-vocoder/src/python/.gitignore b/gr-vocoder/python/.gitignore
index bf03975bb..bf03975bb 100644
--- a/gr-gsm-fr-vocoder/src/python/.gitignore
+++ b/gr-vocoder/python/.gitignore
diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/CMakeLists.txt
new file mode 100644
index 000000000..fff3fffbd
--- /dev/null
+++ b/gr-vocoder/python/CMakeLists.txt
@@ -0,0 +1,50 @@
+# 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.
+
+########################################################################
+# Setup python install
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    FILES
+    __init__.py
+    cvsd.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/vocoder
+    COMPONENT "vocoder_python"
+)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-vocoder/python
+        ${CMAKE_BINARY_DIR}/gr-vocoder/swig
+    )
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-vocoder)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gr-cvsd-vocoder/src/python/Makefile.am b/gr-vocoder/python/Makefile.am
index e6fd74828..4b6146ca7 100644
--- a/gr-cvsd-vocoder/src/python/Makefile.am
+++ b/gr-vocoder/python/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2009,2010 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,16 +21,22 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST += run_tests.in
-DISTCLEANFILES += run_tests
-TESTS = run_tests
+vocoderdir = $(grpythondir)/vocoder
 
+TESTS = run_tests
 
-grblkspythondir = $(grpythondir)/blks2impl
+noinst_PYTHON = \
+	qa_alaw_vocoder.py \
+	qa_codec2_vocoder.py \
+	qa_cvsd_vocoder.py \
+	qa_g721_vocoder.py \
+	qa_g723_24_vocoder.py \
+	qa_g723_40_vocoder.py \
+	qa_gsm_full_rate.py \
+	qa_ulaw_vocoder.py
 
-grblkspython_PYTHON =		\
+vocoder_PYTHON = \
+	__init__.py \
 	cvsd.py
 
-noinst_PYTHON = 			\
-	encdec.py			\
-	qa_cvsd_vocoder.py		
+EXTRA_DIST += run_tests.in
diff --git a/gnuradio-examples/python/apps/Makefile.am b/gr-vocoder/python/__init__.py
index 50fe75151..c5477b2be 100644
--- a/gnuradio-examples/python/apps/Makefile.am
+++ b/gr-vocoder/python/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -19,8 +19,10 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = hf_explorer hf_radio
-EXTRA_DIST += README
+'''
+This is the gr-vocoder package. This package includes the various
+vocoder blocks in GNU Radio.
+'''
 
+from vocoder_swig import *
+from cvsd import *
diff --git a/gr-cvsd-vocoder/src/python/cvsd.py b/gr-vocoder/python/cvsd.py
index 4defbf9a2..27b06ddeb 100644
--- a/gr-cvsd-vocoder/src/python/cvsd.py
+++ b/gr-vocoder/python/cvsd.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,9 +21,9 @@
 # 
 
 from gnuradio import gr
-from gnuradio.vocoder import cvsd_vocoder
+import vocoder_swig
 
-class cvsd_encode(gr.hier_block2):
+class cvsd_encode_fb(gr.hier_block2):
     '''
     This is a wrapper for the CVSD encoder that performs interpolation and filtering
     necessary to work with the vocoding. It converts an incoming float (+-1) to a short, scales
@@ -50,12 +50,12 @@ class cvsd_encode(gr.hier_block2):
         taps = gr.firdes.low_pass(self.interp, self.interp, bw, 2*bw)
         interp = gr.interp_fir_filter_fff(self.interp, taps)
         f2s = gr.float_to_short()
-        enc = cvsd_vocoder.encode_sb()
+        enc = vocoder_swig.cvsd_encode_sb()
 
         self.connect(self, src_scale, interp, f2s, enc, self)
 
 
-class cvsd_decode(gr.hier_block2):
+class cvsd_decode_bf(gr.hier_block2):
     '''
     This is a wrapper for the CVSD decoder that performs decimation and filtering
     necessary to work with the vocoding. It converts an incoming CVSD-encoded short to a float, decodes it
@@ -77,11 +77,10 @@ class cvsd_decode(gr.hier_block2):
         scale_factor = 32000.0
         self.decim = resample
 
-        dec = cvsd_vocoder.decode_bs()
+        dec = vocoder_swig.cvsd_decode_bs()
         s2f = gr.short_to_float()
         taps = gr.firdes.low_pass(1, 1, bw, 2*bw)
         decim = gr.fir_filter_fff(self.decim, taps)
         sink_scale = gr.multiply_const_ff(1.0/scale_factor)
 
         self.connect(self, dec, s2f, decim, sink_scale, self)
-
diff --git a/gr-usrp2/src/qa_usrp2.py b/gr-vocoder/python/qa_alaw_vocoder.py
index 33e44aeed..b7b937138 100755
--- a/gr-usrp2/src/qa_usrp2.py
+++ b/gr-vocoder/python/qa_alaw_vocoder.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2008,2010 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,20 +21,19 @@
 # 
 
 from gnuradio import gr, gr_unittest
-import usrp2_swig
+from vocoder_swig import *
 
-class test_usrp2(gr_unittest.TestCase):
+class test_alaw_vocoder (gr_unittest.TestCase):
 
-    def setUp(self):
+    def setUp (self):
         self.tb = gr.top_block()
-
-    def tearDown(self):
+        
+    def tearDown (self):
         self.tb = None
 
-    def test_000_nop (self):
-        """Just see if we can import the module...
-        They may not have a USRP2 connected, etc.  Don't try to run anything"""
-        pass
-    
+    def test001_module_load (self):
+        enc = alaw_encode_sb();
+        dec = alaw_decode_bs();
+
 if __name__ == '__main__':
-    gr_unittest.run(test_usrp2, "test_usrp2.xml")
+    gr_unittest.run(test_alaw_vocoder, "test_alaw_vocoder.xml")
diff --git a/gr-usrp/src/qa_usrp.py b/gr-vocoder/python/qa_codec2_vocoder.py
index 06e630330..699bb7dda 100755
--- a/gr-usrp/src/qa_usrp.py
+++ b/gr-vocoder/python/qa_codec2_vocoder.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2010 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,20 +21,19 @@
 # 
 
 from gnuradio import gr, gr_unittest
-import usrp_swig
+from vocoder_swig import *
 
-class test_usrp (gr_unittest.TestCase):
+class test_codec2_vocoder (gr_unittest.TestCase):
 
     def setUp (self):
-        self.tb = gr.top_block ()
-
+        self.tb = gr.top_block()
+        
     def tearDown (self):
         self.tb = None
 
-    def test_000_nop (self):
-        """Just see if we can import the module...
-        They may not have a USRP connected, etc.  Don't try to run anything"""
-        pass
+    def test001_module_load (self):
+        raw_enc = codec2_encode_sp();
+        raw_dec = codec2_decode_ps();
     
 if __name__ == '__main__':
-    gr_unittest.run(test_usrp, "test_usrp.xml")
+    gr_unittest.run(test_codec2_vocoder, "test_codec2_vocoder.xml")
diff --git a/gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py b/gr-vocoder/python/qa_cvsd_vocoder.py
index 99a38d946..53045e4a9 100755
--- a/gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py
+++ b/gr-vocoder/python/qa_cvsd_vocoder.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2007,2010 Free Software Foundation, Inc.
+# Copyright 2007,2010,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,17 +20,25 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest, blks2
-import cvsd_vocoder
+from gnuradio import gr, gr_unittest
+from vocoder_swig import *
+from cvsd import *
 
 class test_cvsd_vocoder (gr_unittest.TestCase):
 
     def setUp (self):
         self.tb = gr.top_block()
-
+        
     def tearDown (self):
         self.tb = None
 
+    def test001_module_load (self):
+        raw_enc = cvsd_encode_sb();
+        raw_dec = cvsd_decode_bs();
+        hb_enc = cvsd_encode_fb();
+        hb_dec = cvsd_decode_bf();
+
+
     """ Disable for now
     def test01(self):
         sample_rate = 8000
diff --git a/gr-vocoder/python/qa_g721_vocoder.py b/gr-vocoder/python/qa_g721_vocoder.py
new file mode 100755
index 000000000..79cc944f3
--- /dev/null
+++ b/gr-vocoder/python/qa_g721_vocoder.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+from vocoder_swig import *
+
+class test_g721_vocoder (gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block()
+        
+    def tearDown (self):
+        self.tb = None
+
+    def test001_module_load (self):
+        enc = g721_encode_sb();
+        dec = g721_decode_bs();
+
+if __name__ == '__main__':
+    gr_unittest.run(test_g721_vocoder, "test_g721_vocoder.xml")
diff --git a/gr-vocoder/python/qa_g723_24_vocoder.py b/gr-vocoder/python/qa_g723_24_vocoder.py
new file mode 100755
index 000000000..ccf215f46
--- /dev/null
+++ b/gr-vocoder/python/qa_g723_24_vocoder.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+from vocoder_swig import *
+
+class test_g723_24_vocoder (gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block()
+        
+    def tearDown (self):
+        self.tb = None
+
+    def test001_module_load (self):
+        enc = g723_24_encode_sb();
+        dec = g723_24_decode_bs();
+
+if __name__ == '__main__':
+    gr_unittest.run(test_g723_24_vocoder, "test_g723_24_vocoder.xml")
diff --git a/gr-vocoder/python/qa_g723_40_vocoder.py b/gr-vocoder/python/qa_g723_40_vocoder.py
new file mode 100755
index 000000000..9e6a52339
--- /dev/null
+++ b/gr-vocoder/python/qa_g723_40_vocoder.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+from vocoder_swig import *
+
+class test_g723_40_vocoder (gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block()
+        
+    def tearDown (self):
+        self.tb = None
+
+    def test001_module_load (self):
+        enc = g723_40_encode_sb();
+        dec = g723_40_decode_bs();
+
+if __name__ == '__main__':
+    gr_unittest.run(test_g723_40_vocoder, "test_g723_40_vocoder.xml")
diff --git a/gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py b/gr-vocoder/python/qa_gsm_full_rate.py
index 4164a1965..f9125905c 100755
--- a/gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
+++ b/gr-vocoder/python/qa_gsm_full_rate.py
@@ -21,7 +21,7 @@
 # 
 
 from gnuradio import gr, gr_unittest
-import gsm_full_rate
+import vocoder_swig
 
 class test_gsm_vocoder (gr_unittest.TestCase):
 
@@ -31,5 +31,9 @@ class test_gsm_vocoder (gr_unittest.TestCase):
     def tearDown (self):
         self.tb = None
 
+    def test001_module_load (self):
+        enc = vocoder_swig.gsm_fr_encode_sp();
+        dec = vocoder_swig.gsm_fr_decode_ps();
+
 if __name__ == '__main__':
     gr_unittest.run(test_gsm_vocoder, "test_gsm_vocoder.xml")
diff --git a/gr-vocoder/python/qa_ulaw_vocoder.py b/gr-vocoder/python/qa_ulaw_vocoder.py
new file mode 100755
index 000000000..0e201638c
--- /dev/null
+++ b/gr-vocoder/python/qa_ulaw_vocoder.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+from vocoder_swig import *
+
+class test_ulaw_vocoder (gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block()
+        
+    def tearDown (self):
+        self.tb = None
+
+    def test001_module_load (self):
+        enc = ulaw_encode_sb();
+        dec = ulaw_decode_bs();
+
+if __name__ == '__main__':
+    gr_unittest.run(test_ulaw_vocoder, "test_ulaw_vocoder.xml")
diff --git a/gr-radar-mono/src/python/run_tests.in b/gr-vocoder/python/run_tests.in
index 19b6b895c..e0c61a6b4 100644
--- a/gr-radar-mono/src/python/run_tests.in
+++ b/gr-vocoder/python/run_tests.in
@@ -5,6 +5,6 @@
 # 3rd parameter is path to Python QA directory
 
 @top_builddir@/run_tests.sh \
-    @abs_top_srcdir@/gr-sar-fe \
-    @abs_top_builddir@/gr-sar-fe \
+    @abs_top_srcdir@/gr-vocoder \
+    @abs_top_builddir@/gr-vocoder \
     @srcdir@
diff --git a/gr-radar-mono/.gitignore b/gr-vocoder/swig/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/gr-radar-mono/.gitignore
+++ b/gr-vocoder/swig/.gitignore
diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt
new file mode 100644
index 000000000..2debfef72
--- /dev/null
+++ b/gr-vocoder/swig/CMakeLists.txt
@@ -0,0 +1,62 @@
+# 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_VOCODER_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_LIBRARIES gnuradio-vocoder)
+
+GR_SWIG_MAKE(vocoder_swig vocoder_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS vocoder_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/vocoder
+    COMPONENT "vocoder_python"
+)
+
+install(
+    FILES
+    vocoder_swig.i
+    vocoder_alaw_decode_bs.i
+    vocoder_alaw_encode_sb.i
+    vocoder_codec2_decode_ps.i
+    vocoder_codec2_encode_sp.i
+    vocoder_cvsd_decode_bs.i
+    vocoder_cvsd_encode_sb.i
+    vocoder_g721_decode_bs.i
+    vocoder_g721_encode_sb.i
+    vocoder_g723_24_decode_bs.i
+    vocoder_g723_24_encode_sb.i
+    vocoder_g723_40_decode_bs.i
+    vocoder_g723_40_encode_sb.i
+    vocoder_gsm_fr_encode_sp.i
+    vocoder_gsm_fr_decode_ps.i
+    vocoder_ulaw_decode_bs.i
+    vocoder_ulaw_encode_sb.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "vocoder_swig"
+)
diff --git a/gr-vocoder/swig/Makefile.am b/gr-vocoder/swig/Makefile.am
new file mode 100644
index 000000000..500d72ec7
--- /dev/null
+++ b/gr-vocoder/swig/Makefile.am
@@ -0,0 +1,82 @@
+#
+# 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
+
+TESTS =
+EXTRA_DIST += $(nobase_guile_DATA)
+
+AM_CPPFLAGS = \
+	-I$(abs_top_srcdir)/gr-vocoder/include \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(PYTHON_CPPFLAGS) \
+	$(WITH_INCLUDES)
+
+if GUILE
+nobase_guile_DATA = \
+	gnuradio/vocoder_swig.scm
+endif
+
+noinst_GUILE  = vocoder.test
+
+
+##############################
+# SWIG interface and library
+TOP_SWIG_IFILES = \
+	vocoder_swig.i
+
+# Install so that they end up available as:
+#   import gnuradio.vocoder
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder
+vocoder_swig_pythondir_category = \
+	gnuradio/vocoder
+
+# additional libraries for linking with the SWIG-generated library
+vocoder_swig_la_swig_libadd = \
+	$(abs_top_builddir)/gr-vocoder/lib/libgnuradio-vocoder.la
+
+# additional SWIG files to be installed
+vocoder_swig_swiginclude_headers = \
+	vocoder_alaw_decode_bs.i \
+	vocoder_alaw_encode_sb.i \
+	vocoder_codec2_decode_ps.i \
+	vocoder_codec2_encode_sp.i \
+	vocoder_cvsd_decode_bs.i \
+	vocoder_cvsd_encode_sb.i \
+	vocoder_g721_decode_bs.i \
+	vocoder_g721_encode_sb.i \
+	vocoder_g723_24_decode_bs.i \
+	vocoder_g723_24_encode_sb.i \
+	vocoder_g723_40_decode_bs.i \
+	vocoder_g723_40_encode_sb.i \
+	vocoder_gsm_fr_encode_sp.i \
+	vocoder_gsm_fr_decode_ps.i \
+	vocoder_ulaw_decode_bs.i \
+	vocoder_ulaw_encode_sb.i
+
+vocoder_swig_swig_args = \
+	-I$(abs_top_builddir)/gr-vocoder/lib
+
+if GUILE
+TESTS += run_guile_tests
+endif
diff --git a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen b/gr-vocoder/swig/Makefile.swig.gen
index e23427a0f..b0d0504a8 100644
--- a/gr-cvsd-vocoder/src/lib/Makefile.swig.gen
+++ b/gr-vocoder/swig/Makefile.swig.gen
@@ -20,37 +20,37 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-# Makefile.swig.gen for cvsd_vocoder.i
+# Makefile.swig.gen for vocoder_swig.i
 
 ## Default install locations for these files:
 ##
 ## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/cvsd_vocoder
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/vocoder_swig
 ## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/cvsd_vocoder
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/vocoder_swig
 ##
 ## The following can be overloaded to change the install location, but
 ## this has to be done in the including Makefile.am -before-
 ## Makefile.swig is included.
 
-cvsd_vocoder_pythondir_category ?= gnuradio/cvsd_vocoder
-cvsd_vocoder_pylibdir_category ?= $(cvsd_vocoder_pythondir_category)
-cvsd_vocoder_pythondir = $(pythondir)/$(cvsd_vocoder_pythondir_category)
-cvsd_vocoder_pylibdir = $(pyexecdir)/$(cvsd_vocoder_pylibdir_category)
+vocoder_swig_pythondir_category ?= gnuradio/vocoder_swig
+vocoder_swig_pylibdir_category ?= $(vocoder_swig_pythondir_category)
+vocoder_swig_pythondir = $(pythondir)/$(vocoder_swig_pythondir_category)
+vocoder_swig_pylibdir = $(pyexecdir)/$(vocoder_swig_pylibdir_category)
 
 # The .so libraries for the guile modules get installed whereever guile
 # is installed, usually /usr/lib/guile/gnuradio/
 # FIXME: determince whether these should be installed with gnuradio.
-cvsd_vocoder_scmlibdir = $(libdir)
+vocoder_swig_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/cvsd_vocoder
+# is installed, usually /usr/share/guile/site/vocoder_swig
 # FIXME: determince whether these should be installed with gnuradio.
-cvsd_vocoder_scmdir = $(guiledir)
+vocoder_swig_scmdir = $(guiledir)
 
 ## SWIG headers are always installed into the same directory.
 
-cvsd_vocoder_swigincludedir = $(swigincludedir)
+vocoder_swig_swigincludedir = $(swigincludedir)
 
 ## This is a template file for a "generated" Makefile addition (in
 ## this case, "Makefile.swig.gen").  By including the top-level
@@ -75,70 +75,70 @@ MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
 
-cvsd_vocoder_swiginclude_HEADERS =		\
-	cvsd_vocoder.i			\
-	$(cvsd_vocoder_swiginclude_headers)
+vocoder_swig_swiginclude_HEADERS =		\
+	vocoder_swig.i			\
+	$(vocoder_swig_swiginclude_headers)
 
 if PYTHON
-cvsd_vocoder_pylib_LTLIBRARIES =		\
-	_cvsd_vocoder.la
+vocoder_swig_pylib_LTLIBRARIES =		\
+	_vocoder_swig.la
 
-_cvsd_vocoder_la_SOURCES = 			\
-	python/cvsd_vocoder.cc		\
-	$(cvsd_vocoder_la_swig_sources)
+_vocoder_swig_la_SOURCES = 			\
+	python/vocoder_swig.cc		\
+	$(vocoder_swig_la_swig_sources)
 
-cvsd_vocoder_python_PYTHON =			\
-	cvsd_vocoder.py			\
-	$(cvsd_vocoder_python)
+vocoder_swig_python_PYTHON =			\
+	vocoder_swig.py			\
+	$(vocoder_swig_python)
 
-_cvsd_vocoder_la_LIBADD =			\
+_vocoder_swig_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
-	$(cvsd_vocoder_la_swig_libadd)
+	$(vocoder_swig_la_swig_libadd)
 
-_cvsd_vocoder_la_LDFLAGS =			\
+_vocoder_swig_la_LDFLAGS =			\
 	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(cvsd_vocoder_la_swig_ldflags)
+	$(vocoder_swig_la_swig_ldflags)
 
-_cvsd_vocoder_la_CXXFLAGS =			\
+_vocoder_swig_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
-	$(cvsd_vocoder_la_swig_cxxflags)
+	$(vocoder_swig_la_swig_cxxflags)
 
-python/cvsd_vocoder.cc: cvsd_vocoder.py
-cvsd_vocoder.py: cvsd_vocoder.i
+python/vocoder_swig.cc: vocoder_swig.py
+vocoder_swig.py: vocoder_swig.i 
 
 # Include the python dependencies for this file
--include python/cvsd_vocoder.d
+-include python/vocoder_swig.d
 
 endif		# end of if python
 
 if GUILE
 
-cvsd_vocoder_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-cvsd_vocoder.la
-libguile_gnuradio_cvsd_vocoder_la_SOURCES =	\
-	guile/cvsd_vocoder.cc			\
-	$(cvsd_vocoder_la_swig_sources)
-nobase_cvsd_vocoder_scm_DATA = 		\
-	gnuradio/cvsd_vocoder.scm 		\
-	gnuradio/cvsd_vocoder-primitive.scm
-libguile_gnuradio_cvsd_vocoder_la_LIBADD = 	\
+vocoder_swig_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-vocoder_swig.la
+libguile_gnuradio_vocoder_swig_la_SOURCES =	\
+	guile/vocoder_swig.cc			\
+	$(vocoder_swig_la_swig_sources)
+nobase_vocoder_swig_scm_DATA = 		\
+	gnuradio/vocoder_swig.scm 		\
+	gnuradio/vocoder_swig-primitive.scm
+libguile_gnuradio_vocoder_swig_la_LIBADD = 	\
 	$(STD_SWIG_LA_LIB_ADD)		\
-	$(cvsd_vocoder_la_swig_libadd)
-libguile_gnuradio_cvsd_vocoder_la_LDFLAGS = 	\
+	$(vocoder_swig_la_swig_libadd)
+libguile_gnuradio_vocoder_swig_la_LDFLAGS = 	\
 	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(cvsd_vocoder_la_swig_ldflags)
-libguile_gnuradio_cvsd_vocoder_la_CXXFLAGS = 	\
+	$(vocoder_swig_la_swig_ldflags)
+libguile_gnuradio_vocoder_swig_la_CXXFLAGS = 	\
 	$(STD_SWIG_CXX_FLAGS)		\
 	-I$(top_builddir) 		\
-	$(cvsd_vocoder_la_swig_cxxflags)
+	$(vocoder_swig_la_swig_cxxflags)
 
-guile/cvsd_vocoder.cc: gnuradio/cvsd_vocoder.scm
-gnuradio/cvsd_vocoder.scm: cvsd_vocoder.i
-gnuradio/cvsd_vocoder-primitive.scm: gnuradio/cvsd_vocoder.scm
+guile/vocoder_swig.cc: gnuradio/vocoder_swig.scm
+gnuradio/vocoder_swig.scm: vocoder_swig.i
+gnuradio/vocoder_swig-primitive.scm: gnuradio/vocoder_swig.scm
 
 # Include the guile dependencies for this file
--include guile/cvsd_vocoder.d
+-include guile/vocoder_swig.d
 
 endif				# end of GUILE
 
diff --git a/gr-usrp2/src/run_guile_tests.in b/gr-vocoder/swig/run_guile_tests.in
index 5d08b0dd5..5d08b0dd5 100644
--- a/gr-usrp2/src/run_guile_tests.in
+++ b/gr-vocoder/swig/run_guile_tests.in
diff --git a/gr-vocoder/swig/vocoder_alaw_decode_bs.i b/gr-vocoder/swig/vocoder_alaw_decode_bs.i
new file mode 100644
index 000000000..f789c454f
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_alaw_decode_bs.i
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_alaw_decode_bs.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,alaw_decode_bs);
+
+vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs();
+
+class vocoder_alaw_decode_bs : public gr_sync_block
+{
+private:
+  vocoder_alaw_decode_bs();
+};
diff --git a/gr-vocoder/swig/vocoder_alaw_encode_sb.i b/gr-vocoder/swig/vocoder_alaw_encode_sb.i
new file mode 100644
index 000000000..9fe537d55
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_alaw_encode_sb.i
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_alaw_encode_sb.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,alaw_encode_sb);
+
+vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb();
+
+class vocoder_alaw_encode_sb : public gr_sync_block
+{
+private:
+  vocoder_alaw_encode_sb();
+};
diff --git a/gr-vocoder/swig/vocoder_codec2_decode_ps.i b/gr-vocoder/swig/vocoder_codec2_decode_ps.i
new file mode 100644
index 000000000..e53cb078a
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_codec2_decode_ps.i
@@ -0,0 +1,34 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_codec2_decode_ps.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,codec2_decode_ps);
+
+vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps ();
+
+class vocoder_codec2_decode_ps : public gr_sync_interpolator {
+public:
+  ~vocoder_codec2_decode_ps ();
+};
diff --git a/usrp/host/lib/std_paths.h.in b/gr-vocoder/swig/vocoder_codec2_encode_sp.i
index e09499e0b..84f26954d 100644
--- a/usrp/host/lib/std_paths.h.in
+++ b/gr-vocoder/swig/vocoder_codec2_encode_sp.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,8 +20,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-static const char *std_paths[] = {
-  "@prefix@/share/usrp",
-  "/usr/local/share/usrp",
-  0
+%{
+#include "vocoder_codec2_encode_sp.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,codec2_encode_sp);
+
+vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp ();
+
+class vocoder_codec2_encode_sp : public gr_sync_decimator {
+public:
+  ~vocoder_codec2_encode_sp ();
 };
diff --git a/gr-usrp/src/usrp_source_c.i b/gr-vocoder/swig/vocoder_cvsd_decode_bs.i
index 499f7f740..e990f5440 100644
--- a/gr-usrp/src/usrp_source_c.i
+++ b/gr-vocoder/swig/vocoder_cvsd_decode_bs.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2007,2009,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,28 +21,24 @@
  */
 
 %{
-#include "usrp_source_c.h"
+#include "vocoder_cvsd_decode_bs.h"
 %}
 
-GR_SWIG_BLOCK_MAGIC(usrp,source_c)
+GR_SWIG_BLOCK_MAGIC(vocoder,cvsd_decode_bs);
 
-class usrp_source_c;
-typedef boost::shared_ptr<usrp_source_c> usrp_source_c_sptr;
+vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step=10,
+							 short max_step=1280,
+							 double step_decay=0.9990234375,
+							 double accum_decay= 0.96875,
+							 int K=32,
+							 int J=4,
+							 short pos_accum_max=32767,
+							 short neg_accum_max=-32767);
 
-usrp_source_c_sptr
-usrp_make_source_c(int which=0,
-		   unsigned int decim_rate=16,
-		   int nchan=1,
-		   int mux=-1,
-		   int mode=0,
-		   int fusb_block_size=0,
-		   int fusb_nblocks=0,
-		   const std::string fpga_filename="",
-		   const std::string firmware_filename=""
-		   ) throw (std::runtime_error);
-
-class usrp_source_c : public usrp_source_base 
+class vocoder_cvsd_decode_bs : public gr_sync_interpolator
 {
 private:
-  usrp_source_c() throw (std::runtime_error);
+  vocoder_cvsd_decode_bs (short min_step, short max_step, double step_decay,
+			  double accum_decay, int K, int J,
+			  short pos_accum_max, short neg_accum_max);
 };
diff --git a/gr-usrp/src/usrp_source_s.i b/gr-vocoder/swig/vocoder_cvsd_encode_sb.i
index d8b285c99..5db7b3a48 100644
--- a/gr-usrp/src/usrp_source_s.i
+++ b/gr-vocoder/swig/vocoder_cvsd_encode_sb.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2007,2009,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -21,28 +21,24 @@
  */
 
 %{
-#include "usrp_source_s.h"
+#include "vocoder_cvsd_encode_sb.h"
 %}
 
-GR_SWIG_BLOCK_MAGIC(usrp,source_s)
+GR_SWIG_BLOCK_MAGIC(vocoder,cvsd_encode_sb);
 
-class usrp_source_s;
-typedef boost::shared_ptr<usrp_source_s> usrp_source_s_sptr;
+vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb (short min_step=10,
+							 short max_step=1280,
+							 double step_decay=0.9990234375,
+							 double accum_decay= 0.96875,
+							 int K=32,
+							 int J=4,
+							 short pos_accum_max=32767,
+							 short neg_accum_max=-32767);
 
-usrp_source_s_sptr
-usrp_make_source_s(int which=0,
-		   unsigned int decim_rate=16,
-		   int nchan=1,
-		   int mux=-1,
-		   int mode=0,
-		   int fusb_block_size=0,
-		   int fusb_nblocks=0,
-		   const std::string fpga_filename="",
-		   const std::string firmware_filename=""
-		   ) throw (std::runtime_error);
-
-class usrp_source_s : public usrp_source_base 
+class vocoder_cvsd_encode_sb : public gr_sync_decimator
 {
 private:
-  usrp_source_s() throw (std::runtime_error);
+  vocoder_cvsd_encode_sb (short min_step, short max_step, double step_decay,
+			  double accum_decay, int K, int J,
+			  short pos_accum_max, short neg_accum_max);
 };
diff --git a/usrp/host/lib/usrp_config.cc b/gr-vocoder/swig/vocoder_g721_decode_bs.i
index fcf207f68..47e7d2861 100644
--- a/usrp/host/lib/usrp_config.cc
+++ b/gr-vocoder/swig/vocoder_g721_decode_bs.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,16 +20,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "usrp_config.h"
+%{
+#include "vocoder_g721_decode_bs.h"
+%}
 
-int
-usrp_rx_config_stream_count (unsigned int usrp_rx_config)
-{
-  return 1;
-}
+GR_SWIG_BLOCK_MAGIC(vocoder,g721_decode_bs);
+
+vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs();
 
-int
-usrp_tx_config_stream_count (unsigned int usrp_tx_config)
+class vocoder_g721_decode_bs : public gr_sync_block
 {
-  return 1;
-}
+};
diff --git a/gr-vocoder/swig/vocoder_g721_encode_sb.i b/gr-vocoder/swig/vocoder_g721_encode_sb.i
new file mode 100644
index 000000000..0675087a0
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_g721_encode_sb.i
@@ -0,0 +1,33 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_g721_encode_sb.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,g721_encode_sb);
+
+vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb();
+
+class vocoder_g721_encode_sb : public gr_sync_block
+{
+};
diff --git a/gr-vocoder/swig/vocoder_g723_24_decode_bs.i b/gr-vocoder/swig/vocoder_g723_24_decode_bs.i
new file mode 100644
index 000000000..41548059f
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_g723_24_decode_bs.i
@@ -0,0 +1,33 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_g723_24_decode_bs.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,g723_24_decode_bs);
+
+vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs();
+
+class vocoder_g723_24_decode_bs : public gr_sync_block
+{
+};
diff --git a/gr-vocoder/swig/vocoder_g723_24_encode_sb.i b/gr-vocoder/swig/vocoder_g723_24_encode_sb.i
new file mode 100644
index 000000000..7165a8a82
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_g723_24_encode_sb.i
@@ -0,0 +1,33 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_g723_24_encode_sb.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,g723_24_encode_sb);
+
+vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb();
+
+class vocoder_g723_24_encode_sb : public gr_sync_block
+{
+};
diff --git a/gr-vocoder/swig/vocoder_g723_40_decode_bs.i b/gr-vocoder/swig/vocoder_g723_40_decode_bs.i
new file mode 100644
index 000000000..d9ec9d6c9
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_g723_40_decode_bs.i
@@ -0,0 +1,33 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_g723_40_decode_bs.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,g723_40_decode_bs);
+
+vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs();
+
+class vocoder_g723_40_decode_bs : public gr_sync_block
+{
+};
diff --git a/gr-vocoder/swig/vocoder_g723_40_encode_sb.i b/gr-vocoder/swig/vocoder_g723_40_encode_sb.i
new file mode 100644
index 000000000..839ae46cf
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_g723_40_encode_sb.i
@@ -0,0 +1,33 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_g723_40_encode_sb.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,g723_40_encode_sb);
+
+vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb();
+
+class vocoder_g723_40_encode_sb : public gr_sync_block
+{
+};
diff --git a/gr-vocoder/swig/vocoder_gsm_fr_decode_ps.i b/gr-vocoder/swig/vocoder_gsm_fr_decode_ps.i
new file mode 100644
index 000000000..8e96689f6
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_gsm_fr_decode_ps.i
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_gsm_fr_decode_ps.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,gsm_fr_decode_ps);
+
+vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps();
+
+class vocoder_gsm_fr_decode_ps : public gr_sync_interpolator 
+{
+public:
+  ~vocoder_gsm_fr_decode_ps();
+};
diff --git a/gr-vocoder/swig/vocoder_gsm_fr_encode_sp.i b/gr-vocoder/swig/vocoder_gsm_fr_encode_sp.i
new file mode 100644
index 000000000..8216336a9
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_gsm_fr_encode_sp.i
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_gsm_fr_encode_sp.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,gsm_fr_encode_sp);
+
+vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp();
+
+class vocoder_gsm_fr_encode_sp : public gr_sync_decimator 
+{
+public:
+  ~vocoder_gsm_fr_encode_sp();
+};
diff --git a/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i b/gr-vocoder/swig/vocoder_swig.i
index 20bf8fdea..71a2952dd 100644
--- a/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i
+++ b/gr-vocoder/swig/vocoder_swig.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005,2009 Free Software Foundation, Inc.
+ * Copyright 2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -22,34 +22,26 @@
 
 %include "gnuradio.i"
 
-%{
-#include "gsm_fr_encode_sp.h"
-#include "gsm_fr_decode_ps.h"
-%}
-
-GR_SWIG_BLOCK_MAGIC(gsm_fr,encode_sp);
-
-gsm_fr_encode_sp_sptr gsm_fr_make_encode_sp ();
-
-class gsm_fr_encode_sp : public gr_sync_decimator {
-public:
-  ~gsm_fr_encode_sp ();
-};
-
-// ----------------------------------------------------------------
-
-GR_SWIG_BLOCK_MAGIC(gsm_fr,decode_ps);
-
-gsm_fr_decode_ps_sptr gsm_fr_make_decode_ps ();
-
-class gsm_fr_decode_ps : public gr_sync_interpolator {
-public:
-  ~gsm_fr_decode_ps ();
-};
+%include "vocoder_alaw_decode_bs.i"
+%include "vocoder_alaw_encode_sb.i"
+%include "vocoder_codec2_decode_ps.i"
+%include "vocoder_codec2_encode_sp.i"
+%include "vocoder_cvsd_decode_bs.i"
+%include "vocoder_cvsd_encode_sb.i"
+%include "vocoder_g721_decode_bs.i"
+%include "vocoder_g721_encode_sb.i"
+%include "vocoder_g723_24_decode_bs.i"
+%include "vocoder_g723_24_encode_sb.i"
+%include "vocoder_g723_40_decode_bs.i"
+%include "vocoder_g723_40_encode_sb.i"
+%include "vocoder_gsm_fr_decode_ps.i"
+%include "vocoder_gsm_fr_encode_sp.i"
+%include "vocoder_ulaw_decode_bs.i"
+%include "vocoder_ulaw_encode_sb.i"
 
 #if SWIGGUILE
 %scheme %{
-(load-extension-global "libguile-gnuradio-gsm_full_rate" "scm_init_gnuradio_gsm_full_rate_module")
+(load-extension-global "libguile-gnuradio-vocoder" "scm_init_gnuradio_gsm_vocoder_module")
 %}
 
 %goops %{
diff --git a/gr-vocoder/swig/vocoder_ulaw_decode_bs.i b/gr-vocoder/swig/vocoder_ulaw_decode_bs.i
new file mode 100644
index 000000000..5e8e8c9ae
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_ulaw_decode_bs.i
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_ulaw_decode_bs.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,ulaw_decode_bs);
+
+vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs();
+
+class vocoder_ulaw_decode_bs : public gr_sync_block
+{
+private:
+  vocoder_ulaw_decode_bs();
+};
diff --git a/gr-vocoder/swig/vocoder_ulaw_encode_sb.i b/gr-vocoder/swig/vocoder_ulaw_encode_sb.i
new file mode 100644
index 000000000..1665df480
--- /dev/null
+++ b/gr-vocoder/swig/vocoder_ulaw_encode_sb.i
@@ -0,0 +1,35 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+%{
+#include "vocoder_ulaw_encode_sb.h"
+%}
+
+GR_SWIG_BLOCK_MAGIC(vocoder,ulaw_encode_sb);
+
+vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb();
+
+class vocoder_ulaw_encode_sb : public gr_sync_block
+{
+private:
+  vocoder_ulaw_encode_sb();
+};
diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt
new file mode 100644
index 000000000..7afae785a
--- /dev/null
+++ b/gr-wxgui/CMakeLists.txt
@@ -0,0 +1,89 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrPython)
+
+GR_PYTHON_CHECK_MODULE("wx >= 2.8"  wx           "wx.version().split()[0] >= '2.8'"    WX_FOUND)
+GR_PYTHON_CHECK_MODULE("numpy"      numpy        True                                  NUMPY_FOUND)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+if(NOT CMAKE_CROSSCOMPILING)
+    set(wxgui_python_deps
+        NUMPY_FOUND
+        WX_FOUND
+    )
+endif(NOT CMAKE_CROSSCOMPILING)
+
+GR_REGISTER_COMPONENT("gr-wxgui" ENABLE_GR_WXGUI
+    ENABLE_GR_CORE
+    ENABLE_PYTHON
+    ${wxgui_python_deps}
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GR_WXGUI)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_COMPONENT("wxgui"
+    DISPLAY_NAME "WxGUI"
+    DESCRIPTION  "Wx GUI plotter widgets and grc wrappers"
+    DEPENDS      "core_python"
+)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "wxgui"
+)
+
+########################################################################
+# Install the conf file
+########################################################################
+install(
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf
+    DESTINATION ${GR_PKG_CONF_DIR}
+    COMPONENT "wxgui"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(grc)
+add_subdirectory(src/python)
+
+endif(ENABLE_GR_WXGUI)
diff --git a/gr-wxgui/grc/CMakeLists.txt b/gr-wxgui/grc/CMakeLists.txt
new file mode 100644
index 000000000..49e3da3b1
--- /dev/null
+++ b/gr-wxgui/grc/CMakeLists.txt
@@ -0,0 +1,36 @@
+# 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.
+
+########################################################################
+file(GLOB xml_files "*.xml")
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "wxgui")
+
+########################################################################
+#The wxgui module contains a top_block + wxgui frame.
+########################################################################
+include(GrPython)
+
+GR_PYTHON_INSTALL(
+    FILES
+    __init__.py
+    panel.py
+    top_block_gui.py
+    DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/wxgui
+    COMPONENT "wxgui"
+)
diff --git a/gr-wxgui/grc/wxgui_constellationsink2.xml b/gr-wxgui/grc/wxgui_constellationsink2.xml
index c200790f9..f9df9d4ac 100644
--- a/gr-wxgui/grc/wxgui_constellationsink2.xml
+++ b/gr-wxgui/grc/wxgui_constellationsink2.xml
@@ -18,7 +18,7 @@ constsink_gl.const_sink_c(
 	const_size=$const_size,
 	M=$M,
 	theta=$theta,
-	alpha=$alpha,
+	loop_bw=$loop_bw,
 	fmax=$fmax,
 	mu=$mu,
 	gain_mu=$gain_mu,
@@ -71,9 +71,9 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
 		<type>real</type>
 	</param>
 	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<value>0.005</value>
+		<name>Loop Bandwidth</name>
+		<key>loop_bw</key>
+		<value>6.28/100.0</value>
 		<type>real</type>
 	</param>
 	<param>
diff --git a/gr-wxgui/src/python/CMakeLists.txt b/gr-wxgui/src/python/CMakeLists.txt
new file mode 100644
index 000000000..24e06acd5
--- /dev/null
+++ b/gr-wxgui/src/python/CMakeLists.txt
@@ -0,0 +1,88 @@
+# 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.
+
+########################################################################
+include(GrPython)
+
+########################################################################
+# Install python files into wxgui module
+########################################################################
+GR_PYTHON_INSTALL(
+    FILES
+    __init__.py
+    common.py
+    constants.py
+    constsink_gl.py
+    const_window.py
+    form.py
+    fftsink2.py
+    fftsink_nongl.py
+    fftsink_gl.py
+    fft_window.py
+    gui.py
+    histosink_gl.py
+    histo_window.py
+    numbersink2.py
+    number_window.py
+    plot.py
+    powermate.py
+    pubsub.py
+    scopesink2.py
+    scopesink_nongl.py
+    scopesink_gl.py
+    scope_window.py
+    termsink.py
+    waterfallsink2.py
+    waterfallsink_nongl.py
+    waterfallsink_gl.py
+    waterfall_window.py
+    slider.py
+    stdgui2.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui
+    COMPONENT "wxgui"
+)
+
+########################################################################
+# Install python files into wxgui forms sub-module
+########################################################################
+GR_PYTHON_INSTALL(
+    FILES
+    forms/__init__.py
+    forms/forms.py
+    forms/converters.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui/forms
+    COMPONENT "wxgui"
+)
+
+########################################################################
+# Install python files into wxgui plotter sub-module
+########################################################################
+GR_PYTHON_INSTALL(
+    FILES
+    plotter/__init__.py
+    plotter/bar_plotter.py
+    plotter/channel_plotter.py
+    plotter/common.py
+    plotter/gltext.py
+    plotter/grid_plotter_base.py
+    plotter/plotter_base.py
+    plotter/waterfall_plotter.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/wxgui/plotter
+    COMPONENT "wxgui"
+)
diff --git a/gr-wxgui/src/python/const_window.py b/gr-wxgui/src/python/const_window.py
index f7c7caf07..2ad89b2a3 100644
--- a/gr-wxgui/src/python/const_window.py
+++ b/gr-wxgui/src/python/const_window.py
@@ -36,7 +36,7 @@ import forms
 # Constants
 ##################################################
 SLIDER_STEPS = 200
-ALPHA_MIN_EXP, ALPHA_MAX_EXP = -6, -0.301
+LOOP_BW_MIN_EXP, LOOP_BW_MAX_EXP = -6, 0.0
 GAIN_MU_MIN_EXP, GAIN_MU_MAX_EXP = -6, -0.301
 DEFAULT_FRAME_RATE = gr.prefs().get_long('wxgui', 'const_rate', 5)
 DEFAULT_WIN_SIZE = (500, 400)
@@ -70,19 +70,19 @@ class control_panel(wx.Panel):
 			parent=self, label='Options',
 			bold=True, orient=wx.VERTICAL,
 		)
-		#alpha
+		#loop_bw
 		control_box.AddStretchSpacer()
 		forms.text_box(
-			sizer=control_box, parent=self, label='Alpha',
+			sizer=control_box, parent=self, label='Loop Bandwidth',
 			converter=forms.float_converter(),
-			ps=parent, key=ALPHA_KEY,
+			ps=parent, key=LOOP_BW_KEY,
 		)
 		forms.log_slider(
 			sizer=control_box, parent=self,
-			min_exp=ALPHA_MIN_EXP,
-			max_exp=ALPHA_MAX_EXP,
+			min_exp=LOOP_BW_MIN_EXP,
+			max_exp=LOOP_BW_MAX_EXP,
 			num_steps=SLIDER_STEPS,
-			ps=parent, key=ALPHA_KEY,
+			ps=parent, key=LOOP_BW_KEY,
 		)
 		#gain_mu
 		control_box.AddStretchSpacer()
@@ -127,8 +127,7 @@ class const_window(wx.Panel, pubsub.pubsub):
 		size,
 		title,
 		msg_key,
-		alpha_key,
-		beta_key,
+		loop_bw_key,
 		gain_mu_key,
 		gain_omega_key,
 		omega_key,
@@ -137,8 +136,7 @@ class const_window(wx.Panel, pubsub.pubsub):
 		pubsub.pubsub.__init__(self)
 		#proxy the keys
 		self.proxy(MSG_KEY, controller, msg_key)
-		self.proxy(ALPHA_KEY, controller, alpha_key)
-		self.proxy(BETA_KEY, controller, beta_key)
+		self.proxy(LOOP_BW_KEY, controller, loop_bw_key)
 		self.proxy(GAIN_MU_KEY, controller, gain_mu_key)
 		self.proxy(GAIN_OMEGA_KEY, controller, gain_omega_key)
 		self.proxy(OMEGA_KEY, controller, omega_key)
@@ -164,8 +162,6 @@ class const_window(wx.Panel, pubsub.pubsub):
 		main_box.Add(self.control_panel, 0, wx.EXPAND)
 		self.SetSizerAndFit(main_box)
 		#alpha and gain mu 2nd orders
-		def set_beta(alpha): self[BETA_KEY] = .25*alpha**2
-		self.subscribe(ALPHA_KEY, set_beta)
 		def set_gain_omega(gain_mu): self[GAIN_OMEGA_KEY] = .25*gain_mu**2
 		self.subscribe(GAIN_MU_KEY, set_gain_omega)
 		#register events
diff --git a/gr-wxgui/src/python/constants.py b/gr-wxgui/src/python/constants.py
index 070be0808..08cc6a634 100644
--- a/gr-wxgui/src/python/constants.py
+++ b/gr-wxgui/src/python/constants.py
@@ -73,3 +73,4 @@ NUM_BINS_KEY = 'num_bins'
 FRAME_SIZE_KEY = 'frame_size'
 CHANNEL_OPTIONS_KEY = 'channel_options'
 SHOW_CONTROL_PANEL_KEY = 'show_control_panel'
+LOOP_BW_KEY = 'loop_bw'
diff --git a/gr-wxgui/src/python/constsink_gl.py b/gr-wxgui/src/python/constsink_gl.py
index 91bc65d9f..51434df68 100644
--- a/gr-wxgui/src/python/constsink_gl.py
+++ b/gr-wxgui/src/python/constsink_gl.py
@@ -27,6 +27,12 @@ import common
 from gnuradio import gr, blks2
 from pubsub import pubsub
 from constants import *
+import sys
+try:
+	from gnuradio import digital
+except ImportError:
+	sys.stderr.write("Error: could not import gnuradio.digital, please install gr-digitial.\n")
+	sys.exit(1)
 
 ##################################################
 # Constellation sink block (wrapper for old wxgui)
@@ -47,7 +53,7 @@ class const_sink_c(gr.hier_block2, common.wxgui_hb):
 		#mpsk recv params
 		M=4,
 		theta=0,
-		alpha=0.005,
+		loop_bw=6.28/100.0,
 		fmax=0.06,
 		mu=0.5,
 		gain_mu=0.005,
@@ -68,16 +74,18 @@ class const_sink_c(gr.hier_block2, common.wxgui_hb):
 			vec_rate=frame_rate,
 			vec_len=const_size,
 		)
-		beta = .25*alpha**2 #redundant, will be updated
 		fmin = -fmax
 		gain_omega = .25*gain_mu**2 #redundant, will be updated
 		omega = 1 #set_sample_rate will update this
 		# Costas frequency/phase recovery loop
 		# Critically damped 2nd order PLL
-		self._costas = gr.costas_loop_cc(alpha, beta, fmax, fmin, M)
+		self._costas = digital.costas_loop_cc(loop_bw, M)
 		# Timing recovery loop
 		# Critically damped 2nd order DLL
-		self._retime = gr.clock_recovery_mm_cc(omega, gain_omega, mu, gain_mu, omega_limit)
+		self._retime = digital.clock_recovery_mm_cc(omega,
+							    gain_omega,
+							    mu, gain_mu,
+							    omega_limit)
 		#sync = gr.mpsk_receiver_cc(
 		#	M, #psk order
 		#	theta,
@@ -97,10 +105,8 @@ class const_sink_c(gr.hier_block2, common.wxgui_hb):
 		#controller
 		def setter(p, k, x): p[k] = x
 		self.controller = pubsub()
-		self.controller.subscribe(ALPHA_KEY, self._costas.set_alpha)
-		self.controller.publish(ALPHA_KEY, self._costas.alpha)
-		self.controller.subscribe(BETA_KEY, self._costas.set_beta)
-		self.controller.publish(BETA_KEY, self._costas.beta)
+		self.controller.subscribe(LOOP_BW_KEY, self._costas.set_loop_bandwidth)
+		self.controller.publish(LOOP_BW_KEY, self._costas.get_loop_bandwidth)
 		self.controller.subscribe(GAIN_MU_KEY, self._retime.set_gain_mu)
 		self.controller.publish(GAIN_MU_KEY, self._retime.gain_mu)
 		self.controller.subscribe(OMEGA_KEY, self._retime.set_omega)
@@ -121,8 +127,7 @@ class const_sink_c(gr.hier_block2, common.wxgui_hb):
 			size=size,
 			title=title,
 			msg_key=MSG_KEY,
-			alpha_key=ALPHA_KEY,
-			beta_key=BETA_KEY,
+			loop_bw_key=LOOP_BW_KEY,
 			gain_mu_key=GAIN_MU_KEY,
 			gain_omega_key=GAIN_OMEGA_KEY,
 			omega_key=OMEGA_KEY,
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
new file mode 100644
index 000000000..2d108ab4d
--- /dev/null
+++ b/grc/CMakeLists.txt
@@ -0,0 +1,128 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrPython)
+
+GR_PYTHON_CHECK_MODULE("python >= 2.5"     sys          "sys.version.split()[0] >= '2.5'"           PYTHON_MIN_VER_FOUND)
+GR_PYTHON_CHECK_MODULE("Cheetah >= 2.0.0"  Cheetah      "Cheetah.Version >= '2.0.0'"                CHEETAH_FOUND)
+GR_PYTHON_CHECK_MODULE("lxml >= 1.3.6"     lxml.etree   "lxml.etree.LXML_VERSION >= (1, 3, 6, 0)"   LXML_FOUND)
+GR_PYTHON_CHECK_MODULE("pygtk >= 2.10.0"   gtk          "gtk.pygtk_version >= (2, 10, 0)"           PYGTK_FOUND)
+GR_PYTHON_CHECK_MODULE("numpy"             numpy        True                                        NUMPY_FOUND)
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+if(NOT CMAKE_CROSSCOMPILING)
+    set(grc_python_deps
+        PYTHON_MIN_VER_FOUND
+        CHEETAH_FOUND
+        LXML_FOUND
+        PYGTK_FOUND
+        NUMPY_FOUND
+    )
+endif(NOT CMAKE_CROSSCOMPILING)
+
+GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC
+    ENABLE_GR_CORE
+    ENABLE_PYTHON
+    ${grc_python_deps}
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GRC)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_COMPONENT("grc"
+    DISPLAY_NAME "GNU Radio Companion"
+    DESCRIPTION  "Graphical flow graph designer"
+    DEPENDS      "core_python"
+)
+
+########################################################################
+# Create and install the grc conf file
+########################################################################
+file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GR_PKG_DOC_DIR} docdir)
+file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir)
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/grc.conf.in
+    ${CMAKE_CURRENT_BINARY_DIR}/grc.conf
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf
+    DESTINATION ${GR_PKG_CONF_DIR}
+    COMPONENT "grc"
+)
+
+GR_PYTHON_INSTALL(
+    FILES __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc
+    COMPONENT "grc"
+)
+
+########################################################################
+# Appens NSIS commands to set environment variables
+########################################################################
+if(WIN32)
+
+file(TO_NATIVE_PATH ${GR_PKG_DOC_DIR} GR_DOC_DIR)
+string(REPLACE "\\" "\\\\" GR_DOC_DIR ${GR_DOC_DIR})
+
+file(TO_NATIVE_PATH ${GRC_BLOCKS_DIR} GRC_BLOCKS_PATH)
+string(REPLACE "\\" "\\\\" GRC_BLOCKS_PATH ${GRC_BLOCKS_PATH})
+
+file(TO_NATIVE_PATH ${GR_PYTHON_DIR} GR_PYTHON_POSTFIX)
+string(REPLACE "\\" "\\\\" GR_PYTHON_POSTFIX ${GR_PYTHON_POSTFIX})
+
+CPACK_SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
+    WriteRegStr HKLM ${HLKM_ENV} \\\"GR_DOC_DIR\\\" \\\"$INSTDIR\\\\${GR_DOC_DIR}\\\"
+    WriteRegStr HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\" \\\"$INSTDIR\\\\${GRC_BLOCKS_PATH}\\\"
+    WriteRegStr HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\" \\\"$INSTDIR\\\\${GR_PYTHON_POSTFIX}\\\"
+")
+
+CPACK_SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}
+    DeleteRegValue HKLM ${HLKM_ENV} \\\"GR_DOC_DIR\\\"
+    DeleteRegValue HKLM ${HLKM_ENV} \\\"GRC_BLOCKS_PATH\\\"
+    DeleteRegValue HKLM \\\"SOFTWARE\\\\Python\\\\PythonCore\\\\2.7\\\\PythonPath\\\" \\\"gnuradio\\\"
+")
+
+endif(WIN32)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(base)
+add_subdirectory(blocks)
+add_subdirectory(freedesktop)
+add_subdirectory(grc_gnuradio)
+add_subdirectory(gui)
+add_subdirectory(python)
+add_subdirectory(scripts)
+
+endif(ENABLE_GRC)
diff --git a/grc/base/CMakeLists.txt b/grc/base/CMakeLists.txt
new file mode 100644
index 000000000..c6d6a09eb
--- /dev/null
+++ b/grc/base/CMakeLists.txt
@@ -0,0 +1,42 @@
+# 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.
+
+########################################################################
+GR_PYTHON_INSTALL(FILES
+    odict.py
+    ParseXML.py
+    Block.py
+    Connection.py
+    Constants.py
+    Element.py
+    FlowGraph.py
+    Param.py
+    Platform.py
+    Port.py
+    __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/base
+    COMPONENT "grc"
+)
+
+install(FILES
+    block_tree.dtd
+    flow_graph.dtd
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/base
+    COMPONENT "grc"
+)
diff --git a/grc/blocks/CMakeLists.txt b/grc/blocks/CMakeLists.txt
new file mode 100644
index 000000000..ad31b0975
--- /dev/null
+++ b/grc/blocks/CMakeLists.txt
@@ -0,0 +1,22 @@
+# 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.
+
+########################################################################
+file(GLOB xml_files "*.xml")
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "grc")
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 1ca4bb848..f326285e5 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -30,10 +30,6 @@ dist_ourdata_DATA = \
 	blks2_analysis_filterbank.xml \
 	blks2_cvsd_encode.xml \
 	blks2_cvsd_decode.xml \
-	blks2_dxpsk_demod.xml \
-	blks2_dxpsk_mod.xml \
-	blks2_dxpsk2_demod.xml \
-	blks2_dxpsk2_mod.xml \
 	blks2_error_rate.xml \
 	blks2_fm_deemph.xml \
 	blks2_fm_demod_cf.xml \
@@ -43,8 +39,6 @@ dist_ourdata_DATA = \
 	blks2_logpwrfft_x.xml \
 	blks2_nbfm_rx.xml \
 	blks2_nbfm_tx.xml \
-	blks2_ofdm_demod.xml \
-	blks2_ofdm_mod.xml \
 	blks2_packet_decoder.xml \
 	blks2_packet_encoder.xml \
 	blks2_pfb_arb_resampler.xml \
@@ -71,12 +65,9 @@ dist_ourdata_DATA = \
 	gr_and_xx.xml \
 	gr_and_const_xx.xml \
 	gr_argmax_xx.xml \
-	gr_binary_slicer_fb.xml \
 	gr_channel_model.xml \
 	gr_char_to_float.xml \
 	gr_chunks_to_symbols.xml \
-	gr_clock_recovery_mm_xx.xml \
-	gr_cma_equalizer_cc.xml \
 	gr_complex_to_arg.xml \
 	gr_complex_to_float.xml \
 	gr_complex_to_imag.xml \
@@ -85,13 +76,11 @@ dist_ourdata_DATA = \
 	gr_complex_to_mag_squared.xml \
 	gr_complex_to_real.xml \
 	gr_conjugate_cc.xml \
-	gr_constellation_decoder_cb.xml \
 	gr_copy.xml \
-	gr_correlate_access_code_bb.xml \
-	gr_costas_loop_cc.xml \
 	gr_cpfsk_bc.xml \
 	gr_ctcss_squelch_ff.xml \
 	gr_dc_blocker.xml \
+	gr_cpmmod_bc.xml \
 	gr_decode_ccsds_27_fb.xml \
 	gr_deinterleave.xml \
 	gr_delay.xml \
@@ -109,7 +98,6 @@ dist_ourdata_DATA = \
 	gr_file_source.xml \
 	gr_filter_delay_fc.xml \
 	gr_fir_filter_xxx.xml \
-	gr_fll_band_edge_cc.xml \
 	gr_float_to_char.xml \
 	gr_float_to_complex.xml \
 	gr_float_to_short.xml \
@@ -118,6 +106,7 @@ dist_ourdata_DATA = \
 	gr_freq_xlating_fir_filter_xxx.xml \
 	gr_frequency_modulator_fc.xml \
 	gr_glfsr_source_x.xml \
+	gr_gmskmod_bc.xml \
 	gr_goertzel_fc.xml \
 	gr_head.xml \
 	gr_hilbert_fc.xml \
@@ -135,7 +124,6 @@ dist_ourdata_DATA = \
 	gr_message_sink.xml \
 	gr_message_source.xml \
 	gr_moving_average_xx.xml \
-	gr_mpsk_receiver_cc.xml \
 	gr_mpsk_sync_cc.xml \
 	gr_multiply_const_vxx.xml \
 	gr_multiply_xx.xml \
diff --git a/grc/blocks/blks2_dxpsk2_mod.xml b/grc/blocks/blks2_dxpsk2_mod.xml
deleted file mode 100644
index bf292be17..000000000
--- a/grc/blocks/blks2_dxpsk2_mod.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##DPSK2 Mod - 2, 4
-###################################################
- -->
-<block>
-	<name>DPSK2 Mod</name>
-	<key>blks2_dxpsk2_mod</key>
-	<import>from gnuradio import blks2</import>
-	<make>blks2.$(type)2_mod(
-	samples_per_symbol=$samples_per_symbol,
-	excess_bw=$excess_bw,
-	gray_code=$gray_code,
-	verbose=$verbose,
-	log=$log,
-)</make>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>DBPSK</name>
-			<key>dbpsk</key>
-		</option>
-		<option>
-			<name>DQPSK</name>
-			<key>dqpsk</key>
-		</option>
-	</param>
-	<param>
-		<name>Samples/Symbol</name>
-		<key>samples_per_symbol</key>
-		<value>2</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Excess BW</name>
-		<key>excess_bw</key>
-		<value>0.35</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Gray Code</name>
-		<key>gray_code</key>
-		<value>True</value>
-		<type>bool</type>
-		<option>
-			<name>Yes</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>No</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Verbose</name>
-		<key>verbose</key>
-		<value>False</value>
-		<type>bool</type>
-		<hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide>
-		<option>
-			<name>On</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>Off</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Logging</name>
-		<key>log</key>
-		<value>False</value>
-		<type>bool</type>
-		<hide>#if str($log) == 'False' then 'part' else 'none'#</hide>
-		<option>
-			<name>On</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>Off</name>
-			<key>False</key>
-		</option>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>byte</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-</block>
diff --git a/grc/blocks/blks2_dxpsk_demod.xml b/grc/blocks/blks2_dxpsk_demod.xml
deleted file mode 100644
index 1c96b6cec..000000000
--- a/grc/blocks/blks2_dxpsk_demod.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##DPSK Demod - 2, 4, 8
-###################################################
- -->
-<block>
-	<name>DPSK Demod</name>
-	<key>blks2_dxpsk_demod</key>
-	<import>from gnuradio import blks2</import>
-	<make>blks2.$(type)_demod(
-	samples_per_symbol=$samples_per_symbol,
-	excess_bw=$excess_bw,
-	costas_alpha=$costas_alpha,
-	gain_mu=$gain_mu,
-	mu=$mu,
-	omega_relative_limit=$omega_relative_limit,
-	gray_code=$gray_code,
-	verbose=$verbose,
-	log=$log,
-)</make>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>DBPSK</name>
-			<key>dbpsk</key>
-		</option>
-		<option>
-			<name>DQPSK</name>
-			<key>dqpsk</key>
-		</option>
-		<option>
-			<name>D8PSK</name>
-			<key>d8psk</key>
-		</option>
-	</param>
-	<param>
-		<name>Samples/Symbol</name>
-		<key>samples_per_symbol</key>
-		<value>2</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Excess BW</name>
-		<key>excess_bw</key>
-		<value>0.35</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Costas Alpha</name>
-		<key>costas_alpha</key>
-		<value>0.175</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Gain Mu</name>
-		<key>gain_mu</key>
-		<value>0.175</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Mu</name>
-		<key>mu</key>
-		<value>0.5</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Omega Relative Limit</name>
-		<key>omega_relative_limit</key>
-		<value>0.005</value>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Gray Code</name>
-		<key>gray_code</key>
-		<value>True</value>
-		<type>bool</type>
-		<option>
-			<name>Yes</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>No</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Verbose</name>
-		<key>verbose</key>
-		<value>False</value>
-		<type>bool</type>
-		<hide>#if str($verbose) == 'False' then 'part' else 'none'#</hide>
-		<option>
-			<name>On</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>Off</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Logging</name>
-		<key>log</key>
-		<value>False</value>
-		<type>bool</type>
-		<hide>#if str($log) == 'False' then 'part' else 'none'#</hide>
-		<option>
-			<name>On</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>Off</name>
-			<key>False</key>
-		</option>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>byte</type>
-	</source>
-</block>
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 4b864690c..91afc506c 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -110,26 +110,19 @@
 		<block>gr_unpacked_to_packed_xx</block>
 		<block>gr_packed_to_unpacked_xx</block>
 		<block>gr_unpack_k_bits_bb</block>
-		<block>gr_binary_slicer_fb</block>
 		<block>gr_chunks_to_symbols_xx</block>
 		<block>gr_map_bb</block>
 	</cat>
 	<cat>
 		<name>Synchronizers</name>
-		<block>gr_clock_recovery_mm_xx</block>
 		<block>gr_pfb_clock_sync_xxx</block>
 
-		<block>gr_costas_loop_cc</block>
 		<block>gr_mpsk_sync_cc</block>
-		<block>gr_mpsk_receiver_cc</block>
 
 		<block>gr_pll_carriertracking_cc</block>
 		<block>gr_pll_freqdet_cf</block>
 		<block>gr_pll_refout_cc</block>
 
-		<block>gr_fll_band_edge_cc</block>
-
-		<block>gr_correlate_access_code_bb</block>
 		<block>gr_pn_correlator_cc</block>
 		<block>gr_simple_correlator</block>
 		<block>gr_simple_framer</block>
@@ -182,7 +175,6 @@
 		<block>gr_single_pole_iir_filter_xx</block>
 		<block>gr_hilbert_fc</block>
 		<block>gr_goertzel_fc</block>
-		<block>gr_cma_equalizer_cc</block>
 		<block>gr_rational_resampler_base_xxx</block>
 		<block>blks2_rational_resampler_xxx</block>
 		<block>gr_fractional_interpolator_xx</block>
@@ -198,9 +190,10 @@
 		<block>gr_phase_modulator_fc</block>
 		<block>gr_quadrature_demod_cf</block>
 		<block>gr_cpfsk_bc</block>
+		<block>gr_cpmmod_bc</block>
+		<block>gr_gmskmod_bc</block>
 
 		<block>gr_diff_phasor_cc</block>
-		<block>gr_constellation_decoder_cb</block>
 
 		<block>gr_diff_encoder_bb</block>
 		<block>gr_diff_decoder_bb</block>
@@ -217,20 +210,11 @@
 		<block>blks2_fm_deemph</block>
 		<block>blks2_fm_preemph</block>
 
-		<block>blks2_dxpsk_mod</block>
-		<block>blks2_dxpsk_demod</block>
-
-		<block>blks2_dxpsk2_mod</block>
-		<block>blks2_dxpsk2_demod</block>
-
 		<block>blks2_gmsk_mod</block>
 		<block>blks2_gmsk_demod</block>
 
 		<block>blks2_qamx_mod</block>
 		<block>blks2_qamx_demod</block>
-
-		<block>blks2_ofdm_mod</block>
-		<block>blks2_ofdm_demod</block>
 	</cat>
 	<cat>
 		<name>Error Correction</name>
diff --git a/grc/blocks/gr_costas_loop_cc.xml b/grc/blocks/gr_costas_loop_cc.xml
deleted file mode 100644
index e0db8bc5d..000000000
--- a/grc/blocks/gr_costas_loop_cc.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Costas Loop
-###################################################
- -->
-<block>
-	<name>Costas Loop</name>
-	<key>gr_costas_loop_cc</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.costas_loop_cc($alpha, $beta, $max_freq, $min_freq, $order)</make>
-	<callback>set_alpha($alpha)</callback>
-	<callback>set_beta($beta)</callback>
-	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Max Freq</name>
-		<key>max_freq</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Min Freq</name>
-		<key>min_freq</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Order</name>
-		<key>order</key>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-		<optional>1</optional>
-	</source>
-</block>
diff --git a/grc/blocks/gr_cpmmod_bc.xml b/grc/blocks/gr_cpmmod_bc.xml
new file mode 100644
index 000000000..da405534e
--- /dev/null
+++ b/grc/blocks/gr_cpmmod_bc.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## Continuous Phase Modulation
+###################################################
+ -->
+<block>
+	<name>Continuous Phase Modulation</name>
+	<key>gr_cpmmod_bc</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.cpmmod_bc($type, $mod_index, $samples_per_symbol, $L, $beta)</make>
+	<param>
+		<name>CPM Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>L-REC (Rectangular phase response)</name>
+			<key>gr.cpm.LREC</key>
+		</option>
+		<option>
+			<name>L-RC (Raised Cosine)</name>
+			<key>gr.cpm.LRC</key>
+		</option>
+		<option>
+			<name>L-SRC (Spectral raised cosine)</name>
+			<key>gr.cpm.LSRC</key>
+		</option>
+		<option>
+			<name>TFM (Tamed frequency modulation)</name>
+			<key>gr.cpm.TFM</key>
+		</option>
+		<option>
+			<name>Gaussian</name>
+			<key>gr.cpm.GAUSSIAN</key>
+		</option>
+	</param>
+	<param>
+		<name>Modulation Index</name>
+		<key>mod_index</key>
+		<value>0.5</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Samples/Symbol</name>
+		<key>samples_per_symbol</key>
+		<value>4</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Pulse Duration (Symbols)</name>
+		<key>L</key>
+		<value>4</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Phase Response Parameter (BT or Beta)</name>
+		<key>beta</key>
+		<value>0.3</value>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+</block>
diff --git a/grc/blocks/gr_dc_blocker.xml b/grc/blocks/gr_dc_blocker.xml
index e5aeeb031..05c342074 100644
--- a/grc/blocks/gr_dc_blocker.xml
+++ b/grc/blocks/gr_dc_blocker.xml
@@ -9,7 +9,7 @@
 	<key>gr_dc_blocker</key>
 	<import>from gnuradio import gr</import>
 	<make>gr.dc_blocker_$(type)($length, $long_form)</make>
-	<!-- <callback>set_length($lenght)</callback> -->
+	<!-- <callback>set_length($length)</callback> -->
 	<param>
 		<name>Type</name>
 		<key>type</key>
diff --git a/grc/blocks/gr_gmskmod_bc.xml b/grc/blocks/gr_gmskmod_bc.xml
new file mode 100644
index 000000000..82e47452b
--- /dev/null
+++ b/grc/blocks/gr_gmskmod_bc.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## GMSK
+###################################################
+ -->
+<block>
+	<name>GMSK Modulator</name>
+	<key>gr_gmskmod_bc</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.gmskmod_bc($samples_per_symbol, $bt, $L)</make>
+	<param>
+		<name>Samples/Symbol</name>
+		<key>samples_per_symbol</key>
+		<value>2</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>3 dB Time-Bandwith Product</name>
+		<key>bt</key>
+		<value>0.3</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Pulse Duration (Symbols)</name>
+		<key>L</key>
+		<value>4</value>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+</block>
diff --git a/grc/blocks/gr_pfb_clock_sync.xml b/grc/blocks/gr_pfb_clock_sync.xml
index 26cacfb3e..3e5e65d12 100644
--- a/grc/blocks/gr_pfb_clock_sync.xml
+++ b/grc/blocks/gr_pfb_clock_sync.xml
@@ -8,7 +8,7 @@
 	<name>Polyphase Clock Sync</name>
 	<key>gr_pfb_clock_sync_xxx</key>
 	<import>from gnuradio import gr</import>
-	<make>gr.pfb_clock_sync_$(type)($sps, $alpha, $taps, $filter_size, $init_phase, $max_dev)
+	<make>gr.pfb_clock_sync_$(type)($sps, $alpha, $taps, $filter_size, $init_phase, $max_dev, $osps)
 self.$(id).set_beta($beta)</make>
 	<callback>set_taps($taps)</callback>
 	<callback>set_alpha($alpha)</callback>
@@ -69,6 +69,11 @@ self.$(id).set_beta($beta)</make>
 		<key>max_dev</key>
 		<type>real</type>
 	</param>
+	<param>
+		<name>Output SPS</name>
+		<key>osps</key>
+		<type>int</type>
+	</param>
 	<sink>
 		<name>in</name>
 		<type>$type.input</type>
diff --git a/grc/blocks/gr_pll_carriertracking_cc.xml b/grc/blocks/gr_pll_carriertracking_cc.xml
index 5b876b259..27e673248 100644
--- a/grc/blocks/gr_pll_carriertracking_cc.xml
+++ b/grc/blocks/gr_pll_carriertracking_cc.xml
@@ -8,15 +8,11 @@
 	<name>PLL Carrier Tracking</name>
 	<key>gr_pll_carriertracking_cc</key>
 	<import>from gnuradio import gr</import>
-	<make>gr.pll_carriertracking_cc($alpha, $beta, $max_freq, $min_freq)</make>
+	<make>gr.pll_carriertracking_cc($w, $max_freq, $min_freq)</make>
+	<callback>set_loop_bandwidth($w)</callback>
 	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
+		<name>Loop Bandwidth</name>
+		<key>w</key>
 		<type>real</type>
 	</param>
 	<param>
diff --git a/grc/blocks/gr_pll_freqdet_cf.xml b/grc/blocks/gr_pll_freqdet_cf.xml
index 8ec1fb3bb..d6e4694f0 100644
--- a/grc/blocks/gr_pll_freqdet_cf.xml
+++ b/grc/blocks/gr_pll_freqdet_cf.xml
@@ -8,15 +8,11 @@
 	<name>PLL Freq Det</name>
 	<key>gr_pll_freqdet_cf</key>
 	<import>from gnuradio import gr</import>
-	<make>gr.pll_freqdet_cf($alpha, $beta, $max_freq, $min_freq)</make>
+	<make>gr.pll_freqdet_cf($w, $max_freq, $min_freq)</make>
+	<callback>set_loop_bandwidth($w)</callback>
 	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
+		<name>Loop Bandwidth</name>
+		<key>w</key>
 		<type>real</type>
 	</param>
 	<param>
diff --git a/grc/blocks/gr_pll_refout_cc.xml b/grc/blocks/gr_pll_refout_cc.xml
index 64cf2bfb6..b231ddd19 100644
--- a/grc/blocks/gr_pll_refout_cc.xml
+++ b/grc/blocks/gr_pll_refout_cc.xml
@@ -8,15 +8,11 @@
 	<name>PLL Ref Out</name>
 	<key>gr_pll_refout_cc</key>
 	<import>from gnuradio import gr</import>
-	<make>gr.pll_refout_cc($alpha, $beta, $max_freq, $min_freq)</make>
+	<make>gr.pll_refout_cc($w, $max_freq, $min_freq)</make>
+	<callback>set_loop_bandwidth($w)</callback>
 	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
+		<name>Loop Bandwidth</name>
+		<key>w</key>
 		<type>real</type>
 	</param>
 	<param>
diff --git a/grc/blocks/gr_throttle.xml b/grc/blocks/gr_throttle.xml
index ab8506f55..dc825f167 100644
--- a/grc/blocks/gr_throttle.xml
+++ b/grc/blocks/gr_throttle.xml
@@ -7,6 +7,7 @@
 <block>
 	<name>Throttle</name>
 	<key>gr_throttle</key>
+	<throttle>1</throttle>
 	<import>from gnuradio import gr</import>
 	<make>gr.throttle($type.size*$vlen, $samples_per_second)</make>
 	<param>
diff --git a/grc/freedesktop/CMakeLists.txt b/grc/freedesktop/CMakeLists.txt
new file mode 100644
index 000000000..8c0f53d9f
--- /dev/null
+++ b/grc/freedesktop/CMakeLists.txt
@@ -0,0 +1,47 @@
+# 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.
+
+########################################################################
+set(grc_freedesktop_path ${GR_PKG_DATA_DIR}/grc/freedesktop)
+
+install(FILES
+    grc-icon-256.png
+    grc-icon-128.png
+    grc-icon-64.png
+    grc-icon-48.png
+    grc-icon-32.png
+    gnuradio-grc.xml
+    gnuradio-grc.desktop
+    DESTINATION ${grc_freedesktop_path}
+    COMPONENT "grc"
+)
+
+find_program(HAVE_XDG_UTILS xdg-desktop-menu)
+
+if(UNIX AND HAVE_XDG_UTILS)
+    set(SRCDIR ${CMAKE_INSTALL_PREFIX}/${grc_freedesktop_path})
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/grc_setup_freedesktop.in
+        ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop
+    @ONLY)
+    install(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop
+        DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "grc"
+    )
+endif(UNIX AND HAVE_XDG_UTILS)
diff --git a/grc/grc_gnuradio/CMakeLists.txt b/grc/grc_gnuradio/CMakeLists.txt
new file mode 100644
index 000000000..e992a60a3
--- /dev/null
+++ b/grc/grc_gnuradio/CMakeLists.txt
@@ -0,0 +1,35 @@
+# 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.
+
+########################################################################
+GR_PYTHON_INSTALL(
+    FILES __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio
+    COMPONENT "grc"
+)
+
+GR_PYTHON_INSTALL(FILES
+    blks2/__init__.py
+    blks2/error_rate.py
+    blks2/packet.py
+    blks2/selector.py
+    blks2/tcp.py
+    DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/blks2
+    COMPONENT "grc"
+)
diff --git a/grc/grc_gnuradio/README b/grc/grc_gnuradio/README
index 5a89da54a..897eed65c 100644
--- a/grc/grc_gnuradio/README
+++ b/grc/grc_gnuradio/README
@@ -7,8 +7,5 @@ The blk2s module wraps many blocks in blks2 and gives them streaming outputs.
 Will be phased-out by new message passing implementations.
 Other blks2 blocks will hopefully make their way into blks2impl.
 
-The usrp module contains the simple and dual usrp wrappers.
-Will be phased-out by generic usrp and/or new usrp api.
-
 The wxgui module contains a top_block + wxgui frame.
 Will be phased-out by gui.py in wxgui and a new top block template.
diff --git a/grc/gui/CMakeLists.txt b/grc/gui/CMakeLists.txt
new file mode 100644
index 000000000..c2eb16e9f
--- /dev/null
+++ b/grc/gui/CMakeLists.txt
@@ -0,0 +1,48 @@
+# 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.
+
+########################################################################
+GR_PYTHON_INSTALL(FILES
+    Block.py
+    Colors.py
+    Constants.py
+    Connection.py
+    Element.py
+    FlowGraph.py
+    Param.py
+    Platform.py
+    Port.py
+    Utils.py
+    ActionHandler.py
+    Actions.py
+    Bars.py
+    BlockTreeWindow.py
+    Dialogs.py
+    DrawingArea.py
+    FileDialogs.py
+    MainWindow.py
+    Messages.py
+    NotebookPage.py
+    PropsDialog.py
+    Preferences.py
+    StateCache.py
+    __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/gui
+    COMPONENT "grc"
+)
diff --git a/grc/python/Block.py b/grc/python/Block.py
index 4baf36dc6..967a27ce9 100644
--- a/grc/python/Block.py
+++ b/grc/python/Block.py
@@ -46,6 +46,7 @@ class Block(_Block, _GUIBlock):
 		self._var_make = n.find('var_make')
 		self._checks = n.findall('check')
 		self._callbacks = n.findall('callback')
+		self._throttle = n.find('throttle') or ''
 		#build the block
 		_Block.__init__(
 			self,
@@ -54,6 +55,8 @@ class Block(_Block, _GUIBlock):
 		)
 		_GUIBlock.__init__(self)
 
+	def throttle(self): return bool(self._throttle)
+
 	def validate(self):
 		"""
 		Validate this block.
diff --git a/grc/python/CMakeLists.txt b/grc/python/CMakeLists.txt
new file mode 100644
index 000000000..2075d126d
--- /dev/null
+++ b/grc/python/CMakeLists.txt
@@ -0,0 +1,45 @@
+# 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.
+
+########################################################################
+GR_PYTHON_INSTALL(FILES
+    convert_hier.py
+    expr_utils.py
+    extract_category.py
+    extract_docs.py
+    Block.py
+    Connection.py
+    Constants.py
+    FlowGraph.py
+    Generator.py
+    Param.py
+    Platform.py
+    Port.py
+    __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/python
+    COMPONENT "grc"
+)
+
+install(FILES
+    block.dtd
+    default_flow_graph.grc
+    flow_graph.tmpl
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/python
+    COMPONENT "grc"
+)
diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index 2a2dfdd49..2a6fe51d5 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -57,8 +57,8 @@ class Generator(object):
 
 	def write(self):
 		#do throttle warning
-		all_keys = ' '.join(map(lambda b: b.get_key(), self._flow_graph.get_enabled_blocks()))
-		if ('usrp' not in all_keys) and ('uhd' not in all_keys) and ('audio' not in all_keys) and ('throttle' not in all_keys) and self._generate_options != 'hb':
+		throttled = any(map(lambda b: b.throttle(), self._flow_graph.get_enabled_blocks()))
+		if not throttled and self._generate_options != 'hb':
 			Messages.send_warning('''\
 This flow graph may not have flow control: no audio or usrp blocks found. \
 Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''')
diff --git a/grc/python/block.dtd b/grc/python/block.dtd
index 7c6c39811..41a744d07 100644
--- a/grc/python/block.dtd
+++ b/grc/python/block.dtd
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 	Top level element.
 	A block contains a name, ...parameters list, and list of IO ports.
  -->
-<!ELEMENT block (name, key, category?, import*, var_make?, make, callback*, param*, check*, sink*, source*, doc?)>
+<!ELEMENT block (name, key, category?, throttle?, import*, var_make?, make, callback*, param*, check*, sink*, source*, doc?)>
 <!--
 	Sub level elements.
  -->
@@ -53,3 +53,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 <!ELEMENT value (#PCDATA)>
 <!ELEMENT callback (#PCDATA)>
 <!ELEMENT optional (#PCDATA)>
+<!ELEMENT throttle (#PCDATA)>
diff --git a/grc/python/extract_docs.py b/grc/python/extract_docs.py
index aa85397f9..fe157a221 100644
--- a/grc/python/extract_docs.py
+++ b/grc/python/extract_docs.py
@@ -26,6 +26,8 @@ DOXYGEN_NAME_XPATH = '/doxygen/compounddef/compoundname'
 DOXYGEN_BRIEFDESC_GR_XPATH = '/doxygen/compounddef/briefdescription'
 DOXYGEN_DETAILDESC_GR_XPATH = '/doxygen/compounddef/detaileddescription'
 
+GROUP_KEYS = "gr|trellis|noaa|vocoder|digital"
+
 def extract_txt(xml):
 	"""
 	Recursivly pull the text out of an xml tree.
@@ -63,7 +65,7 @@ def _extract(key):
 			#extract descriptions
 			comp_name = extract_txt(xml.xpath(DOXYGEN_NAME_XPATH)[0]).strip()
 			comp_name = '   ---   ' + comp_name + '   ---   '
-			if re.match('(gr|usrp2|trellis|noaa)_.*', key):
+			if re.match(('(%s)_.*' % GROUP_KEYS), key):
 				brief_desc = extract_txt(xml.xpath(DOXYGEN_BRIEFDESC_GR_XPATH)[0]).strip()
 				detailed_desc = extract_txt(xml.xpath(DOXYGEN_DETAILDESC_GR_XPATH)[0]).strip()
 			else:
diff --git a/grc/scripts/CMakeLists.txt b/grc/scripts/CMakeLists.txt
new file mode 100644
index 000000000..b8d5330f6
--- /dev/null
+++ b/grc/scripts/CMakeLists.txt
@@ -0,0 +1,25 @@
+# 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.
+
+########################################################################
+GR_PYTHON_INSTALL(
+    PROGRAMS gnuradio-companion
+    DESTINATION ${GR_RUNTIME_DIR}
+    COMPONENT "grc"
+)
diff --git a/grc/todo.txt b/grc/todo.txt
index 9dad05730..ccfaad72a 100644
--- a/grc/todo.txt
+++ b/grc/todo.txt
@@ -9,19 +9,14 @@
 ##################################################
 * probe: also non-float outputs
 * log slider gui control
-* generic usrp (when its ready)
 * packet mod: whitening offset
 * wx min window size in options block
 * gr_adaptive_fir_ccf
 * ofdm  
   * gr_ofdm_bpsk_demapper
-  * gr_ofdm_cyclic_prefixer
   * gr_ofdm_demapper_vcb
-  * gr_ofdm_frame_acquisition
   * gr_ofdm_frame_sink
-  * gr_ofdm_insert_preamble
   * gr_ofdm_mapper_bcv
-  * gr_ofdm_sampler
 * size params for the graphical sinks
 * callbacks for set average on fft, waterfall, number sinks
 * add units to params: Sps, Hz, dB...
diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt
new file mode 100644
index 000000000..b33217c14
--- /dev/null
+++ b/gruel/CMakeLists.txt
@@ -0,0 +1,105 @@
+# Copyright 2010-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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+include(GrBoost)
+
+include(GrPython) #used for code generation
+
+########################################################################
+# Register component
+########################################################################
+include(GrComponent)
+GR_REGISTER_COMPONENT("gruel" ENABLE_GRUEL
+    Boost_FOUND
+    PYTHONINTERP_FOUND
+)
+
+include(GrMiscUtils)
+GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS
+    ${Boost_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/include
+    ${CMAKE_CURRENT_BINARY_DIR}/src/include
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+if(ENABLE_GRUEL)
+
+########################################################################
+# Setup CPack components
+########################################################################
+include(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_GRUEL_DESCRIPTION "GNU Radio Utility Etcetera Library")
+
+CPACK_COMPONENT("gruel_runtime"
+    GROUP        "Gruel"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Dynamic link libraries"
+)
+
+CPACK_COMPONENT("gruel_devel"
+    GROUP        "Gruel"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+)
+
+CPACK_COMPONENT("gruel_python"
+    GROUP        "Gruel"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime"
+    DEPENDS     "gruel_runtime"
+)
+
+CPACK_COMPONENT("gruel_swig"
+    GROUP        "Gruel"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS     "gruel_python;gruel_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+add_subdirectory(src/include/gruel)
+add_subdirectory(src/scheme/gnuradio)
+add_subdirectory(src/lib)
+if(ENABLE_PYTHON)
+    add_subdirectory(src/swig)
+    add_subdirectory(src/python)
+endif(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gruel.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gruel.pc
+@ONLY)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gruel.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "gruel_devel"
+)
+
+endif(ENABLE_GRUEL)
diff --git a/gruel/README b/gruel/README
index 585cf026a..647dc843b 100644
--- a/gruel/README
+++ b/gruel/README
@@ -22,9 +22,8 @@
 The GNU Radio Utility Etcetera Library, a collection of low-level routines
 to avoid dependencies on the full GNU Radio core or other libraries.
 
-Over time, some code from libgnuradio-core, libpmt, libmblock, libusrp,
-and libusrp2 will migrate here, to avoid duplication of code and simplify
-dependencies.
+Over time, some code from libgnuradio-core and libpmt will migrate
+here, to avoid duplication of code and simplify dependencies.
 
 By design, this library will not have dependencies on any other part
 of GNU Radio, but may have external dependencies such as Boost.
diff --git a/gruel/src/include/gruel/CMakeLists.txt b/gruel/src/include/gruel/CMakeLists.txt
new file mode 100644
index 000000000..811856b98
--- /dev/null
+++ b/gruel/src/include/gruel/CMakeLists.txt
@@ -0,0 +1,56 @@
+# Copyright 2010-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.
+
+########################################################################
+# Generate inet.h header file
+########################################################################
+include(TestBigEndian)
+enable_language(C)
+TEST_BIG_ENDIAN(GR_ARCH_BIGENDIAN)
+
+include(CheckIncludeFileCXX)
+CHECK_INCLUDE_FILE_CXX(byteswap.h GR_HAVE_BYTESWAP)
+CHECK_INCLUDE_FILE_CXX(arpa/inet.h GR_HAVE_ARPA_INET)
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/inet.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/inet.h
+@ONLY)
+
+########################################################################
+# Install the headers
+########################################################################
+install(FILES
+    api.h
+    attributes.h
+    high_res_timer.h
+    ${CMAKE_CURRENT_BINARY_DIR}/inet.h
+    msg_accepter.h
+    msg_accepter_msgq.h
+    msg_queue.h
+    msg_passing.h
+    pmt.h
+    pmt_pool.h
+    pmt_sugar.h
+    realtime.h
+    sys_pri.h
+    thread_body_wrapper.h
+    thread_group.h
+    thread.h
+DESTINATION ${GR_INCLUDE_DIR}/gruel COMPONENT "gruel_devel")
diff --git a/gruel/src/include/gruel/Makefile.am b/gruel/src/include/gruel/Makefile.am
index 96aed326e..fce739f08 100644
--- a/gruel/src/include/gruel/Makefile.am
+++ b/gruel/src/include/gruel/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST += inet.h.in
 gruelincludedir = $(prefix)/include/gruel
 
 gruelinclude_HEADERS = \
+	api.h \
 	attributes.h \
 	high_res_timer.h \
 	inet.h \
diff --git a/usrp/firmware/src/common/fpga.h b/gruel/src/include/gruel/api.h
index 6cd5de8e2..945814d43 100644
--- a/usrp/firmware/src/common/fpga.h
+++ b/gruel/src/include/gruel/api.h
@@ -1,31 +1,33 @@
-/* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
- * 
+ * Copyright 2010 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_FPGA_H
-#define INCLUDED_FPGA_H
 
-#include "fpga_load.h"
+#ifndef INCLUDED_GRUEL_API_H
+#define INCLUDED_GRUEL_API_H
 
-#if defined(HAVE_USRP2)
-#include "fpga_rev2.h"
+#include <gruel/attributes.h>
+
+#ifdef gruel_EXPORTS
+#  define GRUEL_API __GR_ATTR_EXPORT
+#else
+#  define GRUEL_API __GR_ATTR_IMPORT
 #endif
 
-#endif /* INCLUDED_FPGA_H */
+#endif /* INCLUDED_GRUEL_API_H */
diff --git a/gruel/src/include/gruel/attributes.h b/gruel/src/include/gruel/attributes.h
index fdf48c977..baa5521c8 100644
--- a/gruel/src/include/gruel/attributes.h
+++ b/gruel/src/include/gruel/attributes.h
@@ -53,4 +53,22 @@
 #  define __GR_ATTR_IMPORT
 #endif
 
+////////////////////////////////////////////////////////////////////////
+// define inline when building C
+////////////////////////////////////////////////////////////////////////
+#if defined(_MSC_VER) && !defined(__cplusplus) && !defined(inline)
+#  define inline __inline
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// suppress warnings
+////////////////////////////////////////////////////////////////////////
+#ifdef _MSC_VER
+#  pragma warning(disable: 4251) // class 'A<T>' needs to have dll-interface to be used by clients of class 'B'
+#  pragma warning(disable: 4275) // non dll-interface class ... used as base for dll-interface class ...
+#  pragma warning(disable: 4244) // conversion from 'double' to 'float', possible loss of data
+#  pragma warning(disable: 4305) // 'initializing' : truncation from 'double' to 'float'
+#  pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+#endif
+
 #endif /* INCLUDED_GRUEL_ATTRIBUTES_H */
diff --git a/gruel/src/include/gruel/inet.h.in b/gruel/src/include/gruel/inet.h.in
index 7ac01eb56..8545aeea9 100644
--- a/gruel/src/include/gruel/inet.h.in
+++ b/gruel/src/include/gruel/inet.h.in
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_INET_H
 #define INCLUDED_INET_H
 
+#include <gruel/api.h>
 #include <stdint.h>
 
 #if 1 /* missing htonll or ntohll */
diff --git a/gruel/src/include/gruel/msg_accepter.h b/gruel/src/include/gruel/msg_accepter.h
index 70ac846f5..3dfc8bcf8 100644
--- a/gruel/src/include/gruel/msg_accepter.h
+++ b/gruel/src/include/gruel/msg_accepter.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_GRUEL_MSG_ACCEPTER_H
 #define INCLUDED_GRUEL_MSG_ACCEPTER_H
 
+#include <gruel/api.h>
 #include <gruel/pmt.h>
 #include <boost/shared_ptr.hpp>
 
@@ -29,7 +30,7 @@ namespace gruel {
   /*!
    * \brief Virtual base class that accepts messages
    */
-  class msg_accepter
+  class GRUEL_API msg_accepter
   {
   public:
     msg_accepter() {};
diff --git a/gruel/src/include/gruel/msg_accepter_msgq.h b/gruel/src/include/gruel/msg_accepter_msgq.h
index bf1762e92..22a1855cf 100644
--- a/gruel/src/include/gruel/msg_accepter_msgq.h
+++ b/gruel/src/include/gruel/msg_accepter_msgq.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_MSG_ACCEPTER_MSGQ_H
 #define INCLUDED_MSG_ACCEPTER_MSGQ_H
 
+#include <gruel/api.h>
 #include <gruel/msg_accepter.h>
 #include <gruel/msg_queue.h>
 
@@ -30,7 +31,7 @@ namespace gruel {
   /*!
    * \brief Concrete class that accepts messages and inserts them into a message queue.
    */
-  class msg_accepter_msgq : public msg_accepter 
+  class GRUEL_API msg_accepter_msgq : public msg_accepter
   {
   protected:
     msg_queue_sptr d_msg_queue;
diff --git a/gruel/src/include/gruel/msg_passing.h b/gruel/src/include/gruel/msg_passing.h
index ebbeca815..51268967a 100644
--- a/gruel/src/include/gruel/msg_passing.h
+++ b/gruel/src/include/gruel/msg_passing.h
@@ -25,6 +25,7 @@
  * \brief Include this header to use the message passing features
  */
 
+#include <gruel/api.h>
 #include <gruel/pmt.h>
 #include <gruel/msg_accepter.h>
 
diff --git a/gruel/src/include/gruel/msg_queue.h b/gruel/src/include/gruel/msg_queue.h
index c24313df6..8608842da 100644
--- a/gruel/src/include/gruel/msg_queue.h
+++ b/gruel/src/include/gruel/msg_queue.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_MSG_QUEUE_H
 #define INCLUDED_MSG_QUEUE_H
 
+#include <gruel/api.h>
 #include <gruel/thread.h>
 #include <gruel/pmt.h>
 #include <deque>
@@ -36,7 +37,7 @@ namespace gruel {
   /*!
    * \brief thread-safe message queue
    */
-  class msg_queue {
+  class GRUEL_API msg_queue {
 
     gruel::mutex              d_mutex;
     gruel::condition_variable d_not_empty;
diff --git a/gruel/src/include/gruel/pmt.h b/gruel/src/include/gruel/pmt.h
index 2948abb39..58533e54e 100644
--- a/gruel/src/include/gruel/pmt.h
+++ b/gruel/src/include/gruel/pmt.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_PMT_H
 #define INCLUDED_PMT_H
 
+#include <gruel/api.h>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/any.hpp>
@@ -57,28 +58,28 @@ class pmt_base;
  */
 typedef boost::intrusive_ptr<pmt_base> pmt_t;
 
-extern void intrusive_ptr_add_ref(pmt_base*);
-extern void intrusive_ptr_release(pmt_base*);
+extern GRUEL_API void intrusive_ptr_add_ref(pmt_base*);
+extern GRUEL_API void intrusive_ptr_release(pmt_base*);
 
-class pmt_exception : public std::logic_error
+class GRUEL_API pmt_exception : public std::logic_error
 {
 public:
   pmt_exception(const std::string &msg, pmt_t obj);
 };
 
-class pmt_wrong_type : public pmt_exception
+class GRUEL_API pmt_wrong_type : public pmt_exception
 {
 public:
   pmt_wrong_type(const std::string &msg, pmt_t obj);
 };
 
-class pmt_out_of_range : public pmt_exception
+class GRUEL_API pmt_out_of_range : public pmt_exception
 {
 public:
   pmt_out_of_range(const std::string &msg, pmt_t obj);
 };
 
-class pmt_notimplemented : public pmt_exception
+class GRUEL_API pmt_notimplemented : public pmt_exception
 {
 public:
   pmt_notimplemented(const std::string &msg, pmt_t obj);
@@ -92,24 +93,24 @@ public:
  * I.e., there is a single false value, #f.
  * ------------------------------------------------------------------------
  */
-extern const pmt_t PMT_T;	//< \#t : boolean true constant
-extern const pmt_t PMT_F;	//< \#f : boolean false constant
+extern GRUEL_API const pmt_t PMT_T;	//< \#t : boolean true constant
+extern GRUEL_API const pmt_t PMT_F;	//< \#f : boolean false constant
 
 //! Return true if obj is \#t or \#f, else return false.
-bool pmt_is_bool(pmt_t obj);
+GRUEL_API bool pmt_is_bool(pmt_t obj);
 
 //! Return false if obj is \#f, else return true.
-bool pmt_is_true(pmt_t obj);
+GRUEL_API bool pmt_is_true(pmt_t obj);
 
 //! Return true if obj is \#f, else return true.
-bool pmt_is_false(pmt_t obj);
+GRUEL_API bool pmt_is_false(pmt_t obj);
 
 //! Return \#f is val is false, else return \#t.
-pmt_t pmt_from_bool(bool val);
+GRUEL_API pmt_t pmt_from_bool(bool val);
 
 //! Return true if val is PMT_T, return false when val is PMT_F, 
 // else raise wrong_type exception.
-bool pmt_to_bool(pmt_t val);
+GRUEL_API bool pmt_to_bool(pmt_t val);
 
 /*
  * ------------------------------------------------------------------------
@@ -118,20 +119,20 @@ bool pmt_to_bool(pmt_t val);
  */
 
 //! Return true if obj is a symbol, else false.
-bool pmt_is_symbol(const pmt_t& obj);
+GRUEL_API bool pmt_is_symbol(const pmt_t& obj);
 
 //! Return the symbol whose name is \p s.
-pmt_t pmt_string_to_symbol(const std::string &s);
+GRUEL_API pmt_t pmt_string_to_symbol(const std::string &s);
 
 //! Alias for pmt_string_to_symbol
-pmt_t pmt_intern(const std::string &s);
+GRUEL_API pmt_t pmt_intern(const std::string &s);
 
 
 /*!
  * If \p is a symbol, return the name of the symbol as a string.
  * Otherwise, raise the wrong_type exception.
  */
-const std::string pmt_symbol_to_string(const pmt_t& sym);
+GRUEL_API const std::string pmt_symbol_to_string(const pmt_t& sym);
 
 /*
  * ------------------------------------------------------------------------
@@ -140,7 +141,7 @@ const std::string pmt_symbol_to_string(const pmt_t& sym);
  */
 
 //! Return true if obj is any kind of number, else false.
-bool pmt_is_number(pmt_t obj);
+GRUEL_API bool pmt_is_number(pmt_t obj);
 
 /*
  * ------------------------------------------------------------------------
@@ -149,10 +150,10 @@ bool pmt_is_number(pmt_t obj);
  */
 
 //! Return true if \p x is an integer number, else false
-bool pmt_is_integer(pmt_t x);
+GRUEL_API bool pmt_is_integer(pmt_t x);
 
 //! Return the pmt value that represents the integer \p x.
-pmt_t pmt_from_long(long x);
+GRUEL_API pmt_t pmt_from_long(long x);
 
 /*!
  * \brief Convert pmt to long if possible.
@@ -161,7 +162,7 @@ pmt_t pmt_from_long(long x);
  * return that integer.  Else raise an exception, either wrong_type
  * when x is not an exact integer, or out_of_range when it doesn't fit.
  */
-long pmt_to_long(pmt_t x);
+GRUEL_API long pmt_to_long(pmt_t x);
 
 /*
  * ------------------------------------------------------------------------
@@ -170,10 +171,10 @@ long pmt_to_long(pmt_t x);
  */
 
 //! Return true if \p x is an uint64 number, else false
-bool pmt_is_uint64(pmt_t x);
+GRUEL_API bool pmt_is_uint64(pmt_t x);
 
 //! Return the pmt value that represents the uint64 \p x.
-pmt_t pmt_from_uint64(uint64_t x);
+GRUEL_API pmt_t pmt_from_uint64(uint64_t x);
 
 /*!
  * \brief Convert pmt to uint64 if possible.
@@ -182,7 +183,7 @@ pmt_t pmt_from_uint64(uint64_t x);
  * return that uint64.  Else raise an exception, either wrong_type
  * when x is not an exact uint64, or out_of_range when it doesn't fit.
  */
-uint64_t pmt_to_uint64(pmt_t x);
+GRUEL_API uint64_t pmt_to_uint64(pmt_t x);
 
 /*
  * ------------------------------------------------------------------------
@@ -193,10 +194,10 @@ uint64_t pmt_to_uint64(pmt_t x);
 /*
  * \brief Return true if \p obj is a real number, else false.
  */
-bool pmt_is_real(pmt_t obj);
+GRUEL_API bool pmt_is_real(pmt_t obj);
 
 //! Return the pmt value that represents double \p x.
-pmt_t pmt_from_double(double x);
+GRUEL_API pmt_t pmt_from_double(double x);
 
 /*!
  * \brief Convert pmt to double if possible.
@@ -205,7 +206,7 @@ pmt_t pmt_from_double(double x);
  * as a double.  The argument \p val must be a real or integer, otherwise
  * a wrong_type exception is raised.
  */
-double pmt_to_double(pmt_t x);
+GRUEL_API double pmt_to_double(pmt_t x);
 
 /*
  * ------------------------------------------------------------------------
@@ -216,16 +217,16 @@ double pmt_to_double(pmt_t x);
 /*!
  * \brief return true if \p obj is a complex number, false otherwise.
  */
-bool pmt_is_complex(pmt_t obj);
+GRUEL_API bool pmt_is_complex(pmt_t obj);
 
 //! Return a complex number constructed of the given real and imaginary parts.
-pmt_t pmt_make_rectangular(double re, double im);
+GRUEL_API pmt_t pmt_make_rectangular(double re, double im);
 
 /*!
  * If \p z is complex, real or integer, return the closest complex<double>.
  * Otherwise, raise the wrong_type exception.
  */
-std::complex<double> pmt_to_complex(pmt_t z);
+GRUEL_API std::complex<double> pmt_to_complex(pmt_t z);
 
 /*
  * ------------------------------------------------------------------------
@@ -233,35 +234,35 @@ std::complex<double> pmt_to_complex(pmt_t z);
  * ------------------------------------------------------------------------
  */
 
-extern const pmt_t PMT_NIL;	//< the empty list
+extern GRUEL_API const pmt_t PMT_NIL;	//< the empty list
 
 //! Return true if \p x is the empty list, otherwise return false.
-bool pmt_is_null(const pmt_t& x);
+GRUEL_API bool pmt_is_null(const pmt_t& x);
 
 //! Return true if \p obj is a pair, else false.
-bool pmt_is_pair(const pmt_t& obj);
+GRUEL_API bool pmt_is_pair(const pmt_t& obj);
 
 //! Return a newly allocated pair whose car is \p x and whose cdr is \p y.
-pmt_t pmt_cons(const pmt_t& x, const pmt_t& y);
+GRUEL_API pmt_t pmt_cons(const pmt_t& x, const pmt_t& y);
 
 //! If \p pair is a pair, return the car of the \p pair, otherwise raise wrong_type.
-pmt_t pmt_car(const pmt_t& pair);
+GRUEL_API pmt_t pmt_car(const pmt_t& pair);
 
 //! If \p pair is a pair, return the cdr of the \p pair, otherwise raise wrong_type.
-pmt_t pmt_cdr(const pmt_t& pair);
+GRUEL_API pmt_t pmt_cdr(const pmt_t& pair);
 
 //! Stores \p value in the car field of \p pair.
-void pmt_set_car(pmt_t pair, pmt_t value);
+GRUEL_API void pmt_set_car(pmt_t pair, pmt_t value);
 
 //! Stores \p value in the cdr field of \p pair.
-void pmt_set_cdr(pmt_t pair, pmt_t value);
+GRUEL_API void pmt_set_cdr(pmt_t pair, pmt_t value);
 
-pmt_t pmt_caar(pmt_t pair);
-pmt_t pmt_cadr(pmt_t pair);
-pmt_t pmt_cdar(pmt_t pair);
-pmt_t pmt_cddr(pmt_t pair);
-pmt_t pmt_caddr(pmt_t pair);
-pmt_t pmt_cadddr(pmt_t pair);
+GRUEL_API pmt_t pmt_caar(pmt_t pair);
+GRUEL_API pmt_t pmt_cadr(pmt_t pair);
+GRUEL_API pmt_t pmt_cdar(pmt_t pair);
+GRUEL_API pmt_t pmt_cddr(pmt_t pair);
+GRUEL_API pmt_t pmt_caddr(pmt_t pair);
+GRUEL_API pmt_t pmt_cadddr(pmt_t pair);
 
 /*
  * ------------------------------------------------------------------------
@@ -274,30 +275,30 @@ pmt_t pmt_cadddr(pmt_t pair);
  */
 
 //! Return true if \p x is a tuple, othewise false.
-bool pmt_is_tuple(pmt_t x);
+GRUEL_API bool pmt_is_tuple(pmt_t x);
 
-pmt_t pmt_make_tuple();
-pmt_t pmt_make_tuple(const pmt_t &e0);
-pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1);
-pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2);
-pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3);
-pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4);
-pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4, const pmt_t &e5);
-pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4, const pmt_t &e5, const pmt_t &e6);
-pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4, const pmt_t &e5, const pmt_t &e6, const pmt_t &e7);
-pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4, const pmt_t &e5, const pmt_t &e6, const pmt_t &e7, const pmt_t &e8);
-pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4, const pmt_t &e5, const pmt_t &e6, const pmt_t &e7, const pmt_t &e8, const pmt_t &e9);
+GRUEL_API pmt_t pmt_make_tuple();
+GRUEL_API pmt_t pmt_make_tuple(const pmt_t &e0);
+GRUEL_API pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1);
+GRUEL_API pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2);
+GRUEL_API pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3);
+GRUEL_API pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4);
+GRUEL_API pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4, const pmt_t &e5);
+GRUEL_API pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4, const pmt_t &e5, const pmt_t &e6);
+GRUEL_API pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4, const pmt_t &e5, const pmt_t &e6, const pmt_t &e7);
+GRUEL_API pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4, const pmt_t &e5, const pmt_t &e6, const pmt_t &e7, const pmt_t &e8);
+GRUEL_API pmt_t pmt_make_tuple(const pmt_t &e0, const pmt_t &e1, const pmt_t &e2, const pmt_t &e3, const pmt_t &e4, const pmt_t &e5, const pmt_t &e6, const pmt_t &e7, const pmt_t &e8, const pmt_t &e9);
 
 /*!
  * If \p x is a vector or proper list, return a tuple containing the elements of x
  */
-pmt_t pmt_to_tuple(const pmt_t &x);
+GRUEL_API pmt_t pmt_to_tuple(const pmt_t &x);
 
 /*!
  * Return the contents of position \p k of \p tuple.
  * \p k must be a valid index of \p tuple.
  */
-pmt_t pmt_tuple_ref(const pmt_t &tuple, size_t k);
+GRUEL_API pmt_t pmt_tuple_ref(const pmt_t &tuple, size_t k);
 
 /*
  * ------------------------------------------------------------------------
@@ -308,22 +309,22 @@ pmt_t pmt_tuple_ref(const pmt_t &tuple, size_t k);
  */
 
 //! Return true if \p x is a vector, othewise false.
-bool pmt_is_vector(pmt_t x);
+GRUEL_API bool pmt_is_vector(pmt_t x);
 
 //! Make a vector of length \p k, with initial values set to \p fill
-pmt_t pmt_make_vector(size_t k, pmt_t fill);
+GRUEL_API pmt_t pmt_make_vector(size_t k, pmt_t fill);
 
 /*!
  * Return the contents of position \p k of \p vector.
  * \p k must be a valid index of \p vector.
  */
-pmt_t pmt_vector_ref(pmt_t vector, size_t k);
+GRUEL_API pmt_t pmt_vector_ref(pmt_t vector, size_t k);
 
 //! Store \p obj in position \p k.
-void pmt_vector_set(pmt_t vector, size_t k, pmt_t obj);
+GRUEL_API void pmt_vector_set(pmt_t vector, size_t k, pmt_t obj);
 
 //! Store \p fill in every position of \p vector
-void pmt_vector_fill(pmt_t vector, pmt_t fill);
+GRUEL_API void pmt_vector_fill(pmt_t vector, pmt_t fill);
 
 /*
  * ------------------------------------------------------------------------
@@ -334,7 +335,7 @@ void pmt_vector_fill(pmt_t vector, pmt_t fill);
  */
 
 //! Return true if \p x is a blob, othewise false.
-bool pmt_is_blob(pmt_t x);
+GRUEL_API bool pmt_is_blob(pmt_t x);
 
 /*!
  * \brief Make a blob given a pointer and length in bytes
@@ -344,13 +345,13 @@ bool pmt_is_blob(pmt_t x);
  *
  * The data is copied into the blob.
  */
-pmt_t pmt_make_blob(const void *buf, size_t len);
+GRUEL_API pmt_t pmt_make_blob(const void *buf, size_t len);
 
 //! Return a pointer to the blob's data
-const void *pmt_blob_data(pmt_t blob);
+GRUEL_API const void *pmt_blob_data(pmt_t blob);
 
 //! Return the blob's length in bytes
-size_t pmt_blob_length(pmt_t blob);
+GRUEL_API size_t pmt_blob_length(pmt_t blob);
 
 /*!
  * <pre>
@@ -382,106 +383,106 @@ size_t pmt_blob_length(pmt_t blob);
  */
 
 //! true if \p x is any kind of uniform numeric vector
-bool pmt_is_uniform_vector(pmt_t x);  
-
-bool pmt_is_u8vector(pmt_t x);
-bool pmt_is_s8vector(pmt_t x);
-bool pmt_is_u16vector(pmt_t x);
-bool pmt_is_s16vector(pmt_t x);
-bool pmt_is_u32vector(pmt_t x);
-bool pmt_is_s32vector(pmt_t x);
-bool pmt_is_u64vector(pmt_t x);
-bool pmt_is_s64vector(pmt_t x);
-bool pmt_is_f32vector(pmt_t x);
-bool pmt_is_f64vector(pmt_t x);
-bool pmt_is_c32vector(pmt_t x);
-bool pmt_is_c64vector(pmt_t x);
-
-pmt_t pmt_make_u8vector(size_t k, uint8_t fill);
-pmt_t pmt_make_s8vector(size_t k, int8_t fill);
-pmt_t pmt_make_u16vector(size_t k, uint16_t fill);
-pmt_t pmt_make_s16vector(size_t k, int16_t fill);
-pmt_t pmt_make_u32vector(size_t k, uint32_t fill);
-pmt_t pmt_make_s32vector(size_t k, int32_t fill);
-pmt_t pmt_make_u64vector(size_t k, uint64_t fill);
-pmt_t pmt_make_s64vector(size_t k, int64_t fill);
-pmt_t pmt_make_f32vector(size_t k, float fill);
-pmt_t pmt_make_f64vector(size_t k, double fill);
-pmt_t pmt_make_c32vector(size_t k, std::complex<float> fill);
-pmt_t pmt_make_c64vector(size_t k, std::complex<double> fill);
-
-pmt_t pmt_init_u8vector(size_t k, const uint8_t *data);
-pmt_t pmt_init_s8vector(size_t k, const int8_t *data);
-pmt_t pmt_init_u16vector(size_t k, const uint16_t *data);
-pmt_t pmt_init_s16vector(size_t k, const int16_t *data);
-pmt_t pmt_init_u32vector(size_t k, const uint32_t *data);
-pmt_t pmt_init_s32vector(size_t k, const int32_t *data);
-pmt_t pmt_init_u64vector(size_t k, const uint64_t *data);
-pmt_t pmt_init_s64vector(size_t k, const int64_t *data);
-pmt_t pmt_init_f32vector(size_t k, const float *data);
-pmt_t pmt_init_f64vector(size_t k, const double *data);
-pmt_t pmt_init_c32vector(size_t k, const std::complex<float> *data);
-pmt_t pmt_init_c64vector(size_t k, const std::complex<double> *data);
-
-uint8_t  pmt_u8vector_ref(pmt_t v, size_t k);
-int8_t   pmt_s8vector_ref(pmt_t v, size_t k);
-uint16_t pmt_u16vector_ref(pmt_t v, size_t k);
-int16_t  pmt_s16vector_ref(pmt_t v, size_t k);
-uint32_t pmt_u32vector_ref(pmt_t v, size_t k);
-int32_t  pmt_s32vector_ref(pmt_t v, size_t k);
-uint64_t pmt_u64vector_ref(pmt_t v, size_t k);
-int64_t  pmt_s64vector_ref(pmt_t v, size_t k);
-float    pmt_f32vector_ref(pmt_t v, size_t k);
-double   pmt_f64vector_ref(pmt_t v, size_t k);
-std::complex<float>  pmt_c32vector_ref(pmt_t v, size_t k);
-std::complex<double> pmt_c64vector_ref(pmt_t v, size_t k);
-
-void pmt_u8vector_set(pmt_t v, size_t k, uint8_t x);  //< v[k] = x
-void pmt_s8vector_set(pmt_t v, size_t k, int8_t x);
-void pmt_u16vector_set(pmt_t v, size_t k, uint16_t x);
-void pmt_s16vector_set(pmt_t v, size_t k, int16_t x);
-void pmt_u32vector_set(pmt_t v, size_t k, uint32_t x);
-void pmt_s32vector_set(pmt_t v, size_t k, int32_t x);
-void pmt_u64vector_set(pmt_t v, size_t k, uint64_t x);
-void pmt_s64vector_set(pmt_t v, size_t k, int64_t x);
-void pmt_f32vector_set(pmt_t v, size_t k, float x);
-void pmt_f64vector_set(pmt_t v, size_t k, double x);
-void pmt_c32vector_set(pmt_t v, size_t k, std::complex<float> x);
-void pmt_c64vector_set(pmt_t v, size_t k, std::complex<double> x);
+GRUEL_API bool pmt_is_uniform_vector(pmt_t x);  
+
+GRUEL_API bool pmt_is_u8vector(pmt_t x);
+GRUEL_API bool pmt_is_s8vector(pmt_t x);
+GRUEL_API bool pmt_is_u16vector(pmt_t x);
+GRUEL_API bool pmt_is_s16vector(pmt_t x);
+GRUEL_API bool pmt_is_u32vector(pmt_t x);
+GRUEL_API bool pmt_is_s32vector(pmt_t x);
+GRUEL_API bool pmt_is_u64vector(pmt_t x);
+GRUEL_API bool pmt_is_s64vector(pmt_t x);
+GRUEL_API bool pmt_is_f32vector(pmt_t x);
+GRUEL_API bool pmt_is_f64vector(pmt_t x);
+GRUEL_API bool pmt_is_c32vector(pmt_t x);
+GRUEL_API bool pmt_is_c64vector(pmt_t x);
+
+GRUEL_API pmt_t pmt_make_u8vector(size_t k, uint8_t fill);
+GRUEL_API pmt_t pmt_make_s8vector(size_t k, int8_t fill);
+GRUEL_API pmt_t pmt_make_u16vector(size_t k, uint16_t fill);
+GRUEL_API pmt_t pmt_make_s16vector(size_t k, int16_t fill);
+GRUEL_API pmt_t pmt_make_u32vector(size_t k, uint32_t fill);
+GRUEL_API pmt_t pmt_make_s32vector(size_t k, int32_t fill);
+GRUEL_API pmt_t pmt_make_u64vector(size_t k, uint64_t fill);
+GRUEL_API pmt_t pmt_make_s64vector(size_t k, int64_t fill);
+GRUEL_API pmt_t pmt_make_f32vector(size_t k, float fill);
+GRUEL_API pmt_t pmt_make_f64vector(size_t k, double fill);
+GRUEL_API pmt_t pmt_make_c32vector(size_t k, std::complex<float> fill);
+GRUEL_API pmt_t pmt_make_c64vector(size_t k, std::complex<double> fill);
+
+GRUEL_API pmt_t pmt_init_u8vector(size_t k, const uint8_t *data);
+GRUEL_API pmt_t pmt_init_s8vector(size_t k, const int8_t *data);
+GRUEL_API pmt_t pmt_init_u16vector(size_t k, const uint16_t *data);
+GRUEL_API pmt_t pmt_init_s16vector(size_t k, const int16_t *data);
+GRUEL_API pmt_t pmt_init_u32vector(size_t k, const uint32_t *data);
+GRUEL_API pmt_t pmt_init_s32vector(size_t k, const int32_t *data);
+GRUEL_API pmt_t pmt_init_u64vector(size_t k, const uint64_t *data);
+GRUEL_API pmt_t pmt_init_s64vector(size_t k, const int64_t *data);
+GRUEL_API pmt_t pmt_init_f32vector(size_t k, const float *data);
+GRUEL_API pmt_t pmt_init_f64vector(size_t k, const double *data);
+GRUEL_API pmt_t pmt_init_c32vector(size_t k, const std::complex<float> *data);
+GRUEL_API pmt_t pmt_init_c64vector(size_t k, const std::complex<double> *data);
+
+GRUEL_API uint8_t  pmt_u8vector_ref(pmt_t v, size_t k);
+GRUEL_API int8_t   pmt_s8vector_ref(pmt_t v, size_t k);
+GRUEL_API uint16_t pmt_u16vector_ref(pmt_t v, size_t k);
+GRUEL_API int16_t  pmt_s16vector_ref(pmt_t v, size_t k);
+GRUEL_API uint32_t pmt_u32vector_ref(pmt_t v, size_t k);
+GRUEL_API int32_t  pmt_s32vector_ref(pmt_t v, size_t k);
+GRUEL_API uint64_t pmt_u64vector_ref(pmt_t v, size_t k);
+GRUEL_API int64_t  pmt_s64vector_ref(pmt_t v, size_t k);
+GRUEL_API float    pmt_f32vector_ref(pmt_t v, size_t k);
+GRUEL_API double   pmt_f64vector_ref(pmt_t v, size_t k);
+GRUEL_API std::complex<float>  pmt_c32vector_ref(pmt_t v, size_t k);
+GRUEL_API std::complex<double> pmt_c64vector_ref(pmt_t v, size_t k);
+
+GRUEL_API void pmt_u8vector_set(pmt_t v, size_t k, uint8_t x);  //< v[k] = x
+GRUEL_API void pmt_s8vector_set(pmt_t v, size_t k, int8_t x);
+GRUEL_API void pmt_u16vector_set(pmt_t v, size_t k, uint16_t x);
+GRUEL_API void pmt_s16vector_set(pmt_t v, size_t k, int16_t x);
+GRUEL_API void pmt_u32vector_set(pmt_t v, size_t k, uint32_t x);
+GRUEL_API void pmt_s32vector_set(pmt_t v, size_t k, int32_t x);
+GRUEL_API void pmt_u64vector_set(pmt_t v, size_t k, uint64_t x);
+GRUEL_API void pmt_s64vector_set(pmt_t v, size_t k, int64_t x);
+GRUEL_API void pmt_f32vector_set(pmt_t v, size_t k, float x);
+GRUEL_API void pmt_f64vector_set(pmt_t v, size_t k, double x);
+GRUEL_API void pmt_c32vector_set(pmt_t v, size_t k, std::complex<float> x);
+GRUEL_API void pmt_c64vector_set(pmt_t v, size_t k, std::complex<double> x);
 
 // Return const pointers to the elements
 
-const void *pmt_uniform_vector_elements(pmt_t v, size_t &len);  //< works with any; len is in bytes
-
-const uint8_t  *pmt_u8vector_elements(pmt_t v, size_t &len);  //< len is in elements
-const int8_t   *pmt_s8vector_elements(pmt_t v, size_t &len);  //< len is in elements
-const uint16_t *pmt_u16vector_elements(pmt_t v, size_t &len); //< len is in elements
-const int16_t  *pmt_s16vector_elements(pmt_t v, size_t &len); //< len is in elements
-const uint32_t *pmt_u32vector_elements(pmt_t v, size_t &len); //< len is in elements
-const int32_t  *pmt_s32vector_elements(pmt_t v, size_t &len); //< len is in elements
-const uint64_t *pmt_u64vector_elements(pmt_t v, size_t &len); //< len is in elements
-const int64_t  *pmt_s64vector_elements(pmt_t v, size_t &len); //< len is in elements
-const float    *pmt_f32vector_elements(pmt_t v, size_t &len); //< len is in elements
-const double   *pmt_f64vector_elements(pmt_t v, size_t &len); //< len is in elements
-const std::complex<float>  *pmt_c32vector_elements(pmt_t v, size_t &len); //< len is in elements
-const std::complex<double> *pmt_c64vector_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API const void *pmt_uniform_vector_elements(pmt_t v, size_t &len);  //< works with any; len is in bytes
+
+GRUEL_API const uint8_t  *pmt_u8vector_elements(pmt_t v, size_t &len);  //< len is in elements
+GRUEL_API const int8_t   *pmt_s8vector_elements(pmt_t v, size_t &len);  //< len is in elements
+GRUEL_API const uint16_t *pmt_u16vector_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API const int16_t  *pmt_s16vector_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API const uint32_t *pmt_u32vector_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API const int32_t  *pmt_s32vector_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API const uint64_t *pmt_u64vector_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API const int64_t  *pmt_s64vector_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API const float    *pmt_f32vector_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API const double   *pmt_f64vector_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API const std::complex<float>  *pmt_c32vector_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API const std::complex<double> *pmt_c64vector_elements(pmt_t v, size_t &len); //< len is in elements
 
 // Return non-const pointers to the elements
 
-void *pmt_uniform_vector_writable_elements(pmt_t v, size_t &len);  //< works with any; len is in bytes
-
-uint8_t  *pmt_u8vector_writable_elements(pmt_t v, size_t &len);  //< len is in elements
-int8_t   *pmt_s8vector_writable_elements(pmt_t v, size_t &len);  //< len is in elements
-uint16_t *pmt_u16vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
-int16_t  *pmt_s16vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
-uint32_t *pmt_u32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
-int32_t  *pmt_s32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
-uint64_t *pmt_u64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
-int64_t  *pmt_s64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
-float    *pmt_f32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
-double   *pmt_f64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
-std::complex<float>  *pmt_c32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
-std::complex<double> *pmt_c64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API void *pmt_uniform_vector_writable_elements(pmt_t v, size_t &len);  //< works with any; len is in bytes
+
+GRUEL_API uint8_t  *pmt_u8vector_writable_elements(pmt_t v, size_t &len);  //< len is in elements
+GRUEL_API int8_t   *pmt_s8vector_writable_elements(pmt_t v, size_t &len);  //< len is in elements
+GRUEL_API uint16_t *pmt_u16vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API int16_t  *pmt_s16vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API uint32_t *pmt_u32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API int32_t  *pmt_s32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API uint64_t *pmt_u64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API int64_t  *pmt_s64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API float    *pmt_f32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API double   *pmt_f64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API std::complex<float>  *pmt_c32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
+GRUEL_API std::complex<double> *pmt_c64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements
 
 /*
  * ------------------------------------------------------------------------
@@ -494,31 +495,31 @@ std::complex<double> *pmt_c64vector_writable_elements(pmt_t v, size_t &len); //<
  */
 
 //! Return true if \p obj is a dictionary
-bool pmt_is_dict(const pmt_t &obj);
+GRUEL_API bool pmt_is_dict(const pmt_t &obj);
 
 //! Make an empty dictionary
-pmt_t pmt_make_dict();
+GRUEL_API pmt_t pmt_make_dict();
 
 //! Return a new dictionary with \p key associated with \p value.
-pmt_t pmt_dict_add(const pmt_t &dict, const pmt_t &key, const pmt_t &value);
+GRUEL_API pmt_t pmt_dict_add(const pmt_t &dict, const pmt_t &key, const pmt_t &value);
 
 //! Return a new dictionary with \p key removed.
-pmt_t pmt_dict_delete(const pmt_t &dict, const pmt_t &key);
+GRUEL_API pmt_t pmt_dict_delete(const pmt_t &dict, const pmt_t &key);
 
 //! Return true if \p key exists in \p dict
-bool  pmt_dict_has_key(const pmt_t &dict, const pmt_t &key);
+GRUEL_API bool  pmt_dict_has_key(const pmt_t &dict, const pmt_t &key);
 
 //! If \p key exists in \p dict, return associated value; otherwise return \p not_found.
-pmt_t pmt_dict_ref(const pmt_t &dict, const pmt_t &key, const pmt_t &not_found);
+GRUEL_API pmt_t pmt_dict_ref(const pmt_t &dict, const pmt_t &key, const pmt_t &not_found);
 
 //! Return list of (key . value) pairs
-pmt_t pmt_dict_items(pmt_t dict);
+GRUEL_API pmt_t pmt_dict_items(pmt_t dict);
 
 //! Return list of keys
-pmt_t pmt_dict_keys(pmt_t dict);
+GRUEL_API pmt_t pmt_dict_keys(pmt_t dict);
 
 //! Return list of values
-pmt_t pmt_dict_values(pmt_t dict);
+GRUEL_API pmt_t pmt_dict_values(pmt_t dict);
 
 /*
  * ------------------------------------------------------------------------
@@ -530,16 +531,16 @@ pmt_t pmt_dict_values(pmt_t dict);
  */
 
 //! Return true if \p obj is an any
-bool pmt_is_any(pmt_t obj);
+GRUEL_API bool pmt_is_any(pmt_t obj);
 
 //! make an any
-pmt_t pmt_make_any(const boost::any &any);
+GRUEL_API pmt_t pmt_make_any(const boost::any &any);
 
 //! Return underlying boost::any
-boost::any pmt_any_ref(pmt_t obj);
+GRUEL_API boost::any pmt_any_ref(pmt_t obj);
 
 //! Store \p any in \p obj
-void pmt_any_set(pmt_t obj, const boost::any &any);
+GRUEL_API void pmt_any_set(pmt_t obj, const boost::any &any);
 
 
 /*
@@ -548,13 +549,13 @@ void pmt_any_set(pmt_t obj, const boost::any &any);
  * ------------------------------------------------------------------------
  */
 //! Return true if \p obj is a msg_accepter
-bool pmt_is_msg_accepter(const pmt_t &obj);
+GRUEL_API bool pmt_is_msg_accepter(const pmt_t &obj);
 
 //! make a msg_accepter
-pmt_t pmt_make_msg_accepter(boost::shared_ptr<gruel::msg_accepter> ma);
+GRUEL_API pmt_t pmt_make_msg_accepter(boost::shared_ptr<gruel::msg_accepter> ma);
 
 //! Return underlying msg_accepter
-boost::shared_ptr<gruel::msg_accepter> pmt_msg_accepter_ref(const pmt_t &obj);
+GRUEL_API boost::shared_ptr<gruel::msg_accepter> pmt_msg_accepter_ref(const pmt_t &obj);
 
 /*
  * ------------------------------------------------------------------------
@@ -563,7 +564,7 @@ boost::shared_ptr<gruel::msg_accepter> pmt_msg_accepter_ref(const pmt_t &obj);
  */
 
 //! Return true if x and y are the same object; otherwise return false.
-bool pmt_eq(const pmt_t& x, const pmt_t& y);
+GRUEL_API bool pmt_eq(const pmt_t& x, const pmt_t& y);
 
 /*!
  * \brief Return true if x and y should normally be regarded as the same object, else false.
@@ -578,7 +579,7 @@ bool pmt_eq(const pmt_t& x, const pmt_t& y);
  *   x and y are pairs or vectors that denote same location in store.
  * </pre>
  */
-bool pmt_eqv(const pmt_t& x, const pmt_t& y);
+GRUEL_API bool pmt_eqv(const pmt_t& x, const pmt_t& y);
 
 /*!
  * pmt_equal recursively compares the contents of pairs and vectors,
@@ -586,11 +587,11 @@ bool pmt_eqv(const pmt_t& x, const pmt_t& y);
  * pmt_equal may fail to terminate if its arguments are circular data
  * structures.
  */
-bool pmt_equal(const pmt_t& x, const pmt_t& y);
+GRUEL_API bool pmt_equal(const pmt_t& x, const pmt_t& y);
 
 
 //! Return the number of elements in v
-size_t pmt_length(const pmt_t& v);
+GRUEL_API size_t pmt_length(const pmt_t& v);
 
 /*!
  * \brief Find the first pair in \p alist whose car field is \p obj
@@ -600,7 +601,7 @@ size_t pmt_length(const pmt_t& v);
  * in \p alist has \p obj as its car then \#f is returned.
  * Uses pmt_eq to compare \p obj with car fields of the pairs in \p alist.
  */
-pmt_t pmt_assq(pmt_t obj, pmt_t alist);
+GRUEL_API pmt_t pmt_assq(pmt_t obj, pmt_t alist);
 
 /*!
  * \brief Find the first pair in \p alist whose car field is \p obj
@@ -610,7 +611,7 @@ pmt_t pmt_assq(pmt_t obj, pmt_t alist);
  * in \p alist has \p obj as its car then \#f is returned.
  * Uses pmt_eqv to compare \p obj with car fields of the pairs in \p alist.
  */
-pmt_t pmt_assv(pmt_t obj, pmt_t alist);
+GRUEL_API pmt_t pmt_assv(pmt_t obj, pmt_t alist);
 
 /*!
  * \brief Find the first pair in \p alist whose car field is \p obj
@@ -620,7 +621,7 @@ pmt_t pmt_assv(pmt_t obj, pmt_t alist);
  * in \p alist has \p obj as its car then \#f is returned.
  * Uses pmt_equal to compare \p obj with car fields of the pairs in \p alist.
  */
-pmt_t pmt_assoc(pmt_t obj, pmt_t alist);
+GRUEL_API pmt_t pmt_assoc(pmt_t obj, pmt_t alist);
 
 /*!
  * \brief Apply \p proc element-wise to the elements of list and returns
@@ -629,21 +630,21 @@ pmt_t pmt_assoc(pmt_t obj, pmt_t alist);
  * \p list must be a list.  The dynamic order in which \p proc is
  * applied to the elements of \p list is unspecified.
  */
-pmt_t pmt_map(pmt_t proc(const pmt_t&), pmt_t list);
+GRUEL_API pmt_t pmt_map(pmt_t proc(const pmt_t&), pmt_t list);
 
 /*!
  * \brief reverse \p list.
  *
  * \p list must be a proper list.
  */
-pmt_t pmt_reverse(pmt_t list);
+GRUEL_API pmt_t pmt_reverse(pmt_t list);
 
 /*!
  * \brief destructively reverse \p list.
  *
  * \p list must be a proper list.
  */
-pmt_t pmt_reverse_x(pmt_t list);
+GRUEL_API pmt_t pmt_reverse_x(pmt_t list);
 
 /*!
  * \brief (acons x y a) == (cons (cons x y) a)
@@ -657,76 +658,76 @@ pmt_acons(pmt_t x, pmt_t y, pmt_t a)
 /*!
  * \brief locates \p nth element of \n list where the car is the 'zeroth' element.
  */
-pmt_t pmt_nth(size_t n, pmt_t list);
+GRUEL_API pmt_t pmt_nth(size_t n, pmt_t list);
 
 /*!
  * \brief returns the tail of \p list that would be obtained by calling
  * cdr \p n times in succession.
  */
-pmt_t pmt_nthcdr(size_t n, pmt_t list);
+GRUEL_API pmt_t pmt_nthcdr(size_t n, pmt_t list);
 
 /*!
  * \brief Return the first sublist of \p list whose car is \p obj.
  * If \p obj does not occur in \p list, then \#f is returned.
  * pmt_memq use pmt_eq to compare \p obj with the elements of \p list.
  */
-pmt_t pmt_memq(pmt_t obj, pmt_t list);
+GRUEL_API pmt_t pmt_memq(pmt_t obj, pmt_t list);
 
 /*!
  * \brief Return the first sublist of \p list whose car is \p obj.
  * If \p obj does not occur in \p list, then \#f is returned.
  * pmt_memv use pmt_eqv to compare \p obj with the elements of \p list.
  */
-pmt_t pmt_memv(pmt_t obj, pmt_t list);
+GRUEL_API pmt_t pmt_memv(pmt_t obj, pmt_t list);
 
 /*!
  * \brief Return the first sublist of \p list whose car is \p obj.
  * If \p obj does not occur in \p list, then \#f is returned.
  * pmt_member use pmt_equal to compare \p obj with the elements of \p list.
  */
-pmt_t pmt_member(pmt_t obj, pmt_t list);
+GRUEL_API pmt_t pmt_member(pmt_t obj, pmt_t list);
 
 /*!
  * \brief Return true if every element of \p list1 appears in \p list2, and false otherwise.
  * Comparisons are done with pmt_eqv.
  */
-bool pmt_subsetp(pmt_t list1, pmt_t list2);
+GRUEL_API bool pmt_subsetp(pmt_t list1, pmt_t list2);
 
 /*!
  * \brief Return a list of length 1 containing \p x1
  */
-pmt_t pmt_list1(const pmt_t& x1);
+GRUEL_API pmt_t pmt_list1(const pmt_t& x1);
 
 /*!
  * \brief Return a list of length 2 containing \p x1, \p x2
  */
-pmt_t pmt_list2(const pmt_t& x1, const pmt_t& x2);
+GRUEL_API pmt_t pmt_list2(const pmt_t& x1, const pmt_t& x2);
 
 /*!
  * \brief Return a list of length 3 containing \p x1, \p x2, \p x3
  */
-pmt_t pmt_list3(const pmt_t& x1, const pmt_t& x2, const pmt_t& x3);
+GRUEL_API pmt_t pmt_list3(const pmt_t& x1, const pmt_t& x2, const pmt_t& x3);
 
 /*!
  * \brief Return a list of length 4 containing \p x1, \p x2, \p x3, \p x4
  */
-pmt_t pmt_list4(const pmt_t& x1, const pmt_t& x2, const pmt_t& x3, const pmt_t& x4);
+GRUEL_API pmt_t pmt_list4(const pmt_t& x1, const pmt_t& x2, const pmt_t& x3, const pmt_t& x4);
 
 /*!
  * \brief Return a list of length 5 containing \p x1, \p x2, \p x3, \p x4, \p x5
  */
-pmt_t pmt_list5(const pmt_t& x1, const pmt_t& x2, const pmt_t& x3, const pmt_t& x4, const pmt_t& x5);
+GRUEL_API pmt_t pmt_list5(const pmt_t& x1, const pmt_t& x2, const pmt_t& x3, const pmt_t& x4, const pmt_t& x5);
 
 /*!
  * \brief Return a list of length 6 containing \p x1, \p x2, \p x3, \p x4, \p
  * x5, \p x6
  */
-pmt_t pmt_list6(const pmt_t& x1, const pmt_t& x2, const pmt_t& x3, const pmt_t& x4, const pmt_t& x5, const pmt_t& x6);
+GRUEL_API pmt_t pmt_list6(const pmt_t& x1, const pmt_t& x2, const pmt_t& x3, const pmt_t& x4, const pmt_t& x5, const pmt_t& x6);
 
 /*!
  * \brief Return \p list with \p item added to it.
  */
-pmt_t pmt_list_add(pmt_t list, const pmt_t& item);
+GRUEL_API pmt_t pmt_list_add(pmt_t list, const pmt_t& item);
 
 
 /*
@@ -734,10 +735,10 @@ pmt_t pmt_list_add(pmt_t list, const pmt_t& item);
  *			     read / write
  * ------------------------------------------------------------------------
  */
-extern const pmt_t PMT_EOF;	//< The end of file object
+extern GRUEL_API const pmt_t PMT_EOF;	//< The end of file object
 
 //! return true if obj is the EOF object, otherwise return false.
-bool pmt_is_eof_object(pmt_t obj);
+GRUEL_API bool pmt_is_eof_object(pmt_t obj);
 
 /*!
  * read converts external representations of pmt objects into the
@@ -754,26 +755,26 @@ bool pmt_is_eof_object(pmt_t obj);
  * representation, but the external representation is incomplete and
  * therefore not parsable, an error is signaled.
  */
-pmt_t pmt_read(std::istream &port);
+GRUEL_API pmt_t pmt_read(std::istream &port);
 
 /*!
  * Write a written representation of \p obj to the given \p port.
  */
-void pmt_write(pmt_t obj, std::ostream &port);
+GRUEL_API void pmt_write(pmt_t obj, std::ostream &port);
 
 /*!
  * Return a string representation of \p obj.
  * This is the same output as would be generated by pmt_write.
  */
-std::string pmt_write_string(pmt_t obj);
+GRUEL_API std::string pmt_write_string(pmt_t obj);
 
 
-std::ostream& operator<<(std::ostream &os, pmt_t obj);
+GRUEL_API std::ostream& operator<<(std::ostream &os, pmt_t obj);
 
 /*!
  * \brief Write pmt string representation to stdout.
  */
-void pmt_print(pmt_t v);
+GRUEL_API void pmt_print(pmt_t v);
 
 
 /*
@@ -784,25 +785,25 @@ void pmt_print(pmt_t v);
 /*!
  * \brief Write portable byte-serial representation of \p obj to \p sink
  */
-bool pmt_serialize(pmt_t obj, std::streambuf &sink);
+GRUEL_API bool pmt_serialize(pmt_t obj, std::streambuf &sink);
 
 /*!
  * \brief Create obj from portable byte-serial representation
  */
-pmt_t pmt_deserialize(std::streambuf &source);
+GRUEL_API pmt_t pmt_deserialize(std::streambuf &source);
 
 
-void pmt_dump_sizeof();	// debugging
+GRUEL_API void pmt_dump_sizeof();	// debugging
 
 /*!
  * \brief Provide a simple string generating interface to pmt's serialize function
  */
-std::string pmt_serialize_str(pmt_t obj);
+GRUEL_API std::string pmt_serialize_str(pmt_t obj);
 
 /*!
  * \brief Provide a simple string generating interface to pmt's deserialize function
  */
-pmt_t pmt_deserialize_str(std::string str);
+GRUEL_API pmt_t pmt_deserialize_str(std::string str);
 
 } /* namespace pmt */
 
diff --git a/gruel/src/include/gruel/pmt_pool.h b/gruel/src/include/gruel/pmt_pool.h
index b792523e0..2b227ce6a 100644
--- a/gruel/src/include/gruel/pmt_pool.h
+++ b/gruel/src/include/gruel/pmt_pool.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_PMT_POOL_H
 #define INCLUDED_PMT_POOL_H
 
+#include <gruel/api.h>
 #include <cstddef>
 #include <vector>
 #include <boost/thread.hpp>
@@ -33,9 +34,9 @@ namespace pmt {
  * FIXME may want to go to global allocation with per-thread free list.
  * This would eliminate virtually all lock contention.
  */
-class pmt_pool {
+class GRUEL_API pmt_pool {
 
-  struct item {
+  struct GRUEL_API item {
     struct item	*d_next;
   };
   
diff --git a/gruel/src/include/gruel/realtime.h b/gruel/src/include/gruel/realtime.h
index d110ec956..87f2b0f74 100644
--- a/gruel/src/include/gruel/realtime.h
+++ b/gruel/src/include/gruel/realtime.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_GRUEL_REALTIME_H
 #define INCLUDED_GRUEL_REALTIME_H
 
+#include <gruel/api.h>
 #include <stdexcept>
 
 /*!
@@ -58,7 +59,7 @@ namespace gruel {
   static inline int rt_priority_max() { return 15; }
   static inline int rt_priority_default() { return 1; }
 
-  struct rt_sched_param {
+  struct GRUEL_API rt_sched_param {
     int			priority;
     rt_sched_policy	policy;
 
@@ -88,7 +89,7 @@ namespace gruel {
   // NOTE: If you change this, you need to change the code in 
   // gnuradio-core/src/lib/runtime/gr_realtime.i, see note there.
   rt_status_t
-  enable_realtime_scheduling(rt_sched_param = rt_sched_param());
+  GRUEL_API enable_realtime_scheduling(rt_sched_param = rt_sched_param());
 
 } // namespace gruel
 
diff --git a/gruel/src/include/gruel/sys_pri.h b/gruel/src/include/gruel/sys_pri.h
index b0fd83654..a29b051bf 100644
--- a/gruel/src/include/gruel/sys_pri.h
+++ b/gruel/src/include/gruel/sys_pri.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_GRUEL_SYS_PRI_H
 #define INCLUDED_GRUEL_SYS_PRI_H
 
+#include <gruel/api.h>
 #include <gruel/realtime.h>
 
 /*
@@ -29,7 +30,7 @@
  */
 namespace gruel {
 
-  struct sys_pri {
+  struct GRUEL_API sys_pri {
     static rt_sched_param python();		  // python code
     static rt_sched_param normal();		  // normal blocks
     static rt_sched_param gcell_event_handler();
diff --git a/gruel/src/include/gruel/thread.h b/gruel/src/include/gruel/thread.h
index 5a8ab1876..c6031d88d 100644
--- a/gruel/src/include/gruel/thread.h
+++ b/gruel/src/include/gruel/thread.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_THREAD_H
 #define INCLUDED_THREAD_H
 
+#include <gruel/api.h>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/locks.hpp>
diff --git a/gruel/src/include/gruel/thread_body_wrapper.h b/gruel/src/include/gruel/thread_body_wrapper.h
index b024bfdaf..ae0feda08 100644
--- a/gruel/src/include/gruel/thread_body_wrapper.h
+++ b/gruel/src/include/gruel/thread_body_wrapper.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_THREAD_BODY_WRAPPER_H
 #define INCLUDED_THREAD_BODY_WRAPPER_H
 
+#include <gruel/api.h>
 #include <gruel/thread.h>
 #include <exception>
 #include <iostream>
@@ -28,7 +29,7 @@
 namespace gruel 
 {
 
-  void mask_signals();
+  GRUEL_API void mask_signals();
 
   template <class F>
   class thread_body_wrapper
diff --git a/gruel/src/include/gruel/thread_group.h b/gruel/src/include/gruel/thread_group.h
index 0270746e4..e1658dd1f 100644
--- a/gruel/src/include/gruel/thread_group.h
+++ b/gruel/src/include/gruel/thread_group.h
@@ -15,6 +15,7 @@
 #ifndef INCLUDED_GRUEL_THREAD_GROUP_H
 #define INCLUDED_GRUEL_THREAD_GROUP_H
 
+#include <gruel/api.h>
 #include <gruel/thread.h>
 #include <boost/utility.hpp>
 #include <boost/thread/shared_mutex.hpp>
@@ -22,7 +23,7 @@
 
 namespace gruel
 {
-  class thread_group : public boost::noncopyable
+  class GRUEL_API thread_group : public boost::noncopyable
   {
   public:
     thread_group();
diff --git a/gruel/src/lib/CMakeLists.txt b/gruel/src/lib/CMakeLists.txt
new file mode 100644
index 000000000..a6aa1d992
--- /dev/null
+++ b/gruel/src/lib/CMakeLists.txt
@@ -0,0 +1,103 @@
+# Copyright 2010-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.
+
+########################################################################
+# Include subdirs rather to populate to the sources lists.
+########################################################################
+include(GrMiscUtils)
+include(CheckCXXSourceCompiles)
+
+GR_CHECK_HDR_N_DEF(signal.h HAVE_SIGNAL_H)
+GR_CHECK_HDR_N_DEF(sched.h HAVE_SCHED_H)
+
+set(CMAKE_REQUIRED_LIBRARIES -lpthread)
+CHECK_CXX_SOURCE_COMPILES("
+    #include <signal.h>
+    int main(){pthread_sigmask(0, 0, 0); return 0;}
+    " HAVE_PTHREAD_SIGMASK
+)
+GR_ADD_COND_DEF(HAVE_PTHREAD_SIGMASK)
+
+set(CMAKE_REQUIRED_LIBRARIES -lpthread)
+CHECK_CXX_SOURCE_COMPILES("
+    #include <pthread.h>
+    int main(){
+        pthread_t pthread;
+        pthread_setschedparam(pthread,  0, 0);
+        return 0;
+    } " HAVE_PTHREAD_SETSCHEDPARAM
+)
+GR_ADD_COND_DEF(HAVE_PTHREAD_SETSCHEDPARAM)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include <sched.h>
+    int main(){
+        pid_t pid;
+        sched_setscheduler(pid, 0, 0);
+        return 0;
+    } " HAVE_SCHED_SETSCHEDULER
+)
+GR_ADD_COND_DEF(HAVE_SCHED_SETSCHEDULER)
+
+########################################################################
+# Include subdirs rather to populate to the sources lists.
+########################################################################
+GR_INCLUDE_SUBDIRECTORY(msg)
+GR_INCLUDE_SUBDIRECTORY(pmt)
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+include_directories(${GRUEL_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+list(APPEND gruel_sources
+    realtime.cc
+    sys_pri.cc
+    thread_body_wrapper.cc
+    thread_group.cc
+)
+
+add_library(gruel SHARED ${gruel_sources})
+target_link_libraries(gruel ${Boost_LIBRARIES})
+GR_LIBRARY_FOO(gruel RUNTIME_COMPONENT "gruel_runtime" DEVEL_COMPONENT "gruel_devel")
+
+########################################################################
+# Setup tests
+# Set the test environment so the build libs will be found under MSVC.
+########################################################################
+if(ENABLE_TESTING)
+
+include_directories(${CPPUNIT_INCLUDE_DIRS})
+link_directories(${CPPUNIT_LIBRARY_DIRS})
+
+include(GrTest)
+set(GR_TEST_TARGET_DEPS gruel)
+list(APPEND test_gruel_sources test_gruel.cc)
+add_executable(test_gruel ${test_gruel_sources})
+target_link_libraries(test_gruel gruel ${CPPUNIT_LIBRARIES})
+GR_ADD_TEST(gruel-test test_gruel)
+
+endif(ENABLE_TESTING)
diff --git a/gr-gpio/src/fpga/top/Makefile.am b/gruel/src/lib/msg/CMakeLists.txt
index 34b00076c..116d2c67f 100644
--- a/gr-gpio/src/fpga/top/Makefile.am
+++ b/gruel/src/lib/msg/CMakeLists.txt
@@ -1,5 +1,4 @@
-#
-# Copyright 2008,2009 Free Software Foundation, Inc.
+# Copyright 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -17,25 +16,13 @@
 # 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.
-# 
-
-include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST += \
-	config.vh    \
-	usrp_gpio.csf \
-	usrp_gpio.esf \
-	usrp_gpio.psf \
-	usrp_gpio.qpf \
-	usrp_gpio.qsf \
-	usrp_gpio.v
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
 
-MOSTLYCLEANFILES += 	\
-	db/*		\
-	*.rpt		\
-	*.summary	\
-	*.qws		\
-	*.smsg		\
-	*.done		\
-	*.pin		\
-	*.sof
+list(APPEND gruel_sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/msg_accepter.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/msg_accepter_msgq.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/msg_queue.cc
+)
diff --git a/gruel/src/lib/pmt/CMakeLists.txt b/gruel/src/lib/pmt/CMakeLists.txt
new file mode 100644
index 000000000..a708fa7ad
--- /dev/null
+++ b/gruel/src/lib/pmt/CMakeLists.txt
@@ -0,0 +1,90 @@
+# Copyright 2010 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.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+########################################################################
+# Generate serial tags header file
+########################################################################
+get_filename_component(SCHEME_DIR
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../scheme/gnuradio ABSOLUTE
+)
+
+get_filename_component(PMT_SERIAL_TAGS_H
+    ${CMAKE_CURRENT_BINARY_DIR}/../../include/gruel/pmt_serial_tags.h ABSOLUTE
+)
+
+add_custom_command(
+    OUTPUT ${PMT_SERIAL_TAGS_H}
+    DEPENDS ${SCHEME_DIR}/gen-serial-tags.py
+    DEPENDS ${SCHEME_DIR}/pmt-serial-tags.scm
+    COMMAND ${PYTHON_EXECUTABLE}
+        ${SCHEME_DIR}/gen-serial-tags.py
+        ${SCHEME_DIR}/pmt-serial-tags.scm
+        ${PMT_SERIAL_TAGS_H}
+)
+
+install(
+    FILES ${PMT_SERIAL_TAGS_H}
+    DESTINATION ${GR_INCLUDE_DIR}/gruel
+    COMPONENT "gruel_devel"
+)
+
+include(AddFileDependencies)
+ADD_FILE_DEPENDENCIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/pmt_serialize.cc
+    ${PMT_SERIAL_TAGS_H}
+)
+
+########################################################################
+# Generate other pmt stuff
+########################################################################
+add_custom_command(
+    OUTPUT
+        ${CMAKE_CURRENT_BINARY_DIR}/pmt_unv_int.h
+        ${CMAKE_CURRENT_BINARY_DIR}/qa_pmt_unv.h
+        ${CMAKE_CURRENT_BINARY_DIR}/pmt_unv.cc
+        ${CMAKE_CURRENT_BINARY_DIR}/qa_pmt_unv.cc
+    DEPENDS
+        ${CMAKE_CURRENT_SOURCE_DIR}/generate_unv.py
+        ${CMAKE_CURRENT_SOURCE_DIR}/unv_template.h.t
+        ${CMAKE_CURRENT_SOURCE_DIR}/unv_template.cc.t
+        ${CMAKE_CURRENT_SOURCE_DIR}/unv_qa_template.cc.t
+    COMMAND ${PYTHON_EXECUTABLE} -B -c
+    \"import os,sys\;srcdir='${CMAKE_CURRENT_SOURCE_DIR}'\;sys.path.append(srcdir)\;os.environ['srcdir']=srcdir\;from generate_unv import main\;main()\"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+list(APPEND gruel_sources
+    ${CMAKE_CURRENT_BINARY_DIR}/pmt_unv.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/pmt.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/pmt_io.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/pmt_pool.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/pmt_serialize.cc
+)
+
+list(APPEND test_gruel_sources
+    ${CMAKE_CURRENT_BINARY_DIR}/qa_pmt_unv.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_pmt_prims.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/qa_pmt.cc
+)
diff --git a/gruel/src/lib/pmt/pmt_int.h b/gruel/src/lib/pmt/pmt_int.h
index ea28e37b4..3a5cd382b 100644
--- a/gruel/src/lib/pmt/pmt_int.h
+++ b/gruel/src/lib/pmt/pmt_int.h
@@ -35,7 +35,7 @@
 #define PMT_LOCAL_ALLOCATOR 0		// define to 0 or 1
 namespace pmt {
 
-class pmt_base : boost::noncopyable {
+class GRUEL_API pmt_base : boost::noncopyable {
   mutable boost::detail::atomic_count count_;
 
 protected:
diff --git a/gruel/src/lib/pmt/qa_pmt.h b/gruel/src/lib/pmt/qa_pmt.h
index 43a6dbf67..424c1065b 100644
--- a/gruel/src/lib/pmt/qa_pmt.h
+++ b/gruel/src/lib/pmt/qa_pmt.h
@@ -23,11 +23,12 @@
 #ifndef INCLUDED_QA_PMT_H
 #define INCLUDED_QA_PMT_H
 
+#include <gruel/attributes.h>
 #include <cppunit/TestSuite.h>
 
 //! collect all the tests for pmt
 
-class qa_pmt {
+class __GR_ATTR_EXPORT qa_pmt {
  public:
   //! return suite of tests for all of pmt
   static CppUnit::TestSuite *suite ();
diff --git a/gruel/src/lib/pmt/qa_pmt_prims.cc b/gruel/src/lib/pmt/qa_pmt_prims.cc
index 985361f13..7dec30d56 100644
--- a/gruel/src/lib/pmt/qa_pmt_prims.cc
+++ b/gruel/src/lib/pmt/qa_pmt_prims.cc
@@ -23,6 +23,7 @@
 #include <qa_pmt_prims.h>
 #include <cppunit/TestAssert.h>
 #include <gruel/msg_passing.h>
+#include <boost/format.hpp>
 #include <cstdio>
 #include <cstring>
 #include <sstream>
@@ -54,9 +55,8 @@ qa_pmt_prims::test_symbols()
 
   // generate a bunch of symbols
   for (int i = 0; i < N; i++){
-    char buf[100];
-    snprintf(buf, sizeof(buf), "test-%d", i);
-    v1[i] = mp(buf);
+    std::string buf = str(boost::format("test-%d") % i);
+    v1[i] = mp(buf.c_str());
   }
 
   // confirm that they are all unique
@@ -66,9 +66,8 @@ qa_pmt_prims::test_symbols()
 
   // generate the same symbols again
   for (int i = 0; i < N; i++){
-    char buf[100];
-    snprintf(buf, sizeof(buf), "test-%d", i);
-    v2[i] = mp(buf);
+    std::string buf = str(boost::format("test-%d") % i);
+    v2[i] = mp(buf.c_str());
   }
 
   // confirm that we get the same ones back
diff --git a/gruel/src/lib/pmt/qa_pmt_prims.h b/gruel/src/lib/pmt/qa_pmt_prims.h
index efc5c6050..cc1409ee6 100644
--- a/gruel/src/lib/pmt/qa_pmt_prims.h
+++ b/gruel/src/lib/pmt/qa_pmt_prims.h
@@ -22,10 +22,12 @@
 #ifndef INCLUDED_QA_PMT_PRIMS_H
 #define INCLUDED_QA_PMT_PRIMS_H
 
+#include <gruel/attributes.h>
+#include <gruel/api.h> //reason: suppress warnings
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestCase.h>
 
-class qa_pmt_prims : public CppUnit::TestCase {
+class __GR_ATTR_EXPORT qa_pmt_prims : public CppUnit::TestCase {
 
   CPPUNIT_TEST_SUITE(qa_pmt_prims);
   CPPUNIT_TEST(test_symbols);
diff --git a/gruel/src/lib/realtime.cc b/gruel/src/lib/realtime.cc
index 7397cf3d3..96351f812 100644
--- a/gruel/src/lib/realtime.cc
+++ b/gruel/src/lib/realtime.cc
@@ -132,6 +132,38 @@ namespace gruel {
 
 } // namespace gruel
 
+#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+
+#include <windows.h>
+
+namespace gruel {
+
+    rt_status_t enable_realtime_scheduling(rt_sched_param p){
+
+        //set the priority class on the process
+        int pri_class = (true)? REALTIME_PRIORITY_CLASS : NORMAL_PRIORITY_CLASS;
+        if (SetPriorityClass(GetCurrentProcess(), pri_class) == 0)
+            return RT_OTHER_ERROR;
+
+        //scale the priority value to the constants
+        int priorities[] = {
+            THREAD_PRIORITY_IDLE, THREAD_PRIORITY_LOWEST, THREAD_PRIORITY_BELOW_NORMAL, THREAD_PRIORITY_NORMAL,
+            THREAD_PRIORITY_ABOVE_NORMAL, THREAD_PRIORITY_HIGHEST, THREAD_PRIORITY_TIME_CRITICAL
+        };
+        const double priority = double(p.priority)/(rt_priority_max() - rt_priority_min());
+        size_t pri_index = size_t((priority+1.0)*6/2.0); // -1 -> 0, +1 -> 6
+        pri_index %= sizeof(priorities)/sizeof(*priorities); //range check
+
+        //set the thread priority on the thread
+        if (SetThreadPriority(GetCurrentThread(), priorities[pri_index]) == 0)
+            return RT_OTHER_ERROR;
+
+        //printf("SetPriorityClass + SetThreadPriority\n");
+        return RT_OK;
+    }
+
+} // namespace gruel
+
 #else
 
 namespace gruel {
diff --git a/gruel/src/python/CMakeLists.txt b/gruel/src/python/CMakeLists.txt
new file mode 100644
index 000000000..be5ac956e
--- /dev/null
+++ b/gruel/src/python/CMakeLists.txt
@@ -0,0 +1,52 @@
+# 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.
+
+include(GrPython)
+
+########################################################################
+# Install python files
+########################################################################
+GR_PYTHON_INSTALL(
+    FILES __init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gruel
+    COMPONENT "gruel_python"
+)
+
+GR_PYTHON_INSTALL(
+    FILES pmt/__init__.py
+    DESTINATION ${GR_PYTHON_DIR}/gruel/pmt
+    COMPONENT "gruel_python"
+)
+
+########################################################################
+# Setup unit tests
+########################################################################
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+    get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    set(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gruel/src/python
+        ${CMAKE_BINARY_DIR}/gruel/src/swig
+    )
+    set(GR_TEST_TARGET_DEPS gruel gnuradio-core)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gr-gpio/src/fpga/include/Makefile.am b/gruel/src/scheme/gnuradio/CMakeLists.txt
index 3c891e5d6..4ff4f7feb 100644
--- a/gr-gpio/src/fpga/include/Makefile.am
+++ b/gruel/src/scheme/gnuradio/CMakeLists.txt
@@ -1,5 +1,4 @@
-#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -17,11 +16,11 @@
 # 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.
-# 
 
-include $(top_srcdir)/Makefile.common
+########################################################################
 
-EXTRA_DIST += \
-    common_config_2rxhb_2tx_dig.vh \
-    common_config_2rxint_2tx_dig.vh \
-    common_config_bottom.vh
+install(FILES
+    pmt-serial-tags.scm
+    pmt-serialize.scm
+    macros-etc.scm
+DESTINATION ${GR_PKG_DATA_DIR} COMPONENT "gruel_swig")
diff --git a/usrp/host/include/usrp/Makefile.am b/gruel/src/swig/CMakeLists.txt
index 19504313b..c2769ae27 100644
--- a/usrp/host/include/usrp/Makefile.am
+++ b/gruel/src/swig/CMakeLists.txt
@@ -1,5 +1,4 @@
-#
-# Copyright 2009,2010 Free Software Foundation, Inc.
+# Copyright 2011 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -17,38 +16,26 @@
 # 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.
-#
 
-include $(top_srcdir)/Makefile.common
+########################################################################
+# Setup swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
 
-usrpincludedir = $(includedir)/usrp
+set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS})
+set(GR_SWIG_LIBRARIES gruel)
 
-usrpinclude_HEADERS = \
-	db_base.h \
-	db_basic.h \
-	db_bitshark_rx.h \
-	db_dbs_rx.h \
-	db_dtt754.h \
-	db_dtt768.h \
-	db_flexrf.h \
-	db_flexrf_mimo.h \
-	db_tv_rx.h \
-	db_tv_rx_mimo.h	\
-	db_wbxng.h \
-	db_xcvr2450.h \
-	libusb_types.h \
-	usrp_basic.h \
-	usrp_bytesex.h \
-	usrp_dbid.h \
-	usrp_local_sighandler.h \
-	usrp_prims.h \
-	usrp_slots.h \
-	usrp_standard.h \
-	usrp_subdev_spec.h \
-	usrp_tune_result.h
+GR_SWIG_MAKE(pmt_swig pmt_swig.i)
 
-EXTRA_DIST += \
-	libusb_types.h.in
+GR_SWIG_INSTALL(
+    TARGETS pmt_swig
+    DESTINATION ${GR_PYTHON_DIR}/gruel/pmt
+    COMPONENT "gruel_python"
+)
 
-swiginclude_HEADERS = \
-	db_base.i
+install(
+    FILES gr_intrusive_ptr.i pmt_swig.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "gruel_swig"
+)
diff --git a/gruel/src/swig/Makefile.swig.gen b/gruel/src/swig/Makefile.swig.gen
index c6a2fb956..97aff8104 100644
--- a/gruel/src/swig/Makefile.swig.gen
+++ b/gruel/src/swig/Makefile.swig.gen
@@ -20,20 +20,20 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-# Makefile.swig.gen for gnuradio_core_runtime.i
+# Makefile.swig.gen for pmt_swig.i
 
 ## Default install locations for these files:
 ##
 ## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_runtime
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/pmt_swig
 ## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/gnuradio_core_runtime
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/pmt_swig
 ##
 ## The following can be overloaded to change the install location, but
 ## this has to be done in the including Makefile.am -before-
 ## Makefile.swig is included.
 
-pmt_swig_pythondir_category ?= gruel/pmt_swig
+pmt_swig_pythondir_category ?= gnuradio/pmt_swig
 pmt_swig_pylibdir_category ?= $(pmt_swig_pythondir_category)
 pmt_swig_pythondir = $(pythondir)/$(pmt_swig_pythondir_category)
 pmt_swig_pylibdir = $(pyexecdir)/$(pmt_swig_pylibdir_category)
@@ -44,7 +44,7 @@ pmt_swig_pylibdir = $(pyexecdir)/$(pmt_swig_pylibdir_category)
 pmt_swig_scmlibdir = $(libdir)
 
 # The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/gnuradio_core_runtime
+# is installed, usually /usr/share/guile/site/pmt_swig
 # FIXME: determince whether these should be installed with gnuradio.
 pmt_swig_scmdir = $(guiledir)
 
@@ -105,11 +105,41 @@ _pmt_swig_la_CXXFLAGS =			\
 	$(pmt_swig_la_swig_cxxflags)
 
 python/pmt_swig.cc: pmt_swig.py
-pmt_swig.py: pmt_swig.i
+pmt_swig.py: pmt_swig.i 
 
 # Include the python dependencies for this file
 -include python/pmt_swig.d
 
 endif		# end of if python
 
+if GUILE
+
+pmt_swig_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-pmt_swig.la
+libguile_gnuradio_pmt_swig_la_SOURCES =	\
+	guile/pmt_swig.cc			\
+	$(pmt_swig_la_swig_sources)
+nobase_pmt_swig_scm_DATA = 		\
+	gnuradio/pmt_swig.scm 		\
+	gnuradio/pmt_swig-primitive.scm
+libguile_gnuradio_pmt_swig_la_LIBADD = 	\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(pmt_swig_la_swig_libadd)
+libguile_gnuradio_pmt_swig_la_LDFLAGS = 	\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(pmt_swig_la_swig_ldflags)
+libguile_gnuradio_pmt_swig_la_CXXFLAGS = 	\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(pmt_swig_la_swig_cxxflags)
+
+guile/pmt_swig.cc: gnuradio/pmt_swig.scm
+gnuradio/pmt_swig.scm: pmt_swig.i
+gnuradio/pmt_swig-primitive.scm: gnuradio/pmt_swig.scm
+
+# Include the guile dependencies for this file
+-include guile/pmt_swig.d
+
+endif				# end of GUILE
+
 
diff --git a/gruel/src/swig/pmt_swig.i b/gruel/src/swig/pmt_swig.i
index 34c7d4b7c..276d232a4 100644
--- a/gruel/src/swig/pmt_swig.i
+++ b/gruel/src/swig/pmt_swig.i
@@ -20,7 +20,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-%module pmt
 %include "std_string.i"
 %include "stdint.i"
 %{
@@ -33,7 +32,6 @@
 #include <iosfwd>
 #include <stdexcept>
 #include <gruel/pmt.h>
-using namespace pmt;
 %}
 
 ////////////////////////////////////////////////////////////////////////
@@ -55,10 +53,14 @@ using namespace pmt;
 }
 
 // Template intrusive_ptr for Swig to avoid dereferencing issues
-class pmt_base;
+namespace pmt{
+    class pmt_base;
+}
 //%import <intrusive_ptr.i>
 %import <gr_intrusive_ptr.i>
-%template(swig_int_ptr) boost::intrusive_ptr<pmt_base>;
+%template(swig_int_ptr) boost::intrusive_ptr<pmt::pmt_base>;
+
+namespace pmt{
 
 typedef boost::intrusive_ptr<pmt_base> pmt_t;
 
@@ -777,3 +779,5 @@ std::string pmt_serialize_str(pmt_t obj);
  * \brief Provide a simple string generating interface to pmt's deserialize function
  */
 pmt_t pmt_deserialize_str(std::string str);
+
+} //namespace pmt
diff --git a/usrp/.gitignore b/usrp/.gitignore
deleted file mode 100644
index 4af69afee..000000000
--- a/usrp/.gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-/*.cache
-/*.la
-/*.lo
-/*.pc
-/.deps
-/.la
-/.libs
-/.lo
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/config.cache
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/install-sh
-/ltmain.sh
-/libtool
-/ltmain.sh
-/make.log
-/missing
-/missing
-/stamp-h
-/py-compile
-/stamp-h.in
-/stamp-h1
-/usrp.iss
diff --git a/usrp/Makefile.am b/usrp/Makefile.am
deleted file mode 100644
index cde72e1eb..000000000
--- a/usrp/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2003 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += \
-	usrp.pc.in \
-	usrp.iss.in \
-	usrp.inf
-
-SUBDIRS = host firmware fpga doc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-	usrp.pc
diff --git a/usrp/README b/usrp/README
deleted file mode 100644
index df8277c3c..000000000
--- a/usrp/README
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# README -- the short version
-#
-
-The top level makefile handles the host code and FX2 firmware.
-
-Besides the normal gcc suite and all the auto tools, you'll need
-the SDCC free C compiler to build the firmware.  You MUST
-USE VERSION 2.4.0 or VERSION 2.5.0 due to some problems with variable
-initialization.  http://sdcc.sourceforge.net
-
-
-The high level interface to the USRP using our standard FPGA bitstram
-is contained in usrp/host/lib/usrp_standard.h
-
-If you've got doxygen installed, there are html docs in
-usrp/doc/html/index.html
-
-
-# Compiling the verilog (not required unless you're modifying it)
-
-If you want to build the FPGA .rbf file from source (not required; we
-provide pre-compiled .rbf files in usrp/fpga/rbf directory), you'll
-need Altera's no cost Quartus II development tools.  We're currently
-building with Quartus II 5.1sp1 Web Edition.  The project file is
-usrp/fpga/toplevel/usrp_std/usrp_std.qpf.  The toplevel verilog file
-is usrp/fpga/toplevel/usrp_std/usrp_std.v.  The bulk of the verilog
-modules are contained in usrp/fpga/sdr_lib
-
diff --git a/usrp/doc/.gitignore b/usrp/doc/.gitignore
deleted file mode 100644
index fdf7036a8..000000000
--- a/usrp/doc/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/Makefile
-/Makefile.in
-/html
-/latex
-/man
-/Doxyfile
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/xml
-/usrp_guide.html
diff --git a/usrp/doc/Doxyfile.in b/usrp/doc/Doxyfile.in
deleted file mode 100644
index 33c5bcf03..000000000
--- a/usrp/doc/Doxyfile.in
+++ /dev/null
@@ -1,1158 +0,0 @@
-#
-# Copyright 2001,2004,2005 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.
-# 
-
-# Doxyfile 1.3.7
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = "Universal Software Radio Peripheral"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER         = 
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = 
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 2 levels of 10 sub-directories under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of source 
-# files, where putting all generated files in the same directory would otherwise 
-# cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
-# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, 
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is used 
-# as the annotated text. Otherwise, the brief description is used as-is. If left 
-# blank, the following values are used ("$name" is automatically replaced with the 
-# name of the entity): "The $name class" "The $name widget" "The $name file" 
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = 
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
-# the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = @top_srcdir@/usrp/host \
-                         @top_srcdir@/usrp/doc/other
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
-
-FILE_PATTERNS          = *.h \
-                         *.cc \
-                         *.dox
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = CVS \
-                         @top_srcdir@/usrp/host/swig
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
-
-EXCLUDE_PATTERNS       = moc_*.cc
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = 
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH             = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.
-
-INPUT_FILTER           = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML          = @enable_html_docs@
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE               = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX         = @enable_latex_docs@
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = letter
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML           = @enable_xml_docs@
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = 
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
-
-PREDEFINED             = 
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse the 
-# parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is 
-# recommended to install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = @HAVE_DOT@
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path.
-
-DOT_PATH               = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS           = 
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = YES
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/usrp/doc/Makefile.am b/usrp/doc/Makefile.am
deleted file mode 100644
index 0eddc623a..000000000
--- a/usrp/doc/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright 2001,2005,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-
-SUBDIRS = other
-
-man3dir = $(mandir)/man3
-usrp_docdir  = $(prefix)/share/doc/usrp-$(DOCVER)
-
-EXTRA_DIST += 			\
-	Doxyfile.in		\
-	ddc.eps			\
-	ddc.png			\
-	usrp-block-diagram.eps	\
-	usrp-block-diagram.png	\
-	usrp.jpg		\
-	usrp_guide.xml		
-
-if HAS_XMLTO
-DOCBOOK_HTML_FILES=usrp_guide.html
-all-local: dox docbook-html
-else
-DOCBOOK_HTML_FILES=
-all-local: dox
-endif
-
-dist_usrp_doc_DATA = $(top_srcdir)/usrp/README
-
-dox: html/index.html
-html/index.html:
-	$(MKDIR_P) html
-	@DOXYGEN@
-
-docbook-html: usrp_guide.html
-
-usrp_guide.html: usrp_guide.xml
-	xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html
-	@for i in $(DOCBOOK_HTML_FILES); do \
-		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \
-		$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \
-	done
-	cp -r html $(DESTDIR)$(usrp_docdir)
-
-uninstall-local:
-	$(RM) -fr $(DESTDIR)$(usrp_docdir)/html
-
-clean-local:
-	$(RM) -fr latex html man xml $(DOCBOOK_HTML_FILES)
diff --git a/usrp/doc/ddc.eps b/usrp/doc/ddc.eps
deleted file mode 100644
index 8931a16a4..000000000
--- a/usrp/doc/ddc.eps
+++ /dev/null
@@ -1,3105 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0 
-%%BoundingBox: 0 0 755 575
-%%Pages: 0
-%%Creator: Sun Microsystems, Inc.
-%%Title: none
-%%CreationDate: none
-%%LanguageLevel: 2
-%%EndComments
-%%BeginPreview: 760 575 1 1725 
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000010008000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000300FE001800C100000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000701CF001800C300000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000F03830018000300000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000003F03000018000300000000000
-%00000000000000001F800000000000031800000000000000000000000000780000000000000000
-%000000000000000000000000000000000000000000F00019C03000000000000000000000000000
-%0000000007303000019E0CFC0000000000
-%00000000000000007FE00000000000031800000000000000C00000000000F80000000000000000
-%000000000000000000000000000000000000000001E00019C03000000000000000000000000000
-%000000000030638001FF0C7C0000000000
-%000000000000000060700000000000030000000000000000C00000000000C00000000000000000
-%000000000000000000000000000000000000000003000019E03000000000000000000000000000
-%0000000000307FE001C38C300000000000
-%0000000000000000E0380000000000030000000000000000C00000000000C00000000000000000
-%000000000000000000000000000000000000000003000031F03000000000000000000000000000
-%000000000030787001C18C300000000000
-%0000000000000000E0000C04202002030842002100110181F01000000001F02000000000000000
-%000000000000000000000000000000000000000007C08031B03000000000000000000000000000
-%000000000030703001818C300000000000
-%0000000000000000E0007F86FDF87FC3187FC0FF803F8FF1F8FE001FFC03F9FC00000000000000
-%00000000000000000000000000000000000000000FE7F031B83000000000000000000000000000
-%0000000000307033F181CC300000000000
-%00000000000000007C00E3879FBC78C31879C1CF803F9C70E1C7001FFC00C38E00000000000000
-%0000000000000000000000000000000000000000030E38219C3000000000000000000000000000
-%0000000000307033F981CC300000000000
-%00000000000000003FC0C1C70E0C70631860E30780381838C38300000000C30600000000000000
-%0000000000000000000000000000000000000000030C18618C3000000000000000000000000000
-%00000000003070300181CC300000000000
-%000000000000000007E000C60E0C60631860630380380038C30180000000C30000000000000000
-%0000000000000000000000000000000000000000030C00618E3000000000000000000000000000
-%000000000030303001818C300000000000
-%000000000000000000F001C60E0C60731860670380380038C30380000000C3C000000000000000
-%0000000000000000000000000000000000000000030F804187300001B6DBFFFB6DB00000000000
-%000000000030303001C18C300000000000
-%000000000000000000383FC60E0C60331860670380380FF8C3FF801FFC00C1FC00000000000000
-%00000000000000000000000000000000000000000307F041833000000000000000000000000000
-%0000000000301C6001E30C300000000000
-%0000000000000001C018F8C60E0C60731860670380381E38C300001FFC00C03E00000000000000
-%00000000000000000000000000000000000000000300F8C183B000000000000000000000000000
-%0000000000300FC001FF0C3C0000000000
-%0000000000000001C019C0C60E0C60731860670380383838C30000000000C00700000000000000
-%000000000000000000000000000000000000000003001CC181F000000000000000000000000000
-%0000000000300780019C0C1C0000000000
-%0000000000000000E039C1C60E0C70631860630380383038C30180000000C30700000000000000
-%0000000000000000000000000000000000000000030C0C8180F000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000F071C1C60E0C70E31860638780383078E38380000000C30600000000000000
-%0000000000000000000000000000000000000000030C1D8180F000000000000000080000000000
-%0000000000000000000000000000000000
-%00000000000000007FE0E7C60E0C7FC3186061FF80381CF8F9FF00000000C3DE00000000000000
-%00000000000000000000000000000000000000000307F981807000000000000000040000000000
-%0000000000000000000000000000000000
-%00000000000000001FC07CC60E0C7F83186060FB80380F98787C00000000C0FC00000000000000
-%00000000000000000000000000000000000000000303F181803000000000000000020000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000060000000000300000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000060000000030300000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000060000000038700000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000006000000001FE00000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000060000000007800000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000008000000000
-%0008000000000000000018000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000004000000000
-%000C000180000060000018000000001000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000C000380000060000018000000003000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000004000000000
-%000C000380000060000018000000003000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000C000380000060000018000000003000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%03DC1F87E1F001F87E0019E01F00F87E00
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000001000000000
-%0FFC7FC7C7FC00F0FF001FF83FC3FC7C00
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%1C3C60C38E0C0061C3801C1870E30E3000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000001000000000
-%181C60E38C0C006181801C1CE063043000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000800000000
-%181C00E3800C006300C0181CC033803000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%381C0FE381FC006300C0181CC033F03000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000400000000
-%380C7FE387FC006300C0181CC030FC3000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%181C60E38E0C006300C0181CC0300E3000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%181CC0E38C0C006381C0181CC072063000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%1C1CC0E38C1C00618180181C6067063800
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0E3CE1E38E3C0071C380181C70E38E3800
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000100000000
-%07FC7F61E7EC0078FF00181C3FC1FC1E00
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000100000000
-%01881C60E3C600383C0018080F00F00E00
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000080000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000080000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000040000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000040000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000020000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000020000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000003000000C01803C03FC00000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000003000000C0180FF03FF00000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000003000000C0181E7C38F80000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000C018301C301C0000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000008000000
-%000000000000000C018300C301C0000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000004000000
-%00000603307E000C0183000301C0000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000070330FF800C0183C0030180000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000002000000
-%0000030631C1800C0181FC030380000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000002000000
-%000003063181800C01807F03FF00000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000001863001800C018007C3FF80000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000001000000
-%0000018C303F800C018001C301C0000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000018C30FD800C018000E300C0000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000800000
-%000000DC31C1800C018600E300E0000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000800000
-%000000D83181800E038700E300E0000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000F83183800E038380C300C0000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000400000
-%0000007031C78007FF03FF83FFC0000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000007030FD8003FE00FF03FF80000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000203070800070003C03FC00000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000200000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000100000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000040000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000020000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000010000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000010000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000004000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000004000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000002600
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000003E00
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000000000000000000003FE00
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000001FE00
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%00000000000000000000020000000000000000000000000000000000000000000010000000FE00
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000007E00
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000003E00
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000001E00
-%0000000000000000000000000000000000
-%000007000000000004003C00000000000000000000000000000000000F00000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000001E00
-%0000000000000000000000000000000000
-%00000700000000000C007C00000000000000000000000000000000007FE0000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000E00
-%0000000000000000000000000000000000
-%00000700000000000C00600000000000000000000000000000000007FFFE000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000600
-%0000000000000000000000000000000000
-%00000700000000000C0060000000000000000000000000000000001F801F800000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000200
-%0000000000000000000000000000000000
-%00000719E06F03033F01FCDC1E06787800000000000000000000007C0003E00000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000071FF87FC3031F01F8FC7F87FDFC0000000000000000000000F80001F00000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000071E1870E3030C0060E0E1C78F0C0000000000000000000001C00000380000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000071C1C6063030C0060C0C0E7060E00000000000000000000038000001C0000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000071C0C6063030C0060C18067060E00000000000000000000078000000E0000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000007180C6063030C0060C18067060E000000000000000000000CC000001B0000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000007180C6063030C0060C18067060E0000000000000000000018600000318000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000007180C6063030C0060C18067060E0000000000000000000018300000618000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000007180C6063070C0060C1C067060E0000000000000000000030180000C0C000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000001800000000000000000
-%000007180C60E3070C0060C0C0C7060E00000000000000000000300C000180C000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000001800000000000000000
-%000007180C71C38F0C0060C0E1C7060E0000000000000000000060060003006000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000001800000000000000000
-%000007180C7F81FB0F0060C07F87060E0000000000000000000040030006002000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000001800000000000000000
-%000006180C6700F3070060C01E07060600000000000000000000C001800C003000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000001800000000000000000
-%0000000000600000000000000000000000000000000000000000C000C01C003000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000001800000000000000000
-%0000000000600000000000000000000000000000000000000001C0006038003800000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000001800000000000000000
-%0000000000600000000000000000000000000000000000000601C0003070003800000000000000
-%000000000000000000700200000000000000000000000000000000000000000000100000000000
-%0000000060000001800000000000000000
-%00000000006000000000000000000000000000000000000007E1800018E0001800000000000000
-%0000000000000000007F0200000000000000000000000000000000000000000000100000000000
-%000000007E000001800000000000000000
-%00000000000000000000000000000000000000000000000007FD80000DC0001800000000000000
-%0000000000000000007FC200000000000000000000000000000000000000000000100000000000
-%000000007FC00001800000000000000000
-%00000000000000000000000000000000000000000000000007FF80000780001800000000000000
-%0000000000000000007FFA00000003FF0000000060000000000300000000000000100000000000
-%000000007FF00001800000000000000000
-%0000000000000000000000000000000000000000000000000FFF80000700001C00000000000000
-%0000000000000000007FFA00000003FF800000006000000000C300000000000000100000000000
-%00000000FFF00001800000000000000000
-%00000000000000000000000000000000000000000000000007FD80000780001800000000000000
-%0000000000000000007FC20000000301C00000000000000000C000000000000000100000000000
-%000000007FC00001800000000000000000
-%00000000000000000000000000000000000000000000000007F180000DC0001800000000000000
-%0000000000000000007F020000000300E00000000000000000C000000000000000100000000000
-%000000007E000001800000000000000000
-%00000000000001007F0000200000000000000000000000000601800018E0001800000000000000
-%00000000000000000070020000000300601800404210100301E200400420000000100000000000
-%0000000060000001800000000000000000
-%00000000000003807FF003FC0000000000000000000000000001C0003070003800000000000000
-%00000000000000000000020000000300707F03F8637EFC1FE3F31BF03F60000000100000000000
-%0000000000000001800000000000000000
-%00000000000007807FF807FF0000000000000000000000000001C0006038003800000000000000
-%0000000000000000000002000000030030E7871C63CFDE1CF0C31F3879E0000000100000000000
-%0000000000000001800000000000000000
-%00000000000006C0601C0E070000000000000000000000000000C000C018003000000000000000
-%000000000000000000000200000003003181860C6387063030C31C1C60E0000000100000000000
-%0000000000000000000000000000000000
-%00000000000006C0600C1C038000000000000000000000000000C001800C003000000000000000
-%000000000000000000000200000003003181CC006307060030C31C1CE060000000100000000000
-%0000000000000000000000000000000000
-%0000000000000C60600E18018000000000000000000000000000C0030006003000000000000000
-%000000000000000000000200000003003381CC006303060070C3181CC060000000100000000000
-%0000000000000000000000000000000000
-%0000000000000C6060063800000000000000000000000000000040060003002000000000000000
-%0000000000000000000002000000030033FFCC006303060FF0C3181CC060000000100000000000
-%0000000000000000000000000000000000
-%0000000000001C70600638000000000000000000000000000000600C0001806000000000000000
-%0000000000000000000002000000030073800C006303063E30C3181CC060000000100000000000
-%0000000000000000000000000000000000
-%000000000000183060063800000000000000000000000000000020180000C04000000000000000
-%0000000000000000000002000000030063800C006303063030C3181CC060000000100000000000
-%0000000000000000000000000000000000
-%00000000000018306006380000000000000000000000000000003070000060C000000000000000
-%00000000000000000000020000000300E1818E0E6303063030C3181C60E0000000100000000000
-%0000000000000000000000000000000000
-%000000000000383860063800000000000000000000000000000038E0000031C000000000000000
-%00000000000000000000020000000301C1C1860C6303063070C3181C60E0000000100000000000
-%0000000000000000000000000000000000
-%0000000000003FF86006180000000000000000000000000000001CC000001B8000000000000000
-%000000000000000000000200000003FFC0FF87BC63030639F0F3181C3FE0000000100000000000
-%0000000000000000000000000000000000
-%000000000000301C600E180180000000000000000000000000000F8000000F0000000000000000
-%000000000000000000000200000003FF007E01F06303061FB873181C1F60000000100000000000
-%0000000000000000000000000000000000
-%000000000000600C600C1C038000000000000000000000000000070000000E0000000000000000
-%000000000000000000000200000000000000000000000000000000000060000000100000000000
-%0000000000000000000000000000000000
-%000000000000600C601C0E038000000000000000000000000000038000001C0000000000000000
-%000000000000000000000200000000000000000000000000000000004060000000100000000000
-%0000000000000000000000000000000000
-%000000000000E00E6078078F000000000000000000000000000001E00000780000000000000000
-%0000000000000000000002000000000000000000000000000000000061C0000000100000000000
-%0000000000000000000000000000000000
-%000000000000C0067FF003FE000000000000000000000000000000F80001F00000000000000000
-%000000000000000000000200000000000000000000000000000000003F80000000100000000000
-%0000000000000000000000000000000000
-%000000000000C0067FC000F00000000000000000000000000000003E0007C00000000000000000
-%000000000000000000000200000000000000000000000000000000000F00000000100000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000007F07E000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000003FFFC000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000007FE0000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000600000000000000000000
-%00000000000000000000020000000000C000000000007FE0000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000600000000000000000000
-%00000000000000000000020000000000C000000000007FF8000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000600000000000000000000
-%00000000000000000000020000000000C00000000000701C000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000F00000000000000000000
-%00000000000000000000020000000000C00000000000701C000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000F00000000000000000000
-%00000000000000000000020000000000C000E040C080700C0700E00C0000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000F00000000000000000000
-%00000000000000000000020000000000C003F860C180700C3FC3F83F8000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000001F00000000000000000000
-%00000000000000000000020000000000C0071C61E180700C71E31C738000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000001F80000000000000000000
-%00000000000000000000020000000000C00E0E61E180701C60660C61C000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000003F80000000000000000000
-%00000000000000000000020000000000C00C0631E3007FF8006700600000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000003FC0000000000000000000
-%00000000000000000000020000000000C00C0731B3007FF000E3C0780000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%00000000000000000000020000000000C00C0733330070003FE1F83F8000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%00000000000000000000020000000000C00C071B360070007C607C07C000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%00000000000000000000020000000000C00C061B3600700060600E01C000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%00000000000000000000020000000000C00C061E1E007000E0E606C0C000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%00000000000000000000020000000000C00E0E1E1E007000E0E70E60C000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%00000000000000000000020000000000FFC7FC0E1C00700077E3FC7F8000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%00000000000000000000020000000000FFC1F00E1C0070003E61F83F0000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000003
-%C00000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000007000000000000003C0000000000000000000000000000000000040000000000000000001F
-%FC0000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%00000700000000000C007C000000000000000000000000000000000004000000000000000001FC
-%7FC000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%00000700000000000C0060000000000000000000000000000000000004000000000000000007E0
-%07E000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%00000700000000000C006000000000000000000000000000000000000400000000000000001F00
-%00F80000000000000000020000000000000000FFE3180000000000000000000000100000000000
-%0000000000000000000000000000000000
-%00000718E04703021F01F89C1E0238700000000000000000000000000400000000000000007800
-%001C0000000000000000020000000000000000FFE3186000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000071BF07F83033F01FCFC7F87FCFC000000000000000000000000040000000000000000E000
-%000E0000000000000000020000000000000000C000186000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000071F3879C3030C0060FCF1C7CF9C000000000000000000000000040000000000000000E000
-%00070000000000000000020000000000000000C000186000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000071C1C70E3030C0060C0C0C7070E000000000000000000000000040000000000000001E000
-%00038000000000000000020000000000000000C00318F81C046000000000000000100000000000
-%0000000000000000000000000000000000
-%0000071C0C6063030C0060C1C067060E0000000000000000000000000400000000000000033000
-%0007C000000000000000020000000000000000C00318FC7F07F000000000000000100000000000
-%0000000000000000000000000000000000
-%000007180C6063030C0060C18067060E0000000000000000000000000400000000000000061800
-%000CE000000000000000020000000000000000C0031870E387E000000000000000100000000000
-%0000000000000000000000000000000000
-%000007180C6063030C0060C18067060E0000000000000000000000000400000000000000061C00
-%00187000000000000000020000000000000000FFC3186181870000000000000000100000000000
-%0000000000000000000000000000000000
-%000007180C6063030C0060C18067060E0000000000000000000000000400000000000000040E00
-%00307000000000000000020000000000000000FFC3186180C60000000000000000100000000000
-%0000000000000007C00000000000000000
-%000007180C6063030C0060C18067060E00000000000000000000000004000000000000000C0700
-%00603800000000000000020000000000000000C0031861FFC60000000000000000100000000000
-%000000000000001FF00000000000000000
-%000007180C6063070C0060C0C0E7060E0000000000000000000000000400000000000000180380
-%00C03800000000000000020000000000000000C0031861FFC60000000000000000100000000000
-%00000000000000383C0000000000000000
-%000007180C70C3070C0060C0E1C7060E00000000000000000000000004000000000000001801C0
-%01801800000000000000020000000000000000C003186180060000000000000000100000000000
-%00000000000000701C0000000000000000
-%000007180C7FC3FF0F0060C07F87060E00000000000000000000000004000000000000003000E0
-%03001C00000000000000020000000000000000C003186180060000000000000000100000000000
-%00000000000000E00E0000000000000000
-%000007180C6F00F3070060C03F07060E0000000000000000000000000400000000000000300060
-%06000C00000000000000020000000000000000C003186180C60000000000000000100000000000
-%00000000000000C0060000000000000000
-%000000000060000000000000000000000000000000000000000000000400000000000000300030
-%0C000C00000000000000020000000000000000C0031871C1860000000000000000100000000000
-%00000000000001C0070000000000000000
-%000000000060000000000000000000000000000000000000000000000400000000000C00300018
-%18000400000000000070020000000000000000C003187CFF860000000000000000100000000000
-%00000000600001C0070000000000000000
-%000000000060000000000000000000000000000000000000000000000400000000000FE060000E
-%3000060000000000007F020000000000000000C003183C3E060000000000000000100000000000
-%000000007E0001C0070000000000000000
-%000000000060000000000000000000000000000000000000000000000400000000000FF8600006
-%6000060000000000007FC200000000000000000000000000000000000000000000100000000000
-%000000007FC001C0070000000000000000
-%000000000060000000000000000000000000000000000000000000000400000000000FFF600003
-%C000060000000000007FFA00000000000000000000000000000000000000000000100000000000
-%00000000FFF001C0070000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000FFE600001
-%C000060000000000007FFA00000000000000000000000000000000000000000000100000000000
-%00000000FFF000C0060000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000FF8600003
-%C000060000000000007FC200000000000000000000000000000000000000000000100000000000
-%000000007FC000C0060000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000FE0600006
-%6000060000000000007F0200000000000000000000000000000000000000000000100000000000
-%000000007E000060EC0000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000C0060000C
-%380006000000000000700200000000000000000000000000000000000000000000100000000000
-%00000000600000707C0000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000700018
-%180006000000000000000200000000000000000000000000000000000000000000100000000000
-%000000000000003FFC0000000000000000
-%00000000000003807FE001FC000000000000000000000000000000000400000000000000300030
-%0C000C000000000000000200000000000000000000000000000000000000000000100000000000
-%000000000000000FEE0000000000000000
-%00000000000003807FF807FE000000000000000000000000000000000400000000000000300070
-%07000C000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000030000000000000000
-%00000000000006C0603C0E070000000000000000000000000000000004000000000000003000E0
-%03000C000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%00000000000006C0600C0C038000000000000000000000000000000004000000000000003001C0
-%01801C000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000000000000EE0600E1801800000000000000000000000000000000400000000000000180380
-%00E018000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000000000000C60600E1800000000000000000000000000000000000400000000000000180700
-%007038000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000000000000C60600638000000000000000000000000000000000004000000000000000C0E00
-%003838000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000000000001C70600638000000000000000000000000000000000004000000000000000C1C00
-%001C70000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000183060063800000000000000000000000000000000000400000000000000061800
-%000E70000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000183860063800000000000000000000000000000000000400000000000000033000
-%0007E0000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000000000003FF86006380000000000000000000000000000000000040000000000000001A000
-%000380000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000000000003FF8600E180180000000000000000000000000000000040000000000000000C000
-%000300000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000701C600E1C0180000000000000000000000000000000040000000000000000E000
-%000700000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000600C601C0C03800000000000000000000000000000000400000000000000007C00
-%003E00000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000E00E603C0F07000000000000000000000000000000000400000000000000003E00
-%00FC00000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000E00E7FF807FE000000000000000000000000000000000400000000000000000F80
-%01F000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000C0067FE001F80000000000000000000000000000000004000000000000000003FC
-%3F8000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000000004000000000000000000FF
-%FF0000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000040000000000000000001F
-%F80000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000001
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000200000000000000000000000000000000000000000000100000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000003
-%0000000000000000000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE00000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000003
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000007
-%00000000000000000000000000000000000000000000C000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000007
-%80000000000000000000000000000000000000000000C000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000040000000000000000000F
-%80000000000000000000000000000000000000000001E000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000040000000000000000000F
-%80000000000000000000000000000000000000000001E000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000040000000000000000000F
-%C0000000000000000000000000000000000000000001E000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000040000000000000000000F
-%C0000000000000000000000000000000000000000003F000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000040000000000000000000F
-%C0000000000000000000000000000000000000000003F000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000040000000000000000001F
-%C0000000000000000000000000000000000000000003F000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%00000000000000000000000000000000000000000003F000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%00000000000000000000000000000000000000000007F800000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%00000000000000000000000000000000000000000000C000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000C00000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000C00000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000800000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000007E0C6FC00400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000E70C7FE00400000000000000000000
-%0007807807C0000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000C38C70600400000000000000000000
-%001FC1FE0FE0000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000C00C60600400000000000000000000
-%003863871870000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000F00C60600400000000000000000000
-%003033039830000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000007E0C60600400000000000000000000
-%007007019800000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000001F8C60600400000000000000000000
-%006007019F80000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000038C60600400000000000000000000
-%0060060187E0000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000818C60600400000000000000000000
-%0060070180F0000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000C18C60600400000000000000000000
-%007037018038000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000E38C60600400000000000000000000
-%003033039838000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000007F0C60600400000000000000000000
-%003863871830000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%001FE1FE0FF0000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%0007807C07C0000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000400000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-%FFFFFFFFFFFFFFFFC0000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000000000000001803003E000F800000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000000000000001C0300FF803FE00000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000000000000001E0303C1C070780000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000000000000001E030300C0E0380000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000000000000001F030700E1C01C0000
-%00000000000000004000000000000001FF00000000006000018006086000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000000000000001B83060001800C0000
-%00000000000000004000000000000001FFC0000000006000018006186000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000000000000019C30E0003800E0000
-%0000000000000000400000000000000180C0000000006000000006186000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000000000000019C30E0003800E0000
-%0000000000000000400000000000000180E0000000006000000006186000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000000000000018E30C0003800E0000
-%0000000000000000400000000000000180603C08E00E66060D80C67E6700000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000000000000018630E0003800E0000
-%000000000000000040000000000000018060FF1FF83FE30E0D83F67E6FC0000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000000000000018330E0003800E0000
-%0000000000000000400000000000000180C1C71F3871E30E0D871E1878E0000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000183B060061800C0000
-%00000000000000004000000000000001FF83831C1C60E30F198E0E187060000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000181B060061800C0000
-%00000000000000004000000000000001FF80031C0CE0630B198C0E186060000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000181F0700E0C01C0000
-%0000000000000000400000000000000181E0071C0CE0619B198C06186060000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000180F0381C0E0380000
-%000000000000000040000000000000018060FF1C0CC0619B318C06186060000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000180701FF807FF00000
-%000000000000000040000000000000018071E31C0CC06199B18C06186060000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000180700FF001FC00000
-%000000000000000040000000000000018073831C0CE060F1B18C06186060000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000018073031C0C6060F1E18E0E186060000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%0000000000000000400000000000000180E3071C0C70E0F0E1861E186060000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%00000000000000004000000000000001FFC1FF9C0C3FE070E187FE1E6060000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%00000000000000004000000000000001FF80F99C0C0F6060E181E60E6060000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000003E0300000000006000FC00000003
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000FF830000000000C003FF00000003
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000001C1C00000000000C0070780000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000380E00000000000C00E0180000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000380400000000000800C01C0000000
-%000000000000000040000000000000000C000000180000000010C0000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000380031BF81F8001801C0001FC1FC3
-%1BF03F800000000040000000000000000C000000180000000030C0000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000001F0031F3839C001801800039E38E3
-%1F3879C00000000040000000000000000C00000000000000003000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000FE031C1C60600100180007073063
-%1C1860E00000000040000000000000000C00000000000000003000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000001FC31C0C60700300180006033003
-%1C1CC060000000004000000000000001CC07001C18CF0E01F07CC07819E0000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000003C31C0CE070030018000E033C03
-%181CE060000000004000000000000007EC1FC07F18FFBF83FC7CC0FE1BF0000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000000E31C0CFFF0030018000E031FC3
-%181CFFE000000000400000000000000E3C38E0E398F1F3861C30C1C71E38000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000300631C0CE00006001C00CE0303E3
-%181CC00000000000400000000000000C1C6070C198E0C18E0C30C3839C18000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000300631C0CE00006000C01CE030073
-%181CC0000000000040000000000000180C60318018E0C1800C30C3019818000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000380631C0C606006000E0186073073
-%181CE0600000000040000000000000180C7FF18018C0C1803C30C301981C000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000003C0C31C0C70600400070387063073
-%181C70E00000000040000000000000180C7FF18018C0C183FC30C701981C000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000001FFC31C0C3DE00C0003FF03DE3DE3
-%181C3BC00000000040000000000000180C60018018C0C1878C30C701981C000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000007F031C0C1F800C0001FC01F80FC3
-%181C1F800000000040000000000000180C60018098C0C18C0C30C301981C000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%0000000000000000400000000000000C1C7031C1D8C0C18C0C30C301981C000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%0000000000000000400000000000000E1C7060C198C0C18C1C30C383981C000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%00000000000000004000000000000007FC3FE07F18C0C187FE3EC1FF181C000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%00000000000000004000000000000003CC0F803E18C0C183E61EC07C181C000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000000007E000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000000001FF800000000000000006000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000381C00000000000000006000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000700E00000000000000006000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000000060060300860030110180F818
-%088000000000000040000000000000001E00000010000000000000380700000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000E0001FC0DF81FC3F8FF0F8FE
-%0FE000000000000040000000000000003E000000300000000000003C0700000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000C0003CE0F9C38E3F9C7061C7
-%0FC0000000000000400000000000000030000000300000000000003C0700000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000C0003030E0C3073818386383
-%8E00000000000000400000000000000030000000300000000000003E0700000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000C0FE6030C0E6033800386301
-%8C000000000000004000000000000000FE1F00F07E1F037007FF00360700000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000C0FF7030C0E7033800386301
-%CC000000000000004000000000000000FE7FC1FC7C3F83F007FF00330700000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000C0077FF0C0E7FF380FF86301
-%CC0000000000000040000000000000003061C38E3071C3D0000000338700000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000E0076000C0E600381E386301
-%CC00000000000000400000000000000030E0C70630C0E38000000031C700000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000E0076000C0E6003838386301
-%CC0000000000000040000000000000003000C60030C0630000000030C700000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000000070077030C0E7033830386301
-%8C0000000000000040000000000000003007C60030C0630000000030E700000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000381E3870C0E3073830786383
-%8C000000000000004000000000000000303FC60031C0730007FF00307700000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000800000000000001FFC1FE0C0E3FE381CF879FF
-%0C0000000000000040000000000000003070C60030C0630007FF00303700000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000008000000000000007F00FC0C0E0FC380F983C7C
-%0C00000000000000400000000000000030C0C60230C06300000000303F00000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%0000000000000000400000000000000030C0C60630C06300000000301F00000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%0000000000000000400000000000000030E1C30E38E0E300000000300F00000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%00000000000000004000000000000000307FE3FC3E7FC300000000300F00000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%00000000000000004000000000000000303C60F01E1F0300000000300700000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000080000000000000000000000000000000000000
-%000000000000000040000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-%FFFFFFFFFFFFFFFFC0000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000018000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000018000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000000000000003C000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000000000000003C000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000000000000003C000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000000000000007C000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000000000000007C000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000000000000000000FE000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000000000000000000FE000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000000000000000000FF000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000000000000000000FF000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000010000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000001F800000000000000000F000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000007FE00000000C00000001F000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000E0F00000000C000000018000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000001C0300000000C000000018000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000180380000000E000000038000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000380003F837E3F0FC0FC07F7F1FC07EC606
-%0FE0DF81FC60700000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000003800073C3CF0C1CE0FC0187F3CE0E7C606
-%1C70FBC38E70600000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000030000C0C3870C3030E0018703071C1C606
-%3830E0C30630600000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000030000C0E3030C3038C001870603181C606
-%3018C0C60030E00000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000030001C0E3030C7038C001870703181C606
-%3038C0C60038C00000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000030001FFE3030C7FF8C0018707FF180C606
-%3FF8C0C60018C00000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000038019C003030C7000C001870600180C606
-%3000C0C60019800000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000018019C003030C7000C001870600181C606
-%3000C0C6000D800000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000001C030C0C3030C3030C001870703181C606
-%3018C0C6060D000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000E070E0C3030C3830C0018703871C3C70E
-%3838C0C3060F000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000007FE07BC3030F1EF0C0018703FE0F7C3FE
-%1EF0C0C3DE07000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000003F803F0303070FC0C0018700FC07DC1F6
-%07E0C0C0F806000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000000000000000000001C000
-%000000000006000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000000000000000000001C000
-%000000000006000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000000000000000000001C000
-%00000000001C000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000000000000000000000001C000
-%000000000038000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000008000
-%000000000030000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000001E000187C00000000000003C0
-%0060F8000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000003E00011FF000C0000000007C0
-%0063FC000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000300003183001C000000000E00
-%00670E000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000300003303801C000000380C00
-%004606000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000FC1802301803E030000381F03
-%00C607000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000FC7F06001803F1FC000381F9F
-%C0C006000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000070E706003801C38E000380C18
-%E08006000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000031C386007001C707003FF8C30
-%60800E000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000031C00C00E001C603003FF8C38
-%01801C000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000030F00C01C001C603800380C1E
-%018038000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000FE307E0C038001C603800380C0F
-%C10070000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000FE300F88070001C603800380C03
-%E300E0000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000003003980E0001C603800380C00
-%7303C0000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000003181981C0001C703000380C30
-%330300000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000031C190380001C307000000C38
-%760600000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%0000000000000000000000000000000000000000000000000000030FF103FF800F3FE000000C1F
-%E60FFE000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%00000000000000000000000000000000000000000000000000000307E303FF800F0FC000000C0F
-%C60FFF000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%%EndPreview
-%%BeginProlog
-%%BeginResource: SDRes
-/b4_inc_state save def
-/dict_count countdictstack def
-/op_count count 1 sub def
-userdict begin
-0 setgray 0 setlinecap 1 setlinewidth 0 setlinejoin 10 setmiterlimit[] 0 setdash newpath
-/languagelevel where {pop languagelevel 1 ne {false setstrokeadjust false setoverprint} if} if
-/bdef {bind def} bind def
-/c {setgray} bdef
-/l {neg lineto} bdef
-/rl {neg rlineto} bdef
-/lc {setlinecap} bdef
-/lj {setlinejoin} bdef
-/lw {setlinewidth} bdef
-/ml {setmiterlimit} bdef
-/ld {setdash} bdef
-/m {neg moveto} bdef
-/ct {6 2 roll neg 6 2 roll neg 6 2 roll neg curveto} bdef
-/r {rotate} bdef
-/t {neg translate} bdef
-/s {scale} bdef
-/sw {show} bdef
-/gs {gsave} bdef
-/gr {grestore} bdef
-/f {findfont dup length dict begin
-{1 index /FID ne {def} {pop pop} ifelse} forall /Encoding ISOLatin1Encoding def
-currentdict end /NFont exch definefont pop /NFont findfont} bdef
-/p {closepath} bdef
-/sf {scalefont setfont} bdef
-/ef {eofill}bdef
-/pc {closepath stroke}bdef
-/ps {stroke}bdef
-/pum {matrix currentmatrix}bdef
-/pom {setmatrix}bdef
-/bs {/aString exch def /nXOfs exch def /nWidth exch def currentpoint nXOfs 0 rmoveto pum nWidth aString stringwidth pop div 1 scale aString show pom moveto} bdef
-%%EndResource
-%%EndProlog
-%%BeginSetup
-%%EndSetup
-%%Page: 1 1
-%%BeginPageSetup
-%%EndPageSetup
-pum
-0.02834 0.02833 s 
-0 -20290 t
-/tm matrix currentmatrix def
-gs
-tm setmatrix
--635 -635 t 
-1 1 s 
-635 635 m 27274 635 l 27274 20924 l 635 20924 l 635 635 l eoclip newpath
-0 lw 1 lj 0.000 c 17781 10461 m  14606 10461 l  14606 6016 l  20956 6016 l 
-20956 10461 l  17781 10461 l  pc
-gs
-pum
-15663 7567 t
-65 0 m  65 -606 l  274 -606 l  321 -606 357 -603 382 -597 ct 416 -589 446 -575 471 -554 ct 
-503 -527 526 -492 542 -450 ct 558 -408 566 -360 566 -306 ct 566 -260 561 -219 550 -184 ct 
-539 -148 525 -119 509 -95 ct 492 -72 473 -54 453 -40 ct 433 -27 409 -17 381 -10 ct 
-353 -3 320 0 284 0 ct p
-145 -71 m  275 -71 l  315 -71 346 -75 369 -82 ct 391 -90 409 -100 423 -114 ct 
-442 -133 457 -158 467 -190 ct 478 -222 483 -261 483 -307 ct 483 -371 473 -419 452 -453 ct 
-431 -487 406 -510 376 -522 ct 355 -530 320 -534 272 -534 ct 145 -534 l  p ef
-965 -141 m  1042 -131 l  1030 -86 1007 -52 975 -27 ct 942 -2 900 9 849 9 ct 
-785 9 734 -9 696 -49 ct 658 -88 640 -144 640 -215 ct 640 -289 659 -347 697 -387 ct 
-735 -428 784 -449 845 -449 ct 903 -449 951 -429 989 -389 ct 1026 -349 1044 -292 1044 -220 ct 
-1044 -216 1044 -209 1044 -200 ct 716 -200 l  719 -152 733 -115 757 -89 ct 782 -64 813 -51 849 -51 ct 
-877 -51 900 -58 919 -72 ct 938 -87 l  954 -110 l  p
-721 -261 m  966 -261 l  963 -298 953 -326 938 -344 ct 914 -373 883 -387 845 -387 ct 
-811 -387 783 -376 759 -353 ct 736 -330 l  723 -300 l  p ef
-1427 -160 m  1500 -151 l  1492 -100 1472 -61 1439 -32 ct 1406 -4 1365 9 1317 9 ct 
-1257 9 1209 -9 1172 -49 ct 1136 -88 1118 -144 1118 -217 ct 1118 -265 1125 -306 1141 -342 ct 
-1157 -378 1181 -404 1213 -422 ct 1245 -440 1280 -449 1318 -449 ct 1365 -449 1404 -437 1435 -412 ct 
-1465 -388 1485 -354 1493 -310 ct 1421 -299 l  1414 -328 1402 -350 1384 -365 ct 
-1367 -380 1345 -387 1321 -387 ct 1283 -387 1253 -374 1229 -347 ct 1206 -320 1194 -278 1194 -220 ct 
-1194 -161 1205 -118 1228 -91 ct 1251 -64 1280 -51 1317 -51 ct 1346 -51 1370 -60 1390 -78 ct 
-1409 -96 l  1422 -123 l  p ef
-1564 -520 m  1564 -606 l  1638 -606 l  1638 -520 l  p
-1564 0 m  1564 -439 l  1638 -439 l  1638 0 l  p ef
-1748 0 m  1748 -439 l  1815 -439 l  1815 -377 l  1829 -399 1847 -416 1870 -429 ct 
-1893 -442 1919 -449 1948 -449 ct 1981 -449 2007 -442 2028 -428 ct 2049 -415 2064 -396 2072 -372 ct 
-2107 -423 2152 -449 2208 -449 ct 2251 -449 2285 -437 2308 -412 ct 2332 -388 2343 -351 2343 -301 ct 
-2343 0 l  2269 0 l  2269 -276 l  2269 -306 2267 -327 2262 -340 ct 2257 -354 2249 -364 2236 -372 ct 
-2223 -380 2208 -384 2191 -384 ct 2160 -384 2135 -374 2114 -353 ct 2094 -333 2084 -300 2084 -255 ct 
-2084 0 l  2009 0 l  2009 -285 l  2009 -318 2003 -343 1991 -359 ct 1979 -376 1959 -384 1932 -384 ct 
-1911 -384 1891 -379 1873 -368 ct 1856 -357 1843 -340 1835 -319 ct 1827 -298 1823 -267 1823 -227 ct 
-1823 0 l  p ef
-2750 -54 m  2722 -30 2696 -14 2670 -4 ct 2645 5 2617 9 2588 9 ct 2540 9 2503 -1 2477 -25 ct 
-2451 -49 2438 -79 2438 -115 ct 2438 -137 2443 -156 2453 -174 ct 2463 -192 2475 -206 2491 -217 ct 
-2507 -228 2525 -236 2545 -241 ct 2559 -245 2581 -249 2611 -253 ct 2671 -260 2715 -268 2744 -278 ct 
-2744 -288 2744 -295 2744 -298 ct 2744 -328 2737 -349 2723 -362 ct 2704 -379 2676 -387 2638 -387 ct 
-2603 -387 2577 -381 2561 -369 ct 2544 -356 2532 -335 2524 -303 ct 2451 -313 l 
-2458 -345 2468 -370 2484 -389 ct 2499 -408 2521 -423 2549 -433 ct 2578 -443 2611 -449 2649 -449 ct 
-2687 -449 2717 -444 2740 -435 ct 2764 -427 2781 -415 2792 -402 ct 2803 -389 2811 -372 2815 -351 ct 
-2818 -339 2819 -316 2819 -283 ct 2819 -184 l  2819 -114 2821 -71 2824 -52 ct 
-2827 -34 2833 -16 2843 0 ct 2765 0 l  2757 -15 l  2752 -33 l  p
-2744 -220 m  2717 -209 2676 -200 2622 -192 ct 2592 -187 2570 -182 2557 -177 ct 
-2545 -171 2535 -163 2528 -153 ct 2521 -142 2518 -130 2518 -117 ct 2518 -98 2525 -81 2540 -68 ct 
-2555 -55 2577 -48 2606 -48 ct 2635 -48 2660 -54 2683 -67 ct 2705 -79 2721 -96 2732 -118 ct 
-2740 -135 2744 -160 2744 -193 ct p ef
-3076 -66 m  3087 0 l  3066 3 3047 5 3030 5 ct 3003 5 2982 1 2968 -7 ct 2953 -15 2942 -26 2936 -40 ct 
-2930 -54 2927 -83 2927 -128 ct 2927 -381 l  2872 -381 l  2872 -439 l  2927 -439 l 
-2927 -547 l  3001 -592 l  3001 -439 l  3076 -439 l  3076 -381 l  3001 -381 l 
-3001 -124 l  3001 -103 3002 -89 3005 -83 ct 3008 -77 3012 -72 3018 -69 ct 3024 -65 3032 -63 3043 -63 ct 
-3051 -63 l  3062 -64 l  p ef
-3152 -520 m  3152 -606 l  3226 -606 l  3226 -520 l  p
-3152 0 m  3152 -439 l  3226 -439 l  3226 0 l  p ef
-3336 0 m  3336 -439 l  3403 -439 l  3403 -376 l  3436 -425 3482 -449 3543 -449 ct 
-3570 -449 3594 -444 3616 -434 ct 3638 -425 3655 -412 3666 -397 ct 3677 -382 3685 -363 3689 -342 ct 
-3692 -328 3693 -304 3693 -270 ct 3693 0 l  3619 0 l  3619 -267 l  3619 -297 3616 -320 3610 -335 ct 
-3604 -350 3594 -362 3579 -371 ct 3565 -380 3547 -384 3527 -384 ct 3496 -384 3468 -374 3445 -354 ct 
-3422 -334 3411 -296 3411 -239 ct 3411 0 l  p ef
-3799 36 m  3871 47 l  3874 69 3883 85 3896 95 ct 3915 109 3940 116 3972 116 ct 
-4006 116 4033 109 4052 95 ct 4071 82 4083 62 4090 38 ct 4094 22 4095 -8 4095 -57 ct 
-4063 -19 4022 0 3974 0 ct 3913 0 3867 -21 3833 -65 ct 3800 -108 3784 -161 3784 -222 ct 
-3784 -264 3791 -302 3807 -338 ct 3822 -373 3844 -400 3873 -420 ct 3901 -439 3935 -449 3974 -449 ct 
-4026 -449 4069 -428 4102 -386 ct 4102 -439 l  4171 -439 l  4171 -59 l  4171 8 4164 57 4150 85 ct 
-4136 114 4114 136 4084 153 ct 4054 169 4017 178 3972 178 ct 3920 178 3878 166 3845 142 ct 
-3813 119 l  3798 83 l  p
-3860 -227 m  3860 -169 3872 -127 3895 -101 ct 3918 -74 3946 -61 3981 -61 ct 
-4015 -61 4044 -74 4067 -101 ct 4090 -127 4101 -168 4101 -224 ct 4101 -278 4090 -319 4066 -346 ct 
-4042 -373 4013 -387 3979 -387 ct 3946 -387 3918 -374 3895 -347 ct 3872 -320 l 
-3860 -280 l  p ef
-pom
-pum
-16007 8520 t
-62 0 m  62 -606 l  142 -606 l  142 -71 l  440 -71 l  440 0 l  p ef
-478 -219 m  478 -300 500 -361 545 -400 ct 583 -432 629 -449 684 -449 ct 744 -449 793 -429 832 -389 ct 
-870 -350 889 -295 889 -225 ct 889 -169 881 -124 864 -92 ct 847 -60 822 -34 790 -16 ct 
-757 0 722 9 684 9 ct 622 9 572 -9 534 -49 ct 497 -88 l  478 -145 l  p
-554 -219 m  554 -163 566 -121 591 -93 ct 615 -65 646 -51 684 -51 ct 721 -51 751 -65 776 -93 ct 
-800 -121 813 -164 813 -222 ct 813 -276 800 -317 776 -345 ct 751 -373 720 -387 684 -387 ct 
-646 -387 615 -373 591 -345 ct 566 -317 l  554 -275 l  p ef
-1062 0 m  928 -439 l  1005 -439 l  1075 -185 l  1101 -91 l  1102 -96 1110 -126 1124 -181 ct 
-1194 -439 l  1270 -439 l  1336 -184 l  1358 -100 l  1383 -185 l  1458 -439 l 
-1531 -439 l  1393 0 l  1316 0 l  1246 -263 l  1229 -337 l  1140 0 l  p ef
-1811 0 m  1811 -606 l  2040 -606 l  2080 -606 2111 -604 2132 -600 ct 2162 -595 2187 -586 2207 -572 ct 
-2227 -558 2243 -538 2255 -513 ct 2268 -488 2274 -461 2274 -430 ct 2274 -379 2257 -335 2224 -300 ct 
-2192 -264 2132 -246 2047 -246 ct 1891 -246 l  1891 0 l  p
-1891 -318 m  2048 -318 l  2100 -318 2136 -327 2158 -346 ct 2180 -366 2191 -393 2191 -428 ct 
-2191 -453 2185 -475 2172 -493 ct 2159 -511 2142 -523 2121 -529 ct 2108 -532 2083 -534 2046 -534 ct 
-1891 -534 l  p ef
-2644 -54 m  2616 -30 2590 -14 2564 -4 ct 2539 5 2511 9 2482 9 ct 2434 9 2397 -1 2371 -25 ct 
-2345 -49 2332 -79 2332 -115 ct 2332 -137 2337 -156 2347 -174 ct 2357 -192 2369 -206 2385 -217 ct 
-2401 -228 2419 -236 2439 -241 ct 2453 -245 2475 -249 2505 -253 ct 2565 -260 2609 -268 2638 -278 ct 
-2638 -288 2638 -295 2638 -298 ct 2638 -328 2631 -349 2617 -362 ct 2598 -379 2570 -387 2532 -387 ct 
-2497 -387 2471 -381 2455 -369 ct 2438 -356 2426 -335 2418 -303 ct 2345 -313 l 
-2352 -345 2362 -370 2378 -389 ct 2393 -408 2415 -423 2443 -433 ct 2472 -443 2505 -449 2543 -449 ct 
-2581 -449 2611 -444 2634 -435 ct 2658 -427 2675 -415 2686 -402 ct 2697 -389 2705 -372 2709 -351 ct 
-2712 -339 2713 -316 2713 -283 ct 2713 -184 l  2713 -114 2715 -71 2718 -52 ct 
-2721 -34 2727 -16 2737 0 ct 2659 0 l  2651 -15 l  2646 -33 l  p
-2638 -220 m  2611 -209 2570 -200 2516 -192 ct 2486 -187 2464 -182 2451 -177 ct 
-2439 -171 2429 -163 2422 -153 ct 2415 -142 2412 -130 2412 -117 ct 2412 -98 2419 -81 2434 -68 ct 
-2449 -55 2471 -48 2500 -48 ct 2529 -48 2554 -54 2577 -67 ct 2599 -79 2615 -96 2626 -118 ct 
-2634 -135 2638 -160 2638 -193 ct p ef
-2778 -131 m  2851 -142 l  2855 -113 2867 -90 2886 -74 ct 2905 -59 2931 -51 2965 -51 ct 
-2999 -51 3024 -58 3041 -72 ct 3058 -86 3066 -102 3066 -121 ct 3066 -138 3059 -151 3044 -160 ct 
-3034 -167 3008 -175 2968 -186 ct 2913 -199 2875 -211 2854 -221 ct 2833 -231 2817 -245 2806 -263 ct 
-2795 -281 2790 -301 2790 -322 ct 2790 -342 2794 -360 2803 -376 ct 2812 -393 2825 -407 2840 -418 ct 
-2852 -427 2867 -434 2887 -440 ct 2907 -446 2929 -449 2952 -449 ct 2986 -449 3016 -444 3042 -434 ct 
-3069 -424 3088 -410 3100 -393 ct 3113 -376 3121 -354 3126 -325 ct 3053 -315 l 
-3050 -338 3040 -356 3024 -368 ct 3008 -381 2986 -387 2957 -387 ct 2923 -387 2898 -382 2884 -370 ct 
-2869 -359 2862 -346 2862 -331 ct 2862 -321 2865 -312 2871 -305 ct 2877 -297 2887 -290 2900 -285 ct 
-2907 -282 2929 -276 2965 -266 ct 3018 -252 3055 -240 3076 -231 ct 3096 -222 3113 -209 3125 -192 ct 
-3136 -175 3142 -154 3142 -129 ct 3142 -104 3135 -80 3121 -58 ct 3106 -37 3085 -20 3058 -8 ct 
-3031 3 3000 9 2965 9 ct 2908 9 2865 -1 2835 -25 ct 2805 -49 l  2786 -84 l  p ef
-3175 -131 m  3248 -142 l  3252 -113 3264 -90 3283 -74 ct 3302 -59 3328 -51 3362 -51 ct 
-3396 -51 3421 -58 3438 -72 ct 3455 -86 3463 -102 3463 -121 ct 3463 -138 3456 -151 3441 -160 ct 
-3431 -167 3405 -175 3365 -186 ct 3310 -199 3272 -211 3251 -221 ct 3230 -231 3214 -245 3203 -263 ct 
-3192 -281 3187 -301 3187 -322 ct 3187 -342 3191 -360 3200 -376 ct 3209 -393 3222 -407 3237 -418 ct 
-3249 -427 3264 -434 3284 -440 ct 3304 -446 3326 -449 3349 -449 ct 3383 -449 3413 -444 3439 -434 ct 
-3466 -424 3485 -410 3497 -393 ct 3510 -376 3518 -354 3523 -325 ct 3450 -315 l 
-3447 -338 3437 -356 3421 -368 ct 3405 -381 3383 -387 3354 -387 ct 3320 -387 3295 -382 3281 -370 ct 
-3266 -359 3259 -346 3259 -331 ct 3259 -321 3262 -312 3268 -305 ct 3274 -297 3284 -290 3297 -285 ct 
-3304 -282 3326 -276 3362 -266 ct 3415 -252 3452 -240 3473 -231 ct 3493 -222 3510 -209 3522 -192 ct 
-3533 -175 3539 -154 3539 -129 ct 3539 -104 3532 -80 3518 -58 ct 3503 -37 3482 -20 3455 -8 ct 
-3428 3 3397 9 3362 9 ct 3305 9 3262 -1 3232 -25 ct 3202 -49 l  3183 -84 l  p ef
-pom
-pum
-16827 9473 t
-69 0 m  69 -606 l  478 -606 l  478 -534 l  149 -534 l  149 -346 l  434 -346 l 
-434 -275 l  149 -275 l  149 0 l  p ef
-585 -520 m  585 -606 l  659 -606 l  659 -520 l  p
-585 0 m  585 -439 l  659 -439 l  659 0 l  p ef
-768 0 m  768 -606 l  842 -606 l  842 0 l  p ef
-1118 -66 m  1129 0 l  1108 3 1089 5 1072 5 ct 1045 5 1024 1 1010 -7 ct 995 -15 984 -26 978 -40 ct 
-972 -54 969 -83 969 -128 ct 969 -381 l  914 -381 l  914 -439 l  969 -439 l 
-969 -547 l  1043 -592 l  1043 -439 l  1118 -439 l  1118 -381 l  1043 -381 l 
-1043 -124 l  1043 -103 1044 -89 1047 -83 ct 1050 -77 1054 -72 1060 -69 ct 1066 -65 1074 -63 1085 -63 ct 
-1093 -63 l  1104 -64 l  p ef
-1494 -141 m  1571 -131 l  1559 -86 1536 -52 1504 -27 ct 1471 -2 1429 9 1378 9 ct 
-1314 9 1263 -9 1225 -49 ct 1187 -88 1169 -144 1169 -215 ct 1169 -289 1188 -347 1226 -387 ct 
-1264 -428 1313 -449 1374 -449 ct 1432 -449 1480 -429 1518 -389 ct 1555 -349 1573 -292 1573 -220 ct 
-1573 -216 1573 -209 1573 -200 ct 1245 -200 l  1248 -152 1262 -115 1286 -89 ct 
-1311 -64 1342 -51 1378 -51 ct 1406 -51 1429 -58 1448 -72 ct 1467 -87 l  1483 -110 l 
-p
-1250 -261 m  1495 -261 l  1492 -298 1482 -326 1467 -344 ct 1443 -373 1412 -387 1374 -387 ct 
-1340 -387 1312 -376 1288 -353 ct 1265 -330 l  1252 -300 l  p ef
-1669 0 m  1669 -439 l  1736 -439 l  1736 -372 l  1753 -403 1768 -424 1783 -434 ct 
-1797 -444 1813 -449 1831 -449 ct 1856 -449 1881 -441 1907 -425 ct 1882 -356 l 
-1863 -366 1845 -372 1827 -372 ct 1811 -372 1796 -367 1783 -357 ct 1770 -347 1761 -334 1755 -316 ct 
-1747 -290 1743 -261 1743 -229 ct 1743 0 l  p ef
-pom
-gr
-11317 10321 m  11312 10318 l  11099 10206 l  11093 10203 l  10924 10032 l 
-10921 10026 l  10811 9811 l  10808 9805 l  10769 9556 l  10769 9549 l 
-10808 9299 l  10811 9293 l  10921 9078 l  10924 9072 l  11093 8901 l  11099 8898 l 
-11312 8786 l  11317 8784 l  11564 8744 l  11571 8744 l  11817 8784 l  11823 8786 l 
-12036 8898 l  12041 8901 l  12210 9072 l  12213 9078 l  12324 9293 l  12326 9299 l 
-12366 9549 l  12366 9556 l  12326 9805 l  12324 9811 l  12213 10026 l 
-12210 10032 l  12041 10203 l  12036 10206 l  11823 10318 l  11817 10321 l 
-11571 10361 l  11564 10361 l  11317 10321 l  p
-11567 10319 m  11806 10279 l  12013 10171 l  12178 10004 l  12285 9794 l 
-12324 9552 l  12285 9310 l  12178 9100 l  12013 8933 l  11806 8825 l  11567 8786 l 
-11328 8825 l  11121 8933 l  10956 9100 l  10849 9310 l  10811 9552 l  10849 9794 l 
-10956 10004 l  11121 10171 l  11328 10279 l  11567 10319 l  p
-11049 9029 m  11079 8998 l  11286 9208 l  11493 9417 l  11700 9627 l  11907 9837 l 
-12115 10048 l  12085 10078 l  11877 9868 l  11670 9658 l  11463 9448 l 
-11255 9238 l  11049 9029 l  p
-11079 10078 m  11049 10049 l  11255 9838 l  11463 9628 l  11670 9418 l 
-11878 9208 l  12086 8998 l  12115 9029 l  11907 9239 l  11700 9449 l  11493 9659 l 
-11286 9869 l  11079 10078 l  p ef
-1 lw 0 lj 11317 10321 m  11312 10318 l  11099 10206 l  11093 10203 l  10924 10032 l 
-10921 10026 l  10811 9811 l  10808 9805 l  10769 9556 l  10769 9549 l 
-10808 9299 l  10811 9293 l  10921 9078 l  10924 9072 l  11093 8901 l  11099 8898 l 
-11312 8786 l  11317 8784 l  11564 8744 l  11571 8744 l  11817 8784 l  11823 8786 l 
-12036 8898 l  12041 8901 l  12210 9072 l  12213 9078 l  12324 9293 l  12326 9299 l 
-12366 9549 l  12366 9556 l  12326 9805 l  12324 9811 l  12213 10026 l 
-12210 10032 l  12041 10203 l  12036 10206 l  11823 10318 l  11817 10321 l 
-11571 10361 l  11564 10361 l  11317 10321 l  pc
-11567 10319 m  11806 10279 l  12013 10171 l  12178 10004 l  12285 9794 l 
-12324 9552 l  12285 9310 l  12178 9100 l  12013 8933 l  11806 8825 l  11567 8786 l 
-11328 8825 l  11121 8933 l  10956 9100 l  10849 9310 l  10811 9552 l  10849 9794 l 
-10956 10004 l  11121 10171 l  11328 10279 l  11567 10319 l  pc
-11049 9029 m  11079 8998 l  11286 9208 l  11493 9417 l  11700 9627 l  11907 9837 l 
-12115 10048 l  12085 10078 l  11877 9868 l  11670 9658 l  11463 9448 l 
-11255 9238 l  11049 9029 l  pc
-11079 10078 m  11049 10049 l  11255 9838 l  11463 9628 l  11670 9418 l 
-11878 9208 l  12086 8998 l  12115 9029 l  11907 9239 l  11700 9449 l  11493 9659 l 
-11286 9869 l  11079 10078 l  pc
-7989 6986 m  7538 6836 l  7539 7136 l  7989 6986 l  p ef
-5716 6986 m  7629 6986 l  ps
-14606 6986 m  14155 6836 l  14156 7136 l  14606 6986 l  p ef
-9526 6986 m  14246 6986 l  ps
-10769 9526 m  10318 9376 l  10319 9676 l  10769 9526 l  p ef
-5716 9526 m  10409 9526 l  ps
-14606 9526 m  14155 9376 l  14156 9676 l  14606 9526 l  p ef
-12426 9526 m  14246 9526 l  ps
-0 lw 1 lj 10061 16546 m  6251 16546 l  6251 12736 l  13871 12736 l  13871 16546 l 
-10061 16546 l  pc
-gs
-pum
-9102 13970 t
-64 0 m  64 -606 l  146 -606 l  465 -130 l  465 -606 l  542 -606 l  542 0 l 
-459 0 l  141 -476 l  141 0 l  p ef
-1106 -212 m  1187 -192 l  1170 -126 1140 -76 1096 -41 ct 1052 -6 999 10 936 10 ct 
-870 10 817 -2 776 -29 ct 735 -56 704 -94 683 -145 ct 661 -195 651 -249 651 -307 ct 
-651 -370 663 -425 687 -472 ct 711 -519 745 -555 790 -580 ct 834 -604 883 -616 937 -616 ct 
-998 -616 1049 -601 1090 -570 ct 1131 -539 1160 -496 1176 -440 ct 1097 -421 l 
-1083 -465 1063 -497 1036 -517 ct 1009 -537 976 -547 935 -547 ct 889 -547 850 -536 818 -514 ct 
-787 -492 765 -462 752 -424 ct 740 -386 733 -348 733 -308 ct 733 -256 741 -211 756 -173 ct 
-771 -134 794 -105 826 -86 ct 858 -67 892 -58 929 -58 ct 974 -58 1012 -71 1043 -97 ct 
-1074 -123 l  1095 -161 l  p ef
-1284 -295 m  1284 -395 1311 -474 1366 -531 ct 1420 -588 1489 -617 1575 -617 ct 
-1631 -617 1681 -603 1726 -576 ct 1771 -550 1805 -512 1829 -465 ct 1852 -417 1864 -362 1864 -302 ct 
-1864 -240 1852 -185 1827 -137 ct 1802 -88 1767 -52 1722 -27 ct 1676 -2 1627 10 1574 10 ct 
-1517 10 1466 -3 1421 -31 ct 1376 -58 1342 -96 1319 -143 ct 1296 -191 l  1284 -242 l 
-p
-1367 -294 m  1367 -220 1387 -163 1426 -121 ct 1465 -79 1515 -58 1574 -58 ct 
-1634 -58 1684 -79 1723 -122 ct 1762 -164 1782 -224 1782 -302 ct 1782 -352 1773 -395 1757 -431 ct 
-1740 -468 1715 -497 1683 -517 ct 1651 -537 1615 -547 1575 -547 ct 1518 -547 1470 -528 1429 -489 ct 
-1388 -450 l  1367 -385 l  p ef
-pom
-pum
-7514 14923 t
-38 -194 m  113 -201 l  117 -171 125 -146 138 -126 ct 151 -107 172 -91 199 -79 ct 
-227 -67 258 -61 292 -61 ct 323 -61 350 -66 373 -75 ct 397 -84 414 -96 426 -112 ct 
-437 -128 443 -145 443 -164 ct 443 -183 437 -200 426 -214 ct 415 -228 397 -240 372 -250 ct 
-355 -256 319 -266 264 -279 ct 208 -293 169 -305 147 -317 ct 118 -332 96 -351 82 -374 ct 
-68 -396 61 -421 61 -449 ct 61 -480 69 -508 87 -535 ct 104 -561 130 -582 163 -595 ct 
-196 -609 233 -616 274 -616 ct 319 -616 359 -609 393 -594 ct 427 -580 454 -559 472 -531 ct 
-491 -502 501 -471 502 -435 ct 425 -429 l  421 -468 407 -496 383 -516 ct 359 -536 324 -545 277 -545 ct 
-229 -545 194 -537 171 -519 ct 149 -501 138 -480 138 -454 ct 138 -433 146 -415 162 -401 ct 
-177 -387 217 -372 283 -357 ct 348 -343 393 -330 417 -319 ct 452 -303 478 -282 495 -257 ct 
-512 -232 520 -203 520 -171 ct 520 -138 511 -108 492 -80 ct 474 -51 447 -29 413 -13 ct 
-378 2 339 10 296 10 ct 241 10 195 2 158 -13 ct 121 -29 92 -53 71 -85 ct 50 -117 l 
-39 -154 l  p ef
-638 -520 m  638 -606 l  712 -606 l  712 -520 l  p
-638 0 m  638 -439 l  712 -439 l  712 0 l  p ef
-822 0 m  822 -439 l  889 -439 l  889 -376 l  922 -425 968 -449 1029 -449 ct 
-1056 -449 1080 -444 1102 -434 ct 1124 -425 1141 -412 1152 -397 ct 1163 -382 1171 -363 1175 -342 ct 
-1178 -328 1179 -304 1179 -270 ct 1179 0 l  1105 0 l  1105 -267 l  1105 -297 1102 -320 1096 -335 ct 
-1090 -350 1080 -362 1065 -371 ct 1051 -380 1033 -384 1013 -384 ct 982 -384 954 -374 931 -354 ct 
-908 -334 897 -296 897 -239 ct 897 0 l  p ef
-1600 -141 m  1677 -131 l  1665 -86 1642 -52 1610 -27 ct 1577 -2 1535 9 1484 9 ct 
-1420 9 1369 -9 1331 -49 ct 1293 -88 1275 -144 1275 -215 ct 1275 -289 1294 -347 1332 -387 ct 
-1370 -428 1419 -449 1480 -449 ct 1538 -449 1586 -429 1624 -389 ct 1661 -349 1679 -292 1679 -220 ct 
-1679 -216 1679 -209 1679 -200 ct 1351 -200 l  1354 -152 1368 -115 1392 -89 ct 
-1417 -64 1448 -51 1484 -51 ct 1512 -51 1535 -58 1554 -72 ct 1573 -87 l  1589 -110 l 
-p
-1356 -261 m  1601 -261 l  1598 -298 1588 -326 1573 -344 ct 1549 -373 1518 -387 1480 -387 ct 
-1446 -387 1418 -376 1394 -353 ct 1371 -330 l  1358 -300 l  p ef
-1958 10 m  2133 -616 l  2193 -616 l  2017 10 l  p ef
-2931 -212 m  3012 -192 l  2995 -126 2965 -76 2921 -41 ct 2877 -6 2824 10 2761 10 ct 
-2695 10 2642 -2 2601 -29 ct 2560 -56 2529 -94 2508 -145 ct 2486 -195 2476 -249 2476 -307 ct 
-2476 -370 2488 -425 2512 -472 ct 2536 -519 2570 -555 2615 -580 ct 2659 -604 2708 -616 2762 -616 ct 
-2823 -616 2874 -601 2915 -570 ct 2956 -539 2985 -496 3001 -440 ct 2922 -421 l 
-2908 -465 2888 -497 2861 -517 ct 2834 -537 2801 -547 2760 -547 ct 2714 -547 2675 -536 2643 -514 ct 
-2612 -492 2590 -462 2577 -424 ct 2565 -386 2558 -348 2558 -308 ct 2558 -256 2566 -211 2581 -173 ct 
-2596 -134 2619 -105 2651 -86 ct 2683 -67 2717 -58 2754 -58 ct 2799 -58 2837 -71 2868 -97 ct 
-2899 -123 l  2920 -161 l  p ef
-3097 -219 m  3097 -300 3119 -361 3164 -400 ct 3202 -432 3248 -449 3303 -449 ct 
-3363 -449 3412 -429 3451 -389 ct 3489 -350 3508 -295 3508 -225 ct 3508 -169 3500 -124 3483 -92 ct 
-3466 -60 3441 -34 3409 -16 ct 3376 0 3341 9 3303 9 ct 3241 9 3191 -9 3153 -49 ct 
-3116 -88 l  3097 -145 l  p
-3173 -219 m  3173 -163 3185 -121 3210 -93 ct 3234 -65 3265 -51 3303 -51 ct 3340 -51 3370 -65 3395 -93 ct 
-3419 -121 3432 -164 3432 -222 ct 3432 -276 3419 -317 3395 -345 ct 3370 -373 3339 -387 3303 -387 ct 
-3265 -387 3234 -373 3210 -345 ct 3185 -317 l  3173 -275 l  p ef
-3571 -131 m  3644 -142 l  3648 -113 3660 -90 3679 -74 ct 3698 -59 3724 -51 3758 -51 ct 
-3792 -51 3817 -58 3834 -72 ct 3851 -86 3859 -102 3859 -121 ct 3859 -138 3852 -151 3837 -160 ct 
-3827 -167 3801 -175 3761 -186 ct 3706 -199 3668 -211 3647 -221 ct 3626 -231 3610 -245 3599 -263 ct 
-3588 -281 3583 -301 3583 -322 ct 3583 -342 3587 -360 3596 -376 ct 3605 -393 3618 -407 3633 -418 ct 
-3645 -427 3660 -434 3680 -440 ct 3700 -446 3722 -449 3745 -449 ct 3779 -449 3809 -444 3835 -434 ct 
-3862 -424 3881 -410 3893 -393 ct 3906 -376 3914 -354 3919 -325 ct 3846 -315 l 
-3843 -338 3833 -356 3817 -368 ct 3801 -381 3779 -387 3750 -387 ct 3716 -387 3691 -382 3677 -370 ct 
-3662 -359 3655 -346 3655 -331 ct 3655 -321 3658 -312 3664 -305 ct 3670 -297 3680 -290 3693 -285 ct 
-3700 -282 3722 -276 3758 -266 ct 3811 -252 3848 -240 3869 -231 ct 3889 -222 3906 -209 3918 -192 ct 
-3929 -175 3935 -154 3935 -129 ct 3935 -104 3928 -80 3914 -58 ct 3899 -37 3878 -20 3851 -8 ct 
-3824 3 3793 9 3758 9 ct 3701 9 3658 -1 3628 -25 ct 3598 -49 l  3579 -84 l  p ef
-3998 -520 m  3998 -606 l  4072 -606 l  4072 -520 l  p
-3998 0 m  3998 -439 l  4072 -439 l  4072 0 l  p ef
-4183 0 m  4183 -439 l  4250 -439 l  4250 -376 l  4283 -425 4329 -449 4390 -449 ct 
-4417 -449 4441 -444 4463 -434 ct 4485 -425 4502 -412 4513 -397 ct 4524 -382 4532 -363 4536 -342 ct 
-4539 -328 4540 -304 4540 -270 ct 4540 0 l  4466 0 l  4466 -267 l  4466 -297 4463 -320 4457 -335 ct 
-4451 -350 4441 -362 4426 -371 ct 4412 -380 4394 -384 4374 -384 ct 4343 -384 4315 -374 4292 -354 ct 
-4269 -334 4258 -296 4258 -239 ct 4258 0 l  p ef
-4960 -141 m  5037 -131 l  5025 -86 5002 -52 4970 -27 ct 4937 -2 4895 9 4844 9 ct 
-4780 9 4729 -9 4691 -49 ct 4653 -88 4635 -144 4635 -215 ct 4635 -289 4654 -347 4692 -387 ct 
-4730 -428 4779 -449 4840 -449 ct 4898 -449 4946 -429 4984 -389 ct 5021 -349 5039 -292 5039 -220 ct 
-5039 -216 5039 -209 5039 -200 ct 4711 -200 l  4714 -152 4728 -115 4752 -89 ct 
-4777 -64 4808 -51 4844 -51 ct 4872 -51 4895 -58 4914 -72 ct 4933 -87 l  4949 -110 l 
-p
-4716 -261 m  4961 -261 l  4958 -298 4948 -326 4933 -344 ct 4909 -373 4878 -387 4840 -387 ct 
-4806 -387 4778 -376 4754 -353 ct 4731 -330 l  4718 -300 l  p ef
-pom
-pum
-8136 15876 t
-349 -237 m  349 -308 l  605 -309 l  605 -84 l  566 -52 525 -29 483 -13 ct 
-441 2 398 10 354 10 ct 295 10 241 -2 192 -27 ct 143 -53 107 -90 82 -138 ct 57 -186 45 -240 45 -300 ct 
-45 -359 57 -414 82 -465 ct 106 -516 142 -554 188 -579 ct 234 -604 288 -616 348 -616 ct 
-392 -616 432 -609 467 -595 ct 502 -581 530 -561 550 -535 ct 571 -510 586 -477 596 -436 ct 
-524 -416 l  515 -447 504 -472 490 -489 ct 476 -507 457 -521 432 -532 ct 407 -542 379 -547 349 -547 ct 
-312 -547 280 -542 253 -531 ct 227 -520 205 -505 189 -487 ct 172 -468 160 -449 150 -427 ct 
-135 -389 127 -349 127 -305 ct 127 -251 137 -205 155 -169 ct 174 -133 201 -106 236 -88 ct 
-272 -70 310 -62 350 -62 ct 385 -62 418 -68 452 -82 ct 485 -95 510 -109 527 -124 ct 
-527 -237 l  p ef
-1017 -141 m  1094 -131 l  1082 -86 1059 -52 1027 -27 ct 994 -2 952 9 901 9 ct 
-837 9 786 -9 748 -49 ct 710 -88 692 -144 692 -215 ct 692 -289 711 -347 749 -387 ct 
-787 -428 836 -449 897 -449 ct 955 -449 1003 -429 1041 -389 ct 1078 -349 1096 -292 1096 -220 ct 
-1096 -216 1096 -209 1096 -200 ct 768 -200 l  771 -152 785 -115 809 -89 ct 834 -64 865 -51 901 -51 ct 
-929 -51 952 -58 971 -72 ct 990 -87 l  1006 -110 l  p
-773 -261 m  1018 -261 l  1015 -298 1005 -326 990 -344 ct 966 -373 935 -387 897 -387 ct 
-863 -387 835 -376 811 -353 ct 788 -330 l  775 -300 l  p ef
-1193 0 m  1193 -439 l  1260 -439 l  1260 -376 l  1293 -425 1339 -449 1400 -449 ct 
-1427 -449 1451 -444 1473 -434 ct 1495 -425 1512 -412 1523 -397 ct 1534 -382 1542 -363 1546 -342 ct 
-1549 -328 1550 -304 1550 -270 ct 1550 0 l  1476 0 l  1476 -267 l  1476 -297 1473 -320 1467 -335 ct 
-1461 -350 1451 -362 1436 -371 ct 1422 -380 1404 -384 1384 -384 ct 1353 -384 1325 -374 1302 -354 ct 
-1279 -334 1268 -296 1268 -239 ct 1268 0 l  p ef
-1970 -141 m  2047 -131 l  2035 -86 2012 -52 1980 -27 ct 1947 -2 1905 9 1854 9 ct 
-1790 9 1739 -9 1701 -49 ct 1663 -88 1645 -144 1645 -215 ct 1645 -289 1664 -347 1702 -387 ct 
-1740 -428 1789 -449 1850 -449 ct 1908 -449 1956 -429 1994 -389 ct 2031 -349 2049 -292 2049 -220 ct 
-2049 -216 2049 -209 2049 -200 ct 1721 -200 l  1724 -152 1738 -115 1762 -89 ct 
-1787 -64 1818 -51 1854 -51 ct 1882 -51 1905 -58 1924 -72 ct 1943 -87 l  1959 -110 l 
-p
-1726 -261 m  1971 -261 l  1968 -298 1958 -326 1943 -344 ct 1919 -373 1888 -387 1850 -387 ct 
-1816 -387 1788 -376 1764 -353 ct 1741 -330 l  1728 -300 l  p ef
-2145 0 m  2145 -439 l  2212 -439 l  2212 -372 l  2229 -403 2244 -424 2259 -434 ct 
-2273 -444 2289 -449 2307 -449 ct 2332 -449 2357 -441 2383 -425 ct 2358 -356 l 
-2339 -366 2321 -372 2303 -372 ct 2287 -372 2272 -367 2259 -357 ct 2246 -347 2237 -334 2231 -316 ct 
-2223 -290 2219 -261 2219 -229 ct 2219 0 l  p ef
-2723 -54 m  2695 -30 2669 -14 2643 -4 ct 2618 5 2590 9 2561 9 ct 2513 9 2476 -1 2450 -25 ct 
-2424 -49 2411 -79 2411 -115 ct 2411 -137 2416 -156 2426 -174 ct 2436 -192 2448 -206 2464 -217 ct 
-2480 -228 2498 -236 2518 -241 ct 2532 -245 2554 -249 2584 -253 ct 2644 -260 2688 -268 2717 -278 ct 
-2717 -288 2717 -295 2717 -298 ct 2717 -328 2710 -349 2696 -362 ct 2677 -379 2649 -387 2611 -387 ct 
-2576 -387 2550 -381 2534 -369 ct 2517 -356 2505 -335 2497 -303 ct 2424 -313 l 
-2431 -345 2441 -370 2457 -389 ct 2472 -408 2494 -423 2522 -433 ct 2551 -443 2584 -449 2622 -449 ct 
-2660 -449 2690 -444 2713 -435 ct 2737 -427 2754 -415 2765 -402 ct 2776 -389 2784 -372 2788 -351 ct 
-2791 -339 2792 -316 2792 -283 ct 2792 -184 l  2792 -114 2794 -71 2797 -52 ct 
-2800 -34 2806 -16 2816 0 ct 2738 0 l  2730 -15 l  2725 -33 l  p
-2717 -220 m  2690 -209 2649 -200 2595 -192 ct 2565 -187 2543 -182 2530 -177 ct 
-2518 -171 2508 -163 2501 -153 ct 2494 -142 2491 -130 2491 -117 ct 2491 -98 2498 -81 2513 -68 ct 
-2528 -55 2550 -48 2579 -48 ct 2608 -48 2633 -54 2656 -67 ct 2678 -79 2694 -96 2705 -118 ct 
-2713 -135 2717 -160 2717 -193 ct p ef
-3049 -66 m  3060 0 l  3039 3 3020 5 3003 5 ct 2976 5 2955 1 2941 -7 ct 2926 -15 2915 -26 2909 -40 ct 
-2903 -54 2900 -83 2900 -128 ct 2900 -381 l  2845 -381 l  2845 -439 l  2900 -439 l 
-2900 -547 l  2974 -592 l  2974 -439 l  3049 -439 l  3049 -381 l  2974 -381 l 
-2974 -124 l  2974 -103 2975 -89 2978 -83 ct 2981 -77 2985 -72 2991 -69 ct 2997 -65 3005 -63 3016 -63 ct 
-3024 -63 l  3035 -64 l  p ef
-3097 -219 m  3097 -300 3119 -361 3164 -400 ct 3202 -432 3248 -449 3303 -449 ct 
-3363 -449 3412 -429 3451 -389 ct 3489 -350 3508 -295 3508 -225 ct 3508 -169 3500 -124 3483 -92 ct 
-3466 -60 3441 -34 3409 -16 ct 3376 0 3341 9 3303 9 ct 3241 9 3191 -9 3153 -49 ct 
-3116 -88 l  3097 -145 l  p
-3173 -219 m  3173 -163 3185 -121 3210 -93 ct 3234 -65 3265 -51 3303 -51 ct 3340 -51 3370 -65 3395 -93 ct 
-3419 -121 3432 -164 3432 -222 ct 3432 -276 3419 -317 3395 -345 ct 3370 -373 3339 -387 3303 -387 ct 
-3265 -387 3234 -373 3210 -345 ct 3185 -317 l  3173 -275 l  p ef
-3600 0 m  3600 -439 l  3667 -439 l  3667 -372 l  3684 -403 3699 -424 3714 -434 ct 
-3728 -444 3744 -449 3762 -449 ct 3787 -449 3812 -441 3838 -425 ct 3813 -356 l 
-3794 -366 3776 -372 3758 -372 ct 3742 -372 3727 -367 3714 -357 ct 3701 -347 3692 -334 3686 -316 ct 
-3678 -290 3674 -261 3674 -229 ct 3674 0 l  p ef
-pom
-gr
-gs
-pum
-1284 9366 t
-79 0 m  79 -606 l  159 -606 l  159 0 l  p ef
-293 0 m  293 -439 l  360 -439 l  360 -376 l  393 -425 439 -449 500 -449 ct 
-527 -449 551 -444 573 -434 ct 595 -425 612 -412 623 -397 ct 634 -382 642 -363 646 -342 ct 
-649 -328 650 -304 650 -270 ct 650 0 l  576 0 l  576 -267 l  576 -297 573 -320 567 -335 ct 
-561 -350 551 -362 536 -371 ct 522 -380 504 -384 484 -384 ct 453 -384 425 -374 402 -354 ct 
-379 -334 368 -296 368 -239 ct 368 0 l  p ef
-769 168 m  769 -439 l  837 -439 l  837 -382 l  853 -404 871 -421 891 -432 ct 
-911 -443 936 -449 965 -449 ct 1002 -449 1035 -439 1064 -420 ct 1092 -400 1114 -373 1129 -338 ct 
-1143 -303 1151 -264 1151 -222 ct 1151 -177 1143 -137 1126 -101 ct 1110 -65 1087 -37 1056 -18 ct 
-1025 0 993 9 959 9 ct 934 9 912 4 892 -5 ct 873 -16 856 -29 844 -45 ct 844 168 l 
-p
-837 -217 m  837 -160 848 -118 871 -91 ct 894 -64 922 -51 954 -51 ct 987 -51 1016 -65 1039 -93 ct 
-1063 -121 1075 -164 1075 -223 ct 1075 -279 1063 -321 1040 -349 ct 1017 -376 990 -390 958 -390 ct 
-926 -390 898 -376 873 -346 ct 849 -316 l  837 -273 l  p ef
-1507 0 m  1507 -64 l  1473 -14 1427 9 1368 9 ct 1342 9 1318 4 1295 -4 ct 1273 -14 1256 -27 1245 -42 ct 
-1234 -57 1227 -75 1222 -97 ct 1219 -112 1218 -135 1218 -167 ct 1218 -439 l  1292 -439 l 
-1292 -195 l  1292 -156 1294 -130 1297 -117 ct 1301 -97 1311 -82 1326 -70 ct 
-1342 -59 1360 -54 1383 -54 ct 1405 -54 1426 -59 1446 -71 ct 1465 -82 1479 -98 1487 -118 ct 
-1495 -137 1499 -166 1499 -203 ct 1499 -439 l  1574 -439 l  1574 0 l  p ef
-1858 -66 m  1869 0 l  1848 3 1829 5 1812 5 ct 1785 5 1764 1 1750 -7 ct 1735 -15 1724 -26 1718 -40 ct 
-1712 -54 1709 -83 1709 -128 ct 1709 -381 l  1654 -381 l  1654 -439 l  1709 -439 l 
-1709 -547 l  1783 -592 l  1783 -439 l  1858 -439 l  1858 -381 l  1783 -381 l 
-1783 -124 l  1783 -103 1784 -89 1787 -83 ct 1790 -77 1794 -72 1800 -69 ct 1806 -65 1814 -63 1825 -63 ct 
-1833 -63 l  1844 -64 l  p ef
-2190 0 m  2190 -381 l  2124 -381 l  2124 -439 l  2190 -439 l  2190 -485 l 
-2190 -515 2193 -537 2198 -551 ct 2205 -571 2218 -586 2236 -598 ct 2254 -610 2279 -616 2312 -616 ct 
-2333 -616 2356 -614 2381 -609 ct 2370 -544 l  2355 -547 2340 -548 2326 -548 ct 
-2304 -548 2288 -543 2278 -533 ct 2269 -524 2264 -506 2264 -479 ct 2264 -439 l 
-2350 -439 l  2350 -381 l  2264 -381 l  2264 0 l  p ef
-2410 0 m  2410 -439 l  2477 -439 l  2477 -372 l  2494 -403 2509 -424 2524 -434 ct 
-2538 -444 2554 -449 2572 -449 ct 2597 -449 2622 -441 2648 -425 ct 2623 -356 l 
-2604 -366 2586 -372 2568 -372 ct 2552 -372 2537 -367 2524 -357 ct 2511 -347 2502 -334 2496 -316 ct 
-2488 -290 2484 -261 2484 -229 ct 2484 0 l  p ef
-2674 -219 m  2674 -300 2696 -361 2741 -400 ct 2779 -432 2825 -449 2880 -449 ct 
-2940 -449 2989 -429 3028 -389 ct 3066 -350 3085 -295 3085 -225 ct 3085 -169 3077 -124 3060 -92 ct 
-3043 -60 3018 -34 2986 -16 ct 2953 0 2918 9 2880 9 ct 2818 9 2768 -9 2730 -49 ct 
-2693 -88 l  2674 -145 l  p
-2750 -219 m  2750 -163 2762 -121 2787 -93 ct 2811 -65 2842 -51 2880 -51 ct 2917 -51 2947 -65 2972 -93 ct 
-2996 -121 3009 -164 3009 -222 ct 3009 -276 2996 -317 2972 -345 ct 2947 -373 2916 -387 2880 -387 ct 
-2842 -387 2811 -373 2787 -345 ct 2762 -317 l  2750 -275 l  p ef
-3177 0 m  3177 -439 l  3244 -439 l  3244 -377 l  3258 -399 3276 -416 3299 -429 ct 
-3322 -442 3348 -449 3377 -449 ct 3410 -449 3436 -442 3457 -428 ct 3478 -415 3493 -396 3501 -372 ct 
-3536 -423 3581 -449 3637 -449 ct 3680 -449 3714 -437 3737 -412 ct 3761 -388 3772 -351 3772 -301 ct 
-3772 0 l  3698 0 l  3698 -276 l  3698 -306 3696 -327 3691 -340 ct 3686 -354 3678 -364 3665 -372 ct 
-3652 -380 3637 -384 3620 -384 ct 3589 -384 3564 -374 3543 -353 ct 3523 -333 3513 -300 3513 -255 ct 
-3513 0 l  3438 0 l  3438 -285 l  3438 -318 3432 -343 3420 -359 ct 3408 -376 3388 -384 3361 -384 ct 
-3340 -384 3320 -379 3302 -368 ct 3285 -357 3272 -340 3264 -319 ct 3256 -298 3252 -267 3252 -227 ct 
-3252 0 l  p ef
-pom
-pum
-2302 10319 t
--1 0 m  231 -606 l  318 -606 l  566 0 l  474 0 l  404 -183 l  150 -183 l 
-83 0 l  p
-173 -248 m  379 -248 l  315 -416 l  296 -467 282 -509 272 -542 ct 265 -503 254 -465 240 -426 ct 
-p ef
-621 0 m  621 -606 l  830 -606 l  877 -606 913 -603 938 -597 ct 972 -589 1002 -575 1027 -554 ct 
-1059 -527 1082 -492 1098 -450 ct 1114 -408 1122 -360 1122 -306 ct 1122 -260 1117 -219 1106 -184 ct 
-1095 -148 1081 -119 1065 -95 ct 1048 -72 1029 -54 1009 -40 ct 989 -27 965 -17 937 -10 ct 
-909 -3 876 0 840 0 ct p
-701 -71 m  831 -71 l  871 -71 902 -75 925 -82 ct 947 -90 965 -100 979 -114 ct 
-998 -133 1013 -158 1023 -190 ct 1034 -222 1039 -261 1039 -307 ct 1039 -371 1029 -419 1008 -453 ct 
-987 -487 962 -510 932 -522 ct 911 -530 876 -534 828 -534 ct 701 -534 l  p ef
-1661 -212 m  1742 -192 l  1725 -126 1695 -76 1651 -41 ct 1607 -6 1554 10 1491 10 ct 
-1425 10 1372 -2 1331 -29 ct 1290 -56 1259 -94 1238 -145 ct 1216 -195 1206 -249 1206 -307 ct 
-1206 -370 1218 -425 1242 -472 ct 1266 -519 1300 -555 1345 -580 ct 1389 -604 1438 -616 1492 -616 ct 
-1553 -616 1604 -601 1645 -570 ct 1686 -539 1715 -496 1731 -440 ct 1652 -421 l 
-1638 -465 1618 -497 1591 -517 ct 1564 -537 1531 -547 1490 -547 ct 1444 -547 1405 -536 1373 -514 ct 
-1342 -492 1320 -462 1307 -424 ct 1295 -386 1288 -348 1288 -308 ct 1288 -256 1296 -211 1311 -173 ct 
-1326 -134 1349 -105 1381 -86 ct 1413 -67 1447 -58 1484 -58 ct 1529 -58 1567 -71 1598 -97 ct 
-1629 -123 l  1650 -161 l  p ef
-pom
-gr
-gs
-pum
-1284 6773 t
-79 0 m  79 -606 l  159 -606 l  159 0 l  p ef
-293 0 m  293 -439 l  360 -439 l  360 -376 l  393 -425 439 -449 500 -449 ct 
-527 -449 551 -444 573 -434 ct 595 -425 612 -412 623 -397 ct 634 -382 642 -363 646 -342 ct 
-649 -328 650 -304 650 -270 ct 650 0 l  576 0 l  576 -267 l  576 -297 573 -320 567 -335 ct 
-561 -350 551 -362 536 -371 ct 522 -380 504 -384 484 -384 ct 453 -384 425 -374 402 -354 ct 
-379 -334 368 -296 368 -239 ct 368 0 l  p ef
-769 168 m  769 -439 l  837 -439 l  837 -382 l  853 -404 871 -421 891 -432 ct 
-911 -443 936 -449 965 -449 ct 1002 -449 1035 -439 1064 -420 ct 1092 -400 1114 -373 1129 -338 ct 
-1143 -303 1151 -264 1151 -222 ct 1151 -177 1143 -137 1126 -101 ct 1110 -65 1087 -37 1056 -18 ct 
-1025 0 993 9 959 9 ct 934 9 912 4 892 -5 ct 873 -16 856 -29 844 -45 ct 844 168 l 
-p
-837 -217 m  837 -160 848 -118 871 -91 ct 894 -64 922 -51 954 -51 ct 987 -51 1016 -65 1039 -93 ct 
-1063 -121 1075 -164 1075 -223 ct 1075 -279 1063 -321 1040 -349 ct 1017 -376 990 -390 958 -390 ct 
-926 -390 898 -376 873 -346 ct 849 -316 l  837 -273 l  p ef
-1507 0 m  1507 -64 l  1473 -14 1427 9 1368 9 ct 1342 9 1318 4 1295 -4 ct 1273 -14 1256 -27 1245 -42 ct 
-1234 -57 1227 -75 1222 -97 ct 1219 -112 1218 -135 1218 -167 ct 1218 -439 l  1292 -439 l 
-1292 -195 l  1292 -156 1294 -130 1297 -117 ct 1301 -97 1311 -82 1326 -70 ct 
-1342 -59 1360 -54 1383 -54 ct 1405 -54 1426 -59 1446 -71 ct 1465 -82 1479 -98 1487 -118 ct 
-1495 -137 1499 -166 1499 -203 ct 1499 -439 l  1574 -439 l  1574 0 l  p ef
-1858 -66 m  1869 0 l  1848 3 1829 5 1812 5 ct 1785 5 1764 1 1750 -7 ct 1735 -15 1724 -26 1718 -40 ct 
-1712 -54 1709 -83 1709 -128 ct 1709 -381 l  1654 -381 l  1654 -439 l  1709 -439 l 
-1709 -547 l  1783 -592 l  1783 -439 l  1858 -439 l  1858 -381 l  1783 -381 l 
-1783 -124 l  1783 -103 1784 -89 1787 -83 ct 1790 -77 1794 -72 1800 -69 ct 1806 -65 1814 -63 1825 -63 ct 
-1833 -63 l  1844 -64 l  p ef
-2190 0 m  2190 -381 l  2124 -381 l  2124 -439 l  2190 -439 l  2190 -485 l 
-2190 -515 2193 -537 2198 -551 ct 2205 -571 2218 -586 2236 -598 ct 2254 -610 2279 -616 2312 -616 ct 
-2333 -616 2356 -614 2381 -609 ct 2370 -544 l  2355 -547 2340 -548 2326 -548 ct 
-2304 -548 2288 -543 2278 -533 ct 2269 -524 2264 -506 2264 -479 ct 2264 -439 l 
-2350 -439 l  2350 -381 l  2264 -381 l  2264 0 l  p ef
-2410 0 m  2410 -439 l  2477 -439 l  2477 -372 l  2494 -403 2509 -424 2524 -434 ct 
-2538 -444 2554 -449 2572 -449 ct 2597 -449 2622 -441 2648 -425 ct 2623 -356 l 
-2604 -366 2586 -372 2568 -372 ct 2552 -372 2537 -367 2524 -357 ct 2511 -347 2502 -334 2496 -316 ct 
-2488 -290 2484 -261 2484 -229 ct 2484 0 l  p ef
-2674 -219 m  2674 -300 2696 -361 2741 -400 ct 2779 -432 2825 -449 2880 -449 ct 
-2940 -449 2989 -429 3028 -389 ct 3066 -350 3085 -295 3085 -225 ct 3085 -169 3077 -124 3060 -92 ct 
-3043 -60 3018 -34 2986 -16 ct 2953 0 2918 9 2880 9 ct 2818 9 2768 -9 2730 -49 ct 
-2693 -88 l  2674 -145 l  p
-2750 -219 m  2750 -163 2762 -121 2787 -93 ct 2811 -65 2842 -51 2880 -51 ct 2917 -51 2947 -65 2972 -93 ct 
-2996 -121 3009 -164 3009 -222 ct 3009 -276 2996 -317 2972 -345 ct 2947 -373 2916 -387 2880 -387 ct 
-2842 -387 2811 -373 2787 -345 ct 2762 -317 l  2750 -275 l  p ef
-3177 0 m  3177 -439 l  3244 -439 l  3244 -377 l  3258 -399 3276 -416 3299 -429 ct 
-3322 -442 3348 -449 3377 -449 ct 3410 -449 3436 -442 3457 -428 ct 3478 -415 3493 -396 3501 -372 ct 
-3536 -423 3581 -449 3637 -449 ct 3680 -449 3714 -437 3737 -412 ct 3761 -388 3772 -351 3772 -301 ct 
-3772 0 l  3698 0 l  3698 -276 l  3698 -306 3696 -327 3691 -340 ct 3686 -354 3678 -364 3665 -372 ct 
-3652 -380 3637 -384 3620 -384 ct 3589 -384 3564 -374 3543 -353 ct 3523 -333 3513 -300 3513 -255 ct 
-3513 0 l  3438 0 l  3438 -285 l  3438 -318 3432 -343 3420 -359 ct 3408 -376 3388 -384 3361 -384 ct 
-3340 -384 3320 -379 3302 -368 ct 3285 -357 3272 -340 3264 -319 ct 3256 -298 3252 -267 3252 -227 ct 
-3252 0 l  p ef
-pom
-pum
-2302 7726 t
--1 0 m  231 -606 l  318 -606 l  566 0 l  474 0 l  404 -183 l  150 -183 l 
-83 0 l  p
-173 -248 m  379 -248 l  315 -416 l  296 -467 282 -509 272 -542 ct 265 -503 254 -465 240 -426 ct 
-p ef
-621 0 m  621 -606 l  830 -606 l  877 -606 913 -603 938 -597 ct 972 -589 1002 -575 1027 -554 ct 
-1059 -527 1082 -492 1098 -450 ct 1114 -408 1122 -360 1122 -306 ct 1122 -260 1117 -219 1106 -184 ct 
-1095 -148 1081 -119 1065 -95 ct 1048 -72 1029 -54 1009 -40 ct 989 -27 965 -17 937 -10 ct 
-909 -3 876 0 840 0 ct p
-701 -71 m  831 -71 l  871 -71 902 -75 925 -82 ct 947 -90 965 -100 979 -114 ct 
-998 -133 1013 -158 1023 -190 ct 1034 -222 1039 -261 1039 -307 ct 1039 -371 1029 -419 1008 -453 ct 
-987 -487 962 -510 932 -522 ct 911 -530 876 -534 828 -534 ct 701 -534 l  p ef
-1661 -212 m  1742 -192 l  1725 -126 1695 -76 1651 -41 ct 1607 -6 1554 10 1491 10 ct 
-1425 10 1372 -2 1331 -29 ct 1290 -56 1259 -94 1238 -145 ct 1216 -195 1206 -249 1206 -307 ct 
-1206 -370 1218 -425 1242 -472 ct 1266 -519 1300 -555 1345 -580 ct 1389 -604 1438 -616 1492 -616 ct 
-1553 -616 1604 -601 1645 -570 ct 1686 -539 1715 -496 1731 -440 ct 1652 -421 l 
-1638 -465 1618 -497 1591 -517 ct 1564 -537 1531 -547 1490 -547 ct 1444 -547 1405 -536 1373 -514 ct 
-1342 -492 1320 -462 1307 -424 ct 1295 -386 1288 -348 1288 -308 ct 1288 -256 1296 -211 1311 -173 ct 
-1326 -134 1349 -105 1381 -86 ct 1413 -67 1447 -58 1484 -58 ct 1529 -58 1567 -71 1598 -97 ct 
-1629 -123 l  1650 -161 l  p ef
-pom
-gr
-8442 7781 m  8437 7778 l  8224 7666 l  8218 7663 l  8049 7492 l  8046 7486 l 
-7936 7271 l  7933 7265 l  7894 7016 l  7894 7009 l  7933 6759 l  7936 6753 l 
-8046 6538 l  8049 6532 l  8218 6361 l  8224 6358 l  8437 6246 l  8442 6244 l 
-8689 6204 l  8696 6204 l  8942 6244 l  8948 6246 l  9161 6358 l  9166 6361 l 
-9335 6532 l  9338 6538 l  9449 6753 l  9451 6759 l  9491 7009 l  9491 7016 l 
-9451 7265 l  9449 7271 l  9338 7486 l  9335 7492 l  9166 7663 l  9161 7666 l 
-8948 7778 l  8942 7781 l  8696 7821 l  8689 7821 l  8442 7781 l  p
-8692 7779 m  8931 7739 l  9138 7631 l  9303 7464 l  9410 7254 l  9449 7012 l 
-9410 6770 l  9303 6560 l  9138 6393 l  8931 6285 l  8692 6246 l  8453 6285 l 
-8246 6393 l  8081 6560 l  7974 6770 l  7936 7012 l  7974 7254 l  8081 7464 l 
-8246 7631 l  8453 7739 l  8692 7779 l  p
-8174 6489 m  8204 6458 l  8411 6668 l  8618 6877 l  8825 7087 l  9032 7297 l 
-9240 7508 l  9210 7538 l  9002 7328 l  8795 7118 l  8588 6908 l  8380 6698 l 
-8174 6489 l  p
-8204 7538 m  8174 7509 l  8380 7298 l  8588 7088 l  8795 6878 l  9003 6668 l 
-9211 6458 l  9240 6489 l  9032 6699 l  8825 6909 l  8618 7119 l  8411 7329 l 
-8204 7538 l  p ef
-1 lw 0 lj 8442 7781 m  8437 7778 l  8224 7666 l  8218 7663 l  8049 7492 l 
-8046 7486 l  7936 7271 l  7933 7265 l  7894 7016 l  7894 7009 l  7933 6759 l 
-7936 6753 l  8046 6538 l  8049 6532 l  8218 6361 l  8224 6358 l  8437 6246 l 
-8442 6244 l  8689 6204 l  8696 6204 l  8942 6244 l  8948 6246 l  9161 6358 l 
-9166 6361 l  9335 6532 l  9338 6538 l  9449 6753 l  9451 6759 l  9491 7009 l 
-9491 7016 l  9451 7265 l  9449 7271 l  9338 7486 l  9335 7492 l  9166 7663 l 
-9161 7666 l  8948 7778 l  8942 7781 l  8696 7821 l  8689 7821 l  8442 7781 l 
-pc
-8692 7779 m  8931 7739 l  9138 7631 l  9303 7464 l  9410 7254 l  9449 7012 l 
-9410 6770 l  9303 6560 l  9138 6393 l  8931 6285 l  8692 6246 l  8453 6285 l 
-8246 6393 l  8081 6560 l  7974 6770 l  7936 7012 l  7974 7254 l  8081 7464 l 
-8246 7631 l  8453 7739 l  8692 7779 l  pc
-8174 6489 m  8204 6458 l  8411 6668 l  8618 6877 l  8825 7087 l  9032 7297 l 
-9240 7508 l  9210 7538 l  9002 7328 l  8795 7118 l  8588 6908 l  8380 6698 l 
-8174 6489 l  pc
-8204 7538 m  8174 7509 l  8380 7298 l  8588 7088 l  8795 6878 l  9003 6668 l 
-9211 6458 l  9240 6489 l  9032 6699 l  8825 6909 l  8618 7119 l  8411 7329 l 
-8204 7538 l  pc
-8691 7821 m  8541 8271 l  8841 8270 l  8691 7821 l  p ef
-8691 8181 m  8691 12701 l  ps
-11531 10361 m  11381 10811 l  11681 10810 l  11531 10361 l  p ef
-11531 10721 m  11531 12701 l  ps
-gs
-pum
-7329 12171 t
-26 -131 m  99 -142 l  103 -113 115 -90 134 -74 ct 153 -59 179 -51 213 -51 ct 
-247 -51 272 -58 289 -72 ct 306 -86 314 -102 314 -121 ct 314 -138 307 -151 292 -160 ct 
-282 -167 256 -175 216 -186 ct 161 -199 123 -211 102 -221 ct 81 -231 65 -245 54 -263 ct 
-43 -281 38 -301 38 -322 ct 38 -342 42 -360 51 -376 ct 60 -393 73 -407 88 -418 ct 
-100 -427 115 -434 135 -440 ct 155 -446 177 -449 200 -449 ct 234 -449 264 -444 290 -434 ct 
-317 -424 336 -410 348 -393 ct 361 -376 369 -354 374 -325 ct 301 -315 l  298 -338 288 -356 272 -368 ct 
-256 -381 234 -387 205 -387 ct 171 -387 146 -382 132 -370 ct 117 -359 110 -346 110 -331 ct 
-110 -321 113 -312 119 -305 ct 125 -297 135 -290 148 -285 ct 155 -282 177 -276 213 -266 ct 
-266 -252 303 -240 324 -231 ct 344 -222 361 -209 373 -192 ct 384 -175 390 -154 390 -129 ct 
-390 -104 383 -80 369 -58 ct 354 -37 333 -20 306 -8 ct 279 3 248 9 213 9 ct 156 9 113 -1 83 -25 ct 
-53 -49 l  34 -84 l  p ef
-453 -520 m  453 -606 l  527 -606 l  527 -520 l  p
-453 0 m  453 -439 l  527 -439 l  527 0 l  p ef
-637 0 m  637 -439 l  704 -439 l  704 -376 l  737 -425 783 -449 844 -449 ct 
-871 -449 895 -444 917 -434 ct 939 -425 956 -412 967 -397 ct 978 -382 986 -363 990 -342 ct 
-993 -328 994 -304 994 -270 ct 994 0 l  920 0 l  920 -267 l  920 -297 917 -320 911 -335 ct 
-905 -350 895 -362 880 -371 ct 866 -380 848 -384 828 -384 ct 797 -384 769 -374 746 -354 ct 
-723 -334 712 -296 712 -239 ct 712 0 l  p ef
-pom
-gr
-gs
-pum
-11880 12223 t
-342 -160 m  415 -151 l  407 -100 387 -61 354 -32 ct 321 -4 280 9 232 9 ct 172 9 124 -9 87 -49 ct 
-51 -88 33 -144 33 -217 ct 33 -265 40 -306 56 -342 ct 72 -378 96 -404 128 -422 ct 
-160 -440 195 -449 233 -449 ct 280 -449 319 -437 350 -412 ct 380 -388 400 -354 408 -310 ct 
-336 -299 l  329 -328 317 -350 299 -365 ct 282 -380 260 -387 236 -387 ct 198 -387 168 -374 144 -347 ct 
-121 -320 109 -278 109 -220 ct 109 -161 120 -118 143 -91 ct 166 -64 195 -51 232 -51 ct 
-261 -51 285 -60 305 -78 ct 324 -96 l  337 -123 l  p ef
-451 -219 m  451 -300 473 -361 518 -400 ct 556 -432 602 -449 657 -449 ct 717 -449 766 -429 805 -389 ct 
-843 -350 862 -295 862 -225 ct 862 -169 854 -124 837 -92 ct 820 -60 795 -34 763 -16 ct 
-730 0 695 9 657 9 ct 595 9 545 -9 507 -49 ct 470 -88 l  451 -145 l  p
-527 -219 m  527 -163 539 -121 564 -93 ct 588 -65 619 -51 657 -51 ct 694 -51 724 -65 749 -93 ct 
-773 -121 786 -164 786 -222 ct 786 -276 773 -317 749 -345 ct 724 -373 693 -387 657 -387 ct 
-619 -387 588 -373 564 -345 ct 539 -317 l  527 -275 l  p ef
-926 -131 m  999 -142 l  1003 -113 1015 -90 1034 -74 ct 1053 -59 1079 -51 1113 -51 ct 
-1147 -51 1172 -58 1189 -72 ct 1206 -86 1214 -102 1214 -121 ct 1214 -138 1207 -151 1192 -160 ct 
-1182 -167 1156 -175 1116 -186 ct 1061 -199 1023 -211 1002 -221 ct 981 -231 965 -245 954 -263 ct 
-943 -281 938 -301 938 -322 ct 938 -342 942 -360 951 -376 ct 960 -393 973 -407 988 -418 ct 
-1000 -427 1015 -434 1035 -440 ct 1055 -446 1077 -449 1100 -449 ct 1134 -449 1164 -444 1190 -434 ct 
-1217 -424 1236 -410 1248 -393 ct 1261 -376 1269 -354 1274 -325 ct 1201 -315 l 
-1198 -338 1188 -356 1172 -368 ct 1156 -381 1134 -387 1105 -387 ct 1071 -387 1046 -382 1032 -370 ct 
-1017 -359 1010 -346 1010 -331 ct 1010 -321 1013 -312 1019 -305 ct 1025 -297 1035 -290 1048 -285 ct 
-1055 -282 1077 -276 1113 -266 ct 1166 -252 1203 -240 1224 -231 ct 1244 -222 1261 -209 1273 -192 ct 
-1284 -175 1290 -154 1290 -129 ct 1290 -104 1283 -80 1269 -58 ct 1254 -37 1233 -20 1206 -8 ct 
-1179 3 1148 9 1113 9 ct 1056 9 1013 -1 983 -25 ct 953 -49 l  934 -84 l  p ef
-pom
-gr
-24131 6986 m  23680 6836 l  23681 7136 l  24131 6986 l  p ef
-20956 6986 m  23771 6986 l  ps
-24131 9526 m  23680 9376 l  23681 9676 l  24131 9526 l  p ef
-20956 9526 m  23771 9526 l  ps
-gs
-pum
-24646 7223 t
-79 0 m  79 -606 l  159 -606 l  159 0 l  p ef
-pom
-gr
-gs
-pum
-24435 9763 t
-524 -64 m  562 -39 596 -20 627 -8 ct 604 47 l  560 31 517 6 473 -27 ct 429 -2 379 10 325 10 ct 
-270 10 220 -2 175 -29 ct 131 -55 96 -93 72 -141 ct 48 -189 36 -243 36 -303 ct 36 -362 48 -417 72 -466 ct 
-97 -515 131 -552 176 -578 ct 221 -604 271 -617 326 -617 ct 382 -617 433 -603 478 -577 ct 
-523 -550 557 -513 580 -465 ct 604 -417 616 -363 616 -303 ct 616 -253 608 -208 593 -168 ct 
-578 -129 l  555 -94 l  p
-348 -167 m  394 -154 432 -135 462 -109 ct 509 -152 533 -217 533 -303 ct 533 -352 525 -395 508 -432 ct 
-491 -468 467 -497 435 -517 ct 403 -537 367 -547 327 -547 ct 267 -547 217 -527 178 -486 ct 
-138 -445 119 -384 119 -303 ct 119 -224 138 -163 177 -121 ct 216 -79 266 -58 327 -58 ct 
-355 -58 382 -63 408 -74 ct 383 -90 356 -102 328 -109 ct p ef
-pom
-gr
-gs
-pum
-23747 3307 t
-315 0 m  241 0 l  241 -474 l  223 -457 199 -440 170 -423 ct 141 -405 115 -393 92 -384 ct 
-92 -456 l  133 -476 170 -499 201 -527 ct 232 -555 254 -582 267 -608 ct 315 -608 l 
-p ef
-897 -457 m  823 -452 l  816 -481 807 -502 795 -515 ct 775 -536 750 -547 720 -547 ct 
-697 -547 676 -540 658 -527 ct 634 -510 616 -485 602 -452 ct 589 -420 582 -373 581 -312 ct 
-599 -339 621 -360 647 -373 ct 673 -386 700 -393 729 -393 ct 778 -393 820 -375 855 -338 ct 
-890 -301 908 -254 908 -196 ct 908 -158 899 -123 883 -90 ct 867 -58 844 -33 815 -15 ct 
-787 1 754 10 718 10 ct 656 10 605 -12 566 -58 ct 527 -103 507 -178 507 -283 ct 
-507 -400 529 -486 572 -539 ct 610 -585 661 -608 725 -608 ct 773 -608 812 -595 842 -568 ct 
-873 -541 l  891 -504 l  p
-593 -196 m  593 -170 598 -146 609 -122 ct 620 -99 635 -81 655 -69 ct 675 -57 695 -50 717 -50 ct 
-748 -50 775 -63 798 -88 ct 820 -114 832 -148 832 -192 ct 832 -234 820 -267 798 -291 ct 
-776 -315 748 -327 714 -327 ct 680 -327 652 -315 628 -291 ct 605 -267 l  593 -235 l 
-p ef
-952 -181 m  952 -256 l  1181 -256 l  1181 -181 l  p ef
-1341 0 m  1272 0 l  1272 -606 l  1346 -606 l  1346 -390 l  1378 -429 1418 -449 1467 -449 ct 
-1494 -449 1519 -443 1543 -432 ct 1568 -421 1587 -406 1603 -386 ct 1619 -367 1631 -343 1640 -315 ct 
-1648 -287 1653 -257 1653 -226 ct 1653 -150 1634 -92 1597 -51 ct 1560 -10 1515 9 1463 9 ct 
-1411 9 1370 -11 1341 -55 ct p
-1340 -222 m  1340 -170 1347 -132 1362 -108 ct 1385 -70 1417 -51 1457 -51 ct 
-1489 -51 1517 -65 1541 -93 ct 1565 -121 1577 -164 1577 -220 ct 1577 -277 1565 -319 1543 -346 ct 
-1520 -374 1492 -387 1460 -387 ct 1428 -387 1399 -373 1376 -345 ct 1352 -317 l 
-1340 -276 l  p ef
-1723 -520 m  1723 -606 l  1797 -606 l  1797 -520 l  p
-1723 0 m  1723 -439 l  1797 -439 l  1797 0 l  p ef
-2070 -66 m  2081 0 l  2060 3 2041 5 2024 5 ct 1997 5 1976 1 1962 -7 ct 1947 -15 1936 -26 1930 -40 ct 
-1924 -54 1921 -83 1921 -128 ct 1921 -381 l  1866 -381 l  1866 -439 l  1921 -439 l 
-1921 -547 l  1995 -592 l  1995 -439 l  2070 -439 l  2070 -381 l  1995 -381 l 
-1995 -124 l  1995 -103 1996 -89 1999 -83 ct 2002 -77 2006 -72 2012 -69 ct 2018 -65 2026 -63 2037 -63 ct 
-2045 -63 l  2056 -64 l  p ef
-pom
-pum
-22596 4260 t
-340 0 m  340 -55 l  312 -11 272 9 217 9 ct 182 9 150 0 121 -19 ct 92 -38 69 -65 53 -99 ct 
-37 -134 28 -174 28 -219 ct 28 -263 36 -302 50 -338 ct 65 -374 87 -401 116 -420 ct 
-145 -439 178 -449 214 -449 ct 241 -449 264 -443 285 -432 ct 306 -421 322 -406 335 -388 ct 
-335 -606 l  409 -606 l  409 0 l  p
-105 -219 m  105 -162 117 -120 141 -93 ct 164 -65 192 -51 224 -51 ct 257 -51 285 -64 307 -91 ct 
-330 -117 342 -158 342 -212 ct 342 -273 330 -317 307 -345 ct 284 -373 255 -387 221 -387 ct 
-188 -387 160 -374 138 -346 ct 116 -319 l  105 -277 l  p ef
-818 -54 m  790 -30 764 -14 738 -4 ct 713 5 685 9 656 9 ct 608 9 571 -1 545 -25 ct 
-519 -49 506 -79 506 -115 ct 506 -137 511 -156 521 -174 ct 531 -192 543 -206 559 -217 ct 
-575 -228 593 -236 613 -241 ct 627 -245 649 -249 679 -253 ct 739 -260 783 -268 812 -278 ct 
-812 -288 812 -295 812 -298 ct 812 -328 805 -349 791 -362 ct 772 -379 744 -387 706 -387 ct 
-671 -387 645 -381 629 -369 ct 612 -356 600 -335 592 -303 ct 519 -313 l  526 -345 536 -370 552 -389 ct 
-567 -408 589 -423 617 -433 ct 646 -443 679 -449 717 -449 ct 755 -449 785 -444 808 -435 ct 
-832 -427 849 -415 860 -402 ct 871 -389 879 -372 883 -351 ct 886 -339 887 -316 887 -283 ct 
-887 -184 l  887 -114 889 -71 892 -52 ct 895 -34 901 -16 911 0 ct 833 0 l  825 -15 l 
-820 -33 l  p
-812 -220 m  785 -209 744 -200 690 -192 ct 660 -187 638 -182 625 -177 ct 613 -171 603 -163 596 -153 ct 
-589 -142 586 -130 586 -117 ct 586 -98 593 -81 608 -68 ct 623 -55 645 -48 674 -48 ct 
-703 -48 728 -54 751 -67 ct 773 -79 789 -96 800 -118 ct 808 -135 812 -160 812 -193 ct 
-p ef
-1144 -66 m  1155 0 l  1134 3 1115 5 1098 5 ct 1071 5 1050 1 1036 -7 ct 1021 -15 1010 -26 1004 -40 ct 
-998 -54 995 -83 995 -128 ct 995 -381 l  940 -381 l  940 -439 l  995 -439 l 
-995 -547 l  1069 -592 l  1069 -439 l  1144 -439 l  1144 -381 l  1069 -381 l 
-1069 -124 l  1069 -103 1070 -89 1073 -83 ct 1076 -77 1080 -72 1086 -69 ct 1092 -65 1100 -63 1111 -63 ct 
-1119 -63 l  1130 -64 l  p ef
-1506 -54 m  1478 -30 1452 -14 1426 -4 ct 1401 5 1373 9 1344 9 ct 1296 9 1259 -1 1233 -25 ct 
-1207 -49 1194 -79 1194 -115 ct 1194 -137 1199 -156 1209 -174 ct 1219 -192 1231 -206 1247 -217 ct 
-1263 -228 1281 -236 1301 -241 ct 1315 -245 1337 -249 1367 -253 ct 1427 -260 1471 -268 1500 -278 ct 
-1500 -288 1500 -295 1500 -298 ct 1500 -328 1493 -349 1479 -362 ct 1460 -379 1432 -387 1394 -387 ct 
-1359 -387 1333 -381 1317 -369 ct 1300 -356 1288 -335 1280 -303 ct 1207 -313 l 
-1214 -345 1224 -370 1240 -389 ct 1255 -408 1277 -423 1305 -433 ct 1334 -443 1367 -449 1405 -449 ct 
-1443 -449 1473 -444 1496 -435 ct 1520 -427 1537 -415 1548 -402 ct 1559 -389 1567 -372 1571 -351 ct 
-1574 -339 1575 -316 1575 -283 ct 1575 -184 l  1575 -114 1577 -71 1580 -52 ct 
-1583 -34 1589 -16 1599 0 ct 1521 0 l  1513 -15 l  1508 -33 l  p
-1500 -220 m  1473 -209 1432 -200 1378 -192 ct 1348 -187 1326 -182 1313 -177 ct 
-1301 -171 1291 -163 1284 -153 ct 1277 -142 1274 -130 1274 -117 ct 1274 -98 1281 -81 1296 -68 ct 
-1311 -55 1333 -48 1362 -48 ct 1391 -48 1416 -54 1439 -67 ct 1461 -79 1477 -96 1488 -118 ct 
-1496 -135 1500 -160 1500 -193 ct p ef
-2070 -66 m  2081 0 l  2060 3 2041 5 2024 5 ct 1997 5 1976 1 1962 -7 ct 1947 -15 1936 -26 1930 -40 ct 
-1924 -54 1921 -83 1921 -128 ct 1921 -381 l  1866 -381 l  1866 -439 l  1921 -439 l 
-1921 -547 l  1995 -592 l  1995 -439 l  2070 -439 l  2070 -381 l  1995 -381 l 
-1995 -124 l  1995 -103 1996 -89 1999 -83 ct 2002 -77 2006 -72 2012 -69 ct 2018 -65 2026 -63 2037 -63 ct 
-2045 -63 l  2056 -64 l  p ef
-2118 -219 m  2118 -300 2140 -361 2185 -400 ct 2223 -432 2269 -449 2324 -449 ct 
-2384 -449 2433 -429 2472 -389 ct 2510 -350 2529 -295 2529 -225 ct 2529 -169 2521 -124 2504 -92 ct 
-2487 -60 2462 -34 2430 -16 ct 2397 0 2362 9 2324 9 ct 2262 9 2212 -9 2174 -49 ct 
-2137 -88 l  2118 -145 l  p
-2194 -219 m  2194 -163 2206 -121 2231 -93 ct 2255 -65 2286 -51 2324 -51 ct 2361 -51 2391 -65 2416 -93 ct 
-2440 -121 2453 -164 2453 -222 ct 2453 -276 2440 -317 2416 -345 ct 2391 -373 2360 -387 2324 -387 ct 
-2286 -387 2255 -373 2231 -345 ct 2206 -317 l  2194 -275 l  p ef
-2860 0 m  2860 -606 l  2935 -606 l  2935 -388 l  2970 -429 3013 -449 3066 -449 ct 
-3099 -449 3127 -442 3151 -429 ct 3175 -417 3192 -399 3203 -376 ct 3213 -354 3218 -321 3218 -278 ct 
-3218 0 l  3144 0 l  3144 -278 l  3144 -315 3136 -342 3119 -359 ct 3103 -376 3081 -385 3051 -385 ct 
-3029 -385 3008 -379 2989 -367 ct 2969 -356 2955 -340 2947 -321 ct 2939 -301 2935 -274 2935 -240 ct 
-2935 0 l  p ef
-3309 -219 m  3309 -300 3331 -361 3376 -400 ct 3414 -432 3460 -449 3515 -449 ct 
-3575 -449 3624 -429 3663 -389 ct 3701 -350 3720 -295 3720 -225 ct 3720 -169 3712 -124 3695 -92 ct 
-3678 -60 3653 -34 3621 -16 ct 3588 0 3553 9 3515 9 ct 3453 9 3403 -9 3365 -49 ct 
-3328 -88 l  3309 -145 l  p
-3385 -219 m  3385 -163 3397 -121 3422 -93 ct 3446 -65 3477 -51 3515 -51 ct 3552 -51 3582 -65 3607 -93 ct 
-3631 -121 3644 -164 3644 -222 ct 3644 -276 3631 -317 3607 -345 ct 3582 -373 3551 -387 3515 -387 ct 
-3477 -387 3446 -373 3422 -345 ct 3397 -317 l  3385 -275 l  p ef
-3783 -131 m  3856 -142 l  3860 -113 3872 -90 3891 -74 ct 3910 -59 3936 -51 3970 -51 ct 
-4004 -51 4029 -58 4046 -72 ct 4063 -86 4071 -102 4071 -121 ct 4071 -138 4064 -151 4049 -160 ct 
-4039 -167 4013 -175 3973 -186 ct 3918 -199 3880 -211 3859 -221 ct 3838 -231 3822 -245 3811 -263 ct 
-3800 -281 3795 -301 3795 -322 ct 3795 -342 3799 -360 3808 -376 ct 3817 -393 3830 -407 3845 -418 ct 
-3857 -427 3872 -434 3892 -440 ct 3912 -446 3934 -449 3957 -449 ct 3991 -449 4021 -444 4047 -434 ct 
-4074 -424 4093 -410 4105 -393 ct 4118 -376 4126 -354 4131 -325 ct 4058 -315 l 
-4055 -338 4045 -356 4029 -368 ct 4013 -381 3991 -387 3962 -387 ct 3928 -387 3903 -382 3889 -370 ct 
-3874 -359 3867 -346 3867 -331 ct 3867 -321 3870 -312 3876 -305 ct 3882 -297 3892 -290 3905 -285 ct 
-3912 -282 3934 -276 3970 -266 ct 4023 -252 4060 -240 4081 -231 ct 4101 -222 4118 -209 4130 -192 ct 
-4141 -175 4147 -154 4147 -129 ct 4147 -104 4140 -80 4126 -58 ct 4111 -37 4090 -20 4063 -8 ct 
-4036 3 4005 9 3970 9 ct 3913 9 3870 -1 3840 -25 ct 3810 -49 l  3791 -84 l  p ef
-4372 -66 m  4383 0 l  4362 3 4343 5 4326 5 ct 4299 5 4278 1 4264 -7 ct 4249 -15 4238 -26 4232 -40 ct 
-4226 -54 4223 -83 4223 -128 ct 4223 -381 l  4168 -381 l  4168 -439 l  4223 -439 l 
-4223 -547 l  4297 -592 l  4297 -439 l  4372 -439 l  4372 -381 l  4297 -381 l 
-4297 -124 l  4297 -103 4298 -89 4301 -83 ct 4304 -77 4308 -72 4314 -69 ct 4320 -65 4328 -63 4339 -63 ct 
-4347 -63 l  4358 -64 l  p ef
-pom
-pum
-23257 5213 t
-177 0 m  10 -439 l  89 -439 l  183 -176 l  193 -147 203 -118 211 -87 ct 218 -110 227 -138 239 -171 ct 
-337 -439 l  413 -439 l  247 0 l  p ef
-479 -520 m  479 -606 l  553 -606 l  553 -520 l  p
-479 0 m  479 -439 l  553 -439 l  553 0 l  p ef
-951 -54 m  923 -30 897 -14 871 -4 ct 846 5 818 9 789 9 ct 741 9 704 -1 678 -25 ct 
-652 -49 639 -79 639 -115 ct 639 -137 644 -156 654 -174 ct 664 -192 676 -206 692 -217 ct 
-708 -228 726 -236 746 -241 ct 760 -245 782 -249 812 -253 ct 872 -260 916 -268 945 -278 ct 
-945 -288 945 -295 945 -298 ct 945 -328 938 -349 924 -362 ct 905 -379 877 -387 839 -387 ct 
-804 -387 778 -381 762 -369 ct 745 -356 733 -335 725 -303 ct 652 -313 l  659 -345 669 -370 685 -389 ct 
-700 -408 722 -423 750 -433 ct 779 -443 812 -449 850 -449 ct 888 -449 918 -444 941 -435 ct 
-965 -427 982 -415 993 -402 ct 1004 -389 1012 -372 1016 -351 ct 1019 -339 1020 -316 1020 -283 ct 
-1020 -184 l  1020 -114 1022 -71 1025 -52 ct 1028 -34 1034 -16 1044 0 ct 966 0 l 
-958 -15 l  953 -33 l  p
-945 -220 m  918 -209 877 -200 823 -192 ct 793 -187 771 -182 758 -177 ct 746 -171 736 -163 729 -153 ct 
-722 -142 719 -130 719 -117 ct 719 -98 726 -81 741 -68 ct 756 -55 778 -48 807 -48 ct 
-836 -48 861 -54 884 -67 ct 906 -79 922 -96 933 -118 ct 941 -135 945 -160 945 -193 ct 
-p ef
-1759 -606 m  1839 -606 l  1839 -256 l  1839 -195 1832 -146 1818 -110 ct 1804 -75 1780 -45 1744 -23 ct 
-1708 0 1660 10 1602 10 ct 1545 10 1499 0 1463 -19 ct 1426 -38 1401 -66 1385 -104 ct 
-1370 -141 1362 -191 1362 -256 ct 1362 -606 l  1442 -606 l  1442 -256 l  1442 -203 1447 -164 1457 -139 ct 
-1467 -115 1484 -95 1507 -82 ct 1531 -68 1560 -62 1595 -62 ct 1654 -62 1696 -75 1721 -102 ct 
-1746 -128 1759 -180 1759 -256 ct p ef
-1969 -194 m  2044 -201 l  2048 -171 2056 -146 2069 -126 ct 2082 -107 2103 -91 2130 -79 ct 
-2158 -67 2189 -61 2223 -61 ct 2254 -61 2281 -66 2304 -75 ct 2328 -84 2345 -96 2357 -112 ct 
-2368 -128 2374 -145 2374 -164 ct 2374 -183 2368 -200 2357 -214 ct 2346 -228 2328 -240 2303 -250 ct 
-2286 -256 2250 -266 2195 -279 ct 2139 -293 2100 -305 2078 -317 ct 2049 -332 2027 -351 2013 -374 ct 
-1999 -396 1992 -421 1992 -449 ct 1992 -480 2000 -508 2018 -535 ct 2035 -561 2061 -582 2094 -595 ct 
-2127 -609 2164 -616 2205 -616 ct 2250 -616 2290 -609 2324 -594 ct 2358 -580 2385 -559 2403 -531 ct 
-2422 -502 2432 -471 2433 -435 ct 2356 -429 l  2352 -468 2338 -496 2314 -516 ct 
-2290 -536 2255 -545 2208 -545 ct 2160 -545 2125 -537 2102 -519 ct 2080 -501 2069 -480 2069 -454 ct 
-2069 -433 2077 -415 2093 -401 ct 2108 -387 2148 -372 2214 -357 ct 2279 -343 2324 -330 2348 -319 ct 
-2383 -303 2409 -282 2426 -257 ct 2443 -232 2451 -203 2451 -171 ct 2451 -138 2442 -108 2423 -80 ct 
-2405 -51 2378 -29 2344 -13 ct 2309 2 2270 10 2227 10 ct 2172 10 2126 2 2089 -13 ct 
-2052 -29 2023 -53 2002 -85 ct 1981 -117 l  1970 -154 l  p ef
-2576 0 m  2576 -606 l  2803 -606 l  2849 -606 2886 -600 2914 -587 ct 2942 -575 2964 -556 2980 -531 ct 
-2996 -505 3004 -479 3004 -451 ct 3004 -425 2997 -400 2983 -378 ct 2969 -355 2948 -336 2919 -322 ct 
-2956 -311 2984 -293 3004 -267 ct 3024 -241 3033 -211 3033 -175 ct 3033 -147 3027 -120 3015 -96 ct 
-3003 -72 2989 -53 2971 -40 ct 2953 -26 2931 -16 2905 -10 ct 2878 -3 2845 0 2807 0 ct 
-p
-2656 -351 m  2787 -351 l  2822 -351 2848 -353 2863 -358 ct 2884 -364 2899 -374 2909 -388 ct 
-2920 -402 2925 -420 2925 -441 ct 2925 -461 2920 -479 2911 -494 ct 2901 -510 2887 -520 2869 -526 ct 
-2851 -531 2821 -534 2777 -534 ct 2656 -534 l  p
-2656 -71 m  2807 -71 l  2833 -71 2851 -72 2861 -74 ct 2880 -77 2895 -83 2908 -90 ct 
-2920 -98 2930 -109 2938 -124 ct 2946 -139 2950 -156 2950 -175 ct 2950 -198 2944 -218 2933 -234 ct 
-2921 -251 2905 -263 2885 -269 ct 2864 -276 2835 -279 2796 -279 ct 2656 -279 l 
-p ef
-pom
-gr
-gs
-pum
-6825 19235 t
-497 -212 m  578 -192 l  561 -126 531 -76 487 -41 ct 443 -6 390 10 327 10 ct 
-261 10 208 -2 167 -29 ct 126 -56 95 -94 74 -145 ct 52 -195 42 -249 42 -307 ct 42 -370 54 -425 78 -472 ct 
-102 -519 136 -555 181 -580 ct 225 -604 274 -616 328 -616 ct 389 -616 440 -601 481 -570 ct 
-522 -539 551 -496 567 -440 ct 488 -421 l  474 -465 454 -497 427 -517 ct 400 -537 367 -547 326 -547 ct 
-280 -547 241 -536 209 -514 ct 178 -492 156 -462 143 -424 ct 131 -386 124 -348 124 -308 ct 
-124 -256 132 -211 147 -173 ct 162 -134 185 -105 217 -86 ct 249 -67 283 -58 320 -58 ct 
-365 -58 403 -71 434 -97 ct 465 -123 l  486 -161 l  p ef
-991 -141 m  1068 -131 l  1056 -86 1033 -52 1001 -27 ct 968 -2 926 9 875 9 ct 
-811 9 760 -9 722 -49 ct 684 -88 666 -144 666 -215 ct 666 -289 685 -347 723 -387 ct 
-761 -428 810 -449 871 -449 ct 929 -449 977 -429 1015 -389 ct 1052 -349 1070 -292 1070 -220 ct 
-1070 -216 1070 -209 1070 -200 ct 742 -200 l  745 -152 759 -115 783 -89 ct 808 -64 839 -51 875 -51 ct 
-903 -51 926 -58 945 -72 ct 964 -87 l  980 -110 l  p
-747 -261 m  992 -261 l  989 -298 979 -326 964 -344 ct 940 -373 909 -387 871 -387 ct 
-837 -387 809 -376 785 -353 ct 762 -330 l  749 -300 l  p ef
-1166 0 m  1166 -439 l  1233 -439 l  1233 -376 l  1266 -425 1312 -449 1373 -449 ct 
-1400 -449 1424 -444 1446 -434 ct 1468 -425 1485 -412 1496 -397 ct 1507 -382 1515 -363 1519 -342 ct 
-1522 -328 1523 -304 1523 -270 ct 1523 0 l  1449 0 l  1449 -267 l  1449 -297 1446 -320 1440 -335 ct 
-1434 -350 1424 -362 1409 -371 ct 1395 -380 1377 -384 1357 -384 ct 1326 -384 1298 -374 1275 -354 ct 
-1252 -334 1241 -296 1241 -239 ct 1241 0 l  p ef
-1806 -66 m  1817 0 l  1796 3 1777 5 1760 5 ct 1733 5 1712 1 1698 -7 ct 1683 -15 1672 -26 1666 -40 ct 
-1660 -54 1657 -83 1657 -128 ct 1657 -381 l  1602 -381 l  1602 -439 l  1657 -439 l 
-1657 -547 l  1731 -592 l  1731 -439 l  1806 -439 l  1806 -381 l  1731 -381 l 
-1731 -124 l  1731 -103 1732 -89 1735 -83 ct 1738 -77 1742 -72 1748 -69 ct 1754 -65 1762 -63 1773 -63 ct 
-1781 -63 l  1792 -64 l  p ef
-2182 -141 m  2259 -131 l  2247 -86 2224 -52 2192 -27 ct 2159 -2 2117 9 2066 9 ct 
-2002 9 1951 -9 1913 -49 ct 1875 -88 1857 -144 1857 -215 ct 1857 -289 1876 -347 1914 -387 ct 
-1952 -428 2001 -449 2062 -449 ct 2120 -449 2168 -429 2206 -389 ct 2243 -349 2261 -292 2261 -220 ct 
-2261 -216 2261 -209 2261 -200 ct 1933 -200 l  1936 -152 1950 -115 1974 -89 ct 
-1999 -64 2030 -51 2066 -51 ct 2094 -51 2117 -58 2136 -72 ct 2155 -87 l  2171 -110 l 
-p
-1938 -261 m  2183 -261 l  2180 -298 2170 -326 2155 -344 ct 2131 -373 2100 -387 2062 -387 ct 
-2028 -387 2000 -376 1976 -353 ct 1953 -330 l  1940 -300 l  p ef
-2357 0 m  2357 -439 l  2424 -439 l  2424 -372 l  2441 -403 2456 -424 2471 -434 ct 
-2485 -444 2501 -449 2519 -449 ct 2544 -449 2569 -441 2595 -425 ct 2570 -356 l 
-2551 -366 2533 -372 2515 -372 ct 2499 -372 2484 -367 2471 -357 ct 2458 -347 2449 -334 2443 -316 ct 
-2435 -290 2431 -261 2431 -229 ct 2431 0 l  p ef
-2904 0 m  2904 -381 l  2838 -381 l  2838 -439 l  2904 -439 l  2904 -485 l 
-2904 -515 2907 -537 2912 -551 ct 2919 -571 2932 -586 2950 -598 ct 2968 -610 2993 -616 3026 -616 ct 
-3047 -616 3070 -614 3095 -609 ct 3084 -544 l  3069 -547 3054 -548 3040 -548 ct 
-3018 -548 3002 -543 2992 -533 ct 2983 -524 2978 -506 2978 -479 ct 2978 -439 l 
-3064 -439 l  3064 -381 l  2978 -381 l  2978 0 l  p ef
-3124 0 m  3124 -439 l  3191 -439 l  3191 -372 l  3208 -403 3223 -424 3238 -434 ct 
-3252 -444 3268 -449 3286 -449 ct 3311 -449 3336 -441 3362 -425 ct 3337 -356 l 
-3318 -366 3300 -372 3282 -372 ct 3266 -372 3251 -367 3238 -357 ct 3225 -347 3216 -334 3210 -316 ct 
-3202 -290 3198 -261 3198 -229 ct 3198 0 l  p ef
-3716 -141 m  3793 -131 l  3781 -86 3758 -52 3726 -27 ct 3693 -2 3651 9 3600 9 ct 
-3536 9 3485 -9 3447 -49 ct 3409 -88 3391 -144 3391 -215 ct 3391 -289 3410 -347 3448 -387 ct 
-3486 -428 3535 -449 3596 -449 ct 3654 -449 3702 -429 3740 -389 ct 3777 -349 3795 -292 3795 -220 ct 
-3795 -216 3795 -209 3795 -200 ct 3467 -200 l  3470 -152 3484 -115 3508 -89 ct 
-3533 -64 3564 -51 3600 -51 ct 3628 -51 3651 -58 3670 -72 ct 3689 -87 l  3705 -110 l 
-p
-3472 -261 m  3717 -261 l  3714 -298 3704 -326 3689 -344 ct 3665 -373 3634 -387 3596 -387 ct 
-3562 -387 3534 -376 3510 -353 ct 3487 -330 l  3474 -300 l  p ef
-4171 168 m  4171 -46 l  4160 -30 4144 -16 4123 -6 ct 4102 4 4080 9 4056 9 ct 
-4004 9 3959 -10 3922 -52 ct 3884 -94 3865 -151 3865 -223 ct 3865 -267 3873 -307 3888 -342 ct 
-3904 -377 3926 -404 3955 -422 ct 3984 -440 4016 -449 4051 -449 ct 4105 -449 4148 -426 4179 -380 ct 
-4179 -439 l  4246 -439 l  4246 168 l  p
-3942 -220 m  3942 -164 3954 -121 3977 -93 ct 4001 -65 4029 -51 4063 -51 ct 4094 -51 4122 -64 4144 -91 ct 
-4167 -118 4179 -159 4179 -214 ct 4179 -272 4167 -316 4143 -346 ct 4118 -375 4090 -390 4058 -390 ct 
-4025 -390 3998 -376 3975 -349 ct 3953 -321 l  3942 -279 l  p ef
-4656 0 m  4656 -64 l  4622 -14 4576 9 4517 9 ct 4491 9 4467 4 4444 -4 ct 4422 -14 4405 -27 4394 -42 ct 
-4383 -57 4376 -75 4371 -97 ct 4368 -112 4367 -135 4367 -167 ct 4367 -439 l  4441 -439 l 
-4441 -195 l  4441 -156 4443 -130 4446 -117 ct 4450 -97 4460 -82 4475 -70 ct 
-4491 -59 4509 -54 4532 -54 ct 4554 -54 4575 -59 4595 -71 ct 4614 -82 4628 -98 4636 -118 ct 
-4644 -137 4648 -166 4648 -203 ct 4648 -439 l  4723 -439 l  4723 0 l  p ef
-5145 -141 m  5222 -131 l  5210 -86 5187 -52 5155 -27 ct 5122 -2 5080 9 5029 9 ct 
-4965 9 4914 -9 4876 -49 ct 4838 -88 4820 -144 4820 -215 ct 4820 -289 4839 -347 4877 -387 ct 
-4915 -428 4964 -449 5025 -449 ct 5083 -449 5131 -429 5169 -389 ct 5206 -349 5224 -292 5224 -220 ct 
-5224 -216 5224 -209 5224 -200 ct 4896 -200 l  4899 -152 4913 -115 4937 -89 ct 
-4962 -64 4993 -51 5029 -51 ct 5057 -51 5080 -58 5099 -72 ct 5118 -87 l  5134 -110 l 
-p
-4901 -261 m  5146 -261 l  5143 -298 5133 -326 5118 -344 ct 5094 -373 5063 -387 5025 -387 ct 
-4991 -387 4963 -376 4939 -353 ct 4916 -330 l  4903 -300 l  p ef
-5320 0 m  5320 -439 l  5387 -439 l  5387 -376 l  5420 -425 5466 -449 5527 -449 ct 
-5554 -449 5578 -444 5600 -434 ct 5622 -425 5639 -412 5650 -397 ct 5661 -382 5669 -363 5673 -342 ct 
-5676 -328 5677 -304 5677 -270 ct 5677 0 l  5603 0 l  5603 -267 l  5603 -297 5600 -320 5594 -335 ct 
-5588 -350 5578 -362 5563 -371 ct 5549 -380 5531 -384 5511 -384 ct 5480 -384 5452 -374 5429 -354 ct 
-5406 -334 5395 -296 5395 -239 ct 5395 0 l  p ef
-6083 -160 m  6156 -151 l  6148 -100 6128 -61 6095 -32 ct 6062 -4 6021 9 5973 9 ct 
-5913 9 5865 -9 5828 -49 ct 5792 -88 5774 -144 5774 -217 ct 5774 -265 5781 -306 5797 -342 ct 
-5813 -378 5837 -404 5869 -422 ct 5901 -440 5936 -449 5974 -449 ct 6021 -449 6060 -437 6091 -412 ct 
-6121 -388 6141 -354 6149 -310 ct 6077 -299 l  6070 -328 6058 -350 6040 -365 ct 
-6023 -380 6001 -387 5977 -387 ct 5939 -387 5909 -374 5885 -347 ct 5862 -320 5850 -278 5850 -220 ct 
-5850 -161 5861 -118 5884 -91 ct 5907 -64 5936 -51 5973 -51 ct 6002 -51 6026 -60 6046 -78 ct 
-6065 -96 l  6078 -123 l  p ef
-6217 169 m  6209 99 l  6225 103 6239 105 6251 105 ct 6268 105 6281 103 6291 97 ct 
-6301 92 6309 84 6315 74 ct 6320 66 6328 48 6338 19 ct 6340 14 6342 8 6345 0 ct 
-6178 -439 l  6258 -439 l  6350 -184 l  6362 -152 6372 -118 6382 -83 ct 6390 -117 6400 -150 6412 -183 ct 
-6506 -439 l  6581 -439 l  6413 7 l  6396 55 6382 88 6372 107 ct 6358 131 6343 149 6326 161 ct 
-6309 172 6289 178 6265 178 ct 6251 178 l  6235 175 l  p ef
-pom
-pum
-7778 20188 t
-26 -181 m  26 -256 l  255 -256 l  255 -181 l  p ef
-364 0 m  364 -381 l  298 -381 l  298 -439 l  364 -439 l  364 -485 l  364 -515 367 -537 372 -551 ct 
-379 -571 392 -586 410 -598 ct 428 -610 453 -616 486 -616 ct 507 -616 530 -614 555 -609 ct 
-544 -544 l  529 -547 514 -548 500 -548 ct 478 -548 462 -543 452 -533 ct 443 -524 438 -506 438 -479 ct 
-438 -439 l  524 -439 l  524 -381 l  438 -381 l  438 0 l  p ef
-555 -131 m  628 -142 l  632 -113 644 -90 663 -74 ct 682 -59 708 -51 742 -51 ct 
-776 -51 801 -58 818 -72 ct 835 -86 843 -102 843 -121 ct 843 -138 836 -151 821 -160 ct 
-811 -167 785 -175 745 -186 ct 690 -199 652 -211 631 -221 ct 610 -231 594 -245 583 -263 ct 
-572 -281 567 -301 567 -322 ct 567 -342 571 -360 580 -376 ct 589 -393 602 -407 617 -418 ct 
-629 -427 644 -434 664 -440 ct 684 -446 706 -449 729 -449 ct 763 -449 793 -444 819 -434 ct 
-846 -424 865 -410 877 -393 ct 890 -376 898 -354 903 -325 ct 830 -315 l  827 -338 817 -356 801 -368 ct 
-785 -381 763 -387 734 -387 ct 700 -387 675 -382 661 -370 ct 646 -359 639 -346 639 -331 ct 
-639 -321 642 -312 648 -305 ct 654 -297 664 -290 677 -285 ct 684 -282 706 -276 742 -266 ct 
-795 -252 832 -240 853 -231 ct 873 -222 890 -209 902 -192 ct 913 -175 919 -154 919 -129 ct 
-919 -104 912 -80 898 -58 ct 883 -37 862 -20 835 -8 ct 808 3 777 9 742 9 ct 685 9 642 -1 612 -25 ct 
-582 -49 l  563 -84 l  p ef
-926 10 m  1101 -616 l  1161 -616 l  985 10 l  p ef
-1590 -71 m  1590 0 l  1189 0 l  1189 -17 1191 -35 1198 -51 ct 1208 -79 1224 -105 1247 -132 ct 
-1269 -158 1302 -189 1344 -224 ct 1410 -278 1455 -321 1478 -352 ct 1501 -384 1513 -413 1513 -442 ct 
-1513 -471 1502 -496 1481 -516 ct 1460 -537 1432 -547 1398 -547 ct 1363 -547 1334 -536 1312 -514 ct 
-1291 -493 1280 -463 1280 -425 ct 1203 -433 l  1208 -490 1228 -533 1262 -563 ct 
-1297 -593 1342 -608 1400 -608 ct 1458 -608 1504 -592 1538 -560 ct 1572 -528 1589 -488 1589 -440 ct 
-1589 -416 1584 -392 1574 -368 ct 1564 -345 1548 -320 1525 -294 ct 1502 -268 1463 -233 1410 -188 ct 
-1365 -150 1337 -125 1324 -111 ct 1311 -98 1301 -85 1293 -71 ct p ef
-2097 -66 m  2108 0 l  2087 3 2068 5 2051 5 ct 2024 5 2003 1 1989 -7 ct 1974 -15 1963 -26 1957 -40 ct 
-1951 -54 1948 -83 1948 -128 ct 1948 -381 l  1893 -381 l  1893 -439 l  1948 -439 l 
-1948 -547 l  2022 -592 l  2022 -439 l  2097 -439 l  2097 -381 l  2022 -381 l 
-2022 -124 l  2022 -103 2023 -89 2026 -83 ct 2029 -77 2033 -72 2039 -69 ct 2045 -65 2053 -63 2064 -63 ct 
-2072 -63 l  2083 -64 l  p ef
-2145 -219 m  2145 -300 2167 -361 2212 -400 ct 2250 -432 2296 -449 2351 -449 ct 
-2411 -449 2460 -429 2499 -389 ct 2537 -350 2556 -295 2556 -225 ct 2556 -169 2548 -124 2531 -92 ct 
-2514 -60 2489 -34 2457 -16 ct 2424 0 2389 9 2351 9 ct 2289 9 2239 -9 2201 -49 ct 
-2164 -88 l  2145 -145 l  p
-2221 -219 m  2221 -163 2233 -121 2258 -93 ct 2282 -65 2313 -51 2351 -51 ct 2388 -51 2418 -65 2443 -93 ct 
-2467 -121 2480 -164 2480 -222 ct 2480 -276 2467 -317 2443 -345 ct 2418 -373 2387 -387 2351 -387 ct 
-2313 -387 2282 -373 2258 -345 ct 2233 -317 l  2221 -275 l  p ef
-3043 -98 m  3043 -264 l  2878 -264 l  2878 -333 l  3043 -333 l  3043 -498 l 
-3113 -498 l  3113 -333 l  3278 -333 l  3278 -264 l  3113 -264 l  3113 -98 l 
-p ef
-3407 0 m  3407 -381 l  3341 -381 l  3341 -439 l  3407 -439 l  3407 -485 l 
-3407 -515 3410 -537 3415 -551 ct 3422 -571 3435 -586 3453 -598 ct 3471 -610 3496 -616 3529 -616 ct 
-3550 -616 3573 -614 3598 -609 ct 3587 -544 l  3572 -547 3557 -548 3543 -548 ct 
-3521 -548 3505 -543 3495 -533 ct 3486 -524 3481 -506 3481 -479 ct 3481 -439 l 
-3567 -439 l  3567 -381 l  3481 -381 l  3481 0 l  p ef
-3598 -131 m  3671 -142 l  3675 -113 3687 -90 3706 -74 ct 3725 -59 3751 -51 3785 -51 ct 
-3819 -51 3844 -58 3861 -72 ct 3878 -86 3886 -102 3886 -121 ct 3886 -138 3879 -151 3864 -160 ct 
-3854 -167 3828 -175 3788 -186 ct 3733 -199 3695 -211 3674 -221 ct 3653 -231 3637 -245 3626 -263 ct 
-3615 -281 3610 -301 3610 -322 ct 3610 -342 3614 -360 3623 -376 ct 3632 -393 3645 -407 3660 -418 ct 
-3672 -427 3687 -434 3707 -440 ct 3727 -446 3749 -449 3772 -449 ct 3806 -449 3836 -444 3862 -434 ct 
-3889 -424 3908 -410 3920 -393 ct 3933 -376 3941 -354 3946 -325 ct 3873 -315 l 
-3870 -338 3860 -356 3844 -368 ct 3828 -381 3806 -387 3777 -387 ct 3743 -387 3718 -382 3704 -370 ct 
-3689 -359 3682 -346 3682 -331 ct 3682 -321 3685 -312 3691 -305 ct 3697 -297 3707 -290 3720 -285 ct 
-3727 -282 3749 -276 3785 -266 ct 3838 -252 3875 -240 3896 -231 ct 3916 -222 3933 -209 3945 -192 ct 
-3956 -175 3962 -154 3962 -129 ct 3962 -104 3955 -80 3941 -58 ct 3926 -37 3905 -20 3878 -8 ct 
-3851 3 3820 9 3785 9 ct 3728 9 3685 -1 3655 -25 ct 3625 -49 l  3606 -84 l  p ef
-3969 10 m  4144 -616 l  4204 -616 l  4028 10 l  p ef
-4633 -71 m  4633 0 l  4232 0 l  4232 -17 4234 -35 4241 -51 ct 4251 -79 4267 -105 4290 -132 ct 
-4312 -158 4345 -189 4387 -224 ct 4453 -278 4498 -321 4521 -352 ct 4544 -384 4556 -413 4556 -442 ct 
-4556 -471 4545 -496 4524 -516 ct 4503 -537 4475 -547 4441 -547 ct 4406 -547 4377 -536 4355 -514 ct 
-4334 -493 4323 -463 4323 -425 ct 4246 -433 l  4251 -490 4271 -533 4305 -563 ct 
-4340 -593 4385 -608 4443 -608 ct 4501 -608 4547 -592 4581 -560 ct 4615 -528 4632 -488 4632 -440 ct 
-4632 -416 4627 -392 4617 -368 ct 4607 -345 4591 -320 4568 -294 ct 4545 -268 4506 -233 4453 -188 ct 
-4408 -150 4380 -125 4367 -111 ct 4354 -98 4344 -85 4336 -71 ct p ef
-pom
-gr
-10161 16546 m  10011 16996 l  10311 16995 l  10161 16546 l  p ef
-10161 18381 m  10161 16906 l  ps
-gs
-pum
-2805 3466 t
-38 -194 m  113 -201 l  117 -171 125 -146 138 -126 ct 151 -107 172 -91 199 -79 ct 
-227 -67 258 -61 292 -61 ct 323 -61 350 -66 373 -75 ct 397 -84 414 -96 426 -112 ct 
-437 -128 443 -145 443 -164 ct 443 -183 437 -200 426 -214 ct 415 -228 397 -240 372 -250 ct 
-355 -256 319 -266 264 -279 ct 208 -293 169 -305 147 -317 ct 118 -332 96 -351 82 -374 ct 
-68 -396 61 -421 61 -449 ct 61 -480 69 -508 87 -535 ct 104 -561 130 -582 163 -595 ct 
-196 -609 233 -616 274 -616 ct 319 -616 359 -609 393 -594 ct 427 -580 454 -559 472 -531 ct 
-491 -502 501 -471 502 -435 ct 425 -429 l  421 -468 407 -496 383 -516 ct 359 -536 324 -545 277 -545 ct 
-229 -545 194 -537 171 -519 ct 149 -501 138 -480 138 -454 ct 138 -433 146 -415 162 -401 ct 
-177 -387 217 -372 283 -357 ct 348 -343 393 -330 417 -319 ct 452 -303 478 -282 495 -257 ct 
-512 -232 520 -203 520 -171 ct 520 -138 511 -108 492 -80 ct 474 -51 447 -29 413 -13 ct 
-378 2 339 10 296 10 ct 241 10 195 2 158 -13 ct 121 -29 92 -53 71 -85 ct 50 -117 l 
-39 -154 l  p ef
-924 -54 m  896 -30 870 -14 844 -4 ct 819 5 791 9 762 9 ct 714 9 677 -1 651 -25 ct 
-625 -49 612 -79 612 -115 ct 612 -137 617 -156 627 -174 ct 637 -192 649 -206 665 -217 ct 
-681 -228 699 -236 719 -241 ct 733 -245 755 -249 785 -253 ct 845 -260 889 -268 918 -278 ct 
-918 -288 918 -295 918 -298 ct 918 -328 911 -349 897 -362 ct 878 -379 850 -387 812 -387 ct 
-777 -387 751 -381 735 -369 ct 718 -356 706 -335 698 -303 ct 625 -313 l  632 -345 642 -370 658 -389 ct 
-673 -408 695 -423 723 -433 ct 752 -443 785 -449 823 -449 ct 861 -449 891 -444 914 -435 ct 
-938 -427 955 -415 966 -402 ct 977 -389 985 -372 989 -351 ct 992 -339 993 -316 993 -283 ct 
-993 -184 l  993 -114 995 -71 998 -52 ct 1001 -34 1007 -16 1017 0 ct 939 0 l 
-931 -15 l  926 -33 l  p
-918 -220 m  891 -209 850 -200 796 -192 ct 766 -187 744 -182 731 -177 ct 719 -171 709 -163 702 -153 ct 
-695 -142 692 -130 692 -117 ct 692 -98 699 -81 714 -68 ct 729 -55 751 -48 780 -48 ct 
-809 -48 834 -54 857 -67 ct 879 -79 895 -96 906 -118 ct 914 -135 918 -160 918 -193 ct 
-p ef
-1087 0 m  1087 -439 l  1154 -439 l  1154 -377 l  1168 -399 1186 -416 1209 -429 ct 
-1232 -442 1258 -449 1287 -449 ct 1320 -449 1346 -442 1367 -428 ct 1388 -415 1403 -396 1411 -372 ct 
-1446 -423 1491 -449 1547 -449 ct 1590 -449 1624 -437 1647 -412 ct 1671 -388 1682 -351 1682 -301 ct 
-1682 0 l  1608 0 l  1608 -276 l  1608 -306 1606 -327 1601 -340 ct 1596 -354 1588 -364 1575 -372 ct 
-1562 -380 1547 -384 1530 -384 ct 1499 -384 1474 -374 1453 -353 ct 1433 -333 1423 -300 1423 -255 ct 
-1423 0 l  1348 0 l  1348 -285 l  1348 -318 1342 -343 1330 -359 ct 1318 -376 1298 -384 1271 -384 ct 
-1250 -384 1230 -379 1212 -368 ct 1195 -357 1182 -340 1174 -319 ct 1166 -298 1162 -267 1162 -227 ct 
-1162 0 l  p ef
-1801 168 m  1801 -439 l  1869 -439 l  1869 -382 l  1885 -404 1903 -421 1923 -432 ct 
-1943 -443 1968 -449 1997 -449 ct 2034 -449 2067 -439 2096 -420 ct 2124 -400 2146 -373 2161 -338 ct 
-2175 -303 2183 -264 2183 -222 ct 2183 -177 2175 -137 2158 -101 ct 2142 -65 2119 -37 2088 -18 ct 
-2057 0 2025 9 1991 9 ct 1966 9 1944 4 1924 -5 ct 1905 -16 1888 -29 1876 -45 ct 
-1876 168 l  p
-1869 -217 m  1869 -160 1880 -118 1903 -91 ct 1926 -64 1954 -51 1986 -51 ct 2019 -51 2048 -65 2071 -93 ct 
-2095 -121 2107 -164 2107 -223 ct 2107 -279 2095 -321 2072 -349 ct 2049 -376 2022 -390 1990 -390 ct 
-1958 -390 1930 -376 1905 -346 ct 1881 -316 l  1869 -273 l  p ef
-2250 0 m  2250 -606 l  2324 -606 l  2324 0 l  p ef
-2437 -520 m  2437 -606 l  2511 -606 l  2511 -520 l  p
-2437 0 m  2437 -439 l  2511 -439 l  2511 0 l  p ef
-2621 0 m  2621 -439 l  2688 -439 l  2688 -376 l  2721 -425 2767 -449 2828 -449 ct 
-2855 -449 2879 -444 2901 -434 ct 2923 -425 2940 -412 2951 -397 ct 2962 -382 2970 -363 2974 -342 ct 
-2977 -328 2978 -304 2978 -270 ct 2978 0 l  2904 0 l  2904 -267 l  2904 -297 2901 -320 2895 -335 ct 
-2889 -350 2879 -362 2864 -371 ct 2850 -380 2832 -384 2812 -384 ct 2781 -384 2753 -374 2730 -354 ct 
-2707 -334 2696 -296 2696 -239 ct 2696 0 l  p ef
-3085 36 m  3157 47 l  3160 69 3169 85 3182 95 ct 3201 109 3226 116 3258 116 ct 
-3292 116 3319 109 3338 95 ct 3357 82 3369 62 3376 38 ct 3380 22 3381 -8 3381 -57 ct 
-3349 -19 3308 0 3260 0 ct 3199 0 3153 -21 3119 -65 ct 3086 -108 3070 -161 3070 -222 ct 
-3070 -264 3077 -302 3093 -338 ct 3108 -373 3130 -400 3159 -420 ct 3187 -439 3221 -449 3260 -449 ct 
-3312 -449 3355 -428 3388 -386 ct 3388 -439 l  3457 -439 l  3457 -59 l  3457 8 3450 57 3436 85 ct 
-3422 114 3400 136 3370 153 ct 3340 169 3303 178 3258 178 ct 3206 178 3164 166 3131 142 ct 
-3099 119 l  3084 83 l  p
-3146 -227 m  3146 -169 3158 -127 3181 -101 ct 3204 -74 3232 -61 3267 -61 ct 
-3301 -61 3330 -74 3353 -101 ct 3376 -127 3387 -168 3387 -224 ct 3387 -278 3376 -319 3352 -346 ct 
-3328 -373 3299 -387 3265 -387 ct 3232 -387 3204 -374 3181 -347 ct 3158 -320 l 
-3146 -280 l  p ef
-3812 0 m  3812 -439 l  3879 -439 l  3879 -372 l  3896 -403 3911 -424 3926 -434 ct 
-3940 -444 3956 -449 3974 -449 ct 3999 -449 4024 -441 4050 -425 ct 4025 -356 l 
-4006 -366 3988 -372 3970 -372 ct 3954 -372 3939 -367 3926 -357 ct 3913 -347 3904 -334 3898 -316 ct 
-3890 -290 3886 -261 3886 -229 ct 3886 0 l  p ef
-4390 -54 m  4362 -30 4336 -14 4310 -4 ct 4285 5 4257 9 4228 9 ct 4180 9 4143 -1 4117 -25 ct 
-4091 -49 4078 -79 4078 -115 ct 4078 -137 4083 -156 4093 -174 ct 4103 -192 4115 -206 4131 -217 ct 
-4147 -228 4165 -236 4185 -241 ct 4199 -245 4221 -249 4251 -253 ct 4311 -260 4355 -268 4384 -278 ct 
-4384 -288 4384 -295 4384 -298 ct 4384 -328 4377 -349 4363 -362 ct 4344 -379 4316 -387 4278 -387 ct 
-4243 -387 4217 -381 4201 -369 ct 4184 -356 4172 -335 4164 -303 ct 4091 -313 l 
-4098 -345 4108 -370 4124 -389 ct 4139 -408 4161 -423 4189 -433 ct 4218 -443 4251 -449 4289 -449 ct 
-4327 -449 4357 -444 4380 -435 ct 4404 -427 4421 -415 4432 -402 ct 4443 -389 4451 -372 4455 -351 ct 
-4458 -339 4459 -316 4459 -283 ct 4459 -184 l  4459 -114 4461 -71 4464 -52 ct 
-4467 -34 4473 -16 4483 0 ct 4405 0 l  4397 -15 l  4392 -33 l  p
-4384 -220 m  4357 -209 4316 -200 4262 -192 ct 4232 -187 4210 -182 4197 -177 ct 
-4185 -171 4175 -163 4168 -153 ct 4161 -142 4158 -130 4158 -117 ct 4158 -98 4165 -81 4180 -68 ct 
-4195 -55 4217 -48 4246 -48 ct 4275 -48 4300 -54 4323 -67 ct 4345 -79 4361 -96 4372 -118 ct 
-4380 -135 4384 -160 4384 -193 ct p ef
-4716 -66 m  4727 0 l  4706 3 4687 5 4670 5 ct 4643 5 4622 1 4608 -7 ct 4593 -15 4582 -26 4576 -40 ct 
-4570 -54 4567 -83 4567 -128 ct 4567 -381 l  4512 -381 l  4512 -439 l  4567 -439 l 
-4567 -547 l  4641 -592 l  4641 -439 l  4716 -439 l  4716 -381 l  4641 -381 l 
-4641 -124 l  4641 -103 4642 -89 4645 -83 ct 4648 -77 4652 -72 4658 -69 ct 4664 -65 4672 -63 4683 -63 ct 
-4691 -63 l  4702 -64 l  p ef
-5092 -141 m  5169 -131 l  5157 -86 5134 -52 5102 -27 ct 5069 -2 5027 9 4976 9 ct 
-4912 9 4861 -9 4823 -49 ct 4785 -88 4767 -144 4767 -215 ct 4767 -289 4786 -347 4824 -387 ct 
-4862 -428 4911 -449 4972 -449 ct 5030 -449 5078 -429 5116 -389 ct 5153 -349 5171 -292 5171 -220 ct 
-5171 -216 5171 -209 5171 -200 ct 4843 -200 l  4846 -152 4860 -115 4884 -89 ct 
-4909 -64 4940 -51 4976 -51 ct 5004 -51 5027 -58 5046 -72 ct 5065 -87 l  5081 -110 l 
-p
-4848 -261 m  5093 -261 l  5090 -298 5080 -326 5065 -344 ct 5041 -373 5010 -387 4972 -387 ct 
-4938 -387 4910 -376 4886 -353 ct 4863 -330 l  4850 -300 l  p ef
-5897 -356 m  5497 -356 l  5497 -425 l  5897 -425 l  p
-5897 -172 m  5497 -172 l  5497 -241 l  5897 -241 l  p ef
-6264 0 m  6264 -381 l  6198 -381 l  6198 -439 l  6264 -439 l  6264 -485 l 
-6264 -515 6267 -537 6272 -551 ct 6279 -571 6292 -586 6310 -598 ct 6328 -610 6353 -616 6386 -616 ct 
-6407 -616 6430 -614 6455 -609 ct 6444 -544 l  6429 -547 6414 -548 6400 -548 ct 
-6378 -548 6362 -543 6352 -533 ct 6343 -524 6338 -506 6338 -479 ct 6338 -439 l 
-6424 -439 l  6424 -381 l  6338 -381 l  6338 0 l  p ef
-6455 -131 m  6528 -142 l  6532 -113 6544 -90 6563 -74 ct 6582 -59 6608 -51 6642 -51 ct 
-6676 -51 6701 -58 6718 -72 ct 6735 -86 6743 -102 6743 -121 ct 6743 -138 6736 -151 6721 -160 ct 
-6711 -167 6685 -175 6645 -186 ct 6590 -199 6552 -211 6531 -221 ct 6510 -231 6494 -245 6483 -263 ct 
-6472 -281 6467 -301 6467 -322 ct 6467 -342 6471 -360 6480 -376 ct 6489 -393 6502 -407 6517 -418 ct 
-6529 -427 6544 -434 6564 -440 ct 6584 -446 6606 -449 6629 -449 ct 6663 -449 6693 -444 6719 -434 ct 
-6746 -424 6765 -410 6777 -393 ct 6790 -376 6798 -354 6803 -325 ct 6730 -315 l 
-6727 -338 6717 -356 6701 -368 ct 6685 -381 6663 -387 6634 -387 ct 6600 -387 6575 -382 6561 -370 ct 
-6546 -359 6539 -346 6539 -331 ct 6539 -321 6542 -312 6548 -305 ct 6554 -297 6564 -290 6577 -285 ct 
-6584 -282 6606 -276 6642 -266 ct 6695 -252 6732 -240 6753 -231 ct 6773 -222 6790 -209 6802 -192 ct 
-6813 -175 6819 -154 6819 -129 ct 6819 -104 6812 -80 6798 -58 ct 6783 -37 6762 -20 6735 -8 ct 
-6708 3 6677 9 6642 9 ct 6585 9 6542 -1 6512 -25 ct 6482 -49 l  6463 -84 l  p ef
-pom
-gr
-gs
-pum
-15981 14102 t
-62 0 m  62 -606 l  289 -606 l  335 -606 372 -600 400 -587 ct 428 -575 450 -556 466 -531 ct 
-482 -505 490 -479 490 -451 ct 490 -425 483 -400 469 -378 ct 455 -355 434 -336 405 -322 ct 
-442 -311 470 -293 490 -267 ct 510 -241 519 -211 519 -175 ct 519 -147 513 -120 501 -96 ct 
-489 -72 475 -53 457 -40 ct 439 -26 417 -16 391 -10 ct 364 -3 331 0 293 0 ct p
-142 -351 m  273 -351 l  308 -351 334 -353 349 -358 ct 370 -364 385 -374 395 -388 ct 
-406 -402 411 -420 411 -441 ct 411 -461 406 -479 397 -494 ct 387 -510 373 -520 355 -526 ct 
-337 -531 307 -534 263 -534 ct 142 -534 l  p
-142 -71 m  293 -71 l  319 -71 337 -72 347 -74 ct 366 -77 381 -83 394 -90 ct 
-406 -98 416 -109 424 -124 ct 432 -139 436 -156 436 -175 ct 436 -198 430 -218 419 -234 ct 
-407 -251 391 -263 371 -269 ct 350 -276 321 -279 282 -279 ct 142 -279 l  p ef
-898 -54 m  870 -30 844 -14 818 -4 ct 793 5 765 9 736 9 ct 688 9 651 -1 625 -25 ct 
-599 -49 586 -79 586 -115 ct 586 -137 591 -156 601 -174 ct 611 -192 623 -206 639 -217 ct 
-655 -228 673 -236 693 -241 ct 707 -245 729 -249 759 -253 ct 819 -260 863 -268 892 -278 ct 
-892 -288 892 -295 892 -298 ct 892 -328 885 -349 871 -362 ct 852 -379 824 -387 786 -387 ct 
-751 -387 725 -381 709 -369 ct 692 -356 680 -335 672 -303 ct 599 -313 l  606 -345 616 -370 632 -389 ct 
-647 -408 669 -423 697 -433 ct 726 -443 759 -449 797 -449 ct 835 -449 865 -444 888 -435 ct 
-912 -427 929 -415 940 -402 ct 951 -389 959 -372 963 -351 ct 966 -339 967 -316 967 -283 ct 
-967 -184 l  967 -114 969 -71 972 -52 ct 975 -34 981 -16 991 0 ct 913 0 l  905 -15 l 
-900 -33 l  p
-892 -220 m  865 -209 824 -200 770 -192 ct 740 -187 718 -182 705 -177 ct 693 -171 683 -163 676 -153 ct 
-669 -142 666 -130 666 -117 ct 666 -98 673 -81 688 -68 ct 703 -55 725 -48 754 -48 ct 
-783 -48 808 -54 831 -67 ct 853 -79 869 -96 880 -118 ct 888 -135 892 -160 892 -193 ct 
-p ef
-1060 0 m  1060 -439 l  1127 -439 l  1127 -376 l  1160 -425 1206 -449 1267 -449 ct 
-1294 -449 1318 -444 1340 -434 ct 1362 -425 1379 -412 1390 -397 ct 1401 -382 1409 -363 1413 -342 ct 
-1416 -328 1417 -304 1417 -270 ct 1417 0 l  1343 0 l  1343 -267 l  1343 -297 1340 -320 1334 -335 ct 
-1328 -350 1318 -362 1303 -371 ct 1289 -380 1271 -384 1251 -384 ct 1220 -384 1192 -374 1169 -354 ct 
-1146 -334 1135 -296 1135 -239 ct 1135 0 l  p ef
-1822 0 m  1822 -55 l  1794 -11 1754 9 1699 9 ct 1664 9 1632 0 1603 -19 ct 1574 -38 1551 -65 1535 -99 ct 
-1519 -134 1510 -174 1510 -219 ct 1510 -263 1518 -302 1532 -338 ct 1547 -374 1569 -401 1598 -420 ct 
-1627 -439 1660 -449 1696 -449 ct 1723 -449 1746 -443 1767 -432 ct 1788 -421 1804 -406 1817 -388 ct 
-1817 -606 l  1891 -606 l  1891 0 l  p
-1587 -219 m  1587 -162 1599 -120 1623 -93 ct 1646 -65 1674 -51 1706 -51 ct 1739 -51 1767 -64 1789 -91 ct 
-1812 -117 1824 -158 1824 -212 ct 1824 -273 1812 -317 1789 -345 ct 1766 -373 1737 -387 1703 -387 ct 
-1670 -387 1642 -374 1620 -346 ct 1598 -319 l  1587 -277 l  p ef
-2094 0 m  1960 -439 l  2037 -439 l  2107 -185 l  2133 -91 l  2134 -96 2142 -126 2156 -181 ct 
-2226 -439 l  2302 -439 l  2368 -184 l  2390 -100 l  2415 -185 l  2490 -439 l 
-2563 -439 l  2425 0 l  2348 0 l  2278 -263 l  2261 -337 l  2172 0 l  p ef
-2596 -520 m  2596 -606 l  2670 -606 l  2670 -520 l  p
-2596 0 m  2596 -439 l  2670 -439 l  2670 0 l  p ef
-3065 0 m  3065 -55 l  3037 -11 2997 9 2942 9 ct 2907 9 2875 0 2846 -19 ct 2817 -38 2794 -65 2778 -99 ct 
-2762 -134 2753 -174 2753 -219 ct 2753 -263 2761 -302 2775 -338 ct 2790 -374 2812 -401 2841 -420 ct 
-2870 -439 2903 -449 2939 -449 ct 2966 -449 2989 -443 3010 -432 ct 3031 -421 3047 -406 3060 -388 ct 
-3060 -606 l  3134 -606 l  3134 0 l  p
-2830 -219 m  2830 -162 2842 -120 2866 -93 ct 2889 -65 2917 -51 2949 -51 ct 2982 -51 3010 -64 3032 -91 ct 
-3055 -117 3067 -158 3067 -212 ct 3067 -273 3055 -317 3032 -345 ct 3009 -373 2980 -387 2946 -387 ct 
-2913 -387 2885 -374 2863 -346 ct 2841 -319 l  2830 -277 l  p ef
-3419 -66 m  3430 0 l  3409 3 3390 5 3373 5 ct 3346 5 3325 1 3311 -7 ct 3296 -15 3285 -26 3279 -40 ct 
-3273 -54 3270 -83 3270 -128 ct 3270 -381 l  3215 -381 l  3215 -439 l  3270 -439 l 
-3270 -547 l  3344 -592 l  3344 -439 l  3419 -439 l  3419 -381 l  3344 -381 l 
-3344 -124 l  3344 -103 3345 -89 3348 -83 ct 3351 -77 3355 -72 3361 -69 ct 3367 -65 3375 -63 3386 -63 ct 
-3394 -63 l  3405 -64 l  p ef
-3495 0 m  3495 -606 l  3570 -606 l  3570 -388 l  3605 -429 3648 -449 3701 -449 ct 
-3734 -449 3762 -442 3786 -429 ct 3810 -417 3827 -399 3838 -376 ct 3848 -354 3853 -321 3853 -278 ct 
-3853 0 l  3779 0 l  3779 -278 l  3779 -315 3771 -342 3754 -359 ct 3738 -376 3716 -385 3686 -385 ct 
-3664 -385 3643 -379 3624 -367 ct 3604 -356 3590 -340 3582 -321 ct 3574 -301 3570 -274 3570 -240 ct 
-3570 0 l  p ef
-pom
-pum
-15888 15055 t
-340 0 m  340 -55 l  312 -11 272 9 217 9 ct 182 9 150 0 121 -19 ct 92 -38 69 -65 53 -99 ct 
-37 -134 28 -174 28 -219 ct 28 -263 36 -302 50 -338 ct 65 -374 87 -401 116 -420 ct 
-145 -439 178 -449 214 -449 ct 241 -449 264 -443 285 -432 ct 306 -421 322 -406 335 -388 ct 
-335 -606 l  409 -606 l  409 0 l  p
-105 -219 m  105 -162 117 -120 141 -93 ct 164 -65 192 -51 224 -51 ct 257 -51 285 -64 307 -91 ct 
-330 -117 342 -158 342 -212 ct 342 -273 330 -317 307 -345 ct 284 -373 255 -387 221 -387 ct 
-188 -387 160 -374 138 -346 ct 116 -319 l  105 -277 l  p ef
-832 -141 m  909 -131 l  897 -86 874 -52 842 -27 ct 809 -2 767 9 716 9 ct 652 9 601 -9 563 -49 ct 
-525 -88 507 -144 507 -215 ct 507 -289 526 -347 564 -387 ct 602 -428 651 -449 712 -449 ct 
-770 -449 818 -429 856 -389 ct 893 -349 911 -292 911 -220 ct 911 -216 911 -209 911 -200 ct 
-583 -200 l  586 -152 600 -115 624 -89 ct 649 -64 680 -51 716 -51 ct 744 -51 767 -58 786 -72 ct 
-805 -87 l  821 -110 l  p
-588 -261 m  833 -261 l  830 -298 820 -326 805 -344 ct 781 -373 750 -387 712 -387 ct 
-678 -387 650 -376 626 -353 ct 603 -330 l  590 -300 l  p ef
-1295 -160 m  1368 -151 l  1360 -100 1340 -61 1307 -32 ct 1274 -4 1233 9 1185 9 ct 
-1125 9 1077 -9 1040 -49 ct 1004 -88 986 -144 986 -217 ct 986 -265 993 -306 1009 -342 ct 
-1025 -378 1049 -404 1081 -422 ct 1113 -440 1148 -449 1186 -449 ct 1233 -449 1272 -437 1303 -412 ct 
-1333 -388 1353 -354 1361 -310 ct 1289 -299 l  1282 -328 1270 -350 1252 -365 ct 
-1235 -380 1213 -387 1189 -387 ct 1151 -387 1121 -374 1097 -347 ct 1074 -320 1062 -278 1062 -220 ct 
-1062 -161 1073 -118 1096 -91 ct 1119 -64 1148 -51 1185 -51 ct 1214 -51 1238 -60 1258 -78 ct 
-1277 -96 l  1290 -123 l  p ef
-1432 -520 m  1432 -606 l  1506 -606 l  1506 -520 l  p
-1432 0 m  1432 -439 l  1506 -439 l  1506 0 l  p ef
-1616 0 m  1616 -439 l  1683 -439 l  1683 -377 l  1697 -399 1715 -416 1738 -429 ct 
-1761 -442 1787 -449 1816 -449 ct 1849 -449 1875 -442 1896 -428 ct 1917 -415 1932 -396 1940 -372 ct 
-1975 -423 2020 -449 2076 -449 ct 2119 -449 2153 -437 2176 -412 ct 2200 -388 2211 -351 2211 -301 ct 
-2211 0 l  2137 0 l  2137 -276 l  2137 -306 2135 -327 2130 -340 ct 2125 -354 2117 -364 2104 -372 ct 
-2091 -380 2076 -384 2059 -384 ct 2028 -384 2003 -374 1982 -353 ct 1962 -333 1952 -300 1952 -255 ct 
-1952 0 l  1877 0 l  1877 -285 l  1877 -318 1871 -343 1859 -359 ct 1847 -376 1827 -384 1800 -384 ct 
-1779 -384 1759 -379 1741 -368 ct 1724 -357 1711 -340 1703 -319 ct 1695 -298 1691 -267 1691 -227 ct 
-1691 0 l  p ef
-2617 -54 m  2589 -30 2563 -14 2537 -4 ct 2512 5 2484 9 2455 9 ct 2407 9 2370 -1 2344 -25 ct 
-2318 -49 2305 -79 2305 -115 ct 2305 -137 2310 -156 2320 -174 ct 2330 -192 2342 -206 2358 -217 ct 
-2374 -228 2392 -236 2412 -241 ct 2426 -245 2448 -249 2478 -253 ct 2538 -260 2582 -268 2611 -278 ct 
-2611 -288 2611 -295 2611 -298 ct 2611 -328 2604 -349 2590 -362 ct 2571 -379 2543 -387 2505 -387 ct 
-2470 -387 2444 -381 2428 -369 ct 2411 -356 2399 -335 2391 -303 ct 2318 -313 l 
-2325 -345 2335 -370 2351 -389 ct 2366 -408 2388 -423 2416 -433 ct 2445 -443 2478 -449 2516 -449 ct 
-2554 -449 2584 -444 2607 -435 ct 2631 -427 2648 -415 2659 -402 ct 2670 -389 2678 -372 2682 -351 ct 
-2685 -339 2686 -316 2686 -283 ct 2686 -184 l  2686 -114 2688 -71 2691 -52 ct 
-2694 -34 2700 -16 2710 0 ct 2632 0 l  2624 -15 l  2619 -33 l  p
-2611 -220 m  2584 -209 2543 -200 2489 -192 ct 2459 -187 2437 -182 2424 -177 ct 
-2412 -171 2402 -163 2395 -153 ct 2388 -142 2385 -130 2385 -117 ct 2385 -98 2392 -81 2407 -68 ct 
-2422 -55 2444 -48 2473 -48 ct 2502 -48 2527 -54 2550 -67 ct 2572 -79 2588 -96 2599 -118 ct 
-2607 -135 2611 -160 2611 -193 ct p ef
-2943 -66 m  2954 0 l  2933 3 2914 5 2897 5 ct 2870 5 2849 1 2835 -7 ct 2820 -15 2809 -26 2803 -40 ct 
-2797 -54 2794 -83 2794 -128 ct 2794 -381 l  2739 -381 l  2739 -439 l  2794 -439 l 
-2794 -547 l  2868 -592 l  2868 -439 l  2943 -439 l  2943 -381 l  2868 -381 l 
-2868 -124 l  2868 -103 2869 -89 2872 -83 ct 2875 -77 2879 -72 2885 -69 ct 2891 -65 2899 -63 2910 -63 ct 
-2918 -63 l  2929 -64 l  p ef
-3019 -520 m  3019 -606 l  3093 -606 l  3093 -520 l  p
-3019 0 m  3019 -439 l  3093 -439 l  3093 0 l  p ef
-3177 -219 m  3177 -300 3199 -361 3244 -400 ct 3282 -432 3328 -449 3383 -449 ct 
-3443 -449 3492 -429 3531 -389 ct 3569 -350 3588 -295 3588 -225 ct 3588 -169 3580 -124 3563 -92 ct 
-3546 -60 3521 -34 3489 -16 ct 3456 0 3421 9 3383 9 ct 3321 9 3271 -9 3233 -49 ct 
-3196 -88 l  3177 -145 l  p
-3253 -219 m  3253 -163 3265 -121 3290 -93 ct 3314 -65 3345 -51 3383 -51 ct 3420 -51 3450 -65 3475 -93 ct 
-3499 -121 3512 -164 3512 -222 ct 3512 -276 3499 -317 3475 -345 ct 3450 -373 3419 -387 3383 -387 ct 
-3345 -387 3314 -373 3290 -345 ct 3265 -317 l  3253 -275 l  p ef
-3680 0 m  3680 -439 l  3747 -439 l  3747 -376 l  3780 -425 3826 -449 3887 -449 ct 
-3914 -449 3938 -444 3960 -434 ct 3982 -425 3999 -412 4010 -397 ct 4021 -382 4029 -363 4033 -342 ct 
-4036 -328 4037 -304 4037 -270 ct 4037 0 l  3963 0 l  3963 -267 l  3963 -297 3960 -320 3954 -335 ct 
-3948 -350 3938 -362 3923 -371 ct 3909 -380 3891 -384 3871 -384 ct 3840 -384 3812 -374 3789 -354 ct 
-3766 -334 3755 -296 3755 -239 ct 3755 0 l  p ef
-pom
-pum
-16087 16008 t
-73 0 m  73 -381 l  7 -381 l  7 -439 l  73 -439 l  73 -485 l  73 -515 76 -537 81 -551 ct 
-88 -571 101 -586 119 -598 ct 137 -610 162 -616 195 -616 ct 216 -616 239 -614 264 -609 ct 
-253 -544 l  238 -547 223 -548 209 -548 ct 187 -548 171 -543 161 -533 ct 152 -524 147 -506 147 -479 ct 
-147 -439 l  233 -439 l  233 -381 l  147 -381 l  147 0 l  p ef
-580 -54 m  552 -30 526 -14 500 -4 ct 475 5 447 9 418 9 ct 370 9 333 -1 307 -25 ct 
-281 -49 268 -79 268 -115 ct 268 -137 273 -156 283 -174 ct 293 -192 305 -206 321 -217 ct 
-337 -228 355 -236 375 -241 ct 389 -245 411 -249 441 -253 ct 501 -260 545 -268 574 -278 ct 
-574 -288 574 -295 574 -298 ct 574 -328 567 -349 553 -362 ct 534 -379 506 -387 468 -387 ct 
-433 -387 407 -381 391 -369 ct 374 -356 362 -335 354 -303 ct 281 -313 l  288 -345 298 -370 314 -389 ct 
-329 -408 351 -423 379 -433 ct 408 -443 441 -449 479 -449 ct 517 -449 547 -444 570 -435 ct 
-594 -427 611 -415 622 -402 ct 633 -389 641 -372 645 -351 ct 648 -339 649 -316 649 -283 ct 
-649 -184 l  649 -114 651 -71 654 -52 ct 657 -34 663 -16 673 0 ct 595 0 l  587 -15 l 
-582 -33 l  p
-574 -220 m  547 -209 506 -200 452 -192 ct 422 -187 400 -182 387 -177 ct 375 -171 365 -163 358 -153 ct 
-351 -142 348 -130 348 -117 ct 348 -98 355 -81 370 -68 ct 385 -55 407 -48 436 -48 ct 
-465 -48 490 -54 513 -67 ct 535 -79 551 -96 562 -118 ct 570 -135 574 -160 574 -193 ct 
-p ef
-1030 -160 m  1103 -151 l  1095 -100 1075 -61 1042 -32 ct 1009 -4 968 9 920 9 ct 
-860 9 812 -9 775 -49 ct 739 -88 721 -144 721 -217 ct 721 -265 728 -306 744 -342 ct 
-760 -378 784 -404 816 -422 ct 848 -440 883 -449 921 -449 ct 968 -449 1007 -437 1038 -412 ct 
-1068 -388 1088 -354 1096 -310 ct 1024 -299 l  1017 -328 1005 -350 987 -365 ct 
-970 -380 948 -387 924 -387 ct 886 -387 856 -374 832 -347 ct 809 -320 797 -278 797 -220 ct 
-797 -161 808 -118 831 -91 ct 854 -64 883 -51 920 -51 ct 949 -51 973 -60 993 -78 ct 
-1012 -96 l  1025 -123 l  p ef
-1329 -66 m  1340 0 l  1319 3 1300 5 1283 5 ct 1256 5 1235 1 1221 -7 ct 1206 -15 1195 -26 1189 -40 ct 
-1183 -54 1180 -83 1180 -128 ct 1180 -381 l  1125 -381 l  1125 -439 l  1180 -439 l 
-1180 -547 l  1254 -592 l  1254 -439 l  1329 -439 l  1329 -381 l  1254 -381 l 
-1254 -124 l  1254 -103 1255 -89 1258 -83 ct 1261 -77 1265 -72 1271 -69 ct 1277 -65 1285 -63 1296 -63 ct 
-1304 -63 l  1315 -64 l  p ef
-1377 -219 m  1377 -300 1399 -361 1444 -400 ct 1482 -432 1528 -449 1583 -449 ct 
-1643 -449 1692 -429 1731 -389 ct 1769 -350 1788 -295 1788 -225 ct 1788 -169 1780 -124 1763 -92 ct 
-1746 -60 1721 -34 1689 -16 ct 1656 0 1621 9 1583 9 ct 1521 9 1471 -9 1433 -49 ct 
-1396 -88 l  1377 -145 l  p
-1453 -219 m  1453 -163 1465 -121 1490 -93 ct 1514 -65 1545 -51 1583 -51 ct 1620 -51 1650 -65 1675 -93 ct 
-1699 -121 1712 -164 1712 -222 ct 1712 -276 1699 -317 1675 -345 ct 1650 -373 1619 -387 1583 -387 ct 
-1545 -387 1514 -373 1490 -345 ct 1465 -317 l  1453 -275 l  p ef
-1881 0 m  1881 -439 l  1948 -439 l  1948 -372 l  1965 -403 1980 -424 1995 -434 ct 
-2009 -444 2025 -449 2043 -449 ct 2068 -449 2093 -441 2119 -425 ct 2094 -356 l 
-2075 -366 2057 -372 2039 -372 ct 2023 -372 2008 -367 1995 -357 ct 1982 -347 1973 -334 1967 -316 ct 
-1959 -290 1955 -261 1955 -229 ct 1955 0 l  p ef
-2802 -356 m  2402 -356 l  2402 -425 l  2802 -425 l  p
-2802 -172 m  2402 -172 l  2402 -241 l  2802 -241 l  p ef
-3160 0 m  3160 -606 l  3242 -606 l  3561 -130 l  3561 -606 l  3638 -606 l 
-3638 0 l  3555 0 l  3237 -476 l  3237 0 l  p ef
-pom
-gr
-17781 10461 m  17631 10911 l  17931 10910 l  17781 10461 l  p ef
-17781 13336 m  17781 10821 l  ps
-gs
-pum
-17357 3466 t
-73 0 m  73 -381 l  7 -381 l  7 -439 l  73 -439 l  73 -485 l  73 -515 76 -537 81 -551 ct 
-88 -571 101 -586 119 -598 ct 137 -610 162 -616 195 -616 ct 216 -616 239 -614 264 -609 ct 
-253 -544 l  238 -547 223 -548 209 -548 ct 187 -548 171 -543 161 -533 ct 152 -524 147 -506 147 -479 ct 
-147 -439 l  233 -439 l  233 -381 l  147 -381 l  147 0 l  p ef
-264 -131 m  337 -142 l  341 -113 353 -90 372 -74 ct 391 -59 417 -51 451 -51 ct 
-485 -51 510 -58 527 -72 ct 544 -86 552 -102 552 -121 ct 552 -138 545 -151 530 -160 ct 
-520 -167 494 -175 454 -186 ct 399 -199 361 -211 340 -221 ct 319 -231 303 -245 292 -263 ct 
-281 -281 276 -301 276 -322 ct 276 -342 280 -360 289 -376 ct 298 -393 311 -407 326 -418 ct 
-338 -427 353 -434 373 -440 ct 393 -446 415 -449 438 -449 ct 472 -449 502 -444 528 -434 ct 
-555 -424 574 -410 586 -393 ct 599 -376 607 -354 612 -325 ct 539 -315 l  536 -338 526 -356 510 -368 ct 
-494 -381 472 -387 443 -387 ct 409 -387 384 -382 370 -370 ct 355 -359 348 -346 348 -331 ct 
-348 -321 351 -312 357 -305 ct 363 -297 373 -290 386 -285 ct 393 -282 415 -276 451 -266 ct 
-504 -252 541 -240 562 -231 ct 582 -222 599 -209 611 -192 ct 622 -175 628 -154 628 -129 ct 
-628 -104 621 -80 607 -58 ct 592 -37 571 -20 544 -8 ct 517 3 486 9 451 9 ct 394 9 351 -1 321 -25 ct 
-291 -49 l  272 -84 l  p ef
-635 10 m  810 -616 l  870 -616 l  694 10 l  p ef
-937 0 m  937 -606 l  1019 -606 l  1338 -130 l  1338 -606 l  1415 -606 l 
-1415 0 l  1332 0 l  1014 -476 l  1014 0 l  p ef
-pom
-gr
-22227 6350 m  22199 5876 l  21920 5987 l  22227 6350 l  p ef
-19422 3175 m  19475 3175 l  ps
-19528 3175 m  19581 3175 l  ps
-19634 3175 m  19687 3175 l  ps
-19740 3175 m  19793 3175 l  ps
-19846 3175 m  19899 3175 l  ps
-19952 3175 m  20006 3175 l  ps
-20059 3175 m  20112 3175 l  ps
-20165 3175 m  20218 3175 l  ps
-20271 3175 m  20324 3175 l  ps
-20377 3175 m  20430 3175 l  ps
-20483 3175 m  20536 3175 l  ps
-20590 3175 m  20643 3175 l  ps
-20696 3175 m  20749 3175 l  ps
-20802 3175 m  20855 3175 l  ps
-20908 3175 m  20956 3175 l  ps
-20956 3175 m  20958 3180 l  ps
-20977 3229 m  20997 3278 l  ps
-21017 3328 m  21037 3377 l  ps
-21056 3426 m  21076 3475 l  ps
-21096 3525 m  21115 3574 l  ps
-21135 3623 m  21155 3673 l  ps
-21175 3722 m  21194 3771 l  ps
-21214 3821 m  21234 3870 l  ps
-21254 3919 m  21273 3968 l  ps
-21293 4018 m  21313 4067 l  ps
-21332 4116 m  21352 4166 l  ps
-21372 4215 m  21392 4264 l  ps
-21411 4313 m  21431 4363 l  ps
-21451 4412 m  21471 4461 l  ps
-21490 4511 m  21510 4560 l  ps
-21530 4609 m  21550 4658 l  ps
-21569 4708 m  21589 4757 l  ps
-21609 4806 m  21628 4856 l  ps
-21648 4905 m  21668 4954 l  ps
-21688 5003 m  21707 5053 l  ps
-21727 5102 m  21747 5151 l  ps
-21767 5201 m  21786 5250 l  ps
-21806 5299 m  21826 5348 l  ps
-21845 5398 m  21865 5447 l  ps
-21885 5496 m  21905 5546 l  ps
-21924 5595 m  21944 5644 l  ps
-21964 5693 m  21984 5743 l  ps
-22003 5792 m  22023 5841 l  ps
-22043 5891 m  22063 5940 l  ps
-22082 5989 m  22093 6015 l  ps
-gr
-0 20290 t 
-pom
-count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore
-%%PageTrailer
-%%Trailer
-%%EOF
diff --git a/usrp/doc/ddc.png b/usrp/doc/ddc.png
deleted file mode 100644
index ce35bc2a9..000000000
--- a/usrp/doc/ddc.png
+++ /dev/null
diff --git a/usrp/doc/inband-signaling-gigethernet b/usrp/doc/inband-signaling-gigethernet
deleted file mode 100644
index 4ca7542d2..000000000
--- a/usrp/doc/inband-signaling-gigethernet
+++ /dev/null
@@ -1,34 +0,0 @@
-Gigabit Ethernet Interconnect for the USRP2
-
-At this point, this is a place to summarize design requirements,
-possible solutions, point-counterpoint, etc.
-
-
-Requirements:
-
-(R1) High throughput and low latency between USRP h/w and user-space.
-One of the primary reasons for switching from USB to gigabit ethernet
-is to increase throughput.  Many users want to be be able to build
-WLAN type systems, and are thwarted by the relatively low throughput
-available over the USB.  Eric thinks we should shoot for at least
-100MB/s full-duplex into user space, using packets with payloads on
-the order of 256 to 512 bytes.  The small packet size is to reduce the
-latency.  This is important for many MACs that people want to build on
-the host side.
-
-(R2) Non-priviledged user programs should be able to access the USRP.
-This could be implemented by a priviledged daemon that actually handles the
-low level communication with the USRP2.  This daemon may be desirable
-for other reasons, including central point of control for
-arbitrating/muxing/demuxing between multiple concurrent users (e.g.,
-Tx, Rx, requests, replies, various logical channels).
-
-(R3) Some way to flow control the host to USRP2 stream.  This is
-required in case the user connects an unthrottled signal generator to
-the USRP. (This is not uncommon.)  The USRP2 to host direction
-shouldn't be a problem, since the USRP2 throughput is controlled by
-its configuration.  It is an error to configure the USRP2 to transmit
-data at a higher rate than the transport or host can consume.
-
-One solution to this requirement could be having the USRP2 emit GigE
-"pause" frames.  We'll need to confirm that this works.
diff --git a/usrp/doc/inband-signaling-usb b/usrp/doc/inband-signaling-usb
deleted file mode 100644
index 14f83479a..000000000
--- a/usrp/doc/inband-signaling-usb
+++ /dev/null
@@ -1,314 +0,0 @@
-This file specifies the format of USB packets used for in-band data
-transmission and signaling on the USRP.  All packets are 512-byte long,
-and are transfered using USB "bulk" transfers.
-
-IN packets are sent towards the host.
-OUT packets are sent away from the host.
-
-The layout is 32-bits wide.  All data is transmitted in little-endian
-format across the USB.
-
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |O|U|D|S|E|   RSSI    |  Chan   | mbz |  Tag  |   Payload Len   |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                           Timestamp                           |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                                                               |
-   +                                                               +
-   |                            Payload                            |
-   .                                                               .
-   .                                                               .
-   .                                                               .
-   |                                                               |
-   +             +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |      ...    |                                                 .
-   +-+-+-+-+-+-+-+                                                 .
-   .                                                               .
-   .                            Padding                            .
-   .                                                               .
-   |                                                               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   
-
-  mbz   Must be Zero: these bits must be zero in both IN and OUT packets.
-
-  O     Overrun Flag: set in an IN packet if an overrun condition was
-        detected.  Must be zero in OUT packets.  Overrun occurs when
-        the FPGA has data to transmit to the host and there is no
-        buffer space available.  This generally indicates a problem on
-        the host.  Either it is not keeping up, or it has configured
-        the FPGA to transmit data at a higher rate than the transport
-        (USB) can support.
-
-  U     Underrun Flag: set in an IN packet if an underrun condition
-        was detected.  Must be zero in OUT packets.  Underrun occurs
-        when the FPGA runs out of samples, and it's not between
-        bursts.  See the "End of Burst flag" below.
-
-  D     Dropped Packet Flag: Set in an IN packet if the FPGA
-	discarded an OUT packet because its timestamp had already
-	passed.
-
-  S     Start of Burst Flag:  Set in an OUT packet if the data is the
-        first segment of what is logically a continuous burst of data.
-        Must be zero in IN packets.
-
-  E     End of Burst Flag:  Set in an OUT packet if the data is the
-        last segment of what is logically a continuous burst of data.
-        Must be zero in IN packets.  Underruns are not reported
-        when the FPGA runs out of samples between bursts.
-
-
-  RSSI  6-bit Received Strength Signal Indicator:  Must be zero in OUT
-        packets.  In IN packets, indicates RSSI as reported by front end.
-	FIXME The format and interpretation are to be determined.
-
-  Chan  5-bit logical channel number.  Channel number 0x1f is reserved
-        for control information.  See "Control Channel" below.  Other
-        channels are "data channels."  Each data channel is logically
-        independent of the others.  A data channel payload field
-        contains a sequence of homogeneous samples.  The format of the
-        samples is determined by the configuration associated with the
-        given channel.  It is often the case that the payload field
-        contains 32-bit complex samples, each containing 16-bit real
-        and imaginary components.
-
-  Tag   4-bit tag for matching IN packets with OUT packets.
-        [FIXME, write more...]
-
-  Payload Len: 9-bit field that specifies the length of the payload
-        field in bytes.  Must be in the range 0 to 504 inclusive.
-
-  Timestamp: 32-bit timestamp.
-	On IN packets, the timestamp indicates the time at which the
-	first sample of the packet was produced by the A/D converter(s)
-        for that channel.  On OUT packets, the timestamp specifies the
-        time at which the first sample in the packet should go out the
-        D/A converter(s) for that channel.  If a packet reaches the
-	head of the transmit queue, and the current time is later than
-	the timestamp, an error is assumed to have occurred and the
-	packet is discarded.  As a special case, the timestamp
-	0xffffffff is interpreted as "Now".
-
-	The time base is a free running 32-bit counter that is
-	incremented by the A/D sample-clock.
-
-  Payload: Variable length field.  Length is specified by the
-        Payload Len field.
-
-  Padding: This field is 504 - Payload Len bytes long, and its content
-        is unspecified.  This field pads the packet out to a constant
-        512 bytes.
-
-
-
-"Data Channel" payload format:
--------------------------------
-
-If Chan != 0x1f, the packet is a "data packet" and the payload is a
-sequence of homogeneous samples.  The format of the samples is
-determined by the configuration associated with the given channel.  
-It is often the case that the payload field contains 32-bit complex
-samples, each containing 16-bit real and imaginary components.
-
-
-"Control Channel" payload format:
----------------------------------
-
-If Chan == 0x1f, the packet is a "control packet".  The control channel
-payload consists of a sequence of 0 or more sub-packets.
-
-Each sub-packet starts on a 32-bit boundary, and consists of an 8-bit
-Opcode field, an 8-bit Length field, Length bytes of arguments, and 0,
-1, 2 or 3 bytes of padding to align the tail of the sub-packet to
-a 32-bit boundary.
-
-Control channel packets shall be processed at the head of the queue,
-and shall observe the timestamp semantics described above.
-
-
-General sub-packet format:
---------------------------
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-//-+-+-+-+-+-+-+-+
-   |     Opcode    |    Length     |        <length bytes> ...    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-//-+-+-+-+-+-+-+-+
-
-
-Specific sub-packet formats:
-----------------------------
-
-  RID: 6-bit Request-ID. Copied from request sub-packet into corresponding
-       reply sub-packet.  RID allows the host to match requests and replies.
-
-  Reg Number: 10-bit Register Number.
-
-
-
-Ping Fixed Length:
-
-    Opcode:	OP_PING_FIXED
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       2       |    RID    |     Ping Value    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Ping Fixed Length Reply:
-
-    Opcode:	OP_PING_FIXED_REPLY
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       2       |    RID    |     Ping Value    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Write Register:
-
-    Opcode:	OP_WRITE_REG
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       6       |    mbz    |     Reg Number    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                        Register Value                         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Write Register Masked:
-
-    Opcode:	OP_WRITE_REG_MASKED
-
-    REG[Num] = (REG[Num] & ~Mask) | (Value & Mask)
-
-    That is, only the register bits that correspond to 1's in the
-    mask are written with the new value.
-
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |      10       |    mbz    |     Reg Number    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                         Register Value                        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                           Mask Value                          |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Read Register:
-
-    Opcode:	OP_READ_REG
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       2       |    RID    |     Reg Number    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Read Register Reply:
-
-    Opcode:	OP_READ_REG_REPLY
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       6       |    RID    |     Reg Number    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                        Register Value                         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-I2C Write:
-
-    Opcode:	OP_I2C_WRITE
-    I2C Addr:   7-bit I2C address
-    Data:	The bytes to write to the I2C bus
-    Length:     Length of Data + 2
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |    Length     |       mbz       |   I2C Addr  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Data ...			                           .
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-I2C Read:
-
-    Opcode:	OP_I2C_READ
-    I2C Addr:	7-bit I2C address
-    Nbytes:	Number of bytes to read from I2C bus
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       3       |    RID    | mbz |   I2C Addr  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Nbytes    |              unspecified padding              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-I2C Read Reply:
-
-    Opcode:	OP_I2C_READ_REPLY
-    I2C Addr:	7-bit I2C address
-    Data:	Length - 2 bytes of data read from I2C bus.
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |     Length    |    RID    | mbz |   I2C Addr  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Data ...			                           .
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-SPI Write:
-
-    Opcode:	      OP_SPI_WRITE
-    Enables:	      Which SPI enables to assert (mask)
-    Format:	      Specifies format of SPI data and Opt Header Bytes
-    Opt Header Bytes: 2-byte field containing optional Tx bytes; see Format
-    Data:	      The bytes to write to the SPI bus
-    Length:	      Length of Data + 6
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |    Length     |              mbz              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Enables    |    Format     |        Opt Header Bytes       |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Data ...			                           .
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-SPI Read:
-
-    Opcode:	      OP_SPI_READ
-    Enables:	      Which SPI enables to assert (mask)
-    Format:	      Specifies format of SPI data and Opt Header Bytes
-    Opt Header Bytes: 2-byte field containing optional Tx bytes; see Format
-    Nbytes:	      Number of bytes to read from SPI bus.
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       7       |    RID    |        mbz        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Enables    |    Format     |        Opt Header Bytes       |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Nbytes    |              unspecified padding              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-SPI Read Reply:
-
-    Opcode:   OP_SPI_READ_REPLY
-    Data:     Length - 2 bytes of data read from SPI bus.
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |     Length    |    RID    |        mbz        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Data ...			                           .
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Delay:
-
-    Opcode:	OP_DELAY
-    Ticks:	16-bit unsigned delay count
-
-    Delay Ticks clock ticks before executing next operation.
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       2       |            Ticks              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
diff --git a/usrp/doc/inband-signaling-usb-host b/usrp/doc/inband-signaling-usb-host
deleted file mode 100644
index 6bfdca97e..000000000
--- a/usrp/doc/inband-signaling-usb-host
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-
-See usrp/host/lib/inband/usrp_server.mbh for interface
-
diff --git a/usrp/doc/other/.gitignore b/usrp/doc/other/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/usrp/doc/other/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/usrp/doc/other/Makefile.am b/usrp/doc/other/Makefile.am
deleted file mode 100644
index 815553a6d..000000000
--- a/usrp/doc/other/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright 2005,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST +=			\
-	mainpage.dox		
diff --git a/usrp/doc/other/mainpage.dox b/usrp/doc/other/mainpage.dox
deleted file mode 100644
index 56068cc5f..000000000
--- a/usrp/doc/other/mainpage.dox
+++ /dev/null
@@ -1,9 +0,0 @@
-/*! \mainpage
-
-The top level interfaces to the USRP are usrp_standard_rx and
-usrp_standard_tx.  Also take a look at their base classes,
-usrp_basic_rx, usrp_basic_tx and usrp_basic.
-
-See also <a href="usrp_guide.html">USRP User's and Developer's Guide</a>
-
-*/
diff --git a/usrp/doc/traffic-cop-dma b/usrp/doc/traffic-cop-dma
deleted file mode 100644
index 0b3c3507e..000000000
--- a/usrp/doc/traffic-cop-dma
+++ /dev/null
@@ -1,137 +0,0 @@
-Matt,
-
-Here's my idea on the interface to the traffic cop.  Basically I'm
-thinking about treating it as 4 separate DMA channels, one for each of
-the four possible "flows".  In the interest of simplicity, I think we can
-assign buffers 0,1 to channel 0;  2,3 to channel 1, etc...
-
-port assignments
------------------
-  0   SERDES
-  1   DSP pipeline
-  2   Gigabit ethernet MAC
-  3   RAM
-
-
-registers
----------
-
-  MBZ == Must Be Zero
-
-     3                   2                   1
-   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 
-
-
-TC_DMA_SRC_{0,3} [WR] ("traffic cop DMA source, channel N")
-
-  (The {0,3} notation means there are four of these registers,
-   one for each channel, named TC_DMA_SRC_0, TC_DMA_SRC_1,
-   TC_DMA_SRC_2, TC_DMA_3.)
-
-  Specifies where the writing port adapter writes info the buffer, and
-  the maximum number of lines to write.
-
-       5             9                  9                9  
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |0|  src  |      start      |     end (max)   |       step      |
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-  src:   source port number.  E.g., 2 = ethernet MAC (the buffer writer)
-  start: starting line number for transfer (32-bit lines)
-  end:   index of last line to write.  I.e., start = 0, end = 0, xfers 1 line.
-  step:  normally 1.
-
-
-TC_DMA_DST_{0,3} [WR]
-
-  Specifies the range of lines that the reading port adapter accesses.
-  The number of lines to be transferred is controlled by the source.
-
-       5             9                  9                9  
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |0|  dst  |      start      |    end (max)    |       step      |
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-  dst:   destination port number.  E.g., 1 = DSP pipeline (the buffer reader)
-  start: starting line number tranfer (32-bit lines)
-  end:   Must be zero, unless a TC_DMA_CMD_SEND_0 or TC_DMA_CMD_SEND_1
-         cmd is written to TC_DMA_CTRL_{0,3} in which case this
-         specifies the index of the last line to send to the destination.
-  step:  normally 1.
-
-
-TC_DMA_CTRL_{0,3} [WR]
-
-                            27                           1    4
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |                         MBZ                         |A|  cmd  |
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-  A:    Set if "Host Approval" is required before beginning xfer to dst.
-        Used to allow processor to inspect packet for s/w dispatch.  If set,
-	traffic cop sets PENDING_APPROVAL bit (and causes interrupt?) after the
-	2nd line has been written into the buffer.   Reader is held off
-	until hosts APPROVES or DROPS the buffer.
-
-
-  cmd:  command
-
-    TC_DMA_CMD_RESET	     0  // abort active tranfers now; reset to idle state
-    TC_DMA_CMD_START	     1  // begin transfers according
-    TC_DMA_CMD_STOP	     2  // stop transfers at completion of current buffer
-    TC_DMA_CMD_APPROVE_0     3  // host approves xfer on even buffer, continue
-    TC_DMA_CMD_APPROVE_1     4  // host approves xfer on odd buffer, continue
-    TC_DMA_CMD_DROP_0	     5  // host naks xfer on even buffer, drop buffer and continue
-    TC_DMA_CMD_DROP_1	     6  // host naks xfer on even buffer, drop buffer and continue
-    TC_DMA_CMD_SEND_0	     7  // copy buffer 0 to destination (processor init'd buffer)
-    TC_DMA_CMD_SEND_1	     8  // copy buffer 1 to destination (processor init'd buffer)
-
-
-TC_DMA_STATUS_{0,3} [RD]
-
-           10                  10
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |    nwritten even  |   nwritten odd    |     state?    | flags |
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-  nwritten even:  number of lines written into even buffer
-  nwritten odd:   number of lines written into odd buffer
-
-  flag bits:
-
-    bmTCDS_PENDING_APPROVAL_0	(1 << 0)   // pending host approval on even buffer
-    bmTCDS_PENDING_APPROVAL_1	(1 << 1)   // pending host approval on odd buffer
-    bmTCDS_WRITE_DONE_0	        (1 << 2)   // the even buffer write is complete
-    bmTCDS_WRITE_DONE_1	        (1 << 3)   // the odd buffer write is complete
-
-I think the combination of the "host approval" and WRITE_DONE bits
-will allow us to handle the cases where the host looks and doesn't
-care, and the case where the host looks, cares, and needs to wait
-until it sees the whole packet.
-
-WRITE_DONE_* should be cleared when the corresponding buffer is
-selected to be written into (e.g., when swapping buffers, and at init)
-prior to writing the first line.  WRITE_DONE_* is set when the
-requested number of lines have been written into the buffer.
-
-
-
-I also want a "global status register" that pulls the N flag bits
-from each of the 4 status registers into a single word.  This should
-allow me to read a single word to figure out what to do.
-
-
-TC_DMA_STATUS_GLOBAL [RD]
-
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |     flags3    |     flags2    |     flags1    |     flags0    |
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-// some kind of registers to enable and ack interrupts
-
-TC_DMA_INTR_EN  [WR]	  // enable particular interrupts
-TC_DMA_INTR_CLR [WR]	  // clear particular pending interrupts
-
diff --git a/usrp/doc/usrp-block-diagram.eps b/usrp/doc/usrp-block-diagram.eps
deleted file mode 100644
index 190b9dee3..000000000
--- a/usrp/doc/usrp-block-diagram.eps
+++ /dev/null
@@ -1,2785 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0 
-%%BoundingBox: 0 0 755 575
-%%Pages: 0
-%%Creator: Sun Microsystems, Inc.
-%%Title: none
-%%CreationDate: none
-%%LanguageLevel: 2
-%%EndComments
-%%BeginPreview: 760 575 1 1725 
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000FFE300707800000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000FFE380E1FE00000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C001C0C30700000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C000E1830300000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C000E3820300000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C00077000300000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C0003E000300000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C0001C000700000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000FFC01C000E00000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000FFC03E001C00000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C00037003800000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C0006700F000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C000E381C000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C001C1C18000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C00180C30000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C00380E7FF00000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000C0070077FF00000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%08000000300701F80FF80007C00000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%08000000300707FE0FFE000FF00000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%08000000300706070C060018380000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800000030070E038C030010180000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800000030070C000C030030180000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800000030070E000C030000180000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%08000000300707C00C070000380000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%08000000300703FC0FFE0000300000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000003007007E0FFC0000700000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000003007000F0FFF0000E00000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%08000000300700038C030003C00000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800000030071C018C038007000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800000038061C018C01800E000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800000018060E038C03801C000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000001C0E0F070C070018000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000FFC07FE0FFF003FF80000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800000007F001FC0FFC003FF80000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080007E00000000000000031800000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%08001FF80000000300000031800000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800381C0000000300000031800000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800700C0000000300000031800000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800600E03808E07C8C0E03180E023000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800E0000FE0FF8FCFE3F83183F83F800000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800E0001C70F3C30FC71C31871C3F000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800C0003038E0C30E0E0E318E0E38000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800C0003018C0C30C0C06318C0630000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800C0007018C0C30C0C06318FFE30000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800C0007018C0C30C0C07318FFE30000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800E0067018C0C30C0C07318C0030000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800600E7018C0C30C0C06318C0030000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800700C3038C0C30C0C06318C0630000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0800381C3830C0C30C0E0E318E0E30000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%08001FF81FF0C0C3CC07FC3187FC30000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080007E00FC0C0C1CC01F03181F030000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%080000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000018000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC00000000000000000000000000000
-%007FFFFFFFFFFFFFFFFFFFFFFFFFFFFE00000000000000000000000000000000FFFFFFFFFFFFFF
-%FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC00
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000010000
-%004000000000000000000000000000020000040000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000020000000000000000000
-%004000000000000000000000000000020000000000000000000020000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000040000000000000000000
-%004000000000000000000000000000020000000000000000000010000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000100000000000000000000
-%004000000000000000000000000000020000000000000000000004000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000200000000000000000000
-%004000000000000000000000000000020000000000000000000002000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000400000000000000000000
-%004000000000000000000000000000020000000000000000000001000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000800000000000000000000
-%004000000000000000000000000000020000000000000000000000800000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000001000000000000000000000
-%004000000000000000000000000000020000000000000000000000400000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000002000000000000000000000
-%004000000000000000000000000000020000000000000000000000200000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000000C000000000000000000000
-%004000000000000000000000000000020000000000000000000000180000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000010000000000000000000000
-%004000000000000000000000000000020000000000000000000000040000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000020000000000000000000000
-%004000000000000000000000000000020000000000000000000000020000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000040000000000000000000000
-%004000000000000000000000000000020000000000000000000000010000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000080000000000000000000000
-%004000000000000000000000000000020000000000000000000000008000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000100000000000000000000000
-%004000000000000000000000000000020000000000000000000000004000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000200000000000000000000000
-%004000000000000000000000000000020000000000000000000000002000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000C00000000000000000000000
-%004000000000000000000000000000020000000000000000000000001800000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000020001C03FF800FE0000000000
-%00400000000000000000000000000002000000000003C03FF001FE000200000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000040001E03FFC03FF8000000000
-%00400000000000000000000000000002000000000003C03FFC03FF000100000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000360300E07038000000000
-%00400000000000000000000000000002000000000003C0301C0703800000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040001000036030060601C000000000
-%0040000000000000000000000000000200000000000760300E0E01800040000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040002000073030070C00C000000000
-%004000000000000000000000000000020000000000066030060C01C00020000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040004000063030030C000000000000
-%004000000000000000000000000000020000000000067030071C00000010000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000000063830031C000000000000
-%0040000000000000000000000000000200000000000C3030071800000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000E1830031C00000000FFFF
-%FFC0000000000000000000000000000200000000000C3030031800000001FFFF80000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400200000C1830031C00000000FFFF
-%FFC0000000000000000000000000000200000000001C1830031800000003FFFF80000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000007FF800000C1C30031C000000000000
-%00400000000000000000000000000003FFFFF800001C1830031800000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000001FFC30030C000000000000
-%0040000000000000000000000000000200000000001FFC30071800000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000001FFE30070C00C000000000
-%0040000000000000000000000000000200000000003FFC30061C00C00000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000000380630070E00C000000000
-%004000000000000000000000000000020000000000300E30060C01C00000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400020003006300E0701C000000000
-%004000000000000000000000000000020000000000300E300E0E03800020000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400010003007301E07838000000000
-%0040000000000000000000000000000200000000006006301C0707800040000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000000070033FF801FF0000000000
-%00400000000000000000000000000002000000000060073FF803FE000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400004006003BFE0007C0000000000
-%004000000000000000000000000000020000000000E0033FE000FC000100000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400002000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000200000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000800000000000000000000000
-%004000000000000000000000000000020000000000000000000000000800000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000400000000000000000000000
-%004000000000000000000000000000020000000000000000000000001000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000200000000000000000000000
-%004000000000000000000000000000020000000000000000000000002000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000100000000000000000000000
-%004000000000000000000000000000020000000000000000000000004000000080000000000000
-%0000000000000000000000000000000400
-%0008000000000003FF800000000003000000000000000000400000080000000000000000000000
-%00400000000000000000000000000002000000000000000000000000800000008000000000003F
-%F800000000003000000000000000000400
-%0008000000000003FFC00000000003000000000000000000400000040000000000000000000000
-%00400000000000000000000000000002000000000000000000000001000000008000000000003F
-%FC00000000003000000000000000000400
-%000800000000000300E00000000002000000000000000000400000020000000000000000000000
-%004000000000000000000000000000020000000000000000000000020000000080000000000038
-%0E00000000002000000000000000000400
-%000800000000000300600000000000000000000000000000400000018000000000000000000000
-%0040000000000000000000000000000200000000000000000000000C0000000080000000000030
-%0700000000000000000000000000000400
-%000800000000000300700000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000100000000080000000000030
-%0700000000000000000000000000000400
-%00080000000000030070FE03F03F0330187E000000000000400000002000000000000000000000
-%004000000000000000000000000000020000000000000000000000200000000080000000000030
-%0707E03F03F8338187F000000000000400
-%00080000000000030061EF073873833838E7000000000000400000001000000000000000000000
-%004000000000000000000000000000020000000000000000000000400000000080000000000030
-%070E7073873C31818E7800000000000400
-%000800000000000301E1830E1CE0C3183181800000000000400000000800000000000000000000
-%004000000000000000000000000000020000000000000000000000800000000080000000000038
-%1E1838E0CE0C31831C1800000000000400
-%0008000000000003FF83018C0CC0E3183181C00000000000400000000400000000000000000000
-%00400000000000000000000000000002000000000000000000000100000000008000000000003F
-%FC3018C0CC0631C3180C00000000000400
-%0008000000000003FE03019C01C0E30C6381C00000000000400000000200000000000000000000
-%00400000000000000000000000000002000000000000000000000200000000008000000000003F
-%F03018C00C0630C3181C00000000000400
-%00080000000000030703FF9C01FFE30C63FFC00000000000400000000100000000000000000000
-%004000000000000000000000000000020000000000000000000004000000000080000000000030
-%383FF8C00FFE30C61FFC00000000000400
-%00080000000000030383001C01C0030C6380000000000000400000000040000000000000000000
-%004000000000000000000000000000020000000000000000000010000000000080000000000030
-%183000C00C003066180000000000000400
-%000800000000000301C3001C01C00306C380000000000000400000000020000000000000000000
-%004000000000000000000000000000020000000000000000000020000000000080000000000030
-%1C3000C00C003066180000000000000400
-%000800000000000300E3018C0CC04306C181800000000000400000000000000000000000010000
-%004000000000000000000000000000020000040000000000000000000000000080000000000030
-%0E3818C0CC06306C180C00000000000400
-%000800000000000300E1838E1CE0C307C1C1800000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000030
-%071838E0CE0E303C1C1C00000000000400
-%00080000000000030071E7073873C30380E7800000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000030
-%071E707387BC30380F7800000000000400
-%00080000000000030030FE03F03F8303807F000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000030
-%0387E03F03F8303807F000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800FFC0000000000030000000000C0000000000000C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800FFC00000000
-%00030000000000C0000000000000C00400
-%000800FFF000000000003000C000000C0000000000000C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800FFF00000000
-%0003000C000000C0000000000000C00400
-%000800E07800000000003000C000000C0000000000000C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800E0780000000
-%0003000C000000C0000000000000C00400
-%000800E01800000000003000C000000C0000000000000C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800E01C0000000
-%0003000C000000C0000000000000C00400
-%000800E01C00000000003000C000000C0000000000000C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800E00C0000000
-%0003000E000000C0000000000000C00400
-%000800E00C1FC38183FC37E3F0FC1FCDF03F81FE1FC7FC00400000000000000000000000010000
-%0040000000000000000000000000000200000400000000000000000000000000800E00C1FE1818
-%3FE37E1F0FC0FCDF01FC0FE1FC7EC00400
-%000800E00C39E381873C3CE0C1CE1FCF3879C3CF1F8E7C00400000000020000000000000000000
-%0040000000000000000000000000000200000000000000000000200000000000800E00E38E1818
-%73E3EF0C1CF0FCFB879E1CF1F8E7C00400
-%000800E00E7063818C1C3870C3031C0E1C60E3031C1C3C00400000000040000000000000000000
-%0040000000000000000000000000000200000000000000000000100000000000800E00E3071818
-%E1E3830C3030E0E1C6063831C1C1C00400
-%000800E00E0063818C0C3030C7031C0C0CC0600318181C00400000000100000000000000000000
-%0040000000000000000000000000000200000000000000000000040000000000800E00E0071818
-%C0E3030C3038C0C0CE070031C181C00400
-%000800E00E006381980C3030C7039C0C0CC0700718181C00400000000200000000000000000000
-%0040000000000000000000000000000200000000000000000000020000000000800E00E0071818
-%C0E3030C7038C0C0CC0300718180C00400
-%000800E00C1FE381980C3030C7FF9C0C0CC030FF18381C00400000000400000000000000000000
-%0040000000000000000000000000000200000000000000000000010000000000800E00E0FF1819
-%C0E3030C7FF8C0C0EC030FF18180C00400
-%000800E00C3E6381980C3030C7001C0C0CC033E318381C00400000000800000000000000000000
-%0040000000000000000000000000000200000000000000000000008000000000800E00E3E71819
-%C0E3030C7000C0C0EC031E318180C00400
-%000800E00C7063839C0C3030C6001C0C0CC0730318181C00400000001000000000000000000000
-%0040000000000000000000000000000200000000000000000000004000000000800E00C7071818
-%C0E3030C7000C0C0CC0330318180C00400
-%000800E01C6063838C0C3030C7031C0C0CE0670318181C00400000002000000000000000000000
-%0040000000000000000000000000000200000000000000000000002000000000800E01C6071838
-%C0E3030C3030C0C0CE0730318181C00400
-%000800E03860E1878C1C3030C3871C0E1860E707181C3C00400000008000000000000000000000
-%0040000000000000000000000000000200000000000000000000001800000000800E0386071838
-%E1E3030C3830C0E1C706307180C1C00400
-%000800FFF071E1FF877C3030F1CE1C0F3879C39F180E7C00400000010000000000000000000000
-%0040000000000000000000000000000200000000000000000000000400000000800FFF039F1FF8
-%73E3030F1EF0C0FB839E39F180F7C00400
-%000800FFE03F30F983EC303070FC1C0DF01F81FB1807FC00400000020000000000000000000000
-%0040000000000000000000000000000200000000000000000000000200000000800FFE03F30FD8
-%3FE303078FE0C0DF01F81FB9807EC00400
-%0008000000000000000C0000000000000000000000000000400000040000000000000000000000
-%004000000000000000000000000000020000000000000000000000010000000080000000000000
-%00E0000000000000000000000000000400
-%0008000000000000080C0000000000000000000000000000400000080000000000000000000000
-%004000000000000000000000000000020000000000000000000000008000000080000000000000
-%C0C0000000000000000000000000000400
-%00080000000000000C1C0000000000000000000000000000400000100000000000000000000000
-%004000000000000000000000000000020000000000000000000000004000000080000000000000
-%E1C0000000000000000000000000000400
-%000800000000000007F80000000000000000000000000000400000200000000000000000000000
-%004000000000000000000000000000020000000000000000000000002000000080000000000000
-%7F80000000000000000000000000000400
-%000800000000000003E00000000000000000000000000000400000C00000000000000000000000
-%004000000000000000000000000000020000000000000000000000001800000080000000000000
-%1E00000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000020001C03FF801FE0000000000
-%00400000000000000000000000000002000000000003C03FF801FE000200000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000040001E03FFC03FF8000000000
-%00400000000000000000000000000002000000000003C03FFC03FF000100000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000360300E07018000000000
-%00400000000000000000000000000002000000000003E0301C0703800000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040001000036030070E01C000000000
-%0040000000000000000000000000000200000000000660300E0E01800040000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040002000073030070C00C000000000
-%004000000000000000000000000000020000000000066030060C00800020000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040004000063030030C000000000000
-%004000000000000000000000000000020000000000067030071C00000010000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040010000063830031C000000000000
-%0040000000000000000000000000000200000000000C3030031800000000000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000007FF800000E1830031C00000000FFFF
-%FFC0000000000000000000000000000200000000000C3830031800000001FFFF80000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000007FF800000C1C30031C00000000FFFF
-%FFC0000000000000000000000000000200000800001C1830031800000001FFFF80000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400200000C1C30031C000000000000
-%00400000000000000000000000000003FFFFF800001C1830031800000002000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000001FFC30030C000000000000
-%0040000000000000000000000000000200000000001FFC30071C00000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000001FFE30070C00C000000000
-%0040000000000000000000000000000200000000003FFC30060C00C00000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000000380630070E00C000000000
-%004000000000000000000000000000020000000000300E30060C01C00000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400020003007300E0701C000000000
-%004000000000000000000000000000020000000000300E300E0E03800020000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000003007383C03C78000000000
-%0040000000000000000000000000000200000000006006303C0787000000000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000000070033FF801FF0000000000
-%00400000000000000000000000000002000000000060073FF803FE000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400004006003BFE0007C0000000000
-%004000000000000000000000000000020000000000E0033FE000F8000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000800000000000000000000000
-%004000000000000000000000000000020000000000000000000000000800000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000400000000000000000000000
-%004000000000000000000000000000020000000000000000000000001000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000100000000000000000000000
-%004000000000000000000000000000020000000000000000000000004000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000080000000000000000000000
-%004000000000000000000000000000020000000000000000000000008000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000020000000000000000000000
-%004000000000000000000000000000020000000000000000000000020000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000018000000000000000000000
-%0040000000000000000000000000000200000000000000000000000C0000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000004000000000000000000000
-%004000000000000000000000000000020000000000000000000000100000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000002000000000000000000000
-%004000000000000000000000000000020000000000000000000000200000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000001000000000000000000000
-%004000000000000000000000000000020000000000000000000000400000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000800000000000000000000
-%004000000000000000000000000000020000000000000000000000800000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000400000000000000000000
-%004000000000000000000000000000020000000000000000000001000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000200000000000000000000
-%004000000000000000000000000000020000000000000000000002000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000080000000000000000000
-%004000000000000000000000000000020000000000000000000008000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000040000000000000000000
-%004000000000000000000000000000020000000000000000000010000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000020000000000000000000
-%004000000000000000000000000000020000000000000000000020000000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000000001FFFFFFFFFFFFFFF0000
-%00400000000000000000000000000002000007FFFFFFFFFFFFFFC0000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC00000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000FFFFFFFFFFFFFF
-%FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC00
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000007FF9FF8007C001C000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000007FF9FFE01FF801C000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000007001C0F0383C03E000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C070700C036000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C030E00C036000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C030C000063000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C031C000063000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000007001C071C0000E3800000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000007FF1FFE1C0FE0C1800000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000007FE1FFC1C0FE0C1800000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C001C00E1FFC00000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C000C0061FFC00000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C000C006380E00000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C000E006300600000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C000781E300700000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C0003FFC700700000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0040000006001C0000FF0600300000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC00000000000000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000007FFFFFFFFFFFFF
-%FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC00
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000000001FFFFFFFFFFFFFFF0000
-%00400000000000000000000000000002000007FFFFFFFFFFFFFFC0000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000080000000000000000000
-%004000000000000000000000000000020000000000000000000008000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000002000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000008000000000000000000000
-%004000000000000000000000000000020000000000000000000000080000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000010000000000000000000000
-%004000000000000000000000000000020000000000000000000000040000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000040000000000000000000000
-%004000000000000000000000000000020000000000000000000000010000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000080000000000000000000000
-%004000000000000000000000000000020000000000000000000000008000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000200000000000000000000000
-%004000000000000000000000000000020000000000000000000000002000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000C00000000000000000000000
-%004000000000000000000000000000020000000000000000000000001800000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400001003FE00060007C0000000000
-%0040000000000000000000000000000200000000003FE000E00078000400000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400002003FF800F001FF0000000000
-%0040000000000000000000000000000200000000003FF800E001FE000200000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000400383E00F003C78000000000
-%004000000000000000000000000000020000000000303C01E00787000100000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000800380E01F80701C000000000
-%004000000000000000000000000000020000000000300E01B00E03800080000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040001000380701980E00C000000000
-%004000000000000000000000000000020000000000300601B00C01C00040000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040002000380301980C008000000000
-%004000000000000000000000000000020000000000300703181C00800020000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400080003803039C0C000000000000
-%004000000000000000000000000000020000000000300303181C00000008000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400100003803830C1C000000000000
-%0040000000000000000000000000000200000000003003071C1800000004000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000003803830C1C000000008000
-%0040000000000000000000000000000200000800003003060C1800000000000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000007FFC0000380386061C00000000FFFF
-%FFC00000000000000000000000000003FFFFF800003003060C1800000001FFFF80000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040020000380387FE1C000000000000
-%00400000000000000000000000000002000000000030030FFE1800000002000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000000038030FFF0C000000000000
-%00400000000000000000000000000002000000000030070FFE1C00000004000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000C00038030C030C00C000000000
-%00400000000000000000000000000002000000000030061C070C00C00018000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000000038070C030E01C000000000
-%004000000000000000000000000000020000000000300618030E01C00000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000000380E1C038701C000000000
-%004000000000000000000000000000020000000000300E18038703800000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400008003FFC180183FF8000000000
-%0040000000000000000000000000000200000000003FFC380387FF000080000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000003FF83801C1FE0000000000
-%0040000000000000000000000000000200000000003FF8300181FE000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400002000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000200000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400001000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000400000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000800000000000000000000000
-%004000000000000000000000000000020000000000000000000000000800000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000007FFE00000000000000000C100000000000400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800000000003FF
-%E00000000000000000C100000000000400
-%000800000000003FFE00000000000000000C300000000000400000004000000000000000000000
-%0040000000000000000000000000000200000000000000000000001000000000800000000003FF
-%E00000000000000000C300000000000400
-%0008000000000001C0000000000000000000300000000000400000002000000000000000000000
-%00400000000000000000000000000002000000000000000000000020000000008000000000000C
-%0000000000000000000300000000000400
-%0008000000000001C0000000000000000000300000000000400000000000000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000008000000000000C
-%0000000000000000000300000000000400
-%0008000000000001C0670F833C03C19E1C0CFC0000000000400000000800000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000008000000000000C
-%0270F811C03C09E1C0CFC0000000000400
-%0008000000000001C07F3FE3FF0FE1FF7F0CFC0000000000400000000400000000000000000000
-%00400000000000000000000000000002000000000000000000000100000000008000000000000C
-%07F1FE1FF0FF1FF3F0CFC0000000000400
-%0008000000000001C07A30E3C31C31E3C70C300000000000400000000100000000000000000000
-%00400000000000000000000000000002000000000000000000000400000000008000000000000C
-%0783061C38C31E3E30C300000000000400
-%0008000000000001C0707063839831C1830C300000000000400000000080000000000000000000
-%00400000000000000000000000000002000000000000000000000800000000008000000000000C
-%0703071819C11C1C38C300000000000400
-%0008000000000001C0700063819C01C1830C300000000000400000000040000000000000000000
-%00400000000000000000000000000002000000000000000000001000000000008000000000000C
-%0700071819C01C1818C300000000000400
-%0008000000000001C06003E3818F8181830C300000000000400000000000000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000008000000000000C
-%07001F1818F81C1818C300000000000400
-%0008000000000001C0603FE38187F181830C30000000000040000000001FFFFFFFFFFFFFFF0000
-%00400000000000000000000000000002000007FFFFFFFFFFFFFFC000000000008000000000000C
-%0701FF18187F1C1818C300000000000400
-%0008000000000001C06078638180F181830C300000000000400000000000000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000008000000000000C
-%0703C718180F9C1818C300000000000400
-%0008000000000001C060606381803981830C300000000000400000000000000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000008000000000000C
-%0707071818019C1818C300000000000400
-%0008000000000001C060606381981981830C300000000000400000000000000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000008000000000000C
-%0706071819819C1818C300000000000400
-%0008000000000001C06060E3819C3981830C300000000000400000000000000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000008000000000000C
-%07070F1819C39C1818C300000000000400
-%0008000000000001C0607FE3818FF181830C3C0000000000400000000000000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000008000000000000C
-%0703FF1818FF1C1818C3C0000000000400
-%0008000000000001C0601E338187C181830C1C0000000000400000000000000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000008000000000000C
-%0701F318183E1C1818C1C0000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800FFE0000000000030004000000C0000000000000C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800FFE00000000
-%00030004000000C0000000000000C00400
-%000800FFF000000000003000C000000C0000000000000C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800FFF00000000
-%0003000C000000C0000000000000C00400
-%000800E03800000000003000C000000C0000000000000C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800E0380000000
-%0003000C000000C0000000000000C00400
-%000800E01C00000000003000C000000C0000000000000C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800E01C0000000
-%0003000C000000C0000000000000C00400
-%000800E00C0F838181EC33C3F07819CCE00F007C1B83CC0040000000001FFFFFFFFFFFFFFF0000
-%00400000000000000000000000000002000007FFFFFFFFFFFFFFC00000000000800E00C0F81818
-%1E633C1F0780DCCE00F007C1BC3CC00400
-%000800E00C3FE38187FC3FE3F1FE1FCFF83FC1FE1F8FFC00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800E00E1FE1818
-%7FE3FE1F1FE0FCFF83FC1FE1FC7FC00400
-%000800E00E30E3818E1C3870C3871E0E1870E3871E9C3C00400000000040000000000000000000
-%0040000000000000000000000000000200000000000000000000100000000000800E00E3061818
-%61E3870C3870E0F1C70E3871E0C3C00400
-%000800E00E7063818C0C3030C3031C0E1CE063031C181C00400000000080000000000000000000
-%0040000000000000000000000000000200000000000000000000080000000000800E00E3071818
-%C0E3030C3030C0E0C6063031C1C1C00400
-%000800E00E0063819C0C3030C6031C0C0CC0700318181C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800E00E0071818
-%C0E3030C3038C0C0CC0300318181C00400
-%000800E00E03E381980C3030C7FF9C0C0CC0303F18381C00400000000400000000000000000000
-%0040000000000000000000000000000200000000000000000000010000000000800E00E03F1819
-%C0E3030C7FF8C0C0EC0301F18180C00400
-%000800E00C3FE381980C3030C7FF9C0C0CC031FF18381C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800E00E1FF1819
-%C0E3030C7FF8C0C0EC031FF18180C00400
-%000800E00C786383980C3030C6001C0C0CC033C318381C00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800E00C3871819
-%C0E3030C7000C0C0EC033C318180C00400
-%000800E01C6063839C0C3030C7001C0C0CC0770318181C00400000002000000000000000000000
-%0040000000000000000000000000000200000000000000000000002000000000800E00C7071818
-%C0E3030C7000C0C0CC0330318180C00400
-%000800E0186063838C0C3030C3031C0C1CE0670718181C00400000004000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800E01C6071838
-%C0E3030C3038C0E0C606303181C1C00400
-%000800E07870E1878E1C3030C3871C0E1870E70F180C3C00400000008000000000000000000000
-%0040000000000000000000000000000200000000000000000000000800000000800E07870F1C78
-%E1E3030C3870C0E1C70E307180C3C00400
-%000800FFF03FF1FD87FC3030F1FE1C0FF03FC3FF180FFC00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800FFF03FF0FD8
-%7FE3030F1FE0C0FF83FC3FF1807FC00400
-%000800FFC01E307981EC303070781C0DE01F01F39803CC00400000000000000000000000000000
-%0040000000000000000000000000000200000000000000000000000000000000800FFC01F30798
-%1EE3030787C0C0CE00F00F19803CC00400
-%0008000000000000000C0000000000000000000000000000400000040000000000000000000000
-%004000000000000000000000000000020000000000000000000000010000000080000000000000
-%00C0000000000000000000000000000400
-%00080000000000000C0C0000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%C0C0000000000000000000000000000400
-%00080000000000000E380000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%F3C0000000000000000000000000000400
-%000800000000000007F00000000000000000000000000000400000200000000000000000000000
-%004000000000000000000000000000020000000000000000000000002000000080000000000000
-%7F80000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400001003FF00060007C0000000000
-%0040000000000000000000000000000200000000003FE000E000FC000400000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400002003FFC00F001FF0000000000
-%0040000000000000000000000000000200000000003FF800E003FE000200000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000000381E00F003838000000000
-%004000000000000000000000000000020000000000301C01F00787800000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000800380601F80701C000000000
-%004000000000000000000000000000020000000000300E01B00E03800080000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040001000380701980E00C000000000
-%004000000000000000000000000000020000000000300603B00C01C00040000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040004000380301980C000000000000
-%004000000000000000000000000000020000000000300703181C00000010000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400080003803031C0C000000000000
-%004000000000000000000000000000020000000000300303181800000008000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400100003803830C1C000000000000
-%0040000000000000000000000000000200000000003003071C1800000004000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000007FFA00003803870E1C00000000FFFF
-%FFC00000000000000000000000000003FFFFF800003003060C1800000003FFFF80000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000007FFC0000380386061C00000000FFFF
-%FFC00000000000000000000000000003FFFFF800003003060C1800000001FFFF80000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040020000380307FE0C000000000000
-%00400000000000000000000000000002000000000030030FFE1800000002000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004001000038030FFF0C00C000000000
-%00400000000000000000000000000002000000000030070FFE1C00800004000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000C00038030C030C00C000000000
-%00400000000000000000000000000002000000000030061C070C01C00018000080000000000000
-%0000000000000000000000000000000400
-%0008000000000000000000000000000000000000000000004000000038070C038601C000000000
-%004000000000000000000000000000020000000000300E18030E01800000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040001000380E1C0387038000000000
-%004000000000000000000000000000020000000000301E18038703800040000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400008003FFC180183FF8000000000
-%0040000000000000000000000000000200000000003FFC380387FF000080000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000003FF83801C1FE0000000000
-%0040000000000000000000000000000200000000003FF0300181FE000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400002000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000200000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400001000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000400000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000800000000000000000000000
-%004000000000000000000000000000020000000000000000000000000800000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000200000000000000000000000
-%004000000000000000000000000000020000000000000000000000002000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000040000000000000000000000
-%004000000000000000000000000000020000000000000000000000010000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000100000000000000000000
-%004000000000000000000000000000020000000000000000000004000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000080000000000000000000
-%004000000000000000000000000000020000000000000000000008000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000040000000000000000000
-%004000000000000000000000000000020000000000000000000010000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%00080000000000000000000000000000000000000000000040000000001FFFFFFFFFFFFFFF0000
-%00400000000000000000000000000002000007FFFFFFFFFFFFFFC0000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000800000000000000000000000000000000000000000000400000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000080000000000000
-%0000000000000000000000000000000400
-%000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC00000000000000000000000000000
-%00400000000000000000000000000002000000000000000000000000000000007FFFFFFFFFFFFF
-%FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC00
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%004000000000000000000000000000020000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%007FFFFFFFFFFFFFFFFFFFFFFFFFFFFE0000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%000000000000000000000000000000000000000000000000000000000000000000000000000000
-%0000000000000000000000000000000000
-%%EndPreview
-%%BeginProlog
-%%BeginResource: SDRes
-/b4_inc_state save def
-/dict_count countdictstack def
-/op_count count 1 sub def
-userdict begin
-0 setgray 0 setlinecap 1 setlinewidth 0 setlinejoin 10 setmiterlimit[] 0 setdash newpath
-/languagelevel where {pop languagelevel 1 ne {false setstrokeadjust false setoverprint} if} if
-/bdef {bind def} bind def
-/c {setgray} bdef
-/l {neg lineto} bdef
-/rl {neg rlineto} bdef
-/lc {setlinecap} bdef
-/lj {setlinejoin} bdef
-/lw {setlinewidth} bdef
-/ml {setmiterlimit} bdef
-/ld {setdash} bdef
-/m {neg moveto} bdef
-/ct {6 2 roll neg 6 2 roll neg 6 2 roll neg curveto} bdef
-/r {rotate} bdef
-/t {neg translate} bdef
-/s {scale} bdef
-/sw {show} bdef
-/gs {gsave} bdef
-/gr {grestore} bdef
-/f {findfont dup length dict begin
-{1 index /FID ne {def} {pop pop} ifelse} forall /Encoding ISOLatin1Encoding def
-currentdict end /NFont exch definefont pop /NFont findfont} bdef
-/p {closepath} bdef
-/sf {scalefont setfont} bdef
-/ef {eofill}bdef
-/pc {closepath stroke}bdef
-/ps {stroke}bdef
-/pum {matrix currentmatrix}bdef
-/pom {setmatrix}bdef
-/bs {/aString exch def /nXOfs exch def /nWidth exch def currentpoint nXOfs 0 rmoveto pum nWidth aString stringwidth pop div 1 scale aString show pom moveto} bdef
-%%EndResource
-%%EndProlog
-%%BeginSetup
-%%EndSetup
-%%Page: 1 1
-%%BeginPageSetup
-%%EndPageSetup
-pum
-0.02834 0.02833 s 
-0 -20290 t
-/tm matrix currentmatrix def
-gs
-tm setmatrix
--635 -635 t 
-1 1 s 
-635 635 m 27274 635 l 27274 20924 l 635 20924 l 635 635 l eoclip newpath
-0.996 c 7835 7938 m  8893 6985 l  11010 6985 l  11010 8890 l  8893 8890 l 
-7835 7938 l  p ef
-0 lw 1 lj 0.000 c 7835 7938 m  8893 6985 l  11010 6985 l  11010 8890 l  8893 8890 l 
-7835 7938 l  pc
-gs
-pum
-8520 8228 t
--1 0 m  231 -605 l  317 -605 l  565 0 l  474 0 l  403 -183 l  150 -183 l 
-83 0 l  p
-173 -248 m  378 -248 l  315 -416 l  296 -467 282 -509 272 -541 ct 264 -503 254 -464 240 -426 ct 
-p ef
-621 0 m  621 -605 l  829 -605 l  876 -605 912 -602 937 -596 ct 972 -588 1001 -574 1026 -553 ct 
-1058 -526 1082 -492 1098 -450 ct 1114 -408 1121 -360 1121 -306 ct 1121 -260 1116 -219 1105 -183 ct 
-1095 -148 1081 -118 1064 -95 ct 1047 -72 1029 -54 1009 -40 ct 989 -27 965 -17 937 -10 ct 
-908 -3 876 0 839 0 ct p
-701 -71 m  830 -71 l  870 -71 901 -75 924 -82 ct 947 -90 965 -100 979 -114 ct 
-998 -133 1012 -158 1023 -190 ct 1034 -222 1039 -261 1039 -307 ct 1039 -370 1028 -419 1008 -453 ct 
-987 -487 962 -510 932 -521 ct 910 -530 876 -534 828 -534 ct 701 -534 l  p ef
-1661 -212 m  1741 -192 l  1724 -126 1694 -76 1650 -41 ct 1607 -6 1553 10 1490 10 ct 
-1425 10 1372 -2 1331 -29 ct 1290 -56 1259 -94 1238 -145 ct 1216 -195 1206 -249 1206 -307 ct 
-1206 -370 1218 -425 1242 -472 ct 1266 -519 1300 -554 1345 -579 ct 1389 -603 1438 -615 1491 -615 ct 
-1552 -615 1603 -600 1644 -569 ct 1686 -538 1714 -495 1731 -439 ct 1652 -420 l 
-1638 -465 1617 -497 1591 -517 ct 1564 -537 1530 -547 1490 -547 ct 1443 -547 1404 -536 1373 -513 ct 
-1342 -491 1320 -461 1307 -424 ct 1295 -386 1288 -347 1288 -307 ct 1288 -256 1296 -211 1311 -172 ct 
-1326 -134 1349 -105 1381 -86 ct 1412 -67 1447 -58 1484 -58 ct 1529 -58 1567 -71 1598 -97 ct 
-1629 -122 l  1650 -161 l  p ef
-pom
-gr
-13955 5080 m  11733 5080 l  11733 1270 l  16178 1270 l  16178 5080 l  13955 5080 l 
-pc
-gs
-pum
-13176 2513 t
-69 0 m  69 -605 l  477 -605 l  477 -534 l  149 -534 l  149 -346 l  433 -346 l 
-433 -275 l  149 -275 l  149 0 l  p ef
-532 0 m  766 -315 l  560 -605 l  655 -605 l  765 -450 l  788 -418 804 -393 814 -375 ct 
-827 -397 843 -420 862 -444 ct 984 -605 l  1071 -605 l  858 -320 l  1087 0 l 
-988 0 l  836 -216 l  827 -228 818 -241 809 -256 ct 796 -234 786 -219 780 -211 ct 
-628 0 l  p ef
-1510 -71 m  1510 0 l  1110 0 l  1110 -17 1112 -35 1119 -51 ct 1129 -78 1145 -105 1168 -132 ct 
-1190 -158 1223 -189 1265 -223 ct 1331 -277 1375 -320 1398 -352 ct 1422 -383 1433 -413 1433 -441 ct 
-1433 -471 1423 -495 1402 -516 ct 1380 -536 1353 -546 1319 -546 ct 1283 -546 1255 -535 1233 -514 ct 
-1212 -492 1201 -463 1201 -425 ct 1124 -432 l  1129 -489 1149 -533 1183 -563 ct 
-1217 -593 1263 -608 1321 -608 ct 1379 -608 1425 -591 1459 -559 ct 1493 -527 1510 -487 1510 -439 ct 
-1510 -415 1505 -391 1495 -368 ct 1485 -345 1468 -320 1445 -294 ct 1422 -268 1384 -233 1331 -187 ct 
-1286 -150 1257 -125 1245 -111 ct 1232 -98 1222 -84 1213 -71 ct p ef
-pom
-pum
-12713 3466 t
-462 -605 m  542 -605 l  542 -255 l  542 -194 535 -146 522 -110 ct 508 -74 483 -45 447 -23 ct 
-411 0 364 10 306 10 ct 249 10 202 0 166 -19 ct 130 -38 105 -66 89 -103 ct 74 -140 66 -191 66 -255 ct 
-66 -605 l  146 -605 l  146 -256 l  146 -203 151 -164 161 -139 ct 171 -114 187 -95 211 -82 ct 
-235 -68 264 -61 299 -61 ct 358 -61 400 -75 425 -102 ct 450 -128 462 -180 462 -256 ct 
-p ef
-673 -194 m  748 -201 l  752 -170 760 -146 773 -126 ct 786 -107 806 -91 834 -79 ct 
-862 -67 893 -61 927 -61 ct 958 -61 985 -66 1008 -75 ct 1031 -84 1049 -96 1060 -112 ct 
-1072 -128 1077 -145 1077 -164 ct 1077 -183 1072 -200 1061 -214 ct 1050 -228 1032 -240 1006 -249 ct 
-990 -256 954 -266 898 -279 ct 843 -292 804 -305 782 -317 ct 753 -332 731 -351 717 -373 ct 
-703 -396 696 -421 696 -449 ct 696 -479 704 -508 722 -534 ct 739 -561 764 -581 798 -595 ct 
-831 -609 868 -615 909 -615 ct 954 -615 993 -608 1028 -594 ct 1062 -579 1088 -558 1107 -530 ct 
-1125 -502 1135 -470 1136 -434 ct 1060 -429 l  1055 -467 1041 -496 1018 -515 ct 
-994 -535 959 -545 912 -545 ct 864 -545 828 -536 806 -518 ct 784 -500 773 -479 773 -454 ct 
-773 -432 781 -414 796 -400 ct 812 -386 852 -372 917 -357 ct 982 -342 1027 -329 1051 -318 ct 
-1087 -302 1113 -282 1129 -257 ct 1146 -232 1155 -203 1155 -171 ct 1155 -138 1145 -108 1127 -79 ct 
-1108 -51 1082 -29 1047 -13 ct 1013 2 974 10 931 10 ct 876 10 830 2 793 -13 ct 756 -29 727 -53 706 -85 ct 
-685 -117 l  674 -154 l  p ef
-1278 0 m  1278 -605 l  1506 -605 l  1552 -605 1589 -599 1617 -587 ct 1645 -574 1667 -556 1683 -530 ct 
-1699 -505 1706 -478 1706 -450 ct 1706 -424 1699 -400 1685 -377 ct 1671 -354 1650 -336 1622 -322 ct 
-1658 -311 1687 -293 1706 -267 ct 1726 -241 1736 -210 1736 -175 ct 1736 -147 1730 -120 1718 -96 ct 
-1706 -72 1691 -53 1673 -40 ct 1656 -26 1634 -16 1607 -10 ct 1580 -3 1548 0 1509 0 ct 
-p
-1359 -351 m  1490 -351 l  1525 -351 1551 -353 1566 -358 ct 1586 -364 1602 -374 1612 -388 ct 
-1622 -402 1628 -419 1628 -441 ct 1628 -461 1623 -478 1613 -494 ct 1603 -509 1590 -520 1572 -525 ct 
-1554 -531 1523 -534 1480 -534 ct 1359 -534 l  p
-1359 -71 m  1509 -71 l  1535 -71 1553 -72 1564 -74 ct 1582 -77 1598 -83 1610 -90 ct 
-1623 -98 1633 -109 1641 -124 ct 1649 -139 1653 -156 1653 -175 ct 1653 -198 1647 -217 1635 -234 ct 
-1624 -251 1608 -262 1587 -269 ct 1567 -276 1537 -279 1499 -279 ct 1359 -279 l 
-p ef
-2436 -71 m  2436 0 l  2036 0 l  2036 -17 2038 -35 2045 -51 ct 2055 -78 2071 -105 2094 -132 ct 
-2116 -158 2149 -189 2191 -223 ct 2257 -277 2301 -320 2324 -352 ct 2348 -383 2359 -413 2359 -441 ct 
-2359 -471 2349 -495 2328 -516 ct 2306 -536 2279 -546 2245 -546 ct 2209 -546 2181 -535 2159 -514 ct 
-2138 -492 2127 -463 2127 -425 ct 2050 -432 l  2055 -489 2075 -533 2109 -563 ct 
-2143 -593 2189 -608 2247 -608 ct 2305 -608 2351 -591 2385 -559 ct 2419 -527 2436 -487 2436 -439 ct 
-2436 -415 2431 -391 2421 -368 ct 2411 -345 2394 -320 2371 -294 ct 2348 -268 2310 -233 2257 -187 ct 
-2212 -150 2183 -125 2171 -111 ct 2158 -98 2148 -84 2139 -71 ct p ef
-pom
-pum
-12091 4419 t
-497 -212 m  577 -192 l  560 -126 530 -76 486 -41 ct 443 -6 389 10 326 10 ct 
-261 10 208 -2 167 -29 ct 126 -56 95 -94 74 -145 ct 52 -195 42 -249 42 -307 ct 42 -370 54 -425 78 -472 ct 
-102 -519 136 -554 181 -579 ct 225 -603 274 -615 327 -615 ct 388 -615 439 -600 480 -569 ct 
-522 -538 550 -495 567 -439 ct 488 -420 l  474 -465 453 -497 427 -517 ct 400 -537 366 -547 326 -547 ct 
-279 -547 240 -536 209 -513 ct 178 -491 156 -461 143 -424 ct 131 -386 124 -347 124 -307 ct 
-124 -256 132 -211 147 -172 ct 162 -134 185 -105 217 -86 ct 248 -67 283 -58 320 -58 ct 
-365 -58 403 -71 434 -97 ct 465 -122 l  486 -161 l  p ef
-663 -219 m  663 -300 685 -360 730 -399 ct 768 -432 814 -448 868 -448 ct 929 -448 978 -428 1016 -389 ct 
-1054 -349 1074 -295 1074 -225 ct 1074 -169 1065 -124 1048 -92 ct 1031 -59 1007 -34 974 -16 ct 
-942 0 907 9 868 9 ct 807 9 757 -9 719 -49 ct 682 -88 l  663 -145 l  p
-739 -219 m  739 -163 751 -121 776 -93 ct 800 -65 831 -51 868 -51 ct 905 -51 936 -65 960 -93 ct 
-985 -121 997 -164 997 -221 ct 997 -276 985 -317 960 -345 ct 936 -373 905 -387 868 -387 ct 
-831 -387 800 -373 776 -345 ct 751 -317 l  739 -275 l  p ef
-1166 0 m  1166 -438 l  1233 -438 l  1233 -376 l  1265 -424 1312 -448 1373 -448 ct 
-1399 -448 1424 -443 1446 -434 ct 1468 -424 1484 -412 1495 -396 ct 1507 -381 1514 -363 1519 -342 ct 
-1521 -328 1523 -304 1523 -269 ct 1523 0 l  1448 0 l  1448 -266 l  1448 -297 1446 -319 1440 -334 ct 
-1434 -349 1424 -361 1409 -370 ct 1394 -379 1377 -384 1357 -384 ct 1325 -384 1298 -374 1275 -354 ct 
-1252 -333 1241 -295 1241 -239 ct 1241 0 l  p ef
-1806 -66 m  1816 0 l  1795 3 1777 5 1760 5 ct 1733 5 1712 1 1697 -7 ct 1683 -15 1672 -26 1666 -40 ct 
-1660 -54 1657 -83 1657 -128 ct 1657 -380 l  1602 -380 l  1602 -438 l  1657 -438 l 
-1657 -547 l  1731 -591 l  1731 -438 l  1806 -438 l  1806 -380 l  1731 -380 l 
-1731 -124 l  1731 -103 1732 -89 1735 -83 ct 1737 -77 1742 -72 1748 -68 ct 1753 -65 1762 -63 1773 -63 ct 
-1781 -63 l  1792 -64 l  p ef
-1880 0 m  1880 -438 l  1947 -438 l  1947 -372 l  1964 -403 1980 -423 1995 -433 ct 
-2009 -443 2025 -448 2042 -448 ct 2067 -448 2093 -440 2119 -424 ct 2093 -355 l 
-2075 -366 2057 -371 2039 -371 ct 2022 -371 2008 -366 1995 -357 ct 1982 -347 1973 -333 1967 -316 ct 
-1959 -289 1955 -261 1955 -229 ct 1955 0 l  p ef
-2145 -219 m  2145 -300 2167 -360 2212 -399 ct 2250 -432 2296 -448 2350 -448 ct 
-2411 -448 2460 -428 2498 -389 ct 2536 -349 2556 -295 2556 -225 ct 2556 -169 2547 -124 2530 -92 ct 
-2513 -59 2489 -34 2456 -16 ct 2424 0 2389 9 2350 9 ct 2289 9 2239 -9 2201 -49 ct 
-2164 -88 l  2145 -145 l  p
-2221 -219 m  2221 -163 2233 -121 2258 -93 ct 2282 -65 2313 -51 2350 -51 ct 2387 -51 2418 -65 2442 -93 ct 
-2467 -121 2479 -164 2479 -221 ct 2479 -276 2467 -317 2442 -345 ct 2418 -373 2387 -387 2350 -387 ct 
-2313 -387 2282 -373 2258 -345 ct 2233 -317 l  2221 -275 l  p ef
-2647 0 m  2647 -605 l  2721 -605 l  2721 0 l  p ef
-2832 0 m  2832 -605 l  2906 -605 l  2906 0 l  p ef
-3319 -141 m  3395 -131 l  3383 -86 3361 -52 3328 -27 ct 3295 -2 3253 9 3203 9 ct 
-3138 9 3087 -9 3050 -49 ct 3012 -88 2993 -144 2993 -215 ct 2993 -289 3012 -346 3050 -387 ct 
-3089 -428 3138 -448 3198 -448 ct 3257 -448 3305 -428 3342 -388 ct 3379 -348 3398 -292 3398 -220 ct 
-3398 -215 3398 -209 3397 -200 ct 3070 -200 l  3073 -152 3087 -115 3111 -89 ct 
-3136 -64 3166 -51 3203 -51 ct 3230 -51 3253 -58 3273 -72 ct 3292 -87 l  3307 -109 l 
-p
-3074 -261 m  3319 -261 l  3316 -298 3307 -326 3291 -344 ct 3268 -373 3237 -387 3199 -387 ct 
-3165 -387 3136 -376 3113 -353 ct 3090 -330 l  3077 -299 l  p ef
-3494 0 m  3494 -438 l  3561 -438 l  3561 -372 l  3578 -403 3594 -423 3609 -433 ct 
-3623 -443 3639 -448 3656 -448 ct 3681 -448 3707 -440 3733 -424 ct 3707 -355 l 
-3689 -366 3671 -371 3653 -371 ct 3636 -371 3622 -366 3609 -357 ct 3596 -347 3587 -333 3581 -316 ct 
-3573 -289 3569 -261 3569 -229 ct 3569 0 l  p ef
-pom
-gr
-13956 19115 m  11900 19115 l  11900 6350 l  16013 6350 l  16013 19115 l 
-13956 19115 l  pc
-gs
-pum
-12806 13017 t
-69 0 m  69 -605 l  477 -605 l  477 -534 l  149 -534 l  149 -346 l  433 -346 l 
-433 -275 l  149 -275 l  149 0 l  p ef
-594 0 m  594 -605 l  822 -605 l  862 -605 893 -603 914 -599 ct 944 -594 969 -585 989 -571 ct 
-1009 -557 1025 -538 1038 -513 ct 1050 -488 1056 -460 1056 -430 ct 1056 -378 1040 -335 1007 -299 ct 
-974 -264 915 -246 829 -246 ct 674 -246 l  674 0 l  p
-674 -317 m  830 -317 l  882 -317 919 -327 941 -346 ct 963 -365 973 -392 973 -427 ct 
-973 -453 967 -474 954 -493 ct 941 -511 925 -522 904 -528 ct 890 -532 865 -534 829 -534 ct 
-674 -534 l  p ef
-1433 -237 m  1433 -308 l  1690 -308 l  1690 -84 l  1650 -52 1610 -29 1568 -13 ct 
-1526 2 1483 10 1439 10 ct 1379 10 1325 -2 1277 -27 ct 1228 -53 1191 -90 1167 -138 ct 
-1142 -186 1130 -240 1130 -299 ct 1130 -358 1142 -413 1167 -464 ct 1191 -516 1227 -553 1273 -578 ct 
-1319 -603 1372 -615 1433 -615 ct 1477 -615 1516 -608 1551 -594 ct 1587 -580 1615 -560 1635 -535 ct 
-1655 -510 1670 -476 1681 -436 ct 1608 -416 l  1599 -447 1588 -471 1574 -489 ct 
-1561 -506 1542 -520 1517 -531 ct 1492 -542 1464 -547 1433 -547 ct 1397 -547 1365 -541 1338 -530 ct 
-1311 -519 1290 -504 1273 -486 ct 1257 -468 1244 -448 1235 -426 ct 1220 -389 1212 -348 1212 -304 ct 
-1212 -250 1221 -205 1240 -169 ct 1259 -133 1286 -106 1321 -88 ct 1357 -70 1394 -61 1434 -61 ct 
-1469 -61 1503 -68 1536 -82 ct 1569 -95 1594 -109 1611 -124 ct 1611 -237 l  p ef
-1745 0 m  1977 -605 l  2063 -605 l  2311 0 l  2220 0 l  2149 -183 l  1896 -183 l 
-1829 0 l  p
-1919 -248 m  2124 -248 l  2061 -416 l  2042 -467 2028 -509 2018 -541 ct 2010 -503 2000 -464 1986 -426 ct 
-p ef
-pom
-gr
-0.996 c 7835 17258 m  8893 16305 l  11010 16305 l  11010 18210 l  8893 18210 l 
-7835 17258 l  p ef
-0.000 c 7835 17258 m  8893 16305 l  11010 16305 l  11010 18210 l  8893 18210 l 
-7835 17258 l  pc
-gs
-pum
-8520 17542 t
-65 0 m  65 -605 l  273 -605 l  320 -605 356 -602 381 -596 ct 416 -588 445 -574 470 -553 ct 
-502 -526 526 -492 542 -450 ct 558 -408 565 -360 565 -306 ct 565 -260 560 -219 549 -183 ct 
-539 -148 525 -118 508 -95 ct 491 -72 473 -54 453 -40 ct 433 -27 409 -17 381 -10 ct 
-352 -3 320 0 283 0 ct p
-145 -71 m  274 -71 l  314 -71 345 -75 368 -82 ct 391 -90 409 -100 423 -114 ct 
-442 -133 456 -158 467 -190 ct 478 -222 483 -261 483 -307 ct 483 -370 472 -419 452 -453 ct 
-431 -487 406 -510 376 -521 ct 354 -530 320 -534 272 -534 ct 145 -534 l  p ef
-608 0 m  840 -605 l  926 -605 l  1174 0 l  1083 0 l  1012 -183 l  759 -183 l 
-692 0 l  p
-782 -248 m  987 -248 l  924 -416 l  905 -467 891 -509 881 -541 ct 873 -503 863 -464 849 -426 ct 
-p ef
-1661 -212 m  1741 -192 l  1724 -126 1694 -76 1650 -41 ct 1607 -6 1553 10 1490 10 ct 
-1425 10 1372 -2 1331 -29 ct 1290 -56 1259 -94 1238 -145 ct 1216 -195 1206 -249 1206 -307 ct 
-1206 -370 1218 -425 1242 -472 ct 1266 -519 1300 -554 1345 -579 ct 1389 -603 1438 -615 1491 -615 ct 
-1552 -615 1603 -600 1644 -569 ct 1686 -538 1714 -495 1731 -439 ct 1652 -420 l 
-1638 -465 1617 -497 1591 -517 ct 1564 -537 1530 -547 1490 -547 ct 1443 -547 1404 -536 1373 -513 ct 
-1342 -491 1320 -461 1307 -424 ct 1295 -386 1288 -347 1288 -307 ct 1288 -256 1296 -211 1311 -172 ct 
-1326 -134 1349 -105 1381 -86 ct 1412 -67 1447 -58 1484 -58 ct 1529 -58 1567 -71 1598 -97 ct 
-1629 -122 l  1650 -161 l  p ef
-pom
-gr
-0.996 c 7835 10478 m  8893 9525 l  11010 9525 l  11010 11430 l  8893 11430 l 
-7835 10478 l  p ef
-0.000 c 7835 10478 m  8893 9525 l  11010 9525 l  11010 11430 l  8893 11430 l 
-7835 10478 l  pc
-gs
-pum
-8520 10768 t
--1 0 m  231 -605 l  317 -605 l  565 0 l  474 0 l  403 -183 l  150 -183 l 
-83 0 l  p
-173 -248 m  378 -248 l  315 -416 l  296 -467 282 -509 272 -541 ct 264 -503 254 -464 240 -426 ct 
-p ef
-621 0 m  621 -605 l  829 -605 l  876 -605 912 -602 937 -596 ct 972 -588 1001 -574 1026 -553 ct 
-1058 -526 1082 -492 1098 -450 ct 1114 -408 1121 -360 1121 -306 ct 1121 -260 1116 -219 1105 -183 ct 
-1095 -148 1081 -118 1064 -95 ct 1047 -72 1029 -54 1009 -40 ct 989 -27 965 -17 937 -10 ct 
-908 -3 876 0 839 0 ct p
-701 -71 m  830 -71 l  870 -71 901 -75 924 -82 ct 947 -90 965 -100 979 -114 ct 
-998 -133 1012 -158 1023 -190 ct 1034 -222 1039 -261 1039 -307 ct 1039 -370 1028 -419 1008 -453 ct 
-987 -487 962 -510 932 -521 ct 910 -530 876 -534 828 -534 ct 701 -534 l  p ef
-1661 -212 m  1741 -192 l  1724 -126 1694 -76 1650 -41 ct 1607 -6 1553 10 1490 10 ct 
-1425 10 1372 -2 1331 -29 ct 1290 -56 1259 -94 1238 -145 ct 1216 -195 1206 -249 1206 -307 ct 
-1206 -370 1218 -425 1242 -472 ct 1266 -519 1300 -554 1345 -579 ct 1389 -603 1438 -615 1491 -615 ct 
-1552 -615 1603 -600 1644 -569 ct 1686 -538 1714 -495 1731 -439 ct 1652 -420 l 
-1638 -465 1617 -497 1591 -517 ct 1564 -537 1530 -547 1490 -547 ct 1443 -547 1404 -536 1373 -513 ct 
-1342 -491 1320 -461 1307 -424 ct 1295 -386 1288 -347 1288 -307 ct 1288 -256 1296 -211 1311 -172 ct 
-1326 -134 1349 -105 1381 -86 ct 1412 -67 1447 -58 1484 -58 ct 1529 -58 1567 -71 1598 -97 ct 
-1629 -122 l  1650 -161 l  p ef
-pom
-gr
-0.996 c 7835 14618 m  8893 13665 l  11010 13665 l  11010 15570 l  8893 15570 l 
-7835 14618 l  p ef
-0.000 c 7835 14618 m  8893 13665 l  11010 13665 l  11010 15570 l  8893 15570 l 
-7835 14618 l  pc
-gs
-pum
-8520 14896 t
-65 0 m  65 -605 l  273 -605 l  320 -605 356 -602 381 -596 ct 416 -588 445 -574 470 -553 ct 
-502 -526 526 -492 542 -450 ct 558 -408 565 -360 565 -306 ct 565 -260 560 -219 549 -183 ct 
-539 -148 525 -118 508 -95 ct 491 -72 473 -54 453 -40 ct 433 -27 409 -17 381 -10 ct 
-352 -3 320 0 283 0 ct p
-145 -71 m  274 -71 l  314 -71 345 -75 368 -82 ct 391 -90 409 -100 423 -114 ct 
-442 -133 456 -158 467 -190 ct 478 -222 483 -261 483 -307 ct 483 -370 472 -419 452 -453 ct 
-431 -487 406 -510 376 -521 ct 354 -530 320 -534 272 -534 ct 145 -534 l  p ef
-608 0 m  840 -605 l  926 -605 l  1174 0 l  1083 0 l  1012 -183 l  759 -183 l 
-692 0 l  p
-782 -248 m  987 -248 l  924 -416 l  905 -467 891 -509 881 -541 ct 873 -503 863 -464 849 -426 ct 
-p ef
-1661 -212 m  1741 -192 l  1724 -126 1694 -76 1650 -41 ct 1607 -6 1553 10 1490 10 ct 
-1425 10 1372 -2 1331 -29 ct 1290 -56 1259 -94 1238 -145 ct 1216 -195 1206 -249 1206 -307 ct 
-1206 -370 1218 -425 1242 -472 ct 1266 -519 1300 -554 1345 -579 ct 1389 -603 1438 -615 1491 -615 ct 
-1552 -615 1603 -600 1644 -569 ct 1686 -538 1714 -495 1731 -439 ct 1652 -420 l 
-1638 -465 1617 -497 1591 -517 ct 1564 -537 1530 -547 1490 -547 ct 1443 -547 1404 -536 1373 -513 ct 
-1342 -491 1320 -461 1307 -424 ct 1295 -386 1288 -347 1288 -307 ct 1288 -256 1296 -211 1311 -172 ct 
-1326 -134 1349 -105 1381 -86 ct 1412 -67 1447 -58 1484 -58 ct 1529 -58 1567 -71 1598 -97 ct 
-1629 -122 l  1650 -161 l  p ef
-pom
-gr
-0.996 c 19984 7938 m  18926 6985 l  16809 6985 l  16809 8890 l  18926 8890 l 
-19984 7938 l  p ef
-0.000 c 19984 7938 m  18926 6985 l  16809 6985 l  16809 8890 l  18926 8890 l 
-19984 7938 l  pc
-gs
-pum
-17489 8228 t
--1 0 m  231 -605 l  317 -605 l  565 0 l  474 0 l  403 -183 l  150 -183 l 
-83 0 l  p
-173 -248 m  378 -248 l  315 -416 l  296 -467 282 -509 272 -541 ct 264 -503 254 -464 240 -426 ct 
-p ef
-621 0 m  621 -605 l  829 -605 l  876 -605 912 -602 937 -596 ct 972 -588 1001 -574 1026 -553 ct 
-1058 -526 1082 -492 1098 -450 ct 1114 -408 1121 -360 1121 -306 ct 1121 -260 1116 -219 1105 -183 ct 
-1095 -148 1081 -118 1064 -95 ct 1047 -72 1029 -54 1009 -40 ct 989 -27 965 -17 937 -10 ct 
-908 -3 876 0 839 0 ct p
-701 -71 m  830 -71 l  870 -71 901 -75 924 -82 ct 947 -90 965 -100 979 -114 ct 
-998 -133 1012 -158 1023 -190 ct 1034 -222 1039 -261 1039 -307 ct 1039 -370 1028 -419 1008 -453 ct 
-987 -487 962 -510 932 -521 ct 910 -530 876 -534 828 -534 ct 701 -534 l  p ef
-1661 -212 m  1741 -192 l  1724 -126 1694 -76 1650 -41 ct 1607 -6 1553 10 1490 10 ct 
-1425 10 1372 -2 1331 -29 ct 1290 -56 1259 -94 1238 -145 ct 1216 -195 1206 -249 1206 -307 ct 
-1206 -370 1218 -425 1242 -472 ct 1266 -519 1300 -554 1345 -579 ct 1389 -603 1438 -615 1491 -615 ct 
-1552 -615 1603 -600 1644 -569 ct 1686 -538 1714 -495 1731 -439 ct 1652 -420 l 
-1638 -465 1617 -497 1591 -517 ct 1564 -537 1530 -547 1490 -547 ct 1443 -547 1404 -536 1373 -513 ct 
-1342 -491 1320 -461 1307 -424 ct 1295 -386 1288 -347 1288 -307 ct 1288 -256 1296 -211 1311 -172 ct 
-1326 -134 1349 -105 1381 -86 ct 1412 -67 1447 -58 1484 -58 ct 1529 -58 1567 -71 1598 -97 ct 
-1629 -122 l  1650 -161 l  p ef
-pom
-gr
-0.996 c 19984 17258 m  18926 16305 l  16809 16305 l  16809 18210 l  18926 18210 l 
-19984 17258 l  p ef
-0.000 c 19984 17258 m  18926 16305 l  16809 16305 l  16809 18210 l  18926 18210 l 
-19984 17258 l  pc
-gs
-pum
-17489 17542 t
-65 0 m  65 -605 l  273 -605 l  320 -605 356 -602 381 -596 ct 416 -588 445 -574 470 -553 ct 
-502 -526 526 -492 542 -450 ct 558 -408 565 -360 565 -306 ct 565 -260 560 -219 549 -183 ct 
-539 -148 525 -118 508 -95 ct 491 -72 473 -54 453 -40 ct 433 -27 409 -17 381 -10 ct 
-352 -3 320 0 283 0 ct p
-145 -71 m  274 -71 l  314 -71 345 -75 368 -82 ct 391 -90 409 -100 423 -114 ct 
-442 -133 456 -158 467 -190 ct 478 -222 483 -261 483 -307 ct 483 -370 472 -419 452 -453 ct 
-431 -487 406 -510 376 -521 ct 354 -530 320 -534 272 -534 ct 145 -534 l  p ef
-608 0 m  840 -605 l  926 -605 l  1174 0 l  1083 0 l  1012 -183 l  759 -183 l 
-692 0 l  p
-782 -248 m  987 -248 l  924 -416 l  905 -467 891 -509 881 -541 ct 873 -503 863 -464 849 -426 ct 
-p ef
-1661 -212 m  1741 -192 l  1724 -126 1694 -76 1650 -41 ct 1607 -6 1553 10 1490 10 ct 
-1425 10 1372 -2 1331 -29 ct 1290 -56 1259 -94 1238 -145 ct 1216 -195 1206 -249 1206 -307 ct 
-1206 -370 1218 -425 1242 -472 ct 1266 -519 1300 -554 1345 -579 ct 1389 -603 1438 -615 1491 -615 ct 
-1552 -615 1603 -600 1644 -569 ct 1686 -538 1714 -495 1731 -439 ct 1652 -420 l 
-1638 -465 1617 -497 1591 -517 ct 1564 -537 1530 -547 1490 -547 ct 1443 -547 1404 -536 1373 -513 ct 
-1342 -491 1320 -461 1307 -424 ct 1295 -386 1288 -347 1288 -307 ct 1288 -256 1296 -211 1311 -172 ct 
-1326 -134 1349 -105 1381 -86 ct 1412 -67 1447 -58 1484 -58 ct 1529 -58 1567 -71 1598 -97 ct 
-1629 -122 l  1650 -161 l  p ef
-pom
-gr
-0.996 c 19984 10478 m  18926 9525 l  16809 9525 l  16809 11430 l  18926 11430 l 
-19984 10478 l  p ef
-0.000 c 19984 10478 m  18926 9525 l  16809 9525 l  16809 11430 l  18926 11430 l 
-19984 10478 l  pc
-gs
-pum
-17489 10768 t
--1 0 m  231 -605 l  317 -605 l  565 0 l  474 0 l  403 -183 l  150 -183 l 
-83 0 l  p
-173 -248 m  378 -248 l  315 -416 l  296 -467 282 -509 272 -541 ct 264 -503 254 -464 240 -426 ct 
-p ef
-621 0 m  621 -605 l  829 -605 l  876 -605 912 -602 937 -596 ct 972 -588 1001 -574 1026 -553 ct 
-1058 -526 1082 -492 1098 -450 ct 1114 -408 1121 -360 1121 -306 ct 1121 -260 1116 -219 1105 -183 ct 
-1095 -148 1081 -118 1064 -95 ct 1047 -72 1029 -54 1009 -40 ct 989 -27 965 -17 937 -10 ct 
-908 -3 876 0 839 0 ct p
-701 -71 m  830 -71 l  870 -71 901 -75 924 -82 ct 947 -90 965 -100 979 -114 ct 
-998 -133 1012 -158 1023 -190 ct 1034 -222 1039 -261 1039 -307 ct 1039 -370 1028 -419 1008 -453 ct 
-987 -487 962 -510 932 -521 ct 910 -530 876 -534 828 -534 ct 701 -534 l  p ef
-1661 -212 m  1741 -192 l  1724 -126 1694 -76 1650 -41 ct 1607 -6 1553 10 1490 10 ct 
-1425 10 1372 -2 1331 -29 ct 1290 -56 1259 -94 1238 -145 ct 1216 -195 1206 -249 1206 -307 ct 
-1206 -370 1218 -425 1242 -472 ct 1266 -519 1300 -554 1345 -579 ct 1389 -603 1438 -615 1491 -615 ct 
-1552 -615 1603 -600 1644 -569 ct 1686 -538 1714 -495 1731 -439 ct 1652 -420 l 
-1638 -465 1617 -497 1591 -517 ct 1564 -537 1530 -547 1490 -547 ct 1443 -547 1404 -536 1373 -513 ct 
-1342 -491 1320 -461 1307 -424 ct 1295 -386 1288 -347 1288 -307 ct 1288 -256 1296 -211 1311 -172 ct 
-1326 -134 1349 -105 1381 -86 ct 1412 -67 1447 -58 1484 -58 ct 1529 -58 1567 -71 1598 -97 ct 
-1629 -122 l  1650 -161 l  p ef
-pom
-gr
-0.996 c 19984 14618 m  18926 13665 l  16809 13665 l  16809 15570 l  18926 15570 l 
-19984 14618 l  p ef
-0.000 c 19984 14618 m  18926 13665 l  16809 13665 l  16809 15570 l  18926 15570 l 
-19984 14618 l  pc
-gs
-pum
-17489 14896 t
-65 0 m  65 -605 l  273 -605 l  320 -605 356 -602 381 -596 ct 416 -588 445 -574 470 -553 ct 
-502 -526 526 -492 542 -450 ct 558 -408 565 -360 565 -306 ct 565 -260 560 -219 549 -183 ct 
-539 -148 525 -118 508 -95 ct 491 -72 473 -54 453 -40 ct 433 -27 409 -17 381 -10 ct 
-352 -3 320 0 283 0 ct p
-145 -71 m  274 -71 l  314 -71 345 -75 368 -82 ct 391 -90 409 -100 423 -114 ct 
-442 -133 456 -158 467 -190 ct 478 -222 483 -261 483 -307 ct 483 -370 472 -419 452 -453 ct 
-431 -487 406 -510 376 -521 ct 354 -530 320 -534 272 -534 ct 145 -534 l  p ef
-608 0 m  840 -605 l  926 -605 l  1174 0 l  1083 0 l  1012 -183 l  759 -183 l 
-692 0 l  p
-782 -248 m  987 -248 l  924 -416 l  905 -467 891 -509 881 -541 ct 873 -503 863 -464 849 -426 ct 
-p ef
-1661 -212 m  1741 -192 l  1724 -126 1694 -76 1650 -41 ct 1607 -6 1553 10 1490 10 ct 
-1425 10 1372 -2 1331 -29 ct 1290 -56 1259 -94 1238 -145 ct 1216 -195 1206 -249 1206 -307 ct 
-1206 -370 1218 -425 1242 -472 ct 1266 -519 1300 -554 1345 -579 ct 1389 -603 1438 -615 1491 -615 ct 
-1552 -615 1603 -600 1644 -569 ct 1686 -538 1714 -495 1731 -439 ct 1652 -420 l 
-1638 -465 1617 -497 1591 -517 ct 1564 -537 1530 -547 1490 -547 ct 1443 -547 1404 -536 1373 -513 ct 
-1342 -491 1320 -461 1307 -424 ct 1295 -386 1288 -347 1288 -307 ct 1288 -256 1296 -211 1311 -172 ct 
-1326 -134 1349 -105 1381 -86 ct 1412 -67 1447 -58 1484 -58 ct 1529 -58 1567 -71 1598 -97 ct 
-1629 -122 l  1650 -161 l  p ef
-pom
-gr
-23767 18828 m  20592 18828 l  20592 13113 l  26942 13113 l  26942 18828 l 
-23767 18828 l  pc
-gs
-pum
-22133 15795 t
-219 0 m  219 -534 l  19 -534 l  19 -605 l  499 -605 l  499 -534 l  299 -534 l 
-299 0 l  p ef
-583 0 m  583 -438 l  650 -438 l  650 -372 l  667 -403 683 -423 698 -433 ct 
-712 -443 728 -448 745 -448 ct 770 -448 796 -440 822 -424 ct 796 -355 l  778 -366 760 -371 742 -371 ct 
-725 -371 711 -366 698 -357 ct 685 -347 676 -333 670 -316 ct 662 -289 658 -261 658 -229 ct 
-658 0 l  p ef
-1162 -54 m  1134 -30 1108 -14 1082 -4 ct 1057 5 1029 9 1000 9 ct 952 9 915 -1 889 -25 ct 
-863 -48 850 -79 850 -115 ct 850 -137 855 -156 865 -174 ct 875 -192 887 -206 903 -217 ct 
-919 -228 937 -236 957 -241 ct 971 -245 993 -249 1023 -252 ct 1083 -259 1127 -268 1155 -278 ct 
-1156 -288 1156 -295 1156 -297 ct 1156 -328 1149 -349 1135 -361 ct 1116 -378 1087 -387 1050 -387 ct 
-1015 -387 989 -380 973 -368 ct 956 -356 944 -334 936 -303 ct 863 -313 l  869 -344 880 -369 896 -388 ct 
-911 -408 933 -422 961 -433 ct 990 -443 1023 -448 1061 -448 ct 1098 -448 1129 -444 1152 -435 ct 
-1175 -426 1193 -415 1204 -402 ct 1215 -388 1222 -371 1227 -351 ct 1229 -338 1231 -316 1231 -282 ct 
-1231 -183 l  1231 -114 1232 -70 1235 -52 ct 1238 -34 1245 -16 1254 0 ct 1176 0 l 
-1169 -15 l  1164 -33 l  p
-1155 -220 m  1128 -209 1088 -199 1034 -192 ct 1003 -187 982 -182 969 -177 ct 
-956 -171 947 -163 940 -153 ct 933 -142 929 -130 929 -117 ct 929 -97 937 -81 952 -68 ct 
-967 -54 989 -48 1018 -48 ct 1046 -48 1072 -54 1094 -67 ct 1117 -79 1133 -96 1143 -118 ct 
-1151 -135 1155 -160 1155 -192 ct p ef
-1325 0 m  1325 -438 l  1392 -438 l  1392 -376 l  1424 -424 1471 -448 1532 -448 ct 
-1558 -448 1583 -443 1605 -434 ct 1627 -424 1643 -412 1654 -396 ct 1666 -381 1673 -363 1678 -342 ct 
-1680 -328 1682 -304 1682 -269 ct 1682 0 l  1607 0 l  1607 -266 l  1607 -297 1605 -319 1599 -334 ct 
-1593 -349 1583 -361 1568 -370 ct 1553 -379 1536 -384 1516 -384 ct 1484 -384 1457 -374 1434 -354 ct 
-1411 -333 1400 -295 1400 -239 ct 1400 0 l  p ef
-1772 -130 m  1845 -142 l  1849 -113 1861 -90 1880 -74 ct 1898 -59 1925 -51 1959 -51 ct 
-1993 -51 2018 -58 2035 -72 ct 2051 -85 2059 -102 2059 -121 ct 2059 -137 2052 -151 2038 -160 ct 
-2027 -167 2002 -175 1962 -185 ct 1907 -199 1869 -211 1848 -221 ct 1827 -231 1811 -245 1800 -263 ct 
-1789 -281 1784 -300 1784 -322 ct 1784 -341 1788 -359 1797 -376 ct 1806 -393 1818 -407 1834 -418 ct 
-1845 -426 1861 -433 1881 -439 ct 1901 -445 1923 -448 1945 -448 ct 1980 -448 2010 -443 2036 -433 ct 
-2062 -423 2081 -410 2094 -393 ct 2106 -376 2115 -353 2119 -325 ct 2047 -315 l 
-2043 -338 2034 -355 2018 -368 ct 2002 -381 1980 -387 1951 -387 ct 1917 -387 1892 -381 1878 -370 ct 
-1863 -359 1856 -346 1856 -330 ct 1856 -321 1859 -312 1865 -304 ct 1871 -296 1880 -290 1893 -285 ct 
-1901 -282 1923 -275 1959 -266 ct 2012 -251 2048 -240 2069 -231 ct 2090 -222 2106 -209 2118 -192 ct 
-2130 -175 2136 -154 2136 -128 ct 2136 -104 2129 -80 2114 -58 ct 2100 -36 2079 -20 2052 -8 ct 
-2024 3 1993 9 1959 9 ct 1902 9 1859 -1 1829 -25 ct 1799 -49 l  1780 -84 l  p ef
-2198 0 m  2198 -438 l  2265 -438 l  2265 -377 l  2279 -398 2297 -415 2320 -428 ct 
-2343 -442 2369 -448 2398 -448 ct 2430 -448 2457 -441 2478 -428 ct 2499 -414 2513 -396 2522 -371 ct 
-2556 -423 2602 -448 2657 -448 ct 2701 -448 2734 -436 2758 -412 ct 2781 -388 2793 -351 2793 -301 ct 
-2793 0 l  2719 0 l  2719 -276 l  2719 -306 2716 -327 2712 -340 ct 2707 -353 2698 -364 2685 -372 ct 
-2673 -380 2658 -384 2641 -384 ct 2610 -384 2584 -373 2564 -353 ct 2543 -332 2533 -300 2533 -254 ct 
-2533 0 l  2459 0 l  2459 -285 l  2459 -318 2453 -342 2441 -359 ct 2429 -375 2409 -384 2381 -384 ct 
-2360 -384 2341 -378 2323 -367 ct 2305 -356 2293 -340 2285 -319 ct 2277 -298 2273 -267 2273 -227 ct 
-2273 0 l  p ef
-2914 -520 m  2914 -605 l  2988 -605 l  2988 -520 l  p
-2914 0 m  2914 -438 l  2988 -438 l  2988 0 l  p ef
-3261 -66 m  3271 0 l  3250 3 3232 5 3215 5 ct 3188 5 3167 1 3152 -7 ct 3138 -15 3127 -26 3121 -40 ct 
-3115 -54 3112 -83 3112 -128 ct 3112 -380 l  3057 -380 l  3057 -438 l  3112 -438 l 
-3112 -547 l  3186 -591 l  3186 -438 l  3261 -438 l  3261 -380 l  3186 -380 l 
-3186 -124 l  3186 -103 3187 -89 3190 -83 ct 3192 -77 3197 -72 3203 -68 ct 3208 -65 3217 -63 3228 -63 ct 
-3236 -63 l  3247 -64 l  p ef
-pom
-pum
-20955 16748 t
-65 0 m  65 -605 l  273 -605 l  320 -605 356 -602 381 -596 ct 416 -588 445 -574 470 -553 ct 
-502 -526 526 -492 542 -450 ct 558 -408 565 -360 565 -306 ct 565 -260 560 -219 549 -183 ct 
-539 -148 525 -118 508 -95 ct 491 -72 473 -54 453 -40 ct 433 -27 409 -17 381 -10 ct 
-352 -3 320 0 283 0 ct p
-145 -71 m  274 -71 l  314 -71 345 -75 368 -82 ct 391 -90 409 -100 423 -114 ct 
-442 -133 456 -158 467 -190 ct 478 -222 483 -261 483 -307 ct 483 -370 472 -419 452 -453 ct 
-431 -487 406 -510 376 -521 ct 354 -530 320 -534 272 -534 ct 145 -534 l  p ef
-951 -54 m  923 -30 897 -14 871 -4 ct 846 5 818 9 789 9 ct 741 9 704 -1 678 -25 ct 
-652 -48 639 -79 639 -115 ct 639 -137 644 -156 654 -174 ct 664 -192 676 -206 692 -217 ct 
-708 -228 726 -236 746 -241 ct 760 -245 782 -249 812 -252 ct 872 -259 916 -268 944 -278 ct 
-945 -288 945 -295 945 -297 ct 945 -328 938 -349 924 -361 ct 905 -378 876 -387 839 -387 ct 
-804 -387 778 -380 762 -368 ct 745 -356 733 -334 725 -303 ct 652 -313 l  658 -344 669 -369 685 -388 ct 
-700 -408 722 -422 750 -433 ct 779 -443 812 -448 850 -448 ct 887 -448 918 -444 941 -435 ct 
-964 -426 982 -415 993 -402 ct 1004 -388 1011 -371 1016 -351 ct 1018 -338 1020 -316 1020 -282 ct 
-1020 -183 l  1020 -114 1021 -70 1024 -52 ct 1027 -34 1034 -16 1043 0 ct 965 0 l 
-958 -15 l  953 -33 l  p
-944 -220 m  917 -209 877 -199 823 -192 ct 792 -187 771 -182 758 -177 ct 745 -171 736 -163 729 -153 ct 
-722 -142 718 -130 718 -117 ct 718 -97 726 -81 741 -68 ct 756 -54 778 -48 807 -48 ct 
-835 -48 861 -54 883 -67 ct 906 -79 922 -96 932 -118 ct 940 -135 944 -160 944 -192 ct 
-p ef
-1401 0 m  1401 -64 l  1367 -14 1320 9 1262 9 ct 1236 9 1212 4 1189 -4 ct 1167 -14 1150 -27 1139 -42 ct 
-1128 -57 1121 -75 1116 -97 ct 1113 -112 1112 -135 1112 -166 ct 1112 -438 l  1186 -438 l 
-1186 -195 l  1186 -156 1187 -130 1191 -116 ct 1195 -97 1205 -82 1220 -70 ct 
-1235 -59 1254 -54 1276 -54 ct 1299 -54 1320 -59 1339 -71 ct 1359 -82 1373 -98 1381 -117 ct 
-1389 -137 1393 -166 1393 -203 ct 1393 -438 l  1467 -438 l  1467 0 l  p ef
-1577 36 m  1649 47 l  1652 69 1660 85 1674 95 ct 1693 109 1718 116 1750 116 ct 
-1784 116 1811 109 1829 95 ct 1848 82 1861 62 1867 38 ct 1871 22 1873 -8 1873 -57 ct 
-1840 -19 1800 0 1751 0 ct 1691 0 1644 -21 1611 -65 ct 1578 -108 1562 -160 1562 -221 ct 
-1562 -263 1569 -302 1584 -337 ct 1600 -373 1622 -400 1650 -419 ct 1679 -438 1713 -448 1752 -448 ct 
-1804 -448 1846 -427 1880 -385 ct 1880 -438 l  1948 -438 l  1948 -59 l  1948 8 1941 57 1928 85 ct 
-1914 114 1892 136 1861 153 ct 1831 169 1794 178 1750 178 ct 1698 178 1656 166 1623 142 ct 
-1591 119 l  1576 83 l  p
-1638 -227 m  1638 -169 1650 -127 1672 -101 ct 1695 -74 1724 -61 1758 -61 ct 
-1793 -61 1821 -74 1844 -101 ct 1867 -127 1879 -168 1879 -224 ct 1879 -278 1867 -318 1843 -346 ct 
-1819 -373 1791 -387 1757 -387 ct 1724 -387 1696 -373 1673 -346 ct 1650 -319 l 
-1638 -280 l  p ef
-2066 0 m  2066 -605 l  2141 -605 l  2141 -388 l  2175 -428 2219 -448 2272 -448 ct 
-2304 -448 2333 -442 2357 -429 ct 2381 -416 2398 -398 2408 -376 ct 2418 -353 2424 -320 2424 -278 ct 
-2424 0 l  2349 0 l  2349 -278 l  2349 -315 2341 -342 2325 -359 ct 2309 -376 2286 -384 2257 -384 ct 
-2235 -384 2214 -378 2195 -367 ct 2175 -356 2161 -340 2153 -320 ct 2145 -301 2141 -274 2141 -240 ct 
-2141 0 l  p ef
-2705 -66 m  2715 0 l  2694 3 2676 5 2659 5 ct 2632 5 2611 1 2596 -7 ct 2582 -15 2571 -26 2565 -40 ct 
-2559 -54 2556 -83 2556 -128 ct 2556 -380 l  2501 -380 l  2501 -438 l  2556 -438 l 
-2556 -547 l  2630 -591 l  2630 -438 l  2705 -438 l  2705 -380 l  2630 -380 l 
-2630 -124 l  2630 -103 2631 -89 2634 -83 ct 2636 -77 2641 -72 2647 -68 ct 2652 -65 2661 -63 2672 -63 ct 
-2680 -63 l  2691 -64 l  p ef
-3081 -141 m  3157 -131 l  3145 -86 3123 -52 3090 -27 ct 3057 -2 3015 9 2965 9 ct 
-2900 9 2849 -9 2812 -49 ct 2774 -88 2755 -144 2755 -215 ct 2755 -289 2774 -346 2812 -387 ct 
-2851 -428 2900 -448 2960 -448 ct 3019 -448 3067 -428 3104 -388 ct 3141 -348 3160 -292 3160 -220 ct 
-3160 -215 3160 -209 3159 -200 ct 2832 -200 l  2835 -152 2849 -115 2873 -89 ct 
-2898 -64 2928 -51 2965 -51 ct 2992 -51 3015 -58 3035 -72 ct 3054 -87 l  3069 -109 l 
-p
-2836 -261 m  3081 -261 l  3078 -298 3069 -326 3053 -344 ct 3030 -373 2999 -387 2961 -387 ct 
-2927 -387 2898 -376 2875 -353 ct 2852 -330 l  2839 -299 l  p ef
-3255 0 m  3255 -438 l  3322 -438 l  3322 -372 l  3339 -403 3355 -423 3370 -433 ct 
-3384 -443 3400 -448 3417 -448 ct 3442 -448 3468 -440 3494 -424 ct 3468 -355 l 
-3450 -366 3432 -371 3414 -371 ct 3397 -371 3383 -366 3370 -357 ct 3357 -347 3348 -333 3342 -316 ct 
-3334 -289 3330 -261 3330 -229 ct 3330 0 l  p ef
-3617 0 m  3548 0 l  3548 -605 l  3622 -605 l  3622 -389 l  3654 -428 3694 -448 3742 -448 ct 
-3769 -448 3795 -443 3819 -432 ct 3843 -421 3863 -406 3879 -386 ct 3894 -366 3906 -343 3915 -315 ct 
-3924 -287 3928 -257 3928 -225 ct 3928 -150 3910 -92 3873 -51 ct 3835 -10 3791 9 3739 9 ct 
-3687 9 3646 -11 3617 -54 ct p
-3616 -222 m  3616 -170 3623 -132 3638 -108 ct 3661 -70 3693 -51 3733 -51 ct 
-3765 -51 3793 -65 3817 -93 ct 3840 -121 3852 -163 3852 -219 ct 3852 -277 3841 -319 3818 -346 ct 
-3796 -373 3768 -387 3736 -387 ct 3703 -387 3675 -373 3652 -345 ct 3628 -316 l 
-3616 -276 l  p ef
-3970 -219 m  3970 -300 3992 -360 4037 -399 ct 4075 -432 4121 -448 4175 -448 ct 
-4236 -448 4285 -428 4323 -389 ct 4361 -349 4381 -295 4381 -225 ct 4381 -169 4372 -124 4355 -92 ct 
-4338 -59 4314 -34 4281 -16 ct 4249 0 4214 9 4175 9 ct 4114 9 4064 -9 4026 -49 ct 
-3989 -88 l  3970 -145 l  p
-4046 -219 m  4046 -163 4058 -121 4083 -93 ct 4107 -65 4138 -51 4175 -51 ct 4212 -51 4243 -65 4267 -93 ct 
-4292 -121 4304 -164 4304 -221 ct 4304 -276 4292 -317 4267 -345 ct 4243 -373 4212 -387 4175 -387 ct 
-4138 -387 4107 -373 4083 -345 ct 4058 -317 l  4046 -275 l  p ef
-4761 -54 m  4733 -30 4707 -14 4681 -4 ct 4656 5 4628 9 4599 9 ct 4551 9 4514 -1 4488 -25 ct 
-4462 -48 4449 -79 4449 -115 ct 4449 -137 4454 -156 4464 -174 ct 4474 -192 4486 -206 4502 -217 ct 
-4518 -228 4536 -236 4556 -241 ct 4570 -245 4592 -249 4622 -252 ct 4682 -259 4726 -268 4754 -278 ct 
-4755 -288 4755 -295 4755 -297 ct 4755 -328 4748 -349 4734 -361 ct 4715 -378 4686 -387 4649 -387 ct 
-4614 -387 4588 -380 4572 -368 ct 4555 -356 4543 -334 4535 -303 ct 4462 -313 l 
-4468 -344 4479 -369 4495 -388 ct 4510 -408 4532 -422 4560 -433 ct 4589 -443 4622 -448 4660 -448 ct 
-4697 -448 4728 -444 4751 -435 ct 4774 -426 4792 -415 4803 -402 ct 4814 -388 4821 -371 4826 -351 ct 
-4828 -338 4830 -316 4830 -282 ct 4830 -183 l  4830 -114 4831 -70 4834 -52 ct 
-4837 -34 4844 -16 4853 0 ct 4775 0 l  4768 -15 l  4763 -33 l  p
-4754 -220 m  4727 -209 4687 -199 4633 -192 ct 4602 -187 4581 -182 4568 -177 ct 
-4555 -171 4546 -163 4539 -153 ct 4532 -142 4528 -130 4528 -117 ct 4528 -97 4536 -81 4551 -68 ct 
-4566 -54 4588 -48 4617 -48 ct 4645 -48 4671 -54 4693 -67 ct 4716 -79 4732 -96 4742 -118 ct 
-4750 -135 4754 -160 4754 -192 ct p ef
-4922 0 m  4922 -438 l  4989 -438 l  4989 -372 l  5006 -403 5022 -423 5037 -433 ct 
-5051 -443 5067 -448 5084 -448 ct 5109 -448 5135 -440 5161 -424 ct 5135 -355 l 
-5117 -366 5099 -371 5081 -371 ct 5064 -371 5050 -366 5037 -357 ct 5024 -347 5015 -333 5009 -316 ct 
-5001 -289 4997 -261 4997 -229 ct 4997 0 l  p ef
-5499 0 m  5499 -55 l  5471 -11 5430 9 5376 9 ct 5341 9 5309 0 5280 -19 ct 5250 -38 5228 -65 5212 -99 ct 
-5195 -134 5187 -174 5187 -218 ct 5187 -262 5195 -302 5209 -338 ct 5224 -373 5246 -401 5275 -420 ct 
-5304 -439 5337 -448 5373 -448 ct 5399 -448 5423 -443 5444 -431 ct 5464 -420 5481 -406 5494 -388 ct 
-5494 -605 l  5568 -605 l  5568 0 l  p
-5264 -218 m  5264 -162 5276 -120 5299 -92 ct 5323 -65 5351 -51 5383 -51 ct 5416 -51 5443 -64 5466 -91 ct 
-5489 -117 5500 -158 5500 -212 ct 5500 -272 5489 -316 5465 -344 ct 5442 -373 5414 -387 5380 -387 ct 
-5347 -387 5319 -373 5297 -346 ct 5275 -319 l  5264 -277 l  p ef
-pom
-gr
-23767 12065 m  20592 12065 l  20592 6350 l  26942 6350 l  26942 12065 l 
-23767 12065 l  pc
-gs
-pum
-22239 9022 t
-66 0 m  66 -605 l  335 -605 l  389 -605 430 -600 458 -589 ct 486 -578 508 -559 525 -531 ct 
-542 -504 550 -473 550 -440 ct 550 -397 536 -361 508 -331 ct 481 -302 438 -283 380 -275 ct 
-401 -265 417 -255 428 -245 ct 451 -223 473 -197 494 -164 ct 600 0 l  499 0 l 
-419 -125 l  395 -162 376 -190 361 -209 ct 346 -228 332 -242 320 -249 ct 308 -257 296 -263 284 -266 ct 
-275 -267 260 -268 239 -268 ct 146 -268 l  146 0 l  p
-146 -338 m  318 -338 l  355 -338 384 -342 404 -349 ct 425 -357 441 -369 451 -386 ct 
-462 -402 468 -420 468 -440 ct 468 -468 457 -492 436 -510 ct 416 -529 383 -538 338 -538 ct 
-146 -538 l  p ef
-965 -141 m  1041 -131 l  1029 -86 1007 -52 974 -27 ct 941 -2 899 9 849 9 ct 
-784 9 733 -9 696 -49 ct 658 -88 639 -144 639 -215 ct 639 -289 658 -346 696 -387 ct 
-735 -428 784 -448 844 -448 ct 903 -448 951 -428 988 -388 ct 1025 -348 1044 -292 1044 -220 ct 
-1044 -215 1044 -209 1043 -200 ct 716 -200 l  719 -152 733 -115 757 -89 ct 782 -64 812 -51 849 -51 ct 
-876 -51 899 -58 919 -72 ct 938 -87 l  953 -109 l  p
-720 -261 m  965 -261 l  962 -298 953 -326 937 -344 ct 914 -373 883 -387 845 -387 ct 
-811 -387 782 -376 759 -353 ct 736 -330 l  723 -299 l  p ef
-1427 -160 m  1500 -151 l  1492 -100 1471 -61 1438 -32 ct 1405 -4 1365 9 1317 9 ct 
-1257 9 1209 -9 1172 -48 ct 1136 -88 1118 -144 1118 -217 ct 1118 -265 1125 -306 1141 -342 ct 
-1157 -377 1181 -404 1213 -421 ct 1245 -439 1280 -448 1317 -448 ct 1365 -448 1404 -436 1434 -412 ct 
-1465 -388 1484 -354 1493 -309 ct 1420 -298 l  1413 -328 1401 -350 1384 -365 ct 
-1366 -380 1345 -387 1320 -387 ct 1283 -387 1252 -374 1229 -347 ct 1206 -320 1194 -277 1194 -219 ct 
-1194 -160 1205 -118 1228 -91 ct 1250 -64 1280 -51 1316 -51 ct 1345 -51 1370 -60 1389 -78 ct 
-1409 -95 l  1421 -123 l  p ef
-1864 -141 m  1940 -131 l  1928 -86 1906 -52 1873 -27 ct 1840 -2 1798 9 1748 9 ct 
-1683 9 1632 -9 1595 -49 ct 1557 -88 1538 -144 1538 -215 ct 1538 -289 1557 -346 1595 -387 ct 
-1634 -428 1683 -448 1743 -448 ct 1802 -448 1850 -428 1887 -388 ct 1924 -348 1943 -292 1943 -220 ct 
-1943 -215 1943 -209 1942 -200 ct 1615 -200 l  1618 -152 1632 -115 1656 -89 ct 
-1681 -64 1711 -51 1748 -51 ct 1775 -51 1798 -58 1818 -72 ct 1837 -87 l  1852 -109 l 
-p
-1619 -261 m  1864 -261 l  1861 -298 1852 -326 1836 -344 ct 1813 -373 1782 -387 1744 -387 ct 
-1710 -387 1681 -376 1658 -353 ct 1635 -330 l  1622 -299 l  p ef
-2040 -520 m  2040 -605 l  2114 -605 l  2114 -520 l  p
-2040 0 m  2040 -438 l  2114 -438 l  2114 0 l  p ef
-2347 0 m  2180 -438 l  2259 -438 l  2353 -175 l  2363 -147 2372 -118 2381 -87 ct 
-2388 -110 2397 -138 2409 -171 ct 2506 -438 l  2583 -438 l  2417 0 l  p ef
-2949 -141 m  3025 -131 l  3013 -86 2991 -52 2958 -27 ct 2925 -2 2883 9 2833 9 ct 
-2768 9 2717 -9 2680 -49 ct 2642 -88 2623 -144 2623 -215 ct 2623 -289 2642 -346 2680 -387 ct 
-2719 -428 2768 -448 2828 -448 ct 2887 -448 2935 -428 2972 -388 ct 3009 -348 3028 -292 3028 -220 ct 
-3028 -215 3028 -209 3027 -200 ct 2700 -200 l  2703 -152 2717 -115 2741 -89 ct 
-2766 -64 2796 -51 2833 -51 ct 2860 -51 2883 -58 2903 -72 ct 2922 -87 l  2937 -109 l 
-p
-2704 -261 m  2949 -261 l  2946 -298 2937 -326 2921 -344 ct 2898 -373 2867 -387 2829 -387 ct 
-2795 -387 2766 -376 2743 -353 ct 2720 -330 l  2707 -299 l  p ef
-pom
-pum
-20955 9975 t
-65 0 m  65 -605 l  273 -605 l  320 -605 356 -602 381 -596 ct 416 -588 445 -574 470 -553 ct 
-502 -526 526 -492 542 -450 ct 558 -408 565 -360 565 -306 ct 565 -260 560 -219 549 -183 ct 
-539 -148 525 -118 508 -95 ct 491 -72 473 -54 453 -40 ct 433 -27 409 -17 381 -10 ct 
-352 -3 320 0 283 0 ct p
-145 -71 m  274 -71 l  314 -71 345 -75 368 -82 ct 391 -90 409 -100 423 -114 ct 
-442 -133 456 -158 467 -190 ct 478 -222 483 -261 483 -307 ct 483 -370 472 -419 452 -453 ct 
-431 -487 406 -510 376 -521 ct 354 -530 320 -534 272 -534 ct 145 -534 l  p ef
-951 -54 m  923 -30 897 -14 871 -4 ct 846 5 818 9 789 9 ct 741 9 704 -1 678 -25 ct 
-652 -48 639 -79 639 -115 ct 639 -137 644 -156 654 -174 ct 664 -192 676 -206 692 -217 ct 
-708 -228 726 -236 746 -241 ct 760 -245 782 -249 812 -252 ct 872 -259 916 -268 944 -278 ct 
-945 -288 945 -295 945 -297 ct 945 -328 938 -349 924 -361 ct 905 -378 876 -387 839 -387 ct 
-804 -387 778 -380 762 -368 ct 745 -356 733 -334 725 -303 ct 652 -313 l  658 -344 669 -369 685 -388 ct 
-700 -408 722 -422 750 -433 ct 779 -443 812 -448 850 -448 ct 887 -448 918 -444 941 -435 ct 
-964 -426 982 -415 993 -402 ct 1004 -388 1011 -371 1016 -351 ct 1018 -338 1020 -316 1020 -282 ct 
-1020 -183 l  1020 -114 1021 -70 1024 -52 ct 1027 -34 1034 -16 1043 0 ct 965 0 l 
-958 -15 l  953 -33 l  p
-944 -220 m  917 -209 877 -199 823 -192 ct 792 -187 771 -182 758 -177 ct 745 -171 736 -163 729 -153 ct 
-722 -142 718 -130 718 -117 ct 718 -97 726 -81 741 -68 ct 756 -54 778 -48 807 -48 ct 
-835 -48 861 -54 883 -67 ct 906 -79 922 -96 932 -118 ct 940 -135 944 -160 944 -192 ct 
-p ef
-1401 0 m  1401 -64 l  1367 -14 1320 9 1262 9 ct 1236 9 1212 4 1189 -4 ct 1167 -14 1150 -27 1139 -42 ct 
-1128 -57 1121 -75 1116 -97 ct 1113 -112 1112 -135 1112 -166 ct 1112 -438 l  1186 -438 l 
-1186 -195 l  1186 -156 1187 -130 1191 -116 ct 1195 -97 1205 -82 1220 -70 ct 
-1235 -59 1254 -54 1276 -54 ct 1299 -54 1320 -59 1339 -71 ct 1359 -82 1373 -98 1381 -117 ct 
-1389 -137 1393 -166 1393 -203 ct 1393 -438 l  1467 -438 l  1467 0 l  p ef
-1577 36 m  1649 47 l  1652 69 1660 85 1674 95 ct 1693 109 1718 116 1750 116 ct 
-1784 116 1811 109 1829 95 ct 1848 82 1861 62 1867 38 ct 1871 22 1873 -8 1873 -57 ct 
-1840 -19 1800 0 1751 0 ct 1691 0 1644 -21 1611 -65 ct 1578 -108 1562 -160 1562 -221 ct 
-1562 -263 1569 -302 1584 -337 ct 1600 -373 1622 -400 1650 -419 ct 1679 -438 1713 -448 1752 -448 ct 
-1804 -448 1846 -427 1880 -385 ct 1880 -438 l  1948 -438 l  1948 -59 l  1948 8 1941 57 1928 85 ct 
-1914 114 1892 136 1861 153 ct 1831 169 1794 178 1750 178 ct 1698 178 1656 166 1623 142 ct 
-1591 119 l  1576 83 l  p
-1638 -227 m  1638 -169 1650 -127 1672 -101 ct 1695 -74 1724 -61 1758 -61 ct 
-1793 -61 1821 -74 1844 -101 ct 1867 -127 1879 -168 1879 -224 ct 1879 -278 1867 -318 1843 -346 ct 
-1819 -373 1791 -387 1757 -387 ct 1724 -387 1696 -373 1673 -346 ct 1650 -319 l 
-1638 -280 l  p ef
-2066 0 m  2066 -605 l  2141 -605 l  2141 -388 l  2175 -428 2219 -448 2272 -448 ct 
-2304 -448 2333 -442 2357 -429 ct 2381 -416 2398 -398 2408 -376 ct 2418 -353 2424 -320 2424 -278 ct 
-2424 0 l  2349 0 l  2349 -278 l  2349 -315 2341 -342 2325 -359 ct 2309 -376 2286 -384 2257 -384 ct 
-2235 -384 2214 -378 2195 -367 ct 2175 -356 2161 -340 2153 -320 ct 2145 -301 2141 -274 2141 -240 ct 
-2141 0 l  p ef
-2705 -66 m  2715 0 l  2694 3 2676 5 2659 5 ct 2632 5 2611 1 2596 -7 ct 2582 -15 2571 -26 2565 -40 ct 
-2559 -54 2556 -83 2556 -128 ct 2556 -380 l  2501 -380 l  2501 -438 l  2556 -438 l 
-2556 -547 l  2630 -591 l  2630 -438 l  2705 -438 l  2705 -380 l  2630 -380 l 
-2630 -124 l  2630 -103 2631 -89 2634 -83 ct 2636 -77 2641 -72 2647 -68 ct 2652 -65 2661 -63 2672 -63 ct 
-2680 -63 l  2691 -64 l  p ef
-3081 -141 m  3157 -131 l  3145 -86 3123 -52 3090 -27 ct 3057 -2 3015 9 2965 9 ct 
-2900 9 2849 -9 2812 -49 ct 2774 -88 2755 -144 2755 -215 ct 2755 -289 2774 -346 2812 -387 ct 
-2851 -428 2900 -448 2960 -448 ct 3019 -448 3067 -428 3104 -388 ct 3141 -348 3160 -292 3160 -220 ct 
-3160 -215 3160 -209 3159 -200 ct 2832 -200 l  2835 -152 2849 -115 2873 -89 ct 
-2898 -64 2928 -51 2965 -51 ct 2992 -51 3015 -58 3035 -72 ct 3054 -87 l  3069 -109 l 
-p
-2836 -261 m  3081 -261 l  3078 -298 3069 -326 3053 -344 ct 3030 -373 2999 -387 2961 -387 ct 
-2927 -387 2898 -376 2875 -353 ct 2852 -330 l  2839 -299 l  p ef
-3255 0 m  3255 -438 l  3322 -438 l  3322 -372 l  3339 -403 3355 -423 3370 -433 ct 
-3384 -443 3400 -448 3417 -448 ct 3442 -448 3468 -440 3494 -424 ct 3468 -355 l 
-3450 -366 3432 -371 3414 -371 ct 3397 -371 3383 -366 3370 -357 ct 3357 -347 3348 -333 3342 -316 ct 
-3334 -289 3330 -261 3330 -229 ct 3330 0 l  p ef
-3617 0 m  3548 0 l  3548 -605 l  3622 -605 l  3622 -389 l  3654 -428 3694 -448 3742 -448 ct 
-3769 -448 3795 -443 3819 -432 ct 3843 -421 3863 -406 3879 -386 ct 3894 -366 3906 -343 3915 -315 ct 
-3924 -287 3928 -257 3928 -225 ct 3928 -150 3910 -92 3873 -51 ct 3835 -10 3791 9 3739 9 ct 
-3687 9 3646 -11 3617 -54 ct p
-3616 -222 m  3616 -170 3623 -132 3638 -108 ct 3661 -70 3693 -51 3733 -51 ct 
-3765 -51 3793 -65 3817 -93 ct 3840 -121 3852 -163 3852 -219 ct 3852 -277 3841 -319 3818 -346 ct 
-3796 -373 3768 -387 3736 -387 ct 3703 -387 3675 -373 3652 -345 ct 3628 -316 l 
-3616 -276 l  p ef
-3970 -219 m  3970 -300 3992 -360 4037 -399 ct 4075 -432 4121 -448 4175 -448 ct 
-4236 -448 4285 -428 4323 -389 ct 4361 -349 4381 -295 4381 -225 ct 4381 -169 4372 -124 4355 -92 ct 
-4338 -59 4314 -34 4281 -16 ct 4249 0 4214 9 4175 9 ct 4114 9 4064 -9 4026 -49 ct 
-3989 -88 l  3970 -145 l  p
-4046 -219 m  4046 -163 4058 -121 4083 -93 ct 4107 -65 4138 -51 4175 -51 ct 4212 -51 4243 -65 4267 -93 ct 
-4292 -121 4304 -164 4304 -221 ct 4304 -276 4292 -317 4267 -345 ct 4243 -373 4212 -387 4175 -387 ct 
-4138 -387 4107 -373 4083 -345 ct 4058 -317 l  4046 -275 l  p ef
-4761 -54 m  4733 -30 4707 -14 4681 -4 ct 4656 5 4628 9 4599 9 ct 4551 9 4514 -1 4488 -25 ct 
-4462 -48 4449 -79 4449 -115 ct 4449 -137 4454 -156 4464 -174 ct 4474 -192 4486 -206 4502 -217 ct 
-4518 -228 4536 -236 4556 -241 ct 4570 -245 4592 -249 4622 -252 ct 4682 -259 4726 -268 4754 -278 ct 
-4755 -288 4755 -295 4755 -297 ct 4755 -328 4748 -349 4734 -361 ct 4715 -378 4686 -387 4649 -387 ct 
-4614 -387 4588 -380 4572 -368 ct 4555 -356 4543 -334 4535 -303 ct 4462 -313 l 
-4468 -344 4479 -369 4495 -388 ct 4510 -408 4532 -422 4560 -433 ct 4589 -443 4622 -448 4660 -448 ct 
-4697 -448 4728 -444 4751 -435 ct 4774 -426 4792 -415 4803 -402 ct 4814 -388 4821 -371 4826 -351 ct 
-4828 -338 4830 -316 4830 -282 ct 4830 -183 l  4830 -114 4831 -70 4834 -52 ct 
-4837 -34 4844 -16 4853 0 ct 4775 0 l  4768 -15 l  4763 -33 l  p
-4754 -220 m  4727 -209 4687 -199 4633 -192 ct 4602 -187 4581 -182 4568 -177 ct 
-4555 -171 4546 -163 4539 -153 ct 4532 -142 4528 -130 4528 -117 ct 4528 -97 4536 -81 4551 -68 ct 
-4566 -54 4588 -48 4617 -48 ct 4645 -48 4671 -54 4693 -67 ct 4716 -79 4732 -96 4742 -118 ct 
-4750 -135 4754 -160 4754 -192 ct p ef
-4922 0 m  4922 -438 l  4989 -438 l  4989 -372 l  5006 -403 5022 -423 5037 -433 ct 
-5051 -443 5067 -448 5084 -448 ct 5109 -448 5135 -440 5161 -424 ct 5135 -355 l 
-5117 -366 5099 -371 5081 -371 ct 5064 -371 5050 -366 5037 -357 ct 5024 -347 5015 -333 5009 -316 ct 
-5001 -289 4997 -261 4997 -229 ct 4997 0 l  p ef
-5499 0 m  5499 -55 l  5471 -11 5430 9 5376 9 ct 5341 9 5309 0 5280 -19 ct 5250 -38 5228 -65 5212 -99 ct 
-5195 -134 5187 -174 5187 -218 ct 5187 -262 5195 -302 5209 -338 ct 5224 -373 5246 -401 5275 -420 ct 
-5304 -439 5337 -448 5373 -448 ct 5399 -448 5423 -443 5444 -431 ct 5464 -420 5481 -406 5494 -388 ct 
-5494 -605 l  5568 -605 l  5568 0 l  p
-5264 -218 m  5264 -162 5276 -120 5299 -92 ct 5323 -65 5351 -51 5383 -51 ct 5416 -51 5443 -64 5466 -91 ct 
-5489 -117 5500 -158 5500 -212 ct 5500 -272 5489 -316 5465 -344 ct 5442 -373 5414 -387 5380 -387 ct 
-5347 -387 5319 -373 5297 -346 ct 5275 -319 l  5264 -277 l  p ef
-pom
-gr
-4245 18828 m  1070 18828 l  1070 13113 l  7420 13113 l  7420 18828 l  4245 18828 l 
-pc
-gs
-pum
-2607 15795 t
-219 0 m  219 -534 l  19 -534 l  19 -605 l  499 -605 l  499 -534 l  299 -534 l 
-299 0 l  p ef
-583 0 m  583 -438 l  650 -438 l  650 -372 l  667 -403 683 -423 698 -433 ct 
-712 -443 728 -448 745 -448 ct 770 -448 796 -440 822 -424 ct 796 -355 l  778 -366 760 -371 742 -371 ct 
-725 -371 711 -366 698 -357 ct 685 -347 676 -333 670 -316 ct 662 -289 658 -261 658 -229 ct 
-658 0 l  p ef
-1162 -54 m  1134 -30 1108 -14 1082 -4 ct 1057 5 1029 9 1000 9 ct 952 9 915 -1 889 -25 ct 
-863 -48 850 -79 850 -115 ct 850 -137 855 -156 865 -174 ct 875 -192 887 -206 903 -217 ct 
-919 -228 937 -236 957 -241 ct 971 -245 993 -249 1023 -252 ct 1083 -259 1127 -268 1155 -278 ct 
-1156 -288 1156 -295 1156 -297 ct 1156 -328 1149 -349 1135 -361 ct 1116 -378 1087 -387 1050 -387 ct 
-1015 -387 989 -380 973 -368 ct 956 -356 944 -334 936 -303 ct 863 -313 l  869 -344 880 -369 896 -388 ct 
-911 -408 933 -422 961 -433 ct 990 -443 1023 -448 1061 -448 ct 1098 -448 1129 -444 1152 -435 ct 
-1175 -426 1193 -415 1204 -402 ct 1215 -388 1222 -371 1227 -351 ct 1229 -338 1231 -316 1231 -282 ct 
-1231 -183 l  1231 -114 1232 -70 1235 -52 ct 1238 -34 1245 -16 1254 0 ct 1176 0 l 
-1169 -15 l  1164 -33 l  p
-1155 -220 m  1128 -209 1088 -199 1034 -192 ct 1003 -187 982 -182 969 -177 ct 
-956 -171 947 -163 940 -153 ct 933 -142 929 -130 929 -117 ct 929 -97 937 -81 952 -68 ct 
-967 -54 989 -48 1018 -48 ct 1046 -48 1072 -54 1094 -67 ct 1117 -79 1133 -96 1143 -118 ct 
-1151 -135 1155 -160 1155 -192 ct p ef
-1325 0 m  1325 -438 l  1392 -438 l  1392 -376 l  1424 -424 1471 -448 1532 -448 ct 
-1558 -448 1583 -443 1605 -434 ct 1627 -424 1643 -412 1654 -396 ct 1666 -381 1673 -363 1678 -342 ct 
-1680 -328 1682 -304 1682 -269 ct 1682 0 l  1607 0 l  1607 -266 l  1607 -297 1605 -319 1599 -334 ct 
-1593 -349 1583 -361 1568 -370 ct 1553 -379 1536 -384 1516 -384 ct 1484 -384 1457 -374 1434 -354 ct 
-1411 -333 1400 -295 1400 -239 ct 1400 0 l  p ef
-1772 -130 m  1845 -142 l  1849 -113 1861 -90 1880 -74 ct 1898 -59 1925 -51 1959 -51 ct 
-1993 -51 2018 -58 2035 -72 ct 2051 -85 2059 -102 2059 -121 ct 2059 -137 2052 -151 2038 -160 ct 
-2027 -167 2002 -175 1962 -185 ct 1907 -199 1869 -211 1848 -221 ct 1827 -231 1811 -245 1800 -263 ct 
-1789 -281 1784 -300 1784 -322 ct 1784 -341 1788 -359 1797 -376 ct 1806 -393 1818 -407 1834 -418 ct 
-1845 -426 1861 -433 1881 -439 ct 1901 -445 1923 -448 1945 -448 ct 1980 -448 2010 -443 2036 -433 ct 
-2062 -423 2081 -410 2094 -393 ct 2106 -376 2115 -353 2119 -325 ct 2047 -315 l 
-2043 -338 2034 -355 2018 -368 ct 2002 -381 1980 -387 1951 -387 ct 1917 -387 1892 -381 1878 -370 ct 
-1863 -359 1856 -346 1856 -330 ct 1856 -321 1859 -312 1865 -304 ct 1871 -296 1880 -290 1893 -285 ct 
-1901 -282 1923 -275 1959 -266 ct 2012 -251 2048 -240 2069 -231 ct 2090 -222 2106 -209 2118 -192 ct 
-2130 -175 2136 -154 2136 -128 ct 2136 -104 2129 -80 2114 -58 ct 2100 -36 2079 -20 2052 -8 ct 
-2024 3 1993 9 1959 9 ct 1902 9 1859 -1 1829 -25 ct 1799 -49 l  1780 -84 l  p ef
-2198 0 m  2198 -438 l  2265 -438 l  2265 -377 l  2279 -398 2297 -415 2320 -428 ct 
-2343 -442 2369 -448 2398 -448 ct 2430 -448 2457 -441 2478 -428 ct 2499 -414 2513 -396 2522 -371 ct 
-2556 -423 2602 -448 2657 -448 ct 2701 -448 2734 -436 2758 -412 ct 2781 -388 2793 -351 2793 -301 ct 
-2793 0 l  2719 0 l  2719 -276 l  2719 -306 2716 -327 2712 -340 ct 2707 -353 2698 -364 2685 -372 ct 
-2673 -380 2658 -384 2641 -384 ct 2610 -384 2584 -373 2564 -353 ct 2543 -332 2533 -300 2533 -254 ct 
-2533 0 l  2459 0 l  2459 -285 l  2459 -318 2453 -342 2441 -359 ct 2429 -375 2409 -384 2381 -384 ct 
-2360 -384 2341 -378 2323 -367 ct 2305 -356 2293 -340 2285 -319 ct 2277 -298 2273 -267 2273 -227 ct 
-2273 0 l  p ef
-2914 -520 m  2914 -605 l  2988 -605 l  2988 -520 l  p
-2914 0 m  2914 -438 l  2988 -438 l  2988 0 l  p ef
-3261 -66 m  3271 0 l  3250 3 3232 5 3215 5 ct 3188 5 3167 1 3152 -7 ct 3138 -15 3127 -26 3121 -40 ct 
-3115 -54 3112 -83 3112 -128 ct 3112 -380 l  3057 -380 l  3057 -438 l  3112 -438 l 
-3112 -547 l  3186 -591 l  3186 -438 l  3261 -438 l  3261 -380 l  3186 -380 l 
-3186 -124 l  3186 -103 3187 -89 3190 -83 ct 3192 -77 3197 -72 3203 -68 ct 3208 -65 3217 -63 3228 -63 ct 
-3236 -63 l  3247 -64 l  p ef
-pom
-pum
-1429 16748 t
-65 0 m  65 -605 l  273 -605 l  320 -605 356 -602 381 -596 ct 416 -588 445 -574 470 -553 ct 
-502 -526 526 -492 542 -450 ct 558 -408 565 -360 565 -306 ct 565 -260 560 -219 549 -183 ct 
-539 -148 525 -118 508 -95 ct 491 -72 473 -54 453 -40 ct 433 -27 409 -17 381 -10 ct 
-352 -3 320 0 283 0 ct p
-145 -71 m  274 -71 l  314 -71 345 -75 368 -82 ct 391 -90 409 -100 423 -114 ct 
-442 -133 456 -158 467 -190 ct 478 -222 483 -261 483 -307 ct 483 -370 472 -419 452 -453 ct 
-431 -487 406 -510 376 -521 ct 354 -530 320 -534 272 -534 ct 145 -534 l  p ef
-951 -54 m  923 -30 897 -14 871 -4 ct 846 5 818 9 789 9 ct 741 9 704 -1 678 -25 ct 
-652 -48 639 -79 639 -115 ct 639 -137 644 -156 654 -174 ct 664 -192 676 -206 692 -217 ct 
-708 -228 726 -236 746 -241 ct 760 -245 782 -249 812 -252 ct 872 -259 916 -268 944 -278 ct 
-945 -288 945 -295 945 -297 ct 945 -328 938 -349 924 -361 ct 905 -378 876 -387 839 -387 ct 
-804 -387 778 -380 762 -368 ct 745 -356 733 -334 725 -303 ct 652 -313 l  658 -344 669 -369 685 -388 ct 
-700 -408 722 -422 750 -433 ct 779 -443 812 -448 850 -448 ct 887 -448 918 -444 941 -435 ct 
-964 -426 982 -415 993 -402 ct 1004 -388 1011 -371 1016 -351 ct 1018 -338 1020 -316 1020 -282 ct 
-1020 -183 l  1020 -114 1021 -70 1024 -52 ct 1027 -34 1034 -16 1043 0 ct 965 0 l 
-958 -15 l  953 -33 l  p
-944 -220 m  917 -209 877 -199 823 -192 ct 792 -187 771 -182 758 -177 ct 745 -171 736 -163 729 -153 ct 
-722 -142 718 -130 718 -117 ct 718 -97 726 -81 741 -68 ct 756 -54 778 -48 807 -48 ct 
-835 -48 861 -54 883 -67 ct 906 -79 922 -96 932 -118 ct 940 -135 944 -160 944 -192 ct 
-p ef
-1401 0 m  1401 -64 l  1367 -14 1320 9 1262 9 ct 1236 9 1212 4 1189 -4 ct 1167 -14 1150 -27 1139 -42 ct 
-1128 -57 1121 -75 1116 -97 ct 1113 -112 1112 -135 1112 -166 ct 1112 -438 l  1186 -438 l 
-1186 -195 l  1186 -156 1187 -130 1191 -116 ct 1195 -97 1205 -82 1220 -70 ct 
-1235 -59 1254 -54 1276 -54 ct 1299 -54 1320 -59 1339 -71 ct 1359 -82 1373 -98 1381 -117 ct 
-1389 -137 1393 -166 1393 -203 ct 1393 -438 l  1467 -438 l  1467 0 l  p ef
-1577 36 m  1649 47 l  1652 69 1660 85 1674 95 ct 1693 109 1718 116 1750 116 ct 
-1784 116 1811 109 1829 95 ct 1848 82 1861 62 1867 38 ct 1871 22 1873 -8 1873 -57 ct 
-1840 -19 1800 0 1751 0 ct 1691 0 1644 -21 1611 -65 ct 1578 -108 1562 -160 1562 -221 ct 
-1562 -263 1569 -302 1584 -337 ct 1600 -373 1622 -400 1650 -419 ct 1679 -438 1713 -448 1752 -448 ct 
-1804 -448 1846 -427 1880 -385 ct 1880 -438 l  1948 -438 l  1948 -59 l  1948 8 1941 57 1928 85 ct 
-1914 114 1892 136 1861 153 ct 1831 169 1794 178 1750 178 ct 1698 178 1656 166 1623 142 ct 
-1591 119 l  1576 83 l  p
-1638 -227 m  1638 -169 1650 -127 1672 -101 ct 1695 -74 1724 -61 1758 -61 ct 
-1793 -61 1821 -74 1844 -101 ct 1867 -127 1879 -168 1879 -224 ct 1879 -278 1867 -318 1843 -346 ct 
-1819 -373 1791 -387 1757 -387 ct 1724 -387 1696 -373 1673 -346 ct 1650 -319 l 
-1638 -280 l  p ef
-2066 0 m  2066 -605 l  2141 -605 l  2141 -388 l  2175 -428 2219 -448 2272 -448 ct 
-2304 -448 2333 -442 2357 -429 ct 2381 -416 2398 -398 2408 -376 ct 2418 -353 2424 -320 2424 -278 ct 
-2424 0 l  2349 0 l  2349 -278 l  2349 -315 2341 -342 2325 -359 ct 2309 -376 2286 -384 2257 -384 ct 
-2235 -384 2214 -378 2195 -367 ct 2175 -356 2161 -340 2153 -320 ct 2145 -301 2141 -274 2141 -240 ct 
-2141 0 l  p ef
-2705 -66 m  2715 0 l  2694 3 2676 5 2659 5 ct 2632 5 2611 1 2596 -7 ct 2582 -15 2571 -26 2565 -40 ct 
-2559 -54 2556 -83 2556 -128 ct 2556 -380 l  2501 -380 l  2501 -438 l  2556 -438 l 
-2556 -547 l  2630 -591 l  2630 -438 l  2705 -438 l  2705 -380 l  2630 -380 l 
-2630 -124 l  2630 -103 2631 -89 2634 -83 ct 2636 -77 2641 -72 2647 -68 ct 2652 -65 2661 -63 2672 -63 ct 
-2680 -63 l  2691 -64 l  p ef
-3081 -141 m  3157 -131 l  3145 -86 3123 -52 3090 -27 ct 3057 -2 3015 9 2965 9 ct 
-2900 9 2849 -9 2812 -49 ct 2774 -88 2755 -144 2755 -215 ct 2755 -289 2774 -346 2812 -387 ct 
-2851 -428 2900 -448 2960 -448 ct 3019 -448 3067 -428 3104 -388 ct 3141 -348 3160 -292 3160 -220 ct 
-3160 -215 3160 -209 3159 -200 ct 2832 -200 l  2835 -152 2849 -115 2873 -89 ct 
-2898 -64 2928 -51 2965 -51 ct 2992 -51 3015 -58 3035 -72 ct 3054 -87 l  3069 -109 l 
-p
-2836 -261 m  3081 -261 l  3078 -298 3069 -326 3053 -344 ct 3030 -373 2999 -387 2961 -387 ct 
-2927 -387 2898 -376 2875 -353 ct 2852 -330 l  2839 -299 l  p ef
-3255 0 m  3255 -438 l  3322 -438 l  3322 -372 l  3339 -403 3355 -423 3370 -433 ct 
-3384 -443 3400 -448 3417 -448 ct 3442 -448 3468 -440 3494 -424 ct 3468 -355 l 
-3450 -366 3432 -371 3414 -371 ct 3397 -371 3383 -366 3370 -357 ct 3357 -347 3348 -333 3342 -316 ct 
-3334 -289 3330 -261 3330 -229 ct 3330 0 l  p ef
-3617 0 m  3548 0 l  3548 -605 l  3622 -605 l  3622 -389 l  3654 -428 3694 -448 3742 -448 ct 
-3769 -448 3795 -443 3819 -432 ct 3843 -421 3863 -406 3879 -386 ct 3894 -366 3906 -343 3915 -315 ct 
-3924 -287 3928 -257 3928 -225 ct 3928 -150 3910 -92 3873 -51 ct 3835 -10 3791 9 3739 9 ct 
-3687 9 3646 -11 3617 -54 ct p
-3616 -222 m  3616 -170 3623 -132 3638 -108 ct 3661 -70 3693 -51 3733 -51 ct 
-3765 -51 3793 -65 3817 -93 ct 3840 -121 3852 -163 3852 -219 ct 3852 -277 3841 -319 3818 -346 ct 
-3796 -373 3768 -387 3736 -387 ct 3703 -387 3675 -373 3652 -345 ct 3628 -316 l 
-3616 -276 l  p ef
-3970 -219 m  3970 -300 3992 -360 4037 -399 ct 4075 -432 4121 -448 4175 -448 ct 
-4236 -448 4285 -428 4323 -389 ct 4361 -349 4381 -295 4381 -225 ct 4381 -169 4372 -124 4355 -92 ct 
-4338 -59 4314 -34 4281 -16 ct 4249 0 4214 9 4175 9 ct 4114 9 4064 -9 4026 -49 ct 
-3989 -88 l  3970 -145 l  p
-4046 -219 m  4046 -163 4058 -121 4083 -93 ct 4107 -65 4138 -51 4175 -51 ct 4212 -51 4243 -65 4267 -93 ct 
-4292 -121 4304 -164 4304 -221 ct 4304 -276 4292 -317 4267 -345 ct 4243 -373 4212 -387 4175 -387 ct 
-4138 -387 4107 -373 4083 -345 ct 4058 -317 l  4046 -275 l  p ef
-4761 -54 m  4733 -30 4707 -14 4681 -4 ct 4656 5 4628 9 4599 9 ct 4551 9 4514 -1 4488 -25 ct 
-4462 -48 4449 -79 4449 -115 ct 4449 -137 4454 -156 4464 -174 ct 4474 -192 4486 -206 4502 -217 ct 
-4518 -228 4536 -236 4556 -241 ct 4570 -245 4592 -249 4622 -252 ct 4682 -259 4726 -268 4754 -278 ct 
-4755 -288 4755 -295 4755 -297 ct 4755 -328 4748 -349 4734 -361 ct 4715 -378 4686 -387 4649 -387 ct 
-4614 -387 4588 -380 4572 -368 ct 4555 -356 4543 -334 4535 -303 ct 4462 -313 l 
-4468 -344 4479 -369 4495 -388 ct 4510 -408 4532 -422 4560 -433 ct 4589 -443 4622 -448 4660 -448 ct 
-4697 -448 4728 -444 4751 -435 ct 4774 -426 4792 -415 4803 -402 ct 4814 -388 4821 -371 4826 -351 ct 
-4828 -338 4830 -316 4830 -282 ct 4830 -183 l  4830 -114 4831 -70 4834 -52 ct 
-4837 -34 4844 -16 4853 0 ct 4775 0 l  4768 -15 l  4763 -33 l  p
-4754 -220 m  4727 -209 4687 -199 4633 -192 ct 4602 -187 4581 -182 4568 -177 ct 
-4555 -171 4546 -163 4539 -153 ct 4532 -142 4528 -130 4528 -117 ct 4528 -97 4536 -81 4551 -68 ct 
-4566 -54 4588 -48 4617 -48 ct 4645 -48 4671 -54 4693 -67 ct 4716 -79 4732 -96 4742 -118 ct 
-4750 -135 4754 -160 4754 -192 ct p ef
-4922 0 m  4922 -438 l  4989 -438 l  4989 -372 l  5006 -403 5022 -423 5037 -433 ct 
-5051 -443 5067 -448 5084 -448 ct 5109 -448 5135 -440 5161 -424 ct 5135 -355 l 
-5117 -366 5099 -371 5081 -371 ct 5064 -371 5050 -366 5037 -357 ct 5024 -347 5015 -333 5009 -316 ct 
-5001 -289 4997 -261 4997 -229 ct 4997 0 l  p ef
-5499 0 m  5499 -55 l  5471 -11 5430 9 5376 9 ct 5341 9 5309 0 5280 -19 ct 5250 -38 5228 -65 5212 -99 ct 
-5195 -134 5187 -174 5187 -218 ct 5187 -262 5195 -302 5209 -338 ct 5224 -373 5246 -401 5275 -420 ct 
-5304 -439 5337 -448 5373 -448 ct 5399 -448 5423 -443 5444 -431 ct 5464 -420 5481 -406 5494 -388 ct 
-5494 -605 l  5568 -605 l  5568 0 l  p
-5264 -218 m  5264 -162 5276 -120 5299 -92 ct 5323 -65 5351 -51 5383 -51 ct 5416 -51 5443 -64 5466 -91 ct 
-5489 -117 5500 -158 5500 -212 ct 5500 -272 5489 -316 5465 -344 ct 5442 -373 5414 -387 5380 -387 ct 
-5347 -387 5319 -373 5297 -346 ct 5275 -319 l  5264 -277 l  p ef
-pom
-gr
-4245 12065 m  1070 12065 l  1070 6350 l  7420 6350 l  7420 12065 l  4245 12065 l 
-pc
-gs
-pum
-2713 9022 t
-66 0 m  66 -605 l  335 -605 l  389 -605 430 -600 458 -589 ct 486 -578 508 -559 525 -531 ct 
-542 -504 550 -473 550 -440 ct 550 -397 536 -361 508 -331 ct 481 -302 438 -283 380 -275 ct 
-401 -265 417 -255 428 -245 ct 451 -223 473 -197 494 -164 ct 600 0 l  499 0 l 
-419 -125 l  395 -162 376 -190 361 -209 ct 346 -228 332 -242 320 -249 ct 308 -257 296 -263 284 -266 ct 
-275 -267 260 -268 239 -268 ct 146 -268 l  146 0 l  p
-146 -338 m  318 -338 l  355 -338 384 -342 404 -349 ct 425 -357 441 -369 451 -386 ct 
-462 -402 468 -420 468 -440 ct 468 -468 457 -492 436 -510 ct 416 -529 383 -538 338 -538 ct 
-146 -538 l  p ef
-965 -141 m  1041 -131 l  1029 -86 1007 -52 974 -27 ct 941 -2 899 9 849 9 ct 
-784 9 733 -9 696 -49 ct 658 -88 639 -144 639 -215 ct 639 -289 658 -346 696 -387 ct 
-735 -428 784 -448 844 -448 ct 903 -448 951 -428 988 -388 ct 1025 -348 1044 -292 1044 -220 ct 
-1044 -215 1044 -209 1043 -200 ct 716 -200 l  719 -152 733 -115 757 -89 ct 782 -64 812 -51 849 -51 ct 
-876 -51 899 -58 919 -72 ct 938 -87 l  953 -109 l  p
-720 -261 m  965 -261 l  962 -298 953 -326 937 -344 ct 914 -373 883 -387 845 -387 ct 
-811 -387 782 -376 759 -353 ct 736 -330 l  723 -299 l  p ef
-1427 -160 m  1500 -151 l  1492 -100 1471 -61 1438 -32 ct 1405 -4 1365 9 1317 9 ct 
-1257 9 1209 -9 1172 -48 ct 1136 -88 1118 -144 1118 -217 ct 1118 -265 1125 -306 1141 -342 ct 
-1157 -377 1181 -404 1213 -421 ct 1245 -439 1280 -448 1317 -448 ct 1365 -448 1404 -436 1434 -412 ct 
-1465 -388 1484 -354 1493 -309 ct 1420 -298 l  1413 -328 1401 -350 1384 -365 ct 
-1366 -380 1345 -387 1320 -387 ct 1283 -387 1252 -374 1229 -347 ct 1206 -320 1194 -277 1194 -219 ct 
-1194 -160 1205 -118 1228 -91 ct 1250 -64 1280 -51 1316 -51 ct 1345 -51 1370 -60 1389 -78 ct 
-1409 -95 l  1421 -123 l  p ef
-1864 -141 m  1940 -131 l  1928 -86 1906 -52 1873 -27 ct 1840 -2 1798 9 1748 9 ct 
-1683 9 1632 -9 1595 -49 ct 1557 -88 1538 -144 1538 -215 ct 1538 -289 1557 -346 1595 -387 ct 
-1634 -428 1683 -448 1743 -448 ct 1802 -448 1850 -428 1887 -388 ct 1924 -348 1943 -292 1943 -220 ct 
-1943 -215 1943 -209 1942 -200 ct 1615 -200 l  1618 -152 1632 -115 1656 -89 ct 
-1681 -64 1711 -51 1748 -51 ct 1775 -51 1798 -58 1818 -72 ct 1837 -87 l  1852 -109 l 
-p
-1619 -261 m  1864 -261 l  1861 -298 1852 -326 1836 -344 ct 1813 -373 1782 -387 1744 -387 ct 
-1710 -387 1681 -376 1658 -353 ct 1635 -330 l  1622 -299 l  p ef
-2040 -520 m  2040 -605 l  2114 -605 l  2114 -520 l  p
-2040 0 m  2040 -438 l  2114 -438 l  2114 0 l  p ef
-2347 0 m  2180 -438 l  2259 -438 l  2353 -175 l  2363 -147 2372 -118 2381 -87 ct 
-2388 -110 2397 -138 2409 -171 ct 2506 -438 l  2583 -438 l  2417 0 l  p ef
-2949 -141 m  3025 -131 l  3013 -86 2991 -52 2958 -27 ct 2925 -2 2883 9 2833 9 ct 
-2768 9 2717 -9 2680 -49 ct 2642 -88 2623 -144 2623 -215 ct 2623 -289 2642 -346 2680 -387 ct 
-2719 -428 2768 -448 2828 -448 ct 2887 -448 2935 -428 2972 -388 ct 3009 -348 3028 -292 3028 -220 ct 
-3028 -215 3028 -209 3027 -200 ct 2700 -200 l  2703 -152 2717 -115 2741 -89 ct 
-2766 -64 2796 -51 2833 -51 ct 2860 -51 2883 -58 2903 -72 ct 2922 -87 l  2937 -109 l 
-p
-2704 -261 m  2949 -261 l  2946 -298 2937 -326 2921 -344 ct 2898 -373 2867 -387 2829 -387 ct 
-2795 -387 2766 -376 2743 -353 ct 2720 -330 l  2707 -299 l  p ef
-pom
-pum
-1429 9975 t
-65 0 m  65 -605 l  273 -605 l  320 -605 356 -602 381 -596 ct 416 -588 445 -574 470 -553 ct 
-502 -526 526 -492 542 -450 ct 558 -408 565 -360 565 -306 ct 565 -260 560 -219 549 -183 ct 
-539 -148 525 -118 508 -95 ct 491 -72 473 -54 453 -40 ct 433 -27 409 -17 381 -10 ct 
-352 -3 320 0 283 0 ct p
-145 -71 m  274 -71 l  314 -71 345 -75 368 -82 ct 391 -90 409 -100 423 -114 ct 
-442 -133 456 -158 467 -190 ct 478 -222 483 -261 483 -307 ct 483 -370 472 -419 452 -453 ct 
-431 -487 406 -510 376 -521 ct 354 -530 320 -534 272 -534 ct 145 -534 l  p ef
-951 -54 m  923 -30 897 -14 871 -4 ct 846 5 818 9 789 9 ct 741 9 704 -1 678 -25 ct 
-652 -48 639 -79 639 -115 ct 639 -137 644 -156 654 -174 ct 664 -192 676 -206 692 -217 ct 
-708 -228 726 -236 746 -241 ct 760 -245 782 -249 812 -252 ct 872 -259 916 -268 944 -278 ct 
-945 -288 945 -295 945 -297 ct 945 -328 938 -349 924 -361 ct 905 -378 876 -387 839 -387 ct 
-804 -387 778 -380 762 -368 ct 745 -356 733 -334 725 -303 ct 652 -313 l  658 -344 669 -369 685 -388 ct 
-700 -408 722 -422 750 -433 ct 779 -443 812 -448 850 -448 ct 887 -448 918 -444 941 -435 ct 
-964 -426 982 -415 993 -402 ct 1004 -388 1011 -371 1016 -351 ct 1018 -338 1020 -316 1020 -282 ct 
-1020 -183 l  1020 -114 1021 -70 1024 -52 ct 1027 -34 1034 -16 1043 0 ct 965 0 l 
-958 -15 l  953 -33 l  p
-944 -220 m  917 -209 877 -199 823 -192 ct 792 -187 771 -182 758 -177 ct 745 -171 736 -163 729 -153 ct 
-722 -142 718 -130 718 -117 ct 718 -97 726 -81 741 -68 ct 756 -54 778 -48 807 -48 ct 
-835 -48 861 -54 883 -67 ct 906 -79 922 -96 932 -118 ct 940 -135 944 -160 944 -192 ct 
-p ef
-1401 0 m  1401 -64 l  1367 -14 1320 9 1262 9 ct 1236 9 1212 4 1189 -4 ct 1167 -14 1150 -27 1139 -42 ct 
-1128 -57 1121 -75 1116 -97 ct 1113 -112 1112 -135 1112 -166 ct 1112 -438 l  1186 -438 l 
-1186 -195 l  1186 -156 1187 -130 1191 -116 ct 1195 -97 1205 -82 1220 -70 ct 
-1235 -59 1254 -54 1276 -54 ct 1299 -54 1320 -59 1339 -71 ct 1359 -82 1373 -98 1381 -117 ct 
-1389 -137 1393 -166 1393 -203 ct 1393 -438 l  1467 -438 l  1467 0 l  p ef
-1577 36 m  1649 47 l  1652 69 1660 85 1674 95 ct 1693 109 1718 116 1750 116 ct 
-1784 116 1811 109 1829 95 ct 1848 82 1861 62 1867 38 ct 1871 22 1873 -8 1873 -57 ct 
-1840 -19 1800 0 1751 0 ct 1691 0 1644 -21 1611 -65 ct 1578 -108 1562 -160 1562 -221 ct 
-1562 -263 1569 -302 1584 -337 ct 1600 -373 1622 -400 1650 -419 ct 1679 -438 1713 -448 1752 -448 ct 
-1804 -448 1846 -427 1880 -385 ct 1880 -438 l  1948 -438 l  1948 -59 l  1948 8 1941 57 1928 85 ct 
-1914 114 1892 136 1861 153 ct 1831 169 1794 178 1750 178 ct 1698 178 1656 166 1623 142 ct 
-1591 119 l  1576 83 l  p
-1638 -227 m  1638 -169 1650 -127 1672 -101 ct 1695 -74 1724 -61 1758 -61 ct 
-1793 -61 1821 -74 1844 -101 ct 1867 -127 1879 -168 1879 -224 ct 1879 -278 1867 -318 1843 -346 ct 
-1819 -373 1791 -387 1757 -387 ct 1724 -387 1696 -373 1673 -346 ct 1650 -319 l 
-1638 -280 l  p ef
-2066 0 m  2066 -605 l  2141 -605 l  2141 -388 l  2175 -428 2219 -448 2272 -448 ct 
-2304 -448 2333 -442 2357 -429 ct 2381 -416 2398 -398 2408 -376 ct 2418 -353 2424 -320 2424 -278 ct 
-2424 0 l  2349 0 l  2349 -278 l  2349 -315 2341 -342 2325 -359 ct 2309 -376 2286 -384 2257 -384 ct 
-2235 -384 2214 -378 2195 -367 ct 2175 -356 2161 -340 2153 -320 ct 2145 -301 2141 -274 2141 -240 ct 
-2141 0 l  p ef
-2705 -66 m  2715 0 l  2694 3 2676 5 2659 5 ct 2632 5 2611 1 2596 -7 ct 2582 -15 2571 -26 2565 -40 ct 
-2559 -54 2556 -83 2556 -128 ct 2556 -380 l  2501 -380 l  2501 -438 l  2556 -438 l 
-2556 -547 l  2630 -591 l  2630 -438 l  2705 -438 l  2705 -380 l  2630 -380 l 
-2630 -124 l  2630 -103 2631 -89 2634 -83 ct 2636 -77 2641 -72 2647 -68 ct 2652 -65 2661 -63 2672 -63 ct 
-2680 -63 l  2691 -64 l  p ef
-3081 -141 m  3157 -131 l  3145 -86 3123 -52 3090 -27 ct 3057 -2 3015 9 2965 9 ct 
-2900 9 2849 -9 2812 -49 ct 2774 -88 2755 -144 2755 -215 ct 2755 -289 2774 -346 2812 -387 ct 
-2851 -428 2900 -448 2960 -448 ct 3019 -448 3067 -428 3104 -388 ct 3141 -348 3160 -292 3160 -220 ct 
-3160 -215 3160 -209 3159 -200 ct 2832 -200 l  2835 -152 2849 -115 2873 -89 ct 
-2898 -64 2928 -51 2965 -51 ct 2992 -51 3015 -58 3035 -72 ct 3054 -87 l  3069 -109 l 
-p
-2836 -261 m  3081 -261 l  3078 -298 3069 -326 3053 -344 ct 3030 -373 2999 -387 2961 -387 ct 
-2927 -387 2898 -376 2875 -353 ct 2852 -330 l  2839 -299 l  p ef
-3255 0 m  3255 -438 l  3322 -438 l  3322 -372 l  3339 -403 3355 -423 3370 -433 ct 
-3384 -443 3400 -448 3417 -448 ct 3442 -448 3468 -440 3494 -424 ct 3468 -355 l 
-3450 -366 3432 -371 3414 -371 ct 3397 -371 3383 -366 3370 -357 ct 3357 -347 3348 -333 3342 -316 ct 
-3334 -289 3330 -261 3330 -229 ct 3330 0 l  p ef
-3617 0 m  3548 0 l  3548 -605 l  3622 -605 l  3622 -389 l  3654 -428 3694 -448 3742 -448 ct 
-3769 -448 3795 -443 3819 -432 ct 3843 -421 3863 -406 3879 -386 ct 3894 -366 3906 -343 3915 -315 ct 
-3924 -287 3928 -257 3928 -225 ct 3928 -150 3910 -92 3873 -51 ct 3835 -10 3791 9 3739 9 ct 
-3687 9 3646 -11 3617 -54 ct p
-3616 -222 m  3616 -170 3623 -132 3638 -108 ct 3661 -70 3693 -51 3733 -51 ct 
-3765 -51 3793 -65 3817 -93 ct 3840 -121 3852 -163 3852 -219 ct 3852 -277 3841 -319 3818 -346 ct 
-3796 -373 3768 -387 3736 -387 ct 3703 -387 3675 -373 3652 -345 ct 3628 -316 l 
-3616 -276 l  p ef
-3970 -219 m  3970 -300 3992 -360 4037 -399 ct 4075 -432 4121 -448 4175 -448 ct 
-4236 -448 4285 -428 4323 -389 ct 4361 -349 4381 -295 4381 -225 ct 4381 -169 4372 -124 4355 -92 ct 
-4338 -59 4314 -34 4281 -16 ct 4249 0 4214 9 4175 9 ct 4114 9 4064 -9 4026 -49 ct 
-3989 -88 l  3970 -145 l  p
-4046 -219 m  4046 -163 4058 -121 4083 -93 ct 4107 -65 4138 -51 4175 -51 ct 4212 -51 4243 -65 4267 -93 ct 
-4292 -121 4304 -164 4304 -221 ct 4304 -276 4292 -317 4267 -345 ct 4243 -373 4212 -387 4175 -387 ct 
-4138 -387 4107 -373 4083 -345 ct 4058 -317 l  4046 -275 l  p ef
-4761 -54 m  4733 -30 4707 -14 4681 -4 ct 4656 5 4628 9 4599 9 ct 4551 9 4514 -1 4488 -25 ct 
-4462 -48 4449 -79 4449 -115 ct 4449 -137 4454 -156 4464 -174 ct 4474 -192 4486 -206 4502 -217 ct 
-4518 -228 4536 -236 4556 -241 ct 4570 -245 4592 -249 4622 -252 ct 4682 -259 4726 -268 4754 -278 ct 
-4755 -288 4755 -295 4755 -297 ct 4755 -328 4748 -349 4734 -361 ct 4715 -378 4686 -387 4649 -387 ct 
-4614 -387 4588 -380 4572 -368 ct 4555 -356 4543 -334 4535 -303 ct 4462 -313 l 
-4468 -344 4479 -369 4495 -388 ct 4510 -408 4532 -422 4560 -433 ct 4589 -443 4622 -448 4660 -448 ct 
-4697 -448 4728 -444 4751 -435 ct 4774 -426 4792 -415 4803 -402 ct 4814 -388 4821 -371 4826 -351 ct 
-4828 -338 4830 -316 4830 -282 ct 4830 -183 l  4830 -114 4831 -70 4834 -52 ct 
-4837 -34 4844 -16 4853 0 ct 4775 0 l  4768 -15 l  4763 -33 l  p
-4754 -220 m  4727 -209 4687 -199 4633 -192 ct 4602 -187 4581 -182 4568 -177 ct 
-4555 -171 4546 -163 4539 -153 ct 4532 -142 4528 -130 4528 -117 ct 4528 -97 4536 -81 4551 -68 ct 
-4566 -54 4588 -48 4617 -48 ct 4645 -48 4671 -54 4693 -67 ct 4716 -79 4732 -96 4742 -118 ct 
-4750 -135 4754 -160 4754 -192 ct p ef
-4922 0 m  4922 -438 l  4989 -438 l  4989 -372 l  5006 -403 5022 -423 5037 -433 ct 
-5051 -443 5067 -448 5084 -448 ct 5109 -448 5135 -440 5161 -424 ct 5135 -355 l 
-5117 -366 5099 -371 5081 -371 ct 5064 -371 5050 -366 5037 -357 ct 5024 -347 5015 -333 5009 -316 ct 
-5001 -289 4997 -261 4997 -229 ct 4997 0 l  p ef
-5499 0 m  5499 -55 l  5471 -11 5430 9 5376 9 ct 5341 9 5309 0 5280 -19 ct 5250 -38 5228 -65 5212 -99 ct 
-5195 -134 5187 -174 5187 -218 ct 5187 -262 5195 -302 5209 -338 ct 5224 -373 5246 -401 5275 -420 ct 
-5304 -439 5337 -448 5373 -448 ct 5399 -448 5423 -443 5444 -431 ct 5464 -420 5481 -406 5494 -388 ct 
-5494 -605 l  5568 -605 l  5568 0 l  p
-5264 -218 m  5264 -162 5276 -120 5299 -92 ct 5323 -65 5351 -51 5383 -51 ct 5416 -51 5443 -64 5466 -91 ct 
-5489 -117 5500 -158 5500 -212 ct 5500 -272 5489 -316 5465 -344 ct 5442 -373 5414 -387 5380 -387 ct 
-5347 -387 5319 -373 5297 -346 ct 5275 -319 l  5264 -277 l  p ef
-pom
-gr
-51 lw 13970 5080 m  13970 6350 l  ps
-11010 7920 m  11900 7920 l  ps
-11010 10460 m  11900 10460 l  ps
-11010 14605 m  11900 14605 l  ps
-11010 17245 m  11900 17245 l  ps
-7835 7955 m  7420 7955 l  ps
-7835 10460 m  7420 10460 l  ps
-7835 14605 m  7420 14605 l  ps
-7835 17245 m  7420 17245 l  ps
-16013 7955 m  16809 7955 l  ps
-19984 7920 m  20592 7920 l  ps
-19984 10460 m  20592 10460 l  ps
-16013 10495 m  16809 10495 l  ps
-16013 14605 m  16809 14605 l  ps
-16013 17245 m  16809 17245 l  ps
-19984 14605 m  20592 14605 l  ps
-19984 17245 m  20592 17245 l  ps
-gr
-0 20290 t 
-pom
-count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore
-%%PageTrailer
-%%Trailer
-%%EOF
diff --git a/usrp/doc/usrp-block-diagram.png b/usrp/doc/usrp-block-diagram.png
deleted file mode 100644
index 55a0f0b38..000000000
--- a/usrp/doc/usrp-block-diagram.png
+++ /dev/null
diff --git a/usrp/doc/usrp.jpg b/usrp/doc/usrp.jpg
deleted file mode 100644
index 0ddb59275..000000000
--- a/usrp/doc/usrp.jpg
+++ /dev/null
diff --git a/usrp/doc/usrp_guide.xml b/usrp/doc/usrp_guide.xml
deleted file mode 100644
index 7c4d5d5e8..000000000
--- a/usrp/doc/usrp_guide.xml
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-          "docbookx.dtd" [
-]>
-
-<article>
-  <articleinfo>
-  <title>USRP User's and Developer's Guide</title>
-    <author>
-      <firstname>Matt</firstname>
-      <surname>Ettus</surname>
-      <affiliation>
-	<orgname>Ettus Research LLC</orgname>
-	<address>
-	  Ettus Research LLC
-	  <street>604 Mariposa Ave</street>
-	  <city>Mountain View</city>, <state>CA</state> <postcode>94041</postcode>
-	  <country>USA</country>
-	  <email>matt@ettus.com</email>
-	</address>
-      </affiliation>
-    </author>
-    
-    <abstract>
-      <para>
-	This guide explains both basic usage of the USRP as well as how to expand it.
-      </para>
-    </abstract>
-    
-  </articleinfo>
-  
-  <sect1 id="intro">
-    <title>Introduction</title>
-    <para>
-      The Universal Software Radio Peripheral, or USRP (pronounced "usurp") 
-      is designed to allow general purpose computers to function as high 
-      bandwidth software radios.  In essence, it serves as a digital 
-      baseband and IF section of a radio communication system.  In addition, 
-      it has a well-defined electrical and mechanical interface to RF 
-      front-ends (daughterboards) which can translate between that IF or 
-      baseband and the RF bands of interest
-    </para>
-    <para>
-      The basic design philosophy behind the USRP has been to do all of the
-      waveform-specific processing, like modulation and demodulation, on the
-      host CPU.  All of the high-speed general purpose operations like
-      digital up- and downconversion, decimation and interpolation are done
-      on the FPGA. 
-    </para>
-    <para>
-      It is anticipated that the majority of USRP users will never need to
-      use anything other than the standard FPGA configuration.  However, for
-      those users that wish to, the FPGA design may be changed or replaced.
-      All of the interfaces are well defined and documented.
-    </para>
-    <figure id="usrp-board">
-      <title>USRP with Daughterboards</title>
-      <mediaobject>
-	<imageobject><imagedata fileref="usrp.jpg" format="JPG"/></imageobject>
-	<caption><para>
-	  This USRP has 2 BasicTX and 2 BasicRX boards mounted on it.  
-	  Notice that the boards on the left are rotated 180 degrees.
-	</para></caption>
-      </mediaobject>
-    </figure>
-    
-    <sect2 id="requirements">
-      <title>System Requirements</title>
-      <para>
-	The USRP requires a PC or Mac with a USB2 interface.
-      </para>
-    </sect2>
-    
-  <sect2 id="capabilities">
-    <title>Capabilities</title>
-    <para>
-      The USRP has 4 high-speed analog to digital converters (ADCs), each at 
-      12 bits per sample, 64 million samples per second.  There are also 
-      4 high-speed digital to analog converters (DACs), each at 14 bits per 
-      sample, 128 million samples per second.  These 4 input and 4 output 
-      channels are connected to an Altera Cyclone EP1C12 FPGA.  The FPGA, in 
-      turn, connects to a USB2 interface chip, the Cypress FX2, and on to the 
-      computer.  The USRP connects to the computer via a high speed USB2 
-      interface only, and will not work with USB1.1.  
-    </para>
-    <figure id="usrp-block-diagram-fig"><title>Universal Software Radio Peripheral</title>
-    <mediaobject>
-      <imageobject><imagedata fileref="usrp-block-diagram.eps" format="EPS"/></imageobject>
-      <imageobject><imagedata fileref="usrp-block-diagram.png" format="PNG"/></imageobject>
-      <caption><para></para></caption>
-    </mediaobject>
-    </figure>
-  </sect2>
-  </sect1>
-  <sect1 id="getting-started">
-    <title>Getting Started</title>
-    <sect2 id="the-code">
-      <title>Getting all the Software</title>
-      <para>
-	The first step in using your USRP system is to get all of GNU Radio installed.  This can 
-	sometimes be a daunting process, as there are several other libraries which will need to be
-	installed first.
-      </para>
-      <sect3 id="dependencies">
-	<title>Library Dependencies</title>
-	<itemizedlist>
-	  <listitem>
-	    <para>SWIG</para>
-	    <para>
-	      We use SWIG (Simple Wrapper Interface Generator) to tie together the C++ and Python code 
-	      in the GNU Radio system.  We require that you have version 1.3.24 or newer.  You'll
-	      probably have to compile it from source, which you can find here: <ulink url="http://www.swig.org">SWIG</ulink>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>FFTW</para>
-	    <para>
-	      FFTW is the library which GNU Radio uses for FFTs.  GNU Radio requires version 3.0.1 or
-	      newer, and it must be compiled for single precision.  You can get it from the 
-	      <ulink url="http://www.fftw.org">FFTW Homepage</ulink>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>Boost Library</para>
-	    <para>
-	      Boost provides several low-level structures used in our C++ code.  If it is not included in
-	      your OS distribution, you can get it here:  <ulink url="http://boost.org">Boost</ulink>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>CPP Unit</para>
-	    <para>
-	      CPPUnit provides our unit-testing framework.  This creates automated tests to insure that 
-	      code does not break when changes are made.  Get it at the <ulink url="http://cppunit.sf.net">
-	      CPP Unit Homepage</ulink>
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </sect3>
-      <sect3 id="getting-gradio">
-	<title>Getting GNU Radio and the USRP code</title>
-	<para>
-	  There are several packages of software which make up GNU Radio and the USRP support software.
-	  Links to the latest versions of each can be found on the GNU Radio Wiki at
-	  <ulink url="http://comsec.com/wiki?GnuRadio2.X">Download Links</ulink>.  Gr-build 
-	  can greatly simplify the installation process, and its use it highly recommended.
-	</para>
-      </sect3>
-      <sect3 id="cvs">
-	<title>Following CVS Development</title>
-	<para>
-	  Development for the USRP proceeds very quickly at times, so some users may want to keep up with
-	  the latest by following the CVS trees.  There are three separate software repositories 
-	  which contain various parts of the USRP system.
-	  <itemizedlist>
-	    <listitem>
-	      <para>
-		USRP-HW, containing the hardware and FPGA designs.
-	      </para>
-	      <para>
-		All of the schematics in this repository were created in 
-		<ulink url="http://www.geda.seul.org">gEDA</ulink>.  The board 
-		layouts were created in <ulink url="http://pcb.sf.net">PCB</ulink>.  
-		Verilog designs are compiled in Quartus II Web Edition from 
-		<ulink url="http://www.altera.com">Altera</ulink>.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<ulink url="https://sourceforge.net/cvs/?group_id=22397">USRP-SW</ulink>, 
-		USRP-SW, containing firmware and host drivers for the USRP
-	      </para>
-	      <para>
-		Host side drivers and firmware which runs in the USB2 interface chip on the board.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		<ulink url="http://comsec.com/wiki?CvsAccess">GNU Radio/gr-usrp</ulink>
-		which contains the GNU Radio interface to the USRP
-	      </para>
-	    </listitem>
-	  </itemizedlist>
-	</para>
-      </sect3>
-    </sect2>
-    <sect2 id="usrp-start">
-      <title>Using your USRP</title>
-      <sect3 id="physical">
-	<title>Mechanical Connection</title>
-	<para>
-	  The USRP ships with a complete set of standoffs, nuts and bolts.  There are 20 standoffs, 
-	  M3x10mm M-F, of which 4 are intended to be used as "feet" for the USRP.  Place them in the 4
-	  corner holes on the main board, inserting the male part from below.  The remaining 16 
-	  are used to hold the daughterboards in place.  Four of them should be connected to the male 
-	  portion of the 4 standoffs already inserted from below.  The remaining 12 should be
-	  connected to the board with the 12 M3x6mm screws from below.  At this point there should be
-	  16 standoffs on the board with the male ends up to serve as a guide for the daughterboards.  
-	  The 16 M3 nuts are used to fasten the daughterboards down to the main board.
-	</para>
-	<para>
-	  The USRP accomodates 2 TX and 2 RX daughterboards.  The placement of the standoffs is designed
-	  to prevent the accidental incorrect connection of daughterboards.  The 2 sides of the USRP have 
-	  their daughterboard slots rotated 180 degrees.  The USRP should not be operated without 
-	  standoffs, and daughterboards should never be connected or removed while power is applied.
-	</para>
-      </sect3>
-      <sect3 id="electrical">
-	<title>Electrical Connections</title>
-	<para>
-	  The USRP is powered by a 6V 4A power converter included in the kit.  The converter is
-	  capable of 90-260 Vac, 50/60 Hz operation, and so should work in any country.
-	  If there is a need to use another power supply, the connector is a standard 2.1mm/5.5mm 
-	  DC power connector.  The USRP	itself only needs 5V at 2A, but a 6V supply was chosen to 
-	  accomodate future daughterboards.  Extra power supplies are available from Ettus Research.
-	</para>
-	<para>
-	  The included USB cable should be connected to a USB2-capable socket on a computer.  The USRP
-	  does not support USB 1.1 operation at this time.
-	</para>
-      </sect3>
-      <sect3 id="diagnostics">
-	<title>Troubleshooting</title>
-	<para>
-	  When first powered up, an LED on the USRP should be flashing at about 3-4x per second.
-	  This indicates that the processor is running, and has put the device in a low power mode.
-	  Once firmware has been downloaded to the USRP, the LED will blink at a slower rate.
-	  If there is no blinking LED, check all power connections, and check for continuity
-	  in the power fuse (F501, near the power connector).  If the fuse needs replacement, it
-	  is size 0603, 3 amps.
-	</para>
-      </sect3>
-    </sect2>
-  </sect1>
-  <sect1 id="fpga">
-    <title>FPGA</title>
-    <sect2 id="fpga-std">
-      <title>Standard FPGA Configuration</title>
-      <para>
-	In the standard fpga configuration, usrp_std, all samples sent over
-	the USB interface are in 16-bit signed integers in IQ format.  When
-	there are multiple channels (up to 4), the channels are interleaved.
-	For example, with 4 channels, the sequence would be I0 Q0 I1 Q1 I2 Q2
-	I3 Q3 I0 Q0, etc.
-      </para>  
-      <para>
-	The USRP can operate in full duplex mode.  When in this mode, the
-	transmit and receive sides are completely independent of one another.
-	The only consideration is that the combined data rate over the bus
-	must be 32 Megabytes per second or less.  The multiple RX channels
-	(1,2, or 4) must all be the same data rate (i.e. same decimation
-	ratio).  The same applies to the 1,2, or TX channels, which each must
-	be at the same data rate (which may be different from the RX rate).
-      </para>
-      <para>
-	On the RX side, each of the 4 ADCs can be routed to either of I or the
-	Q input of any of the 4 downconverters.  This allows for having
-	multiple channels selected out of the same ADC sample stream.
-      </para>
-      <para>
-	The digital upconverters (DUCs) on the transmit side are actually
-	contained in the AD9862 CODEC chips, not in the FPGA.  The only
-	transmit signal processing blocks in the FPGA are the interpolators.
-	The interpolator outputs can be routed to any of the 4 CODEC inputs.
-      </para>
-      <figure id="ddc-fig"><title>Digital Down Converter Block Diagram</title>
-      <mediaobject>
-	<imageobject><imagedata fileref="ddc.eps" format="EPS"/></imageobject>
-	<imageobject><imagedata fileref="ddc.png" format="PNG"/></imageobject>
-	<caption><para></para></caption>
-      </mediaobject>
-      </figure>
-      
-    </sect2>
-  </sect1>
-  <sect1 id="dboard-int">
-    <title>Daughterboard Interface</title>
-    <sect2 id="power-int">
-      <title>Power</title>
-      <para>
-	Daughterboards are provided with clean regulated 3.3V for the analog
-	and digital sections.  Additionally there is a 6V connection straight from
-	the wall supply which is intended to supply a 5V LDO regulator.  All daughterboards
-	may draw a combined total of 1.5 A.
-      </para>
-    </sect2>
-      <sect2 id="logical-int">
-      <title>Logical Interface</title>
-      <para>
-	There are slots for 2 TX daughterboards, labeled TXA and TXB, and 2 
-	corresponding RX daughterboards, RXA and RXB.  Each daughterboard slot has 
-	access to 2 of the 4 high-speed data converter analog signals (DAC outputs
-	for TX, ADC inputs for RX).  This allows each daughterboard which uses real 
-	(not IQ) sampling to have 2 independent RF sections, and 2 antennas 
-	(4 total for the system).  If IQ sampling is used, each board can support 
-	a single RF section, for a total of 2 for the whole system.
-      </para>
-      <para>
-	No antialias or reconstruction filtering is provided on the USRP motherboard.
-	This allows for maximum flexibility in frequency planning for the 
-	daughterboards.  The analog input bandwidth of the ADCs is over 200 MHz, so
-	IF frequencies up to that high may be chosen.  If several decibels of loss
-	is tolerable, and IF frequency as high as 500 MHz can be used.
-      </para>
-      <para>
-	Every daughterboard has an I2C EEPROM (24LC024 or 24LC025) onboard 
-	which identifies the board to the system.  This allows the host 
-	software to automatically set up the system properly based on the 
-	installed daughterboard.  The EEPROM may also store calibration values
-	like DC offsets or IQ imbalances.  If this EEPROM is not programmed, a
-	warning message is printed every time USRP software is run.
-      </para>
-    </sect2>
-    <sect2 id="analog-int">
-      <title>Analog Interface</title>
-      <para>
-	Each RX daughterboard has 2 differential analog inputs 
-	(VINP_A/VINN_A and VINP_B/VINN_B) which are sampled at a rate of 64 MS/s.
-	The input impedance is approximately 1Kohm.
-	The motherboard has a software-controllable programmable gain amplifier 
-	on these inputs, with 0 to 20 dB of gain.  With gain set to zero, full 
-	scale inputs are 2 Volts peak-to-peak differential.  When set to 20 dB, 
-	only .2 V pk-pk differential is needed to reach full scale. 
-      </para>
-      <para>
-	If signals are AC-coupled, there is no need to provide DC bias as long as the
-	internal buffer is turned on.  It will provide an approximately 2V bias.
-	If signals are DC-couple, a DC bias of Vdd/2 (1.65V) should be provided to
-	both the positive and negative inputs, and the internal buffer should be turned off.
-	VREF provides a clean 1 V reference.
-      </para>
-      <para>
-	Each TX daughterboard has a pair of differential analog outputs which are 
-	updated at 128 MS/s.  The signals (IOUTP_A/IOUTN_A and IOUTP_B/IOUTN_B) are 
-	current-output, each varying between 0 and 20 mA.  Since they are high-impedance,
-	they can be converted into differential voltages with a resistor.
-      </para>
-      <para>
-	In addition to the high-speed signals, each daughterboard has exclusive access to 2 low-speed ADC inputs 
-	(labeled AUX_ADC_A and AUX_ADC_B) which can be read from software.  
-	These are useful for sensing RSSI signal levels, temperatures, bias 
-	levels, etc.  Additionally, each board has shared access to 4 low-speed DAC
-	signals, labeled AUX_DAC_A through AUX_DAC_D.  RXA and TXA share one set
-	of these 4 lines, and RXB and TXB share their own independent set.  These
-	signals are useful for controlling gain of variable-gain amplifiers, for example.
-	AUX_ADC_REF provides a reference level for gain setting if it is necessary.
-      </para>
-      
-    </sect2>
-    <sect2 id="dig-int">
-      <title>Digital Interface</title>
-      <para></para>
-    </sect2>
-    <sect2 id="mech-int">
-      <title>Connector Pinouts</title>
-      
-      <table frame='all'><title>RX DBoard Connector</title>
-      <tgroup cols='3' align='left' colsep='1' rowsep='1'>
-	<thead>
-	  <row>
-	    <entry>Pin #</entry>
-	    <entry>Name</entry>
-	    <entry>Description</entry>
-	  </row>
-	</thead>
-	<tbody>
-	  <row>
-	    <entry>1</entry>
-	    <entry>power</entry>
-	    <entry>This is power</entry>
-	  </row>
-	  <row>
-	    <entry>c1</entry>
-	    <entry>c4</entry>
-	  </row>
-	  <row>
-	    <entry>d1</entry>
-	    <entry>d4</entry>
-	    <entry>d5</entry>
-	  </row>
-	</tbody>
-      </tgroup>
-      </table>
-    </sect2>
-  </sect1>
-  <sect1 id="dboards">
-    <title>Available Daughterboards</title>
-    <sect2 id="basicrx">
-      <title>BasicRX</title>
-      <para>
-      </para>
-    </sect2>
-    <sect2 id="basictx">
-      <title>BasicTX</title>
-      <para>
-      </para>
-    </sect2>
-  </sect1>
-</article>
diff --git a/usrp/doc/usrp_rfx_diagrams.odp b/usrp/doc/usrp_rfx_diagrams.odp
deleted file mode 100644
index 4521f71ce..000000000
--- a/usrp/doc/usrp_rfx_diagrams.odp
+++ /dev/null
diff --git a/usrp/firmware/.gitignore b/usrp/firmware/.gitignore
deleted file mode 100644
index 75bb241c8..000000000
--- a/usrp/firmware/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/configure
-/config.h.in
-/stamp-h.in
-/libtool
-/config.log
-/config.h
-/config.cache
-/config.status
-/missing
-/stamp-h
-/stamp-h1
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/autom4te.cache
-/*.cache
-/missing
-/make.log
-/usrp.pc
diff --git a/usrp/firmware/Makefile.am b/usrp/firmware/Makefile.am
deleted file mode 100644
index 9c0da3573..000000000
--- a/usrp/firmware/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright 2003 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.
-# 
-
-SUBDIRS = include lib src
diff --git a/usrp/firmware/include/.gitignore b/usrp/firmware/include/.gitignore
deleted file mode 100644
index 75bb241c8..000000000
--- a/usrp/firmware/include/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/configure
-/config.h.in
-/stamp-h.in
-/libtool
-/config.log
-/config.h
-/config.cache
-/config.status
-/missing
-/stamp-h
-/stamp-h1
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/autom4te.cache
-/*.cache
-/missing
-/make.log
-/usrp.pc
diff --git a/usrp/firmware/include/Makefile.am b/usrp/firmware/include/Makefile.am
deleted file mode 100644
index e17726c07..000000000
--- a/usrp/firmware/include/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright 2003 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.
-# 
-
-usrpincludedir = $(includedir)/usrp
-
-usrpinclude_HEADERS = 		\
-	usrp_i2c_addr.h		\
-	usrp_spi_defs.h	        \
-	fpga_regs_common.h	\
-	fpga_regs_standard.h
-
-
-noinst_HEADERS =		\
-	delay.h			\
-	fpga_regs_common.v	\
-	fpga_regs_standard.v	\
-	fpga_regs0.h		\
-	fx2regs.h		\
-	fx2utils.h		\
-	i2c.h			\
-	isr.h			\
-	syncdelay.h		\
-	timer.h			\
-	usb_common.h		\
-	usb_descriptors.h	\
-	usb_requests.h		\
-	usrp_commands.h		\
-	usrp_config.h		\
-	usrp_ids.h		\
-	usrp_interfaces.h	
-
-
-CODE_GENERATOR = 		\
-	generate_regs.py	
-
-EXTRA_DIST = 			\
-	$(CODE_GENERATOR)
-
-fpga_regs_common.v: fpga_regs_common.h generate_regs.py 
-	PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(PYTHON) $(srcdir)/generate_regs.py $(srcdir)/fpga_regs_common.h $@
-
-fpga_regs_standard.v: fpga_regs_standard.h generate_regs.py
-	PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(PYTHON) $(srcdir)/generate_regs.py $(srcdir)/fpga_regs_standard.h $@
diff --git a/usrp/firmware/include/fpga_regs0.h b/usrp/firmware/include/fpga_regs0.h
deleted file mode 100644
index 883798301..000000000
--- a/usrp/firmware/include/fpga_regs0.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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 _FPGA_REGS0_H_
-#define _FPGA_REGS0_H_
-
-#define FR_RX_FREQ_0	   0
-#define FR_RX_FREQ_1	   1
-#define FR_RX_FREQ_2	   2
-#define FR_RX_FREQ_3	   3
-#define FR_TX_FREQ_0	   4
-#define FR_TX_FREQ_1	   5
-#define FR_TX_FREQ_2	   6
-#define FR_TX_FREQ_3	   7
-#define FR_COMBO	   8
-
-
-#define FR_ADC_CLK_DIV   128	// pseudo regs mapped to FR_COMBO by f/w
-#define FR_EXT_CLK_DIV	 129	
-#define FR_INTERP	 130
-#define FR_DECIM	 131
-
-#endif
diff --git a/usrp/firmware/include/fpga_regs_common.h b/usrp/firmware/include/fpga_regs_common.h
deleted file mode 100644
index b4a496af7..000000000
--- a/usrp/firmware/include/fpga_regs_common.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2004 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_FPGA_REGS_COMMON_H
-#define INCLUDED_FPGA_REGS_COMMON_H
-
-// This file defines registers common to all FPGA configurations.
-// Registers 0 to 31 are reserved for use in this file.
-
-
-// The FPGA needs to know the rate that samples are coming from and
-// going to the A/D's and D/A's.  div = 128e6 / sample_rate
-
-#define	FR_TX_SAMPLE_RATE_DIV	 0
-#define	FR_RX_SAMPLE_RATE_DIV	 1
-
-// 2 and 3 are defined in the ATR section
-
-#define	FR_MASTER_CTRL		 4	// master enable and reset controls
-#  define  bmFR_MC_ENABLE_TX		(1 << 0)
-#  define  bmFR_MC_ENABLE_RX		(1 << 1)
-#  define  bmFR_MC_RESET_TX		(1 << 2)
-#  define  bmFR_MC_RESET_RX		(1 << 3)
-
-// i/o direction registers for pins that go to daughterboards.
-// Setting the bit makes it an output from the FPGA to the d'board.
-// top 16 is mask, low 16 is value
-
-#define	FR_OE_0			 5	// slot 0
-#define	FR_OE_1			 6
-#define	FR_OE_2			 7
-#define	FR_OE_3			 8
-
-// i/o registers for pins that go to daughterboards.
-// top 16 is a mask, low 16 is value
-
-#define	FR_IO_0			 9	// slot 0
-#define	FR_IO_1			10
-#define	FR_IO_2			11
-#define	FR_IO_3			12
-
-#define	FR_MODE			13
-#  define  bmFR_MODE_NORMAL		      0
-#  define  bmFR_MODE_LOOPBACK		(1 << 0)	// enable digital loopback
-#  define  bmFR_MODE_RX_COUNTING	(1 << 1)	// Rx is counting
-#  define  bmFR_MODE_RX_COUNTING_32BIT	(1 << 2)	// Rx is counting with a 32 bit counter
-                                                    // low and high 16 bits are multiplexed across channel I and Q
-
-
-// If the corresponding bit is set, internal FPGA debug circuitry
-// controls the i/o pins for the associated bank of daughterboard
-// i/o pins.  Typically used for debugging FPGA designs.
-
-#define FR_DEBUG_EN             14
-#  define bmFR_DEBUG_EN_TX_A           (1 << 0)        // debug controls TX_A i/o
-#  define bmFR_DEBUG_EN_RX_A           (1 << 1)        // debug controls RX_A i/o
-#  define bmFR_DEBUG_EN_TX_B           (1 << 2)        // debug controls TX_B i/o
-#  define bmFR_DEBUG_EN_RX_B           (1 << 3)        // debug controls RX_B i/o
-
-
-// If the corresponding bit is set, enable the automatic DC
-// offset correction control loop.
-//
-// The 4 low bits are significant:
-//
-//   ADC0 = (1 << 0)
-//   ADC1 = (1 << 1)
-//   ADC2 = (1 << 2)
-//   ADC3 = (1 << 3)
-//
-// This control loop works if the attached daugherboard blocks DC.
-// Currently all daughterboards do block DC.  This includes:
-// basic rx, dbs_rx, tv_rx, flex_xxx_rx.
-
-#define FR_DC_OFFSET_CL_EN	15			// DC Offset Control Loop Enable
-
-
-// offset corrections for ADC's and DAC's (2's complement)
-
-#define	FR_ADC_OFFSET_0	 	16
-#define	FR_ADC_OFFSET_1		17
-#define	FR_ADC_OFFSET_2	 	18
-#define	FR_ADC_OFFSET_3		19
-
-
-// ------------------------------------------------------------------------
-// Automatic Transmit/Receive switching
-//
-// If automatic transmit/receive (ATR) switching is enabled in the
-// FR_ATR_CTL register, the presence or absence of data in the FPGA
-// transmit fifo selects between two sets of values for each of the 4
-// banks of daughterboard i/o pins.
-//
-// Each daughterboard slot has 3 16-bit registers associated with it:
-//   FR_ATR_MASK_*, FR_ATR_TXVAL_* and FR_ATR_RXVAL_*
-//
-// FR_ATR_MASK_{0,1,2,3}: 
-//
-//   These registers determine which of the daugherboard i/o pins are
-//   affected by ATR switching.  If a bit in the mask is set, the
-//   corresponding i/o bit is controlled by ATR, else it's output
-//   value comes from the normal i/o pin output register:
-//   FR_IO_{0,1,2,3}.
-//
-// FR_ATR_TXVAL_{0,1,2,3}:
-// FR_ATR_RXVAL_{0,1,2,3}:
-//
-//   If the Tx fifo contains data, then the bits from TXVAL that are
-//   selected by MASK are output.  Otherwise, the bits from RXVAL that
-//   are selected by MASK are output.
-                      
-#define FR_ATR_MASK_0		20	// slot 0
-#define	FR_ATR_TXVAL_0		21
-#define FR_ATR_RXVAL_0		22
-
-#define FR_ATR_MASK_1		23	// slot 1
-#define	FR_ATR_TXVAL_1		24
-#define FR_ATR_RXVAL_1		25
-
-#define FR_ATR_MASK_2		26	// slot 2
-#define	FR_ATR_TXVAL_2		27
-#define FR_ATR_RXVAL_2		28
-
-#define FR_ATR_MASK_3		29	// slot 3
-#define	FR_ATR_TXVAL_3		30
-#define FR_ATR_RXVAL_3		31
-
-// Clock ticks to delay rising and falling edge of T/R signal
-#define FR_ATR_TX_DELAY          2
-#define FR_ATR_RX_DELAY          3
-
-#endif /* INCLUDED_FPGA_REGS_COMMON_H */
diff --git a/usrp/firmware/include/fpga_regs_common.v b/usrp/firmware/include/fpga_regs_common.v
deleted file mode 100644
index 8035d8565..000000000
--- a/usrp/firmware/include/fpga_regs_common.v
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// This file is machine generated from ./fpga_regs_common.h
-// Do not edit by hand; your edits will be overwritten.
-//
-
-// This file defines registers common to all FPGA configurations.
-// Registers 0 to 31 are reserved for use in this file.
-
-
-// The FPGA needs to know the rate that samples are coming from and
-// going to the A/D's and D/A's.  div = 128e6 / sample_rate
-
-`define FR_TX_SAMPLE_RATE_DIV     7'd0
-`define FR_RX_SAMPLE_RATE_DIV     7'd1
-
-// 2 and 3 are defined in the ATR section
-
-`define FR_MASTER_CTRL            7'd4	// master enable and reset controls
-
-// i/o direction registers for pins that go to daughterboards.
-// Setting the bit makes it an output from the FPGA to the d'board.
-// top 16 is mask, low 16 is value
-
-`define FR_OE_0                   7'd5	// slot 0
-`define FR_OE_1                   7'd6
-`define FR_OE_2                   7'd7
-`define FR_OE_3                   7'd8
-
-// i/o registers for pins that go to daughterboards.
-// top 16 is a mask, low 16 is value
-
-`define FR_IO_0                   7'd9	// slot 0
-`define FR_IO_1                   7'd10
-`define FR_IO_2                   7'd11
-`define FR_IO_3                   7'd12
-
-`define FR_MODE                   7'd13
-
-
-// If the corresponding bit is set, internal FPGA debug circuitry
-// controls the i/o pins for the associated bank of daughterboard
-// i/o pins.  Typically used for debugging FPGA designs.
-
-`define FR_DEBUG_EN               7'd14
-
-
-// If the corresponding bit is set, enable the automatic DC
-// offset correction control loop.
-//
-// The 4 low bits are significant:
-//
-//   ADC0 = (1 << 0)
-//   ADC1 = (1 << 1)
-//   ADC2 = (1 << 2)
-//   ADC3 = (1 << 3)
-//
-// This control loop works if the attached daugherboard blocks DC.
-// Currently all daughterboards do block DC.  This includes:
-// basic rx, dbs_rx, tv_rx, flex_xxx_rx.
-
-`define FR_DC_OFFSET_CL_EN        7'd15			// DC Offset Control Loop Enable
-
-
-// offset corrections for ADC's and DAC's (2's complement)
-
-`define FR_ADC_OFFSET_0           7'd16
-`define FR_ADC_OFFSET_1           7'd17
-`define FR_ADC_OFFSET_2           7'd18
-`define FR_ADC_OFFSET_3           7'd19
-
-
-// ------------------------------------------------------------------------
-// Automatic Transmit/Receive switching
-//
-// If automatic transmit/receive (ATR) switching is enabled in the
-// FR_ATR_CTL register, the presence or absence of data in the FPGA
-// transmit fifo selects between two sets of values for each of the 4
-// banks of daughterboard i/o pins.
-//
-// Each daughterboard slot has 3 16-bit registers associated with it:
-//   FR_ATR_MASK_*, FR_ATR_TXVAL_* and FR_ATR_RXVAL_*
-//
-// FR_ATR_MASK_{0,1,2,3}: 
-//
-//   These registers determine which of the daugherboard i/o pins are
-//   affected by ATR switching.  If a bit in the mask is set, the
-//   corresponding i/o bit is controlled by ATR, else it's output
-//   value comes from the normal i/o pin output register:
-//   FR_IO_{0,1,2,3}.
-//
-// FR_ATR_TXVAL_{0,1,2,3}:
-// FR_ATR_RXVAL_{0,1,2,3}:
-//
-//   If the Tx fifo contains data, then the bits from TXVAL that are
-//   selected by MASK are output.  Otherwise, the bits from RXVAL that
-//   are selected by MASK are output.
-                      
-`define FR_ATR_MASK_0             7'd20	// slot 0
-`define FR_ATR_TXVAL_0            7'd21
-`define FR_ATR_RXVAL_0            7'd22
-
-`define FR_ATR_MASK_1             7'd23	// slot 1
-`define FR_ATR_TXVAL_1            7'd24
-`define FR_ATR_RXVAL_1            7'd25
-
-`define FR_ATR_MASK_2             7'd26	// slot 2
-`define FR_ATR_TXVAL_2            7'd27
-`define FR_ATR_RXVAL_2            7'd28
-
-`define FR_ATR_MASK_3             7'd29	// slot 3
-`define FR_ATR_TXVAL_3            7'd30
-`define FR_ATR_RXVAL_3            7'd31
-
-// Clock ticks to delay rising and falling edge of T/R signal
-`define FR_ATR_TX_DELAY           7'd2
-`define FR_ATR_RX_DELAY           7'd3
-
diff --git a/usrp/firmware/include/fpga_regs_standard.h b/usrp/firmware/include/fpga_regs_standard.h
deleted file mode 100644
index 7485e2bab..000000000
--- a/usrp/firmware/include/fpga_regs_standard.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2004,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_FPGA_REGS_STANDARD_H
-#define INCLUDED_FPGA_REGS_STANDARD_H
-
-// Register numbers 0 to 31 are reserved for use in fpga_regs_common.h.
-// Registers 64 to 79 are available for custom FPGA builds.
-
-
-// DDC / DUC
-
-#define	FR_INTERP_RATE		32	// [1,1024]
-#define	FR_DECIM_RATE		33	// [1,256]
-
-// DDC center freq
-
-#define FR_RX_FREQ_0		34
-#define FR_RX_FREQ_1		35
-#define FR_RX_FREQ_2		36
-#define FR_RX_FREQ_3		37
-
-// See below for DDC Starting Phase
-
-// ------------------------------------------------------------------------
-//  configure FPGA Rx mux
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------+-------+-------+-------+-------+-+-----+
-// |      must be zero     | Q3| I3| Q2| I2| Q1| I1| Q0| I0|Z| NCH |
-// +-----------------------+-------+-------+-------+-------+-+-----+
-//
-// There are a maximum of 4 digital downconverters in the the FPGA.
-// Each DDC has two 16-bit inputs, I and Q, and two 16-bit outputs, I & Q.
-//
-// DDC I inputs are specified by the two bit fields I3, I2, I1 & I0
-//
-//   0 = DDC input is from ADC 0
-//   1 = DDC input is from ADC 1
-//   2 = DDC input is from ADC 2
-//   3 = DDC input is from ADC 3
-//
-// If Z == 1, all DDC Q inputs are set to zero
-// If Z == 0, DDC Q inputs are specified by the two bit fields Q3, Q2, Q1 & Q0
-//
-// NCH specifies the number of complex channels that are sent across
-// the USB.  The legal values are 1, 2 or 4, corresponding to 2, 4 or
-// 8 16-bit values.
-
-#define	FR_RX_MUX		38
-
-// ------------------------------------------------------------------------
-//  configure FPGA Tx Mux.
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------+-------+-------+-------+-------+-+-----+
-// |                       | DAC3  | DAC2  | DAC1  |  DAC0 |0| NCH |
-// +-----------------------------------------------+-------+-+-----+
-//
-// NCH specifies the number of complex channels that are sent across
-// the USB.  The legal values are 1 or 2, corresponding to 2 or 4
-// 16-bit values.
-//
-// There are two interpolators with complex inputs and outputs.
-// There are four DACs.  (We use the DUC in each AD9862.)
-//
-// Each 4-bit DACx field specifies the source for the DAC and
-// whether or not that DAC is enabled.  Each subfield is coded
-// like this: 
-//
-//    3 2 1 0
-//   +-+-----+
-//   |E|  N  |
-//   +-+-----+
-//
-// Where E is set if the DAC is enabled, and N specifies which
-// interpolator output is connected to this DAC.
-//
-//  N   which interp output
-// ---  -------------------
-//  0   chan 0 I
-//  1   chan 0 Q
-//  2   chan 1 I
-//  3   chan 1 Q
-
-#define	FR_TX_MUX		39
-
-// ------------------------------------------------------------------------
-// REFCLK control
-//
-// Control whether a reference clock is sent to the daughterboards,
-// and what frequency.  The refclk is sent on d'board i/o pin 0.
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------------------------------+-+------------+
-// |             Reserved (Must be zero)           |E|   DIVISOR  |
-// +-----------------------------------------------+-+------------+
-
-//
-// Bit 7  -- 1 turns on refclk, 0 allows IO use
-// Bits 6:0 Divider value
-
-#define FR_TX_A_REFCLK          40
-#define FR_RX_A_REFCLK          41
-#define FR_TX_B_REFCLK          42
-#define FR_RX_B_REFCLK          43
-
-#  define bmFR_REFCLK_EN	   0x80
-#  define bmFR_REFCLK_DIVISOR_MASK 0x7f
-
-// ------------------------------------------------------------------------
-// DDC Starting Phase
-
-#define FR_RX_PHASE_0		44
-#define FR_RX_PHASE_1		45
-#define FR_RX_PHASE_2		46
-#define FR_RX_PHASE_3		47
-
-// ------------------------------------------------------------------------
-// Tx data format control register
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-------------------------------------------------------+-------+
-// |                    Reserved (Must be zero)            |  FMT  |
-// +-------------------------------------------------------+-------+
-//
-//  FMT values:
-
-#define FR_TX_FORMAT		48
-#  define bmFR_TX_FORMAT_16_IQ		0	// 16-bit I, 16-bit Q
-
-// ------------------------------------------------------------------------
-// Rx data format control register
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------------------------+-+-+---------+-------+
-// |          Reserved (Must be zero)        |B|Q|  WIDTH  | SHIFT |
-// +-----------------------------------------+-+-+---------+-------+
-//
-//  FMT values:
-
-#define FR_RX_FORMAT		49
-
-#  define bmFR_RX_FORMAT_SHIFT_MASK	(0x0f <<  0)	// arithmetic right shift [0, 15]
-#  define bmFR_RX_FORMAT_SHIFT_SHIFT	0
-#  define bmFR_RX_FORMAT_WIDTH_MASK	(0x1f <<  4)    // data width in bits [1, 16] (not all valid)
-#  define bmFR_RX_FORMAT_WIDTH_SHIFT    4
-#  define bmFR_RX_FORMAT_WANT_Q		(0x1  <<  9)    // deliver both I & Q, else just I
-#  define bmFR_RX_FORMAT_BYPASS_HB	(0x1  << 10)    // bypass half-band filter
-
-// The valid combinations currently are:
-//
-//   B  Q  WIDTH  SHIFT
-//   0  1    16     0
-//   0  1     8     8
-
-
-// Possible future values of WIDTH = {4, 2, 1}
-// 12 takes a bit more work, since we need to know packet alignment.
-
-// ------------------------------------------------------------------------
-// FIXME register numbers 50 to 63 are available
-
-// ------------------------------------------------------------------------
-// Registers 64 to 95 are reserved for user custom FPGA builds.
-// The standard USRP software will not touch these.
-
-#define FR_USER_0	64
-#define FR_USER_1	65
-#define FR_USER_2	66
-#define FR_USER_3	67
-#define FR_USER_4	68
-#define FR_USER_5	69
-#define FR_USER_6	70
-#define FR_USER_7	71
-#define FR_USER_8	72
-#define FR_USER_9	73
-#define FR_USER_10	74
-#define FR_USER_11	75
-#define FR_USER_12	76
-#define FR_USER_13	77
-#define FR_USER_14	78
-#define FR_USER_15	79
-#define FR_USER_16	80
-#define FR_USER_17	81
-#define FR_USER_18	82
-#define FR_USER_19	83
-#define FR_USER_20	84
-#define FR_USER_21	85
-#define FR_USER_22	86
-#define FR_USER_23	87
-#define FR_USER_24	88
-#define FR_USER_25	89
-#define FR_USER_26	90
-#define FR_USER_27	91
-#define FR_USER_28	92
-#define FR_USER_29	93
-#define FR_USER_30	94
-#define FR_USER_31	95
-
-//Registers needed for multi usrp master/slave configuration
-//
-//Rx Master/slave control register (FR_RX_MASTER_SLAVE = FR_USER_0)
-//
-#define FR_RX_MASTER_SLAVE		64
-#define bitnoFR_RX_SYNC			0
-#define bitnoFR_RX_SYNC_MASTER		1
-#define bitnoFR_RX_SYNC_SLAVE		2
-#  define bmFR_RX_SYNC          (1 <<bitnoFR_RX_SYNC) //1 If this is a master "sync now" and send sync to slave.
-                                                      //  If this is a slave "sync now" (testing purpose only)
-                                                      //  Sync is allmost the same as reset (clear all counters and buffers) 
-                                                      //  except that the io outputs and settings don't get reset (otherwise it couldn't send the sync to the slave)
-                                                      //0 Normal operation
-
-#  define bmFR_RX_SYNC_MASTER (1 <<bitnoFR_RX_SYNC_MASTER) //1 This is a rx sync master, output sync_rx on rx_a_io[15]
-                                                           //0 This is not a rx sync master
-#  define bmFR_RX_SYNC_SLAVE  (1 <<bitnoFR_RX_SYNC_SLAVE) //1 This is a rx sync slave, follow sync_rx on rx_a_io[bitnoFR_RX_SYNC_INPUT_IOPIN]
-                                                          //0 This is not an rx sync slave.
-
-//Caution The master settings will output values on the io lines.
-//They inheritely enable these lines as output. If you have a daughtercard which uses these lines also as output then you will burn your usrp and daughtercard.
-//If you set the slave bits then your usrp won't do anything if you don't connect a master.
-// Rx Master/slave control register
-//
-// The way this is supposed to be used is connecting a (short) 16pin flatcable from an rx daughterboard in RXA master io_rx[8..15] to slave io_rx[8..15] on RXA of slave usrp
-// This can be done with basic_rx boards or dbsrx boards
-//dbsrx: connect master-J25 to slave-J25
-//basic rx: connect J25 to slave-J25
-//CAUTION: pay attention to the lineup of your connector.
-//The red line (pin1) should be at the same side of the daughterboards on master and slave.
-//If you turnaround the cable on one end you will burn your usrp.
-
-//You cannot use a 16pin flatcable if you are using FLEX400 or FLEX2400 daughterboards, since these use a lot of the io pins.
-//You can still link them but you must use only a 2pin or 1pin cable
-//You can also use a 2-wire link. put a 2pin header on io[15],gnd of the master RXA daughterboard and connect it to io15,gnd of the slave RXA db.
-//You can use a cable like the ones found with the leds on the mainbord of a PC.
-//Make sure you don't twist the cable, otherwise you connect the sync output to ground.
-//To be save you could also just use a single wire from master io[15] to slave io[15], but this is not optimal for signal integrity.
-
-
-// Since rx_io[0] can normally be used as a refclk and is not exported on all daughterboards this line
-// still has the refclk function if you use the master/slave setup (it is not touched by the master/slave settings).
-// The master/slave circuitry will only use io pin 15 and does not touch any of the other io pins.
-#define bitnoFR_RX_SYNC_INPUT_IOPIN		15
-#define bmFR_RX_SYNC_INPUT_IOPIN		(1<<bitnoFR_RX_SYNC_INPUT_IOPIN)
-//TODO the output pin is still hardcoded in the verilog code, make it listen to the following define
-#define bitnoFR_RX_SYNC_OUTPUT_IOPIN	15
-#define bmFR_RX_SYNC_OUTPUT_IOPIN	(1<<bitnoFR_RX_SYNC_OUTPUT_IOPIN)
-// =======================================================================
-// READBACK Registers
-// =======================================================================
-
-#define FR_RB_IO_RX_A_IO_TX_A	1	// read back a-side i/o pins
-#define	FR_RB_IO_RX_B_IO_TX_B	2	// read back b-side i/o pins
-
-// ------------------------------------------------------------------------
-// FPGA Capability register
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------------------------------+-+-----+-+-----+
-// |                    Reserved (Must be zero)    |T|NDUC |R|NDDC |
-// +-----------------------------------------------+-+-----+-+-----+
-//
-// Bottom 4-bits are Rx capabilities
-// Next   4-bits are Tx capabilities
-
-#define	FR_RB_CAPS	3
-#  define bmFR_RB_CAPS_NDDC_MASK	(0x7 << 0)   // # of digital down converters 0,1,2,4
-#  define bmFR_RB_CAPS_NDDC_SHIFT	0
-#  define bmFR_RB_CAPS_RX_HAS_HALFBAND	(0x1 << 3)
-#  define bmFR_RB_CAPS_NDUC_MASK        (0x7 << 4)   // # of digital up converters 0,1,2
-#  define bmFR_RB_CAPS_NDUC_SHIFT	4
-#  define bmFR_RB_CAPS_TX_HAS_HALFBAND	(0x1 << 7)
-
-
-#endif /* INCLUDED_FPGA_REGS_STANDARD_H */
diff --git a/usrp/firmware/include/fpga_regs_standard.v b/usrp/firmware/include/fpga_regs_standard.v
deleted file mode 100644
index d09aa6116..000000000
--- a/usrp/firmware/include/fpga_regs_standard.v
+++ /dev/null
@@ -1,256 +0,0 @@
-//
-// This file is machine generated from ./fpga_regs_standard.h
-// Do not edit by hand; your edits will be overwritten.
-//
-
-// Register numbers 0 to 31 are reserved for use in fpga_regs_common.h.
-// Registers 64 to 79 are available for custom FPGA builds.
-
-
-// DDC / DUC
-
-`define FR_INTERP_RATE            7'd32	// [1,1024]
-`define FR_DECIM_RATE             7'd33	// [1,256]
-
-// DDC center freq
-
-`define FR_RX_FREQ_0              7'd34
-`define FR_RX_FREQ_1              7'd35
-`define FR_RX_FREQ_2              7'd36
-`define FR_RX_FREQ_3              7'd37
-
-// See below for DDC Starting Phase
-
-// ------------------------------------------------------------------------
-//  configure FPGA Rx mux
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------+-------+-------+-------+-------+-+-----+
-// |      must be zero     | Q3| I3| Q2| I2| Q1| I1| Q0| I0|Z| NCH |
-// +-----------------------+-------+-------+-------+-------+-+-----+
-//
-// There are a maximum of 4 digital downconverters in the the FPGA.
-// Each DDC has two 16-bit inputs, I and Q, and two 16-bit outputs, I & Q.
-//
-// DDC I inputs are specified by the two bit fields I3, I2, I1 & I0
-//
-//   0 = DDC input is from ADC 0
-//   1 = DDC input is from ADC 1
-//   2 = DDC input is from ADC 2
-//   3 = DDC input is from ADC 3
-//
-// If Z == 1, all DDC Q inputs are set to zero
-// If Z == 0, DDC Q inputs are specified by the two bit fields Q3, Q2, Q1 & Q0
-//
-// NCH specifies the number of complex channels that are sent across
-// the USB.  The legal values are 1, 2 or 4, corresponding to 2, 4 or
-// 8 16-bit values.
-
-`define FR_RX_MUX                 7'd38
-
-// ------------------------------------------------------------------------
-//  configure FPGA Tx Mux.
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------+-------+-------+-------+-------+-+-----+
-// |                       | DAC3  | DAC2  | DAC1  |  DAC0 |0| NCH |
-// +-----------------------------------------------+-------+-+-----+
-//
-// NCH specifies the number of complex channels that are sent across
-// the USB.  The legal values are 1 or 2, corresponding to 2 or 4
-// 16-bit values.
-//
-// There are two interpolators with complex inputs and outputs.
-// There are four DACs.  (We use the DUC in each AD9862.)
-//
-// Each 4-bit DACx field specifies the source for the DAC and
-// whether or not that DAC is enabled.  Each subfield is coded
-// like this: 
-//
-//    3 2 1 0
-//   +-+-----+
-//   |E|  N  |
-//   +-+-----+
-//
-// Where E is set if the DAC is enabled, and N specifies which
-// interpolator output is connected to this DAC.
-//
-//  N   which interp output
-// ---  -------------------
-//  0   chan 0 I
-//  1   chan 0 Q
-//  2   chan 1 I
-//  3   chan 1 Q
-
-`define FR_TX_MUX                 7'd39
-
-// ------------------------------------------------------------------------
-// REFCLK control
-//
-// Control whether a reference clock is sent to the daughterboards,
-// and what frequency.  The refclk is sent on d'board i/o pin 0.
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------------------------------+-+------------+
-// |             Reserved (Must be zero)           |E|   DIVISOR  |
-// +-----------------------------------------------+-+------------+
-
-//
-// Bit 7  -- 1 turns on refclk, 0 allows IO use
-// Bits 6:0 Divider value
-
-`define FR_TX_A_REFCLK            7'd40
-`define FR_RX_A_REFCLK            7'd41
-`define FR_TX_B_REFCLK            7'd42
-`define FR_RX_B_REFCLK            7'd43
-
-
-// ------------------------------------------------------------------------
-// DDC Starting Phase
-
-`define FR_RX_PHASE_0             7'd44
-`define FR_RX_PHASE_1             7'd45
-`define FR_RX_PHASE_2             7'd46
-`define FR_RX_PHASE_3             7'd47
-
-// ------------------------------------------------------------------------
-// Tx data format control register
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-------------------------------------------------------+-------+
-// |                    Reserved (Must be zero)            |  FMT  |
-// +-------------------------------------------------------+-------+
-//
-//  FMT values:
-
-`define FR_TX_FORMAT              7'd48
-
-// ------------------------------------------------------------------------
-// Rx data format control register
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------------------------+-+-+---------+-------+
-// |          Reserved (Must be zero)        |B|Q|  WIDTH  | SHIFT |
-// +-----------------------------------------+-+-+---------+-------+
-//
-//  FMT values:
-
-`define FR_RX_FORMAT              7'd49
-
-
-// The valid combinations currently are:
-//
-//   B  Q  WIDTH  SHIFT
-//   0  1    16     0
-//   0  1     8     8
-
-
-// Possible future values of WIDTH = {4, 2, 1}
-// 12 takes a bit more work, since we need to know packet alignment.
-
-// ------------------------------------------------------------------------
-// FIXME register numbers 50 to 63 are available
-
-// ------------------------------------------------------------------------
-// Registers 64 to 95 are reserved for user custom FPGA builds.
-// The standard USRP software will not touch these.
-
-`define FR_USER_0                 7'd64
-`define FR_USER_1                 7'd65
-`define FR_USER_2                 7'd66
-`define FR_USER_3                 7'd67
-`define FR_USER_4                 7'd68
-`define FR_USER_5                 7'd69
-`define FR_USER_6                 7'd70
-`define FR_USER_7                 7'd71
-`define FR_USER_8                 7'd72
-`define FR_USER_9                 7'd73
-`define FR_USER_10                7'd74
-`define FR_USER_11                7'd75
-`define FR_USER_12                7'd76
-`define FR_USER_13                7'd77
-`define FR_USER_14                7'd78
-`define FR_USER_15                7'd79
-`define FR_USER_16                7'd80
-`define FR_USER_17                7'd81
-`define FR_USER_18                7'd82
-`define FR_USER_19                7'd83
-`define FR_USER_20                7'd84
-`define FR_USER_21                7'd85
-`define FR_USER_22                7'd86
-`define FR_USER_23                7'd87
-`define FR_USER_24                7'd88
-`define FR_USER_25                7'd89
-`define FR_USER_26                7'd90
-`define FR_USER_27                7'd91
-`define FR_USER_28                7'd92
-`define FR_USER_29                7'd93
-`define FR_USER_30                7'd94
-`define FR_USER_31                7'd95
-
-//Registers needed for multi usrp master/slave configuration
-//
-//Rx Master/slave control register (FR_RX_MASTER_SLAVE = FR_USER_0)
-//
-`define FR_RX_MASTER_SLAVE        7'd64
-`define bitnoFR_RX_SYNC           0
-`define bitnoFR_RX_SYNC_MASTER    1
-`define bitnoFR_RX_SYNC_SLAVE     2
-
-
-//Caution The master settings will output values on the io lines.
-//They inheritely enable these lines as output. If you have a daughtercard which uses these lines also as output then you will burn your usrp and daughtercard.
-//If you set the slave bits then your usrp won't do anything if you don't connect a master.
-// Rx Master/slave control register
-//
-// The way this is supposed to be used is connecting a (short) 16pin flatcable from an rx daughterboard in RXA master io_rx[8..15] to slave io_rx[8..15] on RXA of slave usrp
-// This can be done with basic_rx boards or dbsrx boards
-//dbsrx: connect master-J25 to slave-J25
-//basic rx: connect J25 to slave-J25
-//CAUTION: pay attention to the lineup of your connector.
-//The red line (pin1) should be at the same side of the daughterboards on master and slave.
-//If you turnaround the cable on one end you will burn your usrp.
-
-//You cannot use a 16pin flatcable if you are using FLEX400 or FLEX2400 daughterboards, since these use a lot of the io pins.
-//You can still link them but you must use only a 2pin or 1pin cable
-//You can also use a 2-wire link. put a 2pin header on io[15],gnd of the master RXA daughterboard and connect it to io15,gnd of the slave RXA db.
-//You can use a cable like the ones found with the leds on the mainbord of a PC.
-//Make sure you don't twist the cable, otherwise you connect the sync output to ground.
-//To be save you could also just use a single wire from master io[15] to slave io[15], but this is not optimal for signal integrity.
-
-
-// Since rx_io[0] can normally be used as a refclk and is not exported on all daughterboards this line
-// still has the refclk function if you use the master/slave setup (it is not touched by the master/slave settings).
-// The master/slave circuitry will only use io pin 15 and does not touch any of the other io pins.
-`define bitnoFR_RX_SYNC_INPUT_IOPIN 15
-`define bmFR_RX_SYNC_INPUT_IOPIN  (1<<bitnoFR_RX_SYNC_INPUT_IOPIN)
-//TODO the output pin is still hardcoded in the verilog code, make it listen to the following define
-`define bitnoFR_RX_SYNC_OUTPUT_IOPIN 15
-`define bmFR_RX_SYNC_OUTPUT_IOPIN (1<<bitnoFR_RX_SYNC_OUTPUT_IOPIN)
-// =======================================================================
-// READBACK Registers
-// =======================================================================
-
-`define FR_RB_IO_RX_A_IO_TX_A     7'd1	// read back a-side i/o pins
-`define FR_RB_IO_RX_B_IO_TX_B     7'd2	// read back b-side i/o pins
-
-// ------------------------------------------------------------------------
-// FPGA Capability register
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------------------------------+-+-----+-+-----+
-// |                    Reserved (Must be zero)    |T|NDUC |R|NDDC |
-// +-----------------------------------------------+-+-----+-+-----+
-//
-// Bottom 4-bits are Rx capabilities
-// Next   4-bits are Tx capabilities
-
-`define FR_RB_CAPS                7'd3
-
-
diff --git a/usrp/firmware/include/fx2regs.h b/usrp/firmware/include/fx2regs.h
deleted file mode 100644
index 2f210f567..000000000
--- a/usrp/firmware/include/fx2regs.h
+++ /dev/null
@@ -1,716 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-/*
-//-----------------------------------------------------------------------------
-//   File:      FX2regs.h
-//   Contents:   EZ-USB FX2 register declarations and bit mask definitions.
-//
-// $Archive: /USB/Target/Inc/fx2regs.h $
-// $Date$
-// $Revision$
-//
-//
-//   Copyright (c) 2000 Cypress Semiconductor, All rights reserved
-//-----------------------------------------------------------------------------
-*/
-
-
-#ifndef FX2REGS_H   /* Header Sentry */
-#define FX2REGS_H
-
-#define ALLOCATE_EXTERN		// required for "right thing to happen" with fx2regs.h
-
-/*
-//-----------------------------------------------------------------------------
-// FX2 Related Register Assignments
-//-----------------------------------------------------------------------------
-
-// The Ez-USB FX2 registers are defined here. We use FX2regs.h for register 
-// address allocation by using "#define ALLOCATE_EXTERN". 
-// When using "#define ALLOCATE_EXTERN", you get (for instance): 
-// xdata volatile BYTE OUT7BUF[64]   _at_   0x7B40;
-// Such lines are created from FX2.h by using the preprocessor. 
-// Incidently, these lines will not generate any space in the resulting hex 
-// file; they just bind the symbols to the addresses for compilation. 
-// You just need to put "#define ALLOCATE_EXTERN" in your main program file; 
-// i.e. fw.c or a stand-alone C source file. 
-// Without "#define ALLOCATE_EXTERN", you just get the external reference: 
-// extern xdata volatile BYTE OUT7BUF[64]   ;//   0x7B40;
-// This uses the concatenation operator "##" to insert a comment "//" 
-// to cut off the end of the line, "_at_   0x7B40;", which is not wanted.
-*/
-
-
-#ifdef ALLOCATE_EXTERN
-#define EXTERN
-#define _AT_(a) at a
-#else
-#define EXTERN extern
-#define _AT_ ;/ ## /
-#endif
-
-typedef unsigned char BYTE;
-typedef unsigned short WORD;
-
-EXTERN xdata _AT_(0xE400) volatile BYTE GPIF_WAVE_DATA[128];
-EXTERN xdata _AT_(0xE480) volatile BYTE RES_WAVEDATA_END  ;
-
-// General Configuration
-
-EXTERN xdata _AT_(0xE600) volatile BYTE CPUCS             ;  // Control & Status
-EXTERN xdata _AT_(0xE601) volatile BYTE IFCONFIG          ;  // Interface Configuration
-EXTERN xdata _AT_(0xE602) volatile BYTE PINFLAGSAB        ;  // FIFO FLAGA and FLAGB Assignments
-EXTERN xdata _AT_(0xE603) volatile BYTE PINFLAGSCD        ;  // FIFO FLAGC and FLAGD Assignments
-EXTERN xdata _AT_(0xE604) volatile BYTE FIFORESET         ;  // Restore FIFOS to default state
-EXTERN xdata _AT_(0xE605) volatile BYTE BREAKPT           ;  // Breakpoint
-EXTERN xdata _AT_(0xE606) volatile BYTE BPADDRH           ;  // Breakpoint Address H
-EXTERN xdata _AT_(0xE607) volatile BYTE BPADDRL           ;  // Breakpoint Address L
-EXTERN xdata _AT_(0xE608) volatile BYTE UART230           ;  // 230 Kbaud clock for T0,T1,T2
-EXTERN xdata _AT_(0xE609) volatile BYTE FIFOPINPOLAR      ;  // FIFO polarities
-EXTERN xdata _AT_(0xE60A) volatile BYTE REVID             ;  // Chip Revision
-EXTERN xdata _AT_(0xE60B) volatile BYTE REVCTL            ;  // Chip Revision Control
-
-// Endpoint Configuration
-
-EXTERN xdata _AT_(0xE610) volatile BYTE EP1OUTCFG         ;  // Endpoint 1-OUT Configuration
-EXTERN xdata _AT_(0xE611) volatile BYTE EP1INCFG          ;  // Endpoint 1-IN Configuration
-EXTERN xdata _AT_(0xE612) volatile BYTE EP2CFG            ;  // Endpoint 2 Configuration
-EXTERN xdata _AT_(0xE613) volatile BYTE EP4CFG            ;  // Endpoint 4 Configuration
-EXTERN xdata _AT_(0xE614) volatile BYTE EP6CFG            ;  // Endpoint 6 Configuration
-EXTERN xdata _AT_(0xE615) volatile BYTE EP8CFG            ;  // Endpoint 8 Configuration
-EXTERN xdata _AT_(0xE618) volatile BYTE EP2FIFOCFG        ;  // Endpoint 2 FIFO configuration
-EXTERN xdata _AT_(0xE619) volatile BYTE EP4FIFOCFG        ;  // Endpoint 4 FIFO configuration
-EXTERN xdata _AT_(0xE61A) volatile BYTE EP6FIFOCFG        ;  // Endpoint 6 FIFO configuration
-EXTERN xdata _AT_(0xE61B) volatile BYTE EP8FIFOCFG        ;  // Endpoint 8 FIFO configuration
-EXTERN xdata _AT_(0xE620) volatile BYTE EP2AUTOINLENH     ;  // Endpoint 2 Packet Length H (IN only)
-EXTERN xdata _AT_(0xE621) volatile BYTE EP2AUTOINLENL     ;  // Endpoint 2 Packet Length L (IN only)
-EXTERN xdata _AT_(0xE622) volatile BYTE EP4AUTOINLENH     ;  // Endpoint 4 Packet Length H (IN only)
-EXTERN xdata _AT_(0xE623) volatile BYTE EP4AUTOINLENL     ;  // Endpoint 4 Packet Length L (IN only)
-EXTERN xdata _AT_(0xE624) volatile BYTE EP6AUTOINLENH     ;  // Endpoint 6 Packet Length H (IN only)
-EXTERN xdata _AT_(0xE625) volatile BYTE EP6AUTOINLENL     ;  // Endpoint 6 Packet Length L (IN only)
-EXTERN xdata _AT_(0xE626) volatile BYTE EP8AUTOINLENH     ;  // Endpoint 8 Packet Length H (IN only)
-EXTERN xdata _AT_(0xE627) volatile BYTE EP8AUTOINLENL     ;  // Endpoint 8 Packet Length L (IN only)
-EXTERN xdata _AT_(0xE630) volatile BYTE EP2FIFOPFH        ;  // EP2 Programmable Flag trigger H
-EXTERN xdata _AT_(0xE631) volatile BYTE EP2FIFOPFL        ;  // EP2 Programmable Flag trigger L
-EXTERN xdata _AT_(0xE632) volatile BYTE EP4FIFOPFH        ;  // EP4 Programmable Flag trigger H
-EXTERN xdata _AT_(0xE633) volatile BYTE EP4FIFOPFL        ;  // EP4 Programmable Flag trigger L
-EXTERN xdata _AT_(0xE634) volatile BYTE EP6FIFOPFH        ;  // EP6 Programmable Flag trigger H
-EXTERN xdata _AT_(0xE635) volatile BYTE EP6FIFOPFL        ;  // EP6 Programmable Flag trigger L
-EXTERN xdata _AT_(0xE636) volatile BYTE EP8FIFOPFH        ;  // EP8 Programmable Flag trigger H
-EXTERN xdata _AT_(0xE637) volatile BYTE EP8FIFOPFL        ;  // EP8 Programmable Flag trigger L
-EXTERN xdata _AT_(0xE640) volatile BYTE EP2ISOINPKTS      ;  // EP2 (if ISO) IN Packets per frame (1-3)
-EXTERN xdata _AT_(0xE641) volatile BYTE EP4ISOINPKTS      ;  // EP4 (if ISO) IN Packets per frame (1-3)
-EXTERN xdata _AT_(0xE642) volatile BYTE EP6ISOINPKTS      ;  // EP6 (if ISO) IN Packets per frame (1-3)
-EXTERN xdata _AT_(0xE643) volatile BYTE EP8ISOINPKTS      ;  // EP8 (if ISO) IN Packets per frame (1-3)
-EXTERN xdata _AT_(0xE648) volatile BYTE INPKTEND          ;  // Force IN Packet End
-EXTERN xdata _AT_(0xE649) volatile BYTE OUTPKTEND         ;  // Force OUT Packet End
-
-// Interrupts
-
-EXTERN xdata _AT_(0xE650) volatile BYTE EP2FIFOIE         ;  // Endpoint 2 Flag Interrupt Enable
-EXTERN xdata _AT_(0xE651) volatile BYTE EP2FIFOIRQ        ;  // Endpoint 2 Flag Interrupt Request
-EXTERN xdata _AT_(0xE652) volatile BYTE EP4FIFOIE         ;  // Endpoint 4 Flag Interrupt Enable
-EXTERN xdata _AT_(0xE653) volatile BYTE EP4FIFOIRQ        ;  // Endpoint 4 Flag Interrupt Request
-EXTERN xdata _AT_(0xE654) volatile BYTE EP6FIFOIE         ;  // Endpoint 6 Flag Interrupt Enable
-EXTERN xdata _AT_(0xE655) volatile BYTE EP6FIFOIRQ        ;  // Endpoint 6 Flag Interrupt Request
-EXTERN xdata _AT_(0xE656) volatile BYTE EP8FIFOIE         ;  // Endpoint 8 Flag Interrupt Enable
-EXTERN xdata _AT_(0xE657) volatile BYTE EP8FIFOIRQ        ;  // Endpoint 8 Flag Interrupt Request
-EXTERN xdata _AT_(0xE658) volatile BYTE IBNIE             ;  // IN-BULK-NAK Interrupt Enable
-EXTERN xdata _AT_(0xE659) volatile BYTE IBNIRQ            ;  // IN-BULK-NAK interrupt Request
-EXTERN xdata _AT_(0xE65A) volatile BYTE NAKIE             ;  // Endpoint Ping NAK interrupt Enable
-EXTERN xdata _AT_(0xE65B) volatile BYTE NAKIRQ            ;  // Endpoint Ping NAK interrupt Request
-EXTERN xdata _AT_(0xE65C) volatile BYTE USBIE             ;  // USB Int Enables
-EXTERN xdata _AT_(0xE65D) volatile BYTE USBIRQ            ;  // USB Interrupt Requests
-EXTERN xdata _AT_(0xE65E) volatile BYTE EPIE              ;  // Endpoint Interrupt Enables
-EXTERN xdata _AT_(0xE65F) volatile BYTE EPIRQ             ;  // Endpoint Interrupt Requests
-EXTERN xdata _AT_(0xE660) volatile BYTE GPIFIE            ;  // GPIF Interrupt Enable
-EXTERN xdata _AT_(0xE661) volatile BYTE GPIFIRQ           ;  // GPIF Interrupt Request
-EXTERN xdata _AT_(0xE662) volatile BYTE USBERRIE          ;  // USB Error Interrupt Enables
-EXTERN xdata _AT_(0xE663) volatile BYTE USBERRIRQ         ;  // USB Error Interrupt Requests
-EXTERN xdata _AT_(0xE664) volatile BYTE ERRCNTLIM         ;  // USB Error counter and limit
-EXTERN xdata _AT_(0xE665) volatile BYTE CLRERRCNT         ;  // Clear Error Counter EC[3..0]
-EXTERN xdata _AT_(0xE666) volatile BYTE INT2IVEC          ;  // Interupt 2 (USB) Autovector
-EXTERN xdata _AT_(0xE667) volatile BYTE INT4IVEC          ;  // Interupt 4 (FIFOS & GPIF) Autovector
-EXTERN xdata _AT_(0xE668) volatile BYTE INTSETUP          ;  // Interrupt 2&4 Setup
-
-// Input/Output
-
-EXTERN xdata _AT_(0xE670) volatile BYTE PORTACFG          ;  // I/O PORTA Alternate Configuration
-EXTERN xdata _AT_(0xE671) volatile BYTE PORTCCFG          ;  // I/O PORTC Alternate Configuration
-EXTERN xdata _AT_(0xE672) volatile BYTE PORTECFG          ;  // I/O PORTE Alternate Configuration
-EXTERN xdata _AT_(0xE678) volatile BYTE I2CS              ;  // Control & Status
-EXTERN xdata _AT_(0xE679) volatile BYTE I2DAT             ;  // Data
-EXTERN xdata _AT_(0xE67A) volatile BYTE I2CTL             ;  // I2C Control
-EXTERN xdata _AT_(0xE67B) volatile BYTE XAUTODAT1         ;  // Autoptr1 MOVX access
-EXTERN xdata _AT_(0xE67C) volatile BYTE XAUTODAT2         ;  // Autoptr2 MOVX access
-
-#define EXTAUTODAT1 XAUTODAT1
-#define EXTAUTODAT2 XAUTODAT2
-
-// USB Control
-
-EXTERN xdata _AT_(0xE680) volatile BYTE USBCS             ;  // USB Control & Status
-EXTERN xdata _AT_(0xE681) volatile BYTE SUSPEND           ;  // Put chip into suspend
-EXTERN xdata _AT_(0xE682) volatile BYTE WAKEUPCS          ;  // Wakeup source and polarity
-EXTERN xdata _AT_(0xE683) volatile BYTE TOGCTL            ;  // Toggle Control
-EXTERN xdata _AT_(0xE684) volatile BYTE USBFRAMEH         ;  // USB Frame count H
-EXTERN xdata _AT_(0xE685) volatile BYTE USBFRAMEL         ;  // USB Frame count L
-EXTERN xdata _AT_(0xE686) volatile BYTE MICROFRAME        ;  // Microframe count, 0-7
-EXTERN xdata _AT_(0xE687) volatile BYTE FNADDR            ;  // USB Function address
-
-// Endpoints
-
-EXTERN xdata _AT_(0xE68A) volatile BYTE EP0BCH            ;  // Endpoint 0 Byte Count H
-EXTERN xdata _AT_(0xE68B) volatile BYTE EP0BCL            ;  // Endpoint 0 Byte Count L
-EXTERN xdata _AT_(0xE68D) volatile BYTE EP1OUTBC          ;  // Endpoint 1 OUT Byte Count
-EXTERN xdata _AT_(0xE68F) volatile BYTE EP1INBC           ;  // Endpoint 1 IN Byte Count
-EXTERN xdata _AT_(0xE690) volatile BYTE EP2BCH            ;  // Endpoint 2 Byte Count H
-EXTERN xdata _AT_(0xE691) volatile BYTE EP2BCL            ;  // Endpoint 2 Byte Count L
-EXTERN xdata _AT_(0xE694) volatile BYTE EP4BCH            ;  // Endpoint 4 Byte Count H
-EXTERN xdata _AT_(0xE695) volatile BYTE EP4BCL            ;  // Endpoint 4 Byte Count L
-EXTERN xdata _AT_(0xE698) volatile BYTE EP6BCH            ;  // Endpoint 6 Byte Count H
-EXTERN xdata _AT_(0xE699) volatile BYTE EP6BCL            ;  // Endpoint 6 Byte Count L
-EXTERN xdata _AT_(0xE69C) volatile BYTE EP8BCH            ;  // Endpoint 8 Byte Count H
-EXTERN xdata _AT_(0xE69D) volatile BYTE EP8BCL            ;  // Endpoint 8 Byte Count L
-EXTERN xdata _AT_(0xE6A0) volatile BYTE EP0CS             ;  // Endpoint  Control and Status
-EXTERN xdata _AT_(0xE6A1) volatile BYTE EP1OUTCS          ;  // Endpoint 1 OUT Control and Status
-EXTERN xdata _AT_(0xE6A2) volatile BYTE EP1INCS           ;  // Endpoint 1 IN Control and Status
-EXTERN xdata _AT_(0xE6A3) volatile BYTE EP2CS             ;  // Endpoint 2 Control and Status
-EXTERN xdata _AT_(0xE6A4) volatile BYTE EP4CS             ;  // Endpoint 4 Control and Status
-EXTERN xdata _AT_(0xE6A5) volatile BYTE EP6CS             ;  // Endpoint 6 Control and Status
-EXTERN xdata _AT_(0xE6A6) volatile BYTE EP8CS             ;  // Endpoint 8 Control and Status
-EXTERN xdata _AT_(0xE6A7) volatile BYTE EP2FIFOFLGS       ;  // Endpoint 2 Flags
-EXTERN xdata _AT_(0xE6A8) volatile BYTE EP4FIFOFLGS       ;  // Endpoint 4 Flags
-EXTERN xdata _AT_(0xE6A9) volatile BYTE EP6FIFOFLGS       ;  // Endpoint 6 Flags
-EXTERN xdata _AT_(0xE6AA) volatile BYTE EP8FIFOFLGS       ;  // Endpoint 8 Flags
-EXTERN xdata _AT_(0xE6AB) volatile BYTE EP2FIFOBCH        ;  // EP2 FIFO total byte count H
-EXTERN xdata _AT_(0xE6AC) volatile BYTE EP2FIFOBCL        ;  // EP2 FIFO total byte count L
-EXTERN xdata _AT_(0xE6AD) volatile BYTE EP4FIFOBCH        ;  // EP4 FIFO total byte count H
-EXTERN xdata _AT_(0xE6AE) volatile BYTE EP4FIFOBCL        ;  // EP4 FIFO total byte count L
-EXTERN xdata _AT_(0xE6AF) volatile BYTE EP6FIFOBCH        ;  // EP6 FIFO total byte count H
-EXTERN xdata _AT_(0xE6B0) volatile BYTE EP6FIFOBCL        ;  // EP6 FIFO total byte count L
-EXTERN xdata _AT_(0xE6B1) volatile BYTE EP8FIFOBCH        ;  // EP8 FIFO total byte count H
-EXTERN xdata _AT_(0xE6B2) volatile BYTE EP8FIFOBCL        ;  // EP8 FIFO total byte count L
-EXTERN xdata _AT_(0xE6B3) volatile BYTE SUDPTRH           ;  // Setup Data Pointer high address byte
-EXTERN xdata _AT_(0xE6B4) volatile BYTE SUDPTRL           ;  // Setup Data Pointer low address byte
-EXTERN xdata _AT_(0xE6B5) volatile BYTE SUDPTRCTL         ;  // Setup Data Pointer Auto Mode
-EXTERN xdata _AT_(0xE6B8) volatile BYTE SETUPDAT[8]       ;  // 8 bytes of SETUP data
-
-// GPIF
-
-EXTERN xdata _AT_(0xE6C0) volatile BYTE GPIFWFSELECT      ;  // Waveform Selector
-EXTERN xdata _AT_(0xE6C1) volatile BYTE GPIFIDLECS        ;  // GPIF Done, GPIF IDLE drive mode
-EXTERN xdata _AT_(0xE6C2) volatile BYTE GPIFIDLECTL       ;  // Inactive Bus, CTL states
-EXTERN xdata _AT_(0xE6C3) volatile BYTE GPIFCTLCFG        ;  // CTL OUT pin drive
-EXTERN xdata _AT_(0xE6C4) volatile BYTE GPIFADRH          ;  // GPIF Address H
-EXTERN xdata _AT_(0xE6C5) volatile BYTE GPIFADRL          ;  // GPIF Address L
-
-EXTERN xdata _AT_(0xE6CE) volatile BYTE GPIFTCB3          ;  // GPIF Transaction Count Byte 3
-EXTERN xdata _AT_(0xE6CF) volatile BYTE GPIFTCB2          ;  // GPIF Transaction Count Byte 2
-EXTERN xdata _AT_(0xE6D0) volatile BYTE GPIFTCB1          ;  // GPIF Transaction Count Byte 1
-EXTERN xdata _AT_(0xE6D1) volatile BYTE GPIFTCB0          ;  // GPIF Transaction Count Byte 0
-
-#define EP2GPIFTCH GPIFTCB1   // these are here for backwards compatibility
-#define EP2GPIFTCL GPIFTCB0   // before REVE silicon (ie. REVB and REVD)
-#define EP4GPIFTCH GPIFTCB1   // these are here for backwards compatibility
-#define EP4GPIFTCL GPIFTCB0   // before REVE silicon (ie. REVB and REVD)
-#define EP6GPIFTCH GPIFTCB1   // these are here for backwards compatibility
-#define EP6GPIFTCL GPIFTCB0   // before REVE silicon (ie. REVB and REVD)
-#define EP8GPIFTCH GPIFTCB1   // these are here for backwards compatibility
-#define EP8GPIFTCL GPIFTCB0   // before REVE silicon (ie. REVB and REVD)
-
-// EXTERN xdata volatile BYTE EP2GPIFTCH     _AT_ 0xE6D0;  // EP2 GPIF Transaction Count High
-// EXTERN xdata volatile BYTE EP2GPIFTCL     _AT_ 0xE6D1;  // EP2 GPIF Transaction Count Low
-EXTERN xdata _AT_(0xE6D2) volatile BYTE EP2GPIFFLGSEL     ;  // EP2 GPIF Flag select
-EXTERN xdata _AT_(0xE6D3) volatile BYTE EP2GPIFPFSTOP     ;  // Stop GPIF EP2 transaction on prog. flag
-EXTERN xdata _AT_(0xE6D4) volatile BYTE EP2GPIFTRIG       ;  // EP2 FIFO Trigger
-// EXTERN xdata volatile BYTE EP4GPIFTCH     _AT_ 0xE6D8;  // EP4 GPIF Transaction Count High
-// EXTERN xdata volatile BYTE EP4GPIFTCL     _AT_ 0xE6D9;  // EP4 GPIF Transactionr Count Low
-EXTERN xdata _AT_(0xE6DA) volatile BYTE EP4GPIFFLGSEL     ;  // EP4 GPIF Flag select
-EXTERN xdata _AT_(0xE6DB) volatile BYTE EP4GPIFPFSTOP     ;  // Stop GPIF EP4 transaction on prog. flag
-EXTERN xdata _AT_(0xE6DC) volatile BYTE EP4GPIFTRIG       ;  // EP4 FIFO Trigger
-// EXTERN xdata volatile BYTE EP6GPIFTCH     _AT_ 0xE6E0;  // EP6 GPIF Transaction Count High
-// EXTERN xdata volatile BYTE EP6GPIFTCL     _AT_ 0xE6E1;  // EP6 GPIF Transaction Count Low
-EXTERN xdata _AT_(0xE6E2) volatile BYTE EP6GPIFFLGSEL     ;  // EP6 GPIF Flag select
-EXTERN xdata _AT_(0xE6E3) volatile BYTE EP6GPIFPFSTOP     ;  // Stop GPIF EP6 transaction on prog. flag
-EXTERN xdata _AT_(0xE6E4) volatile BYTE EP6GPIFTRIG       ;  // EP6 FIFO Trigger
-// EXTERN xdata volatile BYTE EP8GPIFTCH     _AT_ 0xE6E8;  // EP8 GPIF Transaction Count High
-// EXTERN xdata volatile BYTE EP8GPIFTCL     _AT_ 0xE6E9;  // EP8GPIF Transaction Count Low
-EXTERN xdata _AT_(0xE6EA) volatile BYTE EP8GPIFFLGSEL     ;  // EP8 GPIF Flag select
-EXTERN xdata _AT_(0xE6EB) volatile BYTE EP8GPIFPFSTOP     ;  // Stop GPIF EP8 transaction on prog. flag
-EXTERN xdata _AT_(0xE6EC) volatile BYTE EP8GPIFTRIG       ;  // EP8 FIFO Trigger
-EXTERN xdata _AT_(0xE6F0) volatile BYTE XGPIFSGLDATH      ;  // GPIF Data H (16-bit mode only)
-EXTERN xdata _AT_(0xE6F1) volatile BYTE XGPIFSGLDATLX     ;  // Read/Write GPIF Data L & trigger transac
-EXTERN xdata _AT_(0xE6F2) volatile BYTE XGPIFSGLDATLNOX   ;  // Read GPIF Data L, no transac trigger
-EXTERN xdata _AT_(0xE6F3) volatile BYTE GPIFREADYCFG      ;  // Internal RDY,Sync/Async, RDY5CFG
-EXTERN xdata _AT_(0xE6F4) volatile BYTE GPIFREADYSTAT     ;  // RDY pin states
-EXTERN xdata _AT_(0xE6F5) volatile BYTE GPIFABORT         ;  // Abort GPIF cycles
-
-// UDMA
-
-EXTERN xdata _AT_(0xE6C6) volatile BYTE FLOWSTATE         ; //Defines GPIF flow state
-EXTERN xdata _AT_(0xE6C7) volatile BYTE FLOWLOGIC         ; //Defines flow/hold decision criteria
-EXTERN xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL        ; //CTL states during active flow state
-EXTERN xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL        ; //CTL states during hold flow state
-EXTERN xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF       ;
-EXTERN xdata _AT_(0xE6CB) volatile BYTE FLOWSTB           ; //CTL/RDY Signal to use as master data strobe 
-EXTERN xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE       ; //Defines active master strobe edge
-EXTERN xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD    ; //Half Period of output master strobe
-EXTERN xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT    ; //Data delay shift 
-EXTERN xdata _AT_(0xE67D) volatile BYTE UDMACRCH          ; //CRC Upper byte
-EXTERN xdata _AT_(0xE67E) volatile BYTE UDMACRCL          ; //CRC Lower byte
-EXTERN xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL       ; //UDMA In only, host terminated use only
-
-
-// Debug/Test
-
-EXTERN xdata _AT_(0xE6F8) volatile BYTE DBUG              ;  // Debug
-EXTERN xdata _AT_(0xE6F9) volatile BYTE TESTCFG           ;  // Test configuration
-EXTERN xdata _AT_(0xE6FA) volatile BYTE USBTEST           ;  // USB Test Modes
-EXTERN xdata _AT_(0xE6FB) volatile BYTE CT1               ;  // Chirp Test--Override
-EXTERN xdata _AT_(0xE6FC) volatile BYTE CT2               ;  // Chirp Test--FSM
-EXTERN xdata _AT_(0xE6FD) volatile BYTE CT3               ;  // Chirp Test--Control Signals
-EXTERN xdata _AT_(0xE6FE) volatile BYTE CT4               ;  // Chirp Test--Inputs
-
-// Endpoint Buffers
-
-EXTERN xdata _AT_(0xE740) volatile BYTE EP0BUF[64]        ;  // EP0 IN-OUT buffer
-EXTERN xdata _AT_(0xE780) volatile BYTE EP1OUTBUF[64]     ;  // EP1-OUT buffer
-EXTERN xdata _AT_(0xE7C0) volatile BYTE EP1INBUF[64]      ;  // EP1-IN buffer
-EXTERN xdata _AT_(0xF000) volatile BYTE EP2FIFOBUF[1024]  ;  // 512/1024-byte EP2 buffer (IN or OUT)
-EXTERN xdata _AT_(0xF400) volatile BYTE EP4FIFOBUF[1024]  ;  // 512 byte EP4 buffer (IN or OUT)
-EXTERN xdata _AT_(0xF800) volatile BYTE EP6FIFOBUF[1024]  ;  // 512/1024-byte EP6 buffer (IN or OUT)
-EXTERN xdata _AT_(0xFC00) volatile BYTE EP8FIFOBUF[1024]  ;  // 512 byte EP8 buffer (IN or OUT)
-
-#undef EXTERN
-#undef _AT_
-
-/*-----------------------------------------------------------------------------
-   Special Function Registers (SFRs)
-   The byte registers and bits defined in the following list are based
-   on the Synopsis definition of the 8051 Special Function Registers for EZ-USB. 
-    If you modify the register definitions below, please regenerate the file 
-    "ezregs.inc" which includes the same basic information for assembly inclusion.
------------------------------------------------------------------------------*/
-
-sfr at 0x80 IOA;
-sfr at 0x81 SP;
-sfr at 0x82 DPL;
-sfr at 0x83 DPH;
-sfr at 0x84 DPL1;
-sfr at 0x85 DPH1;
-sfr at 0x86 DPS;
-         /*  DPS  */
-         sbit at 0x86+0 SEL;
-sfr at 0x87 PCON;   /*  PCON  */
-         //sbit IDLE   = 0x87+0;
-         //sbit STOP   = 0x87+1;
-         //sbit GF0    = 0x87+2;
-         //sbit GF1    = 0x87+3;
-         //sbit SMOD0  = 0x87+7;
-sfr at 0x88 TCON;
-         /*  TCON  */
-         sbit at 0x88+0 IT0;
-         sbit at 0x88+1 IE0;
-         sbit at 0x88+2 IT1;
-         sbit at 0x88+3 IE1;
-         sbit at 0x88+4 TR0;
-         sbit at 0x88+5 TF0;
-         sbit at 0x88+6 TR1;
-         sbit at 0x88+7 TF1;
-sfr at 0x89 TMOD;
-         /*  TMOD  */
-         //sbit M00    = 0x89+0;
-         //sbit M10    = 0x89+1;
-         //sbit CT0    = 0x89+2;
-         //sbit GATE0  = 0x89+3;
-         //sbit M01    = 0x89+4;
-         //sbit M11    = 0x89+5;
-         //sbit CT1    = 0x89+6;
-         //sbit GATE1  = 0x89+7;
-sfr at 0x8A TL0;
-sfr at 0x8B TL1;
-sfr at 0x8C TH0;
-sfr at 0x8D TH1;
-sfr at 0x8E CKCON;
-         /*  CKCON  */
-         //sbit MD0    = 0x89+0;
-         //sbit MD1    = 0x89+1;
-         //sbit MD2    = 0x89+2;
-         //sbit T0M    = 0x89+3;
-         //sbit T1M    = 0x89+4;
-         //sbit T2M    = 0x89+5;
-// sfr at 0x8F SPC_FNC; // Was WRS in Reg320
-         /*  CKCON  */
-         //sbit WRS    = 0x8F+0;
-sfr at 0x90 IOB;
-sfr at 0x91 EXIF; // EXIF Bit Values differ from Reg320
-         /*  EXIF  */
-         //sbit USBINT = 0x91+4;
-         //sbit I2CINT = 0x91+5;
-         //sbit IE4    = 0x91+6;
-         //sbit IE5    = 0x91+7;
-sfr at 0x92 MPAGE;
-sfr at 0x98 SCON0;
-         /*  SCON0  */
-         sbit at 0x98+0 RI;
-         sbit at 0x98+1 TI;
-         sbit at 0x98+2 RB8;
-         sbit at 0x98+3 TB8;
-         sbit at 0x98+4 REN;
-         sbit at 0x98+5 SM2;
-         sbit at 0x98+6 SM1;
-         sbit at 0x98+7 SM0;
-sfr at 0x99 SBUF0;
-
-sfr at 0x9A APTR1H;
-sfr at 0x9B APTR1L;
-sfr at 0x9C AUTODAT1; 
-sfr at 0x9D AUTOPTRH2;
-sfr at 0x9E AUTOPTRL2; 
-sfr at 0x9F AUTODAT2;
-sfr at 0xA0 IOC;
-sfr at 0xA1 INT2CLR;
-sfr at 0xA2 INT4CLR;
-
-#define	AUTOPTRH1	APTR1H
-#define	AUTOPTRL1	APTR1L
-
-sfr at 0xA8 IE;
-         /*  IE  */
-         sbit at 0xA8+0 EX0;
-         sbit at 0xA8+1 ET0;
-         sbit at 0xA8+2 EX1;
-         sbit at 0xA8+3 ET1;
-         sbit at 0xA8+4 ES0;
-         sbit at 0xA8+5 ET2;
-         sbit at 0xA8+6 ES1;
-         sbit at 0xA8+7 EA;
-
-sfr at 0xAA EP2468STAT;
-         /* EP2468STAT */
-         //sbit EP2E   = 0xAA+0;
-         //sbit EP2F   = 0xAA+1;
-         //sbit EP4E   = 0xAA+2;
-         //sbit EP4F   = 0xAA+3;
-         //sbit EP6E   = 0xAA+4;
-         //sbit EP6F   = 0xAA+5;
-         //sbit EP8E   = 0xAA+6;
-         //sbit EP8F   = 0xAA+7;
-
-sfr at 0xAB EP24FIFOFLGS;
-sfr at 0xAC EP68FIFOFLGS;
-sfr at 0xAF AUTOPTRSETUP;
-            /* AUTOPTRSETUP */
-            // sbit EXTACC  = 0xAF+0;
-            // sbit APTR1FZ = 0xAF+1;
-            // sbit APTR2FZ = 0xAF+2;
-
-sfr at 0xB0 IOD;
-sfr at 0xB1 IOE;
-sfr at 0xB2 OEA;
-sfr at 0xB3 OEB;
-sfr at 0xB4 OEC;
-sfr at 0xB5 OED;
-sfr at 0xB6 OEE;
-
-sfr at 0xB8 IP;
-         /*  IP  */
-         sbit at 0xB8+0 PX0;
-         sbit at 0xB8+1 PT0;
-         sbit at 0xB8+2 PX1;
-         sbit at 0xB8+3 PT1;
-         sbit at 0xB8+4 PS0;
-         sbit at 0xB8+5 PT2;
-         sbit at 0xB8+6 PS1;
-
-sfr at 0xBA EP01STAT;
-sfr at 0xBB GPIFTRIG;
-                
-sfr at 0xBD GPIFSGLDATH;
-sfr at 0xBE GPIFSGLDATLX;
-sfr at 0xBF GPIFSGLDATLNOX;
-
-sfr at 0xC0 SCON1;
-         /*  SCON1  */
-         sbit at 0xC0+0 RI1;
-         sbit at 0xC0+1 TI1;
-         sbit at 0xC0+2 RB81;
-         sbit at 0xC0+3 TB81;
-         sbit at 0xC0+4 REN1;
-         sbit at 0xC0+5 SM21;
-         sbit at 0xC0+6 SM11;
-         sbit at 0xC0+7 SM01;
-sfr at 0xC1 SBUF1;
-sfr at 0xC8 T2CON;
-         /*  T2CON  */
-	 sbit at 0xC8+0 CP_RL2;
-	 sbit at 0xC8+1 C_T2;
-         sbit at 0xC8+2 TR2;
-         sbit at 0xC8+3 EXEN2;
-         sbit at 0xC8+4 TCLK;
-         sbit at 0xC8+5 RCLK;
-         sbit at 0xC8+6 EXF2;
-         sbit at 0xC8+7 TF2;
-sfr at 0xCA RCAP2L;
-sfr at 0xCB RCAP2H;
-sfr at 0xCC TL2;
-sfr at 0xCD TH2;
-sfr at 0xD0 PSW;
-         /*  PSW  */
-         sbit at 0xD0+0 P;
-         sbit at 0xD0+1 FL;
-         sbit at 0xD0+2 OV;
-         sbit at 0xD0+3 RS0;
-         sbit at 0xD0+4 RS1;
-         sbit at 0xD0+5 F0;
-         sbit at 0xD0+6 AC;
-         sbit at 0xD0+7 CY;
-sfr at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320
-         /*  EICON  */
-         sbit at 0xD8+3 INT6;
-         sbit at 0xD8+4 RESI;
-         sbit at 0xD8+5 ERESI;
-         sbit at 0xD8+7 SMOD1;
-sfr at 0xE0 ACC;
-sfr at 0xE8 EIE; // EIE Bit Values differ from Reg320
-                        /*  EIE  */
-         sbit at 0xE8+0 EIUSB;
-         sbit at 0xE8+1 EI2C;
-         sbit at 0xE8+2 EIEX4;
-         sbit at 0xE8+3 EIEX5;
-         sbit at 0xE8+4 EIEX6;
-sfr at 0xF0 B;
-sfr at 0xF8 EIP; // EIP Bit Values differ from Reg320
-                        /*  EIP  */
-         sbit at 0xF8+0 PUSB;
-         sbit at 0xF8+1 PI2C;
-         sbit at 0xF8+2 EIPX4;
-         sbit at 0xF8+3 EIPX5;
-         sbit at 0xF8+4 EIPX6;
-
-/*-----------------------------------------------------------------------------
-   Bit Masks
------------------------------------------------------------------------------*/
-
-#define bmBIT0	1
-#define bmBIT1	2
-#define bmBIT2	4
-#define bmBIT3	8
-#define bmBIT4	16
-#define bmBIT5	32
-#define bmBIT6	64
-#define bmBIT7	128
-
-/* CPU Control & Status Register (CPUCS) */
-#define bmPRTCSTB    bmBIT5
-#define bmCLKSPD     (bmBIT4 | bmBIT3)
-#define bmCLKSPD1    bmBIT4
-#define bmCLKSPD0    bmBIT3
-#define bmCLKINV     bmBIT2
-#define bmCLKOE      bmBIT1
-#define bm8051RES    bmBIT0
-/* Port Alternate Configuration Registers */
-/* Port A (PORTACFG) */
-#define bmFLAGD      bmBIT7
-#define bmINT1       bmBIT1
-#define bmINT0       bmBIT0
-/* Port C (PORTCCFG) */
-#define bmGPIFA7     bmBIT7
-#define bmGPIFA6     bmBIT6
-#define bmGPIFA5     bmBIT5
-#define bmGPIFA4     bmBIT4
-#define bmGPIFA3     bmBIT3
-#define bmGPIFA2     bmBIT2
-#define bmGPIFA1     bmBIT1
-#define bmGPIFA0     bmBIT0
-/* Port E (PORTECFG) */
-#define bmGPIFA8     bmBIT7
-#define bmT2EX       bmBIT6
-#define bmINT6       bmBIT5
-#define bmRXD1OUT    bmBIT4
-#define bmRXD0OUT    bmBIT3
-#define bmT2OUT      bmBIT2
-#define bmT1OUT      bmBIT1
-#define bmT0OUT      bmBIT0
-
-/* I2C Control & Status Register (I2CS) */
-#define bmSTART      bmBIT7
-#define bmSTOP       bmBIT6
-#define bmLASTRD     bmBIT5
-#define bmID         (bmBIT4 | bmBIT3)
-#define bmBERR       bmBIT2
-#define bmACK        bmBIT1
-#define bmDONE       bmBIT0
-/* I2C Control Register (I2CTL) */
-#define bmSTOPIE     bmBIT1
-#define bm400KHZ     bmBIT0
-/* Interrupt 2 (USB) Autovector Register (INT2IVEC) */
-#define bmIV4        bmBIT6
-#define bmIV3        bmBIT5
-#define bmIV2        bmBIT4
-#define bmIV1        bmBIT3
-#define bmIV0        bmBIT2
-/* USB Interrupt Request & Enable Registers (USBIE/USBIRQ) */
-#define bmEP0ACK     bmBIT6
-#define bmHSGRANT    bmBIT5
-#define bmURES       bmBIT4
-#define bmSUSP       bmBIT3
-#define bmSUTOK      bmBIT2
-#define bmSOF        bmBIT1
-#define bmSUDAV      bmBIT0
-/* Breakpoint register (BREAKPT) */
-#define bmBREAK      bmBIT3
-#define bmBPPULSE    bmBIT2
-#define bmBPEN       bmBIT1
-/* Interrupt 2 & 4 Setup (INTSETUP) */
-#define bmAV2EN      bmBIT3
-#define bmINT4IN     bmBIT1
-#define bmAV4EN      bmBIT0
-/* USB Control & Status Register (USBCS) */
-#define bmHSM        bmBIT7
-#define bmDISCON     bmBIT3
-#define bmNOSYNSOF   bmBIT2
-#define bmRENUM      bmBIT1
-#define bmSIGRESUME  bmBIT0
-/* Wakeup Control and Status Register (WAKEUPCS) */
-#define bmWU2        bmBIT7
-#define bmWU         bmBIT6
-#define bmWU2POL     bmBIT5
-#define bmWUPOL      bmBIT4
-#define bmDPEN       bmBIT2
-#define bmWU2EN      bmBIT1
-#define bmWUEN       bmBIT0
-/* End Point 0 Control & Status Register (EP0CS) */
-#define bmHSNAK      bmBIT7
-/* End Point 0-1 Control & Status Registers (EP0CS/EP1OUTCS/EP1INCS) */
-#define bmEPBUSY     bmBIT1
-#define bmEPSTALL    bmBIT0
-/* End Point 2-8 Control & Status Registers (EP2CS/EP4CS/EP6CS/EP8CS) */
-#define bmNPAK       (bmBIT6 | bmBIT5 | bmBIT4)
-#define bmEPFULL     bmBIT3
-#define bmEPEMPTY    bmBIT2
-/* Endpoint Status (EP2468STAT) SFR bits */
-#define bmEP8FULL    bmBIT7
-#define bmEP8EMPTY   bmBIT6
-#define bmEP6FULL    bmBIT5
-#define bmEP6EMPTY   bmBIT4
-#define bmEP4FULL    bmBIT3
-#define bmEP4EMPTY   bmBIT2
-#define bmEP2FULL    bmBIT1
-#define bmEP2EMPTY   bmBIT0
-/* SETUP Data Pointer Auto Mode (SUDPTRCTL) */
-#define bmSDPAUTO    bmBIT0
-/* Endpoint Data Toggle Control (TOGCTL) */
-#define bmQUERYTOGGLE  bmBIT7
-#define bmSETTOGGLE    bmBIT6
-#define bmRESETTOGGLE  bmBIT5
-#define bmTOGCTLEPMASK bmBIT3 | bmBIT2 | bmBIT1 | bmBIT0
-/* IBN (In Bulk Nak) enable and request bits (IBNIE/IBNIRQ) */
-#define bmEP8IBN     bmBIT5
-#define bmEP6IBN     bmBIT4
-#define bmEP4IBN     bmBIT3
-#define bmEP2IBN     bmBIT2
-#define bmEP1IBN     bmBIT1
-#define bmEP0IBN     bmBIT0
-
-/* PING-NAK enable and request bits (NAKIE/NAKIRQ) */
-#define bmEP8PING     bmBIT7
-#define bmEP6PING     bmBIT6
-#define bmEP4PING     bmBIT5
-#define bmEP2PING     bmBIT4
-#define bmEP1PING     bmBIT3
-#define bmEP0PING     bmBIT2
-#define bmIBN         bmBIT0
-
-/* Interface Configuration bits (IFCONFIG) */
-#define bmIFCLKSRC    bmBIT7		// set == INTERNAL
-#define bm3048MHZ     bmBIT6		// set == 48 MHz
-#define bmIFCLKOE     bmBIT5
-#define bmIFCLKPOL    bmBIT4
-#define bmASYNC       bmBIT3
-#define bmGSTATE      bmBIT2
-#define bmIFCFG1      bmBIT1
-#define bmIFCFG0      bmBIT0
-#define bmIFCFGMASK   (bmIFCFG0 | bmIFCFG1)
-#define bmIFGPIF      bmIFCFG1
-
-/* EP 2468 FIFO Configuration bits (EP2FIFOCFG,EP4FIFOCFG,EP6FIFOCFG,EP8FIFOCFG) */
-#define bmINFM       bmBIT6
-#define bmOEP        bmBIT5
-#define bmAUTOOUT    bmBIT4
-#define bmAUTOIN     bmBIT3
-#define bmZEROLENIN  bmBIT2
-//   must be zero    bmBIT1
-#define bmWORDWIDE   bmBIT0
-
-/*
- * Chip Revision Control Bits (REVCTL) - used to ebable/disable revision specific features
- */ 
-#define bmNOAUTOARM    bmBIT1	// these don't match the docs
-#define bmSKIPCOMMIT   bmBIT0	// these don't match the docs
-
-#define	bmDYN_OUT      bmBIT1	// these do...
-#define	bmENH_PKT      bmBIT0
-
-
-/* Fifo Reset bits (FIFORESET) */
-#define bmNAKALL       bmBIT7
-
-/* Endpoint Configuration (EPxCFG) */
-#define	bmVALID		bmBIT7
-#define	bmIN		bmBIT6
-#define	bmTYPE1		bmBIT5
-#define	bmTYPE0		bmBIT4
-#define	  bmISOCHRONOUS		bmTYPE0
-#define	  bmBULK		bmTYPE1
-#define	  bmINTERRUPT	       (bmTYPE1 | bmTYPE0)
-#define	bm1KBUF		bmBIT3
-#define	bmBUF1		bmBIT1
-#define	bmBUF0		bmBIT0
-#define	  bmQUADBUF		0
-#define	  bmINVALIDBUF		bmBUF0
-#define	  bmDOUBLEBUF		bmBUF1
-#define	  bmTRIPLEBUF		(bmBUF1 | bmBUF0)
-
-/* OUTPKTEND */
-#define	bmSKIP		bmBIT7	// low 4 bits specify which end point
-
-/* GPIFTRIG defs */
-#define	bmGPIF_IDLE		bmBIT7		// status bit
-
-#define	bmGPIF_EP2_START     	     0
-#define	bmGPIF_EP4_START             1
-#define	bmGPIF_EP6_START             2
-#define	bmGPIF_EP8_START             3
-#define	bmGPIF_READ		bmBIT2
-#define	bmGPIF_WRITE		     0
-
-/* EXIF bits */
-#define	bmEXIF_USBINT		bmBIT4
-#define	bmEXIF_I2CINT		bmBIT5
-#define	bmEXIF_IE4		bmBIT6
-#define	bmEXIF_IE5		bmBIT7
-
-
-#endif   /* FX2REGS_H */
diff --git a/usrp/firmware/include/generate_regs.py b/usrp/firmware/include/generate_regs.py
deleted file mode 100755
index 656cd5e81..000000000
--- a/usrp/firmware/include/generate_regs.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-
-import os, os.path
-import re
-import sys
-
-
-# set srcdir to the directory that contains Makefile.am
-try:
-    srcdir = os.environ['srcdir']
-except KeyError, e:
-    srcdir = "."
-srcdir = srcdir + '/'
-
-def open_src (name, mode):
-    global srcdir
-    return open (os.path.join (srcdir, name), mode)
-
-
-def generate_fpga_regs (h_filename, v_filename):
-    const_width = 7                  # bit width of constants
-    
-    h_file = open_src (h_filename, 'r')
-    v_file = open (v_filename, 'w')
-    v_file.write (
-    '''//
-// This file is machine generated from %s
-// Do not edit by hand; your edits will be overwritten.
-//
-''' % (h_filename,))
-
-    pat = re.compile (r'^#define\s*(FR_\w*)\s*(\w*)(.*)$')
-    pat_bitno = re.compile (r'^#define\s*(bitno\w*)\s*(\w*)(.*)$')
-    pat_bm = re.compile (r'^#define\s*(bm\w*)\s*(\w*)(.*)$')
-    for line in h_file:
-        if re.match ('//|\s*$', line):  # comment or blank line
-            v_file.write (line)
-        mo = pat.search (line)
-        mo_bitno =pat_bitno.search (line)
-        mo_bm =pat_bm.search (line)
-        if mo:
-            v_file.write ('`define %-25s %d\'d%s%s\n' % (
-                mo.group (1), const_width, mo.group (2), mo.group (3)))
-        elif mo_bitno:
-            v_file.write ('`define %-25s %s%s\n' % (
-                mo_bitno.group (1), mo_bitno.group (2), mo_bitno.group (3)))
-        elif mo_bm:
-            v_file.write ('`define %-25s %s%s\n' % (
-                mo_bm.group (1), mo_bm.group (2), mo_bm.group (3)))
-    
-
-if __name__ == '__main__':
-    if len (sys.argv) != 3:
-        sys.stderr.write ('usage: %s file.h file.v\n' % (sys.argv[0]))
-        sys.exit (1)
-    generate_fpga_regs (sys.argv[1], sys.argv[2])
-    
diff --git a/usrp/firmware/include/i2c.h b/usrp/firmware/include/i2c.h
deleted file mode 100644
index 273526dad..000000000
--- a/usrp/firmware/include/i2c.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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 _I2C_H_
-#define _I2C_H_
-
-// returns non-zero if successful, else 0
-unsigned char i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len);
-
-// returns non-zero if successful, else 0
-unsigned char i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len);
-
-#endif /* _I2C_H_ */
diff --git a/usrp/firmware/include/isr.h b/usrp/firmware/include/isr.h
deleted file mode 100644
index 856532890..000000000
--- a/usrp/firmware/include/isr.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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 _ISR_H_
-#define _ISR_H_
-
-/*
- * ----------------------------------------------------------------
- *	routines for managing interrupt services routines
- * ----------------------------------------------------------------
- */
-
-/*
- * The FX2 has three discrete sets of interrupt vectors.
- * The first set is the standard 8051 vector (13 8-byte entries).
- * The second set is USB interrupt autovector (32 4-byte entries).
- * The third set is the FIFO/GPIF autovector (14 4-byte entries).
- *
- * Since all the code we're running in the FX2 is ram based, we
- * forego the typical "initialize the interrupt vectors at link time"
- * strategy, in favor of calls at run time that install the correct
- * pointers to functions.
- */
-
-/*
- * Standard Vector numbers
- */
-
-#define	SV_INT_0		0x03
-#define	SV_TIMER_0		0x0b
-#define	SV_INT_1		0x13
-#define	SV_TIMER_1		0x1b
-#define	SV_SERIAL_0		0x23
-#define	SV_TIMER_2		0x2b
-#define	SV_RESUME		0x33
-#define	SV_SERIAL_1		0x3b
-#define	SV_INT_2		0x43		// (INT_2) points at USB autovector
-#define	SV_I2C			0x4b
-#define	SV_INT_4		0x53		// (INT_4) points at FIFO/GPIF autovector
-#define	SV_INT_5		0x5b
-#define	SV_INT_6		0x63
-
-#define	SV_MIN			SV_INT_0
-#define	SV_MAX			SV_INT_6
-
-/*
- * USB Auto Vector numbers
- */
-
-#define	UV_SUDAV		0x00
-#define	UV_SOF			0x04
-#define	UV_SUTOK		0x08
-#define	UV_SUSPEND		0x0c
-#define	UV_USBRESET		0x10
-#define	UV_HIGHSPEED		0x14
-#define	UV_EP0ACK		0x18
-#define	UV_SPARE_1C		0x1c
-#define	UV_EP0IN		0x20
-#define	UV_EP0OUT		0x24
-#define	UV_EP1IN		0x28
-#define	UV_EP1OUT		0x2c
-#define	UV_EP2			0x30
-#define	UV_EP4			0x34
-#define	UV_EP6			0x38
-#define	UV_EP8			0x3c
-#define	UV_IBN			0x40
-#define	UV_SPARE_44		0x44
-#define	UV_EP0PINGNAK		0x48
-#define	UV_EP1PINGNAK		0x4c
-#define	UV_EP2PINGNAK		0x50
-#define	UV_EP4PINGNAK		0x54
-#define	UV_EP6PINGNAK		0x58
-#define	UV_EP8PINGNAK		0x5c
-#define	UV_ERRLIMIT		0x60
-#define	UV_SPARE_64		0x64
-#define	UV_SPARE_68		0x68
-#define	UV_SPARE_6C		0x6c
-#define	UV_EP2ISOERR		0x70
-#define	UV_EP4ISOERR		0x74
-#define	UV_EP6ISOERR		0x78
-#define	UV_EP8ISOERR		0x7c
-
-#define	UV_MIN			UV_SUDAV
-#define	UV_MAX			UV_EP8ISOERR
-
-/*
- * FIFO/GPIF Auto Vector numbers
- */
-
-#define	FGV_EP2PF		0x00
-#define	FGV_EP4PF		0x04
-#define	FGV_EP6PF		0x08
-#define	FGV_EP8PF		0x0c
-#define	FGV_EP2EF		0x10
-#define	FGV_EP4EF		0x14
-#define	FGV_EP6EF		0x18
-#define	FGV_EP8EF		0x1c
-#define	FGV_EP2FF		0x20
-#define	FGV_EP4FF		0x24
-#define	FGV_EP6FF		0x28
-#define	FGV_EP8FF		0x2c
-#define	FGV_GPIFDONE		0x30
-#define	FGV_GPIFWF		0x34
-
-#define	FGV_MIN			FGV_EP2PF
-#define	FGV_MAX			FGV_GPIFWF
-
-
-/*
- * Hook standard interrupt vector.
- *
- * vector_number is from the SV_<foo> list above.
- * addr is the address of the interrupt service routine.
- */
-void hook_sv (unsigned char vector_number, unsigned short addr);
-
-/*
- * Hook usb interrupt vector.
- *
- * vector_number is from the UV_<foo> list above.
- * addr is the address of the interrupt service routine.
- */
-void hook_uv (unsigned char vector_number, unsigned short addr);
-
-/*
- * Hook fifo/gpif interrupt vector.
- *
- * vector_number is from the FGV_<foo> list above.
- * addr is the address of the interrupt service routine.
- */
-void hook_fgv (unsigned char vector_number, unsigned short addr);
-
-/*
- * One time call to enable autovectoring for both USB and FIFO/GPIF
- */
-void setup_autovectors (void);
-
-
-/*
- * Must be called in each usb interrupt handler
- */
-#define	clear_usb_irq()			\
-	EXIF &= ~bmEXIF_USBINT;		\
-	INT2CLR = 0
-
-/*
- * Must be calledin each fifo/gpif interrupt handler
- */
-#define	clear_fifo_gpif_irq()		\
-	EXIF &= ~bmEXIF_IE4;		\
-	INT4CLR = 0
-
-#endif /* _ISR_H_ */
diff --git a/usrp/firmware/include/syncdelay.h b/usrp/firmware/include/syncdelay.h
deleted file mode 100644
index 0af7d099f..000000000
--- a/usrp/firmware/include/syncdelay.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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 _SYNCDELAY_H_
-#define _SYNCDELAY_H_
-
-/*
- * Magic delay required between access to certain xdata registers (TRM page 15-106).
- * For our configuration, 48 MHz FX2 / 48 MHz IFCLK, we need three cycles.  Each
- * NOP is a single cycle....
- *
- * From TRM page 15-105:
- *
- * Under certain conditions, some read and write access to the FX2 registers must
- * be separated by a "synchronization delay".  The delay is necessary only under the
- * following conditions:
- *
- *   - between a write to any register in the 0xE600 - 0xE6FF range and a write to one
- *     of the registers listed below.
- *
- *   - between a write to one of the registers listed below and a read from any register
- *     in the 0xE600 - 0xE6FF range.
- *
- *   Registers which require a synchronization delay:
- *
- *	FIFORESET			FIFOPINPOLAR
- *	INPKTEND			EPxBCH:L
- *	EPxFIFOPFH:L			EPxAUTOINLENH:L
- *	EPxFIFOCFG			EPxGPIFFLGSEL
- *	PINFLAGSAB			PINFLAGSCD
- *	EPxFIFOIE			EPxFIFOIRQ
- *	GPIFIE				GPIFIRQ
- *	UDMACRCH:L			GPIFADRH:L
- *	GPIFTRIG			EPxGPIFTRIG
- *	OUTPKTEND			REVCTL
- *	GPIFTCB3			GPIFTCB2
- *	GPIFTCB1			GPIFTCB0
- */
-
-/*
- * FIXME ensure that the peep hole optimizer isn't screwing us
- */
-#define	SYNCDELAY	_asm nop; nop; nop; _endasm
-#define	NOP		_asm nop; _endasm
-
-
-#endif /* _SYNCDELAY_H_ */
diff --git a/usrp/firmware/include/usb_common.h b/usrp/firmware/include/usb_common.h
deleted file mode 100644
index ae07b236c..000000000
--- a/usrp/firmware/include/usb_common.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2003 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 _USB_COMMON_H_
-#define _USB_COMMON_H_
-
-extern volatile bit _usb_got_SUDAV;
-
-// Provided by user application to handle VENDOR commands.
-// returns non-zero if it handled the command.
-unsigned char app_vendor_cmd (void);
-
-void usb_install_handlers (void);
-void usb_handle_setup_packet (void);
-
-#define usb_setup_packet_avail()	_usb_got_SUDAV
-
-#endif /* _USB_COMMON_H_ */
diff --git a/usrp/firmware/include/usb_descriptors.h b/usrp/firmware/include/usb_descriptors.h
deleted file mode 100644
index 0b8c6212f..000000000
--- a/usrp/firmware/include/usb_descriptors.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-extern xdata const char high_speed_device_descr[];
-extern xdata const char high_speed_devqual_descr[];
-extern xdata const char high_speed_config_descr[];
-
-extern xdata const char full_speed_device_descr[];
-extern xdata const char full_speed_devqual_descr[];
-extern xdata const char full_speed_config_descr[];
-
-extern xdata unsigned char nstring_descriptors;
-extern xdata char * xdata string_descriptors[];
-
-/*
- * We patch these locations with info read from the usrp config eeprom
- */
-extern xdata char usb_desc_hw_rev_binary_patch_location_0[];
-extern xdata char usb_desc_hw_rev_binary_patch_location_1[];
-extern xdata char usb_desc_hw_rev_ascii_patch_location_0[];
-extern xdata char usb_desc_serial_number_ascii[];
diff --git a/usrp/firmware/include/usb_requests.h b/usrp/firmware/include/usb_requests.h
deleted file mode 100644
index 7a543abb0..000000000
--- a/usrp/firmware/include/usb_requests.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-// Standard USB requests.
-// These are contained in end point 0 setup packets
-
-
-#ifndef _USB_REQUESTS_H_
-#define _USB_REQUESTS_H_
-
-// format of bmRequestType byte
-
-#define	bmRT_DIR_MASK		(0x1 << 7)
-#define	bmRT_DIR_IN		(1 << 7)
-#define	bmRT_DIR_OUT		(0 << 7)
-
-#define	bmRT_TYPE_MASK		(0x3 << 5)
-#define	bmRT_TYPE_STD		(0 << 5)
-#define	bmRT_TYPE_CLASS		(1 << 5)
-#define	bmRT_TYPE_VENDOR	(2 << 5)
-#define	bmRT_TYPE_RESERVED	(3 << 5)
-
-#define	bmRT_RECIP_MASK		(0x1f << 0)
-#define	bmRT_RECIP_DEVICE	(0 << 0)
-#define	bmRT_RECIP_INTERFACE	(1 << 0)
-#define	bmRT_RECIP_ENDPOINT	(2 << 0)
-#define	bmRT_RECIP_OTHER	(3 << 0)
-
-
-// standard request codes (bRequest)
-
-#define	RQ_GET_STATUS		0
-#define	RQ_CLEAR_FEATURE	1
-#define	RQ_RESERVED_2		2
-#define	RQ_SET_FEATURE		3
-#define	RQ_RESERVED_4		4
-#define	RQ_SET_ADDRESS		5
-#define	RQ_GET_DESCR		6
-#define	RQ_SET_DESCR		7
-#define	RQ_GET_CONFIG		8
-#define	RQ_SET_CONFIG		9
-#define	RQ_GET_INTERFACE       10
-#define	RQ_SET_INTERFACE       11
-#define	RQ_SYNCH_FRAME	       12
-
-// standard descriptor types
-
-#define	DT_DEVICE		1
-#define	DT_CONFIG		2
-#define	DT_STRING		3
-#define	DT_INTERFACE		4
-#define	DT_ENDPOINT		5
-#define	DT_DEVQUAL		6
-#define	DT_OTHER_SPEED		7
-#define	DT_INTERFACE_POWER	8
-
-// standard feature selectors
-
-#define	FS_ENDPOINT_HALT	0	// recip: endpoint
-#define	FS_DEV_REMOTE_WAKEUP	1	// recip: device
-#define	FS_TEST_MODE		2	// recip: device
-
-// Get Status device attributes
-
-#define	bmGSDA_SELF_POWERED	0x01
-#define	bmGSDA_REM_WAKEUP	0x02
-
-
-#endif /* _USB_REQUESTS_H_ */
diff --git a/usrp/firmware/include/usrp_commands.h b/usrp/firmware/include/usrp_commands.h
deleted file mode 100644
index 20c28e264..000000000
--- a/usrp/firmware/include/usrp_commands.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* 
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003,2004 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-#ifndef _USRP_COMMANDS_H_
-#define _USRP_COMMANDS_H_
-
-#include <usrp_interfaces.h>
-#include <usrp_spi_defs.h>
-
-#define	MAX_EP0_PKTSIZE		       64	// max size of EP0 packet on FX2
-
-// ----------------------------------------------------------------
-//			Vendor bmRequestType's
-// ----------------------------------------------------------------
-
-#define	VRT_VENDOR_IN			0xC0
-#define	VRT_VENDOR_OUT			0x40
-
-// ----------------------------------------------------------------
-//			  USRP Vendor Requests
-//
-// Note that Cypress reserves [0xA0,0xAF].
-// 0xA0 is the firmware load function.
-// ----------------------------------------------------------------
-
-
-// IN commands
-
-#define	VRQ_GET_STATUS			0x80
-#define		GS_TX_UNDERRUN			0	// wIndexL	// returns 1 byte
-#define		GS_RX_OVERRUN			1	// wIndexL	// returns 1 byte
-
-#define	VRQ_I2C_READ			0x81		// wValueL: i2c address; length: how much to read
-
-#define	VRQ_SPI_READ			0x82		// wValue: optional header bytes
-							// wIndexH:	enables
-							// wIndexL:	format
-							// len: how much to read
-
-// OUT commands
-
-#define	VRQ_SET_LED			0x01		// wValueL off/on {0,1}; wIndexL: which {0,1}
-
-#define	VRQ_FPGA_LOAD			0x02
-#  define	FL_BEGIN			0	// wIndexL: begin fpga programming cycle.  stalls if trouble.
-#  define	FL_XFER				1	// wIndexL: xfer up to 64 bytes of data
-#  define	FL_END				2	// wIndexL: end programming cycle, check for success.
-							//          stalls endpoint if trouble.
-
-#define	VRQ_FPGA_WRITE_REG		0x03		// wIndexL: regno; data: 32-bit regval MSB first
-#define	VRQ_FPGA_SET_RESET		0x04		// wValueL: {0,1}
-#define	VRQ_FPGA_SET_TX_ENABLE		0x05		// wValueL: {0,1}
-#define	VRQ_FPGA_SET_RX_ENABLE		0x06		// wValueL: {0,1}
-// see below VRQ_FPGA_SET_{TX,RX}_RESET
-
-#define	VRQ_SET_SLEEP_BITS		0x07		// wValueH: mask; wValueL: bits.  set bits given by mask to bits
-
-#  define	SLEEP_ADC0			0x01
-#  define	SLEEP_ADC1			0x02
-#  define	SLEEP_DAC0			0x04
-#  define	SLEEP_DAC1			0x08
-
-#define	VRQ_I2C_WRITE			0x08		// wValueL: i2c address; data: data
-
-#define	VRQ_SPI_WRITE			0x09		// wValue: optional header bytes
-							// wIndexH:	enables
-							// wIndexL:	format
-							// len: how much to write
-
-#define	VRQ_FPGA_SET_TX_RESET		0x0a		// wValueL: {0, 1}
-#define	VRQ_FPGA_SET_RX_RESET		0x0b		// wValueL: {0, 1}
-
-
-// -------------------------------------------------------------------
-// we store the hashes at fixed addresses in the FX2 internal memory
-
-#define	  USRP_HASH_SLOT_0_ADDR			0xe1e0
-#define	  USRP_HASH_SLOT_1_ADDR			0xe1f0
-
-
-
-#endif /* _USRP_COMMANDS_H_ */
diff --git a/usrp/firmware/include/usrp_config.h b/usrp/firmware/include/usrp_config.h
deleted file mode 100644
index e77f8e4c5..000000000
--- a/usrp/firmware/include/usrp_config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* 
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-/*
- * configuration stuff for debugging
- */
-
-/*
- * Define to 0 for normal use of port A, i.e., FPGA control bus.
- * Define to 1 to write trace to port A for scoping with logic analyzer.
- */
-#define	UC_TRACE_USING_PORT_A			0
-
-
-/*
- * Define to 0 for normal use of low 3 bits of port E, i.e., A/D, D/A SLEEP bits.
- * Define to 1 to enable by default driving the GPIF state to the
- * low three bits of port E.
- */
-#define UC_START_WITH_GSTATE_OUTPUT_ENABLED	0
-
-
-/*
- * Define to 1 for normal use (the board really has an FPGA on it).
- * Define to 0 for debug use on board without FPGA.
- */
-#define UC_BOARD_HAS_FPGA			1
diff --git a/usrp/firmware/include/usrp_i2c_addr.h b/usrp/firmware/include/usrp_i2c_addr.h
deleted file mode 100644
index 0a4f3ea59..000000000
--- a/usrp/firmware/include/usrp_i2c_addr.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_USRP_I2C_ADDR_H
-#define INCLUDED_USRP_I2C_ADDR_H
-
-// I2C addresses
-
-#define I2C_DEV_EEPROM	0x50		// 24LC02[45]:  7-bits 1010xxx
-
-#define	I2C_ADDR_BOOT	(I2C_DEV_EEPROM	| 0x0)
-#define	I2C_ADDR_TX_A	(I2C_DEV_EEPROM | 0x4)
-#define	I2C_ADDR_RX_A	(I2C_DEV_EEPROM | 0x5)
-#define	I2C_ADDR_TX_B	(I2C_DEV_EEPROM	| 0x6)
-#define	I2C_ADDR_RX_B	(I2C_DEV_EEPROM | 0x7)
-
-
-// format of FX2 BOOT EEPROM
-//	00: 0xC0	code for ``Read IDs from EEPROM''
-//	01: 0xFE	USB Vendor ID (LSB)
-//	02: 0xFF	USB Vendor ID (MSB)
-//	03: 0x02	USB Product ID (LSB)
-//	04: 0x00	USB Product ID (MSB)
-//	05: 0x01	USB Device ID (LSB)	// rev1
-//	06: 0x00	USB Device ID (MSB)	// 0 = unconfig'd (no firmware)
-//	07: 0x00	option byte
-
-
-// format of daughterboard EEPROM
-//	00: 0xDB	code for ``I'm a daughterboard''
-//	01:   ..	Daughterboard ID (LSB)
-//	02:   ..	Daughterboard ID (MSB)
-//	03:   ..	io bits  7-0 direction (bit set if it's an output from m'board)
-//	04:   ..	io bits 15-8 direction (bit set if it's an output from m'board)
-//	05:   ..	ADC0 DC offset correction (LSB)
-//	06:   ..	ADC0 DC offset correction (MSB)
-//	07:   ..	ADC1 DC offset correction (LSB)
-//	08:   ..	ADC1 DC offset correction (MSB)
-// 	...
-//	1f:   ..	negative of the sum of bytes [0x00, 0x1e]
-
-#define	DB_EEPROM_MAGIC		0x00
-#define	  DB_EEPROM_MAGIC_VALUE			0xDB
-#define	DB_EEPROM_ID_LSB		0x01
-#define	DB_EEPROM_ID_MSB		0x02
-#define	DB_EEPROM_OE_LSB		0x03
-#define	DB_EEPROM_OE_MSB		0x04
-#define	DB_EEPROM_OFFSET_0_LSB		0x05	// offset correction for ADC or DAC 0
-#define	DB_EEPROM_OFFSET_0_MSB		0x06
-#define	DB_EEPROM_OFFSET_1_LSB		0x07	// offset correction for ADC or DAC 1
-#define	DB_EEPROM_OFFSET_1_MSB		0x08
-#define	DB_EEPROM_CHKSUM		0x1f
-
-#define	DB_EEPROM_CLEN			0x20	// length of common portion of eeprom
-
-#define	DB_EEPROM_CUSTOM_BASE		DB_EEPROM_CLEN	// first avail offset for
-							//   daughterboard specific use
-
-#endif /* INCLUDED_USRP_I2C_ADDR_H */
-
diff --git a/usrp/firmware/include/usrp_ids.h b/usrp/firmware/include/usrp_ids.h
deleted file mode 100644
index 159151ea9..000000000
--- a/usrp/firmware/include/usrp_ids.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2006,2007 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.
- */
-
-/*
- * USB Vendor and Product IDs that we use
- *
- * (keep in sync with usb_descriptors.a51)
- */
-
-#ifndef _USRP_IDS_H_
-#define _USRP_IDS_H_
-
-#define	USB_VID_CYPRESS			0x04b4
-#define	USB_PID_CYPRESS_FX2		0x8613
-
-
-#define	USB_VID_FSF			0xfffe	  // Free Software Folks
-#define	USB_PID_FSF_EXP_0		0x0000	  // Experimental 0
-#define	USB_PID_FSF_EXP_1		0x0001	  // Experimental 1
-#define	USB_PID_FSF_USRP		0x0002	  // Universal Software Radio Peripheral
-#define	USB_PID_FSF_USRP_reserved	0x0003	  // Universal Software Radio Peripheral
-#define	USB_PID_FSF_SSRP		0x0004	  // Simple Software Radio Peripheral
-#define	USB_PID_FSF_SSRP_reserved	0x0005	  // Simple Software Radio Peripheral
-#define USB_PID_FSF_HPSDR               0x0006    // High Performance Software Defined Radio (Internal Boot)
-#define USB_PID_FSF_HPSDR_HA    	0x0007    // High Performance Software Defined Radio (Host Assisted Boot)
-#define USB_PID_FSF_QS1R	    	0x0008    // QS1R HF receiver
-#define USB_PID_FSF_EZDOP	    	0x0009    // ezdop <jcorgan@aeinet.com>
-#define USB_PID_FSF_BDALE_Development   0x000a    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_TeleMetrum    0x000b    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_TeleDongle    0x000c    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_TeleTerra     0x000d    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_TeleBT        0x000e    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_TeleLaunch    0x000f    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_TeleLCO       0x0010    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_TeleScience   0x0011    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_TelePyro      0x0012    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_9		0x0013	  // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_HPSDR_HERMES	0x0014	  // HPSDR Hermes
-#define USB_PID_FSF_THINKRF		0x0015	  // Catalin Patulea <catalin.patulea@thinkrf.com>
-#define USB_PID_FSF_MSA			0x0016	  // Hans de Bok <hdbok@dionaea.demon.nl> Scotty's Modular Spectrum Analyzer
-
-#define USB_PID_FSF_LBNL_UXO            0x0018    // http://recycle.lbl.gov/~ldoolitt/uxo/
-#define USB_PID_FSF_BDALE_10            0x0019    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_11            0x001a    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_12            0x001b    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_13            0x001c    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_14            0x001d    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_15            0x001e    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_16            0x001f    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_17            0x0020    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_18            0x0021    // Bdale Garbee <bdale@gag.com>
-#define USB_PID_FSF_BDALE_19            0x0022    // Bdale Garbee <bdale@gag.com>
-
-
-#define	USB_DID_USRP_0			0x0000	  // unconfigured rev 0 USRP
-#define	USB_DID_USRP_1			0x0001	  // unconfigured rev 1 USRP
-#define	USB_DID_USRP_2			0x0002	  // unconfigured rev 2 USRP
-
-#endif /* _USRP_IDS_H_ */
diff --git a/usrp/firmware/include/usrp_interfaces.h b/usrp/firmware/include/usrp_interfaces.h
deleted file mode 100644
index 8666e0490..000000000
--- a/usrp/firmware/include/usrp_interfaces.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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 _USRP_INTERFACES_H_
-#define _USRP_INTERFACES_H_
-
-/*
- * We've now split the USRP into 3 separate interfaces.
- *
- * Interface 0 contains only ep0 and is used for command and status.
- * Interface 1 is the Tx path and it uses ep2 OUT BULK.
- * Interface 2 is the Rx path and it uses ep6 IN BULK.
- */
- 
-#define	USRP_CMD_INTERFACE		0
-#define	USRP_CMD_ALTINTERFACE		0
-#define	USRP_CMD_ENDPOINT		0
-
-#define	USRP_TX_INTERFACE		1
-#define	USRP_TX_ALTINTERFACE		0
-#define	USRP_TX_ENDPOINT		2	// streaming data from host to FPGA
-
-#define	USRP_RX_INTERFACE		2
-#define	USRP_RX_ALTINTERFACE		0
-#define	USRP_RX_ENDPOINT		6	// streaming data from FPGA to host
-
-
-#endif /* _USRP_INTERFACES_H_ */
diff --git a/usrp/firmware/include/usrp_spi_defs.h b/usrp/firmware/include/usrp_spi_defs.h
deleted file mode 100644
index 963463ef2..000000000
--- a/usrp/firmware/include/usrp_spi_defs.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_USRP_SPI_DEFS_H
-#define INCLUDED_USRP_SPI_DEFS_H
-
-/*
- * defines for the VRQ_SPI_READ and VRQ_SPI_WRITE commands
- *
- * SPI == "Serial Port Interface".  SPI is a 3 wire bus plus a
- * separate enable for each peripheral.  The common lines are SCLK,
- * SDI and SDO.  The FX2 always drives SCLK and SDI, the clock and
- * data lines from the FX2 to the peripheral.  When enabled, a
- * peripheral may drive SDO, the data line from the peripheral to the
- * FX2.
- *
- * The SPI_READ and SPI_WRITE commands are formatted identically.
- * Each specifies which peripherals to enable, whether the bits should
- * be transmistted Most Significant Bit first or Least Significant Bit
- * first, the number of bytes in the optional header, and the number
- * of bytes to read or write in the body.
- *
- * The body is limited to 64 bytes.  The optional header may contain
- * 0, 1 or 2 bytes.  For an SPI_WRITE, the header bytes are
- * transmitted to the peripheral followed by the the body bytes.  For
- * an SPI_READ, the header bytes are transmitted to the peripheral,
- * then len bytes are read back from the peripheral.
- */
-
-/*
- * SPI_FMT_* goes in wIndexL
- */
-#define SPI_FMT_xSB_MASK	(1 << 7)
-#  define	SPI_FMT_LSB	(1 << 7)	// least signficant bit first
-#  define	SPI_FMT_MSB	(0 << 7)	// most significant bit first
-#define	SPI_FMT_HDR_MASK	(3 << 5)
-#  define	SPI_FMT_HDR_0	(0 << 5)	// 0 header bytes
-#  define	SPI_FMT_HDR_1	(1 << 5)	// 1 header byte
-#  define	SPI_FMT_HDR_2	(2 << 5)	// 2 header bytes
-
-/*
- * SPI_ENABLE_*  goes in wIndexH
- *
- * For the software interface, the enables are active high.
- * For reads, it's an error to have more than one enable set.
- *
- * [FWIW, the hardware implements them as active low.  Don't change the
- * definitions of these.  They are related to usrp_rev1_regs.h]
- */
-#define	SPI_ENABLE_FPGA		0x01	// select FPGA
-#define	SPI_ENABLE_CODEC_A	0x02	// select AD9862 A
-#define	SPI_ENABLE_CODEC_B	0x04	// select AD9862 B
-#define	SPI_ENABLE_reserved	0x08
-#define	SPI_ENABLE_TX_A		0x10	// select d'board TX A
-#define	SPI_ENABLE_RX_A		0x20	// select d'board RX A
-#define	SPI_ENABLE_TX_B		0x40	// select d'board TX B
-#define	SPI_ENABLE_RX_B		0x80	// select d'board RX B
-
-/*
- * If there's one header byte, it goes in wValueL.
- *
- * If there are two header bytes, they go in wValueH | wValueL.
- * The transmit order of the bytes (and bits within them) is 
- * determined by SPI_FMT_*SB
- */
- 
-#endif /* INCLUDED_USRP_SPI_DEFS_H */
diff --git a/usrp/firmware/lib/.gitignore b/usrp/firmware/lib/.gitignore
deleted file mode 100644
index 04f253234..000000000
--- a/usrp/firmware/lib/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-/*.ihx
-/*.lnk
-/*.lst
-/*.map
-/*.mem
-/*.rel
-/*.rst
-/*.sym
-/blink_leds.asm
-/usrp_common.asm
-/command_loop.asm
-/fpga.asm
-/*.asm
-/usrp_gpif.c
-/usrp_gpif_inline.h
-/*.lib
-/Makefile
-/Makefile.in
diff --git a/usrp/firmware/lib/Makefile.am b/usrp/firmware/lib/Makefile.am
deleted file mode 100644
index a6790f010..000000000
--- a/usrp/firmware/lib/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright 2003 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.
-# 
-
-EXTRA_DIST = 		\
-	delay.c		\
-	fx2utils.c	\
-	i2c.c		\
-	isr.c		\
-	timer.c		\
-	usb_common.c
-
-
-
-DEFINES=
-FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include
-
-# with EA = 0, the FX2 implements a portion of the 8051 "external memory"
-# on chip.  This memory is mapped like this:
-#
-# The bottom 8K of memory (0x0000 - 0x1fff) is used for both data and
-# code accesses.  There's also 512 bytes for data only from 0xe000 - 0xe1ff.
-#
-# We tell the linker to start the xdata segment at 0x1800, 6K up from
-# the bottom.
-
-LINKOPTS = --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800
-
-LIBRARY = libfx2.lib
-
-LIBOBJS = 		\
-	delay.rel	\
-	fx2utils.rel	\
-	i2c.rel		\
-	isr.rel		\
-	timer.rel	\
-	usb_common.rel
-
-
-
-all: libfx2.lib
-
-.c.rel:
-	$(XCC) $(FW_INCLUDES) $(DEFINES) -c $< -o $@
-
-$(LIBRARY): $(LIBOBJS)
-	-rm -f $(LIBRARY)
-	touch $(LIBRARY)
-	for obj in $(LIBOBJS); do basename $$obj .rel >> $(LIBRARY) ; done
-
-
-CLEANFILES = \
-	*.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib
-
-DISTCLEANFILES = \
-	*.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib
-
-install: all
-
-
-# dependencies
-
diff --git a/usrp/firmware/lib/delay.c b/usrp/firmware/lib/delay.c
deleted file mode 100644
index 13cf0eec8..000000000
--- a/usrp/firmware/lib/delay.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-/*
- * Delay approximately 1 microsecond (including overhead in udelay).
- */
-static void
-udelay1 (void) _naked
-{
-  _asm				; lcall that got us here took 4 bus cycles
-	ret			; 4 bus cycles
-  _endasm;
-}
-
-/*
- * delay for approximately usecs microseconds
- */
-void
-udelay (unsigned char usecs)
-{
-  do {
-    udelay1 ();
-  } while (--usecs != 0);
-}
-
-
-/*
- * Delay approximately 1 millisecond.
- * We're running at 48 MHz, so we need 48,000 clock cycles.
- *
- * Note however, that each bus cycle takes 4 clock cycles (not obvious,
- * but explains the factor of 4 problem below).
- */
-static void
-mdelay1 (void) _naked
-{
-  _asm
-	mov	dptr,#(-1200 & 0xffff)
-002$:	
-	inc	dptr		; 3 bus cycles
-	mov	a, dpl		; 2 bus cycles
-	orl	a, dph		; 2 bus cycles
-	jnz	002$		; 3 bus cycles
-
-	ret
-  _endasm;
-}
-
-void
-mdelay (unsigned int msecs)
-{
-  do {
-    mdelay1 ();
-  } while (--msecs != 0);
-}
-
-	
diff --git a/usrp/firmware/lib/fx2utils.c b/usrp/firmware/lib/fx2utils.c
deleted file mode 100644
index 64ffcc896..000000000
--- a/usrp/firmware/lib/fx2utils.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-#include "fx2utils.h"
-#include "fx2regs.h"
-#include "delay.h"
-
-void
-fx2_stall_ep0 (void)
-{
-  EP0CS |= bmEPSTALL;
-}
-
-void
-fx2_reset_data_toggle (unsigned char ep)
-{
-  TOGCTL = ((ep & 0x80) >> 3 | (ep & 0x0f));
-  TOGCTL |= bmRESETTOGGLE;
-}
-
-void
-fx2_renumerate (void)
-{
-  USBCS |= bmDISCON | bmRENUM;
-
-  // mdelay (1500);		// FIXME why 1.5 seconds?
-  mdelay (250);			// FIXME why 1.5 seconds?
-  
-  USBIRQ = 0xff;		// clear any pending USB irqs...
-  EPIRQ =  0xff;		//   they're from before the renumeration
-
-  EXIF &= ~bmEXIF_USBINT;
-
-  USBCS &= ~bmDISCON;		// reconnect USB
-}
diff --git a/usrp/firmware/lib/i2c-compiler-bug.c b/usrp/firmware/lib/i2c-compiler-bug.c
deleted file mode 100644
index 360b779bc..000000000
--- a/usrp/firmware/lib/i2c-compiler-bug.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-#include "i2c.h"
-#include "fx2regs.h"
-#include <string.h>
-
-
-// issue a stop bus cycle and wait for completion
-
-
-// returns non-zero if successful, else 0
-unsigned char
-i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len)
-{
-  volatile unsigned char	junk;
-  
-  if (len == 0)			// reading zero bytes always works
-    return 1;
-  
-  // memset (buf, 0, len);		// FIXME, remove
-
-  while (I2CS & bmSTOP)		// wait for stop to clear
-    ;
-
-
-  I2CS = bmSTART;
-  I2DAT = (addr << 1) | 1;	// write address and direction (1's the read bit)
-
-  while ((I2CS & bmDONE) == 0)
-    ;
-
-  if ((I2CS & bmBERR) || (I2CS & bmACK) == 0)	// no device answered...
-    goto fail;
-
-  if (len == 1)
-    I2CS |= bmLASTRD;		
-
-  junk = I2DAT;			// trigger the first read cycle
-
-#if 1
-  while (len != 1){
-    while ((I2CS & bmDONE) == 0)
-      ;
-
-    if (I2CS & bmBERR)
-      goto fail;
-
-    len--;
-    if (len == 1)
-      I2CS |= bmLASTRD;
-    
-    *buf++ = I2DAT;		// get data, trigger another read
-  }
-#endif
-
-  // wait for final byte
-  
-  while ((I2CS & bmDONE) == 0)
-    ;
-  
-  if (I2CS & bmBERR)
-    goto fail;
-
-  I2CS |= bmSTOP;
-  *buf = I2DAT;
-
-  return 1;
-
- fail:
-  I2CS |= bmSTOP;
-  return 0;
-}
-
-
-
-// returns non-zero if successful, else 0
-unsigned char
-i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len)
-{
-  while (I2CS & bmSTOP)		// wait for stop to clear
-    ;
-
-  I2CS = bmSTART;
-  I2DAT = (addr << 1) | 0;	// write address and direction (0's the write bit)
-
-  while ((I2CS & bmDONE) == 0)
-    ;
-
-  if ((I2CS & bmBERR) || (I2CS & bmACK) == 0)	// no device answered...
-    goto fail;
-
-  while (len > 0){
-    I2DAT = *buf++;
-    len--;
-
-    while ((I2CS & bmDONE) == 0)
-      ;
-
-    if ((I2CS & bmBERR) || (I2CS & bmACK) == 0)	// no device answered...
-      goto fail;
-  }
-
-  I2CS |= bmSTOP;
-  return 1;
-
- fail:
-  I2CS |= bmSTOP;
-  return 0;
-}
diff --git a/usrp/firmware/lib/i2c.c b/usrp/firmware/lib/i2c.c
deleted file mode 100644
index 0f238b5cf..000000000
--- a/usrp/firmware/lib/i2c.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-#include "i2c.h"
-#include "fx2regs.h"
-#include <string.h>
-
-
-// issue a stop bus cycle and wait for completion
-
-
-// returns non-zero if successful, else 0
-unsigned char
-i2c_read (unsigned char addr, xdata unsigned char *buf, unsigned char len)
-{
-  volatile unsigned char	junk;
-  
-  if (len == 0)			// reading zero bytes always works
-    return 1;
-  
-  while (I2CS & bmSTOP)		// wait for stop to clear
-    ;
-
-  I2CS = bmSTART;
-  I2DAT = (addr << 1) | 1;	// write address and direction (1's the read bit)
-
-  while ((I2CS & bmDONE) == 0)
-    ;
-
-  if ((I2CS & bmBERR) || (I2CS & bmACK) == 0)	// no device answered...
-    goto fail;
-
-  if (len == 1)
-    I2CS |= bmLASTRD;		
-
-  junk = I2DAT;			// trigger the first read cycle
-
-  while (--len != 0){
-    while ((I2CS & bmDONE) == 0)
-      ;
-
-    if (I2CS & bmBERR)
-      goto fail;
-
-    if (len == 1)
-      I2CS |= bmLASTRD;
-    
-    *buf++ = I2DAT;		// get data, trigger another read
-  }
-
-  // wait for final byte
-  
-  while ((I2CS & bmDONE) == 0)
-    ;
-  
-  if (I2CS & bmBERR)
-    goto fail;
-
-  I2CS |= bmSTOP;
-  *buf = I2DAT;
-
-  return 1;
-
- fail:
-  I2CS |= bmSTOP;
-  return 0;
-}
-
-
-
-// returns non-zero if successful, else 0
-unsigned char
-i2c_write (unsigned char addr, xdata const unsigned char *buf, unsigned char len)
-{
-  while (I2CS & bmSTOP)		// wait for stop to clear
-    ;
-
-  I2CS = bmSTART;
-  I2DAT = (addr << 1) | 0;	// write address and direction (0's the write bit)
-
-  while ((I2CS & bmDONE) == 0)
-    ;
-
-  if ((I2CS & bmBERR) || (I2CS & bmACK) == 0)	// no device answered...
-    goto fail;
-
-  while (len > 0){
-    I2DAT = *buf++;
-    len--;
-
-    while ((I2CS & bmDONE) == 0)
-      ;
-
-    if ((I2CS & bmBERR) || (I2CS & bmACK) == 0)	// no device answered...
-      goto fail;
-  }
-
-  I2CS |= bmSTOP;
-  return 1;
-
- fail:
-  I2CS |= bmSTOP;
-  return 0;
-}
diff --git a/usrp/firmware/lib/isr.c b/usrp/firmware/lib/isr.c
deleted file mode 100644
index 05412daf5..000000000
--- a/usrp/firmware/lib/isr.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-#include "isr.h"
-#include "fx2regs.h"
-#include "syncdelay.h"
-
-extern xdata unsigned char _standard_interrupt_vector[];
-extern xdata unsigned char _usb_autovector[];
-extern xdata unsigned char _fifo_gpif_autovector[];
-
-#define LJMP_OPCODE	0x02
-
-/*
- * Hook standard interrupt vector.
- *
- * vector_number is from the SV_<foo> list.
- * addr is the address of the interrupt service routine.
- */
-void 
-hook_sv (unsigned char vector_number, unsigned short addr)
-{
-  bit	t;
-  
-  // sanity checks
-
-  if (vector_number < SV_MIN || vector_number > SV_MAX)
-    return;
-
-  if ((vector_number & 0x0f) != 0x03 && (vector_number & 0x0f) != 0x0b)
-    return;
-
-  t = EA;
-  EA = 0;
-  _standard_interrupt_vector[vector_number] = LJMP_OPCODE;
-  _standard_interrupt_vector[vector_number + 1] = addr >> 8;
-  _standard_interrupt_vector[vector_number + 2] = addr & 0xff;
-  EA = t;
-}
-
-/*
- * Hook usb interrupt vector.
- *
- * vector_number is from the UV_<foo> list.
- * addr is the address of the interrupt service routine.
- */
-void 
-hook_uv (unsigned char vector_number, unsigned short addr)
-{
-  bit	t;
-  
-  // sanity checks
-
-  if (vector_number < UV_MIN || vector_number > UV_MAX)
-    return;
-
-  if ((vector_number & 0x3) != 0)
-    return;
-
-  t = EA;
-  EA = 0;
-  _usb_autovector[vector_number] = LJMP_OPCODE;
-  _usb_autovector[vector_number + 1] = addr >> 8;
-  _usb_autovector[vector_number + 2] = addr & 0xff;
-  EA = t;
-}
-
-/*
- * Hook fifo/gpif interrupt vector.
- *
- * vector_number is from the FGV_<foo> list.
- * addr is the address of the interrupt service routine.
- */
-void 
-hook_fgv (unsigned char vector_number, unsigned short addr)
-{
-  bit	t;
-  
-  // sanity checks
-
-  if (vector_number < FGV_MIN || vector_number > FGV_MAX)
-    return;
-
-  if ((vector_number & 0x3) != 0)
-    return;
-
-  t = EA;
-  EA = 0;
-  _fifo_gpif_autovector[vector_number] = LJMP_OPCODE;
-  _fifo_gpif_autovector[vector_number + 1] = addr >> 8;
-  _fifo_gpif_autovector[vector_number + 2] = addr & 0xff;
-  EA = t;
-}
-
-/*
- * One time call to enable autovectoring for both USB and FIFO/GPIF.
- *
- * This disables all USB and FIFO/GPIF interrupts and clears
- * any pending interrupts too.  It leaves the master USB and FIFO/GPIF
- * interrupts enabled.
- */
-void
-setup_autovectors (void)
-{
-  // disable master usb and fifo/gpif interrupt enables
-  EIUSB = 0;
-  EIEX4 = 0;
-
-  hook_sv (SV_INT_2, (unsigned short) _usb_autovector);
-  hook_sv (SV_INT_4, (unsigned short) _fifo_gpif_autovector);
-
-  // disable all fifo interrupt enables
-  SYNCDELAY;
-  EP2FIFOIE = 0;	SYNCDELAY;
-  EP4FIFOIE = 0;	SYNCDELAY;
-  EP6FIFOIE = 0;	SYNCDELAY;
-  EP8FIFOIE = 0;	SYNCDELAY;
-
-  // clear all pending fifo irqs	
-  EP2FIFOIRQ = 0xff;	SYNCDELAY;
-  EP4FIFOIRQ = 0xff;	SYNCDELAY;
-  EP6FIFOIRQ = 0xff;	SYNCDELAY;
-  EP8FIFOIRQ = 0xff;	SYNCDELAY;
-
-  IBNIE  = 0;
-  IBNIRQ = 0xff;
-  NAKIE  = 0;
-  NAKIRQ = 0xff;
-  USBIE  = 0;
-  USBIRQ = 0xff;
-  EPIE   = 0;
-  EPIRQ  = 0xff;
-  SYNCDELAY;	GPIFIE = 0;		
-  SYNCDELAY;	GPIFIRQ = 0xff;
-  USBERRIE = 0;
-  USBERRIRQ = 0xff;
-  CLRERRCNT = 0;
-  
-  INTSETUP = bmAV2EN | bmAV4EN | bmINT4IN;
-
-  // clear master irq's for usb and fifo/gpif
-  EXIF &= ~bmEXIF_USBINT;
-  EXIF &= ~bmEXIF_IE4;
-  
-  // enable master usb and fifo/gpif interrrupts
-  EIUSB = 1;
-  EIEX4 = 1;
-}
diff --git a/usrp/firmware/lib/timer.c b/usrp/firmware/lib/timer.c
deleted file mode 100644
index 97e2f7cf9..000000000
--- a/usrp/firmware/lib/timer.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-#include "timer.h"
-#include "fx2regs.h"
-#include "isr.h"
-
-/*
- * Arrange to have isr_tick_handler called at 100 Hz.
- *
- * The cpu clock is running at 48e6.  The input to the timer
- * is 48e6 / 12 = 4e6.
- *
- * We arrange to have the timer overflow every 40000 clocks == 100 Hz
- */
-
-#define	RELOAD_VALUE	((unsigned short) -40000)
-
-void 
-hook_timer_tick (unsigned short isr_tick_handler)
-{
-  ET2 = 0;			// disable timer 2 interrupts
-  hook_sv (SV_TIMER_2, isr_tick_handler);
-  
-  RCAP2H = RELOAD_VALUE >> 8;	// setup the auto reload value
-  RCAP2L = RELOAD_VALUE;
-
-  T2CON = 0x04;			// interrupt on overflow; reload; run
-  ET2 = 1;			// enable timer 2 interrupts
-}
diff --git a/usrp/firmware/lib/usb_common.c b/usrp/firmware/lib/usb_common.c
deleted file mode 100644
index 3b0547b2f..000000000
--- a/usrp/firmware/lib/usb_common.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-#include "usb_common.h"
-#include "fx2regs.h"
-#include "syncdelay.h"
-#include "fx2utils.h"
-#include "isr.h"
-#include "usb_descriptors.h"
-#include "usb_requests.h"
-
-extern xdata char str0[];
-extern xdata char str1[];
-extern xdata char str2[];
-extern xdata char str3[];
-extern xdata char str4[];
-extern xdata char str5[];
-
-
-#define	bRequestType	SETUPDAT[0]
-#define	bRequest	SETUPDAT[1]
-#define	wValueL		SETUPDAT[2]
-#define	wValueH		SETUPDAT[3]
-#define	wIndexL		SETUPDAT[4]
-#define	wIndexH		SETUPDAT[5]
-#define	wLengthL	SETUPDAT[6]
-#define	wLengthH	SETUPDAT[7]
-
-#define MSB(x)	(((unsigned short) x) >> 8)
-#define LSB(x)	(((unsigned short) x) & 0xff)
-
-volatile bit _usb_got_SUDAV;
-
-unsigned char	_usb_config = 0;
-unsigned char	_usb_alt_setting = 0;	// FIXME really 1/interface
-
-xdata unsigned char *current_device_descr;
-xdata unsigned char *current_devqual_descr;
-xdata unsigned char *current_config_descr;
-xdata unsigned char *other_config_descr;
-
-static void
-setup_descriptors (void)
-{
-  if (USBCS & bmHSM){		// high speed mode
-    current_device_descr  = high_speed_device_descr;
-    current_devqual_descr = high_speed_devqual_descr;
-    current_config_descr  = high_speed_config_descr;
-    other_config_descr    = full_speed_config_descr;
-  }
-  else {
-    current_device_descr  = full_speed_device_descr;
-    current_devqual_descr = full_speed_devqual_descr;
-    current_config_descr  = full_speed_config_descr;
-    other_config_descr    = high_speed_config_descr;
-  }
-
-  // whack the type fields
-  // FIXME, may not be required.
-  // current_config_descr[1] = DT_CONFIG;
-  // other_config_descr[1]   = DT_OTHER_SPEED;
-}
-
-static void
-isr_SUDAV (void) interrupt
-{
-  clear_usb_irq ();
-  _usb_got_SUDAV = 1;
-}
-
-static void
-isr_USBRESET (void) interrupt
-{
-  clear_usb_irq ();
-  setup_descriptors ();
-}
-
-static void
-isr_HIGHSPEED (void) interrupt
-{
-  clear_usb_irq ();
-  setup_descriptors ();
-}
-
-void
-usb_install_handlers (void)
-{
-  setup_descriptors ();	    // ensure that they're set before use
-
-  hook_uv (UV_SUDAV,     (unsigned short) isr_SUDAV);
-  hook_uv (UV_USBRESET,  (unsigned short) isr_USBRESET);
-  hook_uv (UV_HIGHSPEED, (unsigned short) isr_HIGHSPEED);
-
-  USBIE = bmSUDAV | bmURES | bmHSGRANT;
-}
-
-// On the FX2 the only plausible endpoints are 0, 1, 2, 4, 6, 8
-// This doesn't check to see that they're enabled
-
-unsigned char
-plausible_endpoint (unsigned char ep)
-{
-  ep &= ~0x80;	// ignore direction bit
-
-  if (ep > 8)
-    return 0;
-
-  if (ep == 1)
-    return 1;
-
-  return (ep & 0x1) == 0;	// must be even
-}
-
-// return pointer to control and status register for endpoint.
-// only called with plausible_endpoints
-
-xdata volatile unsigned char *
-epcs (unsigned char ep)
-{
-  if (ep == 0x01)		// ep1 has different in and out CS regs
-    return EP1OUTCS;
-
-  if (ep == 0x81)
-    return EP1INCS;
-
-  ep &= ~0x80;			// ignore direction bit
-
-  if (ep == 0x00)		// ep0
-    return EP0CS;
-
-  return EP2CS + (ep >> 1);	// 2, 4, 6, 8 are consecutive
-}
-
-void
-usb_handle_setup_packet (void)
-{
-  _usb_got_SUDAV = 0;
-
-  // handle the standard requests...
-
-  switch (bRequestType & bmRT_TYPE_MASK){
-
-  case bmRT_TYPE_CLASS:
-  case bmRT_TYPE_RESERVED:
-    fx2_stall_ep0 ();		// we don't handle these.  indicate error
-    break;
-    
-  case bmRT_TYPE_VENDOR:
-    // call the application code.
-    // If it handles the command it returns non-zero
-
-    if (!app_vendor_cmd ())	
-      fx2_stall_ep0 ();
-    break;
-
-  case bmRT_TYPE_STD:
-    // these are the standard requests...
-
-    if ((bRequestType & bmRT_DIR_MASK) == bmRT_DIR_IN){
-
-      ////////////////////////////////////
-      //    handle the IN requests
-      ////////////////////////////////////
-
-      switch (bRequest){
-
-      case RQ_GET_CONFIG:
-	EP0BUF[0] = _usb_config;	// FIXME app should handle
-	EP0BCH = 0;
-	EP0BCL = 1;
-	break;
-	
-      // --------------------------------
-
-      case RQ_GET_INTERFACE:
-	EP0BUF[0] = _usb_alt_setting;	// FIXME app should handle
-	EP0BCH = 0;
-	EP0BCL = 1;
-	break;
-
-      // --------------------------------
-
-      case RQ_GET_DESCR:
-	switch (wValueH){
-
-	case DT_DEVICE:
-	  SUDPTRH = MSB (current_device_descr);
-	  SUDPTRL = LSB (current_device_descr);
-	  break;
-	  
-	case DT_DEVQUAL:
-	  SUDPTRH = MSB (current_devqual_descr);
-	  SUDPTRL = LSB (current_devqual_descr);
-	  break;
-
-	case DT_CONFIG:
-	  if (0 && wValueL != 1)	// FIXME only a single configuration
-	    fx2_stall_ep0 ();
-	  else {
-	    SUDPTRH = MSB (current_config_descr);
-	    SUDPTRL = LSB (current_config_descr);
-	  }
-	  break;
-
-	case DT_OTHER_SPEED:
-	  if (0 && wValueL != 1)	// FIXME only a single configuration
-	    fx2_stall_ep0 ();
-	  else {
-	    SUDPTRH = MSB (other_config_descr);
-	    SUDPTRL = LSB (other_config_descr);
-	  }
-	  break;
-
-	case DT_STRING:
-	  if (wValueL >= nstring_descriptors)
-	    fx2_stall_ep0 ();
-	  else {
-	    xdata char *p = string_descriptors[wValueL];
-	    SUDPTRH = MSB (p);
-	    SUDPTRL = LSB (p);
-	  }
-	  break;
-
-	default:
-	  fx2_stall_ep0 ();	// invalid request
-	  break;
-	}
-	break;
-	
-      // --------------------------------
-
-      case RQ_GET_STATUS:
-	switch (bRequestType & bmRT_RECIP_MASK){
-	case bmRT_RECIP_DEVICE:
-	  EP0BUF[0] = bmGSDA_SELF_POWERED;	// FIXME app should handle
-	  EP0BUF[1] = 0;
-	  EP0BCH = 0;
-	  EP0BCL = 2;
-	  break;
-
-	case bmRT_RECIP_INTERFACE:
-	  EP0BUF[0] = 0;
-	  EP0BUF[1] = 0;
-	  EP0BCH = 0;
-	  EP0BCL = 2;
-	  break;
-
-	case bmRT_RECIP_ENDPOINT:
-	  if (plausible_endpoint (wIndexL)){
-	    EP0BUF[0] = *epcs (wIndexL) & bmEPSTALL;
-	    EP0BUF[1] = 0;
-	    EP0BCH = 0;
-	    EP0BCL = 2;
-	  }
-	  else
-	    fx2_stall_ep0 ();
-	  break;
-
-	default:
-	  fx2_stall_ep0 ();
-	  break;
-	}
-	break;
-
-      // --------------------------------
-
-      case RQ_SYNCH_FRAME:	// not implemented
-      default:
-	fx2_stall_ep0 ();
-	break;
-      }
-    }
-
-    else {
-
-      ////////////////////////////////////
-      //    handle the OUT requests
-      ////////////////////////////////////
-
-      switch (bRequest){
-
-      case RQ_SET_CONFIG:
-	_usb_config = wValueL;		// FIXME app should handle
-	break;
-
-      case RQ_SET_INTERFACE:
-	_usb_alt_setting = wValueL;	// FIXME app should handle
-	break;
-
-      // --------------------------------
-
-      case RQ_CLEAR_FEATURE:
-	switch (bRequestType & bmRT_RECIP_MASK){
-
-	case bmRT_RECIP_DEVICE:
-	  switch (wValueL){
-	  case FS_DEV_REMOTE_WAKEUP:
-	  default:
-	    fx2_stall_ep0 ();
-	  }
-	  break;
-
-	case bmRT_RECIP_ENDPOINT:
-	  if (wValueL == FS_ENDPOINT_HALT && plausible_endpoint (wIndexL)){
-	    *epcs (wIndexL) &= ~bmEPSTALL;
-	    fx2_reset_data_toggle (wIndexL);
-	  }
-	  else
-	    fx2_stall_ep0 ();
-	  break;
-
-	default:
-	  fx2_stall_ep0 ();
-	  break;
-	}
-	break;
-
-      // --------------------------------
-
-      case RQ_SET_FEATURE:
-	switch (bRequestType & bmRT_RECIP_MASK){
-
-	case bmRT_RECIP_DEVICE:
-	  switch (wValueL){
-	  case FS_TEST_MODE:
-	    // hardware handles this after we complete SETUP phase handshake
-	    break;
-
-	  case FS_DEV_REMOTE_WAKEUP:
-	  default:
-	    fx2_stall_ep0 ();
-	    break;
-	  }
-	}
-	break;
-
-      case bmRT_RECIP_ENDPOINT:
-	switch (wValueL){
-	case FS_ENDPOINT_HALT:
-	  if (plausible_endpoint (wIndexL))
-	    *epcs (wIndexL) |= bmEPSTALL;
-	  else
-	    fx2_stall_ep0 ();
-	  break;
-
-	default:
-	  fx2_stall_ep0 ();
-	  break;
-	}
-	break;
-
-      // --------------------------------
-
-      case RQ_SET_ADDRESS:	// handled by fx2 hardware
-      case RQ_SET_DESCR:	// not implemented
-      default:
-	fx2_stall_ep0 ();
-      }
-
-    }
-    break;
-
-  }	// bmRT_TYPE_MASK
-
-  // ack handshake phase of device request
-  EP0CS |= bmHSNAK;
-}
diff --git a/usrp/firmware/src/.gitignore b/usrp/firmware/src/.gitignore
deleted file mode 100644
index d46c52c00..000000000
--- a/usrp/firmware/src/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-/*.ihx
-/*.lnk
-/*.lst
-/*.map
-/*.mem
-/*.rel
-/*.rst
-/*.sym
-/blink_leds.asm
-/usrp_common.asm
-/command_loop.asm
-/fpga.asm
-/*.asm
-/usrp_gpif.c
-/usrp_gpif_inline.h
-/Makefile
-/Makefile.in
diff --git a/usrp/firmware/src/Makefile.am b/usrp/firmware/src/Makefile.am
deleted file mode 100644
index fab46cef0..000000000
--- a/usrp/firmware/src/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright 2004 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.
-# 
-
-SUBDIRS = common usrp2
diff --git a/usrp/firmware/src/common/.gitignore b/usrp/firmware/src/common/.gitignore
deleted file mode 100644
index d46c52c00..000000000
--- a/usrp/firmware/src/common/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-/*.ihx
-/*.lnk
-/*.lst
-/*.map
-/*.mem
-/*.rel
-/*.rst
-/*.sym
-/blink_leds.asm
-/usrp_common.asm
-/command_loop.asm
-/fpga.asm
-/*.asm
-/usrp_gpif.c
-/usrp_gpif_inline.h
-/Makefile
-/Makefile.in
diff --git a/usrp/firmware/src/common/Makefile.am b/usrp/firmware/src/common/Makefile.am
deleted file mode 100644
index 95232324d..000000000
--- a/usrp/firmware/src/common/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright 2004 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.
-# 
-
-EXTRA_DIST = 			\
-	_startup.a51		\
-	blink_leds.c		\
-	check_mdelay.c		\
-	check_udelay.c		\
-	edit-gpif		\
-	fpga.h			\
-	fpga_load.h		\
-	fpga_load.c		\
-	gpif.c			\
-	gpif.gpf		\
-	init_gpif.c		\
-	usrp_common.c		\
-	usrp_globals.h		\
-	vectors.a51		\
-	build_eeprom.py		
-
-all: usrp_gpif.c
-
-usrp_gpif.c usrp_gpif_inline.h : gpif.c
-	srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h
-
-CLEANFILES = \
-	*.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \
-	usrp_gpif.c usrp_gpif_inline.h
-
-DISTCLEANFILES = \
-	*.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \
-	usrp_gpif.c usrp_gpif_inline.h 
diff --git a/usrp/firmware/src/common/_startup.a51 b/usrp/firmware/src/common/_startup.a51
deleted file mode 100644
index 30a907857..000000000
--- a/usrp/firmware/src/common/_startup.a51
+++ /dev/null
@@ -1,80 +0,0 @@
-;;; -*- asm -*-
-;;;
-;;; Copyright 2003,2004 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.
-
-    
-;;; The default external memory initialization provided by sdcc is not
-;;; appropriate to the FX2.  This is derived from the sdcc code, but uses 
-;;; the FX2 specific _MPAGE sfr.
-
-
-	;; .area XISEG   (XDATA)  ; the initialized external data area
-	;; .area XINIT   (CODE)	  ; the code space consts to init XISEG
-	.area XSEG    (XDATA)	  ; zero initialized xdata
-	.area USBDESCSEG (XDATA)  ; usb descriptors
-
-	
-	.area CSEG    (CODE)
-
-	;; sfr that sets upper address byte of MOVX using @r0 or @r1
-	_MPAGE	=	0x0092
-
-__sdcc_external_startup::
-	;; This system is now compiled with the --no-xinit-opt 
-	;; which means that any initialized XDATA is handled
-	;; inline by code in the GSINIT segs emitted for each file.
-	;; 
-	;; We zero XSEG and all of the internal ram to ensure 
-	;; a known good state for uninitialized variables.
-
-;	_mcs51_genRAMCLEAR() start
-	mov	r0,#l_XSEG
-	mov	a,r0
-	orl	a,#(l_XSEG >> 8)
-	jz	00002$
-	mov	r1,#((l_XSEG + 255) >> 8)
-	mov	dptr,#s_XSEG
-	clr     a
-	
-00001$:	movx	@dptr,a
-	inc	dptr
-	djnz	r0,00001$
-	djnz	r1,00001$
-	
-	;; We're about to clear internal memory.  This will overwrite
-	;; the stack which contains our return address.
-	;; Pop our return address into DPH, DPL
-00002$:	pop	dph
-	pop	dpl
-	
-	;; R0 and A contain 0.  This loop will execute 256 times.
-	;; 
-	;; FWIW the first iteration writes direct address 0x00,
-	;; which is the location of r0.  We get lucky, we're 
-	;; writing the correct value (0)
-	
-00003$:	mov	@r0,a
-	djnz	r0,00003$
-
-	push	dpl		; restore our return address
-	push	dph
-
-	mov	dpl,#0		; indicate that data init is still required
-	ret
diff --git a/usrp/firmware/src/common/_startup.a51.brittle b/usrp/firmware/src/common/_startup.a51.brittle
deleted file mode 100644
index 2996275cf..000000000
--- a/usrp/firmware/src/common/_startup.a51.brittle
+++ /dev/null
@@ -1,78 +0,0 @@
-;;; -*- asm -*-
-;;;
-;;; Copyright 2003 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.
-
-    
-;;; The default external memory initialization provided by sdcc is not
-;;; appropriate to the FX2.  This is derived from the sdcc code, but uses 
-;;; the FX2 specific _MPAGE sfr.
-
-
-	.area XISEG   (XDATA)	; the initialized external data area
-	.area XINIT   (CODE)	; the code space consts to init XISEG
-	.area XSEG    (XDATA)	; zero initialized xdata
-	.area USBDESCSEG (XDATA); usb descriptors
-
-	
-	;; BIG TIME KLUDGE!
-	;; Look at usrp_main.rst and count the bytes from our
-	;; "normal return location" to the first instruction following
-	;; the comment:	"_mcs51_getRAMCLEAR () start"
-	
-	INSTRUCTION_BYTES_TO_SKIP = 0x29	 ; valid for sdcc 2.4.0 
-	
-
-	.area CSEG    (CODE)
-
-	;; sfr that sets upper address byte of MOVX using @r0 or @r1
-	_MPAGE	=	0x0092
-
-__sdcc_external_startup::
-;	_mcs51_genXINIT() start
-	mov	r1,#l_XINIT
-	mov	a,r1
-	orl	a,#(l_XINIT >> 8)
-	jz	00003$
-	mov	r2,#((l_XINIT+255) >> 8)
-	mov	dptr,#s_XINIT
-	mov	r0,#s_XISEG
-	mov	_MPAGE,#(s_XISEG >> 8)
-00001$:	clr	a
-	movc	a,@a+dptr
-	movx	@r0,a
-	inc	dptr
-	inc	r0
-	cjne	r0,#0,00002$
-	inc	_MPAGE
-00002$:	djnz	r1,00001$
-	djnz	r2,00001$
-	mov	_MPAGE,#0xFF
-00003$:
-
-	;; Danger! Total KLUDGE!
-	;; We pop the return address, add a magic number to it
-	;; then jump to that address.  Believe it or not, this
-	;; looks like the least kludgy way to handle this,
-	;; short of patching the compiler...
-
-	pop	dph
-	pop	dpl
-	mov	a,#INSTRUCTION_BYTES_TO_SKIP
-	jmp	@a+dptr
diff --git a/usrp/firmware/src/common/blink_leds.c b/usrp/firmware/src/common/blink_leds.c
deleted file mode 100644
index 255c69733..000000000
--- a/usrp/firmware/src/common/blink_leds.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* 
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-#include "usrp_common.h"
-
-void
-main (void)
-{
-  unsigned short	counter = 0;
-
-  init_usrp ();
-
-  while (1){
-    unsigned char counter_high = counter >> 8;
-    set_led_0 (counter_high & 0x40);
-    set_led_1 (counter_high & 0x80);
-    counter++;
-  }
-}
diff --git a/usrp/firmware/src/common/build_eeprom.py b/usrp/firmware/src/common/build_eeprom.py
deleted file mode 100755
index 00c2e3414..000000000
--- a/usrp/firmware/src/common/build_eeprom.py
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,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.
-# 
-
-import re
-import sys
-import os, os.path
-from optparse import OptionParser
-
-# USB Vendor and Product ID's
-
-VID = 0xfffe                            # Free Software Folks
-PID = 0x0002                            # Universal Software Radio Peripheral
-
-
-def hex_to_bytes (s):
-    if len (s) & 0x1:
-        raise ValueError, "Length must be even"
-    r = []
-    for i in range (0, len(s), 2):
-        r.append (int (s[i:i+2], 16))
-    return r
-    
-def msb (x):
-    return (x >> 8) & 0xff
-
-def lsb (x):
-    return x & 0xff
-
-class ihx_rec (object):
-    def __init__ (self, addr, type, data):
-        self.addr = addr
-        self.type = type
-        self.data = data
-
-class ihx_file (object):
-    def __init__ (self):
-        self.pat = re.compile (r':[0-9A-F]{10,}')
-    def read (self, file):
-        r = []
-        for line in file:
-            line = line.strip().upper ()
-            if not self.pat.match (line):
-                raise ValueError, "Invalid hex record format"
-            bytes = hex_to_bytes (line[1:])
-            sum = reduce (lambda x, y: x + y, bytes, 0) % 256
-            if sum != 0:
-                raise ValueError, "Bad hex checksum"
-            lenx = bytes[0]
-            addr = (bytes[1] << 8) + bytes[2]
-            type = bytes[3]
-            data = bytes[4:-1]
-            if lenx != len (data):
-                raise ValueError, "Invalid hex record (bad length)"
-            if type != 0:
-                break;
-            r.append (ihx_rec (addr, type, data))
-
-        return r
-
-def get_code (filename):
-    """Read the intel hex format file FILENAME and return a tuple
-    of the code starting address and a list of bytes to load there.
-    """
-    f = open (filename, 'r')
-    ifx = ihx_file ()
-    r = ifx.read (f)
-    r.sort (lambda a,b: a.addr - b.addr)
-    code_start = r[0].addr
-    code_end = r[-1].addr + len (r[-1].data)
-    code_len = code_end - code_start
-    code = [0] * code_len
-    for x in r:
-        a = x.addr
-        l = len (x.data)
-        code[a-code_start:a-code_start+l] = x.data
-    return (code_start, code)
-        
-
-def build_eeprom_image (filename, rev):
-    """Build a ``C2 Load'' EEPROM image.
-
-    For details on this format, see section 3.4.3 of
-    the EZ-USB FX2 Technical Reference Manual
-    """
-    # get the code we want to run
-    (start_addr, bytes) = get_code (filename)
-
-    devid = rev
-
-    rom_header = [
-        0xC2,                           # boot from EEPROM
-        lsb (VID),
-        msb (VID),
-        lsb (PID),
-        msb (PID),
-        lsb (devid),
-        msb (devid),
-        0                               # configuration byte
-        ]
-    
-    # 4 byte header that indicates where to load
-    # the immediately follow code bytes.
-    code_header = [
-        msb (len (bytes)),
-        lsb (len (bytes)),
-        msb (start_addr),
-        lsb (start_addr)
-        ]
-
-    # writes 0 to CPUCS reg (brings FX2 out of reset)
-    trailer = [
-        0x80,
-        0x01,
-        0xe6,
-        0x00,
-        0x00
-        ]
-
-    image = rom_header + code_header + bytes + trailer
-
-    assert (len (image) <= 256)
-    return image
-
-def build_shell_script (out, ihx_filename, rev, prefix):
-
-    image = build_eeprom_image (ihx_filename, rev)
-
-    out.write ('#!/bin/sh\n')
-    out.write ('usrper -x load_firmware ' + prefix + '/share/usrp/rev%d/std.ihx\n' % rev)
-    out.write ('sleep 2\n')
-    
-    # print "len(image) =", len(image)
-    
-    i2c_addr = 0x50
-    rom_addr = 0x00
-
-    hex_image = map (lambda x : "%02x" % (x,), image)
-
-    while (len (hex_image) > 0):
-        l = min (len (hex_image), 16)
-        out.write ('usrper i2c_write 0x%02x %02x%s\n' %
-                   (i2c_addr, rom_addr, ''.join (hex_image[0:l])))
-        hex_image = hex_image[l:]
-        rom_addr = rom_addr + l
-        out.write ('sleep 2\n')
-
-if __name__ == '__main__':
-    usage = "usage: %prog -p PREFIX -r REV [options] bootfile.ihx"
-    parser = OptionParser (usage=usage)
-    parser.add_option ("-p", "--prefix", type="string", default="",
-                       help="Specify install prefix from configure")
-    parser.add_option ("-r", "--rev", type="int", default=-1,
-                       help="Specify USRP revision number REV (2 or 4)")
-    (options, args) = parser.parse_args ()
-    if len (args) != 1:
-        parser.print_help ()
-        sys.exit (1)
-    if options.rev < 0:
-        sys.stderr.write (
-            "You must specify the USRP revision number (2 or 4) with -r REV\n")
-        sys.exit (1)
-    if options.prefix == "":
-        sys.stderr.write (
-            "You must specify the install prefix with -p PREFIX\n")
-        sys.exit (1)
-
-    ihx_filename = args[0]
-
-    build_shell_script (sys.stdout, ihx_filename, options.rev, options.prefix)
diff --git a/usrp/firmware/src/common/check_mdelay.c b/usrp/firmware/src/common/check_mdelay.c
deleted file mode 100644
index de1af47f6..000000000
--- a/usrp/firmware/src/common/check_mdelay.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* 
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-#include "usrp_common.h"
-#include "delay.h"
-
-void
-main (void)
-{
-  init_usrp ();
-
-  // CPUCS = 0;		// 12 MHz
-  // CPUCS = bmCLKSPD0;	// 24 MHz
-  CPUCS = bmCLKSPD1;	// 48 MHz
-  
-  while (1){
-    USRP_LED_REG ^= bmLED0;
-    mdelay (10);
-  }
-}
diff --git a/usrp/firmware/src/common/check_udelay.c b/usrp/firmware/src/common/check_udelay.c
deleted file mode 100644
index 46885a067..000000000
--- a/usrp/firmware/src/common/check_udelay.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* 
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-#include "usrp_common.h"
-#include "delay.h"
-
-void
-main (void)
-{
-  init_usrp ();
-
-  // CPUCS = 0;		// 12 MHz
-  // CPUCS = bmCLKSPD0;	// 24 MHz
-  CPUCS = bmCLKSPD1;	// 48 MHz
-  
-  while (1){
-    USRP_LED_REG ^= bmLED0;
-    udelay (250);
-  }
-}
diff --git a/usrp/firmware/src/common/edit-gpif b/usrp/firmware/src/common/edit-gpif
deleted file mode 100755
index 5367b75a5..000000000
--- a/usrp/firmware/src/common/edit-gpif
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env python
-# -*- Python -*-
-#
-# Copyright 2003 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.
-# 
-
-
-# Edit the gpif.c file generated by the Cypress GPIF Designer Tool and
-# produce usrp_gpif.c, and usrp_gpif_inline.h, files suitable for our
-# uses.
-
-import re
-import string
-import sys
-
-def check_flow_state (line, flow_state_dict):
-    mo = re.match (r'/\* Wave (\d) FlowStates \*/ (.*),', line)
-    if mo:
-        wave = int (mo.group (1))
-        data = mo.group (2)
-        split = data.split (',', 8)
-        v = map (lambda x : int (x, 16), split)
-        # print "%s, %s" % (wave, data)
-        # print "split: ", split
-        # print "v    : ", v
-        flow_state_dict[wave] = v
-
-
-def delta (xseq, yseq):
-    # set subtraction
-    z = []
-    for x in xseq:
-        if x not in yseq:
-            z.append (x)
-    return z
-    
-
-def write_define (output, name, pairs):
-    output.write ('#define %s()\t\\\n' % name)
-    output.write ('do {\t\t\t\t\t\\\n')
-    for reg, val in pairs:
-        output.write ('%14s = 0x%02x;\t\t\t\\\n' % (reg, val))
-    output.write ('} while (0)\n\n')
-    
-def write_inlines (output, dict):
-    regs = ['FLOWSTATE', 'FLOWLOGIC', 'FLOWEQ0CTL', 'FLOWEQ1CTL', 'FLOWHOLDOFF',
-            'FLOWSTB', 'FLOWSTBEDGE', 'FLOWSTBHPERIOD', 'GPIFHOLDAMOUNT']
-
-    READ_FLOW_STATE = 2
-    WRITE_FLOW_STATE = 3
-
-    read_info = zip (regs, dict[READ_FLOW_STATE])
-    write_info = zip (regs, dict[WRITE_FLOW_STATE])
-    
-    output.write ('''/*
- * Machine generated by "edit-gpif".  Do not edit by hand.
- */
-
-''')
-    write_define (output, 'setup_flowstate_common', read_info)
-    write_define (output, 'setup_flowstate_read', delta (read_info, write_info))
-    write_define (output, 'setup_flowstate_write', delta (write_info, read_info))
-    
-
-def edit_gpif (input_name, output_name, inline_name):
-    input = open (input_name, 'r')
-    output = open (output_name, 'w')
-    inline = open (inline_name, 'w')
-    flow_state_dict = {}
-
-    output.write ('''/*
- * Machine generated by "edit-gpif".  Do not edit by hand.
- */
-
-''')
-    
-    while 1:
-        line = input.readline ()
-        line = string.replace (line, '\r','')
-        line = re.sub (r' *$', r'', line)
-
-        check_flow_state (line, flow_state_dict)
-
-        line = re.sub (r'#include', r'// #include', line)
-        line = re.sub (r'xdata ', r'', line)
-        if re.search (r'GpifInit', line):
-            break
-        
-        output.write (line)
-
-    output.close ()
-    write_inlines (inline, flow_state_dict)
-    inline.close ()
-
-
-# gpif.c usrp_gpif.c usrp_gpif_inline.h
-edit_gpif (sys.argv[1], sys.argv[2], sys.argv[3])
diff --git a/usrp/firmware/src/common/fpga_load.c b/usrp/firmware/src/common/fpga_load.c
deleted file mode 100644
index c3ae9e707..000000000
--- a/usrp/firmware/src/common/fpga_load.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* 
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-#include "usrp_common.h"
-#include "fpga_load.h"
-#include "delay.h"
-
-/*
- * setup altera FPGA serial load (PS).
- *
- * On entry:
- *	don't care
- *
- * On exit:
- *	ALTERA_DCLK    = 0
- *	ALTERA_NCONFIG = 1
- *	ALTERA_NSTATUS = 1 (input)
- */
-unsigned char
-fpga_load_begin (void)
-{
-  USRP_ALTERA_CONFIG &= ~bmALTERA_BITS;		// clear all bits (NCONFIG low)
-  udelay (40);					// wait 40 us
-  USRP_ALTERA_CONFIG |= bmALTERA_NCONFIG;	// set NCONFIG high
-
-  if (UC_BOARD_HAS_FPGA){
-    // FIXME should really cap this loop with a counter so we
-    //   don't hang forever on a hardware failure.
-    while ((USRP_ALTERA_CONFIG & bmALTERA_NSTATUS) == 0) // wait for NSTATUS to go high
-      ;
-  }
-
-  // ready to xfer now
-
-  return 1;
-}
-
-/*
- * clock out the low bit of bits.
- *
- * On entry:
- *	ALTERA_DCLK    = 0
- *	ALTERA_NCONFIG = 1
- *	ALTERA_NSTATUS = 1 (input)
- *
- * On exit:
- *	ALTERA_DCLK    = 0
- *	ALTERA_NCONFIG = 1
- *	ALTERA_NSTATUS = 1 (input)
- */
-
-
-#if 0
-
-static void
-clock_out_config_byte (unsigned char bits)
-{
-  unsigned char i;
-
-  // clock out configuration byte, least significant bit first
-
-  for (i = 0; i < 8; i++){
-
-    USRP_ALTERA_CONFIG = ((USRP_ALTERA_CONFIG & ~bmALTERA_DATA0) | ((bits & 1) ? bmALTERA_DATA0 : 0));
-    USRP_ALTERA_CONFIG |= bmALTERA_DCLK;		/* set DCLK to 1 */
-    USRP_ALTERA_CONFIG &= ~bmALTERA_DCLK;		/* set DCLK to 0 */
-
-    bits = bits >> 1;
-  }
-}
-	
-#else
-
-static void 
-clock_out_config_byte (unsigned char bits) _naked
-{
-    _asm
-	mov	a, dpl
-	
-	rrc	a
-	mov	_bitALTERA_DATA0,c
-	setb	_bitALTERA_DCLK
-	clr	_bitALTERA_DCLK
-	
-	rrc	a
-	mov	_bitALTERA_DATA0,c
-	setb	_bitALTERA_DCLK
-	clr	_bitALTERA_DCLK
-	
-	rrc	a
-	mov	_bitALTERA_DATA0,c
-	setb	_bitALTERA_DCLK
-	clr	_bitALTERA_DCLK
-	
-	rrc	a
-	mov	_bitALTERA_DATA0,c
-	setb	_bitALTERA_DCLK
-	clr	_bitALTERA_DCLK
-	
-	rrc	a
-	mov	_bitALTERA_DATA0,c
-	setb	_bitALTERA_DCLK
-	clr	_bitALTERA_DCLK
-	
-	rrc	a
-	mov	_bitALTERA_DATA0,c
-	setb	_bitALTERA_DCLK
-	clr	_bitALTERA_DCLK
-	
-	rrc	a
-	mov	_bitALTERA_DATA0,c
-	setb	_bitALTERA_DCLK
-	clr	_bitALTERA_DCLK
-	
-	rrc	a
-	mov	_bitALTERA_DATA0,c
-	setb	_bitALTERA_DCLK
-	clr	_bitALTERA_DCLK
-	
-	ret	
-
-    _endasm;
-}
-
-#endif
-
-static void
-clock_out_bytes (unsigned char bytecount,
-		 unsigned char xdata *p)
-{
-  while (bytecount-- > 0)
-    clock_out_config_byte (*p++);
-}
-
-/*
- * Transfer block of bytes from packet to FPGA serial configuration port
- *
- * On entry:
- *	ALTERA_DCLK    = 0
- *	ALTERA_NCONFIG = 1
- *	ALTERA_NSTATUS = 1 (input)
- *
- * On exit:
- *	ALTERA_DCLK    = 0
- *	ALTERA_NCONFIG = 1
- *	ALTERA_NSTATUS = 1 (input)
- */
-unsigned char
-fpga_load_xfer (xdata unsigned char *p, unsigned char bytecount)
-{
-  clock_out_bytes (bytecount, p);
-  return 1;
-}
-
-/*
- * check for successful load...
- */
-unsigned char
-fpga_load_end (void)
-{
-  unsigned char status = USRP_ALTERA_CONFIG;
-
-  if (!UC_BOARD_HAS_FPGA)			// always true if we don't have FPGA
-    return 1;
-
-  if ((status & bmALTERA_NSTATUS) == 0)		// failed to program
-    return 0;
-
-  if ((status & bmALTERA_CONF_DONE) == bmALTERA_CONF_DONE)
-    return 1;					// everything's cool
-
-  // I don't think this should happen.  It indicates that
-  // programming is still in progress.
-
-  return 0;
-}
diff --git a/usrp/firmware/src/common/fpga_load.h b/usrp/firmware/src/common/fpga_load.h
deleted file mode 100644
index 7c36a04c8..000000000
--- a/usrp/firmware/src/common/fpga_load.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-#ifndef INCLUDED_FPGA_LOAD_H
-#define INCLUDED_FPGA_LOAD_H
-
-unsigned char fpga_load_begin (void);
-unsigned char fpga_load_xfer (xdata unsigned char *p, unsigned char len);
-unsigned char fpga_load_end (void);
-
-#endif /* INCLUDED_FPGA_LOAD_H */
diff --git a/usrp/firmware/src/common/gpif.c b/usrp/firmware/src/common/gpif.c
deleted file mode 100755
index 489e6e81a..000000000
--- a/usrp/firmware/src/common/gpif.c
+++ /dev/null
@@ -1,292 +0,0 @@
-// This program configures the General Programmable Interface (GPIF) for FX2.     
-// Please do not modify sections of text which are marked as "DO NOT EDIT ...". 
-//                                                                                
-// DO NOT EDIT ...                  
-// GPIF Initialization              
-// Interface Timing      Async        
-// Internal Ready Init   IntRdy=1     
-// CTL Out Tristate-able Binary       
-// SingleWrite WF Select     1     
-// SingleRead WF Select      0     
-// FifoWrite WF Select       3     
-// FifoRead WF Select        2     
-// Data Bus Idle Drive   Tristate     
-// END DO NOT EDIT                  
-                                    
-// DO NOT EDIT ...       
-// GPIF Wave Names       
-// Wave 0   = singlerd     
-// Wave 1   = singlewr     
-// Wave 2   = FIFORd       
-// Wave 3   = FIFOWr       
-                         
-// GPIF Ctrl Outputs   Level   
-// CTL 0    = WEN#     CMOS        
-// CTL 1    = REN#     CMOS        
-// CTL 2    = OE#      CMOS        
-// CTL 3    = CLRST    CMOS        
-// CTL 4    = unused   CMOS        
-// CTL 5    = BOGUS    CMOS        
-                               
-// GPIF Rdy Inputs         
-// RDY0     = EF#            
-// RDY1     = FF#            
-// RDY2     = unused         
-// RDY3     = unused         
-// RDY4     = unused         
-// RDY5     = TCXpire        
-// FIFOFlag = FIFOFlag       
-// IntReady = IntReady       
-// END DO NOT EDIT         
-// DO NOT EDIT ...                                                                         
-//                                                                                         
-// GPIF Waveform 0: singlerd                                                                
-//                                                                                         
-// Interval     0         1         2         3         4         5         6     Idle (7) 
-//          _________ _________ _________ _________ _________ _________ _________ _________
-//                                                                                         
-// AddrMode Same Val  Same Val  Same Val  Same Val  Same Val  Same Val  Same Val           
-// DataMode NO Data   NO Data   NO Data   NO Data   NO Data   NO Data   NO Data            
-// NextData SameData  SameData  SameData  SameData  SameData  SameData  SameData           
-// Int Trig No Int    No Int    No Int    No Int    No Int    No Int    No Int             
-// IF/Wait  Wait 1    Wait 1    Wait 1    Wait 1    Wait 1    Wait 1    Wait 1             
-//   Term A                                                                                
-//   LFunc                                                                                 
-//   Term B                                                                                
-// Branch1                                                                                 
-// Branch0                                                                                 
-// Re-Exec                                                                                 
-// Sngl/CRC Default   Default   Default   Default   Default   Default   Default            
-// WEN#         0         0         0         0         0         0         0         0    
-// REN#         0         0         0         0         0         0         0         0    
-// OE#          0         0         0         0         0         0         0         0    
-// CLRST        0         0         0         0         0         0         0         0    
-// unused       0         0         0         0         0         0         0         0    
-// BOGUS        0         0         0         0         0         0         0         0    
-//                     
-// END DO NOT EDIT     
-// DO NOT EDIT ...                                                                         
-//                                                                                         
-// GPIF Waveform 1: singlewr                                                                
-//                                                                                         
-// Interval     0         1         2         3         4         5         6     Idle (7) 
-//          _________ _________ _________ _________ _________ _________ _________ _________
-//                                                                                         
-// AddrMode Same Val  Same Val  Same Val  Same Val  Same Val  Same Val  Same Val           
-// DataMode Activate  Activate  Activate  Activate  Activate  Activate  Activate           
-// NextData SameData  SameData  SameData  SameData  SameData  SameData  SameData           
-// Int Trig No Int    No Int    No Int    No Int    No Int    No Int    No Int             
-// IF/Wait  Wait 1    IF        Wait 1    Wait 1    Wait 1    Wait 1    Wait 1             
-//   Term A           EF#                                                                  
-//   LFunc            AND                                                                  
-//   Term B           EF#                                                                  
-// Branch1            ThenIdle                                                             
-// Branch0            ElseIdle                                                             
-// Re-Exec            No                                                                   
-// Sngl/CRC Default   Default   Default   Default   Default   Default   Default            
-// WEN#         0         1         1         1         1         1         1         0    
-// REN#         0         0         0         0         0         0         0         0    
-// OE#          0         0         0         0         0         0         0         0    
-// CLRST        0         0         0         0         0         0         0         0    
-// unused       0         0         0         0         0         0         0         0    
-// BOGUS        0         0         0         0         0         0         0         0    
-//                     
-// END DO NOT EDIT     
-// DO NOT EDIT ...                                                                         
-//                                                                                         
-// GPIF Waveform 2: FIFORd                                                                  
-//                                                                                         
-// Interval     0         1         2         3         4         5         6     Idle (7) 
-//          _________ _________ _________ _________ _________ _________ _________ _________
-//                                                                                         
-// AddrMode Same Val  Same Val  Same Val  Same Val  Same Val  Same Val  Same Val           
-// DataMode NO Data   Activate  NO Data   NO Data   NO Data   NO Data   NO Data            
-// NextData SameData  SameData  SameData  SameData  SameData  SameData  SameData           
-// Int Trig No Int    No Int    No Int    No Int    No Int    No Int    No Int             
-// IF/Wait  Wait 1    IF        Wait 1    IF        Wait 1    Wait 1    Wait 1             
-//   Term A           TCXpire             TCXpire                                          
-//   LFunc            AND                 AND                                              
-//   Term B           TCXpire             TCXpire                                          
-// Branch1            Then 2              ThenIdle                                         
-// Branch0            Else 1              ElseIdle                                         
-// Re-Exec            No                  No                                               
-// Sngl/CRC Default   Default   Default   Default   Default   Default   Default            
-// WEN#         0         0         0         0         0         0         0         0    
-// REN#         0         0         0         0         0         0         0         0    
-// OE#          1         1         1         0         0         0         0         0    
-// CLRST        0         0         0         0         0         0         0         0    
-// unused       0         0         0         0         0         0         0         0    
-// BOGUS        0         0         0         0         0         0         0         0    
-//                     
-// END DO NOT EDIT     
-// DO NOT EDIT ...                                                                         
-//                                                                                         
-// GPIF Waveform 3: FIFOWr                                                                  
-//                                                                                         
-// Interval     0         1         2         3         4         5         6     Idle (7) 
-//          _________ _________ _________ _________ _________ _________ _________ _________
-//                                                                                         
-// AddrMode Same Val  Same Val  Same Val  Same Val  Same Val  Same Val  Same Val           
-// DataMode NO Data   Activate  Activate  Activate  Activate  Activate  Activate           
-// NextData SameData  SameData  SameData  SameData  SameData  SameData  SameData           
-// Int Trig No Int    No Int    No Int    No Int    No Int    No Int    No Int             
-// IF/Wait  Wait 1    IF        Wait 1    Wait 1    Wait 1    Wait 1    Wait 1             
-//   Term A           TCXpire                                                              
-//   LFunc            AND                                                                  
-//   Term B           TCXpire                                                              
-// Branch1            ThenIdle                                                             
-// Branch0            Else 1                                                               
-// Re-Exec            No                                                                   
-// Sngl/CRC Default   Default   Default   Default   Default   Default   Default            
-// WEN#         0         0         0         0         0         0         0         0    
-// REN#         0         0         0         0         0         0         0         0    
-// OE#          0         0         0         0         0         0         0         0    
-// CLRST        0         0         0         0         0         0         0         0    
-// unused       0         0         0         0         0         0         0         0    
-// BOGUS        0         0         0         0         0         0         0         0    
-//                     
-// END DO NOT EDIT     
-                                              
-// GPIF Program Code                          
-                                              
-// DO NOT EDIT ...                            
-#include "fx2.h"                            
-#include "fx2regs.h"                        
-#include "fx2sdly.h"     // SYNCDELAY macro 
-// END DO NOT EDIT                            
-                                              
-// DO NOT EDIT ...                     
-const char xdata WaveData[128] =     
-{                                      
-// Wave 0 
-/* LenBr */ 0x01,     0x01,     0x01,     0x01,     0x01,     0x01,     0x01,     0x07,
-/* Opcode*/ 0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,
-/* Output*/ 0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,
-/* LFun  */ 0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x3F,
-// Wave 1 
-/* LenBr */ 0x01,     0x3F,     0x01,     0x01,     0x01,     0x01,     0x01,     0x07,
-/* Opcode*/ 0x22,     0x03,     0x02,     0x02,     0x02,     0x02,     0x02,     0x00,
-/* Output*/ 0x00,     0x01,     0x01,     0x01,     0x01,     0x01,     0x01,     0x00,
-/* LFun  */ 0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x3F,
-// Wave 2 
-/* LenBr */ 0x01,     0x11,     0x01,     0x3F,     0x01,     0x01,     0x01,     0x07,
-/* Opcode*/ 0x00,     0x03,     0x00,     0x01,     0x00,     0x00,     0x00,     0x00,
-/* Output*/ 0x04,     0x04,     0x04,     0x00,     0x00,     0x00,     0x00,     0x00,
-/* LFun  */ 0x00,     0x2D,     0x00,     0x2D,     0x00,     0x00,     0x00,     0x3F,
-// Wave 3 
-/* LenBr */ 0x01,     0x39,     0x01,     0x01,     0x01,     0x01,     0x01,     0x07,
-/* Opcode*/ 0x00,     0x03,     0x02,     0x02,     0x02,     0x02,     0x02,     0x00,
-/* Output*/ 0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,
-/* LFun  */ 0x00,     0x2D,     0x00,     0x00,     0x00,     0x00,     0x00,     0x3F,
-};                     
-// END DO NOT EDIT     
-                       
-// DO NOT EDIT ...                     
-const char xdata FlowStates[36] =   
-{                                      
-/* Wave 0 FlowStates */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-/* Wave 1 FlowStates */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-/* Wave 2 FlowStates */ 0x81,0x2D,0x26,0x00,0x04,0x04,0x03,0x02,0x00,
-/* Wave 3 FlowStates */ 0x81,0x2D,0x21,0x00,0x04,0x04,0x03,0x02,0x00,
-};                     
-// END DO NOT EDIT     
-                       
-// DO NOT EDIT ...                                               
-const char xdata InitData[7] =                                   
-{                                                                
-/* Regs  */ 0xA0,0x00,0x00,0x00,0xEE,0x4E,0x00     
-};                                                               
-// END DO NOT EDIT                                               
-                                                                 
-// TO DO: You may add additional code below.
-
-void GpifInit( void )
-{
-  BYTE i;
- 
-  // Registers which require a synchronization delay, see section 15.14
-  // FIFORESET        FIFOPINPOLAR
-  // INPKTEND         OUTPKTEND
-  // EPxBCH:L         REVCTL
-  // GPIFTCB3         GPIFTCB2
-  // GPIFTCB1         GPIFTCB0
-  // EPxFIFOPFH:L     EPxAUTOINLENH:L
-  // EPxFIFOCFG       EPxGPIFFLGSEL
-  // PINFLAGSxx       EPxFIFOIRQ
-  // EPxFIFOIE        GPIFIRQ
-  // GPIFIE           GPIFADRH:L
-  // UDMACRCH:L       EPxGPIFTRIG
-  // GPIFTRIG
-  
-  // Note: The pre-REVE EPxGPIFTCH/L register are affected, as well...
-  //      ...these have been replaced by GPIFTC[B3:B0] registers
- 
-  // 8051 doesn't have access to waveform memories 'til
-  // the part is in GPIF mode.
- 
-  IFCONFIG = 0xEE;
-  // IFCLKSRC=1   , FIFOs executes on internal clk source
-  // xMHz=1       , 48MHz internal clk rate
-  // IFCLKOE=0    , Don't drive IFCLK pin signal at 48MHz
-  // IFCLKPOL=0   , Don't invert IFCLK pin signal from internal clk
-  // ASYNC=1      , master samples asynchronous
-  // GSTATE=1     , Drive GPIF states out on PORTE[2:0], debug WF
-  // IFCFG[1:0]=10, FX2 in GPIF master mode
- 
-  GPIFABORT = 0xFF;  // abort any waveforms pending
- 
-  GPIFREADYCFG = InitData[ 0 ];
-  GPIFCTLCFG = InitData[ 1 ];
-  GPIFIDLECS = InitData[ 2 ];
-  GPIFIDLECTL = InitData[ 3 ];
-  GPIFWFSELECT = InitData[ 5 ];
-  GPIFREADYSTAT = InitData[ 6 ];
- 
-  // use dual autopointer feature... 
-  AUTOPTRSETUP = 0x07;          // inc both pointers, 
-                                // ...warning: this introduces pdata hole(s)
-                                // ...at E67B (XAUTODAT1) and E67C (XAUTODAT2)
-  
-  // source
-  AUTOPTRH1 = MSB( &WaveData );
-  AUTOPTRL1 = LSB( &WaveData );
-  
-  // destination
-  AUTOPTRH2 = 0xE4;
-  AUTOPTRL2 = 0x00;
- 
-  // transfer
-  for ( i = 0x00; i < 128; i++ )
-  {
-    EXTAUTODAT2 = EXTAUTODAT1;
-  }
- 
-// Configure GPIF Address pins, output initial value,
-  PORTCCFG = 0xFF;    // [7:0] as alt. func. GPIFADR[7:0]
-  OEC = 0xFF;         // and as outputs
-  PORTECFG |= 0x80;   // [8] as alt. func. GPIFADR[8]
-  OEE |= 0x80;        // and as output
- 
-// ...OR... tri-state GPIFADR[8:0] pins
-//  PORTCCFG = 0x00;  // [7:0] as port I/O
-//  OEC = 0x00;       // and as inputs
-//  PORTECFG &= 0x7F; // [8] as port I/O
-//  OEE &= 0x7F;      // and as input
- 
-// GPIF address pins update when GPIFADRH/L written
-  SYNCDELAY;                    // 
-  GPIFADRH = 0x00;    // bits[7:1] always 0
-  SYNCDELAY;                    // 
-  GPIFADRL = 0x00;    // point to PERIPHERAL address 0x0000
- 
-// Configure GPIF FlowStates registers for Wave 0 of WaveData
-  FLOWSTATE = FlowStates[ 0 ];
-  FLOWLOGIC = FlowStates[ 1 ];
-  FLOWEQ0CTL = FlowStates[ 2 ];
-  FLOWEQ1CTL = FlowStates[ 3 ];
-  FLOWHOLDOFF = FlowStates[ 4 ];
-  FLOWSTB = FlowStates[ 5 ];
-  FLOWSTBEDGE = FlowStates[ 6 ];
-  FLOWSTBHPERIOD = FlowStates[ 7 ];
-}
- 
diff --git a/usrp/firmware/src/common/gpif.gpf b/usrp/firmware/src/common/gpif.gpf
deleted file mode 100755
index a954ac193..000000000
--- a/usrp/firmware/src/common/gpif.gpf
+++ /dev/null
diff --git a/usrp/firmware/src/common/init_gpif.c b/usrp/firmware/src/common/init_gpif.c
deleted file mode 100644
index edde919be..000000000
--- a/usrp/firmware/src/common/init_gpif.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-#include "usrp_common.h"
-
-// These are the tables generated by the Cypress GPIF Designer
-
-extern const char WaveData[128];
-extern const char FlowStates[36];
-extern const char InitData[7];
-
-// The tool is kind of screwed up, in that it doesn't configure some
-// of the ports correctly.  We just use their tables and handle the
-// initialization ourselves.  They also declare that their static
-// initialized data is in xdata, which screws us too.
-
-void
-init_gpif (void)
-{
-  // we've already setup IFCONFIG before calling this...
-
-  GPIFABORT = 0xFF;  // abort any waveforms pending
-  SYNCDELAY;
- 
-  GPIFREADYCFG = InitData[ 0 ];
-  GPIFCTLCFG = InitData[ 1 ];
-  GPIFIDLECS = InitData[ 2 ];
-  GPIFIDLECTL = InitData[ 3 ];
-  // Hmmm, what's InitData[ 4 ] ...
-  GPIFWFSELECT = InitData[ 5 ];
-  // GPIFREADYSTAT = InitData[ 6 ];	// I think this register is read only...
- 
-  {
-    BYTE i;
-    
-    for (i = 0; i < 128; i++){
-      GPIF_WAVE_DATA[i] = WaveData[i];
-    }
-  }
- 
-  FLOWSTATE = 0;		/* ensure it's off */
-}
diff --git a/usrp/firmware/src/common/usrp_common.c b/usrp/firmware/src/common/usrp_common.c
deleted file mode 100644
index 0998653c2..000000000
--- a/usrp/firmware/src/common/usrp_common.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-/* 
- * common code for USRP
- */
-
-#include "usrp_common.h"
-
-void init_board (void);
-
-void
-init_usrp (void)
-{
-  CPUCS = bmCLKSPD1;	// CPU runs @ 48 MHz
-  CKCON = 0;		// MOVX takes 2 cycles
-
-  // IFCLK is generated internally and runs at 48 MHz; GPIF "master mode"
-
-  IFCONFIG = bmIFCLKSRC | bm3048MHZ | bmIFCLKOE | bmIFCLKPOL | bmIFGPIF;
-  SYNCDELAY;
-
-  // configure IO ports (B and D are used by GPIF)
-
-  IOA = bmPORT_A_INITIAL;	// Port A initial state
-  OEA = bmPORT_A_OUTPUTS;	// Port A direction register
-
-  IOC = bmPORT_C_INITIAL;	// Port C initial state
-  OEC = bmPORT_C_OUTPUTS;	// Port C direction register
-
-  IOE = bmPORT_E_INITIAL;	// Port E initial state
-  OEE = bmPORT_E_OUTPUTS;	// Port E direction register
-
-
-  // REVCTL = bmDYN_OUT | bmENH_PKT;			// highly recommended by docs
-  // SYNCDELAY;
-  
-  // configure end points
-
-  EP1OUTCFG = bmVALID | bmBULK;				SYNCDELAY;
-  EP1INCFG  = bmVALID | bmBULK | bmIN;			SYNCDELAY;
-
-  EP2CFG    = bmVALID | bmBULK | bmQUADBUF;		SYNCDELAY;	// 512 quad bulk OUT
-  EP4CFG    = 0;					SYNCDELAY;	// disabled
-  EP6CFG    = bmVALID | bmBULK | bmQUADBUF | bmIN;	SYNCDELAY;	// 512 quad bulk IN
-  EP8CFG    = 0;					SYNCDELAY;	// disabled
-
-  // reset FIFOs
-
-  FIFORESET = bmNAKALL;					SYNCDELAY;
-  FIFORESET = 2;					SYNCDELAY;
-  // FIFORESET = 4;					SYNCDELAY;
-  FIFORESET = 6;					SYNCDELAY;
-  // FIFORESET = 8;					SYNCDELAY;
-  FIFORESET = 0;					SYNCDELAY;
-  
-  // configure end point FIFOs
-
-  // let core see 0 to 1 transistion of autoout bit
-
-  EP2FIFOCFG =             bmWORDWIDE;			SYNCDELAY;
-  EP2FIFOCFG = bmAUTOOUT | bmWORDWIDE;			SYNCDELAY;
-  EP6FIFOCFG = bmAUTOIN  | bmWORDWIDE;			SYNCDELAY;
-
-
-  // prime the pump 
-
-#if 0
-  EP2BCL  = 0x80;		SYNCDELAY;
-  EP2BCL  = 0x80;		SYNCDELAY;
-  EP2BCL  = 0x80;		SYNCDELAY;
-  EP2BCL  = 0x80;		SYNCDELAY;
-#endif
-
-  EP0BCH = 0;			SYNCDELAY;
-
-  // arm EP1OUT so we can receive "out" packets (TRM pg 8-8)
-
-  EP1OUTBC = 0;			SYNCDELAY;
-
-  EP2GPIFFLGSEL = 0x01;		SYNCDELAY; // For EP2OUT, GPIF uses EF flag
-  EP6GPIFFLGSEL = 0x02;		SYNCDELAY; // For EP6IN,  GPIF uses FF flag
-
-  // set autoin length for EP6
-  // FIXME should be f(enumeration)
-
-  EP6AUTOINLENH = (512) >> 8;	SYNCDELAY;  // this is the length for high speed
-  EP6AUTOINLENL = (512) & 0xff; SYNCDELAY;
-
-  init_board ();
-}
-
diff --git a/usrp/firmware/src/common/usrp_globals.h b/usrp/firmware/src/common/usrp_globals.h
deleted file mode 100644
index 445e9e6b4..000000000
--- a/usrp/firmware/src/common/usrp_globals.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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 _USRP_GLOBALS_H_
-#define _USRP_GLOBALS_H_
-
-extern unsigned char g_tx_enable;
-extern unsigned char g_rx_enable;
-extern unsigned char g_fpga_reset;
-extern unsigned char g_rx_overrun;
-extern unsigned char g_tx_underrun;
-
-
-#endif /* _USRP_GLOBALS_H_ */
diff --git a/usrp/firmware/src/common/vectors.a51 b/usrp/firmware/src/common/vectors.a51
deleted file mode 100644
index e9382ab84..000000000
--- a/usrp/firmware/src/common/vectors.a51
+++ /dev/null
@@ -1,180 +0,0 @@
-;;; -*- asm -*-
-;;;
-;;; Copyright 2003 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.
-;;; 
-
-;;; Interrupt vectors.
-
-;;; N.B. This object module must come first in the list of modules
-
-	.module vectors
-
-;;; ----------------------------------------------------------------
-;;;		  standard FX2 interrupt vectors
-;;; ----------------------------------------------------------------
-
-	.area CSEG (CODE)
-	.area GSINIT (CODE)
-	.area CSEG (CODE)
-__standard_interrupt_vector::
-__reset_vector::
-	ljmp	s_GSINIT
-	
-	;; 13 8-byte entries.  We point them all at __isr_nop
-	ljmp	__isr_nop	; 3 bytes
-	.ds	5		; + 5 = 8 bytes for vector slot
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-	ljmp	__isr_nop
-	.ds	5
-
-__isr_nop::
-	reti
-
-;;; ----------------------------------------------------------------
-;;; the FIFO/GPIF autovector.  14 4-byte entries.
-;;; must start on a 128 byte boundary.
-;;; ----------------------------------------------------------------
-	
-	. = __reset_vector + 0x0080
-		
-__fifo_gpif_autovector::
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-	ljmp	__isr_nop
-	nop	
-
-	
-;;; ----------------------------------------------------------------
-;;; the USB autovector.  32 4-byte entries.
-;;; must start on a 256 byte boundary.
-;;; ----------------------------------------------------------------
-
-	. = __reset_vector + 0x0100
-	
-__usb_autovector::
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
-	ljmp	__isr_nop
-	nop
diff --git a/usrp/firmware/src/usrp2/.gitignore b/usrp/firmware/src/usrp2/.gitignore
deleted file mode 100644
index 54a9e9415..000000000
--- a/usrp/firmware/src/usrp2/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-/*.ihx
-/*.lnk
-/*.lst
-/*.map
-/*.mem
-/*.rel
-/*.rst
-/*.sym
-/blink_leds.asm
-/usrp_common.asm
-/command_loop.asm
-/fpga.asm
-/*.asm
-/Makefile
-/Makefile.in
-/usrp_gpif.c
-/usrp_gpif_inline.h
-/Makefile.in
-/burn-usrp2-eeprom
-/burn-usrp4-eeprom
diff --git a/usrp/firmware/src/usrp2/Makefile.am b/usrp/firmware/src/usrp2/Makefile.am
deleted file mode 100644
index 4402cd636..000000000
--- a/usrp/firmware/src/usrp2/Makefile.am
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# Copyright 2003,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.
-# 
-
-firmware2dir = $(prefix)/share/usrp/rev2
-firmware2_DATA = std.ihx
-
-# we put the same stuff in the rev4 directory
-firmware4dir = $(prefix)/share/usrp/rev4
-firmware4_DATA = std.ihx
-
-EXTRA_DIST =			\
-	edit-gpif		\
-	_startup.a51		\
-	blink_leds.c		\
-	board_specific.c	\
-	check_mdelay.c		\
-	check_udelay.c		\
-	eeprom_boot.a51		\
-	eeprom_init.c		\
-	eeprom_io.c		\
-	eeprom_io.h		\
-	fpga_load.c		\
-	fpga_rev2.c		\
-	fpga_rev2.h		\
-	gpif.c			\
-	init_gpif.c		\
-	spi.c			\
-	spi.h			\
-	usb_descriptors.a51	\
-	usrp_common.c		\
-	usrp_common.h		\
-	usrp_gpif.c		\
-	usrp_main.c		\
-	usrp_rev2_regs.h	\
-	vectors.a51		
-
-
-DEFINES=-DHAVE_USRP2
-FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include \
-         -I$(top_srcdir)/usrp/firmware/src/usrp2 \
-	 -I$(top_srcdir)/usrp/firmware/src/common \
-	 -I$(top_builddir)/usrp/firmware/src/common
-
-# with EA = 0, the FX2 implements a portion of the 8051 "external memory"
-# on chip.  This memory is mapped like this:
-#
-# The bottom 8K of memory (0x0000 - 0x1fff) is used for both data and
-# code accesses.  There's also 512 bytes for data only from 0xe000 - 0xe1ff.
-#
-# We tell the linker to start the xdata segment at 0x1800, 6K up from
-# the bottom.
-
-MEMOPTS = --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size 0x0800 \
- -Wl '-b USBDESCSEG = 0xE000'
-
-LIBOPTS = -L ../../lib libfx2.lib
-LIBDEP = ../../lib/libfx2.lib
-
-LINKOPTS = $(MEMOPTS) $(LIBOPTS)
-
-EXECUTABLES = 			\
-	std.ihx			\
-	blink_leds.ihx 		\
-	check_mdelay.ihx	\
-	check_udelay.ihx	\
-	eeprom_boot.ihx		
-
-STARTUP = _startup.rel
-
-noinst_SCRIPTS = 		\
-	burn-usrp2-eeprom	\
-	burn-usrp4-eeprom
-
-
-.c.rel:
-	$(XCC) $(FW_INCLUDES) $(DEFINES) \
-		-c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.a51.rel:
-	test -f `basename '$<'` || $(LN_S) '$<' .
-	test -f ../common/`basename '$<'` -o \
-		\! -f `dirname '$<'`/../common/`basename '$<'` \
-		|| $(LN_S) `dirname '$<'`/../common/`basename '$<'` ../common/`basename '$<'`
-	$(XAS) `basename '$<'`
-
-
-EEPROM_BOOT_OBJS = eeprom_boot.rel eeprom_init.rel $(STARTUP)
-
-eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP)
-	$(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
-
-burn-usrp2-eeprom: eeprom_boot.ihx
-	$(PYTHON) $(srcdir)/../common/build_eeprom.py -p$(prefix) -r2 eeprom_boot.ihx > $@
-	chmod +x $@
-
-burn-usrp4-eeprom: eeprom_boot.ihx
-	$(PYTHON) $(srcdir)/../common/build_eeprom.py -p$(prefix) -r4 eeprom_boot.ihx > $@
-	chmod +x $@
-
-
-BLINK_LEDS_OBJS = blink_leds.rel usrp_common.rel board_specific.rel spi.rel $(STARTUP)
-
-blink_leds.ihx: $(BLINK_LEDS_OBJS) $(LIBDEP)
-	$(XCC) $(LINKOPTS) -o $@ $(BLINK_LEDS_OBJS)
-
-
-CHECK_MDELAY_OBJS = check_mdelay.rel usrp_common.rel board_specific.rel spi.rel $(STARTUP)
-
-check_mdelay.ihx: $(CHECK_MDELAY_OBJS) $(LIBDEP)
-	$(XCC) $(LINKOPTS) -o $@ $(CHECK_MDELAY_OBJS)
-
-
-
-CHECK_UDELAY_OBJS = check_udelay.rel usrp_common.rel board_specific.rel spi.rel $(STARTUP)
-
-check_udelay.ihx: $(CHECK_UDELAY_OBJS) $(LIBDEP)
-	$(XCC) $(LINKOPTS) -o $@ $(CHECK_UDELAY_OBJS)
-
-
-
-USRP_OBJS = \
-	vectors.rel 						\
-	usrp_main.rel usrp_common.rel board_specific.rel	\
-	fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel \
-	usb_descriptors.rel spi.rel eeprom_io.rel $(STARTUP)
-
-std.ihx: $(USRP_OBJS) $(LIBDEP)
-	$(XCC) $(LINKOPTS) -o $@ $(USRP_OBJS)
-
-CLEANFILES = 		\
-	*.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib	\
-	usrp_gpif.c usrp_gpif_inline.h \
-	burn-usrp2-eeprom	\
-	burn-usrp4-eeprom
-
-DISTCLEANFILES = 	\
-	*.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib
-
-# build gpif stuff
-
-all: usrp_gpif.c
-
-usrp_gpif.c usrp_gpif_inline.h : gpif.c
-	srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c usrp_gpif_inline.h
-
-
-# dependencies
-
-usrp_main.rel: usrp_gpif_inline.h
-#usrp_main.rel: fpga.h usrp_common.h ../../include/usrp_commands.h usrp_gpif_inline.h  ../../include/usrp_config.h usrp_rev2_regs.h ../../include/fx2regs.h
-#usrp_common.rel: usrp_common.h ../../include/usrp_commands.h ../../include/usrp_config.h usrp_rev2_regs.h ../../include/fx2regs.h
-#fpga.rel: usrp_common.h ../../include/usrp_commands.h fpga.h ../../include/usrp_config.h usrp_rev2_regs.h ../../include/fx2regs.h
-#init_gpif.rel: usrp_common.h ../../include/usrp_config.h usrp_rev2_regs.h ../../include/fx2regs.h
diff --git a/usrp/firmware/src/usrp2/_startup.a51 b/usrp/firmware/src/usrp2/_startup.a51
deleted file mode 100644
index 4f5309922..000000000
--- a/usrp/firmware/src/usrp2/_startup.a51
+++ /dev/null
@@ -1 +0,0 @@
-	.include "../common/_startup.a51"
diff --git a/usrp/firmware/src/usrp2/blink_leds.c b/usrp/firmware/src/usrp2/blink_leds.c
deleted file mode 100644
index c633d5d48..000000000
--- a/usrp/firmware/src/usrp2/blink_leds.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../common/blink_leds.c"
diff --git a/usrp/firmware/src/usrp2/board_specific.c b/usrp/firmware/src/usrp2/board_specific.c
deleted file mode 100644
index ef0081d84..000000000
--- a/usrp/firmware/src/usrp2/board_specific.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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.
- */
-
-#include "usrp_common.h"
-#include "spi.h"
-
-void
-set_led_0 (unsigned char on)
-{
-  if (!on)			// active low
-    USRP_PC |= bmPC_LED0;
-  else
-    USRP_PC &= ~bmPC_LED0;
-}
-
-void 
-set_led_1 (unsigned char on)
-{
-  if (!on)			// active low
-    USRP_PC |= bmPC_LED1;
-  else
-    USRP_PC &= ~bmPC_LED1;
-}
-
-void
-toggle_led_0 (void)
-{
-  USRP_PC ^= bmPC_LED0;
-}
-
-void
-toggle_led_1 (void)
-{
-  USRP_PC ^= bmPC_LED1;
-}
-
-void
-la_trace_init (void)
-{
-}
-
-void
-set_sleep_bits (unsigned char bits, unsigned char mask)
-{
-  // NOP on usrp1
-}
-
-static xdata unsigned char xbuf[1];
-
-void
-write_9862 (unsigned char which, unsigned char regno, unsigned char value)
-{
-  xbuf[0] = value;
-  
-  spi_write (0, regno & 0x3f,
-	     which == 0 ? SPI_ENABLE_CODEC_A : SPI_ENABLE_CODEC_B,
-	     SPI_FMT_MSB | SPI_FMT_HDR_1,
-	     xbuf, 1);
-}
-
-void
-write_both_9862s (unsigned char regno, unsigned char value)
-{
-  xbuf[0] = value;
-  
-  spi_write (0, regno & 0x3f,
-	     SPI_ENABLE_CODEC_A | SPI_ENABLE_CODEC_B,
-	     SPI_FMT_MSB | SPI_FMT_HDR_1,
-	     xbuf, 1);
-}
-
-#define REG_RX_PWR_DN		 1
-#define	REG_TX_PWR_DN		 8
-#define	REG_TX_MODULATOR	20
-
-static void
-power_down_9862s (void)
-{
-  write_both_9862s (REG_RX_PWR_DN,    0x01);
-  write_both_9862s (REG_TX_PWR_DN,    0x0f);	// pwr dn digital and analog_both
-  write_both_9862s (REG_TX_MODULATOR, 0x00);	// coarse & fine modulators disabled
-}
-
-void
-init_board (void)
-{
-  la_trace_init ();
-  init_spi ();
-
-  USRP_PC &= ~bmPC_nRESET;	// active low reset
-  USRP_PC |= bmPC_nRESET;
-
-  power_down_9862s ();
-}
diff --git a/usrp/firmware/src/usrp2/check_mdelay.c b/usrp/firmware/src/usrp2/check_mdelay.c
deleted file mode 100644
index ea4ccdb14..000000000
--- a/usrp/firmware/src/usrp2/check_mdelay.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../common/check_mdelay.c"
diff --git a/usrp/firmware/src/usrp2/check_udelay.c b/usrp/firmware/src/usrp2/check_udelay.c
deleted file mode 100644
index d01622e5e..000000000
--- a/usrp/firmware/src/usrp2/check_udelay.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../common/check_udelay.c"
diff --git a/usrp/firmware/src/usrp2/edit-gpif b/usrp/firmware/src/usrp2/edit-gpif
deleted file mode 100755
index 5367b75a5..000000000
--- a/usrp/firmware/src/usrp2/edit-gpif
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env python
-# -*- Python -*-
-#
-# Copyright 2003 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.
-# 
-
-
-# Edit the gpif.c file generated by the Cypress GPIF Designer Tool and
-# produce usrp_gpif.c, and usrp_gpif_inline.h, files suitable for our
-# uses.
-
-import re
-import string
-import sys
-
-def check_flow_state (line, flow_state_dict):
-    mo = re.match (r'/\* Wave (\d) FlowStates \*/ (.*),', line)
-    if mo:
-        wave = int (mo.group (1))
-        data = mo.group (2)
-        split = data.split (',', 8)
-        v = map (lambda x : int (x, 16), split)
-        # print "%s, %s" % (wave, data)
-        # print "split: ", split
-        # print "v    : ", v
-        flow_state_dict[wave] = v
-
-
-def delta (xseq, yseq):
-    # set subtraction
-    z = []
-    for x in xseq:
-        if x not in yseq:
-            z.append (x)
-    return z
-    
-
-def write_define (output, name, pairs):
-    output.write ('#define %s()\t\\\n' % name)
-    output.write ('do {\t\t\t\t\t\\\n')
-    for reg, val in pairs:
-        output.write ('%14s = 0x%02x;\t\t\t\\\n' % (reg, val))
-    output.write ('} while (0)\n\n')
-    
-def write_inlines (output, dict):
-    regs = ['FLOWSTATE', 'FLOWLOGIC', 'FLOWEQ0CTL', 'FLOWEQ1CTL', 'FLOWHOLDOFF',
-            'FLOWSTB', 'FLOWSTBEDGE', 'FLOWSTBHPERIOD', 'GPIFHOLDAMOUNT']
-
-    READ_FLOW_STATE = 2
-    WRITE_FLOW_STATE = 3
-
-    read_info = zip (regs, dict[READ_FLOW_STATE])
-    write_info = zip (regs, dict[WRITE_FLOW_STATE])
-    
-    output.write ('''/*
- * Machine generated by "edit-gpif".  Do not edit by hand.
- */
-
-''')
-    write_define (output, 'setup_flowstate_common', read_info)
-    write_define (output, 'setup_flowstate_read', delta (read_info, write_info))
-    write_define (output, 'setup_flowstate_write', delta (write_info, read_info))
-    
-
-def edit_gpif (input_name, output_name, inline_name):
-    input = open (input_name, 'r')
-    output = open (output_name, 'w')
-    inline = open (inline_name, 'w')
-    flow_state_dict = {}
-
-    output.write ('''/*
- * Machine generated by "edit-gpif".  Do not edit by hand.
- */
-
-''')
-    
-    while 1:
-        line = input.readline ()
-        line = string.replace (line, '\r','')
-        line = re.sub (r' *$', r'', line)
-
-        check_flow_state (line, flow_state_dict)
-
-        line = re.sub (r'#include', r'// #include', line)
-        line = re.sub (r'xdata ', r'', line)
-        if re.search (r'GpifInit', line):
-            break
-        
-        output.write (line)
-
-    output.close ()
-    write_inlines (inline, flow_state_dict)
-    inline.close ()
-
-
-# gpif.c usrp_gpif.c usrp_gpif_inline.h
-edit_gpif (sys.argv[1], sys.argv[2], sys.argv[3])
diff --git a/usrp/firmware/src/usrp2/eeprom_boot.a51 b/usrp/firmware/src/usrp2/eeprom_boot.a51
deleted file mode 100644
index 65e452668..000000000
--- a/usrp/firmware/src/usrp2/eeprom_boot.a51
+++ /dev/null
@@ -1,573 +0,0 @@
-;--------------------------------------------------------
-; Hand tweaked minimal eeprom boot code
-;--------------------------------------------------------
-	.module eeprom_boot
-	.optsdcc -mmcs51 --model-small
-	
-;--------------------------------------------------------
-; Public variables in this module
-;--------------------------------------------------------
-	.globl _eeprom_init
-	.globl _EP8FIFOBUF
-	.globl _EP6FIFOBUF
-	.globl _EP4FIFOBUF
-	.globl _EP2FIFOBUF
-	.globl _EP1INBUF
-	.globl _EP1OUTBUF
-	.globl _EP0BUF
-	.globl _CT4
-	.globl _CT3
-	.globl _CT2
-	.globl _CT1
-	.globl _USBTEST
-	.globl _TESTCFG
-	.globl _DBUG
-	.globl _UDMACRCQUAL
-	.globl _UDMACRCL
-	.globl _UDMACRCH
-	.globl _GPIFHOLDAMOUNT
-	.globl _FLOWSTBHPERIOD
-	.globl _FLOWSTBEDGE
-	.globl _FLOWSTB
-	.globl _FLOWHOLDOFF
-	.globl _FLOWEQ1CTL
-	.globl _FLOWEQ0CTL
-	.globl _FLOWLOGIC
-	.globl _FLOWSTATE
-	.globl _GPIFABORT
-	.globl _GPIFREADYSTAT
-	.globl _GPIFREADYCFG
-	.globl _XGPIFSGLDATLNOX
-	.globl _XGPIFSGLDATLX
-	.globl _XGPIFSGLDATH
-	.globl _EP8GPIFTRIG
-	.globl _EP8GPIFPFSTOP
-	.globl _EP8GPIFFLGSEL
-	.globl _EP6GPIFTRIG
-	.globl _EP6GPIFPFSTOP
-	.globl _EP6GPIFFLGSEL
-	.globl _EP4GPIFTRIG
-	.globl _EP4GPIFPFSTOP
-	.globl _EP4GPIFFLGSEL
-	.globl _EP2GPIFTRIG
-	.globl _EP2GPIFPFSTOP
-	.globl _EP2GPIFFLGSEL
-	.globl _GPIFTCB0
-	.globl _GPIFTCB1
-	.globl _GPIFTCB2
-	.globl _GPIFTCB3
-	.globl _GPIFADRL
-	.globl _GPIFADRH
-	.globl _GPIFCTLCFG
-	.globl _GPIFIDLECTL
-	.globl _GPIFIDLECS
-	.globl _GPIFWFSELECT
-	.globl _SETUPDAT
-	.globl _SUDPTRCTL
-	.globl _SUDPTRL
-	.globl _SUDPTRH
-	.globl _EP8FIFOBCL
-	.globl _EP8FIFOBCH
-	.globl _EP6FIFOBCL
-	.globl _EP6FIFOBCH
-	.globl _EP4FIFOBCL
-	.globl _EP4FIFOBCH
-	.globl _EP2FIFOBCL
-	.globl _EP2FIFOBCH
-	.globl _EP8FIFOFLGS
-	.globl _EP6FIFOFLGS
-	.globl _EP4FIFOFLGS
-	.globl _EP2FIFOFLGS
-	.globl _EP8CS
-	.globl _EP6CS
-	.globl _EP4CS
-	.globl _EP2CS
-	.globl _EP1INCS
-	.globl _EP1OUTCS
-	.globl _EP0CS
-	.globl _EP8BCL
-	.globl _EP8BCH
-	.globl _EP6BCL
-	.globl _EP6BCH
-	.globl _EP4BCL
-	.globl _EP4BCH
-	.globl _EP2BCL
-	.globl _EP2BCH
-	.globl _EP1INBC
-	.globl _EP1OUTBC
-	.globl _EP0BCL
-	.globl _EP0BCH
-	.globl _FNADDR
-	.globl _MICROFRAME
-	.globl _USBFRAMEL
-	.globl _USBFRAMEH
-	.globl _TOGCTL
-	.globl _WAKEUPCS
-	.globl _SUSPEND
-	.globl _USBCS
-	.globl _XAUTODAT2
-	.globl _XAUTODAT1
-	.globl _I2CTL
-	.globl _I2DAT
-	.globl _I2CS
-	.globl _PORTECFG
-	.globl _PORTCCFG
-	.globl _PORTACFG
-	.globl _INTSETUP
-	.globl _INT4IVEC
-	.globl _INT2IVEC
-	.globl _CLRERRCNT
-	.globl _ERRCNTLIM
-	.globl _USBERRIRQ
-	.globl _USBERRIE
-	.globl _GPIFIRQ
-	.globl _GPIFIE
-	.globl _EPIRQ
-	.globl _EPIE
-	.globl _USBIRQ
-	.globl _USBIE
-	.globl _NAKIRQ
-	.globl _NAKIE
-	.globl _IBNIRQ
-	.globl _IBNIE
-	.globl _EP8FIFOIRQ
-	.globl _EP8FIFOIE
-	.globl _EP6FIFOIRQ
-	.globl _EP6FIFOIE
-	.globl _EP4FIFOIRQ
-	.globl _EP4FIFOIE
-	.globl _EP2FIFOIRQ
-	.globl _EP2FIFOIE
-	.globl _OUTPKTEND
-	.globl _INPKTEND
-	.globl _EP8ISOINPKTS
-	.globl _EP6ISOINPKTS
-	.globl _EP4ISOINPKTS
-	.globl _EP2ISOINPKTS
-	.globl _EP8FIFOPFL
-	.globl _EP8FIFOPFH
-	.globl _EP6FIFOPFL
-	.globl _EP6FIFOPFH
-	.globl _EP4FIFOPFL
-	.globl _EP4FIFOPFH
-	.globl _EP2FIFOPFL
-	.globl _EP2FIFOPFH
-	.globl _EP8AUTOINLENL
-	.globl _EP8AUTOINLENH
-	.globl _EP6AUTOINLENL
-	.globl _EP6AUTOINLENH
-	.globl _EP4AUTOINLENL
-	.globl _EP4AUTOINLENH
-	.globl _EP2AUTOINLENL
-	.globl _EP2AUTOINLENH
-	.globl _EP8FIFOCFG
-	.globl _EP6FIFOCFG
-	.globl _EP4FIFOCFG
-	.globl _EP2FIFOCFG
-	.globl _EP8CFG
-	.globl _EP6CFG
-	.globl _EP4CFG
-	.globl _EP2CFG
-	.globl _EP1INCFG
-	.globl _EP1OUTCFG
-	.globl _REVCTL
-	.globl _REVID
-	.globl _FIFOPINPOLAR
-	.globl _UART230
-	.globl _BPADDRL
-	.globl _BPADDRH
-	.globl _BREAKPT
-	.globl _FIFORESET
-	.globl _PINFLAGSCD
-	.globl _PINFLAGSAB
-	.globl _IFCONFIG
-	.globl _CPUCS
-	.globl _RES_WAVEDATA_END
-	.globl _GPIF_WAVE_DATA
-;--------------------------------------------------------
-; special function registers
-;--------------------------------------------------------
-_IOA	=	0x0080
-_SP	=	0x0081
-_DPL	=	0x0082
-_DPH	=	0x0083
-_DPL1	=	0x0084
-_DPH1	=	0x0085
-_DPS	=	0x0086
-_PCON	=	0x0087
-_TCON	=	0x0088
-_TMOD	=	0x0089
-_TL0	=	0x008a
-_TL1	=	0x008b
-_TH0	=	0x008c
-_TH1	=	0x008d
-_CKCON	=	0x008e
-_IOB	=	0x0090
-_EXIF	=	0x0091
-_MPAGE	=	0x0092
-_SCON0	=	0x0098
-_SBUF0	=	0x0099
-_APTR1H	=	0x009a
-_APTR1L	=	0x009b
-_AUTODAT1	=	0x009c
-_AUTOPTRH2	=	0x009d
-_AUTOPTRL2	=	0x009e
-_AUTODAT2	=	0x009f
-_IOC	=	0x00a0
-_INT2CLR	=	0x00a1
-_INT4CLR	=	0x00a2
-_IE	=	0x00a8
-_EP2468STAT	=	0x00aa
-_EP24FIFOFLGS	=	0x00ab
-_EP68FIFOFLGS	=	0x00ac
-_AUTOPTRSETUP	=	0x00af
-_IOD	=	0x00b0
-_IOE	=	0x00b1
-_OEA	=	0x00b2
-_OEB	=	0x00b3
-_OEC	=	0x00b4
-_OED	=	0x00b5
-_OEE	=	0x00b6
-_IP	=	0x00b8
-_EP01STAT	=	0x00ba
-_GPIFTRIG	=	0x00bb
-_GPIFSGLDATH	=	0x00bd
-_GPIFSGLDATLX	=	0x00be
-_GPIFSGLDATLNOX	=	0x00bf
-_SCON1	=	0x00c0
-_SBUF1	=	0x00c1
-_T2CON	=	0x00c8
-_RCAP2L	=	0x00ca
-_RCAP2H	=	0x00cb
-_TL2	=	0x00cc
-_TH2	=	0x00cd
-_PSW	=	0x00d0
-_EICON	=	0x00d8
-_ACC	=	0x00e0
-_EIE	=	0x00e8
-_B	=	0x00f0
-_EIP	=	0x00f8
-;--------------------------------------------------------
-; special function bits 
-;--------------------------------------------------------
-_SEL	=	0x0086
-_IT0	=	0x0088
-_IE0	=	0x0089
-_IT1	=	0x008a
-_IE1	=	0x008b
-_TR0	=	0x008c
-_TF0	=	0x008d
-_TR1	=	0x008e
-_TF1	=	0x008f
-_RI	=	0x0098
-_TI	=	0x0099
-_RB8	=	0x009a
-_TB8	=	0x009b
-_REN	=	0x009c
-_SM2	=	0x009d
-_SM1	=	0x009e
-_SM0	=	0x009f
-_EX0	=	0x00a8
-_ET0	=	0x00a9
-_EX1	=	0x00aa
-_ET1	=	0x00ab
-_ES0	=	0x00ac
-_ET2	=	0x00ad
-_ES1	=	0x00ae
-_EA	=	0x00af
-_PX0	=	0x00b8
-_PT0	=	0x00b9
-_PX1	=	0x00ba
-_PT1	=	0x00bb
-_PS0	=	0x00bc
-_PT2	=	0x00bd
-_PS1	=	0x00be
-_RI1	=	0x00c0
-_TI1	=	0x00c1
-_RB81	=	0x00c2
-_TB81	=	0x00c3
-_REN1	=	0x00c4
-_SM21	=	0x00c5
-_SM11	=	0x00c6
-_SM01	=	0x00c7
-_CP_RL2	=	0x00c8
-_C_T2	=	0x00c9
-_TR2	=	0x00ca
-_EXEN2	=	0x00cb
-_TCLK	=	0x00cc
-_RCLK	=	0x00cd
-_EXF2	=	0x00ce
-_TF2	=	0x00cf
-_P	=	0x00d0
-_FL	=	0x00d1
-_OV	=	0x00d2
-_RS0	=	0x00d3
-_RS1	=	0x00d4
-_F0	=	0x00d5
-_AC	=	0x00d6
-_CY	=	0x00d7
-_INT6	=	0x00db
-_RESI	=	0x00dc
-_ERESI	=	0x00dd
-_SMOD1	=	0x00df
-_EIUSB	=	0x00e8
-_EI2C	=	0x00e9
-_EIEX4	=	0x00ea
-_EIEX5	=	0x00eb
-_EIEX6	=	0x00ec
-_PUSB	=	0x00f8
-_PI2C	=	0x00f9
-_EIPX4	=	0x00fa
-_EIPX5	=	0x00fb
-_EIPX6	=	0x00fc
-_bitS_CLK	=	0x0080
-_bitS_OUT	=	0x0081
-_bitS_IN	=	0x0082
-_bitALTERA_DATA0	=	0x00a1
-_bitALTERA_DCLK	=	0x00a3
-;--------------------------------------------------------
-; overlayable register banks 
-;--------------------------------------------------------
-	.area REG_BANK_0	(REL,OVR,DATA)
-	.ds 8
-;--------------------------------------------------------
-; internal ram data
-;--------------------------------------------------------
-	.area DSEG    (DATA)
-;--------------------------------------------------------
-; overlayable items in internal ram 
-;--------------------------------------------------------
-	.area OSEG    (OVR,DATA)
-;--------------------------------------------------------
-; Stack segment in internal ram 
-;--------------------------------------------------------
-	.area	SSEG	(DATA)
-__start__stack:
-	.ds	1
-
-;--------------------------------------------------------
-; indirectly addressable internal ram data
-;--------------------------------------------------------
-	.area ISEG    (DATA)
-;--------------------------------------------------------
-; bit data
-;--------------------------------------------------------
-	.area BSEG    (BIT)
-;--------------------------------------------------------
-; external ram data
-;--------------------------------------------------------
-	.area XSEG    (XDATA)
-_GPIF_WAVE_DATA	=	0xe400
-_RES_WAVEDATA_END	=	0xe480
-_CPUCS	=	0xe600
-_IFCONFIG	=	0xe601
-_PINFLAGSAB	=	0xe602
-_PINFLAGSCD	=	0xe603
-_FIFORESET	=	0xe604
-_BREAKPT	=	0xe605
-_BPADDRH	=	0xe606
-_BPADDRL	=	0xe607
-_UART230	=	0xe608
-_FIFOPINPOLAR	=	0xe609
-_REVID	=	0xe60a
-_REVCTL	=	0xe60b
-_EP1OUTCFG	=	0xe610
-_EP1INCFG	=	0xe611
-_EP2CFG	=	0xe612
-_EP4CFG	=	0xe613
-_EP6CFG	=	0xe614
-_EP8CFG	=	0xe615
-_EP2FIFOCFG	=	0xe618
-_EP4FIFOCFG	=	0xe619
-_EP6FIFOCFG	=	0xe61a
-_EP8FIFOCFG	=	0xe61b
-_EP2AUTOINLENH	=	0xe620
-_EP2AUTOINLENL	=	0xe621
-_EP4AUTOINLENH	=	0xe622
-_EP4AUTOINLENL	=	0xe623
-_EP6AUTOINLENH	=	0xe624
-_EP6AUTOINLENL	=	0xe625
-_EP8AUTOINLENH	=	0xe626
-_EP8AUTOINLENL	=	0xe627
-_EP2FIFOPFH	=	0xe630
-_EP2FIFOPFL	=	0xe631
-_EP4FIFOPFH	=	0xe632
-_EP4FIFOPFL	=	0xe633
-_EP6FIFOPFH	=	0xe634
-_EP6FIFOPFL	=	0xe635
-_EP8FIFOPFH	=	0xe636
-_EP8FIFOPFL	=	0xe637
-_EP2ISOINPKTS	=	0xe640
-_EP4ISOINPKTS	=	0xe641
-_EP6ISOINPKTS	=	0xe642
-_EP8ISOINPKTS	=	0xe643
-_INPKTEND	=	0xe648
-_OUTPKTEND	=	0xe649
-_EP2FIFOIE	=	0xe650
-_EP2FIFOIRQ	=	0xe651
-_EP4FIFOIE	=	0xe652
-_EP4FIFOIRQ	=	0xe653
-_EP6FIFOIE	=	0xe654
-_EP6FIFOIRQ	=	0xe655
-_EP8FIFOIE	=	0xe656
-_EP8FIFOIRQ	=	0xe657
-_IBNIE	=	0xe658
-_IBNIRQ	=	0xe659
-_NAKIE	=	0xe65a
-_NAKIRQ	=	0xe65b
-_USBIE	=	0xe65c
-_USBIRQ	=	0xe65d
-_EPIE	=	0xe65e
-_EPIRQ	=	0xe65f
-_GPIFIE	=	0xe660
-_GPIFIRQ	=	0xe661
-_USBERRIE	=	0xe662
-_USBERRIRQ	=	0xe663
-_ERRCNTLIM	=	0xe664
-_CLRERRCNT	=	0xe665
-_INT2IVEC	=	0xe666
-_INT4IVEC	=	0xe667
-_INTSETUP	=	0xe668
-_PORTACFG	=	0xe670
-_PORTCCFG	=	0xe671
-_PORTECFG	=	0xe672
-_I2CS	=	0xe678
-_I2DAT	=	0xe679
-_I2CTL	=	0xe67a
-_XAUTODAT1	=	0xe67b
-_XAUTODAT2	=	0xe67c
-_USBCS	=	0xe680
-_SUSPEND	=	0xe681
-_WAKEUPCS	=	0xe682
-_TOGCTL	=	0xe683
-_USBFRAMEH	=	0xe684
-_USBFRAMEL	=	0xe685
-_MICROFRAME	=	0xe686
-_FNADDR	=	0xe687
-_EP0BCH	=	0xe68a
-_EP0BCL	=	0xe68b
-_EP1OUTBC	=	0xe68d
-_EP1INBC	=	0xe68f
-_EP2BCH	=	0xe690
-_EP2BCL	=	0xe691
-_EP4BCH	=	0xe694
-_EP4BCL	=	0xe695
-_EP6BCH	=	0xe698
-_EP6BCL	=	0xe699
-_EP8BCH	=	0xe69c
-_EP8BCL	=	0xe69d
-_EP0CS	=	0xe6a0
-_EP1OUTCS	=	0xe6a1
-_EP1INCS	=	0xe6a2
-_EP2CS	=	0xe6a3
-_EP4CS	=	0xe6a4
-_EP6CS	=	0xe6a5
-_EP8CS	=	0xe6a6
-_EP2FIFOFLGS	=	0xe6a7
-_EP4FIFOFLGS	=	0xe6a8
-_EP6FIFOFLGS	=	0xe6a9
-_EP8FIFOFLGS	=	0xe6aa
-_EP2FIFOBCH	=	0xe6ab
-_EP2FIFOBCL	=	0xe6ac
-_EP4FIFOBCH	=	0xe6ad
-_EP4FIFOBCL	=	0xe6ae
-_EP6FIFOBCH	=	0xe6af
-_EP6FIFOBCL	=	0xe6b0
-_EP8FIFOBCH	=	0xe6b1
-_EP8FIFOBCL	=	0xe6b2
-_SUDPTRH	=	0xe6b3
-_SUDPTRL	=	0xe6b4
-_SUDPTRCTL	=	0xe6b5
-_SETUPDAT	=	0xe6b8
-_GPIFWFSELECT	=	0xe6c0
-_GPIFIDLECS	=	0xe6c1
-_GPIFIDLECTL	=	0xe6c2
-_GPIFCTLCFG	=	0xe6c3
-_GPIFADRH	=	0xe6c4
-_GPIFADRL	=	0xe6c5
-_GPIFTCB3	=	0xe6ce
-_GPIFTCB2	=	0xe6cf
-_GPIFTCB1	=	0xe6d0
-_GPIFTCB0	=	0xe6d1
-_EP2GPIFFLGSEL	=	0xe6d2
-_EP2GPIFPFSTOP	=	0xe6d3
-_EP2GPIFTRIG	=	0xe6d4
-_EP4GPIFFLGSEL	=	0xe6da
-_EP4GPIFPFSTOP	=	0xe6db
-_EP4GPIFTRIG	=	0xe6dc
-_EP6GPIFFLGSEL	=	0xe6e2
-_EP6GPIFPFSTOP	=	0xe6e3
-_EP6GPIFTRIG	=	0xe6e4
-_EP8GPIFFLGSEL	=	0xe6ea
-_EP8GPIFPFSTOP	=	0xe6eb
-_EP8GPIFTRIG	=	0xe6ec
-_XGPIFSGLDATH	=	0xe6f0
-_XGPIFSGLDATLX	=	0xe6f1
-_XGPIFSGLDATLNOX	=	0xe6f2
-_GPIFREADYCFG	=	0xe6f3
-_GPIFREADYSTAT	=	0xe6f4
-_GPIFABORT	=	0xe6f5
-_FLOWSTATE	=	0xe6c6
-_FLOWLOGIC	=	0xe6c7
-_FLOWEQ0CTL	=	0xe6c8
-_FLOWEQ1CTL	=	0xe6c9
-_FLOWHOLDOFF	=	0xe6ca
-_FLOWSTB	=	0xe6cb
-_FLOWSTBEDGE	=	0xe6cc
-_FLOWSTBHPERIOD	=	0xe6cd
-_GPIFHOLDAMOUNT	=	0xe60c
-_UDMACRCH	=	0xe67d
-_UDMACRCL	=	0xe67e
-_UDMACRCQUAL	=	0xe67f
-_DBUG	=	0xe6f8
-_TESTCFG	=	0xe6f9
-_USBTEST	=	0xe6fa
-_CT1	=	0xe6fb
-_CT2	=	0xe6fc
-_CT3	=	0xe6fd
-_CT4	=	0xe6fe
-_EP0BUF	=	0xe740
-_EP1OUTBUF	=	0xe780
-_EP1INBUF	=	0xe7c0
-_EP2FIFOBUF	=	0xf000
-_EP4FIFOBUF	=	0xf400
-_EP6FIFOBUF	=	0xf800
-_EP8FIFOBUF	=	0xfc00
-;--------------------------------------------------------
-; external initialized ram data
-;--------------------------------------------------------
-;--------------------------------------------------------
-; interrupt vector 
-;--------------------------------------------------------
-	.area CSEG    (CODE)
-__interrupt_vect:
-	ljmp	__sdcc_gsinit_startup
-;--------------------------------------------------------
-; global & static initialisations
-;--------------------------------------------------------
-	.area GSINIT  (CODE)
-	.area GSFINAL (CODE)
-	.area GSINIT  (CODE)
-__sdcc_gsinit_startup:
-	mov	sp,#__start__stack - 1
-	lcall	__sdcc_external_startup
-	mov	a,dpl
-	jz	__sdcc_init_data
-	ljmp	__sdcc_program_startup
-__sdcc_init_data:
-	.area GSFINAL (CODE)
-	ljmp	__sdcc_program_startup
-;--------------------------------------------------------
-; Home
-;--------------------------------------------------------
-	.area HOME    (CODE)
-	.area CSEG    (CODE)
-;--------------------------------------------------------
-; code
-;--------------------------------------------------------
-	.area CSEG    (CODE)
-__sdcc_program_startup:
-	lcall	_eeprom_init
-;	return from _eeprom_init will spin here
-	sjmp .
-	.area CSEG    (CODE)
diff --git a/usrp/firmware/src/usrp2/eeprom_init.c b/usrp/firmware/src/usrp2/eeprom_init.c
deleted file mode 100644
index a6f6cbe2d..000000000
--- a/usrp/firmware/src/usrp2/eeprom_init.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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.
- */
-
-#include "usrp_common.h"
-#include "usrp_commands.h"
-#include "spi.h"
-
-/*
- * the host side fpga loader code pushes an MD5 hash of the bitstream
- * into hash1.
- */
-#define	  USRP_HASH_SIZE      16
-xdata at USRP_HASH_SLOT_0_ADDR unsigned char hash0[USRP_HASH_SIZE];
-
-
-#define enable_codecs() USRP_PA &= ~(bmPA_SEN_CODEC_A | bmPA_SEN_CODEC_B)
-#define disable_all()	USRP_PA |=  (bmPA_SEN_CODEC_A | bmPA_SEN_CODEC_B)
-
-static void
-write_byte_msb (unsigned char v);
-
-void
-write_both_9862s (unsigned char header_lo, unsigned char v)
-{
-  enable_codecs ();
-
-  write_byte_msb (header_lo);
-  write_byte_msb (v);
-
-  disable_all ();
-}
-
-// ----------------------------------------------------------------
-
-static void
-write_byte_msb (unsigned char v)
-{
-  unsigned char n = 8;
-  do {
-    v = (v << 1) | (v >> 7);	// rotate left (MSB into bottom bit)
-    bitS_OUT = v & 0x1;
-    bitS_CLK = 1;
-    bitS_CLK = 0;
-  } while (--n != 0);
-}
-
-// ----------------------------------------------------------------
-
-#define REG_RX_PWR_DN		 1
-#define	REG_TX_PWR_DN		 8
-#define	REG_TX_MODULATOR	20
-
-void eeprom_init (void)
-{
-  unsigned short counter;
-  unsigned char	 i;
-
-  // configure IO ports (B and D are used by GPIF)
-
-  IOA = bmPORT_A_INITIAL;	// Port A initial state
-  OEA = bmPORT_A_OUTPUTS;	// Port A direction register
-
-  IOC = bmPORT_C_INITIAL;	// Port C initial state
-  OEC = bmPORT_C_OUTPUTS;	// Port C direction register
-
-  IOE = bmPORT_E_INITIAL;	// Port E initial state
-  OEE = bmPORT_E_OUTPUTS;	// Port E direction register
-
-  EP0BCH = 0;			SYNCDELAY;
-
-  // USBCS &= ~bmRENUM;		// chip firmware handles commands
-  USBCS = 0;			// chip firmware handles commands
-
-  USRP_PC &= ~bmPC_nRESET;	// active low reset
-  USRP_PC |=  bmPC_nRESET;
-
-  // init_spi ();
-  bitS_OUT = 0;			/* idle state has CLK = 0 */
-
-  write_both_9862s (REG_RX_PWR_DN,    0x01);
-  write_both_9862s (REG_TX_PWR_DN,    0x0f);	// pwr dn digital and analog_both
-  write_both_9862s (REG_TX_MODULATOR, 0x00);	// coarse & fine modulators disabled
-
-  // zero firmware hash slot
-  i = 0;
-  do {
-    hash0[i] = 0;
-    i++;
-  } while (i != USRP_HASH_SIZE);
-
-  counter = 0;
-  while (1){
-    counter++;
-    if (counter & 0x8000)
-      IOC ^= bmPC_LED0;
-  }
-}
diff --git a/usrp/firmware/src/usrp2/eeprom_io.c b/usrp/firmware/src/usrp2/eeprom_io.c
deleted file mode 100644
index 9eeb53636..000000000
--- a/usrp/firmware/src/usrp2/eeprom_io.c
+++ /dev/null
@@ -1,65 +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.
- */
-
-#include "eeprom_io.h"
-#include "i2c.h"
-#include "delay.h"
-
-// returns non-zero if successful, else 0
-unsigned char
-eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset,
-	     xdata unsigned char *buf, unsigned char len)
-{
-  // We setup a random read by first doing a "zero byte write".
-  // Writes carry an address.  Reads use an implicit address.
-
-  static xdata unsigned char cmd[1];
-  cmd[0] = eeprom_offset;
-  if (!i2c_write(i2c_addr, cmd, 1))
-    return 0;
-
-  return i2c_read(i2c_addr, buf, len);
-}
-
-
-#if 0
-
-// returns non-zero if successful, else 0
-unsigned char
-eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset,
-	      const xdata unsigned char *buf, unsigned char len)
-{
-  static xdata unsigned char cmd[2];
-  unsigned char ok;
-
-  while (len-- > 0){
-    cmd[0] = eeprom_offset++;
-    cmd[1] = *buf++;
-    ok = i2c_write(i2c_addr, cmd, 2);
-    mdelay(10);		// delay 10ms worst case write time
-    if (!ok)
-      return 0;
-  }
-  return 1;
-}
-
-#endif
diff --git a/usrp/firmware/src/usrp2/eeprom_io.h b/usrp/firmware/src/usrp2/eeprom_io.h
deleted file mode 100644
index 558017b12..000000000
--- a/usrp/firmware/src/usrp2/eeprom_io.h
+++ /dev/null
@@ -1,38 +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_EEPROM_IO_H
-#define INCLUDED_EEPROM_IO_H
-
-
-// returns non-zero if successful, else 0
-unsigned char
-eeprom_read (unsigned char i2c_addr, unsigned char eeprom_offset,
-	     xdata unsigned char *buf, unsigned char len);
-
-// returns non-zero if successful, else 0
-unsigned char
-eeprom_write (unsigned char i2c_addr, unsigned char eeprom_offset,
-	      const xdata unsigned char *buf, unsigned char len);
-
-
-#endif /* INCLUDED_EEPROM_IO_H */
diff --git a/usrp/firmware/src/usrp2/fpga_load.c b/usrp/firmware/src/usrp2/fpga_load.c
deleted file mode 100644
index b0256e925..000000000
--- a/usrp/firmware/src/usrp2/fpga_load.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../common/fpga_load.c"
diff --git a/usrp/firmware/src/usrp2/fpga_rev2.c b/usrp/firmware/src/usrp2/fpga_rev2.c
deleted file mode 100644
index cca961dc4..000000000
--- a/usrp/firmware/src/usrp2/fpga_rev2.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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.
- */
-
-#include "fpga.h"
-#include "fpga_regs_common.h"
-#include "usrp_common.h"
-#include "usrp_globals.h"
-#include "spi.h"
-
-unsigned char g_tx_reset = 0;
-unsigned char g_rx_reset = 0;
-
-void
-fpga_write_reg (unsigned char regno, const xdata unsigned char *regval)
-{
-  spi_write (0, 0x00 | (regno & 0x7f),
-	     SPI_ENABLE_FPGA,
-	     SPI_FMT_MSB | SPI_FMT_HDR_1,
-	     regval, 4);
-}
-
-
-static xdata unsigned char regval[4] = {0, 0, 0, 0};
-
-static void
-write_fpga_master_ctrl (void)
-{
-  unsigned char v = 0;
-  if (g_tx_enable)
-    v |= bmFR_MC_ENABLE_TX;
-  if (g_rx_enable)
-    v |= bmFR_MC_ENABLE_RX;
-  if (g_tx_reset)
-    v |= bmFR_MC_RESET_TX;
-  if (g_rx_reset)
-    v |= bmFR_MC_RESET_RX;
-  regval[3] = v;
-
-  fpga_write_reg (FR_MASTER_CTRL, regval);
-}
-
-// Resets both AD9862's and the FPGA serial bus interface.
-
-void
-fpga_set_reset (unsigned char on)
-{
-  on &= 0x1;
-
-  if (on){
-    USRP_PC &= ~bmPC_nRESET;		// active low
-    g_tx_enable = 0;
-    g_rx_enable = 0;
-    g_tx_reset = 0;
-    g_rx_reset = 0;
-  }
-  else
-    USRP_PC |= bmPC_nRESET;
-}
-
-void
-fpga_set_tx_enable (unsigned char on)
-{
-  on &= 0x1;
-  g_tx_enable = on;
-
-  write_fpga_master_ctrl ();
-
-  if (on){
-    g_tx_underrun = 0;
-    fpga_clear_flags ();
-  }
-}
-
-void
-fpga_set_rx_enable (unsigned char on)
-{
-  on &= 0x1;
-  g_rx_enable = on;
-  
-  write_fpga_master_ctrl ();
-  if (on){
-    g_rx_overrun = 0;
-    fpga_clear_flags ();
-  }
-}
-
-void
-fpga_set_tx_reset (unsigned char on)
-{
-  on &= 0x1;
-  g_tx_reset = on;
-
-  write_fpga_master_ctrl ();
-}
-
-void
-fpga_set_rx_reset (unsigned char on)
-{
-  on &= 0x1;
-  g_rx_reset = on;
-  
-  write_fpga_master_ctrl ();
-}
diff --git a/usrp/firmware/src/usrp2/fpga_rev2.h b/usrp/firmware/src/usrp2/fpga_rev2.h
deleted file mode 100644
index 54ec3f9fa..000000000
--- a/usrp/firmware/src/usrp2/fpga_rev2.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* 
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003,2004 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-#ifndef INCLUDED_FPGA_REV1_H
-#define INCLUDED_FPGA_REV1_H
-
-void fpga_set_reset (unsigned char v);
-void fpga_set_tx_enable (unsigned char v);
-void fpga_set_rx_enable (unsigned char v);
-void fpga_set_tx_reset (unsigned char v);
-void fpga_set_rx_reset (unsigned char v);
-
-unsigned char fpga_has_room_for_packet (void);
-unsigned char fpga_has_packet_avail (void);
-
-#if (UC_BOARD_HAS_FPGA)
-/*
- * return TRUE iff FPGA internal fifo has room for 512 bytes.
- */
-#define fpga_has_room_for_packet()	(GPIFREADYSTAT & bmFPGA_HAS_SPACE)
-
-/*
- * return TRUE iff FPGA internal fifo has at least 512 bytes available.
- */
-#define fpga_has_packet_avail()		(GPIFREADYSTAT & bmFPGA_PKT_AVAIL)
-
-#else	/* no FPGA on board.  fake it. */
-
-#define fpga_has_room_for_packet()	TRUE
-#define	fpga_has_packet_avail()		TRUE
-
-#endif
-
-#define	fpga_clear_flags()				\
-	do {						\
-	  USRP_PE |= bmPE_FPGA_CLR_STATUS;		\
-	  USRP_PE &= ~bmPE_FPGA_CLR_STATUS;		\
-        } while (0)
-
-
-#endif /* INCLUDED_FPGA_REV1_H */
diff --git a/usrp/firmware/src/usrp2/gpif.c b/usrp/firmware/src/usrp2/gpif.c
deleted file mode 100644
index f6745a43b..000000000
--- a/usrp/firmware/src/usrp2/gpif.c
+++ /dev/null
@@ -1,292 +0,0 @@
-// This program configures the General Programmable Interface (GPIF) for FX2.     
-// Please do not modify sections of text which are marked as "DO NOT EDIT ...". 
-//                                                                                
-// DO NOT EDIT ...                  
-// GPIF Initialization              
-// Interface Timing      Async        
-// Internal Ready Init   IntRdy=1     
-// CTL Out Tristate-able Binary       
-// SingleWrite WF Select     1     
-// SingleRead WF Select      0     
-// FifoWrite WF Select       3     
-// FifoRead WF Select        2     
-// Data Bus Idle Drive   Tristate     
-// END DO NOT EDIT                  
-                                    
-// DO NOT EDIT ...       
-// GPIF Wave Names       
-// Wave 0   = singlerd     
-// Wave 1   = singlewr     
-// Wave 2   = FIFORd       
-// Wave 3   = FIFOWr       
-                         
-// GPIF Ctrl Outputs   Level   
-// CTL 0    = WEN#     CMOS        
-// CTL 1    = REN#     CMOS        
-// CTL 2    = OE#      CMOS        
-// CTL 3    = CLRST    CMOS        
-// CTL 4    = unused   CMOS        
-// CTL 5    = BOGUS    CMOS        
-                               
-// GPIF Rdy Inputs         
-// RDY0     = EF#            
-// RDY1     = FF#            
-// RDY2     = unused         
-// RDY3     = unused         
-// RDY4     = unused         
-// RDY5     = TCXpire        
-// FIFOFlag = FIFOFlag       
-// IntReady = IntReady       
-// END DO NOT EDIT         
-// DO NOT EDIT ...                                                                         
-//                                                                                         
-// GPIF Waveform 0: singlerd                                                                
-//                                                                                         
-// Interval     0         1         2         3         4         5         6     Idle (7) 
-//          _________ _________ _________ _________ _________ _________ _________ _________
-//                                                                                         
-// AddrMode Same Val  Same Val  Same Val  Same Val  Same Val  Same Val  Same Val           
-// DataMode NO Data   NO Data   NO Data   NO Data   NO Data   NO Data   NO Data            
-// NextData SameData  SameData  SameData  SameData  SameData  SameData  SameData           
-// Int Trig No Int    No Int    No Int    No Int    No Int    No Int    No Int             
-// IF/Wait  Wait 1    Wait 1    Wait 1    Wait 1    Wait 1    Wait 1    Wait 1             
-//   Term A                                                                                
-//   LFunc                                                                                 
-//   Term B                                                                                
-// Branch1                                                                                 
-// Branch0                                                                                 
-// Re-Exec                                                                                 
-// Sngl/CRC Default   Default   Default   Default   Default   Default   Default            
-// WEN#         0         0         0         0         0         0         0         0    
-// REN#         0         0         0         0         0         0         0         0    
-// OE#          0         0         0         0         0         0         0         0    
-// CLRST        0         0         0         0         0         0         0         0    
-// unused       0         0         0         0         0         0         0         0    
-// BOGUS        0         0         0         0         0         0         0         0    
-//                     
-// END DO NOT EDIT     
-// DO NOT EDIT ...                                                                         
-//                                                                                         
-// GPIF Waveform 1: singlewr                                                                
-//                                                                                         
-// Interval     0         1         2         3         4         5         6     Idle (7) 
-//          _________ _________ _________ _________ _________ _________ _________ _________
-//                                                                                         
-// AddrMode Same Val  Same Val  Same Val  Same Val  Same Val  Same Val  Same Val           
-// DataMode Activate  Activate  Activate  Activate  Activate  Activate  Activate           
-// NextData SameData  SameData  SameData  SameData  SameData  SameData  SameData           
-// Int Trig No Int    No Int    No Int    No Int    No Int    No Int    No Int             
-// IF/Wait  Wait 1    IF        Wait 1    Wait 1    Wait 1    Wait 1    Wait 1             
-//   Term A           EF#                                                                  
-//   LFunc            AND                                                                  
-//   Term B           EF#                                                                  
-// Branch1            ThenIdle                                                             
-// Branch0            ElseIdle                                                             
-// Re-Exec            No                                                                   
-// Sngl/CRC Default   Default   Default   Default   Default   Default   Default            
-// WEN#         0         1         1         1         1         1         1         0    
-// REN#         0         0         0         0         0         0         0         0    
-// OE#          0         0         0         0         0         0         0         0    
-// CLRST        0         0         0         0         0         0         0         0    
-// unused       0         0         0         0         0         0         0         0    
-// BOGUS        0         0         0         0         0         0         0         0    
-//                     
-// END DO NOT EDIT     
-// DO NOT EDIT ...                                                                         
-//                                                                                         
-// GPIF Waveform 2: FIFORd                                                                  
-//                                                                                         
-// Interval     0         1         2         3         4         5         6     Idle (7) 
-//          _________ _________ _________ _________ _________ _________ _________ _________
-//                                                                                         
-// AddrMode Same Val  Same Val  Same Val  Same Val  Same Val  Same Val  Same Val           
-// DataMode NO Data   Activate  NO Data   NO Data   NO Data   NO Data   NO Data            
-// NextData SameData  SameData  SameData  SameData  SameData  SameData  SameData           
-// Int Trig No Int    No Int    No Int    No Int    No Int    No Int    No Int             
-// IF/Wait  Wait 1    IF        Wait 1    IF        Wait 1    Wait 1    Wait 1             
-//   Term A           TCXpire             TCXpire                                          
-//   LFunc            AND                 AND                                              
-//   Term B           TCXpire             TCXpire                                          
-// Branch1            Then 2              ThenIdle                                         
-// Branch0            Else 1              ElseIdle                                         
-// Re-Exec            No                  No                                               
-// Sngl/CRC Default   Default   Default   Default   Default   Default   Default            
-// WEN#         0         0         0         0         0         0         0         0    
-// REN#         1         0         0         0         0         0         0         0    
-// OE#          1         1         1         0         0         0         0         0    
-// CLRST        0         0         0         0         0         0         0         0    
-// unused       0         0         0         0         0         0         0         0    
-// BOGUS        0         0         0         0         0         0         0         0    
-//                     
-// END DO NOT EDIT     
-// DO NOT EDIT ...                                                                         
-//                                                                                         
-// GPIF Waveform 3: FIFOWr                                                                  
-//                                                                                         
-// Interval     0         1         2         3         4         5         6     Idle (7) 
-//          _________ _________ _________ _________ _________ _________ _________ _________
-//                                                                                         
-// AddrMode Same Val  Same Val  Same Val  Same Val  Same Val  Same Val  Same Val           
-// DataMode NO Data   Activate  Activate  Activate  Activate  Activate  Activate           
-// NextData SameData  SameData  SameData  SameData  SameData  SameData  SameData           
-// Int Trig No Int    No Int    No Int    No Int    No Int    No Int    No Int             
-// IF/Wait  Wait 1    IF        Wait 1    Wait 1    Wait 1    Wait 1    Wait 1             
-//   Term A           TCXpire                                                              
-//   LFunc            AND                                                                  
-//   Term B           TCXpire                                                              
-// Branch1            ThenIdle                                                             
-// Branch0            Else 1                                                               
-// Re-Exec            No                                                                   
-// Sngl/CRC Default   Default   Default   Default   Default   Default   Default            
-// WEN#         0         0         0         0         0         0         0         0    
-// REN#         0         0         0         0         0         0         0         0    
-// OE#          0         0         0         0         0         0         0         0    
-// CLRST        0         0         0         0         0         0         0         0    
-// unused       0         0         0         0         0         0         0         0    
-// BOGUS        0         0         0         0         0         0         0         0    
-//                     
-// END DO NOT EDIT     
-                                              
-// GPIF Program Code                          
-                                              
-// DO NOT EDIT ...                            
-#include "fx2.h"                            
-#include "fx2regs.h"                        
-#include "fx2sdly.h"     // SYNCDELAY macro 
-// END DO NOT EDIT                            
-                                              
-// DO NOT EDIT ...                     
-const char xdata WaveData[128] =     
-{                                      
-// Wave 0 
-/* LenBr */ 0x01,     0x01,     0x01,     0x01,     0x01,     0x01,     0x01,     0x07,
-/* Opcode*/ 0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,
-/* Output*/ 0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,
-/* LFun  */ 0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x3F,
-// Wave 1 
-/* LenBr */ 0x01,     0x3F,     0x01,     0x01,     0x01,     0x01,     0x01,     0x07,
-/* Opcode*/ 0x22,     0x03,     0x02,     0x02,     0x02,     0x02,     0x02,     0x00,
-/* Output*/ 0x00,     0x01,     0x01,     0x01,     0x01,     0x01,     0x01,     0x00,
-/* LFun  */ 0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x3F,
-// Wave 2 
-/* LenBr */ 0x01,     0x11,     0x01,     0x3F,     0x01,     0x01,     0x01,     0x07,
-/* Opcode*/ 0x00,     0x03,     0x00,     0x01,     0x00,     0x00,     0x00,     0x00,
-/* Output*/ 0x06,     0x04,     0x04,     0x00,     0x00,     0x00,     0x00,     0x00,
-/* LFun  */ 0x00,     0x2D,     0x00,     0x2D,     0x00,     0x00,     0x00,     0x3F,
-// Wave 3 
-/* LenBr */ 0x01,     0x39,     0x01,     0x01,     0x01,     0x01,     0x01,     0x07,
-/* Opcode*/ 0x00,     0x03,     0x02,     0x02,     0x02,     0x02,     0x02,     0x00,
-/* Output*/ 0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,     0x00,
-/* LFun  */ 0x00,     0x2D,     0x00,     0x00,     0x00,     0x00,     0x00,     0x3F,
-};                     
-// END DO NOT EDIT     
-                       
-// DO NOT EDIT ...                     
-const char xdata FlowStates[36] =   
-{                                      
-/* Wave 0 FlowStates */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-/* Wave 1 FlowStates */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-/* Wave 2 FlowStates */ 0x81,0x2D,0x26,0x00,0x04,0x04,0x03,0x02,0x00,
-/* Wave 3 FlowStates */ 0x81,0x2D,0x21,0x00,0x04,0x04,0x03,0x02,0x00,
-};                     
-// END DO NOT EDIT     
-                       
-// DO NOT EDIT ...                                               
-const char xdata InitData[7] =                                   
-{                                                                
-/* Regs  */ 0xA0,0x00,0x00,0x00,0xEE,0x4E,0x00     
-};                                                               
-// END DO NOT EDIT                                               
-                                                                 
-// TO DO: You may add additional code below.
-
-void GpifInit( void )
-{
-  BYTE i;
- 
-  // Registers which require a synchronization delay, see section 15.14
-  // FIFORESET        FIFOPINPOLAR
-  // INPKTEND         OUTPKTEND
-  // EPxBCH:L         REVCTL
-  // GPIFTCB3         GPIFTCB2
-  // GPIFTCB1         GPIFTCB0
-  // EPxFIFOPFH:L     EPxAUTOINLENH:L
-  // EPxFIFOCFG       EPxGPIFFLGSEL
-  // PINFLAGSxx       EPxFIFOIRQ
-  // EPxFIFOIE        GPIFIRQ
-  // GPIFIE           GPIFADRH:L
-  // UDMACRCH:L       EPxGPIFTRIG
-  // GPIFTRIG
-  
-  // Note: The pre-REVE EPxGPIFTCH/L register are affected, as well...
-  //      ...these have been replaced by GPIFTC[B3:B0] registers
- 
-  // 8051 doesn't have access to waveform memories 'til
-  // the part is in GPIF mode.
- 
-  IFCONFIG = 0xEE;
-  // IFCLKSRC=1   , FIFOs executes on internal clk source
-  // xMHz=1       , 48MHz internal clk rate
-  // IFCLKOE=0    , Don't drive IFCLK pin signal at 48MHz
-  // IFCLKPOL=0   , Don't invert IFCLK pin signal from internal clk
-  // ASYNC=1      , master samples asynchronous
-  // GSTATE=1     , Drive GPIF states out on PORTE[2:0], debug WF
-  // IFCFG[1:0]=10, FX2 in GPIF master mode
- 
-  GPIFABORT = 0xFF;  // abort any waveforms pending
- 
-  GPIFREADYCFG = InitData[ 0 ];
-  GPIFCTLCFG = InitData[ 1 ];
-  GPIFIDLECS = InitData[ 2 ];
-  GPIFIDLECTL = InitData[ 3 ];
-  GPIFWFSELECT = InitData[ 5 ];
-  GPIFREADYSTAT = InitData[ 6 ];
- 
-  // use dual autopointer feature... 
-  AUTOPTRSETUP = 0x07;          // inc both pointers, 
-                                // ...warning: this introduces pdata hole(s)
-                                // ...at E67B (XAUTODAT1) and E67C (XAUTODAT2)
-  
-  // source
-  AUTOPTRH1 = MSB( &WaveData );
-  AUTOPTRL1 = LSB( &WaveData );
-  
-  // destination
-  AUTOPTRH2 = 0xE4;
-  AUTOPTRL2 = 0x00;
- 
-  // transfer
-  for ( i = 0x00; i < 128; i++ )
-  {
-    EXTAUTODAT2 = EXTAUTODAT1;
-  }
- 
-// Configure GPIF Address pins, output initial value,
-  PORTCCFG = 0xFF;    // [7:0] as alt. func. GPIFADR[7:0]
-  OEC = 0xFF;         // and as outputs
-  PORTECFG |= 0x80;   // [8] as alt. func. GPIFADR[8]
-  OEE |= 0x80;        // and as output
- 
-// ...OR... tri-state GPIFADR[8:0] pins
-//  PORTCCFG = 0x00;  // [7:0] as port I/O
-//  OEC = 0x00;       // and as inputs
-//  PORTECFG &= 0x7F; // [8] as port I/O
-//  OEE &= 0x7F;      // and as input
- 
-// GPIF address pins update when GPIFADRH/L written
-  SYNCDELAY;                    // 
-  GPIFADRH = 0x00;    // bits[7:1] always 0
-  SYNCDELAY;                    // 
-  GPIFADRL = 0x00;    // point to PERIPHERAL address 0x0000
- 
-// Configure GPIF FlowStates registers for Wave 0 of WaveData
-  FLOWSTATE = FlowStates[ 0 ];
-  FLOWLOGIC = FlowStates[ 1 ];
-  FLOWEQ0CTL = FlowStates[ 2 ];
-  FLOWEQ1CTL = FlowStates[ 3 ];
-  FLOWHOLDOFF = FlowStates[ 4 ];
-  FLOWSTB = FlowStates[ 5 ];
-  FLOWSTBEDGE = FlowStates[ 6 ];
-  FLOWSTBHPERIOD = FlowStates[ 7 ];
-}
- 
diff --git a/usrp/firmware/src/usrp2/gpif.gpf b/usrp/firmware/src/usrp2/gpif.gpf
deleted file mode 100755
index 854e25399..000000000
--- a/usrp/firmware/src/usrp2/gpif.gpf
+++ /dev/null
diff --git a/usrp/firmware/src/usrp2/init_gpif.c b/usrp/firmware/src/usrp2/init_gpif.c
deleted file mode 100644
index 0f5944b3b..000000000
--- a/usrp/firmware/src/usrp2/init_gpif.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../common/init_gpif.c"
diff --git a/usrp/firmware/src/usrp2/spi.c b/usrp/firmware/src/usrp2/spi.c
deleted file mode 100644
index f5803c55b..000000000
--- a/usrp/firmware/src/usrp2/spi.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,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.
- */
-
-#include "spi.h"
-#include "usrp_rev2_regs.h"
-
-static void
-setup_enables (unsigned char enables)
-{
-  // Software eanbles are active high.
-  // Hardware enables are active low.
-
-  // Uhh, the CODECs are active low, but the FPGA is active high...
-  enables ^= SPI_ENABLE_FPGA;
-
-  // KLUDGE: This code is fragile, but reasonably fast...
-  // low three bits of enables go into port A
-  USRP_PA = USRP_PA | (0x7 << 3);	// disable FPGA, CODEC_A, CODEC_B
-  USRP_PA ^= (enables & 0x7) << 3;	// enable specified devs
-
-  // high four bits of enables go into port E
-  USRP_PE = USRP_PE | (0xf << 4);	// disable TX_A, RX_A, TX_B, RX_B
-  USRP_PE ^= (enables & 0xf0);		// enable specified devs
-}
-
-#define disable_all()	setup_enables (0)
-
-void
-init_spi (void)
-{
-  disable_all ();		/* disable all devs	  */
-  bitS_OUT = 0;			/* idle state has CLK = 0 */
-}
-
-#if 0
-static unsigned char
-count_bits8 (unsigned char v)
-{
-  static unsigned char count4[16] = {
-    0,	// 0
-    1,	// 1
-    1,	// 2
-    2,	// 3
-    1,	// 4
-    2,	// 5
-    2,	// 6
-    3,	// 7
-    1,	// 8
-    2,	// 9
-    2,	// a
-    3,	// b
-    2,	// c
-    3,	// d
-    3,	// e
-    4	// f
-  };
-  return count4[v & 0xf] + count4[(v >> 4) & 0xf];
-}
-
-#else
-
-static unsigned char
-count_bits8 (unsigned char v)
-{
-  unsigned char count = 0;
-  if (v & (1 << 0)) count++;
-  if (v & (1 << 1)) count++;
-  if (v & (1 << 2)) count++;
-  if (v & (1 << 3)) count++;
-  if (v & (1 << 4)) count++;
-  if (v & (1 << 5)) count++;
-  if (v & (1 << 6)) count++;
-  if (v & (1 << 7)) count++;
-  return count;
-}
-#endif
-
-static void
-write_byte_msb (unsigned char v);
-
-static void
-write_bytes_msb (const xdata unsigned char *buf, unsigned char len);
-
-static void
-read_bytes_msb (xdata unsigned char *buf, unsigned char len);
-
-  
-// returns non-zero if successful, else 0
-unsigned char
-spi_read (unsigned char header_hi, unsigned char header_lo,
-	  unsigned char enables, unsigned char format,
-	  xdata unsigned char *buf, unsigned char len)
-{
-  if (count_bits8 (enables) > 1)
-    return 0;		// error, too many enables set
-
-  setup_enables (enables);
-
-  if (format & SPI_FMT_LSB){		// order: LSB
-#if 1
-    return 0;		// error, not implemented
-#else
-    switch (format & SPI_FMR_HDR_MASK){
-    case SPI_FMT_HDR_0:
-      break;
-    case SPI_FMT_HDR_1:
-      write_byte_lsb (header_lo);
-      break;
-    case SPI_FMT_HDR_2:
-      write_byte_lsb (header_lo);
-      write_byte_lsb (header_hi);
-      break;
-    default:
-      return 0;		// error
-    }
-    if (len != 0)
-      read_bytes_lsb (buf, len);
-#endif
-  }
-
-  else {		// order: MSB
-
-    switch (format & SPI_FMT_HDR_MASK){
-    case SPI_FMT_HDR_0:
-      break;
-    case SPI_FMT_HDR_1:
-      write_byte_msb (header_lo);
-      break;
-    case SPI_FMT_HDR_2:
-      write_byte_msb (header_hi);
-      write_byte_msb (header_lo);
-      break;
-    default:
-      return 0;		// error
-    }
-    if (len != 0)
-      read_bytes_msb (buf, len);
-  }
-
-  disable_all ();
-  return 1;		// success
-}
-
-
-// returns non-zero if successful, else 0
-unsigned char
-spi_write (unsigned char header_hi, unsigned char header_lo,
-	   unsigned char enables, unsigned char format,
-	   const xdata unsigned char *buf, unsigned char len)
-{
-  setup_enables (enables);
-
-  if (format & SPI_FMT_LSB){		// order: LSB
-#if 1
-    return 0;		// error, not implemented
-#else
-    switch (format & SPI_FMR_HDR_MASK){
-    case SPI_FMT_HDR_0:
-      break;
-    case SPI_FMT_HDR_1:
-      write_byte_lsb (header_lo);
-      break;
-    case SPI_FMT_HDR_2:
-      write_byte_lsb (header_lo);
-      write_byte_lsb (header_hi);
-      break;
-    default:
-      return 0;		// error
-    }
-    if (len != 0)
-      write_bytes_lsb (buf, len);
-#endif
-  }
-
-  else {		// order: MSB
-
-    switch (format & SPI_FMT_HDR_MASK){
-    case SPI_FMT_HDR_0:
-      break;
-    case SPI_FMT_HDR_1:
-      write_byte_msb (header_lo);
-      break;
-    case SPI_FMT_HDR_2:
-      write_byte_msb (header_hi);
-      write_byte_msb (header_lo);
-      break;
-    default:
-      return 0;		// error
-    }
-    if (len != 0)
-      write_bytes_msb (buf, len);
-  }
-
-  disable_all ();
-  return 1;		// success
-}
-
-// ----------------------------------------------------------------
-
-static void
-write_byte_msb (unsigned char v)
-{
-  v = (v << 1) | (v >> 7);	// rotate left (MSB into bottom bit)
-  bitS_OUT = v & 0x1;
-  bitS_CLK = 1;
-  bitS_CLK = 0;
-
-  v = (v << 1) | (v >> 7);	// rotate left (MSB into bottom bit)
-  bitS_OUT = v & 0x1;
-  bitS_CLK = 1;
-  bitS_CLK = 0;
-
-  v = (v << 1) | (v >> 7);	// rotate left (MSB into bottom bit)
-  bitS_OUT = v & 0x1;
-  bitS_CLK = 1;
-  bitS_CLK = 0;
-
-  v = (v << 1) | (v >> 7);	// rotate left (MSB into bottom bit)
-  bitS_OUT = v & 0x1;
-  bitS_CLK = 1;
-  bitS_CLK = 0;
-
-  v = (v << 1) | (v >> 7);	// rotate left (MSB into bottom bit)
-  bitS_OUT = v & 0x1;
-  bitS_CLK = 1;
-  bitS_CLK = 0;
-
-  v = (v << 1) | (v >> 7);	// rotate left (MSB into bottom bit)
-  bitS_OUT = v & 0x1;
-  bitS_CLK = 1;
-  bitS_CLK = 0;
-
-  v = (v << 1) | (v >> 7);	// rotate left (MSB into bottom bit)
-  bitS_OUT = v & 0x1;
-  bitS_CLK = 1;
-  bitS_CLK = 0;
-
-  v = (v << 1) | (v >> 7);	// rotate left (MSB into bottom bit)
-  bitS_OUT = v & 0x1;
-  bitS_CLK = 1;
-  bitS_CLK = 0;
-}
-
-static void
-write_bytes_msb (const xdata unsigned char *buf, unsigned char len)
-{
-  while (len-- != 0){
-    write_byte_msb (*buf++);
-  }
-}
-
-#if 0
-/*
- * This is incorrectly compiled by SDCC 2.4.0
- */
-static unsigned char
-read_byte_msb (void)
-{
-  unsigned char v = 0;
-
-  bitS_CLK = 1;
-  v |= bitS_IN;
-  bitS_CLK = 0;
-
-  v = v << 1;
-  bitS_CLK = 1;
-  v |= bitS_IN;
-  bitS_CLK = 0;
-
-  v = v << 1;
-  bitS_CLK = 1;
-  v |= bitS_IN;
-  bitS_CLK = 0;
-
-  v = v << 1;
-  bitS_CLK = 1;
-  v |= bitS_IN;
-  bitS_CLK = 0;
-
-  v = v << 1;
-  bitS_CLK = 1;
-  v |= bitS_IN;
-  bitS_CLK = 0;
-
-  v = v << 1;
-  bitS_CLK = 1;
-  v |= bitS_IN;
-  bitS_CLK = 0;
-
-  v = v << 1;
-  bitS_CLK = 1;
-  v |= bitS_IN;
-  bitS_CLK = 0;
-
-  v = v << 1;
-  bitS_CLK = 1;
-  v |= bitS_IN;
-  bitS_CLK = 0;
-
-  return v;
-}
-#else
-static unsigned char
-read_byte_msb (void) _naked
-{
-  _asm
-	clr	a
-
-	setb	_bitS_CLK
-        mov	c, _bitS_IN
-	rlc	a
-	clr	_bitS_CLK
-
-	setb	_bitS_CLK
-        mov	c, _bitS_IN
-	rlc	a
-	clr	_bitS_CLK
-
-	setb	_bitS_CLK
-        mov	c, _bitS_IN
-	rlc	a
-	clr	_bitS_CLK
-
-	setb	_bitS_CLK
-        mov	c, _bitS_IN
-	rlc	a
-	clr	_bitS_CLK
-
-	setb	_bitS_CLK
-        mov	c, _bitS_IN
-	rlc	a
-	clr	_bitS_CLK
-
-	setb	_bitS_CLK
-        mov	c, _bitS_IN
-	rlc	a
-	clr	_bitS_CLK
-
-	setb	_bitS_CLK
-        mov	c, _bitS_IN
-	rlc	a
-	clr	_bitS_CLK
-
-	setb	_bitS_CLK
-        mov	c, _bitS_IN
-	rlc	a
-	clr	_bitS_CLK
-
-	mov	dpl,a
-	ret
-  _endasm;
-}
-#endif
-
-static void
-read_bytes_msb (xdata unsigned char *buf, unsigned char len)
-{
-  while (len-- != 0){
-    *buf++ = read_byte_msb ();
-  }
-}
-
diff --git a/usrp/firmware/src/usrp2/spi.h b/usrp/firmware/src/usrp2/spi.h
deleted file mode 100644
index 12bc5e544..000000000
--- a/usrp/firmware/src/usrp2/spi.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_SPI_H
-#define INCLUDED_SPI_H
-
-#include "usrp_spi_defs.h"
-
-void init_spi (void);		// one time call to init
-
-// returns non-zero if successful, else 0
-unsigned char
-spi_read (unsigned char header_hi, unsigned char header_lo,
-	  unsigned char enables, unsigned char format,
-	  xdata unsigned char *buf, unsigned char len);
-
-// returns non-zero if successful, else 0
-unsigned char
-spi_write (unsigned char header_hi, unsigned char header_lo,
-	   unsigned char enables, unsigned char format,
-	   const xdata unsigned char *buf, unsigned char len);
-
-
-#endif /* INCLUDED_SPI_H */
diff --git a/usrp/firmware/src/usrp2/usb_descriptors.a51 b/usrp/firmware/src/usrp2/usb_descriptors.a51
deleted file mode 100644
index a60adbef8..000000000
--- a/usrp/firmware/src/usrp2/usb_descriptors.a51
+++ /dev/null
@@ -1,404 +0,0 @@
-;;; -*- asm -*-
-;;;
-;;; Copyright 2003 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.
-;;;
-	
-;;; USB Descriptor table for the USRP
-;;; 
-;;; We're a high-speed only device (480 Mb/sec) with 1 configuration
-;;; and 3 interfaces.  
-;;; 
-;;;	interface 0:	command and status (ep0 COMMAND)
-;;;	interface 1:	Transmit path (ep2 OUT BULK)
-;;;	interface 2:	Receive path (ep6 IN BULK)
-
-	.module usb_descriptors
-	
-	VID_FREE	 = 0xfffe	; Free Software Folks
-	PID_USRP	 = 0x0002	; USRP
-
-	;; We distinguish configured from unconfigured USRPs using the Device ID.
-	;; If the MSB of the DID is 0, the device is unconfigured.
-	;; The LSB of the DID is reserved for hardware revs.
-	
-	DID_USRP	 = 0x0100	; Device ID (bcd)
-
-	
-	DSCR_DEVICE	 =   1	; Descriptor type: Device
-	DSCR_CONFIG	 =   2	; Descriptor type: Configuration
-	DSCR_STRING	 =   3	; Descriptor type: String
-	DSCR_INTRFC	 =   4	; Descriptor type: Interface
-	DSCR_ENDPNT	 =   5	; Descriptor type: Endpoint
-	DSCR_DEVQUAL	 =   6	; Descriptor type: Device Qualifier
-	
-	DSCR_DEVICE_LEN	 =  18
-	DSCR_CONFIG_LEN  =   9
-	DSCR_INTRFC_LEN  =   9
-	DSCR_ENDPNT_LEN  =   7
-	DSCR_DEVQUAL_LEN =  10
-	
-	ET_CONTROL	 =   0	; Endpoint type: Control
-	ET_ISO		 =   1	; Endpoint type: Isochronous
-	ET_BULK		 =   2	; Endpoint type: Bulk
-	ET_INT		 =   3	; Endpoint type: Interrupt
-	
-	
-	;; configuration attributes
-	bmSELF_POWERED	=	1 << 6
-
-;;; --------------------------------------------------------
-;;;	external ram data
-;;;--------------------------------------------------------
-	
-	.area USBDESCSEG    (XDATA)
-	
-;;; ----------------------------------------------------------------
-;;; descriptors used when operating at high speed (480Mb/sec)
-;;; ----------------------------------------------------------------
-	
-	.even	; descriptors must be 2-byte aligned for SUDPTR{H,L} to work
-
-	;; The .even directive isn't really honored by the linker.  Bummer!
-	;; (There's no way to specify an alignment requirement for a given area,
-	;; hence when they're concatenated together, even doesn't work.)
-	;; 
-	;; We work around this by telling the linker to put USBDESCSEG
-	;; at 0xE000 absolute.  This means that the maximimum length of this
-	;; segment is 480 bytes, leaving room for the two hash slots 
-	;; at 0xE1EO to 0xE1FF.  
-	;; 
-	;; As of July 7, 2004, this segment is 326 bytes long
-	
-_high_speed_device_descr::
-	.db	DSCR_DEVICE_LEN
-	.db	DSCR_DEVICE
-	.db	<0x0200		; Specification version (LSB)
-	.db	>0x0200		; Specification version (MSB)
-	.db	0xff		; device class (vendor specific)
-	.db	0xff		; device subclass (vendor specific)
-	.db	0xff		; device protocol (vendor specific)
-	.db	64		; bMaxPacketSize0 for endpoint 0
-	.db	<VID_FREE	; idVendor
-	.db	>VID_FREE	; idVendor
-	.db	<PID_USRP	; idProduct
-	.db	>PID_USRP	; idProduct
-_usb_desc_hw_rev_binary_patch_location_0::
-	.db	<DID_USRP	; bcdDevice
-	.db	>DID_USRP	; bcdDevice
-	.db	SI_VENDOR	; iManufacturer (string index)
-	.db	SI_PRODUCT	; iProduct (string index)
-	.db	SI_SERIAL	; iSerial number (string index)
-	.db	1		; bNumConfigurations
-	
-;;; describes the other speed (12Mb/sec)
-	.even
-_high_speed_devqual_descr::
-	.db	DSCR_DEVQUAL_LEN
-	.db	DSCR_DEVQUAL
-	.db	<0x0200		; bcdUSB (LSB)
-	.db	>0x0200		; bcdUSB (MSB)
-	.db	0xff		; bDeviceClass
-	.db	0xff		; bDeviceSubClass
-	.db	0xff		; bDeviceProtocol
-	.db	64		; bMaxPacketSize0
-	.db	1		; bNumConfigurations (one config at 12Mb/sec)
-	.db	0		; bReserved
-	
-	.even
-_high_speed_config_descr::	
-	.db	DSCR_CONFIG_LEN
-	.db	DSCR_CONFIG
-	.db	<(_high_speed_config_descr_end - _high_speed_config_descr) ; LSB
-	.db	>(_high_speed_config_descr_end - _high_speed_config_descr) ; MSB
-	.db	3		; bNumInterfaces
-	.db	1		; bConfigurationValue
-	.db	0		; iConfiguration
-	.db	0x80 | bmSELF_POWERED ; bmAttributes
-	.db	0		; bMaxPower
-
-	;; interface descriptor 0 (command & status, ep0 COMMAND)
-	
-	.db	DSCR_INTRFC_LEN
-	.db	DSCR_INTRFC
-	.db	0		; bInterfaceNumber (zero based)
-	.db	0		; bAlternateSetting
-	.db	0		; bNumEndpoints
-	.db	0xff		; bInterfaceClass (vendor specific)
-	.db	0xff		; bInterfaceSubClass (vendor specific)
-	.db	0xff		; bInterfaceProtocol (vendor specific)
-	.db	SI_COMMAND_AND_STATUS	; iInterface (description)
-
-	;; interface descriptor 1 (transmit path, ep2 OUT BULK)
-	
-	.db	DSCR_INTRFC_LEN
-	.db	DSCR_INTRFC
-	.db	1		; bInterfaceNumber (zero based)
-	.db	0		; bAlternateSetting
-	.db	1		; bNumEndpoints
-	.db	0xff		; bInterfaceClass (vendor specific)
-	.db	0xff		; bInterfaceSubClass (vendor specific)
-	.db	0xff		; bInterfaceProtocol (vendor specific)
-	.db	SI_TX_PATH	; iInterface (description)
-
-	;; interface 1's end point
-
-	.db	DSCR_ENDPNT_LEN
-	.db	DSCR_ENDPNT
-	.db	0x02		; bEndpointAddress (ep 2 OUT)
-	.db	ET_BULK		; bmAttributes
-	.db	<512		; wMaxPacketSize (LSB)
-	.db	>512		; wMaxPacketSize (MSB)
-	.db	0		; bInterval (iso only)
-
-	;; interface descriptor 2 (receive path, ep6 IN BULK)
-	
-	.db	DSCR_INTRFC_LEN
-	.db	DSCR_INTRFC
-	.db	2		; bInterfaceNumber (zero based)
-	.db	0		; bAlternateSetting
-	.db	1		; bNumEndpoints
-	.db	0xff		; bInterfaceClass (vendor specific)
-	.db	0xff		; bInterfaceSubClass (vendor specific)
-	.db	0xff		; bInterfaceProtocol (vendor specific)
-	.db	SI_RX_PATH	; iInterface (description)
-
-	;; interface 2's end point
-
-	.db	DSCR_ENDPNT_LEN
-	.db	DSCR_ENDPNT
-	.db	0x86		; bEndpointAddress (ep 6 IN)
-	.db	ET_BULK		; bmAttributes
-	.db	<512		; wMaxPacketSize (LSB)
-	.db	>512		; wMaxPacketSize (MSB)
-	.db	0		; bInterval (iso only)
-
-_high_speed_config_descr_end:		
-
-;;; ----------------------------------------------------------------
-;;; descriptors used when operating at full speed (12Mb/sec)
-;;; ----------------------------------------------------------------
-
-	.even
-_full_speed_device_descr::	
-	.db	DSCR_DEVICE_LEN
-	.db	DSCR_DEVICE
-	.db	<0x0200		; Specification version (LSB)
-	.db	>0x0200		; Specification version (MSB)
-	.db	0xff		; device class (vendor specific)
-	.db	0xff		; device subclass (vendor specific)
-	.db	0xff		; device protocol (vendor specific)
-	.db	64		; bMaxPacketSize0 for endpoint 0
-	.db	<VID_FREE	; idVendor
-	.db	>VID_FREE	; idVendor
-	.db	<PID_USRP	; idProduct
-	.db	>PID_USRP	; idProduct
-_usb_desc_hw_rev_binary_patch_location_1::
-	.db	<DID_USRP	; bcdDevice
-	.db	>DID_USRP	; bcdDevice
-	.db	SI_VENDOR	; iManufacturer (string index)
-	.db	SI_PRODUCT	; iProduct (string index)
-	.db	SI_NONE		; iSerial number (None)
-	.db	1		; bNumConfigurations
-	
-	
-;;; describes the other speed (480Mb/sec)
-	.even
-_full_speed_devqual_descr::
-	.db	DSCR_DEVQUAL_LEN
-	.db	DSCR_DEVQUAL
-	.db	<0x0200		; bcdUSB
-	.db	>0x0200		; bcdUSB
-	.db	0xff		; bDeviceClass
-	.db	0xff		; bDeviceSubClass
-	.db	0xff		; bDeviceProtocol
-	.db	64		; bMaxPacketSize0
-	.db	1		; bNumConfigurations (one config at 480Mb/sec)
-	.db	0		; bReserved
-	
-	.even
-_full_speed_config_descr::	
-	.db	DSCR_CONFIG_LEN
-	.db	DSCR_CONFIG
-	.db	<(_full_speed_config_descr_end - _full_speed_config_descr) ; LSB
-	.db	>(_full_speed_config_descr_end - _full_speed_config_descr) ; MSB
-	.db	1		; bNumInterfaces
-	.db	1		; bConfigurationValue
-	.db	0		; iConfiguration
-	.db	0x80 | bmSELF_POWERED ; bmAttributes
-	.db	0		; bMaxPower
-
-	;; interface descriptor 0 (command & status, ep0 COMMAND)
-	
-	.db	DSCR_INTRFC_LEN
-	.db	DSCR_INTRFC
-	.db	0		; bInterfaceNumber (zero based)
-	.db	0		; bAlternateSetting
-	.db	0		; bNumEndpoints
-	.db	0xff		; bInterfaceClass (vendor specific)
-	.db	0xff		; bInterfaceSubClass (vendor specific)
-	.db	0xff		; bInterfaceProtocol (vendor specific)
-	.db	SI_COMMAND_AND_STATUS	; iInterface (description)
-	
-_full_speed_config_descr_end:	
-	
-;;; ----------------------------------------------------------------
-;;;			string descriptors
-;;; ----------------------------------------------------------------
-
-_nstring_descriptors::
-	.db	(_string_descriptors_end - _string_descriptors) / 2
-
-_string_descriptors::
-	.db	<str0, >str0
-	.db	<str1, >str1
-	.db	<str2, >str2
-	.db	<str3, >str3
-	.db	<str4, >str4
-	.db	<str5, >str5
-	.db	<str6, >str6
-_string_descriptors_end:
-
-	SI_NONE = 0
-	;; str0 contains the language ID's.
-	.even
-str0:	.db	str0_end - str0
-	.db	DSCR_STRING
-	.db	0
-	.db	0
-	.db	<0x0409		; magic code for US English (LSB)
-	.db	>0x0409		; magic code for US English (MSB)
-str0_end:
-
-	SI_VENDOR = 1
-	.even
-str1:	.db	str1_end - str1
-	.db	DSCR_STRING
-	.db	'F, 0		; 16-bit unicode
-	.db	'r, 0
-	.db	'e, 0
-	.db	'e, 0
-	.db	' , 0
-	.db	'S, 0
-	.db	'o, 0
-	.db	'f, 0
-	.db	't, 0
-	.db	'w, 0
-	.db	'a, 0
-	.db	'r, 0
-	.db	'e, 0
-	.db	' , 0
-	.db	'F, 0
-	.db	'o, 0
-	.db	'l, 0
-	.db	'k, 0
-	.db	's, 0
-str1_end:
-
-	SI_PRODUCT = 2
-	.even
-str2:	.db	str2_end - str2
-	.db	DSCR_STRING
-	.db	'U, 0
-	.db	'S, 0
-	.db	'R, 0
-	.db	'P, 0
-	.db	' , 0
-	.db	'R, 0
-	.db	'e, 0
-	.db	'v, 0
-	.db	' , 0
-_usb_desc_hw_rev_ascii_patch_location_0::
-	.db	'?, 0
-str2_end:
-
-	SI_COMMAND_AND_STATUS = 3
-	.even
-str3:	.db	str3_end - str3
-	.db	DSCR_STRING
-	.db	'C, 0
-	.db	'o, 0
-	.db	'm, 0
-	.db	'm, 0
-	.db	'a, 0
-	.db	'n, 0
-	.db	'd, 0
-	.db	' , 0
-	.db	'&, 0
-	.db	' , 0
-	.db	'S, 0
-	.db	't, 0
-	.db	'a, 0
-	.db	't, 0
-	.db	'u, 0
-	.db	's, 0
-str3_end:
-
-	SI_TX_PATH = 4
-	.even
-str4:	.db	str4_end - str4
-	.db	DSCR_STRING
-	.db	'T, 0
-	.db	'r, 0
-	.db	'a, 0
-	.db	'n, 0
-	.db	's, 0
-	.db	'm, 0
-	.db	'i, 0
-	.db	't, 0
-	.db	' , 0
-	.db	'P, 0
-	.db	'a, 0
-	.db	't, 0
-	.db	'h, 0
-str4_end:
-
-	SI_RX_PATH = 5
-	.even
-str5:	.db	str5_end - str5
-	.db	DSCR_STRING
-	.db	'R, 0
-	.db	'e, 0
-	.db	'c, 0
-	.db	'e, 0
-	.db	'i, 0
-	.db	'v, 0
-	.db	'e, 0
-	.db	' , 0
-	.db	'P, 0
-	.db	'a, 0
-	.db	't, 0
-	.db	'h, 0
-str5_end:
-
-	SI_SERIAL = 6
-	.even
-str6:	.db	str6_end - str6
-	.db	DSCR_STRING
-_usb_desc_serial_number_ascii::
-	.db	'3, 0
-	.db	'., 0
-	.db	'1, 0
-	.db	'4, 0
-	.db	'1, 0
-	.db	'5, 0
-	.db	'9, 0
-	.db	'3, 0
-str6_end:
-
diff --git a/usrp/firmware/src/usrp2/usrp_common.c b/usrp/firmware/src/usrp2/usrp_common.c
deleted file mode 100644
index f389d9253..000000000
--- a/usrp/firmware/src/usrp2/usrp_common.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../common/usrp_common.c"
diff --git a/usrp/firmware/src/usrp2/usrp_common.h b/usrp/firmware/src/usrp2/usrp_common.h
deleted file mode 100644
index 738ba6b37..000000000
--- a/usrp/firmware/src/usrp2/usrp_common.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003,2006 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-/*
- * common defines and prototypes for USRP
- *
- * In comments below "TRM" refers to the EZ-USB FX2 Technical Reference Manual
- */
-
-#ifndef _USRPCOMMON_H_
-#define _USRPCOMMON_H_
-
-#include <usrp_config.h>
-#include <usrp_rev2_regs.h>
-#include <syncdelay.h>
-
-/*
- * From TRM page 15-105:
- *
- * Under certain conditions, some read and write access to the FX2
- * registers must be separated by a "synchronization delay".  The
- * delay is necessary only under the following conditions:
- *
- *   - between a write to any register in the 0xE600 - 0xE6FF range 
- *     and a write to one of the registers listed below.
- *
- *   - between a write to one of the registers listed below and a read 
- *     from any register in the 0xE600 - 0xE6FF range.
- *
- *   Registers which require a synchronization delay:
- *
- *	FIFORESET			FIFOPINPOLAR
- *	INPKTEND			EPxBCH:L
- *	EPxFIFOPFH:L			EPxAUTOINLENH:L
- *	EPxFIFOCFG			EPxGPIFFLGSEL
- *	PINFLAGSAB			PINFLAGSCD
- *	EPxFIFOIE			EPxFIFOIRQ
- *	GPIFIE				GPIFIRQ
- *	UDMACRCH:L			GPIFADRH:L
- *	GPIFTRIG			EPxGPIFTRIG
- *	OUTPKTEND			REVCTL
- *	GPIFTCB3			GPIFTCB2
- *	GPIFTCB1			GPIFTCB0
- */
-
-#define	TRUE		1
-#define	FALSE		0
-
-
-void init_usrp (void);
-void init_gpif (void);
-
-void set_led_0 (unsigned char on);
-void set_led_1 (unsigned char on);
-void toggle_led_0 (void);
-void toggle_led_1 (void);
-
-#define la_trace(v)
-
-#endif /* _USRPCOMMON_H_ */
diff --git a/usrp/firmware/src/usrp2/usrp_main.c b/usrp/firmware/src/usrp2/usrp_main.c
deleted file mode 100644
index c7c09f8c5..000000000
--- a/usrp/firmware/src/usrp2/usrp_main.c
+++ /dev/null
@@ -1,380 +0,0 @@
-/* 
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003,2004 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-#include "usrp_common.h"
-#include "usrp_commands.h"
-#include "fpga.h"
-#include "usrp_gpif_inline.h"
-#include "timer.h"
-#include "i2c.h"
-#include "isr.h"
-#include "usb_common.h"
-#include "fx2utils.h"
-#include "usrp_globals.h"
-#include "usrp_i2c_addr.h"
-#include <string.h>
-#include "spi.h"
-#include "eeprom_io.h"
-#include "usb_descriptors.h"
-
-/*
- * offsets into boot eeprom for configuration values
- */
-#define	HW_REV_OFFSET		  5
-#define SERIAL_NO_OFFSET	248
-#define SERIAL_NO_LEN		  8
-
-
-#define	bRequestType	SETUPDAT[0]
-#define	bRequest	SETUPDAT[1]
-#define	wValueL		SETUPDAT[2]
-#define	wValueH		SETUPDAT[3]
-#define	wIndexL		SETUPDAT[4]
-#define	wIndexH		SETUPDAT[5]
-#define	wLengthL	SETUPDAT[6]
-#define	wLengthH	SETUPDAT[7]
-
-
-unsigned char g_tx_enable = 0;
-unsigned char g_rx_enable = 0;
-unsigned char g_rx_overrun = 0;
-unsigned char g_tx_underrun = 0;
-
-/*
- * the host side fpga loader code pushes an MD5 hash of the bitstream
- * into hash1.
- */
-#define	  USRP_HASH_SIZE      16
-xdata at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE];
-
-static void
-get_ep0_data (void)
-{
-  EP0BCL = 0;			// arm EP0 for OUT xfer.  This sets the busy bit
-
-  while (EP0CS & bmEPBUSY)	// wait for busy to clear
-    ;
-}
-
-/*
- * Handle our "Vendor Extension" commands on endpoint 0.
- * If we handle this one, return non-zero.
- */
-unsigned char
-app_vendor_cmd (void)
-{
-  if (bRequestType == VRT_VENDOR_IN){
-
-    /////////////////////////////////
-    //    handle the IN requests
-    /////////////////////////////////
-
-    switch (bRequest){
-
-    case VRQ_GET_STATUS:
-      switch (wIndexL){
-
-      case GS_TX_UNDERRUN:
-	EP0BUF[0] = g_tx_underrun;
-	g_tx_underrun = 0;
-	EP0BCH = 0;
-	EP0BCL = 1;
-	break;
-
-      case GS_RX_OVERRUN:
-	EP0BUF[0] = g_rx_overrun;
-	g_rx_overrun = 0;
-	EP0BCH = 0;
-	EP0BCL = 1;
-	break;
-
-      default:
-	return 0;
-      }
-      break;
-
-    case VRQ_I2C_READ:
-      if (!i2c_read (wValueL, EP0BUF, wLengthL))
-	return 0;
-
-      EP0BCH = 0;
-      EP0BCL = wLengthL;
-      break;
-      
-    case VRQ_SPI_READ:
-      if (!spi_read (wValueH, wValueL, wIndexH, wIndexL, EP0BUF, wLengthL))
-	return 0;
-
-      EP0BCH = 0;
-      EP0BCL = wLengthL;
-      break;
-
-    default:
-      return 0;
-    }
-  }
-
-  else if (bRequestType == VRT_VENDOR_OUT){
-
-    /////////////////////////////////
-    //    handle the OUT requests
-    /////////////////////////////////
-
-    switch (bRequest){
-
-    case VRQ_SET_LED:
-      switch (wIndexL){
-      case 0:
-	set_led_0 (wValueL);
-	break;
-	
-      case 1:
-	set_led_1 (wValueL);
-	break;
-	
-      default:
-	return 0;
-      }
-      break;
-      
-    case VRQ_FPGA_LOAD:
-      switch (wIndexL){			// sub-command
-      case FL_BEGIN:
-	return fpga_load_begin ();
-	
-      case FL_XFER:
-	get_ep0_data ();
-	return fpga_load_xfer (EP0BUF, EP0BCL);
-	
-      case FL_END:
-	return fpga_load_end ();
-	
-      default:
-	return 0;
-      }
-      break;
-      
-
-    case VRQ_FPGA_SET_RESET:
-      fpga_set_reset (wValueL);
-      break;
-      
-    case VRQ_FPGA_SET_TX_ENABLE:
-      fpga_set_tx_enable (wValueL);
-      break;
-      
-    case VRQ_FPGA_SET_RX_ENABLE:
-      fpga_set_rx_enable (wValueL);
-      break;
-
-    case VRQ_FPGA_SET_TX_RESET:
-      fpga_set_tx_reset (wValueL);
-      break;
-      
-    case VRQ_FPGA_SET_RX_RESET:
-      fpga_set_rx_reset (wValueL);
-      break;
-
-    case VRQ_I2C_WRITE:
-      get_ep0_data ();
-      if (!i2c_write (wValueL, EP0BUF, EP0BCL))
-	return 0;
-      break;
-
-    case VRQ_SPI_WRITE:
-      get_ep0_data ();
-      if (!spi_write (wValueH, wValueL, wIndexH, wIndexL, EP0BUF, EP0BCL))
-	return 0;
-      break;
-
-    default:
-      return 0;
-    }
-
-  }
-  else
-    return 0;    // invalid bRequestType
-
-  return 1;
-}
-
-
-
-static void
-main_loop (void)
-{
-  setup_flowstate_common ();
-
-  while (1){
-
-    if (usb_setup_packet_avail ())
-      usb_handle_setup_packet ();
-    
-  
-    if (GPIFTRIG & bmGPIF_IDLE){
-
-      // OK, GPIF is idle.  Let's try to give it some work.
-
-      // First check for underruns and overruns
-
-      if (UC_BOARD_HAS_FPGA && (USRP_PA & (bmPA_TX_UNDERRUN | bmPA_RX_OVERRUN))){
-      
-	// record the under/over run
-	if (USRP_PA & bmPA_TX_UNDERRUN)
-	  g_tx_underrun = 1;
-
-	if (USRP_PA & bmPA_RX_OVERRUN)
-	  g_rx_overrun = 1;
-
-	// tell the FPGA to clear the flags
-	fpga_clear_flags ();
-      }
-
-      // Next see if there are any "OUT" packets waiting for our attention,
-      // and if so, if there's room in the FPGA's FIFO for them.
-
-      if (g_tx_enable && !(EP24FIFOFLGS & 0x02)){  // USB end point fifo is not empty...
-
-	if (fpga_has_room_for_packet ()){	   // ... and FPGA has room for packet
-
-	  GPIFTCB1 = 0x01;	SYNCDELAY;
-	  GPIFTCB0 = 0x00;	SYNCDELAY;
-
-	  setup_flowstate_write ();
-
-	  SYNCDELAY;
-	  GPIFTRIG = bmGPIF_EP2_START | bmGPIF_WRITE; 	// start the xfer
-	  SYNCDELAY;
-
-	  while (!(GPIFTRIG & bmGPIF_IDLE)){
-	    // wait for the transaction to complete
-	  }
-	}
-      }
-
-      // See if there are any requests for "IN" packets, and if so
-      // whether the FPGA's got any packets for us.
-
-      if (g_rx_enable && !(EP6CS & bmEPFULL)){	// USB end point fifo is not full...
-
-	if (fpga_has_packet_avail ()){		// ... and FPGA has packet available
-
-	  GPIFTCB1 = 0x01;	SYNCDELAY;
-	  GPIFTCB0 = 0x00;	SYNCDELAY;
-
-	  setup_flowstate_read ();
-
-	  SYNCDELAY;
-	  GPIFTRIG = bmGPIF_EP6_START | bmGPIF_READ; 	// start the xfer
-	  SYNCDELAY;
-
-	  while (!(GPIFTRIG & bmGPIF_IDLE)){
-	    // wait for the transaction to complete
-	  }
-
-	  SYNCDELAY;
-	  INPKTEND = 6;	// tell USB we filled buffer (6 is our endpoint num)
-	}
-      }
-    }
-  }
-}
-
-
-/*
- * called at 100 Hz from timer2 interrupt
- *
- * Toggle led 0
- */
-void
-isr_tick (void) interrupt
-{
-  static unsigned char	count = 1;
-  
-  if (--count == 0){
-    count = 50;
-    USRP_LED_REG ^= bmLED0;
-  }
-
-  clear_timer_irq ();
-}
-
-/*
- * Read h/w rev code and serial number out of boot eeprom and
- * patch the usb descriptors with the values.
- */
-void
-patch_usb_descriptors(void)
-{
-  static xdata unsigned char hw_rev;
-  static xdata unsigned char serial_no[8];
-  unsigned char i;
-
-  eeprom_read(I2C_ADDR_BOOT, HW_REV_OFFSET, &hw_rev, 1);	// LSB of device id
-  usb_desc_hw_rev_binary_patch_location_0[0] = hw_rev;
-  usb_desc_hw_rev_binary_patch_location_1[0] = hw_rev;
-  usb_desc_hw_rev_ascii_patch_location_0[0] = hw_rev + '0';     // FIXME if we get > 9
-
-  eeprom_read(I2C_ADDR_BOOT, SERIAL_NO_OFFSET, serial_no, SERIAL_NO_LEN);
-
-  for (i = 0; i < SERIAL_NO_LEN; i++){
-    unsigned char ch = serial_no[i];
-    if (ch == 0xff)	// make unprogrammed EEPROM default to '0'
-      ch = '0';
-    usb_desc_serial_number_ascii[i << 1] = ch;
-  }
-}
-
-void
-main (void)
-{
-#if 0
-  g_rx_enable = 0;	// FIXME (work around initialization bug)
-  g_tx_enable = 0;
-  g_rx_overrun = 0;
-  g_tx_underrun = 0;
-#endif
-
-  memset (hash1, 0, USRP_HASH_SIZE);	// zero fpga bitstream hash.  This forces reload
-  
-  init_usrp ();
-  init_gpif ();
-  
-  // if (UC_START_WITH_GSTATE_OUTPUT_ENABLED)
-  IFCONFIG |= bmGSTATE;			// no conflict, start with it on
-
-  set_led_0 (0);
-  set_led_1 (0);
-  
-  EA = 0;		// disable all interrupts
-
-  patch_usb_descriptors();
-
-  setup_autovectors ();
-  usb_install_handlers ();
-  hook_timer_tick ((unsigned short) isr_tick);
-
-  EIEX4 = 1;		// disable INT4 FIXME
-  EA = 1;		// global interrupt enable
-
-  fx2_renumerate ();	// simulates disconnect / reconnect
-
-  main_loop ();
-}
diff --git a/usrp/firmware/src/usrp2/usrp_rev2_regs.h b/usrp/firmware/src/usrp2/usrp_rev2_regs.h
deleted file mode 100644
index a4f1d9896..000000000
--- a/usrp/firmware/src/usrp2/usrp_rev2_regs.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-/*
- * These are the register definitions for the Rev 1 USRP prototype
- * The Rev 1 is the version with the AD9862's and daughterboards
- */
-
-#ifndef _USRP_REV1_REGS_H_
-#define _USRP_REV1_REGS_H_
-
-#include "fx2regs.h"
-
-/*
- * Port A (bit addressable):
- */
-
-#define USRP_PA			IOA		// Port A
-#define	USRP_PA_OE		OEA		// Port A direction register
-
-#define bmPA_S_CLK		bmBIT0		// SPI serial clock
-#define	bmPA_S_DATA_TO_PERIPH	bmBIT1		// SPI SDI (peripheral rel name)
-#define bmPA_S_DATA_FROM_PERIPH	bmBIT2		// SPI SDO (peripheral rel name)
-#define bmPA_SEN_FPGA		bmBIT3		// serial enable for FPGA (active low)
-#define	bmPA_SEN_CODEC_A	bmBIT4		// serial enable AD9862 A (active low)
-#define	bmPA_SEN_CODEC_B	bmBIT5		// serial enable AD9862 B (active low)
-//#define bmPA_FX2_2		bmBIT6		// misc pin to FPGA (overflow)
-//#define bmPA_FX2_3		bmBIT7		// misc pin to FPGA (underflow)
-#define	bmPA_RX_OVERRUN		bmBIT6		// misc pin to FPGA (overflow)
-#define	bmPA_TX_UNDERRUN	bmBIT7		// misc pin to FPGA (underflow)
-
-
-sbit at 0x80+0 bitS_CLK;		// 0x80 is the bit address of PORT A
-sbit at 0x80+1 bitS_OUT;		// out from FX2 point of view
-sbit at 0x80+2 bitS_IN;			// in from FX2 point of view
-
-
-/* all outputs except S_DATA_FROM_PERIPH, FX2_2, FX2_3 */
-
-#define	bmPORT_A_OUTPUTS  (bmPA_S_CLK			\
-			   | bmPA_S_DATA_TO_PERIPH	\
-			   | bmPA_SEN_FPGA		\
-			   | bmPA_SEN_CODEC_A		\
-			   | bmPA_SEN_CODEC_B		\
-			   )
-
-#define	bmPORT_A_INITIAL   (bmPA_SEN_FPGA | bmPA_SEN_CODEC_A | bmPA_SEN_CODEC_B)
-
-
-/* Port B: GPIF	FD[7:0]			*/
-
-/*
- * Port C (bit addressable):
- *    5:1 FPGA configuration
- */
-
-#define	USRP_PC			IOC		// Port C
-#define	USRP_PC_OE		OEC		// Port C direction register
-
-#define	USRP_ALTERA_CONFIG	USRP_PC
-
-#define	bmPC_nRESET		bmBIT0		// reset line to codecs (active low)
-#define bmALTERA_DATA0		bmBIT1
-#define bmALTERA_NCONFIG	bmBIT2
-#define bmALTERA_DCLK		bmBIT3
-#define bmALTERA_CONF_DONE	bmBIT4
-#define bmALTERA_NSTATUS	bmBIT5
-#define	bmPC_LED0		bmBIT6		// active low
-#define	bmPC_LED1		bmBIT7		// active low
-
-sbit at 0xA0+1 bitALTERA_DATA0;		// 0xA0 is the bit address of PORT C
-sbit at 0xA0+3 bitALTERA_DCLK;
-
-
-#define	bmALTERA_BITS		(bmALTERA_DATA0			\
-				 | bmALTERA_NCONFIG		\
-				 | bmALTERA_DCLK		\
-				 | bmALTERA_CONF_DONE		\
-				 | bmALTERA_NSTATUS)
-
-#define	bmPORT_C_OUTPUTS	(bmPC_nRESET			\
-				 | bmALTERA_DATA0 		\
-				 | bmALTERA_NCONFIG		\
-				 | bmALTERA_DCLK		\
-				 | bmPC_LED0			\
-				 | bmPC_LED1			\
-				 )
-
-#define	bmPORT_C_INITIAL	(bmPC_LED0 | bmPC_LED1)
-
-
-#define	USRP_LED_REG		USRP_PC
-#define	bmLED0			bmPC_LED0
-#define	bmLED1			bmPC_LED1
-
-
-/* Port D: GPIF	FD[15:8]		*/
-
-/* Port E: not bit addressible		*/
-
-#define	USRP_PE			IOE		// Port E
-#define	USRP_PE_OE		OEE		// Port E direction register
-
-#define bmPE_PE0		bmBIT0		// GPIF debug output
-#define	bmPE_PE1		bmBIT1		// GPIF debug output
-#define	bmPE_PE2		bmBIT2		// GPIF debug output
-#define	bmPE_FPGA_CLR_STATUS	bmBIT3		// misc pin to FPGA (clear status)
-#define	bmPE_SEN_TX_A		bmBIT4		// serial enable d'board TX A (active low)
-#define	bmPE_SEN_RX_A		bmBIT5		// serial enable d'board RX A (active low)
-#define	bmPE_SEN_TX_B		bmBIT6		// serial enable d'board TX B (active low)
-#define bmPE_SEN_RX_B		bmBIT7		// serial enable d'board RX B (active low)
-
-
-#define	bmPORT_E_OUTPUTS	(bmPE_FPGA_CLR_STATUS	\
-				 | bmPE_SEN_TX_A 	\
-				 | bmPE_SEN_RX_A	\
-				 | bmPE_SEN_TX_B	\
-				 | bmPE_SEN_RX_B	\
-				 )
-
-
-#define	bmPORT_E_INITIAL	(bmPE_SEN_TX_A 		\
-				 | bmPE_SEN_RX_A	\
-				 | bmPE_SEN_TX_B	\
-				 | bmPE_SEN_RX_B	\
-				 )
-
-/*
- * FPGA output lines that are tied to FX2 RDYx inputs.
- * These are readable using GPIFREADYSTAT.
- */
-#define	bmFPGA_HAS_SPACE		bmBIT0	// usbrdy[0] has room for 512 byte packet
-#define	bmFPGA_PKT_AVAIL		bmBIT1	// usbrdy[1] has >= 512 bytes available
-// #define	bmTX_UNDERRUN			bmBIT2  // usbrdy[2] D/A ran out of data
-// #define	bmRX_OVERRUN			bmBIT3	// usbrdy[3] A/D ran out of buffer
-
-/*
- * FPGA input lines that are tied to the FX2 CTLx outputs.
- *
- * These are controlled by the GPIF microprogram...
- */
-// WR					bmBIT0	// usbctl[0]
-// RD					bmBIT1	// usbctl[1]
-// OE					bmBIT2	// usbctl[2]
-
-#endif /* _USRP_REV1_REGS_H_ */
diff --git a/usrp/firmware/src/usrp2/vectors.a51 b/usrp/firmware/src/usrp2/vectors.a51
deleted file mode 100644
index fa579ba8a..000000000
--- a/usrp/firmware/src/usrp2/vectors.a51
+++ /dev/null
@@ -1 +0,0 @@
-	.include "../common/vectors.a51"
diff --git a/usrp/fpga/.gitignore b/usrp/fpga/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/usrp/fpga/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/usrp/fpga/Makefile.am b/usrp/fpga/Makefile.am
deleted file mode 100644
index 901a66f0f..000000000
--- a/usrp/fpga/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright 2004,2005,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.
-# 
-
-SUBDIRS = rbf
diff --git a/usrp/fpga/README b/usrp/fpga/README
deleted file mode 100644
index 3d1e7ad99..000000000
--- a/usrp/fpga/README
+++ /dev/null
@@ -1,3 +0,0 @@
-The FPGA source content that used to be here is now hosted at:
-
-git://ettus.sourcerepo.com/ettus/fpga.git
diff --git a/usrp/fpga/rbf/.gitignore b/usrp/fpga/rbf/.gitignore
deleted file mode 100644
index eb58a95f5..000000000
--- a/usrp/fpga/rbf/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/Makefile
-/Makefile.in
-/usrp_fpga_rev1.rbf
-/usrp_fpga_rev2.rbf
diff --git a/usrp/fpga/rbf/Makefile.am b/usrp/fpga/rbf/Makefile.am
deleted file mode 100644
index 7bce77d5f..000000000
--- a/usrp/fpga/rbf/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright 2005,2006,2009 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.
-# 
-
-SUBDIRS = rev2 rev4
diff --git a/usrp/fpga/rbf/rev2/.gitignore b/usrp/fpga/rbf/rev2/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/usrp/fpga/rbf/rev2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/usrp/fpga/rbf/rev2/Makefile.am b/usrp/fpga/rbf/rev2/Makefile.am
deleted file mode 100644
index 487650e18..000000000
--- a/usrp/fpga/rbf/rev2/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright 2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-rbf2datadir = $(prefix)/share/usrp/rev2
-
-dist_rbf2data_DATA =		\
-	std_2rxhb_2tx.rbf		\
-	std_4rx_0tx.rbf		\
-	inband_1rxhb_1tx.rbf	\
-	inband_2rxhb_2tx.rbf	\
-	multi_2rxhb_2tx.rbf
diff --git a/usrp/fpga/rbf/rev2/inband_1rxhb_1tx.rbf b/usrp/fpga/rbf/rev2/inband_1rxhb_1tx.rbf
deleted file mode 100755
index c1c9af2ce..000000000
--- a/usrp/fpga/rbf/rev2/inband_1rxhb_1tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev2/inband_2rxhb_2tx.rbf b/usrp/fpga/rbf/rev2/inband_2rxhb_2tx.rbf
deleted file mode 100755
index ca1a0f92b..000000000
--- a/usrp/fpga/rbf/rev2/inband_2rxhb_2tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev2/multi_2rxhb_2tx.rbf b/usrp/fpga/rbf/rev2/multi_2rxhb_2tx.rbf
deleted file mode 100755
index 2683d8641..000000000
--- a/usrp/fpga/rbf/rev2/multi_2rxhb_2tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev2/multi_4rx_0tx.rbf b/usrp/fpga/rbf/rev2/multi_4rx_0tx.rbf
deleted file mode 100755
index b7e4eb393..000000000
--- a/usrp/fpga/rbf/rev2/multi_4rx_0tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf b/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
deleted file mode 100755
index ee3c30d66..000000000
--- a/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf b/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf
deleted file mode 100755
index 1deca9517..000000000
--- a/usrp/fpga/rbf/rev2/std_4rx_0tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev4/.gitignore b/usrp/fpga/rbf/rev4/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/usrp/fpga/rbf/rev4/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/usrp/fpga/rbf/rev4/Makefile.am b/usrp/fpga/rbf/rev4/Makefile.am
deleted file mode 100644
index 54de9b818..000000000
--- a/usrp/fpga/rbf/rev4/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright 2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-rbf4datadir = $(prefix)/share/usrp/rev4
-
-dist_rbf4data_DATA =		\
-	std_2rxhb_2tx.rbf		\
-	std_4rx_0tx.rbf		\
-	inband_1rxhb_1tx.rbf	\
-	inband_2rxhb_2tx.rbf	\
-	multi_2rxhb_2tx.rbf
diff --git a/usrp/fpga/rbf/rev4/inband_1rxhb_1tx.rbf b/usrp/fpga/rbf/rev4/inband_1rxhb_1tx.rbf
deleted file mode 100755
index c1c9af2ce..000000000
--- a/usrp/fpga/rbf/rev4/inband_1rxhb_1tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev4/inband_2rxhb_2tx.rbf b/usrp/fpga/rbf/rev4/inband_2rxhb_2tx.rbf
deleted file mode 100755
index ca1a0f92b..000000000
--- a/usrp/fpga/rbf/rev4/inband_2rxhb_2tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev4/multi_2rxhb_2tx.rbf b/usrp/fpga/rbf/rev4/multi_2rxhb_2tx.rbf
deleted file mode 100755
index 2683d8641..000000000
--- a/usrp/fpga/rbf/rev4/multi_2rxhb_2tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev4/multi_4rx_0tx.rbf b/usrp/fpga/rbf/rev4/multi_4rx_0tx.rbf
deleted file mode 100755
index b7e4eb393..000000000
--- a/usrp/fpga/rbf/rev4/multi_4rx_0tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf b/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
deleted file mode 100755
index ee3c30d66..000000000
--- a/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
+++ /dev/null
diff --git a/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf b/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf
deleted file mode 100755
index 1deca9517..000000000
--- a/usrp/fpga/rbf/rev4/std_4rx_0tx.rbf
+++ /dev/null
diff --git a/usrp/host/.gitignore b/usrp/host/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/usrp/host/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/usrp/host/Makefile.am b/usrp/host/Makefile.am
deleted file mode 100644
index aa94fbd6e..000000000
--- a/usrp/host/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright 2001,2007,2009 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.
-# 
-
-SUBDIRS = misc lib include apps
-
-if PYTHON
-SUBDIRS += swig
-endif 
diff --git a/usrp/host/apps/.gitignore b/usrp/host/apps/.gitignore
deleted file mode 100644
index 16fdf27ad..000000000
--- a/usrp/host/apps/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/*.dat
-/usrper
-/usrper2
-/test_input
-/test_fusb
-/test_usrp
-/test_usrp0
-/test_usrp_standard_rx
-/test_usrp_standard_tx
-/test_usrp_inband_timestamps
-/test_usrp_inband_registers
-/test_usrp_inband_rx
-/test_usrp_inband_tx
-/test_usrp_basic_rx
-/check_order_quickly
-/usrp_cal_dc_offset
-/test_usrp_inband_cs
-/read_packets
-/test_usrp_inband_ping
diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am
deleted file mode 100644
index 8aa361b22..000000000
--- a/usrp/host/apps/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright 2003,2006,2008,2009 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = $(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \
-	   $(USB_INCLUDES) $(WITH_INCLUDES)
-
-bin_PROGRAMS =				\
-	usrper				\
-	usrp_cal_dc_offset		
-
-noinst_PROGRAMS =			\
-	check_order_quickly		\
-	test_usrp_standard_rx		\
-	test_usrp_standard_tx		
-
-noinst_HEADERS =			\
-	time_stuff.h			
-
-noinst_PYTHON =				\
-	burn-db-eeprom			\
-	burn-serial-number		
-
-
-check_order_quickly_SOURCES	= check_order_quickly.cc
-
-test_usrp_standard_rx_SOURCES 	= test_usrp_standard_rx.cc time_stuff.c
-test_usrp_standard_rx_LDADD   	= $(USRP_LA)
-
-test_usrp_standard_tx_SOURCES 	= test_usrp_standard_tx.cc time_stuff.c
-test_usrp_standard_tx_LDADD   	= $(USRP_LA) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB)
-
-usrper_SOURCES			= usrper.cc
-usrper_LDADD 			= $(USRP_LA)
-
-usrp_cal_dc_offset_SOURCES	= usrp_cal_dc_offset.cc
-usrp_cal_dc_offset_LDADD	= $(USRP_LA)
diff --git a/usrp/host/apps/burn-db-eeprom b/usrp/host/apps/burn-db-eeprom
deleted file mode 100755
index 0c908e3d5..000000000
--- a/usrp/host/apps/burn-db-eeprom
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2005,2007,2009 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.
-#
-
-from usrpm.usrp_prims import *
-from optparse import OptionParser
-import sys
-from usrpm.usrp_dbid import *
-
-i2c_addr_map = { 'TX_A' : 0x54,    'RX_A' : 0x55,    'TX_B' : 0x56,    'RX_B' : 0x57 }
-
-daughterboards = {
-    # name            : ((tx-dbid, tx-oe),          (rx-dbid, rx-oe))
-    'basictx'         : ((BASIC_TX, 0x0000),        None),
-    'basicrx'         : (None,                      (BASIC_RX, 0x0000)),
-    'dbsrx'           : (None,                      (DBS_RX, 0x0000)),
-    'dbsrx_clkmod'    : (None,                      (DBS_RX_CLKMOD, 0x0000)),
-    'tvrx'            : (None,                      (TV_RX, 0x0000)),
-    'tvrx2'           : (None,                      (TV_RX_REV_2, 0x0000)),
-    'tvrx3'           : (None,                      (TV_RX_REV_3, 0x0000)),
-    'tvrx_mimo'       : (None,                      (TV_RX_MIMO, 0x0000)),
-    'tvrx2_mimo'      : (None,                      (TV_RX_REV_2_MIMO, 0x0000)),
-    'tvrx3_mimo'      : (None,                      (TV_RX_REV_3_MIMO, 0x0000)),
-    'dtt754'          : (None,                      (DTT754, 0x0000)),
-    'dtt768'          : (None,                      (DTT768, 0x0000)),
-    'rfx400'          : ((FLEX_400_TX, 0x0000),     (FLEX_400_RX, 0x0000)),
-    'rfx900'          : ((FLEX_900_TX, 0x0000),     (FLEX_900_RX, 0x0000)),
-    'rfx1200'         : ((FLEX_1200_TX, 0x0000),    (FLEX_1200_RX, 0x0000)),
-    'rfx1800'         : ((FLEX_1800_TX, 0x0000),    (FLEX_1800_RX, 0x0000)),
-    'rfx2400'         : ((FLEX_2400_TX, 0x0000),    (FLEX_2400_RX, 0x0000)),
-    'rfx400_tx'       : ((FLEX_400_TX, 0x0000),     None),
-    'rfx900_tx'       : ((FLEX_900_TX, 0x0000),     None),
-    'rfx1200_tx'      : ((FLEX_1200_TX, 0x0000),    None),
-    'rfx1800_tx'      : ((FLEX_1800_TX, 0x0000),    None),
-    'rfx2400_tx'      : ((FLEX_2400_TX, 0x0000),    None),
-    'rfx400_rx'       : (None,                      (FLEX_400_RX, 0x0000)),
-    'rfx900_rx'       : (None,                      (FLEX_900_RX, 0x0000)),
-    'rfx1200_rx'      : (None,                      (FLEX_1200_RX, 0x0000)),
-    'rfx1800_rx'      : (None,                      (FLEX_1800_RX, 0x0000)),
-    'rfx2400_rx'      : (None,                      (FLEX_2400_RX, 0x0000)),
-    'rfx400_mimo_a'   : ((FLEX_400_TX_MIMO_A, 0x0000),     (FLEX_400_RX_MIMO_A, 0x0000)),
-    'rfx900_mimo_a'   : ((FLEX_900_TX_MIMO_A, 0x0000),     (FLEX_900_RX_MIMO_A, 0x0000)),
-    'rfx1200_mimo_a'  : ((FLEX_1200_TX_MIMO_A, 0x0000),    (FLEX_1200_RX_MIMO_A, 0x0000)),
-    'rfx1800_mimo_a'  : ((FLEX_1800_TX_MIMO_A, 0x0000),    (FLEX_1800_RX_MIMO_A, 0x0000)),
-    'rfx2400_mimo_a'  : ((FLEX_2400_TX_MIMO_A, 0x0000),    (FLEX_2400_RX_MIMO_A, 0x0000)),
-    'rfx400_mimo_b'   : ((FLEX_400_TX_MIMO_B, 0x0000),     (FLEX_400_RX_MIMO_B, 0x0000)),
-    'rfx900_mimo_b'   : ((FLEX_900_TX_MIMO_B, 0x0000),     (FLEX_900_RX_MIMO_B, 0x0000)),
-    'rfx1200_mimo_b'  : ((FLEX_1200_TX_MIMO_B, 0x0000),    (FLEX_1200_RX_MIMO_B, 0x0000)),
-    'rfx1800_mimo_b'  : ((FLEX_1800_TX_MIMO_B, 0x0000),    (FLEX_1800_RX_MIMO_B, 0x0000)),
-    'rfx2200_mimo_b'  : ((FLEX_2200_TX_MIMO_B, 0x0000),    (FLEX_2200_RX_MIMO_B, 0x0000)),
-    'rfx2400_mimo_b'  : ((FLEX_2400_TX_MIMO_B, 0x0000),    (FLEX_2400_RX_MIMO_B, 0x0000)),
-    'lftx'            : ((LF_TX, 0x0000),           None),
-    'lfrx'            : (None,                      (LF_RX, 0x0000)),
-    'wbx_lo'          : ((WBX_LO_TX, 0x0000),       (WBX_LO_RX, 0x0000)),
-    'wbx_ng'          : ((WBX_NG_TX, 0x0000),       (WBX_NG_RX, 0x0000)),
-    'xcvr2450'        : ((XCVR2450_TX, 0x0000),       (XCVR2450_RX, 0x0000)),
-    'bitshark_rx'     : (None,                      (BITSHARK_RX, 0x0000)),
-    'experimental_tx' : ((EXPERIMENTAL_TX, 0x0000), None),
-    'experimental_rx' : (None,                      (EXPERIMENTAL_RX, 0x0000)),
-    }
-
-def open_cmd_interface(which_board = 0):
-    if not usrp_load_standard_bits (which_board, 0):
-        raise RuntimeError, "usrp_load_standard_bits"
-    dev = usrp_find_device (which_board)
-    if not dev:
-        raise RuntimeError, "usrp_find_device"
-    u = usrp_open_cmd_interface (dev)
-    if not u:
-        raise RuntimeError, "usrp_open_cmd_interface"
-    return u
-
-def write_dboard_eeprom(u, i2c_addr, dbid, oe):
-    eeprom = 0x20 * [0]
-    eeprom[0] = 0xDB                    # magic value
-    eeprom[1] = dbid & 0xff
-    eeprom[2] = (dbid >> 8) & 0xff
-    eeprom[3] = oe & 0xff
-    eeprom[4] = (oe >> 8) & 0xff
-    eeprom[0x1f] = 0xff & (-reduce(lambda x, y: x+y, eeprom)) # checksum
-    s = ''.join (map (chr, eeprom))
-    ok = usrp_eeprom_write (u, i2c_addr, 0, s)
-    return ok
-
-
-def init_eeprom(u, slot_name, force, dbid, oe):
-    i2c_addr = i2c_addr_map[slot_name]
-    e = usrp_eeprom_read (u, i2c_addr, 0, 0x20)
-    if not e:
-        print "%s: no d'board, skipped" % (slot_name,)
-        return True
-
-    if not force and (sum (map (ord, e)) & 0xff) == 0 and ord (e[0]) == 0xDB:
-        print "%s: already initialized, skipped" % (slot_name,)
-        return True
-
-    if not write_dboard_eeprom (u, i2c_addr, dbid, oe):
-        print "%s: failed to write d'board EEPROM" % (slot_name,)
-        return False
-
-    print "%s: OK" % (slot_name,)
-    return True
-
-
-def init_daughterboard(u, side, type, force):
-    ok = True
-    dbinfo = daughterboards[type]
-    if dbinfo[0] is not None:           # burn tx slot
-        ok &= init_eeprom(u, 'TX_' + side, force, dbinfo[0][0], dbinfo[0][1])
-    if dbinfo[1] is not None:           # burn rx slot
-        ok &= init_eeprom(u, 'RX_' + side, force, dbinfo[1][0], dbinfo[1][1])
-    return ok
-
-
-def main():
-    dbs = daughterboards.keys()
-    dbs.sort()
-    usage = """\
-usage: %prog [options]
-You must specify a type with -t or --type,
-and at least one side using -A and/or -B."""
-
-    parser = OptionParser(usage=usage)
-    parser.add_option ("-t", "--type", type="choice", help="choose type from %r" % (dbs,),
-                       choices=dbs, default=None)
-    parser.add_option ("-A", "--burn-a", action="store_true", default=False,
-                       help="burn eeprom(s) on side A")
-    parser.add_option ("-B", "--burn-b", action="store_true", default=False,
-                       help="burn eeprom(s) on side B")
-    parser.add_option ("-f", "--force", action="store_true", default=False,
-                       help="force init of already initialized eeproms")
-    (options, args) = parser.parse_args ()
-
-    which=[]
-    if options.burn_a:
-        which.append('A')
-    if options.burn_b:
-        which.append('B')
-
-    if len(args) != 0 or len(which) == 0 or options.type is None:
-        parser.print_help()
-        sys.exit (1)
-
-    u = open_cmd_interface (0)
-    ok = True
-    for w in which:
-        ok &= init_daughterboard (u, w, options.type, options.force)
-
-    if ok:
-        sys.exit (0)
-    else:
-        sys.exit (1)
-
-if __name__ == "__main__":
-    main ()
-
diff --git a/usrp/host/apps/burn-serial-number b/usrp/host/apps/burn-serial-number
deleted file mode 100755
index f9a2a86a5..000000000
--- a/usrp/host/apps/burn-serial-number
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006,2007 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.
-# 
-
-from usrpm.usrp_prims import *
-from optparse import OptionParser
-import sys
-import time
-
-
-def open_cmd_interface(which_board = 0):
-    if not usrp_load_standard_bits (which_board, 0):
-        raise RuntimeError, "usrp_load_standard_bits"
-    dev = usrp_find_device (which_board)
-    if not dev:
-        raise RuntimeError, "usrp_find_device"
-    u = usrp_open_cmd_interface (dev)
-    if not u:
-        raise RuntimeError, "usrp_open_cmd_interface"
-    return u
-
-
-def write_serial_number_eeprom(u, serial_number):
-    if not str(serial_number):
-        raise TypeError
-
-    i2c_addr = 0x50                 # usrp boot rom
-    serial_number_offset = 248      # offset to serial number
-    serial_number_len = 8           # length of serial number
-
-    lsn = len(serial_number)
-    if lsn > serial_number_len:
-        serial_number = serial_number[0:serial_number_len]
-    if lsn < serial_number_len:
-        serial_number = serial_number + (serial_number_len - lsn) * ' '
-    
-    ok = usrp_eeprom_write (u, i2c_addr, serial_number_offset, serial_number)
-    return ok
-
-
-def main():
-
-    default_serial_number = hex(int(time.time()))[2:]
-    parser = OptionParser()
-    parser.add_option ("-s", "--serial-number", default=default_serial_number,
-                       help="set serial number [default=%default]")
-    (options, args) = parser.parse_args ()
-
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
-
-    u = open_cmd_interface (0)
-    ok = write_serial_number_eeprom(u, options.serial_number)
-
-    if ok:
-        sys.exit(0)
-    else:
-        sys.exit(1)
-
-if __name__ == "__main__":
-    main ()
diff --git a/usrp/host/apps/check_order b/usrp/host/apps/check_order
deleted file mode 100755
index 56e192710..000000000
--- a/usrp/host/apps/check_order
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-# -*- Python -*-
-
-import sys
-import fileinput
-
-skip_count = 4096
-lineno = 0
-last_error = 0
-
-for line in fileinput.input ():
-    lineno += 1
-    if lineno < skip_count:
-        continue
-    (offset, dec_val, hex_val) = line.split ()
-    if lineno == skip_count:
-        expected_val = int (dec_val)
-    int_dec_val = int (dec_val)
-    int_hex_val = int (hex_val, 16)
-    if int_dec_val != expected_val:
-        print "line %6d, delta %4d, expected %6d, got %6d" % (lineno,
-                                                              lineno - last_error,
-                                                              expected_val,
-                                                              int_dec_val)
-        last_error = lineno
-    elif ((int_hex_val >> 12) & 0xf) != (int_hex_val & 0xf):
-        print "line %6d, delta %4d, invalid high bits %04x" % (lineno,
-                                                               lineno - last_error,
-                                                               int_hex_val)
-        last_error = lineno
-        
-    # expected_val = (expected_val + 1) & 0xffff
-    expected_val = (expected_val + 1) & 0x0fff
-    
-
-        
-    
-
-    
diff --git a/usrp/host/apps/check_order_quickly.cc b/usrp/host/apps/check_order_quickly.cc
deleted file mode 100644
index 4fa30c7d9..000000000
--- a/usrp/host/apps/check_order_quickly.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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.
- */
-
-#include <stdio.h>
-
-static bool
-check (int v, int counter, int offset)
-{
-  if ((v & 0x0fff) != counter){
-    fprintf (stdout, "%08x: expected 0x%04x, got 0x%04x\n", offset, counter, v & 0x0fff);
-    return false;
-  }
-
-  if (((v >> 12) & 0xf) != (v & 0xf)){
-    fprintf (stdout, "%08x: bad high bits 0x%04x\n", offset, v);
-    return false;
-  }
-
-  return true;
-}
-
-int
-main (int argc, char **argv)
-{
-  static const int BUFSIZE = 64 * 1024;
-  unsigned short buf[BUFSIZE];
-
-  int	n;
-  int	i;
-  int	counter = 0;
-  int	offset = 0;
-  bool  ok = true;
-
-  while ((n = fread (buf, sizeof (short), BUFSIZE, stdin)) != 0){
-    for (i = 0; i < n; i++){
-      ok &= check (buf[i], counter, offset);
-      counter = (counter + 1) & 0x0fff;
-      offset++;
-    }
-  }
-
-  return ok ? 0 : 1;
-}
diff --git a/usrp/host/apps/dump_12bit_shorts b/usrp/host/apps/dump_12bit_shorts
deleted file mode 100755
index a896f2dd3..000000000
--- a/usrp/host/apps/dump_12bit_shorts
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# -*- Python -*-
-
-import sys, errno
-
-counter = 0
-
-try:
-    while 1:
-        x = sys.stdin.read (2)
-        if not x:
-            break
-
-        v = (ord(x[1]) << 8) | ord(x[0])
-        sys.stdout.write ("0x%08x  %6d  0x%04x\n" % (counter, v & 0x0fff, v))
-        counter += 1
-except IOError, e:
-    if e.errno == errno.EPIPE:
-        sys.exit (0)
-    
-  
-  
-
diff --git a/usrp/host/apps/dump_shorts b/usrp/host/apps/dump_shorts
deleted file mode 100755
index 6104ea062..000000000
--- a/usrp/host/apps/dump_shorts
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# -*- Python -*-
-
-import sys, errno
-
-counter = 0
-
-try:
-    while 1:
-        x = sys.stdin.read (2)
-        if not x:
-            break
-
-        v = (ord(x[1]) << 8) | ord(x[0])
-        sys.stdout.write ("0x%08x  %6d  0x%04x\n" % (counter, v, v))
-        counter += 1
-except IOError, e:
-    if e.errno == errno.EPIPE:
-        sys.exit (0)
-    
-  
-  
-
diff --git a/usrp/host/apps/run b/usrp/host/apps/run
deleted file mode 100755
index 5b13336c7..000000000
--- a/usrp/host/apps/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-./test_usrp_standard_rx -D 8 -o rx.bin
-./dump_12bit_shorts <rx.bin | head -100000 >rx.ascii
-./check_order rx.ascii
-#./dump_12bit_shorts <rx.bin | ./check_order
diff --git a/usrp/host/apps/run2 b/usrp/host/apps/run2
deleted file mode 100755
index 5fcf154cb..000000000
--- a/usrp/host/apps/run2
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-./test_usrp_standard_rx -D 8 -o rx.bin
-./check_order_quickly <rx.bin
diff --git a/usrp/host/apps/run_input b/usrp/host/apps/run_input
deleted file mode 100755
index b8afae6f3..000000000
--- a/usrp/host/apps/run_input
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-./test_usrp_standard_rx -D 8 -o rx.bin "$@"
-./dump_shorts <rx.bin | head -50000 >rx.ascii
-
diff --git a/usrp/host/apps/test_usrp_standard_rx.cc b/usrp/host/apps/test_usrp_standard_rx.cc
deleted file mode 100644
index 4098decda..000000000
--- a/usrp/host/apps/test_usrp_standard_rx.cc
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2006,2008,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <assert.h>
-#include <math.h>
-#include "time_stuff.h"
-#include <usrp/usrp_standard.h>
-#include <usrp/usrp_bytesex.h>
-#include "fpga_regs_common.h"
-#include "fpga_regs_standard.h"
-
-#ifdef HAVE_SCHED_H
-#include <sched.h>
-#endif
-
-char *prog_name;
-
-static bool test_input  (usrp_standard_rx_sptr urx, int max_bytes, FILE *fp);
-
-static void
-set_progname (char *path)
-{
-  char *p = strrchr (path, '/');
-  if (p != 0)
-    prog_name = p+1;
-  else
-    prog_name = path;
-}
-
-static void
-usage ()
-{
-  fprintf (stderr, "usage: %s [-f] [-v] [-l] [-c] [-D <decim>] [-F freq] [-o output_file]\n", prog_name);
-  fprintf (stderr, "  [-f] loop forever\n");
-  fprintf (stderr, "  [-M] how many Megabytes to transfer (default 128)\n");
-  fprintf (stderr, "  [-v] verbose\n");
-  fprintf (stderr, "  [-l] digital loopback in FPGA\n");
-  fprintf (stderr, "  [-c] counting in FPGA\n");
-  fprintf (stderr, "  [-8] 8-bit samples across USB\n");
-  fprintf (stderr, "  [-B <fusb_block_size>] set fast usb block_size\n");
-  fprintf (stderr, "  [-N <fusb_nblocks>] set fast usb nblocks\n");
-  fprintf (stderr, "  [-R] set real time scheduling: SCHED_FIFO; pri = midpoint\n");
-
-  exit (1);
-}
-
-static void
-die (const char *msg)
-{
-  fprintf (stderr, "die: %s: %s\n", prog_name, msg);
-  exit (1);
-}
-
-int
-main (int argc, char **argv)
-{
-  bool 	verbose_p = false;
-  bool	loopback_p = false;
-  bool  counting_p = false;
-  bool	width_8_p = false;
-  int   max_bytes = 128 * (1L << 20);
-  int	ch;
-  char	*output_filename = 0;
-  int	which_board = 0;
-  int	decim = 8;			// 32 MB/sec
-  double	center_freq = 0;
-  int	fusb_block_size = 0;
-  int	fusb_nblocks = 0;
-  bool	realtime_p = false;
-
-
-  set_progname (argv[0]);
-
-  while ((ch = getopt (argc, argv, "fvlco:D:F:M:8B:N:R")) != EOF){
-    switch (ch){
-    case 'f':
-      max_bytes = 0;
-      break;
-
-    case 'v':
-      verbose_p = true;
-      break;
-
-    case 'l':
-      loopback_p = true;
-      break;
-
-    case 'c':
-      counting_p = true;
-      break;
-      
-    case '8':
-      width_8_p = true;
-      break;
-      
-    case 'o':
-      output_filename = optarg;
-      break;
-      
-    case 'D':
-      decim = strtol (optarg, 0, 0);
-      break;
-
-    case 'F':
-      center_freq = strtod (optarg, 0);
-      break;
-
-    case 'M':
-      max_bytes = strtol (optarg, 0, 0) * (1L << 20);
-      if (max_bytes < 0) max_bytes = 0;
-      break;
-
-    case 'B':
-      fusb_block_size = strtol (optarg, 0, 0);
-      break;
-
-    case 'N':
-      fusb_nblocks = strtol (optarg, 0, 0);
-      break;
-
-    case 'R':
-      realtime_p = true;
-      break;
-
-    default:
-      usage ();
-    }
-  }
-
-#ifdef HAVE_SCHED_SETSCHEDULER
-  if (realtime_p){
-    int policy = SCHED_FIFO;
-    int pri = (sched_get_priority_max (policy) - sched_get_priority_min (policy)) / 2;
-    int pid = 0;  // this process
-
-    struct sched_param param;
-    memset(&param, 0, sizeof(param));
-    param.sched_priority = pri;
-    int result = sched_setscheduler(pid, policy, &param);
-    if (result != 0){
-      perror ("sched_setscheduler: failed to set real time priority");
-    }
-    else
-      printf("SCHED_FIFO enabled with priority = %d\n", pri);
-  }
-#endif
-
-  FILE *fp = 0;
-
-  if (output_filename){
-    fp = fopen (output_filename, "wb");
-    if (fp == 0)
-      perror (output_filename);
-  }
-      
-  int mode = 0;
-  if (loopback_p)
-    mode |= usrp_standard_rx::FPGA_MODE_LOOPBACK;
-  if (counting_p)
-    mode |= usrp_standard_rx::FPGA_MODE_COUNTING;
-
-
-  usrp_standard_rx_sptr urx = 
-    usrp_standard_rx::make (which_board, decim, 1, -1, mode,
-			    fusb_block_size, fusb_nblocks);
-
-  if (urx == 0)
-    die ("usrp_standard_rx::make");
-
-  if (!urx->set_rx_freq (0, center_freq))
-    die ("urx->set_rx_freq");
-    
-  if (width_8_p){
-    int width = 8;
-    int shift = 8;
-    bool want_q = true;
-    if (!urx->set_format(usrp_standard_rx::make_format(width, shift, want_q)))
-      die("urx->set_format");
-  }
-
-  urx->start();		// start data xfers
-
-  test_input (urx, max_bytes, fp);
-
-  if (fp)
-    fclose (fp);
-
-  return 0;
-}
-
-
-static bool
-test_input  (usrp_standard_rx_sptr urx, int max_bytes, FILE *fp)
-{
-  int		   fd = -1;
-  static const int BUFSIZE = urx->block_size();
-  static const int N = BUFSIZE/sizeof (short);
-  short 	   buf[N];
-  int		   nbytes = 0;
-
-  double	   start_wall_time = get_elapsed_time ();
-  double	   start_cpu_time  = get_cpu_usage ();
-
-  if (fp)
-    fd = fileno (fp);
-  
-  bool overrun;
-  int noverruns = 0;
-
-  for (nbytes = 0; max_bytes == 0 || nbytes < max_bytes; nbytes += BUFSIZE){
-
-    unsigned int	ret = urx->read (buf, sizeof (buf), &overrun);
-    if (ret != sizeof (buf)){
-      fprintf (stderr, "test_input: error, ret = %d\n", ret);
-    }
-
-    if (overrun){
-      printf ("rx_overrun\n");
-      noverruns++;
-    }
-    
-    if (fd != -1){
-
-      for (unsigned int i = 0; i < sizeof (buf) / sizeof (short); i++)
-	buf[i] = usrp_to_host_short (buf[i]);
-
-      if (write (fd, buf, sizeof (buf)) == -1){
-	perror ("write");
-	fd = -1;
-      }
-    }
-  }
-
-  double stop_wall_time = get_elapsed_time ();
-  double stop_cpu_time  = get_cpu_usage ();
-
-  double delta_wall = stop_wall_time - start_wall_time;
-  double delta_cpu  = stop_cpu_time  - start_cpu_time;
-
-  printf ("xfered %.3g bytes in %.3g seconds.  %.4g bytes/sec.  cpu time = %.4g\n",
-	  (double) max_bytes, delta_wall, max_bytes / delta_wall, delta_cpu);
-  printf ("noverruns = %d\n", noverruns);
-
-  return true;
-}
diff --git a/usrp/host/apps/test_usrp_standard_tx.cc b/usrp/host/apps/test_usrp_standard_tx.cc
deleted file mode 100644
index cc9f9edfc..000000000
--- a/usrp/host/apps/test_usrp_standard_tx.cc
+++ /dev/null
@@ -1,314 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2004,2008,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <assert.h>
-#include <math.h>
-#include "time_stuff.h"
-#include <usrp/usrp_standard.h>
-#include <usrp/usrp_bytesex.h>
-#include <boost/program_options.hpp>
-
-enum {
-  GR_SIN_WAVE,
-  GR_CONST_WAVE
-};
-
-namespace po = boost::program_options;
-
-char *prog_name;
-
-usrp_subdev_spec
-str_to_subdev(std::string spec_str)
-{
-  usrp_subdev_spec spec;
-  if(spec_str == "A" || spec_str == "A:0" || spec_str == "0:0") {
-    spec.side = 0;
-    spec.subdev = 0;
-  }
-  else if(spec_str == "A:1" || spec_str == "0:1") {
-    spec.side = 0;
-    spec.subdev = 1;
-  }
-  else if(spec_str == "B" || spec_str == "B:0" || spec_str == "1:0") {
-    spec.side = 1;
-    spec.subdev = 0;
-  }
-  else if(spec_str == "B:1" || spec_str == "1:1") {
-    spec.side = 1;
-    spec.subdev = 1;
-  }
-  else {
-    throw std::range_error("Incorrect subdevice specifications.\n");
-  }
-
-  return spec;
-}
-
-
-static void
-set_progname (char *path)
-{
-  char *p = strrchr (path, '/');
-  if (p != 0)
-    prog_name = p+1;
-  else
-    prog_name = path;
-}
-
-static void
-die (const char *msg)
-{
-  fprintf (stderr, "die: %s: %s\n", prog_name, msg);
-  exit (1);
-}
-
-
-static bool
-test_output (usrp_standard_tx_sptr utx, long long max_bytes, double ampl, int waveform)
-{
-  const int BUFSIZE = utx->block_size();
-  const int N = BUFSIZE/sizeof (short);
-
-  short    	buf[N];
-  long long	nbytes = 0;
-
-  // ----------------------------------------------------------------
-  // one time initialization of the pattern we're going to transmit
-
-  const int	PERIOD = 65;		// any value is valid
-  const int    	PATLEN = 2 * PERIOD;	
-  short	       	pattern[PATLEN];
-
-  for (int i = 0; i < PERIOD; i++){
-    if (waveform == GR_CONST_WAVE){
-      pattern[2*i+0] = host_to_usrp_short((short) ampl);
-      pattern[2*i+1] = host_to_usrp_short((short) 0);
-    }
-    else {
-      pattern[2*i+0] = host_to_usrp_short((short) (ampl * cos(2*M_PI * i / PERIOD)));
-      pattern[2*i+1] = host_to_usrp_short((short) (ampl * sin(2*M_PI * i / PERIOD)));
-    }
-  }
-
-  // ----------------------------------------------------------------
-
-  double start_wall_time = get_elapsed_time ();
-  double start_cpu_time  = get_cpu_usage ();
-
-  bool 	underrun;
-  int 	nunderruns = 0;
-  int 	pi = 0;
-
-  for (nbytes = 0; max_bytes == 0 || nbytes < max_bytes; nbytes += BUFSIZE){
-
-    for (int i = 0; i < N; i++){
-      buf[i] = pattern[pi];
-      pi++;
-      if (pi >= PATLEN)
-	pi = 0;
-    }
-
-    int	ret = utx->write (buf, sizeof (buf), &underrun);
-    if ((unsigned) ret != sizeof (buf)){
-      fprintf (stderr, "test_output: error, ret = %d\n", ret);
-    }
-
-    if (underrun){
-      nunderruns++;
-      printf ("tx_underrun\n");
-      //printf ("tx_underrun %9d %6d\n", nbytes, nbytes/BUFSIZE);
-    }
-  }
-
-  utx->wait_for_completion ();
-
-  double stop_wall_time = get_elapsed_time ();
-  double stop_cpu_time  = get_cpu_usage ();
-
-  double delta_wall = stop_wall_time - start_wall_time;
-  double delta_cpu  = stop_cpu_time  - start_cpu_time;
-
-  printf ("xfered %.3g bytes in %.3g seconds.  %.4g bytes/sec.  cpu time = %.3g\n",
-	  (double) max_bytes, delta_wall, max_bytes / delta_wall, delta_cpu);
-
-  printf ("%d underruns\n", nunderruns);
-
-  return true;
-}
-
-int
-main (int argc, char **argv)
-{
-  int which = 0;                       // specify which USRP board
-  usrp_subdev_spec spec(0,0);          // specify the d'board side
-  int interp = 16;                     // set the interpolation rate
-  double rf_freq = -1;                 // set the frequency
-  float amp = 10000;                   // set the amplitude of the output
-  float gain = -1;                     // set the d'board PGA gain
-  int waveform;
-  int	fusb_block_size = 0;
-  int	fusb_nblocks = 0;
-  bool	realtime_p = false;
-  double nsamples = 32e6;
-
-  set_progname (argv[0]);
-
-  po::options_description cmdconfig("Program options");
-  cmdconfig.add_options()
-    ("help,h", "produce help message")
-    ("which,W", po::value<int>(&which), "select which USRP board")
-    ("tx-subdev-spec,T", po::value<std::string>(), "select USRP Tx side A or B")
-    ("rf-freq,f", po::value<double>(), "set RF center frequency to FREQ")
-    ("interp,i", po::value<int>(&interp), "set fgpa interpolation rate to INTERP")
-
-    ("sine", "generate a complex sinusoid [default]")
-    ("const", "generate a constant output")
-
-    //("waveform-freq,w", po::value<double>(&wfreq), "set waveform frequency to FREQ")
-    ("amplitude,a", po::value<float>(&amp), "set amplitude")
-    ("gain,g", po::value<float>(&gain), "set output gain to GAIN [default=MAX]")
-    //("offset,o", po::value<float>(&offset), "set waveform offset to OFFSET")
-    ("nsamples,N", po::value<double>(&nsamples), "number of samples to send [default=32M]")
-    ;
-  
-  po::variables_map vm;
-  po::store(po::command_line_parser(argc, argv).
-	    options(cmdconfig).run(), vm);
-  po::notify(vm);
-  
-  if (vm.count("help")) {
-    std::cout << cmdconfig << "\n";
-    return 1;
-  }
-  
-  if(vm.count("tx-subdev-spec")) {
-    std::string s = vm["tx-subdev-spec"].as<std::string>();
-    spec = str_to_subdev(s);
-  }
-
-  if(vm.count("sine")) {
-    waveform = GR_SIN_WAVE;
-  }
-  else if(vm.count("const")) {
-    waveform = GR_CONST_WAVE;
-  }
-  else {
-    waveform = GR_SIN_WAVE;
-  }
-
-  printf("which:    %d\n", which);
-  printf("interp:   %d\n", interp);
-  printf("rf_freq:  %g\n", rf_freq);
-  printf("amp:      %f\n", amp);
-  printf("nsamples: %g\n", nsamples);
-
-
-  if (realtime_p){
-    // FIXME
-  }
-
-  usrp_standard_tx_sptr utx;
-
-  utx = usrp_standard_tx::make (which,
-				interp,
-				1, 	// nchan
-				-1, 	// mux
-				fusb_block_size,
-				fusb_nblocks);
-
-  if (utx == 0)
-    die ("usrp_standard_tx::make");
-
-  // FIXME
-
-  db_base_sptr subdev = utx->selected_subdev(spec);
-  printf("Subdevice name is %s\n", subdev->name().c_str());
-  printf("Subdevice freq range: (%g, %g)\n", 
-	 subdev->freq_min(), subdev->freq_max());
-
-  unsigned int mux = utx->determine_tx_mux_value(spec);
-  printf("mux: %#08x\n",  mux);
-  utx->set_mux(mux);
-
-  if(gain == -1)
-    gain = subdev->gain_max();
-  subdev->set_gain(gain);
-
-  float input_rate = utx->dac_rate() / utx->interp_rate();
-  printf("baseband rate: %g\n",  input_rate);
-
-  usrp_tune_result r;
-
-  if (rf_freq < 0)
-    rf_freq = (subdev->freq_min() + subdev->freq_max()) * 0.5;
-  double target_freq = rf_freq;
-  bool ok = utx->tune(subdev->which(), subdev, target_freq, &r);
-
-  if(!ok) {
-    throw std::runtime_error("Could not set frequency.");
-  }
-
-  subdev->set_enable(true);
-  
-  printf("target_freq:     %f\n", target_freq);
-  printf("ok:              %s\n", ok ? "true" : "false");
-  printf("r.baseband_freq: %f\n", r.baseband_freq);
-  printf("r.dxc_freq:      %f\n", r.dxc_freq);
-  printf("r.residual_freq: %f\n", r.residual_freq);
-  printf("r.inverted:      %d\n", r.inverted);
-
-
-  fflush (stdout);
-  fflush (stderr);
-
-  utx->start();		// start data xfers
-
-  test_output (utx, (long long) nsamples, amp, waveform);
-
-  return 0;
-}  
-
-
-#if 0
-    case 'B':
-      fusb_block_size = strtol (optarg, 0, 0);
-      break;
-
-    case 'N':
-      fusb_nblocks = strtol (optarg, 0, 0);
-      break;
-
-    case 'R':
-      realtime_p = true;
-      break;
-
-#endif
diff --git a/usrp/host/apps/usrp_cal_dc_offset.cc b/usrp/host/apps/usrp_cal_dc_offset.cc
deleted file mode 100644
index 5f708d672..000000000
--- a/usrp/host/apps/usrp_cal_dc_offset.cc
+++ /dev/null
@@ -1,239 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2008,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <assert.h>
-#include <math.h>
-#include <boost/scoped_ptr.hpp>
-#include <usrp/usrp_local_sighandler.h>
-#include <usrp/usrp_standard.h>
-#include <usrp/usrp_bytesex.h>
-
-char *prog_name;
-
-
-
-
-static void 
-run_cal(usrp_standard_rx_sptr u, int which_side, int decim, bool verbose_p)
-{
-  static const int BUFSIZE = u->block_size();
-  static const int N = BUFSIZE/sizeof (short);
-  short 	   buf[N];
-  bool 	cal_done = false;
-  bool overrun;
-  int  noverruns = 0;
-
-  static const double K = 1e-4;
-  long	integrator[2];
-  int	offset[2];
-
-  integrator[0] = 0;
-  integrator[1] = 0;
-  offset[0] = 0;
-  offset[1] = 0;
-
-  u->start();		// start data xfers
-
-  while(!cal_done){
-    int	ret = u->read (buf, sizeof (buf), &overrun);
-    if (ret != (int) sizeof (buf)){
-      fprintf (stderr, "usrp_cal_dc_offset: error, ret = %d\n", ret);
-      continue;
-    }
-    if (overrun){
-      fprintf (stderr, "O");
-      noverruns++;
-    }
-    else {
-      // fputc('.', stderr);
-    }
-
-    static const int MAX = (1L << 30);		// 1G
-
-    for (int i = 0; i < N/2; i++){
-      for (int n = 0; n < 2; n++){
-	integrator[n] = integrator[n] + buf[2*i + n];
-	if (integrator[n] > MAX)
-	  integrator[n] = MAX;
-	else if (integrator[n] < -MAX)
-	  integrator[n] = -MAX;
-      }
-    }
-
-#if 1
-    for (int n = 0; n < 2; n++){
-      offset[n] = (int) rint(integrator[n] * K);
-      if (offset[n] > 32767)
-	offset[n] = 32767;
-      else if (offset[n] < -32767)
-	offset[n] = -32767;
-      u->set_adc_offset(which_side * 2 + n, offset[n]);
-    }
-#else
-    offset[0] = (int) rint(integrator[0] * K);
-    if (offset[0] > 32767)
-      offset[0] = 32767;
-    else if (offset[0] < -32767)
-      offset[0] = -32767;
-    u->set_adc_offset(which_side * 2 + 0, offset[0]);
-    u->set_adc_offset(which_side * 2 + 1, offset[0]);
-#endif
-    
-
-    printf ("%9ld : %6d\t\t%9ld : %6d\n",
-	    integrator[0], offset[0], integrator[1], offset[1]);
-  }
-
-  u->stop();
-}
-
-
-static void
-set_progname (char *path)
-{
-  char *p = strrchr (path, '/');
-  if (p != 0)
-    prog_name = p+1;
-  else
-    prog_name = path;
-}
-
-static void
-usage ()
-{
-  fprintf(stderr, "usage: %s [-v] [-w which_side] [-D decim] [-c ddc_freq] [-g gain]\n", prog_name);
-  fprintf(stderr, "  [-S fusb_block_size] [-N fusb_nblocks]\n");
-  exit (1);
-}
-
-static void
-die (const char *msg)
-{
-  fprintf (stderr, "die: %s: %s\n", prog_name, msg);
-  exit (1);
-}
-
-int
-main (int argc, char **argv)
-{
-  int	    ch;
-  int	    decim = 128;		// 500 kS/sec
-  bool	    verbose_p = false;
-  int	    which_board = 0;
-  int	    which_side = 0;
-  double    ddc_freq = 0;
-  int	    fusb_block_size = 1024;
-  int	    fusb_nblocks = 4;
-  double    pga_gain = 0.0;
-
-  set_progname(argv[0]);
-
-  while ((ch = getopt (argc, argv, "vw:D:c:S:N:g:")) != EOF){
-    switch (ch){
-
-    case 'w':
-      which_side = strtol (optarg, 0, 0);
-      if (which_side < 0 || which_side > 1)
-	usage();
-      break;
-
-    case 'D':
-      decim = strtol (optarg, 0, 0);
-      if (decim < 1)
-	usage();
-      break;
-
-    case 'c':
-      ddc_freq = strtod (optarg, 0);
-      break;
-
-    case 'v':
-      verbose_p = true;
-      break;
-
-    case 'S':
-      fusb_block_size = strtol(optarg, 0, 0);
-      break;
-
-    case 'N':
-      fusb_nblocks = strtol(optarg, 0, 0);
-      break;
-
-    case 'g':
-      pga_gain = strtod (optarg, 0);
-      break;
-
-    default:
-      usage ();
-    }
-  }
-
-  int nchannels = 1;
-  int mode = usrp_standard_rx::FPGA_MODE_NORMAL;
-  int mux;
-
-  if (which_side == 0)
-    mux = 0x00000010;
-  else
-    mux = 0x00000032;
-
-#ifdef SIGINT
-  usrp_local_sighandler sigint (SIGINT, usrp_local_sighandler::throw_signal);
-#endif
-#ifdef SIGQUIT
-  usrp_local_sighandler sigquit (SIGQUIT, usrp_local_sighandler::throw_signal);
-#endif
-
-  usrp_standard_rx_sptr urx =
-    usrp_standard_rx::make(which_board, decim,
-			   nchannels, mux, mode,
-			   fusb_block_size, fusb_nblocks);
-  if (!urx)
-    die("usrp_standard_rx::make");
-
-  try {
-
-    if (!urx->set_rx_freq(0, ddc_freq))
-      die("urx->set_rx_freq");
-
-    urx->set_pga(2 * which_side + 0, pga_gain);
-    urx->set_pga(2 * which_side + 1, pga_gain);
-    
-    run_cal(urx, which_side, decim, verbose_p);
-  }
-  catch (usrp_signal &sig){
-    fprintf (stderr, "usrp_cal_dc_offset: caught %s\n", sig.name().c_str());
-  }
-  catch(...){
-    fprintf (stderr, "usrp_cal_dc_offset: caught something\n");
-  }
-}
-
diff --git a/usrp/host/apps/usrper.cc b/usrp/host/apps/usrper.cc
deleted file mode 100644
index 593cd7921..000000000
--- a/usrp/host/apps/usrper.cc
+++ /dev/null
@@ -1,356 +0,0 @@
-/* -*- c++ -*- */
-/*
- * USRP - Universal Software Radio Peripheral
- *
- * Copyright (C) 2003,2004,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <assert.h>
-#include <errno.h>
-
-#include "usrp/usrp_prims.h"
-#include "usrp_spi_defs.h"
-
-char *prog_name;
-
-static void
-set_progname (char *path)
-{
-  char *p = strrchr (path, '/');
-  if (p != 0)
-    prog_name = p+1;
-  else
-    prog_name = path;
-}
-
-static void
-usage ()
-{
-  fprintf (stderr, "usage: \n");
-  fprintf (stderr, "  %s [-v] [-w <which_board>] [-x] ...\n", prog_name);
-  fprintf (stderr, "  %s load_standard_bits\n", prog_name);
-  fprintf (stderr, "  %s load_firmware <file.ihx>\n", prog_name);
-  fprintf (stderr, "  %s load_fpga <file.rbf>\n", prog_name);
-  fprintf (stderr, "  %s write_fpga_reg <reg8> <value32>\n", prog_name);
-  fprintf (stderr, "  %s set_fpga_reset {on|off}\n", prog_name);
-  fprintf (stderr, "  %s set_fpga_tx_enable {on|off}\n", prog_name);
-  fprintf (stderr, "  %s set_fpga_rx_enable {on|off}\n", prog_name);
-  fprintf (stderr, "  ----- diagnostic routines -----\n");
-  fprintf (stderr, "  %s led0 {on|off}\n", prog_name);
-  fprintf (stderr, "  %s led1 {on|off}\n", prog_name);
-  fprintf (stderr, "  %s set_hash0 <hex-string>\n", prog_name);
-  fprintf (stderr, "  %s get_hash0\n", prog_name);
-  fprintf (stderr, "  %s i2c_read i2c_addr len\n", prog_name);
-  fprintf (stderr, "  %s i2c_write i2c_addr <hex-string>\n", prog_name);
-  fprintf (stderr, "  %s 9862a_write regno value\n", prog_name);
-  fprintf (stderr, "  %s 9862b_write regno value\n", prog_name);
-  fprintf (stderr, "  %s 9862a_read regno\n", prog_name);
-  fprintf (stderr, "  %s 9862b_read regno\n", prog_name);
-  exit (1);
-}
-
-#if 0
-static void
-die (const char *msg)
-{
-  fprintf (stderr, "%s (die): %s\n", prog_name, msg);
-  exit (1);
-}
-#endif
-
-static int 
-hexval (char ch)
-{
-  if ('0' <= ch && ch <= '9')
-    return ch - '0';
-
-  if ('a' <= ch && ch <= 'f')
-    return ch - 'a' + 10;
-
-  if ('A' <= ch && ch <= 'F')
-    return ch - 'A' + 10;
-
-  return -1;
-}
-
-static unsigned char *
-hex_string_to_binary (const char *string, int *lenptr)
-{
-  int	sl = strlen (string);
-  if (sl & 0x01){
-    fprintf (stderr, "%s: odd number of chars in <hex-string>\n", prog_name);
-    return 0;
-  }
-
-  int len = sl / 2;
-  *lenptr = len;
-  unsigned char *buf = new unsigned char [len];
-
-  for (int i = 0; i < len; i++){
-    int hi = hexval (string[2 * i]);
-    int lo = hexval (string[2 * i + 1]);
-    if (hi < 0 || lo < 0){
-      fprintf (stderr, "%s: invalid char in <hex-string>\n", prog_name);
-      delete [] buf;
-      return 0;
-    }
-    buf[i] = (hi << 4) | lo;
-  }
-  return buf;
-}
-
-static void
-print_hex (FILE *fp, unsigned char *buf, int len)
-{
-  for (int i = 0; i < len; i++){
-    fprintf (fp, "%02x", buf[i]);
-  }
-  fprintf (fp, "\n");
-}
-
-static void
-chk_result (bool ok)
-{
-  if (!ok){
-    fprintf (stderr, "%s: failed\n", prog_name);
-    exit (1);
-  }
-}
-
-static bool
-get_on_off (const char *s)
-{
-  if (strcmp (s, "on") == 0)
-    return true;
-
-  if (strcmp (s, "off") == 0)
-    return false;
-
-  usage ();			// no return
-  return false;
-}
-
-
-int
-main (int argc, char **argv)
-{
-  int		ch;
-  bool		verbose = false;
-  int		which_board = 0;
-  bool		fx2_ok_p = false;
-  
-  set_progname (argv[0]);
-  
-  while ((ch = getopt (argc, argv, "vw:x")) != EOF){
-    switch (ch){
-
-    case 'v':
-      verbose = true;
-      break;
-      
-    case 'w':
-      which_board = strtol (optarg, 0, 0);
-      break;
-      
-    case 'x':
-      fx2_ok_p = true;
-      break;
-      
-    default:
-      usage ();
-    }
-  }
-
-  int nopts = argc - optind;
-
-  if (nopts < 1)
-    usage ();
-
-  const char *cmd = argv[optind++];
-  nopts--;
-
-  usrp_one_time_init ();
-
-  
-  libusb_device *udev = usrp_find_device (which_board, fx2_ok_p);
-  if (udev == 0){
-    fprintf (stderr, "%s: failed to find usrp[%d]\n", prog_name, which_board);
-    exit (1);
-  }
-
-  if (usrp_unconfigured_usrp_p (udev)){
-    fprintf (stderr, "%s: found unconfigured usrp; needs firmware.\n", prog_name);
-  }
-
-  if (usrp_fx2_p (udev)){
-    fprintf (stderr, "%s: found unconfigured FX2; needs firmware.\n", prog_name);
-  }
-
-  libusb_device_handle *udh = usrp_open_cmd_interface (udev);
-  if (udh == 0){
-    fprintf (stderr, "%s: failed to open_cmd_interface\n", prog_name);
-    exit (1);
-  }
-
-#define CHKARGS(n) if (nopts != n) usage (); else
-
-  if (strcmp (cmd, "led0") == 0){
-    CHKARGS (1);
-    bool on = get_on_off (argv[optind]);
-    chk_result (usrp_set_led (udh, 0, on));
-  }
-  else if (strcmp (cmd, "led1") == 0){
-    CHKARGS (1);
-    bool on = get_on_off (argv[optind]);
-    chk_result (usrp_set_led (udh, 1, on));
-  }
-  else if (strcmp (cmd, "led2") == 0){
-    CHKARGS (1);
-    bool on = get_on_off (argv[optind]);
-    chk_result (usrp_set_led (udh, 2, on));
-  }
-  else if (strcmp (cmd, "set_hash0") == 0){
-    CHKARGS (1);
-    char *p = argv[optind];
-    unsigned char buf[16];
-
-    memset (buf, ' ', 16);
-    for (int i = 0; i < 16 && *p; i++)
-      buf[i] = *p++;
-    
-    chk_result (usrp_set_hash (udh, 0, buf));
-  }
-  else if (strcmp (cmd, "get_hash0") == 0){
-    CHKARGS (0);
-    unsigned char buf[17];
-    memset (buf, 0, 17);
-    bool r = usrp_get_hash (udh, 0, buf);
-    if (r)
-      printf ("hash: %s\n", buf);
-    chk_result (r);
-  }
-  else if (strcmp (cmd, "load_fpga") == 0){
-    CHKARGS (1);
-    char *filename = argv[optind];
-    chk_result (usrp_load_fpga (udh, filename, true));
-  }
-  else if (strcmp (cmd, "load_firmware") == 0){
-    CHKARGS (1);
-    char *filename = argv[optind];
-    chk_result (usrp_load_firmware (udh, filename, true));
-  }
-  else if (strcmp (cmd, "write_fpga_reg") == 0){
-    CHKARGS (2);
-    chk_result (usrp_write_fpga_reg (udh, strtoul (argv[optind], 0, 0),
-				     strtoul(argv[optind+1], 0, 0)));
-  }
-  else if (strcmp (cmd, "set_fpga_reset") == 0){
-    CHKARGS (1);
-    chk_result (usrp_set_fpga_reset (udh, get_on_off (argv[optind])));
-  }
-  else if (strcmp (cmd, "set_fpga_tx_enable") == 0){
-    CHKARGS (1);
-    chk_result (usrp_set_fpga_tx_enable (udh, get_on_off (argv[optind])));
-  }
-  else if (strcmp (cmd, "set_fpga_rx_enable") == 0){
-    CHKARGS (1);
-    chk_result (usrp_set_fpga_rx_enable (udh, get_on_off (argv[optind])));
-  }
-  else if (strcmp (cmd, "load_standard_bits") == 0){
-    CHKARGS (0);
-    usrp_close_interface (udh);
-    udh = 0;
-    chk_result (usrp_load_standard_bits (which_board, true));
-  }
-  else if (strcmp (cmd, "i2c_read") == 0){
-    CHKARGS (2);
-    int	i2c_addr = strtol (argv[optind], 0, 0);
-    int len = strtol (argv[optind + 1], 0, 0);
-    if (len < 0)
-      chk_result (0);
-
-    unsigned char *buf = new unsigned char [len];
-    bool result = usrp_i2c_read (udh, i2c_addr, buf, len);
-    if (!result){
-      chk_result (0);
-    }
-    print_hex (stdout, buf, len);
-  }
-  else if (strcmp (cmd, "i2c_write") == 0){
-    CHKARGS (2);
-    int	i2c_addr = strtol (argv[optind], 0, 0);
-    int	len = 0;
-    char *hex_string  = argv[optind + 1];
-    unsigned char *buf = hex_string_to_binary (hex_string, &len);
-    if (buf == 0)
-      chk_result (0);
-
-    bool result = usrp_i2c_write (udh, i2c_addr, buf, len);
-    chk_result (result);
-  }
-  else if (strcmp (cmd, "9862a_write") == 0){
-    CHKARGS (2);
-    int regno = strtol (argv[optind], 0, 0);
-    int value = strtol (argv[optind+1], 0, 0);
-    chk_result (usrp_9862_write (udh, 0, regno, value));
-  }
-  else if (strcmp (cmd, "9862b_write") == 0){
-    CHKARGS (2);
-    int regno = strtol (argv[optind], 0, 0);
-    int value = strtol (argv[optind+1], 0, 0);
-    chk_result (usrp_9862_write (udh, 1, regno, value));
-  }
-  else if (strcmp (cmd, "9862a_read") == 0){
-    CHKARGS (1);
-    int regno = strtol (argv[optind], 0, 0);
-    unsigned char value;
-    bool result = usrp_9862_read (udh, 0, regno, &value);
-    if (!result){
-      chk_result (0);
-    }
-    fprintf (stdout, "reg[%d] = 0x%02x\n", regno, value);
-  }
-  else if (strcmp (cmd, "9862b_read") == 0){
-    CHKARGS (1);
-    int regno = strtol (argv[optind], 0, 0);
-    unsigned char value;
-    bool result = usrp_9862_read (udh, 1, regno, &value);
-    if (!result){
-      chk_result (0);
-    }
-    fprintf (stdout, "reg[%d] = 0x%02x\n", regno, value);
-  }
-  else {
-    usage ();
-  }
-
-  if (udh){
-    usrp_close_interface (udh);
-    udh = 0;
-  }
-
-  return 0;
-}
diff --git a/usrp/host/include/.gitignore b/usrp/host/include/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/usrp/host/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/usrp/host/include/usrp/.gitignore b/usrp/host/include/usrp/.gitignore
deleted file mode 100644
index 0f068a1f3..000000000
--- a/usrp/host/include/usrp/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/Makefile
-/Makefile.in
-
-# Generated files
-/libusb_types.h
-/usrp_dbid.h
diff --git a/usrp/host/include/usrp/db_base.h b/usrp/host/include/usrp/db_base.h
deleted file mode 100644
index 35470891a..000000000
--- a/usrp/host/include/usrp/db_base.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008 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 asversion 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_DB_BASE_H
-#define INCLUDED_DB_BASE_H
-
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <iosfwd>
-
-class db_base;
-typedef boost::shared_ptr<db_base> db_base_sptr;
-
-class usrp_basic;
-typedef boost::shared_ptr<usrp_basic> usrp_basic_sptr;
-
-struct freq_result_t
-{
-  bool  ok;
-  double baseband_freq;
-};
-
-/******************************************************************************/
-
-/*!
- * \brief Abstract base class for all USRP daughterboards
- * \ingroup usrp
- */
-class db_base
-{
- protected:
-  bool				d_is_shutdown;
-  usrp_basic		       *d_raw_usrp;
-  int 				d_which;
-  double			d_lo_offset;
-
-  void _enable_refclk(bool enable);
-  virtual double _refclk_freq();
-  virtual int _refclk_divisor();
-
-  usrp_basic *usrp(){
-    return d_raw_usrp;
-  }
-
- public:
-  db_base(boost::shared_ptr<usrp_basic> usrp, int which);
-  virtual ~db_base();
-
-  int dbid();
-  std::string name();
-  std::string side_and_name();
-  int which() { return d_which; }
-
-  bool bypass_adc_buffers(bool bypass);
-  bool set_atr_mask(int v);
-  bool set_atr_txval(int v);
-  bool set_atr_rxval(int v);
-  bool set_atr_tx_delay(int v);
-  bool set_atr_rx_delay(int v);
-  bool set_lo_offset(double offset);
-  double lo_offset() { return d_lo_offset; }
-
-
-  ////////////////////////////////////////////////////////
-  // derived classes should override the following methods
-
-protected:
-  friend class usrp_basic;
-
-  /*!
-   * Called to shutdown daughterboard.  Called from dtor and usrp_basic dtor.
-   *
-   * N.B., any class that overrides shutdown MUST call shutdown in its destructor.
-   */
-  virtual void shutdown();
-
-
-public:
-  virtual float gain_min() = 0;
-  virtual float gain_max() = 0;
-  virtual float gain_db_per_step() = 0;
-  virtual double freq_min() = 0;
-  virtual double freq_max() = 0;
-  virtual struct freq_result_t set_freq(double target_freq) = 0;
-  virtual bool set_gain(float gain) = 0;
-  virtual bool is_quadrature() = 0;
-  virtual bool i_and_q_swapped();
-  virtual bool spectrum_inverted();
-  virtual bool set_enable(bool on);
-  virtual bool set_auto_tr(bool on);
-  virtual bool select_rx_antenna(int which_antenna);
-  virtual bool select_rx_antenna(const std::string &which_antenna);
-  virtual bool set_bw(float bw);
-};
-
-
-std::ostream & operator<<(std::ostream &os, db_base &x);
-
-#endif /* INCLUDED_DB_BASE_H */
diff --git a/usrp/host/include/usrp/db_base.i b/usrp/host/include/usrp/db_base.i
deleted file mode 100644
index fdabd4f99..000000000
--- a/usrp/host/include/usrp/db_base.i
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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.
-//
-
-
-%{
-#include <usrp/db_base.h>
-%}
-
-%include <gr_shared_ptr.i>
-
-class usrp_tune_result
-{
-public:  
-  usrp_tune_result(double baseband=0, double dxc=0, 
-		   double residual=0, bool inv=0);
-  ~usrp_tune_result();
-
-  double baseband_freq;
-  double dxc_freq;
-  double residual_freq;
-  bool  inverted;
-};
-
-struct freq_result_t
-{
-  bool  ok;
-  double baseband_freq;
-};
-
-class db_base
-{
- private:
-  db_base(boost::shared_ptr<usrp_basic> usrp, int which);
-
- public:
-  virtual ~db_base();
-
-  int dbid();
-  std::string name();
-  std::string side_and_name();
-  int which() { return d_which; }
-
-  bool bypass_adc_buffers(bool bypass);
-  bool set_atr_mask(int v);
-  bool set_atr_txval(int v);
-  bool set_atr_rxval(int v);
-  bool set_atr_tx_delay(int v);
-  bool set_atr_rx_delay(int v);
-  bool set_lo_offset(double offset);
-  double lo_offset() { return d_lo_offset; }
-
-  virtual float gain_min() = 0;
-  virtual float gain_max() = 0;
-  virtual float gain_db_per_step() = 0;
-  virtual double freq_min() = 0;
-  virtual double freq_max() = 0;
-  virtual struct freq_result_t set_freq(double target_freq) = 0;
-  virtual bool set_gain(float gain) = 0;
-  virtual bool is_quadrature() = 0;
-  virtual bool i_and_q_swapped();
-  virtual bool spectrum_inverted();
-  virtual bool set_enable(bool on);
-  virtual bool set_auto_tr(bool on);
-  virtual bool select_rx_antenna(int which_antenna);
-  virtual bool select_rx_antenna(const std::string &antenna);
-  virtual bool set_bw(float bw);
-};
-
-// Create templates for db's, vectors of db's, and vector of vectors of db's
-typedef boost::shared_ptr<db_base> db_base_sptr;
-%template(db_base_sptr) boost::shared_ptr<db_base>;
-%template(db_base_sptr_vector) std::vector<db_base_sptr>;
-%template(db_base_sptr_vector_vector) std::vector<std::vector<db_base_sptr> >;
-
-#ifdef SWIGPYTHON
-// Set better class name in Python
-// Enable freq_range and gain_range from public methods of class not implemented in C++
-// And create a dummy wrapper for backwards compatability with some of the example code
-%pythoncode %{
-  db_base_sptr.__repr__ = lambda self: "<db_base::%s>" % (self.name(),)
-  db_base_sptr.freq_range = lambda self: (self.freq_min(), self.freq_max(), 1)
-  db_base_sptr.gain_range = lambda self: (self.gain_min(), self.gain_max(), self.gain_db_per_step())
-%}
-#endif
diff --git a/usrp/host/include/usrp/db_basic.h b/usrp/host/include/usrp/db_basic.h
deleted file mode 100644
index 7f81733f4..000000000
--- a/usrp/host/include/usrp/db_basic.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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 asversion 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 DB_BASIC_H
-#define DB_BASIC_H
-
-#include <usrp/db_base.h>
-
-
-/******************************************************************************/
-
-
-class db_basic_tx : public db_base
-{
-public:
-  db_basic_tx(usrp_basic_sptr usrp, int which);
-  ~db_basic_tx();
-  
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  double freq_min();
-  double freq_max();
-  struct freq_result_t set_freq(double target_freq);
-  bool  set_gain(float gain);
-  bool  is_quadrature();
-};
-
-
-/******************************************************************************/
-
-
-class db_basic_rx : public db_base
-{
- public:
-  db_basic_rx(usrp_basic_sptr usrp, int which, int subdev);
-  ~db_basic_rx();
-  
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  double freq_min();
-  double freq_max();
-  struct freq_result_t set_freq(double target_freq);
-  bool set_gain(float gain);
-  bool is_quadrature();
-
-private:
-  int d_subdev;
-};
-
-
-/******************************************************************************/
-
-
-class db_lf_rx : public db_basic_rx
-{
- public:
-  db_lf_rx(usrp_basic_sptr usrp, int which, int subdev);
-  ~db_lf_rx();
-  
-  double freq_min();
-  double freq_max();
-};
-
-
-/******************************************************************************/
-
-
-class db_lf_tx : public db_basic_tx
-{ 
- public:
-  db_lf_tx(usrp_basic_sptr usrp, int which);
-  ~db_lf_tx();
-  
-  double freq_min();
-  double freq_max();
-};
-
-
-#endif
diff --git a/usrp/host/include/usrp/db_bitshark_rx.h b/usrp/host/include/usrp/db_bitshark_rx.h
deleted file mode 100644
index f81877d28..000000000
--- a/usrp/host/include/usrp/db_bitshark_rx.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2010 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 asversion 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 DB_BITSHARK_RX_H
-#define DB_BITSHARK_RX_H
-
-#include <usrp/db_base.h>
-#include <vector>
-#include <stdint.h>
-
-class db_bitshark_rx : public db_base
-{
-private:
-    int d_i2c_addr;
-    // Internal function for interfacing to the card
-    void _set_pga(int pga_gain);
-    
-protected:
-    void shutdown();
-    
-public:
-    db_bitshark_rx(usrp_basic_sptr usrp, int which);
-    ~db_bitshark_rx();
-    
-    float gain_min();
-    float gain_max();
-    float gain_db_per_step();
-    double freq_min();
-    double freq_max();
-    struct freq_result_t set_freq(double freq);
-    bool  set_gain(float gain);
-    bool  set_bw(float bw);
-    bool  set_clock_scheme(uint8_t clock_scheme, uint32_t ref_clock_freq);
-    bool  is_quadrature();
-    bool  i_and_q_swapped();
-};
-
-#endif
diff --git a/usrp/host/include/usrp/db_dbs_rx.h b/usrp/host/include/usrp/db_dbs_rx.h
deleted file mode 100644
index 7f869637d..000000000
--- a/usrp/host/include/usrp/db_dbs_rx.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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 asversion 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 DB_DBS_RX_H
-#define DB_DBS_RX_H
-
-#include <usrp/db_base.h>
-#include <vector>
-
-#if 0
-struct bw_t {
-  int m;
-  int fdac;
-  float div;
-};
-#endif
-
-class db_dbs_rx : public db_base
-{
-private:
-  int d_osc, d_cp, d_n, d_div2, d_r, d_r_int;
-  int d_fdac, d_m, d_dl, d_ade, d_adl, d_gc1, d_gc2, d_diag;
-  int d_i2c_addr;
-  
-  // Internal gain functions
-  void _write_reg(int regno, int v);
-  void _write_regs(int starting_regno, const std::vector<int> &vals);
-  std::vector<int> _read_status();
-  void _send_reg(int regno);
-  void _set_m(int m);
-  void _set_fdac(int fdac);
-  void _set_dl(int dl);
-  void _set_gc2(int gc2);
-  void _set_gc1(int gc1);
-  void _set_pga(int pga_gain);
-
-  // Internal frequency function
-  void _set_osc(int osc);
-  void _set_cp(int cp);
-  void _set_n(int n);
-  void _set_div2(int div2);
-  void _set_r(int r);
-  void _set_ade(int ade);
-
-  int _refclk_divisor();
-
-protected:
-  void shutdown();
-
-public:
-  db_dbs_rx(usrp_basic_sptr usrp, int which);
-  ~db_dbs_rx();
-
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  double freq_min();
-  double freq_max();
-  struct freq_result_t set_freq(double freq);
-  bool  set_gain(float gain);
-  bool  is_quadrature();
-  bool  set_bw(float bw);
-};
-
-#endif
diff --git a/usrp/host/include/usrp/db_dtt754.h b/usrp/host/include/usrp/db_dtt754.h
deleted file mode 100644
index 4fb952824..000000000
--- a/usrp/host/include/usrp/db_dtt754.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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 asversion 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 DB_DTT754_H
-#define DB_DTT754_H
-
-#include <usrp/db_base.h>
-#include <boost/shared_ptr.hpp>
-
-class db_dtt754 : public db_base
-{
-public:
-  db_dtt754(usrp_basic_sptr usrp, int which);
-  ~db_dtt754();
-  
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool  set_gain(float gain);
-
-  double freq_min();
-  double freq_max();
-  struct freq_result_t set_freq(double target_freq);
-  
-  bool is_quadrature();
-  bool spectrum_inverted();
-  bool set_bw(float bw);
-
-private:
-  void _set_rfagc(float gain);
-  void _set_ifagc(float gain);
-  void _set_pga(float pga_gain);
-
-  int d_i2c_addr;
-  float d_bw, d_freq, d_IF, d_f_ref;
-  bool d_inverted;
-};
-
-#endif
diff --git a/usrp/host/include/usrp/db_dtt768.h b/usrp/host/include/usrp/db_dtt768.h
deleted file mode 100644
index 78e157e79..000000000
--- a/usrp/host/include/usrp/db_dtt768.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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 asversion 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 DB_DTT768_H
-#define DB_DTT768_H
-
-#include <usrp/db_base.h>
-#include <boost/shared_ptr.hpp>
-
-class db_dtt768 : public db_base
-{
-public:
-  db_dtt768(usrp_basic_sptr usrp, int which);
-  ~db_dtt768();
-  
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool  set_gain(float gain);
-
-  double freq_min();
-  double freq_max();
-  struct freq_result_t set_freq(double target_freq);
-  
-  bool is_quadrature();
-  bool spectrum_inverted();
-  bool set_bw(float bw);
-
-private:
-  void _set_rfagc(float gain);
-  void _set_ifagc(float gain);
-  void _set_pga(float pga_gain);
-
-  int d_i2c_addr;
-  float d_bw, d_freq, d_IF, d_f_ref;
-  bool d_inverted;
-};
-
-#endif
diff --git a/usrp/host/include/usrp/db_flexrf.h b/usrp/host/include/usrp/db_flexrf.h
deleted file mode 100644
index 70a55514e..000000000
--- a/usrp/host/include/usrp/db_flexrf.h
+++ /dev/null
@@ -1,394 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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 asversion 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 DB_FLEXRF_H
-#define DB_FLEXRF_H
-
-#include <usrp/db_base.h>
-#include <cmath>
-
-//debug_using_gui = true                // Must be set to True or False
-#define debug_using_gui false           // Must be set to True or False
-
-class _AD4360_common;
-
-class flexrf_base : public db_base
-{
-public:
-  flexrf_base(usrp_basic_sptr usrp, int which, int _power_on=0);
-  ~flexrf_base();
-
-  struct freq_result_t set_freq(double freq);
-
-  bool  is_quadrature();
-  double freq_min();
-  double freq_max();
-
-protected:
-  void _write_all(int R, int control, int N);
-  void _write_control(int control);
-  void _write_R(int R);
-  void _write_N(int N);
-  void _write_it(int v);
-  bool _lock_detect();
-
-  virtual bool _compute_regs(double freq, int &retR, int &retcontrol, 
-			     int &retN, double &retfreq);
-  int  _compute_control_reg();
-  int _refclk_divisor();
-
-  bool _set_pga(float pga_gain);
-
-  int power_on() { return d_power_on; }
-  int power_off() { return 0; }
-
-  bool d_first;
-  int  d_spi_format;
-  int  d_spi_enable;
-  int  d_power_on;
-  int  d_PD;
-
-  _AD4360_common *d_common;
-};
-
-// ----------------------------------------------------------------
-
-class flexrf_base_tx : public flexrf_base
-{
-protected:
-  void shutdown();
-
-public:
-  flexrf_base_tx(usrp_basic_sptr usrp, int which, int _power_on=0);
-  ~flexrf_base_tx();
-
-  // All RFX tx d'boards have fixed gain
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-
-  bool set_auto_tr(bool on);
-  bool set_enable(bool on);
-  bool set_gain(float gain);
-};
-
-class flexrf_base_rx : public flexrf_base
-{
-protected:
-  void shutdown();
-
-public:
-  flexrf_base_rx(usrp_basic_sptr usrp, int which, int _power_on=0);
-  ~flexrf_base_rx();
-    
-  bool set_auto_tr(bool on);
-  bool select_rx_antenna(int which_antenna);
-  bool select_rx_antenna(const std::string &which_antenna);
-  bool set_gain(float gain);
-
-};
-
-// ----------------------------------------------------------------
-
-
-class _AD4360_common
-{
-public:
-  _AD4360_common();
-  virtual ~_AD4360_common();
-
-  virtual double freq_min() = 0;
-  virtual double freq_max() = 0;
-
-  bool _compute_regs(double refclk_freq, double freq, int &retR, 
-		     int &retcontrol, int &retN, double &retfreq);
-  int _compute_control_reg();
-  virtual int _refclk_divisor();
-  int _prescaler();
-
-  void R_DIV(int div) { d_R_DIV = div; }
-
-protected:
-  int d_R_RSV, d_BSC, d_TEST, d_LDP, d_ABP, d_N_RSV, d_PL, d_MTLD;
-  int d_CPG, d_CP3S, d_PDP, d_MUXOUT, d_CR, d_PC;
-
-  // FIXME: d_PD might cause conflict from flexrf_base
-  int d_A_DIV, d_B_DIV, d_R_DIV, d_P, d_PD, d_CP2, d_CP1, d_DIVSEL;
-  int d_DIV2, d_CPGAIN, d_freq_mult;
-
-};
-
-//----------------------------------------------------------------------
-
-class _2200_common : public _AD4360_common
-{
- public:
-  _2200_common();
-  ~_2200_common() {}
- 
-  double freq_min();
-  double freq_max();
-};
-
-//----------------------------------------------------------------------
-
-class _2400_common : public _AD4360_common
-{
- public:
-  _2400_common();
-  ~_2400_common() {}
- 
-  double freq_min();
-  double freq_max();
-};
-
-//----------------------------------------------------------------------
-
-class _1200_common : public _AD4360_common
-{
-public:
-  _1200_common();
-  ~_1200_common() {}
-
-  double freq_min();
-  double freq_max();
-};
-
-//-------------------------------------------------------------------------
-
-class _1800_common : public _AD4360_common
-{
- public:
-  _1800_common();
-  ~_1800_common() {}
-
-  double freq_min();
-  double freq_max();
-};
-
-//-------------------------------------------------------------------------
-
-class _900_common : public _AD4360_common
-{
-public:
-  _900_common();
-  ~_900_common() {}
-  
-  double freq_min();
-  double freq_max();
-};
-
-//-------------------------------------------------------------------------
-
-class _400_common : public _AD4360_common
-{
-public:
-  _400_common();
-  ~_400_common() {}
-
-  double freq_min();
-  double freq_max();
-};
-
-class _400_tx : public _400_common
-{
-public:
-  _400_tx();
-  ~_400_tx() {}
-};
-
-class _400_rx : public _400_common
-{
-public:
-  _400_rx();
-  ~_400_rx() {}
-};
-
-//------------------------------------------------------------    
-
-class db_flexrf_2200_tx : public flexrf_base_tx
-{
- public:
-  db_flexrf_2200_tx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_2200_tx();
-
-  // Wrapper calls to d_common functions
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-class db_flexrf_2200_rx : public flexrf_base_rx
-{
-public:
-  db_flexrf_2200_rx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_2200_rx();
-  
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool i_and_q_swapped();
-
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-//------------------------------------------------------------    
-
-class db_flexrf_2400_tx : public flexrf_base_tx
-{
- public:
-  db_flexrf_2400_tx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_2400_tx();
-
-  // Wrapper calls to d_common functions
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-class db_flexrf_2400_rx : public flexrf_base_rx
-{
-public:
-  db_flexrf_2400_rx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_2400_rx();
-  
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool i_and_q_swapped();
-
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-//------------------------------------------------------------    
-
-class db_flexrf_1200_tx : public flexrf_base_tx
-{
-public:
-  db_flexrf_1200_tx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_1200_tx();
-
-  // Wrapper calls to d_common functions
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-class db_flexrf_1200_rx : public flexrf_base_rx
-{
-public:
-  db_flexrf_1200_rx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_1200_rx();
-  
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool i_and_q_swapped();
-
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-//------------------------------------------------------------    
-
-class db_flexrf_1800_tx : public flexrf_base_tx
-{
- public:
-  db_flexrf_1800_tx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_1800_tx();
-
-  // Wrapper calls to d_common functions
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-class db_flexrf_1800_rx : public flexrf_base_rx
-{
-public:
-  db_flexrf_1800_rx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_1800_rx();
-  
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool i_and_q_swapped();
-
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-//------------------------------------------------------------    
-
-class db_flexrf_900_tx : public flexrf_base_tx
-{
- public:
-  db_flexrf_900_tx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_900_tx();
-
-  // Wrapper calls to d_common functions
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-class db_flexrf_900_rx : public flexrf_base_rx
-{
-public:
-  db_flexrf_900_rx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_900_rx();
-  
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool i_and_q_swapped();
-
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-
-//------------------------------------------------------------    
-
-class db_flexrf_400_tx : public flexrf_base_tx
-{
- public:
-  db_flexrf_400_tx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_400_tx();
-
-  // Wrapper calls to d_common functions
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-class db_flexrf_400_rx : public flexrf_base_rx
-{
-public:
-  db_flexrf_400_rx(usrp_basic_sptr usrp, int which);
-  ~db_flexrf_400_rx();
-
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool i_and_q_swapped();
-
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-};
-
-#endif
diff --git a/usrp/host/include/usrp/db_flexrf_mimo.h b/usrp/host/include/usrp/db_flexrf_mimo.h
deleted file mode 100644
index 771f3b276..000000000
--- a/usrp/host/include/usrp/db_flexrf_mimo.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2008,2009 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.
- */ 
-
-#include <usrp/db_flexrf.h>
-
-class db_flexrf_2400_tx_mimo_a : public db_flexrf_2400_tx
-{
- public:
-  db_flexrf_2400_tx_mimo_a(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_2400_rx_mimo_a : public db_flexrf_2400_rx
-{
- public:
-  db_flexrf_2400_rx_mimo_a(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-      
-class db_flexrf_2400_tx_mimo_b : public db_flexrf_2400_tx
-{
- public:
-  db_flexrf_2400_tx_mimo_b(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_2400_rx_mimo_b : public db_flexrf_2400_rx
-{
- public:
-  db_flexrf_2400_rx_mimo_b(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-
-class db_flexrf_1800_tx_mimo_a : public db_flexrf_1800_tx
-{
- public:
-  db_flexrf_1800_tx_mimo_a(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_1800_rx_mimo_a : public db_flexrf_1800_rx
-{
- public:
-  db_flexrf_1800_rx_mimo_a(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_1800_tx_mimo_b : public db_flexrf_1800_tx
-{
- public:
-  db_flexrf_1800_tx_mimo_b(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_1800_rx_mimo_b : public db_flexrf_1800_rx
-{
- public:
-  db_flexrf_1800_rx_mimo_b(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_1200_tx_mimo_a : public db_flexrf_1200_tx
-{
- public:
-  db_flexrf_1200_tx_mimo_a(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_1200_rx_mimo_a : public db_flexrf_1200_rx
-{
- public:
-  db_flexrf_1200_rx_mimo_a(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_1200_tx_mimo_b : public db_flexrf_1200_tx
-{
- public:
-  db_flexrf_1200_tx_mimo_b(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_1200_rx_mimo_b : public db_flexrf_1200_rx
-{
- public:
-  db_flexrf_1200_rx_mimo_b(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_900_tx_mimo_a : public db_flexrf_900_tx
-{
- public:
-  db_flexrf_900_tx_mimo_a(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_900_rx_mimo_a : public db_flexrf_900_rx
-{
- public:
-  db_flexrf_900_rx_mimo_a(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_900_tx_mimo_b : public db_flexrf_900_tx
-{
- public:
-  db_flexrf_900_tx_mimo_b(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_900_rx_mimo_b : public db_flexrf_900_rx
-{
- public:
-  db_flexrf_900_rx_mimo_b(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_400_tx_mimo_a : public db_flexrf_400_tx
-{
- public:
-  db_flexrf_400_tx_mimo_a(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_400_rx_mimo_a : public db_flexrf_400_rx
-{
- public:
-  db_flexrf_400_rx_mimo_a(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_400_tx_mimo_b : public db_flexrf_400_tx
-{
- public:
-  db_flexrf_400_tx_mimo_b(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
-
-class db_flexrf_400_rx_mimo_b : public db_flexrf_400_rx
-{
- public:
-  db_flexrf_400_rx_mimo_b(usrp_basic_sptr usrp, int which);
-  int _refclk_divisor();
-};
diff --git a/usrp/host/include/usrp/db_tv_rx.h b/usrp/host/include/usrp/db_tv_rx.h
deleted file mode 100644
index ee3ed2bf6..000000000
--- a/usrp/host/include/usrp/db_tv_rx.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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 asversion 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 DB_TV_RX_H
-#define DB_TV_RX_H
-
-#include <usrp/db_base.h>
-
-class db_tv_rx : public db_base
-{
-private:
-  void _set_rfagc(float gain);
-  void _set_ifagc(float gain);
-  void _set_pga(float pga_gain);
-
-  int d_i2c_addr;
-  double d_first_IF, d_second_IF;
-  int d_reference_divisor;
-  bool d_fast_tuning;
-  bool d_inverted;
-
-public:
-  db_tv_rx(usrp_basic_sptr usrp, int which, 
-	   double first_IF, double second_IF);
-  ~db_tv_rx();
-
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  double freq_min();
-  double freq_max();
-  struct freq_result_t set_freq(double target_freq);
-  bool  set_gain(float gain);
-  bool  is_quadrature();
-  bool  spectrum_inverted();
-};
-
-#endif
diff --git a/usrp/host/include/usrp/db_tv_rx_mimo.h b/usrp/host/include/usrp/db_tv_rx_mimo.h
deleted file mode 100644
index 0a9bb486e..000000000
--- a/usrp/host/include/usrp/db_tv_rx_mimo.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2009 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 asversion 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 DB_TV_RX_MIMO_H
-#define DB_TV_RX_MIMO_H
-
-#include <usrp/db_tv_rx.h>
-
-class db_tv_rx_mimo : public db_tv_rx
-{
- public:
-  db_tv_rx_mimo(usrp_basic_sptr usrp, int which,double first_IF, double second_IF);
-  int _refclk_divisor();
-};
-
-#endif
diff --git a/usrp/host/include/usrp/db_wbxng.h b/usrp/host/include/usrp/db_wbxng.h
deleted file mode 100644
index 9a7829278..000000000
--- a/usrp/host/include/usrp/db_wbxng.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2009 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 asversion 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_DB_WBXNG_H
-#define INCLUDED_DB_WBXNG_H
-
-#include <usrp/db_base.h>
-#include <cmath>
-
-class adf4350;
-
-class wbxng_base : public db_base
-{
-public:
-  wbxng_base(usrp_basic_sptr usrp, int which);
-  ~wbxng_base();
-
-  struct freq_result_t set_freq(double freq);
-
-  bool  is_quadrature();
-  double freq_min();
-  double freq_max();
-
-protected:
-  void _write_spi(std::string data);
-  int _refclk_divisor();
-  bool _get_locked();
-  bool _set_pga(float pga_gain);
-
-  bool d_first;
-  int  d_spi_format;
-  int  d_spi_enable;
-  int  d_power_on;
-  int  d_PD;
-
-  boost::shared_ptr<adf4350> d_common;
-};
-
-// ----------------------------------------------------------------
-
-class db_wbxng_tx : public wbxng_base
-{
-protected:
-  void shutdown();
-
-public:
-  db_wbxng_tx(usrp_basic_sptr usrp, int which);
-  ~db_wbxng_tx();
-
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-
-  bool set_auto_tr(bool on);
-  bool set_enable(bool on);
-  bool set_gain(float gain);
-};
-
-class db_wbxng_rx : public wbxng_base
-{
-protected:
-  void shutdown();
-  bool _set_attn(float attn);
-
-public:
-  db_wbxng_rx(usrp_basic_sptr usrp, int which);
-  ~db_wbxng_rx();
-
-  bool set_auto_tr(bool on);
-  bool select_rx_antenna(int which_antenna);
-  bool select_rx_antenna(const std::string &which_antenna);
-  bool set_gain(float gain);
-
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool i_and_q_swapped();
-};
-
-#endif /* INCLUDED_DB_WBXNG_H */
diff --git a/usrp/host/include/usrp/db_xcvr2450.h b/usrp/host/include/usrp/db_xcvr2450.h
deleted file mode 100644
index 305c60d06..000000000
--- a/usrp/host/include/usrp/db_xcvr2450.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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 asversion 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 DB_XCVR2450_H
-#define DB_XCVR2450_H
-
-#include <usrp/db_base.h>
-#include <boost/shared_ptr.hpp>
-
-class xcvr2450;
-typedef boost::shared_ptr<xcvr2450> xcvr2450_sptr;
-
-
-/******************************************************************************/
-
-
-class db_xcvr2450_base: public db_base
-{
-  /*
-   * Abstract base class for all xcvr2450 boards.
-   * 
-   * Derive board specific subclasses from db_xcvr2450_base_{tx,rx}
-   */
-public:
-  db_xcvr2450_base(usrp_basic_sptr usrp, int which);
-  ~db_xcvr2450_base();
-  struct freq_result_t set_freq(double target_freq);
-  bool is_quadrature();
-  double freq_min();
-  double freq_max();
-
-protected:
-  xcvr2450_sptr d_xcvr;
-  void shutdown_common();
-};
-
-
-/******************************************************************************/
-
-
-class db_xcvr2450_tx : public db_xcvr2450_base
-{
-protected:
-  void shutdown();
-
-public:
-  db_xcvr2450_tx(usrp_basic_sptr usrp, int which);
-  ~db_xcvr2450_tx();
-
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool  set_gain(float gain);
-  bool  i_and_q_swapped();
-};
-
-class db_xcvr2450_rx : public db_xcvr2450_base
-{
-protected:
-  void shutdown();
-
-public:
-  db_xcvr2450_rx(usrp_basic_sptr usrp, int which);
-  ~db_xcvr2450_rx();
-
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool  set_gain(float gain);
-};
-
-
-
-#endif
diff --git a/usrp/host/include/usrp/libusb_types.h.in b/usrp/host/include/usrp/libusb_types.h.in
deleted file mode 100644
index cf10e33cc..000000000
--- a/usrp/host/include/usrp/libusb_types.h.in
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  -*- Mode: C++ -*- */
-/*
- * Copyright 2009 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 _LIBUSB_TYPES_H_
-#define _LIBUSB_TYPES_H_
-
-#if @USE_LIBUSB1@
-#include <libusb-1.0/libusb.h>
-struct libusb_device;
-struct libusb_device_handle;
-struct libusb_device_descriptor;
-#else
-#include <usb.h>
-typedef struct usb_device libusb_device;
-typedef struct usb_dev_handle libusb_device_handle;
-typedef struct usb_device_descriptor libusb_device_descriptor;
-#endif
-
-#endif /* _LIBUSB_TYPES_H_ */
diff --git a/usrp/host/include/usrp/usrp_basic.h b/usrp/host/include/usrp/usrp_basic.h
deleted file mode 100644
index b76493ea4..000000000
--- a/usrp/host/include/usrp/usrp_basic.h
+++ /dev/null
@@ -1,993 +0,0 @@
-/*  -*- c++ -*- */
-/*
- * Copyright 2005,2009 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_USRP_BASIC_H
-#define INCLUDED_USRP_BASIC_H
-
-#include <usrp/db_base.h>
-#include <usrp/usrp_slots.h>
-#include <usrp/usrp_subdev_spec.h>
-#include <usrp/libusb_types.h>
-#include <string>
-#include <vector>
-#include <boost/utility.hpp>
-
-class  fusb_devhandle;
-class  fusb_ephandle;
-
-enum txrx_t {
-  C_RX = 0,
-  C_TX = 1
-};
-
-/*
- * ----------------------------------------------------------------------
- * Mid level interface to the Universal Software Radio Peripheral (Rev 1)
- *
- * These classes implement the basic functionality for talking to the
- * USRP.  They try to be as independent of the signal processing code
- * in FPGA as possible.  They implement access to the low level
- * peripherals on the board, provide a common way for reading and
- * writing registers in the FPGA, and provide the high speed interface
- * to streaming data across the USB.
- *
- * It is expected that subclasses will be derived that provide
- * access to the functionality to a particular FPGA configuration.
- * ----------------------------------------------------------------------
- */
-
-
-/*!
- * \brief abstract base class for usrp operations
- * \ingroup usrp
- */
-class usrp_basic : boost::noncopyable
-{
-protected:
-  void shutdown_daughterboards();
-
-protected:
-  libusb_device_handle		*d_udh;
-  struct libusb_context		*d_ctx;
-  int				 d_usb_data_rate;	// bytes/sec
-  int				 d_bytes_per_poll;	// how often to poll for overruns
-  bool				 d_verbose;
-  long   			 d_fpga_master_clock_freq;
-
-  static const int		 MAX_REGS = 128;
-  unsigned int			 d_fpga_shadows[MAX_REGS];
-
-  int				 d_dbid[2];		// daughterboard ID's (side A, side B)
-
-  /*!
-   * Shared pointers to subclasses of db_base.
-   *
-   * The outer vector is of length 2 (0 = side A, 1 = side B).  The
-   * inner vectors are of length 1, 2 or 3 depending on the number of
-   * subdevices implemented by the daugherboard.  At this time, only
-   * the Basic Rx and LF Rx implement more than 1 subdevice.
-   */
-  std::vector< std::vector<db_base_sptr> > d_db;
-
-  // One time call, made only only from usrp_standard_*::make after shared_ptr is created.
-  void init_db(usrp_basic_sptr u);
-
-
-  usrp_basic (int which_board,
-	      libusb_device_handle *open_interface (libusb_device *dev),
-	      const std::string fpga_filename = "",
-	      const std::string firmware_filename = "");
-
-  /*!
-   * \brief advise usrp_basic of usb data rate (bytes/sec)
-   *
-   * N.B., this doesn't tweak any hardware.  Derived classes
-   * should call this to inform us of the data rate whenever it's
-   * first set or if it changes.
-   *
-   * \param usb_data_rate	bytes/sec
-   */
-  void set_usb_data_rate (int usb_data_rate);
-  
-  /*!
-   * \brief Write auxiliary digital to analog converter.
-   *
-   * \param slot	Which Tx or Rx slot to write.
-   *    		N.B., SLOT_TX_A and SLOT_RX_A share the same AUX DAC's.
-   *          		SLOT_TX_B and SLOT_RX_B share the same AUX DAC's.
-   * \param which_dac	[0,3] RX slots must use only 0 and 1.  TX slots must use only 2 and 3.
-   * \param value	[0,4095]
-   * \returns true iff successful
-   */
-  bool _write_aux_dac (int slot, int which_dac, int value);
-
-  /*!
-   * \brief Read auxiliary analog to digital converter.
-   *
-   * \param slot	2-bit slot number. E.g., SLOT_TX_A
-   * \param which_adc	[0,1]
-   * \param value	return 12-bit value [0,4095]
-   * \returns true iff successful
-   */
-  bool _read_aux_adc (int slot, int which_adc, int *value);
-
-  /*!
-   * \brief Read auxiliary analog to digital converter.
-   *
-   * \param slot	2-bit slot number. E.g., SLOT_TX_A
-   * \param which_adc	[0,1]
-   * \returns value in the range [0,4095] if successful, else READ_FAILED.
-   */
-  int _read_aux_adc (int slot, int which_adc);
-
-
-public:
-  virtual ~usrp_basic ();
-
-
-  /*!
-   * Return a vector of vectors that contain shared pointers
-   * to the daughterboard instance(s) associated with the specified side.
-   *
-   * It is an error to use the returned objects after the usrp_basic
-   * object has been destroyed.
-   */
-  std::vector<std::vector<db_base_sptr> > db() const { return d_db; }
-
-  /*!
-   * Return a vector of size >= 1 that contains shared pointers
-   * to the daughterboard instance(s) associated with the specified side.
-   *
-   * \param which_side	[0,1] which daughterboard
-   *
-   * It is an error to use the returned objects after the usrp_basic
-   * object has been destroyed.
-   */
-  std::vector<db_base_sptr> db(int which_side);
- 
-  /*!
-   * \brief is the subdev_spec valid?
-   */
-  bool is_valid(const usrp_subdev_spec &ss);
-
-  /*!
-   * \brief given a subdev_spec, return the corresponding daughterboard object.
-   * \throws std::invalid_ argument if ss is invalid.
-   *
-   * \param ss specifies the side and subdevice
-   */
-  db_base_sptr selected_subdev(const usrp_subdev_spec &ss);
-
-  /*!
-   * \brief return frequency of master oscillator on USRP
-   */
-  long fpga_master_clock_freq () const { return d_fpga_master_clock_freq; }
-
-  /*!
-   * Tell API that the master oscillator on the USRP is operating at a non-standard 
-   * fixed frequency. This is only needed for custom USRP hardware modified to 
-   * operate at a different frequency from the default factory configuration. This
-   * function must be called prior to any other API function.
-   * \param master_clock USRP2 FPGA master clock frequency in Hz (10..64 MHz)
-   */
-  void set_fpga_master_clock_freq (long master_clock) { d_fpga_master_clock_freq = master_clock; }
-
-  /*!
-   * \returns usb data rate in bytes/sec
-   */
-  int usb_data_rate () const { return d_usb_data_rate; }
-
-  void set_verbose (bool on) { d_verbose = on; }
-
-  //! magic value used on alternate register read interfaces
-  static const int READ_FAILED = -99999;
-
-  /*!
-   * \brief Write EEPROM on motherboard or any daughterboard.
-   * \param i2c_addr		I2C bus address of EEPROM
-   * \param eeprom_offset	byte offset in EEPROM to begin writing
-   * \param buf			the data to write
-   * \returns true iff sucessful
-   */
-  bool write_eeprom (int i2c_addr, int eeprom_offset, const std::string buf);
-
-  /*!
-   * \brief Read EEPROM on motherboard or any daughterboard.
-   * \param i2c_addr		I2C bus address of EEPROM
-   * \param eeprom_offset	byte offset in EEPROM to begin reading
-   * \param len			number of bytes to read
-   * \returns the data read if successful, else a zero length string.
-   */
-  std::string read_eeprom (int i2c_addr, int eeprom_offset, int len);
-
-  /*!
-   * \brief Write to I2C peripheral
-   * \param i2c_addr		I2C bus address (7-bits)
-   * \param buf			the data to write
-   * \returns true iff successful
-   * Writes are limited to a maximum of of 64 bytes.
-   */
-  bool write_i2c (int i2c_addr, const std::string buf);
-
-  /*!
-   * \brief Read from I2C peripheral
-   * \param i2c_addr		I2C bus address (7-bits)
-   * \param len			number of bytes to read
-   * \returns the data read if successful, else a zero length string.
-   * Reads are limited to a maximum of 64 bytes.
-   */
-  std::string read_i2c (int i2c_addr, int len);
-
-  /*!
-   * \brief Set ADC offset correction
-   * \param which_adc	which ADC[0,3]: 0 = RX_A I, 1 = RX_A Q...
-   * \param offset	16-bit value to subtract from raw ADC input.
-   */
-  bool set_adc_offset (int which_adc, int offset);
-
-  /*!
-   * \brief Set DAC offset correction
-   * \param which_dac	which DAC[0,3]: 0 = TX_A I, 1 = TX_A Q...
-   * \param offset	10-bit offset value (ambiguous format:  See AD9862 datasheet).
-   * \param offset_pin	1-bit value.  If 0 offset applied to -ve differential pin;
-   *                                  If 1 offset applied to +ve differential pin.
-   */
-  bool set_dac_offset (int which_dac, int offset, int offset_pin);
-
-  /*!
-   * \brief Control ADC input buffer
-   * \param which_adc 	which ADC[0,3]
-   * \param bypass	if non-zero, bypass input buffer and connect input
-   *	                directly to switched cap SHA input of RxPGA.
-   */
-  bool set_adc_buffer_bypass (int which_adc, bool bypass);
-
-  /*!
-   * \brief Enable/disable automatic DC offset removal control loop in FPGA
-   *
-   * \param bits  which control loops to enable
-   * \param mask  which \p bits to pay attention to
-   *
-   * If the corresponding bit is set, enable the automatic DC
-   * offset correction control loop.
-   *
-   * <pre>
-   * The 4 low bits are significant:
-   *
-   *   ADC0 = (1 << 0)
-   *   ADC1 = (1 << 1)
-   *   ADC2 = (1 << 2)
-   *   ADC3 = (1 << 3)
-   * </pre>
-   *
-   * By default the control loop is enabled on all ADC's.
-   */
-  bool set_dc_offset_cl_enable(int bits, int mask);
-
-  /*!
-   * \brief return the usrp's serial number.
-   *
-   * \returns non-zero length string iff successful.
-   */
-  std::string serial_number();
-
-  /*!
-   * \brief Return daughterboard ID for given side [0,1].
-   *
-   * \param which_side	[0,1] which daughterboard
-   *
-   * \return daughterboard id >= 0 if successful
-   * \return -1 if no daugherboard
-   * \return -2 if invalid EEPROM on daughterboard
-   */
-  virtual int daughterboard_id (int which_side) const = 0;
-
-  /*!
-   * \brief Clock ticks to delay rising of T/R signal
-   * \sa write_atr_mask, write_atr_txval, write_atr_rxval
-   */
-  bool write_atr_tx_delay(int value);
-
-  /*!
-   * \brief Clock ticks to delay falling edge of T/R signal
-   * \sa write_atr_mask, write_atr_txval, write_atr_rxval
-   */
-  bool write_atr_rx_delay(int value);
-
-
-  // ================================================================
-  // Routines to access and control daughterboard specific i/o
-  //
-  // Those with a common_ prefix access either the Tx or Rx side depending
-  // on the txrx parameter.  Those without the common_ prefix are virtual
-  // and are overriden in usrp_basic_rx and usrp_basic_tx to access the
-  // the Rx or Tx sides automatically.  We provide the common_ versions
-  // for those daughterboards such as the WBX and XCVR2450 that share
-  // h/w resources (such as the LO) between the Tx and Rx sides.
-
-  // ----------------------------------------------------------------
-  // BEGIN common_  daughterboard control functions
-
-  /*!
-   * \brief Set Programmable Gain Amplifier(PGA)
-   *
-   * \param txrx	Tx or Rx?
-   * \param which_amp	which amp [0,3]
-   * \param gain_in_db	gain value(linear in dB)
-   *
-   * gain is rounded to closest setting supported by hardware.
-   *
-   * \returns true iff sucessful.
-   *
-   * \sa pga_min(), pga_max(), pga_db_per_step()
-   */
-  bool common_set_pga(txrx_t txrx, int which_amp, double gain_in_db);
-
-  /*!
-   * \brief Return programmable gain amplifier gain setting in dB.
-   *
-   * \param txrx	Tx or Rx?
-   * \param which_amp	which amp [0,3]
-   */
-  double common_pga(txrx_t txrx, int which_amp) const;
-
-  /*!
-   * \brief Return minimum legal PGA gain in dB.
-   * \param txrx	Tx or Rx?
-   */
-  double common_pga_min(txrx_t txrx) const;
-
-  /*!
-   * \brief Return maximum legal PGA gain in dB.
-   * \param txrx	Tx or Rx?
-   */
-  double common_pga_max(txrx_t txrx) const;
-
-  /*!
-   * \brief Return hardware step size of PGA(linear in dB).
-   * \param txrx	Tx or Rx?
-   */
-  double common_pga_db_per_step(txrx_t txrx) const;
-
-  /*!
-   * \brief Write direction register(output enables) for pins that go to daughterboard.
-   *
-   * \param txrx	Tx or Rx?
-   * \param which_side	[0,1] which size
-   * \param value	value to write into register
-   * \param mask	which bits of value to write into reg
-   *
-   * Each d'board has 16-bits of general purpose i/o.
-   * Setting the bit makes it an output from the FPGA to the d'board.
-   *
-   * This register is initialized based on a value stored in the
-   * d'board EEPROM.  In general, you shouldn't be using this routine
-   * without a very good reason.  Using this method incorrectly will
-   * kill your USRP motherboard and/or daughterboard.
-   */
-  bool _common_write_oe(txrx_t txrx, int which_side, int value, int mask);
-
-  /*!
-   * \brief Write daughterboard i/o pin value
-   *
-   * \param txrx	Tx or Rx?
-   * \param which_side	[0,1] which d'board
-   * \param value	value to write into register
-   * \param mask	which bits of value to write into reg
-   */
-  bool common_write_io(txrx_t txrx, int which_side, int value, int mask);
-
-  /*!
-   * \brief Read daughterboard i/o pin value
-   *
-   * \param txrx	Tx or Rx?
-   * \param which_side	[0,1] which d'board
-   * \param value	output
-   */
-  bool common_read_io(txrx_t txrx, int which_side, int *value);
-
-  /*!
-   * \brief Read daughterboard i/o pin value
-   *
-   * \param txrx	Tx or Rx?
-   * \param which_side	[0,1] which d'board
-   * \returns register value if successful, else READ_FAILED
-   */
-  int common_read_io(txrx_t txrx, int which_side);
-
-  /*!
-   * \brief Write daughterboard refclk config register
-   *
-   * \param txrx	Tx or Rx?
-   * \param which_side	[0,1] which d'board
-   * \param value	value to write into register, see below
-   *
-   * <pre>
-   * Control whether a reference clock is sent to the daughterboards,
-   * and what frequency.  The refclk is sent on d'board i/o pin 0.
-   * 
-   *     3                   2                   1                       
-   *   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   *  +-----------------------------------------------+-+------------+
-   *  |             Reserved (Must be zero)           |E|   DIVISOR  |
-   *  +-----------------------------------------------+-+------------+
-   * 
-   *  Bit 7  -- 1 turns on refclk, 0 allows IO use
-   *  Bits 6:0 Divider value
-   * </pre>
-   */
-  bool common_write_refclk(txrx_t txrx, int which_side, int value);
-
-  /*!
-   * \brief Automatic Transmit/Receive switching
-   * <pre>
-   *
-   * If automatic transmit/receive (ATR) switching is enabled in the
-   * FR_ATR_CTL register, the presence or absence of data in the FPGA
-   * transmit fifo selects between two sets of values for each of the 4
-   * banks of daughterboard i/o pins.
-   *
-   * Each daughterboard slot has 3 16-bit registers associated with it:
-   *   FR_ATR_MASK_*, FR_ATR_TXVAL_* and FR_ATR_RXVAL_*
-   *
-   * FR_ATR_MASK_{0,1,2,3}: 
-   *
-   *   These registers determine which of the daugherboard i/o pins are
-   *   affected by ATR switching.  If a bit in the mask is set, the
-   *   corresponding i/o bit is controlled by ATR, else it's output
-   *   value comes from the normal i/o pin output register:
-   *   FR_IO_{0,1,2,3}.
-   *
-   * FR_ATR_TXVAL_{0,1,2,3}:
-   * FR_ATR_RXVAL_{0,1,2,3}:
-   *
-   *   If the Tx fifo contains data, then the bits from TXVAL that are
-   *   selected by MASK are output.  Otherwise, the bits from RXVAL that
-   *   are selected by MASK are output.
-   * </pre>
-   */
-  bool common_write_atr_mask(txrx_t txrx, int which_side, int value);
-  bool common_write_atr_txval(txrx_t txrx, int which_side, int value);
-  bool common_write_atr_rxval(txrx_t txrx, int which_side, int value);
-
-  /*!
-   * \brief Write auxiliary digital to analog converter.
-   *
-   * \param txrx	Tx or Rx?
-   * \param which_side	[0,1] which d'board
-   *    		N.B., SLOT_TX_A and SLOT_RX_A share the same AUX DAC's.
-   *          		SLOT_TX_B and SLOT_RX_B share the same AUX DAC's.
-   * \param which_dac	[2,3] TX slots must use only 2 and 3.
-   * \param value	[0,4095]
-   * \returns true iff successful
-   */
-  bool common_write_aux_dac(txrx_t txrx, int which_side, int which_dac, int value);
-
-  /*!
-   * \brief Read auxiliary analog to digital converter.
-   *
-   * \param txrx	Tx or Rx?
-   * \param which_side	[0,1] which d'board
-   * \param which_adc	[0,1]
-   * \param value	return 12-bit value [0,4095]
-   * \returns true iff successful
-   */
-  bool common_read_aux_adc(txrx_t txrx, int which_side, int which_adc, int *value);
-
-  /*!
-   * \brief Read auxiliary analog to digital converter.
-   *
-   * \param txrx	Tx or Rx?
-   * \param which_side	[0,1] which d'board
-   * \param which_adc	[0,1]
-   * \returns value in the range [0,4095] if successful, else READ_FAILED.
-   */
-  int common_read_aux_adc(txrx_t txrx, int which_side, int which_adc);
-
-  // END common_ daughterboard control functions
-  // ----------------------------------------------------------------
-  // BEGIN virtual daughterboard control functions
-
-  /*!
-   * \brief Set Programmable Gain Amplifier (PGA)
-   *
-   * \param which_amp	which amp [0,3]
-   * \param gain_in_db	gain value (linear in dB)
-   *
-   * gain is rounded to closest setting supported by hardware.
-   *
-   * \returns true iff sucessful.
-   *
-   * \sa pga_min(), pga_max(), pga_db_per_step()
-   */
-  virtual bool set_pga (int which_amp, double gain_in_db) = 0;
-
-  /*!
-   * \brief Return programmable gain amplifier gain setting in dB.
-   *
-   * \param which_amp	which amp [0,3]
-   */
-  virtual double pga (int which_amp) const = 0;
-
-  /*!
-   * \brief Return minimum legal PGA gain in dB.
-   */
-  virtual double pga_min () const = 0;
-
-  /*!
-   * \brief Return maximum legal PGA gain in dB.
-   */
-  virtual double pga_max () const = 0;
-
-  /*!
-   * \brief Return hardware step size of PGA (linear in dB).
-   */
-  virtual double pga_db_per_step () const = 0;
-
-  /*!
-   * \brief Write direction register (output enables) for pins that go to daughterboard.
-   *
-   * \param which_side	[0,1] which size
-   * \param value	value to write into register
-   * \param mask	which bits of value to write into reg
-   *
-   * Each d'board has 16-bits of general purpose i/o.
-   * Setting the bit makes it an output from the FPGA to the d'board.
-   *
-   * This register is initialized based on a value stored in the
-   * d'board EEPROM.  In general, you shouldn't be using this routine
-   * without a very good reason.  Using this method incorrectly will
-   * kill your USRP motherboard and/or daughterboard.
-   */
-  virtual bool _write_oe (int which_side, int value, int mask) = 0;
-
-  /*!
-   * \brief Write daughterboard i/o pin value
-   *
-   * \param which_side	[0,1] which d'board
-   * \param value	value to write into register
-   * \param mask	which bits of value to write into reg
-   */
-  virtual bool write_io (int which_side, int value, int mask) = 0;
-
-  /*!
-   * \brief Read daughterboard i/o pin value
-   *
-   * \param which_side	[0,1] which d'board
-   * \param value	output
-   */
-  virtual bool read_io (int which_side, int *value) = 0;
-
-  /*!
-   * \brief Read daughterboard i/o pin value
-   *
-   * \param which_side	[0,1] which d'board
-   * \returns register value if successful, else READ_FAILED
-   */
-  virtual int read_io (int which_side) = 0;
-
-  /*!
-   * \brief Write daughterboard refclk config register
-   *
-   * \param which_side	[0,1] which d'board
-   * \param value	value to write into register, see below
-   *
-   * <pre>
-   * Control whether a reference clock is sent to the daughterboards,
-   * and what frequency.  The refclk is sent on d'board i/o pin 0.
-   * 
-   *     3                   2                   1                       
-   *   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   *  +-----------------------------------------------+-+------------+
-   *  |             Reserved (Must be zero)           |E|   DIVISOR  |
-   *  +-----------------------------------------------+-+------------+
-   * 
-   *  Bit 7  -- 1 turns on refclk, 0 allows IO use
-   *  Bits 6:0 Divider value
-   * </pre>
-   */
-  virtual bool write_refclk(int which_side, int value) = 0;
-
-  virtual bool write_atr_mask(int which_side, int value) = 0;
-  virtual bool write_atr_txval(int which_side, int value) = 0;
-  virtual bool write_atr_rxval(int which_side, int value) = 0;
-
-  /*!
-   * \brief Write auxiliary digital to analog converter.
-   *
-   * \param which_side	[0,1] which d'board
-   *    		N.B., SLOT_TX_A and SLOT_RX_A share the same AUX DAC's.
-   *          		SLOT_TX_B and SLOT_RX_B share the same AUX DAC's.
-   * \param which_dac	[2,3] TX slots must use only 2 and 3.
-   * \param value	[0,4095]
-   * \returns true iff successful
-   */
-  virtual bool write_aux_dac (int which_side, int which_dac, int value) = 0;
-
-  /*!
-   * \brief Read auxiliary analog to digital converter.
-   *
-   * \param which_side	[0,1] which d'board
-   * \param which_adc	[0,1]
-   * \param value	return 12-bit value [0,4095]
-   * \returns true iff successful
-   */
-  virtual bool read_aux_adc (int which_side, int which_adc, int *value) = 0;
-
-  /*!
-   * \brief Read auxiliary analog to digital converter.
-   *
-   * \param which_side	[0,1] which d'board
-   * \param which_adc	[0,1]
-   * \returns value in the range [0,4095] if successful, else READ_FAILED.
-   */
-  virtual int read_aux_adc (int which_side, int which_adc) = 0;
-
-  /*!
-   * \brief returns current fusb block size
-   */
-  virtual int block_size() const = 0;
-
-  /*!
-   * \brief returns A/D or D/A converter rate in Hz
-   */
-  virtual long converter_rate() const = 0;
-
-  // END virtual daughterboard control functions
-
-  // ----------------------------------------------------------------
-  // Low level implementation routines.
-  // You probably shouldn't be using these...
-  //
-
-  bool _set_led (int which_led, bool on);
-
-  /*!
-   * \brief Write FPGA register.
-   * \param regno	7-bit register number
-   * \param value	32-bit value
-   * \returns true iff successful
-   */
-  bool _write_fpga_reg (int regno, int value);	//< 7-bit regno, 32-bit value
-
-  /*!
-   * \brief Read FPGA register.
-   * \param regno	7-bit register number
-   * \param value	32-bit value
-   * \returns true iff successful
-   */
-  bool _read_fpga_reg (int regno, int *value);	//< 7-bit regno, 32-bit value
-
-  /*!
-   * \brief Read FPGA register.
-   * \param regno	7-bit register number
-   * \returns register value if successful, else READ_FAILED
-   */
-  int  _read_fpga_reg (int regno);
-
-  /*!
-   * \brief Write FPGA register with mask.
-   * \param regno	7-bit register number
-   * \param value	16-bit value
-   * \param mask 	16-bit value
-   * \returns true if successful
-   * Only use this for registers who actually implement a mask in the verilog firmware, like FR_RX_MASTER_SLAVE
-   */
-  bool _write_fpga_reg_masked (int regno, int value, int mask);
-
-  /*!
-   * \brief Write AD9862 register.
-   * \param which_codec 0 or 1
-   * \param regno	6-bit register number
-   * \param value	8-bit value
-   * \returns true iff successful
-   */
-  bool _write_9862 (int which_codec, int regno, unsigned char value);
-
-  /*!
-   * \brief Read AD9862 register.
-   * \param which_codec 0 or 1
-   * \param regno	6-bit register number
-   * \param value	8-bit value
-   * \returns true iff successful
-   */
-  bool _read_9862 (int which_codec, int regno, unsigned char *value) const;
-
-  /*!
-   * \brief Read AD9862 register.
-   * \param which_codec 0 or 1
-   * \param regno	6-bit register number
-   * \returns register value if successful, else READ_FAILED
-   */
-  int  _read_9862 (int which_codec, int regno) const;
-
-  /*!
-   * \brief Write data to SPI bus peripheral.
-   *
-   * \param optional_header	0,1 or 2 bytes to write before buf.
-   * \param enables		bitmask of peripherals to write. See usrp_spi_defs.h
-   * \param format		transaction format.  See usrp_spi_defs.h SPI_FMT_*
-   * \param buf			the data to write
-   * \returns true iff successful
-   * Writes are limited to a maximum of 64 bytes.
-   *
-   * If \p format specifies that optional_header bytes are present, they are
-   * written to the peripheral immediately prior to writing \p buf.
-   */
-  bool _write_spi (int optional_header, int enables, int format, std::string buf);
-
-  /*
-   * \brief Read data from SPI bus peripheral.
-   *
-   * \param optional_header	0,1 or 2 bytes to write before buf.
-   * \param enables		bitmask of peripheral to read. See usrp_spi_defs.h
-   * \param format		transaction format.  See usrp_spi_defs.h SPI_FMT_*
-   * \param len			number of bytes to read.  Must be in [0,64].
-   * \returns the data read if sucessful, else a zero length string.
-   *
-   * Reads are limited to a maximum of 64 bytes.
-   *
-   * If \p format specifies that optional_header bytes are present, they
-   * are written to the peripheral first.  Then \p len bytes are read from
-   * the peripheral and returned.
-   */
-  std::string _read_spi (int optional_header, int enables, int format, int len);
-
-  /*!
-   * \brief Start data transfers.
-   * Called in base class to derived class order.
-   */
-  bool start ();
-
-  /*!
-   * \brief Stop data transfers.
-   * Called in base class to derived class order.
-   */
-  bool stop ();
-};
-
-/*!
- * \brief class for accessing the receive side of the USRP
- * \ingroup usrp
- */
-class usrp_basic_rx : public usrp_basic 
-{
-private:
-  fusb_devhandle	*d_devhandle;
-  fusb_ephandle		*d_ephandle;
-  int			 d_bytes_seen;		// how many bytes we've seen
-  bool			 d_first_read;
-  bool			 d_rx_enable;
-
-protected:
-  /*!
-   * \param which_board	     Which USRP board on usb (not particularly useful; use 0)
-   * \param fusb_block_size  fast usb xfer block size.  Must be a multiple of 512. 
-   *                         Use zero for a reasonable default.
-   * \param fusb_nblocks     number of fast usb URBs to allocate.  Use zero for a reasonable default. 
-   * \param fpga_filename    name of the rbf file to load
-   * \param firmware_filename name of ihx file to load
-   */
-  usrp_basic_rx (int which_board,
-		 int fusb_block_size=0,
-		 int fusb_nblocks=0,
-		 const std::string fpga_filename = "",
-		 const std::string firmware_filename = ""
-		 );  // throws if trouble
-
-  bool set_rx_enable (bool on);
-  bool rx_enable () const { return d_rx_enable; }
-
-  bool disable_rx ();		// conditional disable, return prev state
-  void restore_rx (bool on);	// conditional set
-
-  void probe_rx_slots (bool verbose);
-
-public:
-  ~usrp_basic_rx ();
-
-  /*!
-   * \brief invokes constructor, returns instance or 0 if trouble
-   *
-   * \param which_board	     Which USRP board on usb (not particularly useful; use 0)
-   * \param fusb_block_size  fast usb xfer block size.  Must be a multiple of 512. 
-   *                         Use zero for a reasonable default.
-   * \param fusb_nblocks     number of fast usb URBs to allocate.  Use zero for a reasonable default. 
-   * \param fpga_filename    name of file that contains image to load into FPGA
-   * \param firmware_filename	name of file that contains image to load into FX2
-   */
-  static usrp_basic_rx *make (int which_board,
-			      int fusb_block_size=0,
-			      int fusb_nblocks=0,
-			      const std::string fpga_filename = "",
-			      const std::string firmware_filename = ""
-			      );
-
-  /*!
-   * \brief tell the fpga the rate rx samples are coming from the A/D's
-   *
-   * div = fpga_master_clock_freq () / sample_rate
-   *
-   * sample_rate is determined by a myriad of registers
-   * in the 9862.  That's why you have to tell us, so
-   * we can tell the fpga.
-   */
-  bool set_fpga_rx_sample_rate_divisor (unsigned int div);
-
-  /*!
-   * \brief read data from the D/A's via the FPGA.
-   * \p len must be a multiple of 512 bytes.
-   *
-   * \returns the number of bytes read, or -1 on error.
-   *
-   * If overrun is non-NULL it will be set true iff an RX overrun is detected.
-   */
-  int read (void *buf, int len, bool *overrun);
-
-
-  //! sampling rate of A/D converter
-  virtual long converter_rate() const { return fpga_master_clock_freq(); } // 64M
-  long adc_rate() const { return converter_rate(); }
-  int daughterboard_id (int which_side) const { return d_dbid[which_side & 0x1]; }
-
-  bool set_pga (int which_amp, double gain_in_db);
-  double pga (int which_amp) const;
-  double pga_min () const;
-  double pga_max () const;
-  double pga_db_per_step () const;
-
-  bool _write_oe (int which_side, int value, int mask);
-  bool write_io (int which_side, int value, int mask);
-  bool read_io (int which_side, int *value);
-  int read_io (int which_side);
-  bool write_refclk(int which_side, int value);
-  bool write_atr_mask(int which_side, int value);
-  bool write_atr_txval(int which_side, int value);
-  bool write_atr_rxval(int which_side, int value);
-
-  bool write_aux_dac (int which_side, int which_dac, int value);
-  bool read_aux_adc (int which_side, int which_adc, int *value);
-  int  read_aux_adc (int which_side, int which_adc);
-
-  int block_size() const;
-
-  // called in base class to derived class order
-  bool start ();
-  bool stop ();
-};
-
-/*!
- * \brief class for accessing the transmit side of the USRP
- * \ingroup usrp
- */
-class usrp_basic_tx : public usrp_basic 
-{
-private:
-  fusb_devhandle	*d_devhandle;
-  fusb_ephandle		*d_ephandle;
-  int			 d_bytes_seen;		// how many bytes we've seen
-  bool			 d_first_write;
-  bool			 d_tx_enable;
-
- protected:
-  /*!
-   * \param which_board	     Which USRP board on usb (not particularly useful; use 0)
-   * \param fusb_block_size  fast usb xfer block size.  Must be a multiple of 512.
-   *                         Use zero for a reasonable default.
-   * \param fusb_nblocks     number of fast usb URBs to allocate.  Use zero for a reasonable default.
-   * \param fpga_filename    name of file that contains image to load into FPGA
-   * \param firmware_filename	name of file that contains image to load into FX2
-   */
-  usrp_basic_tx (int which_board,
-		 int fusb_block_size=0,
-		 int fusb_nblocks=0,
-		 const std::string fpga_filename = "",
-		 const std::string firmware_filename = ""
-		 );		// throws if trouble
-
-  bool set_tx_enable (bool on);
-  bool tx_enable () const { return d_tx_enable; }
-
-  bool disable_tx ();		// conditional disable, return prev state
-  void restore_tx (bool on);	// conditional set
-
-  void probe_tx_slots (bool verbose);
-
-public:
-
-  ~usrp_basic_tx ();
-
-  /*!
-   * \brief invokes constructor, returns instance or 0 if trouble
-   *
-   * \param which_board	     Which USRP board on usb (not particularly useful; use 0)
-   * \param fusb_block_size  fast usb xfer block size.  Must be a multiple of 512. 
-   *                         Use zero for a reasonable default.
-   * \param fusb_nblocks     number of fast usb URBs to allocate.  Use zero for a reasonable default. 
-   * \param fpga_filename    name of file that contains image to load into FPGA
-   * \param firmware_filename	name of file that contains image to load into FX2
-   */
-  static usrp_basic_tx *make (int which_board, int fusb_block_size=0, int fusb_nblocks=0,
-			      const std::string fpga_filename = "",
-			      const std::string firmware_filename = ""
-			      );
-
-  /*!
-   * \brief tell the fpga the rate tx samples are going to the D/A's
-   *
-   * div = fpga_master_clock_freq () * 2
-   *
-   * sample_rate is determined by a myriad of registers
-   * in the 9862.  That's why you have to tell us, so
-   * we can tell the fpga.
-   */
-  bool set_fpga_tx_sample_rate_divisor (unsigned int div);
-
-  /*!
-   * \brief Write data to the A/D's via the FPGA.
-   *
-   * \p len must be a multiple of 512 bytes.
-   * \returns number of bytes written or -1 on error.
-   *
-   * if \p underrun is non-NULL, it will be set to true iff
-   * a transmit underrun condition is detected.
-   */
-  int write (const void *buf, int len, bool *underrun);
-
-  /*
-   * Block until all outstanding writes have completed.
-   * This is typically used to assist with benchmarking
-   */
-  void wait_for_completion ();
-
-  //! sampling rate of D/A converter
-  virtual long converter_rate() const { return fpga_master_clock_freq () * 2; } // 128M
-  long dac_rate() const { return converter_rate(); }
-  int daughterboard_id (int which_side) const { return d_dbid[which_side & 0x1]; }
-
-  bool set_pga (int which_amp, double gain_in_db);
-  double pga (int which_amp) const;
-  double pga_min () const;
-  double pga_max () const;
-  double pga_db_per_step () const;
-
-  bool _write_oe (int which_side, int value, int mask);
-  bool write_io (int which_side, int value, int mask);
-  bool read_io (int which_side, int *value);
-  int read_io (int which_side);
-  bool write_refclk(int which_side, int value);
-  bool write_atr_mask(int which_side, int value);
-  bool write_atr_txval(int which_side, int value);
-  bool write_atr_rxval(int which_side, int value);
-
-  bool write_aux_dac (int which_side, int which_dac, int value);
-  bool read_aux_adc (int which_side, int which_adc, int *value);
-  int read_aux_adc (int which_side, int which_adc);
-
-  int block_size() const;
-
-  // called in base class to derived class order
-  bool start ();
-  bool stop ();
-};
-
-#endif /* INCLUDED_USRP_BASIC_H */
diff --git a/usrp/host/include/usrp/usrp_bytesex.h b/usrp/host/include/usrp/usrp_bytesex.h
deleted file mode 100644
index 331db31c9..000000000
--- a/usrp/host/include/usrp/usrp_bytesex.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_USRP_BYTESEX_H
-#define INCLUDED_USRP_BYTESEX_H
-
-/*!
- * \brief routines for convertering between host and usrp byte order
- *
- * Prior to including this file, the user must include "config.h"
- * which will or won't define WORDS_BIGENDIAN based on the
- * result of the AC_C_BIGENDIAN autoconf test.
- */
-
-#ifdef HAVE_BYTESWAP_H
-#include <byteswap.h>
-#else
-
-#warning Using non-portable code (likely wrong other than ILP32).
-
-static inline unsigned short int
-bswap_16 (unsigned short int x)
-{
-  return ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8));
-}
-
-static inline unsigned int
-bswap_32 (unsigned int x)
-{
-  return ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) \
-        | (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24));
-}
-#endif
-
-
-#ifdef WORDS_BIGENDIAN
-
-static inline unsigned int
-host_to_usrp_u32 (unsigned int x)
-{
-  return bswap_32(x);
-}
-
-static inline unsigned int
-usrp_to_host_u32 (unsigned int x)
-{
-  return bswap_32(x);
-}
-
-static inline short int
-host_to_usrp_short (short int x)
-{
-  return bswap_16 (x);
-}
-
-static inline short int
-usrp_to_host_short (short int x)
-{
-  return bswap_16 (x);
-}
-
-#else
-
-static inline unsigned int
-host_to_usrp_u32 (unsigned int x)
-{
-  return x;
-}
-
-static inline unsigned int
-usrp_to_host_u32 (unsigned int x)
-{
-  return x;
-}
-
-static inline short int
-host_to_usrp_short (short int x)
-{
-  return x;
-}
-
-static inline short int
-usrp_to_host_short (unsigned short int x)
-{
-  return x;
-}
-
-#endif
-
-#endif /* INCLUDED_USRP_BYTESEX_H */
diff --git a/usrp/host/include/usrp/usrp_local_sighandler.h b/usrp/host/include/usrp/usrp_local_sighandler.h
deleted file mode 100644
index ee336750f..000000000
--- a/usrp/host/include/usrp/usrp_local_sighandler.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_USRP_LOCAL_SIGHANDLER_H
-#define INCLUDED_USRP_LOCAL_SIGHANDLER_H
-
-#include <signal.h>
-#include <string>
-
-/*!
- * \brief Representation of signal.
- */
-class usrp_signal
-{
-  int	d_signum;
-public:
-  usrp_signal (int signum) : d_signum (signum) {}
-  int signal () const { return d_signum; }
-  std::string name () const;
-};
-
-
-/*!
- * \brief Get and set signal handler.
- *
- * Constructor installs new handler, destructor reinstalls
- * original value.
- */
-class usrp_local_sighandler {
-  int			d_signum;
-#ifdef HAVE_SIGACTION
-  struct sigaction	d_old_action;
-#endif
-public:
-  usrp_local_sighandler (int signum, void (*new_handler)(int));
-  ~usrp_local_sighandler ();
-
-  /* throw usrp_signal (signum) */
-  static void throw_signal (int signum) throw (usrp_signal);
-};
-
-#endif /* INCLUDED_USRP_LOCAL_SIGHANDLER_H */
diff --git a/usrp/host/include/usrp/usrp_prims.h b/usrp/host/include/usrp/usrp_prims.h
deleted file mode 100644
index 4780d0004..000000000
--- a/usrp/host/include/usrp/usrp_prims.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*  -*- c++ -*- */
-/*
- * Copyright 2005,2009 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_USRP_PRIMS_H
-#define INCLUDED_USRP_PRIMS_H
-
-#include <usrp/usrp_slots.h>
-#include <usrp/libusb_types.h>
-#include <string>
-
-struct libusb_context;
-
-static const int USRP_HASH_SIZE = 16;
-
-enum usrp_load_status_t { ULS_ERROR = 0, ULS_OK, ULS_ALREADY_LOADED };
-
-/*!
- * \brief initialize libusb; Behavior differs depending on libusb version
- *
- * libusb-0.12
- *
- * Probe busses and devices. The argument is ignored and defaults to NULL.
- * Safe to call more than once.
- *
- * libusb-1.0
- *
- * If an location to a libusb_context is passed in, create and write in the new
- * context. If no argument is provided, initialize libusb with the default
- * (NULL) context.
- *
- * Generally _not_ safe to call more than once with non-NULL argument since a
- * new context will be created each time.
- */
-
-void usrp_one_time_init (libusb_context **ctx = NULL);
-
-/*!
- * \brief deinitialize libusb
- *
- * libusb-0.1: No effect
- *
- * libusb-1.0: Deinitialize context ctx 
- */
-void usrp_deinit (libusb_context *ctx);
-
-/*
- * force a rescan of the buses and devices
- */
-void usrp_rescan ();
-
-/*!
- * \brief locate Nth (zero based) USRP device in system.
- * Return pointer or 0 if not found.
- *
- * The following kinds of devices are considered USRPs:
- *
- *   unconfigured USRP (no firwmare loaded)
- *   configured USRP (firmware loaded)
- *   unconfigured Cypress FX2 (only if fx2_ok_p is true)
- */
-libusb_device *usrp_find_device (int nth, bool fx2_ok_p = false, libusb_context *ctx = NULL);
-
-bool usrp_usrp_p (libusb_device *q);		//< is this a USRP
-bool usrp_usrp0_p (libusb_device *q);		//< is this a USRP Rev 0
-bool usrp_usrp1_p (libusb_device *q);		//< is this a USRP Rev 1
-bool usrp_usrp2_p (libusb_device *q);		//< is this a USRP Rev 2
-int  usrp_hw_rev (libusb_device *q);		//< return h/w rev code
-
-bool usrp_fx2_p (libusb_device *q);			//< is this an unconfigured Cypress FX2
-
-bool usrp_unconfigured_usrp_p (libusb_device *q);	//< some kind of unconfigured USRP
-bool usrp_configured_usrp_p (libusb_device *q);	//< some kind of configured USRP
-
-/*!
- * \brief given a libusb_device return an instance of the appropriate libusb_device_handle
- *
- * These routines claim the specified interface and select the
- * correct alternate interface.  (USB nomenclature is totally screwed!)
- *
- * If interface can't be opened, or is already claimed by some other
- * process, 0 is returned.
- */
-libusb_device_handle *usrp_open_cmd_interface (libusb_device *dev);
-libusb_device_handle *usrp_open_rx_interface (libusb_device *dev);
-libusb_device_handle *usrp_open_tx_interface (libusb_device *dev);
-
-/*!
- * \brief close interface.
- */
-bool usrp_close_interface (libusb_device_handle *udh);
-
-/*!
- * \brief load intel hex format file into USRP/Cypress FX2 (8051).
- *
- * The filename extension is typically *.ihx
- *
- * Note that loading firmware may cause the device to renumerate.  I.e.,
- * change its configuration, invalidating the current device handle.
- */
-
-usrp_load_status_t 
-usrp_load_firmware (libusb_device_handle *udh, const char *filename, bool force);
-
-/*!
- * \brief load intel hex format file into USRP FX2 (8051).
- *
- * The filename extension is typically *.ihx
- *
- * Note that loading firmware may cause the device to renumerate.  I.e.,
- * change its configuration, invalidating the current device handle.
- * If the result is ULS_OK, usrp_load_firmware_nth delays 1 second
- * then rescans the busses and devices.
- */
-usrp_load_status_t
-usrp_load_firmware_nth (int nth, const char *filename, bool force, libusb_context *ctx = NULL);
-
-/*!
- * \brief load fpga configuration bitstream
- */
-usrp_load_status_t
-usrp_load_fpga (libusb_device_handle *udh, const char *filename, bool force);
-
-/*!
- * \brief load the regular firmware and fpga bitstream in the Nth USRP.
- *
- * This is the normal starting point...
- */
-bool usrp_load_standard_bits (int nth, bool force,
-			      const std::string fpga_filename = "",
-			      const std::string firmware_filename = "",
-			      libusb_context *ctx = NULL);
-
-/*!
- * \brief copy the given \p hash into the USRP hash slot \p which.
- * The usrp implements two hash slots, 0 and 1.
- */
-bool usrp_set_hash (libusb_device_handle *udh, int which,
-		    const unsigned char hash[USRP_HASH_SIZE]);
-
-/*!
- * \brief retrieve the \p hash from the USRP hash slot \p which.
- * The usrp implements two hash slots, 0 and 1.
- */
-bool usrp_get_hash (libusb_device_handle *udh, int which,
-		    unsigned char hash[USRP_HASH_SIZE]);
-
-bool usrp_write_fpga_reg (libusb_device_handle *udh, int reg, int value);
-bool usrp_read_fpga_reg (libusb_device_handle *udh, int reg, int *value);
-bool usrp_set_fpga_reset (libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_tx_enable (libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_rx_enable (libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_tx_reset (libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_rx_reset (libusb_device_handle *udh, bool on);
-bool usrp_set_led (libusb_device_handle *udh, int which, bool on);
-
-bool usrp_check_rx_overrun (libusb_device_handle *udh, bool *overrun_p);
-bool usrp_check_tx_underrun (libusb_device_handle *udh, bool *underrun_p);
-
-// i2c_read and i2c_write are limited to a maximum len of 64 bytes.
-
-bool usrp_i2c_write (libusb_device_handle *udh, int i2c_addr,
-		     const void *buf, int len);
-
-bool usrp_i2c_read (libusb_device_handle *udh, int i2c_addr,
-		    void *buf, int len);
-
-// spi_read and spi_write are limited to a maximum of 64 bytes
-// See usrp_spi_defs.h for more info
-
-bool usrp_spi_write (libusb_device_handle *udh,
-		     int optional_header, int enables, int format,
-		     const void *buf, int len);
-
-bool usrp_spi_read (libusb_device_handle *udh,
-		     int optional_header, int enables, int format,
-		     void *buf, int len);
-
-
-bool usrp_9862_write (libusb_device_handle *udh,
-		      int which_codec,			// [0,  1]
-		      int regno,			// [0, 63]
-		      int value);			// [0, 255]	
-
-bool usrp_9862_read (libusb_device_handle *udh,
-		     int which_codec,			// [0,  1]
-		     int regno,				// [0, 63]
-		     unsigned char *value);		// [0, 255]
-
-/*!
- * \brief Write multiple 9862 regs at once.
- *
- * \p buf contains alternating register_number, register_value pairs.
- * \p len must be even and is the length of buf in bytes.
- */
-bool usrp_9862_write_many (libusb_device_handle *udh, int which_codec,
-			   const unsigned char *buf, int len);
-			   
-
-/*!
- * \brief write specified regs to all 9862's in the system
- */
-bool usrp_9862_write_many_all (libusb_device_handle *udh,
-			       const unsigned char *buf, int len);
-			   
-
-// Write 24LC024 / 24LC025 EEPROM on motherboard or daughterboard.
-// Which EEPROM is determined by i2c_addr.  See i2c_addr.h
-
-bool usrp_eeprom_write (libusb_device_handle *udh, int i2c_addr,
-			int eeprom_offset, const void *buf, int len);
-
-
-// Read 24LC024 / 24LC025 EEPROM on motherboard or daughterboard.
-// Which EEPROM is determined by i2c_addr.  See i2c_addr.h
-
-bool usrp_eeprom_read (libusb_device_handle *udh, int i2c_addr,
-		       int eeprom_offset, void *buf, int len);
-
-
-// Slot specific i/o routines
-
-/*!
- * \brief write to the specified aux dac.
- *
- * \p slot: which Tx or Rx slot to write.
- *    N.B., SLOT_TX_A and SLOT_RX_A share the same AUX DAC's
- *          SLOT_TX_B and SLOT_RX_B share the same AUX DAC's
- *
- * \p which_dac: [0,3]  RX slots must use only 0 and 1.
- *			TX slots must use only 2 and 3.
- *
- * AUX DAC 3 is really the 9862 sigma delta output.
- *
- * \p value to write to aux dac.  All dacs take straight
- * binary values.  Although dacs 0, 1 and 2 are 8-bit and dac 3 is 12-bit,
- * the interface is in terms of 12-bit values [0,4095]
- */
-bool usrp_write_aux_dac (libusb_device_handle *uhd, int slot,
-			 int which_dac, int value);
-
-/*!
- * \brief Read the specified aux adc
- *
- * \p slot: which Tx or Rx slot to read aux dac
- * \p which_adc: [0,1]  which of the two adcs to read
- * \p *value: return value, 12-bit straight binary.
- */
-bool usrp_read_aux_adc (libusb_device_handle *udh, int slot,
-			int which_adc, int *value);
-
-
-/*!
- * \brief usrp daughterboard id to name mapping
- */
-const std::string usrp_dbid_to_string (int dbid);
-
-
-enum usrp_dbeeprom_status_t { UDBE_OK, UDBE_BAD_SLOT, UDBE_NO_EEPROM, UDBE_INVALID_EEPROM };
-
-struct usrp_dboard_eeprom {
-  unsigned short	id;		// d'board identifier code
-  unsigned short	oe;		// fpga output enables:
-					//   If bit set, i/o pin is an output from FPGA.
-  short			offset[2];	// ADC/DAC offset correction
-};
-
-/*!
- * \brief Read and return parsed daughterboard eeprom
- */
-usrp_dbeeprom_status_t
-usrp_read_dboard_eeprom (libusb_device_handle *udh,
-			 int slot_id, usrp_dboard_eeprom *eeprom);
-
-/*!
- * \brief write ADC/DAC offset calibration constants to d'board eeprom
- */
-bool usrp_write_dboard_offsets (libusb_device_handle *udh, int slot_id,
-				short offset0, short offset1);
-
-/*!
- * \brief return a usrp's serial number.
- *
- * Note that this only works on a configured usrp.
- * \returns non-zero length string iff successful.
- */
-std::string usrp_serial_number(libusb_device_handle *udh);
-
-#endif /* INCLUDED_USRP_PRIMS_H */
diff --git a/usrp/host/include/usrp/usrp_slots.h b/usrp/host/include/usrp/usrp_slots.h
deleted file mode 100644
index d2c50fc47..000000000
--- a/usrp/host/include/usrp/usrp_slots.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_USRP_SLOTS_H
-#define INCLUDED_USRP_SLOTS_H
-
-// daughterboard slot numbers used in some calls
-
-static const int SLOT_TX_A = 0;
-static const int SLOT_RX_A = 1;
-static const int SLOT_TX_B = 2;
-static const int SLOT_RX_B = 3;
-
-#endif /* INCLUDED_USRP_SLOTS_H */
diff --git a/usrp/host/include/usrp/usrp_standard.h b/usrp/host/include/usrp/usrp_standard.h
deleted file mode 100644
index a631f8b09..000000000
--- a/usrp/host/include/usrp/usrp_standard.h
+++ /dev/null
@@ -1,452 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2009 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_USRP_STANDARD_H
-#define INCLUDED_USRP_STANDARD_H
-
-#include <usrp/usrp_basic.h>
-#include <boost/shared_ptr.hpp>
-#include <usrp/usrp_tune_result.h>
-
-class usrp_standard_tx;
-class usrp_standard_rx;
-
-typedef boost::shared_ptr<usrp_standard_tx> usrp_standard_tx_sptr;
-typedef boost::shared_ptr<usrp_standard_rx> usrp_standard_rx_sptr;
-
-/*!
- * \ingroup usrp
- */
-class usrp_standard_common
-{
-  int	d_fpga_caps;		// capability register val
-
-protected:
-  usrp_standard_common(usrp_basic *parent);
-
-public:
-  /*!
-   *\brief does the FPGA implement the final Rx half-band filter?
-   * If it doesn't, the maximum decimation factor with proper gain 
-   * is 1/2 of what it would otherwise be.
-   */
-  bool has_rx_halfband() const;
-
-  /*!
-   * \brief number of digital downconverters implemented in the FPGA
-   * This will be 0, 1, 2 or 4.
-   */
-  int nddcs() const;
-
-  /*!
-   *\brief does the FPGA implement the initial Tx half-band filter?
-   */
-  bool has_tx_halfband() const;
-
-  /*!
-   * \brief number of digital upconverters implemented in the FPGA
-   * This will be 0, 1, or 2.
-   */
-  int nducs() const;
-
-  /*!
-   * \brief Calculate the frequency to use for setting the digital up or down converter.
-   *
-   * \param target_freq is the desired RF frequency (Hz).
-   * \param baseband_freq is the RF frequency that corresponds to DC in the IF coming from the d'board.
-   * \param  fs is the sampling frequency.
-   * \param[out] dxc_freq the frequency to program into the DDC (or DUC).
-   * \param[out] inverted is true if we're operating in an inverted Nyquist zone.
-   */
-  static void calc_dxc_freq(double target_freq, double baseband_freq, double fs,
-			    double *dxc_freq, bool *inverted);
-};
-
-/*!
- * \brief The C++ interface the receive side of the USRP
- * \ingroup usrp
- *
- * This is the recommended interface to USRP receive functionality
- * for applications that use the USRP but not GNU Radio.
- */
-class usrp_standard_rx : public usrp_basic_rx, public usrp_standard_common
-{
- private:
-  static const int	MAX_CHAN = 4;
-  unsigned int		d_decim_rate;
-  int			d_nchan;
-  int			d_sw_mux;
-  int			d_hw_mux;
-  double		d_rx_freq[MAX_CHAN];
-
- protected:
-  usrp_standard_rx (int which_board,
-		    unsigned int decim_rate,
-		    int nchan = 1,
-		    int mux = -1,
-		    int mode = 0,
-		    int fusb_block_size = 0,
-		    int fusb_nblocks = 0,
-		    const std::string fpga_filename = "",
-		    const std::string firmware_filename = ""
-		    );  // throws if trouble
-
-  bool write_hw_mux_reg ();
-
- public:
-
-  enum {
-    FPGA_MODE_NORMAL     = 0x00,
-    FPGA_MODE_LOOPBACK   = 0x01,
-    FPGA_MODE_COUNTING   = 0x02,
-    FPGA_MODE_COUNTING_32BIT   = 0x04
-  };
-
-  ~usrp_standard_rx ();
-
-  /*!
-   * \brief invokes constructor, returns shared_ptr or shared_ptr equivalent of 0 if trouble
-   *
-   * \param which_board	     Which USRP board on usb (not particularly useful; use 0)
-   * \param decim_rate	     decimation factor
-   * \param nchan	     number of channels
-   * \param mux		     Rx mux setting, \sa set_mux
-   * \param mode	     mode
-   * \param fusb_block_size  fast usb xfer block size.  Must be a multiple of 512. 
-   *                         Use zero for a reasonable default.
-   * \param fusb_nblocks     number of fast usb URBs to allocate.  Use zero for a reasonable default. 
-   * \param fpga_filename    Name of rbf file to load
-   * \param firmware_filename Name of ihx file to load
-   */
-  static usrp_standard_rx_sptr make(int which_board,
-				    unsigned int decim_rate,
-				    int nchan = 1,
-				    int mux = -1,
-				    int mode = 0,
-				    int fusb_block_size = 0,
-				    int fusb_nblocks = 0,
-				    const std::string fpga_filename = "",
-				    const std::string firmware_filename = ""
-				    );
-  /*!
-   * \brief Set decimator rate.  \p rate MUST BE EVEN and in [8, 256].
-   *
-   * The final complex sample rate across the USB is
-   *   adc_freq () / decim_rate () * nchannels ()
-   */
-  bool set_decim_rate  (unsigned int rate);
-
-  /*!
-   * \brief Set number of active channels.  \p nchannels must be 1, 2 or 4.
-   *
-   * The final complex sample rate across the USB is
-   *   adc_freq () / decim_rate () * nchannels ()
-   */
-  bool set_nchannels (int nchannels);
-
-  /*!
-   * \brief Set input mux configuration.
-   *
-   * This determines which ADC (or constant zero) is connected to 
-   * each DDC input.  There are 4 DDCs.  Each has two inputs.
-   *
-   * <pre>
-   * Mux value:
-   *
-   *    3                   2                   1                       
-   *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   * +-------+-------+-------+-------+-------+-------+-------+-------+
-   * |   Q3  |   I3  |   Q2  |   I2  |   Q1  |   I1  |   Q0  |   I0  |
-   * +-------+-------+-------+-------+-------+-------+-------+-------+
-   *
-   * Each 4-bit I field is either 0,1,2,3
-   * Each 4-bit Q field is either 0,1,2,3 or 0xf (input is const zero)
-   * All Q's must be 0xf or none of them may be 0xf
-   * </pre>
-   */
-  bool set_mux  (int mux);
-
-  /*!
-   * Determine the appropriate Rx mux value as a function of the subdevice choosen
-   * and the characteristics of the respective daughterboard.
-   */
-  int determine_rx_mux_value(const usrp_subdev_spec &ss);
-  int determine_rx_mux_value(const usrp_subdev_spec &ss_a, const usrp_subdev_spec &ss_b);
-
-  /*!
-   * \brief set the frequency of the digital down converter.
-   *
-   * \p channel must be in the range [0,3].  \p freq is the center
-   * frequency in Hz.  \p freq may be either negative or postive.
-   * The frequency specified is quantized.  Use rx_freq to retrieve
-   * the actual value used.
-   */
-  bool set_rx_freq (int channel, double freq);  
-
-  /*!
-   * \brief set fpga mode
-   */
-  bool set_fpga_mode (int mode);
-
-  /*!
-   * \brief Set the digital down converter phase register.
-   *
-   * \param channel	which ddc channel [0, 3]
-   * \param phase	32-bit integer phase value.
-   */
-  bool set_ddc_phase(int channel, int phase);
-
-  /*!
-   * \brief Specify Rx data format.
-   *
-   * \param format	format specifier
-   *
-   * Rx data format control register
-   *
-   *     3                   2                   1                       
-   *   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   *  +-----------------------------------------+-+-+---------+-------+
-   *  |          Reserved (Must be zero)        |B|Q|  WIDTH  | SHIFT |
-   *  +-----------------------------------------+-+-+---------+-------+
-   *
-   *  SHIFT specifies arithmetic right shift [0, 15]
-   *  WIDTH specifies bit-width of I & Q samples across the USB [1, 16] (not all valid)
-   *  Q     if set deliver both I & Q, else just I
-   *  B     if set bypass half-band filter.
-   *
-   * Right now the acceptable values are:
-   *
-   *   B  Q  WIDTH  SHIFT
-   *   0  1    16     0
-   *   0  1     8     8
-   *
-   * More valid combos to come.
-   *
-   * Default value is 0x00000300  16-bits, 0 shift, deliver both I & Q.
-   */
-  bool set_format(unsigned int format);
-
-  static unsigned int make_format(int width=16, int shift=0,
-				  bool want_q=true, bool bypass_halfband=false);
-  static int format_width(unsigned int format);
-  static int format_shift(unsigned int format);
-  static bool format_want_q(unsigned int format);
-  static bool format_bypass_halfband(unsigned int format);
-
-  /*!
-   * \brief High-level "tune" method.  Works for the single channel case.
-   *
-   * This method adjusts both the daughterboard LO and the DDC so that
-   * target_freq ends up at DC in the complex baseband samples.
-   *
-   * \param chan  which DDC channel we're controlling (almost always 0).
-   * \param db    the daughterboard we're controlling.
-   * \param target_freq the RF frequency we want at DC in the complex baseband.
-   * \param[out] result details how the hardware was configured.
-   *
-   * \returns true iff everything was successful.
-   */
-  bool tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result *result);
-  
-
-  // ACCESSORS
-  unsigned int decim_rate () const;
-  double rx_freq (int channel) const;
-  int nchannels () const;
-  int mux () const;
-  unsigned int format () const;
-
-  // called in base class to derived class order
-  bool start ();
-  bool stop ();
-};
-
-// ----------------------------------------------------------------
-
-/*!
- * \brief The C++ interface the transmit side of the USRP
- * \ingroup usrp
- *
- * This is the recommended interface to USRP transmit functionality
- * for applications that use the USRP but not GNU Radio.
- *
- * Uses digital upconverter (coarse & fine modulators) in AD9862...
- */
-class usrp_standard_tx : public usrp_basic_tx, public usrp_standard_common
-{
- public:
-  enum coarse_mod_t {
-    CM_NEG_FDAC_OVER_4,		// -32 MHz
-    CM_NEG_FDAC_OVER_8,		// -16 MHz
-    CM_OFF,
-    CM_POS_FDAC_OVER_8,		// +16 MHz
-    CM_POS_FDAC_OVER_4		// +32 MHz
-  };
-
- protected:
-  static const int	MAX_CHAN = 2;
-  unsigned int		d_interp_rate;
-  int			d_nchan;
-  int			d_sw_mux;
-  int			d_hw_mux;
-  double		d_tx_freq[MAX_CHAN];
-  coarse_mod_t		d_coarse_mod[MAX_CHAN];
-  unsigned char		d_tx_modulator_shadow[MAX_CHAN];
-
-  virtual bool set_coarse_modulator (int channel, coarse_mod_t cm);
-  usrp_standard_tx::coarse_mod_t coarse_modulator (int channel) const;
-
- protected:
-  usrp_standard_tx (int which_board,
-		    unsigned int interp_rate,
-		    int nchan = 1,
-		    int	mux = -1,
-		    int fusb_block_size = 0,
-		    int fusb_nblocks = 0,
-		    const std::string fpga_filename = "",
-		    const std::string firmware_filename = ""
-		    );	// throws if trouble
-
-  bool write_hw_mux_reg ();
-
- public:
-  ~usrp_standard_tx ();
-
-  /*!
-   * \brief invokes constructor, returns shared_ptr or shared_ptr equivalent of 0 if trouble
-   *
-   * \param which_board	     Which USRP board on usb (not particularly useful; use 0)
-   * \param interp_rate	     interpolation factor
-   * \param nchan	     number of channels
-   * \param mux		     Tx mux setting, \sa set_mux
-   * \param fusb_block_size  fast usb xfer block size.  Must be a multiple of 512. 
-   *                         Use zero for a reasonable default.
-   * \param fusb_nblocks     number of fast usb URBs to allocate.  Use zero for a reasonable default. 
-   * \param fpga_filename    Name of rbf file to load
-   * \param firmware_filename Name of ihx file to load
-   */
-  static usrp_standard_tx_sptr make(int which_board,
-				    unsigned int interp_rate,
-				    int nchan = 1,
-				    int mux = -1,
-				    int fusb_block_size = 0,
-				    int fusb_nblocks = 0,
-				    const std::string fpga_filename = "",
-				    const std::string firmware_filename = ""
-				    );
-
-  /*!
-   * \brief Set interpolator rate.  \p rate must be in [4, 512] and a multiple of 4.
-   *
-   * The final complex sample rate across the USB is
-   *   dac_freq () / interp_rate () * nchannels ()
-   */
-  virtual bool set_interp_rate (unsigned int rate);
-
-  /*!
-   * \brief Set number of active channels.  \p nchannels must be 1 or 2.
-   *
-   * The final complex sample rate across the USB is
-   *   dac_freq () / decim_rate () * nchannels ()
-   */
-  bool set_nchannels  (int nchannels);
-
-  /*!
-   * \brief Set output mux configuration.
-   *
-   * <pre>
-   *     3                   2                   1                       
-   *   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   *  +-------------------------------+-------+-------+-------+-------+
-   *  |                               | DAC3  | DAC2  | DAC1  |  DAC0 |
-   *  +-------------------------------+-------+-------+-------+-------+
-   * 
-   *  There are two interpolators with complex inputs and outputs.
-   *  There are four DACs.
-   * 
-   *  Each 4-bit DACx field specifies the source for the DAC and
-   *  whether or not that DAC is enabled.  Each subfield is coded
-   *  like this: 
-   * 
-   *     3 2 1 0
-   *    +-+-----+
-   *    |E|  N  |
-   *    +-+-----+
-   * 
-   *  Where E is set if the DAC is enabled, and N specifies which
-   *  interpolator output is connected to this DAC.
-   * 
-   *   N   which interp output
-   *  ---  -------------------
-   *   0   chan 0 I
-   *   1   chan 0 Q
-   *   2   chan 1 I
-   *   3   chan 1 Q
-   * </pre>
-   */
-  bool set_mux  (int mux);
-
-  /*!
-   * Determine the appropriate Tx mux value as a function of the subdevice choosen
-   * and the characteristics of the respective daughterboard.
-   */
-  int determine_tx_mux_value(const usrp_subdev_spec &ss);
-  int determine_tx_mux_value(const usrp_subdev_spec &ss_a, const usrp_subdev_spec &ss_b);
-
-  /*!
-   * \brief set the frequency of the digital up converter.
-   *
-   * \p channel must be in the range [0,1].  \p freq is the center
-   * frequency in Hz.  It must be in the range [-44M, 44M].
-   * The frequency specified is quantized.  Use tx_freq to retrieve
-   * the actual value used.
-   */
-  virtual bool set_tx_freq (int channel, double freq);  // chan: [0,1]
-
-  // ACCESSORS
-  unsigned int interp_rate () const;
-  double tx_freq (int channel) const;
-  int nchannels () const;
-  int mux () const;
-
-  /*!
-   * \brief High-level "tune" method.  Works for the single channel case.
-   *
-   * This method adjusts both the daughterboard LO and the DUC so that
-   * DC in the complex baseband samples ends up at RF target_freq.
-   *
-   * \param chan  which DUC channel we're controlling (usually == which_side).
-   * \param db    the daughterboard we're controlling.
-   * \param target_freq the RF frequency we want our baseband translated to.
-   * \param[out] result details how the hardware was configured.
-   *
-   * \returns true iff everything was successful.
-   */
-  bool tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result *result);
-
-
-  // called in base class to derived class order
-  bool start ();
-  bool stop ();
-};
-
-#endif /* INCLUDED_USRP_STANDARD_H */
diff --git a/usrp/host/include/usrp/usrp_subdev_spec.h b/usrp/host/include/usrp/usrp_subdev_spec.h
deleted file mode 100644
index e841ff832..000000000
--- a/usrp/host/include/usrp/usrp_subdev_spec.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_USRP_SUBDEV_SPEC_H
-#define INCLUDED_USRP_SUBDEV_SPEC_H
-
-/*!
- * \brief specify a daughterboard and subdevice on a daughterboard.
- *
- * In the USRP1, there are two sides, A and B.
- *
- * A daughterboard generally implements a single subdevice, but may in
- * general implement any number of subdevices.  At this time, all daughterboards
- * with the exception of the Basic Rx and LF Rx implement a single subdevice.
- *
- * The Basic Rx and LF Rx implement 2 subdevices (soon 3).  Subdevice
- * 0 routes input RX-A to the DDC I input and routes a constant zero
- * to the DDC Q input.  Similarly, subdevice 1 routes input RX-B to
- * the DDC I input and routes a constant zero to the DDC Q
- * input.  Subdevice 2 (when implemented) will route RX-A to the DDC I
- * input and RX-B to the DDC Q input.
- */
-
-struct usrp_subdev_spec {
-  unsigned int	side;		// 0 -> A; 1 -> B
-  unsigned int	subdev;		// which subdevice (usually zero)
-
-  usrp_subdev_spec(unsigned int _side = 0, unsigned int _subdev = 0)
-    : side(_side), subdev(_subdev) {}
-};
-
-#endif /* INCLUDED_USRP_SUBDEV_SPEC_H */
diff --git a/usrp/host/include/usrp/usrp_tune_result.h b/usrp/host/include/usrp/usrp_tune_result.h
deleted file mode 100644
index 200541a37..000000000
--- a/usrp/host/include/usrp/usrp_tune_result.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_USRP_TUNE_RESULT_H
-#define INCLUDED_USRP_TUNE_RESULT_H
-
-class usrp_tune_result
-{
-public:
-  // RF frequency that corresponds to DC in the IF
-  double baseband_freq;
-
-  // frequency programmed into the DDC/DUC
-  double dxc_freq;
-
-  // residual frequency (typically < 0.01 Hz)
-  double residual_freq;
-
-  // is the spectrum inverted?
-  bool inverted;
-
-  usrp_tune_result(double baseband=0, double dxc=0, double residual=0, bool _inverted=false)
-    : baseband_freq(baseband), dxc_freq(dxc),
-      residual_freq(residual), inverted(_inverted) {}
-};
-
-#endif /* INCLUDED_USRP_TUNE_RESULT_H */
diff --git a/usrp/host/lib/.gitignore b/usrp/host/lib/.gitignore
deleted file mode 100644
index e0e4208db..000000000
--- a/usrp/host/lib/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/test_fusb
-/std_paths.h
-/usrp_dbid.py
-/usrp_dbid.h
-/usrp_dbid.cc
-/stamp-*
diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
deleted file mode 100644
index 96ab55821..000000000
--- a/usrp/host/lib/Makefile.am
+++ /dev/null
@@ -1,194 +0,0 @@
-#
-#  USRP - Universal Software Radio Peripheral
-#
-#  Copyright (C) 2003,2004,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
-#
-#  This program 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 of the License, or
-#  (at your option) any later version.
-#
-#  This program 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 this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Boston, MA  02110-1301  USA
-#
-
-include $(top_srcdir)/Makefile.common
-
-common_INCLUDES = $(USRP_INCLUDES) $(USB_INCLUDES)
-
-lib_LTLIBRARIES = libusrp.la
-
-libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) $(BOOST_LDFLAGS)
-
-libusrp_la_common_LIBADD = 		\
-	$(USB_LIBS) 			\
-	$(BOOST_THREAD_LIB)		\
-	../misc/libmisc.la
-
-# darwin fusb requires gruel (for threading)
-if FUSB_TECH_darwin
-AM_CPPFLAGS = $(GRUEL_INCLUDES) $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
-libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(GRUEL_LA)
-libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) -framework CoreFoundation
-else
-AM_CPPFLAGS = $(common_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES)
-libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
-libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS)
-endif
-
-EXTRA_DIST += 				\
-	std_paths.h.in			\
-	usrp_dbid.dat
-
-BUILT_SOURCES += $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
-
-BUILT_SOURCES += usrp_dbid.cc \
-		 usrp_dbid.py
-
-# ----------------------------------------------------------------
-# FUSB_TECH is set at configure time by way of
-#   usrp/config/usrp_fusb_tech.m4.
-#   It indicates which fast usb strategy we should be building.
-#   We currently implement "generic", "darwin", "win32" and "linux"
-
-
-generic_CODE = 				\
-	fusb_generic.cc			\
-	fusb_sysconfig_generic.cc	\
-	usrp_prims_libusb0.cc		
-
-darwin_CODE =				\
-	fusb_darwin.cc			\
-	fusb_sysconfig_darwin.cc 	\
-	README_OSX			\
-	circular_buffer.h		\
-	circular_linked_list.h		\
-	darwin_libusb.h			\
-	usrp_prims_libusb0.cc		
-
-
-win32_CODE =				\
-	fusb_win32.cc			\
-	fusb_sysconfig_win32.cc 	\
-	usrp_prims_libusb0.cc		
-
-
-linux_CODE =				\
-	fusb_linux.cc			\
-	fusb_sysconfig_linux.cc		\
-	usrp_prims_libusb0.cc		
-
-ra_wb_CODE =				\
-	fusb_ra_wb.cc			\
-	fusb_sysconfig_ra_wb.cc		\
-	usrp_prims_libusb0.cc		
-
-libusb1_CODE =				\
-	fusb_libusb1.cc			\
-	fusb_sysconfig_libusb1.cc	\
-	usrp_prims_libusb1.cc		
-
-#
-# include each <foo>_CODE entry here...
-#
-EXTRA_libusrp_la_SOURCES =		\
-	$(generic_CODE)			\
-	$(darwin_CODE)			\
-	$(win32_CODE)			\
-	$(linux_CODE)			\
-	$(ra_wb_CODE)			\
-	$(libusb1_CODE)
-
-# work around automake deficiency
-libusrp_la_common_SOURCES = 		\
-	fusb.cc				\
-	md5.c				\
-	usrp_basic.cc			\
-	usrp_config.cc			\
-	usrp_dbid.cc			\
-	usrp_local_sighandler.cc	\
-	usrp_prims_common.cc		\
-	usrp_standard.cc		\
-	db_wbxng_adf4350.cc		\
-	db_wbxng_adf4350_regs.cc	\
-	db_boards.cc			\
-	db_base.cc			\
-	db_basic.cc			\
-	db_bitshark_rx.cc		\
-	db_tv_rx.cc			\
-	db_tv_rx_mimo.cc		\
-	db_flexrf.cc			\
-	db_flexrf_mimo.cc		\
-	db_dbs_rx.cc			\
-	db_wbxng.cc			\
-	db_xcvr2450.cc			\
-	db_dtt754.cc			\
-	db_dtt768.cc			\
-	db_util.cc
-
-if FUSB_TECH_generic
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(generic_CODE)
-endif
-
-if FUSB_TECH_darwin
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(darwin_CODE)
-endif
-
-if FUSB_TECH_win32
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(win32_CODE)
-endif
-
-if FUSB_TECH_linux
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(linux_CODE)
-endif
-
-if FUSB_TECH_ra_wb
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(ra_wb_CODE)
-endif
-
-if FUSB_TECH_libusb1
-libusrp_la_SOURCES = $(libusrp_la_common_SOURCES) $(libusb1_CODE)
-endif
-
-
-noinst_HEADERS =			\
-	ad9862.h			\
-	db_base_impl.h			\
-	db_boards.h			\
-	db_util.h			\
-	db_wbxng_adf4350.h		\
-	db_wbxng_adf4350_regs.h		\
-	fusb.h				\
-	fusb_darwin.h			\
-	fusb_generic.h			\
-	fusb_linux.h			\
-	fusb_libusb1.h			\
-	fusb_ra_wb.h			\
-	fusb_win32.h			\
-	md5.h				\
-	rate_to_regval.h		\
-	usrp_config.h			\
-	usrp_primsi.h
-
-if PYTHON
-usrppython_PYTHON =			\
-	usrp_dbid.py			
-
-noinst_PYTHON =				\
-	gen_usrp_dbid.py		\
-	check_data.py			\
-	dump_data.py
-endif
-
-# common way for generating sources from templates when using
-# BUILT_SOURCES, using parallel build protection.
-gen_sources = $(BUILT_SOURCES)
-gen_sources_deps = gen_usrp_dbid.py usrp_dbid.dat
-par_gen_command = PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) $(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat
-include $(top_srcdir)/Makefile.par.gen
diff --git a/usrp/host/lib/README_OSX b/usrp/host/lib/README_OSX
deleted file mode 100644
index 37026f25a..000000000
--- a/usrp/host/lib/README_OSX
+++ /dev/null
@@ -1,63 +0,0 @@
-USRP Darwin Fast USB Changes
-Version 0.2 of 2006-04-27
-Michael Dickens <mdickens @at@ nd .dot. edu>
-
-The files included in this archive are:
-
-circular_buffer.h
-circular_linked_list.h
-darwin_libusb.h
-fusb_darwin.cc
-fusb_darwin.h
-mld_threads.h
-
-These files allow GNURadio code for Darwin / MaxOS X to talk to the
-USRP via USB 2.0 at rates up to around 30 Mega-Bytes/sec (MBps), up
-from 4-8 MBps without the changes.
-
-I implemented the buffering myself; there are probably GR buffers
-available which would do the work but as this is "beta" software it's
-a good place to start.  Speed improvements are made by porting
-LIBUSB's non-true async bulk read and write functions into USRP's
-"fusb", and upgrading them to handle -true- async transfers.
-Unfortunately, the easiest way to do this is to spawn a thread or 2 to
-handle the "async" part of the transfers.  This implementation uses
-Darwin's pthreads to do the work for mutexes, conditions, and threads.
-Previous implementations (0.1 and before) used "omni_threads" as
-provided by gnuradio-core, which caused issues with compiling and
-execution ... I'm glad that this is no longer the case.
-
-As far as I have tested, there is no way to improve the throughput to
-32+ MBps without moving into Darwin's "port"s ... a kernel-level data
-transport method with a user/application layer for USB-specific
-functions.  Unfortunately, Apple's documentation for these "port"s is
-minimal; I have learned more from reading the Darwin source code
-< http://darwinsource.opendarwin.org/ > than by reading Apple's
-documents!  This would also require -not- using LIBUSB, of which the
-removal from the rest of the USRP code would be potentially tedious.
-
-If you run into issues either compiling or testing the USRP on
-OSX, please send me a note.
-
-(1) Go through the bootstrap, configure, compile, and install as
-usual (e.g. see < http://www.nd.edu/~mdickens/GNURadio/ > for my
-usual).
-
-(2) from .../usrp/host/apps :  run the scripts
-++++++++++++++++
-./test_usrp_standard_tx
-./test_usrp_standard_rx
-++++++++++++++++
-
-For -all- systems I've tested on thus far, both of these return
-exactly 41 overruns / underruns, and -most- systems start out with a
-stalled pipe.  This stall comes in a usb_control function call to
-LIBUSB; one would have to change the LIBUSB code to handle this issue.
-
-(3) from gr-build/gnuradio-examples/python/usrp :
-++++++++++++++++
-./benchmark_usb.py
-++++++++++++++++
-
-(4) If you get to here, the try doing the FM receiver (gui or not).
-If that sounds correct, then the USB is working.  Yay!
\ No newline at end of file
diff --git a/usrp/host/lib/ad9862.h b/usrp/host/lib/ad9862.h
deleted file mode 100644
index 4375d93d8..000000000
--- a/usrp/host/lib/ad9862.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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_AD9862_H
-#define INCLUDED_AD9862_H
-
-/*
- * Analog Devices AD9862 registers and some fields
- */
-
-#define BEGIN_AD9862	namespace ad9862 {
-#define	END_AD962	}
-#define	DEF static const int
-
-BEGIN_AD9862;
-
-DEF REG_GENERAL		=  0;
-DEF REG_RX_PWR_DN	=  1;
-DEF	RX_PWR_DN_VREF_DIFF		= (1 << 7);
-DEF	RX_PWR_DN_VREF			= (1 << 6);
-DEF	RX_PWR_DN_RX_DIGIGAL		= (1 << 5);
-DEF	RX_PWR_DN_RX_B			= (1 << 4);
-DEF	RX_PWR_DN_RX_A			= (1 << 3);
-DEF	RX_PWR_DN_BUF_B			= (1 << 2);
-DEF	RX_PWR_DN_BUF_A			= (1 << 1);
-DEF	RX_PWR_DN_ALL			= (1 << 0);
-
-DEF REG_RX_A		=  2;	// bypass input buffer / RxPGA
-DEF REG_RX_B		=  3;	// pypass input buffer / RxPGA
-DEF	RX_X_BYPASS_INPUT_BUFFER	= (1 << 7);
-
-DEF REG_RX_MISC		=  4;
-DEF	RX_MISC_HS_DUTY_CYCLE		= (1 << 2);
-DEF	RX_MISC_SHARED_REF		= (1 << 1);
-DEF	RX_MISC_CLK_DUTY		= (1 << 0);
-
-DEF REG_RX_IF		=  5;
-DEF	RX_IF_THREE_STATE		= (1 << 4);
-DEF	RX_IF_USE_CLKOUT1		= (0 << 3);	
-DEF	RX_IF_USE_CLKOUT2		= (1 << 3);	// aka Rx Retime
-DEF	RX_IF_2S_COMP			= (1 << 2);
-DEF	RX_IF_INV_RX_SYNC		= (1 << 1);
-DEF	RX_IF_MUX_OUT			= (1 << 0);
-
-DEF REG_RX_DIGITAL	=  6;
-DEF	RX_DIGITAL_2_CHAN		= (1 << 3);
-DEF	RX_DIGITAL_KEEP_MINUS_VE	= (1 << 2);
-DEF	RX_DIGITAL_HILBERT		= (1 << 1);
-DEF	RX_DIGITAL_DECIMATE		= (1 << 0);
-
-DEF REG_RESERVED_7	=  7;
-
-DEF REG_TX_PWR_DN	=  8;
-DEF	TX_PWR_DN_ALT_TIMING_MODE	= (1 << 5);
-DEF	TX_PWR_DN_TX_OFF_ENABLE		= (1 << 4);
-DEF	TX_PWR_DN_TX_DIGITAL		= (1 << 3);
-DEF	TX_PWR_DN_TX_ANALOG_B		= 0x4;
-DEF	TX_PWR_DN_TX_ANALOG_A		= 0x2;
-DEF	TX_PWR_DN_TX_ANALOG_BOTH	= 0x7;
-
-DEF REG_RESERVED_9	=  9;
-
-DEF REG_TX_A_OFFSET_LO	= 10;
-DEF REG_TX_A_OFFSET_HI	= 11;
-DEF REG_TX_B_OFFSET_LO	= 12;
-DEF REG_TX_B_OFFSET_HI	= 13;
-
-DEF REG_TX_A_GAIN	= 14;	// fine trim for matching
-DEF REG_TX_B_GAIN	= 15;	// fine trim for matching
-DEF	TX_X_GAIN_COARSE_FULL		= (3 << 6);
-DEF	TX_X_GAIN_COARSE_1_HALF		= (1 << 6);
-DEF	TX_X_GAIN_COARSE_1_ELEVENTH	= (0 << 6);
-
-DEF REG_TX_PGA		= 16;	// 20 dB continuous gain in 0.1 dB steps
-				// 0x00 = min gain (-20 dB)
-				// 0xff = max gain (  0 dB)
-
-DEF REG_TX_MISC		= 17;
-DEF	TX_MISC_SLAVE_ENABLE		= (1 << 1);
-DEF	TX_MISC_TX_PGA_FAST		= (1 << 0);
-
-DEF REG_TX_IF		= 18;
-DEF	TX_IF_USE_CLKOUT2		= (0 << 6);
-DEF	TX_IF_USE_CLKOUT1		= (1 << 6);	// aka Tx Retime
-DEF	TX_IF_I_FIRST			= (0 << 5);
-DEF	TX_IF_Q_FIRST			= (1 << 5);
-DEF	TX_IF_INV_TX_SYNC		= (1 << 4);
-DEF	TX_IF_2S_COMP			= (1 << 3);
-DEF	TX_IF_INVERSE_SAMPLE		= (1 << 2);
-DEF	TX_IF_TWO_EDGES			= (1 << 1);
-DEF	TX_IF_INTERLEAVED		= (1 << 0);
-
-DEF REG_TX_DIGITAL	= 19;
-DEF	TX_DIGITAL_2_DATA_PATHS		= (1 << 4);
-DEF	TX_DIGITAL_KEEP_NEGATIVE	= (1 << 3);
-DEF	TX_DIGITAL_HILBERT		= (1 << 2);
-DEF	TX_DIGITAL_INTERPOLATE_NONE	= 0x0;
-DEF	TX_DIGITAL_INTERPOLATE_2X	= 0x1;
-DEF	TX_DIGITAL_INTERPOLATE_4X	= 0x2;
-
-DEF REG_TX_MODULATOR	= 20;
-DEF	TX_MODULATOR_NEG_FINE_TUNE	= (1 << 5);
-DEF	TX_MODULATOR_DISABLE_NCO	= (0 << 4);
-DEF	TX_MODULATOR_ENABLE_NCO		= (1 << 4);	// aka Fine Mode
-DEF	TX_MODULATOR_REAL_MIX_MODE	= (1 << 3);
-DEF	TX_MODULATOR_NEG_COARSE_TUNE	= (1 << 2);
-DEF	TX_MODULATOR_COARSE_MODULATION_NONE	= 0x0;
-DEF	TX_MODULATOR_COARSE_MODULATION_F_OVER_4	= 0x1;
-DEF	TX_MODULATOR_COARSE_MODULATION_F_OVER_8 = 0x2;
-DEF	TX_MODULATOR_CM_MASK		        = 0x7;
-
-
-DEF REG_TX_NCO_FTW_7_0	= 21;
-DEF REG_TX_NCO_FTW_15_8	= 22;
-DEF REG_TX_NCO_FTW_23_16= 23;
-
-DEF REG_DLL		= 24;
-DEF	DLL_DISABLE_INTERNAL_XTAL_OSC	= (1 << 6);	// aka Input Clock Ctrl
-DEF	DLL_ADC_DIV2			= (1 << 5);
-DEF	DLL_MULT_1X			= (0 << 3);
-DEF	DLL_MULT_2X			= (1 << 3);
-DEF	DLL_MULT_4X			= (2 << 3);
-DEF	DLL_PWR_DN			= (1 << 2);
-// undefined bit			= (1 << 1);
-DEF	DLL_FAST			= (1 << 0);
-
-DEF REG_CLKOUT		= 25;
-DEF	CLKOUT2_EQ_DLL			= (0 << 6);
-DEF	CLKOUT2_EQ_DLL_OVER_2		= (1 << 6);
-DEF	CLKOUT2_EQ_DLL_OVER_4		= (2 << 6);
-DEF	CLKOUT2_EQ_DLL_OVER_8		= (3 << 6);
-DEF	CLKOUT_INVERT_CLKOUT2		= (1 << 5);
-DEF	CLKOUT_DISABLE_CLKOUT2		= (1 << 4);
-// undefined bit			= (1 << 3);
-// undefined bit			= (1 << 2);
-DEF	CLKOUT_INVERT_CLKOUT1		= (1 << 1);
-DEF	CLKOUT_DISABLE_CLKOUT1		= (1 << 0);
-
-DEF REG_AUX_ADC_A2_LO	= 26;
-DEF REG_AUX_ADC_A2_HI	= 27;
-DEF REG_AUX_ADC_A1_LO	= 28;
-DEF REG_AUX_ADC_A1_HI	= 29;
-DEF REG_AUX_ADC_B2_LO	= 30;
-DEF REG_AUX_ADC_B2_HI	= 31;
-DEF REG_AUX_ADC_B1_LO	= 32;
-DEF REG_AUX_ADC_B1_HI	= 33;
-
-DEF REG_AUX_ADC_CTRL	= 34;
-DEF	AUX_ADC_CTRL_AUX_SPI		= (1 << 7);
-DEF	AUX_ADC_CTRL_SELBNOTA		= (1 << 6);
-DEF	AUX_ADC_CTRL_REFSEL_B		= (1 << 5);
-DEF	AUX_ADC_CTRL_SELECT_B2 		= (0 << 4);
-DEF	AUX_ADC_CTRL_SELECT_B1		= (1 << 4);
-DEF	AUX_ADC_CTRL_START_B		= (1 << 3);
-DEF	AUX_ADC_CTRL_REFSEL_A		= (1 << 2);
-DEF	AUX_ADC_CTRL_SELECT_A2		= (0 << 1);
-DEF	AUX_ADC_CTRL_SELECT_A1		= (1 << 1);
-DEF	AUX_ADC_CTRL_START_A   		= (1 << 0);
-
-DEF REG_AUX_ADC_CLK	= 35;
-DEF	AUX_ADC_CLK_CLK_OVER_4		= (1 << 0);
-
-DEF REG_AUX_DAC_A	= 36;
-DEF REG_AUX_DAC_B	= 37;
-DEF REG_AUX_DAC_C	= 38;
-
-DEF REG_AUX_DAC_UPDATE	= 39;
-DEF	AUX_DAC_UPDATE_SLAVE_ENABLE	= (1 << 7);
-DEF	AUX_DAC_UPDATE_C		= (1 << 2);
-DEF	AUX_DAC_UPDATE_B		= (1 << 1);
-DEF	AUX_DAC_UPDATE_A		= (1 << 0);
-
-DEF REG_AUX_DAC_PWR_DN	= 40;
-DEF	AUX_DAC_PWR_DN_C		= (1 << 2);
-DEF	AUX_DAC_PWR_DN_B		= (1 << 1);
-DEF	AUX_DAC_PWR_DN_A		= (1 << 0);
-
-DEF REG_AUX_DAC_CTRL	= 41;
-DEF	AUX_DAC_CTRL_INV_C		= (1 << 4);
-DEF	AUX_DAC_CTRL_INV_B		= (1 << 2);
-DEF	AUX_DAC_CTRL_INV_A		= (1 << 0);
-
-DEF REG_SIGDELT_LO	= 42;
-DEF REG_SIGDELT_HI	= 43;
-
-// 44 to 48 reserved
-
-DEF REG_ADC_LOW_PWR_LO	= 49;
-DEF REG_ADC_LOW_PWR_HI	= 50;
-
-// 51 to 62 reserved
-
-DEF REG_CHIP_ID		= 63;
-
-
-END_AD962;
-
-#undef DEF
-#undef BEGIN_AD9862
-#undef END_AD962
-
-#endif /* INCLUDED_AD9862_H */
diff --git a/usrp/host/lib/check_data.py b/usrp/host/lib/check_data.py
deleted file mode 100755
index 100f0f6dd..000000000
--- a/usrp/host/lib/check_data.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2003 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.
-
-import sys
-import struct
-
-fin = sys.stdin
-
-count = 0
-expected = 0
-last_correction = 0
-
-while 1:
-    s = fin.read(2)
-    if not s or len(s) != 2:
-        break
-
-    v, = struct.unpack ('H', s)
-    iv = int(v) & 0xffff
-    # print "%8d  %6d  0x%04x" % (count, iv, iv)
-    if count & 0x1:                     # only counting on the Q channel
-        if (expected & 0xffff) != iv:
-            print "%8d  (%6d) %6d  0x%04x" % (count, count - last_correction, iv, iv)
-            expected = iv               # reset expected sequence
-            last_correction = count
-        expected = (expected + 1) & 0xffff 
-        
-    count += 1
-
-    
-
-
diff --git a/usrp/host/lib/circular_buffer.h b/usrp/host/lib/circular_buffer.h
deleted file mode 100644
index 48758bf87..000000000
--- a/usrp/host/lib/circular_buffer.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2009,2010 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 _CIRCULAR_BUFFER_H_
-#define _CIRCULAR_BUFFER_H_
-
-#include <gruel/thread.h>
-#include <iostream>
-#include <stdexcept>
-
-#ifndef DO_DEBUG
-#define DO_DEBUG 0
-#endif
-
-#if DO_DEBUG
-#define DEBUG(X) do{X} while(0);
-#else
-#define DEBUG(X) do{} while(0);
-#endif
-
-template <class T>
-class circular_buffer
-{
-private:
-// the buffer to use
-  T* d_buffer;
-
-// the following are in Items (type T)
-  size_t d_bufLen_I, d_readNdx_I, d_writeNdx_I;
-  size_t d_n_avail_write_I, d_n_avail_read_I;
-
-// stuff to control access to class internals
-  gruel::mutex* d_internal;
-  gruel::condition_variable* d_readBlock;
-  gruel::condition_variable* d_writeBlock;
-
-// booleans to decide how to control reading, writing, and aborting
-  bool d_doWriteBlock, d_doFullRead, d_doAbort;
-
-  void delete_mutex_cond () {
-    if (d_internal) {
-      delete d_internal;
-      d_internal = NULL;
-    }
-    if (d_readBlock) {
-      delete d_readBlock;
-      d_readBlock = NULL;
-    }
-    if (d_writeBlock) {
-      delete d_writeBlock;
-      d_writeBlock = NULL;
-    }
-  };
-
-public:
-  circular_buffer (size_t bufLen_I,
-		   bool doWriteBlock = true, bool doFullRead = false) {
-    if (bufLen_I == 0)
-      throw std::runtime_error ("circular_buffer(): "
-				"Number of items to buffer must be > 0.\n");
-    d_bufLen_I = bufLen_I;
-    d_buffer = (T*) new T[d_bufLen_I];
-    d_doWriteBlock = doWriteBlock;
-    d_doFullRead = doFullRead;
-    d_internal = NULL;
-    d_readBlock = d_writeBlock = NULL;
-    reset ();
-    DEBUG (std::cerr << "c_b(): buf len (items) = " << d_bufLen_
-	   << ", doWriteBlock = " << (d_doWriteBlock ? "true" : "false")
-	   << ", doFullRead = " << (d_doFullRead ? "true" : "false")
-	   << std::endl);
-  };
-
-  ~circular_buffer () {
-    delete_mutex_cond ();
-    delete [] d_buffer;
-  };
-
-  inline size_t n_avail_write_items () {
-    gruel::scoped_lock l (*d_internal);
-    size_t retVal = d_n_avail_write_I;
-    return (retVal);
-  };
-
-  inline size_t n_avail_read_items () {
-    gruel::scoped_lock l (*d_internal);
-    size_t retVal = d_n_avail_read_I;
-    return (retVal);
-  };
-
-  inline size_t buffer_length_items () {return (d_bufLen_I);};
-  inline bool do_write_block () {return (d_doWriteBlock);};
-  inline bool do_full_read () {return (d_doFullRead);};
-
-  void reset () {
-    d_doAbort = false;
-    bzero (d_buffer, d_bufLen_I * sizeof (T));
-    d_readNdx_I = d_writeNdx_I = d_n_avail_read_I = 0;
-    d_n_avail_write_I = d_bufLen_I;
-    delete_mutex_cond ();
-    // create a mutex to handle contention of shared resources;
-    // any routine needed access to shared resources uses lock()
-    // before doing anything, then unlock() when finished.
-    d_internal = new gruel::mutex ();
-    // link the internal mutex to the read and write conditions;
-    // when wait() is called, the internal mutex will automatically
-    // be unlock()'ed.  Upon return (from a notify_one() to the condition),
-    // the internal mutex will be lock()'ed.
-    d_readBlock = new gruel::condition_variable ();
-    d_writeBlock = new gruel::condition_variable ();
-  };
-
-/*
- * enqueue: add the given buffer of item-length to the queue,
- *     first-in-first-out (FIFO).
- *
- * inputs:
- *     buf: a pointer to the buffer holding the data
- *
- *     bufLen_I: the buffer length in items (of the instantiated type)
- *
- * returns:
- *    -1: on overflow (write is not blocking, and data is being
- *                     written faster than it is being read)
- *     0: if nothing to do (0 length buffer)
- *     1: if success
- *     2: in the process of aborting, do doing nothing
- *
- * will throw runtime errors if inputs are improper:
- *     buffer pointer is NULL
- *     buffer length is larger than the instantiated buffer length
- */
-
-  int enqueue (T* buf, size_t bufLen_I) {
-    DEBUG (std::cerr << "enqueue: buf = " << (void*) buf
-	   << ", bufLen = " << bufLen_I
-	   << ", #av_wr = " << d_n_avail_write_I
-	   << ", #av_rd = " << d_n_avail_read_I << std::endl);
-    if (bufLen_I > d_bufLen_I) {
-      std::cerr << "ERROR: cannot add buffer longer ("
-		<< bufLen_I << ") than instantiated length ("
-		<< d_bufLen_I << ")." << std::endl;
-      throw std::runtime_error ("circular_buffer::enqueue()");
-    }
-
-    if (bufLen_I == 0)
-      return (0);
-    if (!buf)
-      throw std::runtime_error ("circular_buffer::enqueue(): "
-				"input buffer is NULL.\n");
-    gruel::scoped_lock l (*d_internal);
-    if (d_doAbort) {
-      return (2);
-    }
-    // set the return value to 1: success; change if needed
-    int retval = 1;
-    if (bufLen_I > d_n_avail_write_I) {
-      if (d_doWriteBlock) {
-	while (bufLen_I > d_n_avail_write_I) {
-	  DEBUG (std::cerr << "enqueue: #len > #a, waiting." << std::endl);
-	  // wait; will automatically unlock() the internal mutex via
-	  // the scoped lock
-	  d_writeBlock->wait (l);
-	  // and auto re-lock() it here.
-	  if (d_doAbort) {
-	    DEBUG (std::cerr << "enqueue: #len > #a, aborting." << std::endl);
-	    return (2);
-	  }
-	  DEBUG (std::cerr << "enqueue: #len > #a, done waiting." << std::endl);
-	}
-      } else {
-	d_n_avail_read_I = d_bufLen_I - bufLen_I;
-	d_n_avail_write_I = bufLen_I;
-	DEBUG (std::cerr << "circular_buffer::enqueue: overflow" << std::endl);
-	retval = -1;
-      }
-    }
-    size_t n_now_I = d_bufLen_I - d_writeNdx_I, n_start_I = 0;
-    if (n_now_I > bufLen_I)
-      n_now_I = bufLen_I;
-    else if (n_now_I < bufLen_I)
-      n_start_I = bufLen_I - n_now_I;
-    bcopy (buf, &(d_buffer[d_writeNdx_I]), n_now_I * sizeof (T));
-    if (n_start_I) {
-      bcopy (&(buf[n_now_I]), d_buffer, n_start_I * sizeof (T));
-      d_writeNdx_I = n_start_I;
-    } else
-      d_writeNdx_I += n_now_I;
-    d_n_avail_read_I += bufLen_I;
-    d_n_avail_write_I -= bufLen_I;
-    d_readBlock->notify_one ();
-    return (retval);
-  };
-
-/*
- * dequeue: removes from the queue the number of items requested, or
- *     available, into the given buffer on a FIFO basis.
- *
- * inputs:
- *     buf: a pointer to the buffer into which to copy the data
- *
- *     bufLen_I: pointer to the number of items to remove in items
- *         (of the instantiated type)
- *
- * returns:
- *     0: if nothing to do (0 length buffer)
- *     1: if success
- *     2: in the process of aborting, do doing nothing
- *
- * will throw runtime errors if inputs are improper:
- *     buffer pointer is NULL
- *     buffer length pointer is NULL
- *     buffer length is larger than the instantiated buffer length
- */
-
-  int dequeue (T* buf, size_t* bufLen_I) {
-    DEBUG (std::cerr << "dequeue: buf = " << ((void*) buf)
-	   << ", *bufLen = " << (*bufLen_I)
-	   << ", #av_wr = " <<  d_n_avail_write_I
-	   << ", #av_rd = " << d_n_avail_read_I << std::endl);
-    if (!bufLen_I)
-      throw std::runtime_error ("circular_buffer::dequeue(): "
-				"input bufLen pointer is NULL.\n");
-    if (!buf)
-      throw std::runtime_error ("circular_buffer::dequeue(): "
-				"input buffer pointer is NULL.\n");
-    size_t l_bufLen_I = *bufLen_I;
-    if (l_bufLen_I == 0)
-      return (0);
-    if (l_bufLen_I > d_bufLen_I) {
-      std::cerr << "ERROR: cannot remove buffer longer ("
-		<< l_bufLen_I << ") than instantiated length ("
-		<< d_bufLen_I << ")." << std::endl;
-      throw std::runtime_error ("circular_buffer::dequeue()");
-    }
-
-    gruel::scoped_lock l (*d_internal);
-    if (d_doAbort) {
-      return (2);
-    }
-    if (d_doFullRead) {
-      while (d_n_avail_read_I < l_bufLen_I) {
-	DEBUG (std::cerr << "dequeue: #a < #len, waiting." << std::endl);
-	// wait; will automatically unlock() the internal mutex via
-	// the scoped lock
-	d_readBlock->wait (l);
-	// and re-lock() it here.
-	if (d_doAbort) {
-	  DEBUG (std::cerr << "dequeue: #a < #len, aborting." << std::endl);
-	  return (2);
-	}
-	DEBUG (std::cerr << "dequeue: #a < #len, done waiting." << std::endl);
-     }
-    } else {
-      while (d_n_avail_read_I == 0) {
-	DEBUG (std::cerr << "dequeue: #a == 0, waiting." << std::endl);
-	// wait; will automatically unlock() the internal mutex via
-	// the scoped lock
-	d_readBlock->wait (l);
-	// and re-lock() it here.
-	if (d_doAbort) {
-	  DEBUG (std::cerr << "dequeue: #a == 0, aborting." << std::endl);
-	  return (2);
-	}
-	DEBUG (std::cerr << "dequeue: #a == 0, done waiting." << std::endl);
-      }
-    }
-    if (l_bufLen_I > d_n_avail_read_I)
-      l_bufLen_I = d_n_avail_read_I;
-    size_t n_now_I = d_bufLen_I - d_readNdx_I, n_start_I = 0;
-    if (n_now_I > l_bufLen_I)
-      n_now_I = l_bufLen_I;
-    else if (n_now_I < l_bufLen_I)
-      n_start_I = l_bufLen_I - n_now_I;
-    bcopy (&(d_buffer[d_readNdx_I]), buf, n_now_I * sizeof (T));
-    if (n_start_I) {
-      bcopy (d_buffer, &(buf[n_now_I]), n_start_I * sizeof (T));
-      d_readNdx_I = n_start_I;
-    } else
-      d_readNdx_I += n_now_I;
-    *bufLen_I = l_bufLen_I;
-    d_n_avail_read_I -= l_bufLen_I;
-    d_n_avail_write_I += l_bufLen_I;
-    d_writeBlock->notify_one ();
-    return (1);
-  };
-
-  void abort () {
-    gruel::scoped_lock l (*d_internal);
-    d_doAbort = true;
-    d_writeBlock->notify_one ();
-    d_readBlock->notify_one ();
-  };
-};
-
-#endif /* _CIRCULAR_BUFFER_H_ */
diff --git a/usrp/host/lib/circular_linked_list.h b/usrp/host/lib/circular_linked_list.h
deleted file mode 100644
index bbed5e49b..000000000
--- a/usrp/host/lib/circular_linked_list.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2009,2010 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 _CIRCULAR_LINKED_LIST_H_
-#define _CIRCULAR_LINKED_LIST_H_
-
-#include <gruel/thread.h>
-#include <stdexcept>
-
-#define __INLINE__ inline
-
-#ifndef DO_DEBUG
-#define DO_DEBUG 0
-#endif
-
-#if DO_DEBUG
-#define DEBUG(X) do{X} while(0);
-#else
-#define DEBUG(X) do{} while(0);
-#endif
-
-template <class T> class s_both;
-
-template <class T> class s_node
-{
-  typedef s_node<T>* s_node_ptr;
-
-private:
-  T d_object;
-  bool d_available;
-  s_node_ptr d_prev, d_next;
-  s_both<T>* d_both;
-
-public:
-  s_node (T l_object,
-	  s_node_ptr l_prev = NULL,
-	  s_node_ptr l_next = NULL)
-    : d_object (l_object), d_available (TRUE), d_prev (l_prev),
-    d_next (l_next), d_both (0) {};
-
-  __INLINE__ s_node (s_node_ptr l_prev, s_node_ptr l_next = NULL) {
-    s_node ((T) NULL, l_prev, l_next); };
-  __INLINE__ s_node () { s_node (NULL, NULL, NULL); };
-  __INLINE__ ~s_node () {};
-
-  void remove () {
-    d_prev->next (d_next);
-    d_next->prev (d_prev);
-    d_prev = d_next = this;
-  };
-
-  void insert_before (s_node_ptr l_next) {
-    if (l_next) {
-      s_node_ptr l_prev = l_next->prev ();
-      d_next = l_next;
-      d_prev = l_prev;
-      l_prev->next (this);
-      l_next->prev (this);
-    } else
-      d_next = d_prev = this;
-  };
-
-  void insert_after (s_node_ptr l_prev) {
-    if (l_prev) {
-      s_node_ptr l_next = l_prev->next ();
-      d_prev = l_prev;
-      d_next = l_next;
-      l_next->prev (this);
-      l_prev->next (this);
-    } else
-      d_prev = d_next = this;
-  };
-
-  __INLINE__ T object () { return (d_object); };
-  __INLINE__ void object (T l_object) { d_object = l_object; };
-  __INLINE__ bool available () { return (d_available); };
-  __INLINE__ void set_available () { d_available = TRUE; };
-  __INLINE__ void set_available (bool l_avail) { d_available = l_avail; };
-  __INLINE__ void set_not_available () { d_available = FALSE; };
-  __INLINE__ s_node_ptr next () { return (d_next); };
-  __INLINE__ s_node_ptr prev () { return (d_prev); };
-  __INLINE__ s_both<T>* both () { return (d_both); };
-  __INLINE__ void next (s_node_ptr l_next) { d_next = l_next; };
-  __INLINE__ void prev (s_node_ptr l_prev) { d_prev = l_prev; };
-  __INLINE__ void both (s_both<T>* l_both) { d_both = l_both; };
-};
-
-template <class T> class circular_linked_list {
-  typedef s_node<T>* s_node_ptr;
-
-private:
-  s_node_ptr d_current, d_iterate, d_available, d_inUse;
-  size_t d_n_nodes, d_n_used;
-  gruel::mutex* d_internal;
-  gruel::condition_variable* d_ioBlock;
-
-public:
-  circular_linked_list (size_t n_nodes) {
-    if (n_nodes == 0)
-      throw std::runtime_error ("circular_linked_list(): n_nodes == 0");
-
-    d_iterate = NULL;
-    d_n_nodes = n_nodes;
-    d_n_used = 0;
-    s_node_ptr l_prev, l_next;
-    d_inUse = d_current = l_next = l_prev = NULL;
-
-    l_prev = new s_node<T> ();
-    l_prev->set_available ();
-    l_prev->next (l_prev);
-    l_prev->prev (l_prev);
-    if (n_nodes > 1) {
-      l_next = new s_node<T> (l_prev, l_prev);
-      l_next->set_available ();
-      l_next->next (l_prev);
-      l_next->prev (l_prev);
-      l_prev->next (l_next);
-      l_prev->prev (l_next);
-      if (n_nodes > 2) {
-	size_t n = n_nodes - 2;
-	while (n-- > 0) {
-	  d_current = new s_node<T> (l_prev, l_next);
-	  d_current->set_available ();
-	  d_current->prev (l_prev);
-	  d_current->next (l_next);
-	  l_prev->next (d_current);
-	  l_next->prev (d_current);
-	  l_next = d_current;
-	  d_current = NULL;
-	}
-      }
-    }
-    d_available = d_current = l_prev;
-    d_ioBlock = new gruel::condition_variable ();
-    d_internal = new gruel::mutex ();
-  };
-
-  ~circular_linked_list () {
-    iterate_start ();
-    s_node_ptr l_node = iterate_next ();
-    while (l_node) {
-      delete l_node;
-      l_node = iterate_next ();
-    }
-    delete d_ioBlock;
-    d_ioBlock = NULL;
-    delete d_internal;
-    d_internal = NULL;
-    d_available = d_inUse = d_iterate = d_current = NULL;
-    d_n_used = d_n_nodes = 0;
-  };
-
-  s_node_ptr find_next_available_node () {
-    gruel::scoped_lock l (*d_internal);
-// find an available node
-    s_node_ptr l_node = d_available; 
-    DEBUG (std::cerr << "w ");
-    while (! l_node) {
-      DEBUG (std::cerr << "x" << std::endl);
-      // the ioBlock condition will automatically unlock() d_internal
-      d_ioBlock->wait (l);
-      // and lock() is here
-      DEBUG (std::cerr << "y" << std::endl);
-      l_node = d_available;
-    }
-    DEBUG (std::cerr << "::f_n_a_n: #u = " << num_used()
-	   << ", node = " << l_node << std::endl);
-// remove this one from the current available list
-    if (num_available () == 1) {
-// last one, just set available to NULL
-      d_available = NULL;
-    } else
-      d_available = l_node->next ();
-    l_node->remove ();
-// add is to the inUse list
-    if (! d_inUse)
-      d_inUse = l_node;
-    else
-      l_node->insert_before (d_inUse);
-    d_n_used++;
-    l_node->set_not_available ();
-    return (l_node);
-  };
-
-  void make_node_available (s_node_ptr l_node) {
-    if (!l_node) return;
-    gruel::scoped_lock l (*d_internal);
-    DEBUG (std::cerr << "::m_n_a: #u = " << num_used()
-	   << ", node = " << l_node << std::endl);
-// remove this node from the inUse list
-    if (num_used () == 1) {
-// last one, just set inUse to NULL
-      d_inUse = NULL;
-    } else
-      d_inUse = l_node->next ();
-    l_node->remove ();
-// add this node to the available list
-    if (! d_available)
-      d_available = l_node;
-    else
-      l_node->insert_before (d_available);
-    d_n_used--;
-
-    DEBUG (std::cerr << "s" << d_n_used);
-// signal the condition when new data arrives
-    d_ioBlock->notify_one ();
-    DEBUG (std::cerr << "t ");
-  };
-
-  __INLINE__ void iterate_start () { d_iterate = d_current; };
-
-  s_node_ptr iterate_next () {
-#if 0
-// lock the mutex for thread safety
-    gruel::scoped_lock l (*d_internal);
-#endif
-    s_node_ptr l_this = NULL;
-    if (d_iterate) {
-      l_this = d_iterate;
-      d_iterate = d_iterate->next ();
-      if (d_iterate == d_current)
-	d_iterate = NULL;
-    }
-    return (l_this);
-  };
-
-  __INLINE__ T object () { return (d_current->d_object); };
-  __INLINE__ void object (T l_object) { d_current->d_object = l_object; };
-  __INLINE__ size_t num_nodes () { return (d_n_nodes); };
-  __INLINE__ size_t num_used () { return (d_n_used); };
-  __INLINE__ void num_used (size_t l_n_used) { d_n_used = l_n_used; };
-  __INLINE__ size_t num_available () { return (d_n_nodes - d_n_used); };
-  __INLINE__ void num_used_inc (void) {
-    if (d_n_used < d_n_nodes) ++d_n_used;
-  };
-  __INLINE__ void num_used_dec (void) {
-    if (d_n_used != 0) --d_n_used;
-// signal the condition that new data has arrived
-    d_ioBlock->notify_one ();
-  };
-  __INLINE__ bool in_use () { return (d_n_used != 0); };
-};
-
-template <class T> class s_both
-{
-private:
-  s_node<T>* d_node;
-  void* d_this;
-public:
-  __INLINE__ s_both (s_node<T>* l_node, void* l_this)
-    : d_node (l_node), d_this (l_this) {};
-  __INLINE__ ~s_both () {};
-  __INLINE__ s_node<T>* node () { return (d_node); };
-  __INLINE__ void* This () { return (d_this); };
-  __INLINE__ void set (s_node<T>* l_node, void* l_this) {
-    d_node = l_node; d_this = l_this;};
-};
-
-#endif /* _CIRCULAR_LINKED_LIST_H_ */
diff --git a/usrp/host/lib/darwin_libusb.h b/usrp/host/lib/darwin_libusb.h
deleted file mode 100644
index 8446f044e..000000000
--- a/usrp/host/lib/darwin_libusb.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2009 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.
- */
-
-/*
- * The following code was taken from LIBUSB verion 0.1.10a,
- * and makes the fusb_darwin codes do-able in the current GR
- * programming framework.  Parts and pieces were taken from
- * usbi.h, darwin.c, and error.h .
- *
- * LIBUSB version 0.1.10a is covered by the LGPL, version 2;
- * These codes are used with permission from:
- *   (c) 2000-2003 Johannes Erdfelt <johannes@erdfelt.com>
- *   (c) 2002-2005 Nathan Hjelm <hjelmn@users.sourceforge.net>
- * All rights reserved.
- */
-
-#ifndef __DARWIN_LIBUSB_H__
-#define __DARWIN_LIBUSB_H__
-
-#include <IOKit/IOCFBundle.h>
-#include <IOKit/IOCFPlugIn.h>
-#include <IOKit/usb/IOUSBLib.h>
-#include <IOKit/IOKitLib.h>
-
-extern "C" {
-
-static const char* darwin_error_strings[] = {
-  "no error",
-  "device not opened for exclusive access",
-  "no connection to an IOService",
-  "no asyc port has been opened for interface",
-  "another process has device opened for exclusive access",
-  "pipe is stalled",
-  "could not establish a connection to Darin kernel",
-  "invalid argument",
-  "unknown error"
-};
-
-static const char *
-darwin_error_str (int result)
-{
-  switch (result) {
-  case kIOReturnSuccess:
-    return (darwin_error_strings[0]);
-  case kIOReturnNotOpen:
-    return (darwin_error_strings[1]);
-  case kIOReturnNoDevice:
-    return (darwin_error_strings[2]);
-  case kIOUSBNoAsyncPortErr:
-    return (darwin_error_strings[3]);
-  case kIOReturnExclusiveAccess:
-    return (darwin_error_strings[4]);
-  case kIOUSBPipeStalled:
-    return (darwin_error_strings[5]);
-  case kIOReturnError:
-    return (darwin_error_strings[6]);
-  case kIOReturnBadArgument:
-    return (darwin_error_strings[7]);
-  default:
-    return (darwin_error_strings[8]);
-  }
-}
-
-/* not a valid errorno outside darwin.c */
-#define LUSBDARWINSTALL (ELAST+1)
-
-static int
-darwin_to_errno (int result)
-{
-  switch (result) {
-  case kIOReturnSuccess:
-    return 0;
-  case kIOReturnNotOpen:
-    return EBADF;
-  case kIOReturnNoDevice:
-  case kIOUSBNoAsyncPortErr:
-    return ENXIO;
-  case kIOReturnExclusiveAccess:
-    return EBUSY;
-  case kIOUSBPipeStalled:
-    return LUSBDARWINSTALL;
-  case kIOReturnBadArgument:
-    return EINVAL;
-  case kIOReturnError:
-  default:
-    return 1;
-  }
-}
-
-typedef enum {
-  USB_ERROR_TYPE_NONE = 0,
-  USB_ERROR_TYPE_STRING,
-  USB_ERROR_TYPE_ERRNO,
-} usb_error_type_t;
-
-extern char usb_error_str[1024];
-extern int usb_error_errno;
-extern usb_error_type_t usb_error_type;
-
-#define USB_ERROR(r, x)				 \
-  do {						 \
-    usb_error_type = USB_ERROR_TYPE_ERRNO;	 \
-    usb_error_errno = x;			 \
-    return (r);					 \
-  } while (0)
-
-#define USB_ERROR_STR(r, x, format, args...)				\
-  do {									\
-    usb_error_type = USB_ERROR_TYPE_STRING;				\
-    snprintf (usb_error_str, sizeof (usb_error_str) - 1,		\
-	      format, ## args);						\
-    if (usb_debug) {							\
-      std::cerr << "USB error: " << usb_error_str << std::cerr;		\
-    }									\
-    return (r);								\
-  } while (0)
-
-#define USB_ERROR_STR_ORIG(x, format, args...)				\
-  do {									\
-    usb_error_type = USB_ERROR_TYPE_STRING;				\
-    snprintf (usb_error_str, sizeof (usb_error_str) - 1,		\
-	      format, ## args);						\
-    if (usb_debug) {							\
-      std::cerr << "USB error: " << usb_error_str << std::endl;		\
-    }									\
-    return (x);								\
-  } while (0)
-
-#define USB_ERROR_STR_NO_RET(x, format, args...)			\
-  do {									\
-    usb_error_type = USB_ERROR_TYPE_STRING;				\
-    snprintf (usb_error_str, sizeof (usb_error_str) - 1,		\
-	      format, ## args);						\
-    if (usb_debug) {							\
-      std::cerr << "USB error: " << usb_error_str << std::endl;		\
-    }									\
-  } while (0)
-
-/*
- * simple function that figures out what pipeRef
- * is associated with an endpoint
- */
-static int ep_to_pipeRef (darwin_dev_handle *device, int ep)
-{
-  io_return_t ret;
-  UInt8 numep, direction, number;
-  UInt8 dont_care1, dont_care3;
-  UInt16 dont_care2;
-  int i;
-
-  if (usb_debug > 3) {
-    std::cerr << "Converting ep address to pipeRef." << std::endl;
-  }
-
-  /* retrieve the total number of endpoints on this interface */
-  ret = (*(device->interface))->GetNumEndpoints(device->interface, &numep);
-  if ( ret ) {
-    if ( usb_debug > 3 ) {
-      std::cerr << "ep_to_pipeRef: interface is "
-		<< device->interface << std::endl;
-    }
-    USB_ERROR_STR_ORIG ( -ret, "ep_to_pipeRef: can't get number of "
-			 "endpoints for interface" );
-  }
-
-  /* iterate through the pipeRefs until we find the correct one */
-  for (i = 1 ; i <= numep ; i++) {
-    ret = (*(device->interface))->GetPipeProperties
-      (device->interface, i, &direction, &number,
-       &dont_care1, &dont_care2, &dont_care3);
-
-    if (ret != kIOReturnSuccess) {
-      std::cerr << "ep_to_pipeRef: an error occurred getting "
-		<< "pipe information on pipe " << i << std::endl;
-
-      USB_ERROR_STR_ORIG (-darwin_to_errno(ret),
-			  "ep_to_pipeRef(GetPipeProperties): %s",
-			  darwin_error_str(ret));
-    }
-
-    if (usb_debug > 3) {
-      std::cerr << "ep_to_pipeRef: Pipe " << i << ": DIR: "
-		<< direction << " number: " << number << std::endl;
-    }
-
-    /* calculate the endpoint of the pipe and check it versus
-       the requested endpoint */
-    if ( ((direction << 7 & USB_ENDPOINT_DIR_MASK) |
-	  (number & USB_ENDPOINT_ADDRESS_MASK)) == ep ) {
-      if (usb_debug > 3) {
-	std::cerr << "ep_to_pipeRef: pipeRef for ep address "
-		  << ep << " found: " << i << std::endl;
-      }
-      return (i);
-    }
-  }
-
-  if (usb_debug > 3) {
-    std::cerr << "ep_to_pipeRef: No pipeRef found with endpoint address "
-	      << ep << std::endl;
-  }
-
-  /* none of the found pipes match the requested endpoint */
-  return (-1);
-}
-
-}
-#endif /* __DARWIN_LIBUSB_H__ */
diff --git a/usrp/host/lib/db_base.cc b/usrp/host/lib/db_base.cc
deleted file mode 100644
index b4fb45c51..000000000
--- a/usrp/host/lib/db_base.cc
+++ /dev/null
@@ -1,256 +0,0 @@
-//
-// Copyright 2008,2009 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 asversion 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.
-//
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_base.h>
-#include <db_base_impl.h>
-
-#if 0
-tune_result::tune_result(double baseband, double dxc, double residual, bool inv)
-  : ok(false), baseband_freq(baseband), dxc_freq(dxc), 
-    residual_freq(residual), inverted(inv)
-{
-}
-
-tune_result::~tune_result()
-{ 
-}
-#endif
-
-
-/*****************************************************************************/
-
-db_base::db_base(usrp_basic_sptr usrp, int which)
-  : d_is_shutdown(false), d_raw_usrp(usrp.get()), d_which(which), d_lo_offset(0.0)
-{
-}
-
-db_base::~db_base()
-{
-  shutdown();
-}
-
-void
-db_base::shutdown()
-{
-  if (!d_is_shutdown){
-    d_is_shutdown = true;
-    // do whatever there is to do to shutdown
-  }
-}
-
-int 
-db_base::dbid()
-{
-  return usrp()->daughterboard_id(d_which);
-}
-
-std::string 
-db_base::name()
-{
-  return usrp_dbid_to_string(dbid());
-}
-
-std::string 
-db_base::side_and_name()
-{
-  if(d_which == 0)
-    return "A: " + name();
-  else
-    return "B: " + name();
-}
-
-// Function to bypass ADC buffers. Any board which is DC-coupled
-// should bypass the buffers
-
-bool
-db_base::bypass_adc_buffers(bool bypass)
-{
-  //if(d_tx) {
-  //  throw  std::runtime_error("TX Board has no adc buffers\n");
-  //}
-
-  bool ok = true;
-  if(d_which==0) {
-    ok &= usrp()->set_adc_buffer_bypass(0, bypass);
-    ok &= usrp()->set_adc_buffer_bypass(1, bypass);
-  }
-  else {
-    ok &= usrp()->set_adc_buffer_bypass(2, bypass);
-    ok &= usrp()->set_adc_buffer_bypass(3, bypass);
-  }
-  return ok;
-}
-
-bool 
-db_base::set_atr_mask(int v)
-{
-  // Set Auto T/R mask.
-  return usrp()->write_atr_mask(d_which, v);
-}
-
-bool 
-db_base::set_atr_txval(int v)
-{
-  // Set Auto T/R register value to be used when transmitting.
-  return usrp()->write_atr_txval(d_which, v);
-}
-  
-bool 
-db_base::set_atr_rxval(int v)
-{
-  // Set Auto T/R register value to be used when receiving.
-  return usrp()->write_atr_rxval(d_which, v);
-}
-  
-bool 
-db_base::set_atr_tx_delay(int v)
-{
-  // Set Auto T/R delay (in clock ticks) from when Tx fifo gets data to 
-  // when T/R switches.
-  return usrp()->write_atr_tx_delay(v);
-}
-
-bool 
-db_base::set_atr_rx_delay(int v)
-{
-  // Set Auto T/R delay (in clock ticks) from when Tx fifo goes empty to 
-  // when T/R switches.
-  return usrp()->write_atr_rx_delay(v);
-}
-
-bool
-db_base::i_and_q_swapped()
-{
-  // Return True if this is a quadrature device and (for RX) ADC 0 is Q
-  // or (for TX) DAC 0 is Q
-  return false;
-}
-
-bool 
-db_base::spectrum_inverted()
-{
-  // Return True if the dboard gives an inverted spectrum
-  
-  return false;
-}
-
-bool
-db_base::set_enable(bool on)
-{
-  // For tx daughterboards, this controls the transmitter enable.
-
-  return true;	// default is nop
-}
-
-bool
-db_base::set_auto_tr(bool on)
-{
-  // Enable automatic Transmit/Receive switching (ATR).
-  // 
-  // Should be overridden in subclasses that care.  This will typically
-  // set the atr_mask, txval and rxval.
-
-  return true;
-}
-
-bool
-db_base::set_lo_offset(double offset)
-{
-  // Set how much LO is offset from requested frequency
-
-  d_lo_offset = offset;
-  return true;
-}
-
-bool
-db_base::select_rx_antenna(int which_antenna)
-{
-  // Specify which antenna port to use for reception.
-  // Should be overriden by daughterboards that care.
-
-  return which_antenna == 0;
-}
-
-bool
-db_base::select_rx_antenna(const std::string &which_antenna)
-{
-  // Specify which antenna port to use for reception.
-  // Should be overriden by daughterboards that care.
-
-  return which_antenna == "";
-}
-
-
-// Reference Clock section
-//
-// Control whether a reference clock is sent to the daughterboards,
-// and what frequency
-//
-// Bit 7  -- 1 turns on refclk, 0 allows IO use
-// Bits 6:0 Divider value
-//
-    
-double
-db_base::_refclk_freq() 
-{
-  return usrp()->fpga_master_clock_freq() / _refclk_divisor();
-}
-
-void 
-db_base::_enable_refclk(bool enable)
-{
-  int CLOCK_OUT = 1;   // Clock is on lowest bit
-  int REFCLK_ENABLE = 0x80;
-  int REFCLK_DIVISOR_MASK = 0x7f;
-
-  if(enable) {
-    usrp()->_write_oe(d_which, CLOCK_OUT, CLOCK_OUT); // output enable
-    usrp()->write_refclk(d_which, (_refclk_divisor() & REFCLK_DIVISOR_MASK) | REFCLK_ENABLE);
-  }
-  else {
-    usrp()->write_refclk(d_which, 0);
-  }
-}
-
-int 
-db_base::_refclk_divisor()
-{
-  // Return value to stick in REFCLK_DIVISOR register
-  throw std::runtime_error("_refclk_divisor() called from base class\n");;
-}
-
-bool
-db_base::set_bw(float bw)
-{
-  // Set baseband bandwidth (board specific)
-  // Should be overriden by boards that implement variable IF filtering (e.g., DBSRX)
-  return false;
-}
-
-std::ostream &operator<<(std::ostream &os, db_base &x)
-{
-  os << x.side_and_name();
-  return os;
-}
diff --git a/usrp/host/lib/db_base_impl.h b/usrp/host/lib/db_base_impl.h
deleted file mode 100644
index 9d5ca4370..000000000
--- a/usrp/host/lib/db_base_impl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_DB_BASE_IMPL_H
-#define INCLUDED_DB_BASE_IMPL_H
-
-#include <usrp/db_base.h>
-#include <db_util.h>
-#include <usrp/usrp_basic.h>
-#include <fpga_regs_standard.h>
-#include <fpga_regs_common.h>
-#include <usrp/usrp_prims.h>
-#include <usrp_spi_defs.h>
-#include <stdexcept>
-
-#endif /* INCLUDED_DB_BASE_IMPL_H */
diff --git a/usrp/host/lib/db_basic.cc b/usrp/host/lib/db_basic.cc
deleted file mode 100644
index 1694d6a3f..000000000
--- a/usrp/host/lib/db_basic.cc
+++ /dev/null
@@ -1,266 +0,0 @@
-//
-// Copyright 2008,2009 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_basic.h>
-#include <db_base_impl.h>
-
-db_basic_tx::db_basic_tx(boost::shared_ptr<usrp_basic> usrp, int which)
-  : db_base(usrp, which)
-{
-  // Handler for Basic Tx daughterboards.
-  // 
-  // @param usrp: instance of usrp.source_c
-  // @param which: which side: 0 or 1 corresponding to TX_A or TX_B respectively
-
-  set_gain((gain_min() + gain_max()) / 2);         // initialize gain
-}
-
-db_basic_tx::~db_basic_tx()
-{
-}
-
-double 
-db_basic_tx::freq_min() 
-{
-  return -90e9;
-}
-
-double 
-db_basic_tx::freq_max() 
-{
-  return 90e9;
-}
-
-struct freq_result_t 
-db_basic_tx::set_freq(double target_freq)
-{
-  // Set the frequency.
-  // 
-  // @param freq:  target RF frequency in Hz
-  // @type freq:   double
-  // 
-  // @returns (ok, actual_baseband_freq) where:
-  //   ok is True or False and indicates success or failure,
-  //   actual_baseband_freq is the RF frequency that corresponds to DC in the IF.
-  
-  struct freq_result_t args = {false, 0};
-  args.ok = true;
-  args.baseband_freq = 0.0;
-  return args;
-}
-
-float
-db_basic_tx::gain_min()
-{
-  return usrp()->pga_min();
-}
-
-float
-db_basic_tx::gain_max()
-{
-  return usrp()->pga_max();
-}
-
-float
-db_basic_tx::gain_db_per_step()
-{
-  return usrp()->pga_db_per_step();
-}
-
-bool 
-db_basic_tx::set_gain(float gain)
-{
-  // Set the gain.
-  // 
-  // @param gain:  gain in decibels
-  // @returns True/False
-
-  bool ok = usrp()->set_pga(d_which * 2 + 0, gain);
-  ok = ok && usrp()->set_pga(d_which * 2 + 1, gain);
-  return ok;
-}
-
-bool 
-db_basic_tx::is_quadrature()
-{
-  // Return True if this board requires both I & Q analog channels.
-  
-  return true;
-}
-
-
-/******************************************************************************/
-
-
-db_basic_rx::db_basic_rx(usrp_basic_sptr usrp, int which, int subdev)
-  : db_base(usrp, which)
-{
-  // Handler for Basic Rx daughterboards.
-  // 
-  // @param usrp: instance of usrp.source_c
-  // @param which: which side: 0 or 1 corresponding to TX_A or TX_B respectively
-  // @param subdev: which analog i/o channel: 0 or 1
-  // @type subdev: int
-  
-  d_subdev = subdev;
-    
-  bypass_adc_buffers(true);
-
-  if(0) {       // Doing this would give us a different default than the historical values...
-    set_gain(float(gain_min() + gain_max()) / 2.0);       // initialize gain
-  }
-}
-
-db_basic_rx::~db_basic_rx()
-{
-}
-
-double
-db_basic_rx::freq_min() 
-{
-  return -90e9;
-}
-
-double
-db_basic_rx::freq_max()
-{
-  return 90e9;
-}
-
-struct freq_result_t 
-db_basic_rx::set_freq(double target_freq)
-{
-  // Set the frequency.
-  // 
-  // @param freq:  target RF frequency in Hz
-  // @type freq:   double
-  // 
-  // @returns (ok, actual_baseband_freq) where:
-  //   ok is True or False and indicates success or failure,
-  //   actual_baseband_freq is the RF frequency that corresponds to DC in the IF.
-  
-  struct freq_result_t args = {true, 0.0};
-  return args;
-}
-
-float
-db_basic_rx::gain_min()
-{
-  return usrp()->pga_min();
-}
-
-float
-db_basic_rx::gain_max()
-{
-  return usrp()->pga_max();
-}
-
-float
-db_basic_rx::gain_db_per_step()
-{
-  return usrp()->pga_db_per_step();
-}
-
-bool 
-db_basic_rx::set_gain(float gain)
-{
-  // Set the gain.
-  // 
-  // @param gain:  gain in decibels
-  // @returns True/False
-  
-  return usrp()->set_pga(d_which * 2 + d_subdev, gain);
-}
-
-bool 
-db_basic_rx::is_quadrature()
-{
-  // Return True if this board requires both I & Q analog channels.
-
-  // This bit of info is useful when setting up the USRP Rx mux register.
-  
-  return (d_subdev == 2);
-}
-
-
-
-/******************************************************************************/
-
-
-db_lf_tx::db_lf_tx(usrp_basic_sptr usrp, int which)
-  : db_basic_tx(usrp, which)
-{
-  // Handler for Low Freq Tx daughterboards.
-  //
-  // @param usrp: instance of usrp.source_c
-  // @param which: which side: 0 or 1 corresponding to RX_A or RX_B respectively
-}
-
-db_lf_tx::~db_lf_tx()
-{
-}
-
-double 
-db_lf_tx::freq_min() 
-{
-  return -32e6;
-}
-
-double 
-db_lf_tx::freq_max()
-{
-  return 32e6;
-}
-
-/******************************************************************************/
-
-
-db_lf_rx::db_lf_rx(usrp_basic_sptr usrp, int which, int subdev)
-  : db_basic_rx(usrp, which, subdev)
-{
-  // Handler for Low Freq Rx daughterboards.
-  //
-  // @param usrp: instance of usrp.source_c
-  // @param which: which side: 0 or 1 corresponding to RX_A or RX_B respectively
-  // @param subdev: which analog i/o channel: 0 or 1
-  // @type subdev: int
-}
-
-db_lf_rx::~db_lf_rx()
-{
-}
-
-double
-db_lf_rx::freq_min() 
-{
-  return 0.0;
-}
-
-double
-db_lf_rx::freq_max() 
-{
-  return 32e6;
-}
-
-
diff --git a/usrp/host/lib/db_bitshark_rx.cc b/usrp/host/lib/db_bitshark_rx.cc
deleted file mode 100644
index 5368866d8..000000000
--- a/usrp/host/lib/db_bitshark_rx.cc
+++ /dev/null
@@ -1,417 +0,0 @@
-//
-// Copyright 2010 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_bitshark_rx.h>
-#include <db_base_impl.h>
-#include <cmath>
-#include <cstdio>
-#include <string.h>
-#include <stdint.h>
-
-/* Note: Thie general structure of this file is based on the db_dbsrx.cc 
-   codebase for the dbsrx daughterboard. */
-
-/* The following defines specify the address map provided by the
-   Bitshark card. These registers are all accessed over I2C. */
-#define RF_CENTER_FREQ_REG 0x00
-#define RF_CHAN_FILTER_BW_REG 0x01
-#define RF_GAIN_REG 0x02
-#define BB_GAIN_REG 0x03
-#define ADF4350_REG 0x10
-#define SKY73202_REG 0x11
-#define CLOCK_SCHEME_REG 0x20
-
-/* The following table lists the registers provided by the BURX board that
-   are accessible over I2C:
-   --------------------------------------------------------
-   |RegAddr: 0x00-RF Center Freq register |
-       |4-bytes 0x00|
-       |4-byte unsigned RF center freq (in KHz)|
-   |RegAddr: 0x01-RF channel filter bandwidth register |
-       |4-bytes 0x00|
-       |4-byte unsigned RF channel filter bw (in KHz)|
-   |RegAddr: 0x02-RF gain register |
-       |7-bytes 0x00|
-       |1-byte signed RF gain (in dB)|
-   |RegAddr: 0x03-Baseband gain register |
-       |4-bytes 0x00|
-       |4-byte signed baseband filter gain (in dB)|
-   |RegAddr: 0x10-ADF4350 register |
-       |4-bytes 0x00|
-       |4-byte ADF4350 register value (actual ADF4350 reg addr embedded 
-        within 4-byte value)|
-   |RegAddr: 0x11-SKY73202 register |
-       |5-bytes 0x00|
-       |1-byte reg 0 of SKY73202 |
-       |1-byte reg 1 of SKY73202 |
-       |1-byte reg 2 of SKY73202 |
-   |RegAddr: 0x20-Clock Scheme |
-       |3-bytes 0x00|
-       |1-byte indicating clocking scheme:
-        -0x00 -> BURX local TCXO off, BURX accepts ref clock from
-	         USRP (freq of USRP's ref clock specified in bytes 2-5)
-	-0x01 -> BURX local TCXO on, BURX uses its local TCXO as its ref
-	         clock, TCXO signal output for use by USRP |
-       |4-byte USRP ref clock freq in hz (only needed if byte 1 set to 0x00) |
-       
-  ---------------------------------------------------------------------------
-   
-   As an example, lets say the client wants to set an RF center freq of
-   1000 MHz.  In KHz, this translates to 1000000 (resolution is only down to
-   steps of 1 KHz), which is 0x000F4240 in hex.  So the complete 9-byte I2C 
-   sequence that the client should send is as follows:
-   byte 0: 0x00-register 0x00 is the target of the write operation
-   bytes 1-4: 0x00 (padding)
-   byte 5: 0x40 (LSB of the 1000000 KHz value, in hex)
-   byte 6: 0x42
-   byte 7: 0x0F
-   byte 8: 0x00 (MSB of the 1000000 KHz value, in hex)
-
-   If using the usrper cmd-line application on a PC, this sequence would
-   be sent as follows (assuming that the BURX is in slot A):
-   
-   # usrper i2c_write 0x47 000000000040420F00
-   
-   How about another example...lets say the client wants to setup the clock
-   scheme to use scheme #1 where the 26 MHz TCXO on the BURX board is enabled,
-   and is provided to the USRP.  26 MHz (i.e. 26 million), in hex, is 0x18CBA80.
-   So the complete 9-byte I2C sequence that the client should send is as follows:
-   byte 0: 0x20-register 0x20 is the target of the write operation
-   bytes 1-3: 0x00 (padding)
-   byte 4: 0x01 (indicating that clock scheme #1 is wanted)
-   byte 5: 0x80 (LSB of the BURX ref clk freq)
-   byte 6: 0xBA
-   byte 7: 0x8C
-   byte 8: 0x01 (MSB of the BURX ref clk freq)
-   
-   To enable the BURX local ref clk, which will also make it available on the
-   on-board U.FL connector as a source for the USRP, a user can also use
-   the usrper cmd-line application on a PC.  The following sequence would
-   be sent (assuming that the BURX is in slot A):
-   
-   # usrper i2c_write 0x47 200000000180BA8C01
-
-*/
-
-#define NUM_BYTES_IN_I2C_CMD 9   
-
-/*****************************************************************************/
-
-db_bitshark_rx::db_bitshark_rx(usrp_basic_sptr _usrp, int which)
-  : db_base(_usrp, which)
-{
-    // Control Bitshark receiver USRP daughterboard.
-    // 
-    // @param usrp: instance of usrp.source_c
-    // @param which: which side: 0, 1 corresponding to RX_A or RX_B respectively
-
-    // turn off all outputs
-    usrp()->_write_oe(d_which, 0, 0xffff);
-
-    if (which == 0) 
-    {
-	d_i2c_addr = 0x47;
-    }
-    else 
-    {
-	d_i2c_addr = 0x45;
-    }
-
-    // initialize gain
-    set_gain((gain_min() + gain_max()) / 2.0);
-
-    // by default, assume we're using the USRPs clock as the ref clk,
-    // so setup the clock scheme and frequency.  If the user wants
-    // to use the Bitshark's TCXO, the clock scheme should be set
-    // to 1, the freq should be set to 26000000, and a top-level
-    // 'make' and 'make install' needs to be executed.  In addition, 
-    // a U.FL to SMA cable needs to connect J6 on the Bitshark to 
-    // the external clk input on the USRP
-    set_clock_scheme(0,64000000);
-
-    set_bw(8e6); // Default IF bandwidth to match USRP1 max host bandwidth
-
-    bypass_adc_buffers(true);
-}
-
-db_bitshark_rx::~db_bitshark_rx()
-{
-    shutdown();
-}
-
-/************ Private Functions **********************/
-
-void
-db_bitshark_rx::_set_pga(int pga_gain)
-{
-    assert(pga_gain>=0 && pga_gain<=20);
-    if(d_which == 0) 
-    {
-	usrp()->set_pga (0, pga_gain);
-	usrp()->set_pga (1, pga_gain);
-    }
-    else 
-    {
-	usrp()->set_pga (2, pga_gain);
-	usrp()->set_pga (3, pga_gain);
-    }
-}
-
-/************ Public Functions **********************/
-void
-db_bitshark_rx::shutdown()
-{
-    if (!d_is_shutdown)
-    {
-	d_is_shutdown = true;
-    }
-}
-
-bool
-db_bitshark_rx::set_bw (float bw)
-{
-    std::vector<int> args(NUM_BYTES_IN_I2C_CMD,0);
-    uint16_t rf_bw_in_khz = (uint16_t)(bw/1000.0);
-    char val[4];
-    bool result = false;
-    uint8_t try_count = 0;
-    
-    memset(val,0x00,4);
-    if (rf_bw_in_khz < 660  || rf_bw_in_khz > 56000) 
-    {
-	fprintf(stderr, "db_bitshark_rx::set_bw: bw (=%d) must be between 660 KHz and 56 MHz inclusive\n", rf_bw_in_khz);
-	return false;
-    }
-    //fprintf(stdout,"Setting bw: requested bw in khz is %d\r\n",rf_bw_in_khz);
-    memcpy(val,&rf_bw_in_khz,4);
-    args[0] = RF_CHAN_FILTER_BW_REG;
-    args[5] = val[0];
-    args[6] = val[1];
-    args[7] = val[2];
-    args[8] = val[3];
-    while ((result != true) && (try_count < 3))
-    {
-	result=usrp()->write_i2c (d_i2c_addr, int_seq_to_str (args));
-	try_count++;
-    }
-
-    if (result == false)
-    {
-	fprintf(stderr, "db_bitshark_rx:set_bw: giving up after 3 tries without success\n");
-    }
-    
-    return result;
-}
-
-/* The gain referenced below is RF gain only.  There are two independent
-   gain settings at RF: a digital step attenuator (providing 0, -6, -12, and
-   -18 dB of attenuation), and a second LNA (LNA2) that provides ~25 dB of
-   gain (roughly...it actually depends on the RF freq).  So combining these
-   two stages can provide an overall gain range from 0 (which is mapped
-   to -18 dB on the step attenuator + LNA2 turned off) to 42 (which is
-   mapped to 0 dB on the step attenuator + LNA2 turned on).  
-   
-   There could be better ways to map these, but this is sufficient for
-   now. */
-float
-db_bitshark_rx::gain_min()
-{
-    return 0;
-}
-
-float
-db_bitshark_rx::gain_max()
-{
-    return 42;
-}
-
-float
-db_bitshark_rx::gain_db_per_step()
-{
-    return 6;
-}
-
-bool 
-db_bitshark_rx::set_gain(float gain)
-{
-    // Set the gain.
-    // 
-    // @param gain:  RF gain in decibels, range of 0-42
-    // @returns True/False
-    
-    std::vector<int> args(NUM_BYTES_IN_I2C_CMD,0);
-    bool result = false;
-    uint8_t try_count = 0;
-        
-    if (gain < gain_min() || gain > gain_max()) 
-    {
-	fprintf(stderr,"db_bitshark_rx::set_gain: gain (=%f) must be between %f and %f inclusive\n", gain,gain_min(),gain_max());
-	return false;
-    }
-    //fprintf(stdout,"db_bitshark_rx::set_gain: requested gain of %f\r\n",gain);
-    args[0] = RF_GAIN_REG;
-    args[5] = (int)gain;
-
-    while ((result != true) && (try_count < 3))
-    {
-	result=usrp()->write_i2c (d_i2c_addr, int_seq_to_str (args));
-	try_count++;
-    }
-
-    if (result == false)
-    {
-	fprintf(stderr, "db_bitshark_rx:set_gain: giving up after 3 tries without success\n");
-    }
-    
-    return result;
-}
-
-
-bool 
-db_bitshark_rx::set_clock_scheme(uint8_t clock_scheme, uint32_t ref_clk_freq)
-{
-    // Set the clock scheme for determining how the BURX
-    // dboard receives its clock.  Note: Ideally, the constructor for the
-    // BURX board could simply call this method to set how it wants the
-    // clock scheme configured.  However, depending on the application
-    // using the daughterboard, the constructor may run _after_ some
-    // other portion of the application needs the FPGA.  And if the
-    // the clock source for the FPGA was the BURX's 26 MHz TCXO, we're in
-    // a chicken-before-the-egg dilemna.  So the solution is to leave
-    // this function here for reference in case an app wants to use it,
-    // and also give the user the ability to set the clock scheme through
-    // the usrper cmd-line application (see example at the top of this
-    // file).
-    // 
-    // @param clock_scheme
-    // @param ref_clk_freq in Hz
-    // @returns True/False
-    
-    std::vector<int> args(NUM_BYTES_IN_I2C_CMD,0);
-    bool result = false;
-    uint8_t try_count = 0;
-    char val[4];
-        
-    if (clock_scheme > 1) 
-    {
-	fprintf(stderr,"db_bitshark_rx::set_clock_scheme: invalid scheme %d\n",clock_scheme);
-	return false;
-    }
-    //fprintf(stdout,"db_bitshark_rx::set_clock_scheme: requested clock schem of %d with freq %d Hz \n",clock_scheme,ref_clk_freq);
-    memcpy(val,&ref_clk_freq,4);
-    args[0] = CLOCK_SCHEME_REG;
-    args[4] = (int)clock_scheme;
-    args[5] = val[0];
-    args[6] = val[1];
-    args[7] = val[2];
-    args[8] = val[3];
-
-    while ((result != true) && (try_count < 3))
-    {
-	result=usrp()->write_i2c (d_i2c_addr, int_seq_to_str (args));
-	try_count++;
-    }
-
-    if (result == false)
-    {
-	fprintf(stderr, "db_bitshark_rx:set_clock_scheme: giving up after 3 tries without success\n");
-    }
-    return result;
-}
-
-double
-db_bitshark_rx::freq_min()
-{    
-    return 300e6;
-}
-
-double
-db_bitshark_rx::freq_max()
-{    
-    return 4e9;
-}
-
-struct freq_result_t
-db_bitshark_rx::set_freq(double freq)
-{
-    // Set the frequency.
-    // 
-    // @param freq:  target RF frequency in Hz
-    // @type freq:   double
-    // 
-    // @returns (ok, actual_baseband_freq) where:
-    //   ok is True or False and indicates success or failure,
-    //   actual_baseband_freq is RF frequency that corresponds to DC in the IF.
-    
-    std::vector<int> args(NUM_BYTES_IN_I2C_CMD,0);
-    std::vector<int> bytes(2);
-    char val[4];
-    freq_result_t act_freq = {false, 0};
-    uint32_t freq_in_khz = (uint32_t)(freq/1000.0);
-    bool result = false;
-    uint8_t try_count = 0;
-        
-    memset(val,0x00,4);
-    if(!(freq>=freq_min() && freq<=freq_max())) 
-    {
-	return act_freq;
-    }
-    
-    //fprintf(stdout,"db_bitshark_rx::set_freq: requested freq is %d KHz\n",freq_in_khz);
-    memcpy(val,&freq_in_khz,4);
-    args[0] = RF_CENTER_FREQ_REG;
-    args[5] = val[0];
-    args[6] = val[1];
-    args[7] = val[2];
-    args[8] = val[3];
-
-    while ((result != true) && (try_count < 3))
-    {
-	result=usrp()->write_i2c (d_i2c_addr, int_seq_to_str (args));
-	try_count++;
-    }
-
-    if (result == false)
-    {
-	fprintf(stderr, "db_bitshark_rx:set_freq: giving up after 3 tries without success\n");
-    }
-        
-    act_freq.ok = result;
-    act_freq.baseband_freq = (double)freq;
-    return act_freq;
-}
-
-bool 
-db_bitshark_rx::is_quadrature()
-{    
-    // Return True if this board requires both I & Q analog channels.  
-    return true;
-}
-
-bool
-db_bitshark_rx::i_and_q_swapped()
-{
-    // Returns True since our I and Q channels are swapped
-    return true;
-}
diff --git a/usrp/host/lib/db_boards.cc b/usrp/host/lib/db_boards.cc
deleted file mode 100644
index 9324d58ee..000000000
--- a/usrp/host/lib/db_boards.cc
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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 asversion 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.
-//
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <db_boards.h>
-#include <usrp/usrp_dbid.h>
-#include <usrp/db_basic.h>
-#include <usrp/db_tv_rx.h>
-#include <usrp/db_tv_rx_mimo.h>
-#include <usrp/db_dbs_rx.h>
-#include <usrp/db_flexrf.h>
-#include <usrp/db_flexrf_mimo.h>
-#include <usrp/db_wbxng.h>
-#include <usrp/db_xcvr2450.h>
-#include <usrp/db_dtt754.h>
-#include <usrp/db_dtt768.h>
-#include <usrp/db_bitshark_rx.h>
-#include <cstdio>
-
-std::vector<db_base_sptr>
-instantiate_dbs(int dbid, usrp_basic_sptr usrp, int which_side)
-{
-  std::vector<db_base_sptr> db;
-
-  switch(dbid) {
-
-  case(USRP_DBID_BASIC_TX):
-    db.push_back(db_base_sptr(new db_basic_tx(usrp, which_side)));
-    break;
-
-  case(USRP_DBID_BASIC_RX):
-    db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 0)));
-    db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 1)));
-    db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 2)));
-    break;
-
-  case(USRP_DBID_LF_TX):
-    db.push_back(db_base_sptr(new db_lf_tx(usrp, which_side)));
-    break;
-
-  case(USRP_DBID_LF_RX):
-    db.push_back(db_base_sptr(new db_lf_rx(usrp, which_side, 0)));
-    db.push_back(db_base_sptr(new db_lf_rx(usrp, which_side, 1)));
-    db.push_back(db_base_sptr(new db_lf_rx(usrp, which_side, 2)));
-    break;
-
-  case(USRP_DBID_DBS_RX):
-    db.push_back(db_base_sptr(new db_dbs_rx(usrp, which_side)));
-    break;
-
-  case(USRP_DBID_TV_RX):
-    db.push_back(db_base_sptr(new db_tv_rx(usrp, which_side, 43.75e6, 5.75e6)));
-    break;
-  case(USRP_DBID_TV_RX_REV_2):
-    db.push_back(db_base_sptr(new db_tv_rx(usrp, which_side, 44e6, 20e6)));
-    break;
-  case(USRP_DBID_TV_RX_REV_3):
-    db.push_back(db_base_sptr(new db_tv_rx(usrp, which_side, 44e6, 20e6)));
-    break;
-  case(USRP_DBID_TV_RX_MIMO):
-    db.push_back(db_base_sptr(new db_tv_rx_mimo(usrp, which_side, 43.75e6, 5.75e6)));
-    break;
-  case(USRP_DBID_TV_RX_REV_2_MIMO):
-    db.push_back(db_base_sptr(new db_tv_rx_mimo(usrp, which_side, 44e6, 20e6)));
-    break;
-  case(USRP_DBID_TV_RX_REV_3_MIMO):
-    db.push_back(db_base_sptr(new db_tv_rx_mimo(usrp, which_side, 44e6, 20e6)));
-    break;
-
-  case(USRP_DBID_FLEX_2400_TX):
-    db.push_back(db_base_sptr(new db_flexrf_2400_tx(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_2400_RX):
-    db.push_back(db_base_sptr(new db_flexrf_2400_rx(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1200_TX):
-    db.push_back(db_base_sptr(new db_flexrf_1200_tx(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1200_RX):
-    db.push_back(db_base_sptr(new db_flexrf_1200_rx(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1800_TX):
-    db.push_back(db_base_sptr(new db_flexrf_1800_tx(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1800_RX):
-    db.push_back(db_base_sptr(new db_flexrf_1800_rx(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_900_TX):
-    db.push_back(db_base_sptr(new db_flexrf_900_tx(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_900_RX):
-    db.push_back(db_base_sptr(new db_flexrf_900_rx(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_400_TX):
-    db.push_back(db_base_sptr(new db_flexrf_400_tx(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_400_RX):
-    db.push_back(db_base_sptr(new db_flexrf_400_rx(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_2400_TX_MIMO_A):
-    db.push_back(db_base_sptr(new db_flexrf_2400_tx_mimo_a(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_2400_RX_MIMO_A):
-    db.push_back(db_base_sptr(new db_flexrf_2400_rx_mimo_a(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1800_TX_MIMO_A):
-    db.push_back(db_base_sptr(new db_flexrf_1800_tx_mimo_a(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1800_RX_MIMO_A):
-    db.push_back(db_base_sptr(new db_flexrf_1800_rx_mimo_a(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1200_TX_MIMO_A):
-    db.push_back(db_base_sptr(new db_flexrf_1200_tx_mimo_a(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1200_RX_MIMO_A):
-    db.push_back(db_base_sptr(new db_flexrf_1200_rx_mimo_a(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_900_TX_MIMO_A):
-    db.push_back(db_base_sptr(new db_flexrf_900_tx_mimo_a(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_900_RX_MIMO_A):
-    db.push_back(db_base_sptr(new db_flexrf_900_rx_mimo_a(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_400_TX_MIMO_A):
-    db.push_back(db_base_sptr(new db_flexrf_400_tx_mimo_a(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_400_RX_MIMO_A):
-    db.push_back(db_base_sptr(new db_flexrf_400_rx_mimo_a(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_2400_TX_MIMO_B):
-    db.push_back(db_base_sptr(new db_flexrf_2400_tx_mimo_b(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_2400_RX_MIMO_B):
-    db.push_back(db_base_sptr(new db_flexrf_2400_rx_mimo_b(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1800_TX_MIMO_B):
-    db.push_back(db_base_sptr(new db_flexrf_1800_tx_mimo_b(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1800_RX_MIMO_B):
-    db.push_back(db_base_sptr(new db_flexrf_1800_rx_mimo_b(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1200_TX_MIMO_B):
-    db.push_back(db_base_sptr(new db_flexrf_1200_tx_mimo_b(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_1200_RX_MIMO_B):
-    db.push_back(db_base_sptr(new db_flexrf_1200_rx_mimo_b(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_900_TX_MIMO_B):
-    db.push_back(db_base_sptr(new db_flexrf_900_tx_mimo_b(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_900_RX_MIMO_B):
-    db.push_back(db_base_sptr(new db_flexrf_900_rx_mimo_b(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_400_TX_MIMO_B):
-    db.push_back(db_base_sptr(new db_flexrf_400_tx_mimo_b(usrp, which_side)));
-    break;
-  case(USRP_DBID_FLEX_400_RX_MIMO_B):
-    db.push_back(db_base_sptr(new db_flexrf_400_rx_mimo_b(usrp, which_side)));
-    break;
-
-  case(USRP_DBID_XCVR2450_TX):
-    db.push_back(db_base_sptr(new db_xcvr2450_tx(usrp, which_side)));
-    break;
-  case(USRP_DBID_XCVR2450_RX):
-    db.push_back(db_base_sptr(new db_xcvr2450_rx(usrp, which_side)));
-    break;
-
-#if 0	// FIXME wbx doesn't compile
-  case(USRP_DBID_WBX_LO_TX):
-    db.push_back(db_base_sptr(new db_wbx_lo_tx(usrp, which_side)));
-    break;
-  case(USRP_DBID_WBX_LO_RX):
-    db.push_back(db_base_sptr(new db_wbx_lo_rx(usrp, which_side)));
-    break;
-#endif
-
-  case(USRP_DBID_WBX_NG_TX):
-    db.push_back(db_base_sptr(new db_wbxng_tx(usrp, which_side)));
-    break;
-  case(USRP_DBID_WBX_NG_RX):
-    db.push_back(db_base_sptr(new db_wbxng_rx(usrp, which_side)));
-    break;
-
-  case(USRP_DBID_DTT754):
-    db.push_back(db_base_sptr(new db_dtt754(usrp, which_side)));
-    break;
-  case(USRP_DBID_DTT768):
-    db.push_back(db_base_sptr(new db_dtt768(usrp, which_side)));
-    break;
-
-  case(USRP_DBID_BITSHARK_RX):
-    db.push_back(db_base_sptr(new db_bitshark_rx(usrp, which_side)));
-    break;
-
-  case(-1):
-    if (boost::dynamic_pointer_cast<usrp_basic_tx>(usrp)){
-      db.push_back(db_base_sptr(new db_basic_tx(usrp, which_side)));
-    }
-    else {
-      db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 0)));
-      db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 1)));
-    }
-    break;
-
-  case(-2):
-  default:
-    if (boost::dynamic_pointer_cast<usrp_basic_tx>(usrp)){
-      fprintf(stderr, "\n\aWarning: Treating daughterboard with invalid EEPROM contents as if it were a \"Basic Tx.\"\n");
-      fprintf(stderr, "Warning: This is almost certainly wrong...  Use appropriate burn-*-eeprom utility.\n\n");
-      db.push_back(db_base_sptr(new db_basic_tx(usrp, which_side)));
-    }
-    else {
-      fprintf(stderr, "\n\aWarning: Treating daughterboard with invalid EEPROM contents as if it were a \"Basic Rx.\"\n");
-      fprintf(stderr, "Warning: This is almost certainly wrong...  Use appropriate burn-*-eeprom utility.\n\n");
-      db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 0)));
-      db.push_back(db_base_sptr(new db_basic_rx(usrp, which_side, 1)));
-    }
-    break;
-  }
-
-  return db;
-}
diff --git a/usrp/host/lib/db_boards.h b/usrp/host/lib/db_boards.h
deleted file mode 100644
index 136091c53..000000000
--- a/usrp/host/lib/db_boards.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008 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 asversion 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 DB_BOARDS_H
-#define DB_BOARDS_H
-
-#include <usrp/db_base.h>
-#include <usrp/usrp_basic.h>
-
-std::vector<db_base_sptr> instantiate_dbs(int dbid, usrp_basic_sptr usrp, int which_side);
-
-#endif 
-
-
diff --git a/usrp/host/lib/db_dbs_rx.cc b/usrp/host/lib/db_dbs_rx.cc
deleted file mode 100644
index 7fe8c4951..000000000
--- a/usrp/host/lib/db_dbs_rx.cc
+++ /dev/null
@@ -1,501 +0,0 @@
-//
-// Copyright 2008,2009 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_dbs_rx.h>
-#include <db_base_impl.h>
-#include <cmath>
-#include <cstdio>
-
-
-/*****************************************************************************/
-
-
-db_dbs_rx::db_dbs_rx(usrp_basic_sptr _usrp, int which)
-  : db_base(_usrp, which)
-{
-  // Control DBS receiver based USRP daughterboard.
-  // 
-  // @param usrp: instance of usrp.source_c
-  // @param which: which side: 0, 1 corresponding to RX_A or RX_B respectively
-
-  usrp()->_write_oe(d_which, 0x0001, 0x0001);
-  if(which == 0) {
-    d_i2c_addr = 0x67;
-  }
-  else {
-    d_i2c_addr = 0x65;
-  }
-
-  d_n = 950;
-  d_div2 = 0;
-  d_osc = 5;
-  d_cp = 3;
-  d_r = 4;
-  d_r_int = 1;
-  d_fdac = 127;
-  d_m = 2;
-  d_dl = 0;
-  d_ade = 0;
-  d_adl = 0;
-  d_gc1 = 0;
-  d_gc2 = 31;
-  d_diag = 0;
-  
-  _enable_refclk(true);
-  
-  set_gain((gain_min() + gain_max()) / 2.0);       // initialize gain
-
-  bypass_adc_buffers(true);
-}
-
-db_dbs_rx::~db_dbs_rx()
-{
-  shutdown();
-}
-
-void
-db_dbs_rx::shutdown()
-{
-  if (!d_is_shutdown){
-    d_is_shutdown = true;
-    // do whatever there is to do to shutdown orderly
-    _enable_refclk(false);
-  }
-}
-
-void
-db_dbs_rx::_write_reg (int regno, int v)
-{
-  //regno is in [0,5], v is value to write to register"""
-  assert (0 <= regno && regno <= 5);
-  std::vector<int> args(2);
-  args[0] = regno;
-  args[1] = v;
-  usrp()->write_i2c (d_i2c_addr, int_seq_to_str (args));
-}
-
-void
-db_dbs_rx::_write_regs (int starting_regno, const std::vector<int> &vals)
-{
-  // starting_regno is in [0,5],
-  // vals is a seq of integers to write to consecutive registers"""
-
-  //FIXME
-  std::vector<int> args;
-  args.push_back(starting_regno);
-  args.insert(args.end(), vals.begin(), vals.end());
-  usrp()->write_i2c (d_i2c_addr, int_seq_to_str (args));
-}
-        
-std::vector<int>
-db_dbs_rx::_read_status ()
-{
-  //If successful, return list of two ints: [status_info, filter_DAC]"""
-  std::string s = usrp()->read_i2c (d_i2c_addr, 2);
-  if(s.size() != 2) {
-    std::vector<int> ret(0);
-    return ret;
-  }
-  return str_to_int_seq (s);
-}
-
-void
-db_dbs_rx::_send_reg(int regno)
-{
-  assert(0 <= regno && regno <= 5);
-  if(regno == 0)
-    _write_reg(0,(d_div2<<7) + (d_n>>8));
-  if(regno == 1)
-    _write_reg(1,d_n & 255);
-  if(regno == 2)
-    _write_reg(2,d_osc + (d_cp<<3) + (d_r_int<<5));
-  if(regno == 3)
-    _write_reg(3,d_fdac);
-  if(regno == 4)
-    _write_reg(4,d_m + (d_dl<<5) + (d_ade<<6) + (d_adl<<7));
-  if(regno == 5)
-    _write_reg(5,d_gc2 + (d_diag<<5));
-}
-
-// BW setting
-void
-db_dbs_rx::_set_m(int m)
-{
-  assert(m>0 && m<32);
-  d_m = m;
-  _send_reg(4);
-}
-  
-void
-db_dbs_rx::_set_fdac(int fdac)
-{
-  assert(fdac>=0 && fdac<128);
-  d_fdac = fdac;
-  _send_reg(3);
-}
-
-bool
-db_dbs_rx::set_bw (float bw)
-{
-  if (bw < 1e6 || bw > 33e6) {
-    fprintf(stderr, "db_dbs_rx::set_bw: bw (=%f) must be between 1e6 and 33e6 inclusive\n", bw);
-    return false;
-  }
-
-  // struct bw_t ret = {0, 0, 0};
-  int m_max, m_min, m_test, fdac_test;
-  if(bw >= 4e6)
-    m_max = int(std::min(31, (int)floor(_refclk_freq()/1e6)));
-  else if(bw >= 2e6)      // Outside of Specs!
-    m_max = int(std::min(31, (int)floor(_refclk_freq()/.5e6)));
-  else      // Way outside of Specs!
-    m_max = int(std::min(31, (int)floor(_refclk_freq()/.25e6)));
-  
-  m_min = int(ceil(_refclk_freq()/2.5e6));
-  m_test = m_max;
-  while(m_test >= m_min) {
-    fdac_test = static_cast<int>(round(((bw * m_test / _refclk_freq())-4)/.145));
-    if(fdac_test > 127)
-      m_test = m_test - 1;
-    else
-      break;
-  }
-
-  if(m_test>=m_min && fdac_test>=0) {
-    _set_m(m_test);
-    _set_fdac(fdac_test);
-
-    //ret.m = d_m;
-    //ret.fdac = d_fdac;
-    //ret.div = _refclk_freq()/d_m*(4+0.145*d_fdac);
-  }
-  else {
-    fprintf(stderr, "db_dbs_rx::set_bw: failed\n");
-    return false;
-  }
-
-  return true;
-}
-
-// Gain setting
-void
-db_dbs_rx::_set_dl(int dl)
-{
-  assert(dl == 0 || dl == 1);
-  d_dl = dl;
-  _send_reg(4);
-}
-
-void
-db_dbs_rx::_set_gc2(int gc2)
-{
-  assert(gc2<32 && gc2>=0);
-  d_gc2 = gc2;
-  _send_reg(5);
-}
-
-void
-db_dbs_rx::_set_gc1(int gc1)
-{
-  assert(gc1>=0 && gc1<4096);
-  d_gc1 = gc1;
-  usrp()->write_aux_dac(d_which, 0, gc1);
-}
-
-void
-db_dbs_rx::_set_pga(int pga_gain)
-{
-  assert(pga_gain>=0 && pga_gain<=20);
-  if(d_which == 0) {
-    usrp()->set_pga (0, pga_gain);
-    usrp()->set_pga (1, pga_gain);
-  }
-  else {
-    usrp()->set_pga (2, pga_gain);
-    usrp()->set_pga (3, pga_gain);
-  }
-}
-
-float
-db_dbs_rx::gain_min()
-{
-  return 0;
-}
-
-float
-db_dbs_rx::gain_max()
-{
-  return 104;
-}
-
-float
-db_dbs_rx::gain_db_per_step()
-{
-  return 1;
-}
-
-bool 
-db_dbs_rx::set_gain(float gain)
-{
-  // Set the gain.
-  // 
-  // @param gain:  gain in decibels
-  // @returns True/False
-
-  if(!(gain>=0 && gain<105)) {
-    throw std::runtime_error("gain out of range\n");
-  }
-
-  int gc1=0, gc2=0, dl=0, pga=0;
-
-  if(gain < 56) {
-    gc1 = int((-gain*1.85/56.0 + 2.6)*4096.0/3.3);
-    gain = 0;
-  }
-  else {
-    gc1 = 0;
-    gain -= 56;
-  }
-   
-  if(gain < 24) {
-    gc2 = static_cast<int>(round(31.0 * (1-gain/24.0)));
-    gain = 0;
-  }
-  else {
-    gc2 = 0;
-    gain -=24;
-  }
-  
-  if(gain >= 4.58) {
-    dl = 1;
-    gain -= 4.58;
-  }
-
-  pga = gain;
-  _set_gc1(gc1);
-  _set_gc2(gc2);
-  _set_dl(dl);
-  _set_pga(pga);
-
-  return true;
-}
-
-// Frequency setting
-void
-db_dbs_rx::_set_osc(int osc)
-{
-  assert(osc>=0 && osc<8);
-  d_osc = osc;
-  _send_reg(2);
-}
-
-void
-db_dbs_rx::_set_cp(int cp)
-{
-  assert(cp>=0 && cp<4);
-  d_cp = cp;
-  _send_reg(2);
-}
-
-void
-db_dbs_rx::_set_n(int n)
-{
-  assert(n>256 && n<32768);
-  d_n = n;
-  _send_reg(0);
-  _send_reg(1);
-}
-
-void
-db_dbs_rx::_set_div2(int div2)
-{
-  assert(div2 == 0 || div2 == 1);
-  d_div2 = div2;
-  _send_reg(0);
-}
-
-void
-db_dbs_rx::_set_r(int r)
-{
-  assert(r>=0 && r<128);
-  d_r = r;
-  d_r_int = static_cast<int>(round(log10(r)/log10(2)) - 1);
-  _send_reg(2);
-}
-
-// FIXME  How do we handle ADE and ADL properly?
-void
-db_dbs_rx::_set_ade(int ade)
-{
-  assert(ade == 0 || ade == 1);
-  d_ade = ade;
-  _send_reg(4);
-}
-
-double
-db_dbs_rx::freq_min()
-{
-  return 500e6;
-}
-
-double
-db_dbs_rx::freq_max()
-{
-  return 2.6e9;
-}
-
-struct freq_result_t
-db_dbs_rx::set_freq(double freq)
-{
-  // Set the frequency.
-  // 
-  // @param freq:  target RF frequency in Hz
-  // @type freq:   double
-  // 
-  // @returns (ok, actual_baseband_freq) where:
-  //   ok is True or False and indicates success or failure,
-  //   actual_baseband_freq is RF frequency that corresponds to DC in the IF.
-  
-  freq_result_t args = {false, 0};
-  
-  if(!(freq>=freq_min() && freq<=freq_max())) {
-    return args;
-  }
-  
-  double vcofreq;
-  if(freq<1150e6) {
-    _set_div2(0);
-    vcofreq = 4 * freq;
-  }
-  else {
-    _set_div2(1);
-    vcofreq = 2 * freq;
-  }
-  
-  _set_ade(1);
-  int rmin = std::max(2, (int)(_refclk_freq()/2e6));
-  int rmax = std::min(128, (int)(_refclk_freq()/500e3));
-  int r = 2;
-  int n = 0;
-  int best_r = 2;
-  int best_n = 0;
-  int best_delta = 10e6;
-  int delta;
-  
-  while(r <= rmax) {
-    n = static_cast<int>(round(freq/(_refclk_freq()/r)));
-    if(r<rmin || n<256) {
-      r = r * 2;
-      continue;
-    }
-    delta = (int)fabs(n*_refclk_freq()/r - freq);
-    if(delta < 75e3) {
-      best_r = r;
-      best_n = n;
-      break;
-    }
-    if(delta < best_delta*0.9) {
-      best_r = r;
-      best_n = n;
-      best_delta = delta;
-    }
-    r = r * 2;
-  }
-  _set_r(best_r);
-
-  _set_n(static_cast<int>(round(best_n)));
- 
-  int vco;
-  if(vcofreq < 2433e6)
-    vco = 0;
-  else if(vcofreq < 2711e6)
-    vco=1;
-  else if(vcofreq < 3025e6)
-    vco=2;
-  else if(vcofreq < 3341e6)
-    vco=3;
-  else if(vcofreq < 3727e6)
-    vco=4;
-  else if(vcofreq < 4143e6)
-    vco=5;
-  else if(vcofreq < 4493e6)
-    vco=6;
-  else
-    vco=7;
-  
-  _set_osc(vco);
-  
-  // Set CP current
-  int adc_val = 0;
-  std::vector<int> bytes(2);
-  while(adc_val == 0 || adc_val == 7) {
-    bytes = _read_status();
-    adc_val = bytes[0] >> 2;
-    if(adc_val == 0) {
-      if(vco <= 0) {
-	return args;
-      }
-      else {
-	vco = vco - 1;
-      }
-    }
-    else if(adc_val == 7) {
-      if(vco >= 7) {
-	return args;
-      }
-      else {
-	vco = vco + 1;
-      }
-    }
-    _set_osc(vco);
-  }
-  
-  if(adc_val == 1 || adc_val == 2) {
-    _set_cp(1);
-  }
-  else if(adc_val == 3 || adc_val == 4) {
-    _set_cp(2);
-  }
-  else {
-    _set_cp(3);
-  }
-  
-  args.ok = true;
-  args.baseband_freq = d_n * _refclk_freq() / d_r;
-  return args;
-}
-
-int
-db_dbs_rx::_refclk_divisor()
-{
-  //Return value to stick in REFCLK_DIVISOR register
-  return 16;
-}
-
-bool 
-db_dbs_rx::is_quadrature()
-{
-  // Return True if this board requires both I & Q analog channels.  
-  return true;
-}
diff --git a/usrp/host/lib/db_dtt754.cc b/usrp/host/lib/db_dtt754.cc
deleted file mode 100644
index 9ced705e4..000000000
--- a/usrp/host/lib/db_dtt754.cc
+++ /dev/null
@@ -1,327 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_dtt754.h>
-#include <db_base_impl.h>
-
-int
-control_byte_1()
-{
-  int RS = 0;  // 0 = 166.66kHz reference
-  int ATP = 7; // Disable internal AGC
-  return (0x80 | ATP<<3 | RS);
-}
-
-int
-control_byte_2()
-{
-  int STBY = 0;  // powered on
-  int XTO = 1;   // turn off xtal out, which we don't have
-  int ATC = 0;   // not clear exactly, possibly speeds up or slows down AGC, which we are not using
-  
-  int c = 0xc2 | ATC<<5 | STBY<<4 | XTO;
-  return c;
-}
-
-int
-bandswitch_byte(float freq, float bw)
-{
-  int P5, CP, BS;
-
-  if(bw>7.5e6) {
-    P5 = 1;
-  }
-  else {
-    P5 = 0;
-  }
-
-  if(freq < 121e6) {
-    CP = 0;
-    BS = 1;
-  }
-  else if(freq < 141e6) {
-    CP = 1;
-    BS = 1;
-  }
-  else if(freq < 166e6) {
-    CP = 2;
-    BS = 1;
-  }
-  else if(freq < 182e6) {
-    CP = 3;
-    BS = 1;
-  }
-  else if(freq < 286e6) {
-    CP = 0;
-    BS = 2;
-  }
-  else if(freq < 386e6) {
-    CP = 1;
-    BS = 2;
-  }
-  else if(freq < 446e6) {
-    CP = 2;
-    BS = 2;
-  }
-  else if(freq < 466e6) {
-    CP = 3;
-    BS = 2;
-  }
-  else if(freq < 506e6) {
-    CP = 0;
-    BS = 8;
-  }
-  else if(freq < 761e6) {
-    CP = 1;
-    BS = 8;
-  }
-  else if(freq < 846e6) {
-    CP = 2;
-    BS = 8;
-  }
-  else { // limit is ~905 MHz
-    CP = 3;
-    BS = 8;
-  }
-  return (CP<<6 | P5 << 4 | BS);
-}
-
-db_dtt754::db_dtt754(usrp_basic_sptr _usrp, int which)
-  : db_base(_usrp, which)
-{
-  /*
-   * Control custom DTT75403-based daughterboard.
-   * 
-   * @param usrp: instance of usrp.source_c
-   * @param which: which side: 0 or 1 corresponding to RX_A or RX_B respectively
-   * @type which: int
-   */
-
-  // FIXME: DTT754 and DTT768 can probably inherit from a DTT class
-  
-  if(d_which == 0) {
-    d_i2c_addr = 0x60;
-  }
-  else {
-    d_i2c_addr = 0x62;
-  }
-
-  d_bw = 7e6;
-  d_IF = 36e6;
-        
-  d_f_ref = 166.6666e3;
-  d_inverted = false;
-
-  set_gain((gain_min() + gain_max()) / 2.0);
-
-  bypass_adc_buffers(false);
-}
-
-db_dtt754::~db_dtt754()
-{
-}
-  
-float
-db_dtt754::gain_min()
-{
-  return 0;
-}
-
-float
-db_dtt754::gain_max()
-{
-  return 115;
-}
-
-float
-db_dtt754::gain_db_per_step()
-{
-  return 1;
-}
-
-bool
-db_dtt754::set_gain(float gain)
-{
-  assert(gain>=0 && gain<=115);
-
-  float rfgain, ifgain, pgagain;
-  if(gain > 60) {
-    rfgain = 60;
-    gain = gain - 60;
-  }
-  else {
-    rfgain = gain;
-    gain = 0;
-  }
-  
-  if(gain > 35) {
-    ifgain = 35;
-    gain = gain - 35;
-  }
-  else {
-    ifgain = gain;
-    gain = 0;
-  }
-  pgagain = gain;
-  
-  _set_rfagc(rfgain);
-  _set_ifagc(ifgain);
-  _set_pga(pgagain);
-
-  return true; // can't fail with the assert in place
-}
-
-double
-db_dtt754::freq_min()
-{
-  return 44e6;
-}
-
-double
-db_dtt754::freq_max()
-{
-  return 900e6;
-}
-
-struct freq_result_t
-db_dtt754::set_freq(double target_freq)
-{
-  /*
-   * @returns (ok, actual_baseband_freq) where:
-   * ok is True or False and indicates success or failure,
-   * actual_baseband_freq is the RF frequency that corresponds to DC in the IF.
-   */
-  
-  freq_result_t ret = {false, 0.0};
-
-  if(target_freq < freq_min() || target_freq > freq_max()) {
-    return ret;
-  }
-        
-  double target_lo_freq = target_freq + d_IF;  // High side mixing
-
-  int divisor = (int)(0.5+(target_lo_freq / d_f_ref));
-  double actual_lo_freq = d_f_ref*divisor;
-  
-  if((divisor & ~0x7fff) != 0) {		// must be 15-bits or less
-    return ret;
-  }
-  
-  // build i2c command string
-  std::vector<int> buf(5);
-  buf[0] = (divisor >> 8) & 0xff;          // DB1
-  buf[1] = divisor & 0xff;                 // DB2
-  buf[2] = control_byte_1();
-  buf[3] = bandswitch_byte(actual_lo_freq, d_bw);
-  buf[4] = control_byte_2();
-
-  bool ok = usrp()->write_i2c(d_i2c_addr, int_seq_to_str (buf));
-
-  d_freq = actual_lo_freq - d_IF;
-        
-  ret.ok = ok;
-  ret.baseband_freq = actual_lo_freq;
-
-  return ret;
-
-}
-  
-bool
-db_dtt754::is_quadrature()
-{
-  /*
-   * Return True if this board requires both I & Q analog channels.
-   * 
-   * This bit of info is useful when setting up the USRP Rx mux register.
-   */
-     
-  return false;
-}
-
-bool
-db_dtt754::spectrum_inverted()
-{
-  /*
-   * The 43.75 MHz version is inverted
-   */
-  
-  return d_inverted;
-}
-
-bool
-db_dtt754::set_bw(float bw)
-{
-  /*
-   * Choose the SAW filter bandwidth, either 7MHz or 8MHz)
-   */
-
-  d_bw = bw;
-  set_freq(d_freq);
-
-  return true; // FIXME: propagate set_freq result
-}
-
-void
-db_dtt754::_set_rfagc(float gain)
-{
-  assert(gain <= 60 && gain >= 0);
-  // FIXME this has a 0.5V step between gain = 60 and gain = 59.
-  // Why are there two cases instead of a single linear case?
-  float voltage;
-  if(gain == 60) {
-    voltage = 4;
-  }
-  else {
-    voltage = gain/60.0 * 2.25 + 1.25;
-  }
-  
-  int dacword = (int)(4096*voltage/1.22/3.3);    // 1.22 = opamp gain
-    
-  assert(dacword>=0 && dacword<4096);
-  usrp()->write_aux_dac(d_which, 1, dacword);
-}
-
-void
-db_dtt754::_set_ifagc(float gain)
-{
-  assert(gain <= 35 && gain >= 0);
-  float voltage = gain/35.0 * 2.1 + 1.4;
-  int dacword = (int)(4096*voltage/1.22/3.3);    // 1.22 = opamp gain
-
-  assert(dacword>=0 && dacword<4096);
-  usrp()->write_aux_dac(d_which, 0, dacword);
-}
-
-void
-db_dtt754::_set_pga(float pga_gain)
-{
-  assert(pga_gain >=0 && pga_gain <=20);
-  if(d_which == 0) {
-    usrp()->set_pga (0, pga_gain);
-  }
-  else {
-    usrp()->set_pga (2, pga_gain);
-  }
-}
diff --git a/usrp/host/lib/db_dtt768.cc b/usrp/host/lib/db_dtt768.cc
deleted file mode 100644
index 0dfe1a8f3..000000000
--- a/usrp/host/lib/db_dtt768.cc
+++ /dev/null
@@ -1,300 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008,2009 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_dtt768.h>
-#include <db_base_impl.h>
-
-int
-control_byte_4()
-{
-  int C = 0;   // Charge Pump Current, no info on how to choose
-  int R = 4;   // 125 kHz fref
-  
-  // int ATP = 7; // Disable internal AGC
-  return (0x80 | C<<5 | R);
-}
-
-int
-control_byte_5(float freq, int agcmode = 1)
-{
-  if(agcmode) {
-    if(freq < 150e6) {
-      return 0x3B;
-    }
-    else if(freq < 420e6) {
-      return 0x7E;
-    }
-    else {
-      return 0xB7;
-    }
-  }
-  else {
-    if(freq < 150e6) {
-      return 0x39;
-    }
-    else if(freq < 420e6) {
-      return 0x7C;
-    }
-    else {
-      return 0xB5;
-    }
-  }
-}
-        
-int
-control_byte_6()
-{
-  int ATC = 0;   // AGC time constant = 100ms, 1 = 3S
-  int IFE = 1;   // IF AGC amplifier enable
-  int AT = 0;    // AGC control, ???
-  
-  return (ATC << 5 | IFE << 4 | AT);
-}
-
-int
-control_byte_7()
-{
-  int SAS = 1;  // SAW Digital mode
-  int AGD = 1;  // AGC disable
-  int ADS = 0;  // AGC detector into ADC converter
-  int T = 0;    // Test mode, undocumented
-  return (SAS << 7 | AGD << 5 | ADS << 4 | T);
-}
-
-db_dtt768::db_dtt768(usrp_basic_sptr _usrp, int which)
-  : db_base(_usrp, which)
-{
-  /*
-   * Control custom DTT76803-based daughterboard.
-   * 
-   * @param usrp: instance of usrp.source_c
-   * @param which: which side: 0 or 1 corresponding to RX_A or RX_B respectively
-   * @type which: int
-   */
-  
-  if(d_which == 0) {
-    d_i2c_addr = 0x60;
-  }
-  else {
-    d_i2c_addr = 0x62;
-  }
-
-  d_IF = 44e6;
-        
-  d_f_ref = 125e3;
-  d_inverted = false;
-
-  set_gain((gain_min() + gain_max()) / 2.0);
-
-  bypass_adc_buffers(false);
-}
-
-db_dtt768::~db_dtt768()
-{
-}
-  
-float
-db_dtt768::gain_min()
-{
-  return 0;
-}
-
-float
-db_dtt768::gain_max()
-{
-  return 115;
-}
-
-float
-db_dtt768::gain_db_per_step()
-{
-  return 1;
-}
-
-bool
-db_dtt768::set_gain(float gain)
-{
-  assert(gain>=0 && gain<=115);
-
-  float rfgain, ifgain, pgagain;
-  if(gain > 60) {
-    rfgain = 60;
-    gain = gain - 60;
-  }
-  else {
-    rfgain = gain;
-    gain = 0;
-  }
-  
-  if(gain > 35) {
-    ifgain = 35;
-    gain = gain - 35;
-  }
-  else {
-    ifgain = gain;
-    gain = 0;
-  }
-  pgagain = gain;
-  
-  _set_rfagc(rfgain);
-  _set_ifagc(ifgain);
-  _set_pga(pgagain);
-
-  return true;
-}
-
-double
-db_dtt768::freq_min()
-{
-  return 44e6;
-}
-
-double
-db_dtt768::freq_max()
-{
-  return 900e6;
-}
-
-struct freq_result_t
-db_dtt768::set_freq(double target_freq)
-{
-  /*
-   * @returns (ok, actual_baseband_freq) where:
-   * ok is True or False and indicates success or failure,
-   * actual_baseband_freq is the RF frequency that corresponds to DC in the IF.
-   */
-  
-  freq_result_t ret = {false, 0.0};
-
-  if(target_freq < freq_min() || target_freq > freq_max()) {
-    return ret;
-  }
-        
-  double target_lo_freq = target_freq + d_IF;  // High side mixing
-
-  int divisor = (int)(0.5+(target_lo_freq / d_f_ref));
-  double actual_lo_freq = d_f_ref*divisor;
-  
-  if((divisor & ~0x7fff) != 0) {		// must be 15-bits or less
-    return ret;
-  }
-  
-  // build i2c command string
-  std::vector<int> buf(6);
-  buf[0] = (divisor >> 8) & 0xff;          // DB1
-  buf[1] = divisor & 0xff;                 // DB2
-  buf[2] = control_byte_4();
-  buf[3] = control_byte_5(target_freq);
-  buf[4] = control_byte_6();
-  buf[5] = control_byte_7();
-
-  bool ok = usrp()->write_i2c(d_i2c_addr, int_seq_to_str (buf));
-
-  d_freq = actual_lo_freq - d_IF;
-  
-  ret.ok = ok;
-  ret.baseband_freq = actual_lo_freq;
-
-  return ret;
-
-}
-  
-bool
-db_dtt768::is_quadrature()
-{
-  /*
-   * Return True if this board requires both I & Q analog channels.
-   * 
-   * This bit of info is useful when setting up the USRP Rx mux register.
-   */
-     
-  return false;
-}
-
-bool
-db_dtt768::spectrum_inverted()
-{
-  /*
-   * The 43.75 MHz version is inverted
-   */
-  
-  return d_inverted;
-}
-
-bool
-db_dtt768::set_bw(float bw)
-{
-  /*
-   * Choose the SAW filter bandwidth, either 7MHz or 8MHz)
-   */
-
-  d_bw = bw;
-  set_freq(d_freq);
-
-  return true; // FIXME: propagate set_freq result
-}
-
-void
-db_dtt768::_set_rfagc(float gain)
-{
-  assert(gain <= 60 && gain >= 0);
-  // FIXME this has a 0.5V step between gain = 60 and gain = 59.
-  // Why are there two cases instead of a single linear case?
-  float voltage;
-  if(gain == 60) {
-    voltage = 4;
-  }
-  else {
-    voltage = gain/60.0 * 2.25 + 1.25;
-  }
-  
-  int dacword = (int)(4096*voltage/1.22/3.3);    // 1.22 = opamp gain
-    
-  assert(dacword>=0 && dacword<4096);
-  usrp()->write_aux_dac(d_which, 1, dacword);
-}
-
-void
-db_dtt768::_set_ifagc(float gain)
-{
-  assert(gain <= 35 && gain >= 0);
-  float voltage = gain/35.0 * 2.1 + 1.4;
-  int dacword = (int)(4096*voltage/1.22/3.3);    // 1.22 = opamp gain
-
-  assert(dacword>=0 && dacword<4096);
-  usrp()->write_aux_dac(d_which, 0, dacword);
-}
-
-void
-db_dtt768::_set_pga(float pga_gain)
-{
-  assert(pga_gain >=0 && pga_gain <=20);
-  if(d_which == 0) {
-    usrp()->set_pga (0, pga_gain);
-  }
-  else {
-    usrp()->set_pga (2, pga_gain);
-  }
-}
diff --git a/usrp/host/lib/db_flexrf.cc b/usrp/host/lib/db_flexrf.cc
deleted file mode 100644
index ddd87012d..000000000
--- a/usrp/host/lib/db_flexrf.cc
+++ /dev/null
@@ -1,1247 +0,0 @@
-//
-// Copyright 2008,2009 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_flexrf.h>
-#include <db_base_impl.h>
-#ifdef HAVE_TIME_H
-#include <ctime>
-#endif
-
-// d'board i/o pin defs
-// Tx and Rx have shared defs, but different i/o regs
-#define AUX_RXAGC (1 << 8)
-#define POWER_UP  (1 << 7)         // enables power supply
-#define RX_TXN    (1 << 6)         // Tx only: T/R antenna switch for TX/RX port
-#define RX2_RX1N  (1 << 6)         // Rx only: antenna switch between RX2 and TX/RX port
-#define ENABLE    (1 << 5)         // enables mixer
-#define AUX_SEN   (1 << 4)
-#define AUX_SCLK  (1 << 3)
-#define PLL_LOCK_DETECT (1 << 2)
-#define AUX_SDO   (1 << 1)
-#define CLOCK_OUT (1 << 0)
-
-flexrf_base::flexrf_base(usrp_basic_sptr _usrp, int which, int _power_on)
-  : db_base(_usrp, which), d_power_on(_power_on)
-{
-  /*
-    @param usrp: instance of usrp.source_c
-    @param which: which side: 0 or 1 corresponding to side A or B respectively
-    @type which: int
-  */
-
-  d_first = true;
-  d_spi_format = SPI_FMT_MSB | SPI_FMT_HDR_0;
-
-  usrp()->_write_oe(d_which, 0, 0xffff);   // turn off all outputs
-  _enable_refclk(false);                // disable refclk
-
-  set_auto_tr(false);
-}
-
-flexrf_base::~flexrf_base()
-{
-  delete d_common;
-}
-
-void
-flexrf_base::_write_all(int R, int control, int N)
-{
-  /*
-    Write R counter latch, control latch and N counter latch to VCO.
-    
-    Adds 10ms delay between writing control and N if this is first call.
-    This is the required power-up sequence.
-    
-    @param R: 24-bit R counter latch
-    @type R: int
-    @param control: 24-bit control latch
-    @type control: int
-    @param N: 24-bit N counter latch
-    @type N: int
-  */
-  timespec t;
-  t.tv_sec = 0;
-  t.tv_nsec = 10000000;
-
-  _write_R(R);
-  _write_control(control);
-  if(d_first) {
-    //time.sleep(0.010);
-    nanosleep(&t, NULL);
-    d_first = false;
-  }
-  _write_N(N);
-}
-
-void
-flexrf_base::_write_control(int control)
-{
-  _write_it((control & ~0x3) | 0);
-}
-
-void
-flexrf_base::_write_R(int R)
-{
-  _write_it((R & ~0x3) | 1);
-}
-
-void
-flexrf_base::_write_N(int N)
-{
-  _write_it((N & ~0x3) | 2);
-}
-
-void
-flexrf_base::_write_it(int v)
-{
-  char s[3];
-  s[0] = (char)((v >> 16) & 0xff);
-  s[1] = (char)((v >>  8) & 0xff);
-  s[2] = (char)(v & 0xff);
-  std::string str(s, 3);
-  usrp()->_write_spi(0, d_spi_enable, d_spi_format, str);
-}
-        
-bool
-flexrf_base::_lock_detect()
-{
-  /*
-    @returns: the value of the VCO/PLL lock detect bit.
-    @rtype: 0 or 1
-  */
-  if(usrp()->read_io(d_which) & PLL_LOCK_DETECT) {
-    return true;
-  }
-  else {      // Give it a second chance
-    // FIXME: make portable sleep
-    timespec t;
-    t.tv_sec = 0;
-    t.tv_nsec = 100000000;
-    nanosleep(&t, NULL);
-    
-    if(usrp()->read_io(d_which) & PLL_LOCK_DETECT) {
-      return true;
-    }
-    else {
-      return false;
-    }
-  }
-}
-
-bool
-flexrf_base::_compute_regs(double freq, int &retR, int &retcontrol,
-			   int &retN, double &retfreq)
-{
-  /*
-    Determine values of R, control, and N registers, along with actual freq.
-    
-    @param freq: target frequency in Hz
-    @type freq: float
-    @returns: (R, control, N, actual_freq)
-    @rtype: tuple(int, int, int, float)
-    
-    Override this in derived classes.
-  */
-  
-  //raise NotImplementedError;
-  throw std::runtime_error("_compute_regs called from flexrf_base\n");
-}
-
-int
-flexrf_base::_compute_control_reg()
-{
-  return d_common->_compute_control_reg();
-}
-
-int
-flexrf_base::_refclk_divisor()
-{
-  return d_common->_refclk_divisor();
-}
-
-struct freq_result_t
-flexrf_base::set_freq(double freq)
-{
-  /*
-    @returns (ok, actual_baseband_freq) where:
-    ok is True or False and indicates success or failure,
-    actual_baseband_freq is the RF frequency that corresponds to DC in the IF.
-  */
-
-  struct freq_result_t args = {false, 0};
-
-  // Offsetting the LO helps get the Tx carrier leakage out of the way.
-  // This also ensures that on Rx, we're not getting hosed by the
-  // FPGA's DC removal loop's time constant.  We were seeing a
-  // problem when running with discontinuous transmission.
-  // Offsetting the LO made the problem go away.
-  freq += d_lo_offset;
-  
-  int R, control, N;
-  double actual_freq;
-  _compute_regs(freq, R, control, N, actual_freq);
-
-  if(R==0) {
-    return args;
-  }
-   
-  _write_all(R, control, N);
-  args.ok = _lock_detect();
-  args.baseband_freq = actual_freq;
-  return args;
-}
-
-bool
-flexrf_base::_set_pga(float pga_gain)
-{
-  if(d_which == 0) {
-    usrp()->set_pga(0, pga_gain);
-    usrp()->set_pga(1, pga_gain);
-  }
-  else {
-    usrp()->set_pga(2, pga_gain);
-    usrp()->set_pga(3, pga_gain);
-  }
-  return true;
-}
-
-bool
-flexrf_base::is_quadrature()
-{
-  /*
-    Return True if this board requires both I & Q analog channels.
-    
-    This bit of info is useful when setting up the USRP Rx mux register.
-  */
-  return true;
-}
-
-double
-flexrf_base::freq_min()
-{
-  return d_common->freq_min();
-}
-
-double
-flexrf_base::freq_max()
-{
-  return d_common->freq_max();
-}
-
-// ----------------------------------------------------------------
-
-flexrf_base_tx::flexrf_base_tx(usrp_basic_sptr _usrp, int which, int _power_on)
-  : flexrf_base(_usrp, which, _power_on)
-{
-  /*
-    @param usrp: instance of usrp.sink_c
-    @param which: 0 or 1 corresponding to side TX_A or TX_B respectively.
-  */
-  
-  if(which == 0) {
-    d_spi_enable = SPI_ENABLE_TX_A;
-  }
-  else {
-    d_spi_enable = SPI_ENABLE_TX_B;
-  }
-  
-  // power up the transmit side, but don't enable the mixer
-  usrp()->_write_oe(d_which,(POWER_UP|RX_TXN|ENABLE), 0xffff);
-  usrp()->write_io(d_which, (power_on()|RX_TXN), (POWER_UP|RX_TXN|ENABLE));
-  set_lo_offset(4e6);
-
-  set_gain((gain_min() + gain_max()) / 2.0);  // initialize gain
-}
-
-flexrf_base_tx::~flexrf_base_tx()
-{
-  shutdown();
-}
-
-
-void
-flexrf_base_tx::shutdown()
-{
-  // fprintf(stderr, "flexrf_base_tx::shutdown  d_is_shutdown = %d\n", d_is_shutdown);
-
-  if (!d_is_shutdown){
-    d_is_shutdown = true;
-    // do whatever there is to do to shutdown
-
-    // Power down and leave the T/R switch in the R position
-    usrp()->write_io(d_which, (power_off()|RX_TXN), (POWER_UP|RX_TXN|ENABLE));
-
-    // Power down VCO/PLL
-    d_PD = 3;
-  
-    _write_control(_compute_control_reg());
-    _enable_refclk(false);                       // turn off refclk
-    set_auto_tr(false);
-  }
-}
-
-bool
-flexrf_base_tx::set_auto_tr(bool on)
-{
-  bool ok = true;
-  if(on) {
-    ok &= set_atr_mask (RX_TXN | ENABLE);
-    ok &= set_atr_txval(0      | ENABLE);
-    ok &= set_atr_rxval(RX_TXN | 0);
-  }
-  else {
-    ok &= set_atr_mask (0);
-    ok &= set_atr_txval(0);
-    ok &= set_atr_rxval(0);
-  }
-  return ok;
-}
-
-bool
-flexrf_base_tx::set_enable(bool on)
-{
-  /*
-    Enable transmitter if on is true
-  */
-
-  int v;
-  int mask = RX_TXN | ENABLE;
-  if(on) {
-    v = ENABLE;
-  }
-  else {
-    v = RX_TXN;
-  }
-  return usrp()->write_io(d_which, v, mask);
-}
-
-float
-flexrf_base_tx::gain_min()
-{
-  return usrp()->pga_max();
-}
-
-float
-flexrf_base_tx::gain_max()
-{
-  return usrp()->pga_max();
-}
-
-float
-flexrf_base_tx::gain_db_per_step()
-{
-  return 1;
-}
-
-bool
-flexrf_base_tx::set_gain(float gain)
-{
-  /*
-    Set the gain.
-    
-    @param gain:  gain in decibels
-    @returns True/False
-  */
-  return _set_pga(usrp()->pga_max());
-}
-
-
-/**************************************************************************/
-
-
-flexrf_base_rx::flexrf_base_rx(usrp_basic_sptr _usrp, int which, int _power_on)
-  : flexrf_base(_usrp, which, _power_on)
-{
-  /*
-    @param usrp: instance of usrp.source_c
-    @param which: 0 or 1 corresponding to side RX_A or RX_B respectively.
-  */
-
-  if(which == 0) {
-    d_spi_enable = SPI_ENABLE_RX_A;
-  }
-  else {
-    d_spi_enable = SPI_ENABLE_RX_B;
-  }
-
-  usrp()->_write_oe(d_which, (POWER_UP|RX2_RX1N|ENABLE), 0xffff);
-  usrp()->write_io(d_which,  (power_on()|RX2_RX1N|ENABLE), 
-		   (POWER_UP|RX2_RX1N|ENABLE));
-  
-  // set up for RX on TX/RX port
-  select_rx_antenna("TX/RX");
-  
-  bypass_adc_buffers(true);
-
-  set_lo_offset(-4e6);
-}
-
-flexrf_base_rx::~flexrf_base_rx()
-{
-  shutdown();
-}
-
-void
-flexrf_base_rx::shutdown()
-{
-  // fprintf(stderr, "flexrf_base_rx::shutdown  d_is_shutdown = %d\n", d_is_shutdown);
-
-  if (!d_is_shutdown){
-    d_is_shutdown = true;
-    // do whatever there is to do to shutdown
-
-    // Power down
-    usrp()->common_write_io(C_RX, d_which, power_off(), (POWER_UP|ENABLE));
-
-    // Power down VCO/PLL
-    d_PD = 3;
-  
-
-    // fprintf(stderr, "flexrf_base_rx::shutdown  before _write_control\n");
-    _write_control(_compute_control_reg());
-
-    // fprintf(stderr, "flexrf_base_rx::shutdown  before _enable_refclk\n");
-    _enable_refclk(false);                       // turn off refclk
-
-    // fprintf(stderr, "flexrf_base_rx::shutdown  before set_auto_tr\n");
-    set_auto_tr(false);
-
-    // fprintf(stderr, "flexrf_base_rx::shutdown  after set_auto_tr\n");
-  }
-}
-
-bool
-flexrf_base_rx::set_auto_tr(bool on)
-{
-  bool ok = true;
-  if(on) {
-    ok &= set_atr_mask (ENABLE);
-    ok &= set_atr_txval(     0);
-    ok &= set_atr_rxval(ENABLE);
-  }
-  else {
-    ok &= set_atr_mask (0);
-    ok &= set_atr_txval(0);
-    ok &= set_atr_rxval(0);
-  }
-  return true;
-}
-
-bool
-flexrf_base_rx::select_rx_antenna(int which_antenna)
-{
-  /*
-    Specify which antenna port to use for reception.
-    @param which_antenna: either 'TX/RX' or 'RX2'
-  */
-
-  if(which_antenna == 0) {
-    usrp()->write_io(d_which, 0,RX2_RX1N);
-  }
-  else if(which_antenna == 1) {
-    usrp()->write_io(d_which, RX2_RX1N, RX2_RX1N);
-  }
-  else {
-    return false;
-    // throw std::invalid_argument("which_antenna must be either 'TX/RX' or 'RX2'\n");
-  }
-  return true;
-}
-
-bool
-flexrf_base_rx::select_rx_antenna(const std::string &which_antenna)
-{
-  /*
-    Specify which antenna port to use for reception.
-    @param which_antenna: either 'TX/RX' or 'RX2'
-  */
-
-  if(which_antenna == "TX/RX") {
-    usrp()->write_io(d_which, 0, RX2_RX1N);
-  }
-  else if(which_antenna == "RX2") {
-    usrp()->write_io(d_which, RX2_RX1N, RX2_RX1N);
-  }
-  else {
-    // throw std::invalid_argument("which_antenna must be either 'TX/RX' or 'RX2'\n");
-    return false;
-  }
-  return true;
-}
-
-bool
-flexrf_base_rx::set_gain(float gain)
-{
-  /*
-    Set the gain.
-    
-    @param gain:  gain in decibels
-    @returns True/False
-  */
-  
-  // clamp gain
-  gain = std::max(gain_min(), std::min(gain, gain_max()));
-
-  float pga_gain, agc_gain;
-  float V_maxgain, V_mingain, V_fullscale, dac_value;
-
-  float maxgain = gain_max() - usrp()->pga_max();
-  float mingain = gain_min();
-  if(gain > maxgain) {
-    pga_gain = gain-maxgain;
-    assert(pga_gain <= usrp()->pga_max());
-    agc_gain = maxgain;
-  }
-  else {
-    pga_gain = 0;
-    agc_gain = gain;
-  }
-  
-  V_maxgain = .2;
-  V_mingain = 1.2;
-  V_fullscale = 3.3;
-  dac_value = (agc_gain*(V_maxgain-V_mingain)/(maxgain-mingain) + V_mingain)*4096/V_fullscale;
-
-  assert(dac_value>=0 && dac_value<4096);
-
-  return (usrp()->write_aux_dac(d_which, 0, int(dac_value))
-	  && _set_pga(int(pga_gain)));
-}
-
-// ----------------------------------------------------------------
-
-
-_AD4360_common::_AD4360_common()
-{
-  // R-Register Common Values
-  d_R_RSV = 0;  // bits 23,22
-  d_BSC   = 3;  // bits 21,20 Div by 8 to be safe
-  d_TEST  = 0;  // bit 19
-  d_LDP   = 1;  // bit 18
-  d_ABP   = 0;  // bit 17,16   3ns
-
-  // N-Register Common Values
-  d_N_RSV = 0;  // bit 7
-        
-  // Control Register Common Values
-  d_PD    = 0;  // bits 21,20   Normal operation
-  d_PL    = 0;  // bits 13,12   11mA
-  d_MTLD  = 1;  // bit 11       enabled
-  d_CPG   = 0;  // bit 10       CP setting 1
-  d_CP3S  = 0;  // bit 9        Normal
-  d_PDP   = 1;  // bit 8        Positive
-  d_MUXOUT = 1; // bits 7:5     Digital Lock Detect
-  d_CR    = 0;  // bit 4        Normal
-  d_PC    = 1;  // bits 3,2     Core power 10mA
-}
-
-_AD4360_common::~_AD4360_common()
-{
-}
-
-bool
-_AD4360_common::_compute_regs(double refclk_freq, double freq, int &retR, 
-			      int &retcontrol, int &retN, double &retfreq)
-{
-  /*
-    Determine values of R, control, and N registers, along with actual freq.
-    
-    @param freq: target frequency in Hz
-    @type freq: float
-    @returns: (R, control, N, actual_freq)
-    @rtype: tuple(int, int, int, float)
-  */
-  
-  //  Band-specific N-Register Values
-  //float phdet_freq = _refclk_freq()/d_R_DIV;
-  double phdet_freq = refclk_freq/d_R_DIV;
-  double desired_n = round(freq*d_freq_mult/phdet_freq);
-  double actual_freq = desired_n * phdet_freq;
-  int B = floor(desired_n/_prescaler());
-  int A = desired_n - _prescaler()*B;
-  d_B_DIV = int(B);    // bits 20:8
-  d_A_DIV = int(A);    // bit 6:2
-
-  //assert db_B_DIV >= db_A_DIV
-  if(d_B_DIV < d_A_DIV) {
-    retR = 0;
-    retcontrol = 0;
-    retN = 0;
-    retfreq = 0;
-    return false;
-  }
-
-  int R = (d_R_RSV<<22) | (d_BSC<<20) | (d_TEST<<19) | 
-    (d_LDP<<18) | (d_ABP<<16) | (d_R_DIV<<2);
-  
-  int control = _compute_control_reg();
-
-  int N = (d_DIVSEL<<23) | (d_DIV2<<22) | (d_CPGAIN<<21) | 
-    (d_B_DIV<<8) | (d_N_RSV<<7) | (d_A_DIV<<2);
-
-  retR = R;
-  retcontrol = control;
-  retN = N;
-  retfreq = actual_freq/d_freq_mult;
-  return true;
-}
-
-int
-_AD4360_common::_compute_control_reg()
-{
-  int control = (d_P<<22) | (d_PD<<20) | (d_CP2<<17) | (d_CP1<<14)
-    | (d_PL<<12) | (d_MTLD<<11) | (d_CPG<<10) | (d_CP3S<<9) | (d_PDP<<8)
-    | (d_MUXOUT<<5) | (d_CR<<4) | (d_PC<<2);
-  
-  return control;
-}
-
-int
-_AD4360_common::_refclk_divisor()
-{
-  /*
-    Return value to stick in REFCLK_DIVISOR register
-  */
-  return 1;
-}
-    
-int
-_AD4360_common::_prescaler()
-{
-  if(d_P == 0) {
-    return 8;
-  }
-  else if(d_P == 1) {
-    return 16;
-  }
-  else {
-    return 32;
-  }
-}
-
-//----------------------------------------------------------------------
-
-_2200_common::_2200_common()
-  : _AD4360_common()
-{
-  // Band-specific R-Register Values
-  d_R_DIV = 16;  // bits 15:2
-   
-  // Band-specific C-Register values
-  d_P = 1;        // bits 23,22   Div by 16/17
-  d_CP2 = 7;      // bits 19:17
-  d_CP1 = 7;      // bits 16:14
-
-  // Band specifc N-Register Values
-  d_DIVSEL = 0;   // bit 23
-  d_DIV2 = 0;     // bit 22
-  d_CPGAIN = 0;   // bit 21
-  d_freq_mult = 1;
-}
-
-double
-_2200_common::freq_min()
-{
-  return 2000e6;
-}
-
-double
-_2200_common::freq_max()
-{
-  return 2400e6;
-}
-
-//----------------------------------------------------------------------
-
-_2400_common::_2400_common()
-  : _AD4360_common()
-{
-  // Band-specific R-Register Values
-  d_R_DIV = 16;  // bits 15:2
-   
-  // Band-specific C-Register values
-  d_P = 1;        // bits 23,22   Div by 16/17
-  d_CP2 = 7;      // bits 19:17
-  d_CP1 = 7;      // bits 16:14
-
-  // Band specifc N-Register Values
-  d_DIVSEL = 0;   // bit 23
-  d_DIV2 = 0;     // bit 22
-  d_CPGAIN = 0;   // bit 21
-  d_freq_mult = 1;
-}
-
-double
-_2400_common::freq_min()
-{
-  return 2300e6;
-}
-
-double
-_2400_common::freq_max()
-{
-  return 2900e6;
-}
-
-//----------------------------------------------------------------------
-
-_1200_common::_1200_common()
-  : _AD4360_common()
-{
-  // Band-specific R-Register Values
-  d_R_DIV = 16;  // bits 15:2  DIV by 16 for a 1 MHz phase detector freq
-   
-  // Band-specific C-Register values
-  d_P = 1;        // bits 23,22   Div by 16/17
-  d_CP2 = 7;      // bits 19:17   1.25 mA
-  d_CP1 = 7;      // bits 16:14   1.25 mA
-  
-  // Band specifc N-Register Values
-  d_DIVSEL = 0;   // bit 23
-  d_DIV2 = 1;     // bit 22
-  d_CPGAIN = 0;   // bit 21
-  d_freq_mult = 2;
-}
-
-double 
-_1200_common::freq_min()
-{
-  return 1150e6;
-}
-
-double 
-_1200_common::freq_max()
-{
-  return 1450e6;
-}
-
-//-------------------------------------------------------------------------
-
-_1800_common::_1800_common()
-  : _AD4360_common()
-{
-  // Band-specific R-Register Values
-  d_R_DIV = 16;  // bits 15:2  DIV by 16 for a 1 MHz phase detector freq
-    
-  // Band-specific C-Register values
-  d_P = 1;        // bits 23,22   Div by 16/17
-  d_CP2 = 7;      // bits 19:17   1.25 mA
-  d_CP1 = 7;      // bits 16:14   1.25 mA
-  
-  // Band specifc N-Register Values
-  d_DIVSEL = 0;   // bit 23
-  d_DIV2 = 0;     // bit 22
-  d_freq_mult = 1;
-  d_CPGAIN = 0;   // bit 21
-}
-
-double 
-_1800_common::freq_min()
-{
-  return 1500e6;
-}
-
-double 
-_1800_common::freq_max()
-{
-  return 2100e6;
-}
-
-//-------------------------------------------------------------------------
-
-_900_common::_900_common()
-  : _AD4360_common()
-{
-  // Band-specific R-Register Values
-  d_R_DIV = 16;  // bits 15:2  DIV by 16 for a 1 MHz phase detector freq
-   
-  // Band-specific C-Register values
-  d_P = 1;        // bits 23,22   Div by 16/17
-  d_CP2 = 7;      // bits 19:17   1.25 mA
-  d_CP1 = 7;      // bits 16:14   1.25 mA
-  
-  // Band specifc N-Register Values
-  d_DIVSEL = 0;   // bit 23
-  d_DIV2 = 1;     // bit 22
-  d_freq_mult = 2;
-  d_CPGAIN = 0;   // bit 21
-}
-
-double
-_900_common::freq_min()
-{
-  return 750e6;
-}
-
-double
-_900_common::freq_max()
-{
-  return 1050e6;
-}
-
-//-------------------------------------------------------------------------
-
-_400_common::_400_common()
-  : _AD4360_common()
-{
-  // Band-specific R-Register Values
-  d_R_DIV = 16;   // bits 15:2 
-   
-  // Band-specific C-Register values
-  d_P = 0;        // bits 23,22   Div by 8/9
-  d_CP2 = 7;      // bits 19:17   1.25 mA
-  d_CP1 = 7;      // bits 16:14   1.25 mA
-  
-  // Band specifc N-Register Values  These are different for TX/RX
-  d_DIVSEL = 0;   // bit 23
-  d_freq_mult = 2;
-  
-  d_CPGAIN = 0;   // bit 21
-}
-
-double 
-_400_common::freq_min()
-{
-  return 400e6;
-}  
-
-double 
-_400_common::freq_max()
-{
-  return 500e6;
-}  
-
-_400_tx::_400_tx()
-  : _400_common()
-{
-  d_DIV2 = 1;     // bit 22
-}
-
-_400_rx::_400_rx()
-  : _400_common()
-{
-  d_DIV2 = 0;    // bit 22   // RX side has built-in DIV2 in AD8348
-}
-
-//------------------------------------------------------------    
-
-db_flexrf_2200_tx::db_flexrf_2200_tx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_tx(usrp, which)
-{
-  d_common = new _2200_common();
-}
-
-db_flexrf_2200_tx::~db_flexrf_2200_tx()
-{
-}
-
-bool
-db_flexrf_2200_tx::_compute_regs(double freq, int &retR, int &retcontrol,
-				 int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-
-
-db_flexrf_2200_rx::db_flexrf_2200_rx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_rx(usrp, which)
-{
-  d_common = new _2200_common();
-  set_gain((gain_min() + gain_max()) / 2.0);  // initialize gain
-}
-
-db_flexrf_2200_rx::~db_flexrf_2200_rx()
-{
-}
-
-float
-db_flexrf_2200_rx::gain_min()
-{
-  return usrp()->pga_min();
-}
-
-float
-db_flexrf_2200_rx::gain_max()
-{
-  return usrp()->pga_max()+70;
-}
-
-float
-db_flexrf_2200_rx::gain_db_per_step()
-{
-  return 0.05;
-}
-
-
-bool
-db_flexrf_2200_rx::i_and_q_swapped()
-{
-  return true;
-}
-
-bool
-db_flexrf_2200_rx::_compute_regs(double freq, int &retR, int &retcontrol,
-				 int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-//------------------------------------------------------------    
-
-db_flexrf_2400_tx::db_flexrf_2400_tx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_tx(usrp, which)
-{
-  d_common = new _2400_common();
-}
-
-db_flexrf_2400_tx::~db_flexrf_2400_tx()
-{
-}
-
-bool
-db_flexrf_2400_tx::_compute_regs(double freq, int &retR, int &retcontrol,
-				 int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-
-
-db_flexrf_2400_rx::db_flexrf_2400_rx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_rx(usrp, which)
-{
-  d_common = new _2400_common();
-  set_gain((gain_min() + gain_max()) / 2.0);  // initialize gain
-}
-
-db_flexrf_2400_rx::~db_flexrf_2400_rx()
-{
-}
-
-float
-db_flexrf_2400_rx::gain_min()
-{
-  return usrp()->pga_min();
-}
-
-float
-db_flexrf_2400_rx::gain_max()
-{
-  return usrp()->pga_max()+70;
-}
-
-float
-db_flexrf_2400_rx::gain_db_per_step()
-{
-  return 0.05;
-}
-
-
-bool
-db_flexrf_2400_rx::i_and_q_swapped()
-{
-  return true;
-}
-
-bool
-db_flexrf_2400_rx::_compute_regs(double freq, int &retR, int &retcontrol,
-				 int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-//------------------------------------------------------------    
-
-
-db_flexrf_1200_tx::db_flexrf_1200_tx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_tx(usrp, which)
-{
-  d_common = new _1200_common();
-}
-
-db_flexrf_1200_tx::~db_flexrf_1200_tx()
-{
-}
-
-bool
-db_flexrf_1200_tx::_compute_regs(double freq, int &retR, int &retcontrol,
-				 int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-
-
-
-db_flexrf_1200_rx::db_flexrf_1200_rx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_rx(usrp, which)
-{
-  d_common = new _1200_common();
-  set_gain((gain_min() + gain_max()) / 2.0);  // initialize gain
-}
-
-db_flexrf_1200_rx::~db_flexrf_1200_rx()
-{
-}
-
-float
-db_flexrf_1200_rx::gain_min()
-{
-  return usrp()->pga_min();
-}
-
-float
-db_flexrf_1200_rx::gain_max()
-{
-  return usrp()->pga_max()+70;
-}
-
-float
-db_flexrf_1200_rx::gain_db_per_step()
-{
-  return 0.05;
-}
-
-bool
-db_flexrf_1200_rx::i_and_q_swapped()
-{
-  return true;
-}
-
-bool
-db_flexrf_1200_rx::_compute_regs(double freq, int &retR, int &retcontrol,
-				 int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-
-//------------------------------------------------------------    
-
-
-db_flexrf_1800_tx::db_flexrf_1800_tx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_tx(usrp, which)
-{
-  d_common = new _1800_common();
-}
-
-db_flexrf_1800_tx::~db_flexrf_1800_tx()
-{
-}
-
-bool
-db_flexrf_1800_tx::_compute_regs(double freq, int &retR, int &retcontrol,
-				 int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-
-
-db_flexrf_1800_rx::db_flexrf_1800_rx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_rx(usrp, which)
-{
-  d_common = new _1800_common();
-  set_gain((gain_min() + gain_max()) / 2.0);  // initialize gain
-}
-
-db_flexrf_1800_rx::~db_flexrf_1800_rx()
-{
-}
-
-
-float
-db_flexrf_1800_rx::gain_min()
-{
-  return usrp()->pga_min();
-}
-
-float
-db_flexrf_1800_rx::gain_max()
-{
-  return usrp()->pga_max()+70;
-}
-
-float
-db_flexrf_1800_rx::gain_db_per_step()
-{
-  return 0.05;
-}
-
-bool
-db_flexrf_1800_rx::i_and_q_swapped()
-{
-  return true;
-}
-
-bool
-db_flexrf_1800_rx::_compute_regs(double freq, int &retR, int &retcontrol,
-				 int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-
-//------------------------------------------------------------    
-
-
-db_flexrf_900_tx::db_flexrf_900_tx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_tx(usrp, which)
-{
-  d_common = new _900_common();
-}
-
-db_flexrf_900_tx::~db_flexrf_900_tx()
-{
-}
-
-bool
-db_flexrf_900_tx::_compute_regs(double freq, int &retR, int &retcontrol,
-				int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-
-db_flexrf_900_rx::db_flexrf_900_rx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_rx(usrp, which)
-{
-  d_common = new _900_common();
-  set_gain((gain_min() + gain_max()) / 2.0);  // initialize gain
-}
-
-db_flexrf_900_rx::~db_flexrf_900_rx()
-{
-}
-
-float
-db_flexrf_900_rx::gain_min()
-{
-  return usrp()->pga_min();
-}
-
-float
-db_flexrf_900_rx::gain_max()
-{
-  return usrp()->pga_max()+70;
-}
-
-float
-db_flexrf_900_rx::gain_db_per_step()
-{
-  return 0.05;
-}
-
-bool
-db_flexrf_900_rx::i_and_q_swapped()
-{
-  return true;
-}
-
-bool
-db_flexrf_900_rx::_compute_regs(double freq, int &retR, int &retcontrol,
-				int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-//------------------------------------------------------------    
-
-
-db_flexrf_400_tx::db_flexrf_400_tx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_tx(usrp, which, POWER_UP)
-{
-  d_common = new _400_tx();
-}
-
-db_flexrf_400_tx::~db_flexrf_400_tx()
-{
-}
-
-bool
-db_flexrf_400_tx::_compute_regs(double freq, int &retR, int &retcontrol,
-				int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
-
-
-db_flexrf_400_rx::db_flexrf_400_rx(usrp_basic_sptr usrp, int which)
-  : flexrf_base_rx(usrp, which, POWER_UP)
-{
-  d_common = new _400_rx();
-  set_gain((gain_min() + gain_max()) / 2.0);  // initialize gain
-}
-
-db_flexrf_400_rx::~db_flexrf_400_rx()
-{
-}
-
-float
-db_flexrf_400_rx::gain_min()
-{
-  return usrp()->pga_min();
-}
-
-float
-db_flexrf_400_rx::gain_max()
-{
-  return usrp()->pga_max()+45;
-}
-
-float
-
-db_flexrf_400_rx::gain_db_per_step()
-{
-  return 0.035;
-}
-
-
-bool
-db_flexrf_400_rx::i_and_q_swapped()
-{
-  return true;
-}
-
-bool
-db_flexrf_400_rx::_compute_regs(double freq, int &retR, int &retcontrol,
-				int &retN, double &retfreq)
-{
-  return d_common->_compute_regs(_refclk_freq(), freq, retR,
-				 retcontrol, retN, retfreq);
-}
-
diff --git a/usrp/host/lib/db_flexrf_mimo.cc b/usrp/host/lib/db_flexrf_mimo.cc
deleted file mode 100644
index 29bbbd58f..000000000
--- a/usrp/host/lib/db_flexrf_mimo.cc
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright 2008,2009 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.
- */ 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_flexrf_mimo.h>
-#include <fpga_regs_standard.h>
-#include <fpga_regs_common.h>
-#include <usrp/usrp_prims.h>
-#include <usrp_spi_defs.h>
-
-
-db_flexrf_2400_tx_mimo_a::db_flexrf_2400_tx_mimo_a(usrp_basic_sptr usrp, int which)
-  : db_flexrf_2400_tx(usrp, which)
-{
-  _enable_refclk(true);
-  d_common->R_DIV(1);
-}
-
-int 
-db_flexrf_2400_tx_mimo_a::_refclk_divisor()
-{
-  return 16;
-}
-
-db_flexrf_2400_rx_mimo_a::db_flexrf_2400_rx_mimo_a(usrp_basic_sptr usrp, int which)
-  : db_flexrf_2400_rx(usrp, which)
-{
-  _enable_refclk(true);
-  d_common->R_DIV(1);
-}
-
-int 
-db_flexrf_2400_rx_mimo_a::_refclk_divisor()
-{
-  return 16;
-}
-      
-db_flexrf_2400_tx_mimo_b::db_flexrf_2400_tx_mimo_b(usrp_basic_sptr usrp, int which)
-  : db_flexrf_2400_tx(usrp, which)
-{
-  d_common->R_DIV(16);
-}
-
-int 
-db_flexrf_2400_tx_mimo_b::_refclk_divisor()
-{
-  return 1;
-}
-
-db_flexrf_2400_rx_mimo_b::db_flexrf_2400_rx_mimo_b(usrp_basic_sptr usrp, int which)
-  : db_flexrf_2400_rx(usrp, which)
-{
-  d_common->R_DIV(16);
-}
-
-int 
-db_flexrf_2400_rx_mimo_b::_refclk_divisor()
-{
-  return 1;
-}
-
-db_flexrf_1800_tx_mimo_a::db_flexrf_1800_tx_mimo_a(usrp_basic_sptr usrp, int which)
-  : db_flexrf_1800_tx(usrp, which)
-{
-  _enable_refclk(true);
-  d_common->R_DIV(1);
-}
-
-int 
-db_flexrf_1800_tx_mimo_a::_refclk_divisor()
-{
-  return 16;
-}
-
-db_flexrf_1800_rx_mimo_a::db_flexrf_1800_rx_mimo_a(usrp_basic_sptr usrp, int which)
-  : db_flexrf_1800_rx(usrp, which)
-{
-  _enable_refclk(true);
-  d_common->R_DIV(1);
-}
-
-int 
-db_flexrf_1800_rx_mimo_a::_refclk_divisor()
-{
-  return 16;
-}
-    
-db_flexrf_1800_tx_mimo_b::db_flexrf_1800_tx_mimo_b(usrp_basic_sptr usrp, int which)
-  : db_flexrf_1800_tx(usrp, which)
-{
-  d_common->R_DIV(16);
-}
-
-int 
-db_flexrf_1800_tx_mimo_b::_refclk_divisor()
-{
-  return 1;
-}
-
-db_flexrf_1800_rx_mimo_b::db_flexrf_1800_rx_mimo_b(usrp_basic_sptr usrp, int which)
-  : db_flexrf_1800_rx(usrp, which)
-{
-  d_common->R_DIV(16);
-}
-
-int 
-db_flexrf_1800_rx_mimo_b::_refclk_divisor()
-{
-  return 1;
-}
-
-db_flexrf_1200_tx_mimo_a::db_flexrf_1200_tx_mimo_a(usrp_basic_sptr usrp, int which)
-  : db_flexrf_1200_tx(usrp, which)
-{
-  _enable_refclk(true);
-  d_common->R_DIV(1);
-}
-
-int 
-db_flexrf_1200_tx_mimo_a::_refclk_divisor()
-{
-  return 16;
-}
-
-db_flexrf_1200_rx_mimo_a::db_flexrf_1200_rx_mimo_a(usrp_basic_sptr usrp, int which)
-  : db_flexrf_1200_rx(usrp, which)
-{
-  _enable_refclk(true);
-  d_common->R_DIV(1);
-}
-
-int 
-db_flexrf_1200_rx_mimo_a::_refclk_divisor()
-{
-  return 16;
-}
-    
-db_flexrf_1200_tx_mimo_b::db_flexrf_1200_tx_mimo_b(usrp_basic_sptr usrp, int which)
-  : db_flexrf_1200_tx(usrp, which)
-{
-  d_common->R_DIV(16);
-}
-
-int 
-db_flexrf_1200_tx_mimo_b::_refclk_divisor()
-{
-  return 1;
-}
-
-db_flexrf_1200_rx_mimo_b::db_flexrf_1200_rx_mimo_b(usrp_basic_sptr usrp, int which)
-  : db_flexrf_1200_rx(usrp, which)
-{
-  d_common->R_DIV(16);
-}
-
-int 
-db_flexrf_1200_rx_mimo_b::_refclk_divisor()
-{
-  return 1;
-}
-
-db_flexrf_900_tx_mimo_a::db_flexrf_900_tx_mimo_a(usrp_basic_sptr usrp, int which)
-  : db_flexrf_900_tx(usrp, which)
-{
-  _enable_refclk(true);
-  d_common->R_DIV(1);
-}
-
-int 
-db_flexrf_900_tx_mimo_a::_refclk_divisor()
-{
-  return 16;
-}
-
-db_flexrf_900_rx_mimo_a::db_flexrf_900_rx_mimo_a(usrp_basic_sptr usrp, int which)
-  : db_flexrf_900_rx(usrp, which)
-{
-  _enable_refclk(true);
-  d_common->R_DIV(1);
-}
-
-int 
-db_flexrf_900_rx_mimo_a::_refclk_divisor()
-{
-  return 16;
-}
-    
-db_flexrf_900_tx_mimo_b::db_flexrf_900_tx_mimo_b(usrp_basic_sptr usrp, int which)
-  : db_flexrf_900_tx(usrp, which)
-{
-  d_common->R_DIV(16);
-}
-
-int 
-db_flexrf_900_tx_mimo_b::_refclk_divisor()
-{
-  return 1;
-}
-
-db_flexrf_900_rx_mimo_b::db_flexrf_900_rx_mimo_b(usrp_basic_sptr usrp, int which)
-  : db_flexrf_900_rx(usrp, which)
-{
-  d_common->R_DIV(16);
-}
-
-int db_flexrf_900_rx_mimo_b::_refclk_divisor()
-{
-  return 1;
-}
-
-db_flexrf_400_tx_mimo_a::db_flexrf_400_tx_mimo_a(usrp_basic_sptr usrp, int which)
-  : db_flexrf_400_tx(usrp, which)
-{
-  _enable_refclk(true);
-  d_common->R_DIV(1);
-}
-
-int 
-db_flexrf_400_tx_mimo_a::_refclk_divisor()
-{
-  return 16;
-}
-    
-db_flexrf_400_rx_mimo_a::db_flexrf_400_rx_mimo_a(usrp_basic_sptr usrp, int which)
-  : db_flexrf_400_rx(usrp, which)
-{
-  _enable_refclk(true);
-  d_common->R_DIV(1);
-}
-
-int 
-db_flexrf_400_rx_mimo_a::_refclk_divisor()
-{
-  return 16;
-}
-    
-db_flexrf_400_tx_mimo_b::db_flexrf_400_tx_mimo_b(usrp_basic_sptr usrp, int which)
-  : db_flexrf_400_tx(usrp, which)
-{
-  d_common->R_DIV(16);
-}
-
-int 
-db_flexrf_400_tx_mimo_b::_refclk_divisor()
-{
-  return 1;
-}
-    
-db_flexrf_400_rx_mimo_b::db_flexrf_400_rx_mimo_b(usrp_basic_sptr usrp, int which)
-  : db_flexrf_400_rx(usrp, which)
-{
-  d_common->R_DIV(16);
-}
-
-int 
-db_flexrf_400_rx_mimo_b::_refclk_divisor()
-{
-  return 1;
-}
diff --git a/usrp/host/lib/db_tv_rx.cc b/usrp/host/lib/db_tv_rx.cc
deleted file mode 100644
index 1822479e1..000000000
--- a/usrp/host/lib/db_tv_rx.cc
+++ /dev/null
@@ -1,278 +0,0 @@
-//
-// Copyright 2008,2009 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_tv_rx.h>
-#include <db_base_impl.h>
-
-/*****************************************************************************/
-
-int
-control_byte_1(bool fast_tuning_p, int reference_divisor)
-{
-  int c = 0x88;
-  if(fast_tuning_p) {
-    c |= 0x40;
-  }
-
-  if(reference_divisor == 512) {
-    c |= 0x3 << 1;
-  }
-  else if(reference_divisor == 640) {
-    c |= 0x0 << 1;
-  }
-  else if(reference_divisor == 1024) {
-    c |= 0x1 << 1;
-  }
-  else {
-    assert(0);
-  }
-
-  return c;
-}
-
-int
-control_byte_2(double target_freq, bool shutdown_tx_PGA)
-{
-  int c;
-  if(target_freq < 158e6) {        // VHF low
-    c = 0xa0;
-  }
-  else if(target_freq < 464e6) {   // VHF high
-    c = 0x90;
-  }
-  else {                           // UHF
-    c = 0x30;
-  }
-
-  if(shutdown_tx_PGA) {
-    c |= 0x08;
-  }
-
-  return c;
-}
-
-
-/*****************************************************************************/
-
-
-db_tv_rx::db_tv_rx(usrp_basic_sptr usrp, int which,
-		   double first_IF, double second_IF)
-  : db_base(usrp, which)
-{
-  // Handler for Tv Rx daughterboards.
-  // 
-  // @param usrp: instance of usrp.source_c
-  // @param which: which side: 0, 1 corresponding to RX_A or RX_B respectively
-
-  if(which == 0) {
-    d_i2c_addr = 0x60;
-  }
-  else {
-    d_i2c_addr = 0x61;
-  }
-
-  d_first_IF = first_IF;
-  d_second_IF = second_IF;
-  d_reference_divisor = 640;
-  d_fast_tuning = false;
-  d_inverted = false;                     // FIXME get rid of this
-  
-  set_gain((gain_min() + gain_max()) / 2.0);       // initialize gain
-
-  bypass_adc_buffers(false);
-}
-
-db_tv_rx::~db_tv_rx()
-{
-}
-
-// Gain setting
-void
-db_tv_rx::_set_rfagc(float gain)
-{
-  float voltage;
-
-  assert(gain <= 60 && gain >= 0);
-  // FIXME this has a 0.5V step between gain = 60 and gain = 59.
-  // Why are there two cases instead of a single linear case?
-  if(gain == 60) {
-    voltage = 4;
-  }
-  else {
-    voltage = gain/60.0 * 2.25 + 1.25;
-  }
-  int dacword = int(4096*voltage/1.22/3.3);    // 1.22 = opamp gain
-
-  assert(dacword>=0 && dacword<4096);
-  usrp()->write_aux_dac(d_which, 1, dacword);
-}
-
-void
-db_tv_rx::_set_ifagc(float gain)
-{
-  float voltage;
-
-  assert(gain <= 35 && gain >= 0);
-  voltage = gain/35.0 * 2.1 + 1.4;
-  int dacword = int(4096*voltage/1.22/3.3);    // 1.22 = opamp gain
-  
-  assert(dacword>=0 && dacword<4096);
-  usrp()->write_aux_dac(d_which, 0, dacword);
-}
-
-void
-db_tv_rx::_set_pga(float pga_gain)
-{
-  assert(pga_gain >=0 && pga_gain <=20);
-  if(d_which == 0) {
-    usrp()->set_pga(0, pga_gain);
-  }
-  else {
-    usrp()->set_pga (2, pga_gain);
-  }
-}           
-
-double
-db_tv_rx::freq_min()
-{
-  return 50e6;
-}
-
-double
-db_tv_rx::freq_max()
-{
-  return 860e6;
-}
-
-struct freq_result_t
-db_tv_rx::set_freq(double target_freq)
-{
-  // Set the frequency.
-  // 
-  // @param freq:  target RF frequency in Hz
-  // @type freq:   double
-  // 
-  // @returns (ok, actual_baseband_freq) where:
-  //   ok is True or False and indicates success or failure,
-  //   actual_baseband_freq is RF frequency that corresponds to DC in the IF.
-  
-  freq_result_t args = {false, 0};
-
-  double fmin = freq_min();
-  double fmax = freq_max();
-  if((target_freq < fmin) || (target_freq > fmax)) {
-    return args;
-  }
-  
-  double target_lo_freq = target_freq + d_first_IF;    // High side mixing
-  double f_ref = 4.0e6 / (double)(d_reference_divisor); // frequency steps
-
-  int divisor = int((target_lo_freq + (f_ref * 4)) / (f_ref * 8));  
-  double actual_lo_freq = (f_ref * 8 * divisor);
-  double actual_freq = actual_lo_freq - d_first_IF;
-
-  if((divisor & ~0x7fff) != 0) {		// must be 15-bits or less
-    return args;
-  }
-
-  // build i2c command string
-  std::vector<int> buf(4);
-  buf[0] = (divisor >> 8) & 0xff;         // DB1
-  buf[1] = divisor & 0xff;                // DB2
-  buf[2] = control_byte_1(d_fast_tuning, d_reference_divisor);
-  buf[3] = control_byte_2(actual_freq, true);
-
-  args.ok = usrp()->write_i2c(d_i2c_addr, int_seq_to_str (buf));
-  args.baseband_freq = actual_freq - d_second_IF;
-  return args;
-}
-
-float
-db_tv_rx::gain_min()
-{
-  return 0;
-}
-
-float
-db_tv_rx::gain_max()
-{
-  return 115;
-}
-
-float
-db_tv_rx::gain_db_per_step()
-{
-  return 1;
-}
-
-bool 
-db_tv_rx::set_gain(float gain)
-{
-  // Set the gain.
-  // 
-  // @param gain:  gain in decibels
-  // @returns True/False
-
-  float rfgain, ifgain, pgagain;
-
-  assert(gain>=0 && gain<=115);
-  if(gain>60) {
-    rfgain = 60;
-    gain = gain - 60;
-  }
-  else {
-    rfgain = gain;
-    gain = 0;
-  }
-   
-  if(gain > 35) {
-    ifgain = 35;
-    gain = gain - 35;
-  }
-  else {
-    ifgain = gain;
-    gain = 0;
-  }
-
-  pgagain = gain;
-  _set_rfagc(rfgain);
-  _set_ifagc(ifgain);
-  _set_pga(pgagain);
-
-  return true;
-}
-
-bool 
-db_tv_rx::is_quadrature()
-{
-  // Return True if this board requires both I & Q analog channels.  
-  return false;
-}
-
-bool
-db_tv_rx::spectrum_inverted() 
-{
-  // The 43.75 MHz version is inverted
-  return d_inverted;
-}
diff --git a/usrp/host/lib/db_tv_rx_mimo.cc b/usrp/host/lib/db_tv_rx_mimo.cc
deleted file mode 100644
index 0964c5d8b..000000000
--- a/usrp/host/lib/db_tv_rx_mimo.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright 2008,2009 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_tv_rx_mimo.h>
-
-db_tv_rx_mimo::db_tv_rx_mimo(usrp_basic_sptr usrp, int which,
-		   double first_IF, double second_IF)
-  : db_tv_rx(usrp, which,first_IF,second_IF)
-{
-  _enable_refclk(true);//enable FPGA refclock output on gpio 0
-}
-
-int 
-db_tv_rx_mimo::_refclk_divisor()
-{
-  return 16;// 64/16=> 4 Mhz refclock
-}
-
diff --git a/usrp/host/lib/db_util.cc b/usrp/host/lib/db_util.cc
deleted file mode 100644
index 4b46383bb..000000000
--- a/usrp/host/lib/db_util.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <db_util.h>
-#include <sstream>
-
-std::string
-int_seq_to_str(std::vector<int> &seq)
-{
-  //convert a sequence of integers into a string
-
-  std::stringstream str; 
-  std::vector<int>::iterator i;
-  for(i = seq.begin(); i != seq.end(); i++) {
-    str << char((unsigned int)*i);
-  }
-  return str.str();
-}
-
-std::vector<int> 
-str_to_int_seq(std::string str)
-{
-  //convert a string to a list of integers
-  std::vector<int> seq;
-  std::vector<int>::iterator sitr;
-  std::string::iterator i;
-  for(i=str.begin(); i != str.end(); i++) {
-    int a = (int)(*i);
-    seq.push_back(a);
-  }
-  return seq;
-}
-
diff --git a/usrp/host/lib/db_util.h b/usrp/host/lib/db_util.h
deleted file mode 100644
index e07abb608..000000000
--- a/usrp/host/lib/db_util.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_DB_UTIL_H
-#define INCLUDED_DB_UTIL_H
-
-#include <string>
-#include <vector>
-
-std::string int_seq_to_str(std::vector<int> &seq);
-std::vector<int> str_to_int_seq(std::string str);
-
-#endif /* INCLUDED_DB_UTIL_H */
diff --git a/usrp/host/lib/db_wbxng.cc b/usrp/host/lib/db_wbxng.cc
deleted file mode 100644
index 4d17c72d1..000000000
--- a/usrp/host/lib/db_wbxng.cc
+++ /dev/null
@@ -1,538 +0,0 @@
-//
-// Copyright 2008,2009 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_wbxng.h>
-#include "db_wbxng_adf4350.h"
-#include <db_base_impl.h>
-#include <stdio.h>
-#ifdef HAVE_TIME_H
-#include <ctime>
-#endif
-
-// d'board i/o pin defs
-// Tx and Rx have shared defs, but different i/o regs
-#define ENABLE_5        (1 << 7)         // enables 5.0V power supply
-#define ENABLE_33       (1 << 6)         // enables 3.3V supply
-//#define RX_TXN          (1 << 15)         // Tx only: T/R antenna switch for TX/RX port
-//#define RX2_RX1N        (1 << 15)         // Rx only: antenna switch between RX2 and TX/RX port
-#define RX_TXN          ((1 << 5)|(1 << 15))         // Tx only: T/R antenna switch for TX/RX port
-#define RX2_RX1N        ((1 << 5)|(1 << 15))         // Rx only: antenna switch between RX2 and TX/RX port
-#define RXBB_EN         (1 << 4)
-#define TXMOD_EN        (1 << 4)
-#define PLL_CE          (1 << 3)
-#define PLL_PDBRF       (1 << 2)
-#define PLL_MUXOUT      (1 << 1)
-#define PLL_LOCK_DETECT (1 << 0)
-
-// RX Attenuator constants
-#define ATTN_SHIFT	8
-#define ATTN_MASK	(63 << ATTN_SHIFT)
-
-wbxng_base::wbxng_base(usrp_basic_sptr _usrp, int which)
-  : db_base(_usrp, which)
-{
-  /*
-    @param usrp: instance of usrp.source_c
-    @param which: which side: 0 or 1 corresponding to side A or B respectively
-    @type which: int
-  */
-
-  usrp()->_write_oe(d_which, 0, 0xffff);   // turn off all outputs
-
-  d_first = true;
-  d_spi_format = SPI_FMT_MSB | SPI_FMT_HDR_0;
-
-  _enable_refclk(false);                // disable refclk
-
-  set_auto_tr(false);
-}
-
-wbxng_base::~wbxng_base()
-{
-}
-
-int
-wbxng_base::_refclk_divisor()
-{
-  return 1;
-}
-
-struct freq_result_t
-wbxng_base::set_freq(double freq)
-{
-  /*
-    @returns (ok, actual_baseband_freq) where:
-    ok is True or False and indicates success or failure,
-    actual_baseband_freq is the RF frequency that corresponds to DC in the IF.
-  */
-
-  // clamp freq
-  freq_t int_freq = freq_t(std::max(freq_min(), std::min(freq, freq_max())));
-
-  bool ok = d_common->_set_freq(int_freq*2, _refclk_freq());
-
-  _write_spi(d_common->compute_register(5));
-  _write_spi(d_common->compute_register(4));
-  _write_spi(d_common->compute_register(3));
-  /* load involved registers */
-  _write_spi(d_common->compute_register(2));
-  _write_spi(d_common->compute_register(1));
-  _write_spi(d_common->compute_register(0));
-
-  double freq_result = (double) d_common->_get_freq(_refclk_freq())/2.0;
-
-  //ok &= _get_locked();
-  struct freq_result_t args = {ok, freq_result};
-
-  /* Wait before reading Lock Detect*/
-  timespec t;
-  t.tv_sec = 0;
-  t.tv_nsec = 10000000;
-  nanosleep(&t, NULL);
-
-  //fprintf(stderr,"Setting WBXNG frequency, requested %d, obtained %f, lock_detect %d\n",
-  //        int_freq, freq_result, d_common->_get_locked());
-
-  // FIXME
-  // Offsetting the LO helps get the Tx carrier leakage out of the way.
-  // This also ensures that on Rx, we're not getting hosed by the
-  // FPGA's DC removal loop's time constant.  We were seeing a
-  // problem when running with discontinuous transmission.
-  // Offsetting the LO made the problem go away.
-  //freq += d_lo_offset;
-
-  return args;
-}
-
-bool
-wbxng_base::_set_pga(float pga_gain)
-{
-  if(d_which == 0) {
-    usrp()->set_pga(0, pga_gain);
-    usrp()->set_pga(1, pga_gain);
-  }
-  else {
-    usrp()->set_pga(2, pga_gain);
-    usrp()->set_pga(3, pga_gain);
-  }
-  return true;
-}
-
-bool
-wbxng_base::is_quadrature()
-{
-  /*
-    Return True if this board requires both I & Q analog channels.
-
-    This bit of info is useful when setting up the USRP Rx mux register.
-  */
-  return true;
-}
-
-double
-wbxng_base::freq_min()
-{
-  return (double) d_common->_get_min_freq()/2.0;
-}
-
-double
-wbxng_base::freq_max()
-{
-  return (double) d_common->_get_max_freq()/2.0;
-}
-
-bool
-wbxng_base::_get_locked(void)
-{
-    return usrp()->read_io(d_which) & PLL_LOCK_DETECT;
-}
-
-void
-wbxng_base::_write_spi(std::string data)
-{
-    usrp()->_write_spi(0, d_spi_enable, d_spi_format, data);
-}
-
-// ----------------------------------------------------------------
-
-db_wbxng_tx::db_wbxng_tx(usrp_basic_sptr _usrp, int which)
-  : wbxng_base(_usrp, which)
-{
-  /*
-    @param usrp: instance of usrp.sink_c
-    @param which: 0 or 1 corresponding to side TX_A or TX_B respectively.
-  */
-
-  if(which == 0) {
-    d_spi_enable = SPI_ENABLE_TX_A;
-  }
-  else {
-    d_spi_enable = SPI_ENABLE_TX_B;
-  }
-
-  d_common = boost::shared_ptr<adf4350> (new adf4350());
-
-  /* Initialize the registers. */
-  _write_spi(d_common->compute_register(5));
-  _write_spi(d_common->compute_register(4));
-  _write_spi(d_common->compute_register(3));
-  _write_spi(d_common->compute_register(2));
-  _write_spi(d_common->compute_register(1));
-  _write_spi(d_common->compute_register(0));
-
-  // power up the transmit side, but don't enable the mixer
-  usrp()->_write_oe(d_which,(PLL_CE|PLL_PDBRF|RX_TXN|TXMOD_EN|ENABLE_33|ENABLE_5), (PLL_CE|PLL_PDBRF|RX_TXN|TXMOD_EN|ENABLE_33|ENABLE_5));
-  usrp()->write_io(d_which, (PLL_CE|RX_TXN|ENABLE_33|ENABLE_5), (PLL_CE|PLL_PDBRF|RX_TXN|ENABLE_33|ENABLE_5));
-  //set_lo_offset(4e6);
-  
-  // Disable VCO/PLL
-  //d_common->_enable(true);
-  usrp()->write_io(d_which, (PLL_PDBRF), (PLL_PDBRF));
-
-  set_gain(gain_min());  // initialize gain
-}
-
-db_wbxng_tx::~db_wbxng_tx()
-{
-  shutdown();
-}
-
-void
-db_wbxng_tx::shutdown()
-{
-  // fprintf(stderr, "db_wbxng_tx::shutdown  d_is_shutdown = %d\n", d_is_shutdown);
-
-  if (!d_is_shutdown){
-    d_is_shutdown = true;
-    // do whatever there is to do to shutdown
-
-    // Disable VCO/PLL
-    //d_common->_enable(false);
-    usrp()->write_io(d_which, 0, (PLL_PDBRF));
-
-    // Power down and leave the T/R switch in the R position
-    usrp()->write_io(d_which, (RX_TXN), (PLL_CE|PLL_PDBRF|RX_TXN|ENABLE_33|ENABLE_5));
-
-    /*
-    _write_control(_compute_control_reg());
-    */
-    _enable_refclk(false);                       // turn off refclk
-    set_auto_tr(false);
-  }
-}
-
-bool
-db_wbxng_tx::set_auto_tr(bool on)
-{
-  bool ok = true;
-  if(on) {
-    ok &= set_atr_mask (RX_TXN | TXMOD_EN);
-    ok &= set_atr_txval(0      | TXMOD_EN);
-    ok &= set_atr_rxval(RX_TXN);
-  }
-  else {
-    ok &= set_atr_mask (0);
-    ok &= set_atr_txval(0);
-    ok &= set_atr_rxval(0);
-  }
-  return ok;
-}
-
-bool
-db_wbxng_tx::set_enable(bool on)
-{
-  /*
-    Enable transmitter if on is true
-  */
-
-  int v;
-  int mask = RX_TXN | TXMOD_EN;
-  if(on) {
-    v = TXMOD_EN;
-    // Enable VCO/PLL
-    //d_common->_enable(true);
-  }
-  else {
-    v = RX_TXN;
-    // Disable VCO/PLL
-    //d_common->_enable(false);
-  }
-  return usrp()->write_io(d_which, v, mask);
-}
-
-float
-db_wbxng_tx::gain_min()
-{
-  return 0.0;
-}
-
-float
-db_wbxng_tx::gain_max()
-{
-  return 25.0;
-}
-
-float
-db_wbxng_tx::gain_db_per_step()
-{
-  return gain_max()/(1+(1.4-0.5)*4096/3.3);
-}
-
-bool
-db_wbxng_tx::set_gain(float gain)
-{
-  /*
-    Set the gain.
-
-    @param gain:  gain in decibels
-    @returns True/False
-  */
-
-  // clamp gain
-  gain = std::max(gain_min(), std::min(gain, gain_max()));
-
-  float pga_gain, agc_gain;
-  float V_maxgain, V_mingain, V_fullscale, dac_value;
-
-  float maxgain = gain_max();
-  float mingain = gain_min();
-  pga_gain = 0;
-  agc_gain = gain;
-
-  V_maxgain = 0.5;
-  V_mingain = 1.4;
-  V_fullscale = 3.3;
-  dac_value = (agc_gain*(V_maxgain-V_mingain)/(maxgain-mingain) + V_mingain)*4096/V_fullscale;
-
-  //fprintf(stderr, "TXGAIN: %f dB, Dac Code: %d, Voltage: %f\n", gain, int(dac_value), float((dac_value/4096.0)*V_fullscale));
-  assert(dac_value>=0 && dac_value<4096);
-
-  return (usrp()->write_aux_dac(d_which, 0, int(dac_value))
-     && _set_pga(usrp()->pga_max()));
-
-}
-
-
-/**************************************************************************/
-
-
-db_wbxng_rx::db_wbxng_rx(usrp_basic_sptr _usrp, int which)
-  : wbxng_base(_usrp, which)
-{
-  /*
-    @param usrp: instance of usrp.source_c
-    @param which: 0 or 1 corresponding to side RX_A or RX_B respectively.
-  */
-
-  if(which == 0) {
-    d_spi_enable = SPI_ENABLE_RX_A;
-  }
-  else {
-    d_spi_enable = SPI_ENABLE_RX_B;
-  }
-
-  d_common = boost::shared_ptr<adf4350> (new adf4350());
-
-  /* Initialize the registers. */
-  _write_spi(d_common->compute_register(5));
-  _write_spi(d_common->compute_register(4));
-  _write_spi(d_common->compute_register(3));
-  _write_spi(d_common->compute_register(2));
-  _write_spi(d_common->compute_register(1));
-  _write_spi(d_common->compute_register(0));
-  
-  usrp()->_write_oe(d_which, (PLL_CE|PLL_PDBRF|RX2_RX1N|RXBB_EN|ATTN_MASK|ENABLE_33|ENABLE_5), (PLL_CE|PLL_PDBRF|RX2_RX1N|RXBB_EN|ATTN_MASK|ENABLE_33|ENABLE_5));
-  usrp()->write_io(d_which,  (PLL_CE|RX2_RX1N|RXBB_EN|ENABLE_33|ENABLE_5), (PLL_CE|PLL_PDBRF|RX2_RX1N|RXBB_EN|ATTN_MASK|ENABLE_33|ENABLE_5));
-  //fprintf(stderr,"Setting WBXNG RXBB on");
-
-  // Enable VCO/PLL
-  //d_common->_enable(true);
-  usrp()->write_io(d_which, (PLL_PDBRF), (PLL_PDBRF));
-
-  // set up for RX on TX/RX port
-  select_rx_antenna("TX/RX");
-
-  bypass_adc_buffers(true);
-
-  /*
-  set_lo_offset(-4e6);
-  */
-
-  set_gain(gain_min());  // initialize gain
-}
-
-db_wbxng_rx::~db_wbxng_rx()
-{
-  shutdown();
-}
-
-void
-db_wbxng_rx::shutdown()
-{
-  // fprintf(stderr, "db_wbxng_rx::shutdown  d_is_shutdown = %d\n", d_is_shutdown);
-
-  if (!d_is_shutdown){
-    d_is_shutdown = true;
-    // do whatever there is to do to shutdown
-
-    // Power down VCO/PLL
-    //d_common->_enable(false);
-    usrp()->write_io(d_which, 0, (PLL_PDBRF));
-
-    // fprintf(stderr, "db_wbxng_rx::shutdown  before _write_control\n");
-    //_write_control(_compute_control_reg());
-
-    // fprintf(stderr, "db_wbxng_rx::shutdown  before _enable_refclk\n");
-    _enable_refclk(false);                       // turn off refclk
-
-    // fprintf(stderr, "db_wbxng_rx::shutdown  before set_auto_tr\n");
-    set_auto_tr(false);
-
-    // Power down
-    usrp()->write_io(d_which, 0, (PLL_CE|PLL_PDBRF|RX2_RX1N|RXBB_EN|ATTN_MASK|ENABLE_33|ENABLE_5));
-
-    // fprintf(stderr, "db_wbxng_rx::shutdown  after set_auto_tr\n");
-  }
-}
-
-bool
-db_wbxng_rx::set_auto_tr(bool on)
-{
-  bool ok = true;
-  if(on) {
-    ok &= set_atr_mask (RXBB_EN|RX2_RX1N);
-    ok &= set_atr_txval(      0|RX2_RX1N);
-    ok &= set_atr_rxval(RXBB_EN|       0);
-  }
-  else {
-    ok &= set_atr_mask (0);
-    ok &= set_atr_txval(0);
-    ok &= set_atr_rxval(0);
-  }
-  return true;
-}
-
-bool
-db_wbxng_rx::select_rx_antenna(int which_antenna)
-{
-  /*
-    Specify which antenna port to use for reception.
-    @param which_antenna: either 'TX/RX' or 'RX2'
-  */
-
-  if(which_antenna == 0) {
-    usrp()->write_io(d_which, 0,RX2_RX1N);
-  }
-  else if(which_antenna == 1) {
-    usrp()->write_io(d_which, RX2_RX1N, RX2_RX1N);
-  }
-  else {
-    return false;
-  }
-  return true;
-}
-
-bool
-db_wbxng_rx::select_rx_antenna(const std::string &which_antenna)
-{
-  /*
-    Specify which antenna port to use for reception.
-    @param which_antenna: either 'TX/RX' or 'RX2'
-  */
-
-
-  if(which_antenna == "TX/RX") {
-    usrp()->write_io(d_which, 0, RX2_RX1N);
-  }
-  else if(which_antenna == "RX2") {
-    usrp()->write_io(d_which, RX2_RX1N, RX2_RX1N);
-  }
-  else {
-    return false;
-  }
-
-  return true;
-}
-
-bool
-db_wbxng_rx::set_gain(float gain)
-{
-  /*
-    Set the gain.
-
-    @param gain:  gain in decibels
-    @returns True/False
-  */
-
-  // clamp gain
-  gain = std::max(gain_min(), std::min(gain, gain_max()));
-
-  float pga_gain, agc_gain;
-
-  float maxgain = gain_max() - usrp()->pga_max();
-  if(gain > maxgain) {
-    pga_gain = gain-maxgain;
-    assert(pga_gain <= usrp()->pga_max());
-    agc_gain = maxgain;
-  }
-  else {
-    pga_gain = 0;
-    agc_gain = gain;
-  }
-
-  return _set_attn(maxgain-agc_gain) && _set_pga(int(pga_gain));
-}
-
-bool
-db_wbxng_rx::_set_attn(float attn)
-{
-  int attn_code = int(floor(attn/0.5));
-  unsigned int iobits = (~attn_code) << ATTN_SHIFT;
-  //fprintf(stderr, "Attenuation: %f dB, Code: %d, IO Bits %x, Mask: %x \n", attn, attn_code, iobits & ATTN_MASK, ATTN_MASK);
-  return usrp()->write_io(d_which, iobits, ATTN_MASK);
-}
-
-float
-db_wbxng_rx::gain_min()
-{
-  return usrp()->pga_min();
-}
-
-float
-db_wbxng_rx::gain_max()
-{
-  return usrp()->pga_max()+30.5;
-}
-
-float
-db_wbxng_rx::gain_db_per_step()
-{
-  return 0.05;
-}
-
-bool
-db_wbxng_rx::i_and_q_swapped()
-{
-  return false;
-}
diff --git a/usrp/host/lib/db_wbxng_adf4350.cc b/usrp/host/lib/db_wbxng_adf4350.cc
deleted file mode 100644
index f1ab63d82..000000000
--- a/usrp/host/lib/db_wbxng_adf4350.cc
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// Copyright 2009 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "db_wbxng_adf4350.h"
-#include <db_base_impl.h>
-#include <stdio.h>
-
-#define FREQ_C(freq) uint64_t(freq)
-#define DIV_ROUND(num, denom) (((num) + ((denom)/2))/(denom))
-#define MIN_INT_DIV uint16_t(23)                                        /* minimum int divider, prescaler 4/5 only */
-#define MAX_RF_DIV uint8_t(16)                                          /* max rf divider, divides rf output */
-#define MIN_VCO_FREQ FREQ_C(2.2e9)                                      /* minimum vco freq */
-#define MAX_VCO_FREQ FREQ_C(4.4e9)                                      /* minimum vco freq */
-#define MAX_FREQ DIV_ROUND(MAX_VCO_FREQ, 1)                                           /* upper bound freq (rf div = 1) */
-#define MIN_FREQ DIV_ROUND(MIN_VCO_FREQ, MAX_RF_DIV)                    /* calculated lower bound freq */
-
-#define CE_PIN        (1 << 3)
-#define PDB_RF_PIN    (1 << 2)
-#define MUX_PIN       (1 << 1)
-#define LD_PIN        (1 << 0)
-
-adf4350::adf4350()
-{
-    d_regs = new adf4350_regs();
-}
-
-adf4350::~adf4350()
-{
-    delete d_regs;
-}
-
-std::string
-adf4350::compute_register(uint8_t addr)
-{
-    uint32_t data = d_regs->compute_register(addr);
-
-    data |= addr;
-
-    // create std::string from data here
-    char s[4];
-    s[0] = (char)((data >> 24) & 0xff);
-    s[1] = (char)((data >> 16) & 0xff);
-    s[2] = (char)((data >>  8) & 0xff);
-    s[3] = (char)(data & 0xff);
-    return std::string(s, 4);
-}
-
-freq_t
-adf4350::_get_max_freq(void)
-{
-    return MAX_FREQ;
-}
-
-freq_t
-adf4350::_get_min_freq(void)
-{
-    return MIN_FREQ;
-}
-
-bool
-adf4350::_set_freq(freq_t freq, freq_t refclock_freq)
-{
-    /* Set the frequency by setting int, frac, mod, r, div */
-    if (freq > MAX_FREQ || freq < MIN_FREQ) return false;
-    int min_int_div = 23;
-    d_regs->d_prescaler = 0;
-    if (freq > FREQ_C(3e9)) {
-        min_int_div = 75;
-        d_regs->d_prescaler = 1;
-    }
-    /* Ramp up the RF divider until the VCO is within range. */
-    d_regs->d_divider_select = 0;
-    while (freq < MIN_VCO_FREQ){
-        freq <<= 1; //double the freq
-        d_regs->d_divider_select++; //double the divider
-    }
-    /* Ramp up the R divider until the N divider is at least the minimum. */
-    //d_regs->d_10_bit_r_counter = refclock_freq*MIN_INT_DIV/freq;
-    d_regs->d_10_bit_r_counter = 2;
-    uint64_t n_mod;
-    do{
-        d_regs->d_10_bit_r_counter++;
-        n_mod = freq;
-        n_mod *= d_regs->d_10_bit_r_counter;
-        n_mod *= d_regs->d_mod;
-        n_mod /= refclock_freq;
-        /* calculate int and frac */
-        d_regs->d_int = n_mod/d_regs->d_mod;
-        d_regs->d_frac = (n_mod - (freq_t)d_regs->d_int*d_regs->d_mod) & uint16_t(0xfff);
-        /*
-        fprintf(stderr,
-            "VCO %lu KHz, Int %u, Frac %u, Mod %u, R %u, Div %u\n",
-            freq, d_regs->d_int, d_regs->d_frac,
-            d_regs->d_mod, d_regs->d_10_bit_r_counter, (1 << d_regs->d_divider_select)
-        );
-        */
-    }while(d_regs->d_int < min_int_div);
-    /* calculate the band select so PFD is under 125 KHz */
-    d_regs->d_8_bit_band_select_clock_divider_value = \
-        refclock_freq/(FREQ_C(30e3)*d_regs->d_10_bit_r_counter) + 1;
-    /*
-    fprintf(stderr, "Band Selection: Div %u, Freq %lu\n",
-        d_regs->d_8_bit_band_select_clock_divider_value,
-        refclock_freq/(d_regs->d_8_bit_band_select_clock_divider_value * d_regs->d_10_bit_r_counter) + 1
-    );
-    */
-    return true;
-}
-
-freq_t
-adf4350::_get_freq(freq_t refclock_freq)
-{
-    /* Calculate the freq from int, frac, mod, ref, r, div:
-     *  freq = (int + frac/mod) * (ref/r)
-     * Keep precision by doing multiplies first:
-     *  freq = (((((((int)*mod) + frac)*ref)/mod)/r)/div)
-     */
-    uint64_t freq;
-    freq = d_regs->d_int;
-    freq *= d_regs->d_mod;
-    freq += d_regs->d_frac;
-    freq *= refclock_freq;
-    freq /= d_regs->d_mod;
-    freq /= d_regs->d_10_bit_r_counter;
-    freq /= (1 << d_regs->d_divider_select);
-    return freq;
-}
diff --git a/usrp/host/lib/db_wbxng_adf4350.h b/usrp/host/lib/db_wbxng_adf4350.h
deleted file mode 100644
index ce8cbf4b1..000000000
--- a/usrp/host/lib/db_wbxng_adf4350.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright 2009 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 asversion 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_ADF4350_H
-#define INCLUDED_ADF4350_H
-
-#include "db_wbxng_adf4350_regs.h"
-#include <usrp/db_base.h>
-#include <stdint.h>
-
-typedef uint64_t freq_t;
-class adf4350_regs;
-
-class adf4350
-{
-public:
-    adf4350();
-    ~adf4350();
-    void _update();
-    std::string compute_register(uint8_t addr);
-    bool _set_freq(freq_t freq, freq_t refclock_freq);
-    freq_t _get_freq(freq_t refclock_freq);
-    freq_t _get_max_freq();
-    freq_t _get_min_freq();
-
-protected:
-    adf4350_regs *d_regs;
-};
-
-#endif /* INCLUDED_ADF4350_H */
diff --git a/usrp/host/lib/db_wbxng_adf4350_regs.cc b/usrp/host/lib/db_wbxng_adf4350_regs.cc
deleted file mode 100644
index c9707c3c6..000000000
--- a/usrp/host/lib/db_wbxng_adf4350_regs.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-//
-// Copyright 2009 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 asversion 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.
-
-#include "db_wbxng_adf4350_regs.h"
-#include "db_wbxng_adf4350.h"
-
-//#include "cal_div.h"
-
-/* reg 0 */
-/* reg 1 */
-const uint16_t adf4350_regs::s_phase = 0;
-/* reg 2 */
-const uint8_t adf4350_regs::s_low_noise_and_low_spur_modes = 3;
-const uint8_t adf4350_regs::s_muxout = 6;
-const uint8_t adf4350_regs::s_reference_doubler = 0;
-const uint8_t adf4350_regs::s_rdiv2 = 0;
-const uint8_t adf4350_regs::s_double_buff = 0;
-const uint8_t adf4350_regs::s_charge_pump_setting = 5;
-const uint8_t adf4350_regs::s_ldf = 0;
-const uint8_t adf4350_regs::s_ldp = 0;
-const uint8_t adf4350_regs::s_pd_polarity = 1;
-const uint8_t adf4350_regs::s_power_down = 0;
-const uint8_t adf4350_regs::s_cp_three_state = 0;
-const uint8_t adf4350_regs::s_counter_reset = 0;
-/* reg 3 */
-const uint8_t adf4350_regs::s_csr = 0;
-const uint8_t adf4350_regs::s_clk_div_mode = 0;
-const uint16_t adf4350_regs::s_12_bit_clock_divider_value = 0;
-/* reg 4 */
-const uint8_t adf4350_regs::s_feedback_select = 1;
-const uint8_t adf4350_regs::s_vco_power_down = 0;
-const uint8_t adf4350_regs::s_mtld = 0;
-const uint8_t adf4350_regs::s_aux_output_select = 1;
-const uint8_t adf4350_regs::s_aux_output_enable = 0;
-const uint8_t adf4350_regs::s_aux_output_power = 0;
-const uint8_t adf4350_regs::s_rf_output_enable = 1;
-const uint8_t adf4350_regs::s_output_power = 3;
-/* reg 5 */
-const uint8_t adf4350_regs::s_ld_pin_mode = 1;
-
-adf4350_regs::adf4350_regs(){
-
-    /* reg 0 */
-    d_int = uint16_t(100);
-    d_frac = 0;
-    /* reg 1 */
-    d_prescaler = uint8_t(0);
-    d_mod = uint16_t(0xfff);                      /* max fractional accuracy */
-    /* reg 2 */
-    d_10_bit_r_counter = uint16_t(2);
-    /* reg 3 */
-    /* reg 4 */
-    d_divider_select = 0;
-    d_8_bit_band_select_clock_divider_value = 0;
-    /* reg 5 */
-}
-
-adf4350_regs::~adf4350_regs(void){
-}
-
-uint32_t
-adf4350_regs::_reg_shift(uint32_t data, uint32_t shift){
-        return data << shift;
-}
-
-uint32_t
-adf4350_regs::compute_register(uint8_t addr){
-	uint32_t data = 0;
-	switch (addr){
-		case 0: data = (
-			_reg_shift(d_int, 15)                           |
-			_reg_shift(d_frac, 3));
-		        break;
-		case 1: data = (
-			_reg_shift(d_prescaler, 27)                     |
-			_reg_shift(s_phase, 15)                         |
-			_reg_shift(d_mod, 3));
-		        break;
-		case 2: data = (
-			_reg_shift(s_low_noise_and_low_spur_modes, 29)  |
-			_reg_shift(s_muxout, 26)                        |
-			_reg_shift(s_reference_doubler, 25)             |
-			_reg_shift(s_rdiv2, 24)                         |
-			_reg_shift(d_10_bit_r_counter, 14)              |
-			_reg_shift(s_double_buff, 13)                   |
-			_reg_shift(s_charge_pump_setting, 9)            |
-			_reg_shift(s_ldf, 8)                            |
-			_reg_shift(s_ldp, 7)                            |
-			_reg_shift(s_pd_polarity, 6)                    |
-			_reg_shift(s_power_down, 5)                     |
-			_reg_shift(s_cp_three_state, 4)                 |
-			_reg_shift(s_counter_reset, 3));
-		        break;
-		case 3: data = (
-			_reg_shift(s_csr, 18)                           |
-			_reg_shift(s_clk_div_mode, 15)                  |
-			_reg_shift(s_12_bit_clock_divider_value, 3));
-		        break;
-		case 4: data = (
-			_reg_shift(s_feedback_select, 23)               |
-			_reg_shift(d_divider_select, 20)                |
-			_reg_shift(d_8_bit_band_select_clock_divider_value, 12) |
-			_reg_shift(s_vco_power_down, 11)                |
-			_reg_shift(s_mtld, 10)                          |
-			_reg_shift(s_aux_output_select, 9)              |
-			_reg_shift(s_aux_output_enable, 8)              |
-			_reg_shift(s_aux_output_power, 6)               |
-			_reg_shift(s_rf_output_enable, 5)               |
-			_reg_shift(s_output_power, 3));
-		        break;
-		case 5: data = (
-			_reg_shift(s_ld_pin_mode, 22));
-		        break;
-		default: return data;
-	}
-	/* return the data to write out to spi */
-    return data;
-}
-
diff --git a/usrp/host/lib/db_wbxng_adf4350_regs.h b/usrp/host/lib/db_wbxng_adf4350_regs.h
deleted file mode 100644
index 33a548e85..000000000
--- a/usrp/host/lib/db_wbxng_adf4350_regs.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright 2009 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 asversion 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 ADF4350_REGS_H
-#define ADF4350_REGS_H
-
-#include <usrp/db_base.h>
-#include <stdint.h>
-
-class adf4350;
-
-class adf4350_regs
-{
-public:
-    adf4350_regs();
-    ~adf4350_regs();
-
-    uint32_t _reg_shift(uint32_t data, uint32_t shift);
-    uint32_t compute_register(uint8_t addr);
-
-    /* reg 0 */
-    uint16_t d_int;
-    uint16_t d_frac;
-    /* reg 1 */
-    uint8_t d_prescaler;
-    static const uint16_t s_phase;
-    uint16_t d_mod;
-    /* reg 2 */
-    static const uint8_t s_low_noise_and_low_spur_modes;
-    static const uint8_t s_muxout;
-    static const uint8_t s_reference_doubler;
-    static const uint8_t s_rdiv2;
-    uint16_t d_10_bit_r_counter;
-    static const uint8_t s_double_buff;
-    static const uint8_t s_charge_pump_setting;
-    static const uint8_t s_ldf;
-    static const uint8_t s_ldp;
-    static const uint8_t s_pd_polarity;
-    static const uint8_t s_power_down;
-    static const uint8_t s_cp_three_state;
-    static const uint8_t s_counter_reset;
-    /* reg 3 */
-    static const uint8_t s_csr;
-    static const uint8_t s_clk_div_mode;
-    static const uint16_t s_12_bit_clock_divider_value;
-    /* reg 4 */
-    static const uint8_t s_feedback_select;
-    uint8_t d_divider_select;
-    uint8_t d_8_bit_band_select_clock_divider_value;
-    static const uint8_t s_vco_power_down;
-    static const uint8_t s_mtld;
-    static const uint8_t s_aux_output_select;
-    static const uint8_t s_aux_output_enable;
-    static const uint8_t s_aux_output_power;
-    static const uint8_t s_rf_output_enable;
-    static const uint8_t s_output_power;
-    /* reg 5 */
-    static const uint8_t s_ld_pin_mode;
-
-protected:
-    usrp_basic_sptr d_usrp;
-    int d_spi_enable;
-    int d_spi_format;
-};
-
-#endif /* ADF4350_REGS_H */
diff --git a/usrp/host/lib/db_xcvr2450.cc b/usrp/host/lib/db_xcvr2450.cc
deleted file mode 100644
index ce9d1f4e8..000000000
--- a/usrp/host/lib/db_xcvr2450.cc
+++ /dev/null
@@ -1,795 +0,0 @@
-//
-// Copyright 2008,2009 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 asversion 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.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/db_xcvr2450.h>
-#include <db_base_impl.h>
-#include <cmath>
-#include <boost/thread.hpp>
-#include <boost/weak_ptr.hpp>
-#include <cstdio>
-
-#if 0
-#define LO_OFFSET 4.25e6
-#else
-#define LO_OFFSET 0
-#define NO_LO_OFFSET
-#endif
-
-
-/* ------------------------------------------------------------------------
- *  A few comments about the XCVR2450:
- *
- * It is half-duplex.  I.e., transmit and receive are mutually exclusive.
- * There is a single LO for both the Tx and Rx sides.
- * For our purposes the board is always either receiving or transmitting.
- *
- * Each board is uniquely identified by the *USRP hardware* instance and side
- * This dictionary holds a weak reference to existing board controller so it
- * can be created or retrieved as needed.
- */
-
-
-
-// TX IO Pins
-#define HB_PA_OFF      (1 << 15)    // 5GHz PA, 1 = off, 0 = on
-#define LB_PA_OFF      (1 << 14)    // 2.4GHz PA, 1 = off, 0 = on
-#define ANTSEL_TX1_RX2 (1 << 13)    // 1 = Ant 1 to TX, Ant 2 to RX
-#define ANTSEL_TX2_RX1 (1 << 12)    // 1 = Ant 2 to TX, Ant 1 to RX
-#define TX_EN          (1 << 11)    // 1 = TX on, 0 = TX off
-#define AD9515DIV      (1 << 4)     // 1 = Div  by 3, 0 = Div by 2
-
-#define TX_OE_MASK HB_PA_OFF|LB_PA_OFF|ANTSEL_TX1_RX2|ANTSEL_TX2_RX1|TX_EN|AD9515DIV
-#define TX_SAFE_IO HB_PA_OFF|LB_PA_OFF|ANTSEL_TX1_RX2|AD9515DIV
-
-// RX IO Pins
-#define LOCKDET (1 << 15)           // This is an INPUT!!!
-#define EN      (1 << 14)
-#define RX_EN   (1 << 13)           // 1 = RX on, 0 = RX off
-#define RX_HP   (1 << 12)
-#define RX_OE_MASK EN|RX_EN|RX_HP
-#define RX_SAFE_IO EN
-
-struct xcvr2450_key {
-  std::string serial_no;
-  int which;
-
-  bool operator==(const xcvr2450_key &x){
-    return x.serial_no ==serial_no && x.which == which;
-  }
-};
-
-class xcvr2450
-{
-private:
-  usrp_basic *d_raw_usrp;
-  int d_which;
-
-  bool d_is_shutdown;
-  int d_spi_format, d_spi_enable;
-  
-  int d_mimo, d_int_div, d_frac_div, d_highband, d_five_gig;
-  int d_cp_current, d_ref_div, d_rssi_hbw;
-  int d_txlpf_bw, d_rxlpf_bw, d_rxlpf_fine, d_rxvga_ser;
-  int d_rssi_range, d_rssi_mode, d_rssi_mux;
-  int d_rx_hp_pin, d_rx_hpf, d_rx_ant;
-  int d_tx_ant, d_txvga_ser, d_tx_driver_lin;
-  int d_tx_vga_lin, d_tx_upconv_lin, d_tx_bb_gain;
-  int d_pabias_delay, d_pabias, rx_rf_gain, rx_bb_gain, d_txgain;
-  int d_rx_rf_gain, d_rx_bb_gain;
-
-  int d_reg_standby, d_reg_int_divider, d_reg_frac_divider, d_reg_bandselpll;
-  int d_reg_cal, dsend_reg, d_reg_lpf, d_reg_rxrssi_ctrl, d_reg_txlin_gain;
-  int d_reg_pabias, d_reg_rxgain, d_reg_txgain;
-
-  int d_ad9515_div;
-
-  void _set_rfagc(float gain);
-  void _set_ifagc(float gain);
-  void _set_pga(float pga_gain);
-
-public:
-  usrp_basic *usrp(){
-    return d_raw_usrp;
-  }
-
-  xcvr2450(usrp_basic_sptr usrp, int which);
-  ~xcvr2450();
-  void shutdown();
-
-  void set_reg_standby();
-  
-  // Integer-Divider Ratio (3)
-  void set_reg_int_divider();
-  
-  // Fractional-Divider Ratio (4)
-  void set_reg_frac_divider();
-  
-  // Band Select and PLL (5)
-  void set_reg_bandselpll();
-  
-  // Calibration (6)
-  void set_reg_cal();
-
-  // Lowpass Filter (7)
-  void set_reg_lpf();
-  
-  // Rx Control/RSSI (8)
-  void set_reg_rxrssi_ctrl();
-  
-  // Tx Linearity/Baseband Gain (9)
-  void set_reg_txlin_gain();
-  
-  // PA Bias DAC (10)
-  void set_reg_pabias();
-  
-  // Rx Gain (11)
-  void set_reg_rxgain();
-  
-  // Tx Gain (12)
-  void set_reg_txgain();
-  
-  // Send register write to SPI
-  void send_reg(int v);
-
-  void set_gpio();
-  bool lock_detect();
-  bool set_rx_gain(float gain);
-  bool set_tx_gain(float gain);
-
-  struct freq_result_t set_freq(double target_freq);
-};
-
-
-/*****************************************************************************/
-
-
-xcvr2450::xcvr2450(usrp_basic_sptr _usrp, int which)
-  : d_raw_usrp(_usrp.get()), d_which(which), d_is_shutdown(false)
-{
-  // Handler for Tv Rx daughterboards.
-  // 
-  // @param usrp: instance of usrp.source_c
-  // @param which: which side: 0, 1 corresponding to RX_A or RX_B respectively
-
-  // Use MSB with no header
-  d_spi_format = SPI_FMT_MSB | SPI_FMT_HDR_0;
-
-  if(which == 0) {
-    d_spi_enable = SPI_ENABLE_RX_A;
-  }
-  else {
-    d_spi_enable = SPI_ENABLE_RX_B;
-  }
-
-  // Sane defaults
-  d_mimo = 1;          // 0 = OFF, 1 = ON
-  d_int_div = 192;     // 128 = min, 255 = max
-  d_frac_div = 0;      // 0 = min, 65535 = max
-  d_highband = 0;      // 0 = freq <= 5.4e9, 1 = freq > 5.4e9
-  d_five_gig = 0;      // 0 = freq <= 3.e9, 1 = freq > 3e9
-  d_cp_current = 1;    // 0 = 2mA, 1 = 4mA
-  d_ref_div = 1;       // 1 to 7
-  d_rssi_hbw = 0;      // 0 = 2 MHz, 1 = 6 MHz
-  d_txlpf_bw = 1;      // 1 = 12 MHz, 2 = 18 MHz, 3 = 24 MHz
-  d_rxlpf_bw = 1;      // 0 = 7.5 MHz, 1 = 9.5 MHz, 2 = 14 MHz, 3 = 18 MHz
-  d_rxlpf_fine = 2;    // 0 = 90%, 1 = 95%, 2 = 100%, 3 = 105%, 4 = 110%
-  d_rxvga_ser = 1;     // 0 = RXVGA controlled by B7:1, 1=controlled serially
-  d_rssi_range = 1;    // 0 = low range (datasheet typo), 1=high range (0.5V - 2.0V) 
-  d_rssi_mode = 1;     // 0 = enable follows RXHP, 1 = enabled
-  d_rssi_mux = 0;      // 0 = RSSI, 1 = TEMP
-  d_rx_hp_pin = 0;     // 0 = Fc set by rx_hpf, 1 = 600 KHz
-  d_rx_hpf = 0;        // 0 = 100Hz, 1 = 30KHz
-  d_rx_ant = 0;        // 0 = Ant. #1, 1 = Ant. #2
-  d_tx_ant = 0;        // 0 = Ant. #1, 1 = Ant. #2
-  d_txvga_ser = 1;     // 0 = TXVGA controlled by B6:1, 1=controlled serially
-  d_tx_driver_lin = 2; // 0=50% (worst linearity), 1=63%, 2=78%, 3=100% (best lin)
-  d_tx_vga_lin = 2;    // 0=50% (worst linearity), 1=63%, 2=78%, 3=100% (best lin)
-  d_tx_upconv_lin = 2; // 0=50% (worst linearity), 1=63%, 2=78%, 3=100% (best lin)
-  d_tx_bb_gain = 3;    // 0=maxgain-5dB, 1=max-3dB, 2=max-1.5dB, 3=max
-  d_pabias_delay = 15; // 0 = 0, 15 = 7uS
-  d_pabias = 0;        // 0 = 0 uA, 63 = 315uA
-  d_rx_rf_gain = 0;    // 0 = 0dB, 1 = 0dB, 2 = 15dB, 3 = 30dB
-  d_rx_bb_gain = 16;   // 0 = min, 31 = max (0 - 62 dB)
-
-  d_txgain = 63;       // 0 = min, 63 = max
-
-  // Initialize GPIO and ATR  
-  usrp()->common_write_io(C_TX, d_which, TX_SAFE_IO, TX_OE_MASK);
-  usrp()->_common_write_oe(C_TX, d_which, TX_OE_MASK, 0xffff);
-  usrp()->common_write_atr_txval(C_TX, d_which, TX_SAFE_IO);
-  usrp()->common_write_atr_rxval(C_TX, d_which, TX_SAFE_IO);
-  usrp()->common_write_atr_mask(C_TX, d_which, TX_OE_MASK);
-
-  usrp()->common_write_io(C_RX, d_which, RX_SAFE_IO, RX_OE_MASK);
-  usrp()->_common_write_oe(C_RX, d_which, RX_OE_MASK, 0xffff);
-  usrp()->common_write_atr_txval(C_RX, d_which, RX_SAFE_IO);
-  usrp()->common_write_atr_rxval(C_RX, d_which, RX_SAFE_IO);
-  usrp()->common_write_atr_mask(C_RX, d_which, RX_OE_MASK);
-
-  // Initialize chipset
-  // TODO: perform reset sequence to ensure power up defaults
-  set_reg_standby();
-  set_reg_bandselpll();
-  set_reg_cal();
-  set_reg_lpf();
-  set_reg_rxrssi_ctrl();
-  set_reg_txlin_gain();
-  set_reg_pabias();
-  set_reg_rxgain();
-  set_reg_txgain();
-  //FIXME: set_freq(2.45e9);
-}
-
-xcvr2450::~xcvr2450()
-{
-  //printf("xcvr2450::destructor\n");
-  shutdown();
-}
-
-void
-xcvr2450::shutdown()
-{
-  if (!d_is_shutdown){
-    d_is_shutdown = true;
-    usrp()->common_write_atr_txval(C_TX, d_which, TX_SAFE_IO);
-    usrp()->common_write_atr_rxval(C_TX, d_which, TX_SAFE_IO);
-    usrp()->common_write_atr_txval(C_RX, d_which, RX_SAFE_IO);
-    usrp()->common_write_atr_rxval(C_RX, d_which, RX_SAFE_IO);
-  }
-}
-
-
-void
-xcvr2450::set_reg_standby()
-{
-  d_reg_standby = ((d_mimo<<17) | 
-		   (1<<16)      | 
-		   (1<<6)       | 
-		   (1<<5)       | 
-		   (1<<4)       | 2);
-  send_reg(d_reg_standby);
-}
-
-void
-xcvr2450::set_reg_int_divider()
-{
-  d_reg_int_divider = (((d_frac_div & 0x03)<<16) | 
-		       (d_int_div<<4)            | 3);
-  send_reg(d_reg_int_divider);
-}
-
-void
-xcvr2450::set_reg_frac_divider()
-{
-  d_reg_frac_divider = ((d_frac_div & 0xfffc)<<2) | 4;
-  send_reg(d_reg_frac_divider);
-}
-        
-void
-xcvr2450::set_reg_bandselpll()
-{
-  d_reg_bandselpll = ((d_mimo<<17)      |
-		      (1<<16)           |
-		      (1<<15)           |
-		      (0<<11)           |
-		      (d_highband<<10)  |
-		      (d_cp_current<<9) |
-		      (d_ref_div<<5)    |
-		      (d_five_gig<<4)   | 5);
-  send_reg(d_reg_bandselpll);
-  d_reg_bandselpll = ((d_mimo<<17)      |
-		      (1<<16)           |
-		      (1<<15)           |
-		      (1<<11)           |
-		      (d_highband<<10)  |
-		      (d_cp_current<<9) |
-		      (d_ref_div<<5)    |
-		      (d_five_gig<<4)   | 5);
-  send_reg(d_reg_bandselpll);
-}
-     
-void
-xcvr2450::set_reg_cal()
-{
-  // FIXME do calibration
-  d_reg_cal = (1<<14)|6;
-  send_reg(d_reg_cal);
-}
-
-void
-xcvr2450::set_reg_lpf()
-{
-  d_reg_lpf = (
-	     (d_rssi_hbw<<15)  |
-	     (d_txlpf_bw<<9)  |
-	     (d_rxlpf_bw<<7)   |
-	     (d_rxlpf_fine<<4) | 7);
-  send_reg(d_reg_lpf);
-}
-
-void
-xcvr2450::set_reg_rxrssi_ctrl()
-{
-  d_reg_rxrssi_ctrl = ((d_rxvga_ser<<16)  |
-		       (d_rssi_range<<15) |
-		       (d_rssi_mode<<14)  |
-		       (d_rssi_mux<<12)   |
-		       (1<<9)             |
-		       (d_rx_hpf<<6)      |
-		       (1<<4) 		  | 8);
-  send_reg(d_reg_rxrssi_ctrl);
-}
-
-void
-xcvr2450::set_reg_txlin_gain()
-{
-  d_reg_txlin_gain = ((d_txvga_ser<<14)     |
-		      (d_tx_driver_lin<<12) |
-		      (d_tx_vga_lin<<10)    |
-		      (d_tx_upconv_lin<<6)  |
-		      (d_tx_bb_gain<<4)     | 9);
-  send_reg(d_reg_txlin_gain);
-}
-
-void
-xcvr2450::set_reg_pabias()
-{
-  d_reg_pabias = (
-		  (d_pabias_delay<<10) |
-		  (d_pabias<<4)        | 10);
-  send_reg(d_reg_pabias);
-}
-
-void
-xcvr2450::set_reg_rxgain()
-{
-  d_reg_rxgain = (
-		  (d_rx_rf_gain<<9) |
-		  (d_rx_bb_gain<<4) | 11);
-  send_reg(d_reg_rxgain);
-}
-
-void
-xcvr2450::set_reg_txgain()
-{
-  d_reg_txgain = (d_txgain<<4) | 12;
-  send_reg(d_reg_txgain);
-}
-
-void
-xcvr2450::send_reg(int v)
-{
-  // Send 24 bits, it keeps last 18 clocked in
-  char c[3];
-  c[0] = (char)((v >> 16) & 0xff);
-  c[1] = (char)((v >>  8) & 0xff);
-  c[2] = (char)((v & 0xff));
-  std::string s(c, 3);
-  
-  usrp()->_write_spi(0, d_spi_enable, d_spi_format, s);
-  //printf("xcvr2450: Setting reg %d to %X\n", (v&15), v);
-}
-
-// ----------------------------------------------------------------
-
-void
-xcvr2450::set_gpio()
-{
-  // We calculate four values:
-  //
-  // io_rx_while_rx: what to drive onto io_rx_* when receiving
-  // io_rx_while_tx: what to drive onto io_rx_* when transmitting
-  // io_tx_while_rx: what to drive onto io_tx_* when receiving
-  // io_tx_while_tx: what to drive onto io_tx_* when transmitting
-  //
-  // B1-B7 is ignored as gain is set serially for now.
-  
-  int rx_hp, tx_antsel, rx_antsel, tx_pa_sel;
-  if(d_rx_hp_pin)
-    rx_hp = RX_HP;
-  else
-    rx_hp = 0;
-  
-  if(d_tx_ant)
-    tx_antsel = ANTSEL_TX2_RX1;
-  else
-    tx_antsel = ANTSEL_TX1_RX2;
-
-  if(d_rx_ant)
-    rx_antsel = ANTSEL_TX2_RX1;
-  else
-    rx_antsel = ANTSEL_TX1_RX2;
-
-  if(d_five_gig)
-    tx_pa_sel = LB_PA_OFF;
-  else
-    tx_pa_sel = HB_PA_OFF;
- 
-  // Reset GPIO and ATR
-  // FIXME: dont set io, oe, atr mask once basic code stops overriding our settings
-  usrp()->common_write_io(C_TX, d_which, TX_SAFE_IO, TX_OE_MASK);
-  usrp()->_common_write_oe(C_TX, d_which, TX_OE_MASK, 0xffff);
-  usrp()->common_write_atr_txval(C_TX, d_which, tx_pa_sel|tx_antsel|TX_EN|AD9515DIV);
-  usrp()->common_write_atr_rxval(C_TX, d_which, HB_PA_OFF|LB_PA_OFF|rx_antsel|AD9515DIV);
-  usrp()->common_write_atr_mask(C_TX, d_which, TX_OE_MASK);
-
-  usrp()->common_write_io(C_RX, d_which, RX_SAFE_IO, RX_OE_MASK);
-  usrp()->_common_write_oe(C_RX, d_which, RX_OE_MASK, 0xffff);
-  usrp()->common_write_atr_txval(C_RX, d_which, EN|rx_hp);
-  usrp()->common_write_atr_rxval(C_RX, d_which, EN|rx_hp|RX_EN);
-  usrp()->common_write_atr_mask(C_RX, d_which, RX_OE_MASK);
-
-  //printf("GPIO: RXRX=%04X RXTX=%04X TXRX=%04X TXTX=%04X\n",
-  //       io_rx_while_rx, io_rx_while_tx, io_tx_while_rx, io_tx_while_tx);
-}
-  
-
-struct freq_result_t
-xcvr2450::set_freq(double target_freq)
-{
-  struct freq_result_t args = {false, 0};
-
-  double scaler;
-
-  if(target_freq > 3e9) {
-    d_five_gig = 1;
-    d_ad9515_div = 3;
-    scaler = 4.0/5.0;
-  }
-  else {
-    d_five_gig = 0;
-    d_ad9515_div = 3;
-    scaler = 4.0/3.0;
-  }
-
-  if(target_freq > 5.408e9) {
-    d_highband = 1;
-  }
-  else {
-    d_highband = 0;
-  }
-
-  double vco_freq = target_freq*scaler;
-  double sys_clk = usrp()->fpga_master_clock_freq();  // Usually 64e6 
-  double ref_clk = sys_clk / d_ad9515_div;
-        
-  double phdet_freq = ref_clk/d_ref_div;
-  double div = vco_freq/phdet_freq;
-  d_int_div = int(floor(div));
-  d_frac_div = int((div-d_int_div)*65536.0);
-  // double actual_freq = phdet_freq*(d_int_div+(d_frac_div/65536.0))/scaler;
-  
-  //printf("RF=%f VCO=%f R=%d PHD=%f DIV=%3.5f I=%3d F=%5d ACT=%f\n",
-  //	 target_freq, vco_freq, d_ref_div, phdet_freq,
-  //	 div, d_int_div, d_frac_div, actual_freq);
-
-  set_gpio();
-  set_reg_int_divider();
-  set_reg_frac_divider();
-  set_reg_bandselpll();
-
-  args.ok = lock_detect();
-#ifdef NO_LO_OFFSET
-  args.baseband_freq = target_freq;
-#else
-  args.baseband_freq = actual_freq;
-#endif
-
-  if(!args.ok){
-    printf("Fail %f\n", target_freq);
-  }
-  return args;
-}
-
-bool
-xcvr2450::lock_detect()
-{
-  /*
-    @returns: the value of the VCO/PLL lock detect bit.
-    @rtype: 0 or 1
-  */
-  if(usrp()->common_read_io(C_RX, d_which) & LOCKDET) {
-    return true;
-  }
-  else {      // Give it a second chance
-    if(usrp()->common_read_io(C_RX, d_which) & LOCKDET)
-      return true;
-    else
-      return false;
-  }
-}
-
-bool
-xcvr2450::set_rx_gain(float gain)
-{
-  if(gain < 0.0) 
-    gain = 0.0;
-  if(gain > 92.0)
-    gain = 92.0;
-
-  // Split the gain between RF and baseband
-  // This is experimental, not prescribed
-  if(gain < 31.0) {
-    d_rx_rf_gain = 0;		           // 0 dB RF gain
-    rx_bb_gain = int(gain/2.0);
-  }
-  
-  if(gain >= 30.0 and gain < 60.5) {
-    d_rx_rf_gain = 2;                    // 15 dB RF gain
-    d_rx_bb_gain = int((gain-15.0)/2.0);
-  }
-  
-  if(gain >= 60.5) {
-    d_rx_rf_gain = 3;			   // 30.5 dB RF gain
-    d_rx_bb_gain = int((gain-30.5)/2.0);
-  }
-  
-  set_reg_rxgain();
-  
-  return true;
-}
-
-bool
-xcvr2450::set_tx_gain(float gain)
-{
-  if(gain < 0.0) {
-    gain = 0.0;
-  }
-  if(gain > 30.0) {
-    gain = 30.0;
-  }
-  
-  d_txgain = int((gain/30.0)*63);
-  set_reg_txgain();
-
-  return true;
-}
-
-
-/*****************************************************************************/
-
-
-struct xcvr2450_table_entry {
-  xcvr2450_key 			key;
-  boost::weak_ptr<xcvr2450>	value;
-
-  xcvr2450_table_entry(const xcvr2450_key &_key, boost::weak_ptr<xcvr2450> _value)
-    : key(_key), value(_value) {}
-};
-
-typedef std::vector<xcvr2450_table_entry> xcvr2450_table;
-
-static boost::mutex s_table_mutex;
-static xcvr2450_table s_table;
-
-static xcvr2450_sptr
-_get_or_make_xcvr2450(usrp_basic_sptr usrp, int which)
-{
-  xcvr2450_key key = {usrp->serial_number(), which};
-
-  boost::mutex::scoped_lock	guard(s_table_mutex);
-
-  for (xcvr2450_table::iterator p = s_table.begin(); p != s_table.end();){
-    if (p->value.expired())	// weak pointer is now dead
-      p = s_table.erase(p);	// erase it
-    else {
-      if (key == p->key){	// found it
-	return xcvr2450_sptr(p->value);
-      }
-      else		        
-	++p;			// keep looking
-    }
-  }
-
-  // We don't have the xcvr2450 we're looking for
-
-  // create a new one and stick it in the table.
-  xcvr2450_sptr r(new xcvr2450(usrp, which));
-  xcvr2450_table_entry t(key, r);
-  s_table.push_back(t);
-
-  return r;
-}
-
-
-/*****************************************************************************/
-
-
-db_xcvr2450_base::db_xcvr2450_base(usrp_basic_sptr usrp, int which)
-  : db_base(usrp, which)
-{
-  /*
-   * Abstract base class for all xcvr2450 boards.
-   * 
-   * Derive board specific subclasses from db_xcvr2450_base_{tx,rx}
-   *
-   * @param usrp: instance of usrp.source_c
-   * @param which: which side: 0 or 1 corresponding to side A or B respectively
-   * @type which: int
-   */
-  
-  d_xcvr = _get_or_make_xcvr2450(usrp, which);
-}
-
-db_xcvr2450_base::~db_xcvr2450_base()
-{
-}
-
-void
-db_xcvr2450_base::shutdown_common()
-{
-  // If the usrp_basic in the xcvr2450 is the same as the usrp_basic
-  // in the daughterboard, shutdown the xcvr now (when only one of Tx
-  // and Rx is open, this is always true).
-
-  if (d_xcvr->usrp() == usrp()){
-    //std::cerr << "db_xcvr2450_base::shutdown_common: same -> shutting down\n";
-    d_xcvr->shutdown();
-  }
-  else {
-    //std::cerr << "db_xcvr2450_base::shutdown_common: different -> ignoring\n";
-  }
-}
-
-struct freq_result_t
-db_xcvr2450_base::set_freq(double target_freq)
-{
-  /*
-   * @returns (ok, actual_baseband_freq) where:
-   * ok is True or False and indicates success or failure,
-   * actual_baseband_freq is the RF frequency that corresponds to DC in the IF.
-   */
-  return d_xcvr->set_freq(target_freq+d_lo_offset);
-}
-
-bool
-db_xcvr2450_base::is_quadrature()
-{
-  /*
-   * Return True if this board requires both I & Q analog channels.
-   *
-   * This bit of info is useful when setting up the USRP Rx mux register.
-   */
-   return true;
-}
-
-double
-db_xcvr2450_base::freq_min()
-{
-  return 2.4e9;
-}
-
-double
-db_xcvr2450_base::freq_max()
-{
-  return 6.0e9;
-}
-
-
-/******************************************************************************/
-
-
-db_xcvr2450_tx::db_xcvr2450_tx(usrp_basic_sptr usrp, int which)
-  : db_xcvr2450_base(usrp, which)
-{
-  set_lo_offset(LO_OFFSET);
-  //printf("db_xcvr2450_tx::db_xcvr2450_tx\n");
-}
-
-db_xcvr2450_tx::~db_xcvr2450_tx()
-{
-  shutdown();
-}
-
-void
-db_xcvr2450_tx::shutdown()
-{
-  if (!d_is_shutdown){
-    d_is_shutdown = true;
-    shutdown_common();
-  }
-}
-
-float
-db_xcvr2450_tx::gain_min()
-{
-  return 0;
-}
-
-float
-db_xcvr2450_tx::gain_max()
-{
-  return 30;
-}
-
-float
-db_xcvr2450_tx::gain_db_per_step()
-{
-  return (30.0/63.0);
-}
-
-bool
-db_xcvr2450_tx::set_gain(float gain)
-{
-  return d_xcvr->set_tx_gain(gain);
-}
-
-bool
-db_xcvr2450_tx::i_and_q_swapped()
-{
-  return true;
-}
-
-
-/******************************************************************************/
-
-
-db_xcvr2450_rx::db_xcvr2450_rx(usrp_basic_sptr usrp, int which)
-  : db_xcvr2450_base(usrp, which)
-{
-  /*
-   * @param usrp: instance of usrp.source_c
-   * @param which: 0 or 1 corresponding to side RX_A or RX_B respectively.
-   */
-  set_lo_offset(LO_OFFSET);
-  //printf("db_xcvr2450_rx:d_xcvr_2450_rx\n");
-}
-
-db_xcvr2450_rx::~db_xcvr2450_rx()
-{
-  shutdown();
-}
-
-void
-db_xcvr2450_rx::shutdown()
-{
-  if (!d_is_shutdown){
-    d_is_shutdown = true;
-    shutdown_common();
-  }
-}
-
-float
-db_xcvr2450_rx::gain_min()
-{
-  return 0.0;
-}
-
-float
-db_xcvr2450_rx::gain_max()
-{
-  return 92.0;
-}
-
-float
-db_xcvr2450_rx::gain_db_per_step()
-{
-  return 1;
-}
-
-bool
-db_xcvr2450_rx::set_gain(float gain)
-{
-  return d_xcvr->set_rx_gain(gain);
-}
diff --git a/usrp/host/lib/fusb.cc b/usrp/host/lib/fusb.cc
deleted file mode 100644
index 2a597b67c..000000000
--- a/usrp/host/lib/fusb.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <fusb.h>
-
-// ------------------------------------------------------------------------
-// 			     device handle
-// ------------------------------------------------------------------------
-
-fusb_devhandle::fusb_devhandle (libusb_device_handle *udh)
-  : d_udh (udh)
-{
-  // that's it
-};
-
-fusb_devhandle::~fusb_devhandle ()
-{
-  // nop
-}
-
-// ------------------------------------------------------------------------
-// 			     end point handle
-// ------------------------------------------------------------------------
-
-fusb_ephandle::fusb_ephandle (int endpoint, bool input_p,
-			      int block_size, int nblocks)
-  : d_endpoint (endpoint), d_input_p (input_p),
-    d_block_size (block_size), d_nblocks (nblocks), d_started (false)
-{
-  // that't it
-}
-
-fusb_ephandle::~fusb_ephandle ()
-{
-  // nop
-}
diff --git a/usrp/host/lib/fusb.h b/usrp/host/lib/fusb.h
deleted file mode 100644
index 538ae1ae0..000000000
--- a/usrp/host/lib/fusb.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*  -*- c++ -*- */
-/*
- * Copyright 2005,2009 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 _FUSB_H_
-#define _FUSB_H_
-
-#include <usrp/libusb_types.h>
-
-struct 	libusb_context;
-class   fusb_ephandle;
-
-/*!
- * \brief abstract usb device handle
- */
-class fusb_devhandle {
-private:
-  // NOT IMPLEMENTED
-  fusb_devhandle (const fusb_devhandle &rhs);		  // no copy constructor
-  fusb_devhandle &operator= (const fusb_devhandle &rhs);  // no assignment operator
-
-protected:
-  libusb_device_handle		*d_udh;
-
-public:
-  // CREATORS
-  fusb_devhandle (libusb_device_handle *udh);
-  virtual ~fusb_devhandle ();
-
-  // MANIPULATORS
-  
-  /*!
-   * \brief return an ephandle of the correct subtype
-   */
-  virtual fusb_ephandle *make_ephandle (int endpoint, bool input_p,
-					int block_size = 0, int nblocks = 0) = 0;
-  
-  // ACCESSORS
-  libusb_device_handle *get_usb_dev_handle () const { return d_udh; }
-};
-
-
-/*!
- * \brief abstract usb end point handle
- */
-class fusb_ephandle {
-private:
-  // NOT IMPLEMENTED
-  fusb_ephandle (const fusb_ephandle &rhs);	        // no copy constructor
-  fusb_ephandle &operator= (const fusb_ephandle &rhs);  // no assignment operator
-
-protected:
-  int				d_endpoint;
-  bool				d_input_p;
-  int				d_block_size;
-  int				d_nblocks;
-  bool				d_started;
-
-public:
-  fusb_ephandle (int endpoint, bool input_p,
-		 int block_size = 0, int nblocks = 0);
-  virtual ~fusb_ephandle ();
-
-  virtual bool start () = 0;  	//!< begin streaming i/o
-  virtual bool stop () = 0;	//!< stop streaming i/o
-
-  /*!
-   * \returns \p nbytes if write was successfully enqueued, else -1.
-   * Will block if no free buffers available.
-   */
-  virtual int write (const void *buffer, int nbytes) = 0;
-
-  /*!
-   * \returns number of bytes read or -1 if error.
-   * number of bytes read will be <= nbytes.
-   * Will block if no input available.
-   */
-  virtual int read (void *buffer, int nbytes) = 0;
-
-  /*
-   * block until all outstanding writes have completed
-   */
-  virtual void wait_for_completion () = 0;
-
-  /*!
-   * \brief returns current block size.
-   */
-  int block_size () { return d_block_size; };
-};
-
-
-/*!
- * \brief factory for creating concrete instances of the appropriate subtype.
- */
-class fusb_sysconfig {
-public:
-  /*!
-   * \brief returns fusb_devhandle or throws if trouble
-   */
-  static fusb_devhandle *make_devhandle (libusb_device_handle *udh,
-                                         libusb_context *ctx = 0);
-
-  /*!
-   * \brief Returns max block size in bytes (hard limit).
-   */
-  static int max_block_size ();
-
-  /*!
-   * \brief Returns default block size in bytes.
-   */
-  static int default_block_size ();
-
-  /*!
-   * \brief Returns the default buffer size in bytes.
-   */
-  static int default_buffer_size ();
-
-};
-
-#endif /* _FUSB_H_ */
diff --git a/usrp/host/lib/fusb_darwin.cc b/usrp/host/lib/fusb_darwin.cc
deleted file mode 100644
index d2966c115..000000000
--- a/usrp/host/lib/fusb_darwin.cc
+++ /dev/null
@@ -1,582 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2009,2010 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define DO_DEBUG 0
-
-#include <usb.h>
-#include "fusb.h"
-#include "fusb_darwin.h"
-#include "darwin_libusb.h"
-#include <iostream>
-
-static const int USB_TIMEOUT = 100;	// in milliseconds
-static const UInt8 NUM_QUEUE_ITEMS = 20;
-
-fusb_devhandle_darwin::fusb_devhandle_darwin (usb_dev_handle* udh)
-  : fusb_devhandle (udh)
-{
-  // that's it
-}
-
-fusb_devhandle_darwin::~fusb_devhandle_darwin ()
-{
-  // nop
-}
-
-fusb_ephandle*
-fusb_devhandle_darwin::make_ephandle (int endpoint, bool input_p,
-				      int block_size, int nblocks)
-{
-  return new fusb_ephandle_darwin (this, endpoint, input_p,
-				   block_size, nblocks);
-}
-
-// ----------------------------------------------------------------
-
-fusb_ephandle_darwin::fusb_ephandle_darwin (fusb_devhandle_darwin* dh,
-					    int endpoint, bool input_p,
-					    int block_size, int nblocks)
-  : fusb_ephandle (endpoint, input_p, block_size, nblocks),
-    d_devhandle (dh), d_pipeRef (0), d_transferType (0),
-    d_interfaceRef (0),  d_interface (0), d_queue (0),
-    d_buffer (0), d_bufLenBytes (0)
-{
-  d_bufLenBytes = fusb_sysconfig::max_block_size();
-
-// create circular buffer
-  d_buffer = new circular_buffer<char> (NUM_QUEUE_ITEMS * d_bufLenBytes,
-					!d_input_p, d_input_p);
-
-// create the queue
-  d_queue = new circular_linked_list <s_buffer_ptr> (NUM_QUEUE_ITEMS);
-  d_queue->iterate_start ();
-  s_node_ptr l_node = d_queue->iterate_next ();
-  while (l_node) {
-    l_node->both (new s_both<s_buffer_ptr> (l_node, this));
-    s_buffer_ptr l_buf = new s_buffer (d_bufLenBytes);
-    l_node->object (l_buf);
-    l_node = d_queue->iterate_next ();
-    l_buf = NULL;
-  }
-
-  d_readRunning = new gruel::mutex ();
-  d_runThreadRunning = new gruel::mutex ();
-  d_runBlock = new gruel::condition_variable ();
-  d_readBlock = new gruel::condition_variable ();
-  d_runBlock_mutex = new gruel::mutex ();
-  d_readBlock_mutex = new gruel::mutex ();
-}
-
-fusb_ephandle_darwin::~fusb_ephandle_darwin ()
-{
-  stop ();
-
-  d_queue->iterate_start ();
-  s_node_ptr l_node = d_queue->iterate_next ();
-  while (l_node) {
-    s_both_ptr l_both = l_node->both ();
-    delete l_both;
-    l_both = NULL;
-    l_node->both (NULL);
-    s_buffer_ptr l_buf = l_node->object ();
-    delete l_buf;
-    l_buf = NULL;
-    l_node->object (NULL);
-    l_node = d_queue->iterate_next ();
-  }
-  delete d_queue;
-  d_queue = NULL;
-  delete d_buffer;
-  d_buffer = NULL;
-  delete d_readRunning;
-  d_readRunning = NULL;
-  delete d_runThreadRunning;
-  d_runThreadRunning = NULL;
-  delete d_runBlock_mutex;
-  d_runBlock_mutex = NULL;
-  delete d_readBlock_mutex;
-  d_readBlock_mutex = NULL;
-  delete d_runBlock;
-  d_runBlock = NULL;
-  delete d_readBlock;
-  d_readBlock = NULL;
-}
-
-bool
-fusb_ephandle_darwin::start ()
-{
-  UInt8  direction, number, interval;
-  UInt16 maxPacketSize;
-
-// reset circular buffer
-  d_buffer->reset ();
-
-// reset the queue
-  d_queue->num_used (0);
-  d_queue->iterate_start ();
-  s_node_ptr l_node = d_queue->iterate_next ();
-  while (l_node) {
-    l_node->both()->set (l_node, this);
-    l_node->object()->reset ();
-    l_node->set_available ();
-    l_node = d_queue->iterate_next ();
-  }
-
-  d_pipeRef = d_transferType = 0;
-
-  usb_dev_handle* dev = d_devhandle->get_usb_dev_handle ();
-  if (! dev)
-    USB_ERROR_STR (false, -ENXIO, "fusb_ephandle_darwin::start: "
-		   "null device");
-
-  darwin_dev_handle* device = (darwin_dev_handle*) dev->impl_info;
-  if (! device)
-    USB_ERROR_STR (false, -ENOENT, "fusb_ephandle_darwin::start: "
-		   "device not initialized");
-
-  if (usb_debug) {
-    std::cerr << "fusb_ephandle_darwin::start: dev = " <<
-      (void*) dev << ", device = " << (void*) device << std::endl;
-  }
-
-  d_interfaceRef = device->interface;
-  if (! d_interfaceRef)
-    USB_ERROR_STR (false, -EACCES, "fusb_ephandle_darwin::start: "
-		   "interface used without being claimed");
-  d_interface = *d_interfaceRef;
-
-// get read or write pipe info (depends on "d_input_p")
-
-  if (usb_debug > 3) {
-    std::cerr << "fusb_ephandle_darwin::start d_endpoint = " << d_endpoint
-	      << ", d_input_p = " << (d_input_p ? "TRUE" : "FALSE") << std::endl;
-  }
-
-  int l_endpoint = (d_input_p ? USB_ENDPOINT_IN : USB_ENDPOINT_OUT);
-  int pipeRef = ep_to_pipeRef (device, d_endpoint | l_endpoint);
-  if (pipeRef < 0)
-    USB_ERROR_STR (false, -EINVAL, "fusb_ephandle_darwin::start "
-		   " invalid pipeRef.\n");
-
-  d_pipeRef = pipeRef;
-  d_interface->GetPipeProperties (d_interfaceRef,
-				  d_pipeRef,
-				  &direction,
-				  &number,
-				  &d_transferType,
-				  &maxPacketSize,
-				  &interval);
-  if (usb_debug == 3) {
-    std::cerr << "fusb_ephandle_darwin::start: " << (d_input_p ? "read" : "write")
-	      << ": ep = " << d_endpoint << ", pipeRef = " << d_pipeRef << "interface = "
-	      << d_interface << ", interfaceRef = " << d_interfaceRef
-	      << ", if_direction = " << direction << ", if_# = " << number
-	      << ", if_interval = " << interval << ", if_maxPacketSize = "
-	      << maxPacketSize << std::endl;
-  }
-
-  // set global start boolean
-  d_started = true;
-
-  // lock the runBlock mutex, before creating the run thread.
-  // this guarantees that we can control execution between these 2 threads
-  gruel::scoped_lock l (*d_runBlock_mutex);
-
-  // create the run thread, which allows OSX to process I/O separately
-  d_runThread = new gruel::thread (run_thread, this);
-
-  // wait until the run thread (and possibky read thread) are -really-
-  // going; this will unlock the mutex before waiting for a signal ()
-  d_runBlock->wait (l);
-
-  if (usb_debug) {
-    std::cerr << "fusb_ephandle_darwin::start: " << (d_input_p ? "read" : "write")
-	      << " started." << std::endl;
-  }
-
-  return (true);
-}
-
-void
-fusb_ephandle_darwin::run_thread (void* arg)
-{
-  fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(arg);
-
-  // lock the run thread running mutex; if ::stop() is called, it will
-  // first abort() the pipe then wait for the run thread to finish,
-  // via a lock() on this mutex
-  gruel::mutex* l_runThreadRunning = This->d_runThreadRunning;
-  gruel::scoped_lock l0 (*l_runThreadRunning);
-
-  gruel::mutex* l_readRunning = This->d_readRunning;
-  gruel::condition_variable* l_readBlock = This->d_readBlock;
-  gruel::mutex* l_readBlock_mutex = This->d_readBlock_mutex;
-
-  bool l_input_p = This->d_input_p;
-
-  if (usb_debug) {
-    std::cerr << "fusb_ephandle_darwin::run_thread: starting for "
-	      << (l_input_p ? "read" : "write") << "." << std::endl;
-  }
-
-  usb_interface_t** l_interfaceRef = This->d_interfaceRef;
-  usb_interface_t* l_interface = This->d_interface;
-  CFRunLoopSourceRef l_cfSource;
-
-// create async run loop
-  l_interface->CreateInterfaceAsyncEventSource (l_interfaceRef, &l_cfSource);
-  CFRunLoopAddSource (CFRunLoopGetCurrent (), l_cfSource,
-		      kCFRunLoopDefaultMode);
-// get run loop reference, to allow other threads to stop
-  This->d_CFRunLoopRef = CFRunLoopGetCurrent ();
-
-  gruel::thread* l_rwThread = NULL;
-
-  if (l_input_p) {
-    // lock the readBlock mutex, before creating the read thread.
-    // this guarantees that we can control execution between these 2 threads
-    gruel::scoped_lock l1 (*l_readBlock_mutex);
-    // create the read thread, which just issues all of the starting
-    // async read commands, then returns
-    l_rwThread = new gruel::thread (read_thread, arg);
-    // wait until the the read thread is -really- going; this will
-    // unlock the read block mutex before waiting for a signal ()
-    l_readBlock->wait (l1);
-  }
-
-  {
-    // now signal the run condition to release and finish ::start().
-
-    // lock the runBlock mutex first; this will force waiting until the
-    // ->wait() command is issued in ::start()
-    gruel::mutex* l_run_block_mutex = This->d_runBlock_mutex;
-    gruel::scoped_lock l2 (*l_run_block_mutex);
-
-    // now that the lock is in place, signal the parent thread that
-    // things are running
-    This->d_runBlock->notify_one ();
-  }
-
-  // run the loop
-  CFRunLoopRun ();
-
-  if (l_input_p) {
-    // wait for read_thread () to finish, if needed
-    gruel::scoped_lock l3 (*l_readRunning);
-  }
-
-  // remove run loop stuff
-  CFRunLoopRemoveSource (CFRunLoopGetCurrent (),
-			 l_cfSource, kCFRunLoopDefaultMode);
-
-  if (usb_debug) {
-    std::cerr << "fusb_ephandle_darwin::run_thread: finished for "
-	      << (l_input_p ? "read" : "write") << "." << std::endl;
-  }
-}
-
-void
-fusb_ephandle_darwin::read_thread (void* arg)
-{
-  if (usb_debug) {
-    std::cerr << "fusb_ephandle_darwin::read_thread: starting." << std::endl;
-  }
-
-  fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(arg);
-
-  // before doing anything else, lock the read running mutex.  this
-  // mutex does flow control between this thread and the run_thread
-  gruel::mutex* l_readRunning = This->d_readRunning;
-  gruel::scoped_lock l0 (*l_readRunning);
-
-  // signal the read condition from run_thread() to continue
-
-  // lock the readBlock mutex first; this will force waiting until the
-  // ->wait() command is issued in ::run_thread()
-  gruel::condition_variable* l_readBlock = This->d_readBlock;
-  gruel::mutex* l_read_block_mutex = This->d_readBlock_mutex;
-
-  {
-    gruel::scoped_lock l1 (*l_read_block_mutex);
-
-    // now that the lock is in place, signal the parent thread that
-    // things are running here
-    l_readBlock->notify_one ();
-  }
-
-  // queue up all of the available read requests
-  s_queue_ptr l_queue = This->d_queue;
-  l_queue->iterate_start ();
-  s_node_ptr l_node = l_queue->iterate_next ();
-  while (l_node) {
-    This->read_issue (l_node->both ());
-    l_node = l_queue->iterate_next ();
-  }
-
-  if (usb_debug) {
-    std::cerr << "fusb_ephandle_darwin::read_thread: finished." << std::endl;
-  }
-}
-
-void
-fusb_ephandle_darwin::read_issue (s_both_ptr l_both)
-{
-  if ((! l_both) || (! d_started)) {
-    if (usb_debug > 4) {
-      std::cerr << "fusb_ephandle_darwin::read_issue: Doing nothing; "
-		<< "l_both is " << (void*) l_both << "; started is "
-		<< (d_started ? "TRUE" : "FALSE") << std::endl;
-    }
-    return;
-  }
-
-// set the node and buffer from the input "both"
-  s_node_ptr l_node = l_both->node ();
-  s_buffer_ptr l_buf = l_node->object ();
-  void* v_buffer = (void*) l_buf->buffer ();
-
-// read up to d_bufLenBytes
-  size_t bufLen = d_bufLenBytes;
-  l_buf->n_used (bufLen);
-
-// setup system call result
-  io_return_t result = kIOReturnSuccess;
-
-  if (d_transferType == kUSBInterrupt)
-/* This is an interrupt pipe. We can't specify a timeout. */
-    result = d_interface->ReadPipeAsync
-      (d_interfaceRef, d_pipeRef, v_buffer, bufLen,
-       (IOAsyncCallback1) read_completed, (void*) l_both);
-  else
-    result = d_interface->ReadPipeAsyncTO
-      (d_interfaceRef, d_pipeRef, v_buffer, bufLen, 0, USB_TIMEOUT,
-       (IOAsyncCallback1) read_completed, (void*) l_both);
-
-  if (result != kIOReturnSuccess)
-    USB_ERROR_STR_NO_RET (- darwin_to_errno (result),
-			  "fusb_ephandle_darwin::read_issue "
-			  "(ReadPipeAsync%s): %s",
-			  d_transferType == kUSBInterrupt ? "" : "TO",
-			  darwin_error_str (result));
-  else if (usb_debug > 4) {
-    std::cerr << "fusb_ephandle_darwin::read_issue: Queued " << (void*) l_both
-	      << " (" << bufLen << " Bytes)" << std::endl;
-  }
-}
-
-void
-fusb_ephandle_darwin::read_completed (void* refCon,
-				      io_return_t result,
-				      void* io_size)
-{
-  size_t l_size = (size_t) io_size;
-  s_both_ptr l_both = static_cast<s_both_ptr>(refCon);
-  fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(l_both->This ());
-  s_node_ptr l_node = l_both->node ();
-  circular_buffer<char>* l_buffer = This->d_buffer;
-  s_buffer_ptr l_buf = l_node->object ();
-  size_t l_i_size = l_buf->n_used ();
-
-  if (This->d_started && (l_i_size != l_size)) {
-    std::cerr << "fusb_ephandle_darwin::read_completed: Expected " << l_i_size
-	      << " bytes; read " << l_size << "." << std::endl;
-  } else if (usb_debug > 4) {
-    std::cerr << "fusb_ephandle_darwin::read_completed: Read " << (void*) l_both
-	      << " (" << l_size << " bytes)" << std::endl;
-  }
-
-// add this read to the transfer buffer, and check for overflow
-// -> data is being enqueued faster than it can be dequeued
-  if (l_buffer->enqueue (l_buf->buffer (), l_size) == -1) {
-// print out that there's an overflow
-    fputs ("uO", stderr);
-    fflush (stderr);
-  }
-
-// set buffer's # data to 0
-  l_buf->n_used (0);
-
-// issue another read for this "both"
-  This->read_issue (l_both);
-}
-
-int
-fusb_ephandle_darwin::read (void* buffer, int nbytes)
-{
-  size_t l_nbytes = (size_t) nbytes;
-  d_buffer->dequeue ((char*) buffer, &l_nbytes);
-
-  if (usb_debug > 4) {
-    std::cerr << "fusb_ephandle_darwin::read: request for " << nbytes
-	      << " bytes, " << l_nbytes << " bytes retrieved." << std::endl;
-  }
-
-  return ((int) l_nbytes);
-}
-
-int
-fusb_ephandle_darwin::write (const void* buffer, int nbytes)
-{
-  size_t l_nbytes = (size_t) nbytes;
-
-  if (! d_started) {
-    if (usb_debug) {
-      std::cerr << "fusb_ephandle_darwin::write: Not yet started." << std::endl;
-    }
-    return (0);
-  }
-
-  while (l_nbytes != 0) {
-// find out how much data to copy; limited to "d_bufLenBytes" per node
-    size_t t_nbytes = (l_nbytes > d_bufLenBytes) ? d_bufLenBytes : l_nbytes;
-
-// get next available node to write into;
-// blocks internally if none available
-    s_node_ptr l_node = d_queue->find_next_available_node ();
-
-// copy the input into the node's buffer
-    s_buffer_ptr l_buf = l_node->object ();
-    l_buf->buffer ((char*) buffer, t_nbytes);
-    void* v_buffer = (void*) l_buf->buffer ();
-
-// setup callback parameter & system call return
-    s_both_ptr l_both = l_node->both ();
-    io_return_t result = kIOReturnSuccess;
-
-    if (d_transferType == kUSBInterrupt)
-/* This is an interrupt pipe ... can't specify a timeout. */
-      result = d_interface->WritePipeAsync
-	(d_interfaceRef, d_pipeRef, v_buffer, t_nbytes,
-	 (IOAsyncCallback1) write_completed, (void*) l_both);
-    else
-      result = d_interface->WritePipeAsyncTO
-	(d_interfaceRef, d_pipeRef, v_buffer, t_nbytes, 0, USB_TIMEOUT,
-	 (IOAsyncCallback1) write_completed, (void*) l_both);
-
-    if (result != kIOReturnSuccess)
-      USB_ERROR_STR (-1, - darwin_to_errno (result),
-		     "fusb_ephandle_darwin::write_thread "
-		     "(WritePipeAsync%s): %s",
-		     d_transferType == kUSBInterrupt ? "" : "TO",
-		     darwin_error_str (result));
-    else if (usb_debug > 4) {
-      std::cerr << "fusb_ephandle_darwin::write_thread: Queued " << (void*) l_both
-		<< " (" << t_nbytes << " Bytes)" << std::endl;
-    }
-    l_nbytes -= t_nbytes;
-  }
-
-  return (nbytes);
-}
-
-void
-fusb_ephandle_darwin::write_completed (void* refCon,
-				       io_return_t result,
-				       void* io_size)
-{
-  s_both_ptr l_both = static_cast<s_both_ptr>(refCon);
-  fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(l_both->This ());
-  size_t l_size = (size_t) io_size;
-  s_node_ptr l_node = l_both->node ();
-  s_queue_ptr l_queue = This->d_queue;
-  s_buffer_ptr l_buf = l_node->object ();
-  size_t l_i_size = l_buf->n_used ();
-
-  if (This->d_started && (l_i_size != l_size)) {
-    std::cerr << "fusb_ephandle_darwin::write_completed: Expected " << l_i_size
-	      << " bytes written; wrote " << l_size << "." << std::endl;
-  } else if (usb_debug > 4) {
-    std::cerr << "fusb_ephandle_darwin::write_completed: Wrote " << (void*) l_both
-	      << " (" << l_size << " Bytes)" << std::endl;
-  }
-
-// set buffer's # data to 0
-  l_buf->n_used (0);
-// make the node available for reuse
-  l_queue->make_node_available (l_node);
-}
-
-void
-fusb_ephandle_darwin::abort ()
-{
-  if (usb_debug) {
-    std::cerr << "fusb_ephandle_darwin::abort: starting." << std::endl;
-  }
-
-  io_return_t result = d_interface->AbortPipe (d_interfaceRef, d_pipeRef);
-
-  if (result != kIOReturnSuccess)
-    USB_ERROR_STR_NO_RET (- darwin_to_errno (result),
-			  "fusb_ephandle_darwin::abort "
-			  "(AbortPipe): %s", darwin_error_str (result));
-  if (usb_debug) {
-    std::cerr << "fusb_ephandle_darwin::abort: finished." << std::endl;
-  }
-}
-
-bool
-fusb_ephandle_darwin::stop ()
-{
-  if (! d_started)
-    return (true);
-
-  if (usb_debug) {
-    std::cerr << "fusb_ephandle_darwin::stop: stopping "
-	      << (d_input_p ? "read" : "write") << "." << std::endl;
-  }
-
-  d_started = false;
-
-// abort any pending IO transfers
-  abort ();
-
-// wait for write transfer to finish
-  wait_for_completion ();
-
-// tell IO buffer to abort any waiting conditions
-  d_buffer->abort ();
-
-// stop the run loop
-  CFRunLoopStop (d_CFRunLoopRef);
-
-// wait for the runThread to stop
-  gruel::scoped_lock l (*d_runThreadRunning);
-
-  if (usb_debug) {
-    std::cerr << "fusb_ephandle_darwin::stop: " << (d_input_p ? "read" : "write")
-	      << " stopped." << std::endl;
-  }
-
-  return (true);
-}
-
-void
-fusb_ephandle_darwin::wait_for_completion ()
-{
-  if (d_queue)
-    while (d_queue->in_use ())
-      usleep (1000);
-}
diff --git a/usrp/host/lib/fusb_darwin.h b/usrp/host/lib/fusb_darwin.h
deleted file mode 100644
index 4d18177be..000000000
--- a/usrp/host/lib/fusb_darwin.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006,2009,2010 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 _FUSB_DARWIN_H_
-#define _FUSB_DARWIN_H_
-
-#include <usb.h>
-#include "fusb.h"
-#include <IOKit/IOCFBundle.h>
-#include <IOKit/IOCFPlugIn.h>
-#include <IOKit/usb/IOUSBLib.h>
-#include <IOKit/IOKitLib.h>
-#include "circular_linked_list.h"
-#include "circular_buffer.h"
-
-// for MacOS X 10.4.[0-3]
-#define usb_interface_t IOUSBInterfaceInterface220
-#define InterfaceInterfaceID kIOUSBInterfaceInterfaceID220
-#define InterfaceVersion 220
-
-// for MacOS X 10.3.[0-9] and 10.4.[0-3]
-#define usb_device_t    IOUSBDeviceInterface197
-#define DeviceInterfaceID kIOUSBDeviceInterfaceID197
-#define DeviceVersion 197
-
-extern "C" {
-typedef struct usb_dev_handle {
-  int fd;
-
-  struct usb_bus *bus;
-  struct usb_device *device;
-
-  int config;
-  int interface;
-  int altsetting;
-
-  /* Added by RMT so implementations can store other per-open-device data */
-  void *impl_info;
-} usb_dev_handle;
-
-/* Darwin/OS X impl does not use fd field, instead it uses this */
-typedef struct darwin_dev_handle {
-  usb_device_t** device;
-  usb_interface_t** interface;
-  int open;
-} darwin_dev_handle;
-
-typedef IOReturn io_return_t;
-typedef IOCFPlugInInterface *io_cf_plugin_ref_t;
-
-static int ep_to_pipeRef (darwin_dev_handle* device, int ep);
-extern int usb_debug;
-}
-
-class s_buffer
-{
-private:
-  char* d_buffer;
-  size_t d_n_used, d_n_alloc;
-
-public:
-  inline s_buffer (size_t n_alloc = 0) {
-    d_n_used = 0;
-    d_n_alloc = n_alloc;
-    if (n_alloc) {
-      d_buffer = (char*) new char [n_alloc];
-    } else {
-      d_buffer = 0;
-    }
-  };
-  inline ~s_buffer () {
-    if (d_n_alloc) {
-      delete [] d_buffer;
-    }
-  };
-  inline size_t n_used () { return (d_n_used); };
-  inline void n_used (size_t bufLen) {
-    d_n_used = (bufLen > d_n_alloc) ? d_n_alloc : bufLen; };
-  inline size_t n_alloc () { return (d_n_alloc); };
-  void buffer (char* l_buffer, size_t bufLen) {
-    if (bufLen > d_n_alloc) {
-      std::cerr << "s_buffer::set: Copying only allocated bytes." << std::endl;
-      bufLen = d_n_alloc;
-    }
-    if (!l_buffer) {
-      std::cerr << "s_buffer::set: NULL buffer." << std::endl;
-      return;
-    }
-    bcopy (l_buffer, d_buffer, bufLen);
-    d_n_used = bufLen;
-  };
-  inline char* buffer () { return (d_buffer); };
-  inline void reset () {
-    bzero (d_buffer, d_n_alloc);
-    d_n_used = 0;
-  };
-};
-
-typedef s_buffer* s_buffer_ptr;
-typedef s_node<s_buffer_ptr>* s_node_ptr;
-typedef circular_linked_list<s_buffer_ptr>* s_queue_ptr;
-typedef s_both<s_buffer_ptr>* s_both_ptr;
-
-/*!
- * \brief darwin implementation of fusb_devhandle
- *
- * This is currently identical to the generic implementation
- * and is intended as a starting point for whatever magic is
- * required to make usb fly.
- */
-class fusb_devhandle_darwin : public fusb_devhandle
-{
-public:
-  // CREATORS
-  fusb_devhandle_darwin (usb_dev_handle* udh);
-  virtual ~fusb_devhandle_darwin ();
-
-  // MANIPULATORS
-  virtual fusb_ephandle* make_ephandle (int endpoint, bool input_p,
-					int block_size = 0, int nblocks = 0);
-};
-
-/*!
- * \brief darwin implementation of fusb_ephandle
- *
- * This is currently identical to the generic implementation
- * and is intended as a starting point for whatever magic is
- * required to make usb fly.
- */
-class fusb_ephandle_darwin : public fusb_ephandle
-{
-private:
-  fusb_devhandle_darwin* d_devhandle;
-  gruel::thread* d_runThread;
-  gruel::mutex* d_runThreadRunning;
-
-  CFRunLoopRef d_CFRunLoopRef;
-
-  static void write_completed (void* ret_io_size,
-			       io_return_t result,
-			       void* io_size);
-  static void read_completed (void* ret_io_size,
-			      io_return_t result,
-			      void* io_size);
-  static void run_thread (void* arg);
-  static void read_thread (void* arg);
-
-  void read_issue (s_both_ptr l_both);
-
-public:
-  // variables, for now
-  UInt8 d_pipeRef, d_transferType;
-  usb_interface_t** d_interfaceRef;
-  usb_interface_t* d_interface;
-  s_queue_ptr d_queue;
-  circular_buffer<char>* d_buffer;
-  size_t d_bufLenBytes;
-  gruel::mutex* d_readRunning;
-  gruel::mutex* d_runBlock_mutex;
-  gruel::mutex* d_readBlock_mutex;
-  gruel::condition_variable* d_runBlock;
-  gruel::condition_variable* d_readBlock;
-
-// CREATORS
-
-  fusb_ephandle_darwin (fusb_devhandle_darwin *dh, int endpoint, bool input_p,
-			 int block_size = 0, int nblocks = 0);
-  virtual ~fusb_ephandle_darwin ();
-
-// MANIPULATORS
-
-  virtual bool start ();  	//!< begin streaming i/o
-  virtual bool stop ();		//!< stop streaming i/o
-
-  /*!
-   * \returns \p nbytes if write was successfully enqueued, else -1.
-   * Will block if no free buffers available.
-   */
-  virtual int write (const void* buffer, int nbytes);
-
-  /*!
-   * \returns number of bytes read or -1 if error.
-   * number of bytes read will be <= nbytes.
-   * Will block if no input available.
-   */
-  virtual int read (void* buffer, int nbytes);
-
-  /*
-   * abort any pending IO transfers
-   */
-  void abort ();
-
-  /*
-   * block until all outstanding writes have completed
-   */
-  virtual void wait_for_completion ();
-};
-
-#endif /* _FUSB_DARWIN_H_ */
diff --git a/usrp/host/lib/fusb_generic.cc b/usrp/host/lib/fusb_generic.cc
deleted file mode 100644
index 0958716d9..000000000
--- a/usrp/host/lib/fusb_generic.cc
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <fusb_generic.h>
-#include <usb.h>
-
-
-static const int USB_TIMEOUT = 1000;	// in milliseconds
-
-
-fusb_devhandle_generic::fusb_devhandle_generic (usb_dev_handle *udh)
-  : fusb_devhandle (udh)
-{
-  // that's it
-}
-
-fusb_devhandle_generic::~fusb_devhandle_generic ()
-{
-  // nop
-}
-
-fusb_ephandle *
-fusb_devhandle_generic::make_ephandle (int endpoint, bool input_p,
-				       int block_size, int nblocks)
-{
-  return new fusb_ephandle_generic (this, endpoint, input_p,
-				    block_size, nblocks);
-}
-
-// ----------------------------------------------------------------
-
-fusb_ephandle_generic::fusb_ephandle_generic (fusb_devhandle_generic *dh,
-					      int endpoint, bool input_p,
-					      int block_size, int nblocks)
-  : fusb_ephandle (endpoint, input_p, block_size, nblocks),
-    d_devhandle (dh)
-{
-  // that's it
-}
-
-fusb_ephandle_generic::~fusb_ephandle_generic ()
-{
-  // nop
-}
-
-bool
-fusb_ephandle_generic::start ()
-{
-  d_started = true;
-  return true;
-}
-
-bool
-fusb_ephandle_generic::stop ()
-{
-  d_started = false;
-  return true;
-}
-
-int
-fusb_ephandle_generic::write (const void *buffer, int nbytes)
-{
-  if (!d_started)	// doesn't matter here, but keeps semantics constant
-    return -1;
-  
-  if (d_input_p)
-    return -1;
-  
-  return usb_bulk_write (d_devhandle->get_usb_dev_handle (),
-			 d_endpoint, (char *) buffer, nbytes, USB_TIMEOUT);
-}
-
-int
-fusb_ephandle_generic::read (void *buffer, int nbytes)
-{
-  if (!d_started)	// doesn't matter here, but keeps semantics constant
-    return -1;
-
-  if (!d_input_p)
-    return -1;
-
-  return usb_bulk_read (d_devhandle->get_usb_dev_handle (),
-			d_endpoint|USB_ENDPOINT_IN, (char *) buffer, nbytes,
-			USB_TIMEOUT);
-}
diff --git a/usrp/host/lib/fusb_generic.h b/usrp/host/lib/fusb_generic.h
deleted file mode 100644
index b9aef2737..000000000
--- a/usrp/host/lib/fusb_generic.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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 _FUSB_GENERIC_H_
-#define _FUSB_GENERIC_H_
-
-#include <fusb.h>
-
-/*!
- * \brief generic implementation of fusb_devhandle using only libusb
- */
-class fusb_devhandle_generic : public fusb_devhandle
-{
-public:
-  // CREATORS
-  fusb_devhandle_generic (usb_dev_handle *udh);
-  virtual ~fusb_devhandle_generic ();
-
-  // MANIPULATORS
-  virtual fusb_ephandle *make_ephandle (int endpoint, bool input_p,
-					int block_size = 0, int nblocks = 0);
-};
-
-
-/*!
- * \brief generic implementation of fusb_ephandle using only libusb
- */
-class fusb_ephandle_generic : public fusb_ephandle
-{
-private:
-  fusb_devhandle_generic	*d_devhandle;
-  
-public:
-  // CREATORS
-  fusb_ephandle_generic (fusb_devhandle_generic *dh, int endpoint, bool input_p,
-			 int block_size = 0, int nblocks = 0);
-  virtual ~fusb_ephandle_generic ();
-
-  // MANIPULATORS
-
-  virtual bool start ();  	//!< begin streaming i/o
-  virtual bool stop ();		//!< stop streaming i/o
-
-  /*!
-   * \returns \p nbytes if write was successfully enqueued, else -1.
-   * Will block if no free buffers available.
-   */
-  virtual int write (const void *buffer, int nbytes);
-
-  /*!
-   * \returns number of bytes read or -1 if error.
-   * number of bytes read will be <= nbytes.
-   * Will block if no input available.
-   */
-  virtual int read (void *buffer, int nbytes);
-
-  /*
-   * block until all outstanding writes have completed
-   */
-  virtual void wait_for_completion () { };
-};
-
-#endif /* _FUSB_GENERIC_H_ */
-
diff --git a/usrp/host/lib/fusb_libusb1.cc b/usrp/host/lib/fusb_libusb1.cc
deleted file mode 100644
index 770708451..000000000
--- a/usrp/host/lib/fusb_libusb1.cc
+++ /dev/null
@@ -1,702 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <fusb_libusb1.h>
-#include <fusb.h>
-#include <libusb-1.0/libusb.h>
-#include <stdexcept>
-#include <cstdio>
-#include <assert.h>
-#include <string.h>
-#include <algorithm>
-#include <errno.h>
-#include <string.h>
-
-#define MINIMIZE_TX_BUFFERING true
-
-static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size();
-static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE;
-static const int DEFAULT_BUFFER_SIZE = 4 * (1L << 20);  // 4 MB endpoint
-static const int LIBUSB_TIMEOUT = 0; 			// no timeout
-
-inline static fusb_ephandle_libusb1 *
-lut_get_ephandle (libusb_transfer *lut)
-{
-  return (fusb_ephandle_libusb1 *) lut->user_data;
-}
-
-// ------------------------------------------------------------------------
-// 	libusb_transfer allocation, deallocation, and callback
-// ------------------------------------------------------------------------
-
-static void
-free_lut (libusb_transfer *lut)
-{
-
-  // if this was an input transfer, free the buffer
-  if (lut->endpoint & 0x80)
-    delete [] ((unsigned char *) lut->buffer);
-
-  libusb_free_transfer(lut);
-
-}
-
-/*
- * The callback means the libusb_transfer is completed whether sent, cancelled,
- * or failed. Move the libusb_transfer from the pending list to the
- * completed list. If the cancel is from the destructor then free the
- * transfer instead; normally this won't happen since all endpoints should be
- * destroyed first leaving the pending list empty.
- */
-
-static void
-generic_callback(struct libusb_transfer *lut)
-{
-
-  // Fish out devhandle from endpoint
-  fusb_devhandle_libusb1* dev_handle =
-    lut_get_ephandle(lut)->get_fusb_devhandle_libusb1();
-
-  dev_handle->pending_remove(lut);
-
-  if (lut->status == LIBUSB_TRANSFER_CANCELLED && dev_handle->_teardown() == 1)
-  {
-    free_lut (lut);
-    return;
-  }
-
-  lut_get_ephandle(lut)->completed_list_add(lut);
-
-}
-
-static libusb_transfer*
-alloc_lut (fusb_ephandle_libusb1 *self, int buffer_length, int endpoint,
-           bool input_p, unsigned char *write_buffer,
-           fusb_devhandle_libusb1 *dh)
-{
-
-  struct libusb_transfer* lut = libusb_alloc_transfer(0);
-
-  endpoint = (endpoint & 0x7f) | (input_p ? 0x80 : 0);
-
-  if (input_p)
-    write_buffer = new unsigned char [buffer_length];
-
-  // We need the base class libusb_device_handle
-  libusb_device_handle *dev_handle = dh->get_usb_dev_handle();
-
-  // Load the libusb_transfer for bulk transfer
-  libusb_fill_bulk_transfer (lut,		// transfer
-                             dev_handle,        // dev_handle
-                             endpoint,		// endpoint
-                             write_buffer,	// buffer
-                             buffer_length,	// length
-                             generic_callback,	// callback
-                             self,		// user_data
-                             LIBUSB_TIMEOUT);	// timeout
-
-  return lut;
-}
-
-// ------------------------------------------------------------------------
-// 				device handle
-// ------------------------------------------------------------------------
-
-fusb_devhandle_libusb1::fusb_devhandle_libusb1 (libusb_device_handle *udh,
-                                                libusb_context *ctx)
-  : fusb_devhandle (udh), d_ctx (ctx), d_teardown (false)
-{
-  // that's it
-}
-
-fusb_devhandle_libusb1::~fusb_devhandle_libusb1 ()
-{
-  d_teardown = true;
-
-  std::list<libusb_transfer*>::reverse_iterator it;
-
-  // After cancellation the libusb_transfer is still active so delay freeing
-  // transfer until callback occurs. In most cases the pending list should
-  // already be empty by the time this destructor is called.
-
-  for (it = d_pending_rqsts.rbegin (); it != d_pending_rqsts.rend (); it++) {
-    _cancel_lut (*it);
-  }
-
-  // Wait for pending list to empty
-  _wait_for_completion ();
-
-}
-
-fusb_ephandle*
-fusb_devhandle_libusb1::make_ephandle (int endpoint, bool input_p,
-				       int block_size, int nblocks)
-{
-  return new fusb_ephandle_libusb1 (this, endpoint, input_p,
-				    block_size, nblocks);
-}
-
-/*
- * devhandle list manipulators
- */
-
-void
-fusb_devhandle_libusb1::pending_add (libusb_transfer *lut)
-{
-  d_pending_rqsts.push_back (lut);
-}
-
-
-/*
- * Attempt to cancel all transations associated with eph
- */
-
-void
-fusb_devhandle_libusb1::_cancel_pending_rqsts (fusb_ephandle_libusb1 *eph)
-{
-  std::list<libusb_transfer*>::reverse_iterator it;
-
-  for (it = d_pending_rqsts.rbegin (); it != d_pending_rqsts.rend (); it++){
-    if (lut_get_ephandle (*it) == eph)
-      _cancel_lut (*it);
-  }
-}
-
-/*
- * Pull from the pending list
- */
-
-libusb_transfer *
-fusb_devhandle_libusb1::pending_get ()
-{
-  if (d_pending_rqsts.empty ())
-    return 0;
-
-  libusb_transfer *lut = d_pending_rqsts.front ();
-  d_pending_rqsts.pop_front ();
-  return lut;
-}
-
-/*
- * Match libusb_tranfer with the pending list and erase
- * Return true if found, false otherwise
- */
-
-bool
-fusb_devhandle_libusb1::pending_remove (libusb_transfer *lut)
-{
-  std::list<libusb_transfer*>::iterator	result;
-  result = find (d_pending_rqsts.begin (), d_pending_rqsts.end (), lut);
-
-  if (result == d_pending_rqsts.end ()) {
-    fprintf (stderr, "fusb::pending_remove: failed to find lut in pending_rqsts: %p\n", lut);
-
-    return false;
-  }
-  d_pending_rqsts.erase (result);
-  return true;
-}
-
-/*
- * Submit the libusb_transfer to libusb
- * iff successful, the transfer will be placed on the devhandle pending list.
- */
-
-bool
-fusb_devhandle_libusb1::_submit_lut (libusb_transfer *lut)
-{
-
-  int ret = libusb_submit_transfer (lut);
-  if (ret < 0) {
-    fprintf(stderr, "fusb::_submit_lut %d", ret);
-    return false;
-  }
-
-  pending_add(lut);
-  return true;
-
-}
-
-/*
- * Attempt to cancel any pending libusb_transfer transactions.
- * Return true in the absence of errors, which does not mean that the transfer
- * is cancelled. Cancellation can be checked after the callback is fired off
- * by libusb.
- */
-
-bool
-fusb_devhandle_libusb1::_cancel_lut (libusb_transfer *lut)
-{
-
-  int ret = libusb_cancel_transfer (lut);
-  if (ret < 0) {
-    fprintf (stderr, "fusb::_cancel_lut");
-    return false;
-  }
-  return true;
-
-}
-
-/*
- * Reimplementing _reap for context use and compatibiliy with libusb-0.12.
- *
- * Returns false on timeout or error, true if an event was handled
- *
- * If ok_to_block_p is false then handle already pending events and return
- * immediately.
- *
- * If ok_to_block_p is true then call libusb_handle_events_timeout with default
- * timeout value of 2 seconds, which waits and returns on event arrival or
- * timeout.
- */
-
-bool
-fusb_devhandle_libusb1::_reap (bool ok_to_block_p)
-{
-  int ret;
-  struct timeval tv;
-
-  // Save pending size
-  int pnd_size = d_pending_rqsts.size();
-
-  if (ok_to_block_p) {
-    tv.tv_sec = 2;
-    tv.tv_usec =  0;
-  }
-  else {
-    tv.tv_sec = 0;
-    tv.tv_usec =  0;
-  }
-
-  if ((ret = libusb_handle_events_timeout(d_ctx, &tv)) < 0) {
-    fprintf (stderr, "fusb::_reap libusb_handle_events() %i\n", ret);
-    return false;
-  }
-
-  // Check that a pending transfer was removed
-  if (pnd_size > d_pending_rqsts.size())
-    return true;
-  else {
-    return false;
-  }
-}
-
-void
-fusb_devhandle_libusb1::_wait_for_completion ()
-{
-
-  while (!d_pending_rqsts.empty ())
-    if (!_reap(true))
-      break;
-
-}
-
-// ------------------------------------------------------------------------
-// 				endpoint handle
-// ------------------------------------------------------------------------
-
-fusb_ephandle_libusb1::fusb_ephandle_libusb1 (fusb_devhandle_libusb1 *dh,
-					      int endpoint, bool input_p,
-					      int block_size, int nblocks)
-  : fusb_ephandle (endpoint, input_p, block_size, nblocks),
-    d_devhandle (dh),
-    d_write_work_in_progress (0), d_write_buffer (0),
-    d_read_work_in_progress (0), d_read_buffer (0), d_read_buffer_end (0)
-{
-
-  if (d_block_size < 0 || d_block_size > MAX_BLOCK_SIZE)
-    throw std::out_of_range ("fusb_ephandle_libusb1: block_size");
-
-  if (d_nblocks < 0)
-    throw std::out_of_range ("fusb_ephandle_libusb1: nblocks");
-
-  if (d_block_size == 0)
-    d_block_size = DEFAULT_BLOCK_SIZE;
-
-  if (d_nblocks == 0)
-    d_nblocks = std::max (1, DEFAULT_BUFFER_SIZE / d_block_size);
-
-  if (!d_input_p)
-    if (!MINIMIZE_TX_BUFFERING)
-      d_write_buffer = new unsigned char [d_block_size];
-
-  if (0)
-    fprintf(stderr, "fusb_ephandle_libusb1::ctor: d_block_size = %d  d_nblocks = %d\n",
-      d_block_size, d_nblocks);
-
-  // allocate libusb_transfers
-  for (int i = 0; i < d_nblocks; i++)
-    d_free_list.push_back (alloc_lut (this, d_block_size, d_endpoint,
-                                      d_input_p, d_write_buffer, d_devhandle));
-}
-
-fusb_ephandle_libusb1::~fusb_ephandle_libusb1 ()
-{
-
-  stop ();
-
-  libusb_transfer *lut;
-
-  while ((lut = free_list_get ()) != 0)
-    free_lut (lut);
-
-  while ((lut = completed_list_get ()) != 0)
-    free_lut (lut);
-
-  if (d_write_work_in_progress)
-    free_lut (d_write_work_in_progress);
-
-  delete [] d_write_buffer;
-
-  if (d_read_work_in_progress)
-    free_lut (d_read_work_in_progress);
-
-}
-
-bool
-fusb_ephandle_libusb1::start ()
-{
-  if (d_started)
-    return true;
-
-  d_started = true;
-
-  if (d_input_p) {
-     libusb_transfer *lut;
-
-     int nerrors = 0;
-     while ((lut = free_list_get ()) !=0 && nerrors < d_nblocks) {
-       if (!submit_lut (lut))
-         nerrors++;
-     }
-  }
-
-  return true;
-
-}
-
-/*
- * Cancel all transfers in progress or pending and return to initial state
- */
-
-bool
-fusb_ephandle_libusb1::stop ()
-{
-
-  if (!d_started)
-    return true;
-
-  if (d_write_work_in_progress){
-    free_list_add (d_write_work_in_progress);
-    d_write_work_in_progress = 0;
-  }
-
-  if (d_read_work_in_progress){
-    free_list_add (d_read_work_in_progress);
-    d_read_work_in_progress = 0;
-    d_read_buffer = 0;
-    d_read_buffer_end = 0;
-  }
-
-  d_devhandle->_cancel_pending_rqsts (this);
-  d_devhandle->_reap (false);
-
-  while (1) {
-    libusb_transfer *lut;
-    while ((lut = completed_list_get ()) != 0)
-      free_list_add (lut);
-
-    if (d_free_list.size () == (unsigned) d_nblocks)
-      break;
-
-    if (!d_devhandle->_reap(true))
-      break;
-  }
-
-  d_started = false;
-
-  return true;
-}
-
-// ------------------------------------------------------------------------
-// 			routines for writing
-// ------------------------------------------------------------------------
-
-#if (MINIMIZE_TX_BUFFERING)
-
-int
-fusb_ephandle_libusb1::write (const void *buffer, int nbytes)
-{
-  if (!d_started)	// doesn't matter here, but keeps semantics constant
-    return -1;
-
-  if (d_input_p)
-    return -1;
-
-  assert(nbytes % 512 == 0);
-
-  unsigned char *src = (unsigned char *) buffer;
-
-  int n = 0;
-  while (n < nbytes){
-
-    struct libusb_transfer *lut = get_write_work_in_progress();
-    if (!lut)
-      return -1;
-    assert(lut->actual_length == 0);
-    int m = std::min(nbytes - n, MAX_BLOCK_SIZE);
-    lut->buffer = src;
-    lut->length = m;
-
-    n += m;
-    src += m;
-
-    if (!submit_lut(lut))
-      return -1;
-
-    d_write_work_in_progress = 0;
-  }
-
-  return n;
-}
-
-#else
-
-int
-fusb_ephandle_libusb1::write (const void *buffer, int nbytes)
-{
-  if (!d_started)
-    return -1;
-
-  if (d_input_p)
-    return -1;
-
-  unsigned char *src = (unsigned char *) buffer;
-
-  int n = 0;
-  while (n < nbytes){
-
-    libusb_transfer *lut = get_write_work_in_progress ();
-    if (!lut)
-      return -1;
-    unsigned char *dst = (unsigned char *) lut->buffer;
-    int m = std::min (nbytes - n, lut->length - lut->actual_length);
-
-    memcpy (&dst[lut->actual_length], &src[n], m);
-    lut->actual_length += m;
-    n += m;
-
-    if (lut->actual_length == lut->length){
-      if (!submit_lut (lut))
-        return -1;
-      d_write_work_in_progress = 0;
-    }
-  }
-
-  return n;
-}
-
-#endif
-
-struct libusb_transfer *
-fusb_ephandle_libusb1::get_write_work_in_progress ()
-{
-  if (d_write_work_in_progress)
-    return d_write_work_in_progress;
-
-  while (1) {
-
-    reap_complete_writes ();
-
-    struct libusb_transfer *lut = free_list_get ();
-
-    if (lut != 0){
-      assert (lut->actual_length == 0);
-      d_write_work_in_progress = lut;
-      return lut;
-    }
-
-    if (!d_devhandle->_reap (true))
-      return 0;
-  }
-}
-
-void
-fusb_ephandle_libusb1::reap_complete_writes ()
-{
-  // take a look at the completed list and xfer to free list after
-  // checking for errors.
-
-  libusb_transfer *lut;
-
-  while ((lut = completed_list_get ()) != 0) {
-
-    // Check for any errors or short writes that were reporetd in the transfer.
-    // libusb1 sets status, actual_length.
-
-    if (lut->status != LIBUSB_TRANSFER_COMPLETED) {
-      fprintf (stderr, "fusb: (status %d) \n", lut->status );
-    }
-    else if (lut->actual_length != lut->length){
-      fprintf (stderr, "fusb: short write xfer: %d != %d\n",
-               lut->actual_length, lut->length);
-    }
-
-    free_list_add (lut);
-  }
-}
-
-void
-fusb_ephandle_libusb1::wait_for_completion ()
-{
-  d_devhandle->_wait_for_completion ();
-}
-
-// ------------------------------------------------------------------------
-// 			routines for reading
-// ------------------------------------------------------------------------
-
-int
-fusb_ephandle_libusb1::read (void *buffer, int nbytes)
-{
-  if (!d_started)	// doesn't matter here, but keeps semantics constant
-    return -1;
-
-  if (!d_input_p)
-    return -1;
-
-  unsigned char *dst = (unsigned char *) buffer;
-
-  int n = 0;
-  while (n < nbytes) {
-
-    if (d_read_buffer >= d_read_buffer_end)
-      if (!reload_read_buffer ())
-        return -1;
-
-    int m = std::min (nbytes - n, (int) (d_read_buffer_end - d_read_buffer));
-
-    memcpy (&dst[n], d_read_buffer, m);
-    d_read_buffer += m;
-    n += m;
-  }
-
-  return n;
-
-}
-
-bool
-fusb_ephandle_libusb1::reload_read_buffer ()
-{
-  assert (d_read_buffer >= d_read_buffer_end);
-
-  libusb_transfer *lut;
-
-  if (d_read_work_in_progress) {
-    lut = d_read_work_in_progress;
-    d_read_work_in_progress = 0;
-    d_read_buffer = 0;
-    d_read_buffer_end = 0;
-    lut->actual_length = 0;
-    if (!submit_lut (lut))
-      return false;
-  }
-
-  while (1) {
-
-    while ((lut = completed_list_get ()) == 0 )
-      if (!d_devhandle->_reap(true))
-        return false;
-
-    if (lut->status != LIBUSB_TRANSFER_COMPLETED) {
-      fprintf (stderr, "fust: (rd status %d) %s\n", lut->status,
-               strerror (-lut->status));
-      lut->actual_length = 0;
-      free_list_add (lut);
-      return false;
-    }
-
-    d_read_work_in_progress = lut;
-    d_read_buffer = (unsigned char *) lut->buffer;
-    d_read_buffer_end = d_read_buffer + lut->actual_length;
-
-    return true;
-  }
-}
-
-
-/*
- * ephandle list manipulation
- */
-
-
-void
-fusb_ephandle_libusb1::free_list_add (libusb_transfer *lut)
-{
-  assert (lut_get_ephandle (lut) == this);
-  lut->actual_length = 0;
-  d_free_list.push_back (lut);
-}
-
-libusb_transfer *
-fusb_ephandle_libusb1::free_list_get ()
-{
-  if (d_free_list.empty ())
-    return 0;
-
-  libusb_transfer *lut = d_free_list.front ();
-  d_free_list.pop_front ();
-  return lut;
-}
-
-void
-fusb_ephandle_libusb1::completed_list_add (libusb_transfer *lut)
-{
-  assert (lut_get_ephandle (lut) == this);
-  d_completed_list.push_back (lut);
-}
-
-libusb_transfer *
-fusb_ephandle_libusb1::completed_list_get ()
-{
-  if (d_completed_list.empty ())
-    return 0;
-
-  libusb_transfer *lut = d_completed_list.front ();
-  d_completed_list.pop_front ();
-  return lut;
-}
-
-bool
-fusb_ephandle_libusb1::submit_lut (libusb_transfer *lut)
-{
-  if (!d_devhandle->_submit_lut (lut)) {
-    fprintf (stderr, "_submit_lut failed\n");
-    free_list_add (lut);
-    return false;
-  }
-  return true;
-}
diff --git a/usrp/host/lib/fusb_libusb1.h b/usrp/host/lib/fusb_libusb1.h
deleted file mode 100644
index c0e3736bd..000000000
--- a/usrp/host/lib/fusb_libusb1.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2009 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 _FUSB_LIBUSB1_H_
-#define _FUSB_LIBUSB1_H_
-
-#include <fusb.h>
-#include <list>
-
-struct libusb_transfer;
-struct libusb_context;
-
-class fusb_ephandle_libusb1;
-
-/*!
- * \brief libusb1 implementation of fusb_devhandle
- */
-class fusb_devhandle_libusb1 : public fusb_devhandle
-{
-private:
-  std::list<libusb_transfer*>	 d_pending_rqsts;
-  libusb_context		*d_ctx;
-
-  void pending_add (struct libusb_transfer *lut);
-  struct libusb_transfer * pending_get ();
-
-  bool d_teardown;
-
-public:
-  // CREATORS
-  fusb_devhandle_libusb1 (libusb_device_handle *udh, libusb_context *ctx);
-  virtual ~fusb_devhandle_libusb1 ();
-
-  // MANIPULATORS
-  virtual fusb_ephandle *make_ephandle (int endpoint, bool input_p,
-					int block_size = 0, int nblocks = 0);
-  // internal use only
-  bool _submit_lut (libusb_transfer *);
-  bool _cancel_lut (libusb_transfer *);
-  void _cancel_pending_rqsts (fusb_ephandle_libusb1 *eph);
-  bool _reap (bool ok_to_block_p);
-  void _wait_for_completion ();
-
-  // accessors to work from callback context
-  bool pending_remove (struct libusb_transfer *lut);
-  inline bool _teardown() { return d_teardown; }
-
-};
-
-
-/*!
- * \brief libusb1 implementation of fusb_ephandle
- */
-class fusb_ephandle_libusb1 : public fusb_ephandle
-{
-private:
-  fusb_devhandle_libusb1	 *d_devhandle;
-  std::list<libusb_transfer*>     d_free_list;
-  std::list<libusb_transfer*>     d_completed_list;
-  libusb_transfer                *d_write_work_in_progress;
-  unsigned char                  *d_write_buffer;
-  libusb_transfer                *d_read_work_in_progress;
-  unsigned char                  *d_read_buffer;
-  unsigned char                  *d_read_buffer_end;
-
-  libusb_transfer *get_write_work_in_progress ();
-  void reap_complete_writes ();
-  bool reload_read_buffer ();
-  bool submit_lut (libusb_transfer *lut);
-
-public:
-  // CREATORS
-  fusb_ephandle_libusb1 (fusb_devhandle_libusb1 *dh, int endpoint, bool input_p,
-			 int block_size = 0, int nblocks = 0);
-  virtual ~fusb_ephandle_libusb1 ();
-
-  // MANIPULATORS
-
-  virtual bool start ();  	//!< begin streaming i/o
-  virtual bool stop ();		//!< stop streaming i/o
-
-  /*!
-   * \returns \p nbytes if write was successfully enqueued, else -1.
-   * Will block if no free buffers available.
-   */
-  virtual int write (const void *buffer, int nbytes);
-
-  /*!
-   * \returns number of bytes read or -1 if error.
-   * number of bytes read will be <= nbytes.
-   * Will block if no input available.
-   */
-  virtual int read (void *buffer, int nbytes);
-
-  /*
-   * block until all outstanding writes have completed
-   */
-  virtual void wait_for_completion ();
-
-  void free_list_add (struct libusb_transfer *lut);
-  void completed_list_add (struct libusb_transfer *lut);
-  struct libusb_transfer *free_list_get ();
-  struct libusb_transfer *completed_list_get ();
-
-  // accessor to work from callback context
-  fusb_devhandle_libusb1* get_fusb_devhandle_libusb1 () const {
-    return d_devhandle;
-  }
-};
-
-#endif /* _FUSB_LINUX1_H_ */
-
diff --git a/usrp/host/lib/fusb_linux.cc b/usrp/host/lib/fusb_linux.cc
deleted file mode 100644
index 6c484569f..000000000
--- a/usrp/host/lib/fusb_linux.cc
+++ /dev/null
@@ -1,692 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <fusb_linux.h>
-#include <usb.h>		// libusb header
-#include <stdexcept>
-#ifdef HAVE_LINUX_COMPILER_H
-#include <linux/compiler.h>
-#endif
-#include <linux/usbdevice_fs.h>	// interface to kernel portion of user mode usb driver
-#include <sys/ioctl.h>
-#include <assert.h>
-#include <string.h>
-#include <algorithm>
-#include <errno.h>
-#include <string.h>
-#include <cstdio>
-
-#define MINIMIZE_TX_BUFFERING 1		// must be defined to 0 or 1
-
-
-static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size();		// hard limit
-static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE;
-static const int DEFAULT_BUFFER_SIZE = 4 * (1L << 20);				// 4 MB / endpoint
-
-
-// Totally evil and fragile extraction of file descriptor from
-// guts of libusb.  They don't install usbi.h, which is what we'd need
-// to do this nicely.
-//
-// FIXME if everything breaks someday in the future, look here...
-
-static int
-fd_from_usb_dev_handle (usb_dev_handle *udh)
-{
-  return *((int *) udh);
-}
-
-inline static void
-urb_set_ephandle (usbdevfs_urb *urb, fusb_ephandle_linux *handle)
-{
-  urb->usercontext = handle;
-}
-
-inline static fusb_ephandle_linux *
-urb_get_ephandle (usbdevfs_urb *urb)
-{
-  return (fusb_ephandle_linux *) urb->usercontext;
-}
-
-// ------------------------------------------------------------------------
-// 		   USB request block (urb) allocation
-// ------------------------------------------------------------------------
-
-static usbdevfs_urb *
-alloc_urb (fusb_ephandle_linux *self, int buffer_length, int endpoint,
-	   bool input_p, unsigned char *write_buffer)
-{
-  usbdevfs_urb	*urb = new usbdevfs_urb;
-  memset (urb, 0, sizeof (*urb));
-
-  urb->buffer_length = buffer_length;
-
-  // We allocate dedicated memory only for input buffers.
-  // For output buffers we reuse the same buffer (the kernel 
-  // copies the data at submital time)
-
-  if (input_p)
-    urb->buffer = new unsigned char [buffer_length];
-  else
-    urb->buffer = write_buffer;
-
-  // init common values
-
-  urb->type = USBDEVFS_URB_TYPE_BULK;
-  urb->endpoint = (endpoint & 0x7f) | (input_p ? 0x80 : 0);
-
-  // USBDEVFS_URB_QUEUE_BULK goes away in linux 2.5, but is needed if
-  // we are using a 2.4 usb-uhci host controller driver.  This is
-  // unlikely since we're almost always going to be plugged into a
-  // high speed host controller (ehci)
-#if 0 && defined (USBDEVFS_URB_QUEUE_BULK)
-  urb->flags = USBDEVFS_URB_QUEUE_BULK;
-#endif
-
-  urb->signr = 0;
-  urb_set_ephandle (urb, self);
-
-  return urb;
-}
-
-static void
-free_urb (usbdevfs_urb *urb)
-{
-  // if this was an input urb, free the buffer
-  if (urb->endpoint & 0x80)
-    delete [] ((unsigned char *) urb->buffer);
-
-  delete urb;
-}
-
-// ------------------------------------------------------------------------
-// 				device handle
-// ------------------------------------------------------------------------
-
-fusb_devhandle_linux::fusb_devhandle_linux (usb_dev_handle *udh)
-  : fusb_devhandle (udh)
-{
-  // that's all
-}
-
-fusb_devhandle_linux::~fusb_devhandle_linux ()
-{
-  // if there are any pending requests, cancel them and free the urbs.
-  
-  std::list<usbdevfs_urb*>::reverse_iterator it;
-
-  for (it = d_pending_rqsts.rbegin (); it != d_pending_rqsts.rend (); it++){
-    _cancel_urb (*it);
-    free_urb (*it);
-  }
-}
-
-fusb_ephandle *
-fusb_devhandle_linux::make_ephandle (int endpoint, bool input_p,
-				     int block_size, int nblocks)
-{
-  return new fusb_ephandle_linux (this, endpoint, input_p,
-				  block_size, nblocks);
-}
-
-
-// Attempt to cancel all transactions associated with eph.
-
-void
-fusb_devhandle_linux::_cancel_pending_rqsts (fusb_ephandle_linux *eph)
-{
-  std::list<usbdevfs_urb*>::reverse_iterator it;
-
-  for (it = d_pending_rqsts.rbegin (); it != d_pending_rqsts.rend (); it++){
-    if (urb_get_ephandle (*it) == eph)
-      _cancel_urb (*it);
-  }
-}
-
-void 
-fusb_devhandle_linux::pending_add (usbdevfs_urb *urb)
-{
-  d_pending_rqsts.push_back (urb);
-}
-
-usbdevfs_urb *
-fusb_devhandle_linux::pending_get ()
-{
-  if (d_pending_rqsts.empty ())
-    return 0;
-
-  usbdevfs_urb *urb = d_pending_rqsts.front ();
-  d_pending_rqsts.pop_front ();
-  return urb;
-}
-
-bool
-fusb_devhandle_linux::pending_remove (usbdevfs_urb *urb)
-{
-  std::list<usbdevfs_urb*>::iterator	result = find (d_pending_rqsts.begin (),
-						       d_pending_rqsts.end (),
-						       urb);
-  if (result == d_pending_rqsts.end ()){
-    fprintf (stderr, "fusb::pending_remove: failed to find urb in pending_rqsts: %p\n", urb);
-    return false;
-  }
-  d_pending_rqsts.erase (result);
-  return true;
-}
-
-/*
- * Submit the urb to the kernel.
- * iff successful, the urb will be placed on the devhandle's pending list.
- */
-bool
-fusb_devhandle_linux::_submit_urb (usbdevfs_urb *urb)
-{
-  int	ret;
-
-  ret = ioctl (fd_from_usb_dev_handle (d_udh), USBDEVFS_SUBMITURB, urb);
-  if (ret < 0){
-    perror ("fusb::_submit_urb");
-    return false;
-  }
-  
-  pending_add (urb);
-  return true;
-}
-
-/*
- * Attempt to cancel the in pending or in-progress urb transaction.
- * Return true iff transaction was sucessfully cancelled.
- *
- * Failure to cancel should not be considered a problem.  This frequently
- * occurs if the transaction has already completed in the kernel but hasn't
- * yet been reaped by the user mode code.
- *
- * urbs which were cancelled have their status field set to -ENOENT when
- * they are reaped.
- */
-bool
-fusb_devhandle_linux::_cancel_urb (usbdevfs_urb *urb)
-{
-  int ret = ioctl (fd_from_usb_dev_handle (d_udh), USBDEVFS_DISCARDURB, urb);
-  if (ret < 0){
-    // perror ("fusb::_cancel_urb");
-    return false;
-  }
-  return true;
-}
-
-/*
- * Check with the kernel and see if any of our outstanding requests
- * have completed.  For each completed transaction, remove it from the
- * devhandle's pending list and append it to the completed list for
- * the corresponding endpoint.
- *
- * If any transactions are reaped return true.
- *
- * If ok_to_block_p is true, then this will block until at least one
- * transaction completes or an unrecoverable error occurs.
- */
-bool
-fusb_devhandle_linux::_reap (bool ok_to_block_p)
-{
-  int		ret;
-  int		nreaped = 0;
-  usbdevfs_urb	*urb = 0;
-
-  int	fd = fd_from_usb_dev_handle (d_udh);
-  
-  // try to reap as many as possible without blocking...
-
-  while ((ret = ioctl (fd, USBDEVFS_REAPURBNDELAY, &urb)) == 0){
-    if (urb->status != 0 && urb->status != -ENOENT){
-      fprintf (stderr, "_reap: usb->status = %d, actual_length = %5d\n",
-	       urb->status, urb->actual_length);
-    }
-    pending_remove (urb);
-    urb_get_ephandle (urb)->completed_list_add (urb);
-    nreaped++;
-  }
-
-  if (nreaped > 0)		// if we got any, return w/o blocking
-    return true;
-
-  if (!ok_to_block_p)
-    return false;
-  
-  ret = ioctl (fd, USBDEVFS_REAPURB, &urb);
-  if (ret < 0){
-    perror ("fusb::_reap");
-    return false;
-  }
-
-  pending_remove (urb);
-  urb_get_ephandle (urb)->completed_list_add (urb);
-  return true;
-}
-
-void
-fusb_devhandle_linux::_wait_for_completion ()
-{
-  while (!d_pending_rqsts.empty ())
-    if (!_reap(true))
-      break;
-}
-// ------------------------------------------------------------------------
-// 			     end point handle
-// ------------------------------------------------------------------------
-
-fusb_ephandle_linux::fusb_ephandle_linux (fusb_devhandle_linux *devhandle,
-					  int endpoint,
-					  bool input_p,
-					  int block_size, int nblocks)
-  : fusb_ephandle (endpoint, input_p, block_size, nblocks),
-    d_devhandle (devhandle), 
-    d_write_work_in_progress (0), d_write_buffer (0),
-    d_read_work_in_progress (0), d_read_buffer (0), d_read_buffer_end (0)
-{
-
-  if (d_block_size < 0 || d_block_size > MAX_BLOCK_SIZE)
-    throw std::out_of_range ("fusb_ephandle_linux: block_size");
-
-  if (d_nblocks < 0)
-    throw std::out_of_range ("fusb_ephandle_linux: nblocks");
-
-  if (d_block_size == 0)
-    d_block_size = DEFAULT_BLOCK_SIZE;
-
-  if (d_nblocks == 0)
-    d_nblocks = std::max (1, DEFAULT_BUFFER_SIZE / d_block_size);
-
-  if (!d_input_p)
-    if (!MINIMIZE_TX_BUFFERING)
-      d_write_buffer = new unsigned char [d_block_size];
-
-  if (0)
-    fprintf(stderr, "fusb_ephandle_linux::ctor: d_block_size = %d  d_nblocks = %d\n",
-	    d_block_size, d_nblocks);
-
-  // allocate urbs
-
-  for (int i = 0; i < d_nblocks; i++)
-    d_free_list.push_back (alloc_urb (this, d_block_size, d_endpoint,
-				      d_input_p, d_write_buffer));
-}
-
-fusb_ephandle_linux::~fusb_ephandle_linux ()
-{
-  stop ();
-
-  usbdevfs_urb *urb;
-
-  while ((urb = free_list_get ()) != 0)
-    free_urb (urb);
-
-  while ((urb = completed_list_get ()) != 0)
-    free_urb (urb);
-
-  if (d_write_work_in_progress)
-    free_urb (d_write_work_in_progress);
-
-  delete [] d_write_buffer;
-
-  if (d_read_work_in_progress)
-    free_urb (d_read_work_in_progress);
-}
-
-// ----------------------------------------------------------------
-
-bool
-fusb_ephandle_linux::start ()
-{
-  if (d_started)
-    return true;		// already running
-
-  d_started = true;
-
-  if (d_input_p){		// fire off all the reads
-    usbdevfs_urb *urb;
-
-    int nerrors = 0;
-    while ((urb = free_list_get ()) != 0 && nerrors < d_nblocks){
-      if (!submit_urb (urb))
-	nerrors++;
-    }
-  }
-
-  return true;
-}
-
-//
-// kill all i/o in progress.
-// kill any completed but unprocessed transactions.
-//
-bool
-fusb_ephandle_linux::stop ()
-{
-  if (!d_started)
-    return true;
-
-  if (d_write_work_in_progress){
-    free_list_add (d_write_work_in_progress);
-    d_write_work_in_progress = 0;
-  }
-
-  if (d_read_work_in_progress){
-    free_list_add (d_read_work_in_progress);
-    d_read_work_in_progress = 0;
-    d_read_buffer = 0;
-    d_read_buffer_end = 0;
-  }
-
-  d_devhandle->_cancel_pending_rqsts (this);
-  d_devhandle->_reap (false);
-
-  while (1){
-    usbdevfs_urb *urb;
-    while ((urb = completed_list_get ()) != 0)
-      free_list_add (urb);
-
-    if (d_free_list.size () == (unsigned) d_nblocks)
-      break;
-
-    if (!d_devhandle->_reap(true))
-      break;
-  }
-
-  d_started = false;
-  return true;
-}
-
-// ----------------------------------------------------------------
-//			routines for writing 
-// ----------------------------------------------------------------
-
-#if (MINIMIZE_TX_BUFFERING)
-
-int 
-fusb_ephandle_linux::write(const void *buffer, int nbytes)
-{
-  if (!d_started)
-    return -1;
-  
-  if (d_input_p)
-    return -1;
-
-  assert(nbytes % 512 == 0);
-
-  unsigned char *src = (unsigned char *) buffer;
-
-  int n = 0;
-  while (n < nbytes){
-
-    usbdevfs_urb *urb = get_write_work_in_progress();
-    if (!urb)
-      return -1;
-    assert(urb->actual_length == 0);
-    int m = std::min(nbytes - n, MAX_BLOCK_SIZE);
-    urb->buffer = src;
-    urb->buffer_length = m;
-
-    n += m;
-    src += m;
-
-    if (!submit_urb(urb))
-      return -1;
-
-    d_write_work_in_progress = 0;
-  }
-
-  return n;
-}
-
-#else
-
-int 
-fusb_ephandle_linux::write (const void *buffer, int nbytes)
-{
-  if (!d_started)
-    return -1;
-  
-  if (d_input_p)
-    return -1;
-
-  unsigned char *src = (unsigned char *) buffer;
-
-  int n = 0;
-  while (n < nbytes){
-
-    usbdevfs_urb *urb = get_write_work_in_progress ();
-    if (!urb)
-      return -1;
-    unsigned char *dst = (unsigned char *) urb->buffer;
-    int m = std::min (nbytes - n, urb->buffer_length - urb->actual_length);
-
-    memcpy (&dst[urb->actual_length], &src[n], m);
-    urb->actual_length += m;
-    n += m;
-
-    if (urb->actual_length == urb->buffer_length){
-      if (!submit_urb (urb))
-	return -1;
-      d_write_work_in_progress = 0;
-    }
-  }
-
-  return n;
-}
-
-#endif
-
-usbdevfs_urb *
-fusb_ephandle_linux::get_write_work_in_progress ()
-{
-  // if we've already got some work in progress, return it
-
-  if (d_write_work_in_progress)
-    return d_write_work_in_progress;
-
-  while (1){
-
-    reap_complete_writes ();
-
-    usbdevfs_urb *urb = free_list_get ();
-
-    if (urb != 0){
-      assert (urb->actual_length == 0);
-      d_write_work_in_progress = urb;
-      return urb;
-    }
-
-    // The free list is empty.  Tell the device handle to reap.
-    // Anything it reaps for us will end up on our completed list.
-
-    if (!d_devhandle->_reap (true))
-      return 0;
-  }
-}
-
-void
-fusb_ephandle_linux::reap_complete_writes ()
-{
-  // take a look at the completed_list and xfer to free list after
-  // checking for errors.
-
-  usbdevfs_urb *urb;
-  
-  while ((urb = completed_list_get ()) != 0){
-
-    // Check for any errors or short writes that were reported in the urb.
-    // The kernel sets status, actual_length and error_count.
-    // error_count is only used for ISO xfers.
-    // status is 0 if successful, else is an errno kind of thing
-
-    if (urb->status != 0){
-      fprintf (stderr, "fusb: (status %d) %s\n", urb->status, strerror (-urb->status));
-    }
-    else if (urb->actual_length != urb->buffer_length){
-      fprintf (stderr, "fusb: short write xfer: %d != %d\n",
-	       urb->actual_length, urb->buffer_length);
-    }
-
-    free_list_add (urb);
-  }
-}
-
-void
-fusb_ephandle_linux::wait_for_completion ()
-{
-  d_devhandle->_wait_for_completion ();
-}
-
-// ----------------------------------------------------------------
-//		       routines for reading
-// ----------------------------------------------------------------
-
-int
-fusb_ephandle_linux::read (void *buffer, int nbytes)
-{
-  if (!d_started)
-    return -1;
-  
-  if (!d_input_p)
-    return -1;
-
-  unsigned char *dst = (unsigned char *) buffer;
-
-  int n = 0;
-  while (n < nbytes){
-
-    if (d_read_buffer >= d_read_buffer_end)
-      if (!reload_read_buffer ())
-	return -1;
-
-    int m = std::min (nbytes - n, (int) (d_read_buffer_end - d_read_buffer));
-
-    memcpy (&dst[n], d_read_buffer, m);
-    d_read_buffer += m;
-    n += m;
-  }
-
-  return n;
-}
-
-bool
-fusb_ephandle_linux::reload_read_buffer ()
-{
-  assert (d_read_buffer >= d_read_buffer_end);
-
-  usbdevfs_urb *urb;
-
-  if (d_read_work_in_progress){
-    // We're done with this urb.  Fire off a read to refill it.
-    urb = d_read_work_in_progress;
-    d_read_work_in_progress = 0;
-    d_read_buffer = 0;
-    d_read_buffer_end = 0;
-    urb->actual_length = 0;
-    if (!submit_urb (urb))
-      return false;
-  }
-
-  while (1){
-
-    while ((urb = completed_list_get ()) == 0)
-      if (!d_devhandle->_reap (true))
-	return false;
-
-    // check result of completed read
-
-    if (urb->status != 0){
-      // We've got a problem. Report it and fail.
-      fprintf (stderr, "fusb: (rd status %d) %s\n", urb->status, strerror (-urb->status));
-      urb->actual_length = 0;
-      free_list_add (urb);
-      return false;
-    }
-
-    // we've got a happy urb, full of data...
-
-    d_read_work_in_progress = urb;
-    d_read_buffer = (unsigned char *) urb->buffer;
-    d_read_buffer_end = d_read_buffer + urb->actual_length;
-
-    return true;
-  }
-}
-
-// ----------------------------------------------------------------
-
-void
-fusb_ephandle_linux::free_list_add (usbdevfs_urb *urb)
-{
-  assert (urb_get_ephandle (urb) == this);
-  urb->actual_length = 0;
-  d_free_list.push_back (urb);
-}
-
-usbdevfs_urb *
-fusb_ephandle_linux::free_list_get ()
-{
-  if (d_free_list.empty ())
-    return 0;
-
-  usbdevfs_urb *urb = d_free_list.front ();
-  d_free_list.pop_front ();
-  return urb;
-}
-
-void
-fusb_ephandle_linux::completed_list_add (usbdevfs_urb *urb)
-{
-  assert (urb_get_ephandle (urb) == this);
-  d_completed_list.push_back (urb);
-}
-
-usbdevfs_urb *
-fusb_ephandle_linux::completed_list_get ()
-{
-  if (d_completed_list.empty ())
-    return 0;
-
-  usbdevfs_urb *urb = d_completed_list.front ();
-  d_completed_list.pop_front ();
-  return urb;
-}
-
-/*
- * Submit the urb.  If successful the urb ends up on the devhandle's
- * pending list, otherwise, it's back on our free list.
- */
-bool
-fusb_ephandle_linux::submit_urb (usbdevfs_urb *urb)
-{
-  if (!d_devhandle->_submit_urb (urb)){    // FIXME record the problem somewhere
-    fprintf (stderr, "_submit_urb failed\n");
-    free_list_add (urb);
-    return false;
-  }
-  return true;
-}
diff --git a/usrp/host/lib/fusb_linux.h b/usrp/host/lib/fusb_linux.h
deleted file mode 100644
index 107e1af70..000000000
--- a/usrp/host/lib/fusb_linux.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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.
- */
-
-// Fast USB interface
-
-#ifndef _FUSB_LINUX_H_
-#define _FUSB_LINUX_H_
-
-#include <fusb.h>
-#include <list>
-
-struct  usbdevfs_urb;
-class   fusb_ephandle_linux;
-
-/*!
- * \brief linux specific implementation of fusb_devhandle using usbdevice_fs
- */
-class fusb_devhandle_linux : public fusb_devhandle {
-private:
-  std::list<usbdevfs_urb*>	 d_pending_rqsts;
-
-  void pending_add (usbdevfs_urb *urb);
-  bool pending_remove (usbdevfs_urb *urb);
-  usbdevfs_urb * pending_get ();
-
-
-public:
-  // CREATORS
-  fusb_devhandle_linux (usb_dev_handle *udh);
-  virtual ~fusb_devhandle_linux ();
-
-  // MANIPULATORS
-  virtual fusb_ephandle *make_ephandle (int endpoint, bool input_p,
-					int block_size = 0, int nblocks = 0);
-
-  // internal use only
-  bool _submit_urb (usbdevfs_urb *urb);
-  bool _cancel_urb (usbdevfs_urb *urb);
-  void _cancel_pending_rqsts (fusb_ephandle_linux *eph);
-  bool _reap (bool ok_to_block_p);
-  void _wait_for_completion ();
-};
-
-/*!
- * \brief linux specific implementation of fusb_ephandle using usbdevice_fs
- */
-
-class fusb_ephandle_linux : public fusb_ephandle {
-private:
-  fusb_devhandle_linux	       *d_devhandle;
-  std::list<usbdevfs_urb*>	d_free_list;
-  std::list<usbdevfs_urb*>	d_completed_list;
-  usbdevfs_urb		       *d_write_work_in_progress;
-  unsigned char		       *d_write_buffer;
-  usbdevfs_urb		       *d_read_work_in_progress;
-  unsigned char		       *d_read_buffer;
-  unsigned char		       *d_read_buffer_end;
-
-  usbdevfs_urb *get_write_work_in_progress ();
-  void reap_complete_writes ();
-  bool reload_read_buffer ();
-  bool submit_urb (usbdevfs_urb *urb);
-  
-public:
-  fusb_ephandle_linux (fusb_devhandle_linux *dh, int endpoint, bool input_p,
-		       int block_size = 0, int nblocks = 0);
-  virtual ~fusb_ephandle_linux ();
-
-  virtual bool start ();  	//!< begin streaming i/o
-  virtual bool stop ();		//!< stop streaming i/o
-
-  /*!
-   * \returns \p nbytes if write was successfully enqueued, else -1.
-   * Will block if no free buffers available.
-   */
-  virtual int write (const void *buffer, int nbytes);
-
-  /*!
-   * \returns number of bytes read or -1 if error.
-   * number of bytes read will be <= nbytes.
-   * Will block if no input available.
-   */
-  virtual int read (void *buffer, int nbytes);
-
-  /*
-   * block until all outstanding writes have completed
-   */
-  virtual void wait_for_completion ();
-
-  // internal use only
-  void free_list_add (usbdevfs_urb *urb);
-  void completed_list_add (usbdevfs_urb *urb);
-  usbdevfs_urb *free_list_get (); 		// pop and return head of list or 0
-  usbdevfs_urb *completed_list_get ();		// pop and return head of list or 0
-};
-
-#endif /* _FUSB_LINUX_H_ */
diff --git a/usrp/host/lib/fusb_ra_wb.cc b/usrp/host/lib/fusb_ra_wb.cc
deleted file mode 100644
index 699a34b39..000000000
--- a/usrp/host/lib/fusb_ra_wb.cc
+++ /dev/null
@@ -1,258 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <fusb_ra_wb.h>
-#include <usb.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-#include <sys/event.h>
-#include <dev/usb/usb.h>
-
-static const int USB_TIMEOUT = 1000;	// in milliseconds
-
-// the following comment and function is from fusb_linux.cc
-#if 0
-// Totally evil and fragile extraction of file descriptor from
-// guts of libusb.  They don't install usbi.h, which is what we'd need
-// to do this nicely.
-//
-// FIXME if everything breaks someday in the future, look here...
-
-static int
-fd_from_usb_dev_handle (usb_dev_handle *udh)
-{
-  return *((int *) udh);
-}
-#endif
-
-// the control endpoint doesn't actually do us any good so here is a
-// new "fragile extraction"
-static int
-ep_fd_from_usb_dev_handle (usb_dev_handle *udh, int endpoint)
-{
-  struct usb_dev_handle_kludge2 { // see also usrp_prims.cc
-    int			 fd;
-    struct usb_bus	*bus;
-    struct usb_device	*device;
-    int			 config;
-    int			 interface;
-    int			 altsetting;
-    void		*impl_info;
-  };
-  struct bsd_usb_dev_handle_info_kludge {
-    int			 ep_fd[USB_MAX_ENDPOINTS];
-  };
-  struct bsd_usb_dev_handle_info_kludge *info
-      = (struct bsd_usb_dev_handle_info_kludge *)
-           ((struct usb_dev_handle_kludge2 *)udh)->impl_info;
-  return info->ep_fd[UE_GET_ADDR(endpoint)];
-}
-
-
-fusb_devhandle_ra_wb::fusb_devhandle_ra_wb (usb_dev_handle *udh)
-  : fusb_devhandle (udh)
-{
-  // that's it
-}
-
-fusb_devhandle_ra_wb::~fusb_devhandle_ra_wb ()
-{
-  // nop
-}
-
-fusb_ephandle *
-fusb_devhandle_ra_wb::make_ephandle (int endpoint, bool input_p,
-				     int block_size, int nblocks)
-{
-  return new fusb_ephandle_ra_wb (this, endpoint, input_p,
-				  block_size, nblocks);
-}
-
-// ----------------------------------------------------------------
-
-fusb_ephandle_ra_wb::fusb_ephandle_ra_wb (fusb_devhandle_ra_wb *dh,
-					  int endpoint, bool input_p,
-					  int block_size, int nblocks)
-  : fusb_ephandle (endpoint, input_p, block_size, nblocks),
-    d_devhandle (dh), d_ra_wb_on (false)
-{
-  // that's it 
-}
-
-fusb_ephandle_ra_wb::~fusb_ephandle_ra_wb ()
-{
-  // nop
-}
-
-bool
-fusb_ephandle_ra_wb::start ()
-{
-  d_started = true;
-
-  char buf = '\0';
-  int fd;
-
-  // this is to cause libusb to open the endpoint
-  if (!d_input_p) {
-    write(&buf, 0);
-    fd = ep_fd_from_usb_dev_handle (d_devhandle->get_usb_dev_handle(),
-				    d_endpoint);
-  }
-  else {
-    read(&buf, 0);
-    fd = ep_fd_from_usb_dev_handle (d_devhandle->get_usb_dev_handle(),
-				    d_endpoint|USB_ENDPOINT_IN);
-  }
-
-  // enable read ahead/write behind
-  int ret;
-  struct usb_bulk_ra_wb_opt opts;
-  int enable = 1;
-
-  opts.ra_wb_buffer_size = d_block_size*d_nblocks;
-  opts.ra_wb_request_size = d_block_size;
-//  fprintf (stderr, "setting buffer size to %d, request size to %d\n",
-//	   opts.ra_wb_buffer_size, opts.ra_wb_request_size);
-  if (!d_input_p) {
-    ret = ioctl (fd, USB_SET_BULK_WB_OPT, &opts);
-    if (ret < 0)
-      fprintf (stderr, "USB_SET_BULK_WB_OPT: %s\n", strerror(errno));
-    else {
-      ret = ioctl (fd, USB_SET_BULK_WB, &enable);
-      if (ret < 0)
-	fprintf (stderr, "USB_SET_BULK_WB: %s\n", strerror(errno));
-      else
-	d_ra_wb_on = true;
-    }
-  }
-  else {
-    ret = ioctl (fd, USB_SET_BULK_RA_OPT, &opts);
-    if (ret < 0)
-      fprintf (stderr, "USB_SET_BULK_RA_OPT: %s\n", strerror(errno));
-    else {
-      ret = ioctl (fd, USB_SET_BULK_RA, &enable);
-      if (ret < 0)
-	fprintf (stderr, "USB_SET_BULK_RA: %s\n", strerror(errno));
-      else
-	d_ra_wb_on = true;
-    }
-  }
-
-  return true;
-}
-
-bool
-fusb_ephandle_ra_wb::stop ()
-{
-  int fd;
-  int ret;
-  int enable = 0;
-  if (d_ra_wb_on) {
-    if (!d_input_p) {
-      fd = ep_fd_from_usb_dev_handle (d_devhandle->get_usb_dev_handle(),
-				      d_endpoint);
-      ret = ioctl (fd, USB_SET_BULK_WB, &enable);
-      if (ret < 0)
-	fprintf (stderr, "USB_SET_BULK_WB: %s\n", strerror(errno));
-      else
-	d_ra_wb_on = false;
-    }
-    else {
-      fd = ep_fd_from_usb_dev_handle (d_devhandle->get_usb_dev_handle(),
-				      d_endpoint|USB_ENDPOINT_IN);
-      ret = ioctl (fd, USB_SET_BULK_RA, &enable);
-      if (ret < 0)
-	fprintf (stderr, "USB_SET_BULK_RA: %s\n", strerror(errno));
-      else
-	d_ra_wb_on = false;
-    }
-  }
-
-  d_started = false;
-  return true;
-}
-
-int
-fusb_ephandle_ra_wb::write (const void *buffer, int nbytes)
-{
-  if (!d_started)
-    return -1;
-  
-  if (d_input_p)
-    return -1;
-  
-  return usb_bulk_write (d_devhandle->get_usb_dev_handle (),
-			 d_endpoint, (char *) buffer, nbytes, USB_TIMEOUT);
-}
-
-int
-fusb_ephandle_ra_wb::read (void *buffer, int nbytes)
-{
-  if (!d_started)
-    return -1;
-
-  if (!d_input_p)
-    return -1;
-
-  return usb_bulk_read (d_devhandle->get_usb_dev_handle (),
-			d_endpoint|USB_ENDPOINT_IN, (char *) buffer, nbytes,
-			USB_TIMEOUT);
-}
-
-void
-fusb_ephandle_ra_wb::wait_for_completion ()
-{
-  // as the driver is implemented this only makes sense for write 
-  if (d_ra_wb_on && !d_input_p) {
-    int fd = ep_fd_from_usb_dev_handle (d_devhandle->get_usb_dev_handle(),
-					d_endpoint);
-    int kq = kqueue();
-    if (kq < 0)
-      return;
-    struct kevent evt;
-    int nevents;
-    EV_SET (&evt, fd, EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, 0/*NULL*/);
-    nevents = kevent (kq, &evt, 1, &evt, 1, NULL);
-    if (nevents < 1) {
-      close(kq);
-      return;
-    }
-    while (!(evt.flags & EV_ERROR) && evt.data < (d_block_size*d_nblocks)) {
-      // it's a busy loop, but that's all I can do at the moment
-      nevents = kevent (kq, NULL, 0, &evt, 1, NULL);
-      // let's see if this improves the test_usrp_standard_tx throughput &
-      // "CPU usage" by looping less frequently
-      struct timeval timeout;
-      timeout.tv_sec = 0;
-      timeout.tv_usec = 1000; // 1 ms
-      select (0, NULL, NULL, NULL, &timeout);
-    }
-    close (kq);
-  }
-}
diff --git a/usrp/host/lib/fusb_ra_wb.h b/usrp/host/lib/fusb_ra_wb.h
deleted file mode 100644
index 233976abe..000000000
--- a/usrp/host/lib/fusb_ra_wb.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,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 _FUSB_RA_WB_H_
-#define _FUSB_RA_WB_H_
-
-#include <fusb.h>
-
-/*!
- * \brief generic implementation of fusb_devhandle using only libusb
- */
-class fusb_devhandle_ra_wb : public fusb_devhandle
-{
-public:
-  // CREATORS
-  fusb_devhandle_ra_wb (usb_dev_handle *udh);
-  virtual ~fusb_devhandle_ra_wb ();
-
-  // MANIPULATORS
-  virtual fusb_ephandle *make_ephandle (int endpoint, bool input_p,
-					int block_size = 0, int nblocks = 0);
-};
-
-
-/*!
- * \brief generic implementation of fusb_ephandle using only libusb
- */
-class fusb_ephandle_ra_wb : public fusb_ephandle
-{
-private:
-  fusb_devhandle_ra_wb	*d_devhandle;
-  bool d_ra_wb_on;
-  
-public:
-  // CREATORS
-  fusb_ephandle_ra_wb (fusb_devhandle_ra_wb *dh, int endpoint, bool input_p,
-		       int block_size = 0, int nblocks = 0);
-  virtual ~fusb_ephandle_ra_wb ();
-
-  // MANIPULATORS
-
-  virtual bool start ();  	//!< begin streaming i/o
-  virtual bool stop ();		//!< stop streaming i/o
-
-  /*!
-   * \returns \p nbytes if write was successfully enqueued, else -1.
-   * Will block if no free buffers available.
-   */
-  virtual int write (const void *buffer, int nbytes);
-
-  /*!
-   * \returns number of bytes read or -1 if error.
-   * number of bytes read will be <= nbytes.
-   * Will block if no input available.
-   */
-  virtual int read (void *buffer, int nbytes);
-
-  /*
-   * block until all outstanding writes have completed
-   */
-  virtual void wait_for_completion ();
-};
-
-#endif /* _FUSB_RA_WB_H_ */
-
diff --git a/usrp/host/lib/fusb_sysconfig_darwin.cc b/usrp/host/lib/fusb_sysconfig_darwin.cc
deleted file mode 100644
index 68dd64815..000000000
--- a/usrp/host/lib/fusb_sysconfig_darwin.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2009 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.
- */
-
-#include <fusb.h>
-#include <fusb_darwin.h>
-
-static const int MAX_BLOCK_SIZE = 32 * 1024;		// hard limit
-static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);	// 2 MB
-
-fusb_devhandle *
-fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
-{
-  return new fusb_devhandle_darwin (udh);
-}
-
-int fusb_sysconfig::max_block_size ()
-{
-  return MAX_BLOCK_SIZE;
-}
-
-int fusb_sysconfig::default_block_size ()
-{
-  return fusb_sysconfig::max_block_size ();
-}
-
-int fusb_sysconfig::default_buffer_size ()
-{
-  return FUSB_BUFFER_SIZE;
-}
-
diff --git a/usrp/host/lib/fusb_sysconfig_generic.cc b/usrp/host/lib/fusb_sysconfig_generic.cc
deleted file mode 100644
index e0986510c..000000000
--- a/usrp/host/lib/fusb_sysconfig_generic.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2009 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.
- */
-
-#include <fusb.h>
-#include <fusb_generic.h>
-
-static const int MAX_BLOCK_SIZE = 16 * 1024;		// hard limit
-static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);	// 2 MB
-
-fusb_devhandle *
-fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
-{
-  return new fusb_devhandle_generic (udh);
-}
-	
-int fusb_sysconfig::max_block_size ()
-{
-  return MAX_BLOCK_SIZE;
-}
-
-int fusb_sysconfig::default_block_size ()
-{
-  return fusb_sysconfig::max_block_size ();
-}
-
-int fusb_sysconfig::default_buffer_size ()
-{
-  return FUSB_BUFFER_SIZE;
-}
diff --git a/usrp/host/lib/fusb_sysconfig_libusb1.cc b/usrp/host/lib/fusb_sysconfig_libusb1.cc
deleted file mode 100644
index 46daf561a..000000000
--- a/usrp/host/lib/fusb_sysconfig_libusb1.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2009 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.
- */
-
-#include <fusb.h>
-#include <fusb_libusb1.h>
-
-static const int MAX_BLOCK_SIZE = 16 * 1024;		// hard limit
-static const int DEFAULT_BLOCK_SIZE =   4 * 1024;
-static const int FUSB_BUFFER_SIZE = 1 * (1L << 20);	// 1 MB
-
-struct libusb_context;
-
-fusb_devhandle *
-fusb_sysconfig::make_devhandle (libusb_device_handle *udh, libusb_context *ctx)
-{
-  return new fusb_devhandle_libusb1 (udh, ctx);
-}
-	
-int fusb_sysconfig::max_block_size ()
-{
-  return MAX_BLOCK_SIZE;
-}
-
-int fusb_sysconfig::default_block_size ()
-{
-  return DEFAULT_BLOCK_SIZE;
-}
-
-int fusb_sysconfig::default_buffer_size ()
-{
-  return FUSB_BUFFER_SIZE;
-}
diff --git a/usrp/host/lib/fusb_sysconfig_linux.cc b/usrp/host/lib/fusb_sysconfig_linux.cc
deleted file mode 100644
index e33b90ba4..000000000
--- a/usrp/host/lib/fusb_sysconfig_linux.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2009 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.
- */
-
-#include <fusb.h>
-#include <fusb_linux.h>
-
-static const int MAX_BLOCK_SIZE     =  16 * 1024;	// hard limit
-static const int DEFAULT_BLOCK_SIZE =   4 * 1024;	// fewer kernel memory problems
-static const int FUSB_BUFFER_SIZE   =   1 * (1L << 20); // 1MB
-
-fusb_devhandle *
-fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
-{
-  return new fusb_devhandle_linux (udh);
-}
-
-int fusb_sysconfig::max_block_size ()
-{
-  return MAX_BLOCK_SIZE;
-}
-
-int fusb_sysconfig::default_block_size ()
-{
-  return DEFAULT_BLOCK_SIZE;
-}
-
-int fusb_sysconfig::default_buffer_size ()
-{
-  return FUSB_BUFFER_SIZE;
-}
diff --git a/usrp/host/lib/fusb_sysconfig_ra_wb.cc b/usrp/host/lib/fusb_sysconfig_ra_wb.cc
deleted file mode 100644
index c527e3099..000000000
--- a/usrp/host/lib/fusb_sysconfig_ra_wb.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2006,2009 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.
- */
-
-#include <fusb.h>
-#include <fusb_ra_wb.h>
-
-//static const int MAX_BLOCK_SIZE = 16 * 1024;		// hard limit
-// there's no hard limit, even before making any changes to the driver
-// 64k is empirically a pretty good number
-static const int MAX_BLOCK_SIZE = 64 * 1024;
-// there is a limit of 1 MB in the driver for the buffer size
-static const int FUSB_BUFFER_SIZE = 256 * (1L << 10);	// 256 kB
-
-fusb_devhandle *
-fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
-{
-  return new fusb_devhandle_ra_wb (udh);
-}
-	
-int fusb_sysconfig::max_block_size ()
-{
-  return MAX_BLOCK_SIZE;
-}
-
-int fusb_sysconfig::default_block_size ()
-{
-  return fusb_sysconfig::max_block_size ();
-}
-
-int fusb_sysconfig::default_buffer_size ()
-{
-  return FUSB_BUFFER_SIZE;
-}
diff --git a/usrp/host/lib/fusb_sysconfig_win32.cc b/usrp/host/lib/fusb_sysconfig_win32.cc
deleted file mode 100644
index fb4be8829..000000000
--- a/usrp/host/lib/fusb_sysconfig_win32.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2005,2009 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.
- */
-
-#include <fusb.h>
-#include <fusb_win32.h>
-
-static const int MAX_BLOCK_SIZE = 64 * 1024;		// Windows kernel hard limit
-static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);	// 2 MB
-	
-fusb_devhandle *
-fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
-{
-  return new fusb_devhandle_win32 (udh);
-}
-
-int fusb_sysconfig::max_block_size ()
-{
-  return MAX_BLOCK_SIZE;
-}
-
-int fusb_sysconfig::default_block_size ()
-{
-  return fusb_sysconfig::max_block_size ();
-}
-
-int fusb_sysconfig::default_buffer_size ()
-{
-  return FUSB_BUFFER_SIZE;
-}
diff --git a/usrp/host/lib/fusb_win32.cc b/usrp/host/lib/fusb_win32.cc
deleted file mode 100644
index 8c218534b..000000000
--- a/usrp/host/lib/fusb_win32.cc
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2005 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <fusb_win32.h>
-#include <usb.h>
-#include <assert.h>
-#include <stdexcept>
-#include <string.h>
-#include <cstdio>
-
-static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size();
-static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE;
-static const int DEFAULT_BUFFER_SIZE = 16 * (1L << 20);		// 16 MB / endpoint
-
-
-static const int USB_TIMEOUT = 1000;	// in milliseconds
-
-
-fusb_devhandle_win32::fusb_devhandle_win32 (usb_dev_handle *udh)
-  : fusb_devhandle (udh)
-{
-  // that's it
-}
-
-fusb_devhandle_win32::~fusb_devhandle_win32 ()
-{
-  // nop
-}
-
-fusb_ephandle *
-fusb_devhandle_win32::make_ephandle (int endpoint, bool input_p,
-				       int block_size, int nblocks)
-{
-  return new fusb_ephandle_win32 (this, endpoint, input_p,
-				    block_size, nblocks);
-}
-
-// ----------------------------------------------------------------
-
-fusb_ephandle_win32::fusb_ephandle_win32 (fusb_devhandle_win32 *dh,
-					      int endpoint, bool input_p,
-					      int block_size, int nblocks)
-  : fusb_ephandle (endpoint, input_p, block_size, nblocks),
-    d_devhandle (dh), d_input_leftover(0),d_output_short(0)
-{
-  if (d_block_size < 0 || d_block_size > MAX_BLOCK_SIZE)
-    throw std::out_of_range ("fusb_ephandle_win32: block_size");
-
-  if (d_nblocks < 0)
-    throw std::out_of_range ("fusb_ephandle_win32: nblocks");
-
-  if (d_block_size == 0)
-    d_block_size = DEFAULT_BLOCK_SIZE;
-
-  if (d_nblocks == 0)
-    d_nblocks = std::max (1, DEFAULT_BUFFER_SIZE / d_block_size);
-
-  d_buffer = new char [d_block_size*d_nblocks];
-  d_context = new void * [d_nblocks];
-
-  // allocate contexts
-
-  usb_dev_handle *dev = dh->get_usb_dev_handle ();
-  int i;
-
-  if (d_input_p)
-    endpoint |= USB_ENDPOINT_IN;
-
-  for (i=0; i<d_nblocks; i++)
-    usb_bulk_setup_async(dev, &d_context[i], endpoint);
-}
-
-fusb_ephandle_win32::~fusb_ephandle_win32 ()
-{
-  int i;
-
-  stop ();
-
-  for (i=0; i<d_nblocks; i++)
-    usb_free_async(&d_context[i]);
-
-  delete [] d_buffer;
-  delete [] d_context;
-}
-
-bool
-fusb_ephandle_win32::start ()
-{
-  if (d_started)
-    return true;	// already running
-
-  d_started = true;
-
-  d_curr = d_nblocks-1;
-  d_outstanding_write = 0;
-  d_input_leftover =0;
-  d_output_short = 0;
-
-  if (d_input_p){	// fire off all the reads
-    int i;
-
-    for (i=0; i<d_nblocks; i++) {
-      usb_submit_async(d_context[i], (char * ) d_buffer+i*d_block_size,
-		      d_block_size);
-    }
-  }
-
-  return true;
-}
-
-bool
-fusb_ephandle_win32::stop ()
-{
-  if (!d_started)
-    return true;
-
-  if (!d_input_p)
-    wait_for_completion ();
-
-  d_started = false;
-  return true;
-}
-
-int
-fusb_ephandle_win32::write (const void *buffer, int nbytes)
-{
-  int retval=0;
-  char *buf;
-
-  if (!d_started)	// doesn't matter here, but keeps semantics constant
-    return -1;
-
-  if (d_input_p)
-    return -1;
-
-  int bytes_to_write = nbytes;
-  int a=0;
-
-  if (d_output_short != 0) {
-
-	buf = &d_buffer[d_curr*d_block_size + d_block_size - d_output_short];
-	a = std::min(nbytes, d_output_short);
-	memcpy(buf, buffer, a);
-	bytes_to_write -= a;
-	d_output_short -= a;
-
-    if (d_output_short == 0)
-        usb_submit_async(d_context[d_curr],
-			 &d_buffer[d_curr*d_block_size], d_block_size);
-  }
-
-  while (bytes_to_write > 0) {
-    d_curr = (d_curr+1)%d_nblocks;
-    buf = &d_buffer[d_curr*d_block_size];
-
-    if (d_outstanding_write != d_nblocks) {
-      d_outstanding_write++;
-    } else {
-      retval = usb_reap_async(d_context[d_curr], USB_TIMEOUT);
-      if (retval < 0) {
-		  fprintf(stderr, "%s: usb_reap_async: %s\n",
-			  __FUNCTION__, usb_strerror());
-	  return retval;
-	}
-    }
-
-    int ncopy = std::min(bytes_to_write, d_block_size);
-    memcpy(buf, (void *) &(((char*)buffer)[a]), ncopy);
-    bytes_to_write -= ncopy;
-    a += ncopy;
-
-    d_output_short = d_block_size - ncopy;
-    if (d_output_short == 0)
-	    usb_submit_async(d_context[d_curr], buf, d_block_size);
-  }
-
-  return retval < 0 ? retval : nbytes;
-}
-
-int
-fusb_ephandle_win32::read (void *buffer, int nbytes)
-{
-  int retval=0;
-  char *buf;
-
-  if (!d_started)	// doesn't matter here, but keeps semantics constant
-    return -1;
-
-  if (!d_input_p)
-    return -1;
-
-  int bytes_to_read = nbytes;
-
-  int a=0;
-  if (d_input_leftover != 0) {
-
-	buf = &d_buffer[d_curr*d_block_size + d_block_size - d_input_leftover];
-	a = std::min(nbytes, d_input_leftover);
-	memcpy(buffer, buf, a);
-	bytes_to_read -= a;
-	d_input_leftover -= a;
-
-    if (d_input_leftover == 0)
-        usb_submit_async(d_context[d_curr],
-			 &d_buffer[d_curr*d_block_size], d_block_size);
-  }
-
-  while (bytes_to_read > 0) {
-
-    d_curr = (d_curr+1)%d_nblocks;
-    buf = &d_buffer[d_curr*d_block_size];
-
-    retval = usb_reap_async(d_context[d_curr], USB_TIMEOUT);
-    if (retval < 0)
-	  fprintf(stderr, "%s: usb_reap_async: %s\n",
-			  __FUNCTION__, usb_strerror());
-
-    int ncopy = std::min(bytes_to_read, d_block_size);
-    memcpy((void *) &(((char*)buffer)[a]), buf, ncopy);
-    bytes_to_read -= ncopy;
-    a += ncopy;
-
-    d_input_leftover = d_block_size - ncopy;
-    if (d_input_leftover == 0)
-	    usb_submit_async(d_context[d_curr], buf, d_block_size);
-  }
-
-  return retval < 0 ? retval : nbytes;
-}
-
-void
-fusb_ephandle_win32::wait_for_completion ()
-{
-  int i;
-
-  for (i=0; i<d_outstanding_write; i++) {
-    int context_num;
-
-    context_num = (d_curr+d_outstanding_write+i+1)%d_nblocks;
-    usb_reap_async(d_context[context_num], USB_TIMEOUT);
-  }
-
-  d_outstanding_write = 0;
-}
diff --git a/usrp/host/lib/fusb_win32.h b/usrp/host/lib/fusb_win32.h
deleted file mode 100644
index 3ad2132f4..000000000
--- a/usrp/host/lib/fusb_win32.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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 _FUSB_WIN32_H_
-#define _FUSB_WIN32_H_
-
-#include <fusb.h>
-
-/*!
- * \brief win32 implementation of fusb_devhandle using libusb-win32
- */
-class fusb_devhandle_win32 : public fusb_devhandle
-{
-public:
-  // CREATORS
-  fusb_devhandle_win32 (usb_dev_handle *udh);
-  virtual ~fusb_devhandle_win32 ();
-
-  // MANIPULATORS
-  virtual fusb_ephandle *make_ephandle (int endpoint, bool input_p,
-					int block_size = 0, int nblocks = 0);
-};
-
-
-/*!
- * \brief win32 implementation of fusb_ephandle using libusb-win32
- */
-class fusb_ephandle_win32 : public fusb_ephandle
-{
-private:
-  fusb_devhandle_win32	*d_devhandle;
-
-  unsigned d_curr;
-  unsigned d_outstanding_write;
-  int d_output_short;
-  int d_input_leftover;
-  void ** d_context;
-  char * d_buffer;
-
-public:
-  // CREATORS
-  fusb_ephandle_win32 (fusb_devhandle_win32 *dh, int endpoint, bool input_p,
-			 int block_size = 0, int nblocks = 0);
-  virtual ~fusb_ephandle_win32 ();
-
-  // MANIPULATORS
-
-  virtual bool start ();  	//!< begin streaming i/o
-  virtual bool stop ();		//!< stop streaming i/o
-
-  /*!
-   * \returns \p nbytes if write was successfully enqueued, else -1.
-   * Will block if no free buffers available.
-   */
-  virtual int write (const void *buffer, int nbytes);
-
-  /*!
-   * \returns number of bytes read or -1 if error.
-   * number of bytes read will be <= nbytes.
-   * Will block if no input available.
-   */
-  virtual int read (void *buffer, int nbytes);
-
-  /*
-   * block until all outstanding writes have completed
-   */
-  virtual void wait_for_completion ();
-};
-
-#endif /* _FUSB_WIN32_H_ */
-
diff --git a/usrp/host/lib/gen-ratios b/usrp/host/lib/gen-ratios
deleted file mode 100755
index 2250090d7..000000000
--- a/usrp/host/lib/gen-ratios
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-# -*- python -*-
-
-def how_good (x):
-    pof2 = [1,2,4,8,16]
-    if x in pof2:
-        return 0
-    if x in map (lambda x: x+1, pof2):
-        return -10
-    if x in map (lambda x: x-1, pof2):
-        return -5
-    return -2
-
-    
-def better (v1, v2):
-    return abs ((v1 & 0xf) - ((v1 >> 4) & 0xf)) < abs ((v2 & 0xf) - ((v2 >> 4) & 0xf))
-
-
-def foo ():
-    result = {}
-    for i in range (1,17):
-        for j in range (1,17):
-            i_goodness = how_good (i)
-            j_goodness = how_good (j)
-            goodness = i_goodness + j_goodness
-            v = ((i - 1) << 4) | (j - 1)
-
-            key = i * j
-            prev = result.get (key, None)
-            # print "i=%3d j=%3d key=%3d good=%3d v=0x%02x prev=%s" % (i, j, key, goodness, v, prev)
-
-            if not prev:
-                result[key] = (goodness, v)
-            elif goodness > prev[0]:
-                result[key] = (goodness, v)
-            elif goodness == prev[0] and better(v, prev[1]):
-                result[key] = (goodness, v)
-
-    r = result.items ()
-    r.sort ()
-    for k, d in r:
-        print "(%3d, 0x%02x)" % (k, d[1])
-
-    
-            
-foo ()
-
-	
diff --git a/usrp/host/lib/gen_usrp_dbid.py b/usrp/host/lib/gen_usrp_dbid.py
deleted file mode 100755
index c7d3770c1..000000000
--- a/usrp/host/lib/gen_usrp_dbid.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import os
-import os.path
-import re
-from optparse import OptionParser
-
-def write_header(f, comment_char):
-    f.write(comment_char); f.write('\n')
-    f.write(comment_char); f.write(' Machine generated by gen_usrp_dbid.py from usrp_dbid.dat\n')
-    f.write(comment_char); f.write(' Do not edit by hand.  All edits will be overwritten.\n')
-    f.write(comment_char); f.write('\n')
-    f.write('\n')
-
-def gen_dbid_py(r):
-    f = open('usrp_dbid.py', 'w')
-    comment_char = '#'
-    write_header(f, comment_char)
-    f.write(comment_char); f.write('\n')
-    f.write(comment_char); f.write(" USRP Daughterboard ID's\n")
-    f.write(comment_char); f.write('\n')
-    f.write('\n')
-    for x in r:
-        f.write('%-16s = %s\n' % (x[1], x[2]))
-
-def gen_dbid_h(r):
-    f = open('../include/usrp/usrp_dbid.h', 'w')
-    comment_char = '//'
-    write_header(f, comment_char)
-    f.write(comment_char); f.write('\n')
-    f.write(comment_char); f.write(" USRP Daughterboard ID's\n")
-    f.write(comment_char); f.write('\n')
-    f.write('\n')
-    f.write('#ifndef INCLUDED_USRP_DBID_H\n')
-    f.write('#define INCLUDED_USRP_DBID_H\n')
-    f.write('\n')
-    for x in r:
-        f.write('#define %-25s %s\n' % ('USRP_DBID_' + x[1], x[2]))
-    f.write('\n')
-    f.write('#endif /* INCLUDED_USRP_DBID_H */\n')
-
-def gen_dbid_cc(r):
-    f = open('usrp_dbid.cc', 'w')
-    write_header(f, '//')
-    head = '''/*
- * Copyright 2005 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.
- */
-
-#include <usrp/usrp_prims.h>
-#include <usrp/usrp_dbid.h>
-#include <stdio.h>
-
-#define NELEM(x) sizeof(x)/sizeof(x[0])
-
-static struct {
-  unsigned short	dbid;
-  const char	       *name;
-} dbid_map[] = {
-'''
-    
-    tail = '''};
-
-const std::string
-usrp_dbid_to_string (int dbid)
-{
-  if (dbid == -1)
-    return "<none>";
-
-  if (dbid == -2)
-    return "<invalid EEPROM contents>";
-
-  for (unsigned i = 0; i < NELEM (dbid_map); i++)
-    if (dbid == dbid_map[i].dbid)
-      return dbid_map[i].name;
-
-  char tmp[64];
-  snprintf (tmp, sizeof (tmp), "Unknown (0x%04x)", dbid);
-  return tmp;
-}
-'''
-    f.write(head)
-    for x in r:
-        f.write('  { %-27s "%s" },\n' % (
-            'USRP_DBID_' + x[1] + ',', x[0]))
-    f.write(tail)
-
-def gen_all(src_filename):
-    src_file = open(src_filename, 'r')
-    r = []
-    for line in src_file:
-        line = line.strip()
-        line = re.sub(r'\s*#.*$','', line)
-        if len(line) == 0:
-            continue
-        mo = re.match('"([^"]+)"\s*(0x[0-9a-fA-F]+)', line)
-        if mo:
-            str_name = mo.group(1)
-            id_name = str_name.upper().replace(' ', '_')
-            id_val = mo.group(2)
-            r.append((str_name, id_name, id_val))
-            #sys.stdout.write('%-16s\t%-16s\t%s\n' % ('"'+str_name+'"', id_name, id_val))
-
-    gen_dbid_h(r)
-    gen_dbid_py(r)
-    gen_dbid_cc(r)
-    
-
-def main():
-    usage = "usage: %prog [options] usrp_dbid.dat"
-    parser = OptionParser(usage=usage)
-    (options, args) = parser.parse_args()
-    if len(args) != 1:
-        parser.print_help()
-        sys.exit(1)
-
-    gen_all(args[0])
-
-if __name__ == '__main__':
-    main()
diff --git a/usrp/host/lib/limbo/db_wbx.cc b/usrp/host/lib/limbo/db_wbx.cc
deleted file mode 100644
index 9f1d72939..000000000
--- a/usrp/host/lib/limbo/db_wbx.cc
+++ /dev/null
@@ -1,953 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008 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 asversion 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.
-
-#include <db_wbx.h>
-#include <fpga_regs_standard.h>
-#include <fpga_regs_common.h>
-#include <usrp_prims.h>
-#include <usrp_spi_defs.h>
-#include <stdexcept>
-#include <cmath>
-
-// d'board i/o pin defs
-
-// TX IO Pins
-#define TX_POWER        (1 << 0)  // TX Side Power
-#define RX_TXN          (1 << 1)  // T/R antenna switch for TX/RX port
-#define TX_ENB_MIX      (1 << 2)  // Enable IQ mixer
-#define TX_ENB_VGA      (1 << 3)
-
-// RX IO Pins
-#define RX2_RX1N        (1 << 0)  // antenna switch between RX2 and TX/RX port
-#define RXENABLE        (1 << 1)  // enables mixer
-#define PLL_LOCK_DETECT (1 << 2)  // Muxout pin from PLL -- MUST BE INPUT
-#define MReset          (1 << 3)  // NB6L239 Master Reset, asserted low
-#define SELA0           (1 << 4)  // NB6L239 SelA0
-#define SELA1           (1 << 5)  // NB6L239 SelA1
-#define SELB0           (1 << 6)  // NB6L239 SelB0
-#define SELB1           (1 << 7)  // NB6L239 SelB1
-#define PLL_ENABLE      (1 << 8)  // CE Pin on PLL
-#define AUX_SCLK        (1 << 9)  // ALT SPI SCLK
-#define AUX_SDO         (1 << 10) // ALT SPI SDO
-#define AUX_SEN         (1 << 11) // ALT SPI SEN
-
-
-wbx_base::wbx_base(usrp_basic_sptr usrp, int which)
-  : db_base(usrp, which)
-{
-  /*
-   * @param usrp: instance of usrp.source_c
-   * @param which: which side: 0 or 1 corresponding to side A or B respectively
-   * @type which: int
-   */
-
-  d_first = true;
-  d_spi_format = SPI_FMT_MSB | SPI_FMT_HDR_0;
-
-  // FIXME -- the write reg functions don't work with 0xffff for masks
-  _rx_write_oe(int(PLL_ENABLE|MReset|SELA0|SELA1|SELB0|SELB1|RX2_RX1N|RXENABLE), 0x7fff);
-  _rx_write_io((PLL_ENABLE|MReset|0|RXENABLE), (PLL_ENABLE|MReset|RX2_RX1N|RXENABLE));
-
-  _tx_write_oe((TX_POWER|RX_TXN|TX_ENB_MIX|TX_ENB_VGA), 0x7fff);
-  _tx_write_io((0|RX_TXN), (TX_POWER|RX_TXN|TX_ENB_MIX|TX_ENB_VGA));  // TX off, TR switch set to RX
-
-  if(d_which == 0) {
-    d_spi_enable = SPI_ENABLE_RX_A;
-  }
-  else {
-    d_spi_enable = SPI_ENABLE_RX_B;
-  }
-
-  set_auto_tr(false);
-        
-}
-
-wbx_base::~wbx_base()
-{        
-  shutdown();
-}
-
-
-void
-wbx_base::shutdown()
-{
-  if (!d_is_shutdown){
-    d_is_shutdown = true;
-    // do whatever there is to do to shutdown
-
-    write_io(d_which, d_power_off, POWER_UP);   // turn off power to board
-    _write_oe(d_which, 0, 0xffff);   // turn off all outputs
-    set_auto_tr(false); // disable auto transmit
-  }
-}
-
-bool
-wbx_base::_lock_detect()
-{
-  /*
-   * @returns: the value of the VCO/PLL lock detect bit.
-   * @rtype: 0 or 1
-   */
-
-  if(_rx_read_io() & PLL_LOCK_DETECT) {
-    return true;
-  }
-  else {     // Give it a second chance
-    if(_rx_read_io() & PLL_LOCK_DETECT) {
-      return true;
-    }
-    else {
-      return false;
-    }
-  }
-}
-
-bool 
-wbx_base::_tx_write_oe(int value, int mask)
-{
-  int reg = (d_which == 0 ? FR_OE_0 : FR_OE_2);
-  return d_usrp->_write_fpga_reg(reg, ((mask & 0xffff) << 16) | (value & 0xffff));
-}
-
-bool 
-wbx_base::_rx_write_oe(int value, int mask)
-{
-  int reg = (d_which == 0 ? FR_OE_1 : FR_OE_3);
-  return d_usrp->_write_fpga_reg(reg, ((mask & 0xffff) << 16) | (value & 0xffff));
-}
-
-bool
-wbx_base::_tx_write_io(int value, int mask)
-{
-  int reg = (d_which == 0 ? FR_IO_0 : FR_IO_2);
-  return d_usrp->_write_fpga_reg(reg, ((mask & 0xffff) << 16) | (value & 0xffff));
-}
-
-bool
-wbx_base::_rx_write_io(int value, int mask)
-{
-  int reg = (d_which == 0 ? FR_IO_1 : FR_IO_3);
-  return d_usrp->_write_fpga_reg(reg, ((mask & 0xffff) << 16) | (value & 0xffff));
-}
-
-bool
-wbx_base::_rx_read_io()
-{
-  int reg = (d_which == 0 ? FR_RB_IO_RX_A_IO_TX_A : FR_RB_IO_RX_B_IO_TX_B);
-  int t = d_usrp->_read_fpga_reg(reg);
-  return (t >> 16) & 0xffff;
-}
-
-bool
-wbx_base::_tx_read_io()
-{
-  int reg = (d_which == 0 ? FR_RB_IO_RX_A_IO_TX_A : FR_RB_IO_RX_B_IO_TX_B);
-  int t = d_usrp->_read_fpga_reg(reg);
-  return (t & 0xffff);
-}
-
-bool
-wbx_base::_compute_regs(double freq)
-{
-  /*
-   * Determine values of registers, along with actual freq.
-   * 
-   * @param freq: target frequency in Hz
-   * @type freq: double
-   * @returns: (R, N, func, init, actual_freq)
-   * @rtype: tuple(int, int, int, int, double)
-   * 
-   * Override this in derived classes.
-   */
-  throw std::runtime_error("_compute_regs called from base class\n");
-}
-
-double
-wbx_base::_refclk_freq()
-{
-  return (double)(d_usrp->fpga_master_clock_freq())/_refclk_divisor();
-}
-
-int
-wbx_base::_refclk_divisor()
-{
-  /*
-   * Return value to stick in REFCLK_DIVISOR register
-   */
-  return 1;
-}
-
-struct freq_result_t
-wbx_base::set_freq(double freq)
-{
-  /*
-   * @returns (ok, actual_baseband_freq) where:
-   * ok is True or False and indicates success or failure,
-   * actual_baseband_freq is the RF frequency that corresponds to DC in the IF.
-   */
-  throw std::runtime_error("set_freq called from base class\n");
-}
-
-float
-wbx_base::gain_min()
-{
-  throw std::runtime_error("gain_min called from base class\n");
-}
-
-float
-wbx_base::gain_max()
-{
-  throw std::runtime_error("gain_max called from base class\n");
-}
-
-float
-wbx_base::gain_db_per_step()
-{
-  throw std::runtime_error("gain_db_per_step called from base class\n");
-}
-
-bool
-wbx_base::set_gain(float gain)
-{
-  /*
-   * Set the gain.
-   * 
-   * @param gain:  gain in decibels
-   * @returns True/False
-   */
-  throw std::runtime_error("set_gain called from base class\n");
-}
-
-bool
-wbx_base::_set_pga(float pga_gain)
-{
-  bool ok;
-  if(d_which == 0) {
-    ok  = d_usrp->set_pga(0, pga_gain);
-    ok |= d_usrp->set_pga(1, pga_gain);
-  }
-  else {
-    ok  = d_usrp->set_pga(2, pga_gain);
-    ok |= d_usrp->set_pga(3, pga_gain);
-  }
-  return ok;
-}
-
-bool
-wbx_base::is_quadrature()
-{
-  /*
-   * Return True if this board requires both I & Q analog channels.
-   * 
-   * This bit of info is useful when setting up the USRP Rx mux register.
-   */
-  return true;
-}
-
-
-/****************************************************************************/
-
-
-wbx_base_tx::wbx_base_tx(usrp_basic_sptr usrp, int which)
-  : wbx_base(usrp, which)
-{        
-  /*
-   * @param usrp: instance of usrp.sink_c
-   * @param which: 0 or 1 corresponding to side TX_A or TX_B respectively.
-   */
-  
-  // power up the transmit side, NO -- but set antenna to receive
-  d_usrp->write_io(d_which, (TX_POWER), (TX_POWER|RX_TXN));
-  d_lo_offset = 0e6;
-  
-  // Gain is not set by the PGA, but the PGA must be set at max gain in the TX
-  _set_pga(d_usrp->pga_max());
-}
-
-wbx_base_tx::~wbx_base_tx()
-{
-  // Power down and leave the T/R switch in the R position
-  d_usrp->write_io(d_which, (RX_TXN), (TX_POWER|RX_TXN|TX_ENB_MIX|TX_ENB_VGA));
-}
-
-void
-wbx_base_tx::set_auto_tr(bool on)
-{
-  if(on) {
-    set_atr_mask (RX_TXN);
-    set_atr_txval(0);
-    set_atr_rxval(RX_TXN);
-  }
-  else {
-    set_atr_mask (0);
-    set_atr_txval(0);
-    set_atr_rxval(0);
-  }
-}
-
-void
-wbx_base_tx::set_enable(bool on)
-{
-  /*
-   * Enable transmitter if on is True
-   */
-
-  int mask = RX_TXN|TX_ENB_MIX|TX_ENB_VGA;
-  //printf("HERE!!!!\n");
-  if(on) {
-    d_usrp->write_io(d_which, TX_ENB_MIX|TX_ENB_VGA, mask);
-  }
-  else {
-    d_usrp->write_io(d_which, RX_TXN, mask);
-  }
-}
-
-void
-wbx_base_tx::set_lo_offset(double offset)
-{
-  /*
-   * Set amount by which LO is offset from requested tuning frequency.
-   * 
-   * @param offset: offset in Hz
-   */
-  
-  d_lo_offset = offset;
-}
-
-double
-wbx_base_tx::lo_offset()
-{
-  /*
-   * Get amount by which LO is offset from requested tuning frequency.
-   * 
-   * @returns Offset in Hz
-   */
-
-  return d_lo_offset;
-}
-
-
-/****************************************************************************/
-
-
-wbx_base_rx::wbx_base_rx(usrp_basic_sptr usrp, int which)
-  : wbx_base(usrp, which)
-{
-  /*
-   * @param usrp: instance of usrp.source_c
-   * @param which: 0 or 1 corresponding to side RX_A or RX_B respectively.
-   */
-  
-  // set up for RX on TX/RX port
-  select_rx_antenna("TX/RX");
-  
-  bypass_adc_buffers(true);
-
-  d_lo_offset = 0.0;
-}
-
-wbx_base_rx::~wbx_base_rx()
-{
-  // Power down
-  d_usrp->write_io(d_which, 0, (RXENABLE));
-}
-  
-void
-wbx_base_rx::set_auto_tr(bool on)
-{
-  if(on) {
-    // FIXME: where does ENABLE come from?
-    //set_atr_mask (ENABLE);
-    set_atr_txval(     0);
-    //set_atr_rxval(ENABLE);
-  }
-  else {
-    set_atr_mask (0);
-    set_atr_txval(0);
-    set_atr_rxval(0);
-  }
-}
-
-void
-wbx_base_rx::select_rx_antenna(int which_antenna)
-{
-  /*
-   * Specify which antenna port to use for reception.
-   * @param which_antenna: either 'TX/RX' or 'RX2'
-   */
-  
-  if(which_antenna == 0) {
-    d_usrp->write_io(d_which, 0,        RX2_RX1N);
-  }
-  else if(which_antenna == 1) {
-    d_usrp->write_io(d_which, RX2_RX1N, RX2_RX1N);
-  }
-  else {
-    throw std::invalid_argument("which_antenna must be either 'TX/RX' or 'RX2'\n");
-  }
-}
-
-void
-wbx_base_rx::select_rx_antenna(const std::string &which_antenna)
-{
-  if(which_antenna == "TX/RX") {
-    select_rx_antenna(0);
-  }
-  else if(which_antenna == "RX2") {
-    select_rx_antenna(1);
-  }
-  else {
-    throw std::invalid_argument("which_antenna must be either 'TX/RX' or 'RX2'\n");
-  }
-}
-
-bool
-wbx_base_rx::set_gain(float gain)
-{
-  /*
-   * Set the gain.
-   * 
-   * @param gain:  gain in decibels
-   * @returns True/False
-   */
-  
-  float pga_gain, agc_gain;
-  float maxgain = gain_max() - d_usrp->pga_max();
-  float mingain = gain_min();
-  if(gain > maxgain) {
-    pga_gain = gain-maxgain;
-    assert(pga_gain <= d_usrp->pga_max());
-    agc_gain = maxgain;
-  }
-  else {
-    pga_gain = 0;
-    agc_gain = gain;
-  }
-   
-  float V_maxgain = .2;
-  float V_mingain = 1.2;
-  float V_fullscale = 3.3;
-  float dac_value = (agc_gain*(V_maxgain-V_mingain)/(maxgain-mingain) + V_mingain)*4096/V_fullscale;
-
-  assert(dac_value>=0 && dac_value<4096);
-
-  return d_usrp->write_aux_dac(d_which, 0, (int)(dac_value)) && _set_pga((int)(pga_gain));
-}
-
-void
-wbx_base_rx::set_lo_offset(double offset)
-{
-  /*
-   * Set amount by which LO is offset from requested tuning frequency.
-   * 
-   * @param offset: offset in Hz
-   */
-  d_lo_offset = offset;
-}
-
-double
-wbx_base_rx::lo_offset()
-{
-  /*
-   * Get amount by which LO is offset from requested tuning frequency.
-   * 
-   * @returns Offset in Hz
-   */
-  return d_lo_offset;
-}
-
-bool
-wbx_base_rx::i_and_q_swapped()
-{
-  /*
-   * Return True if this is a quadrature device and ADC 0 is Q.
-   */
-  return false;
-}
-
-
-/****************************************************************************/
-
-_ADF410X_common::_ADF410X_common()
-{
-  // R-Register Common Values
-  d_R_RSV = 0;    // bits 23,22,21
-  d_LDP = 1;      // bit 20     Lock detect in 5 cycles
-  d_TEST = 0;     // bit 19,18  Normal
-  d_ABP = 0;      // bit 17,16  2.9ns
-    
-  // N-Register Common Values
-  d_N_RSV = 0;    // 23,22
-  d_CP_GAIN = 0;  // 21
-    
-  // Function Register Common Values
-  d_P = 0;        // bits 23,22    0 = 8/9, 1 = 16/17, 2 = 32/33, 3 = 64/65
-  d_PD2 = 0;      // bit  21       Normal operation
-  d_CP2 = 4;      // bits 20,19,18 CP Gain = 5mA
-  d_CP1 = 4;      // bits 17,16,15 CP Gain = 5mA
-  d_TC = 0;       // bits 14-11    PFD Timeout
-  d_FL = 0;       // bit 10,9      Fastlock Disabled
-  d_CP3S = 0;     // bit 8         CP Enabled
-  d_PDP = 0;      // bit 7         Phase detector polarity, Positive=1
-  d_MUXOUT = 1;   // bits 6:4      Digital Lock Detect
-  d_PD1 = 0;      // bit 3         Normal operation
-  d_CR = 0;       // bit 2         Normal operation
-}
-
-_ADF410X_common::~_ADF410X_common()
-{
-}
-
-bool 
-_ADF410X_common::_compute_regs(double freq, int &retR, int &retcontrol, 
-			       int &retN, double &retfreq)
-{
-  /*
-   * Determine values of R, control, and N registers, along with actual freq.
-   * 
-   * @param freq: target frequency in Hz
-   * @type freq: double
-   * @returns: (R, N, control, actual_freq)
-   * @rtype: tuple(int, int, int, double)
-   */
-  
-  //  Band-specific N-Register Values
-  double phdet_freq = _refclk_freq()/d_R_DIV;
-  printf("phdet_freq = %f\n", phdet_freq);
-
-  double desired_n = round(freq*d_freq_mult/phdet_freq);
-  printf("desired_n %f\n", desired_n);
-
-  double actual_freq = desired_n * phdet_freq;
-  printf("actual freq %f\n", actual_freq);
-
-  double B = floor(desired_n/_prescaler());
-  double A = desired_n - _prescaler()*B;
-  printf("A %f B %f\n", A, B);
-
-  d_B_DIV = int(B);    // bits 20:8;
-  d_A_DIV = int(A);    // bit 6:2;
-
-  if(d_B_DIV < d_A_DIV) {
-    retR = 0;
-    retN = 0;
-    retcontrol = 0;
-    retfreq = 0;
-    return false;
-  }
-
-  retR = (d_R_RSV<<21) | (d_LDP<<20) | (d_TEST<<18) |
-    (d_ABP<<16) | (d_R_DIV<<2);
-        
-  retN = (d_N_RSV<<22) | (d_CP_GAIN<<21) | (d_B_DIV<<8) | (d_A_DIV<<2);
-
-  retcontrol = (d_P<<22) | (d_PD2<<21) | (d_CP2<<18) | (d_CP1<<15) | 
-    (d_TC<<11) | (d_FL<<9) | (d_CP3S<<8) | (d_PDP<<7) |
-    (d_MUXOUT<<4) | (d_PD1<<3) | (d_CR<<2);
-  
-  retfreq = actual_freq/d_freq_mult;
-  
-  return true;
-}
-
-void 
-_ADF410X_common::_write_all(int R, int N, int control)
-{
-  /*
-   * Write all PLL registers:
-   *   R counter latch,
-   *   N counter latch,
-   *   Function latch,
-   *   Initialization latch
-   * 
-   * Adds 10ms delay between writing control and N if this is first call.
-   * This is the required power-up sequence.
-   * 
-   * @param R: 24-bit R counter latch
-   * @type R: int
-   * @param N: 24-bit N counter latch
-   * @type N: int
-   * @param control: 24-bit control latch
-   * @type control: int
-   */
-  static bool first = true;
-
-  timespec t;
-  t.tv_sec = 0;
-  t.tv_nsec = 10000000;
-  
-  _write_R(R);
-  _write_func(control);
-  _write_init(control);
-  if(first) {
-    //time.sleep(0.010);
-    nanosleep(&t, NULL);
-    first = false;
-  }
-  _write_N(N);
-}
-
-void
-_ADF410X_common::_write_R(int R)
-{
-  _write_it((R & ~0x3) | 0);
-}
-
-void
-_ADF410X_common::_write_N(int N)
-{
-  _write_it((N & ~0x3) | 1);
-}
-
-void
-_ADF410X_common::_write_func(int func)
-{
-  _write_it((func & ~0x3) | 2);
-}
-
-void
-_ADF410X_common::_write_init(int init)
-{
-  _write_it((init & ~0x3) | 3);
-}
-
-void
-_ADF410X_common::_write_it(int v)
-{
-  char c[3];
-  c[0] = (char)((v >> 16) & 0xff);
-  c[1] = (char)((v >>  8) & 0xff);
-  c[2] = (char)((v & 0xff));
-  std::string s(c, 3);
-  //d_usrp->_write_spi(0, d_spi_enable, d_spi_format, s);
-  usrp()->_write_spi(0, d_spi_enable, d_spi_format, s);
-}
-
-int
-_ADF410X_common::_prescaler()
-{
-  if(d_P == 0) {
-    return 8;
-  }
-  else if(d_P == 1) {
-    return 16;
-  }
-  else if(d_P == 2) {
-    return 32;
-  }
-  else if(d_P == 3) {
-    return 64;
-  }
-  else {
-    throw std::invalid_argument("Prescaler out of range\n");
-  }
-}
-
-double
-_ADF410X_common::_refclk_freq()
-{
-  throw std::runtime_error("_refclk_freq called from base class.");
-}
-
-bool
-_ADF410X_common::_rx_write_io(int value, int mask)
-{
-  throw std::runtime_error("_rx_write_io called from base class.");
-}
-
-bool
-_ADF410X_common::_lock_detect()
-{
-  throw std::runtime_error("_lock_detect called from base class.");
-}
-
-usrp_basic* 
-_ADF410X_common::usrp()
-{
-  throw std::runtime_error("usrp() called from base class.");
-}
-
-
-/****************************************************************************/
-
-
-_lo_common::_lo_common()
-  : _ADF410X_common()
-{
-  // Band-specific R-Register Values
-  d_R_DIV = 4;    // bits 15:2
-  
-  // Band-specific C-Register values
-  d_P = 0;        // bits 23,22   0 = Div by 8/9
-  d_CP2 = 4;      // bits 19:17
-  d_CP1 = 4;      // bits 16:14
-  
-  // Band specifc N-Register Values
-  d_DIVSEL = 0;   // bit 23
-  d_DIV2 = 0;     // bit 22
-  d_CPGAIN = 0;   // bit 21
-  d_freq_mult = 1;
-  
-  d_div = 1;
-  d_aux_div = 2;
-  d_main_div = 0;
-}
-
-_lo_common::~_lo_common()
-{
-}
-
-double
-_lo_common::freq_min()
-{
-  return 50e6;
-}
-
-double
-_lo_common::freq_max()
-{
-  return 1000e6;
-}
-
-void
-_lo_common::set_divider(int main_or_aux, int divisor)
-{
-  if(main_or_aux == 0) {
-    if((divisor != 1) || (divisor != 2) || (divisor != 4) || (divisor != 8)) {
-      throw std::invalid_argument("Main Divider Must be 1, 2, 4, or 8\n");
-    }
-    d_main_div = (int)(log10(divisor)/log10(2.0));
-  }
-  else if(main_or_aux == 1) {
-    if((divisor != 2) || (divisor != 4) || (divisor != 8) || (divisor != 16)) {
-      throw std::invalid_argument("Aux Divider Must be 2, 4, 8 or 16\n");
-    }
-    d_main_div = (int)(log10(divisor/2.0)/log10(2.0));
-  }   
-  else {
-    throw std::invalid_argument("main_or_aux must be 'main' or 'aux'\n");
-  }
-  
-  int vala = d_main_div*SELA0;
-  int valb = d_aux_div*SELB0;
-  int mask = SELA0|SELA1|SELB0|SELB1;
-  
-  _rx_write_io((vala | valb), mask);
-}
-
-void
-_lo_common::set_divider(const std::string &main_or_aux, int divisor)
-{
-  if(main_or_aux == "main") {
-    set_divider(0, divisor);
-  }
-  else if(main_or_aux == "aux") {
-    set_divider(1, divisor);
-  }
-  else {
-    throw std::invalid_argument("main_or_aux must be 'main' or 'aux'\n");
-  }
-}
-
-struct freq_result_t
-_lo_common::set_freq(double freq)
-{
-  struct freq_result_t ret;
-  
-  if(freq < 20e6 or freq > 1200e6) {
-    throw std::invalid_argument("Requested frequency out of range\n");
-  }
-
-  int div = 1;
-  double lo_freq = freq * 2;
-  while((lo_freq < 1e9) && (div < 8)) {
-    div = div * 2;
-    lo_freq = lo_freq * 2;
-  }
-  
-  printf("For RF freq of %f, we set DIV=%d and LO Freq=%f\n", freq, div, lo_freq);
-
-  set_divider("main", div);
-  set_divider("aux", div*2);
-  
-  int R, N, control;
-  double actual_freq;
-  _compute_regs(lo_freq, R, N, control, actual_freq);
-  
-  printf("R %d N %d control %d actual freq %f\n", R, N, control, actual_freq);
-  if(R==0) {
-    ret.ok = false;
-    ret.baseband_freq = 0.0;
-    return ret;
-  }
-  _write_all(R, N, control);
-  
-  ret.ok = _lock_detect();
-  ret.baseband_freq = actual_freq/div/2;
-  return ret;
-}
-        
-
-/****************************************************************************/
-
-
-db_wbx_lo_tx::db_wbx_lo_tx(usrp_basic_sptr usrp, int which)
-  : _lo_common(),
-    wbx_base_tx(usrp, which)
-{
-}
-
-db_wbx_lo_tx::~db_wbx_lo_tx()
-{
-}
-
-float
-db_wbx_lo_tx::gain_min()
-{
-  return -56.0;
-}
-
-float
-db_wbx_lo_tx::gain_max()
-{
-  return 0.0;
-}
-
-float
-db_wbx_lo_tx::gain_db_per_step()
-{
-  return 0.1;
-}
-
-bool
-db_wbx_lo_tx::set_gain(float gain)
-{
-  /*
-   * Set the gain.
-   * 
-   * @param gain:  gain in decibels
-   * @returns True/False
-   */
-
-  float txvga_gain;
-  float maxgain = gain_max();
-  float mingain = gain_min();
-  if(gain > maxgain) {
-    txvga_gain = maxgain;
-  }
-  else if(gain < mingain) {
-    txvga_gain = mingain;
-  }
-  else {
-    txvga_gain = gain;
-  }
-
-  float V_maxgain = 1.4;
-  float V_mingain = 0.1;
-  float V_fullscale = 3.3;
-  float dac_value = ((txvga_gain-mingain)*(V_maxgain-V_mingain)/
-		     (maxgain-mingain) + V_mingain)*4096/V_fullscale;
-
-  assert(dac_value>=0 && dac_value<4096);
-  printf("DAC value %f\n", dac_value);
-
-  return d_usrp->write_aux_dac(d_which, 1, (int)(dac_value));
-}
-
-double
-db_wbx_lo_tx::_refclk_freq()
-{
-  return wbx_base::_refclk_freq();
-}
-
-bool
-db_wbx_lo_tx::_rx_write_io(int value, int mask)
-{
-  return wbx_base::_rx_write_io(value, mask);
-}
-
-bool
-db_wbx_lo_tx::_lock_detect()
-{
-  return wbx_base::_lock_detect();
-}
-
-usrp_basic* 
-db_wbx_lo_tx::usrp()
-{
-  return d_usrp;
-}
-
-
-/****************************************************************************/
-
-
-db_wbx_lo_rx::db_wbx_lo_rx(usrp_basic_sptr usrp, int which)
-  : _lo_common(),
-    wbx_base_rx(usrp, which)    
-{
-}
-
-db_wbx_lo_rx::~db_wbx_lo_rx()
-{
-}
-
-float
-db_wbx_lo_rx::gain_min()
-{
-  return d_usrp->pga_min();
-}
-
-float
-db_wbx_lo_rx::gain_max()
-{
-  return d_usrp->pga_max() + 45;
-}
-
-float
-db_wbx_lo_rx::gain_db_per_step()
-{
-  return 0.05;
-}
-
-double
-db_wbx_lo_rx::_refclk_freq()
-{
-  return wbx_base::_refclk_freq();
-}
-
-bool
-db_wbx_lo_rx::_rx_write_io(int value, int mask)
-{
-  return wbx_base::_rx_write_io(value, mask);
-}
-
-bool
-db_wbx_lo_rx::_lock_detect()
-{
-  return wbx_base::_lock_detect();
-}
-
-usrp_basic* 
-db_wbx_lo_rx::usrp()
-{
-  return d_usrp;
-}
diff --git a/usrp/host/lib/limbo/db_wbx.h b/usrp/host/lib/limbo/db_wbx.h
deleted file mode 100644
index 3202d368c..000000000
--- a/usrp/host/lib/limbo/db_wbx.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- c++ -*- */
-//
-// Copyright 2008 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 asversion 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 DB_WBX_H
-#define DB_WBX_H
-
-#include <db_base.h>
-#include <boost/shared_ptr.hpp>
-
-
-/*
-  A few comments about the WBX boards:
-  They are half-duplex.  I.e., transmit and receive are mutually exclusive.
-  There is a single LO for both the Tx and Rx sides.
-  The the shared control signals are hung off of the Rx side.
-  The shared io controls are duplexed onto the Rx side pins.
-  The wbx_high d'board always needs to be in 'auto_tr_mode'
-*/
-
-
-class wbx_base : public db_base
-{
-protected:
-  void shutdown();
-
-  /*
-   * Abstract base class for all wbx boards.
-   * 
-   * Derive board specific subclasses from db_wbx_base_{tx,rx}
-   */
-
-public:
-  wbx_base(usrp_basic_sptr usrp, int which);
-  ~wbx_base();
-  
-  struct freq_result_t set_freq(double freq);
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool set_gain(float gain);  
-  bool is_quadrature();
-
-
-protected:
-  virtual bool _lock_detect();
-
-  // FIXME: After testing, replace these with usrp_basic::common_write_io/oe
-  bool _tx_write_oe(int value, int mask);
-  bool _rx_write_oe(int value, int mask);
-  bool _tx_write_io(int value, int mask);
-  bool _rx_write_io(int value, int mask);
-  virtual bool _rx_read_io();
-  bool _tx_read_io();
-  bool  _compute_regs(double freq);
-  virtual double _refclk_freq();
-  int _refclk_divisor();
-
-  bool _set_pga(float pga_gain);
-
-  bool d_first;
-  int d_spi_format;
-  int d_spi_enable;
-  double d_lo_offset;
-};
-
-
-/****************************************************************************/
-
-
-class wbx_base_tx : public wbx_base
-{
-public:
-  wbx_base_tx(usrp_basic_sptr usrp, int which);
-  ~wbx_base_tx();
-
-  bool set_auto_tr(bool on);
-  bool set_enable(bool on);
-};
-
-
-/****************************************************************************/
-
-
-class wbx_base_rx : public wbx_base
-{
-public:
-  wbx_base_rx(usrp_basic_sptr usrp, int which);
-  ~wbx_base_rx();
-  
-  bool set_auto_tr(bool on);
-  bool select_rx_antenna(int which_antenna);
-  bool select_rx_antenna(const std::string &which_antenna);
-  bool set_gain(float gain);
-  bool i_and_q_swapped();
-};
-
-
-/****************************************************************************/
-
-
-class _ADF410X_common
-{
-public:
-  _ADF410X_common();
-  virtual ~_ADF410X_common();
-  
-  bool _compute_regs(double freq, int &retR, int &retcontrol,
-		     int &retN, double &retfreq);
-  void _write_all(int R, int N, int control);
-  void _write_R(int R);
-  void _write_N(int N);
-  void _write_func(int func);
-  void _write_init(int init);
-  int  _prescaler();
-  virtual void _write_it(int v);
-  virtual double _refclk_freq();
-  virtual bool _rx_write_io(int value, int mask);
-  virtual bool _lock_detect();
-
-protected:
-  virtual usrp_basic* usrp();
-
-  int d_R_RSV, d_LDP, d_TEST, d_ABP;
-  int d_N_RSV, d_CP_GAIN;
-  int d_P, d_PD2, d_CP2, d_CP1, d_TC, d_FL;
-  int d_CP3S, d_PDP, d_MUXOUT, d_PD1, d_CR;
-  int d_R_DIV, d_A_DIV, d_B_DIV;
-  int d_freq_mult;
-
-  int d_spi_format;
-  int d_spi_enable;
-};
-
-
-/****************************************************************************/
-
-
-class _lo_common : public _ADF410X_common
-{
-public:
-  _lo_common();
-  ~_lo_common();
-
-  double freq_min();
-  double freq_max();
-  
-  void set_divider(int main_or_aux, int divisor);
-  void set_divider(const std::string &main_or_aux, int divisor);
-
-  struct freq_result_t set_freq(double freq);
-
-protected:
-  int d_R_DIV, d_P, d_CP2, d_CP1;
-  int d_DIVSEL, d_DIV2, d_CPGAIN;
-  int d_div, d_aux_div, d_main_div;
-};
-        
-
-/****************************************************************************/
-
-
-class db_wbx_lo_tx : public _lo_common, public wbx_base_tx
-{
-public:
-  db_wbx_lo_tx(usrp_basic_sptr usrp, int which);
-  ~db_wbx_lo_tx();
-
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-  bool  set_gain(float gain);
-
-  double _refclk_freq();
-  bool _rx_write_io(int value, int mask);
-  bool _lock_detect();
-
-protected:
-  usrp_basic* usrp();
-};
-        
-
-/****************************************************************************/
-
-
-class db_wbx_lo_rx : public _lo_common, public  wbx_base_rx
-{
-public:
-  db_wbx_lo_rx(usrp_basic_sptr usrp, int which);
-  ~db_wbx_lo_rx();
-
-  float gain_min();
-  float gain_max();
-  float gain_db_per_step();
-
-  double _refclk_freq();
-  bool _rx_write_io(int value, int mask);
-  bool _lock_detect();
-
-protected:
-  usrp_basic* usrp();
-};
-
-#endif
diff --git a/usrp/host/lib/md5.c b/usrp/host/lib/md5.c
deleted file mode 100644
index b15ab390f..000000000
--- a/usrp/host/lib/md5.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/* md5.c - Functions to compute MD5 message digest of files or memory blocks
-   according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995, 1996, 2001, 2003 Free Software Foundation, Inc.
-   NOTE: The canonical source of this file is maintained with the GNU C
-   Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.  */
-
-/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "md5.h"
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-// #include "unlocked-io.h"
-
-#ifdef _LIBC
-# include <endian.h>
-# if __BYTE_ORDER == __BIG_ENDIAN
-#  define WORDS_BIGENDIAN 1
-# endif
-/* We need to keep the namespace clean so define the MD5 function
-   protected using leading __ .  */
-# define md5_init_ctx __md5_init_ctx
-# define md5_process_block __md5_process_block
-# define md5_process_bytes __md5_process_bytes
-# define md5_finish_ctx __md5_finish_ctx
-# define md5_read_ctx __md5_read_ctx
-# define md5_stream __md5_stream
-# define md5_buffer __md5_buffer
-#endif
-
-#ifdef WORDS_BIGENDIAN
-# define SWAP(n)							\
-    (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
-#else
-# define SWAP(n) (n)
-#endif
-
-#define BLOCKSIZE 4096
-/* Ensure that BLOCKSIZE is a multiple of 64.  */
-#if BLOCKSIZE % 64 != 0
-/* FIXME-someday (soon?): use #error instead of this kludge.  */
-"invalid BLOCKSIZE"
-#endif
-
-/* This array contains the bytes used to pad the buffer to the next
-   64-byte boundary.  (RFC 1321, 3.1: Step 1)  */
-static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
-
-
-/* Initialize structure containing state of computation.
-   (RFC 1321, 3.3: Step 3)  */
-void
-md5_init_ctx (struct md5_ctx *ctx)
-{
-  ctx->A = 0x67452301;
-  ctx->B = 0xefcdab89;
-  ctx->C = 0x98badcfe;
-  ctx->D = 0x10325476;
-
-  ctx->total[0] = ctx->total[1] = 0;
-  ctx->buflen = 0;
-}
-
-/* Put result from CTX in first 16 bytes following RESBUF.  The result
-   must be in little endian byte order.
-
-   IMPORTANT: On some systems it is required that RESBUF is correctly
-   aligned for a 32 bits value.  */
-void *
-md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
-{
-  ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A);
-  ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B);
-  ((md5_uint32 *) resbuf)[2] = SWAP (ctx->C);
-  ((md5_uint32 *) resbuf)[3] = SWAP (ctx->D);
-
-  return resbuf;
-}
-
-/* Process the remaining bytes in the internal buffer and the usual
-   prolog according to the standard and write the result to RESBUF.
-
-   IMPORTANT: On some systems it is required that RESBUF is correctly
-   aligned for a 32 bits value.  */
-void *
-md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
-{
-  /* Take yet unprocessed bytes into account.  */
-  md5_uint32 bytes = ctx->buflen;
-  size_t pad;
-
-  /* Now count remaining bytes.  */
-  ctx->total[0] += bytes;
-  if (ctx->total[0] < bytes)
-    ++ctx->total[1];
-
-  pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
-  memcpy (&ctx->buffer[bytes], fillbuf, pad);
-
-  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
-  *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
-  *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
-							(ctx->total[0] >> 29));
-
-  /* Process last bytes.  */
-  md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
-
-  return md5_read_ctx (ctx, resbuf);
-}
-
-/* Compute MD5 message digest for bytes read from STREAM.  The
-   resulting message digest number will be written into the 16 bytes
-   beginning at RESBLOCK.  */
-int
-md5_stream (FILE *stream, void *resblock)
-{
-  struct md5_ctx ctx;
-  char buffer[BLOCKSIZE + 72];
-  size_t sum;
-
-  /* Initialize the computation context.  */
-  md5_init_ctx (&ctx);
-
-  /* Iterate over full file contents.  */
-  while (1)
-    {
-      /* We read the file in blocks of BLOCKSIZE bytes.  One call of the
-	 computation function processes the whole buffer so that with the
-	 next round of the loop another block can be read.  */
-      size_t n;
-      sum = 0;
-
-      /* Read block.  Take care for partial reads.  */
-      while (1)
-	{
-	  n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
-
-	  sum += n;
-
-	  if (sum == BLOCKSIZE)
-	    break;
-
-	  if (n == 0)
-	    {
-	      /* Check for the error flag IFF N == 0, so that we don't
-		 exit the loop after a partial read due to e.g., EAGAIN
-		 or EWOULDBLOCK.  */
-	      if (ferror (stream))
-		return 1;
-	      goto process_partial_block;
-	    }
-
-	  /* We've read at least one byte, so ignore errors.  But always
-	     check for EOF, since feof may be true even though N > 0.
-	     Otherwise, we could end up calling fread after EOF.  */
-	  if (feof (stream))
-	    goto process_partial_block;
-	}
-
-      /* Process buffer with BLOCKSIZE bytes.  Note that
-			BLOCKSIZE % 64 == 0
-       */
-      md5_process_block (buffer, BLOCKSIZE, &ctx);
-    }
-
- process_partial_block:;
-
-  /* Process any remaining bytes.  */
-  if (sum > 0)
-    md5_process_bytes (buffer, sum, &ctx);
-
-  /* Construct result in desired memory.  */
-  md5_finish_ctx (&ctx, resblock);
-  return 0;
-}
-
-/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
-   result is always in little endian byte order, so that a byte-wise
-   output yields to the wanted ASCII representation of the message
-   digest.  */
-void *
-md5_buffer (const char *buffer, size_t len, void *resblock)
-{
-  struct md5_ctx ctx;
-
-  /* Initialize the computation context.  */
-  md5_init_ctx (&ctx);
-
-  /* Process whole buffer but last len % 64 bytes.  */
-  md5_process_bytes (buffer, len, &ctx);
-
-  /* Put result in desired memory area.  */
-  return md5_finish_ctx (&ctx, resblock);
-}
-
-
-void
-md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
-{
-  /* When we already have some bits in our internal buffer concatenate
-     both inputs first.  */
-  if (ctx->buflen != 0)
-    {
-      size_t left_over = ctx->buflen;
-      size_t add = 128 - left_over > len ? len : 128 - left_over;
-
-      memcpy (&ctx->buffer[left_over], buffer, add);
-      ctx->buflen += add;
-
-      if (ctx->buflen > 64)
-	{
-	  md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
-
-	  ctx->buflen &= 63;
-	  /* The regions in the following copy operation cannot overlap.  */
-	  memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
-		  ctx->buflen);
-	}
-
-      buffer = (const char *) buffer + add;
-      len -= add;
-    }
-
-  /* Process available complete blocks.  */
-  if (len >= 64)
-    {
-#if !_STRING_ARCH_unaligned
-/* To check alignment gcc has an appropriate operator.  Other
-   compilers don't.  */
-# if __GNUC__ >= 2
-#  define UNALIGNED_P(p) (((md5_uintptr) p) % __alignof__ (md5_uint32) != 0)
-# else
-#  define UNALIGNED_P(p) (((md5_uintptr) p) % sizeof (md5_uint32) != 0)
-# endif
-      if (UNALIGNED_P (buffer))
-	while (len > 64)
-	  {
-	    md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
-	    buffer = (const char *) buffer + 64;
-	    len -= 64;
-	  }
-      else
-#endif
-	{
-	  md5_process_block (buffer, len & ~63, ctx);
-	  buffer = (const char *) buffer + (len & ~63);
-	  len &= 63;
-	}
-    }
-
-  /* Move remaining bytes in internal buffer.  */
-  if (len > 0)
-    {
-      size_t left_over = ctx->buflen;
-
-      memcpy (&ctx->buffer[left_over], buffer, len);
-      left_over += len;
-      if (left_over >= 64)
-	{
-	  md5_process_block (ctx->buffer, 64, ctx);
-	  left_over -= 64;
-	  memcpy (ctx->buffer, &ctx->buffer[64], left_over);
-	}
-      ctx->buflen = left_over;
-    }
-}
-
-
-/* These are the four functions used in the four steps of the MD5 algorithm
-   and defined in the RFC 1321.  The first function is a little bit optimized
-   (as found in Colin Plumbs public domain implementation).  */
-/* #define FF(b, c, d) ((b & c) | (~b & d)) */
-#define FF(b, c, d) (d ^ (b & (c ^ d)))
-#define FG(b, c, d) FF (d, b, c)
-#define FH(b, c, d) (b ^ c ^ d)
-#define FI(b, c, d) (c ^ (b | ~d))
-
-/* Process LEN bytes of BUFFER, accumulating context into CTX.
-   It is assumed that LEN % 64 == 0.  */
-
-void
-md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
-{
-  md5_uint32 correct_words[16];
-  const md5_uint32 *words = buffer;
-  size_t nwords = len / sizeof (md5_uint32);
-  const md5_uint32 *endp = words + nwords;
-  md5_uint32 A = ctx->A;
-  md5_uint32 B = ctx->B;
-  md5_uint32 C = ctx->C;
-  md5_uint32 D = ctx->D;
-
-  /* First increment the byte count.  RFC 1321 specifies the possible
-     length of the file up to 2^64 bits.  Here we only compute the
-     number of bytes.  Do a double word increment.  */
-  ctx->total[0] += len;
-  if (ctx->total[0] < len)
-    ++ctx->total[1];
-
-  /* Process all bytes in the buffer with 64 bytes in each round of
-     the loop.  */
-  while (words < endp)
-    {
-      md5_uint32 *cwp = correct_words;
-      md5_uint32 A_save = A;
-      md5_uint32 B_save = B;
-      md5_uint32 C_save = C;
-      md5_uint32 D_save = D;
-
-      /* First round: using the given function, the context and a constant
-	 the next context is computed.  Because the algorithms processing
-	 unit is a 32-bit word and it is determined to work on words in
-	 little endian byte order we perhaps have to change the byte order
-	 before the computation.  To reduce the work for the next steps
-	 we store the swapped words in the array CORRECT_WORDS.  */
-
-#define OP(a, b, c, d, s, T)						\
-      do								\
-        {								\
-	  a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T;		\
-	  ++words;							\
-	  a = rol (a, s);						\
-	  a += b;							\
-        }								\
-      while (0)
-
-      /* Before we start, one word to the strange constants.
-	 They are defined in RFC 1321 as
-
-	 T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64, or
-	 perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin $_))}'
-       */
-
-      /* Round 1.  */
-      OP (A, B, C, D,  7, 0xd76aa478);
-      OP (D, A, B, C, 12, 0xe8c7b756);
-      OP (C, D, A, B, 17, 0x242070db);
-      OP (B, C, D, A, 22, 0xc1bdceee);
-      OP (A, B, C, D,  7, 0xf57c0faf);
-      OP (D, A, B, C, 12, 0x4787c62a);
-      OP (C, D, A, B, 17, 0xa8304613);
-      OP (B, C, D, A, 22, 0xfd469501);
-      OP (A, B, C, D,  7, 0x698098d8);
-      OP (D, A, B, C, 12, 0x8b44f7af);
-      OP (C, D, A, B, 17, 0xffff5bb1);
-      OP (B, C, D, A, 22, 0x895cd7be);
-      OP (A, B, C, D,  7, 0x6b901122);
-      OP (D, A, B, C, 12, 0xfd987193);
-      OP (C, D, A, B, 17, 0xa679438e);
-      OP (B, C, D, A, 22, 0x49b40821);
-
-      /* For the second to fourth round we have the possibly swapped words
-	 in CORRECT_WORDS.  Redefine the macro to take an additional first
-	 argument specifying the function to use.  */
-#undef OP
-#define OP(f, a, b, c, d, k, s, T)					\
-      do								\
-	{								\
-	  a += f (b, c, d) + correct_words[k] + T;			\
-	  a = rol (a, s);						\
-	  a += b;							\
-	}								\
-      while (0)
-
-      /* Round 2.  */
-      OP (FG, A, B, C, D,  1,  5, 0xf61e2562);
-      OP (FG, D, A, B, C,  6,  9, 0xc040b340);
-      OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
-      OP (FG, B, C, D, A,  0, 20, 0xe9b6c7aa);
-      OP (FG, A, B, C, D,  5,  5, 0xd62f105d);
-      OP (FG, D, A, B, C, 10,  9, 0x02441453);
-      OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
-      OP (FG, B, C, D, A,  4, 20, 0xe7d3fbc8);
-      OP (FG, A, B, C, D,  9,  5, 0x21e1cde6);
-      OP (FG, D, A, B, C, 14,  9, 0xc33707d6);
-      OP (FG, C, D, A, B,  3, 14, 0xf4d50d87);
-      OP (FG, B, C, D, A,  8, 20, 0x455a14ed);
-      OP (FG, A, B, C, D, 13,  5, 0xa9e3e905);
-      OP (FG, D, A, B, C,  2,  9, 0xfcefa3f8);
-      OP (FG, C, D, A, B,  7, 14, 0x676f02d9);
-      OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
-
-      /* Round 3.  */
-      OP (FH, A, B, C, D,  5,  4, 0xfffa3942);
-      OP (FH, D, A, B, C,  8, 11, 0x8771f681);
-      OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
-      OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
-      OP (FH, A, B, C, D,  1,  4, 0xa4beea44);
-      OP (FH, D, A, B, C,  4, 11, 0x4bdecfa9);
-      OP (FH, C, D, A, B,  7, 16, 0xf6bb4b60);
-      OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
-      OP (FH, A, B, C, D, 13,  4, 0x289b7ec6);
-      OP (FH, D, A, B, C,  0, 11, 0xeaa127fa);
-      OP (FH, C, D, A, B,  3, 16, 0xd4ef3085);
-      OP (FH, B, C, D, A,  6, 23, 0x04881d05);
-      OP (FH, A, B, C, D,  9,  4, 0xd9d4d039);
-      OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
-      OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
-      OP (FH, B, C, D, A,  2, 23, 0xc4ac5665);
-
-      /* Round 4.  */
-      OP (FI, A, B, C, D,  0,  6, 0xf4292244);
-      OP (FI, D, A, B, C,  7, 10, 0x432aff97);
-      OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
-      OP (FI, B, C, D, A,  5, 21, 0xfc93a039);
-      OP (FI, A, B, C, D, 12,  6, 0x655b59c3);
-      OP (FI, D, A, B, C,  3, 10, 0x8f0ccc92);
-      OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
-      OP (FI, B, C, D, A,  1, 21, 0x85845dd1);
-      OP (FI, A, B, C, D,  8,  6, 0x6fa87e4f);
-      OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
-      OP (FI, C, D, A, B,  6, 15, 0xa3014314);
-      OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
-      OP (FI, A, B, C, D,  4,  6, 0xf7537e82);
-      OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
-      OP (FI, C, D, A, B,  2, 15, 0x2ad7d2bb);
-      OP (FI, B, C, D, A,  9, 21, 0xeb86d391);
-
-      /* Add the starting values of the context.  */
-      A += A_save;
-      B += B_save;
-      C += C_save;
-      D += D_save;
-    }
-
-  /* Put checksum in context given as argument.  */
-  ctx->A = A;
-  ctx->B = B;
-  ctx->C = C;
-  ctx->D = D;
-}
diff --git a/usrp/host/lib/md5.h b/usrp/host/lib/md5.h
deleted file mode 100644
index 4a4e790c1..000000000
--- a/usrp/host/lib/md5.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* md5.h - Declaration of functions and data types used for MD5 sum
-   computing library functions.
-   Copyright (C) 1995, 1996, 1999, 2000, 2003 Free Software Foundation, Inc.
-   NOTE: The canonical source of this file is maintained with the GNU C
-   Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.  */
-
-#ifndef _MD5_H
-#define _MD5_H 1
-
-#include <stdio.h>
-#include <limits.h>
-
-/* The following contortions are an attempt to use the C preprocessor
-   to determine an unsigned integral type that is 32 bits wide.  An
-   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   doing that would require that the configure script compile and *run*
-   the resulting executable.  Locally running cross-compiled executables
-   is usually not possible.  */
-
-#ifdef _LIBC
-# include <stdint.h>
-typedef uint32_t md5_uint32;
-typedef uintptr_t md5_uintptr;
-#else
-# define UINT_MAX_32_BITS 4294967295U
-
-# if UINT_MAX == UINT_MAX_32_BITS
-   typedef unsigned int md5_uint32;
-# else
-#  if USHRT_MAX == UINT_MAX_32_BITS
-    typedef unsigned short md5_uint32;
-#  else
-#   if ULONG_MAX == UINT_MAX_32_BITS
-     typedef unsigned long md5_uint32;
-#   else
-     /* The following line is intended to evoke an error.
-        Using #error is not portable enough.  */
-     "Cannot determine unsigned 32-bit data type."
-#   endif
-#  endif
-# endif
-/* We have to make a guess about the integer type equivalent in size
-   to pointers which should always be correct.  */
-typedef unsigned long int md5_uintptr;
-#endif
-
-/* Structure to save state of computation between the single steps.  */
-struct md5_ctx
-{
-  md5_uint32 A;
-  md5_uint32 B;
-  md5_uint32 C;
-  md5_uint32 D;
-
-  md5_uint32 total[2];
-  md5_uint32 buflen;
-  char buffer[128];
-};
-
-/*
- * The following three functions are build up the low level used in
- * the functions `md5_stream' and `md5_buffer'.
- */
-
-/* Initialize structure containing state of computation.
-   (RFC 1321, 3.3: Step 3)  */
-extern void md5_init_ctx (struct md5_ctx *ctx);
-
-/* Starting with the result of former calls of this function (or the
-   initialization function update the context for the next LEN bytes
-   starting at BUFFER.
-   It is necessary that LEN is a multiple of 64!!! */
-extern void md5_process_block (const void *buffer, size_t len,
-			       struct md5_ctx *ctx);
-
-/* Starting with the result of former calls of this function (or the
-   initialization function update the context for the next LEN bytes
-   starting at BUFFER.
-   It is NOT required that LEN is a multiple of 64.  */
-extern void md5_process_bytes (const void *buffer, size_t len,
-			       struct md5_ctx *ctx);
-
-/* Process the remaining bytes in the buffer and put result from CTX
-   in first 16 bytes following RESBUF.  The result is always in little
-   endian byte order, so that a byte-wise output yields to the wanted
-   ASCII representation of the message digest.
-
-   IMPORTANT: On some systems it is required that RESBUF be correctly
-   aligned for a 32 bits value.  */
-extern void *md5_finish_ctx (struct md5_ctx *ctx, void *resbuf);
-
-
-/* Put result from CTX in first 16 bytes following RESBUF.  The result is
-   always in little endian byte order, so that a byte-wise output yields
-   to the wanted ASCII representation of the message digest.
-
-   IMPORTANT: On some systems it is required that RESBUF is correctly
-   aligned for a 32 bits value.  */
-extern void *md5_read_ctx (const struct md5_ctx *ctx, void *resbuf);
-
-
-/* Compute MD5 message digest for bytes read from STREAM.  The
-   resulting message digest number will be written into the 16 bytes
-   beginning at RESBLOCK.  */
-extern int md5_stream (FILE *stream, void *resblock);
-
-/* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
-   result is always in little endian byte order, so that a byte-wise
-   output yields to the wanted ASCII representation of the message
-   digest.  */
-extern void *md5_buffer (const char *buffer, size_t len, void *resblock);
-
-#define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
-
-#endif
diff --git a/usrp/host/lib/rate_to_regval.h b/usrp/host/lib/rate_to_regval.h
deleted file mode 100644
index 1ffdc0f69..000000000
--- a/usrp/host/lib/rate_to_regval.h
+++ /dev/null
@@ -1,97 +0,0 @@
-  {   1, 0x00 },
-  {   2, 0x01 },
-  {   3, 0x02 },
-  {   4, 0x11 },
-  {   5, 0x04 },
-  {   6, 0x05 },
-  {   7, 0x06 },
-  {   8, 0x13 },
-  {   9, 0x08 },
-  {  10, 0x09 },
-  {  11, 0x0a },
-  {  12, 0x15 },
-  {  13, 0x0c },
-  {  14, 0x0d },
-  {  15, 0x0e },
-  {  16, 0x33 },
-  {  18, 0x18 },
-  {  20, 0x19 },
-  {  21, 0x26 },
-  {  22, 0x1a },
-  {  24, 0x35 },
-  {  25, 0x44 },
-  {  26, 0x1c },
-  {  27, 0x28 },
-  {  28, 0x1d },
-  {  30, 0x1e },
-  {  32, 0x37 },
-  {  33, 0x2a },
-  {  35, 0x46 },
-  {  36, 0x55 },
-  {  39, 0x2c },
-  {  40, 0x39 },
-  {  42, 0x56 },
-  {  44, 0x3a },
-  {  45, 0x2e },
-  {  48, 0x57 },
-  {  49, 0x66 },
-  {  50, 0x49 },
-  {  52, 0x3c },
-  {  54, 0x58 },
-  {  55, 0x4a },
-  {  56, 0x3d },
-  {  60, 0x59 },
-  {  63, 0x68 },
-  {  64, 0x77 },
-  {  65, 0x4c },
-  {  66, 0x5a },
-  {  70, 0x69 },
-  {  72, 0x5b },
-  {  75, 0x4e },
-  {  77, 0x6a },
-  {  78, 0x5c },
-  {  80, 0x79 },
-  {  81, 0x88 },
-  {  84, 0x5d },
-  {  88, 0x7a },
-  {  90, 0x5e },
-  {  91, 0x6c },
-  {  96, 0x7b },
-  {  98, 0x6d },
-  {  99, 0x8a },
-  { 100, 0x99 },
-  { 104, 0x7c },
-  { 105, 0x6e },
-  { 108, 0x8b },
-  { 110, 0x9a },
-  { 112, 0x7d },
-  { 117, 0x8c },
-  { 120, 0x9b },
-  { 121, 0xaa },
-  { 126, 0x8d },
-  { 128, 0x7f },
-  { 130, 0x9c },
-  { 132, 0xab },
-  { 135, 0x8e },
-  { 140, 0x9d },
-  { 143, 0xac },
-  { 144, 0xbb },
-  { 150, 0x9e },
-  { 154, 0xad },
-  { 156, 0xbc },
-  { 160, 0x9f },
-  { 165, 0xae },
-  { 168, 0xbd },
-  { 169, 0xcc },
-  { 176, 0xaf },
-  { 180, 0xbe },
-  { 182, 0xcd },
-  { 192, 0xbf },
-  { 195, 0xce },
-  { 196, 0xdd },
-  { 208, 0xcf },
-  { 210, 0xde },
-  { 224, 0xdf },
-  { 225, 0xee },
-  { 240, 0xef },
-  { 256, 0xff }
diff --git a/usrp/host/lib/usrp_basic.cc b/usrp/host/lib/usrp_basic.cc
deleted file mode 100644
index 5b2f7ff71..000000000
--- a/usrp/host/lib/usrp_basic.cc
+++ /dev/null
@@ -1,1538 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2004,2008,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "usrp/usrp_basic.h"
-#include "usrp/usrp_prims.h"
-#include "usrp_interfaces.h"
-#include "fpga_regs_common.h"
-#include "fpga_regs_standard.h"
-#include "fusb.h"
-#include "db_boards.h"
-#include <stdexcept>
-#include <assert.h>
-#include <math.h>
-#include <ad9862.h>
-#include <string.h>
-#include <cstdio>
-
-using namespace ad9862;
-
-#define NELEM(x) (sizeof (x) / sizeof (x[0]))
-
-// These set the buffer size used for each end point using the fast
-// usb interface.  The kernel ends up locking down this much memory.
-
-static const int FUSB_BUFFER_SIZE = fusb_sysconfig::default_buffer_size();
-static const int FUSB_BLOCK_SIZE = fusb_sysconfig::max_block_size();
-static const int FUSB_NBLOCKS    = FUSB_BUFFER_SIZE / FUSB_BLOCK_SIZE;
-
-
-static const double POLLING_INTERVAL = 0.1;	// seconds
-
-////////////////////////////////////////////////////////////////
-
-static libusb_device_handle *
-open_rx_interface (libusb_device *dev)
-{
-  libusb_device_handle *udh = usrp_open_rx_interface (dev);
-  if (udh == 0){
-    fprintf (stderr, "usrp_basic_rx: can't open rx interface\n");
-  }
-  return udh;
-}
-
-static libusb_device_handle *
-open_tx_interface (libusb_device *dev)
-{
-  libusb_device_handle *udh = usrp_open_tx_interface (dev);
-  if (udh == 0){
-    fprintf (stderr, "usrp_basic_tx: can't open tx interface\n");
-  }
-  return udh;
-}
-
-//////////////////////////////////////////////////////////////////
-//
-//			usrp_basic
-//
-////////////////////////////////////////////////////////////////
-
-// Given:
-//   CLKIN = 64 MHz
-//   CLKSEL pin = high
-//
-// These settings give us:
-//   CLKOUT1 = CLKIN = 64 MHz
-//   CLKOUT2 = CLKIN = 64 MHz
-//   ADC is clocked at  64 MHz
-//   DAC is clocked at 128 MHz
-
-static unsigned char common_regs[] = {
-  REG_GENERAL,		0,
-  REG_DLL,		(DLL_DISABLE_INTERNAL_XTAL_OSC
-			 | DLL_MULT_2X
-			 | DLL_FAST),
-  REG_CLKOUT,		CLKOUT2_EQ_DLL_OVER_2,
-  REG_AUX_ADC_CLK,	AUX_ADC_CLK_CLK_OVER_4
-};
-
-usrp_basic::usrp_basic (int which_board,
-			libusb_device_handle *
-			open_interface (libusb_device *dev),
-			const std::string fpga_filename,
-			const std::string firmware_filename)
-  : d_udh (0), d_ctx (0),
-    d_usb_data_rate (16000000),	// SWAG, see below
-    d_bytes_per_poll ((int) (POLLING_INTERVAL * d_usb_data_rate)),
-    d_verbose (false), d_fpga_master_clock_freq(64000000), d_db(2)
-{
-  /*
-   * SWAG: Scientific Wild Ass Guess.
-   *
-   * d_usb_data_rate is used only to determine how often to poll for over- and
-   * under-runs. We defualt it to 1/2  of our best case.  Classes derived from
-   * usrp_basic (e.g., usrp_standard_tx and usrp_standard_rx) call
-   * set_usb_data_rate() to tell us the actual rate. This doesn't change our
-   * throughput, that's determined by the signal processing code in the FPGA
-   * (which we know nothing about), and the system limits determined by libusb,
-   * fusb_*, and the underlying drivers.
-   */
-  memset (d_fpga_shadows, 0, sizeof (d_fpga_shadows));
-
-  usrp_one_time_init (&d_ctx);
-
-  if (!usrp_load_standard_bits (which_board, false, fpga_filename,
-                                firmware_filename, d_ctx))
-    throw std::runtime_error ("usrp_basic/usrp_load_standard_bits");
-
-  libusb_device *dev = usrp_find_device (which_board, false, d_ctx);
-  if (dev == 0){
-    fprintf (stderr, "usrp_basic: can't find usrp[%d]\n", which_board);
-    throw std::runtime_error ("usrp_basic/usrp_find_device");
-  }
-
-  if (!(usrp_usrp_p(dev) && usrp_hw_rev(dev) >= 1)){
-    fprintf (stderr, "usrp_basic: sorry, this code only works with USRP revs >= 1\n");
-    throw std::runtime_error ("usrp_basic/bad_rev");
-  }
-
-  if ((d_udh = open_interface (dev)) == 0)
-    throw std::runtime_error ("usrp_basic/open_interface");
-
-  // initialize registers that are common to rx and tx
-
-  if (!usrp_9862_write_many_all (d_udh, common_regs, sizeof (common_regs))) {
-    fprintf (stderr, "usrp_basic: failed to init common AD9862 regs\n");
-    throw std::runtime_error ("usrp_basic/init_9862");
-  }
-
-  _write_fpga_reg (FR_MODE, 0);		// ensure we're in normal mode
-  _write_fpga_reg (FR_DEBUG_EN, 0);	// disable debug outputs
-
-}
-
-usrp_basic::~usrp_basic ()
-{
-  d_db.resize(0); // forget db shared ptrs
-
-  if (d_udh)
-    usrp_close_interface (d_udh);
-
-  usrp_deinit (d_ctx);
-}
-
-void
-usrp_basic::shutdown_daughterboards()
-{
-  // nuke d'boards before we close down USB in ~usrp_basic
-  // shutdown() will do any board shutdown while the USRP can still
-  // be talked to
-  for(size_t i = 0; i < d_db.size(); i++)
-    for(size_t j = 0; j < d_db[i].size(); j++)
-      d_db[i][j]->shutdown();
-}
-
-void
-usrp_basic::init_db(usrp_basic_sptr u)
-{
-  if (u.get() != this)
-    throw std::invalid_argument("u is not this");
-
-  d_db[0] = instantiate_dbs(d_dbid[0], u, 0);
-  d_db[1] = instantiate_dbs(d_dbid[1], u, 1);
-}
-
-std::vector<db_base_sptr>
-usrp_basic::db(int which_side)
-{
-  which_side &= 0x1;	// clamp it to avoid any reporting any errors
-  return d_db[which_side];
-}
-
-bool
-usrp_basic::is_valid(const usrp_subdev_spec &ss)
-{
-  if (ss.side < 0 || ss.side > 1)
-    return false;
-
-  if (ss.subdev < 0 || ss.subdev >= d_db[ss.side].size())
-    return false;
-
-  return true;
-}
-
-db_base_sptr
-usrp_basic::selected_subdev(const usrp_subdev_spec &ss)
-{
-  if (!is_valid(ss))
-    throw std::invalid_argument("invalid subdev_spec");
-
-  return d_db[ss.side][ss.subdev];
-}
-
-bool
-usrp_basic::start ()
-{
-  return true;		// nop
-}
-
-bool
-usrp_basic::stop ()
-{
-  return true;		// nop
-}
-
-void
-usrp_basic::set_usb_data_rate (int usb_data_rate)
-{
-  d_usb_data_rate = usb_data_rate;
-  d_bytes_per_poll = (int) (usb_data_rate * POLLING_INTERVAL);
-}
-
-bool
-usrp_basic::_write_aux_dac (int slot, int which_dac, int value)
-{
-  return usrp_write_aux_dac (d_udh, slot, which_dac, value);
-}
-
-bool
-usrp_basic::_read_aux_adc (int slot, int which_adc, int *value)
-{
-  return usrp_read_aux_adc (d_udh, slot, which_adc, value);
-}
-
-int
-usrp_basic::_read_aux_adc (int slot, int which_adc)
-{
-  int	value;
-  if (!_read_aux_adc (slot, which_adc, &value))
-    return READ_FAILED;
-
-  return value;
-}
-
-bool
-usrp_basic::write_eeprom (int i2c_addr, int eeprom_offset, const std::string buf)
-{
-  return usrp_eeprom_write (d_udh, i2c_addr, eeprom_offset, buf.data (), buf.size ());
-}
-
-std::string
-usrp_basic::read_eeprom (int i2c_addr, int eeprom_offset, int len)
-{
-  if (len <= 0)
-    return "";
-
-  char buf[len];
-
-  if (!usrp_eeprom_read (d_udh, i2c_addr, eeprom_offset, buf, len))
-    return "";
-
-  return std::string (buf, len);
-}
-
-bool
-usrp_basic::write_i2c (int i2c_addr, const std::string buf)
-{
-  return usrp_i2c_write (d_udh, i2c_addr, buf.data (), buf.size ());
-}
-
-std::string
-usrp_basic::read_i2c (int i2c_addr, int len)
-{
-  if (len <= 0)
-    return "";
-
-  char buf[len];
-
-  if (!usrp_i2c_read (d_udh, i2c_addr, buf, len))
-    return "";
-
-  return std::string (buf, len);
-}
-
-std::string
-usrp_basic::serial_number()
-{
-  return usrp_serial_number(d_udh);
-}
-
-// ----------------------------------------------------------------
-
-bool
-usrp_basic::set_adc_offset (int which_adc, int offset)
-{
-  if (which_adc < 0 || which_adc > 3)
-    return false;
-
-  return _write_fpga_reg (FR_ADC_OFFSET_0 + which_adc, offset);
-}
-
-bool
-usrp_basic::set_dac_offset (int which_dac, int offset, int offset_pin)
-{
-  if (which_dac < 0 || which_dac > 3)
-    return false;
-
-  int which_codec = which_dac >> 1;
-  int tx_a = (which_dac & 0x1) == 0;
-  int lo = ((offset & 0x3) << 6) | (offset_pin & 0x1);
-  int hi = (offset >> 2);
-  bool ok;
-
-  if (tx_a){
-    ok =  _write_9862 (which_codec, REG_TX_A_OFFSET_LO, lo);
-    ok &= _write_9862 (which_codec, REG_TX_A_OFFSET_HI, hi);
-  }
-  else {
-    ok =  _write_9862 (which_codec, REG_TX_B_OFFSET_LO, lo);
-    ok &= _write_9862 (which_codec, REG_TX_B_OFFSET_HI, hi);
-  }
-  return ok;
-}
-
-bool
-usrp_basic::set_adc_buffer_bypass (int which_adc, bool bypass)
-{
-  if (which_adc < 0 || which_adc > 3)
-    return false;
-
-  int codec = which_adc >> 1;
-  int reg = (which_adc & 1) == 0 ? REG_RX_A : REG_RX_B;
-
-  unsigned char cur_rx;
-  unsigned char cur_pwr_dn;
-
-  // If the input buffer is bypassed, we need to power it down too.
-
-  bool ok = _read_9862 (codec, reg, &cur_rx);
-  ok &= _read_9862 (codec, REG_RX_PWR_DN, &cur_pwr_dn);
-  if (!ok)
-    return false;
-
-  if (bypass){
-    cur_rx |= RX_X_BYPASS_INPUT_BUFFER;
-    cur_pwr_dn |= ((which_adc & 1) == 0) ? RX_PWR_DN_BUF_A : RX_PWR_DN_BUF_B;
-  }
-  else {
-    cur_rx &= ~RX_X_BYPASS_INPUT_BUFFER;
-    cur_pwr_dn &= ~(((which_adc & 1) == 0) ? RX_PWR_DN_BUF_A : RX_PWR_DN_BUF_B);
-  }
-
-  ok &= _write_9862 (codec, reg, cur_rx);
-  ok &= _write_9862 (codec, REG_RX_PWR_DN, cur_pwr_dn);
-  return ok;
-}
-
-bool
-usrp_basic::set_dc_offset_cl_enable(int bits, int mask)
-{
-  return _write_fpga_reg(FR_DC_OFFSET_CL_EN,
-			 (d_fpga_shadows[FR_DC_OFFSET_CL_EN] & ~mask) | (bits & mask));
-}
-
-// ----------------------------------------------------------------
-
-bool
-usrp_basic::_write_fpga_reg (int regno, int value)
-{
-  if (d_verbose){
-    fprintf (stdout, "_write_fpga_reg(%3d, 0x%08x)\n", regno, value);
-    fflush (stdout);
-  }
-
-  if (regno >= 0 && regno < MAX_REGS)
-    d_fpga_shadows[regno] = value;
-
-  return usrp_write_fpga_reg (d_udh, regno, value);
-}
-
-bool
-usrp_basic::_write_fpga_reg_masked (int regno, int value, int mask)
-{
-  //Only use this for registers who actually use a mask in the verilog firmware, like FR_RX_MASTER_SLAVE
-  //value is a 16 bits value and mask is a 16 bits mask
-  if (d_verbose){
-    fprintf (stdout, "_write_fpga_reg_masked(%3d, 0x%04x,0x%04x)\n", regno, value, mask);
-    fflush (stdout);
-  }
-
-  if (regno >= 0 && regno < MAX_REGS)
-    d_fpga_shadows[regno] = value;
-
-  return usrp_write_fpga_reg (d_udh, regno, (value & 0xffff) | ((mask & 0xffff)<<16));
-}
-
-
-bool
-usrp_basic::_read_fpga_reg (int regno, int *value)
-{
-  return usrp_read_fpga_reg (d_udh, regno, value);
-}
-
-int
-usrp_basic::_read_fpga_reg (int regno)
-{
-  int value;
-  if (!_read_fpga_reg (regno, &value))
-    return READ_FAILED;
-  return value;
-}
-
-bool
-usrp_basic::_write_9862 (int which_codec, int regno, unsigned char value)
-{
-  if (0 && d_verbose){
-    // FIXME really want to enable logging in usrp_prims:usrp_9862_write
-    fprintf(stdout, "_write_9862(codec = %d, regno = %2d, val = 0x%02x)\n", which_codec, regno, value);
-    fflush(stdout);
-  }
-
-  return usrp_9862_write (d_udh, which_codec, regno, value);
-}
-
-
-bool
-usrp_basic::_read_9862 (int which_codec, int regno, unsigned char *value) const
-{
-  return usrp_9862_read (d_udh, which_codec, regno, value);
-}
-
-int
-usrp_basic::_read_9862 (int which_codec, int regno) const
-{
-  unsigned char value;
-  if (!_read_9862 (which_codec, regno, &value))
-    return READ_FAILED;
-  return value;
-}
-
-bool
-usrp_basic::_write_spi (int optional_header, int enables, int format, std::string buf)
-{
-  return usrp_spi_write (d_udh, optional_header, enables, format,
-			 buf.data(), buf.size());
-}
-
-std::string
-usrp_basic::_read_spi (int optional_header, int enables, int format, int len)
-{
-  if (len <= 0)
-    return "";
-
-  char buf[len];
-
-  if (!usrp_spi_read (d_udh, optional_header, enables, format, buf, len))
-    return "";
-
-  return std::string (buf, len);
-}
-
-
-bool
-usrp_basic::_set_led (int which_led, bool on)
-{
-  return usrp_set_led (d_udh, which_led, on);
-}
-
-bool
-usrp_basic::write_atr_tx_delay(int value)
-{
-  return _write_fpga_reg(FR_ATR_TX_DELAY, value);
-}
-
-bool
-usrp_basic::write_atr_rx_delay(int value)
-{
-  return _write_fpga_reg(FR_ATR_RX_DELAY, value);
-}
-
-/*
- * ----------------------------------------------------------------
- * Routines to access and control daughterboard specific i/o
- * ----------------------------------------------------------------
- */
-static int
-slot_id_to_oe_reg (int slot_id)
-{
-  static int reg[4]  = { FR_OE_0, FR_OE_1, FR_OE_2, FR_OE_3 };
-  assert (0 <= slot_id && slot_id < 4);
-  return reg[slot_id];
-}
-
-static int
-slot_id_to_io_reg (int slot_id)
-{
-  static int reg[4]  = { FR_IO_0, FR_IO_1, FR_IO_2, FR_IO_3 };
-  assert (0 <= slot_id && slot_id < 4);
-  return reg[slot_id];
-}
-
-static int
-slot_id_to_refclk_reg(int slot_id)
-{
-  static int reg[4]  = { FR_TX_A_REFCLK, FR_RX_A_REFCLK, FR_TX_B_REFCLK, FR_RX_B_REFCLK };
-  assert (0 <= slot_id && slot_id < 4);
-  return reg[slot_id];
-}
-
-static int
-slot_id_to_atr_mask_reg(int slot_id)
-{
-  static int reg[4]  = { FR_ATR_MASK_0, FR_ATR_MASK_1, FR_ATR_MASK_2, FR_ATR_MASK_3 };
-  assert (0 <= slot_id && slot_id < 4);
-  return reg[slot_id];
-}
-
-static int
-slot_id_to_atr_txval_reg(int slot_id)
-{
-  static int reg[4]  = { FR_ATR_TXVAL_0, FR_ATR_TXVAL_1, FR_ATR_TXVAL_2, FR_ATR_TXVAL_3 };
-  assert (0 <= slot_id && slot_id < 4);
-  return reg[slot_id];
-}
-
-static int
-slot_id_to_atr_rxval_reg(int slot_id)
-{
-  static int reg[4]  = { FR_ATR_RXVAL_0, FR_ATR_RXVAL_1, FR_ATR_RXVAL_2, FR_ATR_RXVAL_3 };
-  assert (0 <= slot_id && slot_id < 4);
-  return reg[slot_id];
-}
-
-static int
-to_slot(txrx_t txrx, int which_side)
-{
-  // TX_A = 0
-  // RX_A = 1
-  // TX_B = 2
-  // RX_B = 3
-  return ((which_side & 0x1) << 1) | ((txrx & 0x1) == C_RX);
-}
-
-bool
-usrp_basic::common_set_pga(txrx_t txrx, int which_amp, double gain)
-{
-  if (which_amp < 0 || which_amp > 3)
-    return false;
-
-  gain = std::min(common_pga_max(txrx),
-		  std::max(common_pga_min(txrx), gain));
-
-  int codec = which_amp >> 1;	
-  int int_gain = (int) rint((gain - common_pga_min(txrx)) / common_pga_db_per_step(txrx));
-
-  if (txrx == C_TX){		// 0 and 1 are same, as are 2 and 3
-    return _write_9862(codec, REG_TX_PGA, int_gain);
-  }
-  else {
-    int reg = (which_amp & 1) == 0 ? REG_RX_A : REG_RX_B;
-
-    // read current value to get input buffer bypass flag.
-    unsigned char cur_rx;
-    if (!_read_9862(codec, reg, &cur_rx))
-      return false;
-
-    cur_rx = (cur_rx & RX_X_BYPASS_INPUT_BUFFER) | (int_gain & 0x7f);
-    return _write_9862(codec, reg, cur_rx);
-  }
-}
-
-double
-usrp_basic::common_pga(txrx_t txrx, int which_amp) const
-{
-  if (which_amp < 0 || which_amp > 3)
-    return READ_FAILED;
-
-  if (txrx == C_TX){
-    int codec = which_amp >> 1;
-    unsigned char v;
-    bool ok = _read_9862 (codec, REG_TX_PGA, &v);
-    if (!ok)
-      return READ_FAILED;
-
-    return (pga_db_per_step() * v) + pga_min();
-  }
-  else {
-    int codec = which_amp >> 1;
-    int reg = (which_amp & 1) == 0 ? REG_RX_A : REG_RX_B;
-    unsigned char v;
-    bool ok = _read_9862 (codec, reg, &v);
-    if (!ok)
-      return READ_FAILED;
-
-    return (pga_db_per_step() * (v & 0x1f)) + pga_min();
-  }
-}
-
-double
-usrp_basic::common_pga_min(txrx_t txrx) const
-{
-  if (txrx == C_TX)
-    return -20.0;
-  else
-    return   0.0;
-}
-
-double
-usrp_basic::common_pga_max(txrx_t txrx) const
-{
-  if (txrx == C_TX)
-    return   0.0;
-  else
-    return  20.0;
-}
-
-double
-usrp_basic::common_pga_db_per_step(txrx_t txrx) const
-{
-  if (txrx == C_TX)
-    return  20.0 / 255;
-  else
-    return  20.0 / 20;
-}
-
-bool
-usrp_basic::_common_write_oe(txrx_t txrx, int which_side, int value, int mask)
-{
-  if (! (0 <= which_side && which_side <= 1))
-    return false;
-
-  return _write_fpga_reg(slot_id_to_oe_reg(to_slot(txrx, which_side)),
-			 (mask << 16) | (value & 0xffff));
-}
-
-bool
-usrp_basic::common_write_io(txrx_t txrx, int which_side, int value, int mask)
-{
-  if (! (0 <= which_side && which_side <= 1))
-    return false;
-
-  return _write_fpga_reg(slot_id_to_io_reg(to_slot(txrx, which_side)),
-			 (mask << 16) | (value & 0xffff));
-}
-
-bool
-usrp_basic::common_read_io(txrx_t txrx, int which_side, int *value)
-{
-  if (! (0 <= which_side && which_side <= 1))
-    return false;
-
-  int t;
-  int reg = which_side + 1;	// FIXME, *very* magic number (fix in serial_io.v)
-  bool ok = _read_fpga_reg(reg, &t);
-  if (!ok)
-    return false;
-
-  if (txrx == C_TX){
-    *value = t & 0xffff;		// FIXME, more magic
-    return true;
-  }
-  else {
-    *value = (t >> 16) & 0xffff;	// FIXME, more magic
-    return true;
-  }
-}
-
-int
-usrp_basic::common_read_io(txrx_t txrx, int which_side)
-{
-  int	value;
-  if (!common_read_io(txrx, which_side, &value))
-    return READ_FAILED;
-  return value;
-}
-
-bool
-usrp_basic::common_write_refclk(txrx_t txrx, int which_side, int value)
-{
-  if (! (0 <= which_side && which_side <= 1))
-    return false;
-
-  return _write_fpga_reg(slot_id_to_refclk_reg(to_slot(txrx, which_side)),
-			 value);
-}
-
-bool
-usrp_basic::common_write_atr_mask(txrx_t txrx, int which_side, int value)
-{
-  if (! (0 <= which_side && which_side <= 1))
-    return false;
-
-  return _write_fpga_reg(slot_id_to_atr_mask_reg(to_slot(txrx, which_side)),
-			 value);
-}
-
-bool
-usrp_basic::common_write_atr_txval(txrx_t txrx, int which_side, int value)
-{
-  if (! (0 <= which_side && which_side <= 1))
-    return false;
-
-  return _write_fpga_reg(slot_id_to_atr_txval_reg(to_slot(txrx, which_side)),
-			 value);
-}
-
-bool
-usrp_basic::common_write_atr_rxval(txrx_t txrx, int which_side, int value)
-{
-  if (! (0 <= which_side && which_side <= 1))
-    return false;
-
-  return _write_fpga_reg(slot_id_to_atr_rxval_reg(to_slot(txrx, which_side)),
-			 value);
-}
-
-bool
-usrp_basic::common_write_aux_dac(txrx_t txrx, int which_side, int which_dac, int value)
-{
-  return _write_aux_dac(to_slot(txrx, which_side), which_dac, value);
-}
-
-bool
-usrp_basic::common_read_aux_adc(txrx_t txrx, int which_side, int which_adc, int *value)
-{
-  return _read_aux_adc(to_slot(txrx, which_side), which_adc, value);
-}
-
-int
-usrp_basic::common_read_aux_adc(txrx_t txrx, int which_side, int which_adc)
-{
-  return _read_aux_adc(to_slot(txrx, which_side), which_adc);
-}
-
-
-////////////////////////////////////////////////////////////////
-//
-//			   usrp_basic_rx
-//
-////////////////////////////////////////////////////////////////
-
-static unsigned char rx_init_regs[] = {
-  REG_RX_PWR_DN,	0,
-  REG_RX_A,		0,	// minimum gain = 0x00 (max gain = 0x14)
-  REG_RX_B,		0,	// minimum gain = 0x00 (max gain = 0x14)
-  REG_RX_MISC,		(RX_MISC_HS_DUTY_CYCLE | RX_MISC_CLK_DUTY),
-  REG_RX_IF,		(RX_IF_USE_CLKOUT1
-			 | RX_IF_2S_COMP),
-  REG_RX_DIGITAL,	(RX_DIGITAL_2_CHAN)
-};
-
-
-usrp_basic_rx::usrp_basic_rx (int which_board, int fusb_block_size, int fusb_nblocks,
-			      const std::string fpga_filename,
-			      const std::string firmware_filename
-			      )
-  : usrp_basic (which_board, open_rx_interface, fpga_filename, firmware_filename),
-    d_devhandle (0), d_ephandle (0),
-    d_bytes_seen (0), d_first_read (true),
-    d_rx_enable (false)
-{
-  // initialize rx specific registers
-
-  if (!usrp_9862_write_many_all (d_udh, rx_init_regs, sizeof (rx_init_regs))){
-    fprintf (stderr, "usrp_basic_rx: failed to init AD9862 RX regs\n");
-    throw std::runtime_error ("usrp_basic_rx/init_9862");
-  }
-
-  if (0){
-    // FIXME power down 2nd codec rx path
-    usrp_9862_write (d_udh, 1, REG_RX_PWR_DN, 0x1);	// power down everything
-  }
-
-  // Reset the rx path and leave it disabled.
-  set_rx_enable (false);
-  usrp_set_fpga_rx_reset (d_udh, true);
-  usrp_set_fpga_rx_reset (d_udh, false);
-
-  set_fpga_rx_sample_rate_divisor (2);	// usually correct
-
-  set_dc_offset_cl_enable(0xf, 0xf);	// enable DC offset removal control loops
-
-  probe_rx_slots (false);
-
-  //d_db[0] = instantiate_dbs(d_dbid[0], this, 0);
-  //d_db[1] = instantiate_dbs(d_dbid[1], this, 1);
-
-  // check fusb buffering parameters
-
-  if (fusb_block_size < 0 || fusb_block_size > FUSB_BLOCK_SIZE)
-    throw std::out_of_range ("usrp_basic_rx: invalid fusb_block_size");
-
-  if (fusb_nblocks < 0)
-    throw std::out_of_range ("usrp_basic_rx: invalid fusb_nblocks");
-
-  if (fusb_block_size == 0)
-    fusb_block_size = fusb_sysconfig::default_block_size();
-
-  if (fusb_nblocks == 0)
-    fusb_nblocks = std::max (1, FUSB_BUFFER_SIZE / fusb_block_size);
-
-  d_devhandle = fusb_sysconfig::make_devhandle (d_udh, d_ctx);
-  d_ephandle = d_devhandle->make_ephandle (USRP_RX_ENDPOINT, true,
-					   fusb_block_size, fusb_nblocks);
-
-  write_atr_mask(0, 0);		// zero Rx A Auto Transmit/Receive regs
-  write_atr_txval(0, 0);
-  write_atr_rxval(0, 0);
-  write_atr_mask(1, 0);		// zero Rx B Auto Transmit/Receive regs
-  write_atr_txval(1, 0);
-  write_atr_rxval(1, 0);
-}
-
-static unsigned char rx_fini_regs[] = {
-  REG_RX_PWR_DN,	0x1				// power down everything
-};
-
-usrp_basic_rx::~usrp_basic_rx ()
-{
-  if (!set_rx_enable (false)){
-    fprintf (stderr, "usrp_basic_rx: set_fpga_rx_enable failed\n");
-  }
-
-  d_ephandle->stop ();
-  delete d_ephandle;
-  delete d_devhandle;
-
-  if (!usrp_9862_write_many_all (d_udh, rx_fini_regs, sizeof (rx_fini_regs))){
-    fprintf (stderr, "usrp_basic_rx: failed to fini AD9862 RX regs\n");
-  }
-
-  shutdown_daughterboards();
-}
-
-
-bool
-usrp_basic_rx::start ()
-{
-  if (!usrp_basic::start ())	// invoke parent's method
-    return false;
-
-  // fire off reads before asserting rx_enable
-
-  if (!d_ephandle->start ()){
-    fprintf (stderr, "usrp_basic_rx: failed to start end point streaming");
-    return false;
-  }
-
-  if (!set_rx_enable (true)){
-    fprintf (stderr, "usrp_basic_rx: set_rx_enable failed\n");
-    return false;
-  }
-
-  return true;
-}
-
-bool
-usrp_basic_rx::stop ()
-{
-  bool ok = usrp_basic::stop();
-
-  if (!set_rx_enable(false)){
-    fprintf (stderr, "usrp_basic_rx: set_rx_enable(false) failed\n");
-    ok = false;
-  }
-
-  if (!d_ephandle->stop()){
-    fprintf (stderr, "usrp_basic_rx: failed to stop end point streaming");
-    ok = false;
-  }
-
-  return ok;
-}
-
-usrp_basic_rx *
-usrp_basic_rx::make (int which_board, int fusb_block_size, int fusb_nblocks,
-		     const std::string fpga_filename,
-		     const std::string firmware_filename)
-{
-  usrp_basic_rx *u = 0;
-
-  try {
-    u = new usrp_basic_rx (which_board, fusb_block_size, fusb_nblocks,
-			   fpga_filename, firmware_filename);
-    return u;
-  }
-  catch (...){
-    delete u;
-    return 0;
-  }
-
-  return u;
-}
-
-bool
-usrp_basic_rx::set_fpga_rx_sample_rate_divisor (unsigned int div)
-{
-  return _write_fpga_reg (FR_RX_SAMPLE_RATE_DIV, div - 1);
-}
-
-
-/*
- * \brief read data from the D/A's via the FPGA.
- * \p len must be a multiple of 512 bytes.
- *
- * \returns the number of bytes read, or -1 on error.
- *
- * If overrun is non-NULL it will be set true iff an RX overrun is detected.
- */
-int
-usrp_basic_rx::read (void *buf, int len, bool *overrun)
-{
-  int	r;
-
-  if (overrun)
-    *overrun = false;
-
-  if (len < 0 || (len % 512) != 0){
-    fprintf (stderr, "usrp_basic_rx::read: invalid length = %d\n", len);
-    return -1;
-  }
-
-  r = d_ephandle->read (buf, len);
-  if (r > 0)
-    d_bytes_seen += r;
-
-  /*
-   * In many cases, the FPGA reports an rx overrun right after we
-   * enable the Rx path.  If this is our first read, check for the
-   * overrun to clear the condition, then ignore the result.
-   */
-  if (0 && d_first_read){	// FIXME
-    d_first_read = false;
-    bool bogus_overrun;
-    usrp_check_rx_overrun (d_udh, &bogus_overrun);
-  }
-
-  if (overrun != 0 && d_bytes_seen >= d_bytes_per_poll){
-    d_bytes_seen = 0;
-    if (!usrp_check_rx_overrun (d_udh, overrun)){
-      fprintf (stderr, "usrp_basic_rx: usrp_check_rx_overrun failed\n");
-    }
-  }
-
-  return r;
-}
-
-bool
-usrp_basic_rx::set_rx_enable (bool on)
-{
-  d_rx_enable = on;
-  return usrp_set_fpga_rx_enable (d_udh, on);
-}
-
-// conditional disable, return prev state
-bool
-usrp_basic_rx::disable_rx ()
-{
-  bool enabled = rx_enable ();
-  if (enabled)
-    set_rx_enable (false);
-  return enabled;
-}
-
-// conditional set
-void
-usrp_basic_rx::restore_rx (bool on)
-{
-  if (on != rx_enable ())
-    set_rx_enable (on);
-}
-
-void
-usrp_basic_rx::probe_rx_slots (bool verbose)
-{
-  struct usrp_dboard_eeprom	eeprom;
-  static int slot_id_map[2] = { SLOT_RX_A, SLOT_RX_B };
-  static const char *slot_name[2] = { "RX d'board A", "RX d'board B" };
-
-  for (int i = 0; i < 2; i++){
-    int slot_id = slot_id_map [i];
-    const char *msg = 0;
-    usrp_dbeeprom_status_t s = usrp_read_dboard_eeprom (d_udh, slot_id, &eeprom);
-
-    switch (s){
-    case UDBE_OK:
-      d_dbid[i] = eeprom.id;
-      msg = usrp_dbid_to_string (eeprom.id).c_str ();
-      set_adc_offset (2*i+0, eeprom.offset[0]);
-      set_adc_offset (2*i+1, eeprom.offset[1]);
-      _write_fpga_reg (slot_id_to_oe_reg(slot_id), (0xffff << 16) | eeprom.oe);
-      _write_fpga_reg (slot_id_to_io_reg(slot_id), (0xffff << 16) | 0x0000);
-      break;
-
-    case UDBE_NO_EEPROM:
-      d_dbid[i] = -1;
-      msg = "<none>";
-      _write_fpga_reg (slot_id_to_oe_reg(slot_id), (0xffff << 16) | 0x0000);
-      _write_fpga_reg (slot_id_to_io_reg(slot_id), (0xffff << 16) | 0x0000);
-      break;
-
-    case UDBE_INVALID_EEPROM:
-      d_dbid[i] = -2;
-      msg = "Invalid EEPROM contents";
-      _write_fpga_reg (slot_id_to_oe_reg(slot_id), (0xffff << 16) | 0x0000);
-      _write_fpga_reg (slot_id_to_io_reg(slot_id), (0xffff << 16) | 0x0000);
-      break;
-
-    case UDBE_BAD_SLOT:
-    default:
-      assert (0);
-    }
-
-    if (verbose){
-      fflush (stdout);
-      fprintf (stderr, "%s: %s\n", slot_name[i], msg);
-    }
-  }
-}
-
-bool
-usrp_basic_rx::set_pga (int which_amp, double gain)
-{
-  return common_set_pga(C_RX, which_amp, gain);
-}
-
-double
-usrp_basic_rx::pga(int which_amp) const
-{
-  return common_pga(C_RX, which_amp);
-}
-
-double
-usrp_basic_rx::pga_min() const
-{
-  return common_pga_min(C_RX);
-}
-
-double
-usrp_basic_rx::pga_max() const
-{
-  return common_pga_max(C_RX);
-}
-
-double
-usrp_basic_rx::pga_db_per_step() const
-{
-  return common_pga_db_per_step(C_RX);
-}
-
-bool
-usrp_basic_rx::_write_oe (int which_side, int value, int mask)
-{
-  return _common_write_oe(C_RX, which_side, value, mask);
-}
-
-bool
-usrp_basic_rx::write_io (int which_side, int value, int mask)
-{
-  return common_write_io(C_RX, which_side, value, mask);
-}
-
-bool
-usrp_basic_rx::read_io (int which_side, int *value)
-{
-  return common_read_io(C_RX, which_side, value);
-}
-
-int
-usrp_basic_rx::read_io (int which_side)
-{
-  return common_read_io(C_RX, which_side);
-}
-
-bool
-usrp_basic_rx::write_refclk(int which_side, int value)
-{
-  return common_write_refclk(C_RX, which_side, value);
-}
-
-bool
-usrp_basic_rx::write_atr_mask(int which_side, int value)
-{
-  return common_write_atr_mask(C_RX, which_side, value);
-}
-
-bool
-usrp_basic_rx::write_atr_txval(int which_side, int value)
-{
-  return common_write_atr_txval(C_RX, which_side, value);
-}
-
-bool
-usrp_basic_rx::write_atr_rxval(int which_side, int value)
-{
-  return common_write_atr_rxval(C_RX, which_side, value);
-}
-
-bool
-usrp_basic_rx::write_aux_dac (int which_side, int which_dac, int value)
-{
-  return common_write_aux_dac(C_RX, which_side, which_dac, value);
-}
-
-bool
-usrp_basic_rx::read_aux_adc (int which_side, int which_adc, int *value)
-{
-  return common_read_aux_adc(C_RX, which_side, which_adc, value);
-}
-
-int
-usrp_basic_rx::read_aux_adc (int which_side, int which_adc)
-{
-  return common_read_aux_adc(C_RX, which_side, which_adc);
-}
-
-int
-usrp_basic_rx::block_size () const { return d_ephandle->block_size(); }
-
-////////////////////////////////////////////////////////////////
-//
-//			   usrp_basic_tx
-//
-////////////////////////////////////////////////////////////////
-
-
-//
-// DAC input rate 64 MHz interleaved for a total input rate of 128 MHz
-// DAC input is latched on rising edge of CLKOUT2
-// NCO is disabled
-// interpolate 2x
-// coarse modulator disabled
-//
-
-static unsigned char tx_init_regs[] = {
-  REG_TX_PWR_DN,	0,
-  REG_TX_A_OFFSET_LO,	0,
-  REG_TX_A_OFFSET_HI,	0,
-  REG_TX_B_OFFSET_LO,	0,
-  REG_TX_B_OFFSET_HI,	0,
-  REG_TX_A_GAIN,	(TX_X_GAIN_COARSE_FULL | 0),
-  REG_TX_B_GAIN,	(TX_X_GAIN_COARSE_FULL | 0),
-  REG_TX_PGA,		0xff,			// maximum gain (0 dB)
-  REG_TX_MISC,		0,
-  REG_TX_IF,		(TX_IF_USE_CLKOUT1
-			 | TX_IF_I_FIRST
-			 | TX_IF_INV_TX_SYNC
-			 | TX_IF_2S_COMP
-			 | TX_IF_INTERLEAVED),
-  REG_TX_DIGITAL,	(TX_DIGITAL_2_DATA_PATHS
-			 | TX_DIGITAL_INTERPOLATE_4X),
-  REG_TX_MODULATOR,	(TX_MODULATOR_DISABLE_NCO
-			 | TX_MODULATOR_COARSE_MODULATION_NONE),
-  REG_TX_NCO_FTW_7_0,	0,
-  REG_TX_NCO_FTW_15_8,	0,
-  REG_TX_NCO_FTW_23_16,	0
-};
-
-usrp_basic_tx::usrp_basic_tx (int which_board, int fusb_block_size, int fusb_nblocks,
-			      const std::string fpga_filename,
-			      const std::string firmware_filename)
-  : usrp_basic (which_board, open_tx_interface, fpga_filename, firmware_filename),
-    d_devhandle (0), d_ephandle (0),
-    d_bytes_seen (0), d_first_write (true),
-    d_tx_enable (false)
-{
-  if (!usrp_9862_write_many_all (d_udh, tx_init_regs, sizeof (tx_init_regs))){
-    fprintf (stderr, "usrp_basic_tx: failed to init AD9862 TX regs\n");
-    throw std::runtime_error ("usrp_basic_tx/init_9862");
-  }
-
-  if (0){
-    // FIXME power down 2nd codec tx path
-    usrp_9862_write (d_udh, 1, REG_TX_PWR_DN,
-		     (TX_PWR_DN_TX_DIGITAL
-		      | TX_PWR_DN_TX_ANALOG_BOTH));
-  }
-
-  // Reset the tx path and leave it disabled.
-  set_tx_enable (false);
-  usrp_set_fpga_tx_reset (d_udh, true);
-  usrp_set_fpga_tx_reset (d_udh, false);
-
-  set_fpga_tx_sample_rate_divisor (4);	// we're using interp x4
-
-  probe_tx_slots (false);
-
-  //d_db[0] = instantiate_dbs(d_dbid[0], this, 0);
-  //d_db[1] = instantiate_dbs(d_dbid[1], this, 1);
-
-  // check fusb buffering parameters
-
-  if (fusb_block_size < 0 || fusb_block_size > FUSB_BLOCK_SIZE)
-    throw std::out_of_range ("usrp_basic_rx: invalid fusb_block_size");
-
-  if (fusb_nblocks < 0)
-    throw std::out_of_range ("usrp_basic_rx: invalid fusb_nblocks");
-
-  if (fusb_block_size == 0)
-    fusb_block_size = FUSB_BLOCK_SIZE;
-
-  if (fusb_nblocks == 0)
-    fusb_nblocks = std::max (1, FUSB_BUFFER_SIZE / fusb_block_size);
-
-  d_devhandle = fusb_sysconfig::make_devhandle (d_udh, d_ctx);
-  d_ephandle = d_devhandle->make_ephandle (USRP_TX_ENDPOINT, false,
-					   fusb_block_size, fusb_nblocks);
-
-  write_atr_mask(0, 0);		// zero Tx A Auto Transmit/Receive regs
-  write_atr_txval(0, 0);
-  write_atr_rxval(0, 0);
-  write_atr_mask(1, 0);		// zero Tx B Auto Transmit/Receive regs
-  write_atr_txval(1, 0);
-  write_atr_rxval(1, 0);
-}
-
-
-static unsigned char tx_fini_regs[] = {
-  REG_TX_PWR_DN,	(TX_PWR_DN_TX_DIGITAL
-			 | TX_PWR_DN_TX_ANALOG_BOTH),
-  REG_TX_MODULATOR,	(TX_MODULATOR_DISABLE_NCO
-			 | TX_MODULATOR_COARSE_MODULATION_NONE)
-};
-
-usrp_basic_tx::~usrp_basic_tx ()
-{
-  d_ephandle->stop ();
-  delete d_ephandle;
-  delete d_devhandle;
-
-  if (!usrp_9862_write_many_all (d_udh, tx_fini_regs, sizeof (tx_fini_regs))){
-    fprintf (stderr, "usrp_basic_tx: failed to fini AD9862 TX regs\n");
-  }
-
-  shutdown_daughterboards();
-}
-
-bool
-usrp_basic_tx::start ()
-{
-  if (!usrp_basic::start ())
-    return false;
-
-  if (!set_tx_enable (true)){
-    fprintf (stderr, "usrp_basic_tx: set_tx_enable failed\n");
-    return false;
-  }
-
-  if (!d_ephandle->start ()){
-    fprintf (stderr, "usrp_basic_tx: failed to start end point streaming");
-    return false;
-  }
-
-  return true;
-}
-
-bool
-usrp_basic_tx::stop ()
-{
-  bool ok = usrp_basic::stop ();
-
-  if (!d_ephandle->stop ()){
-    fprintf (stderr, "usrp_basic_tx: failed to stop end point streaming");
-    ok = false;
-  }
-
-  if (!set_tx_enable (false)){
-    fprintf (stderr, "usrp_basic_tx: set_tx_enable(false) failed\n");
-    ok = false;
-  }
-
-  return ok;
-}
-
-usrp_basic_tx *
-usrp_basic_tx::make (int which_board, int fusb_block_size, int fusb_nblocks,
-		     const std::string fpga_filename,
-		     const std::string firmware_filename)
-{
-  usrp_basic_tx *u = 0;
-
-  try {
-    u = new usrp_basic_tx (which_board, fusb_block_size, fusb_nblocks,
-			   fpga_filename, firmware_filename);
-    return u;
-  }
-  catch (...){
-    delete u;
-    return 0;
-  }
-
-  return u;
-}
-
-bool
-usrp_basic_tx::set_fpga_tx_sample_rate_divisor (unsigned int div)
-{
-  return _write_fpga_reg (FR_TX_SAMPLE_RATE_DIV, div - 1);
-}
-
-/*!
- * \brief Write data to the A/D's via the FPGA.
- *
- * \p len must be a multiple of 512 bytes.
- * \returns number of bytes written or -1 on error.
- *
- * if \p underrun is non-NULL, it will be set to true iff
- * a transmit underrun condition is detected.
- */
-int
-usrp_basic_tx::write (const void *buf, int len, bool *underrun)
-{
-  int	r;
-
-  if (underrun)
-    *underrun = false;
-
-  if (len < 0 || (len % 512) != 0){
-    fprintf (stderr, "usrp_basic_tx::write: invalid length = %d\n", len);
-    return -1;
-  }
-
-  r = d_ephandle->write (buf, len);
-  if (r > 0)
-    d_bytes_seen += r;
-
-  /*
-   * In many cases, the FPGA reports an tx underrun right after we
-   * enable the Tx path.  If this is our first write, check for the
-   * underrun to clear the condition, then ignore the result.
-   */
-  if (d_first_write && d_bytes_seen >= 4 * FUSB_BLOCK_SIZE){
-    d_first_write = false;
-    bool bogus_underrun;
-    usrp_check_tx_underrun (d_udh, &bogus_underrun);
-  }
-
-  if (underrun != 0 && d_bytes_seen >= d_bytes_per_poll){
-    d_bytes_seen = 0;
-    if (!usrp_check_tx_underrun (d_udh, underrun)){
-      fprintf (stderr, "usrp_basic_tx: usrp_check_tx_underrun failed\n");
-    }
-  }
-
-  return r;
-}
-
-void
-usrp_basic_tx::wait_for_completion ()
-{
-  d_ephandle->wait_for_completion ();
-}
-
-bool
-usrp_basic_tx::set_tx_enable (bool on)
-{
-  d_tx_enable = on;
-  // fprintf (stderr, "set_tx_enable %d\n", on);
-  return usrp_set_fpga_tx_enable (d_udh, on);
-}
-
-// conditional disable, return prev state
-bool
-usrp_basic_tx::disable_tx ()
-{
-  bool enabled = tx_enable ();
-  if (enabled)
-    set_tx_enable (false);
-  return enabled;
-}
-
-// conditional set
-void
-usrp_basic_tx::restore_tx (bool on)
-{
-  if (on != tx_enable ())
-    set_tx_enable (on);
-}
-
-void
-usrp_basic_tx::probe_tx_slots (bool verbose)
-{
-  struct usrp_dboard_eeprom	eeprom;
-  static int slot_id_map[2] = { SLOT_TX_A, SLOT_TX_B };
-  static const char *slot_name[2] = { "TX d'board A", "TX d'board B" };
-
-  for (int i = 0; i < 2; i++){
-    int slot_id = slot_id_map [i];
-    const char *msg = 0;
-    usrp_dbeeprom_status_t s = usrp_read_dboard_eeprom (d_udh, slot_id, &eeprom);
-
-    switch (s){
-    case UDBE_OK:
-      d_dbid[i] = eeprom.id;
-      msg = usrp_dbid_to_string (eeprom.id).c_str ();
-      // FIXME, figure out interpretation of dc offset for TX d'boards
-      // offset = (eeprom.offset[1] << 16) | (eeprom.offset[0] & 0xffff);
-      _write_fpga_reg (slot_id_to_oe_reg(slot_id), (0xffff << 16) | eeprom.oe);
-      _write_fpga_reg (slot_id_to_io_reg(slot_id), (0xffff << 16) | 0x0000);
-      break;
-
-    case UDBE_NO_EEPROM:
-      d_dbid[i] = -1;
-      msg = "<none>";
-      _write_fpga_reg (slot_id_to_oe_reg(slot_id), (0xffff << 16) | 0x0000);
-      _write_fpga_reg (slot_id_to_io_reg(slot_id), (0xffff << 16) | 0x0000);
-      break;
-
-    case UDBE_INVALID_EEPROM:
-      d_dbid[i] = -2;
-      msg = "Invalid EEPROM contents";
-      _write_fpga_reg (slot_id_to_oe_reg(slot_id), (0xffff << 16) | 0x0000);
-      _write_fpga_reg (slot_id_to_io_reg(slot_id), (0xffff << 16) | 0x0000);
-      break;
-
-    case UDBE_BAD_SLOT:
-    default:
-      assert (0);
-    }
-
-    if (verbose){
-      fflush (stdout);
-      fprintf (stderr, "%s: %s\n", slot_name[i], msg);
-    }
-  }
-}
-
-bool
-usrp_basic_tx::set_pga (int which_amp, double gain)
-{
-  return common_set_pga(C_TX, which_amp, gain);
-}
-
-double
-usrp_basic_tx::pga (int which_amp) const
-{
-  return common_pga(C_TX, which_amp);
-}
-
-double
-usrp_basic_tx::pga_min() const
-{
-  return common_pga_min(C_TX);
-}
-
-double
-usrp_basic_tx::pga_max() const
-{
-  return common_pga_max(C_TX);
-}
-
-double
-usrp_basic_tx::pga_db_per_step() const
-{
-  return common_pga_db_per_step(C_TX);
-}
-
-bool
-usrp_basic_tx::_write_oe (int which_side, int value, int mask)
-{
-  return _common_write_oe(C_TX, which_side, value, mask);
-}
-
-bool
-usrp_basic_tx::write_io (int which_side, int value, int mask)
-{
-  return common_write_io(C_TX, which_side, value, mask);
-}
-
-bool
-usrp_basic_tx::read_io (int which_side, int *value)
-{
-  return common_read_io(C_TX, which_side, value);
-}
-
-int
-usrp_basic_tx::read_io (int which_side)
-{
-  return common_read_io(C_TX, which_side);
-}
-
-bool
-usrp_basic_tx::write_refclk(int which_side, int value)
-{
-  return common_write_refclk(C_TX, which_side, value);
-}
-
-bool
-usrp_basic_tx::write_atr_mask(int which_side, int value)
-{
-  return common_write_atr_mask(C_TX, which_side, value);
-}
-
-bool
-usrp_basic_tx::write_atr_txval(int which_side, int value)
-{
-  return common_write_atr_txval(C_TX, which_side, value);
-}
-
-bool
-usrp_basic_tx::write_atr_rxval(int which_side, int value)
-{
-  return common_write_atr_rxval(C_TX, which_side, value);
-}
-
-bool
-usrp_basic_tx::write_aux_dac (int which_side, int which_dac, int value)
-{
-  return common_write_aux_dac(C_TX, which_side, which_dac, value);
-}
-
-bool
-usrp_basic_tx::read_aux_adc (int which_side, int which_adc, int *value)
-{
-  return common_read_aux_adc(C_TX, which_side, which_adc, value);
-}
-
-int
-usrp_basic_tx::read_aux_adc (int which_side, int which_adc)
-{
-  return common_read_aux_adc(C_TX, which_side, which_adc);
-}
-
-int
-usrp_basic_tx::block_size () const { return d_ephandle->block_size(); }
-
diff --git a/usrp/host/lib/usrp_config.h b/usrp/host/lib/usrp_config.h
deleted file mode 100644
index ee5cb63bd..000000000
--- a/usrp/host/lib/usrp_config.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003 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 _USRP_CONFIG_H_
-#define _USRP_CONFIG_H_
-
-/*
- * ----------------------------------------------------------------
- * USRP Rx configurations.
- *
- * For now this is a placeholder, but will eventually specify the
- * mapping from A/D outputs to DDC inputs (I & Q).
- *
- * What's implemented today is a single DDC that has its I input
- * connected to ADC0 and its Q input connected to ADC1
- * ----------------------------------------------------------------
- */
-
-#define	USRP_RX_CONFIG_DEFAULT	0
-
-/*!
- * given a usrp_rx_config word, return the number of I & Q streams that
- * are interleaved on the USB.
- */
-
-int usrp_rx_config_stream_count (unsigned int usrp_rx_config);
-
-/*
- * USRP Tx configurations.
- *
- * For now this is a placeholder, but will eventually specify the
- * mapping from DUC outputs to D/A inputs.
- *
- * What's implemented today is a single DUC that has its I output
- * connected to DAC0 and its Q output connected to DAC1
- */
-
-#define	USRP_TX_CONFIG_DEFAULT	0
-
-/*!
- * given a usrp_tx_config word, return the number of I & Q streams that
- * are interleaved on the USB.
- */
-
-int usrp_tx_config_stream_count (unsigned int usrp_tx_config);
-
-
-#endif /* _USRP_CONFIG_H_ */
diff --git a/usrp/host/lib/usrp_dbid.dat b/usrp/host/lib/usrp_dbid.dat
deleted file mode 100644
index 2548d737e..000000000
--- a/usrp/host/lib/usrp_dbid.dat
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright 2005,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-# This file is used to generate usrp_dbid.h, usrp_dbid.cc and usrp_dbid.py
-
-"Basic Tx"		0x0000
-"Basic Rx"		0x0001
-"DBS Rx"		0x0002
-"TV Rx"			0x0003
-
-"Flex 400 Rx"		0x0004
-"Flex 900 Rx"		0x0005
-"Flex 1200 Rx"		0x0006
-"Flex 2400 Rx"		0x0007
-
-"Flex 400 Tx"		0x0008
-"Flex 900 Tx"		0x0009
-"Flex 1200 Tx"		0x000a
-"Flex 2400 Tx"		0x000b
-
-"TV Rx Rev 2"		0x000c
-"DBS Rx ClkMod"		0x000d
-
-"LF Tx"			0x000e
-"LF Rx"			0x000f
-
-"Flex 400 Rx MIMO A"	0x0014
-"Flex 900 Rx MIMO A"	0x0015
-"Flex 1200 Rx MIMO A"	0x0016
-"Flex 2400 Rx MIMO A"	0x0017
-
-"Flex 400 Tx MIMO A"	0x0018
-"Flex 900 Tx MIMO A"	0x0019
-"Flex 1200 Tx MIMO A"	0x001a
-"Flex 2400 Tx MIMO A"	0x001b
-
-"Flex 400 Rx MIMO B"	0x0024
-"Flex 900 Rx MIMO B"	0x0025
-"Flex 1200 Rx MIMO B"	0x0026
-"Flex 2400 Rx MIMO B"	0x0027
-
-"Flex 400 Tx MIMO B"	0x0028
-"Flex 900 Tx MIMO B"	0x0029
-"Flex 1200 Tx MIMO B"	0x002a
-"Flex 2400 Tx MIMO B"	0x002b
-
-"Flex 2200 Rx MIMO B"	0x002c
-"Flex 2200 Tx MIMO B"	0x002d
-
-"Flex 1800 Rx"		0x0030
-"Flex 1800 Tx"		0x0031
-"Flex 1800 Rx MIMO A"	0x0032
-"Flex 1800 Tx MIMO A"	0x0033
-"Flex 1800 Rx MIMO B"	0x0034
-"Flex 1800 Tx MIMO B"	0x0035
-
-"TV Rx Rev 3"		0x0040
-"DTT754"		0x0041
-"DTT768"		0x0042
-"TV Rx MIMO"		0x0043
-"TV Rx Rev 2 MIMO"	0x0044
-"TV Rx Rev 3 MIMO"	0x0045
-
-"WBX LO TX"		0x0050
-"WBX LO RX"		0x0051
-
-"WBX NG TX"		0x0052
-"WBX NG RX"		0x0053
-
-"XCVR2450 Tx"		0x0060
-"XCVR2450 Rx"		0x0061
-
-"Bitshark Rx"           0x0070
-
-"Experimental Tx"	0xfffe
-"Experimental Rx"	0xffff
diff --git a/usrp/host/lib/usrp_local_sighandler.cc b/usrp/host/lib/usrp_local_sighandler.cc
deleted file mode 100644
index 59013972e..000000000
--- a/usrp/host/lib/usrp_local_sighandler.cc
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2009 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.
- */
-
-/*
- * This is actually the same as gr_local_signhandler, but with a different name.
- * We don't have a common library to put this in, so...
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/usrp_local_sighandler.h>
-#include <stdexcept>
-#include <stdio.h>
-#include <string.h>
-
-usrp_local_sighandler::usrp_local_sighandler (int signum,
-					      void (*new_handler)(int))
-  : d_signum (signum)
-{
-#ifdef HAVE_SIGACTION
-  struct sigaction new_action;
-  memset (&new_action, 0, sizeof (new_action));
-
-  new_action.sa_handler = new_handler;
-  sigemptyset (&new_action.sa_mask);
-  new_action.sa_flags = 0;
-
-  if (sigaction (d_signum, &new_action, &d_old_action) < 0){
-    perror ("sigaction (install new)");
-    throw std::runtime_error ("sigaction");
-  }
-#endif
-}
-
-usrp_local_sighandler::~usrp_local_sighandler ()
-{
-#ifdef HAVE_SIGACTION
-  if (sigaction (d_signum, &d_old_action, 0) < 0){
-    perror ("sigaction (restore old)");
-    throw std::runtime_error ("sigaction");
-  }
-#endif
-}
-
-void
-usrp_local_sighandler::throw_signal(int signum) throw(usrp_signal)
-{
-  throw usrp_signal (signum);
-}
-
-/*
- * Semi-hideous way to may a signal number into a signal name
- */
-
-#define SIGNAME(x) case x: return #x
-
-std::string
-usrp_signal::name () const
-{
-  char tmp[128];
-
-  switch (signal ()){
-#ifdef SIGHUP
-    SIGNAME (SIGHUP);
-#endif
-#ifdef SIGINT
-    SIGNAME (SIGINT);
-#endif
-#ifdef SIGQUIT
-    SIGNAME (SIGQUIT);
-#endif
-#ifdef SIGILL
-    SIGNAME (SIGILL);
-#endif
-#ifdef SIGTRAP
-    SIGNAME (SIGTRAP);
-#endif
-#ifdef SIGABRT
-    SIGNAME (SIGABRT);
-#endif
-#ifdef SIGBUS
-    SIGNAME (SIGBUS);
-#endif
-#ifdef SIGFPE
-    SIGNAME (SIGFPE);
-#endif
-#ifdef SIGKILL
-    SIGNAME (SIGKILL);
-#endif
-#ifdef SIGUSR1
-    SIGNAME (SIGUSR1);
-#endif
-#ifdef SIGSEGV
-    SIGNAME (SIGSEGV);
-#endif
-#ifdef SIGUSR2
-    SIGNAME (SIGUSR2);
-#endif
-#ifdef SIGPIPE
-    SIGNAME (SIGPIPE);
-#endif
-#ifdef SIGALRM
-    SIGNAME (SIGALRM);
-#endif
-#ifdef SIGTERM
-    SIGNAME (SIGTERM);
-#endif
-#ifdef SIGSTKFLT
-    SIGNAME (SIGSTKFLT);
-#endif
-#ifdef SIGCHLD
-    SIGNAME (SIGCHLD);
-#endif
-#ifdef SIGCONT
-    SIGNAME (SIGCONT);
-#endif
-#ifdef SIGSTOP
-    SIGNAME (SIGSTOP);
-#endif
-#ifdef SIGTSTP
-    SIGNAME (SIGTSTP);
-#endif
-#ifdef SIGTTIN
-    SIGNAME (SIGTTIN);
-#endif
-#ifdef SIGTTOU
-    SIGNAME (SIGTTOU);
-#endif
-#ifdef SIGURG
-    SIGNAME (SIGURG);
-#endif
-#ifdef SIGXCPU
-    SIGNAME (SIGXCPU);
-#endif
-#ifdef SIGXFSZ
-    SIGNAME (SIGXFSZ);
-#endif
-#ifdef SIGVTALRM
-    SIGNAME (SIGVTALRM);
-#endif
-#ifdef SIGPROF
-    SIGNAME (SIGPROF);
-#endif
-#ifdef SIGWINCH
-    SIGNAME (SIGWINCH);
-#endif
-#ifdef SIGIO
-    SIGNAME (SIGIO);
-#endif
-#ifdef SIGPWR
-    SIGNAME (SIGPWR);
-#endif
-#ifdef SIGSYS
-    SIGNAME (SIGSYS);
-#endif
-  default:
-#if defined (HAVE_SNPRINTF)
-#if defined (SIGRTMIN) && defined (SIGRTMAX) 
-    if (signal () >= SIGRTMIN && signal () <= SIGRTMAX){
-      snprintf (tmp, sizeof (tmp), "SIGRTMIN + %d", signal ());
-      return tmp;
-    }
-#endif
-    snprintf (tmp, sizeof (tmp), "SIGNAL %d", signal ());
-    return tmp;
-#else
-    return "Unknown signal";
-#endif
-  }
-}
diff --git a/usrp/host/lib/usrp_prims_common.cc b/usrp/host/lib/usrp_prims_common.cc
deleted file mode 100644
index 20a55653c..000000000
--- a/usrp/host/lib/usrp_prims_common.cc
+++ /dev/null
@@ -1,1241 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2004,2006,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "usrp_primsi.h"
-#include "usrp_commands.h"
-#include "usrp_ids.h"
-#include "usrp_i2c_addr.h"
-#include "fpga_regs_common.h"
-#include "fpga_regs_standard.h"
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <time.h>		// FIXME should check with autoconf (nanosleep)
-#include <algorithm>
-#include <ad9862.h>
-#include <assert.h>
-#include "std_paths.h"
-
-extern "C" {
-#include "md5.h"
-};
-
-#define VERBOSE 0
-
-using namespace ad9862;
-
-static const int FIRMWARE_HASH_SLOT	= 0;
-static const int FPGA_HASH_SLOT 	= 1;
-
-static const int hash_slot_addr[2] = {
-  USRP_HASH_SLOT_0_ADDR,
-  USRP_HASH_SLOT_1_ADDR
-};
-
-static const char *default_firmware_filename = "std.ihx";
-static const char *default_fpga_filename     = "std_2rxhb_2tx.rbf";
-
-static char *
-find_file (const char *filename, int hw_rev)
-{
-  const char **sp = std_paths;
-  static char path[1000];
-  char *s;
-
-  s = getenv("USRP_PATH");
-  if (s) {
-    snprintf (path, sizeof (path), "%s/rev%d/%s", s, hw_rev, filename);
-    if (access (path, R_OK) == 0)
-      return path;
-  }
-
-  while (*sp){
-    snprintf (path, sizeof (path), "%s/rev%d/%s", *sp, hw_rev, filename);
-    if (access (path, R_OK) == 0)
-      return path;
-    sp++;
-  }
-  return 0;
-}
-
-static const char *
-get_proto_filename(const std::string user_filename, const char *env_var, const char *def)
-{
-  if (user_filename.length() != 0)
-    return user_filename.c_str();
-
-  char *s = getenv(env_var);
-  if (s && *s)
-    return s;
-
-  return def;
-}
-
-
-static void power_down_9862s (libusb_device_handle *udh);
-
-
-// ----------------------------------------------------------------
-
-/*
- * q must be a real USRP, not an FX2.  Return its hardware rev number.
- */
-
-int
-usrp_hw_rev (libusb_device *q)
-{
-  libusb_device_descriptor desc = _get_usb_device_descriptor(q);
-  return desc.bcdDevice & 0x00FF;
-}
-
-/*
- * q must be a real USRP, not an FX2.  Return true if it's configured.
- */
-static bool
-_usrp_configured_p (libusb_device *q)
-{
-  libusb_device_descriptor desc = _get_usb_device_descriptor(q);
-  return (desc.bcdDevice & 0xFF00) != 0;
-}
-
-bool
-usrp_usrp_p (libusb_device *q)
-{
-  libusb_device_descriptor desc = _get_usb_device_descriptor(q);
-  return (desc.idVendor == USB_VID_FSF
-          && desc.idProduct == USB_PID_FSF_USRP);
-}
-
-bool
-usrp_fx2_p (libusb_device *q)
-{
-  libusb_device_descriptor desc = _get_usb_device_descriptor(q);
-  return (desc.idVendor == USB_VID_CYPRESS
-          && desc.idProduct == USB_PID_CYPRESS_FX2);
-}
-
-bool
-usrp_usrp0_p (libusb_device *q)
-{
-  return usrp_usrp_p (q) && usrp_hw_rev (q) == 0;
-}
-
-bool
-usrp_usrp1_p (libusb_device *q)
-{
-  return usrp_usrp_p (q) && usrp_hw_rev (q) == 1;
-}
-
-bool
-usrp_usrp2_p (libusb_device *q)
-{
-  return usrp_usrp_p (q) && usrp_hw_rev (q) == 2;
-}
-
-
-bool
-usrp_unconfigured_usrp_p (libusb_device *q)
-{
-  return usrp_usrp_p (q) && !_usrp_configured_p (q);
-}
-
-bool
-usrp_configured_usrp_p (libusb_device *q)
-{
-  return usrp_usrp_p (q) && _usrp_configured_p (q);
-}
-
-
-// ----------------------------------------------------------------
-
-
-libusb_device_handle *
-usrp_open_cmd_interface (libusb_device *dev)
-{
-  return usrp_open_interface (dev, USRP_CMD_INTERFACE, USRP_CMD_ALTINTERFACE);
-}
-
-libusb_device_handle *
-usrp_open_rx_interface (libusb_device *dev)
-{
-  return usrp_open_interface (dev, USRP_RX_INTERFACE, USRP_RX_ALTINTERFACE);
-}
-
-libusb_device_handle *
-usrp_open_tx_interface (libusb_device *dev)
-{
-  return usrp_open_interface (dev, USRP_TX_INTERFACE, USRP_TX_ALTINTERFACE);
-}
-
-
-// ----------------------------------------------------------------
-// write internal ram using Cypress vendor extension
-
-static bool
-write_internal_ram (libusb_device_handle *udh, unsigned char *buf,
-                    int start_addr, size_t len)
-{
-  int addr;
-  int n;
-  int a;
-  int quanta = MAX_EP0_PKTSIZE;
-
-  for (addr = start_addr; addr < start_addr + (int) len; addr += quanta){
-    n = len + start_addr - addr;
-    if (n > quanta)
-      n = quanta;
-
-    a = _usb_control_transfer (udh, 0x40, 0xA0, addr, 0,
-                       (unsigned char*)(buf + (addr - start_addr)), n, 1000);
-
-    if (a < 0){
-      fprintf(stderr,"write_internal_ram failed\n");
-      return false;
-    }
-  }
-  return true;
-}
-
-
-// ----------------------------------------------------------------
-// whack the CPUCS register using the upload RAM vendor extension
-
-static bool
-reset_cpu (libusb_device_handle *udh, bool reset_p)
-{
-  unsigned char v;
-
-  if (reset_p)
-    v = 1;		// hold processor in reset
-  else
-    v = 0;	        // release reset
-
-  return write_internal_ram (udh, &v, 0xE600, 1);
-}
-
-// ----------------------------------------------------------------
-// Load intel format file into cypress FX2 (8051)
-
-static bool
-_usrp_load_firmware (libusb_device_handle *udh, const char *filename,
-		     unsigned char hash[USRP_HASH_SIZE])
-{
-  FILE	*f = fopen (filename, "ra");
-  if (f == 0){
-    perror (filename);
-    return false;
-  }
-
-  if (!reset_cpu (udh, true))	// hold CPU in reset while loading firmware
-    goto fail;
-
-
-  char s[1024];
-  int length;
-  int addr;
-  int type;
-  unsigned char data[256];
-  unsigned char checksum, a;
-  unsigned int b;
-  int i;
-
-  while (!feof(f)){
-    fgets(s, sizeof (s), f); /* we should not use more than 263 bytes normally */
-    if(s[0]!=':'){
-      fprintf(stderr,"%s: invalid line: \"%s\"\n", filename, s);
-      goto fail;
-    }
-    sscanf(s+1, "%02x", &length);
-    sscanf(s+3, "%04x", &addr);
-    sscanf(s+7, "%02x", &type);
-
-    if(type==0){
-
-      a=length+(addr &0xff)+(addr>>8)+type;
-      for(i=0;i<length;i++){
-	sscanf (s+9+i*2,"%02x", &b);
-	data[i]=b;
-	a=a+data[i];
-      }
-
-      sscanf (s+9+length*2,"%02x", &b);
-      checksum=b;
-      if (((a+checksum)&0xff)!=0x00){
-	fprintf (stderr, "  ** Checksum failed: got 0x%02x versus 0x%02x\n", (-a)&0xff, checksum);
-	goto fail;
-      }
-      if (!write_internal_ram (udh, data, addr, length))
-	goto fail;
-    }
-    else if (type == 0x01){      // EOF
-      break;
-    }
-    else if (type == 0x02){
-      fprintf (stderr, "Extended address: whatever I do with it?\n");
-      fprintf (stderr, "%s: invalid line: \"%s\"\n", filename, s);
-      goto fail;
-    }
-  }
-
-  // we jam the hash value into the FX2 memory before letting
-  // the cpu out of reset.  When it comes out of reset it
-  // may renumerate which will invalidate udh.
-
-  if (!usrp_set_hash (udh, FIRMWARE_HASH_SLOT, hash))
-    fprintf (stderr, "usrp: failed to write firmware hash slot\n");
-
-  if (!reset_cpu (udh, false))		// take CPU out of reset
-    goto fail;
-
-  fclose (f);
-  return true;
-
- fail:
-  fclose (f);
-  return false;
-}
-
-// ----------------------------------------------------------------
-// load fpga
-
-static bool
-_usrp_load_fpga (libusb_device_handle *udh, const char *filename,
-		 unsigned char hash[USRP_HASH_SIZE])
-{
-  bool ok = true;
-
-  FILE	*fp = fopen (filename, "rb");
-  if (fp == 0){
-    perror (filename);
-    return false;
-  }
-
-  unsigned char buf[MAX_EP0_PKTSIZE];	// 64 is max size of EP0 packet on FX2
-  int n;
-
-  usrp_set_led (udh, 1, 1);		// led 1 on
-
-
-  // reset FPGA (and on rev1 both AD9862's, thus killing clock)
-  usrp_set_fpga_reset (udh, 1);		// hold fpga in reset
-
-  if (write_cmd (udh, VRQ_FPGA_LOAD, 0, FL_BEGIN, 0, 0) != 0)
-    goto fail;
-
-  while ((n = fread (buf, 1, sizeof (buf), fp)) > 0){
-    if (write_cmd (udh, VRQ_FPGA_LOAD, 0, FL_XFER, buf, n) != n)
-      goto fail;
-  }
-
-  if (write_cmd (udh, VRQ_FPGA_LOAD, 0, FL_END, 0, 0) != 0)
-    goto fail;
-
-  fclose (fp);
-
-  if (!usrp_set_hash (udh, FPGA_HASH_SLOT, hash))
-    fprintf (stderr, "usrp: failed to write fpga hash slot\n");
-
-  // On the rev1 USRP, the {tx,rx}_{enable,reset} bits are
-  // controlled over the serial bus, and hence aren't observed until
-  // we've got a good fpga bitstream loaded.
-
-  usrp_set_fpga_reset (udh, 0);		// fpga out of master reset
-
-  // now these commands will work
-
-  ok &= usrp_set_fpga_tx_enable (udh, 0);
-  ok &= usrp_set_fpga_rx_enable (udh, 0);
-
-  ok &= usrp_set_fpga_tx_reset (udh, 1);	// reset tx and rx paths
-  ok &= usrp_set_fpga_rx_reset (udh, 1);
-  ok &= usrp_set_fpga_tx_reset (udh, 0);	// reset tx and rx paths
-  ok &= usrp_set_fpga_rx_reset (udh, 0);
-
-  if (!ok)
-    fprintf (stderr, "usrp: failed to reset tx and/or rx path\n");
-
-  // Manually reset all regs except master control to zero.
-  // FIXME may want to remove this when we rework FPGA reset strategy.
-  // In the mean while, this gets us reproducible behavior.
-  for (int i = 0; i < FR_USER_0; i++){
-    if (i == FR_MASTER_CTRL)
-      continue;
-    usrp_write_fpga_reg(udh, i, 0);
-  }
-
-  power_down_9862s (udh);		// on the rev1, power these down!
-  usrp_set_led (udh, 1, 0);		// led 1 off
-
-  return true;
-
- fail:
-  power_down_9862s (udh);		// on the rev1, power these down!
-  fclose (fp);
-  return false;
-}
-
-// ----------------------------------------------------------------
-
-bool
-usrp_set_led (libusb_device_handle *udh, int which, bool on)
-{
-  int r = write_cmd (udh, VRQ_SET_LED, on, which, 0, 0);
-
-  return r == 0;
-}
-
-bool
-usrp_set_hash (libusb_device_handle *udh, int which,
-               const unsigned char hash[USRP_HASH_SIZE])
-{
-  which &= 1;
-
-  // we use the Cypress firmware down load command to jam it in.
-  int r = _usb_control_transfer (udh, 0x40, 0xa0, hash_slot_addr[which], 0,
-                                (unsigned char *) hash, USRP_HASH_SIZE, 1000);
-
-  if (r < 0)
-     fprintf (stderr, "usrp: failed to set hash\n");
-
-  return r == USRP_HASH_SIZE;
-}
-
-bool
-usrp_get_hash (libusb_device_handle *udh, int which,
-               unsigned char hash[USRP_HASH_SIZE])
-{
-  which &= 1;
-
-  // we use the Cypress firmware upload command to fetch it.
-  int r = _usb_control_transfer (udh, 0xc0, 0xa0, hash_slot_addr[which], 0,
-                                (unsigned char *) hash, USRP_HASH_SIZE, 1000);
-
-  if (r < 0)
-     fprintf (stderr, "usrp: failed to get hash\n");
-
-  return r == USRP_HASH_SIZE;
-}
-
-
-
-static bool
-usrp_set_switch (libusb_device_handle *udh, int cmd_byte, bool on)
-{
-  return write_cmd (udh, cmd_byte, on, 0, 0, 0) == 0;
-}
-
-static bool
-usrp1_fpga_write (libusb_device_handle *udh,
-		  int regno, int value)
-{
-  // on the rev1 usrp, we use the generic spi_write interface
-
-  unsigned char buf[4];
-
-  buf[0] = (value >> 24) & 0xff;	// MSB first
-  buf[1] = (value >> 16) & 0xff;
-  buf[2] = (value >>  8) & 0xff;
-  buf[3] = (value >>  0) & 0xff;
-
-  return usrp_spi_write (udh, 0x00 | (regno & 0x7f),
-			 SPI_ENABLE_FPGA,
-			 SPI_FMT_MSB | SPI_FMT_HDR_1,
-			 buf, sizeof (buf));
-}
-
-static bool
-usrp1_fpga_read (libusb_device_handle *udh,
-		 int regno, int *value)
-{
-  *value = 0;
-  unsigned char buf[4];
-
-  bool ok = usrp_spi_read (udh, 0x80 | (regno & 0x7f),
-			   SPI_ENABLE_FPGA,
-			   SPI_FMT_MSB | SPI_FMT_HDR_1,
-			   buf, sizeof (buf));
-
-  if (ok)
-    *value = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
-
-  return ok;
-}
-
-bool
-usrp_write_fpga_reg (libusb_device_handle *udh, int reg, int value)
-{
-  switch (usrp_hw_rev (_get_usb_device (udh))){
-  case 0:                       // not supported ;)
-    abort();
-
-  default:
-    return usrp1_fpga_write (udh, reg, value);
-  }
-}
-
-bool
-usrp_read_fpga_reg (libusb_device_handle *udh, int reg, int *value)
-{
-  switch (usrp_hw_rev (_get_usb_device (udh))){
-  case 0:               // not supported ;)
-    abort();
-
-  default:
-    return usrp1_fpga_read (udh, reg, value);
-  }
-}
-
-bool
-usrp_set_fpga_reset (libusb_device_handle *udh, bool on)
-{
-  return usrp_set_switch (udh, VRQ_FPGA_SET_RESET, on);
-}
-
-bool
-usrp_set_fpga_tx_enable (libusb_device_handle *udh, bool on)
-{
-  return usrp_set_switch (udh, VRQ_FPGA_SET_TX_ENABLE, on);
-}
-
-bool
-usrp_set_fpga_rx_enable (libusb_device_handle *udh, bool on)
-{
-  return usrp_set_switch (udh, VRQ_FPGA_SET_RX_ENABLE, on);
-}
-
-bool
-usrp_set_fpga_tx_reset (libusb_device_handle *udh, bool on)
-{
-  return usrp_set_switch (udh, VRQ_FPGA_SET_TX_RESET, on);
-}
-
-bool
-usrp_set_fpga_rx_reset (libusb_device_handle *udh, bool on)
-{
-  return usrp_set_switch (udh, VRQ_FPGA_SET_RX_RESET, on);
-}
-
-
-// ----------------------------------------------------------------
-// conditional load stuff
-
-static bool
-compute_hash (const char *filename, unsigned char hash[USRP_HASH_SIZE])
-{
-  assert (USRP_HASH_SIZE == 16);
-  memset (hash, 0, USRP_HASH_SIZE);
-
-  FILE *fp = fopen (filename, "rb");
-  if (fp == 0){
-    perror (filename);
-    return false;
-  }
-  int r = md5_stream (fp, hash);
-  fclose (fp);
-
-  return r == 0;
-}
-
-static usrp_load_status_t
-usrp_conditionally_load_something (libusb_device_handle *udh,
-				   const char *filename,
-				   bool force,
-				   int slot,
-				   bool loader (libusb_device_handle *,
-						const char *,
-						unsigned char [USRP_HASH_SIZE]))
-{
-  unsigned char file_hash[USRP_HASH_SIZE];
-  unsigned char usrp_hash[USRP_HASH_SIZE];
-
-  if (access (filename, R_OK) != 0){
-    perror (filename);
-    return ULS_ERROR;
-  }
-
-  if (!compute_hash (filename, file_hash))
-    return ULS_ERROR;
-
-  if (!force
-      && usrp_get_hash (udh, slot, usrp_hash)
-      && memcmp (file_hash, usrp_hash, USRP_HASH_SIZE) == 0)
-    return ULS_ALREADY_LOADED;
-
-  bool r = loader (udh, filename, file_hash);
-
-  if (!r)
-    return ULS_ERROR;
-
-  return ULS_OK;
-}
-
-usrp_load_status_t
-usrp_load_firmware (libusb_device_handle *udh,
-		    const char *filename,
-		    bool force)
-{
-  return usrp_conditionally_load_something (udh, filename, force,
-					    FIRMWARE_HASH_SLOT,
-					    _usrp_load_firmware);
-}
-
-usrp_load_status_t
-usrp_load_fpga (libusb_device_handle *udh,
-		const char *filename,
-		bool force)
-{
-  return usrp_conditionally_load_something (udh, filename, force,
-					    FPGA_HASH_SLOT,
-					    _usrp_load_fpga);
-}
-
-static libusb_device_handle *
-open_nth_cmd_interface (int nth, libusb_context *ctx)
-{
-
-  libusb_device *udev = usrp_find_device (nth, false, ctx);
-  if (udev == 0){
-    fprintf (stderr, "usrp: failed to find usrp[%d]\n", nth);
-    return 0;
-  }
-
-  libusb_device_handle *udh;
-
-  udh = usrp_open_cmd_interface (udev);
-  if (udh == 0){
-    // FIXME this could be because somebody else has it open.
-    // We should delay and retry...
-    fprintf (stderr, "open_nth_cmd_interface: open_cmd_interface failed\n");
-    return 0;
-  }
-
-  return udh;
-}
-
-static bool
-our_nanosleep (const struct timespec *delay)
-{
-  struct timespec	new_delay = *delay;
-  struct timespec	remainder;
-
-  while (1){
-    int r = nanosleep (&new_delay, &remainder);
-    if (r == 0)
-      return true;
-    if (errno == EINTR)
-      new_delay = remainder;
-    else {
-      perror ("nanosleep");
-      return false;
-    }
-  }
-}
-
-static bool
-mdelay (int millisecs)
-{
-  struct timespec	ts;
-  ts.tv_sec = millisecs / 1000;
-  ts.tv_nsec = (millisecs - (1000 * ts.tv_sec)) * 1000000;
-  return our_nanosleep (&ts);
-}
-
-
-usrp_load_status_t
-usrp_load_firmware_nth (int nth, const char *filename, bool force, libusb_context *ctx)
-{
-  libusb_device_handle *udh = open_nth_cmd_interface (nth, ctx);
-  if (udh == 0)
-    return ULS_ERROR;
-
-  usrp_load_status_t s = usrp_load_firmware (udh, filename, force);
-  usrp_close_interface (udh);
-
-  switch (s){
-
-  case ULS_ALREADY_LOADED:              // nothing changed...
-    return ULS_ALREADY_LOADED;
-    break;
-
-  case ULS_OK:
-    // we loaded firmware successfully.
-
-    // It's highly likely that the board will renumerate (simulate a
-    // disconnect/reconnect sequence), invalidating our current
-    // handle.
-
-    // FIXME.  Turn this into a loop that rescans until we refind ourselves
-
-    struct timespec     t;      // delay for 2 second
-    t.tv_sec = 2;
-    t.tv_nsec = 0;
-    our_nanosleep (&t);
-
-    usrp_rescan ();
-
-    return ULS_OK;
-
-  default:
-  case ULS_ERROR:               // some kind of problem
-    return ULS_ERROR;
-  }
-}
-
-static void
-load_status_msg (usrp_load_status_t s, const char *type, const char *filename)
-{
-  char *e = getenv("USRP_VERBOSE");
-  bool verbose = e != 0;
-
-  switch (s){
-  case ULS_ERROR:
-    fprintf (stderr, "usrp: failed to load %s %s.\n", type, filename);
-    break;
-
-  case ULS_ALREADY_LOADED:
-    if (verbose)
-      fprintf (stderr, "usrp: %s %s already loaded.\n", type, filename);
-    break;
-
-  case ULS_OK:
-    if (verbose)
-      fprintf (stderr, "usrp: %s %s loaded successfully.\n", type, filename);
-    break;
-  }
-}
-
-bool
-usrp_load_standard_bits (int nth, bool force,
-			 const std::string fpga_filename,
-			 const std::string firmware_filename,
-			 libusb_context *ctx)
-{
-  usrp_load_status_t 	s;
-  const char		*filename;
-  const char		*proto_filename;
-  int hw_rev;
-
-  // first, figure out what hardware rev we're dealing with
-  {
-    libusb_device *udev = usrp_find_device (nth, false, ctx);
-    if (udev == 0){
-      fprintf (stderr, "usrp: failed to find usrp[%d]\n", nth);
-      return false;
-    }
-    hw_rev = usrp_hw_rev (udev);
-  }
-
-  // start by loading the firmware
-
-  proto_filename = get_proto_filename(firmware_filename, "USRP_FIRMWARE",
-				      default_firmware_filename);
-  filename = find_file(proto_filename, hw_rev);
-  if (filename == 0){
-    fprintf (stderr, "Can't find firmware: %s\n", proto_filename);
-    return false;
-  }
-  s = usrp_load_firmware_nth (nth, filename, force, ctx);
-  load_status_msg (s, "firmware", filename);
-
-  if (s == ULS_ERROR)
-    return false;
-
-  // if we actually loaded firmware, we must reload fpga ...
-  if (s == ULS_OK)
-    force = true;
-
-  // now move on to the fpga configuration bitstream
-
-  proto_filename = get_proto_filename(fpga_filename, "USRP_FPGA",
-				      default_fpga_filename);
-  filename = find_file (proto_filename, hw_rev);
-  if (filename == 0){
-    fprintf (stderr, "Can't find fpga bitstream: %s\n", proto_filename);
-    return false;
-  }
-  libusb_device_handle *udh = open_nth_cmd_interface (nth, ctx);
-  if (udh == 0)
-    return false;
-
-  s = usrp_load_fpga (udh, filename, force);
-  usrp_close_interface (udh);
-  load_status_msg (s, "fpga bitstream", filename);
-
-  if (s == ULS_ERROR)
-    return false;
-
-  return true;
-}
-
-
-bool
-_usrp_get_status (libusb_device_handle *udh, int which, bool *trouble)
-{
-  unsigned char	status;
-  *trouble = true;
-
-  if (write_cmd (udh, VRQ_GET_STATUS, 0, which,
-		 &status, sizeof (status)) != sizeof (status))
-    return false;
-
-  *trouble = status;
-  return true;
-}
-
-bool
-usrp_check_rx_overrun (libusb_device_handle *udh, bool *overrun_p)
-{
-  return _usrp_get_status (udh, GS_RX_OVERRUN, overrun_p);
-}
-
-bool
-usrp_check_tx_underrun (libusb_device_handle *udh, bool *underrun_p)
-{
-  return _usrp_get_status (udh, GS_TX_UNDERRUN, underrun_p);
-}
-
-
-bool
-usrp_i2c_write (libusb_device_handle *udh, int i2c_addr,
-		const void *buf, int len)
-{
-  if (len < 1 || len > MAX_EP0_PKTSIZE)
-    return false;
-
-  return write_cmd (udh, VRQ_I2C_WRITE, i2c_addr, 0,
-		    (unsigned char *) buf, len) == len;
-}
-
-
-bool
-usrp_i2c_read (libusb_device_handle *udh, int i2c_addr,
-	       void *buf, int len)
-{
-  if (len < 1 || len > MAX_EP0_PKTSIZE)
-    return false;
-
-  return write_cmd (udh, VRQ_I2C_READ, i2c_addr, 0,
-		    (unsigned char *) buf, len) == len;
-}
-
-bool
-usrp_spi_write (libusb_device_handle *udh,
-		int optional_header, int enables, int format,
-		const void *buf, int len)
-{
-  if (len < 0 || len > MAX_EP0_PKTSIZE)
-    return false;
-
-  return write_cmd (udh, VRQ_SPI_WRITE,
-		    optional_header,
-		    ((enables & 0xff) << 8) | (format & 0xff),
-		    (unsigned char *) buf, len) == len;
-}
-
-
-bool
-usrp_spi_read (libusb_device_handle *udh,
-	       int optional_header, int enables, int format,
-	       void *buf, int len)
-{
-  if (len < 0 || len > MAX_EP0_PKTSIZE)
-    return false;
-
-  return write_cmd (udh, VRQ_SPI_READ,
-		    optional_header,
-		    ((enables & 0xff) << 8) | (format & 0xff),
-		    (unsigned char *) buf, len) == len;
-}
-
-bool
-usrp_9862_write (libusb_device_handle *udh, int which_codec,
-		 int regno, int value)
-{
-  if (0)
-    fprintf (stderr, "usrp_9862_write which = %d, reg = %2d, val = %3d (0x%02x)\n",
-	     which_codec, regno, value, value);
-
-  unsigned char buf[1];
-
-  buf[0] = value;
-
-  return usrp_spi_write (udh, 0x00 | (regno & 0x3f),
-			 which_codec == 0 ? SPI_ENABLE_CODEC_A : SPI_ENABLE_CODEC_B,
-			 SPI_FMT_MSB | SPI_FMT_HDR_1,
-			 buf, 1);
-}
-
-bool
-usrp_9862_read (libusb_device_handle *udh, int which_codec,
-		int regno, unsigned char *value)
-{
-  return usrp_spi_read (udh, 0x80 | (regno & 0x3f),
-			which_codec == 0 ? SPI_ENABLE_CODEC_A : SPI_ENABLE_CODEC_B,
-			SPI_FMT_MSB | SPI_FMT_HDR_1,
-			value, 1);
-}
-
-bool
-usrp_9862_write_many (libusb_device_handle *udh,
-		      int which_codec,
-		      const unsigned char *buf,
-		      int len)
-{
-  if (len & 0x1)
-    return false;		// must be even
-
-  bool result = true;
-
-  while (len > 0){
-    result &= usrp_9862_write (udh, which_codec, buf[0], buf[1]);
-    len -= 2;
-    buf += 2;
-  }
-
-  return result;
-}
-
-
-bool
-usrp_9862_write_many_all (libusb_device_handle *udh,
-			   const unsigned char *buf, int len)
-{
-  // FIXME handle 2/2 and 4/4 versions
-
-  bool result;
-  result  = usrp_9862_write_many (udh, 0, buf, len);
-  result &= usrp_9862_write_many (udh, 1, buf, len);
-  return result;
-}
-
-static void
-power_down_9862s (libusb_device_handle *udh)
-{
-  static const unsigned char regs[] = {
-    REG_RX_PWR_DN,	0x01,		// everything
-    REG_TX_PWR_DN,	0x0f,		// pwr dn digital and analog_both
-    REG_TX_MODULATOR,	0x00		// coarse & fine modulators disabled
-  };
-
-  switch (usrp_hw_rev (_get_usb_device (udh))){
-  case 0:
-    break;
-
-  default:
-    usrp_9862_write_many_all (udh, regs, sizeof (regs));
-    break;
-  }
-}
-
-
-static const int EEPROM_PAGESIZE = 16;
-
-bool
-usrp_eeprom_write (libusb_device_handle *udh, int i2c_addr,
-		   int eeprom_offset, const void *buf, int len)
-{
-  unsigned char cmd[2];
-  const unsigned char *p = (unsigned char *) buf;
-
-  // The simplest thing that could possibly work:
-  //   all writes are single byte writes.
-  //
-  // We could speed this up using the page write feature,
-  // but we write so infrequently, why bother...
-
-  while (len-- > 0){
-    cmd[0] = eeprom_offset++;
-    cmd[1] = *p++;
-    bool r = usrp_i2c_write (udh, i2c_addr, cmd, sizeof (cmd));
-    mdelay (10);		// delay 10ms worst case write time
-    if (!r)
-      return false;
-  }
-
-  return true;
-}
-
-bool
-usrp_eeprom_read (libusb_device_handle *udh, int i2c_addr,
-		  int eeprom_offset, void *buf, int len)
-{
-  unsigned char *p = (unsigned char *) buf;
-
-  // We setup a random read by first doing a "zero byte write".
-  // Writes carry an address.  Reads use an implicit address.
-
-  unsigned char cmd[1];
-  cmd[0] = eeprom_offset;
-  if (!usrp_i2c_write (udh, i2c_addr, cmd, sizeof (cmd)))
-    return false;
-
-  while (len > 0){
-    int n = std::min (len, MAX_EP0_PKTSIZE);
-    if (!usrp_i2c_read (udh, i2c_addr, p, n))
-      return false;
-    len -= n;
-    p += n;
-  }
-  return true;
-}
-
-// ----------------------------------------------------------------
-
-static bool
-slot_to_codec (int slot, int *which_codec)
-{
-  *which_codec = 0;
-
-  switch (slot){
-  case SLOT_TX_A:
-  case SLOT_RX_A:
-    *which_codec = 0;
-    break;
-
-  case SLOT_TX_B:
-  case SLOT_RX_B:
-    *which_codec = 1;
-    break;
-
-  default:
-    fprintf (stderr, "usrp_prims:slot_to_codec: invalid slot = %d\n", slot);
-    return false;
-  }
-  return true;
-}
-
-static bool
-tx_slot_p (int slot)
-{
-  switch (slot){
-  case SLOT_TX_A:
-  case SLOT_TX_B:
-    return true;
-
-  default:
-    return false;
-  }
-}
-
-bool
-usrp_write_aux_dac (libusb_device_handle *udh, int slot,
-		    int which_dac, int value)
-{
-  int which_codec;
-
-  if (!slot_to_codec (slot, &which_codec))
-    return false;
-
-  if (!(0 <= which_dac && which_dac < 4)){
-    fprintf (stderr, "usrp_write_aux_dac: invalid dac = %d\n", which_dac);
-    return false;
-  }
-
-  value &= 0x0fff;	// mask to 12-bits
-
-  if (which_dac == 3){
-    // dac 3 is really 12-bits.  Use value as is.
-    bool r = true;
-    r &= usrp_9862_write (udh, which_codec, 43, (value >> 4));       // most sig
-    r &= usrp_9862_write (udh, which_codec, 42, (value & 0xf) << 4); // least sig
-    return r;
-  }
-  else {
-    // dac 0, 1, and 2 are really 8 bits.
-    value = value >> 4;		// shift value appropriately
-    return usrp_9862_write (udh, which_codec, 36 + which_dac, value);
-  }
-}
-
-
-bool
-usrp_read_aux_adc (libusb_device_handle *udh, int slot,
-		   int which_adc, int *value)
-{
-  *value = 0;
-  int	which_codec;
-
-  if (!slot_to_codec (slot, &which_codec))
-    return false;
-
-  if (!(0 <= which_codec && which_codec < 2)){
-    fprintf (stderr, "usrp_read_aux_adc: invalid adc = %d\n", which_adc);
-    return false;
-  }
-
-  unsigned char aux_adc_control =
-    AUX_ADC_CTRL_REFSEL_A		// on chip reference
-    | AUX_ADC_CTRL_REFSEL_B;		// on chip reference
-
-  int	rd_reg = 26;	// base address of two regs to read for result
-
-  // program the ADC mux bits
-  if (tx_slot_p (slot))
-    aux_adc_control |= AUX_ADC_CTRL_SELECT_A2 | AUX_ADC_CTRL_SELECT_B2;
-  else {
-    rd_reg += 2;
-    aux_adc_control |= AUX_ADC_CTRL_SELECT_A1 | AUX_ADC_CTRL_SELECT_B1;
-  }
-
-  // I'm not sure if we can set the mux and issue a start conversion
-  // in the same cycle, so let's do them one at a time.
-
-  usrp_9862_write (udh, which_codec, 34, aux_adc_control);
-
-  if (which_adc == 0)
-    aux_adc_control |= AUX_ADC_CTRL_START_A;
-  else {
-    rd_reg += 4;
-    aux_adc_control |= AUX_ADC_CTRL_START_B;
-  }
-
-  // start the conversion
-  usrp_9862_write (udh, which_codec, 34, aux_adc_control);
-
-  // read the 10-bit result back
-  unsigned char v_lo = 0;
-  unsigned char v_hi = 0;
-  bool r = usrp_9862_read (udh, which_codec, rd_reg, &v_lo);
-  r &= usrp_9862_read (udh, which_codec, rd_reg + 1, &v_hi);
-
-  if (r)
-    *value = ((v_hi << 2) | ((v_lo >> 6) & 0x3)) << 2;	// format as 12-bit
-
-  return r;
-}
-
-// ----------------------------------------------------------------
-
-static int slot_to_i2c_addr (int slot)
-{
-  switch (slot){
-  case SLOT_TX_A:	return I2C_ADDR_TX_A;
-  case SLOT_RX_A:	return I2C_ADDR_RX_A;
-  case SLOT_TX_B:	return I2C_ADDR_TX_B;
-  case SLOT_RX_B:	return I2C_ADDR_RX_B;
-  default:		return -1;
-  }
-}
-
-static void
-set_chksum (unsigned char *buf)
-{
-  int sum = 0;
-  unsigned int i;
-  for (i = 0; i < DB_EEPROM_CLEN - 1; i++)
-    sum += buf[i];
-  buf[i] = -sum;
-}
-
-static usrp_dbeeprom_status_t
-read_dboard_eeprom (libusb_device_handle *udh,
-		    int slot_id, unsigned char *buf)
-{
-  int i2c_addr = slot_to_i2c_addr (slot_id);
-  if (i2c_addr == -1)
-    return UDBE_BAD_SLOT;
-
-  if (!usrp_eeprom_read (udh, i2c_addr, 0, buf, DB_EEPROM_CLEN))
-    return UDBE_NO_EEPROM;
-
-  if (buf[DB_EEPROM_MAGIC] != DB_EEPROM_MAGIC_VALUE)
-    return UDBE_INVALID_EEPROM;
-
-  int sum = 0;
-  for (unsigned int i = 0; i < DB_EEPROM_CLEN; i++)
-    sum += buf[i];
-
-  if ((sum & 0xff) != 0)
-    return UDBE_INVALID_EEPROM;
-
-  return UDBE_OK;
-}
-
-usrp_dbeeprom_status_t
-usrp_read_dboard_eeprom (libusb_device_handle *udh,
-			 int slot_id, usrp_dboard_eeprom *eeprom)
-{
-  unsigned char buf[DB_EEPROM_CLEN];
-
-  memset (eeprom, 0, sizeof (*eeprom));
-
-  usrp_dbeeprom_status_t s = read_dboard_eeprom (udh, slot_id, buf);
-  if (s != UDBE_OK)
-    return s;
-
-  eeprom->id = (buf[DB_EEPROM_ID_MSB] << 8) | buf[DB_EEPROM_ID_LSB];
-  eeprom->oe = (buf[DB_EEPROM_OE_MSB] << 8) | buf[DB_EEPROM_OE_LSB];
-  eeprom->offset[0] = (buf[DB_EEPROM_OFFSET_0_MSB] << 8) | buf[DB_EEPROM_OFFSET_0_LSB];
-  eeprom->offset[1] = (buf[DB_EEPROM_OFFSET_1_MSB] << 8) | buf[DB_EEPROM_OFFSET_1_LSB];
-
-  return UDBE_OK;
-}
-
-bool
-usrp_write_dboard_offsets (libusb_device_handle *udh, int slot_id,
-			   short offset0, short offset1)
-{
-  unsigned char buf[DB_EEPROM_CLEN];
-
-  usrp_dbeeprom_status_t s = read_dboard_eeprom (udh, slot_id, buf);
-  if (s != UDBE_OK)
-    return false;
-
-  buf[DB_EEPROM_OFFSET_0_LSB] = (offset0 >> 0) & 0xff;
-  buf[DB_EEPROM_OFFSET_0_MSB] = (offset0 >> 8) & 0xff;
-  buf[DB_EEPROM_OFFSET_1_LSB] = (offset1 >> 0) & 0xff;
-  buf[DB_EEPROM_OFFSET_1_MSB] = (offset1 >> 8) & 0xff;
-  set_chksum (buf);
-
-  return usrp_eeprom_write (udh, slot_to_i2c_addr (slot_id),
-			    0, buf, sizeof (buf));
-}
-
-// ----------------------------------------------------------------
-
-std::string
-usrp_serial_number(libusb_device_handle *udh)
-{
-  libusb_device_descriptor desc =
-    _get_usb_device_descriptor (_get_usb_device (udh));
-
-  unsigned char iserial = desc.iSerialNumber;
-  if (iserial == 0)
-    return "";
-
-  unsigned char buf[1024];
-  if (_get_usb_string_descriptor (udh, iserial, buf, sizeof(buf)) < 0)
-    return "";
-
-  return (char*) buf;
-}
-
-
-
-
diff --git a/usrp/host/lib/usrp_prims_libusb0.cc b/usrp/host/lib/usrp_prims_libusb0.cc
deleted file mode 100644
index 4fbfabea9..000000000
--- a/usrp/host/lib/usrp_prims_libusb0.cc
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2004,2006,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "usrp_primsi.h"
-#include "usrp_commands.h"
-#include <usb.h>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <ad9862.h>
-#include <assert.h>
-
-extern "C" {
-#include "md5.h"
-};
-
-using namespace ad9862;
-
-/*
- * libusb 0.12 / 1.0 compatibility
- */
-
-struct usb_device *
-_get_usb_device (struct usb_dev_handle *udh)
-{
-  return usb_device (udh);
-}
-
-struct usb_device_descriptor
-_get_usb_device_descriptor (struct usb_device *q)
-{
-  return q->descriptor;
-}
-
-int
-_get_usb_string_descriptor (struct usb_dev_handle *udh, int index,
-                           unsigned char* data, int length)
-{
-  int ret;
-  ret =  usb_get_string_simple (udh, index, (char*) data, length);
-
-  if (ret < 0) {
-    fprintf (stderr, "usrp: usb_get_string_descriptor failed: %s\n",
-             usb_strerror());
-  }
-
-  return ret;
-}
-
-int
-_usb_control_transfer (struct usb_dev_handle *udh, int request_type,
-                      int request, int value, int index,
-                      unsigned char *data, int length, unsigned int timeout)
-{
-  int ret;
-
-  ret = usb_control_msg (udh, request_type,request, value, index,
-                         (char*) data, length, (int) timeout);
-  if (ret < 0) 
-    fprintf (stderr, "usrp: usb_control_msg failed: %s\n", usb_strerror());
-
-  return ret;
-}
-
-
-// ----------------------------------------------------------------
-
-
-void
-usrp_one_time_init (libusb_context **ctx)
-{
-  static bool first = true;
-
-  if (first) {
-    first = false;
-    usb_init ();			// usb library init
-    usb_find_busses ();
-    usb_find_devices ();
-  }
-}
-
-void
-usrp_deinit (libusb_context *ctx)
-{
-  // nop
-}
-
-void
-usrp_rescan ()
-{
-  usb_find_busses ();
-  usb_find_devices ();
-}
-
-
-// ----------------------------------------------------------------
-
-
-struct usb_device *
-usrp_find_device (int nth, bool fx2_ok_p, libusb_context *ctx)
-{
-  struct usb_bus *p;
-  struct usb_device *q;
-  int	 n_found = 0;
-
-  usrp_one_time_init ();
-
-  p = usb_get_busses();
-  while (p != NULL){
-    q = p->devices;
-    while (q != NULL){
-      if (usrp_usrp_p (q) || (fx2_ok_p && usrp_fx2_p (q))){
-	if (n_found == nth)	// return this one
-	  return q;
-	n_found++;		// keep looking
-      }
-      q = q->next;
-    }
-    p = p->next;
-  }
-  return 0;	// not found
-}
-
-struct usb_dev_handle *
-usrp_open_interface (struct usb_device *dev, int interface, int altinterface)
-{
-  struct usb_dev_handle *udh = usb_open (dev);
-  if (udh == 0)
-    return 0;
-
-  if (dev != usb_device (udh)){
-    fprintf (stderr, "%s:%d: internal error!\n", __FILE__, __LINE__);
-    abort ();
-  }
-
-#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-  // There's no get get_configuration function, and with some of the newer kernels
-  // setting the configuration, even if to the same value, hoses any other processes
-  // that have it open.  Hence we opt to not set it at all (We've only
-  // got a single configuration anyway).  This may hose the win32 stuff...
-
-  // Appears to be required for libusb-win32 and Cygwin -- dew 09/20/06
-  if (usb_set_configuration (udh, 1) < 0){
-    /*
-     * Ignore this error.
-     *
-     * Seems that something changed in drivers/usb/core/devio.c:proc_setconfig such that
-     * it returns -EBUSY if _any_ of the interfaces of a device are open.
-     * We've only got a single configuration, so setting it doesn't even seem
-     * like it should be required.
-     */
-  }
-#endif
-
-  if (usb_claim_interface (udh, interface) < 0){
-    fprintf (stderr, "%s:usb_claim_interface: failed interface %d\n", __FUNCTION__,interface);
-    fprintf (stderr, "%s\n", usb_strerror());
-    usb_close (udh);
-    return 0;
-  }
-
-  if (usb_set_altinterface (udh, altinterface) < 0){
-    fprintf (stderr, "%s:usb_set_alt_interface: failed\n", __FUNCTION__);
-    fprintf (stderr, "%s\n", usb_strerror());
-    usb_release_interface (udh, interface);
-    usb_close (udh);
-    return 0;
-  }
-
-  return udh;
-}
-
-bool
-usrp_close_interface (struct usb_dev_handle *udh)
-{
-  // we're assuming that closing an interface automatically releases it.
-  return usb_close (udh) == 0;
-}
-
-
-// ----------------------------------------------------------------
-// write vendor extension command to USRP
-
-
-int
-write_cmd (struct usb_dev_handle *udh,
-	   int request, int value, int index,
-	   unsigned char *bytes, int len)
-{
-  int	requesttype = (request & 0x80) ? VRT_VENDOR_IN : VRT_VENDOR_OUT;
-
-  int r = usb_control_msg (udh, requesttype, request, value, index,
-			   (char *) bytes, len, 1000);
-  if (r < 0){
-    // we get EPIPE if the firmware stalls the endpoint.
-    if (errno != EPIPE) {
-      fprintf (stderr, "usb_control_msg failed: %s\n", usb_strerror ());
-      fprintf (stderr, "write_cmd failed\n");
-    }
-  }
-
-  return r;
-}
-
diff --git a/usrp/host/lib/usrp_prims_libusb1.cc b/usrp/host/lib/usrp_prims_libusb1.cc
deleted file mode 100644
index 5dfe416e1..000000000
--- a/usrp/host/lib/usrp_prims_libusb1.cc
+++ /dev/null
@@ -1,276 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2004,2006,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "usrp_primsi.h"
-#include "usrp_commands.h"
-#include <libusb-1.0/libusb.h>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <ad9862.h>
-#include <assert.h>
-
-extern "C" {
-#include "md5.h"
-};
-
-using namespace ad9862;
-
-static const int LIBUSB1_DEBUG = 0;
-
-/*
- * libusb 0.12 / 1.0 compatibility
- */
-
-static const char *
-_get_usb_error_str (int usb_err)
-{
-  switch (usb_err) {
-  case LIBUSB_SUCCESS:
-    return "Success (no error)";
-  case LIBUSB_ERROR_IO:
-    return "Input/output error";
-  case LIBUSB_ERROR_INVALID_PARAM:
-    return "Invalid parameter";
-  case LIBUSB_ERROR_ACCESS:
-    return "Access denied (insufficient permissions)";
-  case LIBUSB_ERROR_NO_DEVICE:
-    return "No such device (it may have been disconnected)";
-  case LIBUSB_ERROR_NOT_FOUND:
-    return "Entity not found";
-  case LIBUSB_ERROR_BUSY:
-    return "Resource busy";
-  case LIBUSB_ERROR_TIMEOUT:
-    return "Operation timed out";
-  case LIBUSB_ERROR_OVERFLOW:
-    return "Overflow";
-  case LIBUSB_ERROR_PIPE:
-    return "Pipe error";
-   case LIBUSB_ERROR_INTERRUPTED:
-    return "System call interrupted (perhaps due to signal)";
-  case LIBUSB_ERROR_NO_MEM:
-    return "Insufficient memory";
-  case LIBUSB_ERROR_NOT_SUPPORTED:
-    return "Operation not supported or unimplemented on this platform";
-  case LIBUSB_ERROR_OTHER:
-    return "Unknown error";
-  }
-
-  return "Unknown error";
-}
-
-struct libusb_device *
-_get_usb_device (struct libusb_device_handle *udh)
-{
-  return libusb_get_device (udh);
-}
-
-struct libusb_device_descriptor
-_get_usb_device_descriptor(struct libusb_device *q)
-{
-  int ret;
-  struct libusb_device_descriptor desc;
-
-  ret = libusb_get_device_descriptor(q, &desc);
-
-  if (ret < 0) {
-    fprintf (stderr, "usrp: libusb_get_device_descriptor failed: %s\n",
-             _get_usb_error_str(ret));
-  }
-  return desc;
-}
-
-int
-_get_usb_string_descriptor (struct libusb_device_handle *udh, int index,
-                            unsigned char* data, int length)
-{
-  int ret;
-  ret = libusb_get_string_descriptor_ascii (udh, (uint8_t) index, data, length);
-
-  if (ret < 0) {
-    fprintf (stderr, "usrp: libusb_get_string_descriptor_ascii failed: %s\n",
-             _get_usb_error_str(ret));
-  }
-  return ret;
-}
-
-int
-_usb_control_transfer (struct libusb_device_handle *udh, int request_type,
-                       int request, int value, int index,
-                       unsigned char *data, int length, unsigned int timeout)
-{
-  int ret;
-  ret = libusb_control_transfer (udh, request_type, request, value, index,
-                                 data, length, timeout);
-  if (ret < 0) {
-    fprintf (stderr, "usrp: libusb_control_transfer failed: %s\n",
-             _get_usb_error_str(ret));
-  }
-  return ret;
-}
-
-
-// ----------------------------------------------------------------
-
-
-void
-usrp_one_time_init (libusb_context **ctx)
-{
-  int ret;
-
-  if ((ret = libusb_init (ctx)) < 0)
-    fprintf (stderr, "usrp: libusb_init failed: %s\n", _get_usb_error_str(ret));
-
-  // Enable debug verbosity if requested. This will only work if the debug
-  // option is compiled into libusb and may produce a generous amount of output
-  // on stdout. If debug output is not compiled into libusb, this call does
-  // nothing. 
-  if (LIBUSB1_DEBUG)
-    libusb_set_debug(*ctx, 3);
-}
-
-void
-usrp_deinit (struct libusb_context *ctx)
-{
-  // Each object _should_ be running in its own context. If running in default
-  // context then leave the instance open as it may be shared.
-  if (ctx != NULL)
-    libusb_exit (ctx);
-}
-
-void
-usrp_rescan ()
-{
-  // nop
-}
-
-struct libusb_device *
-usrp_find_device (int nth, bool fx2_ok_p, libusb_context *ctx)
-{
-  libusb_device **list;
-
-  struct libusb_device *q;
-  int	 n_found = 0;
-
-  // Make sure not operating on default context. There are cases where operating
-  // with a single global (NULL) context may be preferable, so this check can be
-  // skipped if you know what you're doing.
-  assert (ctx != NULL);
-
-  size_t cnt = libusb_get_device_list(ctx, &list);
-  size_t i = 0;
-
-  if (cnt < 0)
-    fprintf(stderr, "usrp: libusb_get_device_list failed: %s\n",
-            _get_usb_error_str(cnt));
-
-  for (i = 0; i < cnt; i++) {
-    q = list[i];
-    if (usrp_usrp_p (q) || (fx2_ok_p && usrp_fx2_p (q))) {
-	if (n_found == nth)	// return this one
-	  return q;
-	n_found++;		// keep looking
-    }
-  }
-
-  // The list needs to be freed. Right now just release it if nothing is found.
-  libusb_free_device_list(list, 1);
-
-  return 0;	// not found
-}
-
-struct libusb_device_handle *
-usrp_open_interface (libusb_device *dev, int interface, int altinterface)
-{
-  libusb_device_handle *udh;
-  int ret;
-
-  if (libusb_open (dev, &udh) < 0)
-    return 0;
-
-  if (dev != libusb_get_device (udh)){
-    fprintf (stderr, "%s:%d: internal error!\n", __FILE__, __LINE__);
-    abort ();
-  }
-
-  if ((ret = libusb_claim_interface (udh, interface)) < 0) {
-    fprintf (stderr, "%s:usb_claim_interface: failed interface %d\n",
-             __FUNCTION__, interface);
-    fprintf (stderr, "%s\n", _get_usb_error_str(ret));
-    libusb_close (udh);
-    return 0;
-  }
-
-  if ((ret = libusb_set_interface_alt_setting (udh, interface,
-                                               altinterface)) < 0) {
-    fprintf (stderr, "%s:usb_set_alt_interface: failed\n", __FUNCTION__);
-    fprintf (stderr, "%s\n", _get_usb_error_str(ret));
-    libusb_release_interface (udh, interface);
-    libusb_close (udh);
-    return 0;
-  }
-
-  return udh;
-}
-
-bool
-usrp_close_interface (libusb_device_handle *udh)
-{
-  // returns void
-  libusb_close(udh);
-  return 0;
-}
-
-
-// ----------------------------------------------------------------
-// write vendor extension command to USRP
-
-
-int
-write_cmd (struct libusb_device_handle *udh,
-           int request, int value, int index,
-           unsigned char *bytes, int len)
-{
-  int requesttype = (request & 0x80) ? VRT_VENDOR_IN : VRT_VENDOR_OUT;
-
-  int ret = libusb_control_transfer(udh, requesttype, request, value, index,
-                                    bytes, len, 1000);
-
-  if (ret < 0) {
-    // we get EPIPE if the firmware stalls the endpoint.
-    if (ret != LIBUSB_ERROR_PIPE) {
-      fprintf (stderr, "usrp: libusb_control_transfer failed: %s\n",
-               _get_usb_error_str(ret));
-      fprintf (stderr, "usrp: write_cmd failed\n");
-    }
-  }
-
-  return ret;
-}
-
diff --git a/usrp/host/lib/usrp_primsi.h b/usrp/host/lib/usrp_primsi.h
deleted file mode 100644
index b1cf7263a..000000000
--- a/usrp/host/lib/usrp_primsi.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2009 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.
- */
-
-/*
- * Internal usrp_prims header file
- */
-
-#ifndef _USRP_PRIMSI_H_
-#define _USRP_PRIMSI_H_
-
-#include "usrp/usrp_prims.h"
-
-/*
- * Internal functions
- */
-
-libusb_device_handle *
-usrp_open_interface(libusb_device *dev, int interface, int altinterface);
-
-int write_cmd (libusb_device_handle *udh, int request, int value, int index,
-               unsigned char *bytes, int len);
-
-/*
- * Compatibility functions
- */
-
-libusb_device *_get_usb_device (libusb_device_handle *udh);
-
-libusb_device_descriptor _get_usb_device_descriptor (libusb_device *q);
-
-int _get_usb_string_descriptor (libusb_device_handle *udh, int index,
-                                unsigned char* data, int length);
-
-int _usb_control_transfer (libusb_device_handle *udh, int request_type,
-                           int request, int value, int index,
-                           unsigned char *data, int length,
-                           unsigned int timeout);
-
-#endif /* _USRP_PRIMSI_H_ */
-
diff --git a/usrp/host/lib/usrp_standard.cc b/usrp/host/lib/usrp_standard.cc
deleted file mode 100644
index fe5afabdb..000000000
--- a/usrp/host/lib/usrp_standard.cc
+++ /dev/null
@@ -1,1175 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2008,2009 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <usrp/usrp_standard.h>
-
-#include "usrp/usrp_prims.h"
-#include "fpga_regs_common.h"
-#include "fpga_regs_standard.h"
-#include <stdexcept>
-#include <assert.h>
-#include <math.h>
-#include <ad9862.h>
-#include <cstdio>
-
-
-static const int OLD_CAPS_VAL = 0xaa55ff77;
-static const int DEFAULT_CAPS_VAL = ((2 << bmFR_RB_CAPS_NDUC_SHIFT)
-				     | (2 << bmFR_RB_CAPS_NDDC_SHIFT)
-				     | bmFR_RB_CAPS_RX_HAS_HALFBAND);
-
-// #define USE_FPGA_TX_CORDIC
-
-
-using namespace ad9862;
-
-#define NELEM(x) (sizeof (x) / sizeof (x[0]))
-
-
-void
-usrp_standard_common::calc_dxc_freq(double target_freq, double baseband_freq, double fs,
-				    double *dxc_freq, bool *inverted)
-{
-  /*
-    Calculate the frequency to use for setting the digital up or down converter.
-    
-    @param target_freq: desired RF frequency (Hz)
-    @param baseband_freq: the RF frequency that corresponds to DC in the IF.
-    @param fs: converter sample rate
-    
-    @returns: 2-tuple (ddc_freq, inverted) where ddc_freq is the value
-      for the ddc and inverted is True if we're operating in an inverted
-      Nyquist zone.
-  */
-
-#if 0
-    printf("calc_dxc_freq:\n");
-    printf("  target   = %f\n", target_freq);
-    printf("  baseband = %f\n", baseband_freq);
-    printf("  fs       = %f\n", fs);
-#endif
-
-  double delta = target_freq - baseband_freq;
-    
-  if(delta >= 0) {
-    while(delta > fs) {
-      delta -= fs;
-    }
-    if(delta <= fs/2) {		// non-inverted region
-      *dxc_freq = -delta;	
-      *inverted = false;
-    }
-    else {     			// inverted region
-      *dxc_freq = delta - fs;
-      *inverted = true;
-    }
-  }
-  else {
-    while(delta < -fs) {
-      delta += fs;
-    }
-    if(delta >= -fs/2) {
-      *dxc_freq = -delta;	// non-inverted region
-      *inverted = false;
-    }
-    else {			// inverted region
-      *dxc_freq = delta + fs;
-      *inverted = true;
-    }
-  }
-
-#if 0
-    printf("  dxc_freq  = %f\n", *dxc_freq);
-    printf("  inverted  = %s\n", *inverted ? "true" : "false");
-#endif
-}
-
-
-/* 
- * Real lambda expressions would be _so_ much easier...
- */
-class dxc_control {
-public:
-  virtual bool is_tx() = 0;
-  virtual bool set_dxc_freq(double dxc_freq) = 0;
-  virtual double dxc_freq() = 0;
-};
-
-class ddc_control : public dxc_control {
-  usrp_standard_rx     *d_u;
-  int			d_chan;
-
-public:
-  ddc_control(usrp_standard_rx *u, int chan)
-    : d_u(u), d_chan(chan) {}
-  
-  bool is_tx(){ return false; }
-  bool set_dxc_freq(double dxc_freq){ return d_u->set_rx_freq(d_chan, dxc_freq); }
-  double dxc_freq(){ return d_u->rx_freq(d_chan); }
-};
-
-class duc_control : public dxc_control {
-  usrp_standard_tx     *d_u;
-  int			d_chan;
-
-public:
-  duc_control(usrp_standard_tx *u, int chan)
-    : d_u(u), d_chan(chan) {}
-  
-  bool is_tx(){ return true; }
-  bool set_dxc_freq(double dxc_freq){ return d_u->set_tx_freq(d_chan, dxc_freq); }
-  double dxc_freq() { return d_u->tx_freq(d_chan); }
-};
-
-
-/*!
- * \brief Tune such that target_frequency ends up at DC in the complex baseband
- *
- * \param db		the daughterboard to use
- * \param target_freq	the center frequency we want at baseband (DC)
- * \param fs 		the sample rate
- * \param dxc		DDC or DUC access and control object
- * \param[out] result	details of what we did
- *
- * \returns true iff operation was successful
- *
- * Tuning is a two step process.  First we ask the front-end to
- * tune as close to the desired frequency as it can.  Then we use
- * the result of that operation and our target_frequency to
- * determine the value for the digital down converter.
- */
-static bool
-tune_a_helper(db_base_sptr db, double target_freq, double fs,
-	      dxc_control &dxc, usrp_tune_result *result)
-{
-  bool inverted = false;
-  double dxc_freq;
-  double actual_dxc_freq;
-
-  // Ask the d'board to tune as closely as it can to target_freq
-#if 0
-  bool ok = db->set_freq(target_freq, &result->baseband_freq);
-#else
-  bool ok;
-  {
-    freq_result_t fr = db->set_freq(target_freq);
-    ok = fr.ok;
-    result->baseband_freq = fr.baseband_freq;
-  }
-#endif
-
-  // Calculate the DDC setting that will downconvert the baseband from the
-  // daughterboard to our target frequency.
-  usrp_standard_common::calc_dxc_freq(target_freq, result->baseband_freq, fs,
-				      &dxc_freq, &inverted);
-
-  // If the spectrum is inverted, and the daughterboard doesn't do
-  // quadrature downconversion, we can fix the inversion by flipping the
-  // sign of the dxc_freq...  (This only happens using the basic_rx board)
-  
-  if(db->spectrum_inverted())
-    inverted = !inverted;
-  
-  if(inverted && !db->is_quadrature()){
-    dxc_freq = -dxc_freq;
-    inverted = !inverted;
-  }
-  
-  if (dxc.is_tx() && !db->i_and_q_swapped())		// down conversion versus up conversion
-    dxc_freq = -dxc_freq;
-
-  ok &= dxc.set_dxc_freq(dxc_freq);
-  actual_dxc_freq = dxc.dxc_freq();
-  
-  result->dxc_freq = dxc_freq;
-  result->residual_freq = dxc_freq - actual_dxc_freq;
-  result->inverted = inverted;
-  return ok;
-}
-
-
-static unsigned int
-compute_freq_control_word_fpga (double master_freq, double target_freq,
-				double *actual_freq, bool verbose)
-{
-  static const int NBITS = 14;
-  
-  int	v = (int) rint (target_freq / master_freq * pow (2.0, 32.0));
-
-  if (0)
-    v = (v >> (32 - NBITS)) << (32 - NBITS);	// keep only top NBITS
-
-  *actual_freq = v * master_freq / pow (2.0, 32.0);
-
-  if (verbose)
-    fprintf (stderr,
-	     "compute_freq_control_word_fpga: target = %g  actual = %g  delta = %g\n",
-	     target_freq, *actual_freq, *actual_freq - target_freq);
-
-  return (unsigned int) v;
-}
-
-// The 9862 uses an unsigned 24-bit frequency tuning word and 
-// a separate register to control the sign.
-
-static unsigned int
-compute_freq_control_word_9862 (double master_freq, double target_freq,
-				double *actual_freq, bool verbose)
-{
-  double sign = 1.0;
-
-  if (target_freq < 0)
-    sign = -1.0;
-
-  int	v = (int) rint (fabs (target_freq) / master_freq * pow (2.0, 24.0));
-  *actual_freq = v * master_freq / pow (2.0, 24.0) * sign;
-
-  if (verbose)
-    fprintf (stderr,
-     "compute_freq_control_word_9862: target = %g  actual = %g  delta = %g  v = %8d\n",
-     target_freq, *actual_freq, *actual_freq - target_freq, v);
-
-  return (unsigned int) v;
-}
-
-// ----------------------------------------------------------------
-
-usrp_standard_common::usrp_standard_common(usrp_basic *parent)
-{
-  // read new FPGA capability register
-  if (!parent->_read_fpga_reg(FR_RB_CAPS, &d_fpga_caps)){
-    fprintf (stderr, "usrp_standard_common: failed to read FPGA cap register.\n");
-    throw std::runtime_error ("usrp_standard_common::ctor");
-  }
-  // If we don't have the cap register, set the value to what it would
-  // have had if we did have one ;)
-  if (d_fpga_caps == OLD_CAPS_VAL)
-    d_fpga_caps = DEFAULT_CAPS_VAL;
-
-  if (0){
-    fprintf(stdout, "has_rx_halfband = %d\n", has_rx_halfband());
-    fprintf(stdout, "nddcs           = %d\n", nddcs());
-    fprintf(stdout, "has_tx_halfband = %d\n", has_tx_halfband());
-    fprintf(stdout, "nducs           = %d\n", nducs());
-  }
-}
-
-bool
-usrp_standard_common::has_rx_halfband() const
-{
-  return (d_fpga_caps & bmFR_RB_CAPS_RX_HAS_HALFBAND) ? true : false;
-}
-
-int
-usrp_standard_common::nddcs() const
-{
-  return (d_fpga_caps & bmFR_RB_CAPS_NDDC_MASK) >> bmFR_RB_CAPS_NDDC_SHIFT;
-}
-
-bool
-usrp_standard_common::has_tx_halfband() const
-{
-  return (d_fpga_caps & bmFR_RB_CAPS_TX_HAS_HALFBAND) ? true : false;
-}
-
-int
-usrp_standard_common::nducs() const
-{
-  return (d_fpga_caps & bmFR_RB_CAPS_NDUC_MASK) >> bmFR_RB_CAPS_NDUC_SHIFT;
-}
-
-// ----------------------------------------------------------------
-
-static int 
-real_rx_mux_value (int mux, int nchan)
-{
-  if (mux != -1)
-    return mux;
-
-  return 0x32103210;
-}
-
-usrp_standard_rx::usrp_standard_rx (int which_board,
-				    unsigned int decim_rate,
-				    int nchan, int mux, int mode,
-				    int fusb_block_size, int fusb_nblocks,
-				    const std::string fpga_filename,
-				    const std::string firmware_filename
-				    )
-  : usrp_basic_rx (which_board, fusb_block_size, fusb_nblocks,
-		   fpga_filename, firmware_filename),
-    usrp_standard_common(this),
-    d_nchan (1), d_sw_mux (0x0), d_hw_mux (0x0)
-{
-  if (!set_format(make_format())){
-    fprintf (stderr, "usrp_standard_rx: set_format failed\n");
-    throw std::runtime_error ("usrp_standard_rx::ctor");
-  }
-  if (!set_nchannels (nchan)){
-    fprintf (stderr, "usrp_standard_rx: set_nchannels failed\n");
-    throw std::runtime_error ("usrp_standard_rx::ctor");
-  }
-  if (!set_decim_rate (decim_rate)){
-    fprintf (stderr, "usrp_standard_rx: set_decim_rate failed\n");
-    throw std::runtime_error ("usrp_standard_rx::ctor");
-  }
-  if (!set_mux (real_rx_mux_value (mux, nchan))){
-    fprintf (stderr, "usrp_standard_rx: set_mux failed\n");
-    throw std::runtime_error ("usrp_standard_rx::ctor");
-  }
-  if (!set_fpga_mode (mode)){
-    fprintf (stderr, "usrp_standard_rx: set_fpga_mode failed\n");
-    throw std::runtime_error ("usrp_standard_rx::ctor");
-  }
-
-  for (int i = 0; i < MAX_CHAN; i++){
-    set_rx_freq(i, 0);
-    set_ddc_phase(i, 0);
-  }
-}
-
-usrp_standard_rx::~usrp_standard_rx ()
-{
-  // fprintf(stderr, "\nusrp_standard_rx: dtor\n");
-}
-
-bool
-usrp_standard_rx::start ()
-{
-  if (!usrp_basic_rx::start ())
-    return false;
-
-  // add our code here
-
-  return true;
-}
-
-bool
-usrp_standard_rx::stop ()
-{
-  bool ok = usrp_basic_rx::stop ();
-
-  // add our code here
-
-  return ok;
-}
-
-usrp_standard_rx_sptr
-usrp_standard_rx::make (int which_board,
-			unsigned int decim_rate,
-			int nchan, int mux, int mode,
-			int fusb_block_size, int fusb_nblocks,
-			const std::string fpga_filename,
-			const std::string firmware_filename
-			)
-{
-  try {
-    usrp_standard_rx_sptr u = 
-      usrp_standard_rx_sptr(new usrp_standard_rx(which_board, decim_rate,
-						 nchan, mux, mode,
-						 fusb_block_size, fusb_nblocks,
-						 fpga_filename, firmware_filename));
-    u->init_db(u);
-    return u;
-  }
-  catch (...){
-    return usrp_standard_rx_sptr();
-  }
-}
-
-bool
-usrp_standard_rx::set_decim_rate(unsigned int rate)
-{
-  if (has_rx_halfband()){
-    if ((rate & 0x1) || rate < 4 || rate > 256){
-      fprintf (stderr, "usrp_standard_rx::set_decim_rate: rate must be EVEN and in [4, 256]\n");
-      return false;
-    }
-  }
-  else {
-    if (rate < 4 || rate > 128){
-      fprintf (stderr, "usrp_standard_rx::set_decim_rate: rate must be in [4, 128]\n");
-      return false;
-    }
-  }
-
-  d_decim_rate = rate;
-  set_usb_data_rate ((adc_rate () / rate * nchannels ())
-		     * (2 * sizeof (short)));
-
-  bool s = disable_rx ();
-  int v = has_rx_halfband() ? d_decim_rate/2 - 1 : d_decim_rate - 1;
-  bool ok = _write_fpga_reg (FR_DECIM_RATE, v);
-  restore_rx (s);
-  return ok;
-}
-
-bool usrp_standard_rx::set_nchannels (int nchan)
-{
-  if (!(nchan == 1 || nchan == 2 || nchan == 4))
-    return false;
-
-  if (nchan > nddcs())
-    return false;
-
-  d_nchan = nchan;
-
-  return write_hw_mux_reg ();
-}
-
-
-// map software mux value to hw mux value
-//
-// Software mux value:
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-------+-------+-------+-------+-------+-------+-------+-------+
-// |   Q3  |   I3  |   Q2  |   I2  |   Q1  |   I1  |   Q0  |   I0  |
-// +-------+-------+-------+-------+-------+-------+-------+-------+
-//
-// Each 4-bit I field is either 0,1,2,3
-// Each 4-bit Q field is either 0,1,2,3 or 0xf (input is const zero)
-// All Q's must be 0xf or none of them may be 0xf
-//
-//
-// Hardware mux value:
-//
-//    3                   2                   1                       
-//  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-----------------------+-------+-------+-------+-------+-+-----+
-// |      must be zero     | Q3| I3| Q2| I2| Q1| I1| Q0| I0|Z| NCH |
-// +-----------------------+-------+-------+-------+-------+-+-----+
-
-
-static bool
-map_sw_mux_to_hw_mux (int sw_mux, int *hw_mux_ptr)
-{
-  // confirm that all I's are either 0,1,2,3 
-
-  for (int i = 0; i < 8; i += 2){
-    int t = (sw_mux >> (4 * i)) & 0xf;
-    if (!(0 <= t && t <= 3))
-      return false;
-  }
-
-  // confirm that all Q's are either 0,1,2,3 or 0xf
-
-  for (int i = 1; i < 8; i += 2){
-    int t = (sw_mux >> (4 * i)) & 0xf;
-    if (!(t == 0xf || (0 <= t && t <= 3)))
-      return false;
-  }
-
-  // confirm that all Q inputs are 0xf (const zero input),
-  // or none of them are 0xf
-
-  int q_and = 1;
-  int q_or =  0;
-
-  for (int i = 0; i < 4; i++){
-    int qx_is_0xf = ((sw_mux >> (8 * i + 4)) & 0xf) == 0xf;
-    q_and &= qx_is_0xf;
-    q_or  |= qx_is_0xf;
-  }
-
-  if (q_and || !q_or){		// OK
-    int hw_mux_value = 0;
-
-    for (int i = 0; i < 8; i++){
-      int t = (sw_mux >> (4 * i)) & 0x3;
-      hw_mux_value |= t << (2 * i + 4);
-    }
-
-    if (q_and)
-      hw_mux_value |= 0x8;	// all Q's zero
-
-    *hw_mux_ptr = hw_mux_value;
-    return true;
-  }
-  else
-    return false;
-}
-
-bool
-usrp_standard_rx::set_mux (int mux)
-{
-  if (!map_sw_mux_to_hw_mux (mux, &d_hw_mux))
-    return false;
-
-  // fprintf (stderr, "sw_mux = 0x%08x  hw_mux = 0x%08x\n", mux, d_hw_mux);
-
-  d_sw_mux = mux;
-  return write_hw_mux_reg ();
-}
-
-bool
-usrp_standard_rx::write_hw_mux_reg ()
-{
-  bool s = disable_rx ();
-  bool ok = _write_fpga_reg (FR_RX_MUX, d_hw_mux | d_nchan);
-  restore_rx (s);
-  return ok;
-}
-
-int
-usrp_standard_rx::determine_rx_mux_value(const usrp_subdev_spec &ss)
-{
-  /*
-    Determine appropriate Rx mux value as a function of the subdevice choosen and the
-    characteristics of the respective daughterboard.
-    
-    @param u:           instance of USRP source
-    @param subdev_spec: return value from subdev option parser.  
-    @type  subdev_spec: (side, subdev), where side is 0 or 1 and subdev is 0 or 1
-    @returns:           the Rx mux value
-  
-    Figure out which A/D's to connect to the DDC.
-    
-    Each daughterboard consists of 1 or 2 subdevices.  (At this time,
-    all but the Basic Rx have a single subdevice.  The Basic Rx
-    has two independent channels, treated as separate subdevices).
-    subdevice 0 of a daughterboard may use 1 or 2 A/D's.  We determine this
-    by checking the is_quadrature() method.  If subdevice 0 uses only a single
-    A/D, it's possible that the daughterboard has a second subdevice, subdevice 1,
-    and it uses the second A/D.
-    
-    If the card uses only a single A/D, we wire a zero into the DDC Q input.
-    
-    (side, 0) says connect only the A/D's used by subdevice 0 to the DDC.
-    (side, 1) says connect only the A/D's used by subdevice 1 to the DDC.
-  */
-
-  struct truth_table_element
-  {
-    int          d_side;
-    int 	 d_uses;
-    bool         d_swap_iq;
-    unsigned int d_mux_val;
-
-    truth_table_element(int side, unsigned int uses, bool swap_iq, unsigned int mux_val=0)
-      : d_side(side), d_uses(uses), d_swap_iq(swap_iq), d_mux_val(mux_val){}
-      
-    bool operator==(const truth_table_element &in)
-    {
-      return (d_side == in.d_side && d_uses == in.d_uses && d_swap_iq == in.d_swap_iq);
-    }
-
-    unsigned int mux_val() { return d_mux_val; }
-  };
-
-
-  if (!is_valid(ss))
-    throw std::invalid_argument("subdev_spec");
-
-
-  // This is a tuple of length 1 or 2 containing the subdevice
-  // classes for the selected side.
-  std::vector<db_base_sptr> db = this->db(ss.side);
-  
-  unsigned int uses;
-
-  // compute bitmasks of used A/D's
-  
-  if(db[ss.subdev]->is_quadrature())
-    uses = 0x3;               // uses A/D 0 and 1
-  else if (ss.subdev == 0)
-    uses = 0x1;               // uses A/D 0 only
-  else if(ss.subdev == 1)
-    uses = 0x2;               // uses A/D 1 only
-  else
-    uses = 0x0;               // uses no A/D (doesn't exist)
-  
-  if(uses == 0){
-    throw std::runtime_error("Determine RX Mux Error");
-  }
-  
-  bool swap_iq = db[ss.subdev]->i_and_q_swapped();
-  
-  truth_table_element truth_table[8] = {
-    // (side, uses, swap_iq) : mux_val
-    truth_table_element(0, 0x1, false, 0xf0f0f0f0),
-    truth_table_element(0, 0x2, false, 0xf0f0f0f1),
-    truth_table_element(0, 0x3, false, 0x00000010),
-    truth_table_element(0, 0x3, true,  0x00000001),
-    truth_table_element(1, 0x1, false, 0xf0f0f0f2),
-    truth_table_element(1, 0x2, false, 0xf0f0f0f3),
-    truth_table_element(1, 0x3, false, 0x00000032),
-    truth_table_element(1, 0x3, true,  0x00000023)
-  };
-  size_t nelements = sizeof(truth_table)/sizeof(truth_table[0]);
-  
-  truth_table_element target(ss.side, uses, swap_iq, 0);
-  
-  size_t i;
-  for(i = 0; i < nelements; i++){
-    if (truth_table[i] == target)
-      return truth_table[i].mux_val();
-  }
-  throw std::runtime_error("internal error");
-}
-
-int
-usrp_standard_rx::determine_rx_mux_value(const usrp_subdev_spec &ss_a, const usrp_subdev_spec &ss_b)
-{
-  std::vector<db_base_sptr> db_a = this->db(ss_a.side);
-  std::vector<db_base_sptr> db_b = this->db(ss_b.side);
-  if (db_a[ss_a.subdev]->is_quadrature() != db_b[ss_b.subdev]->is_quadrature()){
-    throw std::runtime_error("Cannot compute dual mux when mixing quadrature and non-quadrature subdevices");
-  }
-  int mux_a = determine_rx_mux_value(ss_a);
-  int mux_b = determine_rx_mux_value(ss_b);
-  //move the lower byte of the mux b into the second byte of the mux a
-  return ((mux_b & 0xff) << 8) | (mux_a & 0xffff00ff);
-}
-
-bool
-usrp_standard_rx::set_rx_freq (int channel, double freq)
-{
-  if (channel < 0 || channel > MAX_CHAN)
-    return false;
-
-  unsigned int v =
-    compute_freq_control_word_fpga (adc_rate(),
-				    freq, &d_rx_freq[channel],
-				    d_verbose);
-
-  return _write_fpga_reg (FR_RX_FREQ_0 + channel, v);
-}
-
-unsigned int
-usrp_standard_rx::decim_rate () const { return d_decim_rate; }
-
-int
-usrp_standard_rx::nchannels () const { return d_nchan; }
-
-int
-usrp_standard_rx::mux () const { return d_sw_mux; }
-
-double 
-usrp_standard_rx::rx_freq (int channel) const
-{
-  if (channel < 0 || channel >= MAX_CHAN)
-    return 0;
-
-  return d_rx_freq[channel];
-}
-
-bool
-usrp_standard_rx::set_fpga_mode (int mode)
-{
-  return _write_fpga_reg (FR_MODE, mode);
-}
-
-bool
-usrp_standard_rx::set_ddc_phase(int channel, int phase)
-{
-  if (channel < 0 || channel >= MAX_CHAN)
-    return false;
-
-  return _write_fpga_reg(FR_RX_PHASE_0 + channel, phase);
-}
-
-
-// To avoid quiet failures, check for things that our code cares about.
-
-static bool
-rx_format_is_valid(unsigned int format)
-{
-  int width =  usrp_standard_rx::format_width(format);
-  int want_q = usrp_standard_rx::format_want_q(format);
-
-  if (!(width == 8 || width == 16))	// FIXME add other widths when valid
-    return false;
-
-  if (!want_q)		// FIXME remove check when the rest of the code can handle I only
-    return false;
-
-  return true;
-}
-
-bool
-usrp_standard_rx::set_format(unsigned int format)
-{
-  if (!rx_format_is_valid(format))
-    return false;
-
-  return _write_fpga_reg(FR_RX_FORMAT, format);
-}
-
-unsigned int
-usrp_standard_rx::format() const
-{
-  return d_fpga_shadows[FR_RX_FORMAT];
-}
-
-// ----------------------------------------------------------------
-
-unsigned int 
-usrp_standard_rx::make_format(int width, int shift, bool want_q, bool bypass_halfband)
-{
-  unsigned int format = 
-    (((width << bmFR_RX_FORMAT_WIDTH_SHIFT) & bmFR_RX_FORMAT_WIDTH_MASK)
-     | ((shift << bmFR_RX_FORMAT_SHIFT_SHIFT) & bmFR_RX_FORMAT_SHIFT_MASK));
-
-  if (want_q)
-    format |= bmFR_RX_FORMAT_WANT_Q;
-  if (bypass_halfband)
-    format |= bmFR_RX_FORMAT_BYPASS_HB;
-
-  return format;
-}
-
-int
-usrp_standard_rx::format_width(unsigned int format)
-{
-  return (format & bmFR_RX_FORMAT_WIDTH_MASK) >> bmFR_RX_FORMAT_WIDTH_SHIFT;
-}
-
-int
-usrp_standard_rx::format_shift(unsigned int format)
-{
-  return (format & bmFR_RX_FORMAT_SHIFT_MASK) >> bmFR_RX_FORMAT_SHIFT_SHIFT;
-}
-
-bool
-usrp_standard_rx::format_want_q(unsigned int format)
-{
-  return (format & bmFR_RX_FORMAT_WANT_Q) != 0;
-}
-
-bool
-usrp_standard_rx::format_bypass_halfband(unsigned int format)
-{
-  return (format & bmFR_RX_FORMAT_BYPASS_HB) != 0;
-}
-
-bool
-usrp_standard_rx::tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result *result)
-{
-  ddc_control dxc(this, chan);
-  return tune_a_helper(db, target_freq, converter_rate(), dxc, result);
-}
-
-
-//////////////////////////////////////////////////////////////////
-
-
-// tx data is timed to CLKOUT1 (64 MHz)
-// interpolate 4x
-// fine modulator enabled
-
-
-static unsigned char tx_regs_use_nco[] = {
-  REG_TX_IF,		(TX_IF_USE_CLKOUT1
-			 | TX_IF_I_FIRST
-			 | TX_IF_2S_COMP
-			 | TX_IF_INTERLEAVED),
-  REG_TX_DIGITAL,	(TX_DIGITAL_2_DATA_PATHS
-			 | TX_DIGITAL_INTERPOLATE_4X)
-};
-
-
-static int
-real_tx_mux_value (int mux, int nchan)
-{
-  if (mux != -1)
-    return mux;
-
-  switch (nchan){
-  case 1:
-    return 0x0098;
-  case 2:
-    return 0xba98;
-  default:
-    assert (0);
-  }
-}
-
-usrp_standard_tx::usrp_standard_tx (int which_board,
-				    unsigned int interp_rate,
-				    int nchan, int mux,
-				    int fusb_block_size, int fusb_nblocks,
-				    const std::string fpga_filename,
-				    const std::string firmware_filename
-				    )
-  : usrp_basic_tx (which_board, fusb_block_size, fusb_nblocks, fpga_filename, firmware_filename),
-    usrp_standard_common(this),
-    d_sw_mux (0x8), d_hw_mux (0x81)
-{
-  if (!usrp_9862_write_many_all (d_udh, tx_regs_use_nco, sizeof (tx_regs_use_nco))){
-    fprintf (stderr, "usrp_standard_tx: failed to init AD9862 TX regs\n");
-    throw std::runtime_error ("usrp_standard_tx::ctor");
-  }
-  if (!set_nchannels (nchan)){
-    fprintf (stderr, "usrp_standard_tx: set_nchannels failed\n");
-    throw std::runtime_error ("usrp_standard_tx::ctor");
-  }
-  if (!set_interp_rate (interp_rate)){
-    fprintf (stderr, "usrp_standard_tx: set_interp_rate failed\n");
-    throw std::runtime_error ("usrp_standard_tx::ctor");
-  }
-  if (!set_mux (real_tx_mux_value (mux, nchan))){
-    fprintf (stderr, "usrp_standard_tx: set_mux failed\n");
-    throw std::runtime_error ("usrp_standard_tx::ctor");
-  }
-
-  for (int i = 0; i < MAX_CHAN; i++){
-    d_tx_modulator_shadow[i] = (TX_MODULATOR_DISABLE_NCO
-				| TX_MODULATOR_COARSE_MODULATION_NONE);
-    d_coarse_mod[i] = CM_OFF;
-    set_tx_freq (i, 0);
-  }
-}
-
-usrp_standard_tx::~usrp_standard_tx ()
-{
-  // fprintf(stderr, "\nusrp_standard_tx: dtor\n");
-}
-
-bool
-usrp_standard_tx::start ()
-{
-  if (!usrp_basic_tx::start ())
-    return false;
-
-  // add our code here
-
-  return true;
-}
-
-bool
-usrp_standard_tx::stop ()
-{
-  bool ok = usrp_basic_tx::stop ();
-
-  // add our code here
-
-  return ok;
-}
-
-usrp_standard_tx_sptr
-usrp_standard_tx::make (int which_board,
-			unsigned int interp_rate,
-			int nchan, int mux,
-			int fusb_block_size, int fusb_nblocks,
-			const std::string fpga_filename,
-			const std::string firmware_filename
-			)
-{
-  try {
-    usrp_standard_tx_sptr u  = 
-      usrp_standard_tx_sptr(new usrp_standard_tx(which_board, interp_rate, nchan, mux,
-						 fusb_block_size, fusb_nblocks,
-						 fpga_filename, firmware_filename));
-    u->init_db(u);
-    return u;
-  }
-  catch (...){
-    return usrp_standard_tx_sptr();
-  }
-}
-
-bool
-usrp_standard_tx::set_interp_rate (unsigned int rate)
-{
-  // fprintf (stderr, "usrp_standard_tx::set_interp_rate\n");
-
-  if ((rate & 0x3) || rate < 4 || rate > 512){
-    fprintf (stderr, "usrp_standard_tx::set_interp_rate: rate must be in [4, 512] and a multiple of 4.\n");
-    return false;
-  }
-
-  d_interp_rate = rate;
-  set_usb_data_rate ((dac_rate () / rate * nchannels ())
-		     * (2 * sizeof (short)));
-
-  // We're using the interp by 4 feature of the 9862 so that we can
-  // use its fine modulator.  Thus, we reduce the FPGA's interpolation rate
-  // by a factor of 4.
-
-  bool s = disable_tx ();
-  bool ok = _write_fpga_reg (FR_INTERP_RATE, d_interp_rate/4 - 1);
-  restore_tx (s);
-  return ok;
-}
-
-bool
-usrp_standard_tx::set_nchannels (int nchan)
-{
-  if (!(nchan == 1 || nchan == 2))
-    return false;
-
-  if (nchan > nducs())
-    return false;
-
-  d_nchan = nchan;
-  return write_hw_mux_reg ();
-}
-
-bool
-usrp_standard_tx::set_mux (int mux)
-{
-  d_sw_mux = mux;
-  d_hw_mux = mux << 4;
-  return write_hw_mux_reg ();
-}
-
-bool
-usrp_standard_tx::write_hw_mux_reg ()
-{
-  bool s = disable_tx ();
-  bool ok = _write_fpga_reg (FR_TX_MUX, d_hw_mux | d_nchan);
-  restore_tx (s);
-  return ok;
-}
-
-int
-usrp_standard_tx::determine_tx_mux_value(const usrp_subdev_spec &ss)
-{
-  /*
-    Determine appropriate Tx mux value as a function of the subdevice choosen.
-
-    @param u:           instance of USRP source
-    @param subdev_spec: return value from subdev option parser.  
-    @type  subdev_spec: (side, subdev), where side is 0 or 1 and subdev is 0
-    @returns:           the Rx mux value
-  
-    This is simpler than the rx case.  Either you want to talk
-    to side A or side B.  If you want to talk to both sides at once,
-    determine the value manually.
-  */
-
-  if (!is_valid(ss))
-    throw std::invalid_argument("subdev_spec");
-
-  std::vector<db_base_sptr> db = this->db(ss.side);
-  
-  if(db[ss.subdev]->i_and_q_swapped()) {
-    unsigned int mask[2] = {0x0089, 0x8900};
-    return mask[ss.side];
-  }
-  else {
-    unsigned int mask[2] = {0x0098, 0x9800};
-    return mask[ss.side];
-  }
-}
-
-int
-usrp_standard_tx::determine_tx_mux_value(const usrp_subdev_spec &ss_a, const usrp_subdev_spec &ss_b)
-{
-  if (ss_a.side == ss_b.side && ss_a.subdev == ss_b.subdev){
-    throw std::runtime_error("Cannot compute dual mux, repeated subdevice");
-  }
-  int mux_a = determine_tx_mux_value(ss_a);
-  //Get the mux b:
-  //	DAC0 becomes DAC2
-  //	DAC1 becomes DAC3
-  unsigned int mask[2] = {0x0022, 0x2200};
-  int mux_b = determine_tx_mux_value(ss_b) + mask[ss_b.side];
-  return mux_b | mux_a;
-}
-
-#ifdef USE_FPGA_TX_CORDIC
-
-bool
-usrp_standard_tx::set_tx_freq (int channel, double freq)
-{
-  if (channel < 0 || channel >= MAX_CHAN)
-    return false;
-
-  // This assumes we're running the 4x on-chip interpolator.
-
-  unsigned int v =
-    compute_freq_control_word_fpga (dac_rate () / 4,
-				    freq, &d_tx_freq[channel],
-				    d_verbose);
-
-  return _write_fpga_reg (FR_TX_FREQ_0 + channel, v);
-}
-
-
-#else
-
-bool
-usrp_standard_tx::set_tx_freq (int channel, double freq)
-{
-  if (channel < 0 || channel >= MAX_CHAN)
-    return false;
-
-  // split freq into fine and coarse components
-
-  coarse_mod_t	cm;
-  double	coarse;
-
-  double coarse_freq_1 = dac_rate () / 8; // First coarse frequency
-  double coarse_freq_2 = dac_rate () / 4; // Second coarse frequency
-  double coarse_limit_1 = coarse_freq_1 / 2; // Midpoint of [0 , freq1] range
-  double coarse_limit_2 = (coarse_freq_1 + coarse_freq_2) / 2; // Midpoint of [freq1 , freq2] range
-  double high_limit = (double)44e6/128e6*dac_rate (); // Highest meaningful frequency
-
-  if (freq < -high_limit)		// too low
-    return false;
-  else if (freq < -coarse_limit_2){	// For 64MHz: [-44, -24)
-    cm = CM_NEG_FDAC_OVER_4;
-    coarse = -coarse_freq_2;
-  }
-  else if (freq < -coarse_limit_1){	// For 64MHz: [-24, -8)
-    cm = CM_NEG_FDAC_OVER_8;
-    coarse = -coarse_freq_1;
-  }
-  else if (freq < coarse_limit_1){		// For 64MHz: [-8, 8)
-    cm = CM_OFF;
-    coarse = 0;
-  }
-  else if (freq < coarse_limit_2){	// For 64MHz: [8, 24)
-    cm = CM_POS_FDAC_OVER_8;
-    coarse = coarse_freq_1;
-  }
-  else if (freq <= high_limit){	// For 64MHz: [24, 44]
-    cm = CM_POS_FDAC_OVER_4;
-    coarse = coarse_freq_2;
-  }
-  else				// too high
-    return false;
-
-
-  set_coarse_modulator (channel, cm);	// set bits in d_tx_modulator_shadow
-
-  double fine = freq - coarse;
-
-
-  // Compute fine tuning word...
-  // This assumes we're running the 4x on-chip interpolator.
-  // (This is required to use the fine modulator.)
-
-  unsigned int v =
-    compute_freq_control_word_9862 (dac_rate () / 4,
-				    fine, &d_tx_freq[channel], d_verbose);
-
-  d_tx_freq[channel] += coarse;		// adjust actual
-  
-  unsigned char high, mid, low;
-
-  high = (v >> 16) & 0xff;
-  mid =  (v >>  8) & 0xff;
-  low =  (v >>  0) & 0xff;
-
-  bool ok = true;
-
-  // write the fine tuning word
-  ok &= _write_9862 (channel, REG_TX_NCO_FTW_23_16, high);
-  ok &= _write_9862 (channel, REG_TX_NCO_FTW_15_8,  mid);
-  ok &= _write_9862 (channel, REG_TX_NCO_FTW_7_0,   low);
-
-
-  d_tx_modulator_shadow[channel] |= TX_MODULATOR_ENABLE_NCO;
-
-  if (fine < 0)
-    d_tx_modulator_shadow[channel] |= TX_MODULATOR_NEG_FINE_TUNE;
-  else
-    d_tx_modulator_shadow[channel] &= ~TX_MODULATOR_NEG_FINE_TUNE;
-
-  ok &=_write_9862 (channel, REG_TX_MODULATOR, d_tx_modulator_shadow[channel]);
-
-  return ok;
-}
-#endif
-
-bool
-usrp_standard_tx::set_coarse_modulator (int channel, coarse_mod_t cm)
-{
-  if (channel < 0 || channel >= MAX_CHAN)
-    return false;
-
-  switch (cm){
-  case CM_NEG_FDAC_OVER_4:
-    d_tx_modulator_shadow[channel] &= ~TX_MODULATOR_CM_MASK;
-    d_tx_modulator_shadow[channel] |= TX_MODULATOR_COARSE_MODULATION_F_OVER_4;
-    d_tx_modulator_shadow[channel] |= TX_MODULATOR_NEG_COARSE_TUNE;
-    break;
-
-  case CM_NEG_FDAC_OVER_8:
-    d_tx_modulator_shadow[channel] &= ~TX_MODULATOR_CM_MASK;
-    d_tx_modulator_shadow[channel] |= TX_MODULATOR_COARSE_MODULATION_F_OVER_8;
-    d_tx_modulator_shadow[channel] |= TX_MODULATOR_NEG_COARSE_TUNE;
-    break;
-
-  case CM_OFF:
-    d_tx_modulator_shadow[channel] &= ~TX_MODULATOR_CM_MASK;
-    break;
-
-  case CM_POS_FDAC_OVER_8:
-    d_tx_modulator_shadow[channel] &= ~TX_MODULATOR_CM_MASK;
-    d_tx_modulator_shadow[channel] |= TX_MODULATOR_COARSE_MODULATION_F_OVER_8;
-    break;
-
-  case CM_POS_FDAC_OVER_4:
-    d_tx_modulator_shadow[channel] &= ~TX_MODULATOR_CM_MASK;
-    d_tx_modulator_shadow[channel] |= TX_MODULATOR_COARSE_MODULATION_F_OVER_4;
-    break;
-
-  default:
-    return false;
-  }
-
-  d_coarse_mod[channel] = cm;
-  return true;
-}
-
-unsigned int
-usrp_standard_tx::interp_rate () const { return d_interp_rate; }
-
-int
-usrp_standard_tx::nchannels () const { return d_nchan; }
-
-int
-usrp_standard_tx::mux () const { return d_sw_mux; }
-
-double
-usrp_standard_tx::tx_freq (int channel) const
-{
-  if (channel < 0 || channel >= MAX_CHAN)
-    return 0;
-
-  return d_tx_freq[channel];
-}
-
-usrp_standard_tx::coarse_mod_t
-usrp_standard_tx::coarse_modulator (int channel) const
-{
-  if (channel < 0 || channel >= MAX_CHAN)
-    return CM_OFF;
-
-  return d_coarse_mod[channel];
-}
-
-bool
-usrp_standard_tx::tune(int chan, db_base_sptr db, double target_freq, usrp_tune_result *result)
-{
-  duc_control dxc(this, chan);
-  return tune_a_helper(db, target_freq, converter_rate(), dxc, result);
-}
diff --git a/usrp/host/misc/.gitignore b/usrp/host/misc/.gitignore
deleted file mode 100644
index a02b6ff73..000000000
--- a/usrp/host/misc/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/usrp/host/misc/Makefile.am b/usrp/host/misc/Makefile.am
deleted file mode 100644
index d238311e3..000000000
--- a/usrp/host/misc/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright 2003,2004,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST += \
-	getopt.c getopt.h \
-	gettimeofday.c \
-	usleep.c
-
-noinst_LTLIBRARIES = libmisc.la
-
-libmisc_la_SOURCES = bug_work_around_8.cc
diff --git a/usrp/host/misc/bug_work_around_8.cc b/usrp/host/misc/bug_work_around_8.cc
deleted file mode 100644
index 41943247f..000000000
--- a/usrp/host/misc/bug_work_around_8.cc
+++ /dev/null
@@ -1,2 +0,0 @@
-// if libmisc has no sources, it doesn't get built correctly
-int gr_bug_work_around_8;
diff --git a/usrp/host/misc/getopt.c b/usrp/host/misc/getopt.c
deleted file mode 100644
index 34eeaa6a4..000000000
--- a/usrp/host/misc/getopt.c
+++ /dev/null
@@ -1,734 +0,0 @@
-/* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
-   before changing it!
-
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 1993
-   	Free Software Foundation, Inc.
-
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* NOTE!!!  AIX requires this to be the first thing in the file.
-   Do not put ANYTHING before it!  */
-#if !defined (__GNUC__) && defined (_AIX)
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else /* not __GNUC__ */
-#if defined (HAVE_ALLOCA_H) || (defined(sparc) && (defined(sun) || (!defined(USG) && !defined(SVR4) && !defined(__svr4__))))
-#include <alloca.h>
-#else
-#ifndef _AIX
-char *alloca ();
-#endif
-#endif /* alloca.h */
-#endif /* not __GNUC__ */
-
-#if !__STDC__ && !defined(const) && IN_GCC
-#define const
-#endif
-
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.  */
-#ifndef _NO_PROTO
-#define _NO_PROTO
-#endif
-
-#include <stdio.h>
-#include <string.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
-
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef	__GNU_LIBRARY__
-#undef	alloca
-/* Don't include stdlib.h for non-GNU C libraries because some of them
-   contain conflicting prototypes for getopt.  */
-#include <stdlib.h>
-#else	/* Not GNU C library.  */
-#define	__alloca	alloca
-#endif	/* GNU C library.  */
-
-/* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a
-   long-named option.  Because this is not POSIX.2 compliant, it is
-   being phased out.  */
-/* #define GETOPT_COMPAT */
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
-   but it behaves differently for the user, since it allows the user
-   to intersperse the options with the other arguments.
-
-   As `getopt' works, it permutes the elements of ARGV so that,
-   when it is done, all the options precede everything else.  Thus
-   all application programs are extended to handle flexible argument order.
-
-   Setting the environment variable POSIXLY_CORRECT disables permutation.
-   Then the behavior is completely standard.
-
-   GNU application programs can use a third alternative mode in which
-   they can distinguish the relative order of options and other arguments.  */
-
-#include "getopt.h"
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-char *optarg = 0;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-/* XXX 1003.2 says this must be 1 before any call.  */
-int optind = 0;
-
-/* The next char to be scanned in the option-element
-   in which the last option character we returned was found.
-   This allows us to pick up the scan where we left off.
-
-   If this is zero, or a null string, it means resume the scan
-   by advancing to the next ARGV-element.  */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
-   for unrecognized options.  */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
-   This must be initialized on some systems to avoid linking in the
-   system's own getopt implementation.  */
-
-int optopt = '?';
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
-   If the caller did not specify anything,
-   the default is REQUIRE_ORDER if the environment variable
-   POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-   REQUIRE_ORDER means don't recognize them as options;
-   stop option processing when the first non-option is seen.
-   This is what Unix does.
-   This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using `+' as the first character
-   of the list of option characters.
-
-   PERMUTE is the default.  We permute the contents of ARGV as we scan,
-   so that eventually all the non-options are at the end.  This allows options
-   to be given in any order, even with programs that were not written to
-   expect this.
-
-   RETURN_IN_ORDER is an option available to programs that were written
-   to expect options and other ARGV-elements in any order and that care about
-   the ordering of the two.  We describe each non-option ARGV-element
-   as if it were the argument of an option with character code 1.
-   Using `-' as the first character of the list of option characters
-   selects this mode of operation.
-
-   The special argument `--' forces an end of option-scanning regardless
-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return EOF with `optind' != ARGC.  */
-
-static enum
-{
-  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-#ifdef	__GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
-   because there are many ways it can cause trouble.
-   On some systems, it contains special magic macros that don't work
-   in GCC.  */
-#include <string.h>
-#define	my_index	strchr
-#define	my_bcopy(src, dst, n)	memcpy ((dst), (src), (n))
-#else
-
-/* Avoid depending on library functions or files
-   whose names are inconsistent.  */
-
-char *getenv ();
-
-static char *
-my_index (str, chr)
-     const char *str;
-     int chr;
-{
-  while (*str)
-    {
-      if (*str == chr)
-	return (char *) str;
-      str++;
-    }
-  return 0;
-}
-
-static void
-my_bcopy (from, to, size)
-     const char *from;
-     char *to;
-     int size;
-{
-  int i;
-  for (i = 0; i < size; i++)
-    to[i] = from[i];
-}
-#endif				/* GNU C library.  */
-
-/* Handle permutation of arguments.  */
-
-/* Describe the part of ARGV that contains non-options that have
-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
-   `last_nonopt' is the index after the last of them.  */
-
-static int first_nonopt;
-static int last_nonopt;
-
-/* Exchange two adjacent subsequences of ARGV.
-   One subsequence is elements [first_nonopt,last_nonopt)
-   which contains all the non-options that have been skipped so far.
-   The other is elements [last_nonopt,optind), which contains all
-   the options processed since those non-options were skipped.
-
-   `first_nonopt' and `last_nonopt' are relocated so that they describe
-   the new indices of the non-options in ARGV after they are moved.  */
-
-static void
-exchange (argv)
-     char **argv;
-{
-  int nonopts_size = (last_nonopt - first_nonopt) * sizeof (char *);
-  char **temp = (char **) __alloca (nonopts_size);
-
-  /* Interchange the two blocks of data in ARGV.  */
-
-  my_bcopy ((char *) &argv[first_nonopt], (char *) temp, nonopts_size);
-  my_bcopy ((char *) &argv[last_nonopt], (char *) &argv[first_nonopt],
-	    (optind - last_nonopt) * sizeof (char *));
-  my_bcopy ((char *) temp,
-	    (char *) &argv[first_nonopt + optind - last_nonopt],
-	    nonopts_size);
-
-  /* Update records for the slots the non-options now occupy.  */
-
-  first_nonopt += (optind - last_nonopt);
-  last_nonopt = optind;
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
-   given in OPTSTRING.
-
-   If an element of ARGV starts with '-', and is not exactly "-" or "--",
-   then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If `getopt'
-   is called repeatedly, it returns successively each of the option characters
-   from each of the option elements.
-
-   If `getopt' finds another option character, it returns that character,
-   updating `optind' and `nextchar' so that the next call to `getopt' can
-   resume the scan with the following option character or ARGV-element.
-
-   If there are no more option characters, `getopt' returns `EOF'.
-   Then `optind' is the index in ARGV of the first ARGV-element
-   that is not an option.  (The ARGV-elements have been permuted
-   so that those that are not options now come last.)
-
-   OPTSTRING is a string containing the legitimate option characters.
-   If an option character is seen that is not listed in OPTSTRING,
-   return '?' after printing an error message.  If you set `opterr' to
-   zero, the error message is suppressed but we still return '?'.
-
-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
-   so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
-   wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in `optarg', otherwise `optarg' is set to zero.
-
-   If OPTSTRING starts with `-' or `+', it requests different methods of
-   handling the non-option ARGV-elements.
-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
-   Long-named options begin with `--' instead of `-'.
-   Their names may be abbreviated as long as the abbreviation is unique
-   or is an exact match for some defined option.  If they have an
-   argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a `=', or else the in next ARGV-element.
-   When `getopt' finds a long-named option, it returns 0 if that option's
-   `flag' field is nonzero, the value of the option's `val' field
-   if the `flag' field is zero.
-
-   The elements of ARGV aren't really const, because we permute them.
-   But we pretend they're const in the prototype to be compatible
-   with other systems.
-
-   LONGOPTS is a vector of `struct option' terminated by an
-   element containing a name which is zero.
-
-   LONGIND returns the index in LONGOPT of the long-named option found.
-   It is only valid when a long-named option has been found by the most
-   recent call.
-
-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
-   long-named options.  */
-
-int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-     const struct option *longopts;
-     int *longind;
-     int long_only;
-{
-  int option_index;
-
-  optarg = 0;
-
-  /* Initialize the internal data when the first call is made.
-     Start processing options with ARGV-element 1 (since ARGV-element 0
-     is the program name); the sequence of previously skipped
-     non-option ARGV-elements is empty.  */
-
-  if (optind == 0)
-    {
-      first_nonopt = last_nonopt = optind = 1;
-
-      nextchar = NULL;
-
-      /* Determine how to handle the ordering of options and nonoptions.  */
-
-      if (optstring[0] == '-')
-	{
-	  ordering = RETURN_IN_ORDER;
-	  ++optstring;
-	}
-      else if (optstring[0] == '+')
-	{
-	  ordering = REQUIRE_ORDER;
-	  ++optstring;
-	}
-      else if (getenv ("POSIXLY_CORRECT") != NULL)
-	ordering = REQUIRE_ORDER;
-      else
-	ordering = PERMUTE;
-    }
-
-  if (nextchar == NULL || *nextchar == '\0')
-    {
-      if (ordering == PERMUTE)
-	{
-	  /* If we have just processed some options following some non-options,
-	     exchange them so that the options come first.  */
-
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
-	    exchange ((char **) argv);
-	  else if (last_nonopt != optind)
-	    first_nonopt = optind;
-
-	  /* Now skip any additional non-options
-	     and extend the range of non-options previously skipped.  */
-
-	  while (optind < argc
-		 && (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
-		 && (longopts == NULL
-		     || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif				/* GETOPT_COMPAT */
-		 )
-	    optind++;
-	  last_nonopt = optind;
-	}
-
-      /* Special ARGV-element `--' means premature end of options.
-	 Skip it like a null option,
-	 then exchange with previous non-options as if it were an option,
-	 then skip everything else like a non-option.  */
-
-      if (optind != argc && !strcmp (argv[optind], "--"))
-	{
-	  optind++;
-
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
-	    exchange ((char **) argv);
-	  else if (first_nonopt == last_nonopt)
-	    first_nonopt = optind;
-	  last_nonopt = argc;
-
-	  optind = argc;
-	}
-
-      /* If we have done all the ARGV-elements, stop the scan
-	 and back over any non-options that we skipped and permuted.  */
-
-      if (optind == argc)
-	{
-	  /* Set the next-arg-index to point at the non-options
-	     that we previously skipped, so the caller will digest them.  */
-	  if (first_nonopt != last_nonopt)
-	    optind = first_nonopt;
-	  return EOF;
-	}
-
-      /* If we have come to a non-option and did not permute it,
-	 either stop the scan or describe it to the caller and pass it by.  */
-
-      if ((argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
-	  && (longopts == NULL
-	      || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif				/* GETOPT_COMPAT */
-	  )
-	{
-	  if (ordering == REQUIRE_ORDER)
-	    return EOF;
-	  optarg = argv[optind++];
-	  return 1;
-	}
-
-      /* We have found another option-ARGV-element.
-	 Start decoding its characters.  */
-
-      nextchar = (argv[optind] + 1
-		  + (longopts != NULL && argv[optind][1] == '-'));
-    }
-
-  if (longopts != NULL
-      && ((argv[optind][0] == '-'
-	   && (argv[optind][1] == '-' || long_only))
-#ifdef GETOPT_COMPAT
-	  || argv[optind][0] == '+'
-#endif				/* GETOPT_COMPAT */
-	  ))
-    {
-      const struct option *p;
-      char *s = nextchar;
-      int exact = 0;
-      int ambig = 0;
-      const struct option *pfound = NULL;
-      int indfound;
-
-      while (*s && *s != '=')
-	s++;
-
-      /* Test all options for either exact match or abbreviated matches.  */
-      for (p = longopts, option_index = 0; p->name;
-	   p++, option_index++)
-	if (!strncmp (p->name, nextchar, s - nextchar))
-	  {
-	    if (s - nextchar == strlen (p->name))
-	      {
-		/* Exact match found.  */
-		pfound = p;
-		indfound = option_index;
-		exact = 1;
-		break;
-	      }
-	    else if (pfound == NULL)
-	      {
-		/* First nonexact match found.  */
-		pfound = p;
-		indfound = option_index;
-	      }
-	    else
-	      /* Second nonexact match found.  */
-	      ambig = 1;
-	  }
-
-      if (ambig && !exact)
-	{
-	  if (opterr)
-	    fprintf (stderr, "%s: option `%s' is ambiguous\n",
-		     argv[0], argv[optind]);
-	  nextchar += strlen (nextchar);
-	  optind++;
-	  return '?';
-	}
-
-      if (pfound != NULL)
-	{
-	  option_index = indfound;
-	  optind++;
-	  if (*s)
-	    {
-	      /* Don't test has_arg with >, because some C compilers don't
-		 allow it to be used on enums.  */
-	      if (pfound->has_arg)
-		optarg = s + 1;
-	      else
-		{
-		  if (opterr)
-		    {
-		      if (argv[optind - 1][1] == '-')
-			/* --option */
-			fprintf (stderr,
-				 "%s: option `--%s' doesn't allow an argument\n",
-				 argv[0], pfound->name);
-		      else
-			/* +option or -option */
-			fprintf (stderr,
-			     "%s: option `%c%s' doesn't allow an argument\n",
-			     argv[0], argv[optind - 1][0], pfound->name);
-		    }
-		  nextchar += strlen (nextchar);
-		  return '?';
-		}
-	    }
-	  else if (pfound->has_arg == 1)
-	    {
-	      if (optind < argc)
-		optarg = argv[optind++];
-	      else
-		{
-		  if (opterr)
-		    fprintf (stderr, "%s: option `%s' requires an argument\n",
-			     argv[0], argv[optind - 1]);
-		  nextchar += strlen (nextchar);
-		  return optstring[0] == ':' ? ':' : '?';
-		}
-	    }
-	  nextchar += strlen (nextchar);
-	  if (longind != NULL)
-	    *longind = option_index;
-	  if (pfound->flag)
-	    {
-	      *(pfound->flag) = pfound->val;
-	      return 0;
-	    }
-	  return pfound->val;
-	}
-      /* Can't find it as a long option.  If this is not getopt_long_only,
-	 or the option starts with '--' or is not a valid short
-	 option, then it's an error.
-	 Otherwise interpret it as a short option.  */
-      if (!long_only || argv[optind][1] == '-'
-#ifdef GETOPT_COMPAT
-	  || argv[optind][0] == '+'
-#endif				/* GETOPT_COMPAT */
-	  || my_index (optstring, *nextchar) == NULL)
-	{
-	  if (opterr)
-	    {
-	      if (argv[optind][1] == '-')
-		/* --option */
-		fprintf (stderr, "%s: unrecognized option `--%s'\n",
-			 argv[0], nextchar);
-	      else
-		/* +option or -option */
-		fprintf (stderr, "%s: unrecognized option `%c%s'\n",
-			 argv[0], argv[optind][0], nextchar);
-	    }
-	  nextchar = (char *) "";
-	  optind++;
-	  return '?';
-	}
-    }
-
-  /* Look at and handle the next option-character.  */
-
-  {
-    char c = *nextchar++;
-    char *temp = my_index (optstring, c);
-
-    /* Increment `optind' when we start to process its last character.  */
-    if (*nextchar == '\0')
-      ++optind;
-
-    if (temp == NULL || c == ':')
-      {
-	if (opterr)
-	  {
-#if 0
-	    if (c < 040 || c >= 0177)
-	      fprintf (stderr, "%s: unrecognized option, character code 0%o\n",
-		       argv[0], c);
-	    else
-	      fprintf (stderr, "%s: unrecognized option `-%c'\n", argv[0], c);
-#else
-	    /* 1003.2 specifies the format of this message.  */
-	    fprintf (stderr, "%s: illegal option -- %c\n", argv[0], c);
-#endif
-	  }
-	optopt = c;
-	return '?';
-      }
-    if (temp[1] == ':')
-      {
-	if (temp[2] == ':')
-	  {
-	    /* This is an option that accepts an argument optionally.  */
-	    if (*nextchar != '\0')
-	      {
-		optarg = nextchar;
-		optind++;
-	      }
-	    else
-	      optarg = 0;
-	    nextchar = NULL;
-	  }
-	else
-	  {
-	    /* This is an option that requires an argument.  */
-	    if (*nextchar != '\0')
-	      {
-		optarg = nextchar;
-		/* If we end this ARGV-element by taking the rest as an arg,
-		   we must advance to the next element now.  */
-		optind++;
-	      }
-	    else if (optind == argc)
-	      {
-		if (opterr)
-		  {
-#if 0
-		    fprintf (stderr, "%s: option `-%c' requires an argument\n",
-			     argv[0], c);
-#else
-		    /* 1003.2 specifies the format of this message.  */
-		    fprintf (stderr, "%s: option requires an argument -- %c\n",
-			     argv[0], c);
-#endif
-		  }
-		optopt = c;
-		if (optstring[0] == ':')
-		  c = ':';
-		else
-		  c = '?';
-	      }
-	    else
-	      /* We already incremented `optind' once;
-		 increment it again when taking next ARGV-elt as argument.  */
-	      optarg = argv[optind++];
-	    nextchar = NULL;
-	  }
-      }
-    return c;
-  }
-}
-
-#ifdef GETOPT
-int
-getopt (argc, argv, optstring)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-{
-  return _getopt_internal (argc, argv, optstring,
-			   (const struct option *) 0,
-			   (int *) 0,
-			   0);
-}
-#endif
-
-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
-   the above definition of `getopt'.  */
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  int c;
-  int digit_optind = 0;
-
-  while (1)
-    {
-      int this_option_optind = optind ? optind : 1;
-
-      c = getopt (argc, argv, "abc:d:0123456789");
-      if (c == EOF)
-	break;
-
-      switch (c)
-	{
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	  if (digit_optind != 0 && digit_optind != this_option_optind)
-	    printf ("digits occur in two different argv-elements.\n");
-	  digit_optind = this_option_optind;
-	  printf ("option %c\n", c);
-	  break;
-
-	case 'a':
-	  printf ("option a\n");
-	  break;
-
-	case 'b':
-	  printf ("option b\n");
-	  break;
-
-	case 'c':
-	  printf ("option c with value `%s'\n", optarg);
-	  break;
-
-	case '?':
-	  break;
-
-	default:
-	  printf ("?? getopt returned character code 0%o ??\n", c);
-	}
-    }
-
-  if (optind < argc)
-    {
-      printf ("non-option ARGV-elements: ");
-      while (optind < argc)
-	printf ("%s ", argv[optind++]);
-      printf ("\n");
-    }
-
-  exit (0);
-}
-
-#endif /* TEST */
diff --git a/usrp/host/misc/getopt.h b/usrp/host/misc/getopt.h
deleted file mode 100644
index 067908147..000000000
--- a/usrp/host/misc/getopt.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
-
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef _GETOPT_H
-#define _GETOPT_H 1
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int optopt;
-
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument		(or 0) if the option does not take an argument,
-   required_argument	(or 1) if the option requires an argument,
-   optional_argument 	(or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct option
-{
-#if	__STDC__
-  const char *name;
-#else
-  char *name;
-#endif
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-#define	no_argument		0
-#define required_argument	1
-#define optional_argument	2
-
-#if __STDC__
-#if defined(__GNU_LIBRARY__)
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-#endif /* not __GNU_LIBRARY__ */
-extern int getopt_long (int argc, char *const *argv, const char *shortopts,
-		        const struct option *longopts, int *longind);
-extern int getopt_long_only (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind);
-
-/* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int argc, char *const *argv,
-			     const char *shortopts,
-		             const struct option *longopts, int *longind,
-			     int long_only);
-#else /* not __STDC__ */
-extern int getopt ();
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-#endif /* not __STDC__ */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _GETOPT_H */
diff --git a/usrp/host/misc/gettimeofday.c b/usrp/host/misc/gettimeofday.c
deleted file mode 100644
index 098793ac9..000000000
--- a/usrp/host/misc/gettimeofday.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2003 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.
- */
-
-#include <config.h>
-
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-#endif
-#ifdef HAVE_WINBASE_H
-# include <winbase.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-/* 
- * broken implementation for WIN32. 
- * FIXME: usec precision
- */
-int gettimeofday(struct timeval *tv, struct timezone *tz)
-{
-	if (tv) {
-		time_t tm;
-		
-		time(&tm);
-		tv->tv_sec = tm;
-		tv->tv_usec = 0;
-	}
-	return 0;
-}
-
diff --git a/usrp/host/misc/mkstemp.c b/usrp/host/misc/mkstemp.c
deleted file mode 100644
index 8abacb984..000000000
--- a/usrp/host/misc/mkstemp.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
-   This file is derived from the one in the GNU C Library.
-
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.  */
-
-#include <config.h>
-
-/* Disable the definition of mkstemp to rpl_mkstemp (from config.h) in this
-   file.  Otherwise, we'd get conflicting prototypes for rpl_mkstemp on
-   most systems.  */
-#undef mkstemp
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef __GT_FILE
-# define __GT_FILE 0
-#endif
-
-int __gen_tempname ();
-
-/* Generate a unique temporary file name from TEMPLATE.
-   The last six characters of TEMPLATE must be "XXXXXX";
-   they are replaced with a string that makes the filename unique.
-   Then open the file and return a fd. */
-int
-rpl_mkstemp (char *template)
-{
-  return __gen_tempname (template, __GT_FILE);
-}
diff --git a/usrp/host/misc/tempname.c b/usrp/host/misc/tempname.c
deleted file mode 100644
index 2611126cf..000000000
--- a/usrp/host/misc/tempname.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/* tempname.c - generate the name of a temporary file.
-
-   Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Boston, MA 02110-1301, USA.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <assert.h>
-
-#include <errno.h>
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
-
-#include <stdio.h>
-#ifndef P_tmpdir
-# define P_tmpdir "/tmp"
-#endif
-#ifndef TMP_MAX
-# define TMP_MAX 238328
-#endif
-#ifndef __GT_FILE
-# define __GT_FILE	0
-# define __GT_BIGFILE	1
-# define __GT_DIR	2
-# define __GT_NOCREATE	3
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if HAVE_FCNTL_H || _LIBC
-# include <fcntl.h>
-#endif
-
-#if HAVE_SYS_TIME_H || _LIBC
-# include <sys/time.h>
-#endif
-
-#if HAVE_STDINT_H || _LIBC
-# include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
-#if HAVE_UNISTD_H || _LIBC
-# include <unistd.h>
-#endif
-
-#include <sys/stat.h>
-#if STAT_MACROS_BROKEN
-# undef S_ISDIR
-#endif
-#if !defined S_ISDIR && defined S_IFDIR
-# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
-#endif
-#if !S_IRUSR && S_IREAD
-# define S_IRUSR S_IREAD
-#endif
-#if !S_IRUSR
-# define S_IRUSR 00400
-#endif
-#if !S_IWUSR && S_IWRITE
-# define S_IWUSR S_IWRITE
-#endif
-#if !S_IWUSR
-# define S_IWUSR 00200
-#endif
-#if !S_IXUSR && S_IEXEC
-# define S_IXUSR S_IEXEC
-#endif
-#if !S_IXUSR
-# define S_IXUSR 00100
-#endif
-
-#if _LIBC
-# define struct_stat64 struct stat64
-#else
-# define struct_stat64 struct stat
-# define __getpid getpid
-# define __gettimeofday gettimeofday
-#ifdef MKDIR_TAKES_ONE_ARG
-# define __mkdir(pathname,mode) mkdir((pathname))
-#else
-# define __mkdir mkdir
-#endif
-# define __open open
-# define __open64 open
-#ifdef HAVE_LSTAT
-# define __lxstat64(version, path, buf) lstat (path, buf)
-#else
-# define __lxstat64(version, path, buf) stat (path, buf)
-#endif
-# define __xstat64(version, path, buf) stat (path, buf)
-#endif
-
-#if ! (HAVE___SECURE_GETENV || _LIBC)
-# define __secure_getenv getenv
-#endif
-
-#ifdef _LIBC
-# include <hp-timing.h>
-# if HP_TIMING_AVAIL
-#  define RANDOM_BITS(Var) \
-  if (__builtin_expect (value == UINT64_C (0), 0))			      \
-    {									      \
-      /* If this is the first time this function is used initialize	      \
-	 the variable we accumulate the value in to some somewhat	      \
-	 random value.  If we'd not do this programs at startup time	      \
-	 might have a reduced set of possible names, at least on slow	      \
-	 machines.  */							      \
-      struct timeval tv;						      \
-      __gettimeofday (&tv, NULL);					      \
-      value = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;		      \
-    }									      \
-  HP_TIMING_NOW (Var)
-# endif
-#endif
-
-/* Use the widest available unsigned type if uint64_t is not
-   available.  The algorithm below extracts a number less than 62**6
-   (approximately 2**35.725) from uint64_t, so ancient hosts where
-   uintmax_t is only 32 bits lose about 3.725 bits of randomness,
-   which is better than not having mkstemp at all.  */
-#if !defined UINT64_MAX && !defined uint64_t
-# define uint64_t uintmax_t
-#endif
-
-/* Return nonzero if DIR is an existent directory.  */
-static int
-direxists (const char *dir)
-{
-  struct_stat64 buf;
-  return __xstat64 (_STAT_VER, dir, &buf) == 0 && S_ISDIR (buf.st_mode);
-}
-
-/* Path search algorithm, for tmpnam, tmpfile, etc.  If DIR is
-   non-null and exists, uses it; otherwise uses the first of $TMPDIR,
-   P_tmpdir, /tmp that exists.  Copies into TMPL a template suitable
-   for use with mk[s]temp.  Will fail (-1) if DIR is non-null and
-   doesn't exist, none of the searched dirs exists, or there's not
-   enough space in TMPL. */
-int
-__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
-	       int try_tmpdir)
-{
-  const char *d;
-  size_t dlen, plen;
-
-  if (!pfx || !pfx[0])
-    {
-      pfx = "file";
-      plen = 4;
-    }
-  else
-    {
-      plen = strlen (pfx);
-      if (plen > 5)
-	plen = 5;
-    }
-
-  if (try_tmpdir)
-    {
-      d = __secure_getenv ("TMPDIR");
-      if (d != NULL && direxists (d))
-	dir = d;
-      else if (dir != NULL && direxists (dir))
-	/* nothing */ ;
-      else
-	dir = NULL;
-    }
-  if (dir == NULL)
-    {
-      if (direxists (P_tmpdir))
-	dir = P_tmpdir;
-      else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
-	dir = "/tmp";
-      else
-	{
-	  __set_errno (ENOENT);
-	  return -1;
-	}
-    }
-
-  dlen = strlen (dir);
-  while (dlen > 1 && dir[dlen - 1] == '/')
-    dlen--;			/* remove trailing slashes */
-
-  /* check we have room for "${dir}/${pfx}XXXXXX\0" */
-  if (tmpl_len < dlen + 1 + plen + 6 + 1)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
-  return 0;
-}
-
-/* These are the characters used in temporary filenames.  */
-static const char letters[] =
-"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-
-/* Generate a temporary file name based on TMPL.  TMPL must match the
-   rules for mk[s]temp (i.e. end in "XXXXXX").  The name constructed
-   does not exist at the time of the call to __gen_tempname.  TMPL is
-   overwritten with the result.
-
-   KIND may be one of:
-   __GT_NOCREATE:	simply verify that the name does not exist
-			at the time of the call.
-   __GT_FILE:		create the file using open(O_CREAT|O_EXCL)
-			and return a read-write fd.  The file is mode 0600.
-   __GT_BIGFILE:	same as __GT_FILE but use open64().
-   __GT_DIR:		create a directory, which will be mode 0700.
-
-   We use a clever algorithm to get hard-to-predict names. */
-int
-__gen_tempname (char *tmpl, int kind)
-{
-  int len;
-  char *XXXXXX;
-  static uint64_t value;
-  uint64_t random_time_bits;
-  unsigned int count;
-  int fd = -1;
-  int save_errno = errno;
-  struct_stat64 st;
-
-  /* A lower bound on the number of temporary files to attempt to
-     generate.  The maximum total number of temporary file names that
-     can exist for a given template is 62**6.  It should never be
-     necessary to try all these combinations.  Instead if a reasonable
-     number of names is tried (we define reasonable as 62**3) fail to
-     give the system administrator the chance to remove the problems.  */
-  unsigned int attempts_min = 62 * 62 * 62;
-
-  /* The number of times to attempt to generate a temporary file.  To
-     conform to POSIX, this must be no smaller than TMP_MAX.  */
-  unsigned int attempts = attempts_min < TMP_MAX ? TMP_MAX : attempts_min;
-
-  len = strlen (tmpl);
-  if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  /* This is where the Xs start.  */
-  XXXXXX = &tmpl[len - 6];
-
-  /* Get some more or less random data.  */
-#ifdef RANDOM_BITS
-  RANDOM_BITS (random_time_bits);
-#else
-# if HAVE_GETTIMEOFDAY || _LIBC
-  {
-    struct timeval tv;
-    __gettimeofday (&tv, NULL);
-    random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;
-  }
-# else
-  random_time_bits = time (NULL);
-# endif
-#endif
-  value += random_time_bits ^ __getpid ();
-
-  for (count = 0; count < attempts; value += 7777, ++count)
-    {
-      uint64_t v = value;
-
-      /* Fill in the random bits.  */
-      XXXXXX[0] = letters[v % 62];
-      v /= 62;
-      XXXXXX[1] = letters[v % 62];
-      v /= 62;
-      XXXXXX[2] = letters[v % 62];
-      v /= 62;
-      XXXXXX[3] = letters[v % 62];
-      v /= 62;
-      XXXXXX[4] = letters[v % 62];
-      v /= 62;
-      XXXXXX[5] = letters[v % 62];
-
-      switch (kind)
-	{
-	case __GT_FILE:
-	  fd = __open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-	  break;
-
-	case __GT_BIGFILE:
-	  fd = __open64 (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-	  break;
-
-	case __GT_DIR:
-	  fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
-	  break;
-
-	case __GT_NOCREATE:
-	  /* This case is backward from the other three.  __gen_tempname
-	     succeeds if __xstat fails because the name does not exist.
-	     Note the continue to bypass the common logic at the bottom
-	     of the loop.  */
-	  if (__lxstat64 (_STAT_VER, tmpl, &st) < 0)
-	    {
-	      if (errno == ENOENT)
-		{
-		  __set_errno (save_errno);
-		  return 0;
-		}
-	      else
-		/* Give up now. */
-		return -1;
-	    }
-	  continue;
-
-	default:
-	  assert (! "invalid KIND in __gen_tempname");
-	}
-
-      if (fd >= 0)
-	{
-	  __set_errno (save_errno);
-	  return fd;
-	}
-      else if (errno != EEXIST)
-	return -1;
-    }
-
-  /* We got out of the loop because we ran out of combinations to try.  */
-  __set_errno (EEXIST);
-  return -1;
-}
diff --git a/usrp/host/misc/usleep.c b/usrp/host/misc/usleep.c
deleted file mode 100644
index b1d7dad47..000000000
--- a/usrp/host/misc/usleep.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 3 of the
-License, or (at your option) any later version.
-
-The GNU C Library 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#include <config.h>
-
-#ifndef HAVE_USLEEP
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-#endif
-#ifdef HAVE_WINBASE_H
-# include <winbase.h>
-#endif
-
-#ifdef apollo
-# include <apollo/base.h>
-# include <apollo/time.h>
-  static time_$clock_t DomainTime100mS =
-    {
-	0, 100000/4
-    };
-  static status_$t DomainStatus;
-#endif
-
-/* Sleep USECONDS microseconds, or until a previously set timer goes off.  */
-int
-usleep (unsigned long useconds)
-{
-#ifdef apollo
-  /* The usleep function does not work under the SYS5.3 environment.
-     Use the Domain/OS time_$wait call instead. */
-  time_$wait (time_$relative, DomainTime100mS, &DomainStatus);
-#elif defined(HAVE_SSLEEP)	/* Win32 */
-  Sleep( useconds/1000 );
-#else
-  struct timeval delay;
-
-  delay.tv_sec = 0;
-  delay.tv_usec = useconds;
-  select (0, 0, 0, 0, &delay);
-#endif
-  return 0;
-}
-
-#endif /* !HAVE_USLEEP */
diff --git a/usrp/host/swig/.gitignore b/usrp/host/swig/.gitignore
deleted file mode 100644
index 9897dac41..000000000
--- a/usrp/host/swig/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-/Makefile
-/Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
-/usrp_prims.cc
-/usrp_prims.py
-/usrp_prims.scm
-/prims.cc
-/prims.py
-/gnuradio
-/guile
-/python
diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
deleted file mode 100644
index 5baeff4cb..000000000
--- a/usrp/host/swig/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Copyright 2001,2003,2004,2006,2007,2008,2009,2010 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-include $(top_srcdir)/Makefile.swig
-
-AM_CPPFLAGS =			\
-	$(USRP_INCLUDES)	\
-	-I$(srcdir)		\
-	$(PYTHON_CPPFLAGS)	\
-	$(USB_INCLUDES)		\
-	$(WITH_INCLUDES)
-
-#################################
-# SWIG interface and library
-
-TOP_SWIG_IFILES =		\
-	usrp_prims.i
-
-# Install so that they end up available as:
-#   import usrpm.usrp_prims
-# This ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/usrpm
-usrp_prims_pythondir_category =	\
-	usrpm
-
-# additional arguments to the SWIG command
-usrp_prims_swig_args =		\
-	$(USRP_INCLUDES)
-
-# additional libraries for linking with the SWIG-generated library
-usrp_prims_la_swig_libadd =	\
-	$(USRP_LA)
-
-# additional Python files to be installed along with the SWIG-generated one
-usrp_prims_python =		\
-	__init__.py		\
-	usrp_fpga_regs.py
diff --git a/usrp/host/swig/Makefile.swig.gen b/usrp/host/swig/Makefile.swig.gen
deleted file mode 100644
index b4cc97caa..000000000
--- a/usrp/host/swig/Makefile.swig.gen
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright 2009 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.
-# 
-
-# Makefile.swig.gen for usrp_prims.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/usrp_prims
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/usrp_prims
-##
-## The following can be overloaded to change the install location, but
-## this has to be done in the including Makefile.am -before-
-## Makefile.swig is included.
-
-usrp_prims_pythondir_category ?= gnuradio/usrp_prims
-usrp_prims_pylibdir_category ?= $(usrp_prims_pythondir_category)
-usrp_prims_pythondir = $(pythondir)/$(usrp_prims_pythondir_category)
-usrp_prims_pylibdir = $(pyexecdir)/$(usrp_prims_pylibdir_category)
-
-# The .so libraries for the guile modules get installed whereever guile
-# is installed, usually /usr/lib/guile/gnuradio/
-# FIXME: determince whether these should be installed with gnuradio.
-usrp_prims_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/usrp_prims
-# FIXME: determince whether these should be installed with gnuradio.
-usrp_prims_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-usrp_prims_swigincludedir = $(swigincludedir)
-
-## This is a template file for a "generated" Makefile addition (in
-## this case, "Makefile.swig.gen").  By including the top-level
-## Makefile.swig, this file will be used to generate the SWIG
-## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
-## SWIG .i files to generated wrappings for; there can be more than 1
-## so long as the names are unique (no sorting is done on the
-## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
-## file will generate .cc, .py, and possibly .h files -- meaning that
-## all of these files will have the same base name (that provided for
-## the SWIG .i file).
-##
-## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
-## right thing.  For more info, see <
-## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
-
-## Other cleaned files: dependency files generated by SWIG or this Makefile
-
-MOSTLYCLEANFILES += $(DEPDIR)/*.S*
-
-## Various SWIG variables.  These can be overloaded in the including
-## Makefile.am by setting the variable value there, then including
-## Makefile.swig .
-
-usrp_prims_swiginclude_HEADERS =		\
-	usrp_prims.i			\
-	$(usrp_prims_swiginclude_headers)
-
-if PYTHON
-usrp_prims_pylib_LTLIBRARIES =		\
-	_usrp_prims.la
-
-_usrp_prims_la_SOURCES = 			\
-	python/usrp_prims.cc		\
-	$(usrp_prims_la_swig_sources)
-
-usrp_prims_python_PYTHON =			\
-	usrp_prims.py			\
-	$(usrp_prims_python)
-
-_usrp_prims_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(usrp_prims_la_swig_libadd)
-
-_usrp_prims_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(usrp_prims_la_swig_ldflags)
-
-_usrp_prims_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(usrp_prims_la_swig_cxxflags)
-
-python/usrp_prims.cc: usrp_prims.py
-usrp_prims.py: usrp_prims.i
-
-# Include the python dependencies for this file
--include python/usrp_prims.d
-
-endif		# end of if python
-
-if GUILE
-
-usrp_prims_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-usrp_prims.la
-libguile_gnuradio_usrp_prims_la_SOURCES =	\
-	guile/usrp_prims.cc			\
-	$(usrp_prims_la_swig_sources)
-nobase_usrp_prims_scm_DATA = 		\
-	gnuradio/usrp_prims.scm 		\
-	gnuradio/usrp_prims-primitive.scm
-libguile_gnuradio_usrp_prims_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(usrp_prims_la_swig_libadd)
-libguile_gnuradio_usrp_prims_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(usrp_prims_la_swig_ldflags)
-libguile_gnuradio_usrp_prims_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(usrp_prims_la_swig_cxxflags)
-
-guile/usrp_prims.cc: gnuradio/usrp_prims.scm
-gnuradio/usrp_prims.scm: usrp_prims.i
-gnuradio/usrp_prims-primitive.scm: gnuradio/usrp_prims.scm
-
-# Include the guile dependencies for this file
--include guile/usrp_prims.d
-
-endif				# end of GUILE
-
-
diff --git a/usrp/host/swig/__init__.py b/usrp/host/swig/__init__.py
deleted file mode 100644
index a4917cf64..000000000
--- a/usrp/host/swig/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# make this a package
diff --git a/usrp/host/swig/usrp_fpga_regs.py b/usrp/host/swig/usrp_fpga_regs.py
deleted file mode 100644
index b116d7b7a..000000000
--- a/usrp/host/swig/usrp_fpga_regs.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2005 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.
-# 
-
-from usrpm import usrp_prims
-
-# Copy everything that starts with FR_ or bmFR_ from the usrp_prims
-# name space into our name space.  This is effectively a python binding for
-# the contents of firmware/include/fpga_regs_common.h and fpga_regs_standard.h
-
-for name in dir(usrp_prims):
-    if name.startswith("FR_") or name.startswith("bmFR_"):
-        globals()[name] = usrp_prims.__dict__[name]
diff --git a/usrp/host/swig/usrp_prims.i b/usrp/host/swig/usrp_prims.i
deleted file mode 100644
index a58f8aacf..000000000
--- a/usrp/host/swig/usrp_prims.i
+++ /dev/null
@@ -1,265 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2003,2004,2009 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.
- */
-
-/*
- * Low level primitives for directly messing with USRP hardware.
- *
- * If you're trying to use the USRP, you'll probably want to take a
- * look at the usrp_standard_rx and usrp_standard_tx classes.  They
- * hide a bunch of low level details and provide high performance
- * streaming i/o.
- *
- * This interface is built on top of libusb, which allegedly works under
- * Linux, *BSD and Mac OS/X.  http://libusb.sourceforge.net
- */
-
-%include <stl.i>	// pick up string stuff
-
-
-%{
-#include <usrp/usrp_prims.h>
-#include <stddef.h>		// ptrdiff_t
-%}
-
-
-enum usrp_load_status_t { ULS_ERROR = 0, ULS_OK, ULS_ALREADY_LOADED };
-
-
-/*!
- * \brief initialize libusb; probe busses and devices.
- * Safe to call more than once.
- */
-void usrp_one_time_init (libusb_context **ctx = NULL);
-
-void usrp_rescan ();
-
-/*!
- * \brief locate Nth (zero based) USRP device in system.
- * Return pointer or 0 if not found.
- *
- * The following kinds of devices are considered USRPs:
- *
- *   unconfigured USRP (no firwmare loaded)
- *   configured USRP (firmware loaded)
- *   unconfigured Cypress FX2 (only if fx2_ok_p is true)
- */
-libusb_device *usrp_find_device (int nth, bool fx2_ok_p = false, libusb_context *ctx = NULL);
-
-bool usrp_usrp_p (libusb_device *q);		//< is this a USRP
-bool usrp_usrp0_p (libusb_device *q);		//< is this a USRP Rev 0
-bool usrp_usrp1_p (libusb_device *q);		//< is this a USRP Rev 1
-bool usrp_usrp2_p (libusb_device *q);		//< is this a USRP Rev 2
-int  usrp_hw_rev (libusb_device *q);		//< return h/w rev code
-bool usrp_fx2_p (libusb_device *q);			//< is this an unconfigured Cypress FX2
-
-bool usrp_unconfigured_usrp_p (libusb_device *q);	//< some kind of unconfigured USRP
-bool usrp_configured_usrp_p (libusb_device *q);	//< some kind of configured USRP
-
-/*!
- * \brief given a libusb_device return an instance of the appropriate libusb_device_handle
- *
- * These routines claim the specified interface and select the
- * correct alternate interface.  (USB nomenclature is totally screwed!)
- *
- * If interface can't be opened, or is already claimed by some other
- * process, 0 is returned.
- */
-libusb_device_handle *usrp_open_cmd_interface (libusb_device *dev);
-libusb_device_handle *usrp_open_rx_interface (libusb_device *dev);
-libusb_device_handle *usrp_open_tx_interface (libusb_device *dev);
-
-/*!
- * \brief close interface.
- */
-bool usrp_close_interface (libusb_device_handle *udh);
-
-/*!
- * \brief load intel hex format file into USRP/Cypress FX2 (8051).
- *
- * The filename extension is typically *.ihx
- *
- * Note that loading firmware may cause the device to renumerate.  I.e.,
- * change its configuration, invalidating the current device handle.
- */
-
-usrp_load_status_t 
-usrp_load_firmware (libusb_device_handle *udh, const char *filename, bool force);
-
-/*!
- * \brief load intel hex format file into USRP FX2 (8051).
- *
- * The filename extension is typically *.ihx
- *
- * Note that loading firmware may cause the device to renumerate.  I.e.,
- * change its configuration, invalidating the current device handle.
- * If the result is ULS_OK, usrp_load_firmware_nth delays 1 second
- * then rescans the busses and devices.
- */
-usrp_load_status_t
-usrp_load_firmware_nth (int nth, const char *filename, bool force, libusb_context *ctx = NULL);
-
-/*!
- * \brief load fpga configuration bitstream
- */
-usrp_load_status_t
-usrp_load_fpga (libusb_device_handle *udh, const char *filename, bool force);
-
-/*!
- * \brief load the regular firmware and fpga bitstream in the Nth USRP.
- *
- * This is the normal starting point...
- */
-bool usrp_load_standard_bits (int nth, bool force);
-
-
-%include <fpga_regs_common.h>
-%include <fpga_regs_standard.h>
-
-
-bool usrp_write_fpga_reg (libusb_device_handle *udh, int reg, int value);
-
-%inline %{
-
-int 
-usrp_read_fpga_reg (libusb_device_handle *udh, int reg)
-{
-  int value;
-  bool ok = usrp_read_fpga_reg (udh, reg, &value);
-  if (ok)
-    return value;
-  else
-    return -999;
-}
-
-%}
-
-bool usrp_set_fpga_reset (libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_tx_enable (libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_rx_enable (libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_tx_reset (libusb_device_handle *udh, bool on);
-bool usrp_set_fpga_rx_reset (libusb_device_handle *udh, bool on);
-bool usrp_set_led (libusb_device_handle *udh, int which, bool on);
-
-bool usrp_check_rx_overrun (libusb_device_handle *udh, bool *overrun_p);
-bool usrp_check_tx_underrun (libusb_device_handle *udh, bool *underrun_p);
-
-// i2c_read and i2c_write are limited to a maximum len of 64 bytes.
-
-bool usrp_i2c_write (libusb_device_handle *udh, int i2c_addr,
-		     void *buf, int len);
-
-bool usrp_i2c_read (libusb_device_handle *udh, int i2c_addr,
-		    void *buf, int len);
-
-// spi_read and spi_write are limited to a maximum of 64 bytes
-// See usrp_spi_defs.h for more info
-
-bool usrp_spi_write (libusb_device_handle *udh,
-		     int optional_header, int enables, int format,
-		     unsigned char *buf, int len);
-
-bool usrp_spi_read (libusb_device_handle *udh,
-		     int optional_header, int enables, int format,
-		     unsigned char *buf, int len);
-
-
-bool usrp_9862_write (libusb_device_handle *udh,
-		      int which_codec,			// [0,  1]
-		      int regno,			// [0, 63]
-		      int value);			// [0, 255]	
-
-%inline %{
-
-int 
-usrp_9862_read (libusb_device_handle *udh, int which_codec, int reg)
-{
-  unsigned char value;
-  bool ok = usrp_9862_read (udh, which_codec, reg, &value);
-  if (ok)
-    return value;
-  else
-    return -999;
-}
-
-%}
-
-%inline %{
-
-bool 
-usrp_eeprom_write (libusb_device_handle *udh, int i2c_addr,
-		   int eeprom_offset, const std::string buf)
-{
-  return usrp_eeprom_write (udh, i2c_addr, eeprom_offset,
-			    buf.data (), buf.size ());
-}
-  
-std::string
-usrp_eeprom_read (libusb_device_handle *udh, int i2c_addr,
-		  int eeprom_offset, int len)
-{
-  if (len <= 0)
-    return "";
-  
-  char buf[len];
-
-  if (!usrp_eeprom_read (udh, i2c_addr, eeprom_offset, buf, len))
-    return "";
-
-  return std::string (buf, len);
-}
-
-%}
-
-bool usrp_write_aux_dac (libusb_device_handle *uhd, int slot,
-			 int which_dac, int value);
-
-%inline %{
-
-int usrp_read_aux_adc (libusb_device_handle *udh, int slot, int which_adc)
-{
-  int value;
-  bool ok = usrp_read_aux_adc (udh, slot, which_adc, &value);
-  if (ok)
-    return value;
-  else
-    return -999;
-}
-
-%}
-
-/*!
- * \brief return a usrp's serial number.
- *
- * Note that this only works on a configured usrp.
- * \returns non-zero length string iff successful.
- */
-std::string usrp_serial_number(libusb_device_handle *udh);
-
-/*!
- * \brief usrp daughterboard id to name mapping
- */
-const std::string usrp_dbid_to_string (int dbid);
-
-%inline %{
-#include "../../firmware/include/fpga_regs_common.h"
-#include "../../firmware/include/fpga_regs_standard.h"
-%}
diff --git a/usrp/host/swig/util.py b/usrp/host/swig/util.py
deleted file mode 100644
index 089bcaaac..000000000
--- a/usrp/host/swig/util.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# utilities
-
-from usrp_prims import *
-
-def setup (which_board = 0):
-    if not usrp_load_standard_bits (which_board, False):
-        raise RuntimeError, "usrp_load_standard_bits"
-    dev = usrp_find_device (which_board)
-    if not dev:
-        raise RuntimeError, "usrp_find_device"
-    u = usrp_open_cmd_interface (dev)
-    if not u:
-        raise RuntimeError, "usrp_open_cmd_interface"
-
-    # FIXME setup high speed paths, Aux ADC Clock, ...
-
-    # usrp_9862_write (u, 0, 35, 0x1)     # aux ADC clock = CLK/4
-    # usrp_9862_write (u, 1, 35, 0x1)
-
-    return u
-
-def write_slot_oe (u, slot, value, mask):
-    assert 0 <= slot and slot < 4
-    return usrp_write_fpga_reg (u, slot + FR_OE_0,
-                                ((mask & 0xffff) << 16) | (value & 0xffff))
-
-def write_slot_io (u, slot, value, mask):
-    assert 0 <= slot and slot < 4
-    return usrp_write_fpga_reg (u, slot + FR_IO_0,
-                                ((mask & 0xffff) << 16) | (value & 0xffff))
-
-
-# ----------------------------------------------------------------
-
-
-def ramp_aux_dac (u, which_codec, which_dac):
-    if not (which_codec == 0 or which_codec == 1):
-        raise AssertionError
-    if not (which_dac >= 0 and which_dac < 4):
-        raise AssertionError
-    try:
-        if which_dac == 3:                  # sigma delta output
-            sigma_delta_loop (u, which_codec)
-        else:
-            aux_dac_loop (u, which_codec, which_dac)
-    except KeyboardInterrupt:
-        return
-
-def sigma_delta_loop (u, which_codec):
-    counter = 0
-    while True:
-        usrp_9862_write (u, which_codec, 43, counter >> 4)
-        usrp_9862_write (u, which_codec, 42, (counter & 0xf) << 4)
-        # counter += 1 FIXME
-        counter += 4
-        if counter > 0xfff:
-            counter = 0
-
-def aux_dac_loop (u, which_codec, which_dac):
-    reg = 36 + which_dac                # Aux DAC A,B,C
-    counter = 0
-    while True:
-        usrp_9862_write (u, which_codec, reg, counter)
-        counter += 1
-        if counter > 0xff:
-            counter = 0
-
-
-def read_aux_adc_loop (u, slot, which_adc):
-    while True:
-        v = usrp_read_aux_adc (u, slot, which_adc)
-        print "%3d  %5.3f" % (v, v * 3.3 / 1024)
-
-def ramp_io_port (u, slot):
-    counter = 0
-    try:
-        while True:
-            write_slot_io (u, slot, counter, 0xffff)
-            counter += 1
-            if counter > 0xffff:
-                counter = 0
-    except KeyboardInterrupt:
-        return
-
-def walk_io_port (u, slot):
-    bit = 1
-    try:
-        while True:
-            write_slot_io (u, slot, bit, 0xffff)
-            bit = (bit << 1) & 0xffff
-            if bit == 0:
-                bit = 1
-    except KeyboardInterrupt:
-        return
-
diff --git a/usrp/usrp.inf b/usrp/usrp.inf
deleted file mode 100644
index b612d1e37..000000000
--- a/usrp/usrp.inf
+++ /dev/null
@@ -1,91 +0,0 @@
-[Version]
-Signature = "$Chicago$"
-provider  = %manufacturer%
-DriverVer = 03/09/2005,0.1.10.1
-CatalogFile = usrp.cat
-
-Class = LibUsbDevices
-ClassGUID = {EB781AAF-9C70-4523-A5DF-642A87ECA567}
-
-[ClassInstall]
-AddReg=ClassInstall.AddReg
-
-[ClassInstall32]
-AddReg=ClassInstall.AddReg
-
-[ClassInstall.AddReg]
-HKR,,,,"LibUSB-Win32 Devices"
-HKR,,Icon,,"-20"
-
-[Manufacturer]
-%manufacturer%=Devices
-
-;--------------------------------------------------------------------------
-; Files
-;--------------------------------------------------------------------------
-
-[SourceDisksNames]
-1 = "Libusb-Win32 Driver Installation Disk",,
-
-[SourceDisksFiles]
-libusb0.sys = 1,,
-libusb0.dll = 1,,
-
-[DestinationDirs]
-LIBUSB.Files.Sys = 10,System32\Drivers
-LIBUSB.Files.Dll = 10,System32
-
-[LIBUSB.Files.Sys]
-libusb0.sys
-
-[LIBUSB.Files.Dll]
-libusb0.dll
-
-;--------------------------------------------------------------------------
-; Device driver
-;--------------------------------------------------------------------------
-
-[LIBUSB_DEV]
-CopyFiles = LIBUSB.Files.Sys, LIBUSB.Files.Dll
-AddReg    = LIBUSB_DEV.AddReg
-
-[LIBUSB_DEV.NT]
-CopyFiles = LIBUSB.Files.Sys, LIBUSB.Files.Dll
-
-[LIBUSB_DEV.HW]
-DelReg = LIBUSB_DEV.DelReg.HW
-
-[LIBUSB_DEV.NT.HW]
-DelReg = LIBUSB_DEV.DelReg.HW
-
-[LIBUSB_DEV.NT.Services]
-AddService = libusb0, 0x00000002, LIBUSB.AddService
-
-[LIBUSB_DEV.AddReg]
-HKR,,DevLoader,,*ntkern
-HKR,,NTMPDriver,,libusb0.sys
-
-[LIBUSB_DEV.DelReg.HW]
-HKR,,"LowerFilters"
-
-;--------------------------------------------------------------------------
-; Services
-;--------------------------------------------------------------------------
-
-[LIBUSB.AddService]
-DisplayName    = "LibUsb-Win32 - Kernel Driver 03/09/2005, 0.1.10.1"
-ServiceType    = 1
-StartType      = 3
-ErrorControl   = 0
-ServiceBinary  = %12%\libusb0.sys
-
-;--------------------------------------------------------------------------
-; Devices
-;--------------------------------------------------------------------------
-
-[Devices]
-"USRP filter"=LIBUSB_DEV, USB\VID_fffe&PID_0002
-
-[Strings]
-manufacturer = "GNU Radio folks"
-
diff --git a/usrp/usrp.iss.in b/usrp/usrp.iss.in
deleted file mode 100644
index e1257d82f..000000000
--- a/usrp/usrp.iss.in
+++ /dev/null
@@ -1,69 +0,0 @@
-;
-; Copyright 2003 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.
-;
-
-; Requirements: Inno Setup (http://www.jrsoftware.org/isdl.php)
-;
-; To compile this script do the following:
-; - copy libusb's driver (libusb0.sys, libusb0.dll) to this folder
-; - copy the USRP filter .inf file to this folder
-; - copy the USRP .exe and .dll files to this folder
-; - open this scipt with Inno Setup
-; - compile and run
-
-[Setup]
-AppName=USRP
-AppVerName=USRP @VERSION@
-AppPublisher=GNU Radio folks
-AppPublisherURL=http://www.gnu.org/software/gnuradio/
-AppVersion=@VERSION@
-DefaultDirName={pf}\Usrp
-DefaultGroupName=Usrp
-Compression=lzma
-SolidCompression=yes
-; Win98 or higher
-MinVersion=4,5
-PrivilegesRequired=admin
-LicenseFile="COPYING_GPL.txt"
-
-[Files]
-; copy the file to the App folder
-Source: "*.sys"; DestDir: "{app}\driver"
-;Source: "*.cat"; DestDir: "{app}\driver"
-Source: "*.dll"; DestDir: "{app}\driver"
-Source: "usrp.inf"; DestDir: "{app}\driver"
-
-; also copy the DLL to the system folders so that rundll32.exe will find it
-Source: "*.dll"; DestDir: "{win}\system32"; FLags: replacesameversion restartreplace
-
-Source: "COPYING_GPL.txt"; DestDir: "{app}"
-Source: "README.txt"; DestDir: "{app}"; Flags: isreadme
-
-Source: "*.exe"; DestDir: "{app}"
-Source: "*.ihx"; DestDir: "{app}\rev2"
-Source: "*.rbf"; DestDir: "{app}\rev2"
-
-[Icons]
-Name: "{group}\Uninstall TestDrivers"; Filename: "{uninstallexe}"
-
-[Run]
-; invoke libusb's DLL to install the .inf file
-Filename: "rundll32"; Parameters: "libusb0.dll,usb_install_driver_np_rundll {app}\driver\usrp.inf"; StatusMsg: "Installing driver (this may take a few seconds) ..."
-
diff --git a/usrp/usrp.pc.in b/usrp/usrp.pc.in
deleted file mode 100644
index 3c30de622..000000000
--- a/usrp/usrp.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: usrp
-Description: USRP Client Side C++ interface
-Requires: @LIBUSB_PKG_CONFIG_NAME@
-Version: @LIBVER@
-Libs: -L${libdir} -lusrp
-Cflags: -I${includedir}
diff --git a/usrp2/.gitignore b/usrp2/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/usrp2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/usrp2/Makefile.am b/usrp2/Makefile.am
deleted file mode 100644
index 9813f38cb..000000000
--- a/usrp2/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = host firmware
diff --git a/usrp2/doc/inband-signaling-eth b/usrp2/doc/inband-signaling-eth
deleted file mode 100644
index f4f497be9..000000000
--- a/usrp2/doc/inband-signaling-eth
+++ /dev/null
@@ -1,390 +0,0 @@
-#
-# Copyright 2007 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-
-FIXME Needless to say, this is _very much_ a work in progress
-
-
-
-This file specifies the format of ethernet packets used for in-band data
-transmission and signaling on the USRP2.
-
-IN packets are sent towards the host.
-OUT packets are sent away from the host.
-
-The layout is 32-bits wide.  All data is transmitted in BIG-endian
-format across the ethernet.
-
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |  Chan   |                     mbz                       |I|S|E|
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                           Timestamp                           |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                                                               |
-   +                                                               +
-   |                            Payload                            |
-   .                                                               .
-   .                                                               .
-   .                                                               .
-   |                                                               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-
-  mbz   Must be Zero: these bits must be zero in both IN and OUT packets.
-
-  I	Send Immediately. Set on Tx data that should be transmitted now.
-	FIXME: change definition to honor 0xffffffff timestamp.
-
-  S     Start of Burst Flag:  Set in an OUT packet if the data is the
-        first segment of what is logically a continuous burst of data.
-        Must be zero in IN packets.
-
-  E     End of Burst Flag:  Set in an OUT packet if the data is the
-        last segment of what is logically a continuous burst of data.
-        Must be zero in IN packets.  Underruns are not reported
-        when the FPGA runs out of samples between bursts.
-
-
-  Chan  5-bit logical channel number.  Channel number 0x1f is reserved
-        for control information.  See "Control Channel" below.  Other
-        channels are "data channels."  Each data channel is logically
-        independent of the others.  A data channel payload field
-        contains a sequence of homogeneous samples.  The format of the
-        samples is determined by the configuration associated with the
-        given channel.  It is often the case that the payload field
-        contains 32-bit complex samples, each containing 16-bit real
-        and imaginary components.
-
-  Timestamp: 32-bit timestamp.
-
-	FIXME: update to reflect that the time is measured at the
-	time the samples inserted into or pulled out of the 
-	DSP pipeline, not the A/D time.  Using A/D time is problematic
-	because of group delay through filtering, etc.
-
-	On IN packets, the timestamp indicates the time at which the
-	first sample of the packet was produced by the A/D converter(s)
-        for that channel.  On OUT packets, the timestamp specifies the
-        time at which the first sample in the packet should go out the
-        D/A converter(s) for that channel.  If a packet reaches the
-	head of the transmit queue, and the current time is later than
-	the timestamp, an error is assumed to have occurred and the
-	packet is discarded.  As a special case, the timestamp
-	0xffffffff is interpreted as "Now".
-
-	The time base is a free running 32-bit counter that is
-	incremented by the A/D sample-clock.
-
-  Payload: Variable length field.  Length is specified by the
-        length of the containing ethernet frame.
-
-
-// FIXME need to revisit this stuff
-
-  O     Overrun Flag: set in an IN packet if an overrun condition was
-        detected.  Must be zero in OUT packets.  Overrun occurs when
-        the FPGA has data to transmit to the host and there is no
-        buffer space available.  This generally indicates a problem on
-        the host.  Either it is not keeping up, or it has configured
-        the FPGA to transmit data at a higher rate than the transport
-        (USB) can support.
-
-  U     Underrun Flag: set in an IN packet if an underrun condition
-        was detected.  Must be zero in OUT packets.  Underrun occurs
-        when the FPGA runs out of samples, and it's not between
-        bursts.  See the "End of Burst flag" below.
-
-  D     Dropped Packet Flag: Set in an IN packet if the FPGA
-	discarded an OUT packet because its timestamp had already
-	passed.
-
-
-  RSSI  6-bit Received Strength Signal Indicator:  Must be zero in OUT
-        packets.  In IN packets, indicates RSSI as reported by front end.
-	FIXME The format and interpretation are to be determined.
-
-
-  Tag   4-bit tag for matching IN packets with OUT packets.
-        [FIXME, write more...]
-
-
-
-"Data Channel" payload format:
--------------------------------
-
-If Chan != 0x1f, the packet is a "data packet" and the payload is a
-sequence of homogeneous samples.  The format of the samples is
-determined by the configuration associated with the given channel.  
-It is often the case that the payload field contains 32-bit complex
-samples, each containing 16-bit real and imaginary components.
-
-
-"Control Channel" payload format:
----------------------------------
-
-If Chan == 0x1f, the packet is a "control packet".  The control channel
-payload consists of a sequence of 0 or more sub-packets.
-
-Each sub-packet starts on a 32-bit boundary, and consists of an 8-bit
-Opcode field, an 8-bit Length field, Length bytes of arguments, and 0,
-1, 2 or 3 bytes of padding to align the tail of the sub-packet to
-a 32-bit boundary.
-
-Control channel packets shall be processed at the head of the queue,
-and shall observe the timestamp semantics described above.
-
-
-General sub-packet format:
---------------------------
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-//-+-+-+-+-+-+-+-+
-   |     Opcode    |    Length     |        <length bytes> ...    |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-//-+-+-+-+-+-+-+-+
-
-
-Specific sub-packet formats:
-----------------------------
-
-  RID: 8-bit Request-ID. Copied from request sub-packet into corresponding
-       reply sub-packet.  RID allows the host to match requests and replies.
-
-  Reg Number: 8-bit Register Number.
-
-
-
-Identify:
-
-    Opcode:	OP_ID
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       2       |       RID     |      mbz      |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Identify Reply:
-
-    Opcode:	OP_ID_REPLY
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |      50       |      RID      |      mbz      |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |  Mac Addr 0   |  Mac Addr 1   |  Mac Addr 2   |  Mac Addr 3   |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |  Mac Addr 4   |  Mac Addr 5   | H/W rev major | H/W rev minor |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   | Serial Num 0  | Serial Num 1  | Serial Num 2  | Serial Num 3  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   | Serial Num 4  | Serial Num 5  | Serial Num 6  | Serial Num 7  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                                                               |
-   +                                                               +
-   |                                                               |
-   +                         FPGA MD5SUM                           +
-   |                                                               |
-   +                                                               +
-   |                                                               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                                                               |
-   +                                                               +
-   |                                                               |
-   +                          S/W MD5SUM                           +
-   |                                                               |
-   +                                                               +
-   |                                                               |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Write Register:
-
-    Opcode:	OP_WRITE_REG
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       6       |      mbz      |   Reg Number  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                        Register Value                         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Write Register Masked:
-
-    Opcode:	OP_WRITE_REG_MASKED
-
-    REG[Num] = (REG[Num] & ~Mask) | (Value & Mask)
-
-    That is, only the register bits that correspond to 1's in the
-    mask are written with the new value.
-
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |      10       |      mbz      |   Reg Number  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                         Register Value                        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                           Mask Value                          |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Read Register:
-
-    Opcode:	OP_READ_REG
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       2       |      RID      |   Reg Number  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Read Register Reply:
-
-    Opcode:	OP_READ_REG_REPLY
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       6       |      RID      |   Reg Number  |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |                        Register Value                         |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-// FIXME these may not be implemented...
-
-I2C Write:
-
-    Opcode:	OP_I2C_WRITE
-    I2C Addr:   7-bit I2C address
-    Data:	The bytes to write to the I2C bus
-    Length:     Length of Data + 2
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |    Length     |      RID      |    I2C Addr   |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Data ...			                           .
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-I2C Write Reply:
-
-    Opcode:	OP_I2C_WRITE_REPLY
-    Length:     2
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       2       |      RID      |      OK       |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-OK is 1 if successful, else 0.
-
-
-I2C Read:
-
-    Opcode:	OP_I2C_READ
-    I2C Addr:	7-bit I2C address
-    Nbytes:	Number of bytes to read from I2C bus
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       3       |      RID      |    I2C Addr   |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Nbytes    |              unspecified padding              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-I2C Read Reply:
-
-    Opcode:	OP_I2C_READ_REPLY
-    I2C Addr:	7-bit I2C address
-    Data:	Length - 2 bytes of data read from I2C bus.
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |     Length    |      RID      |      OK       |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Data ...			                           .
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-OK is 1 if successful, else 0
-
-
-SPI Write:
-
-    Opcode:	      OP_SPI_WRITE
-    Enables:	      Which SPI enables to assert (mask)
-    Format:	      Specifies format of SPI data and Opt Header Bytes
-    Opt Header Bytes: 2-byte field containing optional Tx bytes; see Format
-    Data:	      The bytes to write to the SPI bus
-    Length:	      Length of Data + 6
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |     Length    |      RID      |      mbz      |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Enables    |    Format     |        Opt Header Bytes       |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Data ...			                           .
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-SPI Write Reply:
-
-    Opcode:	OP_SPI_WRITE_REPLY
-    Length:     2
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       2       |      RID      |      OK       |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-OK is 1 if successful, else 0.
-
-
-SPI Read:
-
-    Opcode:	      OP_SPI_READ
-    Enables:	      Which SPI enables to assert (mask)
-    Format:	      Specifies format of SPI data and Opt Header Bytes
-    Opt Header Bytes: 2-byte field containing optional Tx bytes; see Format
-    Nbytes:	      Number of bytes to read from SPI bus.
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       7       |      RID      |      mbz      |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Enables    |    Format     |        Opt Header Bytes       |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Nbytes    |              unspecified padding              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-SPI Read Reply:
-
-    Opcode:   OP_SPI_READ_REPLY
-    Data:     Length - 2 bytes of data read from SPI bus.
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |     Length    |    RID    |        mbz        |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |    Data ...			                           .
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-Delay:
-
-    Opcode:	OP_DELAY
-    Ticks:	16-bit unsigned delay count
-
-    Delay Ticks clock ticks before executing next operation.
-
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-   |     Opcode    |       2       |            Ticks              |
-   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
diff --git a/usrp2/firmware/.gitignore b/usrp2/firmware/.gitignore
deleted file mode 100644
index 2381f1328..000000000
--- a/usrp2/firmware/.gitignore
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-stamp
-/*.a
-/*.bin
-/*.dump
-/*.log
-/*.rom
-/.deps
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/blink_leds
-/blink_leds2
-/build
-/compile
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/eth_test
-/gen_eth_packets
-/ibs_rx_test
-/ibs_tx_test
-/install-sh
-/libtool
-/ltmain.sh
-/missing
-/py-compile
-/rcv_eth_packets
-/run_tests.sh
-/stamp-h1
-/test1
-/test_phy_comm
-/timer_test
-/buf_ram_test
-/buf_ram_zero
-/hello
-/configure.lineno
diff --git a/usrp2/firmware/AUTHORS b/usrp2/firmware/AUTHORS
deleted file mode 100644
index 6bd41174b..000000000
--- a/usrp2/firmware/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Eric Blossom <eb@comsec.com>
-Matt Ettus <matt@ettus.com>
diff --git a/usrp2/firmware/COPYING b/usrp2/firmware/COPYING
deleted file mode 100644
index 94a9ed024..000000000
--- a/usrp2/firmware/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/usrp2/firmware/ChangeLog b/usrp2/firmware/ChangeLog
deleted file mode 100644
index 3154fc43a..000000000
--- a/usrp2/firmware/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-Please use the trac interface to see what's changed.
-http://gnuradio.org/trac/timeline
diff --git a/usrp2/firmware/INSTALL b/usrp2/firmware/INSTALL
deleted file mode 100644
index 5458714e1..000000000
--- a/usrp2/firmware/INSTALL
+++ /dev/null
@@ -1,234 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/usrp2/firmware/Makefile.am b/usrp2/firmware/Makefile.am
deleted file mode 100644
index a5339bb5b..000000000
--- a/usrp2/firmware/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright 2007,2008,2010 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-ACLOCAL_AMFLAGS = -I config
-
-include $(top_srcdir)/Makefile.common
-
-EXTRA_DIST = \
-	bootstrap \
-	configure \
-	configure.gnu \
-	u2_flash_tool
-
-SUBDIRS = config 
-
-if BUILDING_USRP2_FIRMWARE
-SUBDIRS += include lib apps
-endif
-
-
diff --git a/usrp2/firmware/Makefile.common b/usrp2/firmware/Makefile.common
deleted file mode 100644
index d45576201..000000000
--- a/usrp2/firmware/Makefile.common
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright 2007 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-STD_INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
-
-#HAL_IO = -DHAL_IO_USES_DBOARD_PINS 
-HAL_IO = -DHAL_IO_USES_UART 
-
-AM_CPPFLAGS = $(HAL_IO) $(STD_INCLUDES)
-
-STD_CFLAGS = --std=gnu99 -Wall -Werror-implicit-function-declaration -mxl-soft-div -msoft-float
-
-AM_CFLAGS = $(STD_CFLAGS) -mxl-soft-mul -mxl-barrel-shift
-#AM_CFLAGS = $(STD_CFLAGS) -mxl-soft-mul -mxl-barrel-shift -mxl-gp-opt -G 16384
-
-
-#LINKER_SCRIPT = $(top_srcdir)/lib/microblaze.ld
-#AM_LDFLAGS = -Wl,-T,$(LINKER_SCRIPT) -Wl,-defsym -Wl,_STACK_SIZE=1024
-#AM_LDFLAGS = -Wl,-T,$(LINKER_SCRIPT) -Wl,-Map -Wl,$@.map
-#AM_LDFLAGS = -Wl,-T,$(LINKER_SCRIPT)
-AM_LDFLAGS = -Wl,-Map -Wl,$@.map -Wl,-defsym -Wl,_STACK_SIZE=3072
-#AM_LDFLAGS = -Wl,-defsym -Wl,_STACK_SIZE=2048
-
-
-%.bin : %
-	mb-objcopy -O binary $< $@
-
-%.dump : %
-	mb-objdump -DSC $< > $@
-
-%.rom : %.bin
-	hexdump -v -e'1/1 "%.2X\n"' $< > $@
-
-
-.PRECIOUS : %.bin
-
-
-BINS =  $(noinst_PROGRAMS:=.bin)
-ROMS =  $(noinst_PROGRAMS:=.rom)
-DUMPS = $(noinst_PROGRAMS:=.dump)
-
-noinst_DATA = $(BINS) $(ROMS) $(DUMPS)
-
-CLEANFILES = $(ROMS) $(DUMPS) $(BINS)
diff --git a/usrp2/firmware/NEWS b/usrp2/firmware/NEWS
deleted file mode 100644
index e69de29bb..000000000
--- a/usrp2/firmware/NEWS
+++ /dev/null
diff --git a/usrp2/firmware/README b/usrp2/firmware/README
deleted file mode 100644
index 61d5ec4ff..000000000
--- a/usrp2/firmware/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Stay tuned for additional info as it becomes available ...
-
-  $ ./bootstrap
-  $ ./configure.gnu
-  $ make
diff --git a/usrp2/firmware/apps/.gitignore b/usrp2/firmware/apps/.gitignore
deleted file mode 100644
index 33469a796..000000000
--- a/usrp2/firmware/apps/.gitignore
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-stamp
-/*.a
-/*.bin
-/*.dump
-/*.log
-/*.rom
-/*.map
-/.deps
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/blink_leds
-/blink_leds2
-/build
-/compile
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/echo
-/eth_test
-/gen_eth_packets
-/ibs_rx_test
-/ibs_tx_test
-/install-sh
-/libtool
-/ltmain.sh
-/missing
-/py-compile
-/rcv_eth_packets
-/run_tests.sh
-/stamp-h1
-/test1
-/test_phy_comm
-/timer_test
-/buf_ram_test
-/buf_ram_zero
-/hello
-/test_printf
-/test_spi
-/test_i2c
-/gen_pause_frames
-/test_serdes
-/rx_only
-/tx_only
-/tx_standalone
-/tx_drop
-/tx_drop2
-/tx_drop_rate_limited
-/test_lsdac
-/test_lsadc
-/read_dbids
-/test_db_spi
-/ramp_lsdac
-/eth_to_serdes
-/serdes_to_dsp
-/sd_gentest
-/sd_bounce
-/can_i_sub
-/tx_only_v2
-/rx_only_v2
-/txrx
-/txrx_wbx
-/txrx_xcvr
-/eth_serdes
-/serdes_txrx
-/set_hw_rev
-/test_sd
-/factory_test
-/test_ram
-/mimo_tx
-/mimo_tx_slave
-/burn_dbsrx_eeprom
-/burnrev30
-/burnrev31
-/burnrev40
diff --git a/usrp2/firmware/apps/Makefile.am b/usrp2/firmware/apps/Makefile.am
deleted file mode 100644
index 1dc8b0a73..000000000
--- a/usrp2/firmware/apps/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# Copyright 2007,2008 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-include $(top_srcdir)/Makefile.common
-
-LDADD = ../lib/libu2fw.a
-
-noinst_PROGRAMS = \
-	blink_leds \
-	blink_leds2 \
-	buf_ram_test \
-	burn_dbsrx_eeprom \
-	can_i_sub \
-	echo \
-	eth_serdes \
-	gen_eth_packets \
-	hello \
-	ibs_rx_test \
-	ibs_tx_test \
-	rcv_eth_packets \
-	read_dbids \
-	set_hw_rev \
-	test1 \
-	test_db_spi \
-	test_i2c \
-	test_sd \
-	test_ram \
-	test_phy_comm \
-	test_lsadc \
-	test_lsdac \
-	timer_test \
-	tx_standalone \
-	txrx \
-	txrx_wbx \
-	txrx_xcvr \
-	factory_test \
-	burnrev30 \
-	burnrev31 \
-	burnrev40 \
-	serdes_txrx \
-	sd_gentest \
-	sd_bounce \
-	mimo_tx \
-	mimo_tx_slave
-
-
-
-# tx_drop_SOURCES = tx_drop.c app_common.c
-# tx_drop_rate_limited_SOURCES = tx_drop_rate_limited.c app_common.c
-# tx_drop2_SOURCES = tx_drop2.c app_common.c
-txrx_SOURCES = txrx.c app_common_v2.c
-txrx_wbx_SOURCES = txrx.c app_common_v2.c
-txrx_xcvr_SOURCES = txrx.c app_common_v2.c
-factory_test_SOURCES = factory_test.c app_common_v2.c
-eth_serdes_SOURCES = eth_serdes.c app_passthru_v2.c
-serdes_txrx_SOURCES = serdes_txrx.c app_common_v2.c
-mimo_tx_SOURCES = mimo_tx.c mimo_app_common_v2.c
-mimo_tx_slave_SOURCES = mimo_tx_slave.c app_common_v2.c
-
-txrx_wbx_LDADD = ../lib/libu2fw_wbx.a
-
-txrx_xcvr_LDADD = ../lib/libu2fw_xcvr.a
-
-
-noinst_HEADERS = \
-        app_common_v2.h \
-        app_passthru_v2.h \
-        mimo_app_common_v2.h
-
-
-MOSTLYCLEANFILES = *.map
diff --git a/usrp2/firmware/apps/app_common_v2.c b/usrp2/firmware/apps/app_common_v2.c
deleted file mode 100644
index 7716ed992..000000000
--- a/usrp2/firmware/apps/app_common_v2.c
+++ /dev/null
@@ -1,686 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "app_common_v2.h"
-#include "buffer_pool.h"
-#include "memcpy_wa.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "print_rmon_regs.h"
-#include "db.h"
-#include "db_base.h"
-#include "clocks.h"
-#include "u2_init.h"
-#include <string.h>
-#include "usrp2_i2c_addr.h"
-
-volatile bool link_is_up = false;	// eth handler sets this
-int cpu_tx_buf_dest_port = PORT_ETH;
-
-// If this is non-zero, this dbsm could be writing to the ethernet
-dbsm_t *ac_could_be_sending_to_eth;
-
-static unsigned char exp_seqno __attribute__((unused)) = 0;
-
-static inline bool
-sync_to_pps(const op_generic_t *p)
-{
-  timesync_regs->sync_on_next_pps = 1;
-  //putstr("SYNC to PPS\n");
-  return true;
-}
-
-static bool
-sync_every_pps(const op_generic_t *p)
-{
-  if (p->ok)
-    timesync_regs->tick_control |= TSC_TRIGGER_EVERYPPS;
-  else
-    timesync_regs->tick_control &= ~TSC_TRIGGER_EVERYPPS;
-
-  return true;
-}
-
-static inline bool
-config_mimo_cmd(const op_config_mimo_t *p)
-{
-  clocks_mimo_config(p->flags);
-  return true;
-}
-
-void
-set_reply_hdr(u2_eth_packet_t *reply_pkt, u2_eth_packet_t const *cmd_pkt)
-{
-  reply_pkt->ehdr.dst = cmd_pkt->ehdr.src;
-  reply_pkt->ehdr.src = *ethernet_mac_addr();
-  reply_pkt->ehdr.ethertype = U2_ETHERTYPE;
-  reply_pkt->thdr.flags = 0;
-  reply_pkt->thdr.fifo_status = 0;	// written by protocol engine
-  reply_pkt->thdr.seqno = 0;		// written by protocol engine
-  reply_pkt->thdr.ack = 0;		// written by protocol engine
-  u2p_set_word0(&reply_pkt->fixed, 0, CONTROL_CHAN);
-  reply_pkt->fixed.timestamp = timer_regs->time;
-}
-
-static void
-send_reply(unsigned char *reply, size_t reply_len)
-{
-  if (reply_len < 64)
-    reply_len = 64;
-
-  // wait for buffer to become idle
-  hal_set_leds(0x4, 0x4);
-  while((buffer_pool_status->status & BPS_IDLE(CPU_TX_BUF)) == 0)
-    ;
-  hal_set_leds(0x0, 0x4);
-
-  // copy reply into CPU_TX_BUF
-  memcpy_wa(buffer_ram(CPU_TX_BUF), reply, reply_len);
-
-  // wait until nobody else is sending to the ethernet
-  if (ac_could_be_sending_to_eth){
-    hal_set_leds(0x8, 0x8);
-    dbsm_wait_for_opening(ac_could_be_sending_to_eth);
-    hal_set_leds(0x0, 0x8);
-  }
-
-  if (0){
-    printf("sending_reply to port %d, len = %d\n", cpu_tx_buf_dest_port, (int)reply_len);
-    print_buffer(buffer_ram(CPU_TX_BUF), reply_len/4);
-  }
-
-  // fire it off
-  bp_send_from_buf(CPU_TX_BUF, cpu_tx_buf_dest_port, 1, 0, reply_len/4);
-
-  // wait for it to complete (not long, it's a small pkt)
-  while((buffer_pool_status->status & (BPS_DONE(CPU_TX_BUF) | BPS_ERROR(CPU_TX_BUF))) == 0)
-    ;
-
-  bp_clear_buf(CPU_TX_BUF);
-}
-
-
-static size_t
-op_id_cmd(const op_generic_t *p,
-	  void *reply_payload, size_t reply_payload_space)
-{
-  op_id_reply_t *r = (op_id_reply_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))	// no room
-    return 0;
-
-  // Build reply subpacket
-
-  r->opcode = OP_ID_REPLY;
-  r->len = sizeof(op_id_reply_t);
-  r->rid = p->rid;
-  r->addr = *ethernet_mac_addr();
-  r->hw_rev = (u2_hw_rev_major << 8) | u2_hw_rev_minor;
-  // r->fpga_md5sum = ;	// FIXME
-  // r->sw_md5sum = ;	// FIXME
-
-  return r->len;
-}
-
-
-static size_t
-config_tx_v2_cmd(const op_config_tx_v2_t *p,
-		 void *reply_payload, size_t reply_payload_space)
-{
-  op_config_tx_reply_v2_t *r = (op_config_tx_reply_v2_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))
-    return 0;					// no room
-
-  struct tune_result	tune_result;
-  memset(&tune_result, 0, sizeof(tune_result));
-
-  bool ok = true;
-
-  if (p->valid & CFGV_GAIN){
-    ok &= db_set_gain(tx_dboard, p->gain);
-  }
-
-  if (p->valid & CFGV_FREQ){
-    bool was_streaming = is_streaming();
-    if (was_streaming)
-      stop_rx_cmd();
-
-    u2_fxpt_freq_t f = u2_fxpt_freq_from_hilo(p->freq_hi, p->freq_lo);
-    bool tune_ok = db_tune(tx_dboard, f, &tune_result);
-    ok &= tune_ok;
-    print_tune_result("Tx", tune_ok, f, &tune_result);
-
-    if (was_streaming)
-      restart_streaming();
-  }
-
-  if (p->valid & CFGV_INTERP_DECIM){
-    int interp = p->interp;
-    int hb1 = 0;
-    int hb2 = 0;
-
-    if (!(interp & 1)){
-      hb2 = 1;
-      interp = interp >> 1;
-    }
-
-    if (!(interp & 1)){
-      hb1 = 1;
-      interp = interp >> 1;
-    }
-
-    if (interp < MIN_CIC_INTERP || interp > MAX_CIC_INTERP)
-      ok = false;
-    else {
-      dsp_tx_regs->interp_rate = (hb1<<9) | (hb2<<8) | interp;
-      // printf("Interp: %d, register %d\n", p->interp, (hb1<<9) | (hb2<<8) | interp);
-    }
-  }
-
-  if (p->valid & CFGV_SCALE_IQ){
-    dsp_tx_regs->scale_iq = p->scale_iq;
-  }
-
-  // Build reply subpacket
-
-  r->opcode = OP_CONFIG_TX_REPLY_V2;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = ok;
-  r->inverted = tune_result.inverted;
-  r->baseband_freq_hi = u2_fxpt_freq_hi(tune_result.baseband_freq);
-  r->baseband_freq_lo = u2_fxpt_freq_lo(tune_result.baseband_freq);
-  r->duc_freq_hi = u2_fxpt_freq_hi(tune_result.dxc_freq);
-  r->duc_freq_lo = u2_fxpt_freq_lo(tune_result.dxc_freq);
-  r->residual_freq_hi = u2_fxpt_freq_hi(tune_result.residual_freq);
-  r->residual_freq_lo = u2_fxpt_freq_lo(tune_result.residual_freq);
-  return r->len;
-}
-
-static size_t
-config_rx_v2_cmd(const op_config_rx_v2_t *p,
-		 void *reply_payload, size_t reply_payload_space)
-{
-  op_config_rx_reply_v2_t *r = (op_config_rx_reply_v2_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))
-    return 0;				// no room
-
-  struct tune_result	tune_result;
-  memset(&tune_result, 0, sizeof(tune_result));
-
-  bool ok = true;
-
-  if (p->valid & CFGV_GAIN){
-    ok &= db_set_gain(rx_dboard, p->gain);
-  }
-
-  if (p->valid & CFGV_FREQ){
-    bool was_streaming = is_streaming();
-    if (was_streaming)
-      stop_rx_cmd();
-
-    u2_fxpt_freq_t f = u2_fxpt_freq_from_hilo(p->freq_hi, p->freq_lo);
-    bool tune_ok = db_tune(rx_dboard, f, &tune_result);
-    ok &= tune_ok;
-    print_tune_result("Rx", tune_ok, f, &tune_result);
-
-    if (was_streaming)
-      restart_streaming();
-  }
-
-  if (p->valid & CFGV_INTERP_DECIM){
-    int decim = p->decim;
-    int hb1 = 0;
-    int hb2 = 0;
-
-    if(!(decim & 1)) {
-      hb2 = 1;
-      decim = decim >> 1;
-    }
-
-    if(!(decim & 1)) {
-      hb1 = 1;
-      decim = decim >> 1;
-    }
-
-    if (decim < MIN_CIC_DECIM || decim > MAX_CIC_DECIM)
-      ok = false;
-    else {
-      dsp_rx_regs->decim_rate = (hb1<<9) | (hb2<<8) | decim;
-      // printf("Decim: %d, register %d\n", p->decim, (hb1<<9) | (hb2<<8) | decim);
-    }
-  }
-
-  if (p->valid & CFGV_SCALE_IQ){
-    dsp_rx_regs->scale_iq = p->scale_iq;
-  }
-
-  // Build reply subpacket
-
-  r->opcode = OP_CONFIG_RX_REPLY_V2;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = ok;
-  r->inverted = tune_result.inverted;
-  r->baseband_freq_hi = u2_fxpt_freq_hi(tune_result.baseband_freq);
-  r->baseband_freq_lo = u2_fxpt_freq_lo(tune_result.baseband_freq);
-  r->ddc_freq_hi = u2_fxpt_freq_hi(tune_result.dxc_freq);
-  r->ddc_freq_lo = u2_fxpt_freq_lo(tune_result.dxc_freq);
-  r->residual_freq_hi = u2_fxpt_freq_hi(tune_result.residual_freq);
-  r->residual_freq_lo = u2_fxpt_freq_lo(tune_result.residual_freq);
-
-  return r->len;
-}
-
-static size_t
-read_time_cmd(const op_generic_t *p,
-	      void *reply_payload, size_t reply_payload_space)
-{
-  op_read_time_reply_t *r = (op_read_time_reply_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))
-    return 0;					// no room
-
-  r->opcode = OP_READ_TIME_REPLY;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->time = timer_regs->time;
-
-  return r->len;
-}
-
-static void
-fill_db_info(u2_db_info_t *p, const struct db_base *db)
-{
-  //p->dbid = db->dbid;
-  p->freq_min_hi = u2_fxpt_freq_hi(db->freq_min);
-  p->freq_min_lo = u2_fxpt_freq_lo(db->freq_min);
-  p->freq_max_hi = u2_fxpt_freq_hi(db->freq_max);
-  p->freq_max_lo = u2_fxpt_freq_lo(db->freq_max);
-  p->gain_min = db->gain_min;
-  p->gain_max = db->gain_max;
-  p->gain_step_size = db->gain_step_size;
-}
-
-static size_t
-dboard_info_cmd(const op_generic_t *p,
-		void *reply_payload, size_t reply_payload_space)
-{
-  op_dboard_info_reply_t *r = (op_dboard_info_reply_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))
-    return 0;					// no room
-
-  r->opcode = OP_DBOARD_INFO_REPLY;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = true;
-
-  fill_db_info(&r->tx_db_info, tx_dboard);
-  fill_db_info(&r->rx_db_info, rx_dboard);
-
-  r->tx_db_info.dbid = read_dboard_eeprom(I2C_ADDR_TX_A);
-  r->rx_db_info.dbid = read_dboard_eeprom(I2C_ADDR_RX_A);
-
-  return r->len;
-}
-
-static size_t
-peek_cmd(const op_peek_t *p,
-	 void *reply_payload, size_t reply_payload_space)
-{
-  op_generic_t *r = (op_generic_t *) reply_payload;
-
-  //putstr("peek: addr="); puthex32(p->addr);
-  //printf(" bytes=%u\n", p->bytes);
-
-  if ((reply_payload_space < (sizeof(*r) + p->bytes)) ||
-      p->bytes > MAX_SUBPKT_LEN - sizeof(op_generic_t)) {
-    putstr("peek: insufficient reply packet space\n");
-    return 0;			// FIXME do partial read?
-  }
-
-  r->opcode = OP_PEEK_REPLY;
-  r->len = sizeof(*r)+p->bytes;
-  r->rid = p->rid;
-  r->ok = true;
-
-  memcpy_wa(reply_payload+sizeof(*r), (void *)p->addr, p->bytes);
-
-  return r->len;
-}
-
-static bool
-poke_cmd(const op_poke_t *p)
-{
-  int bytes = p->len - sizeof(*p);
-  //putstr("poke: addr="); puthex32(p->addr);
-  //printf(" bytes=%u\n", bytes);
-
-  uint8_t *src = (uint8_t *)p + sizeof(*p);
-  memcpy_wa((void *)p->addr, src, bytes);
-
-  return true;
-}
-
-static bool
-set_lo_offset_cmd(const op_freq_t *p)
-{
-  u2_fxpt_freq_t f = u2_fxpt_freq_from_hilo(p->freq_hi, p->freq_lo);
-  if (p->opcode == OP_SET_TX_LO_OFFSET)
-    return db_set_lo_offset(tx_dboard, f);
-  else
-    return db_set_lo_offset(rx_dboard, f);
-}
-
-static size_t
-gpio_read_cmd(const op_gpio_t *p,
-	      void *reply_payload, size_t reply_payload_space)
-{
-  op_gpio_read_reply_t *r = (op_gpio_read_reply_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))	// no room
-    return 0;
-
- // Build reply subpacket
-
-  r->opcode = OP_GPIO_READ_REPLY;
-  r->len = sizeof(op_gpio_read_reply_t);
-  r->rid = p->rid;
-  r->ok = true;
-  r->mbz = 0;
-  r->value = hal_gpio_read(p->bank);
-
-  return r->len;
-}
-
-static size_t
-generic_reply(const op_generic_t *p,
-	      void *reply_payload, size_t reply_payload_space,
-	      bool ok)
-{
-  op_generic_t *r = (op_generic_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))
-    return 0;					// no room
-
-  r->opcode = p->opcode | OP_REPLY_BIT;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = ok;
-
-  return r->len;
-}
-
-static size_t
-add_eop(void *reply_payload, size_t reply_payload_space)
-{
-  op_generic_t *r = (op_generic_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))
-    return 0;					// no room
-
-  r->opcode = OP_EOP;
-  r->len = sizeof(*r);
-  r->rid = 0;
-  r->ok =  0;
-
-  return r->len;
-}
-
-void
-handle_control_chan_frame(u2_eth_packet_t *pkt, size_t len)
-{
-  unsigned char reply[sizeof(u2_eth_packet_t) + 4 * sizeof(u2_subpkt_t)] _AL4;
-  unsigned char *reply_payload = &reply[sizeof(u2_eth_packet_t)];
-  int reply_payload_space = sizeof(reply) - sizeof(u2_eth_packet_t);
-
-  // initialize reply
-  memset(reply, 0, sizeof(reply));
-  set_reply_hdr((u2_eth_packet_t *) reply, pkt);
-
-  // point to beginning of payload (subpackets)
-  unsigned char *payload = ((unsigned char *) pkt) + sizeof(u2_eth_packet_t);
-  int payload_len = len - sizeof(u2_eth_packet_t);
-
-  size_t subpktlen = 0;
-  bool ok = false;
-
-  while (payload_len >= sizeof(op_generic_t)){
-    const op_generic_t *gp = (const op_generic_t *) payload;
-    subpktlen = 0;
-
-    // printf("\nopcode = %d\n", gp->opcode);
-
-    switch(gp->opcode){
-    case OP_EOP:		// end of subpackets
-      goto end_of_subpackets;
-
-    case OP_ID:
-      subpktlen = op_id_cmd(gp, reply_payload, reply_payload_space);
-      break;
-
-    case OP_CONFIG_TX_V2:
-      subpktlen = config_tx_v2_cmd((op_config_tx_v2_t *) payload, reply_payload, reply_payload_space);
-      break;
-
-    case OP_CONFIG_RX_V2:
-      subpktlen = config_rx_v2_cmd((op_config_rx_v2_t *) payload, reply_payload, reply_payload_space);
-      break;
-
-    case OP_START_RX_STREAMING:
-      if (pkt->fixed.timestamp == -1) // Start now (default)
-        start_rx_streaming_cmd(&pkt->ehdr.src, (op_start_rx_streaming_t *) payload);
-      else
-        start_rx_streaming_at_cmd(&pkt->ehdr.src, (op_start_rx_streaming_t *)payload, pkt->fixed.timestamp);
-      ok = true;
-      goto generic_reply;
-
-    case OP_STOP_RX:
-      stop_rx_cmd();
-      ok = true;
-      goto generic_reply;
-
-    case OP_RX_ANTENNA:
-        ok = db_set_antenna(rx_dboard, ((op_config_mimo_t *)payload)->flags);
-        goto generic_reply;
-
-    case OP_TX_ANTENNA:
-        ok = db_set_antenna(tx_dboard, ((op_config_mimo_t *)payload)->flags);
-        goto generic_reply;
-
-    case OP_BURN_MAC_ADDR:
-      ok = ethernet_set_mac_addr(&((op_burn_mac_addr_t *)payload)->addr);
-      goto generic_reply;
-
-    case OP_CONFIG_MIMO:
-      ok = config_mimo_cmd((op_config_mimo_t *) payload);
-      goto generic_reply;
-
-    case OP_READ_TIME:
-      subpktlen = read_time_cmd(gp, reply_payload, reply_payload_space);
-      break;
-
-    case OP_DBOARD_INFO:
-      subpktlen = dboard_info_cmd(gp, reply_payload, reply_payload_space);
-      break;
-
-    case OP_SYNC_TO_PPS:
-      sync_to_pps((op_generic_t *) payload);
-      ok = true;
-      goto generic_reply;
-
-    case OP_PEEK:
-      subpktlen = peek_cmd((op_peek_t *)payload, reply_payload, reply_payload_space);
-      break;
-
-    case OP_POKE:
-      ok = poke_cmd((op_poke_t *)payload);
-      goto generic_reply;
-
-    case OP_SET_TX_LO_OFFSET:
-    case OP_SET_RX_LO_OFFSET:
-      ok = set_lo_offset_cmd((op_freq_t *)payload);
-      goto generic_reply;
-
-    case OP_RESET_DB:
-      db_init();
-      ok = true;
-      goto generic_reply;
-
-    case OP_SYNC_EVERY_PPS:
-      ok = sync_every_pps((op_generic_t *) payload);
-      goto generic_reply;
-
-    case OP_GPIO_SET_DDR:
-      ok = true;
-      hal_gpio_set_ddr(((op_gpio_t *)payload)->bank,
-		       ((op_gpio_t *)payload)->value,
-		       ((op_gpio_t *)payload)->mask);
-      goto generic_reply;
-
-    case OP_GPIO_SET_SELS:
-      ok = true;
-      hal_gpio_set_sels(((op_gpio_set_sels_t *)payload)->bank,
-			(char *)(&((op_gpio_set_sels_t *)payload)->sels));
-      goto generic_reply;
-
-    case OP_GPIO_READ:
-      subpktlen = gpio_read_cmd((op_gpio_t *) payload, reply_payload, reply_payload_space);
-      break;
-
-    case OP_GPIO_WRITE:
-      ok = true;
-      hal_gpio_write(((op_gpio_t *)payload)->bank,
-		     ((op_gpio_t *)payload)->value,
-		     ((op_gpio_t *)payload)->mask);
-      goto generic_reply;
-
-    case OP_GPIO_STREAM:
-      ok = true;
-      dsp_rx_regs->gpio_stream_enable = (uint32_t)((op_gpio_t *)payload)->value;
-      goto generic_reply;
-
-    // Add new opcode handlers here
-
-    generic_reply:
-      subpktlen = generic_reply(gp, reply_payload, reply_payload_space, ok);
-      break;
-
-    default:
-      printf("app_common_v2: unhandled opcode = %d\n", gp->opcode);
-      break;
-    }
-
-    int t = (gp->len + 3) & ~3;		// bump to a multiple of 4
-    payload += t;
-    payload_len -= t;
-
-    subpktlen = (subpktlen + 3) & ~3;	// bump to a multiple of 4
-    reply_payload += subpktlen;
-    reply_payload_space -= subpktlen;
-  }
-
- end_of_subpackets:
-
-  // add the EOP marker
-  subpktlen = add_eop(reply_payload, reply_payload_space);
-  subpktlen = (subpktlen + 3) & ~3;	// bump to a multiple of 4
-  reply_payload += subpktlen;
-  reply_payload_space -= subpktlen;
-
-  send_reply(reply, reply_payload - reply);
-}
-
-
-/*
- * Called when an ethernet packet is received.
- * Return true if we handled it here, otherwise
- * it'll be passed on to the DSP Tx pipe
- */
-bool
-eth_pkt_inspector(dbsm_t *sm, int bufno)
-{
-  u2_eth_packet_t *pkt = (u2_eth_packet_t *) buffer_ram(bufno);
-  size_t byte_len = (buffer_pool_status->last_line[bufno] - 1) * 4;
-
-  //static size_t last_len = 0;
-
-  // hal_toggle_leds(0x1);
-
-  // inspect rcvd frame and figure out what do do.
-
-  if (pkt->ehdr.ethertype != U2_ETHERTYPE)
-    return true;	// ignore, probably bogus PAUSE frame from MAC
-
-  int chan = u2p_chan(&pkt->fixed);
-
-  switch (chan){
-  case CONTROL_CHAN:
-    handle_control_chan_frame(pkt, byte_len);
-    return true;	// we handled the packet
-    break;
-
-  case 0:
-  default:
-#if 0
-    if (last_len != 0){
-      if (byte_len != last_len){
-	printf("Len: %d last: %d\n", byte_len, last_len);
-      }
-    }
-    last_len = byte_len;
-
-    if((pkt->thdr.seqno) == exp_seqno){
-      exp_seqno++;
-      //putchar('.');
-    }
-    else {
-      // putchar('S');
-      //printf("S%d %d ",exp_seqno,pkt->thdr.seqno);
-      exp_seqno = pkt->thdr.seqno + 1;
-    }
-#endif
-    return false;	// pass it on to Tx DSP
-    break;
-  }
-}
-
-/*
- * Called when eth phy state changes (w/ interrupts disabled)
- */
-void
-link_changed_callback(int speed)
-{
-  link_is_up = speed != 0;
-  hal_set_leds(link_is_up ? LED_RJ45 : 0x0, LED_RJ45);
-  printf("\neth link changed: speed = %d\n", speed);
-}
-
-
-void
-print_tune_result(char *msg, bool tune_ok,
-		  u2_fxpt_freq_t target_freq, struct tune_result *r)
-{
-#if 0
-  printf("db_tune %s %s\n", msg, tune_ok ? "true" : "false");
-  putstr("  target_freq   "); print_fxpt_freq(target_freq); newline();
-  putstr("  baseband_freq "); print_fxpt_freq(r->baseband_freq); newline();
-  putstr("  dxc_freq      "); print_fxpt_freq(r->dxc_freq); newline();
-  putstr("  residual_freq "); print_fxpt_freq(r->residual_freq); newline();
-  printf("  inverted      %s\n", r->inverted ? "true" : "false");
-#endif
-}
diff --git a/usrp2/firmware/apps/app_common_v2.h b/usrp2/firmware/apps/app_common_v2.h
deleted file mode 100644
index ff1baec06..000000000
--- a/usrp2/firmware/apps/app_common_v2.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_APP_COMMON_H
-#define INCLUDED_APP_COMMON_H
-
-#include "bool.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "memory_map.h"
-#include "hal_io.h"
-#include <stddef.h>
-#include <db.h>
-
-#define CPU_TX_BUF 	7	// cpu -> eth
-
-#define	_AL4 __attribute__((aligned (4)))
-
-extern volatile bool link_is_up;	// eth handler sets this
-
-// If there's a dbsm that sends to the ethernet, put it's address here
-extern dbsm_t *ac_could_be_sending_to_eth;
-
-extern int cpu_tx_buf_dest_port;
-
-void set_reply_hdr(u2_eth_packet_t *reply_pkt, u2_eth_packet_t const *cmd_pkt);
-
-/*
- * Called when an ethernet packet is received.
- * Return true if we handled it here, otherwise
- * it'll be passed on to the DSP Tx pipe
- */
-bool eth_pkt_inspector(dbsm_t *sm, int bufno);
-
-void link_changed_callback(int speed);
-
-void
-print_tune_result(char *msg, bool tune_ok,
-		  u2_fxpt_freq_t target_freq, struct tune_result *r);
-
-
-void start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p);
-void start_rx_streaming_at_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p, uint32_t time);
-void stop_rx_cmd(void);
-void restart_streaming(void);
-void restart_streaming_at(uint32_t time);
-bool is_streaming(void);
-
-void handle_control_chan_frame(u2_eth_packet_t *pkt, size_t len);
-
-#endif /* INCLUDED_APP_COMMON_H */
diff --git a/usrp2/firmware/apps/app_passthru_v2.c b/usrp2/firmware/apps/app_passthru_v2.c
deleted file mode 100644
index 406c56b3b..000000000
--- a/usrp2/firmware/apps/app_passthru_v2.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "app_passthru_v2.h"
-#include "buffer_pool.h"
-#include "memcpy_wa.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "print_rmon_regs.h"
-#include "db.h"
-#include "clocks.h"
-#include <string.h>
-
-volatile bool link_is_up = false;	// eth handler sets this
-
-
-// If this is non-zero, this dbsm could be writing to the ethernet
-dbsm_t *ac_could_be_sending_to_eth;
-
-//static unsigned char exp_seqno = 0;
-
-void
-set_reply_hdr(u2_eth_packet_t *reply_pkt, u2_eth_packet_t const *cmd_pkt)
-{
-  reply_pkt->ehdr.dst = cmd_pkt->ehdr.src;
-  reply_pkt->ehdr.src = *ethernet_mac_addr();
-  reply_pkt->ehdr.ethertype = U2_ETHERTYPE;
-  reply_pkt->thdr.flags = 0;
-  reply_pkt->thdr.fifo_status = 0;	// written by protocol engine
-  reply_pkt->thdr.seqno = 0;		// written by protocol engine
-  reply_pkt->thdr.ack = 0;		// written by protocol engine
-  u2p_set_word0(&reply_pkt->fixed, 0, CONTROL_CHAN);
-  reply_pkt->fixed.timestamp = timer_regs->time;
-}
-
-static void
-send_reply(unsigned char *reply, size_t reply_len)
-{
-  if (reply_len < 64)
-    reply_len = 64;
-
-  // wait for buffer to become idle
-  hal_set_leds(0x4, 0x4);
-  while((buffer_pool_status->status & BPS_IDLE(CPU_TX_BUF)) == 0)
-    ;
-  hal_set_leds(0x0, 0x4);
-
-  // copy reply into CPU_TX_BUF
-  memcpy_wa(buffer_ram(CPU_TX_BUF), reply, reply_len);
-
-  // wait until nobody else is sending to the ethernet
-  if (ac_could_be_sending_to_eth){
-    hal_set_leds(0x8, 0x8);
-    dbsm_wait_for_opening(ac_could_be_sending_to_eth);
-    hal_set_leds(0x0, 0x8);
-  }
-
-  // fire it off
-  bp_send_from_buf(CPU_TX_BUF, PORT_ETH, 1, 0, reply_len/4);
-
-  // wait for it to complete (not long, it's a small pkt)
-  while((buffer_pool_status->status & (BPS_DONE(CPU_TX_BUF) | BPS_ERROR(CPU_TX_BUF))) == 0)
-    ;
-
-  bp_clear_buf(CPU_TX_BUF);
-}
-
-
-static size_t
-op_id_cmd(const op_generic_t *p,
-	  void *reply_payload, size_t reply_payload_space)
-{
-  op_id_reply_t *r = (op_id_reply_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))	// no room
-    return 0;
-
-  // Build reply subpacket
-
-  r->opcode = OP_ID_REPLY;
-  r->len = sizeof(op_id_reply_t);
-  r->rid = p->rid;
-  r->addr = *ethernet_mac_addr();
-  r->hw_rev = 0x0000;	// FIXME
-  // r->fpga_md5sum = ;	// FIXME
-  // r->sw_md5sum = ;	// FIXME
-
-  // FIXME Add d'board info, including dbid, min/max gain, min/max freq
-
-  return r->len;
-}
-
-static size_t
-add_eop(void *reply_payload, size_t reply_payload_space)
-{
-  op_generic_t *r = (op_generic_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))		
-    return 0;					// no room
-
-  r->opcode = OP_EOP;
-  r->len = sizeof(*r);
-  r->rid = 0;
-  r->ok =  0;
-
-  return r->len;
-}
-
-bool
-handle_control_chan_frame(u2_eth_packet_t *pkt, size_t len)
-{
-  unsigned char reply[sizeof(u2_eth_packet_t) + 4 * sizeof(u2_subpkt_t)] _AL4;
-  unsigned char *reply_payload = &reply[sizeof(u2_eth_packet_t)];
-  int reply_payload_space = sizeof(reply) - sizeof(u2_eth_packet_t);
-
-  bool handled_it = false;
-
-  // initialize reply
-  memset(reply, 0, sizeof(reply));
-  set_reply_hdr((u2_eth_packet_t *) reply, pkt);
-
-  // point to beginning of payload (subpackets)
-  unsigned char *payload = ((unsigned char *) pkt) + sizeof(u2_eth_packet_t);
-  int payload_len = len - sizeof(u2_eth_packet_t);
-
-  size_t subpktlen = 0;
-
-  while (payload_len >= sizeof(op_generic_t)){
-    const op_generic_t *gp = (const op_generic_t *) payload;
-    subpktlen = 0;
-
-    switch(gp->opcode){
-    case OP_EOP:		// end of subpackets
-      goto end_of_subpackets;
-
-    case OP_ID:
-      subpktlen = op_id_cmd(gp, reply_payload, reply_payload_space);
-      handled_it = true;
-      break;
-
-    default:
-      if (0){
-	printf("\npassing on %d\n", gp->opcode);
-      }
-      break;
-    }
-
-    int t = (gp->len + 3) & ~3;		// bump to a multiple of 4
-    payload += t;
-    payload_len -= t;
-
-    subpktlen = (subpktlen + 3) & ~3;	// bump to a multiple of 4
-    reply_payload += subpktlen;
-    reply_payload_space -= subpktlen;
-  }
-
- end_of_subpackets:
-
-  if (handled_it){
-    // add the EOP marker
-    subpktlen = add_eop(reply_payload, reply_payload_space);
-    subpktlen = (subpktlen + 3) & ~3;	// bump to a multiple of 4
-    reply_payload += subpktlen;
-    reply_payload_space -= subpktlen;
-
-    send_reply(reply, reply_payload - reply);
-  }
-
-  return handled_it;
-}
-
-
-/*
- * Called when an ethernet packet is received.
- * Return true if we handled it here, otherwise
- * it'll be passed on to the DSP Tx pipe
- */
-bool
-eth_pkt_inspector(dbsm_t *sm, int bufno)
-{
-  u2_eth_packet_t *pkt = (u2_eth_packet_t *) buffer_ram(bufno);
-  size_t byte_len = (buffer_pool_status->last_line[bufno] - 3) * 4;
-
-  //static size_t last_len = 0;
-
-  // hal_toggle_leds(0x1);
-
-  // inspect rcvd frame and figure out what do do.
-
-  if (pkt->ehdr.ethertype != U2_ETHERTYPE)
-    return true;	// ignore, probably bogus PAUSE frame from MAC
-
-  int chan = u2p_chan(&pkt->fixed);
-
-  switch (chan){
-  case CONTROL_CHAN:
-    return handle_control_chan_frame(pkt, byte_len);
-    break;
-
-  case 0:
-  default:
-#if 0
-    if (last_len != 0){
-      if (byte_len != last_len){
-	printf("Len: %d last: %d\n", byte_len, last_len);
-      }
-    }
-    last_len = byte_len;
-
-    if((pkt->thdr.seqno) == exp_seqno){
-      exp_seqno++;
-      //putchar('.');
-    }
-    else {
-      // putchar('S');
-      //printf("S%d %d ",exp_seqno,pkt->thdr.seqno);
-      exp_seqno = pkt->thdr.seqno + 1;
-    }
-#endif
-    return false;	// pass it on to Tx DSP
-    break;
-  }
-}
-
-/*
- * Called when eth phy state changes (w/ interrupts disabled)
- */
-void
-link_changed_callback(int speed)
-{
-  link_is_up = speed != 0;
-  hal_set_leds(link_is_up ? LED_RJ45 : 0x0, LED_RJ45);
-  printf("\neth link changed: speed = %d\n", speed);
-}
diff --git a/usrp2/firmware/apps/app_passthru_v2.h b/usrp2/firmware/apps/app_passthru_v2.h
deleted file mode 100644
index 419997ff6..000000000
--- a/usrp2/firmware/apps/app_passthru_v2.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_APP_COMMON_H
-#define INCLUDED_APP_COMMON_H
-
-#include "bool.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "memory_map.h"
-#include "hal_io.h"
-#include <stddef.h>
-#include <db.h>
-
-#define CPU_TX_BUF 	7	// cpu -> eth
-
-#define	_AL4 __attribute__((aligned (4)))
-
-extern volatile bool link_is_up;	// eth handler sets this
-
-
-// If there's a dbsm that sends to the ethernet, put it's address here
-extern dbsm_t *ac_could_be_sending_to_eth;
-
-
-void set_reply_hdr(u2_eth_packet_t *reply_pkt, u2_eth_packet_t const *cmd_pkt);
-
-/*
- * Called when an ethernet packet is received.
- * Return true if we handled it here, otherwise
- * it'll be passed on to the DSP Tx pipe
- */
-bool eth_pkt_inspector(dbsm_t *sm, int bufno);
-
-void link_changed_callback(int speed);
-
-bool handle_control_chan_frame(u2_eth_packet_t *pkt, size_t len);
-
-#endif /* INCLUDED_APP_COMMON_H */
diff --git a/usrp2/firmware/apps/bitrot/tx_drop.c b/usrp2/firmware/apps/bitrot/tx_drop.c
deleted file mode 100644
index d5d6557de..000000000
--- a/usrp2/firmware/apps/bitrot/tx_drop.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common.h"
-#include "print_rmon_regs.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/*
- * Like tx_only.c, but we discard data packets instead of sending them to the
- * DSP TX pipeline.
- */
-
-int total_rx_pkts = 0;
-int total_rx_bytes = 0;
-
-
-static int timer_delta = MASTER_CLK_RATE/1000;	// tick at 1kHz
-
-/*
- * This program can respond to queries from the host
- * and stream rx samples.
- *
- * Buffer 1 is used by the cpu to send frames to the host.
- * Buffers 2 and 3 are used to double-buffer the DSP Rx to eth flow
- * Buffers 4 and 5 are used to double-buffer the eth to DSP Tx  eth flow
- */
-//#define CPU_RX_BUF	0	// eth -> cpu
-//#define CPU_TX_BUF 	1	// cpu -> eth
-
-#define	DSP_RX_BUF_0	2	// dsp rx -> eth (double buffer)
-#define	DSP_RX_BUF_1	3	// dsp rx -> eth
-#define	DSP_TX_BUF_0	4	// eth -> dsp tx (double buffer)
-#define	DSP_TX_BUF_1	5	// eth -> dsp tx
-
-
-/*
- * ================================================================
- *      configure DSP TX double buffering state machine
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 2 lines (word0 + timestamp)
-// DSP Tx reads word0 (flags) + timestamp followed by samples
-
-#define DSP_TX_FIRST_LINE		  4
-#define DSP_TX_SAMPLES_PER_FRAME	250	// not used except w/ debugging
-#define	DSP_TX_EXTRA_LINES		  2	// reads word0 + timestamp
-
-// Receive from ethernet
-buf_cmd_args_t dsp_tx_recv_args = {
-  PORT_ETH,
-  0,
-  BP_LAST_LINE
-};
-
-// send to DSP Tx
-buf_cmd_args_t dsp_tx_send_args = {
-  PORT_DSP,
-  DSP_TX_FIRST_LINE,	// starts just past ethernet header
-  0			// filled in from last_line register
-};
-
-dbsm_t dsp_tx_sm;	// the state machine
-
-
-// ----------------------------------------------------------------
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-void
-timer_irq_handler(unsigned irq)
-{
-  hal_set_timeout(timer_delta);	// schedule next timeout
-}
-
-// Tx DSP underrun
-void
-underrun_irq_handler(unsigned irq)
-{
-  putchar('U');
-
-  dbsm_stop(&dsp_tx_sm);
-  dsp_tx_regs->clear_state = 1;
-  dbsm_start(&dsp_tx_sm);  // restart sm so we're listening to ethernet again
-
-  // putstr("\nirq: underrun\n");
-}
-
-
-void
-start_rx_cmd(const u2_mac_addr_t *host, op_start_rx_t *p)
-{
-}
-
-void
-stop_rx_cmd(void)
-{
-}
-
-static void
-setup_tx()
-{
-  dsp_tx_regs->clear_state = 1;
-  bp_clear_buf(DSP_TX_BUF_0);
-  bp_clear_buf(DSP_TX_BUF_1);
-
-  int tx_scale = 256;
-  int interp = 32;
-
-  op_config_tx_t def_config;
-  memset(&def_config, 0, sizeof(def_config));
-  def_config.phase_inc  = 408021893;			// 9.5 MHz [2**32 * fc/fsample]
-  def_config.scale_iq = (tx_scale << 16) | tx_scale;
-  def_config.interp = interp;
-
-  // setup Tx DSP regs
-  config_tx_cmd(&def_config);
-}
-
-
-inline static void
-buffer_irq_handler(unsigned irq)
-{
-  uint32_t  status = buffer_pool_status->status;
-
-  if (status & BPS_ERROR_ALL){
-    // FIXME rare path, handle error conditions
-    putstr("Errors! status = ");
-    puthex32_nl(status);
-
-    printf("total_rx_pkts  = %d\n", total_rx_pkts);
-    printf("total_rx_bytes = %d\n", total_rx_bytes);
-
-    print_rmon_regs();
-
-    if (status & (BPS_ERROR(DSP_TX_BUF_0) | BPS_ERROR(DSP_TX_BUF_1))){
-      dbsm_stop(&dsp_tx_sm);		
-      dsp_tx_regs->clear_state = 1; // try to restart
-      dbsm_start(&dsp_tx_sm);
-      return;
-    }
-  }
-
-  dbsm_process_status(&dsp_tx_sm, status);
-
-  if (status & BPS_DONE(CPU_TX_BUF)){
-    bp_clear_buf(CPU_TX_BUF);
-  }
-}
-
-
-/*
- * Called when an ethernet packet is received.
- *
- * Claim that we handled all the packets,
- * dropping those destined for the TX DSP chain
- * on the ground.
- */
-bool
-nop_eth_pkt_inspector(dbsm_t *sm, int bufno)
-{
-  hal_toggle_leds(0x1);
-
-  u2_eth_packet_t *pkt = (u2_eth_packet_t *) buffer_ram(bufno);
-  size_t byte_len = (buffer_pool_status->last_line[bufno] - 1) * 4;
-
-  total_rx_pkts++;
-  total_rx_bytes += byte_len;
-
-  // inspect rcvd frame and figure out what do do.
-
-  if (pkt->ehdr.ethertype != U2_ETHERTYPE)
-    return true;	// ignore, probably bogus PAUSE frame from MAC
-
-  int chan = u2p_chan(&pkt->fixed);
-
-  switch (chan){
-  case CONTROL_CHAN:
-    handle_control_chan_frame(pkt, byte_len);
-    return true;	// we handled the packet
-    break;
-
-  case 0:
-  default:
-    return true;	// We handled the data by dropping it :)
-    break;
-  }
-}
-
-
-int
-main(void)
-{
-  u2_init();
-
-  // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
-  hal_gpio_set_tx_mode(15, 0, GPIOM_FPGA_1);
-  hal_gpio_set_rx_mode(15, 0, GPIOM_FPGA_1);
-
-  putstr("\ntx_drop\n");
-  
-  // Control LEDs
-  hal_set_leds(0x0, 0x3);
-
-  pic_register_handler(IRQ_UNDERRUN, underrun_irq_handler);
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-  ethernet_init();
-
-  // initialize double buffering state machine for ethernet -> DSP Tx
-
-  dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
-	    &dsp_tx_recv_args, &dsp_tx_send_args,
-	    nop_eth_pkt_inspector);
-
-  // program tx registers
-  setup_tx();
-
-  // kick off the state machine
-  dbsm_start(&dsp_tx_sm);
-
-  while(1){
-    buffer_irq_handler(0);
-  }
-}
-
diff --git a/usrp2/firmware/apps/bitrot/tx_drop2.c b/usrp2/firmware/apps/bitrot/tx_drop2.c
deleted file mode 100644
index 7f9b7a563..000000000
--- a/usrp2/firmware/apps/bitrot/tx_drop2.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common.h"
-#include "print_rmon_regs.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/*
- * Like tx_only.c, but we discard data packets instead of sending them to the
- * DSP TX pipeline.
- */
-
-int total_rx_pkts = 0;
-int total_rx_bytes = 0;
-
-
-static int timer_delta = MASTER_CLK_RATE/1000;	// tick at 1kHz
-
-/*
- * This program can respond to queries from the host
- * and stream rx samples.
- *
- * Buffer 1 is used by the cpu to send frames to the host.
- * Buffers 2 and 3 are used to double-buffer the DSP Rx to eth flow
- * Buffers 4 and 5 are used to double-buffer the eth to DSP Tx  eth flow
- */
-//#define CPU_RX_BUF	0	// eth -> cpu
-//#define CPU_TX_BUF 	1	// cpu -> eth
-
-#define	DSP_RX_BUF_0	2	// dsp rx -> eth (double buffer)
-#define	DSP_RX_BUF_1	3	// dsp rx -> eth
-#define	DSP_TX_BUF_0	4	// eth -> dsp tx (double buffer)
-#define	DSP_TX_BUF_1	5	// eth -> dsp tx
-
-
-/*
- * ================================================================
- *      configure DSP RX double buffering state machine
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line (word0)
-// DSP Rx writes timestamp followed by nlines_per_frame of samples
-#define DSP_RX_FIRST_LINE		  5
-#define DSP_RX_SAMPLES_PER_FRAME	128
-#define	DSP_RX_EXTRA_LINES		  1	// writes timestamp
-
-// Receive from DSP Rx
-buf_cmd_args_t dsp_rx_recv_args = {
-  PORT_DSP,
-  DSP_RX_FIRST_LINE,
-  BP_LAST_LINE
-};
-
-// send to ethernet
-buf_cmd_args_t dsp_rx_send_args = {
-  PORT_ETH,
-  0,		// starts with ethernet header in line 0
-  0,		// filled in from last_line register
-};
-
-dbsm_t dsp_rx_sm;	// the state machine
-
-/*
- * ================================================================
- *      configure DSP TX double buffering state machine
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 2 lines (word0 + timestamp)
-// DSP Tx reads word0 (flags) + timestamp followed by samples
-
-#define DSP_TX_FIRST_LINE		  4
-#define DSP_TX_SAMPLES_PER_FRAME	250	// not used except w/ debugging
-#define	DSP_TX_EXTRA_LINES		  2	// reads word0 + timestamp
-
-// Receive from ethernet
-buf_cmd_args_t dsp_tx_recv_args = {
-  PORT_ETH,
-  0,
-  BP_LAST_LINE
-};
-
-// send to DSP Tx
-buf_cmd_args_t dsp_tx_send_args = {
-  PORT_DSP,
-  DSP_TX_FIRST_LINE,	// starts just past ethernet header
-  0			// filled in from last_line register
-};
-
-dbsm_t dsp_tx_sm;	// the state machine
-
-
-// ----------------------------------------------------------------
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-void
-timer_irq_handler(unsigned irq)
-{
-  hal_set_timeout(timer_delta);	// schedule next timeout
-}
-
-// Tx DSP underrun
-void
-underrun_irq_handler(unsigned irq)
-{
-  putchar('U');
-
-  dbsm_stop(&dsp_tx_sm);
-  dsp_tx_regs->clear_state = 1;
-  dbsm_start(&dsp_tx_sm);  // restart sm so we're listening to ethernet again
-
-  // putstr("\nirq: underrun\n");
-}
-
-
-void
-start_rx_cmd(const u2_mac_addr_t *host, op_start_rx_t *p)
-{
-}
-
-void
-stop_rx_cmd(void)
-{
-}
-
-static void
-setup_tx()
-{
-  dsp_tx_regs->clear_state = 1;
-  bp_clear_buf(DSP_TX_BUF_0);
-  bp_clear_buf(DSP_TX_BUF_1);
-
-#if 1
-  int tx_scale = 256;
-  int interp = 32;
-
-  op_config_tx_t def_config;
-  memset(&def_config, 0, sizeof(def_config));
-  def_config.phase_inc  = 408021893;			// 9.5 MHz [2**32 * fc/fsample]
-  def_config.scale_iq = (tx_scale << 16) | tx_scale;
-  def_config.interp = interp;
-
-  // setup Tx DSP regs
-  config_tx_cmd(&def_config);
-#endif
-}
-
-
-inline static void
-buffer_irq_handler(unsigned irq)
-{
-  uint32_t  status = buffer_pool_status->status;
-
-  if (status & BPS_ERROR_ALL){
-    // FIXME rare path, handle error conditions
-    putstr("Errors! status = ");
-    puthex32_nl(status);
-
-    printf("total_rx_pkts  = %d\n", total_rx_pkts);
-    printf("total_rx_bytes = %d\n", total_rx_bytes);
-
-    print_rmon_regs();
-
-    if (status & (BPS_ERROR(DSP_TX_BUF_0) | BPS_ERROR(DSP_TX_BUF_1))){
-      dbsm_stop(&dsp_tx_sm);		
-      dsp_tx_regs->clear_state = 1; // try to restart
-      dbsm_start(&dsp_tx_sm);
-      return;
-    }
-  }
-
-  dbsm_process_status(&dsp_tx_sm, status);
-
-  if (status & BPS_DONE(CPU_TX_BUF)){
-    bp_clear_buf(CPU_TX_BUF);
-  }
-}
-
-/*
- * Called when an ethernet packet is received.
- * Return true if we handled it here (always!)
- */
-bool
-nop_eth_pkt_inspector(dbsm_t *sm, int bufno)
-{
-  hal_toggle_leds(0x1);
-
-  u2_eth_packet_t *pkt = (u2_eth_packet_t *) buffer_ram(bufno);
-  size_t byte_len = (buffer_pool_status->last_line[bufno] - 1) * 4;
-
-  total_rx_pkts++;
-  total_rx_bytes += byte_len;
-
-  // inspect rcvd frame and figure out what do do.
-
-  if (pkt->ehdr.ethertype != U2_ETHERTYPE)
-    return true;	// ignore, probably bogus PAUSE frame from MAC
-
-  int chan = u2p_chan(&pkt->fixed);
-
-  switch (chan){
-  case CONTROL_CHAN:
-    handle_control_chan_frame(pkt, byte_len);
-    return true;	// we handled the packet
-    break;
-
-  case 0:
-  default:
-    return true;	// say we handled it
-    break;
-  }
-}
-
-
-int
-main(void)
-{
-  u2_init();
-
-  // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
-  hal_gpio_set_tx_mode(15, 0, GPIOM_FPGA_1);
-  hal_gpio_set_rx_mode(15, 0, GPIOM_FPGA_1);	// no printing...
-
-  putstr("\ntx_drop2\n");
-  
-  // Control LEDs
-  hal_set_leds(0x0, 0x3);
-
-  // pic_register_handler(IRQ_OVERRUN,  overrun_irq_handler);
-  pic_register_handler(IRQ_UNDERRUN, underrun_irq_handler);
-
-  //pic_register_handler(IRQ_TIMER, timer_irq_handler);
-  //hal_set_timeout(timer_delta);
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-
-  ethernet_init();
-
-  // initialize double buffering state machine for ethernet -> DSP Tx
-
-  dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
-	    &dsp_tx_recv_args, &dsp_tx_send_args,
-	    nop_eth_pkt_inspector);
-
-  // program tx registers
-  setup_tx();
-
-  // kick off the state machine
-  dbsm_start(&dsp_tx_sm);
-
-  while(1){
-    buffer_irq_handler(0);
-  }
-}
-
diff --git a/usrp2/firmware/apps/bitrot/tx_drop_rate_limited.c b/usrp2/firmware/apps/bitrot/tx_drop_rate_limited.c
deleted file mode 100644
index 0eab25b34..000000000
--- a/usrp2/firmware/apps/bitrot/tx_drop_rate_limited.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common.h"
-#include "print_rmon_regs.h"
-#include "eth_mac.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/*
- * receive packets from ethernet at a fixed rate and discard them
- */
-
-int total_rx_pkts = 0;
-int total_rx_bytes = 0;
-
-
-static int timer_delta = (int)(MASTER_CLK_RATE * 10e-6); // 10us / tick
-
-
-/*
- * This program can respond to queries from the host
- * and stream rx samples.
- *
- * Buffer 1 is used by the cpu to send frames to the host.
- * Buffers 2 and 3 are used to double-buffer the DSP Rx to eth flow
- * Buffers 4 and 5 are used to double-buffer the eth to DSP Tx  eth flow
- */
-//#define CPU_RX_BUF	0	// eth -> cpu
-//#define CPU_TX_BUF 	1	// cpu -> eth
-
-#define	DSP_RX_BUF_0	2	// dsp rx -> eth (double buffer)
-#define	DSP_RX_BUF_1	3	// dsp rx -> eth
-#define	DSP_TX_BUF_0	4	// eth -> dsp tx (double buffer)
-#define	DSP_TX_BUF_1	5	// eth -> dsp tx
-
-
-
-// ----------------------------------------------------------------
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-static volatile bool receive_packet_now = false;
-
-void
-timer_irq_handler(unsigned irq)
-{
-  hal_set_timeout(timer_delta);	// schedule next timeout
-  receive_packet_now = true;
-}
-
-
-// Tx DSP underrun
-void
-underrun_irq_handler(unsigned irq)
-{
-  putchar('U');
-}
-
-
-void
-start_rx_cmd(const u2_mac_addr_t *host, op_start_rx_t *p)
-{
-}
-
-void
-stop_rx_cmd(void)
-{
-}
-
-static void
-setup_tx()
-{
-  dsp_tx_regs->clear_state = 1;
-  bp_clear_buf(DSP_TX_BUF_0);
-  bp_clear_buf(DSP_TX_BUF_1);
-
-  int tx_scale = 256;
-  int interp = 32;
-
-  op_config_tx_t def_config;
-  memset(&def_config, 0, sizeof(def_config));
-  def_config.phase_inc  = 408021893;			// 9.5 MHz [2**32 * fc/fsample]
-  def_config.scale_iq = (tx_scale << 16) | tx_scale;
-  def_config.interp = interp;
-
-  // setup Tx DSP regs
-  config_tx_cmd(&def_config);
-}
-
-
-/*
- * Called when an ethernet packet is received.
- *
- * Claim that we handled all the packets,
- * dropping those destined for the TX DSP chain
- * on the ground.
- */
-bool
-nop_eth_pkt_inspector(dbsm_t *sm, int bufno)
-{
-  hal_toggle_leds(0x1);
-
-  u2_eth_packet_t *pkt = (u2_eth_packet_t *) buffer_ram(bufno);
-  size_t byte_len = (buffer_pool_status->last_line[bufno] - 1) * 4;
-
-  total_rx_pkts++;
-  total_rx_bytes += byte_len;
-
-  // inspect rcvd frame and figure out what do do.
-
-  if (pkt->ehdr.ethertype != U2_ETHERTYPE)
-    return true;	// ignore, probably bogus PAUSE frame from MAC
-
-  int chan = u2p_chan(&pkt->fixed);
-
-  switch (chan){
-  case CONTROL_CHAN:
-    handle_control_chan_frame(pkt, byte_len);
-    return true;	// we handled the packet
-    break;
-
-  case 0:
-  default:
-    return true;	// We handled the data by dropping it :)
-    break;
-  }
-}
-
-
-inline static void
-buffer_irq_handler(unsigned irq)
-{
-  uint32_t  status = buffer_pool_status->status;
-
-  if (status & (BPS_DONE(CPU_TX_BUF) | BPS_ERROR(CPU_TX_BUF)))
-    bp_clear_buf(CPU_TX_BUF);
-
-  if (status & (BPS_DONE(DSP_TX_BUF_0) | BPS_ERROR(DSP_TX_BUF_0))){
-    bp_clear_buf(DSP_TX_BUF_0);
-
-    if (status & BPS_ERROR(DSP_TX_BUF_0)){
-      int crc = eth_mac_read_rmon(0x05);
-      int fifo_full = eth_mac_read_rmon(0x06);
-      int too_short_too_long = eth_mac_read_rmon(0x07);
-      putstr("Errors! status = ");
-      puthex32_nl(status);
-
-      printf("crc_err\t\t= %d\n", crc);
-      printf("fifo_full\t\t= %d\n", fifo_full);
-      printf("too_short_too_long\t= %d\n", too_short_too_long);
-
-      printf("total_rx_pkts  = %d\n", total_rx_pkts);
-      printf("total_rx_bytes = %d\n", total_rx_bytes);
-    }
-    else
-      nop_eth_pkt_inspector(0, DSP_TX_BUF_0);
-  }
-
-  if (receive_packet_now && (status & BPS_IDLE(DSP_TX_BUF_0))){
-    receive_packet_now = false;
-    bp_receive_to_buf(DSP_TX_BUF_0, PORT_ETH, 1, 0, BP_LAST_LINE);
-  }
-}
-
-
-int
-main(void)
-{
-  u2_init();
-
-  // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
-  hal_gpio_set_tx_mode(15, 0, GPIOM_FPGA_1);
-  hal_gpio_set_rx_mode(15, 0, GPIOM_FPGA_1);
-
-  putstr("\ntx_drop_rate_limited\n");
-  
-  // Control LEDs
-  hal_set_leds(0x0, 0x3);
-
-  pic_register_handler(IRQ_UNDERRUN, underrun_irq_handler);
-
-  pic_register_handler(IRQ_TIMER, timer_irq_handler);
-  hal_set_timeout(timer_delta);
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-  ethernet_init();
-
-  // program tx registers
-  setup_tx();
-
-  // start a receive from ethernet
-  bp_receive_to_buf(DSP_TX_BUF_0, PORT_ETH, 1, 0, BP_LAST_LINE);
-
-  while(1){
-    buffer_irq_handler(0);
-  }
-}
-
diff --git a/usrp2/firmware/apps/blink_leds.c b/usrp2/firmware/apps/blink_leds.c
deleted file mode 100644
index 682ca8db2..000000000
--- a/usrp2/firmware/apps/blink_leds.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "hal_io.h"
-#include "nonstdio.h"
-
-int
-main(void)
-{
-  int	counter = 0;
-
-  u2_init();
-  
-  putstr("blink_leds\n");
-  while(1){
-    output_regs->leds = (counter++ & 0x3);
-  }
-  
-  return 0;
-}
diff --git a/usrp2/firmware/apps/blink_leds2.c b/usrp2/firmware/apps/blink_leds2.c
deleted file mode 100644
index d4bd89a19..000000000
--- a/usrp2/firmware/apps/blink_leds2.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "hal_io.h"
-#include "pic.h"
-#include "nonstdio.h"
-
-//#define DELTA_T  (MASTER_CLK_RATE/2)	// 0.5s (10ns per tick)
-#define DELTA_T  5000  		// 5 us (10ns per tick)
-
-
-void
-timer_handler(unsigned irq)
-{
-  hal_set_timeout(DELTA_T);	// schedule next timeout
-  hal_toggle_leds(0x2);
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  putstr("blink_leds2\n");
-  pic_register_handler(IRQ_TIMER, timer_handler);
-  hal_set_timeout(DELTA_T);	// schedule next timeout
-
-  while(1){
-    hal_toggle_leds(0x1);
-  }
-
-  return 0;
-}
diff --git a/usrp2/firmware/apps/buf_ram_test.c b/usrp2/firmware/apps/buf_ram_test.c
deleted file mode 100644
index e639166a1..000000000
--- a/usrp2/firmware/apps/buf_ram_test.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "bool.h"
-#include "nonstdio.h"
-#include "hal_io.h"
-#include "mdelay.h"
-
-
-static void
-write_bufs(void)
-{
-  int	i, n;
-  int	counter = 0;
-
-  for (n = 0; n < NBUFFERS; n++){
-    volatile int *p = buffer_ram(n);
-    for (i = 0; i < BP_NLINES; i++)
-      p[i] = counter++;
-  }
-}
-
-// return number of errors detected
-static int
-check_bufs(void)
-{
-  int	i, n;
-  int	counter = 0;
-  int	nerrors = 0;
-
-  for (n = 0; n < NBUFFERS; n++){
-    volatile int *p = buffer_ram(n);
-    for (i = 0; i < BP_NLINES; i++, counter++){
-      int rd = p[i];
-      if (rd != counter){
-	putchar('b');
-	putchar(n + '0');
-	putchar('[');
-	puthex16(i);
-	putstr("] exp: ");
-	puthex32(counter);
-	putstr(" got: ");
-	puthex32_nl(rd);
-	nerrors++;
-      }
-    }
-  }
-  return nerrors;
-}
-
-
-int
-main(void)
-{
-  u2_init();
-
-  output_regs->leds = 0;
-
-  write_bufs();
-  int nerrors = check_bufs();
-
-  if (nerrors == 0){
-    output_regs->leds = 0x3;		// leds on  -> PASS
-    putstr("PASS\n");
-  }
-  else {
-    output_regs->leds = 0x0;		// leds off -> FAIL
-    putstr("FAIL\n");
-  }
-
-  hal_finish();
-  return 0;
-}
diff --git a/usrp2/firmware/apps/burn_dbsrx_eeprom.c b/usrp2/firmware/apps/burn_dbsrx_eeprom.c
deleted file mode 100644
index cbfb37bec..000000000
--- a/usrp2/firmware/apps/burn_dbsrx_eeprom.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "i2c.h"
-#include "usrp2_i2c_addr.h"
-#include "mdelay.h"
-#include "hal_io.h"
-#include "nonstdio.h"
-#include "bool.h"
-
-
-
-int read_dboard_eeprom(int i2c_addr);
-
-
-#define USRP_DBID_DBS_RX          	 0x0002
-#define USRP_DBID_DBS_RX_WITH_CLOCK_MOD  0x000d
-
-const char dbs_rx_rev2_eeprom[] = {
-  0xdb, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18
-};
-
-#define	LED_VALS   (LED_A | LED_B | LED_C | LED_D)
-#define	LED_MASK   (LED_A | LED_B | LED_C | LED_D)
-
-int
-main(void)
-{
-  u2_init();
-
-  puts("\nburn_dbsrx_eeprom\n");
-
-  hal_set_leds(0, ~0);	// all off
-
-  int i2c_addr = I2C_ADDR_RX_A;
-  int dbid = read_dboard_eeprom(i2c_addr);
-  bool ok;
-  const char *msg = 0;
-
-  switch (dbid){
-  case -1:
-    msg = "No RX daughterboard found";
-    goto bad;
-
-  case -2:
-    msg = "Invalid RX EEPROM contents";
-    goto bad;
-
-  case USRP_DBID_DBS_RX_WITH_CLOCK_MOD:
-    msg = "RX Daughterboard already reports being a DBS RX w/ CLOCK_MOD";
-    goto good;
-
-  case USRP_DBID_DBS_RX:
-    // Says it's a DBS_RX, attempt to burn the EEPROM
-    ok = eeprom_write(i2c_addr, 0,
-		      dbs_rx_rev2_eeprom, sizeof(dbs_rx_rev2_eeprom));
-    if (ok){
-      msg = "Successfully programmed db as DBS RX Rev 2.1";
-      goto good;
-    }
-    else {
-      msg = "Failed to write daugherboard eeprom";
-      goto bad;
-    }
-
-  default:
-    msg = "Daughterboard is not a DBS RX; ignored";
-    goto bad;
-  }
-  
- good:
-  puts(msg);
-  hal_set_leds(LED_VALS, LED_MASK);
-  while (1)
-    ;
-
- bad:
-  puts(msg);
-  while(1){
-    hal_toggle_leds(LED_VALS);
-    mdelay(50);
-  }
-}
diff --git a/usrp2/firmware/apps/burnrev30.c b/usrp2/firmware/apps/burnrev30.c
deleted file mode 100644
index e91c35c09..000000000
--- a/usrp2/firmware/apps/burnrev30.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common_v2.h"
-#include "memcpy_wa.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <i2c.h>
-#include <usrp2_i2c_addr.h>
-#include <clocks.h>
-#include "sd.h"
-#include "mdelay.h"
-
-#define HW_REV_MAJOR 3
-#define HW_REV_MINOR 0
-
-int test_ram()
-{
-  int i,j,k;
-  output_regs->ram_page = 1<<10;
-  
-  extram[0] = 0xDEADBEEF;
-  extram[1] = 0xF00D1234;
-  extram[7] = 0x76543210;
-  
-  output_regs->ram_page = 2<<10;
-  extram[7] = 0x55555555;
-  extram[1] = 0xaaaaaaaa;
-  extram[0] = 0xeeeeeeee;
-  
-  output_regs->ram_page = 1<<10;
-  
-  i = extram[0];
-  k = extram[1];
-  j = extram[7];
-  
-  if((i != 0xDEADBEEF)||(j!=0x76543210)||(k!=0xF00D1234)) {
-    puts("RAM FAIL1!\n");
-    puthex32_nl(i);
-    puthex32_nl(j);
-    puthex32_nl(k);
-    return 0;
-  }
-  
-  output_regs->ram_page = 2<<10;
-
-  j = extram[7];
-  k = extram[1];
-  i = extram[0];
-
-  if((i != 0xeeeeeeee)||(j!=0x55555555)||(k!=0xaaaaaaaa)) {
-    puts("RAM FAIL2!\n");
-    puthex32_nl(i);
-    puthex32_nl(j);
-    puthex32_nl(k);
-    return 0;
-  }
-  return 1;
-}
-
-int test_sd()
-{
-  int i = sd_init();
-  if(i==0) {
-    puts("FAILED INIT of Card\n");
-    return 0;
-  }
-  
-  unsigned char buf[512];
-  i = sd_read_block(2048,buf);
-  if(i == 0) {
-    puts("READ Command Rejected\n");
-    return 0;
-  }
-  if((buf[0]==0xb8)&&(buf[1]==0x08)&&(buf[2]==0x00)&&(buf[3]==0x50))
-    ;
-  else {
-    puts("Read bad data from SD Card\n");
-    return 0;
-  }
-  return 1;
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  putstr("\nFactory Test, Board Rev 3.0\n");
-
-  bool ok = true;
-  unsigned char maj = HW_REV_MAJOR;
-  unsigned char min = HW_REV_MINOR;
-  ok = eeprom_write(I2C_ADDR_MBOARD, MBOARD_REV_MSB, &maj, 1);
-  ok &= eeprom_write(I2C_ADDR_MBOARD, MBOARD_REV_LSB, &min, 1);
-
-  putstr("\nset_hw_rev\n");
-  if (ok)
-    printf("OK: set h/w rev to %d.%d\n", HW_REV_MAJOR, HW_REV_MINOR);
-  else {
-    printf("FAILED to set h/w rev to %d.%d\n", HW_REV_MAJOR, HW_REV_MINOR);
-    hal_finish();
-    return 0;
-  }
-
-  if(test_sd())
-    puts("SD OK\n");
-  else {
-    puts("SD FAIL\n");
-    //hal_finish();
-    //return 0;
-  }
-  if(test_ram())
-    puts("RAM OK\n");
-  else {
-    puts("RAM FAIL\n");
-    hal_finish();
-    return 0;
-  }
-
-  print_mac_addr(ethernet_mac_addr()->addr);
-  newline();
-
-  clocks_mimo_config(MC_WE_LOCK_TO_SMA);
-
-  while (!clocks_lock_detect()) {
-    puts("No Lock");
-    mdelay(1000);
-  }
-  puts("Clock Locked\n");
-
-}
diff --git a/usrp2/firmware/apps/burnrev31.c b/usrp2/firmware/apps/burnrev31.c
deleted file mode 100644
index 2a58bdfe5..000000000
--- a/usrp2/firmware/apps/burnrev31.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common_v2.h"
-#include "memcpy_wa.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <i2c.h>
-#include <usrp2_i2c_addr.h>
-#include <clocks.h>
-#include "sd.h"
-#include "mdelay.h"
-
-#define HW_REV_MAJOR 3
-#define HW_REV_MINOR 1
-
-int test_ram()
-{
-  int i,j,k;
-  output_regs->ram_page = 1<<10;
-  
-  extram[0] = 0xDEADBEEF;
-  extram[1] = 0xF00D1234;
-  extram[7] = 0x76543210;
-  
-  output_regs->ram_page = 2<<10;
-  extram[7] = 0x55555555;
-  extram[1] = 0xaaaaaaaa;
-  extram[0] = 0xeeeeeeee;
-  
-  output_regs->ram_page = 1<<10;
-  
-  i = extram[0];
-  k = extram[1];
-  j = extram[7];
-  
-  if((i != 0xDEADBEEF)||(j!=0x76543210)||(k!=0xF00D1234)) {
-    puts("RAM FAIL1!\n");
-    puthex32_nl(i);
-    puthex32_nl(j);
-    puthex32_nl(k);
-    return 0;
-  }
-  
-  output_regs->ram_page = 2<<10;
-
-  j = extram[7];
-  k = extram[1];
-  i = extram[0];
-
-  if((i != 0xeeeeeeee)||(j!=0x55555555)||(k!=0xaaaaaaaa)) {
-    puts("RAM FAIL2!\n");
-    puthex32_nl(i);
-    puthex32_nl(j);
-    puthex32_nl(k);
-    return 0;
-  }
-  return 1;
-}
-
-int test_sd()
-{
-  int i = sd_init();
-  if(i==0) {
-    puts("FAILED INIT of Card\n");
-    return 0;
-  }
-  
-  unsigned char buf[512];
-  i = sd_read_block(2048,buf);
-  if(i == 0) {
-    puts("READ Command Rejected\n");
-    return 0;
-  }
-  if((buf[0]==0xb8)&&(buf[1]==0x08)&&(buf[2]==0x00)&&(buf[3]==0x50))
-    ;
-  else {
-    puts("Read bad data from SD Card\n");
-    return 0;
-  }
-  return 1;
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  putstr("\nFactory Test, Board Rev 3.1\n");
-
-  bool ok = true;
-  unsigned char maj = HW_REV_MAJOR;
-  unsigned char min = HW_REV_MINOR;
-  ok = eeprom_write(I2C_ADDR_MBOARD, MBOARD_REV_MSB, &maj, 1);
-  ok &= eeprom_write(I2C_ADDR_MBOARD, MBOARD_REV_LSB, &min, 1);
-
-  putstr("\nset_hw_rev\n");
-  if (ok)
-    printf("OK: set h/w rev to %d.%d\n", HW_REV_MAJOR, HW_REV_MINOR);
-  else {
-    printf("FAILED to set h/w rev to %d.%d\n", HW_REV_MAJOR, HW_REV_MINOR);
-    hal_finish();
-    return 0;
-  }
-
-  if(test_sd())
-    puts("SD OK\n");
-  else {
-    puts("SD FAIL\n");
-    //hal_finish();
-    //return 0;
-  }
-  if(test_ram())
-    puts("RAM OK\n");
-  else {
-    puts("RAM FAIL\n");
-    hal_finish();
-    return 0;
-  }
-
-  print_mac_addr(ethernet_mac_addr()->addr);
-  newline();
-
-  clocks_mimo_config(MC_WE_LOCK_TO_SMA);
-
-  while (!clocks_lock_detect()) {
-    puts("No Lock");
-    mdelay(1000);
-  }
-  puts("Clock Locked\n");
-
-}
diff --git a/usrp2/firmware/apps/burnrev40.c b/usrp2/firmware/apps/burnrev40.c
deleted file mode 100644
index 5197f5358..000000000
--- a/usrp2/firmware/apps/burnrev40.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common_v2.h"
-#include "memcpy_wa.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <i2c.h>
-#include <usrp2_i2c_addr.h>
-#include <clocks.h>
-#include "sd.h"
-#include "mdelay.h"
-
-#define HW_REV_MAJOR 4
-#define HW_REV_MINOR 0
-
-int test_ram()
-{
-  int i,j,k;
-  output_regs->ram_page = 1<<10;
-  
-  extram[0] = 0xDEADBEEF;
-  extram[1] = 0xF00D1234;
-  extram[7] = 0x76543210;
-  
-  output_regs->ram_page = 2<<10;
-  extram[7] = 0x55555555;
-  extram[1] = 0xaaaaaaaa;
-  extram[0] = 0xeeeeeeee;
-  
-  output_regs->ram_page = 1<<10;
-  
-  i = extram[0];
-  k = extram[1];
-  j = extram[7];
-  
-  if((i != 0xDEADBEEF)||(j!=0x76543210)||(k!=0xF00D1234)) {
-    puts("RAM FAIL1!\n");
-    puthex32_nl(i);
-    puthex32_nl(j);
-    puthex32_nl(k);
-    return 0;
-  }
-  
-  output_regs->ram_page = 2<<10;
-
-  j = extram[7];
-  k = extram[1];
-  i = extram[0];
-
-  if((i != 0xeeeeeeee)||(j!=0x55555555)||(k!=0xaaaaaaaa)) {
-    puts("RAM FAIL2!\n");
-    puthex32_nl(i);
-    puthex32_nl(j);
-    puthex32_nl(k);
-    return 0;
-  }
-  return 1;
-}
-
-int test_sd()
-{
-  int i = sd_init();
-  if(i==0) {
-    puts("FAILED INIT of Card\n");
-    return 0;
-  }
-  
-  unsigned char buf[512];
-  i = sd_read_block(2048,buf);
-  if(i == 0) {
-    puts("READ Command Rejected\n");
-    return 0;
-  }
-  if((buf[0]==0xb8)&&(buf[1]==0x08)&&(buf[2]==0x00)&&(buf[3]==0x50))
-    ;
-  else {
-    puts("Read bad data from SD Card\n");
-    return 0;
-  }
-  return 1;
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  putstr("\nFactory Test, Board Rev 4.0\n");
-
-  bool ok = true;
-  unsigned char maj = HW_REV_MAJOR;
-  unsigned char min = HW_REV_MINOR;
-  ok = eeprom_write(I2C_ADDR_MBOARD, MBOARD_REV_MSB, &maj, 1);
-  ok &= eeprom_write(I2C_ADDR_MBOARD, MBOARD_REV_LSB, &min, 1);
-
-  putstr("\nset_hw_rev\n");
-  if (ok)
-    printf("OK: set h/w rev to %d.%d\n", HW_REV_MAJOR, HW_REV_MINOR);
-  else {
-    printf("FAILED to set h/w rev to %d.%d\n", HW_REV_MAJOR, HW_REV_MINOR);
-    hal_finish();
-    return 0;
-  }
-
-  if(test_sd())
-    puts("SD OK\n");
-  else {
-    puts("SD FAIL\n");
-    //hal_finish();
-    //return 0;
-  }
-  if(test_ram())
-    puts("RAM OK\n");
-  else {
-    puts("RAM FAIL\n");
-    hal_finish();
-    return 0;
-  }
-
-  print_mac_addr(ethernet_mac_addr()->addr);
-  newline();
-
-  clocks_mimo_config(MC_WE_LOCK_TO_SMA);
-
-  while (!clocks_lock_detect()) {
-    puts("No Lock");
-    mdelay(1000);
-  }
-  puts("Clock Locked\n");
-
-}
diff --git a/usrp2/firmware/apps/can_i_sub.c b/usrp2/firmware/apps/can_i_sub.c
deleted file mode 100644
index ed49791f0..000000000
--- a/usrp2/firmware/apps/can_i_sub.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <u2_init.h>
-#include <nonstdio.h>
-
-//typedef long long int64_t;
-
-
-int64_t sub(int64_t a, int64_t b);
-void print(int64_t d);
-
-int main(void)
-{
-  u2_init();
-
-  int64_t d = sub(462550990848000LL, 462028800000000LL);
-  print_uint64(d);
-  newline();
-  return 0;
-}
-
-int64_t sub(int64_t a, int64_t b)
-{
-  return a - b;
-}
-
-
diff --git a/usrp2/firmware/apps/double_buffer_fragment.c b/usrp2/firmware/apps/double_buffer_fragment.c
deleted file mode 100644
index cfc061247..000000000
--- a/usrp2/firmware/apps/double_buffer_fragment.c
+++ /dev/null
@@ -1,138 +0,0 @@
-#if 0
-void 
-double_buffering(int port) {
-  unsigned int localstatus = buffer_pool_status->status;
-
-  if(localstatus & BPS_DONE_0) {
-    bp_clear_buf(0);
-    if(buffer_state[0] == FILLING) {
-      buffer_state[0] = FULL;
-      if(buffer_state[1] == EMPTY) {
-	bp_receive_to_buf(1, 1, 1, 10, 509);  // DSP_RX to buffer 1, use 500 lines
-	buffer_state[1] = FILLING;
-      }
-      else
-	dsp_rx_idle = 1;
-      if(serdes_tx_idle) {
-	serdes_tx_idle = 0;
-	bp_send_from_buf(0, port, 1, 10, 509);  // SERDES_TX from buffer 0
-	buffer_state[0] = EMPTYING;
-      }
-    }
-    else {  // buffer was emptying
-      buffer_state[0] = EMPTY;
-      if(dsp_rx_idle) {
-	dsp_rx_idle = 0;
-	bp_receive_to_buf(0, 1, 1, 10, 509);  // DSP_RX to buffer 0, use 500 lines
-	buffer_state[0] = FILLING;
-      }
-      if(buffer_state[1] == FULL) {
-	bp_send_from_buf(1, port, 1, 10, 509);  // SERDES_TX from buffer 1
-	buffer_state[1] = EMPTYING;
-      }
-      else
-	serdes_tx_idle = 1;
-    }
-    putstr("Int Proc'ed 0\n");
-  }
-
-  if(localstatus & BPS_DONE_1) {
-    bp_clear_buf(1);
-    if(buffer_state[1] == FILLING) {
-      buffer_state[1] = FULL;
-      if(buffer_state[0] == EMPTY) {
-	bp_receive_to_buf(0, 1, 1, 10, 509);  // DSP_RX to buffer 1, use 500 lines
-	buffer_state[0] = FILLING;
-      }
-      else
-	dsp_rx_idle = 1;
-      if(serdes_tx_idle) {
-	serdes_tx_idle = 0;
-	bp_send_from_buf(1, port, 1, 10, 509);  // SERDES_TX from buffer 1
-	buffer_state[1] = EMPTYING;
-      }
-    }
-    else {  // buffer was emptying
-      buffer_state[1] = EMPTY;
-      if(dsp_rx_idle) {
-	dsp_rx_idle = 0;
-	bp_receive_to_buf(1, 1, 1, 10, 509);  // DSP_RX to buffer 1, use 500 lines
-	buffer_state[1] = FILLING;
-      }
-      if(buffer_state[0] == FULL) {
-	bp_send_from_buf(0, port, 1, 10, 509);  // SERDES_TX from buffer 0
-	buffer_state[0] = EMPTYING;
-      }
-      else
-	serdes_tx_idle = 1;
-    }
-  putstr("Int Proc'ed 1\n");
-  }
-
-  if(localstatus & BPS_DONE_2) {
-    bp_clear_buf(2);
-    if(buffer_state[2] == FILLING) {
-      buffer_state[2] = FULL;
-      if(buffer_state[3] == EMPTY) {
-	bp_receive_to_buf(3, port, 1, 5, 504);  // SERDES_RX to buffer 3, use 500 lines
-	buffer_state[3] = FILLING;
-      }
-      else
-	serdes_rx_idle = 1;
-      if(dsp_tx_idle) {
-	dsp_tx_idle = 0;
-	bp_send_from_buf(2, 1, 1, 5, 504);  // DSP_TX from buffer 2
-	buffer_state[2] = EMPTYING;
-      }
-    }
-    else {  // buffer was emptying
-      buffer_state[2] = EMPTY;
-      if(serdes_rx_idle) {
-	serdes_rx_idle = 0;
-	bp_receive_to_buf(2, port, 1, 5, 504);  // SERDES_RX to buffer 2
-	buffer_state[2] = FILLING;
-      }
-      if(buffer_state[3] == FULL) {
-	bp_send_from_buf(3, 1, 1, 5, 504);  // DSP_TX from buffer 3
-	buffer_state[3] = EMPTYING;
-      }
-      else
-	dsp_tx_idle = 1;
-    }
-  putstr("Int Proc'ed 2\n");
-  }
-
-  if(localstatus & BPS_DONE_3) {
-    bp_clear_buf(3);
-    if(buffer_state[3] == FILLING) {
-      buffer_state[3] = FULL;
-      if(buffer_state[2] == EMPTY) {
-	bp_receive_to_buf(2, port, 1, 5, 504);  // SERDES_RX to buffer 2, use 500 lines
-	buffer_state[2] = FILLING;
-      }
-      else
-	serdes_rx_idle = 1;
-      if(dsp_tx_idle) {
-	dsp_tx_idle = 0;
-	bp_send_from_buf(3, 1, 1, 5, 504);  // DSP_TX from buffer 3
-	buffer_state[3] = EMPTYING;
-      }
-    }
-    else {  // buffer was emptying
-      buffer_state[3] = EMPTY;
-      if(serdes_rx_idle) {
-	serdes_rx_idle = 0;
-	bp_receive_to_buf(3, port, 1, 5, 504);  // SERDES_RX to buffer 3
-	buffer_state[3] = FILLING;
-      }
-      if(buffer_state[2] == FULL) {
-	bp_send_from_buf(2, 1, 1, 5, 504);  // DSP_TX from buffer 2
-	buffer_state[2] = EMPTYING;
-      }
-      else
-	dsp_tx_idle = 1;
-    }
-  putstr("Int Proc'ed 3\n");
-  }
-}
-#endif
diff --git a/usrp2/firmware/apps/echo.c b/usrp2/firmware/apps/echo.c
deleted file mode 100644
index 89108ee80..000000000
--- a/usrp2/firmware/apps/echo.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "u2_init.h"
-#include "stdio.h"
-
-int
-main(void)
-{
-  u2_init();
-
-  puts("\n>>> echo <<<");
-
-  while (1){
-    int ch = getchar();
-    putchar(ch);
-  }
-
-  return 0;
-}
diff --git a/usrp2/firmware/apps/eth_serdes.c b/usrp2/firmware/apps/eth_serdes.c
deleted file mode 100644
index 0286f0c1f..000000000
--- a/usrp2/firmware/apps/eth_serdes.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_passthru_v2.h"
-#include "memcpy_wa.h"
-#include "clocks.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-#define FW_SETS_SEQNO	1	// define to 0 or 1 (FIXME must be 1 for now)
-
-#if (FW_SETS_SEQNO)
-static int fw_seqno __attribute__((unused));	// used when f/w is filling in sequence numbers
-#endif
-
-
-/*
- * Full duplex Tx and Rx between ethernet and serdes
- *
- * Buffer 1 is used by the cpu to send frames to the host.
- * Buffers 2 and 3 are used to double-buffer the DSP Rx to eth flow
- * Buffers 4 and 5 are used to double-buffer the eth to DSP Tx  eth flow
- */
-//#define CPU_RX_BUF	0	// eth -> cpu
-
-#define	DSP_RX_BUF_0	2	// serdes -> eth (double buffer)
-#define	DSP_RX_BUF_1	3	// serdes -> eth
-#define	DSP_TX_BUF_0	4	// eth -> serdes (double buffer)
-#define	DSP_TX_BUF_1	5	// eth -> serdes
-
-/*
- * ================================================================
- *   configure serdes double buffering state machine (eth -> serdes)
- * ================================================================
- */
-
-
-// Receive from ethernet
-buf_cmd_args_t dsp_tx_recv_args = {
-  PORT_ETH,
-  0,
-  BP_LAST_LINE
-};
-
-// send to serdes
-buf_cmd_args_t dsp_tx_send_args = {
-  PORT_SERDES,
-  0,
-  0			// filled in from last_line register
-};
-
-dbsm_t dsp_tx_sm;	// the state machine
-
-/*
- * ====================================================================
- *   configure serdes RX double buffering state machine (serdes -> eth)
- * ====================================================================
- */
-
-// receive from serdes
-buf_cmd_args_t dsp_rx_recv_args = {
-  PORT_SERDES,
-  0,
-  BP_LAST_LINE
-};
-
-// send to ETH
-buf_cmd_args_t dsp_rx_send_args = {
-  PORT_ETH,
-  0,		// starts with ethernet header in line 0
-  0,		// filled in from list_line register
-};
-
-dbsm_t dsp_rx_sm;	// the state machine
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-// ----------------------------------------------------------------
-
-
-#if (FW_SETS_SEQNO)
-/*
- * Debugging ONLY.  This will be handled by the tx_protocol_engine.
- *
- * This is called when the DSP Rx chain has filled in a packet.
- * We set and increment the seqno, then return false, indicating
- * that we didn't handle the packet.  A bit of a kludge
- * but it should work.
- */
-
-bool 
-fw_sets_seqno_inspector(dbsm_t *sm, int buf_this)	// returns false
-{
-#if 0
-  uint32_t *p = buffer_ram(buf_this);
-  uint32_t last_line = buffer_pool_status->last_line[buf_this] - sm->last_line_adj;
-  printf("fw_sets_seqno_inspector: buf_this = %d, last_line = %d\n",
-	 buf_this, last_line);
-
-  print_buffer(p, (last_line + 1));
-#endif
-
-#if 0
-  uint32_t *p = buffer_ram(buf_this);
-  uint32_t seqno = fw_seqno++;
-
-  // KLUDGE all kinds of nasty magic numbers and embedded knowledge
-  uint32_t t = p[4];
-  t = (t & 0xffff00ff) | ((seqno & 0xff) << 8);
-  p[4] = t;
-#endif
-
-  return false;		// we didn't handle the packet
-}
-#endif
-
-
-inline static void
-buffer_irq_handler(unsigned irq)
-{
-  uint32_t  status = buffer_pool_status->status;
-
-  if (0 && (status & ~BPS_IDLE_ALL)){
-    putstr("status = ");
-    puthex32_nl(status);
-  }
-    
-  dbsm_process_status(&dsp_tx_sm, status);
-  dbsm_process_status(&dsp_rx_sm, status);
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  output_regs->led_src = 0x3;		// h/w controls bottom two bits
-  clocks_enable_test_clk(true, 1);
-
-  putstr("\neth <-> serdes\n");
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-  ethernet_init();
-
-  // clocks_mimo_config(MC_WE_LOCK_TO_SMA | MC_PROVIDE_CLK_TO_MIMO);
-  clocks_mimo_config(MC_WE_DONT_LOCK | MC_PROVIDE_CLK_TO_MIMO);
-
-#if 0
-  // make bit 15 of Tx gpio's be a s/w output
-  hal_gpio_set_sel(GPIO_TX_BANK, 15, 's');
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0x8000, 0x8000);
-#endif
-
-#if 1
-  output_regs->debug_mux_ctrl = 1;
-  hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0xffff, 0xffff);
-  hal_gpio_set_ddr(GPIO_RX_BANK, 0xffff, 0xffff);
-#endif
-
-
-  // initialize double buffering state machine for ethernet -> serdes
-
-  dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
-	    &dsp_tx_recv_args, &dsp_tx_send_args,
-	    eth_pkt_inspector);
-
-
-  // initialize double buffering state machine for serdes -> ethernet
-
-  if (FW_SETS_SEQNO){
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      fw_sets_seqno_inspector);
-  }
-  else {
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      dbsm_nop_inspector);
-  }
-
-  // tell app_common that this dbsm could be sending to the ethernet
-  ac_could_be_sending_to_eth = &dsp_rx_sm;
-
-
-  // kick off the state machines
-  dbsm_start(&dsp_tx_sm);
-  dbsm_start(&dsp_rx_sm);
-
-  //int which = 0;
-
-  while(1){
-    // hal_gpio_write(GPIO_TX_BANK, which, 0x8000);
-    // which ^= 0x8000;
-
-    buffer_irq_handler(0);
-  }
-}
diff --git a/usrp2/firmware/apps/factory_test.c b/usrp2/firmware/apps/factory_test.c
deleted file mode 100644
index e7dde524a..000000000
--- a/usrp2/firmware/apps/factory_test.c
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common_v2.h"
-#include "memcpy_wa.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <i2c.h>
-#include <usrp2_i2c_addr.h>
-#include <clocks.h>
-#include "sd.h"
-
-#define FW_SETS_SEQNO	1	// define to 0 or 1 (FIXME must be 1 for now)
-
-#if (FW_SETS_SEQNO)
-static int fw_seqno;	// used when f/w is filling in sequence numbers
-#endif
-
-
-/*
- * Full duplex Tx and Rx between ethernet and DSP pipelines
- *
- * Buffer 1 is used by the cpu to send frames to the host.
- * Buffers 2 and 3 are used to double-buffer the DSP Rx to eth flow
- * Buffers 4 and 5 are used to double-buffer the eth to DSP Tx  eth flow
- */
-//#define CPU_RX_BUF	0	// eth -> cpu
-
-#define	DSP_RX_BUF_0	2	// dsp rx -> eth (double buffer)
-#define	DSP_RX_BUF_1	3	// dsp rx -> eth
-#define	DSP_TX_BUF_0	4	// eth -> dsp tx (double buffer)
-#define	DSP_TX_BUF_1	5	// eth -> dsp tx
-
-/*
- * ================================================================
- *   configure DSP TX double buffering state machine (eth -> dsp)
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 2 lines (word0 + timestamp)
-// DSP Tx reads word0 (flags) + timestamp followed by samples
-
-#define DSP_TX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4)
-
-// Receive from ethernet
-buf_cmd_args_t dsp_tx_recv_args = {
-  PORT_ETH,
-  0,
-  BP_LAST_LINE
-};
-
-// send to DSP Tx
-buf_cmd_args_t dsp_tx_send_args = {
-  PORT_DSP,
-  DSP_TX_FIRST_LINE,	// starts just past transport header
-  0			// filled in from last_line register
-};
-
-dbsm_t dsp_tx_sm;	// the state machine
-
-/*
- * ================================================================
- *   configure DSP RX double buffering state machine (dsp -> eth)
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 1 line (word0)
-// DSP Rx writes timestamp followed by nlines_per_frame of samples
-#define DSP_RX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4 + 1)
-
-// receive from DSP
-buf_cmd_args_t dsp_rx_recv_args = {
-  PORT_DSP,
-  DSP_RX_FIRST_LINE,
-  BP_LAST_LINE
-};
-
-// send to ETH
-buf_cmd_args_t dsp_rx_send_args = {
-  PORT_ETH,
-  0,		// starts with ethernet header in line 0
-  0,		// filled in from list_line register
-};
-
-dbsm_t dsp_rx_sm;	// the state machine
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-// variables for streaming mode
-
-static bool         streaming_p = false;
-static unsigned int streaming_items_per_frame = 0;
-static int          streaming_frame_count = 0;
-#define FRAMES_PER_CMD	1000
-
-bool is_streaming(void){ return streaming_p; }
-
-// ----------------------------------------------------------------
-
-
-void
-restart_streaming(void)
-{
-  // setup RX DSP regs
-  dsp_rx_regs->clear_state = 1;			// reset
-
-  streaming_p = true;
-  streaming_frame_count = FRAMES_PER_CMD;
-
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);			// set "chain" bit
-
-  // kick off the state machine
-  dbsm_start(&dsp_rx_sm);
-
-  dsp_rx_regs->rx_time = 0;		// enqueue first of two commands
-
-  // make sure this one and the rest have the "now" and "chain" bits set.
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);
-
-  dsp_rx_regs->rx_time = 0;		// enqueue second command
-}
-
-void
-start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p)
-{
-  host_mac_addr = *host;	// remember who we're sending to
-
-  /*
-   * Construct  ethernet header and word0 and preload into two buffers
-   */
-  u2_eth_packet_t	pkt;
-  memset(&pkt, 0, sizeof(pkt));
-  pkt.ehdr.dst = *host;
-  pkt.ehdr.src = *ethernet_mac_addr();
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-  u2p_set_word0(&pkt.fixed, 0, 0);
-  // DSP RX will fill in timestamp
-
-  memcpy_wa(buffer_ram(DSP_RX_BUF_0), &pkt, sizeof(pkt));
-  memcpy_wa(buffer_ram(DSP_RX_BUF_1), &pkt, sizeof(pkt));
-
-
-  if (FW_SETS_SEQNO)
-    fw_seqno = 0;
-
-  streaming_items_per_frame = p->items_per_frame;
-  restart_streaming();
-}
-
-
-void start_rx_streaming_at_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p, uint32_t time)
-{}
-void restart_streaming_at(uint32_t time)
-{}
-
-void
-stop_rx_cmd(void)
-{
-  streaming_p = false;
-  dsp_rx_regs->clear_state = 1;	// flush cmd queue
-  bp_clear_buf(DSP_RX_BUF_0);
-  bp_clear_buf(DSP_RX_BUF_1);
-}
-
-
-static void
-setup_tx()
-{
-  dsp_tx_regs->clear_state = 1;
-  bp_clear_buf(DSP_TX_BUF_0);
-  bp_clear_buf(DSP_TX_BUF_1);
-
-  int tx_scale = 256;
-  int interp = 32;
-
-  // setup some defaults
-
-  dsp_tx_regs->freq = 0;
-  dsp_tx_regs->scale_iq = (tx_scale << 16) | tx_scale;
-  dsp_tx_regs->interp_rate = interp;
-}
-
-
-#if (FW_SETS_SEQNO)
-/*
- * Debugging ONLY.  This will be handled by the tx_protocol_engine.
- *
- * This is called when the DSP Rx chain has filled in a packet.
- * We set and increment the seqno, then return false, indicating
- * that we didn't handle the packet.  A bit of a kludge
- * but it should work.
- */
-bool
-fw_sets_seqno_inspector(dbsm_t *sm, int buf_this)	// returns false
-{
-  uint32_t *p = buffer_ram(buf_this);
-  uint32_t seqno = fw_seqno++;
-
-  // KLUDGE all kinds of nasty magic numbers and embedded knowledge
-  uint32_t t = p[4];
-  t = (t & 0xffff00ff) | ((seqno & 0xff) << 8);
-  p[4] = t;
-
-  // queue up another rx command when required
-  if (streaming_p && --streaming_frame_count == 0){
-    streaming_frame_count = FRAMES_PER_CMD;
-    dsp_rx_regs->rx_time = 0;
-  }
-
-  return false;		// we didn't handle the packet
-}
-#endif
-
-
-inline static void
-buffer_irq_handler(unsigned irq)
-{
-  uint32_t  status = buffer_pool_status->status;
-
-  dbsm_process_status(&dsp_tx_sm, status);
-  dbsm_process_status(&dsp_rx_sm, status);
-}
-
-int test_ram()
-{
-  int i,j,k;
-  output_regs->ram_page = 1<<10;
-
-  extram[0] = 0xDEADBEEF;
-  extram[1] = 0xF00D1234;
-  extram[7] = 0x76543210;
-
-  output_regs->ram_page = 2<<10;
-  extram[7] = 0x55555555;
-  extram[1] = 0xaaaaaaaa;
-  extram[0] = 0xeeeeeeee;
-
-  output_regs->ram_page = 1<<10;
-
-  i = extram[0];
-  k = extram[1];
-  j = extram[7];
-
-  if((i != 0xDEADBEEF)||(j!=0x76543210)||(k!=0xF00D1234)) {
-    puts("RAM FAIL1!\n");
-    puthex32_nl(i);
-    puthex32_nl(j);
-    puthex32_nl(k);
-    return 0;
-  }
-
-  output_regs->ram_page = 2<<10;
-
-  j = extram[7];
-  k = extram[1];
-  i = extram[0];
-
-  if((i != 0xeeeeeeee)||(j!=0x55555555)||(k!=0xaaaaaaaa)) {
-    puts("RAM FAIL2!\n");
-    puthex32_nl(i);
-    puthex32_nl(j);
-    puthex32_nl(k);
-    return 0;
-  }
-  return 1;
-}
-
-int test_sd()
-{
-  int i = sd_init();
-  if(i==0) {
-    puts("FAILED INIT of Card\n");
-    return 0;
-  }
-
-  unsigned char buf[512];
-  i = sd_read_block(2048,buf);
-  if(i == 0) {
-    puts("READ Command Rejected\n");
-    return 0;
-  }
-  if((buf[0]==0xb8)&&(buf[1]==0x08)&&(buf[2]==0x00)&&(buf[3]==0x50))
-    ;
-  else {
-    puts("Read bad data from SD Card\n");
-    return 0;
-  }
-  return 1;
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  putstr("\nFactory Test\n");
-
-  print_mac_addr(ethernet_mac_addr()->addr);
-  newline();
-
-  if(test_sd())
-    puts("SD OK\n");
-  else {
-    puts("SD FAIL\n");
-    //    hal_finish();
-    //return 0;
-  }
-  if(test_ram())
-    puts("RAM OK\n");
-  else {
-    puts("RAM FAIL\n");
-    hal_finish();
-    return 0;
-  }
-
-  print_mac_addr(ethernet_mac_addr()->addr);
-  newline();
-
-  output_regs->led_src = 0x7;  // make bottom 3 controlled by HW
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-  ethernet_init();
-
-  clocks_enable_tx_dboard(true,1);
-  clocks_mimo_config(MC_WE_LOCK_TO_SMA);
-#if 0
-  // make bit 15 of Tx gpio's be a s/w output
-  hal_gpio_set_sel(GPIO_TX_BANK, 15, 's');
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0x8000, 0x8000);
-#endif
-
-  output_regs->debug_mux_ctrl = 1;
-#if 0
-  hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0xffff, 0xffff);
-  hal_gpio_set_ddr(GPIO_RX_BANK, 0xffff, 0xffff);
-#endif
-
-
-  // initialize double buffering state machine for ethernet -> DSP Tx
-
-  dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
-	    &dsp_tx_recv_args, &dsp_tx_send_args,
-	    eth_pkt_inspector);
-
-
-  // initialize double buffering state machine for DSP RX -> Ethernet
-
-  if (FW_SETS_SEQNO){
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      fw_sets_seqno_inspector);
-  }
-  else {
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      dbsm_nop_inspector);
-  }
-
-  // tell app_common that this dbsm could be sending to the ethernet
-  ac_could_be_sending_to_eth = &dsp_rx_sm;
-
-
-  // program tx registers
-  setup_tx();
-
-  // kick off the state machine
-  dbsm_start(&dsp_tx_sm);
-
-  //int which = 0;
-
-  while(1){
-    // hal_gpio_write(GPIO_TX_BANK, which, 0x8000);
-    // which ^= 0x8000;
-
-    buffer_irq_handler(0);
-
-    int pending = pic_regs->pending;		// poll for under or overrun
-
-    if (pending & PIC_UNDERRUN_INT){
-      dbsm_handle_tx_underrun(&dsp_tx_sm);
-      pic_regs->pending = PIC_UNDERRUN_INT;	// clear interrupt
-      putchar('U');
-    }
-
-    if (pending & PIC_OVERRUN_INT){
-      dbsm_handle_rx_overrun(&dsp_rx_sm);
-      pic_regs->pending = PIC_OVERRUN_INT;	// clear pending interrupt
-
-      // FIXME Figure out how to handle this robustly.
-      // Any buffers that are emptying should be allowed to drain...
-
-      if (streaming_p){
-	// restart_streaming();
-	// FIXME report error
-      }
-      else {
-	// FIXME report error
-      }
-      putchar('O');
-    }
-  }
-}
diff --git a/usrp2/firmware/apps/gen_eth_packets.c b/usrp2/firmware/apps/gen_eth_packets.c
deleted file mode 100644
index 5cda5bb8e..000000000
--- a/usrp2/firmware/apps/gen_eth_packets.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "memcpy_wa.h"
-#include "print_rmon_regs.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-// ----------------------------------------------------------------
-
-static u2_mac_addr_t dst_mac_addr =
-  {{  0xff, 0xff, 0xff, 0xff, 0xff, 0xff }};
-
-// ----------------------------------------------------------------
-
-// #define	PACKET_SIZE 1500		// bytes
-// #define ETH_DATA_RATE 1000000		// 1MB/s
-// #define	ETH_PACKET_RATE (ETH_DATA_RATE/PACKET_SIZE)	// 13,3333 pkts/s
-
-// static int timer_delta = MASTER_CLK_RATE/ETH_PACKET_RATE;	// ticks between interrupts
-
-static int timer_delta = (int)(MASTER_CLK_RATE * 1e-3);		// tick at 1 kHz
-static int sim_timer_delta = (int)(MASTER_CLK_RATE * 100e-6);	// tick at 10 kHz
-
-static volatile bool send_packet_now = false;   // timer handler sets this
-static volatile bool link_is_up = false;	// eth handler sets this
-
-int packet_number = 0;
-
-
-#define CPU_TX_BUF	0	// cpu xmits ethernet frames from here
-#define CPU_RX_BUF	1	// receive ethernet frames here
-
-// ----------------------------------------------------------------
-
-/*
- * Called when eth phy state changes (w/ interrupts disabled)
- */
-void
-link_changed_callback(int speed)
-{
-  link_is_up = speed == 0 ? false : true;
-  hal_set_leds(link_is_up ? 0x2 : 0x0, 0x2);
-  printf("\neth link changed: speed = %d\n", speed);
-}
-
-void
-timer_irq_handler(unsigned irq)
-{
-  hal_set_timeout(timer_delta);	// schedule next timeout
-  send_packet_now = 1;
-}
-
-
-static void
-init_packet(int *buf, const u2_eth_packet_t *pkt, int bufnum)
-{
-  int i = 0;
-  int mark = ((bufnum & 0xff) << 24) | 0x005A0000;
-
-  for (i = 0; i < BP_NLINES; i++){
-    buf[i] = mark | i;
-    mark ^= 0x00FF0000;
-  }
-
-  // copy header into buffer
-  memcpy_wa(buf, pkt, sizeof(*pkt));
-}
-
-static void
-init_packets(void)
-{
-  u2_eth_packet_t	pkt __attribute__((aligned (4)));
-
-  memset(&pkt, 0, sizeof(pkt));
-
-  pkt.ehdr.dst = dst_mac_addr;
-  pkt.ehdr.src = *ethernet_mac_addr();
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-  pkt.fixed.word0 = 0x01234567;
-  pkt.fixed.timestamp = 0xffffffff;
-
-  // init just the one we're using
-  init_packet((void *)buffer_ram(CPU_TX_BUF), &pkt, CPU_TX_BUF);
-}
-
-int
-main(void)
-{
-  int npackets_sent = 0;
-
-  u2_init();
-
-  // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
-  //hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  //hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-
-  putstr("\ngen_eth_packets\n");
-  
-  hal_set_leds(0x0, 0x3);
-
-  init_packets();
-
-  pic_register_handler(IRQ_TIMER, timer_irq_handler);
-
-  if (hwconfig_simulation_p())
-    timer_delta = sim_timer_delta;
-
-  hal_set_timeout(timer_delta);
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-  ethernet_init();
-
-  /*
-  if (hwconfig_simulation_p()){
-    eth_mac->speed = 4;	// hardcode mac speed to 1000
-    link_is_up = true;
-  }
-  */
-
-  // fire off a receive from the ethernet
-  bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, BP_LAST_LINE);
-
-  while(1){
-    uint32_t status = buffer_pool_status->status;
-
-    if (status & (BPS_DONE(CPU_RX_BUF) | BPS_ERROR(CPU_RX_BUF))){
-      bp_clear_buf(CPU_RX_BUF);
-      // ignore incoming ethernet packets; they were looped back in sim
-      bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, BP_LAST_LINE);
-    }
-
-    if (status & (BPS_DONE(CPU_TX_BUF) | BPS_ERROR(CPU_TX_BUF))){
-      if (status & BPS_ERROR(CPU_TX_BUF)){
-	putchar('E');
-      }
-      bp_clear_buf(CPU_TX_BUF);
-      npackets_sent++;
-      if ((npackets_sent & 0xF) == 0){	// print after every 16 packets
-	//print_rmon_regs();
-	putchar('.');
-      }
-    }
-
-    if (link_is_up && send_packet_now && (status & BPS_IDLE(CPU_TX_BUF))){
-      send_packet_now = false;
-
-      // kick off the next packet
-      // FIXME set packet number in packet
-
-      bp_send_from_buf(CPU_TX_BUF, PORT_ETH, 1, 0, 255);	// 1KB total
-      hal_toggle_leds(0x1);
-    }
-  }
-
-  hal_finish();
-  return 1;
-}
diff --git a/usrp2/firmware/apps/gen_pause_frames.c b/usrp2/firmware/apps/gen_pause_frames.c
deleted file mode 100644
index 8f2b2df03..000000000
--- a/usrp2/firmware/apps/gen_pause_frames.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "u2_eth_packet.h"
-#include "memcpy_wa.h"
-#include <stddef.h>
-#include <stdlib.h>
-
-
-// ----------------------------------------------------------------
-
-unsigned char dst_mac_addr[6] = {
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-};
-
-// ----------------------------------------------------------------
-
-// #define	PACKET_SIZE 1500		// bytes
-// #define ETH_DATA_RATE 1000000		// 1MB/s
-// #define	ETH_PACKET_RATE (ETH_DATA_RATE/PACKET_SIZE)	// 13,3333 pkts/s
-
-// static int timer_delta = MASTER_CLK_RATE/ETH_PACKET_RATE;	// ticks between interrupts
-
-static int timer_delta = MASTER_CLK_RATE/1000;	// tick at 1kHz
-
-static volatile bool send_packet_now = false;   // timer handler sets this
-static volatile bool link_is_up = false;	// eth handler sets this
-
-int packet_number = 0;
-
-// ----------------------------------------------------------------
-
-// debugging output on tx pins
-#define LS_MASK  0xE0000
-#define LS_1000  0x80000
-#define LS_100   0x40000
-#define LS_10    0x20000
-
-
-/*
- * Called when eth phy state changes (w/ interrupts disabled)
- */
-void
-link_changed_callback(int speed)
-{
-  int v = 0;
-  switch(speed){
-  case 10:
-    v = LS_10;
-    link_is_up = true;
-    break;
-    
-  case 100:
-    v = LS_100;
-    link_is_up = true;
-    break;
-    
-  case 1000:
-    v = LS_100;
-    link_is_up = true;
-    break;
-
-  default:
-    v = 0;
-    link_is_up = false;
-    break;
-  }
-
-  hal_gpio_set_tx(v, LS_MASK);	/* set debug bits on d'board */
-
-  putstr("\neth link changed: speed = ");
-  puthex16_nl(speed);
-}
-
-void
-timer_irq_handler(unsigned irq)
-{
-  hal_set_timeout(timer_delta);	// schedule next timeout
-  send_packet_now = 1;
-}
-
-
-void
-buffer_irq_handler(unsigned irq)
-{
-  // FIXME
-}
-
-static void
-init_packet(int *buf, const u2_eth_packet_t *pkt, int bufnum)
-{
-  int i = 0;
-  int mark = ((bufnum & 0xff) << 24) | 0x005A0000;
-
-  for (i = 0; i < BP_NLINES; i++){
-    buf[i] = mark | i;
-    mark ^= 0x00FF0000;
-  }
-
-  // copy header into buffer
-  memcpy_wa(buf, pkt, sizeof(*pkt));
-}
-
-static void
-init_packets(void)
-{
-  int	i;
-  
-  u2_eth_packet_t	pkt __attribute__((aligned (4)));
-
-  for (i = 0; i < 6; i++){
-    pkt.ehdr.dst.addr[i] = dst_mac_addr[i];
-  }
-  pkt.ehdr.src = *ethernet_mac_addr();
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-
-  // fill ALL buffers for debugging
-  for (i = 0; i < 8; i++)
-    init_packet((void *)buffer_ram(i), &pkt, i);
-}
-
-static int led_counter = 0;
-
-int
-main(void)
-{
-  int send_pause = 1;
-  
-  u2_init();
-
-  // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
-  //hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  //hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-
-  putstr("\ngen_eth_packets\n");
-  
-  // Control LEDs
-  output_regs->leds = 0x00;
-
-  init_packets();
-
-  // pic_register_handler(IRQ_BUFFER, buffer_irq_handler);  // poll for now
-  pic_register_handler(IRQ_TIMER, timer_irq_handler);
-  hal_set_timeout(timer_delta);
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-
-  ethernet_init();
-
-  eth_mac->pause_frame_send_en = 1;
-  eth_mac->pause_quanta_set = 16384 / 512;
-
-  // eth_mac->speed = 4;	// FIXME hardcode mac speed to 1000
-
-  while(1){
-    if (link_is_up && send_packet_now){
-      send_packet_now = false;
-
-
-      if (send_pause)
-	eth_mac->xon_cpu = 1;
-      else
-	eth_mac->xon_cpu = 0;
-
-      send_pause ^= 1;
-
-      // kick off the next packet
-      // FIXME set packet number in packet
-
-#if 0
-      bp_send_from_buf(0, PORT_ETH, 1, 0, 255);	// 1KB total
-
-      while ((buffer_pool_status->status & (BPS_DONE_0|BPS_ERROR_0)) == 0)
-	;
-      bp_clear_buf(0);
-#endif
-
-      output_regs->leds = ((++led_counter) & 0x1) | (link_is_up ? 0x2 : 0x0);
-    }
-  }
-
-  hal_finish();
-  return 1;
-}
diff --git a/usrp2/firmware/apps/hello.c b/usrp2/firmware/apps/hello.c
deleted file mode 100644
index bce843093..000000000
--- a/usrp2/firmware/apps/hello.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "u2_init.h"
-#include "stdio.h"
-
-int
-main(void)
-{
-  u2_init();
-
-  puts("Hello World");
-  puts("Goodbye World");
-
-  return 0;
-}
diff --git a/usrp2/firmware/apps/ibs_rx_test.c b/usrp2/firmware/apps/ibs_rx_test.c
deleted file mode 100644
index bdc04747e..000000000
--- a/usrp2/firmware/apps/ibs_rx_test.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "nonstdio.h"
-
-#define PORT 2    // ethernet = 2, serdes = 0
-int dsp_rx_buf, dsp_tx_buf, serdes_rx_buf, serdes_tx_buf;
-int dsp_rx_idle, dsp_tx_idle, serdes_rx_idle, serdes_tx_idle;
-
-int buffer_state[4];
-
-static void __attribute__((unused))
-wait_until_status_nonzero(void) 
-{
-  while (buffer_pool_status->status == 0)
-    ;
-}
-
-int
-main(void)
-{
-  int i;
-  
-  u2_init();
-
-  output_regs->adc_ctrl = 0x0A;
-
-  dsp_rx_regs->freq = 0;
-  dsp_rx_regs->scale_iq = (1 << 16) | 1;
-  dsp_rx_regs->decim_rate = 8;
-
-  volatile unsigned int *buffer0 = buffer_ram(0);
-  volatile unsigned int *buffer1 = buffer_ram(1);
-  volatile unsigned int *buffer2 = buffer_ram(2);
-  
-  putstr("Starting RX\n");
-  bp_clear_buf(0);
-  bp_receive_to_buf(0, 1, 1, 0, 99);
-
-  dsp_rx_regs->rx_command = (50 << 9) | 100;   // Numlines, lines per frame
-  dsp_rx_regs->rx_time = 0x2000;
-
-  dsp_rx_regs->rx_command = (137 << 9) | 50;   // Numlines, lines per frame
-  dsp_rx_regs->rx_time = 0x2200;
-
-  while (buffer_pool_status->status == 0)
-    ;
-  bp_clear_buf(0);
-  bp_clear_buf(1);
-  bp_receive_to_buf(1, 1, 1, 0, 99);
-  while (buffer_pool_status->status == 0)
-    ;
-  bp_clear_buf(2);
-  bp_receive_to_buf(2, 1, 1, 0, 99);
-  while (buffer_pool_status->status == 0)
-    ;
-  
-  for(i=0;i<100;i++) {
-    puthex(i);
-    putstr("   ");
-    puthex_nl(buffer0[i]);
-  }
-  for(i=0;i<60;i++) {
-    puthex(i);
-    putstr("   ");
-    puthex_nl(buffer1[i]);
-  }
-  for(i=0;i<60;i++) {
-    puthex(i);
-    putstr("   ");
-    puthex_nl(buffer2[i]);
-  }
-  //while(timer_regs -> time < 0x6000)
-  //  {}
-
-  putstr("Done\n");
-  hal_finish();
-  
-  return 1;
-}
diff --git a/usrp2/firmware/apps/ibs_tx_test.c b/usrp2/firmware/apps/ibs_tx_test.c
deleted file mode 100644
index ff9446d92..000000000
--- a/usrp2/firmware/apps/ibs_tx_test.c
+++ /dev/null
@@ -1,160 +0,0 @@
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "nonstdio.h"
-
-// Globals
-#define EMPTY 0
-#define FILLING 1
-#define FULL 2
-#define EMPTYING 3
-
-#define PORT 2    // ethernet = 2, serdes = 0
-int dsp_rx_buf, dsp_tx_buf, serdes_rx_buf, serdes_tx_buf;
-int dsp_rx_idle, dsp_tx_idle, serdes_rx_idle, serdes_tx_idle;
-
-int buffer_state[4];
-
-static void
-wait_until_status_nonzero(void)
-{
-  while (buffer_pool_status->status == 0)
-    ;
-}
-
-int
-main(void)
-{
-  int i;
-  
-  u2_init();
-  
-  dsp_tx_regs->freq = 0;
-  dsp_tx_regs->scale_iq = (1 << 16) | 1;
-  dsp_tx_regs->interp_rate = 8;
-
-  // Write data to be sent into the first buffer
-  volatile unsigned int *buffer0 = buffer_ram(0);
-  volatile unsigned int *buffer1 = buffer_ram(1);
-  
-
-  putstr("Starting to fill in RAM\n");
-  for(i=0;i<512;i++) 
-    buffer0[i] = i;
-  putstr("Filled in RAM\n");
-  
-  buffer0[0] = 7; // start and end of buffer, send immediately
-  buffer0[1] = 0x0000;  // start time
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 1, 1, 0, 9);
-  while (buffer_pool_status->status == 0)
-    ;
-  while(timer_regs -> time < 0x6000)
-    {}
-
-  buffer0[0] = 3; // start and end of buffer
-  buffer0[1] = 0x8000;  // start time
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 1, 1, 0, 9);
-  while (buffer_pool_status->status == 0)
-    ;
-  while(timer_regs -> time < 0x8400)
-    {}
-
-  buffer0[0] = 3; // start and end of buffer
-  buffer0[1] = 0x8800;  // start time
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 1, 1, 0, 9);
-  while (buffer_pool_status->status == 0)
-    ;
-  while(timer_regs -> time < 0x9000)
-    {}
-
-  buffer0[0] = 0x2;  // not last
-  buffer0[1] = 0x9100;  // start time
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 1, 1, 0, 9);
-  while (buffer_pool_status->status == 0)
-    ;
-  buffer0[0] = 0x1;  // last
-  buffer0[1] = 0x0000;  // start time
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 1, 1, 0, 9);
-  while (buffer_pool_status->status == 0)
-    ;
-
-  
-  buffer0[0] = 0x3;  // first and last
-  buffer0[1] = 0x8000;  // Time in the past
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 1, 1, 0, 9);
-  while (buffer_pool_status->status == 0)
-    ;
-
-  /*
-  buffer0[0] = 0x2; // not last
-  buffer0[1] = 0x9600;  // start time
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 1, 1, 0, 9);
-  while (buffer_pool_status->status == 0)
-    ;
-  */
-
-  while(timer_regs -> time < 0xa000)
-    {}
-
-  putstr("Done\n");
-
-  while(1)
-    {}
-  hal_finish();
-  
-  // Send a bunch, let them pile up in FIFO
-  bp_send_from_buf(0, 2, 1, 21, 80);    wait_until_status_nonzero();
-  bp_clear_buf(0);
-  putstr("First add'l TX done\n");
-  bp_send_from_buf(0, 2, 1, 81, 288);   wait_until_status_nonzero();
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 2, 1, 289, 292);  wait_until_status_nonzero();
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 2, 1, 293, 326);  wait_until_status_nonzero();
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 2, 1, 327, 399);  wait_until_status_nonzero();
-  bp_clear_buf(0);
-  bp_send_from_buf(0, 2, 1, 400, 511);  wait_until_status_nonzero();
-  bp_clear_buf(0);
-  putstr("All add'l TX done\n");
-  
-  bp_receive_to_buf(1, 2, 1, 21, 80);   wait_until_status_nonzero();
-  bp_clear_buf(1);
-  putstr("First add'l RX done\n");
-  bp_receive_to_buf(1, 2, 1, 81, 288);  wait_until_status_nonzero();
-  bp_clear_buf(1);
-  bp_receive_to_buf(1, 2, 1, 289, 292); wait_until_status_nonzero();
-  bp_clear_buf(1);
-  bp_receive_to_buf(1, 2, 1, 293, 326); wait_until_status_nonzero();
-  bp_clear_buf(1);
-  bp_receive_to_buf(1, 2, 1, 327, 399); wait_until_status_nonzero();
-  bp_clear_buf(1);
-  bp_receive_to_buf(1, 2, 1, 400, 511); wait_until_status_nonzero();
-  bp_clear_buf(1);
-  putstr("All add'l RX done\n");
-
-  for(i=0;i<512;i++)
-    if(buffer0[i] != buffer1[i]) {
-      putstr("ERROR at location: ");
-      puthex_nl(i);
-      putstr("Value sent: ");
-      puthex_nl(buffer0[i]);
-      putstr("Value rcvd: ");
-      puthex_nl(buffer1[i]);
-      //break;
-    }
-  
-  putstr("Done Testing\n");
-  
-  hal_finish();
-  return 1;
-}
diff --git a/usrp2/firmware/apps/mimo_app_common_v2.c b/usrp2/firmware/apps/mimo_app_common_v2.c
deleted file mode 100644
index 5dbecb0d0..000000000
--- a/usrp2/firmware/apps/mimo_app_common_v2.c
+++ /dev/null
@@ -1,582 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "mimo_app_common_v2.h"
-#include "buffer_pool.h"
-#include "memcpy_wa.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "print_rmon_regs.h"
-#include "db.h"
-#include "db_base.h"
-#include "clocks.h"
-#include "u2_init.h"
-#include <string.h>
-
-volatile bool link_is_up = false;	// eth handler sets this
-int cpu_tx_buf_dest_port = PORT_ETH;
-
-// If this is non-zero, this dbsm could be writing to the ethernet
-dbsm_t *ac_could_be_sending_to_eth;
-
-static unsigned char exp_seqno __attribute__((unused)) = 0;
-
-void abort(void);
-
-static bool
-burn_mac_addr(const op_burn_mac_addr_t *p)
-{
-  return ethernet_set_mac_addr(&p->addr);
-}
-
-static bool
-sync_to_pps(const op_generic_t *p)
-{
-  timesync_regs->sync_on_next_pps = 1;
-  putstr("SYNC to PPS\n");
-  return true;
-}
-
-static bool
-config_mimo_cmd(const op_config_mimo_t *p)
-{
-  clocks_mimo_config(p->flags);
-  return true;
-}
-
-void
-set_reply_hdr(u2_eth_packet_t *reply_pkt, u2_eth_packet_t const *cmd_pkt)
-{
-  reply_pkt->ehdr.dst = cmd_pkt->ehdr.src;
-  reply_pkt->ehdr.src = *ethernet_mac_addr();
-  reply_pkt->ehdr.ethertype = U2_ETHERTYPE;
-  reply_pkt->thdr.flags = 0;
-  reply_pkt->thdr.fifo_status = 0;	// written by protocol engine
-  reply_pkt->thdr.seqno = 0;		// written by protocol engine
-  reply_pkt->thdr.ack = 0;		// written by protocol engine
-  u2p_set_word0(&reply_pkt->fixed, 0, CONTROL_CHAN);
-  reply_pkt->fixed.timestamp = timer_regs->time;
-}
-
-static void
-send_reply(unsigned char *reply, size_t reply_len)
-{
-  if (reply_len < 64)
-    reply_len = 64;
-
-  // wait for buffer to become idle
-  hal_set_leds(0x4, 0x4);
-  while((buffer_pool_status->status & BPS_IDLE(CPU_TX_BUF)) == 0)
-    ;
-  hal_set_leds(0x0, 0x4);
-
-  // copy reply into CPU_TX_BUF
-  memcpy_wa(buffer_ram(CPU_TX_BUF), reply, reply_len);
-
-  // wait until nobody else is sending to the ethernet
-  if (ac_could_be_sending_to_eth){
-    hal_set_leds(0x8, 0x8);
-    dbsm_wait_for_opening(ac_could_be_sending_to_eth);
-    hal_set_leds(0x0, 0x8);
-  }
-
-  if (0){
-    printf("sending_reply to port %d, len = %d\n", cpu_tx_buf_dest_port, (int)reply_len);
-    print_buffer(buffer_ram(CPU_TX_BUF), reply_len/4);
-  }
-
-  // fire it off
-  bp_send_from_buf(CPU_TX_BUF, cpu_tx_buf_dest_port, 1, 0, reply_len/4);
-
-  // wait for it to complete (not long, it's a small pkt)
-  while((buffer_pool_status->status & (BPS_DONE(CPU_TX_BUF) | BPS_ERROR(CPU_TX_BUF))) == 0)
-    ;
-
-  bp_clear_buf(CPU_TX_BUF);
-}
-
-
-static size_t
-op_id_cmd(const op_generic_t *p,
-	  void *reply_payload, size_t reply_payload_space)
-{
-  op_id_reply_t *r = (op_id_reply_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))	// no room
-    return 0;
-
-  // Build reply subpacket
-
-  r->opcode = OP_ID_REPLY;
-  r->len = sizeof(op_id_reply_t);
-  r->rid = p->rid;
-  r->addr = *ethernet_mac_addr();
-  r->hw_rev = (u2_hw_rev_major << 8) | u2_hw_rev_minor;
-  // r->fpga_md5sum = ;	// FIXME
-  // r->sw_md5sum = ;	// FIXME
-
-  return r->len;
-}
-
-
-static size_t
-config_tx_v2_cmd(const op_config_tx_v2_t *p,
-		 void *reply_payload, size_t reply_payload_space)
-{
-  op_config_tx_reply_v2_t *r = (op_config_tx_reply_v2_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))
-    return 0;					// no room
-
-  struct tune_result	tune_result;
-  memset(&tune_result, 0, sizeof(tune_result));
-
-  bool ok = true;
-  
-#if 0
-  if (p->valid & CFGV_GAIN){
-    ok &= db_set_gain(tx_dboard, p->gain);
-  }
-
-  if (p->valid & CFGV_FREQ){
-    bool was_streaming = is_streaming();
-    if (was_streaming)
-      stop_rx_cmd();
-    
-    u2_fxpt_freq_t f = u2_fxpt_freq_from_hilo(p->freq_hi, p->freq_lo);
-    bool tune_ok = db_tune(tx_dboard, f, &tune_result);
-    ok &= tune_ok;
-    print_tune_result("Tx", tune_ok, f, &tune_result);
-
-    if (was_streaming)
-      restart_streaming();
-  }
-
-  if (p->valid & CFGV_INTERP_DECIM){
-    int interp = p->interp;
-    int hb1 = 0;
-    int hb2 = 0;
-
-    if (!(interp & 1)){
-      hb2 = 1;
-      interp = interp >> 1;
-    }
-
-    if (!(interp & 1)){
-      hb1 = 1;
-      interp = interp >> 1;
-    }
-    
-    if (interp < MIN_CIC_INTERP || interp > MAX_CIC_INTERP)
-      ok = false;
-    else {
-      dsp_tx_regs->interp_rate = (hb1<<9) | (hb2<<8) | interp;
-      // printf("Interp: %d, register %d\n", p->interp, (hb1<<9) | (hb2<<8) | interp);
-    }
-  }
-
-  if (p->valid & CFGV_SCALE_IQ){
-    dsp_tx_regs->scale_iq = p->scale_iq;
-  }
-#endif
-
-  // Build reply subpacket
-
-  r->opcode = OP_CONFIG_TX_REPLY_V2;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = ok;
-  r->inverted = tune_result.inverted;
-  r->baseband_freq_hi = u2_fxpt_freq_hi(tune_result.baseband_freq);
-  r->baseband_freq_lo = u2_fxpt_freq_lo(tune_result.baseband_freq);
-  r->duc_freq_hi = u2_fxpt_freq_hi(tune_result.dxc_freq);
-  r->duc_freq_lo = u2_fxpt_freq_lo(tune_result.dxc_freq);
-  r->residual_freq_hi = u2_fxpt_freq_hi(tune_result.residual_freq);
-  r->residual_freq_lo = u2_fxpt_freq_lo(tune_result.residual_freq);
-  return r->len;
-}
-
-static size_t
-config_rx_v2_cmd(const op_config_rx_v2_t *p, 
-		 void *reply_payload, size_t reply_payload_space)
-{
-  op_config_rx_reply_v2_t *r = (op_config_rx_reply_v2_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))
-    return 0;				// no room
-
-  struct tune_result	tune_result;
-  memset(&tune_result, 0, sizeof(tune_result));
-
-  bool ok = true;
-  
-  if (p->valid & CFGV_GAIN){
-    ok &= db_set_gain(rx_dboard, p->gain);
-  }
-
-  if (p->valid & CFGV_FREQ){
-    bool was_streaming = is_streaming();
-    if (was_streaming)
-      stop_rx_cmd();
-    
-    u2_fxpt_freq_t f = u2_fxpt_freq_from_hilo(p->freq_hi, p->freq_lo);
-    bool tune_ok = db_tune(rx_dboard, f, &tune_result);
-    ok &= tune_ok;
-    print_tune_result("Rx", tune_ok, f, &tune_result);
-
-    if (was_streaming)
-      restart_streaming();
-  }
-
-  if (p->valid & CFGV_INTERP_DECIM){
-    int decim = p->decim;
-    int hb1 = 0;
-    int hb2 = 0;
-    
-    if(!(decim & 1)) {
-      hb2 = 1;
-      decim = decim >> 1;
-    }
-    
-    if(!(decim & 1)) {
-      hb1 = 1;
-      decim = decim >> 1;
-    }
-    
-    if (decim < MIN_CIC_DECIM || decim > MAX_CIC_DECIM)
-      ok = false;
-    else {
-      dsp_rx_regs->decim_rate = (hb1<<9) | (hb2<<8) | decim;
-      // printf("Decim: %d, register %d\n", p->decim, (hb1<<9) | (hb2<<8) | decim);
-    }
-  }
-
-  if (p->valid & CFGV_SCALE_IQ){
-    dsp_rx_regs->scale_iq = p->scale_iq;
-  }
-
-  // Build reply subpacket
-
-  r->opcode = OP_CONFIG_RX_REPLY_V2;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = ok;
-  r->inverted = tune_result.inverted;
-  r->baseband_freq_hi = u2_fxpt_freq_hi(tune_result.baseband_freq);
-  r->baseband_freq_lo = u2_fxpt_freq_lo(tune_result.baseband_freq);
-  r->ddc_freq_hi = u2_fxpt_freq_hi(tune_result.dxc_freq);
-  r->ddc_freq_lo = u2_fxpt_freq_lo(tune_result.dxc_freq);
-  r->residual_freq_hi = u2_fxpt_freq_hi(tune_result.residual_freq);
-  r->residual_freq_lo = u2_fxpt_freq_lo(tune_result.residual_freq);
-
-  return r->len;
-}
-
-static size_t
-read_time_cmd(const op_generic_t *p,
-	      void *reply_payload, size_t reply_payload_space)
-{
-  op_read_time_reply_t *r = (op_read_time_reply_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))		
-    return 0;					// no room
-
-  r->opcode = OP_READ_TIME_REPLY;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->time = timer_regs->time;
-
-  return r->len;
-}
-
-static void
-fill_db_info(u2_db_info_t *p, const struct db_base *db)
-{
-  p->dbid = db->dbid;
-  p->freq_min_hi = u2_fxpt_freq_hi(db->freq_min);
-  p->freq_min_lo = u2_fxpt_freq_lo(db->freq_min);
-  p->freq_max_hi = u2_fxpt_freq_hi(db->freq_max);
-  p->freq_max_lo = u2_fxpt_freq_lo(db->freq_max);
-  p->gain_min = db->gain_min;
-  p->gain_max = db->gain_max;
-  p->gain_step_size = db->gain_step_size;
-}
-
-static size_t
-dboard_info_cmd(const op_generic_t *p,
-		void *reply_payload, size_t reply_payload_space)
-{
-  op_dboard_info_reply_t *r = (op_dboard_info_reply_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))		
-    return 0;					// no room
-
-  r->opcode = OP_DBOARD_INFO_REPLY;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = true;
-
-  fill_db_info(&r->tx_db_info, tx_dboard);
-  fill_db_info(&r->rx_db_info, rx_dboard);
-
-  return r->len;
-}
-
-static size_t
-peek_cmd(const op_peek_t *p,
-	 void *reply_payload, size_t reply_payload_space)
-{
-  op_generic_t *r = (op_generic_t *) reply_payload;
-
-  putstr("peek: addr="); puthex32(p->addr);
-  printf(" bytes=%u\n", p->bytes);
-
-  if ((reply_payload_space < (sizeof(*r) + p->bytes)) ||
-      p->bytes > MAX_SUBPKT_LEN - sizeof(op_generic_t)) {
-    putstr("peek: insufficient reply packet space\n");
-    return 0;			// FIXME do partial read?
-  }
-
-  r->opcode = OP_PEEK_REPLY;
-  r->len = sizeof(*r)+p->bytes;
-  r->rid = p->rid;
-  r->ok = true;
-
-  memcpy_wa(reply_payload+sizeof(*r), (void *)p->addr, p->bytes);
-
-  return r->len;
-}
-
-static bool
-poke_cmd(const op_poke_t *p)
-{
-  int bytes = p->len - sizeof(*p);
-  putstr("poke: addr="); puthex32(p->addr);
-  printf(" bytes=%u\n", bytes);
-
-  uint8_t *src = (uint8_t *)p + sizeof(*p);
-  memcpy_wa((void *)p->addr, src, bytes);
-
-  return true;
-}
-
-static size_t
-generic_reply(const op_generic_t *p,
-	      void *reply_payload, size_t reply_payload_space,
-	      bool ok)
-{
-  op_generic_t *r = (op_generic_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))		
-    return 0;					// no room
-
-  r->opcode = p->opcode | OP_REPLY_BIT;
-  r->len = sizeof(*r);
-  r->rid = p->rid;
-  r->ok = ok;
-
-  return r->len;
-}
-
-static size_t
-add_eop(void *reply_payload, size_t reply_payload_space)
-{
-  op_generic_t *r = (op_generic_t *) reply_payload;
-  if (reply_payload_space < sizeof(*r))		
-    return 0;					// no room
-
-  r->opcode = OP_EOP;
-  r->len = sizeof(*r);
-  r->rid = 0;
-  r->ok =  0;
-
-  return r->len;
-}
-
-void
-handle_control_chan_frame(u2_eth_packet_t *pkt, size_t len)
-{
-  unsigned char reply[sizeof(u2_eth_packet_t) + 4 * sizeof(u2_subpkt_t)] _AL4;
-  unsigned char *reply_payload = &reply[sizeof(u2_eth_packet_t)];
-  int reply_payload_space = sizeof(reply) - sizeof(u2_eth_packet_t);
-
-  // initialize reply
-  memset(reply, 0, sizeof(reply));
-  set_reply_hdr((u2_eth_packet_t *) reply, pkt);
-
-  // point to beginning of payload (subpackets)
-  unsigned char *payload = ((unsigned char *) pkt) + sizeof(u2_eth_packet_t);
-  int payload_len = len - sizeof(u2_eth_packet_t);
-
-  size_t subpktlen = 0;
-
-  while (payload_len >= sizeof(op_generic_t)){
-    const op_generic_t *gp = (const op_generic_t *) payload;
-    subpktlen = 0;
-
-    // printf("\nopcode = %d\n", gp->opcode);
-
-    switch(gp->opcode){
-    case OP_EOP:		// end of subpackets
-      goto end_of_subpackets;
-
-    case OP_ID:
-      subpktlen = op_id_cmd(gp, reply_payload, reply_payload_space);
-      break;
-    
-    case OP_CONFIG_TX_V2:
-      subpktlen = config_tx_v2_cmd((op_config_tx_v2_t *) payload,
-				   reply_payload, reply_payload_space);
-      break;
-
-    case OP_CONFIG_RX_V2:
-      subpktlen = config_rx_v2_cmd((op_config_rx_v2_t *) payload,
-				   reply_payload, reply_payload_space);
-      break;
-
-    case OP_START_RX_STREAMING:
-      start_rx_streaming_cmd(&pkt->ehdr.src, (op_start_rx_streaming_t *) payload);
-      subpktlen = generic_reply(gp, reply_payload, reply_payload_space, true);
-      break;
-    
-    case OP_STOP_RX:
-      stop_rx_cmd();
-      subpktlen = generic_reply(gp, reply_payload, reply_payload_space, true);
-      break;
-    
-    case OP_BURN_MAC_ADDR:
-      subpktlen = generic_reply(gp, reply_payload, reply_payload_space,
-				burn_mac_addr((op_burn_mac_addr_t *) payload));
-      break;
-
-    case OP_CONFIG_MIMO:
-      subpktlen = generic_reply(gp, reply_payload, reply_payload_space,
-				config_mimo_cmd((op_config_mimo_t *) payload));
-      break;
-
-    case OP_READ_TIME:
-      subpktlen = read_time_cmd(gp, reply_payload, reply_payload_space);
-      break;
-
-    case OP_DBOARD_INFO:
-      subpktlen = dboard_info_cmd(gp, reply_payload, reply_payload_space);
-      break;
-
-    case OP_SYNC_TO_PPS:
-      subpktlen = generic_reply(gp, reply_payload, reply_payload_space,
-				sync_to_pps((op_generic_t *) payload));
-      break;
-
-    case OP_PEEK:
-      subpktlen = peek_cmd((op_peek_t *)payload, reply_payload, reply_payload_space);
-      break;
-
-    case OP_POKE:
-      subpktlen = generic_reply(gp, reply_payload, reply_payload_space,
-				poke_cmd((op_poke_t *)payload));
-      break;
-
-    default:
-      printf("app_common_v2: unhandled opcode = %d\n", gp->opcode);
-      break;
-    }
-
-    int t = (gp->len + 3) & ~3;		// bump to a multiple of 4
-    payload += t;
-    payload_len -= t;
-
-    subpktlen = (subpktlen + 3) & ~3;	// bump to a multiple of 4
-    reply_payload += subpktlen;
-    reply_payload_space -= subpktlen;
-  }
-
- end_of_subpackets:
-
-  // add the EOP marker
-  subpktlen = add_eop(reply_payload, reply_payload_space);
-  subpktlen = (subpktlen + 3) & ~3;	// bump to a multiple of 4
-  reply_payload += subpktlen;
-  reply_payload_space -= subpktlen;
-
-  send_reply(reply, reply_payload - reply);
-}
-
-
-/*
- * Called when an ethernet packet is received.
- * Return true if we handled it here, otherwise
- * it'll be passed on to the DSP Tx pipe
- */
-int
-eth_pkt_inspector(bsm12_t *sm, int bufno)
-{
-  u2_eth_packet_t *pkt = (u2_eth_packet_t *) buffer_ram(bufno);
-  size_t byte_len = (buffer_pool_status->last_line[bufno] - 3) * 4;
-
-  //static size_t last_len = 0;
-
-  // hal_toggle_leds(0x1);
-
-  // inspect rcvd frame and figure out what do do.
-
-  if (pkt->ehdr.ethertype != U2_ETHERTYPE)
-    return true;	// ignore, probably bogus PAUSE frame from MAC
-
-  int chan = u2p_chan(&pkt->fixed);
-
-  switch (chan){
-  case CONTROL_CHAN:
-    handle_control_chan_frame(pkt, byte_len);
-    return -1;
-    break;
-
-  case 0:
-    return 0;	// pass it off to DSP TX
-
-  case 1:
-    return 1;	// pass it off to SERDES TX
-
-  default:
-    abort();
-    break;
-  }
-}
-
-/*
- * Called when eth phy state changes (w/ interrupts disabled)
- */
-void
-link_changed_callback(int speed)
-{
-  link_is_up = speed != 0;
-  hal_set_leds(link_is_up ? LED_RJ45 : 0x0, LED_RJ45);
-  printf("\neth link changed: speed = %d\n", speed);
-}
-
-
-void
-print_tune_result(char *msg, bool tune_ok,
-		  u2_fxpt_freq_t target_freq, struct tune_result *r)
-{
-#if 0
-  printf("db_tune %s %s\n", msg, tune_ok ? "true" : "false");
-  putstr("  target_freq   "); print_fxpt_freq(target_freq); newline();
-  putstr("  baseband_freq "); print_fxpt_freq(r->baseband_freq); newline();
-  putstr("  dxc_freq      "); print_fxpt_freq(r->dxc_freq); newline();
-  putstr("  residual_freq "); print_fxpt_freq(r->residual_freq); newline();
-  printf("  inverted      %s\n", r->inverted ? "true" : "false");
-#endif
-}
diff --git a/usrp2/firmware/apps/mimo_app_common_v2.h b/usrp2/firmware/apps/mimo_app_common_v2.h
deleted file mode 100644
index 7bb5b7286..000000000
--- a/usrp2/firmware/apps/mimo_app_common_v2.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_APP_COMMON_H
-#define INCLUDED_APP_COMMON_H
-
-#include "bool.h"
-#include "usrp2_eth_packet.h"
-#include "bsm12.h"
-#include "memory_map.h"
-#include "hal_io.h"
-#include <stddef.h>
-#include <db.h>
-
-#define CPU_TX_BUF 	7	// cpu -> eth
-
-#define	_AL4 __attribute__((aligned (4)))
-
-extern volatile bool link_is_up;	// eth handler sets this
-
-// If there's a dbsm that sends to the ethernet, put it's address here
-extern dbsm_t *ac_could_be_sending_to_eth;
-
-extern int cpu_tx_buf_dest_port;
-
-void set_reply_hdr(u2_eth_packet_t *reply_pkt, u2_eth_packet_t const *cmd_pkt);
-
-/*
- * Called when an ethernet packet is received.
- */
-int eth_pkt_inspector(bsm12_t *sm, int bufno);
-
-
-void link_changed_callback(int speed);
-
-void
-print_tune_result(char *msg, bool tune_ok,
-		  u2_fxpt_freq_t target_freq, struct tune_result *r);
-
-
-void start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p);
-void stop_rx_cmd(void);
-void restart_streaming(void);
-bool is_streaming(void);
-
-void handle_control_chan_frame(u2_eth_packet_t *pkt, size_t len);
-
-#endif /* INCLUDED_APP_COMMON_H */
diff --git a/usrp2/firmware/apps/mimo_tx.c b/usrp2/firmware/apps/mimo_tx.c
deleted file mode 100644
index 7fc7b486f..000000000
--- a/usrp2/firmware/apps/mimo_tx.c
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This is a down and dirty test program that confirms that the we can
- * coherently transmit different signals to two USRP2s connected via a
- * mimo cable.  This code runs in the USRP2 connected to the ethernet.
- * The other USRP runs mimo_tx_slave.  The host runs test_mimo_tx.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "bsm12.h"
-#include "mimo_app_common_v2.h"
-#include "memcpy_wa.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include "clocks.h"
-
-#define FW_SETS_SEQNO	1	// define to 0 or 1 (FIXME must be 1 for now)
-
-#if (FW_SETS_SEQNO)
-static int fw_seqno;	// used when f/w is filling in sequence numbers
-#endif
-
-
-/*
- * Experimental code to transmit packets to DSP Tx and SERDES
- *
- * Hard wire the Tx config so we don't have to deal with control stuff yet.
- */
-
-#define	BUF_BSM12_0	4
-#define	BUF_BSM12_1	5
-#define	BUF_BSM12_2	6
-
-//#define CPU_TX_BUF	7	// cpu -> eth
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 2 lines (word0 + timestamp)
-// DSP Tx reads word0 (flags) + timestamp followed by samples
-
-#define DSP_TX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4)
-
-// Receive from ethernet
-buf_cmd_args_t bsm12_recv_args = {
-  PORT_ETH,
-  0,
-  BP_LAST_LINE
-};
-
-// send to DSP Tx
-buf_cmd_args_t bsm12_send0_args = {
-  PORT_DSP,
-  DSP_TX_FIRST_LINE,	// starts just past transport header
-  0			// filled in from last_line register
-};
-
-// send to SERDES
-buf_cmd_args_t bsm12_send1_args = {
-  PORT_SERDES,
-  0,			// starts just past transport header
-  0			// filled in from last_line register
-};
-
-bsm12_t bsm12_sm;	// the state machine
-
-#if 0
-/*
- * ================================================================
- *   configure DSP RX double buffering state machine (dsp -> eth)
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 1 line (word0)
-// DSP Rx writes timestamp followed by nlines_per_frame of samples
-#define DSP_RX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4 + 1)
-
-// receive from DSP
-buf_cmd_args_t dsp_rx_recv_args = {
-  PORT_DSP,
-  DSP_RX_FIRST_LINE,
-  BP_LAST_LINE
-};
-
-// send to ETH
-buf_cmd_args_t dsp_rx_send_args = {
-  PORT_ETH,
-  0,		// starts with ethernet header in line 0
-  0,		// filled in from list_line register
-};
-
-dbsm_t dsp_rx_sm;	// the state machine
-#endif
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-// variables for streaming mode
-
-static bool         streaming_p = false;
-static unsigned int streaming_items_per_frame = 0;
-static int          streaming_frame_count = 0;
-#define FRAMES_PER_CMD	1000
-
-bool is_streaming(void){ return streaming_p; }
-
-
-// ----------------------------------------------------------------
-
-
-void
-restart_streaming(void)
-{
-#if 0
-  // setup RX DSP regs
-  dsp_rx_regs->clear_state = 1;			// reset
-
-  streaming_p = true;
-  streaming_frame_count = FRAMES_PER_CMD;
-
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);			// set "chain" bit
-
-  // kick off the state machine
-  dbsm_start(&dsp_rx_sm);
-
-  dsp_rx_regs->rx_time = 0;		// enqueue first of two commands
-
-  // make sure this one and the rest have the "now" and "chain" bits set.
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);				
-
-  dsp_rx_regs->rx_time = 0;		// enqueue second command
-#endif
-}
-
-void
-start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p)
-{
-#if 0
-  host_mac_addr = *host;	// remember who we're sending to
-
-  /*
-   * Construct  ethernet header and word0 and preload into two buffers
-   */
-  u2_eth_packet_t	pkt;
-  memset(&pkt, 0, sizeof(pkt));
-  pkt.ehdr.dst = *host;
-  pkt.ehdr.src = *ethernet_mac_addr();
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-  u2p_set_word0(&pkt.fixed, 0, 0);
-  // DSP RX will fill in timestamp
-
-  memcpy_wa(buffer_ram(DSP_RX_BUF_0), &pkt, sizeof(pkt));
-  memcpy_wa(buffer_ram(DSP_RX_BUF_1), &pkt, sizeof(pkt));
-
-
-  if (FW_SETS_SEQNO)
-    fw_seqno = 0;
-
-  streaming_items_per_frame = p->items_per_frame;
-  restart_streaming();
-#endif
-}
-
-
-void
-stop_rx_cmd(void)
-{
-#if 0
-  streaming_p = false;
-  dsp_rx_regs->clear_state = 1;	// flush cmd queue
-  bp_clear_buf(DSP_RX_BUF_0);
-  bp_clear_buf(DSP_RX_BUF_1);
-#endif
-}
-
-
-static void
-setup_tx()
-{
-  dsp_tx_regs->clear_state = 1;
-
-  int tx_scale = 2500;
-  int interp = 8;		// * 4
-
-  // setup some defaults
-
-  dsp_tx_regs->freq = 429496730;	// 10MHz
-  dsp_tx_regs->scale_iq = (tx_scale << 16) | tx_scale;
-  dsp_tx_regs->interp_rate = (1 << 9) | (1 << 8) | interp;
-}
-
-
-#if 0
-#if (FW_SETS_SEQNO)
-/*
- * Debugging ONLY.  This will be handled by the tx_protocol_engine.
- *
- * This is called when the DSP Rx chain has filled in a packet.
- * We set and increment the seqno, then return false, indicating
- * that we didn't handle the packet.  A bit of a kludge
- * but it should work.
- */
-int
-fw_sets_seqno_inspector(bsm12_t *sm, int buf_this)
-{
-  uint32_t *p = buffer_ram(buf_this);
-  uint32_t seqno = fw_seqno++;
-
-  // KLUDGE all kinds of nasty magic numbers and embedded knowledge
-  uint32_t t = p[4];
-  t = (t & 0xffff00ff) | ((seqno & 0xff) << 8);
-  p[4] = t;
-
-  // queue up another rx command when required
-  if (streaming_p && --streaming_frame_count == 0){
-    streaming_frame_count = FRAMES_PER_CMD;
-    dsp_rx_regs->rx_time = 0;
-  }
-
-  return false;		// we didn't handle the packet
-}
-#endif
-#endif
-
-
-inline static void
-buffer_irq_handler(unsigned irq)
-{
-  uint32_t  status = buffer_pool_status->status;
-
-  bsm12_process_status(&bsm12_sm, status);
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  putstr("\nMIMO Tx\n");
-  print_mac_addr(ethernet_mac_addr()->addr);
-  newline();
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-  ethernet_init();
-
-  clocks_mimo_config(MC_WE_DONT_LOCK | MC_PROVIDE_CLK_TO_MIMO);
-
-#if 0
-  // make bit 15 of Tx gpio's be a s/w output
-  hal_gpio_set_sel(GPIO_TX_BANK, 15, 's');
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0x8000, 0x8000);
-#endif
-
-  output_regs->debug_mux_ctrl = 1;
-#if 0
-  hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0xffff, 0xffff);
-  hal_gpio_set_ddr(GPIO_RX_BANK, 0xffff, 0xffff);
-#endif
-
-
-  // initialize double buffering state machine for ethernet -> DSP Tx
-
-  bsm12_init(&bsm12_sm, BUF_BSM12_0,
-	     &bsm12_recv_args, &bsm12_send0_args, &bsm12_send1_args,
-	     eth_pkt_inspector);
-
-
-#if 0
-  // initialize double buffering state machine for DSP RX -> Ethernet
-
-  if (FW_SETS_SEQNO){
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      fw_sets_seqno_inspector);
-  }
-  else {
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      dbsm_nop_inspector);
-  }
-
-  // tell app_common that this dbsm could be sending to the ethernet
-  ac_could_be_sending_to_eth = &dsp_rx_sm;
-#endif
-
-
-  // program tx registers
-  setup_tx();
-
-  // kick off the state machine
-  bsm12_start(&bsm12_sm);
-
-  //int which = 0;
-
-  while(1){
-    // hal_gpio_write(GPIO_TX_BANK, which, 0x8000);
-    // which ^= 0x8000;
-
-    buffer_irq_handler(0);
-
-    int pending = pic_regs->pending;		// poll for under or overrun
-
-    if (pending & PIC_UNDERRUN_INT){
-      // dbsm_handle_tx_underrun(&dsp_tx_sm);
-      pic_regs->pending = PIC_UNDERRUN_INT;	// clear interrupt
-      putchar('U');
-    }
-
-    if (pending & PIC_OVERRUN_INT){
-      // dbsm_handle_rx_overrun(&dsp_rx_sm);
-      pic_regs->pending = PIC_OVERRUN_INT;	// clear pending interrupt
-
-      // FIXME Figure out how to handle this robustly.
-      // Any buffers that are emptying should be allowed to drain...
-
-      if (streaming_p){
-	// restart_streaming();
-	// FIXME report error
-      }
-      else {
-	// FIXME report error
-      }
-      putchar('O');
-    }
-  }
-}
diff --git a/usrp2/firmware/apps/mimo_tx_slave.c b/usrp2/firmware/apps/mimo_tx_slave.c
deleted file mode 100644
index 4c284b7c9..000000000
--- a/usrp2/firmware/apps/mimo_tx_slave.c
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This is a down and dirty test program that confirms that the we can
- * coherently transmit different signals to two USRP2s connected via a
- * mimo cable.  This code runs in the USRP2 NOT connected to the
- * ethernet.  The USRP connected to the ethernet runs mimo_tx.  The
- * host runs test_mimo_tx.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common_v2.h"
-#include "memcpy_wa.h"
-#include "clocks.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-#define FW_SETS_SEQNO	1	// define to 0 or 1 (FIXME must be 1 for now)
-
-#if (FW_SETS_SEQNO)
-static int fw_seqno;	// used when f/w is filling in sequence numbers
-#endif
-
-
-/*
- * Full duplex Tx and Rx between serdes and DSP pipelines
- *
- * Buffer 1 is used by the cpu to send frames to the host.
- * Buffers 2 and 3 are used to double-buffer the DSP Rx to serdes flow
- * Buffers 4 and 5 are used to double-buffer the serdes to DSP Tx flow
- */
-//#define CPU_RX_BUF	0	// eth -> cpu
-
-#define	DSP_RX_BUF_0	2	// dsp rx -> serdes (double buffer)
-#define	DSP_RX_BUF_1	3	// dsp rx -> serdes
-#define	DSP_TX_BUF_0	4	// serdes -> dsp tx (double buffer)
-#define	DSP_TX_BUF_1	5	// serdes -> dsp tx
-
-/*
- * ==================================================================
- *   configure DSP TX double buffering state machine (serdes -> dsp)
- * ==================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 2 lines (word0 + timestamp)
-// DSP Tx reads word0 (flags) + timestamp followed by samples
-
-#define DSP_TX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4)
-
-// Receive from serdes
-buf_cmd_args_t dsp_tx_recv_args = {
-  PORT_SERDES,
-  0,
-  BP_LAST_LINE
-};
-
-// send to DSP Tx
-buf_cmd_args_t dsp_tx_send_args = {
-  PORT_DSP,
-  DSP_TX_FIRST_LINE,	// starts just past transport header
-  0			// filled in from last_line register
-};
-
-dbsm_t dsp_tx_sm;	// the state machine
-
-/*
- * =================================================================
- *   configure DSP RX double buffering state machine (dsp -> serdes)
- * =================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 1 line (word0)
-// DSP Rx writes timestamp followed by nlines_per_frame of samples
-#define DSP_RX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4 + 1)
-
-// receive from DSP
-buf_cmd_args_t dsp_rx_recv_args = {
-  PORT_DSP,
-  DSP_RX_FIRST_LINE,
-  BP_LAST_LINE
-};
-
-// send to serdes
-buf_cmd_args_t dsp_rx_send_args = {
-  PORT_SERDES,
-  0,		// starts with ethernet header in line 0
-  0,		// filled in from list_line register
-};
-
-dbsm_t dsp_rx_sm;	// the state machine
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-// variables for streaming mode
-
-static bool         streaming_p = false;
-static unsigned int streaming_items_per_frame = 0;
-static int          streaming_frame_count = 0;
-#define FRAMES_PER_CMD	1000
-
-bool is_streaming(void){ return streaming_p; }
-
-// ----------------------------------------------------------------
-
-
-void
-restart_streaming(void)
-{
-  // setup RX DSP regs
-  dsp_rx_regs->clear_state = 1;			// reset
-
-  streaming_p = true;
-  streaming_frame_count = FRAMES_PER_CMD;
-
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);			// set "chain" bit
-
-  // kick off the state machine
-  dbsm_start(&dsp_rx_sm);
-
-  dsp_rx_regs->rx_time = 0;		// enqueue first of two commands
-
-  // make sure this one and the rest have the "now" and "chain" bits set.
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);
-
-  dsp_rx_regs->rx_time = 0;		// enqueue second command
-}
-
-void
-start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p)
-{
-  host_mac_addr = *host;	// remember who we're sending to
-
-  /*
-   * Construct  ethernet header and word0 and preload into two buffers
-   */
-  u2_eth_packet_t	pkt;
-  memset(&pkt, 0, sizeof(pkt));
-  pkt.ehdr.dst = *host;
-  pkt.ehdr.src = *ethernet_mac_addr();
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-  u2p_set_word0(&pkt.fixed, 0, 0);
-  // DSP RX will fill in timestamp
-
-  memcpy_wa(buffer_ram(DSP_RX_BUF_0), &pkt, sizeof(pkt));
-  memcpy_wa(buffer_ram(DSP_RX_BUF_1), &pkt, sizeof(pkt));
-
-
-  if (FW_SETS_SEQNO)
-    fw_seqno = 0;
-
-  streaming_items_per_frame = p->items_per_frame;
-  restart_streaming();
-}
-
-void start_rx_streaming_at_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p, uint32_t time)
-{}
-void restart_streaming_at(uint32_t time)
-{}
-
-void
-stop_rx_cmd(void)
-{
-  streaming_p = false;
-  dsp_rx_regs->clear_state = 1;	// flush cmd queue
-  bp_clear_buf(DSP_RX_BUF_0);
-  bp_clear_buf(DSP_RX_BUF_1);
-}
-
-
-static void
-setup_tx()
-{
-  dsp_tx_regs->clear_state = 1;
-  bp_clear_buf(DSP_TX_BUF_0);
-  bp_clear_buf(DSP_TX_BUF_1);
-
-  int tx_scale = 2500;
-  int interp = 8;		// * 4
-
-  // setup some defaults
-
-  dsp_tx_regs->freq = 429496730;	// 10MHz
-  dsp_tx_regs->scale_iq = (tx_scale << 16) | tx_scale;
-  dsp_tx_regs->interp_rate = (1 << 9) | (1 << 8) | interp;
-}
-
-
-#if (FW_SETS_SEQNO)
-/*
- * Debugging ONLY.  This will be handled by the tx_protocol_engine.
- *
- * This is called when the DSP Rx chain has filled in a packet.
- * We set and increment the seqno, then return false, indicating
- * that we didn't handle the packet.  A bit of a kludge
- * but it should work.
- */
-bool
-fw_sets_seqno_inspector(dbsm_t *sm, int buf_this)	// returns false
-{
-  uint32_t *p = buffer_ram(buf_this);
-  uint32_t seqno = fw_seqno++;
-
-  // KLUDGE all kinds of nasty magic numbers and embedded knowledge
-  uint32_t t = p[4];
-  t = (t & 0xffff00ff) | ((seqno & 0xff) << 8);
-  p[4] = t;
-
-  // queue up another rx command when required
-  if (streaming_p && --streaming_frame_count == 0){
-    streaming_frame_count = FRAMES_PER_CMD;
-    dsp_rx_regs->rx_time = 0;
-  }
-
-  return false;		// we didn't handle the packet
-}
-#endif
-
-
-inline static void
-buffer_irq_handler(unsigned irq)
-{
-  // hal_toggle_leds(LED_A);
-
-  uint32_t  status = buffer_pool_status->status;
-
-  if (0 && (status & ~BPS_IDLE_ALL)){
-    putstr("status = ");
-    puthex32_nl(status);
-  }
-
-  dbsm_process_status(&dsp_tx_sm, status);
-  dbsm_process_status(&dsp_rx_sm, status);
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  output_regs->led_src = 0x3;		// h/w controls bottom two bits
-  clocks_enable_test_clk(true, 1);
-
-  putstr("\nMIMO Tx Slave\n");
-
-  cpu_tx_buf_dest_port = PORT_SERDES;
-
-  // ethernet_register_link_changed_callback(link_changed_callback);
-  // ethernet_init();
-
-  clocks_mimo_config(MC_WE_LOCK_TO_MIMO);
-
-  // puts("post clocks_mimo_config");
-
-#if 0
-  // make bit 15 of Tx gpio's be a s/w output
-  hal_gpio_set_sel(GPIO_TX_BANK, 15, 's');
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0x8000, 0x8000);
-#endif
-
-#if 0
-  output_regs->debug_mux_ctrl = 1;
-  hal_gpio_set_sels(GPIO_TX_BANK, "0000000000000000");
-  hal_gpio_set_sels(GPIO_RX_BANK, "0000000000000000");
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0xffff, 0xffff);
-  hal_gpio_set_ddr(GPIO_RX_BANK, 0xffff, 0xffff);
-#endif
-
-
-  // initialize double buffering state machine for ethernet -> DSP Tx
-
-  dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
-	    &dsp_tx_recv_args, &dsp_tx_send_args,
-	    eth_pkt_inspector);
-
-
-  //output_regs->flush_icache = 1;
-
-  // initialize double buffering state machine for DSP RX -> Ethernet
-
-  if (FW_SETS_SEQNO){
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      fw_sets_seqno_inspector);
-  }
-  else {
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      dbsm_nop_inspector);
-  }
-
-  // puts("post dbsm_init's");
-
-  // tell app_common that this dbsm could be sending to the ethernet
-  ac_could_be_sending_to_eth = &dsp_rx_sm;
-
-
-  // program tx registers
-  setup_tx();
-
-  // puts("post setup_tx");
-
-  // kick off the state machine
-  dbsm_start(&dsp_tx_sm);
-
-  // puts("post dbsm_start");
-
-  //int which = 0;
-
-  while(1){
-    // hal_gpio_write(GPIO_TX_BANK, which, 0x8000);
-    // which ^= 0x8000;
-
-    buffer_irq_handler(0);
-
-    int pending = pic_regs->pending;		// poll for under or overrun
-
-    if (pending & PIC_UNDERRUN_INT){
-      dbsm_handle_tx_underrun(&dsp_tx_sm);
-      pic_regs->pending = PIC_UNDERRUN_INT;	// clear interrupt
-      putchar('U');
-    }
-
-    if (pending & PIC_OVERRUN_INT){
-      dbsm_handle_rx_overrun(&dsp_rx_sm);
-      pic_regs->pending = PIC_OVERRUN_INT;	// clear pending interrupt
-
-      // FIXME Figure out how to handle this robustly.
-      // Any buffers that are emptying should be allowed to drain...
-
-      if (streaming_p){
-	// restart_streaming();
-	// FIXME report error
-      }
-      else {
-	// FIXME report error
-      }
-      putchar('O');
-    }
-  }
-}
diff --git a/usrp2/firmware/apps/rcv_eth_packets.c b/usrp2/firmware/apps/rcv_eth_packets.c
deleted file mode 100644
index ec772ca75..000000000
--- a/usrp2/firmware/apps/rcv_eth_packets.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "memcpy_wa.h"
-#include <stddef.h>
-#include <stdlib.h>
-
-
-// ----------------------------------------------------------------
-
-static u2_mac_addr_t dst_mac_addr =
-  {{  0xff, 0xff, 0xff, 0xff, 0xff, 0xff }};
-
-
-// ----------------------------------------------------------------
-
-#define	PACKET_SIZE 1500		// bytes
-#define ETH_DATA_RATE 1000000		// 1MB/s
-#define	ETH_PACKET_RATE (ETH_DATA_RATE/PACKET_SIZE)	// 13,3333 pkts/s
-
-#define TIMER_RATE 100000000		// 100 MHz clock
-
-static int timer_delta = TIMER_RATE/ETH_PACKET_RATE;	// ticks between interrupts
-
-static volatile bool send_packet_now = false;   // timer handler sets this
-static volatile bool link_is_up = false;	// eth handler sets this
-
-int packet_number = 0;
-
-// ----------------------------------------------------------------
-
-// debugging output on tx pins
-#define LS_MASK  0xE0000
-#define LS_1000  0x80000
-#define LS_100   0x40000
-#define LS_10    0x20000
-
-
-/*
- * Called when eth phy state changes (w/ interrupts disabled)
- */
-void
-link_changed_callback(int speed)
-{
-  int v = 0;
-  switch(speed){
-  case 10:
-    v = LS_10;
-    link_is_up = true;
-    break;
-    
-  case 100:
-    v = LS_100;
-    link_is_up = true;
-    break;
-    
-  case 1000:
-    v = LS_100;
-    link_is_up = true;
-    break;
-
-  default:
-    v = 0;
-    link_is_up = false;
-    break;
-  }
-
-  //hal_gpio_set_tx(v, LS_MASK);	/* set debug bits on d'board */
-
-  putstr("\neth link changed: speed = ");
-  puthex16_nl(speed);
-}
-
-void
-timer_irq_handler(unsigned irq)
-{
-  hal_set_timeout(timer_delta);	// schedule next timeout
-  send_packet_now = 1;
-}
-
-
-void
-buffer_irq_handler(unsigned irq)
-{
-  // FIXME
-}
-
-static void
-init_packet(int *buf, const u2_eth_packet_t *pkt, int bufnum)
-{
-  int i = 0;
-  int mark = ((bufnum & 0xff) << 24) | 0x005A0000;
-
-  for (i = 0; i < BP_NLINES; i++){
-    buf[i] = mark | i;
-    mark ^= 0x00FF0000;
-  }
-
-  // copy header into buffer
-  memcpy_wa(buf, pkt, sizeof(*pkt));
-}
-
-static void
-init_packets(void)
-{
-  int	i;
-  
-  u2_eth_packet_t	pkt __attribute__((aligned (4)));
-
-  pkt.ehdr.dst = dst_mac_addr;
-  pkt.ehdr.src = *ethernet_mac_addr();
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-
-  // fill ALL buffers for debugging
-  for (i = 0; i < 8; i++)
-    init_packet((void *)buffer_ram(i), &pkt, i);
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  int	prev_leds = -1;
-  int	new_leds  = 0x00;
-  output_regs->leds = 0x00;
-
-  int peak_hold_count = 0;
-
-  // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
-  //hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  //hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-
-  putstr("\nrcv_eth_packets\n");
-  
-  init_packets();
-
-  // pic_register_handler(IRQ_BUFFER, buffer_irq_handler);  // poll for now
-
-  // FIXME turn off timer since I don't think MTS and MFS instructions are implemented
-  // pic_register_handler(IRQ_TIMER, timer_irq_handler);
-  // hal_set_timeout(timer_delta);
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-
-  ethernet_init();
-
-  //eth_mac->speed = 4;	// FIXME hardcode mac speed to 1000
-
-  // kick off a receive
-  bp_receive_to_buf(2, PORT_ETH, 1, 0, 511);
-
-  while(1){
-    // u2_eth_packet_t	pkt;
-
-    new_leds = 0;
-    if (link_is_up)
-      new_leds = 0x2;
-
-    if ((buffer_pool_status->status & (BPS_DONE_2|BPS_ERROR_2)) != 0){
-      // we've got a packet!
-
-#if 0
-      // copy to stack buffer so we can byte address it
-      memcpy_wa(&pkt, (void *)buffer_ram(2), sizeof(pkt));
-      
-      putstr("Rx: src: ");
-      print_mac_addr(pkt.ehdr.dst_addr);
-      putstr(" dst: ");
-      print_mac_addr(pkt.ehdr.src_addr);
-      putstr(" ethtype: ");
-      puthex16(pkt.ehdr.ethertype);
-      putstr(" len: ");
-      int len = (buffer_pool_status->last_line[2] + 1) * 4;
-      puthex16_nl(len);
-#else
-      volatile int *bp = buffer_ram(2);
-      int	i;
-      for (i = 0; i < 16; i++){
-	puthex8(i);
-	putchar(':');
-	puthex32_nl(bp[i]);
-      }
-#endif
-      
-      // kick off next receive
-      bp_clear_buf(2);
-      bp_receive_to_buf(2, PORT_ETH, 1, 0, 511);
-
-      peak_hold_count = 2048 * 10;
-    }
-
-    if (peak_hold_count > 0){
-      peak_hold_count--;
-      new_leds |= 0x1;
-    }
-
-    if (new_leds != prev_leds){
-      prev_leds = new_leds;
-      output_regs->leds = new_leds;
-    }
-  }
-
-  hal_finish();
-  return 1;
-}
diff --git a/usrp2/firmware/apps/read_dbids.c b/usrp2/firmware/apps/read_dbids.c
deleted file mode 100644
index 4caabd885..000000000
--- a/usrp2/firmware/apps/read_dbids.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <nonstdio.h>
-#include <u2_init.h>
-#include <bool.h>
-#include <usrp2_i2c_addr.h>
-#include <i2c.h>
-
-
-int main(void)
-{
-  u2_init();
-
-  puts("\nread_dbids");
-
-  unsigned char dbid_tx[2];
-  unsigned char dbid_rx[2];
-  bool ok;
-
-  ok = eeprom_read(I2C_ADDR_TX_A, 1, dbid_tx, 2);
-  if (!ok){
-    puts("failed to read Tx Daugherboard EEPROM");
-  }
-  else {
-    putstr("Tx Daugherboard ID: ");
-    puthex8(dbid_tx[1]);    // MSB
-    puthex8(dbid_tx[0]);    // LSB
-    newline();
-  }
-
-  ok = eeprom_read(I2C_ADDR_RX_A, 1, dbid_rx, 2);
-  if (!ok){
-    puts("failed to read Rx Daugherboard EEPROM");
-  }
-  else {
-    putstr("Rx Daugherboard ID: ");
-    puthex8(dbid_rx[1]);    // MSB
-    puthex8(dbid_rx[0]);    // LSB
-    newline();
-  }
-
-  return 0;
-}
diff --git a/usrp2/firmware/apps/sd_bounce.c b/usrp2/firmware/apps/sd_bounce.c
deleted file mode 100644
index 30e3e3fc5..000000000
--- a/usrp2/firmware/apps/sd_bounce.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* 
- * Loopback SERDES to SERDES
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "nonstdio.h"
-#include "memset_wa.h"
-#include <dbsm.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <clocks.h>
-
-
-
-// ----------------------------------------------------------------
-
-#define SERDES_RX_BUF_0		0
-#define	SERDES_RX_BUF_1		1
-
-/*
- * ================================================================
- *      configure SD RX double buffering state machine
- * ================================================================
- */
-
-// receive from SERDES
-buf_cmd_args_t sd_recv_args = {
-  PORT_SERDES,
-  0,
-  BP_LAST_LINE
-};
-
-// send to SERDES
-buf_cmd_args_t sd_send_args = {
-  PORT_SERDES,
-  0,		// starts with packet in line 0
-  0,		// filled in from list_line register
-};
-
-dbsm_t sd_sm;	// the state machine
-
-
-
-
-// ----------------------------------------------------------------
-
-#if 0
-static bool
-check_packet(int *buf, int nlines)
-{
-  bool ok = true;
-  int i = 0;
-  for (i = 0; i < nlines; i++){
-    int expected = ((2*i + 0) << 16) | (2*i+1);
-    if (buf[i] != expected){
-      ok = false;
-      printf("buf[%d] = 0x%x  expected = 0x%x\n", i, buf[i], expected);
-    }
-  }
-  return ok;
-}
-
-static void
-zero_buffer(int bufno)
-{
-  memset_wa(buffer_ram(bufno), 0, BP_NLINES * 4);
-}
-#endif
-
-
-bool
-sd_rx_inspector(dbsm_t *sm, int buf_this)
-{
-  hal_toggle_leds(0x2);
-
-#if 0
-  int last_line = buffer_pool_status->last_line[buf_this];
-  bool ok = check_packet(buffer_ram(buf_this), last_line);
-  static int good = 0;
-  static int bad = 0;
-
-  if (ok)
-    good++;
-  else
-    bad++;
-
-  if(good+bad == 10000) {
-    printf("Good %d\tBad %d\n",good,bad);
-    good = 0;
-    bad = 0;
-  }
-#endif
-
-  return false;
-}
-
-
-inline static void
-buffer_irq_handler(void)
-{
-  uint32_t  status = buffer_pool_status->status;
-  dbsm_process_status(&sd_sm, status);
-}
-
-
-int
-main(void)
-{
-  u2_init();
-
-  putstr("\nsd_bounce\n");
-
-  // Get our clock from the mimo interface
-  clocks_mimo_config(MC_WE_LOCK_TO_MIMO);
-
-  dbsm_init(&sd_sm, SERDES_RX_BUF_0,
-	    &sd_recv_args, &sd_send_args,
-	    sd_rx_inspector);
-
-  // kick off the state machine
-  dbsm_start(&sd_sm);
-
-  while(1){
-    buffer_irq_handler();
-  }
-}
diff --git a/usrp2/firmware/apps/sd_gentest.c b/usrp2/firmware/apps/sd_gentest.c
deleted file mode 100644
index 4824f03f5..000000000
--- a/usrp2/firmware/apps/sd_gentest.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "nonstdio.h"
-#include "memset_wa.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <clocks.h>
-#include <mdelay.h>
-
-// ----------------------------------------------------------------
-
-int packet_number = 0;
-volatile bool send_packet_now = 0;
-
-#define SERDES_TX_BUF	0
-#define	SERDES_RX_BUF 	1
-
-
-#define NLINES_PER_PKT	380
-
-
-// ----------------------------------------------------------------
-
-//static int timer_delta = (int)(MASTER_CLK_RATE * 100e-6);
-static int timer_delta = 1000000; // .01 second
-
-void
-timer_irq_handler(unsigned irq)
-{
-  hal_set_timeout(timer_delta);	// schedule next timeout
-  send_packet_now = true;
-}
-
-
-static void
-init_packet(int *buf)
-{
-  int i = 0;
-  for (i = 0; i < BP_NLINES; i++){
-    buf[i] = ((2*i + 0) << 16) | (2*i+1);
-  }
-}
-
-static bool
-check_packet(int *buf, int nlines)
-{
-  bool ok = true;
-  int i = 0;
-  for (i = 0; i < nlines; i++){
-    int expected = ((2*i + 0) << 16) | (2*i+1);
-    if (buf[i] != expected){
-      ok = false;
-      printf("buf[%d] = 0x%x  expected = 0x%x\n", i, buf[i], expected);
-    }
-  }
-  return ok;
-}
-
-static void
-zero_buffer(int bufno)
-{
-  memset_wa(buffer_ram(bufno), 0, BP_NLINES * 4);
-}
-
-static void
-init_packets(void)
-{
-  // init just the one we're using
-  init_packet(buffer_ram(SERDES_TX_BUF));
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  // We're free running and provide clock to the MIMO interface
-  clocks_mimo_config(MC_WE_DONT_LOCK | MC_PROVIDE_CLK_TO_MIMO);
-
-
-  // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
-  // output_regs->debug_mux_ctrl = 1;
-  // hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  // hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-
-  putstr("\nsd_gentest\n");
-  
-  // Set up serdes (already enabled)
-  //output_regs->serdes_ctrl = (SERDES_ENABLE | SERDES_RXEN | SERDES_LOOPEN);
-  //output_regs->serdes_ctrl = (SERDES_ENABLE | SERDES_RXEN);
-
-  init_packets();
-
-  // pic_register_handler(IRQ_TIMER, timer_irq_handler);
-
-  //if (hwconfig_simulation_p())
-  //  timer_delta = sim_timer_delta;
-
-  // start a receive from sd
-  zero_buffer(SERDES_RX_BUF);
-  bp_receive_to_buf(SERDES_RX_BUF, PORT_SERDES, 1, 0, BP_LAST_LINE);
-
-  // fire off the first packet
-  bp_send_from_buf(SERDES_TX_BUF, PORT_SERDES, 1, 0, NLINES_PER_PKT);
-  hal_set_timeout(timer_delta);
-  int ready_to_send = 0;
-
-  int counter __attribute__((unused)) = 0;
-  int sent = 1;
-  int txerr = 0;
-  int rxerr = 0;
-  int rcvd = 0;
-  int rxcrc = 0;
-  int sent_acc = 0;
-  int txerr_acc = 0;
-  int rxerr_acc = 0;
-  int rcvd_acc = 0;
-  int rxcrc_acc = 0;
-
-#define EXPECTING_PKT() ((counter & 0x1) == 0)
-#define	SEND_PKT()      ((counter & 0x1) != 0)
-
-  bool got_packet = false;
-
-  while(1){
-    uint32_t status = buffer_pool_status->status;
-
-    if (status & (BPS_DONE(SERDES_RX_BUF))){
-      bp_clear_buf(SERDES_RX_BUF);
-      got_packet = true;
-
-      //hal_toggle_leds(0x2);
-
-      // check packet
-      int last_line = buffer_pool_status->last_line[SERDES_RX_BUF]-1;
-      bool ok = check_packet(buffer_ram(SERDES_RX_BUF), last_line);
-      
-      if (ok) {
-	rcvd++;
-	//putchar('r');
-      }
-      else {
-	rcvd++;
-	rxcrc++;
-	//putchar('P');
-      }
-      // start a receive from sd
-      zero_buffer(SERDES_RX_BUF);
-      bp_receive_to_buf(SERDES_RX_BUF, PORT_SERDES, 1, 0, BP_LAST_LINE);
-    }
-
-    if (status & (BPS_ERROR(SERDES_RX_BUF))){
-      bp_clear_buf(SERDES_RX_BUF);
-      got_packet = true;
-      rcvd++;
-      rxerr++;
-      //putchar('E');
-
-      // start a receive from sd
-      zero_buffer(SERDES_RX_BUF);
-      bp_receive_to_buf(SERDES_RX_BUF, PORT_SERDES, 1, 0, BP_LAST_LINE);
-    }
-
-    if (status & (BPS_DONE(SERDES_TX_BUF))){
-      bp_clear_buf(SERDES_TX_BUF);
-      //putchar('t');
-      bp_send_from_buf(SERDES_TX_BUF, PORT_SERDES, 1, 0, NLINES_PER_PKT);
-      //mdelay(1);
-      int	i;
-      for (i = 0; i < 50; i++){
-	asm volatile ("or  r0, r0, r0\n\
-		   or  r0, r0, r0\n    \
-		   or  r0, r0, r0\n    \
-		   or  r0, r0, r0\n    \
-		   or  r0, r0, r0\n    \
-		   or  r0, r0, r0\n    \
-		   or  r0, r0, r0\n");
-      }
-      sent ++;
-      ready_to_send = 1;
-      //hal_toggle_leds(0x1);
-    }
-
-    if (status & BPS_ERROR(SERDES_TX_BUF)){
-      bp_clear_buf(SERDES_TX_BUF);
-      sent++;
-      txerr++;
-      ready_to_send = 1;
-      //putchar('X');
-    }
-
-    if(sent >=1000) {
-      printf("Status\tSENT %d\tTXERR %d\t",sent,txerr);
-      printf("RX %d\tERR %d\tCRC %d\tMISSED %d\n",rcvd, rxerr, rxcrc, sent-rcvd);
-      sent_acc += sent; sent = 0;
-      txerr_acc += txerr; txerr = 0;
-      rcvd_acc += rcvd; rcvd = 0;
-      rxerr_acc += rxerr; rxerr = 0;
-      rxcrc_acc += rxcrc; rxcrc = 0;
-    }
-
-    if(sent_acc >=10000) {
-      printf("\nOverall\tSENT %d\tTXERR %d\t",sent_acc,txerr_acc);
-      printf("RX %d\tERR %d\tCRC %d\tMISSED %d\n\n",rcvd_acc, rxerr_acc, rxcrc_acc, sent_acc-rcvd_acc);
-      sent_acc = 0;
-      txerr_acc = 0;
-      rcvd_acc = 0;
-      rxerr_acc = 0;
-      rxcrc_acc = 0;
-    }
-#if 0
-    int pending = pic_regs->pending;
-    if (pending & PIC_TIMER_INT){
-      hal_set_timeout(timer_delta);
-      
-      /*
-	if (EXPECTING_PKT()){
-	if (!got_packet)
-	  putchar('T');
-	got_packet = false;
-      }
-
-      if (SEND_PKT()){
-	if (status & BPS_IDLE(SERDES_TX_BUF))
-	  bp_send_from_buf(SERDES_TX_BUF, PORT_SERDES, 1, 0, NLINES_PER_PKT);
-      }
-      counter++;
-      */
-
-      putchar('T');
-      if(ready_to_send) {
-	bp_send_from_buf(SERDES_TX_BUF, PORT_SERDES, 1, 0, NLINES_PER_PKT);
-	counter++;
-	ready_to_send = 0;
-      }
-      
-      pic_regs->pending = PIC_TIMER_INT;	// clear pending interrupt
-    }
-#endif
-  }
-  
-  return 0;
-}
diff --git a/usrp2/firmware/apps/serdes_to_dsp.c b/usrp2/firmware/apps/serdes_to_dsp.c
deleted file mode 100644
index a9876d99b..000000000
--- a/usrp2/firmware/apps/serdes_to_dsp.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/*
- * This program can respond to queries from the host
- * and stream rx samples.
- *
- * Buffer 1 is used by the cpu to send frames to the host.
- * Buffers 2 and 3 are used to double-buffer the DSP Rx to eth flow
- * Buffers 4 and 5 are used to double-buffer the eth to DSP Tx  eth flow
- */
-//#define CPU_RX_BUF	0	// eth -> cpu
-//#define CPU_TX_BUF 	1	// cpu -> eth
-
-#define	DSP_RX_BUF_0	2	// dsp rx -> eth (double buffer)
-#define	DSP_RX_BUF_1	3	// dsp rx -> eth
-#define	DSP_TX_BUF_0	4	// eth -> dsp tx (double buffer)
-#define	DSP_TX_BUF_1	5	// eth -> dsp tx
-
-/*
- * ================================================================
- *      configure DSP TX double buffering state machine
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 2 lines (word0 + timestamp)
-// DSP Tx reads word0 (flags) + timestamp followed by samples
-
-#define DSP_TX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4)
-
-// Receive from ethernet
-buf_cmd_args_t dsp_tx_recv_args = {
-  PORT_SERDES,
-  0,
-  BP_LAST_LINE
-};
-
-// send to DSP Tx
-buf_cmd_args_t dsp_tx_send_args = {
-  PORT_DSP,
-  DSP_TX_FIRST_LINE,	// starts just past transport header
-  0			// filled in from last_line register
-};
-
-dbsm_t dsp_tx_sm;	// the state machine
-
-
-// ----------------------------------------------------------------
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-void
-start_rx_cmd(const u2_mac_addr_t *host, op_start_rx_t *p)
-{
-}
-
-void
-stop_rx_cmd(void)
-{
-}
-
-static void
-setup_tx()
-{
-  dsp_tx_regs->clear_state = 1;
-  bp_clear_buf(DSP_TX_BUF_0);
-  bp_clear_buf(DSP_TX_BUF_1);
-
-  int tx_scale = 256;
-  int interp = 32;
-
-  op_config_tx_t def_config;
-  memset(&def_config, 0, sizeof(def_config));
-  def_config.phase_inc  = 408021893;			// 9.5 MHz [2**32 * fc/fsample]
-  def_config.scale_iq = (tx_scale << 16) | tx_scale;
-  def_config.interp = interp;
-
-  // setup Tx DSP regs
-  config_tx_cmd(&def_config);
-}
-
-
-inline static void
-buffer_irq_handler(unsigned irq)
-{
-  //hal_toggle_leds(0x2);
-
-  uint32_t  status = buffer_pool_status->status;
-
-  dbsm_process_status(&dsp_tx_sm, status);
-
-  if (status & BPS_DONE(CPU_TX_BUF)){
-    bp_clear_buf(CPU_TX_BUF);
-  }
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  // Get our clock from the mimo interface
-
-  clocks_enable_test_clk(true,1);
-  clocks_mimo_config(MC_WE_LOCK_TO_MIMO);
-  
-  // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
-  //hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  //hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-
-  putstr("\nserdes_to_dsp\n");
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-  ethernet_init();
-
-
-  // initialize double buffering state machine for ethernet -> DSP Tx
-
-  dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
-	    &dsp_tx_recv_args, &dsp_tx_send_args,
-	    eth_pkt_inspector);
-
-  // program tx registers
-  setup_tx();
-
-  // kick off the state machine
-  dbsm_start(&dsp_tx_sm);
-
-  while(1){
-    buffer_irq_handler(0);
-
-    int pending = pic_regs->pending;	// poll for under or overrun
-
-    if (pending & PIC_UNDERRUN_INT){
-      dbsm_handle_tx_underrun(&dsp_tx_sm);
-      pic_regs->pending = PIC_UNDERRUN_INT;	// clear interrupt
-      putchar('U');
-    }
-  }
-}
-
diff --git a/usrp2/firmware/apps/serdes_txrx.c b/usrp2/firmware/apps/serdes_txrx.c
deleted file mode 100644
index aa4a3f33c..000000000
--- a/usrp2/firmware/apps/serdes_txrx.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common_v2.h"
-#include "memcpy_wa.h"
-#include "clocks.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-#define FW_SETS_SEQNO	1	// define to 0 or 1 (FIXME must be 1 for now)
-
-#if (FW_SETS_SEQNO)
-static int fw_seqno;	// used when f/w is filling in sequence numbers
-#endif
-
-
-/*
- * Full duplex Tx and Rx between serdes and DSP pipelines
- *
- * Buffer 1 is used by the cpu to send frames to the host.
- * Buffers 2 and 3 are used to double-buffer the DSP Rx to serdes flow
- * Buffers 4 and 5 are used to double-buffer the serdes to DSP Tx flow
- */
-//#define CPU_RX_BUF	0	// eth -> cpu
-
-#define	DSP_RX_BUF_0	2	// dsp rx -> serdes (double buffer)
-#define	DSP_RX_BUF_1	3	// dsp rx -> serdes
-#define	DSP_TX_BUF_0	4	// serdes -> dsp tx (double buffer)
-#define	DSP_TX_BUF_1	5	// serdes -> dsp tx
-
-/*
- * ==================================================================
- *   configure DSP TX double buffering state machine (serdes -> dsp)
- * ==================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 2 lines (word0 + timestamp)
-// DSP Tx reads word0 (flags) + timestamp followed by samples
-
-#define DSP_TX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4)
-
-// Receive from serdes
-buf_cmd_args_t dsp_tx_recv_args = {
-  PORT_SERDES,
-  0,
-  BP_LAST_LINE
-};
-
-// send to DSP Tx
-buf_cmd_args_t dsp_tx_send_args = {
-  PORT_DSP,
-  DSP_TX_FIRST_LINE,	// starts just past transport header
-  0			// filled in from last_line register
-};
-
-dbsm_t dsp_tx_sm;	// the state machine
-
-/*
- * =================================================================
- *   configure DSP RX double buffering state machine (dsp -> serdes)
- * =================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 1 line (word0)
-// DSP Rx writes timestamp followed by nlines_per_frame of samples
-#define DSP_RX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4 + 1)
-
-// receive from DSP
-buf_cmd_args_t dsp_rx_recv_args = {
-  PORT_DSP,
-  DSP_RX_FIRST_LINE,
-  BP_LAST_LINE
-};
-
-// send to serdes
-buf_cmd_args_t dsp_rx_send_args = {
-  PORT_SERDES,
-  0,		// starts with ethernet header in line 0
-  0,		// filled in from list_line register
-};
-
-dbsm_t dsp_rx_sm;	// the state machine
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-// variables for streaming mode
-
-static bool         streaming_p = false;
-static unsigned int streaming_items_per_frame = 0;
-static int          streaming_frame_count = 0;
-#define FRAMES_PER_CMD	1000
-
-bool is_streaming(void){ return streaming_p; }
-
-// ----------------------------------------------------------------
-
-
-void
-restart_streaming(void)
-{
-  // setup RX DSP regs
-  dsp_rx_regs->clear_state = 1;			// reset
-
-  streaming_p = true;
-  streaming_frame_count = FRAMES_PER_CMD;
-
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);			// set "chain" bit
-
-  // kick off the state machine
-  dbsm_start(&dsp_rx_sm);
-
-  dsp_rx_regs->rx_time = 0;		// enqueue first of two commands
-
-  // make sure this one and the rest have the "now" and "chain" bits set.
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);
-
-  dsp_rx_regs->rx_time = 0;		// enqueue second command
-}
-
-void
-start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p)
-{
-  host_mac_addr = *host;	// remember who we're sending to
-
-  /*
-   * Construct  ethernet header and word0 and preload into two buffers
-   */
-  u2_eth_packet_t	pkt;
-  memset(&pkt, 0, sizeof(pkt));
-  pkt.ehdr.dst = *host;
-  pkt.ehdr.src = *ethernet_mac_addr();
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-  u2p_set_word0(&pkt.fixed, 0, 0);
-  // DSP RX will fill in timestamp
-
-  memcpy_wa(buffer_ram(DSP_RX_BUF_0), &pkt, sizeof(pkt));
-  memcpy_wa(buffer_ram(DSP_RX_BUF_1), &pkt, sizeof(pkt));
-
-
-  if (FW_SETS_SEQNO)
-    fw_seqno = 0;
-
-  streaming_items_per_frame = p->items_per_frame;
-  restart_streaming();
-}
-
-void start_rx_streaming_at_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p, uint32_t time)
-{}
-void restart_streaming_at(uint32_t time)
-{}
-
-void
-stop_rx_cmd(void)
-{
-  streaming_p = false;
-  dsp_rx_regs->clear_state = 1;	// flush cmd queue
-  bp_clear_buf(DSP_RX_BUF_0);
-  bp_clear_buf(DSP_RX_BUF_1);
-}
-
-
-static void
-setup_tx()
-{
-  dsp_tx_regs->clear_state = 1;
-  bp_clear_buf(DSP_TX_BUF_0);
-  bp_clear_buf(DSP_TX_BUF_1);
-
-  int tx_scale = 256;
-  int interp = 32;
-
-  // setup some defaults
-
-  dsp_tx_regs->freq = 0;
-  dsp_tx_regs->scale_iq = (tx_scale << 16) | tx_scale;
-  dsp_tx_regs->interp_rate = interp;
-}
-
-
-#if (FW_SETS_SEQNO)
-/*
- * Debugging ONLY.  This will be handled by the tx_protocol_engine.
- *
- * This is called when the DSP Rx chain has filled in a packet.
- * We set and increment the seqno, then return false, indicating
- * that we didn't handle the packet.  A bit of a kludge
- * but it should work.
- */
-bool
-fw_sets_seqno_inspector(dbsm_t *sm, int buf_this)	// returns false
-{
-  uint32_t *p = buffer_ram(buf_this);
-  uint32_t seqno = fw_seqno++;
-
-  // KLUDGE all kinds of nasty magic numbers and embedded knowledge
-  uint32_t t = p[4];
-  t = (t & 0xffff00ff) | ((seqno & 0xff) << 8);
-  p[4] = t;
-
-  // queue up another rx command when required
-  if (streaming_p && --streaming_frame_count == 0){
-    streaming_frame_count = FRAMES_PER_CMD;
-    dsp_rx_regs->rx_time = 0;
-  }
-
-  return false;		// we didn't handle the packet
-}
-#endif
-
-
-inline static void
-buffer_irq_handler(unsigned irq)
-{
-  // hal_toggle_leds(LED_A);
-
-  uint32_t  status = buffer_pool_status->status;
-
-  if (0 && (status & ~BPS_IDLE_ALL)){
-    putstr("status = ");
-    puthex32_nl(status);
-  }
-
-  dbsm_process_status(&dsp_tx_sm, status);
-  dbsm_process_status(&dsp_rx_sm, status);
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  output_regs->led_src = 0x3;		// h/w controls bottom two bits
-  clocks_enable_test_clk(true, 1);
-
-  putstr("\nSERDES TxRx\n");
-
-  cpu_tx_buf_dest_port = PORT_SERDES;
-
-  // ethernet_register_link_changed_callback(link_changed_callback);
-  // ethernet_init();
-
-  clocks_mimo_config(MC_WE_LOCK_TO_MIMO);
-
-  // puts("post clocks_mimo_config");
-
-#if 0
-  // make bit 15 of Tx gpio's be a s/w output
-  hal_gpio_set_sel(GPIO_TX_BANK, 15, 's');
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0x8000, 0x8000);
-#endif
-
-#if 0
-  output_regs->debug_mux_ctrl = 1;
-  hal_gpio_set_sels(GPIO_TX_BANK, "0000000000000000");
-  hal_gpio_set_sels(GPIO_RX_BANK, "0000000000000000");
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0xffff, 0xffff);
-  hal_gpio_set_ddr(GPIO_RX_BANK, 0xffff, 0xffff);
-#endif
-
-
-  // initialize double buffering state machine for ethernet -> DSP Tx
-
-  dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
-	    &dsp_tx_recv_args, &dsp_tx_send_args,
-	    eth_pkt_inspector);
-
-
-  //output_regs->flush_icache = 1;
-
-  // initialize double buffering state machine for DSP RX -> Ethernet
-
-  if (FW_SETS_SEQNO){
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      fw_sets_seqno_inspector);
-  }
-  else {
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      dbsm_nop_inspector);
-  }
-
-  // puts("post dbsm_init's");
-
-  // tell app_common that this dbsm could be sending to the ethernet
-  ac_could_be_sending_to_eth = &dsp_rx_sm;
-
-
-  // program tx registers
-  setup_tx();
-
-  // puts("post setup_tx");
-
-  // kick off the state machine
-  dbsm_start(&dsp_tx_sm);
-
-  // puts("post dbsm_start");
-
-  //int which = 0;
-
-  while(1){
-    // hal_gpio_write(GPIO_TX_BANK, which, 0x8000);
-    // which ^= 0x8000;
-
-    buffer_irq_handler(0);
-
-    int pending = pic_regs->pending;		// poll for under or overrun
-
-    if (pending & PIC_UNDERRUN_INT){
-      dbsm_handle_tx_underrun(&dsp_tx_sm);
-      pic_regs->pending = PIC_UNDERRUN_INT;	// clear interrupt
-      putchar('U');
-    }
-
-    if (pending & PIC_OVERRUN_INT){
-      dbsm_handle_rx_overrun(&dsp_rx_sm);
-      pic_regs->pending = PIC_OVERRUN_INT;	// clear pending interrupt
-
-      // FIXME Figure out how to handle this robustly.
-      // Any buffers that are emptying should be allowed to drain...
-
-      if (streaming_p){
-	// restart_streaming();
-	// FIXME report error
-      }
-      else {
-	// FIXME report error
-      }
-      putchar('O');
-    }
-  }
-}
diff --git a/usrp2/firmware/apps/set_hw_rev.c b/usrp2/firmware/apps/set_hw_rev.c
deleted file mode 100644
index d4ac8ff81..000000000
--- a/usrp2/firmware/apps/set_hw_rev.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <u2_init.h>
-#include <nonstdio.h>
-#include <i2c.h>
-#include <usrp2_i2c_addr.h>
-
-#define HW_REV_MAJOR 0
-#define HW_REV_MINOR 3
-
-int
-main(void)
-{
-  u2_init();
-
-  putstr("\nset_hw_rev\n");
-
-  bool ok = true;
-  unsigned char maj = HW_REV_MAJOR;
-  unsigned char min = HW_REV_MINOR;
-  ok = eeprom_write(I2C_ADDR_MBOARD, MBOARD_REV_MSB, &maj, 1);
-  ok &= eeprom_write(I2C_ADDR_MBOARD, MBOARD_REV_LSB, &min, 1);
-
-  if (ok)
-    printf("OK: set h/w rev to %d.%d\n", HW_REV_MAJOR, HW_REV_MINOR);
-  else
-    printf("FAILED to set h/w rev to %d.%d\n", HW_REV_MAJOR, HW_REV_MINOR);
-
-  return 0;
-}
diff --git a/usrp2/firmware/apps/test1.c b/usrp2/firmware/apps/test1.c
deleted file mode 100644
index c3cc3be56..000000000
--- a/usrp2/firmware/apps/test1.c
+++ /dev/null
@@ -1,282 +0,0 @@
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "nonstdio.h"
-
-// Globals
-#define EMPTY 0
-#define FILLING 1
-#define FULL 2
-#define EMPTYING 3
-
-#define PORT 2    // ethernet = 2, serdes = 0
-int dsp_rx_buf, dsp_tx_buf, serdes_rx_buf, serdes_tx_buf;
-int dsp_rx_idle, dsp_tx_idle, serdes_rx_idle, serdes_tx_idle;
-
-int buffer_state[4];
-
-
-void double_buffering(int port);
-
-//
-// We register this in the secondary interrupt vector.
-// It's called on buffer manager interrupts
-//
-void
-buffer_irq_handler(unsigned irq)
-{
-  double_buffering(PORT);
-}
-
-int
-main(void)
-{
-  int i;
-
-  u2_init();
-
-  // Control LEDs
-  output_regs->leds = 0x02;
-
-  // Turn on ADCs
-  output_regs->adc_ctrl = 0x0A;
-
-  // Set up TX Chain
-  dsp_tx_regs->freq = 0;
-  dsp_tx_regs->scale_iq = (1 << 16) | 1;
-  dsp_tx_regs->interp_rate = 8;
-
-  // Set up RX Chain
-  dsp_rx_regs->freq = 0;
-  dsp_rx_regs->scale_iq = (1 << 16) | 1;
-  dsp_rx_regs->decim_rate = 8;
-
-  // Set up buffer control, using only 4 for now
-  for(i=0;i<4;i++) 
-    buffer_state[i] = EMPTY;
-
-  // Set up DSP RX
-  buffer_state[0] = FILLING;
-  serdes_tx_idle = 1;
-  bp_receive_to_buf(0, 1, 1, 10, 509);  // DSP_RX to buffer 0, use 500 lines
-
-  //dsp_rx_regs->run_rx = 1;           // Start DSP_RX
-  putstr("Done DSP RX setup\n");
-
-  // Set up serdes RX
-  buffer_state[2] = FILLING;
-  dsp_tx_idle = 1;
-  bp_receive_to_buf(2, PORT, 1, 5, 504);
-
-  while (buffer_pool_status->status == 0)  // wait for completion of DSP RX
-    ;
-
-  putstr("Done DSP TX setup\n");
-  //dsp_tx_regs->run_tx = 1;
-
-  // register interrupt handler
-  pic_register_handler(IRQ_BUFFER, buffer_irq_handler);
-
-  while (1)
-    ;
-
-  hal_finish();
-  return 1;
-}
-
-void 
-double_buffering(int port) {
-  unsigned int localstatus = buffer_pool_status->status;
-
-  if(localstatus & BPS_DONE_0) {
-    bp_clear_buf(0);
-    if(buffer_state[0] == FILLING) {
-      buffer_state[0] = FULL;
-      if(buffer_state[1] == EMPTY) {
-	bp_receive_to_buf(1, 1, 1, 10, 509);  // DSP_RX to buffer 1, use 500 lines
-	buffer_state[1] = FILLING;
-      }
-      else
-	dsp_rx_idle = 1;
-      if(serdes_tx_idle) {
-	serdes_tx_idle = 0;
-	bp_send_from_buf(0, port, 1, 10, 509);  // SERDES_TX from buffer 0
-	buffer_state[0] = EMPTYING;
-      }
-    }
-    else {  // buffer was emptying
-      buffer_state[0] = EMPTY;
-      if(dsp_rx_idle) {
-	dsp_rx_idle = 0;
-	bp_receive_to_buf(0, 1, 1, 10, 509);  // DSP_RX to buffer 0, use 500 lines
-	buffer_state[0] = FILLING;
-      }
-      if(buffer_state[1] == FULL) {
-	bp_send_from_buf(1, port, 1, 10, 509);  // SERDES_TX from buffer 1
-	buffer_state[1] = EMPTYING;
-      }
-      else
-	serdes_tx_idle = 1;
-    }
-    putstr("Int Proc'ed 0\n");
-  }
-  if(localstatus & BPS_DONE_1) {
-    bp_clear_buf(1);
-    if(buffer_state[1] == FILLING) {
-      buffer_state[1] = FULL;
-      if(buffer_state[0] == EMPTY) {
-	bp_receive_to_buf(0, 1, 1, 10, 509);  // DSP_RX to buffer 1, use 500 lines
-	buffer_state[0] = FILLING;
-      }
-      else
-	dsp_rx_idle = 1;
-      if(serdes_tx_idle) {
-	serdes_tx_idle = 0;
-	bp_send_from_buf(1, port, 1, 10, 509);  // SERDES_TX from buffer 1
-	buffer_state[1] = EMPTYING;
-      }
-    }
-    else {  // buffer was emptying
-      buffer_state[1] = EMPTY;
-      if(dsp_rx_idle) {
-	dsp_rx_idle = 0;
-	bp_receive_to_buf(1, 1, 1, 10, 509);  // DSP_RX to buffer 1, use 500 lines
-	buffer_state[1] = FILLING;
-      }
-      if(buffer_state[0] == FULL) {
-	bp_send_from_buf(0, port, 1, 10, 509);  // SERDES_TX from buffer 0
-	buffer_state[0] = EMPTYING;
-      }
-      else
-	serdes_tx_idle = 1;
-    }
-  putstr("Int Proc'ed 1\n");
-  }
-  if(localstatus & BPS_DONE_2) {
-    bp_clear_buf(2);
-    if(buffer_state[2] == FILLING) {
-      buffer_state[2] = FULL;
-      if(buffer_state[3] == EMPTY) {
-	bp_receive_to_buf(3, port, 1, 5, 504);  // SERDES_RX to buffer 3, use 500 lines
-	buffer_state[3] = FILLING;
-      }
-      else
-	serdes_rx_idle = 1;
-      if(dsp_tx_idle) {
-	dsp_tx_idle = 0;
-	bp_send_from_buf(2, 1, 1, 5, 504);  // DSP_TX from buffer 2
-	buffer_state[2] = EMPTYING;
-      }
-    }
-    else {  // buffer was emptying
-      buffer_state[2] = EMPTY;
-      if(serdes_rx_idle) {
-	serdes_rx_idle = 0;
-	bp_receive_to_buf(2, port, 1, 5, 504);  // SERDES_RX to buffer 2
-	buffer_state[2] = FILLING;
-      }
-      if(buffer_state[3] == FULL) {
-	bp_send_from_buf(3, 1, 1, 5, 504);  // DSP_TX from buffer 3
-	buffer_state[3] = EMPTYING;
-      }
-      else
-	dsp_tx_idle = 1;
-    }
-  putstr("Int Proc'ed 2\n");
-  }
-  if(localstatus & BPS_DONE_3) {
-    bp_clear_buf(3);
-    if(buffer_state[3] == FILLING) {
-      buffer_state[3] = FULL;
-      if(buffer_state[2] == EMPTY) {
-	bp_receive_to_buf(2, port, 1, 5, 504);  // SERDES_RX to buffer 2, use 500 lines
-	buffer_state[2] = FILLING;
-      }
-      else
-	serdes_rx_idle = 1;
-      if(dsp_tx_idle) {
-	dsp_tx_idle = 0;
-	bp_send_from_buf(3, 1, 1, 5, 504);  // DSP_TX from buffer 3
-	buffer_state[3] = EMPTYING;
-      }
-    }
-    else {  // buffer was emptying
-      buffer_state[3] = EMPTY;
-      if(serdes_rx_idle) {
-	serdes_rx_idle = 0;
-	bp_receive_to_buf(3, port, 1, 5, 504);  // SERDES_RX to buffer 3
-	buffer_state[3] = FILLING;
-      }
-      if(buffer_state[2] == FULL) {
-	bp_send_from_buf(2, 1, 1, 5, 504);  // DSP_TX from buffer 2
-	buffer_state[2] = EMPTYING;
-      }
-      else
-	dsp_tx_idle = 1;
-    }
-  putstr("Int Proc'ed 3\n");
-  }
-}
-
-// Spare Code
-
-#if 0  
-  // Set up LSDAC
-  int i = 0;
-  while(1) {
-    int command = (3 << 19) | (0 << 16) |  (i & 0xffff);
-    spi_transact(SPI_TXONLY, SPI_SS_TX_DAC, command, 24, 1); // negate TX phase
-    i++;
-  }
-#endif
-
-#if 0  
-  // Write to buffer 0
-  int *buf = (int *)(BUFFER_BASE + BUFFER_0);
-  puthex_nl((int)buf);
-
-  for(i=0;i<BUFFER_SIZE;i++)
-    buf[i] = i;
-
-  putstr("Filled buffer 0\n");
-
-  // Write to buffer 1
-  buf = (int *)(BUFFER_BASE + BUFFER_1);
-  puthex_nl((int)buf);
-  for(i=0;i<BUFFER_SIZE;i++)
-    buf[i] =  i + ((i^0xFFFF) << 16);
-
-  putstr("Filled buffer 1\n");
-
-#endif
-
-#if 0
-  // rx SERDES into buffer #2  (buf,port,step,fl,ll)
-  bp_receive_to_buf(2, 0, 1, 10, 300);
-  putstr("SERDES RX buffer setup\n");
-
-  // send SERDES from buffer #0 (buf,port,step,fl,ll)
-  bp_send_from_buf(0, 0, 1, 20, 200);
-  putstr("SERDES TX buffer setup\n");
-
-#endif
-
-#if 0
-  // send to DACs from buffer #1
-  bp_send_from_buf(1 /*buf#*/, 1 /*port*/, 1 /*step*/, 20 /*fl*/, 250 /*ll*/);
-  putstr("DAC Buffer setup\n");
-#endif
-
-#if 0
-  //putstr("ENTER INT\n");
-  for(i=0;i<8;i++)
-    if(*status & (1<<i)) {
-      //putstr("Clearing buf ");
-      puthex_nl(i);
-      bp_clear_buf(i);
-    }
-  //putstr("EXIT INT\n");
-#endif
diff --git a/usrp2/firmware/apps/test_db_spi.c b/usrp2/firmware/apps/test_db_spi.c
deleted file mode 100644
index f4fa98ef1..000000000
--- a/usrp2/firmware/apps/test_db_spi.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <u2_init.h>
-#include <nonstdio.h>
-#include <hal_io.h>
-#include <spi.h>
-
-int
-main(void)
-{
-  u2_init();
-
-  puts("\ntest_db_spi");
-
-  while(1){
-    spi_transact(SPI_TXONLY, SPI_SS_RX_DB, 0xCC33, 16, SPIF_PUSH_FALL);
-    spi_transact(SPI_TXONLY, SPI_SS_TX_DB, 0x33CC, 16, SPIF_PUSH_FALL);
-  }
-}
diff --git a/usrp2/firmware/apps/test_i2c.c b/usrp2/firmware/apps/test_i2c.c
deleted file mode 100644
index f349ead88..000000000
--- a/usrp2/firmware/apps/test_i2c.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <u2_init.h>		/* FIXME */
-#include <i2c.h>
-#include <usrp2_i2c_addr.h>
-#include <string.h>
-#include <hal_io.h>
-
-
-
-#define ASSERT_TRUE(x) \
-  do { \
-    if (!(x)){ \
-      printf("ASSERT_TRUE failed on line %d\n", __LINE__); \
-      nerrors++; \
-    } \
-  } while(0)
-
-#define ASSERT_FALSE(x) \
-  do { \
-    if (x){ \
-      printf("ASSERT_FALSE failed on line %d\n", __LINE__); \
-      nerrors++; \
-    } \
-  } while(0)
-
-
-#define BUFSIZE 128
-
-int
-main(void)
-{
-  int i;
-  bool ok;
-  int  nerrors = 0;
-  uint8_t buf[BUFSIZE];
-  int not_dev_addr = 0x35;	// no device with this address on the i2c bus.
-  int offset;
-  int len;
-  
-  u2_init();
-
-  puts("test_i2c\n");
-
-  // try writing a non-existent device
-  buf[0] = 0xA5;
-  ok = i2c_write(not_dev_addr, buf, 1);
-  ASSERT_FALSE(ok);
-
-  // try read from non-existent device
-  buf[0] = 0;
-  ok = i2c_read(not_dev_addr, buf, 1);
-  ASSERT_FALSE(ok);
-
-  // try writing eeprom
-  offset = 31;
-  len = 8;
-  memset(buf, 0, sizeof(buf));
-  for (i = 0; i < len; i++)
-    buf[i] = i;
-  ok = eeprom_write(I2C_ADDR_MBOARD, offset, buf, len);
-  ASSERT_TRUE(ok);
-
-  // now try to read it back
-  offset = 31;
-  len = 8;
-  memset(buf, 0, sizeof(buf));
-  ok = eeprom_read(I2C_ADDR_MBOARD, offset, buf, len);
-  ASSERT_TRUE(ok);
-
-  // check result
-  for (i = 0; i < len; i++){
-    if (buf[i] != i){
-      printf("buf[%d] = %d, should be %d\n", i, buf[i], i);
-      nerrors++;
-    }
-  }
-  
-  if (nerrors == 0){
-    output_regs->leds = 0x3;
-    puts("PASSED\n");
-  }
-  else {
-    output_regs->leds = 0x0;
-    puts("FAILED\n");
-  }
-
-  hal_finish();
-  return 0;
-}
-
diff --git a/usrp2/firmware/apps/test_lsadc.c b/usrp2/firmware/apps/test_lsadc.c
deleted file mode 100644
index 5fda29cd7..000000000
--- a/usrp2/firmware/apps/test_lsadc.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <lsadc.h>
-#include <lsdac.h>
-#include <u2_init.h>
-#include <nonstdio.h>
-#include <hal_io.h>
-
-int
-main(void)
-{
-  u2_init();
-
-  puts("\ntest_lsadc");
-
-  uint32_t r;
-
-  unsigned int up_counter = 0;
-  
-  while (1){
-    unsigned int v;
-    v = up_counter;
-
-    lsdac_write_rx(0, v << 0);
-    lsdac_write_rx(2, v << 1);
-
-#if 1
-    r = lsadc_read_rx(0);
-    lsdac_write_rx(1, r & 0x0fff);
-    //puthex32_nl(r);
-#endif
-
-#if 1
-    r = lsadc_read_rx(1);
-    lsdac_write_rx(3, r & 0x0fff);
-    //puthex32_nl(r);
-#endif
-
-    up_counter++;
-  }
-}
diff --git a/usrp2/firmware/apps/test_lsdac.c b/usrp2/firmware/apps/test_lsdac.c
deleted file mode 100644
index 8c1bf333b..000000000
--- a/usrp2/firmware/apps/test_lsdac.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <lsdac.h>
-#include <u2_init.h>
-#include <nonstdio.h>
-#include <hal_io.h>
-
-int
-main(void)
-{
-  u2_init();
-
-  puts("\ntest_lsdac");
-
-  unsigned int up_counter = 0;
-  unsigned int dn_counter = 0;
-
-  while(1){
-    unsigned int v;
-    v = up_counter;
-    lsdac_write_rx(0, v << 0);
-    lsdac_write_rx(1, v << 1);
-    lsdac_write_rx(2, v << 2);
-    lsdac_write_rx(3, v << 3);
-
-    v = up_counter;
-    lsdac_write_tx(0, v << 0);
-    lsdac_write_tx(1, v << 1);
-    lsdac_write_tx(2, v << 2);
-    lsdac_write_tx(3, v << 3);
-
-    up_counter++;
-    dn_counter--;
-  }
-}
diff --git a/usrp2/firmware/apps/test_phy_comm.c b/usrp2/firmware/apps/test_phy_comm.c
deleted file mode 100644
index 7242c6fc8..000000000
--- a/usrp2/firmware/apps/test_phy_comm.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// check communication with ethernet PHY chip
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "hal_io.h"
-#include "ethernet.h"
-#include "pic.h"
-#include "nonstdio.h"
-
-
-#define DELTA_T     12500000  		// .125s (10ns per tick)
-//#define DELTA_T      10000
-
-// debugging output on tx pins
-#define LS_MASK  0xE0000
-#define LS_1000  0x80000
-#define LS_100   0x40000
-#define LS_10    0x20000
-
-
-
-#define U2_ETHERTYPE 0xBEEF
-
-
-static volatile int led_link_up_flag = 0;
-
-/*
- * Called when eth phy state changes (w/ interrupts disabled)
- */
-void
-link_changed_callback(int speed)
-{
-  int v = 0;
-  switch(speed){
-  case 10:
-    v = LS_10;
-    led_link_up_flag = 0x2;
-    break;
-    
-  case 100:
-    v = LS_100;
-    led_link_up_flag = 0x2;
-    break;
-    
-  case 1000:
-    v = LS_100;
-    led_link_up_flag = 0x2;
-    break;
-
-  default:
-    v = 0;
-    led_link_up_flag = 0;
-    break;
-  }
-
-  //hal_gpio_set_tx(v, LS_MASK);	/* set debug bits on d'board */
-
-  putstr("\neth link changed: speed = ");
-  puthex_nl(speed);
-}
-
-void
-timer_handler(unsigned irq)
-{
-  static int led_counter = 0;
-
-  hal_set_timeout(DELTA_T);	// schedule next timeout
-  output_regs->leds = (led_counter++ & 0x1) | led_link_up_flag;
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  putstr("\n test_phy_comm\n");
-
-  pic_register_handler(IRQ_TIMER, timer_handler);
-  hal_set_timeout(DELTA_T);	// schedule timeout
-
-  // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
-  //hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  //hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-
-  output_regs->phy_ctrl = 1;	/* reset the eth PHY */
-  output_regs->phy_ctrl = 0;
-
-  ethernet_init();
-
-  while(1)
-    ;
-
-  return 0;
-}
diff --git a/usrp2/firmware/apps/test_ram.c b/usrp2/firmware/apps/test_ram.c
deleted file mode 100644
index 77ee693f6..000000000
--- a/usrp2/firmware/apps/test_ram.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <u2_init.h>		/* FIXME */
-#include <sd.h>
-#include <string.h>
-#include <hal_io.h>
-#include <nonstdio.h>
-#include <hal_uart.h>
-
-#define ASSERT_TRUE(x) \
-  do { \
-    if (!(x)){ \
-      printf("ASSERT_TRUE failed on line %d\n", __LINE__); \
-      nerrors++; \
-    } \
-  } while(0)
-
-#define ASSERT_FALSE(x) \
-  do { \
-    if (x){ \
-      printf("ASSERT_FALSE failed on line %d\n", __LINE__); \
-      nerrors++; \
-    } \
-  } while(0)
-
-
-#define BUFSIZE 128
-
-int test_ram()
-{
-  int i,j,k;
-  output_regs->ram_page = 1<<10;
-  
-  extram[0] = 0xDEADBEEF;
-  extram[1] = 0xF00D1234;
-  extram[7] = 0x76543210;
-  
-  output_regs->ram_page = 2<<10;
-  extram[7] = 0x55555555;
-  extram[1] = 0xaaaaaaaa;
-  extram[0] = 0xeeeeeeee;
-  
-  output_regs->ram_page = 1<<10;
-  
-  i = extram[0];
-  k = extram[1];
-  j = extram[7];
-  
-  if((i != 0xDEADBEEF)||(j!=0x76543210)||(k!=0xF00D1234)) {
-    puts("RAM FAIL1!\n");
-    puthex32_nl(i);
-    puthex32_nl(j);
-    puthex32_nl(k);
-    return 0;
-  }
-  
-  output_regs->ram_page = 2<<10;
-
-  j = extram[7];
-  k = extram[1];
-  i = extram[0];
-
-  if((i != 0xeeeeeeee)||(j!=0x55555555)||(k!=0xaaaaaaaa)) {
-    puts("RAM FAIL2!\n");
-    puthex32_nl(i);
-    puthex32_nl(j);
-    puthex32_nl(k);
-    return 0;
-  }
-  return 1;
-}
-
-int
-main(void)
-{
-
-  u2_init();
-  puts("\ntest_ram\n");
-  int success = test_ram();
-  if(success)
-    puts("RAM Passed Tests\n");
-  else
-    puts("RAM Failed\n");
-
-  hal_finish();
-  return 0;
-}
-
diff --git a/usrp2/firmware/apps/test_sd.c b/usrp2/firmware/apps/test_sd.c
deleted file mode 100644
index 494432d7f..000000000
--- a/usrp2/firmware/apps/test_sd.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <u2_init.h>		/* FIXME */
-#include <sd.h>
-#include <string.h>
-#include <hal_io.h>
-#include <nonstdio.h>
-
-
-#define ASSERT_TRUE(x) \
-  do { \
-    if (!(x)){ \
-      printf("ASSERT_TRUE failed on line %d\n", __LINE__); \
-      nerrors++; \
-    } \
-  } while(0)
-
-#define ASSERT_FALSE(x) \
-  do { \
-    if (x){ \
-      printf("ASSERT_FALSE failed on line %d\n", __LINE__); \
-      nerrors++; \
-    } \
-  } while(0)
-
-
-#define BUFSIZE 128
-
-int
-main(void)
-{
-  int i;
-  unsigned char buf[512];
-
-  u2_init();
-
-  puts("\ntest_sd\n");
-  
-
-  i = sd_init();
-  if(i)
-    puts("Successfully Init'ed Card\n");
-  else
-    puts("FAILED INIT of Card\n");
-
-  i = sd_read_block(2048,buf);
-  if(i) {
-    puts("READ Command accepted\n");
-    for(i=0;i<512;i++)
-      if((i&15) == 15)
-	puthex8_nl(buf[i]);
-      else {
-	puthex8(buf[i]);
-	putchar(' ');
-      }
-  }
-  else
-    puts("READ Command Rejected\n");
-  
-  puts("Done");
-  hal_finish();
-  return 0;
-}
-
diff --git a/usrp2/firmware/apps/timer_test.c b/usrp2/firmware/apps/timer_test.c
deleted file mode 100644
index 7c1e46440..000000000
--- a/usrp2/firmware/apps/timer_test.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "nonstdio.h"
-
-
-#define DELTA_T  500  		// 5 us (10ns per tick)
-
-
-void 
-timer_handler(unsigned irq)
-{
-  int t = timer_regs->time;
-  timer_regs->time = t + DELTA_T;
-
-  putstr("Tick: ");
-  puthex_nl(t);
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  // setup timer
-
-  putstr("Setting up timer\n");
-  pic_register_handler(IRQ_TIMER, timer_handler);
-
-  int t = timer_regs->time;
-  timer_regs->time = t + DELTA_T;
-
-  while (1)
-    ;
-
-  putstr("Done Testing\n");
-  
-  hal_finish();
-  return 1;
-}
diff --git a/usrp2/firmware/apps/tx_standalone.c b/usrp2/firmware/apps/tx_standalone.c
deleted file mode 100644
index 6350a6956..000000000
--- a/usrp2/firmware/apps/tx_standalone.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "memcpy_wa.h"
-#include "dbsm.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define	_AL4 __attribute__((aligned (4)))
-
-#define USE_BUFFER_INTERRUPT	0	// 0 or 1
-
-
-static int timer_delta = MASTER_CLK_RATE/1000;	// tick at 1kHz
-
-/*
- * This program can respond to queries from the host
- * and stream rx samples.
- *
- * Buffer 1 is used by the cpu to send frames to the host.
- * Buffers 2 and 3 are used to double-buffer the DSP Rx to eth flow
- * Buffers 4 and 5 are used to double-buffer the eth to DSP Tx  eth flow
- */
-//#define CPU_RX_BUF	0	// eth -> cpu
-#define CPU_TX_BUF 	1	// cpu -> eth
-
-#define	DSP_RX_BUF_0	2	// dsp rx -> eth (double buffer)
-#define	DSP_RX_BUF_1	3	// dsp rx -> eth
-#define	DSP_TX_BUF_0	4	// eth -> dsp tx (double buffer)
-#define	DSP_TX_BUF_1	5	// eth -> dsp tx
-
-
-/*
- * ================================================================
- *      configure DSP RX double buffering state machine
- * ================================================================
- */
-
-
-// 4 lines of ethernet hdr + 1 line (word0)
-// DSP Rx writes timestamp followed by nlines_per_frame of samples
-#define DSP_RX_FIRST_LINE		  5
-#define DSP_RX_SAMPLES_PER_FRAME	128
-#define	DSP_RX_EXTRA_LINES		  1	// writes timestamp
-
-// Receive from DSP Rx
-buf_cmd_args_t dsp_rx_recv_args = {
-  PORT_DSP,
-  DSP_RX_FIRST_LINE,
-  BP_LAST_LINE
-};
-
-// send to ethernet
-buf_cmd_args_t dsp_rx_send_args = {
-  PORT_ETH,
-  0,		// starts with ethernet header in line 0
-  0,		// filled in from last_line register
-};
-
-dbsm_t dsp_rx_sm;	// the state machine
-
-/*
- * ================================================================
- *      configure DSP TX double buffering state machine
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 2 lines (word0 + timestamp)
-// DSP Tx reads word0 (flags) + timestamp followed by samples
-
-#define DSP_TX_FIRST_LINE		  4
-#define DSP_TX_SAMPLES_PER_FRAME	250	// not used except w/ debugging
-#define	DSP_TX_EXTRA_LINES		  2	// reads word0 + timestamp
-
-// Receive from ethernet
-buf_cmd_args_t dsp_tx_recv_args = {
-  PORT_ETH,
-  0,
-  BP_LAST_LINE
-};
-
-// send to DSP Tx
-buf_cmd_args_t dsp_tx_send_args = {
-  PORT_DSP,
-  DSP_TX_FIRST_LINE,	// starts just past ethernet header
-  0			// filled in from last_line register
-};
-
-dbsm_t dsp_tx_sm;	// the state machine
-
-/*
- * send constant buffer to DSP TX
- */
-static inline void 
-SEND_CONST_TO_DSP_TX(void)
-{
-  bp_send_from_buf(DSP_TX_BUF_0, PORT_DSP, 1,
-		   DSP_TX_FIRST_LINE,
-		   DSP_TX_FIRST_LINE + DSP_TX_EXTRA_LINES + DSP_TX_SAMPLES_PER_FRAME - 1);
-}
-
-// ----------------------------------------------------------------
-
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-void link_changed_callback(int speed);
-static volatile bool link_is_up = false;	// eth handler sets this
-
-
-void
-timer_irq_handler(unsigned irq)
-{
-  hal_set_timeout(timer_delta);	// schedule next timeout
-}
-
-// Tx DSP underrun
-void
-underrun_irq_handler(unsigned irq)
-{
-  dsp_tx_regs->clear_state = 1;
-  bp_clear_buf(DSP_TX_BUF_0);
-  bp_clear_buf(DSP_TX_BUF_1);
-  dbsm_stop(&dsp_tx_sm);
-
-  // FIXME anything else?
-
-  putstr("\nirq: underrun\n");
-}
-
-// Rx DSP overrun
-void
-overrun_irq_handler(unsigned irq)
-{
-  dsp_rx_regs->clear_state = 1;
-  bp_clear_buf(DSP_RX_BUF_0);
-  bp_clear_buf(DSP_RX_BUF_1);
-  dbsm_stop(&dsp_rx_sm);
-
-  // FIXME anything else?
-
-  putstr("\nirq: overrun\n");
-}
-
-static void
-start_tx_transfers(void)
-{
-  bp_clear_buf(DSP_TX_BUF_0);	// FIXME, really goes in state machine
-  bp_clear_buf(DSP_TX_BUF_1);
-
-  // fill everything with a constant 32k + 0j
-
-  uint32_t const_sample = (32000 << 16) | 0;
-  int i;
-  for (i = 0; i < BP_NLINES; i++){
-    buffer_ram(DSP_TX_BUF_0)[i] = const_sample;
-    buffer_ram(DSP_TX_BUF_1)[i] = const_sample;
-  }
-
-  /*
-   * Construct  ethernet header and word0 and preload into two buffers
-   */
-  u2_eth_packet_t	pkt;
-  memset(&pkt, 0, sizeof(pkt));
-  //pkt.ehdr.dst = *host;
-  pkt.ehdr.src = *ethernet_mac_addr();
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-  u2p_set_word0(&pkt.fixed,
-		U2P_TX_IMMEDIATE | U2P_TX_START_OF_BURST, 0);
-  u2p_set_timestamp(&pkt.fixed, T_NOW);
-
-  memcpy_wa(buffer_ram(DSP_TX_BUF_0), &pkt, sizeof(pkt));
-  memcpy_wa(buffer_ram(DSP_TX_BUF_1), &pkt, sizeof(pkt));
-
-
-  int tx_scale = 256;
-
-  // setup Tx DSP regs
-  dsp_tx_regs->clear_state = 1;			// reset
-  dsp_tx_regs->freq = 408021893;		// 9.5 MHz [2**32 * fc/fsample]
-  dsp_tx_regs->scale_iq = (tx_scale << 16) | tx_scale;
-  dsp_tx_regs->interp_rate = 32;
-
-  // kick off the state machine
-  // dbsm_start(&dsp_rx_sm);
-
-  SEND_CONST_TO_DSP_TX();	// send constant buffer to DSP TX
-}
-
-
-void
-buffer_irq_handler(unsigned irq)
-{
-  uint32_t  status = buffer_pool_status->status;
-
-  if (0){
-    putstr("irq: ");
-    puthex32(status);
-    putchar('\n');
-  }
-
-  if (status & BPS_ERROR_ALL){
-    // FIXME rare path, handle error conditions
-  }
-
-  if (status & BPS_DONE(DSP_TX_BUF_0)){
-    bp_clear_buf(DSP_TX_BUF_0);
-    SEND_CONST_TO_DSP_TX();
-    hal_toggle_leds(0x1);
-  }
-
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  // setup tx gpio bits for GPIOM_FPGA_1 -- fpga debug output
-  //hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  //hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-
-  putstr("\ntx_only\n");
-  
-  // Control LEDs
-  hal_set_leds(0x0, 0x3);
-
-  if (USE_BUFFER_INTERRUPT)
-    pic_register_handler(IRQ_BUFFER,   buffer_irq_handler);
-
-  pic_register_handler(IRQ_OVERRUN,  overrun_irq_handler);
-  pic_register_handler(IRQ_UNDERRUN, underrun_irq_handler);
-
-  //pic_register_handler(IRQ_TIMER, timer_irq_handler);
-  //hal_set_timeout(timer_delta);
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-
-  ethernet_init();
-
-  // initialize double buffering state machine for DSP RX -> Ethernet
-  dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	    &dsp_rx_recv_args, &dsp_rx_send_args,
-	    dbsm_nop_inspector);
-
-  // setup receive from ETH
-  // bp_receive_to_buf(CPU_RX_BUF, PORT_ETH, 1, 0, BP_LAST_LINE);
-
-#if 0
-  if (hwconfig_simulation_p()){
-    // If we're simulating, pretend that we got a start command from the host
-    u2_mac_addr_t host = {{ 0x00, 0x0A, 0xE4, 0x3E, 0xD2, 0xD5 }};
-    start_rx_cmd(&host);
-  }
-#endif
-
-  start_tx_transfers();		// send constant buffers to DSP TX
-
-  while(1){
-    if (!USE_BUFFER_INTERRUPT)
-      buffer_irq_handler(0);
-  }
-}
-
-// ----------------------------------------------------------------
-
-// debugging output on tx pins
-#define LS_MASK  0xE0000
-#define LS_1000  0x80000
-#define LS_100   0x40000
-#define LS_10    0x20000
-
-/*
- * Called when eth phy state changes (w/ interrupts disabled)
- */
-void
-link_changed_callback(int speed)
-{
-  int v = 0;
-  switch(speed){
-  case 10:
-    v = LS_10;
-    link_is_up = true;
-    break;
-    
-  case 100:
-    v = LS_100;
-    link_is_up = true;
-    break;
-    
-  case 1000:
-    v = LS_100;
-    link_is_up = true;
-    break;
-
-  default:
-    v = 0;
-    link_is_up = false;
-    break;
-  }
-
-  //hal_gpio_set_tx(v, LS_MASK);	/* set debug bits on d'board */
-
-  // hal_set_leds(link_is_up ? 0x2 : 0x0, 0x2);
-
-  printf("\neth link changed: speed = %d\n", speed);
-}
diff --git a/usrp2/firmware/apps/txrx.c b/usrp2/firmware/apps/txrx.c
deleted file mode 100644
index 975f314bd..000000000
--- a/usrp2/firmware/apps/txrx.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "hal_io.h"
-#include "buffer_pool.h"
-#include "pic.h"
-#include "bool.h"
-#include "ethernet.h"
-#include "nonstdio.h"
-#include "usrp2_eth_packet.h"
-#include "dbsm.h"
-#include "app_common_v2.h"
-#include "memcpy_wa.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include "clocks.h"
-
-#define FW_SETS_SEQNO	1	// define to 0 or 1 (FIXME must be 1 for now)
-
-#if (FW_SETS_SEQNO)
-static int fw_seqno;	// used when f/w is filling in sequence numbers
-#endif
-
-
-/*
- * Full duplex Tx and Rx between ethernet and DSP pipelines
- *
- * Buffer 1 is used by the cpu to send frames to the host.
- * Buffers 2 and 3 are used to double-buffer the DSP Rx to eth flow
- * Buffers 4 and 5 are used to double-buffer the eth to DSP Tx  eth flow
- */
-//#define CPU_RX_BUF	0	// eth -> cpu
-
-#define	DSP_RX_BUF_0	2	// dsp rx -> eth (double buffer)
-#define	DSP_RX_BUF_1	3	// dsp rx -> eth
-#define	DSP_TX_BUF_0	4	// eth -> dsp tx (double buffer)
-#define	DSP_TX_BUF_1	5	// eth -> dsp tx
-
-/*
- * ================================================================
- *   configure DSP TX double buffering state machine (eth -> dsp)
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 2 lines (word0 + timestamp)
-// DSP Tx reads word0 (flags) + timestamp followed by samples
-
-#define DSP_TX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4)
-
-// Receive from ethernet
-buf_cmd_args_t dsp_tx_recv_args = {
-  PORT_ETH,
-  0,
-  BP_LAST_LINE
-};
-
-// send to DSP Tx
-buf_cmd_args_t dsp_tx_send_args = {
-  PORT_DSP,
-  DSP_TX_FIRST_LINE,	// starts just past transport header
-  0			// filled in from last_line register
-};
-
-dbsm_t dsp_tx_sm;	// the state machine
-
-/*
- * ================================================================
- *   configure DSP RX double buffering state machine (dsp -> eth)
- * ================================================================
- */
-
-// 4 lines of ethernet hdr + 1 line transport hdr + 1 line (word0)
-// DSP Rx writes timestamp followed by nlines_per_frame of samples
-#define DSP_RX_FIRST_LINE ((sizeof(u2_eth_hdr_t) + sizeof(u2_transport_hdr_t))/4 + 1)
-
-// receive from DSP
-buf_cmd_args_t dsp_rx_recv_args = {
-  PORT_DSP,
-  DSP_RX_FIRST_LINE,
-  BP_LAST_LINE
-};
-
-// send to ETH
-buf_cmd_args_t dsp_rx_send_args = {
-  PORT_ETH,
-  0,		// starts with ethernet header in line 0
-  0,		// filled in from list_line register
-};
-
-dbsm_t dsp_rx_sm;	// the state machine
-
-
-// The mac address of the host we're sending to.
-u2_mac_addr_t host_mac_addr;
-
-
-// variables for streaming mode
-
-static bool         streaming_p = false;
-static unsigned int streaming_items_per_frame = 0;
-static int          streaming_frame_count = 0;
-#define FRAMES_PER_CMD	1000
-
-bool is_streaming(void){ return streaming_p; }
-
-
-// ----------------------------------------------------------------
-
-
-void
-restart_streaming(void)
-{
-  // setup RX DSP regs
-  dsp_rx_regs->clear_state = 1;			// reset
-
-  streaming_p = true;
-  streaming_frame_count = FRAMES_PER_CMD;
-
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);			// set "chain" bit
-
-  // kick off the state machine
-  dbsm_start(&dsp_rx_sm);
-
-  dsp_rx_regs->rx_time = 0;		// enqueue first of two commands
-
-  // make sure this one and the rest have the "now" and "chain" bits set.
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);
-
-  dsp_rx_regs->rx_time = 0;		// enqueue second command
-}
-
-void
-restart_streaming_at(uint32_t time)
-{
-  // setup RX DSP regs
-  dsp_rx_regs->clear_state = 1;			// reset
-
-  streaming_p = true;
-  streaming_frame_count = FRAMES_PER_CMD;
-
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      0, 1);			// set "chain" bit
-
-  // kick off the state machine
-  dbsm_start(&dsp_rx_sm);
-
-  dsp_rx_regs->rx_time = time;		// enqueue first of two commands
-
-  // make sure this one and the rest have the "now" and "chain" bits set.
-  dsp_rx_regs->rx_command =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-	      streaming_items_per_frame,
-	      1, 1);
-
-  dsp_rx_regs->rx_time = 0;		// enqueue second command
-}
-
-void
-start_rx_streaming_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p)
-{
-  host_mac_addr = *host;	// remember who we're sending to
-
-  /*
-   * Construct  ethernet header and word0 and preload into two buffers
-   */
-  u2_eth_packet_t	pkt;
-  memset(&pkt, 0, sizeof(pkt));
-  pkt.ehdr.dst = *host;
-  pkt.ehdr.src = *ethernet_mac_addr();
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-  u2p_set_word0(&pkt.fixed, 0, 0);
-  // DSP RX will fill in timestamp
-
-  memcpy_wa(buffer_ram(DSP_RX_BUF_0), &pkt, sizeof(pkt));
-  memcpy_wa(buffer_ram(DSP_RX_BUF_1), &pkt, sizeof(pkt));
-
-
-  if (FW_SETS_SEQNO)
-    fw_seqno = 0;
-
-  streaming_items_per_frame = p->items_per_frame;
-  restart_streaming();
-}
-
-void
-start_rx_streaming_at_cmd(const u2_mac_addr_t *host, op_start_rx_streaming_t *p, uint32_t time)
-{
-  host_mac_addr = *host;	// remember who we're sending to
-
-  /*
-   * Construct  ethernet header and word0 and preload into two buffers
-   */
-  u2_eth_packet_t	pkt;
-  memset(&pkt, 0, sizeof(pkt));
-  pkt.ehdr.dst = *host;
-  pkt.ehdr.src = *ethernet_mac_addr();
-  pkt.ehdr.ethertype = U2_ETHERTYPE;
-  u2p_set_word0(&pkt.fixed, 0, 0);
-  // DSP RX will fill in timestamp
-
-  memcpy_wa(buffer_ram(DSP_RX_BUF_0), &pkt, sizeof(pkt));
-  memcpy_wa(buffer_ram(DSP_RX_BUF_1), &pkt, sizeof(pkt));
-
-
-  if (FW_SETS_SEQNO)
-    fw_seqno = 0;
-
-  streaming_items_per_frame = p->items_per_frame;
-  restart_streaming_at(time);
-}
-
-
-void
-stop_rx_cmd(void)
-{
-  streaming_p = false;
-  dsp_rx_regs->clear_state = 1;	// flush cmd queue
-  bp_clear_buf(DSP_RX_BUF_0);
-  bp_clear_buf(DSP_RX_BUF_1);
-}
-
-
-static void
-setup_tx()
-{
-  dsp_tx_regs->clear_state = 1;
-  bp_clear_buf(DSP_TX_BUF_0);
-  bp_clear_buf(DSP_TX_BUF_1);
-
-  int tx_scale = 256;
-  int interp = 32;
-
-  // setup some defaults
-
-  dsp_tx_regs->freq = 0;
-  dsp_tx_regs->scale_iq = (tx_scale << 16) | tx_scale;
-  dsp_tx_regs->interp_rate = interp;
-}
-
-
-#if (FW_SETS_SEQNO)
-/*
- * Debugging ONLY.  This will be handled by the tx_protocol_engine.
- *
- * This is called when the DSP Rx chain has filled in a packet.
- * We set and increment the seqno, then return false, indicating
- * that we didn't handle the packet.  A bit of a kludge
- * but it should work.
- */
-bool
-fw_sets_seqno_inspector(dbsm_t *sm, int buf_this)	// returns false
-{
-  uint32_t *p = buffer_ram(buf_this);
-  uint32_t seqno = fw_seqno++;
-
-  // KLUDGE all kinds of nasty magic numbers and embedded knowledge
-  uint32_t t = p[4];
-  t = (t & 0xffff00ff) | ((seqno & 0xff) << 8);
-  p[4] = t;
-
-  // queue up another rx command when required
-  if (streaming_p && --streaming_frame_count == 0){
-    streaming_frame_count = FRAMES_PER_CMD;
-    dsp_rx_regs->rx_time = 0;
-  }
-
-  return false;		// we didn't handle the packet
-}
-#endif
-
-
-inline static void
-buffer_irq_handler(unsigned irq)
-{
-  uint32_t  status = buffer_pool_status->status;
-
-  dbsm_process_status(&dsp_tx_sm, status);
-  dbsm_process_status(&dsp_rx_sm, status);
-}
-
-int
-main(void)
-{
-  u2_init();
-
-  putstr("\nTxRx-NEWETH\n");
-  print_mac_addr(ethernet_mac_addr()->addr);
-  newline();
-
-  ethernet_register_link_changed_callback(link_changed_callback);
-  ethernet_init();
-
-#if 0
-  // make bit 15 of Tx gpio's be a s/w output
-  hal_gpio_set_sel(GPIO_TX_BANK, 15, 's');
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0x8000, 0x8000);
-#endif
-
-  output_regs->debug_mux_ctrl = 1;
-#if 0
-  hal_gpio_set_sels(GPIO_TX_BANK, "1111111111111111");
-  hal_gpio_set_sels(GPIO_RX_BANK, "1111111111111111");
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0xffff, 0xffff);
-  hal_gpio_set_ddr(GPIO_RX_BANK, 0xffff, 0xffff);
-#endif
-
-
-  // initialize double buffering state machine for ethernet -> DSP Tx
-
-  dbsm_init(&dsp_tx_sm, DSP_TX_BUF_0,
-	    &dsp_tx_recv_args, &dsp_tx_send_args,
-	    eth_pkt_inspector);
-
-
-  // initialize double buffering state machine for DSP RX -> Ethernet
-
-  if (FW_SETS_SEQNO){
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      fw_sets_seqno_inspector);
-  }
-  else {
-    dbsm_init(&dsp_rx_sm, DSP_RX_BUF_0,
-	      &dsp_rx_recv_args, &dsp_rx_send_args,
-	      dbsm_nop_inspector);
-  }
-
-  // tell app_common that this dbsm could be sending to the ethernet
-  ac_could_be_sending_to_eth = &dsp_rx_sm;
-
-
-  // program tx registers
-  setup_tx();
-
-  // kick off the state machine
-  dbsm_start(&dsp_tx_sm);
-
-  //int which = 0;
-
-  while(1){
-    // hal_gpio_write(GPIO_TX_BANK, which, 0x8000);
-    // which ^= 0x8000;
-
-    buffer_irq_handler(0);
-
-    int pending = pic_regs->pending;		// poll for under or overrun
-
-    if (pending & PIC_UNDERRUN_INT){
-      dbsm_handle_tx_underrun(&dsp_tx_sm);
-      pic_regs->pending = PIC_UNDERRUN_INT;	// clear interrupt
-      putchar('U');
-    }
-
-    if (pending & PIC_OVERRUN_INT){
-      dbsm_handle_rx_overrun(&dsp_rx_sm);
-      pic_regs->pending = PIC_OVERRUN_INT;	// clear pending interrupt
-
-      // FIXME Figure out how to handle this robustly.
-      // Any buffers that are emptying should be allowed to drain...
-
-      if (streaming_p){
-	// restart_streaming();
-	// FIXME report error
-      }
-      else {
-	// FIXME report error
-      }
-      putchar('O');
-    }
-  }
-}
diff --git a/usrp2/firmware/bootstrap b/usrp2/firmware/bootstrap
deleted file mode 100755
index 4106d4746..000000000
--- a/usrp2/firmware/bootstrap
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# Copyright 2001,2005 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.
-
-
-rm -fr config.cache autom4te*.cache
-
-aclocal -I config
-autoconf
-autoheader
-# libtoolize --automake
-automake --add-missing -Wno-portability
-
diff --git a/usrp2/firmware/config.guess b/usrp2/firmware/config.guess
deleted file mode 100644
index 278f9e9e0..000000000
--- a/usrp2/firmware/config.guess
+++ /dev/null
@@ -1,1516 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2007-07-22'
-
-# This file 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 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa:Linux:*:*)
-    	echo xtensa-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/usrp2/firmware/config.sub b/usrp2/firmware/config.sub
deleted file mode 100644
index 1761d8bdf..000000000
--- a/usrp2/firmware/config.sub
+++ /dev/null
@@ -1,1626 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2007-06-28'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file 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 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/usrp2/firmware/config/.gitignore b/usrp2/firmware/config/.gitignore
deleted file mode 100644
index b11bb113a..000000000
--- a/usrp2/firmware/config/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-/configure
-/Makefile.in
-/config.log
-/config.h
-/ltmain.sh
-/Makefile
-/config.status
-/stamp-h1
-/config.h.in
-/autom4te.cache
-/libtool
-/missing
-/aclocal.m4
-/install-sh
-/depcomp
-/py-compile
-/compile
-/build
-/run_tests.sh
-/*-stamp
diff --git a/usrp2/firmware/config/Makefile.am b/usrp2/firmware/config/Makefile.am
deleted file mode 100644
index 06b15c68a..000000000
--- a/usrp2/firmware/config/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright 2008 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-# Install m4 macros in this directory
-m4datadir = $(datadir)/aclocal
-
-# List your m4 macros here
-m4macros = \
-	grc_build.m4 \
-	grc_usrp2_stub.m4 \
-	grc_usrp2_firmware.m4
-
-EXTRA_DIST = $(m4macros) 
diff --git a/usrp2/firmware/config/grc_build.m4 b/usrp2/firmware/config/grc_build.m4
deleted file mode 100644
index bf33d0da2..000000000
--- a/usrp2/firmware/config/grc_build.m4
+++ /dev/null
@@ -1,287 +0,0 @@
-dnl Copyright 2006,2008 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.
-
-dnl Create --enable-foo argument for named component, create variables as needed
-dnl $1 is component name
-AC_DEFUN([GRC_ENABLE], [
-    _GRC_ENABLE($1,m4_bpatsubst($1,-,_))
-])
-dnl $2 is the '_'d component name
-dnl on exit variable enable_$2 will be set to [yes|no];
-dnl         passed will be [yes|no] (same as enable_$2)
-
-AC_DEFUN([_GRC_ENABLE],[
-    passed=yes
-    AC_ARG_ENABLE([$1],
-		  AC_HELP_STRING([--enable-$1],
-				 [Stop if $1 fails configuration]),
-		  [],[
-        [enable_]$2=$enable_all_components
-        if test x$enable_all_components = xno; then
-            passed=no
-        fi
-    ])
-])
-dnl Component specific configuration
-dnl The order of the GR_ macros determines the order of compilation
-dnl For -any- checks on $enable_all_components
-dnl use the following guildlines:
-dnl   yes : --enable-all-components was specified, so error out if any
-dnl         components do not pass configuration checks.
-dnl   no  : --disable-all-components was specified, so try to build the
-dnl         --enable'd components, and error out if any do not pass
-dnl         configuration checks.
-dnl   ""  : this option was not specified on the command line; try to
-dnl         build all components that are not --with'd, but don't
-dnl         error out if any component does not pass configuration checks.
-dnl
-dnl For each --enable-foo component, if that flag is not specified on
-dnl the command line, the related variable $enable_foo will be set to
-dnl $enable_all_components .
-
-dnl Create --with-foo argument for named compoment, create variables as needed
-dnl $1 is component name
-dnl $2 is what to do on success
-dnl $3 is the PKG_CONFIG name; if not given, then $1
-AC_DEFUN([GRC_WITH], [
-    if test [x]$3 = x; then
-        pc_comp_name="$1"
-    else
-        pc_comp_name="$3"
-    fi
-    _GRC_WITH($1,[$2],${pc_comp_name},m4_bpatsubst($1,-,_))
-])
-dnl $3 is the pkg-config component name
-dnl $4 is the '_'d component name
-dnl on exit variable passed will be [yes|no|with]:
-dnl   yes: if --enable-$1 and/or --enable-all-components was specified,
-dnl        but --with was not;
-dnl   with: if --with-$1 was specified, and passed checks;
-dnl   no: all other conditions
-AC_DEFUN([_GRC_WITH],[
-    AC_ARG_WITH([$1],
-	        AC_HELP_STRING([--with-$1@<:@=PATH@:>@],
-	 		       [Use package $1 if installed in PATH (if specified) or PKG_CONFIG_PATH (if PATH not specified); stop if $1 not found]),
-                [if test "x$withval" != "xyes"; then
-		    [with_]$4[_val]=$withval
-		    [with_]$4=yes
-		 fi],
-	        [])
-    if test x$[with_]$4 = xyes; then
-        if test x$[enable_]$4 = xyes; then
-	    AC_MSG_ERROR([Component $1: Cannot use both --enable and --with])
-        else
-	    _GRC_WITH_PKG_CONFIG_CHECK($1,$3,$4)
-	    ifelse([$2], , :, [$2])
-        fi
-    fi
-])
-
-dnl Use 'pkgconfig' to check for a package
-dnl $1 is the --with component name
-dnl $2 is the pkg-config component name, if provided; otherwise use $1 for this
-dnl on success, resulting INCLUDES, INCLUDEDIR, LA, and LIBDIRPATH variables
-dnl will be set; on failure, will exit with an error.
-AC_DEFUN([GRC_WITH_PKG_CONFIG_CHECK], [
-    if test [x]$2 = x; then
-        pc_comp_name="$1"
-    else
-        pc_comp_name="$2"
-    fi
-    _GRC_WITH_PKG_CONFIG_CHECK($1,${pc_comp_name},m4_bpatsubst($1,-,_))
-])
-dnl $2 is the pkg-config component name
-dnl $3 is the '_'d component name
-AC_DEFUN([_GRC_WITH_PKG_CONFIG_CHECK],[
-    dnl save PKG_CONFIG_PATH, restore at the end
-    s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-
-    dnl create the PKG_CONFIG_PATH, via this component arg, if provided;
-    dnl else use the environment PKG_CONFIG_PATH
-    l_PKG_CONFIG_PATH=$[with_]$3[_val]
-    if test "x$l_PKG_CONFIG_PATH" != "x"; then
-        export PKG_CONFIG_PATH=$l_PKG_CONFIG_PATH
-
-        dnl verify that the file exists; if not, no point in continuing
-        if ! test -r ${l_PKG_CONFIG_PATH}/$2[.pc]; then
-	    AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info for $2, with provided PKG_CONFIG_PATH = @<:@ $l_PKG_CONFIG_PATH @:>@ .])
-        fi
-    fi
-
-    dnl do the check; error out if not found
-    PKG_CHECK_EXISTS($2, [passed=with; check1=yes], [
-        check1=no
-        dnl pkg-config returned an error; this might be that the .pc
-	dnl file was not valid, or the Requires: were not met.
-	dnl If the arg was provided and the input PKG_CONFIG_PATH , then try
-	dnl again appending the whole PKG_CONFIG_PATH.
-	if test "x$l_PKG_CONFIG_PATH" != "x"; then
-            if test "x$s_PKG_CONFIG_PATH" != "x"; then
-                export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
-	        PKG_CHECK_EXISTS($2, passed=with, passed=no)
-            fi
-        fi
-        if test $passed != with; then
-            AC_MSG_ERROR([Component $1: PKGCONFIG cannot find info for $2, with PKG_CONFIG_PATH = @<:@ $PKG_CONFIG_PATH @:>@ .])
-        fi
-        dnl pkg-config Requires are now met; save the new PKG_CONFIG_PATH
-        s_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
-    ])
-
-    dnl if PKG_CHECK_EXISTS returned, then this component's .pc file was
-    dnl found in the provided 'arg' PKG_CONFIG_PATH;
-    dnl retrieve various parameters
-    $3[_INCLUDES]=`$PKG_CONFIG --cflags-only-I $2`
-    $3[_LA]=`$PKG_CONFIG --libs $2`
-    $3[_INCLUDEDIR]=`$PKG_CONFIG --variable=includedir $2`
-
-    if test x$check1 = xyes; then
-        dnl prepend the args PKG_CONFIG_PATH to the saved one, if the
-	dnl saved version was not empty
-        if test "x$s_PKG_CONFIG_PATH" != "x"; then
-            export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${s_PKG_CONFIG_PATH}
-        fi
-    fi
-])
-
-dnl Check the $prefix versus the --with libdirpath for this component
-dnl $1 is the prefix
-dnl $2 is the --with component name
-dnl $3 is the --with component library path
-AC_DEFUN([GRC_PREFIX_LDFLAGS],[
-    $2[_LIBDIRPATH]=$3
-    dnl create LDFLAGS for this --with, if different from the provided $prefix
-    if test [x]$1[/lib] != [x]$3; then
-        $2[_LDFLAG]=[-L]$3
-    else
-        $2[_LDFLAG]=
-    fi
-])
-
-dnl Check to make sure this dependency is fulfilled for this component
-dnl $1 is the component's name
-dnl $2 is the component dependency name
-dnl On input and exit, $passed will be:
-dnl   with : if --with passed muster
-dnl   yes  : if --enable passed muster
-dnl   no   : otherwise
-dnl If trying --with, will error-out if any dependency was not --with'd
-AC_DEFUN([GRC_CHECK_DEPENDENCY],[
-dnl    f0=[enable_]m4_bpatsubst($1,-,_)
-dnl    f1=[$enable_]m4_bpatsubst($1,-,_)
-dnl    echo
-dnl    echo "$1 : Checking Dependency $2"
-dnl    echo "$1 : enable_all_components is '$enable_all_components'"
-dnl    echo "$1 : $f0 is '$f1'"
-dnl    echo "$1 : passed is '$passed'"
-dnl    echo
-    if test $passed != no; then
-        if test $passed = yes; then
-            dnl make sure this dependency was not skipped
-            if test [x$]m4_bpatsubst($2,-,_)[_skipped] = xyes; then
-                AC_MSG_RESULT([Component $1 requires $2, which is not being built or specified via pre-installed files.])
-                passed=no
-            fi
-        else
-            dnl make sure this dependency was --with'd only; not --enable'd
-            if test [x$]m4_bpatsubst($2,-,_)[_with] = xno; then
-                AC_MSG_ERROR([Component $1 requires $2 to be included as --with-$1@<:@=arg@:>@])
-            fi
-        fi
-    fi
-])
-
-dnl Check to make sure GUILE is available
-dnl $1 is the component name
-AC_DEFUN([GRC_CHECK_GUILE],[
-    if test x"$GUILE" = x; then
-        AC_MSG_RESULT([Component $1 requires guile, which was not found.])
-        passed=no
-    fi
-])
-
-dnl Add the specified "with" list; clear the provided variable
-dnl $1 is the component name
-dnl $2 is the path list name suffix
-dnl $3 is the separator (for paths, ":"; for includes " ")
-AC_DEFUN([GRC_ADD_TO_LIST],[
-    if test "x${$1[_]$2}" != "x"; then
-        if test "x$[with_]$2" = "x"; then
-            [with_]$2="${$1[_]$2}"
-	else
-	    [with_]$2="${$1[_]$2}"$3"$[with_]$2"
-	fi
-	$1[_]$2=
-    fi
-])
-
-dnl Conditionally build named component.
-dnl $1 is component name
-dnl $2 is executed if configuration passes and build is desired
-AC_DEFUN([GRC_BUILD_CONDITIONAL],[
-    _GRC_BUILD_CONDITIONAL($1, $2, m4_bpatsubst($1,-,_))
-])
-dnl $3=m4_bpatsubst($1,-,_)
-dnl Use $passed=no to indicate configuration failure;
-dnl Use $passed=with to indicate the use of pre-installed libraries and headers;
-dnl Any other value of $passed, including blank, assumes success;
-dnl Defines $3_with=[yes|no] depending on if $passed=with or not (respectively)
-dnl Defines $3_skipped=[yes|no] depending on if $passed=no or not (respectively)
-AC_DEFUN([_GRC_BUILD_CONDITIONAL],[
-    $3[_with]=no
-    if test $passed = no; then
-	if test x$[enable_]$3 = xyes; then
-	    AC_MSG_ERROR([Component $1 has errors; stopping.])
-	else
-	    AC_MSG_RESULT([Not building component $1.])
-	fi
-    else
-        if test $passed = with; then
-	    with_dirs="$with_dirs $1"
-	    GRC_ADD_TO_LIST($3, INCLUDES, " ")
-	    GRC_ADD_TO_LIST($3, SWIG_INCLUDES, " ")
-	    GRC_ADD_TO_LIST($3, PYDIRPATH, ":")
-	    GRC_ADD_TO_LIST($3, SWIGDIRPATH, ":")
-	    GRC_ADD_TO_LIST($3, LIBDIRPATH, ":")
-	    AC_MSG_RESULT([Component $1 will be included from a pre-installed library and includes.])
-	    $3[_with]=yes
-	else
-	    $3[_LDFLAG]=
-            if test x$[enable_]$3 != xno; then
-	        ifelse([$2], , :, [$2])
-	        build_dirs="$build_dirs $1"
-	        AC_MSG_RESULT([Component $1 passed configuration checks; building.])
-            else
-	        passed=no
-	        AC_MSG_RESULT([Component $1 passed configuration checks; but not building.])
-	    fi
-	fi
-    fi
-    if test $passed = no; then
-        skipped_dirs="$skipped_dirs $1"
-        $3[_skipped]=yes
-    else
-        $3[_skipped]=no
-    fi
-    AC_SUBST($3[_INCLUDES])
-    AC_SUBST($3[_LA])
-    AC_SUBST($3[_INCLUDEDIR])
-    AC_SUBST($3[_LIBDIRPATH])
-    AC_SUBST($3[_LDFLAG])
-])
diff --git a/usrp2/firmware/config/grc_usrp2_firmware.m4 b/usrp2/firmware/config/grc_usrp2_firmware.m4
deleted file mode 100644
index 53ff03ce4..000000000
--- a/usrp2/firmware/config/grc_usrp2_firmware.m4
+++ /dev/null
@@ -1,76 +0,0 @@
-dnl Copyright 2008 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.
-
-dnl Fix 2.64 cross compile detection for AVR and RTEMS
-dnl by not trying to compile fopen.
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.64],
-  [m4_foreach([_GCC_LANG], [C, C++, Fortran, Fortran 77],
-     [m4_define([_AC_LANG_IO_PROGRAM(]_GCC_LANG[)], m4_defn([AC_LANG_PROGRAM(]_GCC_LANG[)]))])]) 
-
-AC_DEFUN([GRC_USRP2_FIRMWARE],[
-    dnl we use  --enable-usrp2-firmware to enable this
-    GRC_ENABLE(usrp2-firmware)
-
-    GRC_CHECK_DEPENDENCY(usrp2-firmware, usrp2)
-
-    AC_REQUIRE([AC_PROG_CC])
-    AC_REQUIRE([AC_PROG_CPP])
-    AC_REQUIRE([AM_PROG_AS])
-    AC_REQUIRE([AC_PROG_RANLIB])
-
-
-    AC_CHECK_HEADERS(arpa/inet.h netinet/in.h byteswap.h)
-    AC_C_BIGENDIAN
-
-    dnl If execution gets to here, $passed will be:
-    dnl   with : if the --with code didn't error out
-    dnl   yes  : if the --enable code passed muster and all dependencies are met
-    dnl   no   : otherwise
-    if test $passed = yes; then
-
-	dnl Only do firmware if mb-gcc can be found
-	AC_CHECK_PROG([MB_GCC],[mb-gcc],[yes],[no])
-	if test $MB_GCC = no; then
-	    AC_MSG_RESULT([usrp2 firmware requires mb-gcc.  Not found])
-	    passed=no
-	fi
-    fi
-    if test $passed != with; then
-	dnl how and where to find INCLUDES and LA
-	dnl USRP2_INCLUDES="-I\${abs_top_srcdir}/usrp2/host/include \
-	dnl	-I\${abs_top_srcdir}/usrp2/firmware/include"
-        dnl USRP2_LA="\${abs_top_builddir}/usrp2/host/lib/libusrp2.la"
-	:
-    fi
-
-    dnl Include the usrp2 INCLUDES and LA
-    dnl AC_SUBST(USRP2_INCLUDES)
-    dnl AC_SUBST(USRP2_LA)
-
-    AC_CONFIG_FILES([ \
-        apps/Makefile \
-        include/Makefile \
-        lib/Makefile \
-    ])
-
-    dnl Slightly non-standard:  we handle this with an AM_CONDITIONAL
-    AM_CONDITIONAL(BUILDING_USRP2_FIRMWARE, [test $passed = yes && test "$enable_usrp2_firmware" != no])
-
-    GRC_BUILD_CONDITIONAL(usrp2-firmware)
-])
diff --git a/usrp2/firmware/config/grc_usrp2_stub.m4 b/usrp2/firmware/config/grc_usrp2_stub.m4
deleted file mode 100644
index 57aa86c08..000000000
--- a/usrp2/firmware/config/grc_usrp2_stub.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-dnl Copyright 2008 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_USRP2_STUB],[
-    GRC_ENABLE(usrp2)
-    GRC_BUILD_CONDITIONAL(usrp2)
-])
diff --git a/usrp2/firmware/configure.ac b/usrp2/firmware/configure.ac
deleted file mode 100644
index f3ff0cd80..000000000
--- a/usrp2/firmware/configure.ac
+++ /dev/null
@@ -1,162 +0,0 @@
-dnl
-dnl Copyright 2007,2008 Free Software Foundation, Inc.
-dnl
-dnl This program 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 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
-
-AC_INIT
-AC_PREREQ(2.57)
-AM_CONFIG_HEADER(config.h)
-AC_CONFIG_AUX_DIR([.])
-AC_CONFIG_SRCDIR([lib/u2_init.c])
-
-AM_INIT_AUTOMAKE(usrp2-firmware,0.0svn)
-
-dnl Component specific configuration
-dnl The order of the GR_ macros determines the order of compilation
-dnl For -any- checks on $enable_all_components
-dnl use the following guidelines:
-dnl   yes : --enable-all-components was specified, so error out if any
-dnl         components do not pass configuration checks.
-dnl   no  : --disable-all-components was specified, so try to build the
-dnl         --enable'd components, and error out if any do not pass
-dnl         configuration checks.
-dnl   ""  : this option was not specified on the command line; try to
-dnl         build all components that are not --with'd, but don't
-dnl         error out if any component does not pass configuration checks.
-dnl
-dnl For each --enable-foo component, if that flag is not specified on
-dnl the command line, the related variable $enable_foo will be set to
-dnl $enable_all_components .
-
-AC_ARG_ENABLE(
-    [all-components],
-    [  --enable-all-components Build all configurable components (default), or stop on failed dependencies]
-)
-
-#build_dirs="config"
-build_dirs=
-GRC_USRP2_STUB
-GRC_USRP2_FIRMWARE
-
-
-# Each component is now either to be built, was skipped, will be
-# included from pre-installed libraries and includes, or failed
-# dependencies.
-AC_SUBST([build_dirs], [$build_dirs])
-AC_SUBST([skipped_dirs], [$skipped_dirs])
-AC_SUBST([with_dirs], [$with_dirs])
-
-# fix for older autotools that don't define "abs_top_YYY" by default
-AC_SUBST(abs_top_srcdir)
-AC_SUBST(abs_top_builddir)
-
-# 'with' variables - the pre-installed libraries, includes, and paths
-# - must always come last in the lists, so they require special
-# treatment.
-AC_SUBST(with_INCLUDES)
-AC_SUBST(with_SWIG_INCLUDES)
-AC_SUBST(with_PYDIRPATH)
-AC_SUBST(with_SWIGDIRPATH)
-AC_SUBST(with_LIBDIRPATH)
-
-AC_CONFIG_FILES([ \
-    Makefile \
-    config/Makefile \
-])
-
-AC_OUTPUT
-
-#
-# trim usrp2 out of dirs; we only use it as a controlling dependency
-#
-t=
-for d in $build_dirs
-do
-    if test $d != usrp2; then
-        if test -z "$t"; then
-            t="$d"
-        else
-            t="$t $d"
-        fi
-    fi
-done
-build_dirs=$t
-
-t=
-for d in $skipped_dirs
-do
-    if test $d != usrp2; then
-        if test -z "$t"; then
-            t="$d"
-        else
-            t="$t $d"
-        fi
-    fi
-done
-skipped_dirs=$t
-
-t=
-for d in $with_dirs
-do
-    if test $d != usrp2; then
-        if test -z "$t"; then
-            t="$d"
-        else
-            t="$t $d"
-        fi
-    fi
-done
-with_dirs=$t
-
-if test "$build_dirs" != ""; then
-    echo
-    echo "*********************************************************************"
-    echo The following GNU Radio components have been successfully configured:
-    echo 
-    for dir in $build_dirs
-    do
-        echo $dir
-    done
-    echo
-    echo You my now run the 'make' command to build these components.
-    echo
-fi
-
-if test "$skipped_dirs" != ""; then
-    echo "*********************************************************************"
-    echo The following components were skipped either because you asked not
-    echo to build them or they didn\'t pass configuration checks:
-    echo
-    for dir in $skipped_dirs
-    do
-        echo $dir
-    done
-    echo
-    echo These components will not be built.
-    echo
-fi
-if test "$with_dirs" != ""; then
-    echo "*********************************************************************"
-    echo The following components will be included from pre-installed
-    echo libraries and includes:
-    echo
-    for dir in $with_dirs
-    do
-        echo $dir
-    done
-    echo
-    echo These components will not be built.
-    echo
-fi
diff --git a/usrp2/firmware/configure.gnu b/usrp2/firmware/configure.gnu
deleted file mode 100755
index 53ca9b518..000000000
--- a/usrp2/firmware/configure.gnu
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# wrapper to setup cross-compilation of firmware
-#
-
-for v in CC CPP CXX AS AR NM RANLIB STRIP F77 CFLAGS CXXFLAGS CPPFLAGS LDFLAGS CCAS CCASFLAGS USB_LIBS USB_CFLAGS
-do
-  unset $v
-done
-
-args=
-for t in "$@"
-do
-  case "$t" in
-      (CC=*)       ;;
-      (CPP=*)      ;;
-      (CXX=*)      ;;
-      (AR=*)       ;;
-      (AS=*)       ;;
-      (NM=*)       ;;
-      (RANLIB=*)   ;;
-      (STRIP=*)    ;;
-      (F77=*)      ;;
-      (FFLAGS=*)   ;;
-      (CFLAGS=*)   ;;
-      (CXXFLAGS=*) ;;
-      (CPPFLAGS=*) ;;
-      (LDFLAGS=*)  ;;
-      (CCAS=*)     ;;
-      (CCASFLAGS=*)  ;;
-      (USB_CFLAGS=*) ;;
-      (USB_LIBS=*) ;;
-      (*)  args="$args $t" ;;
-  esac
-done
-
-
-`dirname $0`/configure CFLAGS='-O2' $args --host=mb
diff --git a/usrp2/firmware/divisors.py b/usrp2/firmware/divisors.py
deleted file mode 100755
index d31bd4dad..000000000
--- a/usrp2/firmware/divisors.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-
-speeds = (9600, 19200, 38400, 57600, 115200, 230400)
-
-master_clk = 100e6
-wb_clk = master_clk / 2
-
-def divisor(speed):
-    div0 = wb_clk // (speed * 16)
-    div1 = div0 + 1
-    actual0 = actual_speed(div0)
-    actual1 = actual_speed(div1)
-    if abs(actual0 - speed) < abs(actual1 - speed):
-        return div0
-    else:
-        return div1
-
-def actual_speed(divisor):
-    return (wb_clk // divisor) / 16
-
-def doit(speed):
-    div = divisor(speed)
-    actual = actual_speed(div)
-    rel_error = (actual - speed) / speed
-    print "target: %6d  divisor: %6d  actual: %11.4f  %6.3f%%" % (speed, div, actual, rel_error*100)
-
-def main():
-    print "wb_clk = %f" % (wb_clk,)
-    for s in speeds:
-        doit(s)
-
-if __name__ == '__main__':
-    main()
-    
diff --git a/usrp2/firmware/include/.gitignore b/usrp2/firmware/include/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/usrp2/firmware/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/usrp2/firmware/include/Makefile.am b/usrp2/firmware/include/Makefile.am
deleted file mode 100644
index a5e339191..000000000
--- a/usrp2/firmware/include/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright 2008 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-include $(top_srcdir)/Makefile.common
-
-noinst_HEADERS = \
-    usrp2_cdefs.h \
-    usrp2_eth_packet.h \
-    usrp2_fpga_regs.h \
-    usrp2_i2c_addr.h \
-    usrp2_mac_addr.h \
-    usrp2_mimo_config.h \
-    usrp2_types.h
diff --git a/usrp2/firmware/include/usrp2_cdefs.h b/usrp2/firmware/include/usrp2_cdefs.h
deleted file mode 100644
index 71395cda8..000000000
--- a/usrp2/firmware/include/usrp2_cdefs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_USRP2_CDEFS_H
-#define INCLUDED_USRP2_CDEFS_H
-
-/* C++ needs to know that types and declarations are C, not C++.  */
-#ifdef	__cplusplus
-# define __U2_BEGIN_DECLS	extern "C" {
-# define __U2_END_DECLS	}
-#else
-# define __U2_BEGIN_DECLS
-# define __U2_END_DECLS
-#endif
-
-#endif /* INCLUDED_USRP2_CDEFS_H */
diff --git a/usrp2/firmware/include/usrp2_eth_packet.h b/usrp2/firmware/include/usrp2_eth_packet.h
deleted file mode 100644
index 2f24556f0..000000000
--- a/usrp2/firmware/include/usrp2_eth_packet.h
+++ /dev/null
@@ -1,500 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009,2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_USRP2_ETH_PACKET_H
-#define INCLUDED_USRP2_ETH_PACKET_H
-
-#include "usrp2_cdefs.h"
-#include "usrp2_bytesex.h"
-#include "usrp2_mac_addr.h"
-#include "usrp2_mimo_config.h"
-
-__U2_BEGIN_DECLS
-
-#define U2_ETHERTYPE 		0xBEEF	// used in our frames
-#define	MAC_CTRL_ETHERTYPE	0x8808	// used in PAUSE frames
-
-/*
- * All these data structures are BIG-ENDIAN on the wire
- */
-
-// FIXME gcc specific.  Really ought to come from compiler.h
-#define _AL4   __attribute__((aligned (4)))
-
-/*
- * \brief The classic 14-byte ethernet header
- */
-typedef struct {
-  u2_mac_addr_t dst;
-  u2_mac_addr_t src;
-  uint16_t 	ethertype;
-} __attribute__((packed)) u2_eth_hdr_t;
-
-/*!
- * \brief USRP2 transport header
- *
- * This enables host->usrp2 flow control and dropped packet detection.
- */
-typedef struct {
-  uint16_t	flags;		// MBZ, may be used for channel in future
-  uint16_t	fifo_status;	// free space in Rx fifo in 32-bit lines
-  uint8_t	seqno;		// sequence number of this packet
-  uint8_t	ack;		// sequence number of next packet expected
-} __attribute__((packed)) u2_transport_hdr_t;
-
-
-/*
- * The fixed payload header of a USRP2 ethernet packet...
- *
- * Basically there's 1 word of flags and routing info, and 1 word
- * of timestamp that specifies when the data was received, or
- * when it should be transmitted. The data samples follow immediately.
- *
- * Transmit packets (from host to U2)
- * 
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |  Chan   |                    mbz                        |I|S|E|
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |                           Timestamp                           |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *
- * Received packets (from U2 to host)
- *
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |  Chan   |                    mbz                              |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |                           Timestamp                           |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- *  mbz == must be zero
- */
-
-typedef struct {
-  uint32_t	word0;		// flags etc
-  uint32_t	timestamp;	// time of rx or tx (100 MHz)
-} u2_fixed_hdr_t;
-
-
-#define U2P_CHAN_MASK		0x1f
-#define	U2P_CHAN_SHIFT		27
-
-#define U2P_TX_IMMEDIATE	0x00000004  // send samples NOW, else at timestamp
-#define U2P_TX_START_OF_BURST	0x00000002  // this frame is the start of a burst
-#define	U2P_TX_END_OF_BURST	0x00000001  // this frame is the end of a burst
-
-#define	U2P_ALL_FLAGS		0x00000007
-
-#define	CONTROL_CHAN		0x1f
-
-static inline int
-u2p_chan(u2_fixed_hdr_t *p)
-{
-  return (ntohl(p->word0) >> U2P_CHAN_SHIFT) & U2P_CHAN_MASK;
-}
-
-inline static uint32_t
-u2p_word0(u2_fixed_hdr_t *p)
-{
-  return ntohl(p->word0);
-}
-
-inline static uint32_t
-u2p_timestamp(u2_fixed_hdr_t *p)
-{
-  return ntohl(p->timestamp);
-}
-
-inline static void
-u2p_set_word0(u2_fixed_hdr_t *p, int flags, int chan)
-{
-  p->word0 = htonl((flags & U2P_ALL_FLAGS)
-		   | ((chan & U2P_CHAN_MASK) << U2P_CHAN_SHIFT));
-}
-
-inline static void
-u2p_set_timestamp(u2_fixed_hdr_t *p, uint32_t ts)
-{
-  p->timestamp = htonl(ts);
-}
-
-/*!
- * \brief consolidated packet: ethernet header + transport header + fixed header
- */
-typedef struct {
-  u2_eth_hdr_t		ehdr;
-  u2_transport_hdr_t	thdr;
-  u2_fixed_hdr_t	fixed;
-} u2_eth_packet_t;
-
-/*
- * full load of samples:
- *   ethernet header + transport header + fixed header + maximum number of samples.
- *   sizeof(u2_eth_samples_t) == 1512
- *   (payload is 1498 bytes, two bytes shorter than 1500 byte MTU)
- *   (sample numbers are made even to force pairwise alignment in the interleaved case)
- */
-
-#define U2_MAX_SAMPLES	370
-#define	U2_MIN_SAMPLES   10
-
-typedef struct {
-  u2_eth_packet_t	hdrs;
-  uint32_t		samples[U2_MAX_SAMPLES];
-} u2_eth_samples_t;
-
-/*
- * Opcodes for control channel
- *
- * Reply opcodes are the same as the request opcode with the OP_REPLY_BIT set (0x80).
- */
-#define OP_REPLY_BIT	          0x80
-
-#define	OP_EOP			     0	// marks last subpacket in packet
-
-#define OP_ID			     1
-#define	OP_ID_REPLY		     (OP_ID | OP_REPLY_BIT)
-#define	OP_BURN_MAC_ADDR	     2
-#define OP_BURN_MAC_ADDR_REPLY	     (OP_BURN_MAC_ADDR | OP_REPLY_BIT)
-#define	OP_READ_TIME	             3	// What time is it? (100 MHz counter)
-#define	OP_READ_TIME_REPLY           (OP_READ_TIME | OP_REPLY_BIT)
-#define	OP_CONFIG_RX_V2	             4
-#define	OP_CONFIG_RX_REPLY_V2        (OP_CONFIG_RX_V2 | OP_REPLY_BIT)
-#define	OP_CONFIG_TX_V2	             5
-#define	OP_CONFIG_TX_REPLY_V2        (OP_CONFIG_TX_V2 | OP_REPLY_BIT)
-#define	OP_START_RX_STREAMING        6
-#define	OP_START_RX_STREAMING_REPLY  (OP_START_RX_STREAMING | OP_REPLY_BIT)
-#define	OP_STOP_RX	             7
-#define	OP_STOP_RX_REPLY	     (OP_STOP_RX | OP_REPLY_BIT)
-#define	OP_CONFIG_MIMO	       	     8
-#define OP_CONFIG_MIMO_REPLY	     (OP_CONFIG_MIMO | OP_REPLY_BIT)
-#define	OP_DBOARD_INFO		     9
-#define	OP_DBOARD_INFO_REPLY	     (OP_DBOARD_INFO | OP_REPLY_BIT)
-#define	OP_SYNC_TO_PPS               10
-#define	OP_SYNC_TO_PPS_REPLY	     (OP_SYNC_TO_PPS | OP_REPLY_BIT)
-#define OP_PEEK                      11
-#define OP_PEEK_REPLY                (OP_PEEK | OP_REPLY_BIT)
-#define OP_POKE                      12
-#define OP_POKE_REPLY                (OP_POKE | OP_REPLY_BIT)
-#define OP_SET_TX_LO_OFFSET          13
-#define OP_SET_TX_LO_OFFSET_REPLY    (OP_SET_TX_LO_OFFSET | OP_REPLY_BIT)
-#define OP_SET_RX_LO_OFFSET          14
-#define OP_SET_RX_LO_OFFSET_REPLY    (OP_SET_RX_LO_OFFSET | OP_REPLY_BIT)
-#define OP_RESET_DB                  15
-#define OP_RESET_DB_REPLY            (OP_RESET_DB | OP_REPLY_BIT)
-#define OP_SYNC_EVERY_PPS            16
-#define OP_SYNC_EVERY_PPS_REPLY      (OP_SYNC_EVERY_PPS | OP_REPLY_BIT)
-#define OP_GPIO_SET_DDR              17
-#define OP_GPIO_SET_DDR_REPLY        (OP_GPIO_SET_DDR | OP_REPLY_BIT)
-#define OP_GPIO_SET_SELS             18
-#define OP_GPIO_SET_SELS_REPLY       (OP_GPIO_SET_SELS | OP_REPLY_BIT)
-#define OP_GPIO_READ                 19
-#define OP_GPIO_READ_REPLY           (OP_GPIO_READ | OP_REPLY_BIT)
-#define OP_GPIO_WRITE                20
-#define OP_GPIO_WRITE_REPLY          (OP_GPIO_WRITE | OP_REPLY_BIT)
-#define OP_GPIO_STREAM               21
-#define OP_GPIO_STREAM_REPLY         (OP_GPIO_STREAM | OP_REPLY_BIT)
-#define OP_RX_ANTENNA                22
-#define OP_RX_ANTENNA_REPLY          (OP_RX_ANTENNA | OP_REPLY_BIT)
-#define OP_TX_ANTENNA                23
-#define OP_TX_ANTENNA_REPLY          (OP_RX_ANTENNA | OP_REPLY_BIT)
-
-/*
- * All subpackets are a multiple of 4 bytes long.
- * All subpackets start with an 8-bit opcode, an 8-bit len and an 8-bit rid.
- */
-#define MAX_SUBPKT_LEN 252
-
-/*!
- * \brief Generic request and reply packet
- *
- * Used by:
- *  OP_EOP, OP_BURN_MAC_ADDR_REPLY, OP_START_RX_STREAMING_REPLY,
- *  OP_STOP_RX_REPLY, OP_DBOARD_INFO, OP_SYNC_TO_PPS
- */
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	ok;		// bool
-} _AL4 op_generic_t;
-
-/*!
- * \brief Reply info from a USRP2
- */
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	mbz;
-  u2_mac_addr_t	addr;
-  uint16_t	hw_rev;
-  uint8_t	fpga_md5sum[16];
-  uint8_t	sw_md5sum[16];
-} _AL4 op_id_reply_t;
-
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	mbz;
-  uint32_t	items_per_frame;  // # of 32-bit data items; MTU=1500: [9,371]
-} _AL4 op_start_rx_streaming_t;
-
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  u2_mac_addr_t	addr;
-} _AL4 op_burn_mac_addr_t;
-
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	mbz;
-  uint32_t	time;
-} _AL4 op_read_time_reply_t;
-
-
-/*!
- * \brief Configure receiver
- */
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	mbz;
-  // bitmask indicating which of the following fields are valid
-  uint16_t	valid;
-  uint16_t	gain;		// fxpt_db (Q9.7)
-  uint32_t	freq_hi;	// high 32-bits of 64-bit fxpt_freq (Q44.20)
-  uint32_t	freq_lo;	// low  32-bits of 64-bit fxpt_freq (Q44.20)
-  uint32_t	decim;		// desired decimation factor (NOT -1)
-  uint32_t	scale_iq;	// (scale_i << 16) | scale_q [16.0 format]
-} _AL4 op_config_rx_v2_t;
-
-// bitmask for "valid" field.  If the bit is set, there's
-// meaningful data in the corresonding field.
-
-#define	CFGV_GAIN		0x0001	// gain field is valid
-#define	CFGV_FREQ		0x0002	// target_freq field is valid
-#define	CFGV_INTERP_DECIM	0x0004	// interp or decim is valid
-#define	CFGV_SCALE_IQ		0x0008	// scale_iq is valid
-
-/*!
- * \brief Reply to receiver configuration
- */
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	mbz;
-
-  uint16_t	ok;		// config was successful (bool)
-  uint16_t	inverted;	// spectrum is inverted (bool)
-
-  // RF frequency that corresponds to DC in the IF (fxpt_freq)
-  uint32_t	baseband_freq_hi;
-  uint32_t	baseband_freq_lo;
-  // DDC frequency (fxpt_freq)
-  uint32_t	ddc_freq_hi;
-  uint32_t	ddc_freq_lo;
-  // residual frequency (fxpt_freq)
-  uint32_t	residual_freq_hi;
-  uint32_t	residual_freq_lo;
-
-} _AL4 op_config_rx_reply_v2_t;
-
-/*!
- *  \brief Configure transmitter
- */
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	mbz;
-
-  // bitmask indicating which of the following fields are valid
-  uint16_t	valid;
-  uint16_t	gain;		// fxpt_db (Q9.7)
-  uint32_t	freq_hi;	// high 32-bits of 64-bit fxpt_freq (Q44.20)
-  uint32_t	freq_lo;	// low  32-bits of 64-bit fxpt_freq (Q44.20)
-  uint32_t	interp;		// desired interpolation factor (NOT -1)
-  uint32_t	scale_iq;	// (scale_i << 16) | scale_q [16.0 format]
-} _AL4 op_config_tx_v2_t;
-
-/*!
- * \brief Reply to configure transmitter
- */
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	mbz;
-
-  uint16_t	ok;		// config was successful (bool)
-  uint16_t	inverted;	// spectrum is inverted (bool)
-
-  // RF frequency that corresponds to DC in the IF (fxpt_freq)
-  uint32_t	baseband_freq_hi;
-  uint32_t	baseband_freq_lo;
-  // DUC frequency (fxpt_freq)
-  uint32_t	duc_freq_hi;
-  uint32_t	duc_freq_lo;
-  // residual frequency (fxpt_freq)
-  uint32_t	residual_freq_hi;
-  uint32_t	residual_freq_lo;
-
-} _AL4 op_config_tx_reply_v2_t;
-
-/*!
- * \brief Configure MIMO clocking, etc (uses generic reply)
- */
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	flags;	// from usrp_mimo_config.h
-} op_config_mimo_t;
-
-
-/*!
- * \brief High-level information about daughterboards
- */
-typedef struct {
-  int32_t	dbid;		//< d'board ID (-1 none, -2 invalid eeprom)
-  uint32_t	freq_min_hi;	//< high 32-bits of 64-bit fxpt_freq (Q44.20)
-  uint32_t	freq_min_lo;	//< low  32-bits of 64-bit fxpt_freq (Q44.20)
-  uint32_t	freq_max_hi;	//< high 32-bits of 64-bit fxpt_freq (Q44.20)
-  uint32_t	freq_max_lo;	//< low  32-bits of 64-bit fxpt_freq (Q44.20)
-  uint16_t	gain_min;	//< min gain that can be set. fxpt_db (Q9.7)
-  uint16_t	gain_max;	//< max gain that can be set. fxpt_db (Q9.7)
-  uint16_t	gain_step_size;	//< fxpt_db (Q9.7)
-} u2_db_info_t;
-
-
-/*!
- * \brief Reply to d'board info request
- */
-typedef struct {
-  uint8_t	opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	ok;		// request was successful (bool)
-
-  u2_db_info_t	tx_db_info;
-  u2_db_info_t	rx_db_info;
-} _AL4 op_dboard_info_reply_t;
-
-/*!
- * \brief Read from Wishbone memory
- */
-typedef struct {
-  uint8_t       opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	mbz;
-  uint32_t      addr;
-  uint32_t      bytes;
-} _AL4 op_peek_t;
-
-/*!
- * \brief Write to Wishbone memory
- */
-typedef struct {
-  uint8_t       opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	mbz;
-  uint32_t      addr;
-  // Words follow here
-} _AL4 op_poke_t;
-
-/* 
- * Common structure for commands with a single frequency param 
- * (e.g., set_*_lo_offset, set_*_bw)
- */
-typedef struct {
-  uint8_t       opcode;
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	mbz;
-  uint32_t	freq_hi;	//< high 32-bits of 64-bit fxpt_freq (Q44.20)
-  uint32_t	freq_lo;	//< low  32-bits of 64-bit fxpt_freq (Q44.20)
-} _AL4 op_freq_t;
-
-/*
- * Structures for commands in GPIO system
- */
-typedef struct {
-  uint8_t       opcode;		// OP_GPIO_SET_DDR, OP_GPIO_WRITE, OP_GPIO_STREAM
-  uint8_t       len;
-  uint8_t       rid;
-  uint8_t       bank;
-  uint16_t      value;
-  uint16_t      mask;
-} _AL4 op_gpio_t;
-
-typedef struct {
-  uint8_t       opcode;		// OP_GPIO_SET_SELS
-  uint8_t       len;
-  uint8_t       rid;
-  uint8_t       bank;
-  uint8_t       sels[16];
-} _AL4 op_gpio_set_sels_t;
-
-typedef struct {
-  uint8_t	opcode;		// OP_GPIO_READ_REPLY
-  uint8_t	len;
-  uint8_t	rid;
-  uint8_t	ok;
-  uint16_t      mbz;
-  uint16_t	value;
-} _AL4 op_gpio_read_reply_t;
-
-/*
- * ================================================================
- *             union of all of subpacket types
- * ================================================================
- */
-typedef union {
-
-  op_generic_t			op_generic;
-  op_id_reply_t			op_id_reply;
-  op_start_rx_streaming_t	op_start_rx_streaming;
-  op_burn_mac_addr_t		op_burn_mac_addr;
-  op_read_time_reply_t		op_read_time_reply;
-  op_config_rx_v2_t		op_config_rx_v2;
-  op_config_rx_reply_v2_t	op_config_rx_reply_v2;
-  op_config_tx_v2_t		op_config_tx_v2;
-  op_config_tx_reply_v2_t	op_config_tx_reply_v2;
-  op_config_mimo_t 		op_config_mimo;
-  op_peek_t                     op_peek;
-  op_poke_t                     op_poke;
-  op_freq_t                     op_freq;
-  op_gpio_t                     op_gpio;
-  op_gpio_set_sels_t            op_gpio_set_sels;
-  op_gpio_read_reply_t          op_gpio_read_reply;
-
-} u2_subpkt_t;
-
-
-__U2_END_DECLS
-
-#endif /* INCLUDED_USRP2_ETH_PACKET_H */
diff --git a/usrp2/firmware/include/usrp2_fpga_regs.h b/usrp2/firmware/include/usrp2_fpga_regs.h
deleted file mode 100644
index b0f83df60..000000000
--- a/usrp2/firmware/include/usrp2_fpga_regs.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_USRP2_FPGA_REGS_H
-#define INCLUDED_USSRP2_FPGA_REGS_H
-
-#include "usrp2_cdefs.h"
-
-__U2_BEGIN_DECLS
-
-// ----------------------------------------------------------------
-
-#define	DSP_CORE_TX_BASE	128
-
-// DUC center frequency tuning word (phase increment)
-#define FR_TX_FREQ_0		(0 + DSP_CORE_TX_BASE)
-
-// I & Q output scaling, 16.0 format ((I_SCALE << 16) | Q_SCALE)
-#define FR_TX_SCALE_0		(1 + DSP_CORE_TX_BASE)
-
-// Tx interpolation rate (set to 1 less than desired rate)
-#define FR_TX_INTERP_RATE_0	(2 + DSP_CORE_TX_BASE)
-
-// Write 1 (actually anything) to clear tx state
-#define FR_TX_CLEAR_STATE_0	(3 + DSP_CORE_TX_BASE)
-
-// ----------------------------------------------------------------
-
-#define	DSP_CORE_RX_BASE	160
-
-// DDC center frequency tuning word (phase increment)
-#define FR_RX_FREQ_0		(0 + DSP_CORE_RX_BASE)
-
-// I & Q input scaling, 16.0 format ((I_SCALE << 16) | Q_SCALE)
-#define FR_RX_SCALE_0		(1 + DSP_CORE_RX_BASE)
-
-// Rx decimation rate (set to 1 less than desired rate)
-#define FR_RX_DECIM_RATE_0	(2 + DSP_CORE_RX_BASE)
-
-// The next two registers concatenated are the Rx command register.
-//
-// Writing FR_RX_TIME_TO_RX_0 writes the concatenated value into the
-// cmd queue.  Thus, if you're writing both, be sure to write
-// FR_RX_QTY_0 first.
-//
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |                          Timestamp                            |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-#define FR_RX_TIME_TO_RX	(3 + DSP_CORE_RX_BASE)
-
-//                          23-bits                       9-bits
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |                number_of_lines              | lines_per_frame |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-#define FR_RX_QTY_0		(4 + DSP_CORE_RX_BASE)
-
-// write a 1 (anything actually) to clear the overrun 
-#define FR_RX_CLR_OVERRUN_0	(5 + DSP_CORE_RX_BASE)
-
-
-__U2_END_DECLS
-
-#endif /* INCLUDED_USRP2_FPGA_REGS_H */
diff --git a/usrp2/firmware/include/usrp2_i2c_addr.h b/usrp2/firmware/include/usrp2_i2c_addr.h
deleted file mode 100644
index f25996903..000000000
--- a/usrp2/firmware/include/usrp2_i2c_addr.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_USRP2_I2C_ADDR_H
-#define INCLUDED_USRP2_I2C_ADDR_H
-
-#include "usrp2_cdefs.h"
-
-__U2_BEGIN_DECLS
-
-// I2C addresses
-
-#define I2C_DEV_EEPROM	0x50		// 24LC02[45]:  7-bits 1010xxx
-
-#define	I2C_ADDR_MBOARD	(I2C_DEV_EEPROM	| 0x0)
-#define	I2C_ADDR_TX_A	(I2C_DEV_EEPROM | 0x4)
-#define	I2C_ADDR_RX_A	(I2C_DEV_EEPROM | 0x5)
-
-
-// format of USRP2 motherboard rom
-//	00: 0x00	h/w rev (LSB)
-//	01: 0x00	h/w rev (MSB)
-//	02: 0x00	MAC addr 0
-//	03: 0x50	MAC addr 1
-//	04: 0xC2	MAC addr 2
-//	05: 0x85	MAC addr 3
-//	06: 0x3.	MAC addr 4
-//	07: 0x..	MAC addr 5
-
-#define MBOARD_REV_LSB	0x00
-#define	MBOARD_REV_MSB  0x01
-#define	MBOARD_MAC_ADDR 0x02
-
-
-// format of daughterboard EEPROM
-//	00: 0xDB	code for ``I'm a daughterboard''
-//	01:   ..	Daughterboard ID (LSB)
-//	02:   ..	Daughterboard ID (MSB)
-//	03:   ..	io bits  7-0 direction (bit set if it's an output from m'board)
-//	04:   ..	io bits 15-8 direction (bit set if it's an output from m'board)
-//	05:   ..	ADC0 DC offset correction (LSB)
-//	06:   ..	ADC0 DC offset correction (MSB)
-//	07:   ..	ADC1 DC offset correction (LSB)
-//	08:   ..	ADC1 DC offset correction (MSB)
-// 	...
-//	1f:   ..	negative of the sum of bytes [0x00, 0x1e]
-
-#define	DB_EEPROM_MAGIC		0x00
-#define	  DB_EEPROM_MAGIC_VALUE			0xDB
-#define	DB_EEPROM_ID_LSB		0x01
-#define	DB_EEPROM_ID_MSB		0x02
-#define	DB_EEPROM_OE_LSB		0x03
-#define	DB_EEPROM_OE_MSB		0x04
-#define	DB_EEPROM_OFFSET_0_LSB		0x05	// offset correction for ADC or DAC 0
-#define	DB_EEPROM_OFFSET_0_MSB		0x06
-#define	DB_EEPROM_OFFSET_1_LSB		0x07	// offset correction for ADC or DAC 1
-#define	DB_EEPROM_OFFSET_1_MSB		0x08
-#define	DB_EEPROM_CHKSUM		0x1f
-
-#define	DB_EEPROM_CLEN			0x20	// length of common portion of eeprom
-
-#define	DB_EEPROM_CUSTOM_BASE		DB_EEPROM_CLEN	// first avail offset for
-							//   daughterboard specific use
-__U2_END_DECLS
-
-#endif /* INCLUDED_USRP2_I2C_ADDR_H */
-
diff --git a/usrp2/firmware/include/usrp2_mac_addr.h b/usrp2/firmware/include/usrp2_mac_addr.h
deleted file mode 100644
index da5a69f58..000000000
--- a/usrp2/firmware/include/usrp2_mac_addr.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_USRP2_MAC_ADDR_H
-#define INCLUDED_USRP2_MAC_ADDR_H
-
-#include <stdint.h>
-
-typedef struct {
-  uint8_t	addr[6];
-} u2_mac_addr_t;
-
-#endif /* INCLUDED_USRP2_MAC_ADDR_H */
diff --git a/usrp2/firmware/include/usrp2_mimo_config.h b/usrp2/firmware/include/usrp2_mimo_config.h
deleted file mode 100644
index 129675198..000000000
--- a/usrp2/firmware/include/usrp2_mimo_config.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_USRP2_MIMO_CONFIG_H
-#define INCLUDED_USRP2_MIMO_CONFIG_H
-
-#define	_MC_WE_LOCK			0x0001
-#define	_MC_MIMO_CLK_INPUT		0x0002		// else SMA input
-
-/*
- * Derived masks (use these):
- *
- * We get our input from 1 of three places:
- *  Our free running oscilator, our SMA connector, or from the MIMO connector
- */
-#define	MC_WE_DONT_LOCK			0x0000
-#define	MC_WE_LOCK_TO_SMA		(_MC_WE_LOCK | 0)
-#define	MC_WE_LOCK_TO_MIMO		(_MC_WE_LOCK | _MC_MIMO_CLK_INPUT)
-
-/*
- * Independent of the source of the clock, we may or may not drive our
- * clock onto the mimo connector.  Note that there are dedicated clock
- * signals in each direction, so disaster doesn't occurs if we're
- * unnecessarily providing clock.
- */
-#define	MC_PROVIDE_CLK_TO_MIMO		0x0004
-
-
-#endif /* INCLUDED_USRP2_MIMO_CONFIG_H */
diff --git a/usrp2/firmware/include/usrp2_types.h b/usrp2/firmware/include/usrp2_types.h
deleted file mode 100644
index 32cb25c41..000000000
--- a/usrp2/firmware/include/usrp2_types.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_USRP2_TYPES_H
-#define INCLUDED_USRP2_TYPES_H
-
-#include <usrp2_cdefs.h>
-#include <stdint.h>
-
-__U2_BEGIN_DECLS
-
-/*!
- * \brief Fixed point representation of a frequency in Hertz (VITA-49 compatible)
- *
- * 64-bit two's complement, with the radix point 20 bits up from the bottom. 
- * Q44.20 format (20 bits to the right of the radix point)
- *
- * Values range from +/- 8.79 terahertz with a resolution of 0.95 microhertz.
- */
-typedef int64_t	u2_fxpt_freq_t;
-
-#define U2_FPF_RP	20	// location of radix point in u2_fxpt_freq_t
-
-// macro so we can init structs at compile time
-#define U2_DOUBLE_TO_FXPT_FREQ(f) (int64_t)((f) * (1LL << U2_FPF_RP))
-
-static inline u2_fxpt_freq_t
-u2_double_to_fxpt_freq(double f)
-{
-  return U2_DOUBLE_TO_FXPT_FREQ(f);
-}
-
-static inline int
-u2_fxpt_freq_round_to_int(u2_fxpt_freq_t fx)
-{
-  return (int)((fx+(1<<(U2_FPF_RP-1)))>>U2_FPF_RP);
-}
-
-static inline unsigned int
-u2_fxpt_freq_round_to_uint(u2_fxpt_freq_t fx)
-{
-  return (unsigned int)((fx+(1<<(U2_FPF_RP-1)))>>U2_FPF_RP);
-}
-
-static inline double
-u2_fxpt_freq_to_double(u2_fxpt_freq_t fx)
-{
-  return ((double) fx) * 1.0/(1 << U2_FPF_RP);
-}
-
-static inline uint32_t
-u2_fxpt_freq_hi(u2_fxpt_freq_t f)
-{
-  return ((f >> 32) & 0xffffffff);
-}
-
-static inline uint32_t
-u2_fxpt_freq_lo(u2_fxpt_freq_t f)
-{
-  return (f & 0xffffffff);
-}
-
-static inline u2_fxpt_freq_t
-u2_fxpt_freq_from_hilo(uint32_t hi, uint32_t lo)
-{
-  return (((u2_fxpt_freq_t) hi) << 32) | lo;
-}
-
-/*!
- * \brief Fixed point representation of a gain in dB (VITA-49 compatible)
- *
- * 16-bit two's complement, with the radix point 7 bits up from the bottom. 
- * Q9.7 format (7 bits to the right of the radix point)
- */
-typedef int16_t u2_fxpt_gain_t;
-
-#define U2_FPG_RP	7	// location of radix point in u2_fxpt_gain_t
-
-// macro so we can init structs at compile time
-#define U2_DOUBLE_TO_FXPT_GAIN(g) (int16_t)((g) * (1 << U2_FPG_RP))
-
-static inline u2_fxpt_gain_t
-u2_double_to_fxpt_gain(double g)
-{
-  return U2_DOUBLE_TO_FXPT_GAIN(g);
-}
-
-static inline float
-u2_fxpt_gain_to_double(u2_fxpt_gain_t fx)
-{
-  return ((double) fx) * 1.0/(1 << U2_FPG_RP);
-}
-
-static inline int
-u2_fxpt_gain_round_to_int(u2_fxpt_gain_t fx)
-{ 
-  return (int)((fx+(1<<(U2_FPG_RP-1)))>>U2_FPG_RP);
-}
-
-
-__U2_END_DECLS
-
-
-#endif /* INCLUDED_USRP2_TYPES_H */
diff --git a/usrp2/firmware/lib/.gitignore b/usrp2/firmware/lib/.gitignore
deleted file mode 100644
index 5d838bf6c..000000000
--- a/usrp2/firmware/lib/.gitignore
+++ /dev/null
@@ -1,40 +0,0 @@
-*~
-/*-stamp
-/*.a
-/*.bin
-/*.dump
-/*.log
-/*.rom
-/.deps
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/blink_leds
-/blink_leds2
-/build
-/compile
-/config.h
-/config.h.in
-/config.log
-/config.status
-/configure
-/depcomp
-/eth_test
-/gen_eth_packets
-/ibs_rx_test
-/ibs_tx_test
-/install-sh
-/libtool
-/ltmain.sh
-/missing
-/py-compile
-/rcv_eth_packets
-/run_tests.sh
-/stamp-h1
-/test1
-/test_phy_comm
-/timer_test
-/buf_ram_test
-/buf_ram_zero
-/hello
diff --git a/usrp2/firmware/lib/Makefile.am b/usrp2/firmware/lib/Makefile.am
deleted file mode 100644
index 2e5f3651f..000000000
--- a/usrp2/firmware/lib/Makefile.am
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# Copyright 2007,2010 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-include $(top_srcdir)/Makefile.common
-
-noinst_LIBRARIES = \
-	libu2fw.a \
-	libu2fw_wbx.a \
-	libu2fw_xcvr.a
-
-U2FW_COMMON = \
-	_exit.c \
-	abort.c \
-	ad9510.c \
-	ad9777.c \
-	bsm12.c \
-	buffer_pool.c \
-	clocks.c \
-	db_basic.c \
-	dbsm.c \
-	eeprom.c \
-	eth_mac.c \
-	ethernet.c \
-	exit.c \
-	hal_io.c \
-	hal_uart.c \
-	i2c.c \
-	lsadc.c \
-	lsdac.c \
-	mdelay.c \
-	memcpy_wa.c \
-	memset_wa.c \
-	nonstdio.c \
-	pic.c \
-	print_buffer.c \
-	print_fxpt.c \
-	print_mac_addr.c \
-	print_rmon_regs.c \
-	printf.c \
-	sd.c \
-	spi.c \
-	u2_init.c
-
-libu2fw_a_SOURCES = \
-	$(U2FW_COMMON) \
-	db_init.c \
-	db_bitshark_rx.c \
-	db_dbsrx.c \
-	db_rfx.c \
-	db_tvrx.c
-
-libu2fw_wbx_a_SOURCES = \
-	$(U2FW_COMMON) \
-	db_init_wbx.c \
-	adf4350.c \
-	adf4350_regs.c \
-	db_wbxng.c 
-
-libu2fw_xcvr_a_SOURCES = \
-	$(U2FW_COMMON) \
-	db_init_xcvr.c \
-	adf4350.c \
-	adf4350_regs.c \
-	db_xcvr2450.c
-
-
-noinst_HEADERS = \
-	ad9510.h \
-	adf4350.h \
-	adf4350_regs.h \
-	ad9777.h \
-	ad9777_regs.h \
-	bool.h \
-	bsm12.h \
-	buffer_pool.h \
-	clocks.h \
-	db.h \
-	db_base.h \
-	db_wbxng.h \
-	db_bitshark_rx.h \
-	dbsm.h \
-	eth_mac.h \
-	eth_mac_regs.h \
-	eth_phy.h \
-	ethernet.h \
-	hal_io.h \
-	hal_uart.h \
-	i2c.h \
-	lsadc.h \
-	lsdac.h \
-	mdelay.h \
-	memcpy_wa.h \
-	memory_map.h \
-	memset_wa.h \
-	nonstdio.h \
-	pic.h \
-	print_rmon_regs.h \
-	sd.h \
-	spi.h \
-	stdint.h \
-	stdio.h \
-	u2_init.h \
-	usrp2_bytesex.h \
-        wb16550.h
-
-EXTRA_DIST = \
-        microblaze.ld
diff --git a/usrp2/firmware/lib/_exit.c b/usrp2/firmware/lib/_exit.c
deleted file mode 100644
index 9b40ab2ee..000000000
--- a/usrp2/firmware/lib/_exit.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Stub so we can compile using 3.4 based mb-gcc
- */
-void 
-_exit(int status)
-{
-  while (1)
-    ;
-}
diff --git a/usrp2/firmware/lib/ad9510.c b/usrp2/firmware/lib/ad9510.c
deleted file mode 100644
index 4d3acb65d..000000000
--- a/usrp2/firmware/lib/ad9510.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ad9510.h"
-#include "spi.h"
-#include <memory_map.h>
-
-#define RD (1 << 15)
-#define WR (0 << 15)
-
-void
-ad9510_write_reg(int regno, uint8_t value)
-{
-  uint32_t inst = WR | (regno & 0xff);
-  uint32_t v = (inst << 8) | (value & 0xff);
-  spi_transact(SPI_TXONLY, SPI_SS_AD9510, v, 24, SPIF_PUSH_FALL);
-}
-
-int
-ad9510_read_reg(int regno)
-{
-  uint32_t inst = RD | (regno & 0xff);
-  uint32_t v = (inst << 8) | 0;
-  uint32_t r = spi_transact(SPI_TXRX, SPI_SS_AD9510, v, 24,
-			    SPIF_PUSH_FALL | SPIF_LATCH_FALL);
-  return r & 0xff;
-}
diff --git a/usrp2/firmware/lib/ad9510.h b/usrp2/firmware/lib/ad9510.h
deleted file mode 100644
index a395e5223..000000000
--- a/usrp2/firmware/lib/ad9510.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_AD9510_H
-#define INCLUDED_AD9510_H
-
-#include <stdint.h>
-
-/*
- * Analog Device AD9510 1.2 GHz Clock Distribution IC w/ PLL
- */
-
-void ad9510_write_reg(int regno, uint8_t value);
-int  ad9510_read_reg(int regno);
-
-#endif /* INCLUDED_AD9510_H */
diff --git a/usrp2/firmware/lib/ad9777.c b/usrp2/firmware/lib/ad9777.c
deleted file mode 100644
index 734ccd7e5..000000000
--- a/usrp2/firmware/lib/ad9777.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ad9777.h"
-#include "memory_map.h"
-#include "spi.h"
-
-#define	IB_RD   	0x80
-#define	IB_WR		0x00
-#define	IB_XFER_1	0x00
-#define	IB_XFER_2	0x20
-#define	IB_XFER_3	0x40
-#define	IB_XFER_4	0x60
-#define	IB_ADDR_MASK	0x1f
-
-void    
-ad9777_write_reg(int regno, uint8_t value)
-{
-  uint8_t instr = IB_WR | IB_XFER_1 | (regno & IB_ADDR_MASK);
-  spi_transact(SPI_TXONLY, SPI_SS_AD9777,
-	       (instr << 8) | (value & 0xff), 16, SPIF_PUSH_FALL);
-}
-
-int
-ad9777_read_reg(int regno)
-{
-  uint8_t instr = IB_RD | IB_XFER_1 | (regno & IB_ADDR_MASK);
-  uint32_t r = spi_transact(SPI_TXRX, SPI_SS_AD9777,
-			    (instr << 8) | 0, 16,
-			    SPIF_PUSH_FALL | SPIF_LATCH_RISE);
-  return r & 0xff;
-}
diff --git a/usrp2/firmware/lib/ad9777.h b/usrp2/firmware/lib/ad9777.h
deleted file mode 100644
index d4d104910..000000000
--- a/usrp2/firmware/lib/ad9777.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_AD9777_H
-#define INCLUDED_AD9777_H
-
-#include <stdint.h>
-#include "ad9777_regs.h"
-
-/*
- * Analog Devices AD9777 16-bit, 160 MS/s, Dual Interpolating TxDAC
- */
-
-void ad9777_write_reg(int regno, uint8_t value);
-int  ad9777_read_reg(int regno);
-
-#endif /* INCLUDED_AD9777_H */
diff --git a/usrp2/firmware/lib/ad9777_regs.h b/usrp2/firmware/lib/ad9777_regs.h
deleted file mode 100644
index de2936c15..000000000
--- a/usrp2/firmware/lib/ad9777_regs.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_AD9777_REGS_H
-#define INCLUDED_AD9777_REGS_H
-
-#define R0_SW_RESET	(1 << 5)
-#define	R0_SLEEP	(1 << 4)
-#define	R0_POWER_DN	(1 << 3)
-#define	R0_1R		(1 << 2)
-#define R0_2R		(0 << 2)
-#define	R0_PLL_LOCKED	(1 << 1)
-
-#define	R1_INTERP_1X	0x00
-#define	R1_INTERP_2X	0x40
-#define	R1_INTERP_4X	0x80
-#define R1_INTERP_8X	0xC0
-#define	R1_MOD_NONE	0x00
-#define	R1_MOD_FS_2	0x10		// Fs/2
-#define	R1_MOD_FS_4	0x20		// Fs/4
-#define	R1_MOD_FS_8	0x30		// Fs/8
-#define R1_ZERO_STUFF	(1 << 3)	// N.B., doubles output rate
-#define	R1_REAL_MIX	(1 << 2)
-#define	R1_CMPLX_MIX	(0 << 2)
-#define	R1_POS_EXP	(1 << 1)	// exp(+jwt)
-#define	R1_NEG_EXP	(0 << 1)	// exp(-jwt)
-#define	R1_DATACLK_OUT	(1 << 0)
-
-#define	R2_2S_COMP	(0 << 7)
-#define R2_2PORT_MODE	(0 << 6)
-#define	R2_1PORT_MODE	(1 << 6)
-
-#define	R3_PLL_DIV_1	0x00
-#define	R3_PLL_DIV_2	0x01
-#define	R3_PLL_DIV_4	0x02
-#define	R3_PLL_DIV_8	0x03
-
-#define	R4_PLL_ON	(1 << 7)
-#define	R4_CP_MANUAL	(1 << 6)
-#define	R4_CP_AUTO	(0 << 6)
-#define	R4_CP_50uA	(0x00 | R4_CP_MANUAL)
-#define	R4_CP_100uA	(0x01 | R4_CP_MANUAL)
-#define	R4_CP_200uA	(0x02 | R4_CP_MANUAL)
-#define	R4_CP_400uA	(0x03 | R4_CP_MANUAL)
-#define	R4_CP_800uA	(0x07 | R4_CP_MANUAL)
-
-#define R5_I_FINE_GAIN(g)    (g)		// 8-bits
-#define R6_I_COARSE_GAIN(g)  ((g) & 0xf)	// low 4-bits
-
-#define	R9_Q_FINE_GAIN(g)    (g)		// 8-bits
-#define	R10_Q_COARSE_GAIN(g) ((g) & 0xf)	// low 4-bits
-
-
-// FIXME more registers for offset and gain control...
-
-
-#endif /* INCLUDED_AD9777_REGS_H */
diff --git a/usrp2/firmware/lib/adf4350.c b/usrp2/firmware/lib/adf4350.c
deleted file mode 100644
index dbab654ea..000000000
--- a/usrp2/firmware/lib/adf4350.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "adf4350.h"
-#include "adf4350_regs.h"
-#include "db_wbxng.h"
-#include <spi.h>
-#include <hal_io.h>
-#include <stdio.h>
-#include <stdint.h>
-
-#define INPUT_REF_FREQ U2_DOUBLE_TO_FXPT_FREQ(50e6)
-#define INPUT_REF_FREQ_2X (2*INPUT_REF_FREQ)                            /* input ref freq with doubler turned on */
-#define MAX_RF_DIV UINT8_C(16)                                          /* max rf divider, divides rf output */
-#define MIN_VCO_FREQ U2_DOUBLE_TO_FXPT_FREQ(2.2e9)                      /* minimum vco freq */
-#define MAX_VCO_FREQ U2_DOUBLE_TO_FXPT_FREQ(4.4e9)                      /* minimum vco freq */
-#define MAX_FREQ MAX_VCO_FREQ                                           /* upper bound freq (rf div = 1) */
-#define MIN_FREQ U2_DOUBLE_TO_FXPT_FREQ(68.75e6)                        /* lower bound freq (rf div = 16) */
-
-u2_fxpt_freq_t adf4350_get_max_freq(void){
-	return MAX_FREQ;
-}
-
-u2_fxpt_freq_t adf4350_get_min_freq(void){
-	return MIN_FREQ;
-}
-
-void adf4350_init(struct db_base *dbb){
-	struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-
-	/* Initialize the pin levels. */
-	hal_gpio_write( db->base.is_tx ? GPIO_TX_BANK : GPIO_RX_BANK, PLL_CE, PLL_CE );
-	adf4350_enable(true, dbb);
-	/* Initialize the registers. */
-	adf4350_load_register(5, dbb);
-	adf4350_load_register(4, dbb);
-	adf4350_load_register(3, dbb);
-	adf4350_load_register(2, dbb);
-	adf4350_load_register(1, dbb);
-	adf4350_load_register(0, dbb);
-}
-
-/*
-void adf4350_update(void){
-	// mirror the lock detect pin to the led debug
-	if (adf4350_get_locked()){
-		io_set_pin(led_pin);
-	}else{
-		io_clear_pin(led_pin);
-	}
-}
-*/
-
-bool adf4350_get_locked(struct db_base *dbb){
-	struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-
-	int pins;
-	pins = hal_gpio_read( db->base.is_tx ? GPIO_TX_BANK : GPIO_RX_BANK );
-  	if(pins & PLL_LOCK_DETECT)
-		return true;
-	return false;
-}
-
-void adf4350_enable(bool enable, struct db_base *dbb){
-	struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-
-	if (enable){ /* chip enable */
-		hal_gpio_write( db->base.is_tx ? GPIO_TX_BANK : GPIO_RX_BANK, PLL_PDBRF, PLL_PDBRF );
-	}else{
-		hal_gpio_write( db->base.is_tx ? GPIO_TX_BANK : GPIO_RX_BANK, 0, PLL_PDBRF );
-	}
-}
-
-void adf4350_write(uint8_t addr, uint32_t data, struct db_base *dbb){
-	struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-
-	//printf("SPI write ADDR 0x%x, WORD 0x%x\n", (int) (addr), (int) (data));
-	data |= addr;
-	spi_transact(SPI_TXONLY,db->common.spi_mask,data,32,SPIF_PUSH_FALL);
-	//spi_read_write(clk_pin, data_pin, ld_pin, &data, 32);
-	/* pulse latch */
-	//io_set_pin(le_pin);
-	//io_clear_pin(le_pin);
-}
-
-bool adf4350_set_freq(u2_fxpt_freq_t freq, struct db_base *dbb){
-	struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-
-	/* Set the frequency by setting int, frac, mod, r, div */
-	if (freq > MAX_FREQ || freq < MIN_FREQ) return false;
-
-	/* Set the prescaler and the min N based on the freq. */
-	uint16_t min_int_div;
-	if (freq > U2_DOUBLE_TO_FXPT_FREQ(3e9) ){
-		db->common.adf4350_regs_prescaler = (uint8_t) 1;
-		min_int_div = UINT16_C(75);
-	}else{
-		db->common.adf4350_regs_prescaler = (uint8_t) 0;
-		min_int_div = UINT16_C(23);
-	}
-
-	/* Ramp up the RF divider until the VCO is within range. */
-	db->common.adf4350_regs_divider_select = (uint8_t) 0;
-	while (freq < MIN_VCO_FREQ){
-		freq <<= 1; //double the freq
-		db->common.adf4350_regs_divider_select++; //double the divider
-	}
-
-	/* Ramp up the R divider until the N divider is at least the minimum. */
-	db->common.adf4350_regs_10_bit_r_counter = (uint16_t) (DIV_ROUND((INPUT_REF_FREQ*min_int_div), freq));
-	//printf("Initial R setting: %u, MIN_INT: %u\n", db->common.adf4350_regs_10_bit_r_counter, min_int_div);
-	if (db->common.adf4350_regs_10_bit_r_counter * U2_DOUBLE_TO_FXPT_FREQ(32e6) < INPUT_REF_FREQ){
-		db->common.adf4350_regs_10_bit_r_counter = (uint16_t) (DIV_ROUND(INPUT_REF_FREQ, U2_DOUBLE_TO_FXPT_FREQ(32e6)));
-		//printf("Updating R setting: %u, MIN_INT: %u\n", db->common.adf4350_regs_10_bit_r_counter, min_int_div);
-	}
-
-	db->common.adf4350_regs_10_bit_r_counter--;
-	//db->common.adf4350_regs_10_bit_r_counter=1;
-
-	do{
-		db->common.adf4350_regs_10_bit_r_counter++;
-		/* throw out some fractional bits in freq to avoid overflow */
-		u2_fxpt_freq_t some_frac_freq = (U2_DOUBLE_TO_FXPT_FREQ(1.0)/db->common.adf4350_regs_mod);
-		uint64_t n_mod = DIV_ROUND(freq, some_frac_freq);
-		n_mod *= db->common.adf4350_regs_10_bit_r_counter;
-		n_mod *= db->common.adf4350_regs_mod;
-		n_mod = DIV_ROUND(n_mod, DIV_ROUND(INPUT_REF_FREQ, some_frac_freq));
-		/* calculate int and frac: regs_mod is a power of 2, this will optimize to a bitwise operation */
-		db->common.adf4350_regs_int = (uint16_t) (n_mod/db->common.adf4350_regs_mod);
-		db->common.adf4350_regs_frac = (uint16_t) (n_mod%db->common.adf4350_regs_mod);
-		//printf("Int %u < Min %u\n", db->common.adf4350_regs_int, min_int_div);
-	}while(db->common.adf4350_regs_int < min_int_div);
-
-	/* calculate the band select so PFD is under 125 KHz */
-	db->common.adf4350_regs_8_bit_band_select_clock_divider_value = \
-		(uint8_t) (INPUT_REF_FREQ/(U2_DOUBLE_TO_FXPT_FREQ(30e3)*db->common.adf4350_regs_10_bit_r_counter)) + 1;
-
-	/*
-	printf(
-		"VCO %u KHz, Int %u, Frac %u, Mod %u, R %u, Div %u, BandSelect %u\n",
-		(uint32_t) ((freq >> U2_FPF_RP)/1000),
-		(uint32_t) db->common.adf4350_regs_int,
-		(uint32_t) db->common.adf4350_regs_frac,
-		(uint32_t) db->common.adf4350_regs_mod,
-		(uint32_t) db->common.adf4350_regs_10_bit_r_counter,
-		(uint32_t) (1 << db->common.adf4350_regs_divider_select),
-		(uint32_t) db->common.adf4350_regs_8_bit_band_select_clock_divider_value
-	);
-	*/
-
-	/* load involved registers */
-	adf4350_load_register(5, dbb);
-	adf4350_load_register(3, dbb);
-	adf4350_load_register(1, dbb);
-	adf4350_load_register(2, dbb);
-	adf4350_load_register(4, dbb);
-	adf4350_load_register(0, dbb); /* register 0 must be last */
-	return adf4350_get_locked(dbb);
-}
-
-u2_fxpt_freq_t adf4350_get_freq(struct db_base *dbb){
-	struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-
-	/* Calculate the freq from int, frac, mod, ref, r, div:
-	 *  freq = (int + frac/mod) * (ref/r)
-	 * Keep precision by doing multiplies first:
-	 *  freq = (((((((int)*mod) + frac)*ref)/mod)/r)/div)
-	 */
-	uint64_t temp;
-	temp = (uint64_t) db->common.adf4350_regs_int;
-	temp *= (uint64_t) db->common.adf4350_regs_mod;
-	temp += (uint64_t) db->common.adf4350_regs_frac;
-	temp *= (uint64_t) (INPUT_REF_FREQ >> U2_FPF_RP);
-	temp /= (uint64_t) db->common.adf4350_regs_mod;
-	temp /= (uint64_t) db->common.adf4350_regs_10_bit_r_counter;
-	temp /= (uint64_t) (1 << db->common.adf4350_regs_divider_select);
-
-	/* Shift 1Hz Radix Point for u2_fxpt_freq_t */
-	temp = temp << U2_FPF_RP;
-
-	/*
-	printf(
-		"Got Freq %u KHz, Int %u, Frac %u, Mod %u, R %u, Div %u\n",
-		(uint32_t) ((temp >> U2_FPF_RP)/1000),
-		(uint32_t) db->common.adf4350_regs_int,
-		(uint32_t) db->common.adf4350_regs_frac,
-		(uint32_t) db->common.adf4350_regs_mod,
-		(uint32_t) db->common.adf4350_regs_10_bit_r_counter,
-		(uint32_t) (1 << db->common.adf4350_regs_divider_select)
-	);
-	*/
-
-	return (u2_fxpt_freq_t) (temp);
-}
diff --git a/usrp2/firmware/lib/adf4350.h b/usrp2/firmware/lib/adf4350.h
deleted file mode 100644
index 3c66ec344..000000000
--- a/usrp2/firmware/lib/adf4350.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef ADF4350_H
-#define ADF4350_H
-
-#include <db_base.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#define DIV_ROUND(num, denom) (((num) + ((denom)/2))/(denom))
-#define UINT8_C(num) ((uint8_t) (num))
-#define UINT16_C(num) ((uint16_t) (num))
-
-void adf4350_init(struct db_base *dbb);
-//void adf4350_update(void);
-bool adf4350_get_locked(struct db_base *dbb);
-void adf4350_enable(bool enable, struct db_base *dbb);
-void adf4350_write(uint8_t addr, uint32_t data, struct db_base *dbb);
-bool adf4350_set_freq(u2_fxpt_freq_t freq, struct db_base *dbb);
-u2_fxpt_freq_t adf4350_get_freq(struct db_base *dbb);
-u2_fxpt_freq_t adf4350_get_max_freq(void);
-u2_fxpt_freq_t adf4350_get_min_freq(void);
-
-#endif /* ADF4350_H */
diff --git a/usrp2/firmware/lib/adf4350_regs.c b/usrp2/firmware/lib/adf4350_regs.c
deleted file mode 100644
index e2740d3ab..000000000
--- a/usrp2/firmware/lib/adf4350_regs.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "adf4350_regs.h"
-#include "adf4350.h"
-#include "db_wbxng.h"
-
-#define _REG_SHIFT(reg, shift) (((uint32_t)(reg)) << (shift))
-
-/* reg 0 */
-/* reg 1 */
-static const uint16_t adf4350_regs_phase = 0;                           /* 0 */
-/* reg 2 */
-static const uint8_t adf4350_regs_low_noise_and_low_spur_modes = 3;     /* low noise mode */
-static const uint8_t adf4350_regs_muxout = 3;                           /* digital lock detect */
-static const uint8_t adf4350_regs_reference_doubler = 0;                /* disabled */
-static const uint8_t adf4350_regs_rdiv2 = 1;                            /* disabled */
-static const uint8_t adf4350_regs_double_buff = 0;                      /* disabled */
-static const uint8_t adf4350_regs_charge_pump_setting = 5;              /* 2.50 mA */
-static const uint8_t adf4350_regs_ldf = 0;                              /* frac-n */
-static const uint8_t adf4350_regs_ldp = 0;                              /* 10 ns */
-static const uint8_t adf4350_regs_pd_polarity = 1;                      /* positive */
-static const uint8_t adf4350_regs_power_down = 0;                       /* disabled */
-static const uint8_t adf4350_regs_cp_three_state = 0;                   /* disabled */
-static const uint8_t adf4350_regs_counter_reset = 0;                    /* disabled */
-/* reg 3 */
-static const uint8_t adf4350_regs_csr = 0;                              /* disabled */
-static const uint8_t adf4350_regs_clk_div_mode = 0;                     /* clock divider off */
-static const uint16_t adf4350_regs_12_bit_clock_divider_value = 0;      /* 0 */
-/* reg 4 */
-static const uint8_t adf4350_regs_feedback_select = 1;                  /* fundamental */
-static const uint8_t adf4350_regs_vco_power_down = 0;                   /* vco powered up */
-static const uint8_t adf4350_regs_mtld = 0;                             /* mute disabled */
-static const uint8_t adf4350_regs_aux_output_select = 1;                /* divided output */
-static const uint8_t adf4350_regs_aux_output_enable = 1;                /* disabled */
-static const uint8_t adf4350_regs_aux_output_power = 0;                 /* -4 */
-static const uint8_t adf4350_regs_rf_output_enable = 1;                 /* enabled */
-static const uint8_t adf4350_regs_output_power = 3;                     /* -1 */
-/* reg 5 */
-static const uint8_t adf4350_regs_ld_pin_mode = 1;                      /* digital lock detect */
-
-void adf4350_load_register(uint8_t addr, struct db_base *dbb){
-	struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-	uint32_t data;
-	switch (addr){
-		case 0: data = (
-			_REG_SHIFT(db->common.adf4350_regs_int, 15)                |
-			_REG_SHIFT(db->common.adf4350_regs_frac, 3)); break;
-		case 1: data = (
-			_REG_SHIFT(db->common.adf4350_regs_prescaler, 27)          |
-			_REG_SHIFT(adf4350_regs_phase, 15)                         |
-			_REG_SHIFT(db->common.adf4350_regs_mod, 3)); break;
-		case 2: data = (
-			_REG_SHIFT(adf4350_regs_low_noise_and_low_spur_modes, 29)  |
-			_REG_SHIFT(adf4350_regs_muxout, 26)                        |
-			_REG_SHIFT(adf4350_regs_reference_doubler, 25)             |
-			_REG_SHIFT(adf4350_regs_rdiv2, 24)                         |
-			_REG_SHIFT(db->common.adf4350_regs_10_bit_r_counter, 14)   |
-			_REG_SHIFT(adf4350_regs_double_buff, 13)                   |
-			_REG_SHIFT(adf4350_regs_charge_pump_setting, 9)            |
-			_REG_SHIFT(adf4350_regs_ldf, 8)                            |
-			_REG_SHIFT(adf4350_regs_ldp, 7)                            |
-			_REG_SHIFT(adf4350_regs_pd_polarity, 6)                    |
-			_REG_SHIFT(adf4350_regs_power_down, 5)                     |
-			_REG_SHIFT(adf4350_regs_cp_three_state, 4)                 |
-			_REG_SHIFT(adf4350_regs_counter_reset, 3)); break;
-		case 3: data = (
-			_REG_SHIFT(adf4350_regs_csr, 18)                           |
-			_REG_SHIFT(adf4350_regs_clk_div_mode, 15)                  |
-			_REG_SHIFT(adf4350_regs_12_bit_clock_divider_value, 3)); break;
-		case 4: data = (
-			_REG_SHIFT(adf4350_regs_feedback_select, 23)               |
-			_REG_SHIFT(db->common.adf4350_regs_divider_select, 20)     |
-			_REG_SHIFT(db->common.adf4350_regs_8_bit_band_select_clock_divider_value, 12) |
-			_REG_SHIFT(adf4350_regs_vco_power_down, 11)                |
-			_REG_SHIFT(adf4350_regs_mtld, 10)                          |
-			_REG_SHIFT(adf4350_regs_aux_output_select, 9)              |
-			_REG_SHIFT(adf4350_regs_aux_output_enable, 8)              |
-			_REG_SHIFT(adf4350_regs_aux_output_power, 6)               |
-			_REG_SHIFT(adf4350_regs_rf_output_enable, 5)               |
-			_REG_SHIFT(adf4350_regs_output_power, 3)); break;
-		case 5: data = (
-			_REG_SHIFT(adf4350_regs_ld_pin_mode, 22)); break;
-		default: return;
-	}
-	/* write the data out to spi */
-	adf4350_write(addr, data, dbb);
-}
diff --git a/usrp2/firmware/lib/adf4350_regs.h b/usrp2/firmware/lib/adf4350_regs.h
deleted file mode 100644
index f7c160f6f..000000000
--- a/usrp2/firmware/lib/adf4350_regs.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- *
- * Copyright 2010 Ettus Research LLC
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef ADF4350_REGS_H
-#define ADF4350_REGS_H
-
-#include <db_base.h>
-#include <stdint.h>
-
-void adf4350_load_register(uint8_t addr, struct db_base *dbb);
-
-#endif /* ADF4350_REGS_H */
diff --git a/usrp2/firmware/lib/bool.h b/usrp2/firmware/lib/bool.h
deleted file mode 100644
index 36f472d40..000000000
--- a/usrp2/firmware/lib/bool.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_BOOL_H
-#define INCLUDED_BOOL_H
-
-typedef int bool;
-#define true	1
-#define	false	0
-
-#endif /* INCLUDED_BOOL_H */
diff --git a/usrp2/firmware/lib/bsm12.c b/usrp2/firmware/lib/bsm12.c
deleted file mode 100644
index c996e6496..000000000
--- a/usrp2/firmware/lib/bsm12.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * buffer state machine: 1 input to two outputs
- *
- * Typically used to read packets from the ethernet and then after inspecting,
- * handle the packet in firmware or pass it on to 1 of the 2 buffer destinations.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "bsm12.h"
-#include "memory_map.h"
-#include "buffer_pool.h"
-#include "bool.h"
-#include "nonstdio.h"
-#include <stdlib.h>
-
-typedef enum {
-  BS_EMPTY,
-  BS_FILLING,
-  BS_FULL,
-  BS_EMPTYING,
-} buffer_state_t;
-
-static buffer_state_t buffer_state[NBUFFERS];
-static uint32_t last_send_ctrl[NBUFFERS];
-static int8_t  buffer_target[NBUFFERS];	    // -1, 0 or 1.
-static uint8_t buffer_dst[NBUFFERS];	    // 0 or 1. Valid only when BF_EMPTYING
-
-#define ST_IDLE (-1)
-
-void
-bsm12_init(bsm12_t *sm, int buf0,
-	   const buf_cmd_args_t *recv,
-	   const buf_cmd_args_t *send0,
-	   const buf_cmd_args_t *send1,
-	   bsm12_inspector_t inspect)
-{
-  if (buf0 & 0x3)	// precondition: buf0 % 4 == 0
-    abort();
-
-  sm->buf0 = buf0;
-  sm->running = false;
-  sm->recv_args = *recv;
-  sm->send_args[0] = *send0;
-  sm->send_args[1] = *send1;
-
-  sm->rx_state = ST_IDLE;
-  sm->tx_state[0] = ST_IDLE;
-  sm->tx_state[1] = ST_IDLE;
-
-  sm->inspect = inspect;
-
-  sm->bps_error = BPS_ERROR(buf0 + 0) | BPS_ERROR(buf0 + 1) | BPS_ERROR(buf0 + 2);
-  sm->bps_done  = BPS_DONE(buf0 + 0)  | BPS_DONE(buf0 + 1)  | BPS_DONE(buf0 + 2);
-  sm->bps_error_or_done = sm->bps_error | sm->bps_done;
-
-  // How much to adjust the last_line register.
-  // It's 1 for everything but the ethernet.
-  sm->last_line_adj = recv->port == PORT_ETH ? 3 : 1;
-
-  buffer_state[sm->buf0 + 0] = BS_EMPTY;
-  buffer_state[sm->buf0 + 1] = BS_EMPTY;
-  buffer_state[sm->buf0 + 2] = BS_EMPTY;
-
-  buffer_target[sm->buf0 + 0] = -1;
-  buffer_target[sm->buf0 + 1] = -1;
-  buffer_target[sm->buf0 + 2] = -1;
-
-  for (int i = 0; i < NBUFFERS; i++)
-    sm->next_buf[i] = buf0;
-
-  sm->next_buf[buf0 + 0] = buf0 + 1;
-  sm->next_buf[buf0 + 1] = buf0 + 2;
-  sm->next_buf[buf0 + 2] = buf0 + 0;
-
-  for (int i = 0; i < 3; i++){
-    sm->precomputed_receive_to_buf_ctrl_word[i] =
-      (BPC_READ
-       | BPC_BUFFER(sm->buf0 + i)
-       | BPC_PORT(sm->recv_args.port)
-       | BPC_STEP(1)
-       | BPC_FIRST_LINE(sm->recv_args.first_line)
-       | BPC_LAST_LINE(sm->recv_args.last_line));
-    
-    for (int j = 0; j < 2; j++){
-      sm->precomputed_send_from_buf_ctrl_word[i][j] =
-	(BPC_WRITE
-	 | BPC_BUFFER(sm->buf0 + i)
-	 | BPC_PORT(sm->send_args[j].port)
-	 | BPC_STEP(1)
-	 | BPC_FIRST_LINE(sm->send_args[j].first_line)
-	 | BPC_LAST_LINE(0));		// last line filled in at runtime
-    }
-  }
-}
-
-static inline void
-bsm12_receive_to_buf(bsm12_t *sm, int bufno)
-{
-  buffer_pool_ctrl->ctrl = sm->precomputed_receive_to_buf_ctrl_word[bufno & 0x3];
-}
-
-static inline void
-bsm12_send_from_buf(bsm12_t *sm, int bufno, int dst_idx)
-{
-  dst_idx &= 0x1;
-
-  uint32_t t = 
-    (sm->precomputed_send_from_buf_ctrl_word[bufno & 0x3][dst_idx]
-     | BPC_LAST_LINE(buffer_pool_status->last_line[bufno] - sm->last_line_adj));
-
-  buffer_pool_ctrl->ctrl = t;
-  last_send_ctrl[bufno] = t;
-  buffer_dst[bufno] = dst_idx;
-}
-
-static inline void
-bsm12_resend_from_buf(bsm12_t *sm, int bufno)
-{
-  buffer_pool_ctrl->ctrl = last_send_ctrl[bufno];
-}
-
-void
-bsm12_start(bsm12_t *sm)
-{
-  sm->running = true;
-
-  buffer_state[sm->buf0 + 0] = BS_EMPTY;
-  buffer_state[sm->buf0 + 1] = BS_EMPTY;
-  buffer_state[sm->buf0 + 2] = BS_EMPTY;
-
-  buffer_target[sm->buf0 + 0] = -1;
-  buffer_target[sm->buf0 + 1] = -1;
-  buffer_target[sm->buf0 + 2] = -1;
-
-  bp_clear_buf(sm->buf0 + 0);
-  bp_clear_buf(sm->buf0 + 1);
-  bp_clear_buf(sm->buf0 + 2);
-
-  sm->rx_state = 0;
-  sm->tx_state[0] = ST_IDLE;
-  sm->tx_state[1] = ST_IDLE;
-  bsm12_receive_to_buf(sm, sm->buf0);
-  buffer_state[sm->buf0] = BS_FILLING;
-}
-
-void
-bsm12_stop(bsm12_t *sm)
-{
-  sm->running = false;
-  bp_clear_buf(sm->buf0 + 0);
-  bp_clear_buf(sm->buf0 + 1);
-  bp_clear_buf(sm->buf0 + 2);
-  buffer_state[sm->buf0 + 0] = BS_EMPTY;
-  buffer_state[sm->buf0 + 1] = BS_EMPTY;
-  buffer_state[sm->buf0 + 2] = BS_EMPTY;
-}
-
-static void bsm12_process_helper(bsm12_t *sm, int buf_this);
-static void bsm12_error_helper(bsm12_t *sm, int buf_this);
-
-void
-bsm12_process_status(bsm12_t *sm, uint32_t status)
-{
-  // anything for us?
-  if ((status & sm->bps_error_or_done) == 0 || !sm->running)
-    return;
-
-  if (status & sm->bps_error){
-    // Most likely an ethernet Rx error.  We just restart the transfer.
-    if (status & (BPS_ERROR(sm->buf0 + 0)))
-      bsm12_error_helper(sm, sm->buf0 + 0);
-
-    if (status & (BPS_ERROR(sm->buf0 + 1)))
-      bsm12_error_helper(sm, sm->buf0 + 1);
-
-    if (status & (BPS_ERROR(sm->buf0 + 2)))
-      bsm12_error_helper(sm, sm->buf0 + 2);
-  }
-
-  if (status & BPS_DONE(sm->buf0 + 0))
-    bsm12_process_helper(sm, sm->buf0 + 0);
-
-  if (status & BPS_DONE(sm->buf0 + 1))
-    bsm12_process_helper(sm, sm->buf0 + 1);
-
-  if (status & BPS_DONE(sm->buf0 + 2))
-    bsm12_process_helper(sm, sm->buf0 + 2);
-}
-
-static void 
-bsm12_process_helper(bsm12_t *sm, int buf_this)
-{
-  bp_clear_buf(buf_this);
-
-  if (buffer_state[buf_this] == BS_FILLING){
-
-    buffer_state[buf_this] = BS_FULL;
-    buffer_target[buf_this] = -1;
-
-    //
-    // where does this packet go?
-    //
-    int dst = sm->inspect(sm, buf_this);
-    if (dst == -1){
-      //
-      // f/w handled the packet; refill the buffer
-      //
-      bsm12_receive_to_buf(sm, buf_this);
-      buffer_state[buf_this] = BS_FILLING;
-      buffer_target[buf_this] = -1;
-      sm->rx_state = buf_this & 0x3;
-    }
-    else {	// goes to dst 0 or 1
-      //
-      // If the next buffer is empty, start a receive on it
-      //
-      int t = sm->next_buf[buf_this];
-      if (buffer_state[t] == BS_EMPTY){
-	bsm12_receive_to_buf(sm, t);
-	buffer_state[t] = BS_FILLING;
-	buffer_target[t] = -1;
-	sm->rx_state = t & 0x3;
-      }
-      else
-	sm->rx_state = ST_IDLE;
-
-      //
-      // If the destination is idle, start the xfer, othewise remember it
-      //
-      if (sm->tx_state[dst] == ST_IDLE){
-	bsm12_send_from_buf(sm, buf_this, dst);
-	sm->tx_state[dst] = buf_this & 0x3;
-	buffer_state[buf_this] = BS_EMPTYING;
-	buffer_target[buf_this] = -1;
-      }
-      else {
-	buffer_target[buf_this] = dst;
-      }
-    }
-  }
-
-  else {    // BS_EMPTYING
-
-    buffer_state[buf_this] = BS_EMPTY;
-    buffer_target[buf_this] = -1;
-
-    if (sm->rx_state == ST_IDLE){	// fire off another receive
-      sm->rx_state = buf_this & 0x3;
-      bsm12_receive_to_buf(sm, buf_this);
-      buffer_state[buf_this] = BS_FILLING;
-      buffer_target[buf_this] = -1;
-    }
-
-    int dst = buffer_dst[buf_this];	// the dst we were emptying into
-    // is the next buffer full and for us?
-    int t = sm->next_buf[buf_this];
-    if (buffer_target[t] == dst){		// yes,
-      bsm12_send_from_buf(sm, t, dst);		// send it
-      buffer_state[t] = BS_EMPTYING;
-      buffer_target[t] = -1;
-      sm->tx_state[dst] = t & 0x3;
-    }
-    // how about the one after that?
-    else if (buffer_target[t=sm->next_buf[t]] == dst){	// yes,
-      bsm12_send_from_buf(sm, t, dst);			// send it
-      buffer_state[t] = BS_EMPTYING;
-      buffer_target[t] = -1;
-      sm->tx_state[dst] = t & 0x3;
-    }
-    else {
-      sm->tx_state[dst] = ST_IDLE;
-    }
-  }
-}
-
-static void
-bsm12_error_helper(bsm12_t *sm, int buf_this)
-{
-  bp_clear_buf(buf_this);		  // clears ERROR flag
-
-  if (buffer_state[buf_this] == BS_FILLING){
-    bsm12_receive_to_buf(sm, buf_this);	  // restart the xfer
-  }
-  else { // buffer was emptying
-    bsm12_resend_from_buf(sm, buf_this);  // restart the xfer
-  }
-}
-
-
-void
-bsm12_handle_tx_underrun(bsm12_t *sm)
-{
-}
-
-void
-bsm12_handle_rx_overrun(bsm12_t *sm)
-{
-}
diff --git a/usrp2/firmware/lib/bsm12.h b/usrp2/firmware/lib/bsm12.h
deleted file mode 100644
index b8e576b79..000000000
--- a/usrp2/firmware/lib/bsm12.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_BSM12_H
-#define INCLUDED_BSM12_H
-
-#include "dbsm.h"
-#include "memory_map.h"
-
-/*!
- * buffer state machine: 1 input to two outputs
- *
- * Typically used to read packets from the ethernet and then after inspecting,
- * handle the packet in firmware or pass it on to 1 of the 2 buffer destinations.
- */
-
-struct _bsm12;
-typedef struct _bsm12 bsm12_t;
-
-/*!
- * Pointer to function that does packet inspection.
- *
- * \param sm		the state machine
- * \param buf_this	the index of the buffer to inspect and/or pass on
- *
- * Returns -1, 0 or 1.  If it returns -1, it means that the s/w
- * handled that packet, and that it should NOT be passed on to one of
- * the buffer endpoints.  0 indicates the first endpoint, 1 the second endpoint.
- */
-typedef int (*bsm12_inspector_t)(bsm12_t *sm, int buf_this);
-
-
-/*!
- * buffer state machine: 1 input to two outputs
- */
-struct _bsm12
-{
-  uint8_t	  buf0;	 // This machine uses buf0, buf0+1 and buf0+2.  buf0 % 4 == 0.
-  uint8_t	  running;
-  int8_t	  rx_state;	// -1, 0, 1, 2  which buffer we're receiving into
-  int8_t	  tx_state[2];	// -1, 0, 1, 2  which buffer we're sending from
-  buf_cmd_args_t  recv_args;
-  buf_cmd_args_t  send_args[2];
-  bsm12_inspector_t inspect;
-  int		  last_line_adj;
-  uint32_t	  bps_error;
-  uint32_t	  bps_done;
-  uint32_t	  bps_error_or_done;
-  uint8_t	  next_buf[NBUFFERS];
-  uint32_t	  precomputed_receive_to_buf_ctrl_word[3];
-  uint32_t	  precomputed_send_from_buf_ctrl_word[4][2];  // really only 3, not 4 
-                                                              //   (easier addr comp)
-};
-
-void bsm12_init(bsm12_t *sm, int buf0,
-		const buf_cmd_args_t *recv,
-		const buf_cmd_args_t *send0,
-		const buf_cmd_args_t *send1,
-		bsm12_inspector_t inspect);
-
-void bsm12_start(bsm12_t *sm);
-void bsm12_stop(bsm12_t *sm);
-void bsm12_process_status(bsm12_t *sm, uint32_t status);
-void bsm12_handle_tx_underrun(bsm12_t *sm);
-void bsm12_handle_rx_overrun(bsm12_t *sm);
-
-
-#endif /* INCLUDED_BSM12_H */
diff --git a/usrp2/firmware/lib/buffer_pool.c b/usrp2/firmware/lib/buffer_pool.c
deleted file mode 100644
index 77e7c5213..000000000
--- a/usrp2/firmware/lib/buffer_pool.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "memory_map.h"
-#include "buffer_pool.h"
-#include "hal_io.h" 
-
-void
-bp_init(void)
-{
-  int i;
-  bp_disable_port(PORT_SERDES);
-  bp_disable_port(PORT_DSP);
-  bp_disable_port(PORT_ETH);
-  bp_disable_port(PORT_RAM);
-
-  for (i = 0; i < NBUFFERS; i++)
-    bp_clear_buf(i);
-}
-
-#ifndef INLINE_BUFFER_POOL
-
-void
-bp_clear_buf(int bufnum)
-{
-  buffer_pool_ctrl->ctrl = BPC_BUFFER(bufnum) | BPC_PORT_NIL | BPC_CLR;
-}
-
-void
-bp_disable_port(int portnum) 
-{
-  // disable buffer connections to this port
-  buffer_pool_ctrl->ctrl = BPC_BUFFER_NIL | BPC_PORT(portnum);
-}
-
-void
-bp_receive_to_buf(int bufnum, int port, int step, int fl, int ll)
-{
-  buffer_pool_ctrl->ctrl = (BPC_READ
-			    | BPC_BUFFER(bufnum)
-			    | BPC_PORT(port)
-			    | BPC_STEP(step)
-			    | BPC_FIRST_LINE(fl)
-			    | BPC_LAST_LINE(ll));
-}
-
-void
-bp_send_from_buf(int bufnum, int port, int step, int fl, int ll)
-{
-  buffer_pool_ctrl->ctrl = (BPC_WRITE
-			    | BPC_BUFFER(bufnum)
-			    | BPC_PORT(port)
-			    | BPC_STEP(step)
-			    | BPC_FIRST_LINE(fl)
-			    | BPC_LAST_LINE(ll));
-}
-
-#endif
diff --git a/usrp2/firmware/lib/buffer_pool.h b/usrp2/firmware/lib/buffer_pool.h
deleted file mode 100644
index 145b20f8d..000000000
--- a/usrp2/firmware/lib/buffer_pool.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_BUFFER_POOL_H
-#define INCLUDED_BUFFER_POOL_H
-
-#include "memory_map.h"
-
-// Buffer Pool Management
-
-
-// define to have common buffer operations inlined
-#define INLINE_BUFFER_POOL 1
-
-void bp_init(void);
-
-#ifndef INLINE_BUFFER_POOL
-
-void bp_clear_buf(int bufnum);
-void bp_disable_port(int portnum);
-void bp_receive_to_buf(int bufnum, int port, int step, int fl, int ll);
-void bp_send_from_buf(int bufnum, int port, int step, int fl, int ll);
-
-#else
-
-static inline void
-bp_clear_buf(int bufnum)
-{
-  buffer_pool_ctrl->ctrl = BPC_BUFFER(bufnum) | BPC_PORT_NIL | BPC_CLR;
-}
-
-static inline void
-bp_disable_port(int portnum) 
-{
-  // disable buffer connections to this port
-  buffer_pool_ctrl->ctrl = BPC_BUFFER_NIL | BPC_PORT(portnum);
-}
-
-static inline void
-bp_receive_to_buf(int bufnum, int port, int step, int fl, int ll)
-{
-  buffer_pool_ctrl->ctrl = (BPC_READ
-			    | BPC_BUFFER(bufnum)
-			    | BPC_PORT(port)
-			    | BPC_STEP(step)
-			    | BPC_FIRST_LINE(fl)
-			    | BPC_LAST_LINE(ll));
-}
-
-static inline void
-bp_send_from_buf(int bufnum, int port, int step, int fl, int ll)
-{
-  buffer_pool_ctrl->ctrl = (BPC_WRITE
-			    | BPC_BUFFER(bufnum)
-			    | BPC_PORT(port)
-			    | BPC_STEP(step)
-			    | BPC_FIRST_LINE(fl)
-			    | BPC_LAST_LINE(ll));
-}
-#endif
-#endif
diff --git a/usrp2/firmware/lib/clocks.c b/usrp2/firmware/lib/clocks.c
deleted file mode 100644
index 0dbf3f90e..000000000
--- a/usrp2/firmware/lib/clocks.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <clocks.h>
-
-#include "memory_map.h"
-#include "ad9510.h"
-#include "spi.h"
-#include "u2_init.h"
-#include "nonstdio.h"
-
-void 
-clocks_init(void)
-{
-  // Set up basic clocking functions in AD9510
-  ad9510_write_reg(0x45, 0x00); // CLK2 drives distribution
-
-  clocks_enable_fpga_clk(true, 1);
-
-  spi_wait();
-
-  // Set up PLL for 10 MHz reference
-  // Reg 4, A counter, Don't Care
-  ad9510_write_reg(0x05, 0x00);  // Reg 5, B counter MSBs, 0
-  ad9510_write_reg(0x06, 0x05);  // Reg 6, B counter LSBs, 5
-  // Reg 7, Loss of reference detect, doesn't work yet, 0
-  ad9510_write_reg(0x5A, 0x01); // Update Regs
-
-
-  // FIXME, probably need interface to this...
-  timesync_regs->tick_control = 4;
-
-  // Primary clock configuration
-  clocks_mimo_config(MC_WE_DONT_LOCK);
-
-  // Set up other clocks
-  clocks_enable_test_clk(false, 0);
-  clocks_enable_tx_dboard(false, 0);
-  clocks_enable_rx_dboard(false, 0);
-  clocks_enable_eth_phyclk(false, 0);
-
-  // Enable clock to ADCs and DACs
-  clocks_enable_dac_clk(true, 1);
-  clocks_enable_adc_clk(true, 1);
-}
-
-
-void
-clocks_mimo_config(int flags)
-{
-  if (flags & _MC_WE_LOCK){
-    // Reg 8, Charge pump on, dig lock det, positive PFD, 47
-    ad9510_write_reg(0x08, 0x47);
-  }
-  else {
-    // Reg 8, Charge pump off, dig lock det, positive PFD
-    ad9510_write_reg(0x08, 0x00);
-  }
-  
-  // Reg 9, Charge pump current, 0x40=3mA, 0x00=650uA
-  ad9510_write_reg(0x09, 0x00);
-  // Reg A, Prescaler of 2, everything normal 04
-  ad9510_write_reg(0x0A, 0x04);
-  // Reg B, R Div MSBs, 0
-  ad9510_write_reg(0x0B, 0x00);
-  // Reg C, R Div LSBs, 1
-  ad9510_write_reg(0x0C, 0x01);
-  // Reg D, Antibacklash, Digital lock det, 0
-
-  ad9510_write_reg(0x5A, 0x01); // Update Regs
-
-  spi_wait();
-  
-  // Allow for clock switchover
-  
-  if (flags & _MC_WE_LOCK){		// WE LOCK
-    if (flags & _MC_MIMO_CLK_INPUT) {
-      // Turn on ref output and choose the MIMO connector
-      output_regs->clk_ctrl = 0x15;  
-    }
-    else {
-      // turn on ref output and choose the SMA
-      output_regs->clk_ctrl = 0x1C; 
-    }
-  }
-  else {				// WE DONT LOCK
-    // Disable both ext clk inputs
-    output_regs->clk_ctrl = 0x10;
-  }
-
-  // Do we drive a clock onto the MIMO connector?
-  if (flags & MC_PROVIDE_CLK_TO_MIMO)
-    clocks_enable_clkexp_out(true,10);
-  else
-    clocks_enable_clkexp_out(false,0); 
-}
-
-bool 
-clocks_lock_detect()
-{
-  if(pic_regs->pending & PIC_CLKSTATUS)
-    return true;
-  return false;
-}
-
-int inline
-clocks_gen_div(int divisor)
-{
-  int L,H;
-  L = (divisor>>1)-1;
-  H = divisor-L-2;
-  return (L<<4)|H;
-}
-
-#define CLOCK_OUT_EN 0x08
-#define CLOCK_OUT_DIS_CMOS 0x01
-#define CLOCK_OUT_DIS_PECL 0x02
-#define CLOCK_DIV_DIS 0x80
-#define CLOCK_DIV_EN 0x00
-
-#define CLOCK_MODE_PECL 1
-#define CLOCK_MODE_LVDS 2
-#define CLOCK_MODE_CMOS 3
-
-void 
-clocks_enable_XXX_clk(bool enable, int divisor, int reg_en, int reg_div, int mode)
-{
-  int enable_word, div_word, div_en_word;
-
-  switch(mode) {
-  case CLOCK_MODE_PECL :
-    enable_word = enable ? 0x08 : 0x0A;
-    break;
-  case CLOCK_MODE_LVDS :
-    enable_word = enable ? 0x02 : 0x03;
-    break;
-  case CLOCK_MODE_CMOS :
-    enable_word = enable ? 0x08 : 0x09;
-    break;
-  }
-  if(enable && (divisor>1)) {
-    div_word = clocks_gen_div(divisor);
-    div_en_word = CLOCK_DIV_EN;
-  }
-  else {
-    div_word = 0;
-    div_en_word = CLOCK_DIV_DIS;
-  }
-
-  ad9510_write_reg(reg_en,enable_word); // Output en/dis
-  ad9510_write_reg(reg_div,div_word); // Set divisor
-  ad9510_write_reg(reg_div+1,div_en_word); // Enable or Bypass Divider
-  ad9510_write_reg(0x5A, 0x01);  // Update Regs
-}
-
-// Clock 0
-void
-clocks_enable_test_clk(bool enable, int divisor)
-{
-  clocks_enable_XXX_clk(enable,divisor,0x3C,0x48,CLOCK_MODE_PECL);
-}
-
-// Clock 1
-void
-clocks_enable_fpga_clk(bool enable, int divisor)
-{
-  clocks_enable_XXX_clk(enable,divisor,0x3D,0x4A,CLOCK_MODE_PECL);
-}
-
-// Clock 2 on Rev 3, Clock 5 on Rev 4
-void
-clocks_enable_clkexp_out(bool enable, int divisor)
-{
-  if(u2_hw_rev_major == 3)
-    clocks_enable_XXX_clk(enable,divisor,0x3E,0x4C,CLOCK_MODE_PECL);
-  else if(u2_hw_rev_major == 4) {
-    ad9510_write_reg(0x34,0x00);  // Turn on fine delay
-    ad9510_write_reg(0x35,0x00);  // Set Full Scale to nearly 10ns
-    ad9510_write_reg(0x36,0x1c);  // Set fine delay.  0x20 is midscale
-    clocks_enable_XXX_clk(enable,divisor,0x41,0x52,CLOCK_MODE_LVDS);
-    
-  }
-  else
-    putstr("ERR: Invalid Rev\n");
-}
-
-// Clock 5 on Rev 3, none (was 2) on Rev 4
-void
-clocks_enable_eth_phyclk(bool enable, int divisor)
-{
-  if(u2_hw_rev_major == 3)
-    clocks_enable_XXX_clk(enable,divisor,0x41,0x52,CLOCK_MODE_LVDS);
-  else if(u2_hw_rev_major == 4)
-    clocks_enable_XXX_clk(enable,divisor,0x3E,0x4C,CLOCK_MODE_PECL);
-  else
-    putstr("ERR: Invalid Rev\n");
-}
-
-// Clock 3
-void
-clocks_enable_dac_clk(bool enable, int divisor)
-{
-  clocks_enable_XXX_clk(enable,divisor,0x3F,0x4E,CLOCK_MODE_PECL);
-}
-
-// Clock 4
-void
-clocks_enable_adc_clk(bool enable, int divisor)
-{
-  clocks_enable_XXX_clk(enable,divisor,0x40,0x50,CLOCK_MODE_LVDS);
-}
-
-// Clock 6
-void
-clocks_enable_tx_dboard(bool enable, int divisor)
-{
-  clocks_enable_XXX_clk(enable,divisor,0x42,0x54,CLOCK_MODE_CMOS);
-}
-
-// Clock 7
-void
-clocks_enable_rx_dboard(bool enable, int divisor)
-{
-  clocks_enable_XXX_clk(enable,divisor,0x43,0x56,CLOCK_MODE_CMOS);
-}
diff --git a/usrp2/firmware/lib/clocks.h b/usrp2/firmware/lib/clocks.h
deleted file mode 100644
index 39a0893c1..000000000
--- a/usrp2/firmware/lib/clocks.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_CLOCKS_H
-#define INCLUDED_CLOCKS_H
-
-/*
- * Routines to configure our multitude of clocks
- */
-
-#include <bool.h>
-#include <usrp2_mimo_config.h>
-
-
-/*!
- * One time call to initialize all clocks to a reasonable state.  We
- * come out of here using our free running 100MHz oscilator and not
- * providing a clock to the MIMO connector (CMC_WE_DONT_LOCK)
- */
-void clocks_init(void);
-
-
-/*!
- * \brief MIMO clock configuration.
- *
- * Configure our master clock source, and whether or not we drive a
- * clock onto the mimo connector.  See MC_flags in usrp2_mimo_config.h.
- */
-void clocks_mimo_config(int flags);
-
-/*!
- * \brief Lock Detect -- Return True if our PLL is locked
- */
-bool clocks_lock_detect();
-
-/*!
- * \brief Enable or disable test clock (extra clock signal)
- */
-void clocks_enable_test_clk(bool enable, int divisor);
-
-/*!
- * \brief Enable or disable fpga clock.  Disabling would wedge and require a power cycle.
- */
-void clocks_enable_fpga_clk(bool enable, int divisor);
-
-/*!
- * \brief Enable or disable clock output sent to MIMO connector
- */
-void clocks_enable_clkexp_out(bool enable, int divisor);
-
-/*!
- * \brief Enable or disable ethernet phyclk, should always be disabled
- */
-void clocks_enable_eth_phyclk(bool enable, int divisor);
-
-/*!
- * \brief Enable or disable clock to DAC
- */
-void clocks_enable_dac_clk(bool enable, int divisor);
-
-/*!
- * \brief Enable or disable clock to ADC
- */
-void clocks_enable_adc_clk(bool enable, int divisor);
-
-/*!
- * \brief Enable or disable clock to Rx daughterboard
- */
-void clocks_enable_rx_dboard(bool enable, int divisor);
-
-
-/*!
- * \brief Enable or disable clock to Tx daughterboard
- */
-void clocks_enable_tx_dboard(bool enable, int divisor);
-
-
-#endif /* INCLUDED_CLOCKS_H */
diff --git a/usrp2/firmware/lib/db.h b/usrp2/firmware/lib/db.h
deleted file mode 100644
index 9c0f41da5..000000000
--- a/usrp2/firmware/lib/db.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Interface to daughterboard code
- */
-
-#ifndef INCLUDED_DB_H
-#define INCLUDED_DB_H
-
-#include <usrp2_types.h>
-
-
-struct db_base;
-
-/* pointers to daughterboard structures */
-extern struct db_base *tx_dboard;
-extern struct db_base *rx_dboard;
-
-
-//! Intermediate tuning information
-
-struct tune_result
-{
-  //! The RF frequency that corresponds to DC in the IF from the daughterboard
-  u2_fxpt_freq_t 	baseband_freq;
-
-  //! The DDC/DUC frequency used to down/up convert to/from the target frequency
-  u2_fxpt_freq_t 	dxc_freq;
-
-  //! Any differerence btwn target and actual (typically < 0.01 Hz)
-  u2_fxpt_freq_t 	residual_freq;
-
-  //! Is the complex baseband spectrum inverted
-  bool			inverted;
-};
-
-
-/*!
- * \brief One-time init at powerup
- *
- *  Sets rx_dboard, tx_dboard and initializes daughterboards.
- */
-void 
-db_init(void);
-
-/*!
- * \brief Set daughterboard LO offset frequency.
- *
- * \param[in] db is the daughterboard instance
- * \param[in] offset is the amount to add to tuning requests
- * \param[out] success or failure
- */
-bool
-db_set_lo_offset(struct db_base *db, u2_fxpt_freq_t offset);
-
-/*!
- * \brief Two stage tuning.  Given target_freq, tune LO and DDC/DUC
- *
- * \param[in] db is the daughterboard instance
- * \param[in] target_freq is the freq to translate the complex baseband to/from.
- * \param[out] result provides details of the resulting configuration.
- * 
- */
-bool
-db_tune(struct db_base *db, u2_fxpt_freq_t target_freq, struct tune_result *result);
-
-
-/*
- * Set only the DDC frequency
- */
-bool
-db_set_ddc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq);
-
-/*
- * Set only the DUC frequency
- */
-bool
-db_set_duc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq);
-
-
-/*!
- * \brief Set gain
- */
-bool
-db_set_gain(struct db_base *db, u2_fxpt_gain_t gain);
-
-bool
-db_set_antenna(struct db_base *db, int ant);
-
-/*!
- * \brief Read the eeprom value from the db, without defaulting to BasicRX/TX
- */
-int
-read_dboard_eeprom(int i2c_addr);
-
-#endif /* INCLUDED_DB_H */
diff --git a/usrp2/firmware/lib/db_base.h b/usrp2/firmware/lib/db_base.h
deleted file mode 100644
index 1945efe0b..000000000
--- a/usrp2/firmware/lib/db_base.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_DB_BASE_H
-#define INCLUDED_DB_BASE_H
-
-#include <usrp2_types.h>
-#include <bool.h>
-
-/*!
- * \brief "base class" for firmware version of daughterboard code
- */
-struct db_base {
-  uint16_t		dbid;		//< daughterboard ID
-
-  uint16_t              is_tx 		  : 1;  //< is this a transmit db?
-  uint16_t		is_quadrature 	  : 1;
-  uint16_t		i_and_q_swapped   : 1;
-  uint16_t		spectrum_inverted : 1;
-
-  uint16_t		output_enables;	//< bitmask of which pins should be outputs from FPGA
-  uint16_t		used_pins;	//< bitmask of pins used by the daughterboard
-
-  u2_fxpt_freq_t	freq_min;	//< min freq that can be set (Hz)
-  u2_fxpt_freq_t	freq_max;	//< max freq that can be set (Hz)
-
-  u2_fxpt_gain_t	gain_min;	//< min gain that can be set (dB)
-  u2_fxpt_gain_t	gain_max;	//< max gain that can be set (dB)
-  u2_fxpt_gain_t	gain_step_size;	//< (dB)
-
-  u2_fxpt_freq_t	default_lo_offset;  //< offset to add to tune frequency, reset value
-  u2_fxpt_freq_t        current_lo_offset;  //< current value of lo_offset
-
-  /*
-   * Auto T/R control values
-   */
-  uint32_t		atr_mask;       //< which bits to control
-  uint32_t		atr_txval;	//< value to use when transmitting
-  uint32_t		atr_rxval;	//< value to use when receiving
-
-  //! delay in clk ticks from when Tx fifo gets data to when T/R switches
-  // uint32_t		atr_tx_delay;
-
-  //! delay in clk ticks from when Tx fifo goes empty to when T/R switches
-  // uint32_t		atr_rx_delay;
-
-  bool	(*init)(struct db_base *);
-  bool	(*set_freq)(struct db_base *, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc);
-  bool	(*set_gain)(struct db_base *, u2_fxpt_gain_t gain);
-  bool	(*set_tx_enable)(struct db_base *, bool on);
-  bool	(*set_antenna)(struct db_base *, int ant);
-};
-
-
-#endif /* INCLUDED_DB_BASE_H */
diff --git a/usrp2/firmware/lib/db_basic.c b/usrp2/firmware/lib/db_basic.c
deleted file mode 100644
index 8f86f060b..000000000
--- a/usrp2/firmware/lib/db_basic.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <db_base.h>
-
-bool db_basic_init(struct db_base *db);
-bool db_basic_set_freq(struct db_base *db, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc);
-bool db_basic_set_gain(struct db_base *db, u2_fxpt_gain_t gain);
-bool db_basic_set_tx_enable(struct db_base *, bool on);
-
-struct db_basic {
-  struct db_base	base;
-};
-
-
-struct db_basic db_basic_tx = {
-  .base.dbid = 0x0000,
-  .base.is_tx = true,
-  .base.output_enables = 0x0000,
-  .base.used_pins = 0x0000,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(-90e9),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(90e9),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.atr_mask = 	0,
-  .base.atr_txval = 	0,
-  .base.atr_rxval =	0,
-  //.base.atr_tx_delay =	0,
-  //.base.atr_rx_delay =	0,
-
-  .base.init = db_basic_init,
-  .base.set_freq = db_basic_set_freq,
-  .base.set_gain = db_basic_set_gain,
-  .base.set_tx_enable = db_basic_set_tx_enable,
-  .base.set_antenna = 0,
-};
-
-struct db_basic db_basic_rx = {
-  .base.dbid = 0x0001,
-  .base.is_tx = false,
-  .base.output_enables = 0x0000,
-  .base.used_pins = 0x0000,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(-90e9),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(90e9),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.is_quadrature = false,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.atr_mask = 	0,
-  .base.atr_txval = 	0,
-  .base.atr_rxval =	0,
-  //.base.atr_tx_delay =	0,
-  //.base.atr_rx_delay =	0,
-
-  .base.init = db_basic_init,
-  .base.set_freq = db_basic_set_freq,
-  .base.set_gain = db_basic_set_gain,
-  .base.set_tx_enable = db_basic_set_tx_enable,
-  .base.set_antenna = 0,
-};
-
-struct db_basic db_lf_tx = {
-  .base.dbid = 0x000e,
-  .base.is_tx = true,
-  .base.output_enables = 0x0000,
-  .base.used_pins = 0x0000,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(-32e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(32e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.atr_mask = 	0,
-  .base.atr_txval = 	0,
-  .base.atr_rxval =	0,
-  //.base.atr_tx_delay =	0,
-  //.base.atr_rx_delay =	0,
-
-  .base.init = db_basic_init,
-  .base.set_freq = db_basic_set_freq,
-  .base.set_gain = db_basic_set_gain,
-  .base.set_tx_enable = db_basic_set_tx_enable,
-  .base.set_antenna = 0,
-};
-
-struct db_basic db_lf_rx = {
-  .base.dbid = 0x000f,
-  .base.is_tx = false,
-  .base.output_enables = 0x0000,
-  .base.used_pins = 0x0000,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(32e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.is_quadrature = false,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.atr_mask = 	0,
-  .base.atr_txval = 	0,
-  .base.atr_rxval =	0,
-  //.base.atr_tx_delay =	0,
-  //.base.atr_rx_delay =	0,
-
-  .base.init = db_basic_init,
-  .base.set_freq = db_basic_set_freq,
-  .base.set_gain = db_basic_set_gain,
-  .base.set_tx_enable = db_basic_set_tx_enable,
-  .base.set_antenna = 0,
-};
-
-
-bool
-db_basic_init(struct db_base *db)
-{
-  return true;
-}
-
-bool
-db_basic_set_freq(struct db_base *db, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc)
-{
-  *dc = 0;
-  return true;
-}
-
-bool
-db_basic_set_gain(struct db_base *db, u2_fxpt_gain_t gain)
-{
-  return true;
-}
-
-bool
-db_basic_set_tx_enable(struct db_base *db, bool on)
-{
-  return true;
-}
-
diff --git a/usrp2/firmware/lib/db_bitshark_rx.c b/usrp2/firmware/lib/db_bitshark_rx.c
deleted file mode 100644
index cf7370ff0..000000000
--- a/usrp2/firmware/lib/db_bitshark_rx.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "db_bitshark_rx.h"
-#include <memory_map.h>
-#include <db_base.h>
-#include <hal_io.h>
-#include <mdelay.h>
-#include <lsdac.h>
-#include <clocks.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <i2c.h>
-
-/* Note: Thie general structure of this file is based on the db_wbxng.c 
-   codebase for the wbx daughterboard. */
-
-/* The following defines specify the address map provided by the
-   Bitshark USRP Rx (BURX) board. These registers are all accessed over I2C. */
-#define RF_CENTER_FREQ_REG 0x00
-#define RF_CHAN_FILTER_BW_REG 0x01
-#define RF_GAIN_REG 0x02
-#define BB_GAIN_REG 0x03
-#define ADF4350_REG 0x10
-#define SKY73202_REG 0x11
-#define CLOCK_SCHEME_REG 0x20
-
-/* The following table lists the registers provided by the Bitshark board 
-   that are accessible over I2C:
-   --------------------------------------------------------
-   |RegAddr: 0x00-RF Center Freq register |
-       |4-bytes 0x00|
-       |4-byte unsigned RF center freq (in KHz)|
-   |RegAddr: 0x01-RF channel filter bandwidth register |
-       |4-bytes 0x00|
-       |4-byte unsigned RF channel filter bw (in KHz)|
-   |RegAddr: 0x02-RF gain register |
-       |7-bytes 0x00|
-       |1-byte signed RF gain (in dB)|
-   |RegAddr: 0x03-Baseband gain register |
-       |4-bytes 0x00|
-       |4-byte signed baseband filter gain (in dB)|
-   |RegAddr: 0x10-ADF4350 register |
-       |4-bytes 0x00|
-       |4-byte ADF4350 register value (actual ADF4350 reg addr embedded 
-        within 4-byte value)|
-   |RegAddr: 0x11-SKY73202 register |
-       |5-bytes 0x00|
-       |1-byte reg 0 of SKY73202 |
-       |1-byte reg 1 of SKY73202 |
-       |1-byte reg 2 of SKY73202 |
-   |RegAddr: 0x20-Clock Scheme |
-       |3-bytes 0x00|
-       |1-byte indicating clocking scheme:
-        -0x00 -> BURX local TCXO off, BURX accepts ref clock from
-	         USRP2 (freq of USRP2's ref clock specified in bytes 2-5)
-	-0x01 -> BURX local TCXO on, BURX uses its local TCXO as its ref
-	         clock, TCXO signal output for use as phase lock for USRP2 |
-       |4-byte USRP2 ref clock freq in hz (only needed if byte 1 set to 0x00) |
-       
-  ---------------------------------------------------------------------------
-   
-   As an example, lets say the client wants to set an RF center freq of
-   1000 MHz.  In KHz, this translates to 1000000 (resolution is only down to
-   steps of 1 KHz), which is 0x000F4240 in hex.  So the complete 9-byte I2C 
-   sequence that the client should send is as follows:
-   byte 0: 0x00-register 0x00 is the target of the write operation
-   bytes 1-4: 0x00 (padding)
-   byte 5: 0x00 (MSB of the 1000000 KHz value, in hex)
-   byte 6: 0x0F
-   byte 7: 0x42
-   byte 8: 0x40 (LSB of the 1000000 KHz value, in hex)
-   
-   How about another example...lets say the client wants to setup the clock
-   scheme to use scheme #1 where the 26 MHz TCXO on the BURX board is enabled,
-   and is provided to the USRP2 for it to phase lock to it as an external ref.  
-   26 MHz (i.e. 26 million), in hex, is 0x18CBA80.
-   So the complete 9-byte I2C sequence that the client should send is as follows:
-   byte 0: 0x20-register 0x20 is the target of the write operation
-   bytes 1-3: 0x00 (padding)
-   byte 4: 0x01 (indicating that clock scheme #1 is wanted)
-   byte 5: 0x01 (MSB of the BURX ref clk freq)
-   byte 6: 0x8C
-   byte 7: 0xBA
-   byte 8: 0x80 (LSB of the BURX ref clk freq)
-
-   Note: The endian-ness of 4-byte values used in I2C cmds is different on 
-   USRP2 compared to USRP1.
-   
-*/
-
-#define NUM_BYTES_IN_I2C_CMD 9
-#define I2C_ADDR 0x47
-
-bool bitshark_rx_init(struct db_base *dbb);
-bool bitshark_rx_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc);
-bool bitshark_rx_set_gain(struct db_base *dbb, u2_fxpt_gain_t gain);
-bool bitshark_rx_set_bw(struct db_base *dbb, uint16_t bw);
-
-static bool set_clock_scheme(uint8_t clock_scheme, uint32_t ref_clk_freq);
-
-/*
- * The class instances
- */
-struct db_bitshark_rx db_bitshark_rx = {
-    .base.dbid = 0x0070,
-    .base.is_tx = false,
-    .base.output_enables = 0x0000,
-    .base.used_pins = 0x0000,
-    .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(300e6),
-    .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(4000e6),
-    .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-    .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(42),
-    .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(6),
-    .base.is_quadrature = true,
-    .base.i_and_q_swapped = true,
-    .base.spectrum_inverted = false,
-    .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-    .base.init = bitshark_rx_init,
-    .base.set_freq = bitshark_rx_set_freq,
-    .base.set_gain = bitshark_rx_set_gain,
-    .base.set_tx_enable = 0,
-    .base.atr_mask = 0x0000,
-    .base.atr_txval = 0,
-    .base.atr_rxval = 0,
-    .base.set_antenna = 0,
-    .extra.bw_min = 660, /* in KHz, so 660 KHz */
-    .extra.bw_max = 56000, /* in KHz, so 56 MHz */
-    .extra.set_bw = bitshark_rx_set_bw
-};
-
-bool
-bitshark_rx_init(struct db_base *dbb)
-{
-    struct db_bitshark_rx_dummy *db = (struct db_bitshark_rx_dummy *) dbb;    
-
-    clocks_enable_rx_dboard(true, 0);
-    /* hal_gpio_write( GPIO_RX_BANK, ENABLE_5|ENABLE_33, ENABLE_5|ENABLE_33 ); */
-    /* above isn't needed, since we don't have any GPIO from the FPGA */
-    
-    /* setup the clock scheme to accept the USRP2's 100 MHz ref clk */
-    set_clock_scheme(0,100000000);
-
-    /* initial setting of gain */
-    dbb->set_gain(dbb,U2_DOUBLE_TO_FXPT_GAIN(20.0));
-
-    /* Set the freq now to get the one time 10ms delay out of the way. */
-    u2_fxpt_freq_t	dc;
-    dbb->set_freq(dbb, dbb->freq_min, &dc);
-
-    /* set up the RF bandwidth of the signal of interest...Note: there
-       doesn't appear to be a standard way of setting this bandwidth
-       in USRP2-land (compared to USRP1-land, where we have the
-       straight-forward set_bw() method).  Not sure why this is, but
-       for now, simply set the bandwidth once for the intended
-       application. */
-    db->extra.set_bw(dbb, 25000);  /* 25 MHz channel bw */
-
-    return true;
-}
-
-bool
-bitshark_rx_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc)
-{
-    struct db_bitshark_rx_dummy *db = (struct db_bitshark_rx_dummy *) dbb;    
-    unsigned char args[NUM_BYTES_IN_I2C_CMD];
-    unsigned char val[4];
-    uint32_t freq_in_hz = (uint32_t)(u2_fxpt_freq_round_to_uint(freq));
-    uint32_t freq_div_5mhz = freq_in_hz/5000000;
-    uint32_t freq_rounded_to_5mhz_in_khz = freq_div_5mhz*5000;
-    uint64_t freq_rounded_to_5mhz_in_hz = ((uint64_t)freq_rounded_to_5mhz_in_khz)*1000;
-    uint64_t temp;
-   
-    if(!(freq>=db->base.freq_min && freq<=db->base.freq_max)) 
-    {
-	return false;
-    }
-
-    /* There is a bug in the BURX firmware where tuning to frequencies
-       above 2.2 GHz will result in a small final frequency error
-       (up to a few KHz).  This bug is due to an overflow of a 16-bit
-       value when the input reference clock is sufficiently high (such
-       as the 100 MHz clock used on the USRP2), AND the requested tuning
-       frequency is not a multiple of 5 MHz.  A fix for the BURX firmware
-       is available from Epiq Solutions, but requires an AVR microcontroller 
-       programmer to update the firmware on the BURX card directly.  An 
-       alternate solution is to enforce a policy where the BURX card only
-       tunes to frequencies that are multiples of 5 MHz, and uses the
-       DDC in the FPGA to perform any fine-tuning less than 5 MHz.  So
-       an application can still request an abribrary RF tuning frequency,
-       but the BURX card will be directed to tune to the next lowest
-       multiple of 5 MHz, and return the DC-centered freq to the calling
-       function to allow the DDC in the FPGA to perform the final 
-       down-conversion digitally.  This policy also reduces the overall
-       spurious content due to the LO synthesizer, as the Frac-N portion
-       of the ADF4350 synthesizer isn't being invoked in modes where
-       high spur content would be seen. */
-    
-    memset(args,0x00,NUM_BYTES_IN_I2C_CMD);
-    memcpy(val,&freq_rounded_to_5mhz_in_khz,4);
-    args[0] = RF_CENTER_FREQ_REG;
-    args[5] = val[3];
-    args[6] = val[2];
-    args[7] = val[1];
-    args[8] = val[0];
-    
-    i2c_write(I2C_ADDR, args, NUM_BYTES_IN_I2C_CMD);
-    /* Add a brief delay after each command.  This only seems to be
-       necessary when sending a sequence of commands one after the other.
-       This issue appears to be specific to the USRP2, since it isn't
-       necessary on the USRP1.  The 5 mS delay is a bit of 
-       an emperical compromise: too short (say, 1 mS), and every once
-       in a great while a command will still be magically dropped on its
-       way out...too long (say, 500 mS) and higher-level apps such as
-       usrp2_fft.py seem to choke because the init sequence is taking
-       too long.  So 5 mS was tested repeatedly without error, and deemed
-       reasonable. Not sure if this is an issue with the I2C master
-       code in the microblaze or some place else, and I hate magic
-       delays too, but this seems to be stable. */
-    mdelay(5);
-
-    /* shift the value up so that it is represented properly in the fixed
-       point mode...
-    */
-    temp = freq_rounded_to_5mhz_in_hz << U2_FPF_RP;
-
-
-    *dc = (u2_fxpt_freq_t)temp;
-    return true;
-}
-
-bool
-bitshark_rx_set_gain(struct db_base *dbb, u2_fxpt_gain_t gain)
-{
-    struct db_bitshark_rx_dummy *db = (struct db_bitshark_rx_dummy *) dbb;
-    
-    unsigned char args[NUM_BYTES_IN_I2C_CMD];
-    uint8_t final_gain = (uint8_t)(u2_fxpt_gain_round_to_int(gain));
-    
-    if(!(gain >= db->base.gain_min && gain <= db->base.gain_max)) 
-    {
-	return false;
-    }
-    
-    memset(args,0x00,NUM_BYTES_IN_I2C_CMD);
-    args[0] = RF_GAIN_REG;
-    args[5] = final_gain;
-
-    i2c_write(I2C_ADDR, args, NUM_BYTES_IN_I2C_CMD);
-    /* Add a brief delay after each command.  This only seems to be
-       necessary when sending a sequence of commands one after the other.
-       This issue appears to be specific to the USRP2, since it isn't
-       necessary on the USRP1.  The 5 mS delay is a bit of 
-       an emperical compromise: too short (say, 1 mS), and every once
-       in a great while a command will still be magically dropped on its
-       way out...too long (say, 500 mS) and higher-level apps such as
-       usrp2_fft.py seem to choke because the init sequence is taking
-       too long.  So 5 mS was tested repeatedly without error, and deemed
-       reasonable. Not sure if this is an issue with the I2C master
-       code in the microblaze or some place else, and I hate magic
-       delays too, but this seems to be stable. */
-    mdelay(5);
-
-    return true;
-}
-
-bool
-bitshark_rx_set_bw(struct db_base *dbb, uint16_t bw_in_khz)
-{
-    struct db_bitshark_rx_dummy *db = (struct db_bitshark_rx_dummy *) dbb;
-    unsigned char val[2];
-    unsigned char args[NUM_BYTES_IN_I2C_CMD];
-    
-    if(!(bw_in_khz >= db->extra.bw_min && bw_in_khz <= db->extra.bw_max)) 
-    {
-	return false;
-    }
-    
-    memset(args,0x00,NUM_BYTES_IN_I2C_CMD);
-    memcpy(val,&bw_in_khz,2);
-    args[0] = RF_CHAN_FILTER_BW_REG;
-    args[5] = val[1];
-    args[6] = val[0];
-
-    i2c_write(I2C_ADDR, args, NUM_BYTES_IN_I2C_CMD);
-    /* Add a brief delay after each command.  This only seems to be
-       necessary when sending a sequence of commands one after the other.
-       This issue appears to be specific to the USRP2, since it isn't
-       necessary on the USRP1.  The 5 mS delay is a bit of 
-       an emperical compromise: too short (say, 1 mS), and every once
-       in a great while a command will still be magically dropped on its
-       way out...too long (say, 500 mS) and higher-level apps such as
-       usrp2_fft.py seem to choke because the init sequence is taking
-       too long.  So 5 mS was tested repeatedly without error, and deemed
-       reasonable. Not sure if this is an issue with the I2C master
-       code in the microblaze or some place else, and I hate magic
-       delays too, but this seems to be stable. */
-    mdelay(5);
-
-    return true;
-}
-
-static bool
-set_clock_scheme(uint8_t clock_scheme, uint32_t ref_clk_freq)
-{
-    /* Set the clock scheme for determining how the BURX
-       dboard receives its clock.  For the USRP2, there is really only
-       one way of doing this, which is to use the 100 MHz ref clk
-       on the USRP2 as its reference.  However, it is possible to
-       use the BURX's 26 MHz TCXO as the external reference input to
-       the USRP, which would provide phase lock between our oscillator
-       and the USRP's 100 MHz oscillator.  And since the BURX board
-       provides the ability to warp the oscillator, this may be
-       useful to some folks.  Otherwise, the BURX board will always
-       just take the 100 MHz reference from the USRP2 as its reference.
-    */
-    
-    unsigned char args[NUM_BYTES_IN_I2C_CMD];
-    char val[4];
-
-    if (clock_scheme > 1) 
-    {
-	return false;
-    }
-
-    memcpy(val,&ref_clk_freq,4);
-    args[0] = CLOCK_SCHEME_REG;
-    args[4] = clock_scheme;
-    args[5] = val[3];
-    args[6] = val[2];
-    args[7] = val[1];
-    args[8] = val[0];
-
-    i2c_write(I2C_ADDR, args, NUM_BYTES_IN_I2C_CMD);
-    /* Add a brief delay after each command.  This only seems to be
-       necessary when sending a sequence of commands one after the other.
-       This issue appears to be specific to the USRP2, since it isn't
-       necessary on the USRP1.  The 5 mS delay is a bit of 
-       an emperical compromise: too short (say, 1 mS), and every once
-       in a great while a command will still be magically dropped on its
-       way out...too long (say, 500 mS) and higher-level apps such as
-       usrp2_fft.py seem to choke because the init sequence is taking
-       too long.  So 5 mS was tested repeatedly without error, and deemed
-       reasonable. Not sure if this is an issue with the I2C master
-       code in the microblaze or some place else, and I hate magic
-       delays too, but this seems to be stable. */
-    mdelay(5);
-
-    return true;
-}
-
diff --git a/usrp2/firmware/lib/db_bitshark_rx.h b/usrp2/firmware/lib/db_bitshark_rx.h
deleted file mode 100644
index 3651f27b8..000000000
--- a/usrp2/firmware/lib/db_bitshark_rx.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef DB_BITSHARK_RX_H
-#define DB_BITSHARK_RX_H
-
-#include <db_base.h>
-
-struct db_bitshark_rx_extra 
-{
-    uint16_t bw_min;
-    uint16_t bw_max;
-    bool     (*set_bw)(struct db_base *, uint16_t bw);
-	
-};
-
-struct db_bitshark_rx_dummy 
-{
-  struct db_base	base;
-  struct db_bitshark_rx_extra	extra;
-};
-
-
-struct db_bitshark_rx 
-{
-  struct db_base	base;
-  struct db_bitshark_rx_extra extra;
-};
-
-
-#endif /* DB_BITSHARK_RX_H */
diff --git a/usrp2/firmware/lib/db_dbsrx.c b/usrp2/firmware/lib/db_dbsrx.c
deleted file mode 100644
index ce1300bf2..000000000
--- a/usrp2/firmware/lib/db_dbsrx.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <i2c.h>
-#include <db_base.h>
-#include <lsdac.h>
-#include <memory_map.h>
-#include <clocks.h>
-#include <stdio.h>
-#include <hal_io.h>
-
-#define min(X,Y) ((X) < (Y) ? (X) : (Y))
-#define max(X,Y) ((X) > (Y) ? (X) : (Y))
-#define abs(X) ((X) < (0) ? ((-1)*(X)) : (X))
-
-#define I2C_ADDR 0x67
-#define REFCLK_DIVISOR 25   // Gives a 4 MHz clock
-#define REFCLK_FREQ U2_DOUBLE_TO_FXPT_FREQ(MASTER_CLK_RATE/REFCLK_DIVISOR)
-#define REFCLK_FREQ_INT u2_fxpt_freq_round_to_int(REFCLK_FREQ)
-
-#define VMAXGAIN .75
-#define VMINGAIN 2.6
-#define RFGAINMAX 60
-#define BBGAINMAX 24
-#define DACFULLSCALE 3.3
-
-bool db_dbsrx_init(struct db_base *db);
-bool db_dbsrx_set_freq(struct db_base *db, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc);
-bool db_dbsrx_set_gain(struct db_base *db, u2_fxpt_gain_t gain);
-
-struct db_dbsrx_common {
-  int d_n;
-  int d_div2;
-  int d_osc;
-  int d_cp;
-  int d_r_reg;
-  int d_fdac;
-  int d_m;
-  int d_dl;
-  int d_ade;
-  int d_adl;
-  int d_gc2;
-  int d_diag;
-};
-
-struct db_dbsrx_dummy {
-  struct db_base base;
-  struct db_dbsrx_common common;
-};
-
-struct db_dbsrx {
-  struct db_base base;
-  struct db_dbsrx_common common;
-};
-
-struct db_dbsrx db_dbsrx = {
-  .base.dbid = 0x000d,
-  .base.is_tx = false,
-  .base.output_enables = 0x0000,
-  .base.used_pins = 0x0000,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(500e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(2.6e9),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(RFGAINMAX+BBGAINMAX),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(1),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = db_dbsrx_init,
-  .base.set_freq = db_dbsrx_set_freq,
-  .base.set_gain = db_dbsrx_set_gain,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = 0x0000,
-  .base.atr_txval = 0,
-  .base.atr_rxval = 0,
-  //.base.atr_tx_delay =
-  //.base.atr_rx_delay =
-  .common.d_n = 950,
-  .common.d_div2 = 0,
-  .common.d_osc = 5,
-  .common.d_cp = 3,
-  .common.d_r_reg = 1,
-  .common.d_fdac = 127,
-  .common.d_m = 2,
-  .common.d_dl = 1,
-  .common.d_ade = 0,
-  .common.d_adl = 0,
-  .common.d_gc2 = 31,
-  .common.d_diag = 0,
-  .base.set_antenna = 0,
-};
-
-bool
-db_dbsrx_init(struct db_base *dbb){
-  struct db_dbsrx_dummy *db = (struct db_dbsrx_dummy *) dbb;
-  db->base.set_gain(dbb, (db->base.gain_max + db->base.gain_min)/2);
-  clocks_enable_rx_dboard(true, REFCLK_DIVISOR);  // Gives 4 MHz clock
-
-  return true;
-}
-
-/**************************************************
- * Registers
- **************************************************/
-static int
-_read_adc (void){
-  unsigned char readback[2];
-  i2c_read(I2C_ADDR, readback, 2*sizeof(unsigned char));
-  int adc_val = (readback[0] >> 2)&7;
-  //printf("READBACK[0] %d, [1] %d\n",readback[0],readback[1]);
-  //printf("ADC: %d\n",adc_val);
-  return adc_val;
-}
-
-static void
-_write_reg (int regno, int v){
-  //regno is in [0,5], v is value to write to register"""
-  unsigned char args[2];
-  args[0] = (unsigned char)regno;
-  args[1] = (unsigned char)v;
-  i2c_write(I2C_ADDR, args, 2*sizeof(unsigned char));
-  //printf("Reg %d, Val %x\n",regno,v);
-}
-
-static void _send_reg_0(struct db_dbsrx_dummy *db){
-  _write_reg(0,(db->common.d_div2<<7) + (db->common.d_n>>8));
-}
-
-static void _send_reg_1(struct db_dbsrx_dummy *db){
-  _write_reg(1,db->common.d_n & 255);
-}
-
-static void _send_reg_2(struct db_dbsrx_dummy *db){
-  _write_reg(2,db->common.d_osc + (db->common.d_cp<<3) + (db->common.d_r_reg<<5));
-}
-
-static void _send_reg_3(struct db_dbsrx_dummy *db){
-  _write_reg(3,db->common.d_fdac);
-}
-
-static void _send_reg_4(struct db_dbsrx_dummy *db){
-  _write_reg(4,db->common.d_m + (db->common.d_dl<<5) + (db->common.d_ade<<6) + (db->common.d_adl<<7));
-}
-
-static void _send_reg_5(struct db_dbsrx_dummy *db){
-  _write_reg(5,db->common.d_gc2 + (db->common.d_diag<<5));
-}
-
-/**************************************************
- * Helpers for setting the freq
- **************************************************/
-static void
-_set_div2(struct db_dbsrx_dummy *db, int div2){
-  db->common.d_div2 = div2;
-  _send_reg_0(db);
-}
-
-// FIXME  How do we handle ADE and ADL properly?
-static void
-_set_ade(struct db_dbsrx_dummy *db, int ade){
-  db->common.d_ade = ade;
-  _send_reg_4(db);
-}
-
-static void
-_set_r(struct db_dbsrx_dummy *db, int r){
-  db->common.d_r_reg = r;
-  _send_reg_2(db);
-}
-
-static void
-_set_n(struct db_dbsrx_dummy *db, int n){
-  db->common.d_n = n;
-  _send_reg_0(db);
-  _send_reg_1(db);
-}
-
-static void
-_set_osc(struct db_dbsrx_dummy *db, int osc){
-  db->common.d_osc = osc;
-  _send_reg_2(db);
-}
-
-static void
-_set_cp(struct db_dbsrx_dummy *db, int cp){
-  db->common.d_cp = cp;
-  _send_reg_2(db);
-}
-
-/**************************************************
- * Set the freq
- **************************************************/
-
-
-bool
-db_dbsrx_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc){
-  struct db_dbsrx_dummy *db = (struct db_dbsrx_dummy *) dbb;
-
-  if(!(freq>=db->base.freq_min && freq<=db->base.freq_max)) {
-    return false;
-  }
-
-  u2_fxpt_freq_t vcofreq;
-  if(freq < U2_DOUBLE_TO_FXPT_FREQ(1150e6)) {
-    _set_div2(db, 0);
-    vcofreq = 4 * freq;
-  }
-  else {
-    _set_div2(db, 1);
-    vcofreq = 2 * freq;
-  }
-  
-  _set_ade(db, 1);
-  int rmin = max(2, u2_fxpt_freq_round_to_int(REFCLK_FREQ/2e6)); //TODO? remove max()
-  //int rmax = min(128, u2_fxpt_freq_round_to_int(REFCLK_FREQ/500e3)); //TODO? remove min()
-  int n = 0;
-  u2_fxpt_freq_t best_delta = U2_DOUBLE_TO_FXPT_FREQ(10e6);
-  u2_fxpt_freq_t delta;
-
-  int r_reg = 0;
-  while ((r_reg<7) && ((2<<r_reg) < rmin)) {
-    r_reg++;
-  }
-  //printf ("r_reg = %d, r = %d\n",r_reg,2<<r_reg);
-  int best_r = r_reg;
-  int best_n = 0;
-
-  while(r_reg <= 7) {
-    n = u2_fxpt_freq_round_to_int(freq/REFCLK_FREQ_INT*(2<<r_reg));
-    //printf("LOOP: r_reg %d, best_r %d, best_n %d, best_delta %d\n",
-    //r_reg,best_r,best_n,u2_fxpt_freq_round_to_int(best_delta));
-
-    //printf("N: %d\n",n);
-    if(n<256) {
-      r_reg++;
-      continue;
-    }
-    delta = abs(n*REFCLK_FREQ/(2<<r_reg) - freq);
-    if(delta < best_delta) {
-      best_r = r_reg;
-      best_n = n;
-      best_delta = delta;
-    }
-    if(best_delta < U2_DOUBLE_TO_FXPT_FREQ(75e3)) {
-      break;
-    }
-    r_reg++;
-  }
-
-  //printf("BEST R: %d  Best Delta %d  Best N %d\n",
-  // best_r,u2_fxpt_freq_round_to_int(best_delta),best_n);
-  _set_r(db, best_r);
-  _set_n(db, best_n);
- 
-  int vco;
-  if(vcofreq < U2_DOUBLE_TO_FXPT_FREQ(2433e6))
-    vco = 0;
-  else if(vcofreq < U2_DOUBLE_TO_FXPT_FREQ(2711e6))
-    vco=1;
-  else if(vcofreq < U2_DOUBLE_TO_FXPT_FREQ(3025e6))
-    vco=2;
-  else if(vcofreq < U2_DOUBLE_TO_FXPT_FREQ(3341e6))
-    vco=3;
-  else if(vcofreq < U2_DOUBLE_TO_FXPT_FREQ(3727e6))
-    vco=4;
-  else if(vcofreq < U2_DOUBLE_TO_FXPT_FREQ(4143e6))
-    vco=5;
-  else if(vcofreq < U2_DOUBLE_TO_FXPT_FREQ(4493e6))
-    vco=6;
-  else
-    vco=7;
-  //printf("Initial VCO choice %d\n",vco);  
-  _set_osc(db, vco);
-  
-
-  int adc_val = 0;
-  while(adc_val == 0 || adc_val == 7) {
-    adc_val = _read_adc();
-    //printf("adc %d\n",adc_val);
-
-    if(adc_val == 0) {
-      if(vco <= 0) {
-        return false;
-      }
-      else {
-        vco = vco - 1;
-      }
-    }
-    else if(adc_val == 7) {
-      if(vco >= 7) {
-        return false;
-      }
-      else {
-        vco = vco + 1;
-      }
-    }
-    _set_osc(db, vco);
-  }
-  
-  if(adc_val == 1 || adc_val == 2) {
-    _set_cp(db, 1);
-  }
-  else if(adc_val == 3 || adc_val == 4) {
-    _set_cp(db, 2);
-  }
-  else {
-    _set_cp(db, 3);
-  }
-  //printf("Final VCO choice %d\n",vco);  
-
-  *dc = db->common.d_n * REFCLK_FREQ / (2<<db->common.d_r_reg);
-  return true;
- 
-}
-
-/**************************************************
- * Helpers for setting the gain
- **************************************************/
-
-static void
-_set_gc2(struct db_dbsrx_dummy *db, int gc2){
-  db->common.d_gc2 = gc2;
-  _send_reg_5(db);
-}
-
-/**************************************************
- * Set the gain
- **************************************************/
-bool
-db_dbsrx_set_gain(struct db_base *dbb, u2_fxpt_gain_t gain){
-  struct db_dbsrx_dummy *db = (struct db_dbsrx_dummy *) dbb;
-  
-  u2_fxpt_gain_t rfgain, bbgain;
-
-  if(!(gain >= db->base.gain_min && gain <= db->base.gain_max)) {
-    return false;
-  }
-  
-  if(gain < U2_DOUBLE_TO_FXPT_GAIN(RFGAINMAX)) {
-    rfgain = gain;
-    bbgain = 0;
-  }
-  else {
-    rfgain = U2_DOUBLE_TO_FXPT_GAIN(RFGAINMAX);
-    bbgain = gain - U2_DOUBLE_TO_FXPT_GAIN(RFGAINMAX);
-  }
-
-  int rf_gain_slope_q8 = 256 * 4096 * (VMAXGAIN-VMINGAIN) / RFGAINMAX / DACFULLSCALE;
-  int rf_gain_offset_q8 = 128 * 256 * 4096 * VMINGAIN / DACFULLSCALE;
-  
-  int rfdac = (rfgain*rf_gain_slope_q8 + rf_gain_offset_q8)>>15;
-
-  //printf("Set RF Gain %d, %d\n",rfgain,rfdac);
-  lsdac_write_rx(1,rfdac);
-  
-  // Set GC2
-  int bb_gain_slope_q8 = 256*(0-31)/(BBGAINMAX-0);
-
-  int gc2 = u2_fxpt_gain_round_to_int((bb_gain_slope_q8 * bbgain)>>8) + 31;
-  //printf("Set BB Gain: %d, gc2 %d\n",bbgain,gc2);
-
-  _set_gc2(db, gc2);
-
-  return true;
-}
-
-/**************************************************
- * Helpers for setting the bw
- **************************************************/
-static void
-_set_m(struct db_dbsrx_dummy *db, int m){
-  db->common.d_m = m;
-  _send_reg_4(db);
-}
-  
-static void
-_set_fdac(struct db_dbsrx_dummy *db, int fdac){
-  db->common.d_fdac = fdac;
-  _send_reg_3(db);
-}
diff --git a/usrp2/firmware/lib/db_init.c b/usrp2/firmware/lib/db_init.c
deleted file mode 100644
index d58badc9e..000000000
--- a/usrp2/firmware/lib/db_init.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <memory_map.h>
-#include <i2c.h>
-#include <usrp2_i2c_addr.h>
-#include <string.h>
-#include <stdio.h>
-#include <db.h>
-#include <db_base.h>
-#include <hal_io.h>
-#include <nonstdio.h>
-
-
-struct db_base *tx_dboard;	// the tx daughterboard that's installed
-struct db_base *rx_dboard;	// the rx daughterboard that's installed
-
-extern struct db_base db_basic_tx;
-extern struct db_base db_basic_rx;
-extern struct db_base db_lf_tx;
-extern struct db_base db_lf_rx;
-extern struct db_base db_rfx_400_tx;
-extern struct db_base db_rfx_400_rx;
-extern struct db_base db_rfx_900_tx;
-extern struct db_base db_rfx_900_rx;
-extern struct db_base db_rfx_1200_tx;
-extern struct db_base db_rfx_1200_rx;
-extern struct db_base db_rfx_1800_tx;
-extern struct db_base db_rfx_1800_rx;
-extern struct db_base db_rfx_2400_tx;
-extern struct db_base db_rfx_2400_rx;
-extern struct db_base db_wbxng_rx;
-extern struct db_base db_wbxng_tx;
-extern struct db_base db_tvrx1;
-extern struct db_base db_tvrx2;
-extern struct db_base db_tvrx3;
-extern struct db_base db_dbsrx;
-extern struct db_base db_bitshark_rx;
-
-struct db_base *all_dboards[] = {
-  &db_basic_tx,
-  &db_basic_rx,
-  &db_lf_tx,
-  &db_lf_rx,
-  &db_rfx_400_tx,
-  &db_rfx_400_rx,
-  &db_rfx_900_tx,
-  &db_rfx_900_rx,
-  &db_rfx_1200_tx,
-  &db_rfx_1200_rx,
-  &db_rfx_1800_tx,
-  &db_rfx_1800_rx,
-  &db_rfx_2400_tx,
-  &db_rfx_2400_rx,
-  &db_tvrx1,
-#if 0
-  &db_tvrx2,
-#endif
-  &db_tvrx3,
-  &db_dbsrx,
-  &db_bitshark_rx,
-  0
-};
-
-
-typedef enum { UDBE_OK, UDBE_NO_EEPROM, UDBE_INVALID_EEPROM } usrp_dbeeprom_status_t;
-
-static usrp_dbeeprom_status_t
-read_raw_dboard_eeprom (unsigned char *buf, int i2c_addr)
-{
-  if (!eeprom_read (i2c_addr, 0, buf, DB_EEPROM_CLEN))
-    return UDBE_NO_EEPROM;
-
-  if (buf[DB_EEPROM_MAGIC] != DB_EEPROM_MAGIC_VALUE)
-    return UDBE_INVALID_EEPROM;
-
-  int sum = 0;
-  unsigned int i;
-  for (i = 0; i < DB_EEPROM_CLEN; i++)
-    sum += buf[i];
-
-  if ((sum & 0xff) != 0)
-    return UDBE_INVALID_EEPROM;
-
-  return UDBE_OK;
-}
-
-
-/*
- * Return DBID, -1 <none> or -2 <invalid eeprom contents>
- */
-int
-read_dboard_eeprom(int i2c_addr)
-{
-  unsigned char buf[DB_EEPROM_CLEN];
-
-  usrp_dbeeprom_status_t s = read_raw_dboard_eeprom (buf, i2c_addr);
-
-  //printf("\nread_raw_dboard_eeprom: %d\n", s);
-
-  switch (s){
-  case UDBE_OK:
-    return (buf[DB_EEPROM_ID_MSB] << 8) | buf[DB_EEPROM_ID_LSB];
-
-  case UDBE_NO_EEPROM:
-  default:
-    return -1;
-
-  case UDBE_INVALID_EEPROM:
-    return -2;
-  }
-}
-
-
-static struct db_base *
-lookup_dbid(int dbid)
-{
-  if (dbid < 0)
-    return 0;
-
-  int i;
-  for (i = 0; all_dboards[i]; i++)
-    if (all_dboards[i]->dbid == dbid)
-      return all_dboards[i];
-
-  return 0;
-}
-
-static struct db_base *
-lookup_dboard(int i2c_addr, struct db_base *default_db, char *msg)
-{
-  struct db_base *db;
-  int dbid = read_dboard_eeprom(i2c_addr);
-
-  // FIXME removing this printf has the system hang if there are two d'boards
-  // installed.  (I think the problem is in i2c_read/write or the way
-  // I kludge the zero-byte write to set the read address in eeprom_read.)
-  printf("%s dbid: 0x%x\n", msg, dbid);
-
-  if (dbid < 0){	// there was some kind of problem.  Treat as Basic Tx
-    return default_db;
-  }
-  else if ((db = lookup_dbid(dbid)) == 0){
-    printf("No daugherboard code for dbid = 0x%x\n", dbid);
-    return default_db;
-  }
-  return db;
-}
-
-void
-set_atr_regs(int bank, struct db_base *db)
-{
-  uint32_t	val[4];
-  int		shift;
-  int		mask;
-  int		i;
-
-  val[ATR_IDLE] = db->atr_rxval;
-  val[ATR_RX]   = db->atr_rxval;
-  val[ATR_TX]   = db->atr_txval;
-  val[ATR_FULL] = db->atr_txval;
-
-  if (bank == GPIO_TX_BANK){
-    mask = 0xffff0000;
-    shift = 16;
-  }
-  else {
-    mask = 0x0000ffff;
-    shift = 0;
-  }
-
-  for (i = 0; i < 4; i++){
-    int t = (atr_regs->v[i] & ~mask) | ((val[i] << shift) & mask);
-    //printf("atr_regs[%d] = 0x%x\n", i, t);
-    atr_regs->v[i] = t;
-  }
-}
-
-static void
-set_gpio_mode(int bank, struct db_base *db)
-{
-  int	i;
-
-  hal_gpio_set_ddr(bank, db->output_enables, 0xffff);
-  set_atr_regs(bank, db);
-
-  for (i = 0; i < 16; i++){
-    if (db->used_pins & (1 << i)){
-      // set to either GPIO_SEL_SW or GPIO_SEL_ATR
-      hal_gpio_set_sel(bank, i, (db->atr_mask & (1 << i)) ? 'a' : 's');
-    }
-  }
-}
-
-static int __attribute__((unused))
-determine_tx_mux_value(struct db_base *db) 
-{
-  if (db->i_and_q_swapped)
-    return 0x01;
-  else
-    return 0x10;
-}
-
-static int
-determine_rx_mux_value(struct db_base *db)
-{
-#define	ADC0 0x0
-#define	ADC1 0x1
-#define ZERO 0x2
-  
-  static int truth_table[8] = {
-    /* swap_iq, uses */
-    /* 0, 0x0 */    (ZERO << 2) | ZERO,		// N/A
-    /* 0, 0x1 */    (ZERO << 2) | ADC0,
-    /* 0, 0x2 */    (ZERO << 2) | ADC1,
-    /* 0, 0x3 */    (ADC1 << 2) | ADC0,
-    /* 1, 0x0 */    (ZERO << 2) | ZERO,		// N/A
-    /* 1, 0x1 */    (ZERO << 2) | ADC0,
-    /* 1, 0x2 */    (ZERO << 2) | ADC1,
-    /* 1, 0x3 */    (ADC0 << 2) | ADC1,
-  };
-
-  int	subdev0_uses;
-  int	subdev1_uses;
-  int	uses;
-
-  if (db->is_quadrature)
-    subdev0_uses = 0x3;		// uses A/D 0 and 1
-  else
-    subdev0_uses = 0x1;		// uses A/D 0 only
-
-  // FIXME second subdev on Basic Rx, LF RX
-  // if subdev2 exists
-  // subdev1_uses = 0x2;
-  subdev1_uses = 0;
-
-  uses = subdev0_uses;
-
-  int swap_iq = db->i_and_q_swapped & 0x1;
-  int index = (swap_iq << 2) | uses;
-
-  return truth_table[index];
-}
-
-
-void
-db_init(void)
-{
-  int	m;
-
-  tx_dboard = lookup_dboard(I2C_ADDR_TX_A, &db_basic_tx, "Tx");
-  //printf("db_init: tx dbid = 0x%x\n", tx_dboard->dbid);
-  set_gpio_mode(GPIO_TX_BANK, tx_dboard);
-  tx_dboard->init(tx_dboard);
-  m = determine_tx_mux_value(tx_dboard);
-  dsp_tx_regs->tx_mux = m;
-  //printf("tx_mux = 0x%x\n", m);
-  tx_dboard->current_lo_offset = tx_dboard->default_lo_offset;
-
-  rx_dboard = lookup_dboard(I2C_ADDR_RX_A, &db_basic_rx, "Rx");
-  //printf("db_init: rx dbid = 0x%x\n", rx_dboard->dbid);
-  set_gpio_mode(GPIO_RX_BANK, rx_dboard);
-  rx_dboard->init(rx_dboard);
-  m = determine_rx_mux_value(rx_dboard);
-  dsp_rx_regs->rx_mux = m;
-  //printf("rx_mux = 0x%x\n", m);
-  rx_dboard->current_lo_offset = rx_dboard->default_lo_offset;
-}
-
-/*!
- *  Calculate the frequency to use for setting the digital down converter.
- *
- *  \param[in] target_freq   desired RF frequency (Hz)
- *  \param[in] baseband_freq the RF frequency that corresponds to DC in the IF.
- * 
- *  \param[out] dxc_freq is the value for the ddc
- *  \param[out] inverted is true if we're operating in an inverted Nyquist zone.
-*/
-void
-calc_dxc_freq(u2_fxpt_freq_t target_freq, u2_fxpt_freq_t baseband_freq,
-	      u2_fxpt_freq_t *dxc_freq, bool *inverted)
-{
-  u2_fxpt_freq_t fs = U2_DOUBLE_TO_FXPT_FREQ(100e6);	// converter sample rate
-  u2_fxpt_freq_t delta = target_freq - baseband_freq;
-
-#if 0
-  printf("calc_dxc_freq\n");
-  printf("  fs       = "); print_fxpt_freq(fs); newline();
-  printf("  target   = "); print_fxpt_freq(target_freq); newline();
-  printf("  baseband = "); print_fxpt_freq(baseband_freq); newline();
-  printf("  delta    = "); print_fxpt_freq(delta); newline();
-#endif  
-
-  if (delta >= 0){
-    while (delta > fs)
-      delta -= fs;
-    if (delta <= fs/2){		// non-inverted region
-      *dxc_freq = -delta;
-      *inverted = false;
-    }
-    else {			// inverted region
-      *dxc_freq = delta - fs;
-      *inverted = true;
-    }
-  }
-  else {
-    while (delta < -fs)
-      delta += fs;
-    if (delta >= -fs/2){	// non-inverted region
-      *dxc_freq = -delta;
-      *inverted = false;
-    }
-    else {			// inverted region
-      *dxc_freq = delta + fs;
-      *inverted = true;
-    }
-  }
-}
-
-bool
-db_set_lo_offset(struct db_base *db, u2_fxpt_freq_t offset)
-{
-  db->current_lo_offset = offset;
-  return true;
-}
-
-bool
-db_tune(struct db_base *db, u2_fxpt_freq_t target_freq, struct tune_result *result)
-{
-  memset(result, 0, sizeof(*result));
-  bool inverted = false;
-  u2_fxpt_freq_t dxc_freq;
-  u2_fxpt_freq_t actual_dxc_freq;
-
-  // Ask the d'board to tune as closely as it can to target_freq+lo_offset
-  bool ok = db->set_freq(db, target_freq+db->current_lo_offset, &result->baseband_freq);
-
-  // Calculate the DDC setting that will downconvert the baseband from the
-  // daughterboard to our target frequency.
-  calc_dxc_freq(target_freq, result->baseband_freq, &dxc_freq, &inverted);
-
-  // If the spectrum is inverted, and the daughterboard doesn't do
-  // quadrature downconversion, we can fix the inversion by flipping the
-  // sign of the dxc_freq...  (This only happens using the basic_rx board)
-  
-  if (db->spectrum_inverted)
-    inverted = !inverted;
-
-  if (inverted && !db->is_quadrature){
-    dxc_freq = -dxc_freq;
-    inverted = !inverted;
-  }
-
-  if (db->is_tx){
-    dxc_freq = -dxc_freq;	// down conversion versus up conversion
-    ok &= db_set_duc_freq(dxc_freq, &actual_dxc_freq);
-  }
-  else {
-    ok &= db_set_ddc_freq(dxc_freq, &actual_dxc_freq);
-  }
-
-  result->dxc_freq = dxc_freq;
-  result->residual_freq = dxc_freq - actual_dxc_freq;
-  result->inverted = inverted;
-  return ok;
-}
-
-static int32_t
-compute_freq_control_word(u2_fxpt_freq_t target_freq, u2_fxpt_freq_t *actual_freq)
-{
-  // If we were using floating point, we'd calculate
-  //   master = 100e6;
-  //   v = (int) rint(target_freq / master_freq) * pow(2.0, 32.0);
-
-  //printf("compute_freq_control_word\n");
-  //printf("  target_freq = "); print_fxpt_freq(target_freq); newline();
-
-  int32_t master_freq = 100000000;	// 100M
-
-  int32_t v = ((target_freq << 12)) / master_freq;
-  //printf("  fcw = %d\n", v);
-
-  *actual_freq = (v * (int64_t) master_freq) >> 12;
-
-  //printf("  actual = "); print_fxpt_freq(*actual_freq); newline();
-
-  return v;
-}
-
-
-bool
-db_set_ddc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq)
-{
-  int32_t v = compute_freq_control_word(dxc_freq, actual_dxc_freq);
-  dsp_rx_regs->freq = v;
-  return true;
-}
-
-bool
-db_set_duc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq)
-{
-  int32_t v = compute_freq_control_word(dxc_freq, actual_dxc_freq);
-  dsp_tx_regs->freq = v;
-  return true;
-}
-
-bool
-db_set_gain(struct db_base *db, u2_fxpt_gain_t gain)
-{
-  return db->set_gain(db, gain);
-}
-
-bool
-db_set_antenna(struct db_base *db, int ant)
-{
-  if (db->set_antenna == 0) return false;
-  return db->set_antenna(db, ant);
-}
diff --git a/usrp2/firmware/lib/db_init_wbx.c b/usrp2/firmware/lib/db_init_wbx.c
deleted file mode 100644
index 8810e0d4d..000000000
--- a/usrp2/firmware/lib/db_init_wbx.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <memory_map.h>
-#include <i2c.h>
-#include <usrp2_i2c_addr.h>
-#include <string.h>
-#include <stdio.h>
-#include <db.h>
-#include <db_base.h>
-#include <hal_io.h>
-#include <nonstdio.h>
-
-
-struct db_base *tx_dboard;	// the tx daughterboard that's installed
-struct db_base *rx_dboard;	// the rx daughterboard that's installed
-
-extern struct db_base db_basic_tx;
-extern struct db_base db_basic_rx;
-extern struct db_base db_lf_tx;
-extern struct db_base db_lf_rx;
-extern struct db_base db_wbxng_rx;
-extern struct db_base db_wbxng_tx;
-
-struct db_base *all_dboards[] = {
-  &db_basic_tx,
-  &db_basic_rx,
-  &db_lf_tx,
-  &db_lf_rx,
-  &db_wbxng_rx,
-  &db_wbxng_tx,
-  0
-};
-
-
-typedef enum { UDBE_OK, UDBE_NO_EEPROM, UDBE_INVALID_EEPROM } usrp_dbeeprom_status_t;
-
-static usrp_dbeeprom_status_t
-read_raw_dboard_eeprom (unsigned char *buf, int i2c_addr)
-{
-  if (!eeprom_read (i2c_addr, 0, buf, DB_EEPROM_CLEN))
-    return UDBE_NO_EEPROM;
-
-  if (buf[DB_EEPROM_MAGIC] != DB_EEPROM_MAGIC_VALUE)
-    return UDBE_INVALID_EEPROM;
-
-  int sum = 0;
-  unsigned int i;
-  for (i = 0; i < DB_EEPROM_CLEN; i++)
-    sum += buf[i];
-
-  if ((sum & 0xff) != 0)
-    return UDBE_INVALID_EEPROM;
-
-  return UDBE_OK;
-}
-
-
-/*
- * Return DBID, -1 <none> or -2 <invalid eeprom contents>
- */
-int
-read_dboard_eeprom(int i2c_addr)
-{
-  unsigned char buf[DB_EEPROM_CLEN];
-
-  usrp_dbeeprom_status_t s = read_raw_dboard_eeprom (buf, i2c_addr);
-
-  //printf("\nread_raw_dboard_eeprom: %d\n", s);
-
-  switch (s){
-  case UDBE_OK:
-    return (buf[DB_EEPROM_ID_MSB] << 8) | buf[DB_EEPROM_ID_LSB];
-
-  case UDBE_NO_EEPROM:
-  default:
-    return -1;
-
-  case UDBE_INVALID_EEPROM:
-    return -2;
-  }
-}
-
-
-static struct db_base *
-lookup_dbid(int dbid)
-{
-  if (dbid < 0)
-    return 0;
-
-  int i;
-  for (i = 0; all_dboards[i]; i++)
-    if (all_dboards[i]->dbid == dbid)
-      return all_dboards[i];
-
-  return 0;
-}
-
-static struct db_base *
-lookup_dboard(int i2c_addr, struct db_base *default_db, char *msg)
-{
-  struct db_base *db;
-  int dbid = read_dboard_eeprom(i2c_addr);
-
-  // FIXME removing this printf has the system hang if there are two d'boards
-  // installed.  (I think the problem is in i2c_read/write or the way
-  // I kludge the zero-byte write to set the read address in eeprom_read.)
-  printf("%s dbid: 0x%x\n", msg, dbid);
-
-  if (dbid < 0){	// there was some kind of problem.  Treat as Basic Tx
-    return default_db;
-  }
-  else if ((db = lookup_dbid(dbid)) == 0){
-    printf("No daugherboard code for dbid = 0x%x\n", dbid);
-    return default_db;
-  }
-  return db;
-}
-
-void
-set_atr_regs(int bank, struct db_base *db)
-{
-  uint32_t	val[4];
-  int		shift;
-  int		mask;
-  int		i;
-
-  val[ATR_IDLE] = db->atr_rxval;
-  val[ATR_RX]   = db->atr_rxval;
-  val[ATR_TX]   = db->atr_txval;
-  val[ATR_FULL] = db->atr_txval;
-
-  if (bank == GPIO_TX_BANK){
-    mask = 0xffff0000;
-    shift = 16;
-  }
-  else {
-    mask = 0x0000ffff;
-    shift = 0;
-  }
-
-  for (i = 0; i < 4; i++){
-    int t = (atr_regs->v[i] & ~mask) | ((val[i] << shift) & mask);
-    //printf("atr_regs[%d] = 0x%x\n", i, t);
-    atr_regs->v[i] = t;
-  }
-}
-
-static void
-set_gpio_mode(int bank, struct db_base *db)
-{
-  int	i;
-
-  hal_gpio_set_ddr(bank, db->output_enables, 0xffff);
-  set_atr_regs(bank, db);
-
-  for (i = 0; i < 16; i++){
-    if (db->used_pins & (1 << i)){
-      // set to either GPIO_SEL_SW or GPIO_SEL_ATR
-      hal_gpio_set_sel(bank, i, (db->atr_mask & (1 << i)) ? 'a' : 's');
-    }
-  }
-}
-
-static int __attribute__((unused))
-determine_tx_mux_value(struct db_base *db) 
-{
-  if (db->i_and_q_swapped)
-    return 0x01;
-  else
-    return 0x10;
-}
-
-static int
-determine_rx_mux_value(struct db_base *db)
-{
-#define	ADC0 0x0
-#define	ADC1 0x1
-#define ZERO 0x2
-  
-  static int truth_table[8] = {
-    /* swap_iq, uses */
-    /* 0, 0x0 */    (ZERO << 2) | ZERO,		// N/A
-    /* 0, 0x1 */    (ZERO << 2) | ADC0,
-    /* 0, 0x2 */    (ZERO << 2) | ADC1,
-    /* 0, 0x3 */    (ADC1 << 2) | ADC0,
-    /* 1, 0x0 */    (ZERO << 2) | ZERO,		// N/A
-    /* 1, 0x1 */    (ZERO << 2) | ADC0,
-    /* 1, 0x2 */    (ZERO << 2) | ADC1,
-    /* 1, 0x3 */    (ADC0 << 2) | ADC1,
-  };
-
-  int	subdev0_uses;
-  int	subdev1_uses;
-  int	uses;
-
-  if (db->is_quadrature)
-    subdev0_uses = 0x3;		// uses A/D 0 and 1
-  else
-    subdev0_uses = 0x1;		// uses A/D 0 only
-
-  // FIXME second subdev on Basic Rx, LF RX
-  // if subdev2 exists
-  // subdev1_uses = 0x2;
-  subdev1_uses = 0;
-
-  uses = subdev0_uses;
-
-  int swap_iq = db->i_and_q_swapped & 0x1;
-  int index = (swap_iq << 2) | uses;
-
-  return truth_table[index];
-}
-
-
-void
-db_init(void)
-{
-  int	m;
-
-  tx_dboard = lookup_dboard(I2C_ADDR_TX_A, &db_basic_tx, "Tx");
-  //printf("db_init: tx dbid = 0x%x\n", tx_dboard->dbid);
-  set_gpio_mode(GPIO_TX_BANK, tx_dboard);
-  tx_dboard->init(tx_dboard);
-  m = determine_tx_mux_value(tx_dboard);
-  dsp_tx_regs->tx_mux = m;
-  //printf("tx_mux = 0x%x\n", m);
-  tx_dboard->current_lo_offset = tx_dboard->default_lo_offset;
-
-  rx_dboard = lookup_dboard(I2C_ADDR_RX_A, &db_basic_rx, "Rx");
-  //printf("db_init: rx dbid = 0x%x\n", rx_dboard->dbid);
-  set_gpio_mode(GPIO_RX_BANK, rx_dboard);
-  rx_dboard->init(rx_dboard);
-  m = determine_rx_mux_value(rx_dboard);
-  dsp_rx_regs->rx_mux = m;
-  //printf("rx_mux = 0x%x\n", m);
-  rx_dboard->current_lo_offset = rx_dboard->default_lo_offset;
-}
-
-/*!
- *  Calculate the frequency to use for setting the digital down converter.
- *
- *  \param[in] target_freq   desired RF frequency (Hz)
- *  \param[in] baseband_freq the RF frequency that corresponds to DC in the IF.
- * 
- *  \param[out] dxc_freq is the value for the ddc
- *  \param[out] inverted is true if we're operating in an inverted Nyquist zone.
-*/
-void
-calc_dxc_freq(u2_fxpt_freq_t target_freq, u2_fxpt_freq_t baseband_freq,
-	      u2_fxpt_freq_t *dxc_freq, bool *inverted)
-{
-  u2_fxpt_freq_t fs = U2_DOUBLE_TO_FXPT_FREQ(100e6);	// converter sample rate
-  u2_fxpt_freq_t delta = target_freq - baseband_freq;
-
-#if 0
-  printf("calc_dxc_freq\n");
-  printf("  fs       = "); print_fxpt_freq(fs); newline();
-  printf("  target   = "); print_fxpt_freq(target_freq); newline();
-  printf("  baseband = "); print_fxpt_freq(baseband_freq); newline();
-  printf("  delta    = "); print_fxpt_freq(delta); newline();
-#endif  
-
-  if (delta >= 0){
-    while (delta > fs)
-      delta -= fs;
-    if (delta <= fs/2){		// non-inverted region
-      *dxc_freq = -delta;
-      *inverted = false;
-    }
-    else {			// inverted region
-      *dxc_freq = delta - fs;
-      *inverted = true;
-    }
-  }
-  else {
-    while (delta < -fs)
-      delta += fs;
-    if (delta >= -fs/2){	// non-inverted region
-      *dxc_freq = -delta;
-      *inverted = false;
-    }
-    else {			// inverted region
-      *dxc_freq = delta + fs;
-      *inverted = true;
-    }
-  }
-}
-
-bool
-db_set_lo_offset(struct db_base *db, u2_fxpt_freq_t offset)
-{
-  db->current_lo_offset = offset;
-  return true;
-}
-
-bool
-db_tune(struct db_base *db, u2_fxpt_freq_t target_freq, struct tune_result *result)
-{
-  memset(result, 0, sizeof(*result));
-  bool inverted = false;
-  u2_fxpt_freq_t dxc_freq;
-  u2_fxpt_freq_t actual_dxc_freq;
-
-  // Ask the d'board to tune as closely as it can to target_freq+lo_offset
-  bool ok = db->set_freq(db, target_freq+db->current_lo_offset, &result->baseband_freq);
-
-  // Calculate the DDC setting that will downconvert the baseband from the
-  // daughterboard to our target frequency.
-  calc_dxc_freq(target_freq, result->baseband_freq, &dxc_freq, &inverted);
-
-  // If the spectrum is inverted, and the daughterboard doesn't do
-  // quadrature downconversion, we can fix the inversion by flipping the
-  // sign of the dxc_freq...  (This only happens using the basic_rx board)
-  
-  if (db->spectrum_inverted)
-    inverted = !inverted;
-
-  if (inverted && !db->is_quadrature){
-    dxc_freq = -dxc_freq;
-    inverted = !inverted;
-  }
-
-  if (db->is_tx){
-    dxc_freq = -dxc_freq;	// down conversion versus up conversion
-    ok &= db_set_duc_freq(dxc_freq, &actual_dxc_freq);
-  }
-  else {
-    ok &= db_set_ddc_freq(dxc_freq, &actual_dxc_freq);
-  }
-
-  result->dxc_freq = dxc_freq;
-  result->residual_freq = dxc_freq - actual_dxc_freq;
-  result->inverted = inverted;
-  return ok;
-}
-
-static int32_t
-compute_freq_control_word(u2_fxpt_freq_t target_freq, u2_fxpt_freq_t *actual_freq)
-{
-  // If we were using floating point, we'd calculate
-  //   master = 100e6;
-  //   v = (int) rint(target_freq / master_freq) * pow(2.0, 32.0);
-
-  //printf("compute_freq_control_word\n");
-  //printf("  target_freq = "); print_fxpt_freq(target_freq); newline();
-
-  int32_t master_freq = 100000000;	// 100M
-
-  int32_t v = ((target_freq << 12)) / master_freq;
-  //printf("  fcw = %d\n", v);
-
-  *actual_freq = (v * (int64_t) master_freq) >> 12;
-
-  //printf("  actual = "); print_fxpt_freq(*actual_freq); newline();
-
-  return v;
-}
-
-
-bool
-db_set_ddc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq)
-{
-  int32_t v = compute_freq_control_word(dxc_freq, actual_dxc_freq);
-  dsp_rx_regs->freq = v;
-  return true;
-}
-
-bool
-db_set_duc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq)
-{
-  int32_t v = compute_freq_control_word(dxc_freq, actual_dxc_freq);
-  dsp_tx_regs->freq = v;
-  return true;
-}
-
-bool
-db_set_gain(struct db_base *db, u2_fxpt_gain_t gain)
-{
-  return db->set_gain(db, gain);
-}
-
-bool
-db_set_antenna(struct db_base *db, int ant)
-{
-  if (db->set_antenna == 0) return false;
-  return db->set_antenna(db, ant);
-}
diff --git a/usrp2/firmware/lib/db_init_xcvr.c b/usrp2/firmware/lib/db_init_xcvr.c
deleted file mode 100644
index 3e3d3eb86..000000000
--- a/usrp2/firmware/lib/db_init_xcvr.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <memory_map.h>
-#include <i2c.h>
-#include <usrp2_i2c_addr.h>
-#include <string.h>
-#include <stdio.h>
-#include <db.h>
-#include <db_base.h>
-#include <hal_io.h>
-#include <nonstdio.h>
-
-
-struct db_base *tx_dboard;	// the tx daughterboard that's installed
-struct db_base *rx_dboard;	// the rx daughterboard that's installed
-
-extern struct db_base db_basic_tx;
-extern struct db_base db_basic_rx;
-extern struct db_base db_lf_tx;
-extern struct db_base db_lf_rx;
-extern struct db_base db_xcvr2450_tx;
-extern struct db_base db_xcvr2450_rx;
-
-struct db_base *all_dboards[] = {
-  &db_basic_tx,
-  &db_basic_rx,
-  &db_lf_tx,
-  &db_lf_rx,
-  &db_xcvr2450_rx,
-  &db_xcvr2450_tx,
-  0
-};
-
-
-typedef enum { UDBE_OK, UDBE_NO_EEPROM, UDBE_INVALID_EEPROM } usrp_dbeeprom_status_t;
-
-static usrp_dbeeprom_status_t
-read_raw_dboard_eeprom (unsigned char *buf, int i2c_addr)
-{
-  if (!eeprom_read (i2c_addr, 0, buf, DB_EEPROM_CLEN))
-    return UDBE_NO_EEPROM;
-
-  if (buf[DB_EEPROM_MAGIC] != DB_EEPROM_MAGIC_VALUE)
-    return UDBE_INVALID_EEPROM;
-
-  int sum = 0;
-  unsigned int i;
-  for (i = 0; i < DB_EEPROM_CLEN; i++)
-    sum += buf[i];
-
-  if ((sum & 0xff) != 0)
-    return UDBE_INVALID_EEPROM;
-
-  return UDBE_OK;
-}
-
-
-/*
- * Return DBID, -1 <none> or -2 <invalid eeprom contents>
- */
-int
-read_dboard_eeprom(int i2c_addr)
-{
-  unsigned char buf[DB_EEPROM_CLEN];
-
-  usrp_dbeeprom_status_t s = read_raw_dboard_eeprom (buf, i2c_addr);
-
-  //printf("\nread_raw_dboard_eeprom: %d\n", s);
-
-  switch (s){
-  case UDBE_OK:
-    return (buf[DB_EEPROM_ID_MSB] << 8) | buf[DB_EEPROM_ID_LSB];
-
-  case UDBE_NO_EEPROM:
-  default:
-    return -1;
-
-  case UDBE_INVALID_EEPROM:
-    return -2;
-  }
-}
-
-
-static struct db_base *
-lookup_dbid(int dbid)
-{
-  if (dbid < 0)
-    return 0;
-
-  int i;
-  for (i = 0; all_dboards[i]; i++)
-    if (all_dboards[i]->dbid == dbid)
-      return all_dboards[i];
-
-  return 0;
-}
-
-static struct db_base *
-lookup_dboard(int i2c_addr, struct db_base *default_db, char *msg)
-{
-  struct db_base *db;
-  int dbid = read_dboard_eeprom(i2c_addr);
-
-  // FIXME removing this printf has the system hang if there are two d'boards
-  // installed.  (I think the problem is in i2c_read/write or the way
-  // I kludge the zero-byte write to set the read address in eeprom_read.)
-  printf("%s dbid: 0x%x\n", msg, dbid);
-
-  if (dbid < 0){	// there was some kind of problem.  Treat as Basic Tx
-    return default_db;
-  }
-  else if ((db = lookup_dbid(dbid)) == 0){
-    printf("No daugherboard code for dbid = 0x%x\n", dbid);
-    return default_db;
-  }
-  return db;
-}
-
-void
-set_atr_regs(int bank, struct db_base *db)
-{
-  uint32_t	val[4];
-  int		shift;
-  int		mask;
-  int		i;
-
-  val[ATR_IDLE] = db->atr_rxval;
-  val[ATR_RX]   = db->atr_rxval;
-  val[ATR_TX]   = db->atr_txval;
-  val[ATR_FULL] = db->atr_txval;
-
-  if (bank == GPIO_TX_BANK){
-    mask = 0xffff0000;
-    shift = 16;
-  }
-  else {
-    mask = 0x0000ffff;
-    shift = 0;
-  }
-
-  for (i = 0; i < 4; i++){
-    int t = (atr_regs->v[i] & ~mask) | ((val[i] << shift) & mask);
-    //printf("atr_regs[%d] = 0x%x\n", i, t);
-    atr_regs->v[i] = t;
-  }
-}
-
-static void
-set_gpio_mode(int bank, struct db_base *db)
-{
-  int	i;
-
-  hal_gpio_set_ddr(bank, db->output_enables, 0xffff);
-  set_atr_regs(bank, db);
-
-  for (i = 0; i < 16; i++){
-    if (db->used_pins & (1 << i)){
-      // set to either GPIO_SEL_SW or GPIO_SEL_ATR
-      hal_gpio_set_sel(bank, i, (db->atr_mask & (1 << i)) ? 'a' : 's');
-    }
-  }
-}
-
-static int __attribute__((unused))
-determine_tx_mux_value(struct db_base *db) 
-{
-  if (db->i_and_q_swapped)
-    return 0x01;
-  else
-    return 0x10;
-}
-
-static int
-determine_rx_mux_value(struct db_base *db)
-{
-#define	ADC0 0x0
-#define	ADC1 0x1
-#define ZERO 0x2
-  
-  static int truth_table[8] = {
-    /* swap_iq, uses */
-    /* 0, 0x0 */    (ZERO << 2) | ZERO,		// N/A
-    /* 0, 0x1 */    (ZERO << 2) | ADC0,
-    /* 0, 0x2 */    (ZERO << 2) | ADC1,
-    /* 0, 0x3 */    (ADC1 << 2) | ADC0,
-    /* 1, 0x0 */    (ZERO << 2) | ZERO,		// N/A
-    /* 1, 0x1 */    (ZERO << 2) | ADC0,
-    /* 1, 0x2 */    (ZERO << 2) | ADC1,
-    /* 1, 0x3 */    (ADC0 << 2) | ADC1,
-  };
-
-  int	subdev0_uses;
-  int	subdev1_uses;
-  int	uses;
-
-  if (db->is_quadrature)
-    subdev0_uses = 0x3;		// uses A/D 0 and 1
-  else
-    subdev0_uses = 0x1;		// uses A/D 0 only
-
-  // FIXME second subdev on Basic Rx, LF RX
-  // if subdev2 exists
-  // subdev1_uses = 0x2;
-  subdev1_uses = 0;
-
-  uses = subdev0_uses;
-
-  int swap_iq = db->i_and_q_swapped & 0x1;
-  int index = (swap_iq << 2) | uses;
-
-  return truth_table[index];
-}
-
-
-void
-db_init(void)
-{
-  int	m;
-
-  tx_dboard = lookup_dboard(I2C_ADDR_TX_A, &db_basic_tx, "Tx");
-  //printf("db_init: tx dbid = 0x%x\n", tx_dboard->dbid);
-  set_gpio_mode(GPIO_TX_BANK, tx_dboard);
-  tx_dboard->init(tx_dboard);
-  m = determine_tx_mux_value(tx_dboard);
-  dsp_tx_regs->tx_mux = m;
-  //printf("tx_mux = 0x%x\n", m);
-  tx_dboard->current_lo_offset = tx_dboard->default_lo_offset;
-
-  rx_dboard = lookup_dboard(I2C_ADDR_RX_A, &db_basic_rx, "Rx");
-  //printf("db_init: rx dbid = 0x%x\n", rx_dboard->dbid);
-  set_gpio_mode(GPIO_RX_BANK, rx_dboard);
-  rx_dboard->init(rx_dboard);
-  m = determine_rx_mux_value(rx_dboard);
-  dsp_rx_regs->rx_mux = m;
-  //printf("rx_mux = 0x%x\n", m);
-  rx_dboard->current_lo_offset = rx_dboard->default_lo_offset;
-}
-
-/*!
- *  Calculate the frequency to use for setting the digital down converter.
- *
- *  \param[in] target_freq   desired RF frequency (Hz)
- *  \param[in] baseband_freq the RF frequency that corresponds to DC in the IF.
- * 
- *  \param[out] dxc_freq is the value for the ddc
- *  \param[out] inverted is true if we're operating in an inverted Nyquist zone.
-*/
-void
-calc_dxc_freq(u2_fxpt_freq_t target_freq, u2_fxpt_freq_t baseband_freq,
-	      u2_fxpt_freq_t *dxc_freq, bool *inverted)
-{
-  u2_fxpt_freq_t fs = U2_DOUBLE_TO_FXPT_FREQ(100e6);	// converter sample rate
-  u2_fxpt_freq_t delta = target_freq - baseband_freq;
-
-#if 0
-  printf("calc_dxc_freq\n");
-  printf("  fs       = "); print_fxpt_freq(fs); newline();
-  printf("  target   = "); print_fxpt_freq(target_freq); newline();
-  printf("  baseband = "); print_fxpt_freq(baseband_freq); newline();
-  printf("  delta    = "); print_fxpt_freq(delta); newline();
-#endif  
-
-  if (delta >= 0){
-    while (delta > fs)
-      delta -= fs;
-    if (delta <= fs/2){		// non-inverted region
-      *dxc_freq = -delta;
-      *inverted = false;
-    }
-    else {			// inverted region
-      *dxc_freq = delta - fs;
-      *inverted = true;
-    }
-  }
-  else {
-    while (delta < -fs)
-      delta += fs;
-    if (delta >= -fs/2){	// non-inverted region
-      *dxc_freq = -delta;
-      *inverted = false;
-    }
-    else {			// inverted region
-      *dxc_freq = delta + fs;
-      *inverted = true;
-    }
-  }
-}
-
-bool
-db_set_lo_offset(struct db_base *db, u2_fxpt_freq_t offset)
-{
-  db->current_lo_offset = offset;
-  return true;
-}
-
-bool
-db_tune(struct db_base *db, u2_fxpt_freq_t target_freq, struct tune_result *result)
-{
-  memset(result, 0, sizeof(*result));
-  bool inverted = false;
-  u2_fxpt_freq_t dxc_freq;
-  u2_fxpt_freq_t actual_dxc_freq;
-
-  // Ask the d'board to tune as closely as it can to target_freq+lo_offset
-  bool ok = db->set_freq(db, target_freq+db->current_lo_offset, &result->baseband_freq);
-
-  // Calculate the DDC setting that will downconvert the baseband from the
-  // daughterboard to our target frequency.
-  calc_dxc_freq(target_freq, result->baseband_freq, &dxc_freq, &inverted);
-
-  // If the spectrum is inverted, and the daughterboard doesn't do
-  // quadrature downconversion, we can fix the inversion by flipping the
-  // sign of the dxc_freq...  (This only happens using the basic_rx board)
-  
-  if (db->spectrum_inverted)
-    inverted = !inverted;
-
-  if (inverted && !db->is_quadrature){
-    dxc_freq = -dxc_freq;
-    inverted = !inverted;
-  }
-
-  if (db->is_tx){
-    dxc_freq = -dxc_freq;	// down conversion versus up conversion
-    ok &= db_set_duc_freq(dxc_freq, &actual_dxc_freq);
-  }
-  else {
-    ok &= db_set_ddc_freq(dxc_freq, &actual_dxc_freq);
-  }
-
-  result->dxc_freq = dxc_freq;
-  result->residual_freq = dxc_freq - actual_dxc_freq;
-  result->inverted = inverted;
-  return ok;
-}
-
-static int32_t
-compute_freq_control_word(u2_fxpt_freq_t target_freq, u2_fxpt_freq_t *actual_freq)
-{
-  // If we were using floating point, we'd calculate
-  //   master = 100e6;
-  //   v = (int) rint(target_freq / master_freq) * pow(2.0, 32.0);
-
-  //printf("compute_freq_control_word\n");
-  //printf("  target_freq = "); print_fxpt_freq(target_freq); newline();
-
-  int32_t master_freq = 100000000;	// 100M
-
-  int32_t v = ((target_freq << 12)) / master_freq;
-  //printf("  fcw = %d\n", v);
-
-  *actual_freq = (v * (int64_t) master_freq) >> 12;
-
-  //printf("  actual = "); print_fxpt_freq(*actual_freq); newline();
-
-  return v;
-}
-
-
-bool
-db_set_ddc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq)
-{
-  int32_t v = compute_freq_control_word(dxc_freq, actual_dxc_freq);
-  dsp_rx_regs->freq = v;
-  return true;
-}
-
-bool
-db_set_duc_freq(u2_fxpt_freq_t dxc_freq, u2_fxpt_freq_t *actual_dxc_freq)
-{
-  int32_t v = compute_freq_control_word(dxc_freq, actual_dxc_freq);
-  dsp_tx_regs->freq = v;
-  return true;
-}
-
-bool
-db_set_gain(struct db_base *db, u2_fxpt_gain_t gain)
-{
-  return db->set_gain(db, gain);
-}
-
-bool
-db_set_antenna(struct db_base *db, int ant)
-{
-  if (db->set_antenna == 0) return false;
-  return db->set_antenna(db, ant);
-}
diff --git a/usrp2/firmware/lib/db_rfx.c b/usrp2/firmware/lib/db_rfx.c
deleted file mode 100644
index d07d3c1fb..000000000
--- a/usrp2/firmware/lib/db_rfx.c
+++ /dev/null
@@ -1,674 +0,0 @@
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <spi.h>
-#include <memory_map.h>
-#include <db_base.h>
-#include <hal_io.h>
-#include <stdio.h>
-#include <mdelay.h>
-#include <lsdac.h>
-#include <clocks.h>
-
-
-bool rfx_init_rx(struct db_base *db);
-bool rfx_init_tx(struct db_base *db);
-bool rfx_set_freq(struct db_base *db, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc);
-bool rfx_set_gain_rx(struct db_base *db, u2_fxpt_gain_t gain);
-bool rfx_set_gain_tx(struct db_base *db, u2_fxpt_gain_t gain);
-bool rfx_set_tx_enable(struct db_base *, bool on);
-
-// Control Latch Defines
-#define P 0  // Prescalar value for setting in regs, must match the next line...
-#define PRESCALER 8  // Presacalar value for computations
-#define PD 0  // Power down, 0 = normal operation
-#define PL 0 // PLL power output
-#define MTLD 1 // Mute till lock detect
-#define CPGAIN 0 // Charge pump gain, use setting 1, also in N-reg
-#define CP3S 0 // Charge pump tri-state, 0 = normal operation
-#define PDP 1 // Phase detector polarity
-#define MUXOUT 1 // Digital lock detect, active high
-#define CR 0 // normal operation
-#define PC 1 // core power
-
-// N Latch Defines
-#define DIVSEL 0 // N Counter always operates on full rate
-#define N_RSV 0
-
-// R Latch Defines
-#define R_RSV 0
-#define R_BSC 3
-#define R_TMB 0
-#define R_LDP 1
-#define R_ABP 0
-#define R_DIV 16
-
-#define phdet_freq (U2_DOUBLE_TO_FXPT_FREQ(100e6/R_DIV))
-
-// IO Pin functions
-#define POWER_UP  (1 << 7)  //  Low enables power supply
-#define ANT_SW  (1 << 6)   // On TX DB, 0 = TX, 1 = RX, on RX DB 0 = main ant, 1 = RX2
-#define MIX_EN  (1 << 5)   // Enable appropriate mixer
-#define LOCKDET_MASK (1 << 2)   // Input pin
-
-struct db_rfx_common {
-  // RFX common stuff
-  unsigned char DIV2;
-  unsigned char CP1;
-  unsigned char CP2;
-  int freq_mult;
-  int spi_mask;  
-};
-
-struct db_rfx_dummy {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-
-struct db_rfx_400_rx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_400_tx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_900_rx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_900_tx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_1200_rx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_1200_tx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_1800_rx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_1800_tx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_2200_rx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_2200_tx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_2400_rx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-struct db_rfx_2400_tx {
-  struct db_base	base;
-  struct db_rfx_common	common;
-};
-
-
-/*
- * The class instances
- */
-struct db_rfx_400_rx db_rfx_400_rx = {
-  .base.dbid = 0x0024,
-  .base.is_tx = false,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(400e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(500e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(45),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0.022),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = rfx_init_rx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_rx,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = POWER_UP,
-  .base.atr_rxval = POWER_UP|MIX_EN,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 0,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_RX_DB,
-  .common.freq_mult = 2
-};
-
-
-struct db_rfx_400_tx db_rfx_400_tx = {
-  .base.dbid = 0x0028,
-  .base.is_tx = true,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(400e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(500e6),
-  //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
-  .base.init = rfx_init_tx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_tx,
-  .base.set_tx_enable = rfx_set_tx_enable,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = POWER_UP|MIX_EN, 
-  .base.atr_rxval = POWER_UP|ANT_SW,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 1,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_TX_DB,
-  .common.freq_mult = 2
-};
-
-struct db_rfx_900_rx db_rfx_900_rx = {
-  .base.dbid = 0x0025,
-  .base.is_tx = false,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(750e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(1050e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(70),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0.034),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = rfx_init_rx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_rx,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = 0,
-  .base.atr_rxval = MIX_EN,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 1,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_RX_DB,
-  .common.freq_mult = 2
-};
-
-
-struct db_rfx_900_tx db_rfx_900_tx = {
-  .base.dbid = 0x0029,
-  .base.is_tx = true,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(750e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(1050e6),
-  //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
-  .base.init = rfx_init_tx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_tx,
-  .base.set_tx_enable = rfx_set_tx_enable,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = MIX_EN, 
-  .base.atr_rxval = ANT_SW,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 1,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_TX_DB,
-  .common.freq_mult = 2
-};
-
-struct db_rfx_1200_rx db_rfx_1200_rx = {
-  .base.dbid = 0x0026,
-  .base.is_tx = false,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(1150e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(1450e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(70),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0.034),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = rfx_init_rx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_rx,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = 0,
-  .base.atr_rxval = MIX_EN,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 1,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_RX_DB,
-  .common.freq_mult = 2
-};
-
-
-struct db_rfx_1200_tx db_rfx_1200_tx = {
-  .base.dbid = 0x002a,
-  .base.is_tx = true,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(1150e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(1450e6),
-  //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
-  .base.init = rfx_init_tx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_tx,
-  .base.set_tx_enable = rfx_set_tx_enable,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = MIX_EN, 
-  .base.atr_rxval = ANT_SW,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 1,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_TX_DB,
-  .common.freq_mult = 2
-};
-
-struct db_rfx_1800_rx db_rfx_1800_rx = {
-  .base.dbid = 0x0034,
-  .base.is_tx = false,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(1500e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(2100e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(70),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0.034),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = rfx_init_rx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_rx,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = 0,
-  .base.atr_rxval = MIX_EN,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 0,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_RX_DB,
-  .common.freq_mult = 1
-};
-
-
-struct db_rfx_1800_tx db_rfx_1800_tx = {
-  .base.dbid = 0x0035,
-  .base.is_tx = true,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(1500e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(2100e6),
-  //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
-  .base.init = rfx_init_tx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_tx,
-  .base.set_tx_enable = rfx_set_tx_enable,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = MIX_EN, 
-  .base.atr_rxval = ANT_SW,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 0,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_TX_DB,
-  .common.freq_mult = 1  
-};
-
-
-struct db_rfx_2200_rx db_rfx_2200_rx = {
-  .base.dbid = 0x002c,
-  .base.is_tx = false,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(2000e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(2400e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(70),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0.034),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = rfx_init_rx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_rx,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = 0,
-  .base.atr_rxval = MIX_EN,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 0,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_RX_DB,
-  .common.freq_mult = 1
-};
-
-
-struct db_rfx_2200_tx db_rfx_2200_tx = {
-  .base.dbid = 0x002d,
-  .base.is_tx = true,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(2000e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(2400e6),
-  //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
-  .base.init = rfx_init_tx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_tx,
-  .base.set_tx_enable = rfx_set_tx_enable,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = MIX_EN, 
-  .base.atr_rxval = ANT_SW,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 0,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_TX_DB,
-  .common.freq_mult = 1
-};
-
-
-struct db_rfx_2400_rx db_rfx_2400_rx = {
-  .base.dbid = 0x0027,
-  .base.is_tx = false,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(2300e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(2900e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(70),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0.034),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = rfx_init_rx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_rx,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = 0,
-  .base.atr_rxval = MIX_EN,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 0,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_RX_DB,
-  .common.freq_mult = 1
-};
-
-
-struct db_rfx_2400_tx db_rfx_2400_tx = {
-  .base.dbid = 0x002b,
-  .base.is_tx = true,
-  .base.output_enables = 0x00E0,
-  .base.used_pins = 0x00FF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(2300e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(2900e6),
-  //.base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  //.base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(xxx),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(12.5e6),
-  .base.init = rfx_init_tx,
-  .base.set_freq = rfx_set_freq,
-  .base.set_gain = rfx_set_gain_tx,
-  .base.set_tx_enable = rfx_set_tx_enable,
-  .base.atr_mask = 0x00E0,
-  .base.atr_txval = MIX_EN, 
-  .base.atr_rxval = ANT_SW,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.DIV2 = 0,
-  .common.CP1 = 7,
-  .common.CP2 = 7,
-  .common.spi_mask = SPI_SS_TX_DB,
-  .common.freq_mult = 1
-};
-
-
-bool
-rfx_init_tx(struct db_base *dbb)
-{
-  //struct db_rfx_dummy *db = (struct db_rfx_dummy *) dbb;
-  clocks_enable_tx_dboard(true, 0);
-
-  // Set the freq now to get the one time 10ms delay out of the way.
-  u2_fxpt_freq_t	dc;
-  dbb->set_freq(dbb, dbb->freq_min, &dc);
-  return true;
-}
-
-bool
-rfx_init_rx(struct db_base *dbb)
-{
-  //struct db_rfx_dummy *db = (struct db_rfx_dummy *) dbb;
-  clocks_enable_rx_dboard(true, 0);
-
-  // test gain
-  dbb->set_gain(dbb,U2_DOUBLE_TO_FXPT_GAIN(45.0));
-
-  // Set the freq now to get the one time 10ms delay out of the way.
-  u2_fxpt_freq_t	dc;
-  dbb->set_freq(dbb, dbb->freq_min, &dc);
-
-  return true;
-}
-
-bool
-rfx_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc)
-{
-  static unsigned char first = true;
-
-  *dc = 0;
-  struct db_rfx_dummy *db = (struct db_rfx_dummy *) dbb;
-  u2_fxpt_freq_t desired_n = (U2_DOUBLE_TO_FXPT_FREQ(1.0)*db->common.freq_mult*freq)/phdet_freq;
-  int N_DIV = u2_fxpt_freq_round_to_int(desired_n);
-  int B = N_DIV/PRESCALER;
-  int A = N_DIV - PRESCALER*B;
-
-  if(B<A)
-    return false;
-
-  int R = (R_RSV<<22)|(R_BSC<<20)|(R_TMB<<19)|(R_LDP<<18)|(R_ABP<<16)|(R_DIV<<2)|1;
-  int N = (DIVSEL<<23)|(db->common.DIV2<<22)|(CPGAIN<<21)|(B<<8)|(N_RSV<<7)|(A<<2)|2;
-  int C = (P<<22)|(PD<<20)|(db->common.CP2<<17)|(db->common.CP1<<14)|(PL<<12)|
-    (MTLD<<11)|(CPGAIN<<10)|(CP3S<<9)|(PDP<<8)|(MUXOUT<<5)|(CR<<4)|(PC<<2)|0;
-
-  spi_transact(SPI_TXONLY,db->common.spi_mask,R,24,SPIF_PUSH_FALL);
-  spi_transact(SPI_TXONLY,db->common.spi_mask,C,24,SPIF_PUSH_FALL);
-  if (first){
-    first = false;
-    mdelay(10);
-  }
-  spi_transact(SPI_TXONLY,db->common.spi_mask,N,24,SPIF_PUSH_FALL);
-
-  //printf("A = %d, B = %d, N_DIV = %d\n",A, B, N_DIV);
-  *dc = (N_DIV * phdet_freq) / db->common.freq_mult;
-  return true;
-}
-
-bool
-rfx_set_gain_tx(struct db_base *dbb, u2_fxpt_gain_t gain)
-{
-  // There is no analog gain control on TX
-  return true;
-}
-
-bool
-rfx_set_gain_rx(struct db_base *dbb, u2_fxpt_gain_t gain)
-{
-  struct db_rfx_dummy *db = (struct db_rfx_dummy *) dbb;
-
-  int offset_q8 = (int)(1.2/3.3*4096*(1<<15));  
-  int range_q15 = (int)(-1.0*4096/3.3*256*128);
-  int slope_q8 = range_q15/db->base.gain_max;
-
-  int dacword = ((slope_q8 * gain) + offset_q8)>>15;
-  //printf("DACWORD %d\n",dacword);
-  lsdac_write_rx(1,dacword);
-  return true;
-}
-
-
-bool
-rfx_set_tx_enable(struct db_base *dbb, bool on)
-{
-  struct db_rfx_dummy *db = (struct db_rfx_dummy *) dbb;
-
-  // FIXME
-
-  return false;
-}
-
-bool
-rfx_lock_detect(struct db_base *dbb)
-{
-  struct db_rfx_dummy *db = (struct db_rfx_dummy *) dbb;
-  int pins;
-  pins = hal_gpio_read( db->base.is_tx ? GPIO_TX_BANK : GPIO_RX_BANK );
-  if(pins & LOCKDET_MASK)
-    return true;
-  return false;
-}
-
-/* 
-    def select_rx_antenna(self, which_antenna):
-        """
-        Specify which antenna port to use for reception.
-        @param which_antenna: either 'TX/RX' or 'RX2'
-        """
-        if which_antenna in (0, 'TX/RX'):
-            self._u.write_io(self._which, 0,        RX2_RX1N)
-        elif which_antenna in (1, 'RX2'):
-            self._u.write_io(self._which, RX2_RX1N, RX2_RX1N)
-        else:
-            raise ValueError, "which_antenna must be either 'TX/RX' or 'RX2'"
-
-    def set_gain(self, gain):
-        """
-        Set the gain.
-
-        @param gain:  gain in decibels
-        @returns True/False
-        """
-        maxgain = self.gain_range()[1] - self._u.pga_max()
-        mingain = self.gain_range()[0]
-        if gain > maxgain:
-            pga_gain = gain-maxgain
-            assert pga_gain <= self._u.pga_max()
-            agc_gain = maxgain
-        else:
-            pga_gain = 0
-            agc_gain = gain
-        V_maxgain = .2
-        V_mingain = 1.2
-        V_fullscale = 3.3
-        dac_value = (agc_gain*(V_maxgain-V_mingain)/(maxgain-mingain) + V_mingain)*4096/V_fullscale
-        assert dac_value>=0 and dac_value<4096
-        return self._u.write_aux_dac(self._which, 0, int(dac_value)) and \
-               self._set_pga(int(pga_gain))
-
-    def gain_range(self):
-        return (self._u.pga_min(), self._u.pga_max() + 70, 0.05) -- For 900-2400
-        return (self._u.pga_min(), self._u.pga_max() + 45, 0.035) -- For 400
-
-*/
diff --git a/usrp2/firmware/lib/db_tvrx.c b/usrp2/firmware/lib/db_tvrx.c
deleted file mode 100644
index 077e59e88..000000000
--- a/usrp2/firmware/lib/db_tvrx.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <i2c.h>
-#include <lsdac.h>
-#include <memory_map.h>
-#include <db_base.h>
-#include <hal_io.h>
-#include <stdio.h>
-
-bool tvrx_init(struct db_base *db);
-bool tvrx_set_freq(struct db_base *db, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc);
-bool tvrx_set_gain(struct db_base *db, u2_fxpt_gain_t gain);
-
-#define I2C_ADDR 0x60
-#define REF_FREQ (U2_DOUBLE_TO_FXPT_FREQ(4e6)/640*8)
-
-#define ref_div 640  /* choices are 640, 512, 1024 */
-
-#if (ref_div == 640)
-#define ref_div_byte 0
-#else
-#if (ref_div == 512)
-#define ref_div_byte 0x6
-#else
-#define ref_div_byte 0x2
-#endif
-#endif
-
-#define fast_tuning 0x40
-
-#define control_byte_1 (0x88|fast_tuning|ref_div_byte)
-
-
-struct db_tvrx_common {
-  // TVRX common stuff
-  u2_fxpt_freq_t first_if;
-  u2_fxpt_freq_t second_if;
-};
-
-struct db_tvrx_dummy {
-  struct db_base	base;
-  struct db_tvrx_common	common;
-};
-
-struct db_tvrx1 {
-  struct db_base	base;
-  struct db_tvrx_common	common;
-};
-
-struct db_tvrx2 {
-  struct db_base	base;
-  struct db_tvrx_common	common;
-};
-
-struct db_tvrx3 {
-  struct db_base	base;
-  struct db_tvrx_common	common;
-};
-
-/* The class instances */
-struct db_tvrx1 db_tvrx1 = {
-  .base.dbid = 0x0003,
-  .base.is_tx = false,
-  .base.output_enables = 0x0000,
-  .base.used_pins = 0x0000,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(50e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(860e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(95),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(1),
-  .base.is_quadrature = false,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = tvrx_init,
-  .base.set_freq = tvrx_set_freq,
-  .base.set_gain = tvrx_set_gain,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = 0x0000,
-  .base.atr_txval = 0,
-  .base.atr_rxval = 0,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.first_if = U2_DOUBLE_TO_FXPT_FREQ(43.75e6),
-  .common.second_if = U2_DOUBLE_TO_FXPT_FREQ(5.75e6),
-};
-
-#if 0
-struct db_tvrx2 db_tvrx2 = {
-  .base.dbid = 0x000c,
-  .base.is_tx = false,
-  .base.output_enables = 0x0000,
-  .base.used_pins = 0x0000,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(50e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(860e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(95),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(1),
-  .base.is_quadrature = false,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = tvrx_init,
-  .base.set_freq = tvrx_set_freq,
-  .base.set_gain = tvrx_set_gain,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = 0x0000,
-  .base.atr_txval = 0,
-  .base.atr_rxval = 0,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.first_if = U2_DOUBLE_TO_FXPT_FREQ(44e6),
-  .common.second_if = U2_DOUBLE_TO_FXPT_FREQ(56e6),	// Fs - 44e6
-};
-#endif
-
-struct db_tvrx3 db_tvrx3 = {
-  .base.dbid = 0x0040,
-  .base.is_tx = false,
-  .base.output_enables = 0x0000,
-  .base.used_pins = 0x0000,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(50e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(860e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(95),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(1),
-  .base.is_quadrature = false,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = tvrx_init,
-  .base.set_freq = tvrx_set_freq,
-  .base.set_gain = tvrx_set_gain,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = 0x0000,
-  .base.atr_txval = 0,
-  .base.atr_rxval = 0,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.first_if = U2_DOUBLE_TO_FXPT_FREQ(44e6),
-  .common.second_if = U2_DOUBLE_TO_FXPT_FREQ(56e6),	// Fs - 44e6
-};
-
-bool
-tvrx_init(struct db_base *dbb)
-{
-  struct db_tvrx_dummy *db = (struct db_tvrx_dummy *) dbb;
-  db->base.set_gain(dbb,U2_DOUBLE_TO_FXPT_GAIN(94.0));
-  return true;
-}
-
-bool
-tvrx_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc)
-{
-  *dc = 0;
-  if (freq < dbb->freq_min || freq > dbb->freq_max)
-    return false;
-
-  struct db_tvrx_dummy *db = (struct db_tvrx_dummy *) dbb;
-
-  u2_fxpt_freq_t target_lo_freq = freq + db->common.first_if;
-  int n_div = u2_fxpt_freq_round_to_int(((1LL<<20) * target_lo_freq)/REF_FREQ);
-  
-  u2_fxpt_freq_t actual_lo_freq = REF_FREQ * n_div;
-  u2_fxpt_freq_t actual_freq = actual_lo_freq - db->common.first_if;
-  if(n_div > 32767)
-    return false;
-
-  if (0)
-    printf("n_div = %d, actual_freq = %d, actual_lo_freq = %d\n",
-	   n_div, u2_fxpt_freq_round_to_int(actual_freq),
-	   u2_fxpt_freq_round_to_int(actual_lo_freq));
-
-  unsigned char buf[4];
-  buf[0] = (n_div>>8) & 0xff;
-  buf[1] = n_div & 0xff;
-  buf[2] = control_byte_1;
-  buf[3] = ((actual_freq < U2_DOUBLE_TO_FXPT_FREQ(158e6)) ? 0xa8 :  // VHF LOW
-	    (actual_freq < U2_DOUBLE_TO_FXPT_FREQ(464e6)) ? 0x98 :  // VHF HIGH
-	    0x38);  // UHF
-
-  *dc = actual_freq - db->common.second_if;
-  return i2c_write(I2C_ADDR,buf,4);
-}
-
-bool
-tvrx_set_gain(struct db_base *dbb, u2_fxpt_gain_t gain)
-{
-  //struct db_tvrx_dummy *db = (struct db_tvrx_dummy *) dbb;
-  int rfgain;
-  int ifgain;
-  if(gain>U2_DOUBLE_TO_FXPT_GAIN(95.0))
-    return false;
-  if(gain<0)
-    return false;
-
-  if(gain>U2_DOUBLE_TO_FXPT_GAIN(60.0)) {
-    rfgain = U2_DOUBLE_TO_FXPT_GAIN(60.0);
-    ifgain = gain-U2_DOUBLE_TO_FXPT_GAIN(60.0);
-  } else {
-    rfgain = gain;
-    ifgain = 0;
-  }
-  
-  int rf_slope_q8 = 256 * 4096 * 2.5 / 60.0 / 1.22 / 3.3;
-  int rf_offset_q8 = 128 * 256 * 4096 * 1.25 / 1.22 / 3.3;
-  int if_slope_q8 = 256 * 4096 * 2.25 / 35.0 / 1.22 / 3.3;
-  int if_offset_q8 = 128 * 256 * 4096 * 1.4 / 1.22 / 3.3;
-
-  
-  int rfdac = (rfgain*rf_slope_q8 + rf_offset_q8)>>15;
-  int ifdac = (ifgain*if_slope_q8 + if_offset_q8)>>15;
-  lsdac_write_rx(0,rfdac);
-  lsdac_write_rx(1,ifdac);
-
-  if (0)
-    printf("Setting gain %d, rf %d, if %d\n",gain,rfdac,ifdac);
-
-  return true;
-}
-
-
-bool
-tvrx_lock_detect(struct db_base *dbb)
-{
-  // struct db_tvrx_dummy *db = (struct db_tvrx_dummy *) dbb;
-  return true;
-}
diff --git a/usrp2/firmware/lib/db_wbxng.c b/usrp2/firmware/lib/db_wbxng.c
deleted file mode 100644
index 954633da2..000000000
--- a/usrp2/firmware/lib/db_wbxng.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-#include "db_wbxng.h"
-#include "adf4350.h"
-#include <spi.h>
-#include <memory_map.h>
-#include <db_base.h>
-#include <hal_io.h>
-#include <mdelay.h>
-#include <lsdac.h>
-#include <clocks.h>
-#include <stdio.h>
-#include <stdint.h>
-
-#define min(X,Y) ((X) < (Y) ? (X) : (Y))
-#define max(X,Y) ((X) > (Y) ? (X) : (Y))
-
-bool wbxng_init_rx(struct db_base *dbb);
-bool wbxng_init_tx(struct db_base *dbb);
-bool wbxng_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc);
-bool wbxng_set_gain_rx(struct db_base *dbb, u2_fxpt_gain_t gain);
-bool wbxng_set_gain_tx(struct db_base *dbb, u2_fxpt_gain_t gain);
-bool wbxng_set_tx_enable(struct db_base *dbb, bool on);
-
-
-/*
- * The class instances
- */
-struct db_wbxng_rx db_wbxng_rx = {
-  .base.dbid = 0x0053,
-  .base.is_tx = false,
-  .base.output_enables = RX2_RX1N|RXBB_EN|ATTN_MASK|ENABLE_33|ENABLE_5|PLL_CE|PLL_PDBRF|ATTN_MASK,
-  .base.used_pins = 0xFFFF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(68.75e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(2200e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(31.5),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0.5),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = wbxng_init_rx,
-  .base.set_freq = wbxng_set_freq,
-  .base.set_gain = wbxng_set_gain_rx,
-  .base.set_tx_enable = 0,
-  .base.atr_mask = RXBB_EN | RX2_RX1N,
-  .base.atr_txval = RX2_RX1N,
-  .base.atr_rxval = RXBB_EN,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.adf4350_regs_int = UINT16_C(100),
-  .common.adf4350_regs_frac = 0,
-  .common.adf4350_regs_prescaler = 1,
-  .common.adf4350_regs_mod = UINT16_C(0xfff),
-  .common.adf4350_regs_10_bit_r_counter = UINT16_C(1),
-  .common.adf4350_regs_divider_select = 0,
-  .common.adf4350_regs_8_bit_band_select_clock_divider_value = 0,
-  .common.spi_mask = SPI_SS_RX_DB,
-  .common.freq_mult = 2
-};
-
-
-struct db_wbxng_tx db_wbxng_tx = {
-  .base.dbid = 0x0052,
-  .base.is_tx = true,
-  .base.output_enables = RX_TXN|TXMOD_EN|ENABLE_33|ENABLE_5|PLL_CE|PLL_PDBRF,
-  .base.used_pins = 0xFFFF,
-  .base.freq_min = U2_DOUBLE_TO_FXPT_FREQ(68.75e6),
-  .base.freq_max = U2_DOUBLE_TO_FXPT_FREQ(2200e6),
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(25),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(0.1),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = wbxng_init_tx,
-  .base.set_freq = wbxng_set_freq,
-  .base.set_gain = wbxng_set_gain_tx,
-  .base.set_tx_enable = wbxng_set_tx_enable,
-  .base.atr_mask = RX_TXN | TXMOD_EN,
-  .base.atr_txval = TXMOD_EN,
-  .base.atr_rxval = RX_TXN,
-  // .base.atr_tx_delay =
-  // .base.atr_rx_delay =
-  .base.set_antenna = 0,
-  .common.adf4350_regs_int = UINT16_C(100),
-  .common.adf4350_regs_frac = 0,
-  .common.adf4350_regs_prescaler = 1,
-  .common.adf4350_regs_mod = UINT16_C(0xfff),
-  .common.adf4350_regs_10_bit_r_counter = UINT16_C(1),
-  .common.adf4350_regs_divider_select = 0,
-  .common.adf4350_regs_8_bit_band_select_clock_divider_value = 0,
-  .common.spi_mask = SPI_SS_TX_DB,
-  .common.freq_mult = 2
-};
-
-
-bool
-wbxng_init_tx(struct db_base *dbb)
-{
-  //struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-  clocks_enable_tx_dboard(true, 0);
-  hal_gpio_write( GPIO_TX_BANK, ENABLE_5|ENABLE_33, ENABLE_5|ENABLE_33 );
-
-  adf4350_init(dbb);
-
-  // Set the freq now to get the one time 10ms delay out of the way.
-  u2_fxpt_freq_t	dc;
-  dbb->set_freq(dbb, dbb->freq_min, &dc);
-  return true;
-}
-
-bool
-wbxng_init_rx(struct db_base *dbb)
-{
-  //struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-  clocks_enable_rx_dboard(true, 0);
-  hal_gpio_write( GPIO_RX_BANK, ENABLE_5|ENABLE_33, ENABLE_5|ENABLE_33 );
-
-  adf4350_init(dbb);
-
-  // test gain
-  dbb->set_gain(dbb,U2_DOUBLE_TO_FXPT_GAIN(20.0));
-
-  // Set the freq now to get the one time 10ms delay out of the way.
-  u2_fxpt_freq_t	dc;
-  dbb->set_freq(dbb, dbb->freq_min, &dc);
-
-  return true;
-}
-
-bool
-wbxng_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc)
-{
-  // clamp freq
-  u2_fxpt_freq_t clamp_freq = max(dbb->freq_min, min(freq, dbb->freq_max));
-  //printf("Requested LO freq = %u", (uint32_t) ((clamp_freq >> U2_FPF_RP)/1000));
-  bool ok = adf4350_set_freq(clamp_freq<<1,dbb);
-  *dc = adf4350_get_freq(dbb)>>1;
-
-  return ok;
-}
-
-bool
-wbxng_set_gain_tx(struct db_base *dbb, u2_fxpt_gain_t gain)
-{
-  struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-
-  // clamp gain
-  //gain = max(db->gain_min, min(gain, db->gain_max));
-
-  int offset_q8 = (int)(1.4/3.3*4096*(1<<15));
-  int range_q15 = (int)(-0.9*4096/3.3*256*128);
-  int slope_q8 = range_q15/db->base.gain_max;
-
-  int dacword = ((slope_q8 * gain) + offset_q8)>>15;
-  //printf("DACWORD 0x%x\n",dacword);
-  lsdac_write_tx(0,dacword);
-  return true;
-}
-
-bool
-wbxng_set_gain_rx(struct db_base *dbb, u2_fxpt_gain_t gain)
-{
-  struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-
-  // clamp gain
-  //gain = max(db->gain_min, min(gain, db->gain_max));
-
-  int iobits = (int) ((~((db->base.gain_max - gain) << 2)) & ATTN_MASK);
-  //printf("gain %d, gainmax %d, RX_ATTN_MASK = 0x%x, RX_ATTN_WORD = 0x%x\n", gain, db->base.gain_max, (int) (ATTN_MASK), (int) (iobits));
-
-  hal_gpio_write( GPIO_RX_BANK, (int) (iobits), ATTN_MASK );
-  return true;
-}
-
-
-bool
-wbxng_set_tx_enable(struct db_base *dbb, bool on)
-{
-  struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-
-  // FIXME
-
-  return false;
-}
-
-bool
-wbxng_lock_detect(struct db_base *dbb)
-{
-  struct db_wbxng_dummy *db = (struct db_wbxng_dummy *) dbb;
-
-  int pins;
-  pins = hal_gpio_read( db->base.is_tx ? GPIO_TX_BANK : GPIO_RX_BANK );
-  if(pins & PLL_LOCK_DETECT)
-    //printf("Got Locked Status from Synth");
-    return true;
-
-  //printf("Got Unlocked Status from Synth");
-  return false;
-}
-
diff --git a/usrp2/firmware/lib/db_wbxng.h b/usrp2/firmware/lib/db_wbxng.h
deleted file mode 100644
index 3756e6c24..000000000
--- a/usrp2/firmware/lib/db_wbxng.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef DB_WBXNG_H
-#define DB_WBXNG_H
-
-#include <db_base.h>
-
-// IO Pin functions
-// Tx and Rx have shared defs, but different i/o regs
-#define ENABLE_5        (1 << 7)              // enables 5.0V power supply
-#define ENABLE_33       (1 << 6)              // enables 3.3V supply
-//#define RX_TXN          (1 << 15)             // Tx only: T/R antenna switch for TX/RX port
-//#define RX2_RX1N        (1 << 15)             // Rx only: antenna switch between RX2 and TX/RX port
-#define RX_TXN          ((1 << 5)|(1 << 15))  // Tx only: T/R antenna switch for TX/RX port
-#define RX2_RX1N        ((1 << 5)|(1 << 15))  // Rx only: antenna switch between RX2 and TX/RX port
-#define RXBB_EN         (1 << 4)
-#define TXMOD_EN        (1 << 4)
-#define PLL_CE          (1 << 3)
-#define PLL_PDBRF       (1 << 2)
-#define PLL_MUXOUT      (1 << 1)
-#define PLL_LOCK_DETECT (1 << 0)
-
-// RX Attenuator constants
-#define ATTN_SHIFT	8
-#define ATTN_MASK	(63 << ATTN_SHIFT)
-
-struct db_wbxng_common {
-  // RFX common stuff
-  uint16_t adf4350_regs_int;
-  uint16_t adf4350_regs_frac;
-  uint8_t adf4350_regs_prescaler;
-  uint16_t adf4350_regs_mod;
-  uint16_t adf4350_regs_10_bit_r_counter;
-  uint8_t adf4350_regs_divider_select;
-  uint8_t adf4350_regs_8_bit_band_select_clock_divider_value;
-
-  int freq_mult;
-  int spi_mask;
-};
-
-struct db_wbxng_dummy {
-  struct db_base	base;
-  struct db_wbxng_common	common;
-};
-
-
-struct db_wbxng_rx {
-  struct db_base	base;
-  struct db_wbxng_common	common;
-};
-
-struct db_wbxng_tx {
-  struct db_base	base;
-  struct db_wbxng_common	common;
-};
-
-
-#endif /* DB_WBXNG_H */
diff --git a/usrp2/firmware/lib/db_xcvr2450.c b/usrp2/firmware/lib/db_xcvr2450.c
deleted file mode 100644
index 4cdcf031e..000000000
--- a/usrp2/firmware/lib/db_xcvr2450.c
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
- * Copyright 2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <memory_map.h>
-#include <db_base.h>
-#include <stdio.h>
-#include <spi.h>
-#include <hal_io.h>
-#include <clocks.h>
-#include <mdelay.h>
-
-void set_atr_regs(int bank, struct db_base *db); //FIXME I need to be in a header
-
-// RX IO Pins
-#define LOCKDET (1 << 15)           // This is an INPUT!!!
-#define EN      (1 << 14)
-#define RX_EN   (1 << 13)           // 1 = RX on, 0 = RX off
-#define RX_HP   (1 << 12)
-#define B1      (1 << 11)
-#define B2      (1 << 10)
-#define B3      (1 << 9)
-#define B4      (1 << 8)
-#define B5      (1 << 7)
-#define B6      (1 << 6)
-#define B7      (1 << 5)
-#define RX_OE_MASK EN|RX_EN|RX_HP|B1|B2|B3|B4|B5|B6|B7
-#define RX_SAFE_IO EN
-#define RX_ATR_MASK EN|RX_EN|RX_HP
-
-// TX IO Pins
-#define HB_PA_OFF      (1 << 15)    // 5GHz PA, 1 = off, 0 = on
-#define LB_PA_OFF      (1 << 14)    // 2.4GHz PA, 1 = off, 0 = on
-#define ANTSEL_TX1_RX2 (1 << 13)    // 1 = Ant 1 to TX, Ant 2 to RX
-#define ANTSEL_TX2_RX1 (1 << 12)    // 1 = Ant 2 to TX, Ant 1 to RX
-#define TX_EN          (1 << 11)    // 1 = TX on, 0 = TX off
-#define AD9515DIV      (1 << 4)     // 1 = Div  by 3, 0 = Div by 2
-#define TX_OE_MASK HB_PA_OFF|LB_PA_OFF|ANTSEL_TX1_RX2|ANTSEL_TX2_RX1|TX_EN|AD9515DIV
-#define TX_SAFE_IO HB_PA_OFF|LB_PA_OFF|ANTSEL_TX1_RX2|AD9515DIV
-#define TX_ATR_MASK HB_PA_OFF|LB_PA_OFF|ANTSEL_TX1_RX2|ANTSEL_TX2_RX1|TX_EN|AD9515DIV
-
-#define LB_FREQ_MIN U2_DOUBLE_TO_FXPT_FREQ(2.3e9)
-#define LB_FREQ_MAX U2_DOUBLE_TO_FXPT_FREQ(2.6e9)
-#define HB_FREQ_MIN U2_DOUBLE_TO_FXPT_FREQ(4.8e9)
-#define HB_FREQ_MAX U2_DOUBLE_TO_FXPT_FREQ(6.1e9)
-#define MASTER_REF_CLK_DIV 1
-#define N_DIV_MIN_Q16 (131 << 16)
-
-bool xcvr2450_init(struct db_base *db);
-bool xcvr2450_set_freq(struct db_base *db, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc);
-bool xcvr2450_set_gain_rx(struct db_base *db, u2_fxpt_gain_t gain);
-bool xcvr2450_set_gain_tx(struct db_base *db, u2_fxpt_gain_t gain);
-bool xcvr2450_set_tx_enable(struct db_base *db, bool on);
-bool xcvr2450_set_rx_antenna(struct db_base *db, int ant);
-bool xcvr2450_set_tx_antenna(struct db_base *db, int ant);
-
-struct db_xcvr2450_common {
-  int d_mimo, d_int_div, d_frac_div, d_highband, d_five_gig;
-  int d_cp_current, d_ref_div, d_rssi_hbw;
-  int d_txlpf_bw, d_rxlpf_bw, d_rxlpf_fine, d_rxvga_ser;
-  int d_rssi_range, d_rssi_mode, d_rssi_mux;
-  int d_rx_hp_pin, d_rx_hpf, d_rx_ant;
-  int d_tx_ant, d_txvga_ser, d_tx_driver_lin;
-  int d_tx_vga_lin, d_tx_upconv_lin, d_tx_bb_gain;
-  int d_pabias_delay, d_pabias;
-  int d_rx_rf_gain, d_rx_bb_gain, d_txgain;
-  int d_ad9515_div;
-  int d_tx_enb;
-};
-
-struct db_xcvr2450_dummy {
-  struct db_base base;
-  struct db_xcvr2450_common *common;
-};
-
-struct db_xcvr2450_rx {
-  struct db_base base;
-  struct db_xcvr2450_common *common;
-};
-
-struct db_xcvr2450_tx {
-  struct db_base base;
-  struct db_xcvr2450_common *common;
-};
-
-/*
- * shared common between rx and tx db
- */
-struct db_xcvr2450_common db_xcvr2450_common = {
-  /* set sane defaults */
-  .d_mimo = 1,          // 0 = OFF, 1 = ON
-  .d_int_div = 192,     // 128 = min, 255 = max
-  .d_frac_div = 0,      // 0 = min, 65535 = max
-  .d_highband = 0,      // 0 = freq <= 5.4e9, 1 = freq > 5.4e9
-  .d_five_gig = 0,      // 0 = freq <= 3.e9, 1 = freq > 3e9
-  .d_cp_current = 0,    // 0 = 2mA, 1 = 4mA
-  .d_ref_div = 1,       // 1 to 7
-  .d_rssi_hbw = 0,      // 0 = 2 MHz, 1 = 6 MHz
-  .d_txlpf_bw = 1,      // 1 = 12 MHz, 2 = 18 MHz, 3 = 24 MHz
-  .d_rxlpf_bw = 1,      // 0 = 7.5 MHz, 1 = 9.5 MHz, 2 = 14 MHz, 3 = 18 MHz
-  .d_rxlpf_fine = 2,    // 0 = 90%, 1 = 95%, 2 = 100%, 3 = 105%, 4 = 110%
-  .d_rxvga_ser = 1,     // 0 = RXVGA controlled by B7:1, 1=controlled serially
-  .d_rssi_range = 1,    // 0 = low range (datasheet typo), 1=high range (0.5V - 2.0V)
-  .d_rssi_mode = 1,     // 0 = enable follows RXHP, 1 = enabled
-  .d_rssi_mux = 0,      // 0 = RSSI, 1 = TEMP
-  .d_rx_hp_pin = 0,     // 0 = Fc set by rx_hpf, 1 = 600 KHz
-  .d_rx_hpf = 0,        // 0 = 100Hz, 1 = 30KHz
-  .d_rx_ant = 0,        // 0 = Ant. #1, 1 = Ant. #2
-  .d_tx_ant = 0,        // 0 = Ant. #1, 1 = Ant. #2
-  .d_txvga_ser = 1,     // 0 = TXVGA controlled by B6:1, 1=controlled serially
-  .d_tx_driver_lin = 2, // 0=50% (worst linearity), 1=63%, 2=78%, 3=100% (best lin)
-  .d_tx_vga_lin = 2,    // 0=50% (worst linearity), 1=63%, 2=78%, 3=100% (best lin)
-  .d_tx_upconv_lin = 2, // 0=50% (worst linearity), 1=63%, 2=78%, 3=100% (best lin)
-  .d_tx_bb_gain = 3,    // 0=maxgain-5dB, 1=max-3dB, 2=max-1.5dB, 3=max
-  .d_pabias_delay = 15, // 0 = 0, 15 = 7uS
-  .d_pabias = 0,        // 0 = 0 uA, 63 = 315uA
-  .d_rx_rf_gain = 0,    // 0 = 0dB, 1 = 0dB, 2 = 15dB, 3 = 30dB
-  .d_rx_bb_gain = 16,   // 0 = min, 31 = max (0 - 62 dB)
-  .d_txgain = 63,       // 0 = min, 63 = max
-  .d_tx_enb = 1,        // 0 = disabled, 1 = enabled
-};
-
-/*
- * The class instances
- */
-struct db_xcvr2450_rx db_xcvr2450_rx = {
-  .base.dbid = 0x0061,
-  .base.is_tx = false,
-  .base.output_enables = RX_OE_MASK,
-  .base.used_pins = 0xFFFF,
-  .base.freq_min = LB_FREQ_MIN,
-  .base.freq_max = HB_FREQ_MAX,
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(92),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(1),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = false,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = xcvr2450_init,
-  .base.set_freq = xcvr2450_set_freq,
-  .base.set_gain = xcvr2450_set_gain_rx,
-  .base.atr_mask = RX_ATR_MASK,
-  .base.atr_txval = 0x0,
-  .base.atr_rxval = 0x0,
-  .base.set_antenna = xcvr2450_set_rx_antenna,
-  .common = &db_xcvr2450_common,
-};
-
-struct db_xcvr2450_tx db_xcvr2450_tx = {
-  .base.dbid = 0x0060,
-  .base.is_tx = true,
-  .base.output_enables = TX_OE_MASK,
-  .base.used_pins = 0xFFFF,
-  .base.freq_min = LB_FREQ_MIN,
-  .base.freq_max = HB_FREQ_MAX,
-  .base.gain_min = U2_DOUBLE_TO_FXPT_GAIN(0),
-  .base.gain_max = U2_DOUBLE_TO_FXPT_GAIN(30),
-  .base.gain_step_size = U2_DOUBLE_TO_FXPT_GAIN(30.0/63.0),
-  .base.is_quadrature = true,
-  .base.i_and_q_swapped = true,
-  .base.spectrum_inverted = false,
-  .base.default_lo_offset = U2_DOUBLE_TO_FXPT_FREQ(0),
-  .base.init = xcvr2450_init,
-  .base.set_freq = xcvr2450_set_freq,
-  .base.set_gain = xcvr2450_set_gain_tx,
-  .base.set_tx_enable = xcvr2450_set_tx_enable,
-  .base.atr_mask = TX_ATR_MASK,
-  .base.atr_txval = 0x0,
-  .base.atr_rxval = 0x0,
-  .base.set_antenna = xcvr2450_set_tx_antenna,
-  .common = &db_xcvr2450_common,
-};
-
-/**************************************************
- * Set Registers
- **************************************************/
-static void
-send_reg(int v){
-  // Send 24 bits, it keeps last 18 clocked in
-  spi_transact(SPI_TXONLY,SPI_SS_RX_DB,v,24,SPIF_PUSH_FALL);
-  //printf("xcvr2450: Setting reg %d to %x\n", (v&15), v);
-}
-
-static void
-set_reg_standby(struct db_xcvr2450_dummy *db){
-  int reg_standby = (
-    (db->common->d_mimo<<17) |
-    (1<<16)                 |
-    (1<<6)                  |
-    (1<<5)                  |
-    (1<<4)                  | 2);
-  send_reg(reg_standby);
-}
-
-static void
-set_reg_int_divider(struct db_xcvr2450_dummy *db){
-  int reg_int_divider = ((
-    (db->common->d_frac_div & 0x03)<<16) |
-    (db->common->d_int_div<<4)           | 3);
-  send_reg(reg_int_divider);
-}
-
-static void
-set_reg_frac_divider(struct db_xcvr2450_dummy *db){
-  int reg_frac_divider = ((db->common->d_frac_div & 0xfffc)<<2) | 4;
-  send_reg(reg_frac_divider);
-}
-
-static void
-set_reg_bandselpll(struct db_xcvr2450_dummy *db){
-  int reg_bandselpll = ((db->common->d_mimo<<17) |
-    (1<<16) |
-    (1<<15) |
-    (0<<11) | //this bit gets toggled
-    (db->common->d_highband<<10)  |
-    (db->common->d_cp_current<<9) |
-    (db->common->d_ref_div<<5)    |
-    (db->common->d_five_gig<<4)   | 5);
-  send_reg(reg_bandselpll);
-  reg_bandselpll = ((db->common->d_mimo<<17) |
-    (1<<16) |
-    (1<<15) |
-    (1<<11) |
-    (db->common->d_highband<<10)  |
-    (db->common->d_cp_current<<9) |
-    (db->common->d_ref_div<<5)    |
-    (db->common->d_five_gig<<4)   | 5);
-  send_reg(reg_bandselpll);
-}
-
-static void
-set_reg_cal(struct db_xcvr2450_dummy *db){
-  // FIXME do calibration
-  int reg_cal = (
-    (1<<14) | 6);
-  send_reg(reg_cal);
-}
-
-static void
-set_reg_lpf(struct db_xcvr2450_dummy *db){
-  int reg_lpf = (
-    (db->common->d_rssi_hbw<<15)  |
-    (db->common->d_txlpf_bw<<9)  |
-    (db->common->d_rxlpf_bw<<7)   |
-    (db->common->d_rxlpf_fine<<4) | 7);
-  send_reg(reg_lpf);
-}
-
-static void
-set_reg_rxrssi_ctrl(struct db_xcvr2450_dummy *db){
-  int reg_rxrssi_ctrl = (
-       (db->common->d_rxvga_ser<<16)  |
-       (db->common->d_rssi_range<<15) |
-       (db->common->d_rssi_mode<<14)  |
-       (db->common->d_rssi_mux<<12)   |
-       (1<<9)                        |
-       (db->common->d_rx_hpf<<6)      |
-       (1<<4)                        | 8);
-  send_reg(reg_rxrssi_ctrl);
-}
-
-static void
-set_reg_txlin_gain(struct db_xcvr2450_dummy *db){
-  int reg_txlin_gain = (
-      (db->common->d_txvga_ser<<14)     |
-      (db->common->d_tx_driver_lin<<12) |
-      (db->common->d_tx_vga_lin<<10)    |
-      (db->common->d_tx_upconv_lin<<6)  |
-      (db->common->d_tx_bb_gain<<4)     | 9);
-  send_reg(reg_txlin_gain);
-}
-
-static void
-set_reg_pabias(struct db_xcvr2450_dummy *db){
-  int reg_pabias = (
-      (db->common->d_pabias_delay<<10) |
-      (db->common->d_pabias<<4)        | 10);
-  send_reg(reg_pabias);
-}
-
-static void
-set_reg_rxgain(struct db_xcvr2450_dummy *db){
-  int reg_rxgain = (
-    (db->common->d_rx_rf_gain<<9) |
-    (db->common->d_rx_bb_gain<<4) | 11);
-  send_reg(reg_rxgain);
-}
-
-static void
-set_reg_txgain(struct db_xcvr2450_dummy *db){
-  int reg_txgain = (
-    (db->common->d_txgain<<4) | 12);
-  send_reg(reg_txgain);
-}
-
-/**************************************************
- * GPIO
- **************************************************/
-static void
-set_gpio(struct db_xcvr2450_dummy *db){
-  //set tx/rx gpio pins for auto tr
-  int tx_enb_sel = (db->common->d_tx_enb)? TX_EN:0;
-  int ad9515_sel = (db->common->d_ad9515_div == 3)? AD9515DIV:0;
-  int rx_hp = (db->common->d_rx_hp_pin)? RX_HP:0;
-  int tx_antsel = (db->common->d_tx_ant)? ANTSEL_TX2_RX1:ANTSEL_TX1_RX2;
-  int rx_antsel = (db->common->d_rx_ant)? ANTSEL_TX2_RX1:ANTSEL_TX1_RX2;
-  int tx_pa_sel = (db->common->d_five_gig)? LB_PA_OFF:HB_PA_OFF;
-
-  /* FIXME better way to set rx and tx val for RX and TX banks */
-  /* set rx bank */
-  db->base.atr_rxval = EN|rx_hp|RX_EN;
-  db->base.atr_txval = EN|rx_hp;
-  set_atr_regs(GPIO_RX_BANK, (struct db_base *)db);
-  /* set tx bank */
-  db->base.atr_rxval = HB_PA_OFF|LB_PA_OFF|rx_antsel|ad9515_sel;
-  db->base.atr_txval = tx_pa_sel|tx_antsel|tx_enb_sel|ad9515_sel;
-  set_atr_regs(GPIO_TX_BANK, (struct db_base *)db);
-}
-
-/**************************************************
- * Init for TX and RX
- **************************************************/
-bool
-xcvr2450_init(struct db_base *dbb){
-  struct db_xcvr2450_dummy *db = (struct db_xcvr2450_dummy *) dbb;
-  /* Initialize chipset */
-  clocks_enable_tx_dboard(true, MASTER_REF_CLK_DIV);
-  set_gpio(db);
-  set_reg_standby(db);
-  set_reg_bandselpll(db);
-  set_reg_cal(db);
-  set_reg_lpf(db);
-  set_reg_rxrssi_ctrl(db);
-  set_reg_txlin_gain(db);
-  set_reg_pabias(db);
-  set_reg_rxgain(db);
-  set_reg_txgain(db);
-  //u2_fxpt_freq_t dc;
-  //db->base.set_freq(dbb, U2_DOUBLE_TO_FXPT_FREQ(2.434e9), &dc);
-  return true;
-}
-
-/**************************************************
- * Lock detect
- **************************************************/
-static bool
-lock_detect(){
-  //true when the VCO/PLL lock detect bit is set.
-  if(hal_gpio_read(GPIO_RX_BANK) & LOCKDET) {
-    return true;
-  }
-  else {      // Give it a second chance
-    mdelay(1);
-    if(hal_gpio_read(GPIO_RX_BANK) & LOCKDET)
-      return true;
-    else
-      return false;
-  }
-}
-
-/**************************************************
- * Set the freq
- **************************************************/
-bool
-xcvr2450_set_freq(struct db_base *dbb, u2_fxpt_freq_t freq, u2_fxpt_freq_t *dc){
-  unsigned int scaler, div_factor, actual_div_q16;
-  struct db_xcvr2450_dummy *db = (struct db_xcvr2450_dummy *) dbb;
-  /* determine if the freq range is in low or high band */
-  if (freq >= LB_FREQ_MIN && freq <= LB_FREQ_MAX) {
-    db->common->d_five_gig = 0;
-    scaler = 3;
-    //printf("2.4-GHZ\n");
-  } else if (freq >= HB_FREQ_MIN && freq <= HB_FREQ_MAX) {
-    db->common->d_five_gig = 1;
-    scaler = 5;
-    //printf("5-GHZ\n");
-  } else {
-    printf("Out of range\n");
-    return false;
-  }
-  /* set the highband bit */
-  if(freq > U2_DOUBLE_TO_FXPT_FREQ(5.408e9)) {
-    db->common->d_highband = 1;
-    //printf("5-HB\n");
-  }
-  else {
-    db->common->d_highband = 0;
-    //printf("5-LB\n");
-  }
-  unsigned int loop_iter = 0;
-  do { /* set the dividers so that the n divider is above the practical minimum */
-    switch(loop_iter){
-      case 0:
-        db->common->d_ad9515_div = 3;
-        db->common->d_ref_div = 1;
-        break;
-      case 1:
-        db->common->d_ad9515_div = 2;
-        db->common->d_ref_div = 2;
-        break;
-      default:
-        db->common->d_ad9515_div = 3;
-        db->common->d_ref_div = loop_iter;
-    }
-    loop_iter++;
-    div_factor = db->common->d_ref_div*db->common->d_ad9515_div*4*MASTER_REF_CLK_DIV;
-    actual_div_q16 = ((freq*div_factor)/(scaler*MASTER_CLK_RATE)) >> (U2_FPF_RP-16);
-  } while (actual_div_q16 < N_DIV_MIN_Q16);
-  /* calculate the divisors */
-  db->common->d_int_div = actual_div_q16 >> 16;
-  db->common->d_frac_div = actual_div_q16 & 0xffff; //isolate lower 16 bits
-  /* calculate the dc freq */
-  *dc = ((((u2_fxpt_freq_t)MASTER_CLK_RATE)*actual_div_q16*scaler) / div_factor) << (U2_FPF_RP-16);
-  /*printf("scaler %d, div(int) %u, div_factor %d, ad9515_div %u, ref_div %u\n",
-    scaler, db->common->d_int_div, div_factor, db->common->d_ad9515_div, db->common->d_ref_div);
-  printf("actual div %u, Target Freq %uKHz, Actual Freq %uKHz\n",
-    actual_div_q16, u2_fxpt_freq_round_to_int(freq/1000), u2_fxpt_freq_round_to_int(*dc/1000));
-  */
-  set_gpio(db);
-  set_reg_int_divider(db);
-  set_reg_frac_divider(db);
-  set_reg_bandselpll(db);
-
-  bool ok = lock_detect();
-  if(!ok){
-    printf("Fail lock detect %uKHz\n", u2_fxpt_freq_round_to_int(freq/1000));
-  }
-  return ok;
-}
-
-/**************************************************
- * Set RX Gain
- **************************************************/
-bool
-xcvr2450_set_gain_rx(struct db_base *dbb, u2_fxpt_gain_t gain){
-  struct db_xcvr2450_dummy *db = (struct db_xcvr2450_dummy *) dbb;
-  //ensure gain is within range
-  if(!(gain >= db->base.gain_min && gain <= db->base.gain_max)) {
-    return false;
-  }
-  // Split the gain between RF and baseband
-  // This is experimental, not prescribed
-  if(gain < U2_DOUBLE_TO_FXPT_GAIN(30.0)) {
-    db->common->d_rx_rf_gain = 0; // 0 dB RF gain
-    db->common->d_rx_bb_gain = u2_fxpt_gain_round_to_int(gain/2);
-  }
-  else if(gain >= U2_DOUBLE_TO_FXPT_GAIN(30.0) && gain < U2_DOUBLE_TO_FXPT_GAIN(61.0)) {
-    db->common->d_rx_rf_gain = 2; // 15 dB RF gain
-    db->common->d_rx_bb_gain = u2_fxpt_gain_round_to_int((gain-U2_DOUBLE_TO_FXPT_GAIN(15.0))/2);
-  }
-  else if(gain >= U2_DOUBLE_TO_FXPT_GAIN(61.0)) {
-    db->common->d_rx_rf_gain = 3; // 30.5 dB RF gain
-    db->common->d_rx_bb_gain = u2_fxpt_gain_round_to_int((gain-U2_DOUBLE_TO_FXPT_GAIN(30.5))/2);
-  }
-  //printf("RX RF Gain %u, RX BB Gain %u\n", db->common->d_rx_rf_gain, db->common->d_rx_bb_gain);
-  set_reg_rxgain(db);
-  return true;
-}
-
-/**************************************************
- * Set TX Gain
- **************************************************/
-bool
-xcvr2450_set_gain_tx(struct db_base *dbb, u2_fxpt_gain_t gain){
-  struct db_xcvr2450_dummy *db = (struct db_xcvr2450_dummy *) dbb;
-  //ensure gain in within range
-  if(!(gain >= db->base.gain_min && gain <= db->base.gain_max)) {
-    return false;
-  }
-  //scale for register and set
-  db->common->d_txgain = (gain*63)/db->base.gain_max;
-  //printf("TX Gain %u, TX Reg %u\n", u2_fxpt_gain_round_to_int(gain), db->common->d_txgain);
-  set_reg_txgain(db);
-  return true;
-}
-
-/**************************************************
- * Set TX Enable
- **************************************************/
-bool
-xcvr2450_set_tx_enable(struct db_base *dbb, bool on){
-  struct db_xcvr2450_dummy *db = (struct db_xcvr2450_dummy *) dbb;
-  db->common->d_tx_enb = on;
-  set_gpio(db);
-  return true;
-}
-
-/**************************************************
- * Set Antennas
- **************************************************/
-bool xcvr2450_set_rx_antenna(struct db_base *dbb, int ant){
-    printf("xcvr set rx ant %d\n", ant);
-    if (ant > 1) return false;
-    struct db_xcvr2450_dummy *db = (struct db_xcvr2450_dummy *) dbb;
-    db->common->d_rx_ant = ant;
-    set_gpio(db);
-    return true;
-}
-
-bool xcvr2450_set_tx_antenna(struct db_base *dbb, int ant){
-    printf("xcvr set tx ant %d\n", ant);
-    if (ant > 1) return false;
-    struct db_xcvr2450_dummy *db = (struct db_xcvr2450_dummy *) dbb;
-    db->common->d_tx_ant = ant;
-    set_gpio(db);
-    return true;
-}
diff --git a/usrp2/firmware/lib/dbsm.c b/usrp2/firmware/lib/dbsm.c
deleted file mode 100644
index 96484d577..000000000
--- a/usrp2/firmware/lib/dbsm.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Double Buffering State Machine
- */
-
-#include "dbsm.h"
-#include "memory_map.h"
-#include "buffer_pool.h"
-#include "bool.h"
-#include "nonstdio.h"
-#include <stdlib.h>
-
-typedef enum {
-  BS_EMPTY,
-  BS_FILLING,
-  BS_FULL,
-  BS_EMPTYING,
-} buffer_state_t;
-
-static buffer_state_t buffer_state[NBUFFERS];
-
-bool
-dbsm_nop_inspector(dbsm_t *sm, int buf_this)
-{
-  return false;
-}
-
-void
-dbsm_init(dbsm_t *sm, int buf0,
-	  const buf_cmd_args_t *recv, const buf_cmd_args_t *send,
-	  inspector_t inspect)
-{
-  if (buf0 & 0x1)	// must be even
-    abort();
-
-  sm->buf0 = buf0;
-  sm->running = false;
-  sm->recv_args = *recv;
-  sm->send_args = *send;
-
-  sm->rx_idle = true;
-  sm->tx_idle = true;
-
-  sm->inspect = inspect;
-
-  // How much to adjust the last_line register.
-  // It's 1 for everything but the ethernet.
-  //sm->last_line_adj = recv->port == PORT_ETH ? 3 : 1;
-  sm->last_line_adj = 1;
-
-  buffer_state[sm->buf0] = BS_EMPTY;
-  buffer_state[sm->buf0 ^ 1] = BS_EMPTY;
-
-  sm->precomputed_receive_to_buf_ctrl_word[0] =
-    (BPC_READ
-     | BPC_BUFFER(sm->buf0)
-     | BPC_PORT(sm->recv_args.port)
-     | BPC_STEP(1)
-     | BPC_FIRST_LINE(sm->recv_args.first_line)
-     | BPC_LAST_LINE(sm->recv_args.last_line));
-    
-  sm->precomputed_receive_to_buf_ctrl_word[1] =
-    (BPC_READ
-     | BPC_BUFFER(sm->buf0 ^ 1)
-     | BPC_PORT(sm->recv_args.port)
-     | BPC_STEP(1)
-     | BPC_FIRST_LINE(sm->recv_args.first_line)
-     | BPC_LAST_LINE(sm->recv_args.last_line));
-    
-  sm->precomputed_send_from_buf_ctrl_word[0] =
-    (BPC_WRITE
-     | BPC_BUFFER(sm->buf0)
-     | BPC_PORT(sm->send_args.port)
-     | BPC_STEP(1)
-     | BPC_FIRST_LINE(sm->send_args.first_line)
-     | BPC_LAST_LINE(0));		// last line filled in at runtime
-    
-  sm->precomputed_send_from_buf_ctrl_word[1] =
-    (BPC_WRITE
-     | BPC_BUFFER(sm->buf0 ^ 1)
-     | BPC_PORT(sm->send_args.port)
-     | BPC_STEP(1)
-     | BPC_FIRST_LINE(sm->send_args.first_line)
-     | BPC_LAST_LINE(0));		// last line filled in at runtime
-    
-}
-
-static inline void
-dbsm_receive_to_buf(dbsm_t *sm, int bufno)
-{
-  buffer_pool_ctrl->ctrl = sm->precomputed_receive_to_buf_ctrl_word[bufno & 1];
-}
-
-static inline void
-dbsm_send_from_buf(dbsm_t *sm, int bufno)
-{
-  buffer_pool_ctrl->ctrl =
-    (sm->precomputed_send_from_buf_ctrl_word[bufno & 1]
-     | BPC_LAST_LINE(buffer_pool_status->last_line[bufno] - sm->last_line_adj));
-}
-
-void
-dbsm_start(dbsm_t *sm)
-{
-  // printf("dbsm_start: buf0 = %d, recv_port = %d\n", sm->buf0, sm->recv_args.port);
-
-  sm->running = true;
-
-  buffer_state[sm->buf0] = BS_EMPTY;
-  buffer_state[sm->buf0 ^ 1] = BS_EMPTY;
-
-  bp_clear_buf(sm->buf0);
-  bp_clear_buf(sm->buf0 ^ 1);
-
-  sm->tx_idle = true;
-  sm->rx_idle = false;
-  dbsm_receive_to_buf(sm, sm->buf0);
-  buffer_state[sm->buf0] = BS_FILLING;
-
-}
-
-
-void
-dbsm_stop(dbsm_t *sm)
-{
-  sm->running = false;
-  bp_clear_buf(sm->buf0);
-  bp_clear_buf(sm->buf0 ^ 1);
-  buffer_state[sm->buf0] = BS_EMPTY;
-  buffer_state[sm->buf0 ^ 1] = BS_EMPTY;
-}
-
-static void dbsm_process_helper(dbsm_t *sm, int buf_this);
-static void dbsm_error_helper(dbsm_t *sm, int buf_this);
-
-void
-dbsm_process_status(dbsm_t *sm, uint32_t status)
-{
-  if (!sm->running)
-    return;
-
-  if (status & (BPS_ERROR(sm->buf0) | BPS_ERROR(sm->buf0 ^ 1))){
-    putchar('E');
-    // Most likely an ethernet Rx error.  We just restart the transfer.
-    if (status & (BPS_ERROR(sm->buf0)))
-      dbsm_error_helper(sm, sm->buf0);
-
-    if (status & (BPS_ERROR(sm->buf0 ^ 1)))
-      dbsm_error_helper(sm, sm->buf0 ^ 1);
-  }
-
-  if (status & BPS_DONE(sm->buf0))
-    dbsm_process_helper(sm, sm->buf0);
-
-  if (status & BPS_DONE(sm->buf0 ^ 1))
-    dbsm_process_helper(sm, sm->buf0 ^ 1);
-}
-
-static void
-dbsm_process_helper(dbsm_t *sm, int buf_this)
-{
-  int buf_other = buf_this ^ 1;
-
-  bp_clear_buf(buf_this);
-
-  if (buffer_state[buf_this] == BS_FILLING){
-    buffer_state[buf_this] = BS_FULL;
-    //
-    // does s/w handle this packet?
-    //
-    if (sm->inspect(sm, buf_this)){
-      // s/w handled the packet; refill the buffer
-      dbsm_receive_to_buf(sm, buf_this);
-      buffer_state[buf_this] = BS_FILLING;
-    }
-
-    else {	// s/w didn't handle this; pass it on
-
-      if(buffer_state[buf_other] == BS_EMPTY){
-	dbsm_receive_to_buf(sm, buf_other);
-	buffer_state[buf_other] = BS_FILLING;
-      }
-      else
-	sm->rx_idle = true;
-
-      if (sm->tx_idle){
-	sm->tx_idle = false;
-	dbsm_send_from_buf(sm, buf_this);
-	buffer_state[buf_this] = BS_EMPTYING;
-      }
-    }
-  }
-  else {  // buffer was emptying
-    buffer_state[buf_this] = BS_EMPTY;
-    if (sm->rx_idle){
-      sm->rx_idle = false;
-      dbsm_receive_to_buf(sm, buf_this);
-      buffer_state[buf_this] = BS_FILLING;
-    }
-    if (buffer_state[buf_other] == BS_FULL){
-      dbsm_send_from_buf(sm, buf_other);
-      buffer_state[buf_other] = BS_EMPTYING;
-    }
-    else
-      sm->tx_idle = true;
-  }
-}
-
-static void
-dbsm_error_helper(dbsm_t *sm, int buf_this)
-{
-  bp_clear_buf(buf_this);		// clears ERROR flag
-
-  if (buffer_state[buf_this] == BS_FILLING){
-    dbsm_receive_to_buf(sm, buf_this);	  // restart the xfer
-  }
-  else { // buffer was emptying
-    dbsm_send_from_buf(sm, buf_this);	  // restart the xfer
-  }
-}
-
-/*
- * Handle DSP Tx underrun
- */
-void
-dbsm_handle_tx_underrun(dbsm_t *sm)
-{
-  // clear the DSP Tx state machine
-  dsp_tx_regs->clear_state = 1;
-
-  // If there's a buffer that's empyting, clear it & flush xfer
-
-  if (buffer_state[sm->buf0] == BS_EMPTYING){
-    bp_clear_buf(sm->buf0);
-    dsp_tx_regs->clear_state = 1;	// flush partial packet
-    // drop frame in progress on ground.  Pretend it finished
-    dbsm_process_helper(sm, sm->buf0);
-  }
-  else if (buffer_state[sm->buf0 ^ 1] == BS_EMPTYING){
-    bp_clear_buf(sm->buf0 ^ 1);
-    dsp_tx_regs->clear_state = 1;	// flush partial packet
-    // drop frame in progress on ground.  Pretend it finished
-    dbsm_process_helper(sm, sm->buf0 ^ 1);
-  }
-}
-
-/*
- * Handle DSP Rx overrun
- */
-void
-dbsm_handle_rx_overrun(dbsm_t *sm)
-{
-  dsp_rx_regs->clear_state = 1;
-
-  // If there's a buffer that's filling, clear it.
-  // Any restart will be the job of the caller.
-  
-  if (buffer_state[sm->buf0] == BS_FILLING)
-    bp_clear_buf(sm->buf0);
-
-  if (buffer_state[sm->buf0 ^1] == BS_FILLING)
-    bp_clear_buf(sm->buf0 ^ 1);
-}
-
-void 
-dbsm_wait_for_opening(dbsm_t *sm)
-{
-  if (buffer_state[sm->buf0] == BS_EMPTYING){
-    // wait for xfer to complete
-    int mask = BPS_DONE(sm->buf0) | BPS_ERROR(sm->buf0) | BPS_IDLE(sm->buf0);
-    while ((buffer_pool_status->status & mask) == 0)
-      ;
-  }
-  else if (buffer_state[sm->buf0 ^ 1] == BS_EMPTYING){
-    // wait for xfer to complete
-    int mask = BPS_DONE(sm->buf0 ^ 1) | BPS_ERROR(sm->buf0 ^ 1) | BPS_IDLE(sm->buf0 ^ 1);
-    while ((buffer_pool_status->status & mask) == 0)
-      ;
-  }
-}
diff --git a/usrp2/firmware/lib/dbsm.h b/usrp2/firmware/lib/dbsm.h
deleted file mode 100644
index 3a64bf0dc..000000000
--- a/usrp2/firmware/lib/dbsm.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_DBSM_H
-#define INCLUDED_DBSM_H
-
-/*
- * Double Buffering State Machine
- */
-
-#include <stdint.h>
-#include "bool.h"
-
-struct _dbsm;
-typedef struct _dbsm dbsm_t;
-
-/*
- * pointer to function that does packet inspection.
- *
- * If one of these returns true, it means that the s/w
- * handled that packet, and that it should NOT be passed
- * on to the normal destination port.
- */
-typedef bool (*inspector_t)(dbsm_t *sm, int buf_this);
-
-bool dbsm_nop_inspector(dbsm_t *sm, int buf_this);	// returns false
-
-
-typedef struct
-{
-  uint16_t	port;
-  uint16_t	first_line;
-  uint16_t	last_line;
-} buf_cmd_args_t;
-
-/*!
- * double buffer state machine
- */
-struct _dbsm
-{
-  uint8_t	  buf0;	     // Must be even. This machine uses buf0 and buf0+1
-  uint8_t	  running;
-  uint8_t	  rx_idle;
-  uint8_t	  tx_idle;
-  buf_cmd_args_t  recv_args;
-  buf_cmd_args_t  send_args;
-  inspector_t	  inspect;
-  uint32_t	  precomputed_receive_to_buf_ctrl_word[2];
-  uint32_t	  precomputed_send_from_buf_ctrl_word[2];
-  int		  last_line_adj;
-};
-
-void dbsm_init(dbsm_t *sm, int buf0,
-	       const buf_cmd_args_t *recv, const buf_cmd_args_t *send,
-	       inspector_t inspect);
-
-void dbsm_start(dbsm_t *sm);
-void dbsm_stop(dbsm_t *sm);
-void dbsm_process_status(dbsm_t *sm, uint32_t status);
-void dbsm_handle_tx_underrun(dbsm_t *sm);
-void dbsm_handle_rx_overrun(dbsm_t *sm);
-
-/*
- * The cpu calls this when it want to ensure that it can send a buffer
- * to the same destination being used by this state machine.
- *
- * If neither buffer is EMPTYING it returns immediately.  If a buffer
- * is EMPYTING, it waits for the h/w to transition to the DONE or
- * ERROR state.
- *
- * When this function returns, the caller queues it's buffer and busy
- * waits for it to complete.
- */
-void dbsm_wait_for_opening(dbsm_t *sm);
-
-#endif /* INCLUDED_DBSM_H */
diff --git a/usrp2/firmware/lib/eeprom.c b/usrp2/firmware/lib/eeprom.c
deleted file mode 100644
index b12ffe082..000000000
--- a/usrp2/firmware/lib/eeprom.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "i2c.h"
-#include "mdelay.h"
-
-static const int EEPROM_PAGESIZE = 16;
-
-bool
-eeprom_write (int i2c_addr, int eeprom_offset, const void *buf, int len)
-{
-  unsigned char cmd[2];
-  const unsigned char *p = (unsigned char *) buf;
-  
-  // The simplest thing that could possibly work:
-  //   all writes are single byte writes.
-  //
-  // We could speed this up using the page write feature,
-  // but we write so infrequently, why bother...
-
-  while (len-- > 0){
-    cmd[0] = eeprom_offset++;
-    cmd[1] = *p++;
-    bool r = i2c_write (i2c_addr, cmd, sizeof (cmd));
-    mdelay (10);	// delay 10ms worst case write time
-    if (!r)
-      return false;
-  }
-  return true;
-}
-
-bool
-eeprom_read (int i2c_addr, int eeprom_offset, void *buf, int len)
-{
-  unsigned char *p = (unsigned char *) buf;
-
-  // We setup a random read by first doing a "zero byte write".
-  // Writes carry an address.  Reads use an implicit address.
-
-  unsigned char cmd[1];
-  cmd[0] = eeprom_offset;
-  if (!i2c_write (i2c_addr, cmd, sizeof (cmd)))
-    return false;
-
-  while (len > 0){
-    // int n = std::min (len, MAX_EP0_PKTSIZE);
-    int n = len;
-    if (!i2c_read (i2c_addr, p, n))
-      return false;
-    len -= n;
-    p += n;
-  }
-  return true;
-}
- 
diff --git a/usrp2/firmware/lib/eth_mac.c b/usrp2/firmware/lib/eth_mac.c
deleted file mode 100644
index 88051dca0..000000000
--- a/usrp2/firmware/lib/eth_mac.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "eth_mac.h"
-#include "memory_map.h"
-#include "bool.h"
-#include "eth_phy.h"	// for simulation constants
-#include "mdelay.h"
-#include "stdio.h"
-
-#define PHY_ADDR 1
-
-void
-eth_mac_set_addr(const u2_mac_addr_t *src)
-{
-  eth_mac->ucast_hi = 
-    (((unsigned int)src->addr[0])<<8) + 
-    ((unsigned int)src->addr[1]);
-  eth_mac->ucast_lo = 
-    (((unsigned int)src->addr[2])<<24) + 
-    (((unsigned int)src->addr[3])<<16) +
-    (((unsigned int)src->addr[4])<<8) +
-    (((unsigned int)src->addr[5]));
-}
-
-
-void 
-eth_mac_init(const u2_mac_addr_t *src)
-{
-  eth_mac->miimoder = 25;	// divider from CPU clock (50MHz/25 = 2MHz)
-
-  eth_mac_set_addr(src);
-  eth_mac->settings = MAC_SET_PAUSE_EN | MAC_SET_PASS_BCAST | MAC_SET_PASS_UCAST | MAC_SET_PAUSE_SEND_EN; 
-
-  eth_mac->pause_time = 38;
-  eth_mac->pause_thresh = 1200;
-
-  // set rx flow control high and low water marks
-  // unsigned int lwmark = (2*2048 + 64)/4; // 2 * 2048-byte frames + 1 * 64-byte pause frame
-  // eth_mac->fc_hwmark = lwmark + 2048/4;  // plus a 2048-byte frame
-
-  //  eth_mac->fc_lwmark = 600;		// there are currently 2047 lines in the fifo
-  // eth_mac->fc_hwmark = 1200;
-  //eth_mac->fc_padtime = 1700;           // how long before flow control runs out do we 
-                                        // request a re-pause.  Units of 8ns (bytes)
-
-  //eth_mac->tx_pause_en = 0;		// pay attn to pause frames sent to us
-  //eth_mac->pause_quanta_set = 38;	// a bit more than 1 max frame 16kb/512 + fudge
-  //eth_mac->pause_frame_send_en = 0;	// enable sending pause frames
-}
-
-int
-eth_mac_read_rmon(int addr)
-{
-  int t = 0;
-  /*  
-  eth_mac->rmon_rd_addr = addr;
-  eth_mac->rmon_rd_apply = 1;
-  while(eth_mac->rmon_rd_grant == 0)
-    ;
-
-  t = eth_mac->rmon_rd_dout;
-  eth_mac->rmon_rd_apply = 0;
-  */
-  return t;
-}
-
-int
-eth_mac_miim_read(int addr)
-{
-  if (hwconfig_simulation_p()){
-    switch(addr){
-    case PHY_LINK_AN:
-      return LANSR_MASTER | LANSR_LINK_GOOD | LANSR_SPEED_1000;
-    default:
-      return 0;
-    }
-  }
-
-  int phy_addr = PHY_ADDR;
-  eth_mac->miiaddress = ((addr & 0x1f) << 8) | phy_addr;
-  eth_mac->miicommand = MIIC_RSTAT;
-
-  while((eth_mac->miistatus & MIIS_BUSY) != 0)
-    ;
-
-  int r = eth_mac->miirx_data;
-  //printf("MIIM-READ ADDR 0x%x DATA 0x%x\n",addr, r);
-  return r;
-}
-
-void
-eth_mac_miim_write(int addr, int value)
-{
-  int phy_addr = PHY_ADDR;
-  eth_mac->miiaddress = ((addr & 0x1f) << 8) | phy_addr;
-  eth_mac->miitx_data = value;
-  eth_mac->miicommand = MIIC_WCTRLDATA;
-
-  //printf("MIIM-WRITE ADDR 0x%x VAL 0x%x\n",addr,value);
-  while((eth_mac->miistatus & MIIS_BUSY) != 0)
-    ;
-}
-
-int
-eth_mac_miim_read_status(void)
-{
-  if (hwconfig_simulation_p())
-    return 0;
-
-  return eth_mac->miistatus;
-}
diff --git a/usrp2/firmware/lib/eth_mac.h b/usrp2/firmware/lib/eth_mac.h
deleted file mode 100644
index 291994c5c..000000000
--- a/usrp2/firmware/lib/eth_mac.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_ETH_MAC_H
-#define INCLUDED_ETH_MAC_H
-
-#include "usrp2_mac_addr.h"
-
-void eth_mac_init(const u2_mac_addr_t *src);
-
-void eth_mac_set_addr(const u2_mac_addr_t *src);
-int  eth_mac_read_rmon(int addr);
-int  eth_mac_miim_read(int addr);
-void eth_mac_miim_write(int addr, int value);
-int  eth_mac_miim_read_status(void);
-
-#endif /* INCLUDED_ETH_MAC_H */
diff --git a/usrp2/firmware/lib/eth_mac_regs.h b/usrp2/firmware/lib/eth_mac_regs.h
deleted file mode 100644
index d680f8de0..000000000
--- a/usrp2/firmware/lib/eth_mac_regs.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_ETH_MAC_REGS_H
-#define INCLUDED_ETH_MAC_REGS_H
-
-/*
- * Simple GEMAC
- *
- */
-typedef struct {
-  volatile int settings;
-  volatile int ucast_hi;
-  volatile int ucast_lo;
-  volatile int mcast_hi;
-  volatile int mcast_lo;
-  volatile int miimoder;
-  volatile int miiaddress;
-  volatile int miitx_data;
-  volatile int miicommand;
-  volatile int miistatus;
-  volatile int miirx_data;
-  volatile int pause_time;
-  volatile int pause_thresh;
-} eth_mac_regs_t;
-
-// settings register
-#define MAC_SET_PAUSE_EN  (1 << 0)   // Makes us respect received pause frames (normally on)
-#define MAC_SET_PASS_ALL  (1 << 1)   // Enables promiscuous mode, currently broken
-#define MAC_SET_PASS_PAUSE (1 << 2)  // Sends pause frames through (normally off)
-#define MAC_SET_PASS_BCAST (1 << 3)  // Sends broadcast frames through (normally on)
-#define MAC_SET_PASS_MCAST (1 << 4)  // Sends multicast frames that match mcast addr (normally off)
-#define MAC_SET_PASS_UCAST (1 << 5)  // Sends unicast (normal) frames through if they hit in address filter (normally on)
-#define MAC_SET_PAUSE_SEND_EN (1 << 6) // Enables sending pause frames
-
-// miicommand register
-#define MIIC_SCANSSTAT	(1 << 0)	// Scan status
-#define MIIC_RSTAT      (1 << 1)	// Read status
-#define	MIIC_WCTRLDATA	(1 << 2)	// Write control data
-
-// miistatus register
-#define MIIS_LINKFAIL	(1 << 0)	// The link failed
-#define	MIIS_BUSY	(1 << 1)	// The MII is busy (operation in progress)
-#define	MIIS_NVALID	(1 << 2)	// The data in the status register is invalid
-					//   This it is only valid when the scan status is active.
-
-#endif /* INCLUDED_ETH_MAC_REGS_H */
diff --git a/usrp2/firmware/lib/eth_phy.h b/usrp2/firmware/lib/eth_phy.h
deleted file mode 100644
index 6c16f97b7..000000000
--- a/usrp2/firmware/lib/eth_phy.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Much of this was extracted from the Linux e1000_hw.h file */
-
-#ifndef INCLUDED_ETH_PHY_H
-#define INCLUDED_ETH_PHY_H
-
-/* PHY 1000 MII Register/Bit Definitions */
-/* PHY Registers defined by IEEE */
-
-#define PHY_CTRL         0x00 /* Control Register */
-#define PHY_STATUS       0x01 /* Status Regiser */
-#define PHY_ID1          0x02 /* Phy Id Reg (word 1) */
-#define PHY_ID2          0x03 /* Phy Id Reg (word 2) */
-#define PHY_AUTONEG_ADV  0x04 /* Autoneg Advertisement */
-#define PHY_LP_ABILITY   0x05 /* Link Partner Ability (Base Page) */
-#define PHY_AUTONEG_EXP  0x06 /* Autoneg Expansion Reg */
-#define PHY_NEXT_PAGE_TX 0x07 /* Next Page TX */
-#define PHY_LP_NEXT_PAGE 0x08 /* Link Partner Next Page */
-#define PHY_1000T_CTRL   0x09 /* 1000Base-T Control Reg */
-#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
-#define PHY_EXT_STATUS   0x0F /* Extended Status Reg */
-
-/* PHY 1000 MII Register additions in DP83856 */
-/* The part implements 0x00 thru 0x1f; we use these. */
-
-#define	PHY_LINK_AN	 0x11 /* Link and Auto Negotiation Status Reg */
-#define PHY_INT_STATUS	 0x14 /* Interupt Status Reg (RO) */
-#define PHY_INT_MASK	 0x15 /* Interrupt Mask Reg  (RW) */
-#define PHY_INT_CLEAR    0x17 /* Interrupt Clear Reg (RW) */
-
-
-/* Bit definitions for some of the registers above */
-
-/* PHY Control Register (PHY_CTRL) */
-#define MII_CR_SPEED_SELECT_MSB 0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_COLL_TEST_ENABLE 0x0080  /* Collision test enable */
-#define MII_CR_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
-#define MII_CR_ISOLATE          0x0400  /* Isolate PHY from MII */
-#define MII_CR_POWER_DOWN       0x0800  /* Power down */
-#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
-#define MII_CR_SPEED_SELECT_LSB 0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_LOOPBACK         0x4000  /* 0 = normal, 1 = loopback */
-#define MII_CR_RESET            0x8000  /* 0 = normal, 1 = PHY reset */
-
-/* PHY Status Register (PHY_STATUS) */
-#define MII_SR_EXTENDED_CAPS     0x0001 /* Extended register capabilities */
-#define MII_SR_JABBER_DETECT     0x0002 /* Jabber Detected */
-#define MII_SR_LINK_STATUS       0x0004 /* Link Status 1 = link */
-#define MII_SR_AUTONEG_CAPS      0x0008 /* Auto Neg Capable */
-#define MII_SR_REMOTE_FAULT      0x0010 /* Remote Fault Detect */
-#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
-#define MII_SR_PREAMBLE_SUPPRESS 0x0040 /* Preamble may be suppressed */
-#define MII_SR_EXTENDED_STATUS   0x0100 /* Ext. status info in Reg 0x0F */
-#define MII_SR_100T2_HD_CAPS     0x0200 /* 100T2 Half Duplex Capable */
-#define MII_SR_100T2_FD_CAPS     0x0400 /* 100T2 Full Duplex Capable */
-#define MII_SR_10T_HD_CAPS       0x0800 /* 10T   Half Duplex Capable */
-#define MII_SR_10T_FD_CAPS       0x1000 /* 10T   Full Duplex Capable */
-#define MII_SR_100X_HD_CAPS      0x2000 /* 100X  Half Duplex Capable */
-#define MII_SR_100X_FD_CAPS      0x4000 /* 100X  Full Duplex Capable */
-#define MII_SR_100T4_CAPS        0x8000 /* 100T4 Capable */
-
-/* Autoneg Advertisement Register (PHY_AUTONEG_ADV) */
-#define NWAY_AR_SELECTOR_FIELD 0x0001   /* indicates IEEE 802.3 CSMA/CD */
-#define NWAY_AR_10T_HD_CAPS    0x0020   /* 10T   Half Duplex Capable */
-#define NWAY_AR_10T_FD_CAPS    0x0040   /* 10T   Full Duplex Capable */
-#define NWAY_AR_100TX_HD_CAPS  0x0080   /* 100TX Half Duplex Capable */
-#define NWAY_AR_100TX_FD_CAPS  0x0100   /* 100TX Full Duplex Capable */
-#define NWAY_AR_100T4_CAPS     0x0200   /* 100T4 Capable */
-#define NWAY_AR_PAUSE          0x0400   /* Pause operation desired */
-#define NWAY_AR_ASM_DIR        0x0800   /* Asymmetric Pause Direction bit */
-#define NWAY_AR_REMOTE_FAULT   0x2000   /* Remote Fault detected */
-#define NWAY_AR_NEXT_PAGE      0x8000   /* Next Page ability supported */
-
-/* Link Partner Ability Register (Base Page) (PHY_LP_ABILITY) */
-#define NWAY_LPAR_SELECTOR_FIELD 0x0000 /* LP protocol selector field */
-#define NWAY_LPAR_10T_HD_CAPS    0x0020 /* LP is 10T   Half Duplex Capable */
-#define NWAY_LPAR_10T_FD_CAPS    0x0040 /* LP is 10T   Full Duplex Capable */
-#define NWAY_LPAR_100TX_HD_CAPS  0x0080 /* LP is 100TX Half Duplex Capable */
-#define NWAY_LPAR_100TX_FD_CAPS  0x0100 /* LP is 100TX Full Duplex Capable */
-#define NWAY_LPAR_100T4_CAPS     0x0200 /* LP is 100T4 Capable */
-#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
-#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
-#define NWAY_LPAR_REMOTE_FAULT   0x2000 /* LP has detected Remote Fault */
-#define NWAY_LPAR_ACKNOWLEDGE    0x4000 /* LP has rx'd link code word */
-#define NWAY_LPAR_NEXT_PAGE      0x8000 /* Next Page ability supported */
-
-/* Autoneg Expansion Register (PHY_AUTONEG_EXP) */
-#define NWAY_ER_LP_NWAY_CAPS      0x0001 /* LP has Auto Neg Capability */
-#define NWAY_ER_PAGE_RXD          0x0002 /* LP is 10T   Half Duplex Capable */
-#define NWAY_ER_NEXT_PAGE_CAPS    0x0004 /* LP is 10T   Full Duplex Capable */
-#define NWAY_ER_LP_NEXT_PAGE_CAPS 0x0008 /* LP is 100TX Half Duplex Capable */
-#define NWAY_ER_PAR_DETECT_FAULT  0x0010 /* LP is 100TX Full Duplex Capable */
-
-/* Next Page TX Register (PHY_NEXT_PAGE_TX) */
-#define NPTX_MSG_CODE_FIELD 0x0001 /* NP msg code or unformatted data */
-#define NPTX_TOGGLE         0x0800 /* Toggles between exchanges
-                                    * of different NP
-                                    */
-#define NPTX_ACKNOWLDGE2    0x1000 /* 1 = will comply with msg
-                                    * 0 = cannot comply with msg
-                                    */
-#define NPTX_MSG_PAGE       0x2000 /* formatted(1)/unformatted(0) pg */
-#define NPTX_NEXT_PAGE      0x8000 /* 1 = addition NP will follow
-                                    * 0 = sending last NP
-                                    */
-
-/* Link Partner Next Page Register (PHY_LP_NEXT_PAGE) */
-#define LP_RNPR_MSG_CODE_FIELD 0x0001 /* NP msg code or unformatted data */
-#define LP_RNPR_TOGGLE         0x0800 /* Toggles between exchanges
-                                       * of different NP
-                                       */
-#define LP_RNPR_ACKNOWLDGE2    0x1000 /* 1 = will comply with msg
-                                       * 0 = cannot comply with msg
-                                       */
-#define LP_RNPR_MSG_PAGE       0x2000  /* formatted(1)/unformatted(0) pg */
-#define LP_RNPR_ACKNOWLDGE     0x4000  /* 1 = ACK / 0 = NO ACK */
-#define LP_RNPR_NEXT_PAGE      0x8000  /* 1 = addition NP will follow
-                                        * 0 = sending last NP
-                                        */
-
-/* 1000BASE-T Control Register (PHY_1000T_CTRL) */
-#define CR_1000T_ASYM_PAUSE      0x0080 /* Advertise asymmetric pause bit */
-#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
-#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
-#define CR_1000T_REPEATER_DTE    0x0400 /* 1=Repeater/switch device port */
-                                        /* 0=DTE device */
-#define CR_1000T_MS_VALUE        0x0800 /* 1=Configure PHY as Master */
-                                        /* 0=Configure PHY as Slave */
-#define CR_1000T_MS_ENABLE       0x1000 /* 1=Master/Slave manual config value */
-                                        /* 0=Automatic Master/Slave config */
-#define CR_1000T_TEST_MODE_NORMAL 0x0000 /* Normal Operation */
-#define CR_1000T_TEST_MODE_1     0x2000 /* Transmit Waveform test */
-#define CR_1000T_TEST_MODE_2     0x4000 /* Master Transmit Jitter test */
-#define CR_1000T_TEST_MODE_3     0x6000 /* Slave Transmit Jitter test */
-#define CR_1000T_TEST_MODE_4     0x8000 /* Transmitter Distortion test */
-
-/* 1000BASE-T Status Register (PHY_1000T_STATUS) */
-#define SR_1000T_IDLE_ERROR_CNT   0x00FF /* Num idle errors since last read */
-#define SR_1000T_ASYM_PAUSE_DIR   0x0100 /* LP asymmetric pause direction bit */
-#define SR_1000T_LP_HD_CAPS       0x0400 /* LP is 1000T HD capable */
-#define SR_1000T_LP_FD_CAPS       0x0800 /* LP is 1000T FD capable */
-#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
-#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
-#define SR_1000T_MS_CONFIG_RES    0x4000 /* 1=Local TX is Master, 0=Slave */
-#define SR_1000T_MS_CONFIG_FAULT  0x8000 /* Master/Slave config fault */
-#define SR_1000T_REMOTE_RX_STATUS_SHIFT          12
-#define SR_1000T_LOCAL_RX_STATUS_SHIFT           13
-#define SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT    5
-#define FFE_IDLE_ERR_COUNT_TIMEOUT_20            20
-#define FFE_IDLE_ERR_COUNT_TIMEOUT_100           100
-
-/* Extended Status Register (PHY_EXT_STATUS) */
-#define IEEE_ESR_1000T_HD_CAPS 0x1000 /* 1000T HD capable */
-#define IEEE_ESR_1000T_FD_CAPS 0x2000 /* 1000T FD capable */
-#define IEEE_ESR_1000X_HD_CAPS 0x4000 /* 1000X HD capable */
-#define IEEE_ESR_1000X_FD_CAPS 0x8000 /* 1000X FD capable */
-
-#define PHY_TX_POLARITY_MASK   0x0100 /* register 10h bit 8 (polarity bit) */
-#define PHY_TX_NORMAL_POLARITY 0      /* register 10h bit 8 (normal polarity) */
-
-#define AUTO_POLARITY_DISABLE  0x0010 /* register 11h bit 4 */
-                                      /* (0=enable, 1=disable) */
-
-/* Link and Auto Negotiation Status Reg (PHY_LINK_AN) [READ-ONLY] */
-#define	LANSR_MASTER           0x0001 /* 1=PHY is currently in master mode */
-#define	LANSR_FULL_DUPLEX      0x0002 /* 1=PHY is currently full duplex */
-#define LANSR_LINK_GOOD        0x0004 /* 1=a good link is established */
-#define LANSR_SPEED_MASK       0x0018
-#define	  LANSR_SPEED_10       0x0000 /*   10Mb/s */
-#define	  LANSR_SPEED_100      0x0008 /*  100Mb/s */
-#define	  LANSR_SPEED_1000     0x0010 /* 1000Mb/s */
-#define	  LANSR_SPEED_RSRVD    0x0018 /* reserved */
-#define LANSR_NON_COMP_MODE    0x0020 /* 1=detects only in non-compliant mode */
-#define	LANSR_DEEP_LOOPBACK    0x0040 /* 1=the PHY operates in deep loopback mode */
-#define	LANSR_SHALLOW_LOOPBACK 0x0080 /* 1=the PHY operates in shallow loopback mode */
-#define LANSR_RSRVD_8	       0x0100 /* reserved */
-#define LANSR_FIFO_ERR	       0x0200 /* 1=FIFO error occurred */
-#define	LANSR_MDIX_XOVER       0x0400 /* 1=PHY's MDI is in cross-over mode */
-#define	LANSR_RSRVD_11	       0x0800 /* resevered */
-#define	LANSR_TP_POLARITY_REV  0xf000 /* Twisted pair polarity status A:D([15:12]) 1=reversed */
-
-/* Interrupt status, mask and clear regs (PHY_INT_{STATUS,MASK,CLEAR}) */
-#define	PHY_INT_RSRVD_0	       0x0001 /* reserved */
-#define	PHY_INT_RSRVD_1	       0x0002 /* reserved */
-#define	PHY_INT_RSRVD_2	       0x0004 /* reserved */
-#define	PHY_INT_REM_FLT_CNG    0x0008 /* Remote Fault Changed */
-#define	PHY_INT_AN_CMPL	       0x0010 /* Auto-negotiation completion */
-#define	PHY_INT_NXT_PG_RCVD    0x0020 /* Next Page Received */
-#define PHY_INT_JABBER_CNG     0x0040 /* Jabber Changed */
-#define PHY_INT_NO_LINK	       0x0080 /* No link after auto-negotiation */
-#define PHY_INT_NO_HCD	       0x0100 /* AN couldn't determine highest common denominator */
-#define PHY_INT_MAS_SLA_ERR    0x0200 /* Master / Slave Error: couldn't resolve */
-#define PHY_INT_PRL_DET_FLT    0x0400 /* Parallel detection fault */
-#define PHY_INT_POL_CNG	       0x0800 /* Polarity of any channel changed */
-#define	PHY_INT_MDIX_CNG       0x1000 /* MDIX changed.  A pair swap occurred. */
-#define PHY_INT_DPLX_CNG       0x2000 /* Duplex changed */
-#define PHY_INT_LNK_CNG	       0x4000 /* Link changed (asserted when a link is established or broken) */
-#define PHY_INT_SPD_CNG	       0x8000 /* Speed changed */
-
-#endif /* INCLUDED_ETH_PHY_H */
diff --git a/usrp2/firmware/lib/ethernet.c b/usrp2/firmware/lib/ethernet.c
deleted file mode 100644
index f554e0179..000000000
--- a/usrp2/firmware/lib/ethernet.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ethernet.h"
-#include "memory_map.h"
-#include "eth_phy.h"
-#include "eth_mac.h"
-#include "eth_mac_regs.h"
-#include "pic.h"
-#include "hal_io.h"
-#include "nonstdio.h"
-#include "bool.h"
-#include "i2c.h"
-#include "usrp2_i2c_addr.h"
-
-
-#define VERBOSE 0
-
-static ethernet_t ed_state;
-static ethernet_link_changed_callback_t ed_callback = 0;
-
-void 
-ethernet_register_link_changed_callback(ethernet_link_changed_callback_t new_callback)
-{
-  ed_callback = new_callback;
-}
-
-
-static void
-ed_set_mac_speed(int speed)
-{
-  printf("Speed set to %d\n",speed);
-  /*
-  switch(speed){
-  case 10:
-    eth_mac->speed = 1;
-    break;
-  case 100:
-    eth_mac->speed = 2;
-    break;
-  case 1000:
-    eth_mac->speed = 4;
-    break;
-  default:
-    break;
-  }
-  */
-}
-
-static void
-ed_link_up(int speed)
-{
-  // putstr("ed_link_up: "); puthex16_nl(speed);
-
-  ed_set_mac_speed(speed);
-
-  if (ed_callback)		// fire link changed callback
-    (*ed_callback)(speed);
-}
-
-static void
-ed_link_down(void)
-{
-  // putstr("ed_link_down\n");
-
-  if (ed_callback)		// fire link changed callback
-    (*ed_callback)(0);
-}
-
-
-static void
-ed_link_speed_change(int speed)
-{
-  ed_link_down();
-  ed_link_up(speed);
-}
-
-static void
-print_flow_control(int flow_control)
-{
-  static const char *flow_control_msg[4] = {
-    "NONE", "WE_TX", "WE_RX", "SYMMETRIC"
-  };
-  putstr("ethernet flow control: ");
-  puts(flow_control_msg[flow_control & 0x3]);
-}
-
-static void
-check_flow_control_resolution(void)
-{
-  static const unsigned char table[16] = {
-    // index = {local_asm, local_pause, partner_asm, partner_pause}
-    FC_NONE,  FC_NONE,  FC_NONE,  FC_NONE,
-    FC_NONE,  FC_SYMM,  FC_NONE,  FC_SYMM,
-    FC_NONE,  FC_NONE,  FC_NONE,  FC_WE_TX,
-    FC_NONE,  FC_SYMM,  FC_WE_RX, FC_SYMM
-  };
-
-  int us = eth_mac_miim_read(PHY_AUTONEG_ADV);
-  int lp = eth_mac_miim_read(PHY_LP_ABILITY);
-  int index = (((us >> 10) & 0x3) << 2) | ((lp >> 10) & 0x3);
-  ed_state.flow_control = table[index];
-
-  if (1)
-    print_flow_control(ed_state.flow_control);
-}
-
-/*
- * Read the PHY state register to determine link state and speed
- */
-static void
-ed_check_phy_state(void)
-{
-  int lansr = eth_mac_miim_read(PHY_LINK_AN);
-  eth_link_state_t new_state = LS_UNKNOWN;
-  int new_speed = S_UNKNOWN;
-
-  if (VERBOSE){
-    putstr("LANSR: ");
-    puthex16_nl(lansr);
-  }
-
-  if (lansr & LANSR_LINK_GOOD){		// link's up
-    if (VERBOSE)
-      puts("  LINK_GOOD");
-
-    new_state = LS_UP;
-    switch (lansr & LANSR_SPEED_MASK){
-    case LANSR_SPEED_10:
-      new_speed = 10;
-      break;
-      
-    case LANSR_SPEED_100:
-      new_speed = 100;
-      break;
-      
-    case LANSR_SPEED_1000:
-      new_speed = 1000;
-      break;
-
-    default:
-      new_speed = S_UNKNOWN;
-      break;
-    }
-
-    check_flow_control_resolution();
-  }
-  else {				// link's down
-    if (VERBOSE)
-      puts("  NOT LINK_GOOD");
-    
-    new_state = LS_DOWN;
-    new_speed = S_UNKNOWN;
-  }
-
-  if (new_state != ed_state.link_state){
-    ed_state.link_state = new_state;		// remember new state
-    if (new_state == LS_UP)
-      ed_link_up(new_speed);
-    else if (new_state == LS_DOWN)
-      ed_link_down();
-  }
-  else if (new_state == LS_UP && new_speed != ed_state.link_speed){
-    ed_state.link_speed = new_speed;		// remember new speed
-    ed_link_speed_change(new_speed);
-  }
-}
-
-/*
- * This is fired when the ethernet PHY state changes
- */
-static void
-eth_phy_irq_handler(unsigned irq)
-{
-  ed_check_phy_state();
-  eth_mac_miim_write(PHY_INT_CLEAR, ~0);	// clear all ints
-}
-
-void
-ethernet_init(void)
-{
-  eth_mac_init(ethernet_mac_addr());
-
-  ed_state.link_state = LS_UNKNOWN;
-  ed_state.link_speed = S_UNKNOWN;
-
-  // initialize MAC registers
-  //  eth_mac->tx_hwmark = 0x1e;
-  //eth_mac->tx_lwmark = 0x19;
-
-  //eth_mac->crc_chk_en = 1;
-  //eth_mac->rx_max_length = 2048;
-
-  // configure PAUSE frame stuff
-  //eth_mac->tx_pause_en = 1;		// pay attn to pause frames sent to us
-
-  //eth_mac->pause_quanta_set = 38;	// a bit more than 1 max frame 16kb/512 + fudge
-  //eth_mac->pause_frame_send_en = 1;	// enable sending pause frames
-
-
-  // setup PHY to interrupt on changes
-
-  unsigned mask =
-    (PHY_INT_AN_CMPL		// auto-neg completed
-     | PHY_INT_NO_LINK		// no link after auto-neg
-     | PHY_INT_NO_HCD		// no highest common denominator
-     | PHY_INT_MAS_SLA_ERR	// couldn't resolve master/slave 
-     | PHY_INT_PRL_DET_FLT	// parallel detection fault
-     | PHY_INT_LNK_CNG		// link established or broken
-     | PHY_INT_SPD_CNG		// speed changed
-     );
-
-  eth_mac_miim_write(PHY_INT_CLEAR, ~0);	// clear all pending interrupts
-  eth_mac_miim_write(PHY_INT_MASK, mask);	// enable the ones we want
-
-  pic_register_handler(IRQ_PHY, eth_phy_irq_handler);
-
-  // Advertise our flow control configuation.
-  //
-  // We and the link partner each specify two bits in the base page
-  // related to autoconfiguration: NWAY_AR_PAUSE and NWAY_AR_ASM_DIR.
-  // The bits say what a device is "willing" to do, not what may actually
-  // happen as a result of the negotiation.  There are 4 cases:
-  //
-  // PAUSE  ASM_DIR
-  //
-  //  0        0        I have no flow control capability.
-  //
-  //  1        0        I both assert and respond to flow control.
-  //
-  //  0        1        I assert flow control, but cannot respond.  That is,
-  //                    I want to be able to send PAUSE frames, but will ignore any
-  //		 	you send to me.  (This is our configuration.)
-  //
-  //  1        1        I can both assert and respond to flow control AND I am willing
-  //                    to operate symmetrically OR asymmetrically in EITHER direction.
-  //                    (We hope the link partner advertises this, otherwise we don't
-  //			get what we want.)
-
-  int t = eth_mac_miim_read(PHY_AUTONEG_ADV);
-  t &= ~(NWAY_AR_PAUSE | NWAY_AR_ASM_DIR);
-  t |= NWAY_AR_ASM_DIR;
-
-  // Say we can't to 10BASE-T or 100BASE-TX, half or full duplex
-  t &= ~(NWAY_AR_10T_HD_CAPS | NWAY_AR_10T_FD_CAPS | NWAY_AR_100TX_HD_CAPS | NWAY_AR_100TX_FD_CAPS);
-
-  eth_mac_miim_write(PHY_AUTONEG_ADV, t);
-  int r = eth_mac_miim_read(PHY_AUTONEG_ADV);  		// DEBUG, read back
-  if (t != r){
-    printf("PHY_AUTONEG_ADV: wrote 0x%x, got 0x%x\n", t, r);
-  }
-
-  // Restart autonegotation.  
-  // We want to ensure that we're advertising our PAUSE capabilities.
-  t = eth_mac_miim_read(PHY_CTRL);
-  eth_mac_miim_write(PHY_CTRL, t | MII_CR_RESTART_AUTO_NEG);
-}
-
-static bool 
-unprogrammed(const u2_mac_addr_t *t)
-{
-  int i;
-  bool all_zeros = true;
-  bool all_ones =  true;
-  for (i = 0; i < 6; i++){
-    all_zeros &= t->addr[i] == 0x00;
-    all_ones  &= t->addr[i] == 0xff;
-  }
-  return all_ones | all_zeros;
-}
-
-static int8_t src_addr_initialized = false;
-static u2_mac_addr_t src_addr = {{
-    0x00, 0x50, 0xC2, 0x85, 0x3f, 0xff
-  }};
-
-const u2_mac_addr_t *
-ethernet_mac_addr(void)
-{
-  if (!src_addr_initialized){    // fetch from eeprom
-    src_addr_initialized = true;
-
-    // if we're simulating, don't read the EEPROM model, it's REALLY slow
-    if (hwconfig_simulation_p())	
-      return &src_addr;
-    
-    u2_mac_addr_t tmp;
-    bool ok = eeprom_read(I2C_ADDR_MBOARD, MBOARD_MAC_ADDR, &tmp.addr[0], 6);
-    if (!ok || unprogrammed(&tmp)){
-      // use the default
-    }
-    else
-      src_addr = tmp;
-  }
-
-  return &src_addr;
-}
-
-bool
-ethernet_set_mac_addr(const u2_mac_addr_t *t)
-{
-  bool ok = eeprom_write(I2C_ADDR_MBOARD, MBOARD_MAC_ADDR, &t->addr[0], 6);
-  if (ok){
-    src_addr = *t;
-    src_addr_initialized = true;
-    eth_mac_set_addr(t);
-  }
-
-  return ok;
-}
-
-int
-ethernet_check_errors(void)
-{
-  // these registers are reset when read
-  
-  int	r = 0;
-  /*
-  if (eth_mac_read_rmon(0x05) != 0)
-    r |= RME_RX_CRC;
-  if (eth_mac_read_rmon(0x06) != 0)
-    r |= RME_RX_FIFO_FULL;
-  if (eth_mac_read_rmon(0x07) != 0)
-    r |= RME_RX_2SHORT_2LONG;
-  
-  if (eth_mac_read_rmon(0x25) != 0)
-    r |= RME_TX_JAM_DROP;
-  if (eth_mac_read_rmon(0x26) != 0)
-    r |= RME_TX_FIFO_UNDER;
-  if (eth_mac_read_rmon(0x27) != 0)
-    r |= RME_TX_FIFO_OVER;
-  */
-  return r;
-}
diff --git a/usrp2/firmware/lib/ethernet.h b/usrp2/firmware/lib/ethernet.h
deleted file mode 100644
index aaed05d44..000000000
--- a/usrp2/firmware/lib/ethernet.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_ETHERNET_H
-#define INCLUDED_ETHERNET_H
-
-#include "usrp2_mac_addr.h"
-#include "bool.h"
-
-typedef void (*ethernet_link_changed_callback_t)(int speed);
-
-
-/*!
- * \brief one time call to initialize ethernet
- */
-void ethernet_init(void);
-
-/*!
- * \brief Specify the function to call on link state changes.
- * 
- * When the link comes up, speed is the link speed in Mbit/s.
- * When the link goes down, speed is 0.
- */
-void ethernet_register_link_changed_callback(ethernet_link_changed_callback_t cb);
-
-/*!
- * \returns ethernet MAC address
- */
-const u2_mac_addr_t *ethernet_mac_addr(void);
-
-/*!
- * \brief write mac address to eeprom and begin using it
- */
-bool ethernet_set_mac_addr(const u2_mac_addr_t *t);
-
-
-/*
- * \brief read RMON regs and return error mask
- */
-int ethernet_check_errors(void);
-
-#define	RME_RX_CRC	     0x0001
-#define	RME_RX_FIFO_FULL     0x0002
-#define RME_RX_2SHORT_2LONG  0x0004
-
-#define	RME_TX_JAM_DROP	     0x0010
-#define	RME_TX_FIFO_UNDER    0x0020
-#define	RME_TX_FIFO_OVER     0x0040
-
-
-typedef enum { LS_UNKNOWN, LS_DOWN, LS_UP } eth_link_state_t;
-
-// flow control bitmasks
-#define	FC_NONE		0x0
-#define	FC_WE_TX	0x1			// we send PAUSE frames
-#define	FC_WE_RX 	0x2			// we honor received PAUSE frames
-#define	FC_SYMM		(FC_WE_TX | FC_WE_RX)
-
-#define S_UNKNOWN (-1)			// unknown link speed
-
-typedef struct {
-  eth_link_state_t	link_state;
-  int			link_speed;	// in Mb/s
-  int			flow_control;
-} ethernet_t;
-
-#endif /* INCLUDED_ETHERNET_H */
diff --git a/usrp2/firmware/lib/exit.c b/usrp2/firmware/lib/exit.c
deleted file mode 100644
index 95a3bf4de..000000000
--- a/usrp2/firmware/lib/exit.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-extern void _exit(int status);
-
-void 
-exit(int status)
-{
-  _exit(status);
-}
diff --git a/usrp2/firmware/lib/hal_io.c b/usrp2/firmware/lib/hal_io.c
deleted file mode 100644
index 1a370687e..000000000
--- a/usrp2/firmware/lib/hal_io.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// conditionalized on HAL_IO_USES_DBOARD_PINS && HAL_IO_USES_UART
-
-#include "hal_io.h"
-#include "memory_map.h"
-#include "hal_uart.h"
-#include "bool.h"
-#include <stdio.h>
-#include <string.h>
-//#include <assert.h>
-
-/*
- * ========================================================================
- *				    GPIOS
- * ========================================================================
- */
-void 
-hal_gpio_set_ddr(int bank, int value, int mask)
-{
-  bank &= 0x1;
-
-  if (bank == GPIO_TX_BANK){	// tx in top half
-    value <<= 16;
-    mask <<= 16;
-  }
-  else {
-    value &= 0xffff;
-    mask &= 0xffff;
-  }
-
-  int ei = hal_disable_ints();
-  gpio_base->ddr = (gpio_base->ddr & ~mask) | (value & mask);
-  hal_restore_ints(ei);
-}
-
-static bool
-code_to_int(char code, int *val)
-{
-  switch(code){
-  case 's':	*val = GPIO_SEL_SW; 	 return true;
-  case 'a':	*val = GPIO_SEL_ATR; 	 return true;
-  case '0':	*val = GPIO_SEL_DEBUG_0; return true;
-  case '1':	*val = GPIO_SEL_DEBUG_1; return true;
-  case '.':	
-  default:
-    return false;
-  }
-}
-
-void
-hal_gpio_set_sel(int bank, int bitno, char code)
-{
-  bank &= 0x1;
-  int	t;
-
-  if (!code_to_int(code, &t))
-    return;
-
-  int val  =   t << (2 * bitno);
-  int mask = 0x3 << (2 * bitno);
-
-  volatile uint32_t *sel = bank == GPIO_TX_BANK ? &gpio_base->tx_sel : &gpio_base->rx_sel;
-  int ei = hal_disable_ints();
-  int v = (*sel & ~mask) | (val & mask);
-  *sel = v;
-  hal_restore_ints(ei);
-
-  if (0)
-    printf("hal_gpio_set_sel(bank=%d, bitno=%d, code=%c) *sel = 0x%x\n",
-	   bank, bitno, code, v);
-}
-
-void
-hal_gpio_set_sels(int bank, char *codes)
-{
-  //assert(strlen(codes) == 16);
-
-  int val = 0;
-  int mask = 0;
-  int i;
-
-  for (i = 15; i >= 0; i--){
-    val <<= 2;
-    mask <<= 2;
-    int t;
-    if (code_to_int(codes[i], &t)){
-      val  |= t;
-      mask |= 0x3;
-    }
-  }
-
-  volatile uint32_t *sel = bank == GPIO_TX_BANK ? &gpio_base->tx_sel : &gpio_base->rx_sel;
-  int ei = hal_disable_ints();
-  *sel = (*sel & ~mask) | (val & mask);
-  hal_restore_ints(ei);
-}
-
-
-/*!
- * \brief write \p value to gpio pins specified by \p mask.
- */
-void
-hal_gpio_write(int bank, int value, int mask)
-{
-  static uint32_t	_gpio_io_shadow;
-
-  bank &= 0x1;
-
-  if (bank == GPIO_TX_BANK){	// tx in top half
-    value <<= 16;
-    mask <<= 16;
-  }
-  else {
-    value &= 0xffff;
-    mask &= 0xffff;
-  }
-
-  //int ei = hal_disable_ints();
-  _gpio_io_shadow = (_gpio_io_shadow & ~mask) | (value & mask);
-  gpio_base->io = _gpio_io_shadow;
-  //hal_restore_ints(ei);
-}
-
-
-/*!
- * \brief read GPIO bits
- */
-int
-hal_gpio_read(int bank)
-{
-  bank &= 0x1;
-  int r = gpio_base->io;
-  if (bank == GPIO_TX_BANK)
-    r >>= 16;
-
-  return r & 0xffff;
-}
-
-/*
- * ========================================================================
- *				leds
- * ========================================================================
- */
-
-static unsigned long leds_shadow = 0;
-static unsigned long led_src_shadow = 0;
-
-void 
-hal_set_leds(int value, int mask)
-{
-  int ei = hal_disable_ints();
-  leds_shadow = (leds_shadow & ~mask) | (value & mask);
-  output_regs->leds = leds_shadow;
-  hal_restore_ints(ei);
-}
-
-// Allow hardware control over leds.  1 = hardware, 0 = software
-void 
-hal_set_led_src(int value, int mask)
-{
-  int ei = hal_disable_ints();
-  led_src_shadow = (led_src_shadow & ~mask) | (value & mask);
-  output_regs->led_src = led_src_shadow;
-  hal_restore_ints(ei);
-}
-
-void 
-hal_toggle_leds(int mask)
-{
-  int ei = hal_disable_ints();
-  leds_shadow ^= mask;
-  output_regs->leds = leds_shadow;
-  hal_restore_ints(ei);
-}
-
-
-// ================================================================
-//		    		primitives
-// ================================================================
-
-#if defined(HAL_IO_USES_DBOARD_PINS)
-//
-// Does i/o using high 9-bits of rx daughterboard pins.
-//
-//  1 1 1 1 1 1
-//  5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-// |      char     |W|             |
-// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//
-// 
-// Asserts W when writing char
-//
-
-#define W 	0x0080
-
-void
-hal_io_init(void)
-{
-  // make high 9 bits of tx daughterboard outputs
-  hal_gpio_set_rx_mode(15, 7, GPIOM_OUTPUT);
-
-  // and set them to zero
-  hal_gpio_set_rx(0x0000, 0xff80);
-}
-
-void
-hal_finish(void)
-{
-  volatile unsigned long *p = (unsigned long *) 0xC2F0;
-  *p = 0;
-}
-
-// %c
-inline int
-putchar(int ch)
-{
-  hal_gpio_set_rx((s << 8) | W, 0xff80);
-  hal_gpio_set_rx(0, 0xff80);
-  return ch;
-}
-
-#elif defined(HAL_IO_USES_UART)
-
-void
-hal_io_init(void)
-{
-  hal_uart_init();
-}
-
-void
-hal_finish(void)
-{
-}
-
-// %c
-inline int
-putchar(int ch)
-{
-  hal_uart_putc(ch);
-  return ch;
-}
-
-int
-getchar(void)
-{
-  return hal_uart_getc();
-}
-
-#else	// nop all i/o
-
-void
-hal_io_init(void)
-{
-}
-
-void
-hal_finish(void)
-{
-}
-
-// %c
-inline int
-putchar(int ch)
-{
-  return ch;
-}
-
-int
-getchar(void)
-{
-  return EOF;
-}
-
-#endif
-
-// ================================================================
-//             (slightly) higher level functions
-//
-// These are here so we can inline the calls to putchar.
-// The rest of the stuff was moved to nonstdio.c
-// ================================================================
-
-// \n
-inline void 
-newline(void)
-{
-  putchar('\n');
-}
-
-int
-putstr(const char *s)
-{
-  while (*s)
-    putchar(*s++);
-
-  return 0;
-}
-
-int
-puts(const char *s)
-{
-  putstr(s);
-  putchar('\n');
-  return 0;
-}
diff --git a/usrp2/firmware/lib/hal_io.h b/usrp2/firmware/lib/hal_io.h
deleted file mode 100644
index b6ae35b73..000000000
--- a/usrp2/firmware/lib/hal_io.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_HAL_IO_H
-#define INCLUDED_HAL_IO_H
-
-#include "memory_map.h"
-
-void hal_io_init(void);
-void hal_finish();
-
-
-/*
- * ------------------------------------------------------------------------
- * The GPIO pins are organized into two banks of 16-bits.
- * Bank 0 goes to the Tx daughterboard, Bank 1 goes to the Rx daughterboard.
- *
- * Each pin may be configured as an input or an output from the FPGA.
- * For output pins, there are four signals which may be routed to the
- * pin.  The four signals are the value written by s/w, the output of
- * the ATR controller, or two different sources of debug info from the
- * FPGA fabric.
- * ------------------------------------------------------------------------
- */
-
-#define GPIO_TX_BANK	0	// pins that connect to the Tx daughterboard
-#define	GPIO_RX_BANK	1	// pins that connect to the Rx daughterboard
-
-
-/*!
- * \brief Set the data direction for GPIO pins
- *
- * If the bit is set, it's an output from the FPGA.
- * \param value is a 16-bit bitmask of values
- * \param mask is a 16-bit bitmask of which bits to effect.
- */ 
-void hal_gpio_set_ddr(int bank, int value, int mask);
-
-/*!
- * \brief Select the source of the signal for an output pin.
- *
- * \param code is is one of 's', 'a', '0', '1'
- *   where 's' selects software output, 'a' selects ATR output, '0' selects
- *   debug 0, '1' selects debug 1.
- */
-void hal_gpio_set_sel(int bank, int bitno, char code);
-
-/*!
- * \brief Select the source of the signal for the output pins.
- *
- * \param codes is is a string of 16 characters composed of '.', 's',
- * 'a', '0', or '1' where '.' means "don't change", 's' selects
- * software output, 'a' selects ATR output, '0' selects debug 0, '1'
- * selects debug 1.
- */
-void hal_gpio_set_sels(int bank, char *codes);
-
-
-/*!
- * \brief write \p value to gpio pins specified by \p mask.
- */
-void hal_gpio_write(int bank, int value, int mask);
-
-/*!
- * \brief read GPIO bits
- */
-int  hal_gpio_read(int bank);
-
-
-/*
- * ------------------------------------------------------------------------
- *			   control the leds
- *
- * Low 4-bits are the general purpose leds on the board
- * The next bit is the led on the ethernet connector
- * ------------------------------------------------------------------------
- */
-
-void hal_set_leds(int value, int mask);
-void hal_set_led_src(int value, int mask);
-void hal_toggle_leds(int mask);
-
-/*
- * ------------------------------------------------------------------------
- *			   simple timeouts
- * ------------------------------------------------------------------------
- */
-
-
-
-static inline void
-hal_set_timeout(int delta_ticks)
-{
-  int t = timer_regs->time + delta_ticks;
-  if (t == 0)			// kills timer
-    t = 1;
-  timer_regs->time = t;
-}
-
-/*
- * ------------------------------------------------------------------------
- *			interrupt enable/disable
- * ------------------------------------------------------------------------
- */
-
-/*!
- * \brief Disable interrupts and return previous interrupt enable state.
- * [Microblaze specific]
- */
-static inline int
-hal_disable_ints(void)
-{
-  int result, t0;
-
-  asm volatile("mfs   %0, rmsr       \n\
-		andni %1, %0, 0x2    \n\
-		mts   rmsr, %1"
-	       : "=r" (result), "=r" (t0));
-  return result;
-}
-
-/*!
- * \brief Enable interrupts and return previous interrupt enable state.
- * [Microblaze specific]
- */
-static inline int
-hal_enable_ints(void)
-{
-  int result, t0;
-
-  asm volatile("mfs  %0, rmsr	      \n\
-		ori  %1, %0, 0x2      \n\
-		mts  rmsr, %1"
-	       : "=r" (result), "=r" (t0));
-  return result;
-}
-
-/*!
- * \brief Set interrupt enable state to \p prev_state.
- * [Microblaze specific]
- */
-static inline void
-hal_restore_ints(int prev_state)
-{
-  int t0, t1;
-  asm volatile("andi  %0, %2, 0x2	\n\
-		mfs   %1, rmsr          \n\
-		andni %1, %1, 0x2	\n\
-		or    %1, %1, %0	\n\
-		mts   rmsr, %1"
-	       : "=r" (t0), "=r"(t1) : "r" (prev_state));
-}
-
-#endif /* INCLUDED_HAL_IO_H */
diff --git a/usrp2/firmware/lib/hal_uart.c b/usrp2/firmware/lib/hal_uart.c
deleted file mode 100644
index 75b12b432..000000000
--- a/usrp2/firmware/lib/hal_uart.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hal_uart.h"
-#include "hal_io.h"
-#include "memory_map.h"
-
-// First pass, no interrupts
-
-// Replaced with divisors.py which generates best divisor
-//#define CALC_DIVISOR(rate) (WISHBONE_CLK_RATE / ((rate) * 16))
-
-#define NSPEEDS 6
-#define	MAX_WB_DIV 4
-
-static const uint16_t
-divisor_table[MAX_WB_DIV+1][NSPEEDS] = {
-  {   2,   2,   2,   2,  2,  2},   // 0: can't happen
-  { 651, 326, 163, 109, 54, 27 },  // 1: 100 MHz
-  { 326, 163,  81,  54, 27, 14 },  // 2:  50 MHz
-  { 217, 109,  54,  36, 18,  9 },  // 3:  33.3333 MHz
-  { 163,  81,  41,  27, 14,  7 },  // 4:  25 MHz
-};
-
-#define u uart_regs
-
-void
-hal_uart_init(void)
-{
-  u->clkdiv = 217;  // 230400 bps
-}
-
-void
-hal_uart_putc(int ch)
-{
-  if (ch == '\n')		// FIXME for now map \n -> \r\n
-    hal_uart_putc('\r');
-
-  while (u->txlevel == 0)	 // wait for fifo to have space
-    ;
-
-  u->txchar = ch;
-}
-
-void
-hal_uart_putc_nowait(int ch)
-{
-  if (ch == '\n')		// FIXME for now map \n -> \r\n
-    hal_uart_putc('\r');
-
-  if(u->txlevel)   // If fifo has space
-    u->txchar = ch;
-}
-
-int
-hal_uart_getc(void)
-{
-  while ((u->rxlevel) == 0)  // wait for data to be ready
-    ;
-
-  return u->rxchar;
-}
diff --git a/usrp2/firmware/lib/hal_uart.h b/usrp2/firmware/lib/hal_uart.h
deleted file mode 100644
index 2ddfa6259..000000000
--- a/usrp2/firmware/lib/hal_uart.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_HAL_UART_H
-#define INCLUDED_HAL_UART_H
-
-
-/*!
- * \brief one-time call to init
- */
-void hal_uart_init(void);
-
-typedef enum {
-  US_9600,
-  US_19200,
-  US_38400,
-  US_57600,
-  US_115200,
-  US_230400,
-} hal_uart_speed_t;
-
-typedef struct {
-  hal_uart_speed_t	speed;
-} hal_uart_config_t;
-
-/*!
- * \brief Set uart parameters
- *  Default is 115,200 bps, 8N1.
- */
-void hal_uart_set_config(const hal_uart_config_t *c);
-
-/*!
- * \brief Get uart configuation.
- */
-void hal_uart_get_config(hal_uart_config_t *c);
-
-/*!
- * \brief Enqueue \p ch for output over serial port
- */
-void hal_uart_putc(int ch);
-
-/*!
- * \brief Enqueue \p ch for output over serial port, silent fail if queue is full
- */
-void hal_uart_putc_nowait(int ch);
-
-/*
- * \brief Blocking read of next char from serial port
- */
-int hal_uart_getc(void);
-
-
-#endif /* INCLUDED_HAL_UART_H */
diff --git a/usrp2/firmware/lib/i2c.c b/usrp2/firmware/lib/i2c.c
deleted file mode 100644
index 3f738733b..000000000
--- a/usrp2/firmware/lib/i2c.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "i2c.h"
-#include "memory_map.h"
-#include "stdint.h"
-
-#define MAX_WB_DIV 4	// maximum wishbone divisor (from 100 MHz MASTER_CLK)
-
-// prescaler divisor values for 100 kHz I2C [uses 5 * SCLK internally]
-
-#define PRESCALER(wb_div) (((MASTER_CLK_RATE/(wb_div)) / (5 * 100000)) - 1)
-
-static uint16_t prescaler_values[MAX_WB_DIV+1] = {
-  0xffff,	// 0: can't happen
-  PRESCALER(1),	// 1: 100 MHz
-  PRESCALER(2), // 2:  50 MHz
-  PRESCALER(3), // 3:  33.333 MHz
-  PRESCALER(4), // 4:  25 MHz
-};
-
-void
-i2c_init(void)
-{
-  i2c_regs->ctrl = 0;		// disable core
-  
-  // setup prescaler depending on wishbone divisor
-  int wb_div = hwconfig_wishbone_divisor();
-  if (wb_div > MAX_WB_DIV)
-    wb_div = MAX_WB_DIV;
-
-  i2c_regs->prescaler_lo = prescaler_values[wb_div] & 0xff;
-  i2c_regs->prescaler_hi = (prescaler_values[wb_div] >> 8) & 0xff;
-
-  i2c_regs->ctrl = I2C_CTRL_EN;	// enable core
-
-  // FIXME interrupt driven?
-}
-
-static inline void
-wait_for_xfer(void)
-{
-  while (i2c_regs->cmd_status & I2C_ST_TIP)	// wait for xfer to complete
-    ;
-}
-
-static inline bool
-wait_chk_ack(void)
-{
-  wait_for_xfer();
-
-  if ((i2c_regs->cmd_status & I2C_ST_RXACK) != 0){	// target NAK'd
-    return false;
-  }
-  return true;
-}
-
-bool 
-i2c_read (unsigned char i2c_addr, unsigned char *buf, unsigned int len)
-{
-  if (len == 0)			// reading zero bytes always works
-    return true;
-
-  while (i2c_regs->cmd_status & I2C_ST_BUSY)
-    ;
-
-  i2c_regs->data = (i2c_addr << 1) | 1;	 // 7 bit address and read bit (1)
-  // generate START and write addr
-  i2c_regs->cmd_status = I2C_CMD_WR | I2C_CMD_START;
-  if (!wait_chk_ack())
-    goto fail;
-
-  for (; len > 0; buf++, len--){
-    i2c_regs->cmd_status = I2C_CMD_RD | (len == 1 ? (I2C_CMD_NACK | I2C_CMD_STOP) : 0);
-    wait_for_xfer();
-    *buf = i2c_regs->data;
-  }
-  return true;
-
- fail:
-  i2c_regs->cmd_status = I2C_CMD_STOP;  // generate STOP
-  return false;
-}
-
-
-bool 
-i2c_write(unsigned char i2c_addr, const unsigned char *buf, unsigned int len)
-{
-  while (i2c_regs->cmd_status & I2C_ST_BUSY)
-    ;
-
-  i2c_regs->data = (i2c_addr << 1) | 0;	 // 7 bit address and write bit (0)
-
-  // generate START and write addr (and maybe STOP)
-  i2c_regs->cmd_status = I2C_CMD_WR | I2C_CMD_START | (len == 0 ? I2C_CMD_STOP : 0);  
-  if (!wait_chk_ack())
-    goto fail;
-
-  for (; len > 0; buf++, len--){
-    i2c_regs->data = *buf;
-    i2c_regs->cmd_status = I2C_CMD_WR | (len == 1 ? I2C_CMD_STOP : 0);
-    if (!wait_chk_ack())
-      goto fail;
-  }
-  return true;
-
- fail:
-  i2c_regs->cmd_status = I2C_CMD_STOP;  // generate STOP
-  return false;
-}
-
-  
diff --git a/usrp2/firmware/lib/i2c.h b/usrp2/firmware/lib/i2c.h
deleted file mode 100644
index ad1e4159a..000000000
--- a/usrp2/firmware/lib/i2c.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_I2C_H
-#define INCLUDED_I2C_H
-
-#include "bool.h"
-
-void i2c_init(void);
-bool i2c_read (unsigned char i2c_addr, unsigned char *buf, unsigned int len);
-bool i2c_write(unsigned char i2c_addr, const unsigned char *buf, unsigned int len);
-
-
-// Write 24LC024 / 24LC025 EEPROM on motherboard or daughterboard.
-// Which EEPROM is determined by i2c_addr.  See i2c_addr.h
-
-bool eeprom_write (int i2c_addr, int eeprom_offset, const void *buf, int len);
-
-// Read 24LC024 / 24LC025 EEPROM on motherboard or daughterboard.
-// Which EEPROM is determined by i2c_addr.  See i2c_addr.h
-
-bool eeprom_read (int i2c_addr, int eeprom_offset, void *buf, int len);
-
-#endif /* INCLUDED_I2C_H */
diff --git a/usrp2/firmware/lib/lsadc.c b/usrp2/firmware/lib/lsadc.c
deleted file mode 100644
index 7983552e7..000000000
--- a/usrp2/firmware/lib/lsadc.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "lsadc.h"
-#include "spi.h"
-#include "memory_map.h"
-
-
-// AD9712 or AD7922   1 MS/s, 10-/12-bit ADCs
-
-//#define SPI_SS_DEBUG SPI_SS_RX_DB
-#define SPI_SS_DEBUG 0
-
-
-void 
-lsadc_init(void)
-{
-  // nop
-}
-
-/* 
- * The ADC's are pipelined.   That is, you have to tell them
- * which of the two inputs you want one cycle ahead of time.
- * We could optimize and keep track of which one we used last
- * time, but for simplicity we'll always tell it which
- * one we want.  This takes 2 16-bit xfers, one to set the
- * input and one to read the one we want.
- */
-
-int
-_lsadc_read(int which_adc, int slave_select)
-{
-  uint32_t r;
-  int channel = which_adc & 0x1;
-
-  // Set CHN and STY equal to channel number.  We don't want "daisy chain mode"
-  uint16_t cmd = (channel << 13) | (channel << 12);
-
-  spi_transact(SPI_TXONLY, slave_select | SPI_SS_DEBUG,
-	       cmd, 16, SPIF_PUSH_RISE | SPIF_LATCH_RISE);
-
-  r = spi_transact(SPI_TXRX, slave_select | SPI_SS_DEBUG,
-		   cmd, 16, SPIF_PUSH_RISE | SPIF_LATCH_RISE);
-
-  return r & 0x0fff;
-}
-
-int
-lsadc_read_rx(int which_adc)
-{
-  return _lsadc_read(which_adc, SPI_SS_RX_ADC);
-}
-
-int
-lsadc_read_tx(int which_adc)
-{
-  return _lsadc_read(which_adc, SPI_SS_TX_ADC);
-}
diff --git a/usrp2/firmware/lib/lsadc.h b/usrp2/firmware/lib/lsadc.h
deleted file mode 100644
index 319f34d91..000000000
--- a/usrp2/firmware/lib/lsadc.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_LSADC_H
-#define INCLUDED_LSADC_H
-
-#include "memory_map.h"
-
-/*!
- * \brief One time call to initialize low-speed ADCs.
- */
-void lsadc_init(void);
-
-/*!
- * \brief Read one of the low-speed Rx daughterboard ADCs.
- * \param which_adc in [0, 1]
- *
- * \returns 12-bit value in [0,4095]
- */
-int lsadc_read_rx(int which_adc);
-
-/*!
- * \brief Read one of the low-speed Tx daughterboard ADCs.
- * \param which_adc in [0, 1]
- *
- * \returns 12-bit value in [0,4095]
- */
-int lsadc_read_tx(int which_adc);
-
-
-#endif /* INCLUDED_LSADC_H */
diff --git a/usrp2/firmware/lib/lsdac.c b/usrp2/firmware/lib/lsdac.c
deleted file mode 100644
index 6bc2e5cb5..000000000
--- a/usrp2/firmware/lib/lsdac.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "lsdac.h"
-#include "spi.h"
-#include "memory_map.h"
-
-// AD5624, AD5623
-
-#define CMD(x)		  ((x) << 19)
-#define CMD_WR_INPUT_N	     CMD(0)   // write input N
-#define	CMD_UP_DAC_N	     CMD(1)   // update DAC N from input reg
-#define CMD_WR_INPUT_N_LDAC  CMD(2)   // write input N, update all
-#define	CMD_WR_UP_DAC_N	     CMD(3)   // write and update N
-#define CMD_WR_PWR_CONFIG    CMD(4)   // write power up/down config reg
-#define	CMD_SW_RESET	     CMD(5)   // force s/w reset
-#define	CMD_WR_LDAC_CFG	     CMD(6)   // write LDAC config reg
-#define	CMD_WR_INT_REF_CFG   CMD(7)   // write internal ref cfg reg (AD5623R only)
-
-
-//#define SPI_SS_DEBUG SPI_SS_TX_DB
-#define SPI_SS_DEBUG 0
-
-inline static void
-_write_rx(uint32_t v)
-{
-  spi_transact(SPI_TXONLY, SPI_SS_RX_DAC | SPI_SS_DEBUG, v, 24, SPIF_PUSH_RISE);
-}
-
-inline static void
-_write_tx(uint32_t v)
-{
-  spi_transact(SPI_TXONLY, SPI_SS_TX_DAC | SPI_SS_DEBUG, v, 24, SPIF_PUSH_RISE);
-}
-
-void 
-lsdac_init(void)
-{
-  _write_tx(CMD_SW_RESET | 0x1);		// power-on reset
-  _write_rx(CMD_SW_RESET | 0x1);		// power-on reset
-}
-
-void
-lsdac_write_rx(int which_dac, int value)
-{
-  _write_rx(CMD_WR_UP_DAC_N | ((which_dac & 0x7) << 16) | ((value << 4) & 0xffff));
-}
-
-void
-lsdac_write_tx(int which_dac, int value)
-{
-  _write_tx(CMD_WR_UP_DAC_N | ((which_dac & 0x7) << 16) | ((value << 4) & 0xffff));
-}
diff --git a/usrp2/firmware/lib/lsdac.h b/usrp2/firmware/lib/lsdac.h
deleted file mode 100644
index 9cad917e3..000000000
--- a/usrp2/firmware/lib/lsdac.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_LSDAC_H
-#define INCLUDED_LSDAC_H
-
-#include "memory_map.h"
-
-/*!
- * \brief One time call to initialize low-speed DACs.
- */
-void lsdac_init(void);
-
-/*!
- * \brief Write one of the low-speed Rx daughterboard DACs.
- * \param which_dac in [0, 3]
- * \param unsigned 12-bit value in [0, 4095]
- *
- * value maps linearly to output voltage from 0 to 3.3V
- */
-void lsdac_write_rx(int which_dac, int value);
-
-/*!
- * \brief Write one of the low-speed Tx daughterboard DACs.
- * \param which_dac in [0, 3]
- * \param unsigned 12-bit value in [0, 4095]
- *
- * value maps linearly to output voltage from 0 to 3.3V
- */
-void lsdac_write_tx(int which_dac, int value);
-
-
-#endif /* INCLUDED_LSDAC_H */
diff --git a/usrp2/firmware/lib/mdelay.c b/usrp2/firmware/lib/mdelay.c
deleted file mode 100644
index c8c119b1a..000000000
--- a/usrp2/firmware/lib/mdelay.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "mdelay.h"
-#include "memory_map.h"
-
-// Delay about one millisecond.
-//
-// Need 33,333 cycles at 33 MHz.
-// Each time around the loop is 10 cycles
-//
-
-#define LOOPCNT(wb_div) (MASTER_CLK_RATE/(wb_div) / 10000)
-
-inline static void
-delay_1ms(int loop_count)
-{
-  int	i;
-  for (i = 0; i < loop_count; i++){
-    asm volatile ("or  r0, r0, r0\n\
-		   or  r0, r0, r0\n\
-		   or  r0, r0, r0\n\
-		   or  r0, r0, r0\n\
-		   or  r0, r0, r0\n\
-		   or  r0, r0, r0\n\
-		   or  r0, r0, r0\n");
-  }
-}
-
-// delay about ms milliseconds
-void
-mdelay(int ms)
-{
-  static int loop_count = -1;
-
-  if (hwconfig_simulation_p())
-    return;
-
-  if (loop_count < 0){
-    // set correct loop_count
-    static unsigned short lc[8] = {
-      0,
-      LOOPCNT(1),
-      LOOPCNT(2),
-      LOOPCNT(3),
-      LOOPCNT(4),
-      LOOPCNT(5),
-      LOOPCNT(6),
-      LOOPCNT(7)
-    };
-
-    loop_count = lc[hwconfig_wishbone_divisor() & 0x7];
-  }
-
-  int i;
-  for (i = 0; i < ms; i++)
-    delay_1ms(loop_count);
-}
diff --git a/usrp2/firmware/lib/mdelay.h b/usrp2/firmware/lib/mdelay.h
deleted file mode 100644
index 226bbb3f7..000000000
--- a/usrp2/firmware/lib/mdelay.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_MDELAY_H
-#define INCLUDED_MDELAY_H
-
-/*!
- * \brief Delay about ms milliseconds
- *
- * If simulating, _very_ short delay
- */
-void mdelay(int ms);
-
-#endif /* INCLUDED_MDELAY_H */
diff --git a/usrp2/firmware/lib/memcpy_wa.c b/usrp2/firmware/lib/memcpy_wa.c
deleted file mode 100644
index ef20efaa9..000000000
--- a/usrp2/firmware/lib/memcpy_wa.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "memcpy_wa.h"
-#include <stdint.h>
-#include <stdlib.h>
-
-/*
- * For copying to/from non-byte-adressable memory, such as
- * the buffers.  dst, src, and nbytes must all satisfy (x % 4 == 0)
- */
-void
-memcpy_wa(void *dst, const void *src, size_t nbytes)
-{
-  if (((intptr_t) dst & 0x3)
-      || ((intptr_t) src & 0x3)
-      || (nbytes & 0x3))
-    exit(1);			/* die! */
-
-  int *dp = (int *) dst;
-  int *sp = (int *) src;
-  unsigned  nw = nbytes/4;
-
-  unsigned i;
-  for (i = 0; i < nw; i++)
-    dp[i] = sp[i];
-}
diff --git a/usrp2/firmware/lib/memcpy_wa.h b/usrp2/firmware/lib/memcpy_wa.h
deleted file mode 100644
index 072fc148f..000000000
--- a/usrp2/firmware/lib/memcpy_wa.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_MEMCPY_WA_H
-#define INCLUDED_MEMCPY_WA_H
-
-#include <stddef.h>
-
-/*
- * For copying to/from non-byte-adressable memory, such as
- * the buffers.  dst, src, and nbytes must all satisfy (x % 4 == 0)
- */
-void memcpy_wa(void *dst, const void *src, size_t nbytes);
-
-#endif /* INCLUDED_MEMCPY_WA_H */
-
-
diff --git a/usrp2/firmware/lib/memory_map.h b/usrp2/firmware/lib/memory_map.h
deleted file mode 100644
index 0d0cf04f6..000000000
--- a/usrp2/firmware/lib/memory_map.h
+++ /dev/null
@@ -1,723 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Overall Memory Map
- *   0000-7FFF  32K   RAM space (16K on 1500, 24K on 2000, 32K on DSP)
- *   8000-BFFF  16K   Buffer Pool
- *   C000-FFFF  16K   Peripherals
- */
-
-
-#ifndef INCLUDED_MEMORY_MAP_H
-#define INCLUDED_MEMORY_MAP_H
-
-#include <stdint.h>
-
-
-#define MASTER_CLK_RATE        100000000		// 100 MHz
-
-
-////////////////////////////////////////////////////////////////
-//
-//         Memory map for embedded wishbone bus
-//
-////////////////////////////////////////////////////////////////
-
-
-////////////////////////////////////////////////////////////////
-// Main RAM, Slave 0
-
-#define RAM_BASE 0x0000
-
-////////////////////////////////////////////////////////////////
-// Buffer Pool RAM, Slave 1
-//
-// The buffers themselves are located in Slave 1, Buffer Pool RAM.
-// The status registers are in Slave 5, Buffer Pool Status.
-// The control register is in Slave 7, Settings Bus.
-
-#define BUFFER_POOL_RAM_BASE 0x8000
-
-#define	NBUFFERS                8
-#define BP_NLINES	   0x0200	// number of 32-bit lines in a buffer
-#define BP_LAST_LINE	(BP_NLINES - 1)	// last line in a buffer
-
-#define buffer_pool_ram \
-  ((uint32_t *) BUFFER_POOL_RAM_BASE)
-
-#define buffer_ram(n) (&buffer_pool_ram[(n) * BP_NLINES])
-
-
-/////////////////////////////////////////////////////
-// SPI Core, Slave 2.  See core docs for more info
-#define SPI_BASE 0xC000   // Base address (16-bit)
-
-typedef struct {
-  volatile uint32_t	txrx0;
-  volatile uint32_t	txrx1;
-  volatile uint32_t	txrx2;
-  volatile uint32_t	txrx3;
-  volatile uint32_t	ctrl;
-  volatile uint32_t	div;
-  volatile uint32_t	ss;
-} spi_regs_t;
-
-#define spi_regs ((spi_regs_t *) SPI_BASE)
-
-
-// Masks for controlling different peripherals
-#define SPI_SS_AD9510    1
-#define SPI_SS_AD9777    2
-#define SPI_SS_RX_DAC    4
-#define SPI_SS_RX_ADC    8
-#define SPI_SS_RX_DB    16
-#define SPI_SS_TX_DAC   32
-#define SPI_SS_TX_ADC   64
-#define SPI_SS_TX_DB   128
-
-// Masks for different parts of CTRL reg
-#define SPI_CTRL_ASS      (1<<13)
-#define SPI_CTRL_IE       (1<<12)
-#define SPI_CTRL_LSB      (1<<11)
-#define SPI_CTRL_TXNEG    (1<<10)
-#define SPI_CTRL_RXNEG    (1<< 9)
-#define SPI_CTRL_GO_BSY   (1<< 8)
-#define SPI_CTRL_CHAR_LEN_MASK 0x7F
-
-////////////////////////////////////////////////
-// I2C, Slave 3
-// See Wishbone I2C-Master Core Specification.
-
-#define I2C_BASE 0xC400
-
-typedef struct {
-  volatile uint32_t  prescaler_lo;	// r/w
-  volatile uint32_t  prescaler_hi;	// r/w
-  volatile uint32_t  ctrl;		// r/w
-  volatile uint32_t  data;		// wr = transmit reg; rd = receive reg
-  volatile uint32_t  cmd_status;	// wr = command reg;  rd = status reg
-} i2c_regs_t;
-
-#define i2c_regs ((i2c_regs_t *) I2C_BASE)
-
-#define	I2C_CTRL_EN	(1 << 7)	// core enable
-#define	I2C_CTRL_IE	(1 << 6)	// interrupt enable
-
-//
-// STA, STO, RD, WR, and IACK bits are cleared automatically
-//
-#define	I2C_CMD_START	(1 << 7)	// generate (repeated) start condition
-#define I2C_CMD_STOP	(1 << 6)	// generate stop condition
-#define	I2C_CMD_RD	(1 << 5)	// read from slave
-#define I2C_CMD_WR	(1 << 4)	// write to slave
-#define	I2C_CMD_NACK	(1 << 3)	// when a rcvr, send ACK (ACK=0) or NACK (ACK=1)
-#define I2C_CMD_RSVD_2	(1 << 2)	// reserved
-#define	I2C_CMD_RSVD_1	(1 << 1)	// reserved
-#define I2C_CMD_IACK	(1 << 0)	// set to clear pending interrupt
-
-#define I2C_ST_RXACK	(1 << 7)	// Received acknowledgement from slave (1 = NAK, 0 = ACK)
-#define	I2C_ST_BUSY	(1 << 6)	// 1 after START signal detected; 0 after STOP signal detected
-#define	I2C_ST_AL	(1 << 5)	// Arbitration lost.  1 when core lost arbitration
-#define	I2C_ST_RSVD_4	(1 << 4)	// reserved
-#define	I2C_ST_RSVD_3	(1 << 3)	// reserved
-#define	I2C_ST_RSVD_2	(1 << 2)	// reserved
-#define I2C_ST_TIP	(1 << 1)	// Transfer-in-progress
-#define	I2C_ST_IP	(1 << 0)	// Interrupt pending
-
-
-////////////////////////////////////////////////
-// GPIO, Slave 4
-//
-// These go to the daughterboard i/o pins
-
-#define GPIO_BASE 0xC800
-
-typedef struct {
-  volatile uint32_t	io;	  // tx data in high 16, rx in low 16
-  volatile uint32_t     ddr;      // 32 bits, 1 means output. tx in high 16, rx in low 16
-  volatile uint32_t	tx_sel;   // 16 2-bit fields select which source goes to TX DB
-  volatile uint32_t	rx_sel;   // 16 2-bit fields select which source goes to RX DB
-} gpio_regs_t;
-
-// each 2-bit sel field is layed out this way
-#define GPIO_SEL_SW	   0 // if pin is an output, set by software in the io reg
-#define	GPIO_SEL_ATR	   1 // if pin is an output, set by ATR logic
-#define	GPIO_SEL_DEBUG_0   2 // if pin is an output, debug lines from FPGA fabric
-#define	GPIO_SEL_DEBUG_1   3 // if pin is an output, debug lines from FPGA fabric
-
-#define gpio_base ((gpio_regs_t *) GPIO_BASE)
-
-///////////////////////////////////////////////////
-// Buffer Pool Status, Slave 5
-//
-// The buffers themselves are located in Slave 1, Buffer Pool RAM.
-// The status registers are in Slave 5, Buffer Pool Status.
-// The control register is in Slave 7, Settings Bus.
-
-#define BUFFER_POOL_STATUS_BASE 0xCC00
-
-typedef struct {
-  volatile uint32_t last_line[NBUFFERS]; // last line xfer'd in buffer
-  volatile uint32_t status;	         // error and done flags
-  volatile uint32_t hw_config;	         // see below
-  volatile uint32_t dummy[3];
-  volatile uint32_t irqs;
-  volatile uint32_t pri_enc_bp_status;
-  volatile uint32_t cycle_count;
-} buffer_pool_status_t;
-
-#define buffer_pool_status ((buffer_pool_status_t *) BUFFER_POOL_STATUS_BASE)
-
-/*
- * Buffer n's xfer is done.
- * Clear this bit by issuing bp_clear_buf(n)
- */
-#define BPS_DONE(n)     (0x00000001 << (n))
-#define BPS_DONE_0	BPS_DONE(0)
-#define BPS_DONE_1	BPS_DONE(1)
-#define BPS_DONE_2	BPS_DONE(2)
-#define BPS_DONE_3	BPS_DONE(3)
-#define BPS_DONE_4	BPS_DONE(4)
-#define BPS_DONE_5	BPS_DONE(5)
-#define BPS_DONE_6	BPS_DONE(6)
-#define BPS_DONE_7	BPS_DONE(7)
-
-/*
- * Buffer n's xfer had an error.
- * Clear this bit by issuing bp_clear_buf(n)
- */
-#define BPS_ERROR(n)	(0x00000100 << (n))
-#define BPS_ERROR_0	BPS_ERROR(0)
-#define BPS_ERROR_1	BPS_ERROR(1)
-#define BPS_ERROR_2	BPS_ERROR(2)
-#define BPS_ERROR_3	BPS_ERROR(3)
-#define BPS_ERROR_4	BPS_ERROR(4)
-#define BPS_ERROR_5	BPS_ERROR(5)
-#define BPS_ERROR_6	BPS_ERROR(6)
-#define BPS_ERROR_7	BPS_ERROR(7)
-
-/*
- * Buffer n is idle.  A buffer is idle if it's not
- * DONE, ERROR, or processing a transaction.  If it's
- * IDLE, it's safe to start a new transaction.
- *
- * Clear this bit by starting a xfer with
- * bp_send_from_buf or bp_receive_to_buf.
- */
-#define BPS_IDLE(n)     (0x00010000 << (n))
-#define BPS_IDLE_0	BPS_IDLE(0)
-#define BPS_IDLE_1	BPS_IDLE(1)
-#define BPS_IDLE_2	BPS_IDLE(2)
-#define BPS_IDLE_3	BPS_IDLE(3)
-#define BPS_IDLE_4	BPS_IDLE(4)
-#define BPS_IDLE_5	BPS_IDLE(5)
-#define BPS_IDLE_6	BPS_IDLE(6)
-#define BPS_IDLE_7	BPS_IDLE(7)
-
-/*
- * Buffer n has a "slow path" packet in it.
- * This bit is orthogonal to the bits above and indicates that
- * the FPGA ethernet rx protocol engine has identified this packet
- * as one requiring firmware intervention.
- */
-#define BPS_SLOWPATH(n) (0x01000000 << (n))
-#define BPS_SLOWPATH_0	BPS_SLOWPATH(0)
-#define BPS_SLOWPATH_1	BPS_SLOWPATH(1)
-#define BPS_SLOWPATH_2	BPS_SLOWPATH(2)
-#define BPS_SLOWPATH_3	BPS_SLOWPATH(3)
-#define BPS_SLOWPATH_4	BPS_SLOWPATH(4)
-#define BPS_SLOWPATH_5	BPS_SLOWPATH(5)
-#define BPS_SLOWPATH_6	BPS_SLOWPATH(6)
-#define BPS_SLOWPATH_7	BPS_SLOWPATH(7)
-
-
-#define BPS_DONE_ALL	  0x000000ff	// mask of all dones
-#define BPS_ERROR_ALL	  0x0000ff00	// mask of all errors
-#define BPS_IDLE_ALL      0x00ff0000	// mask of all idles
-#define BPS_SLOWPATH_ALL  0xff000000	// mask of all slowpaths
-
-// The hw_config register
-
-#define	HWC_SIMULATION		0x80000000
-#define	HWC_WB_CLK_DIV_MASK	0x0000000f
-
-/*!
- * \brief return non-zero if we're running under the simulator
- */
-inline static int
-hwconfig_simulation_p(void)
-{
-  return buffer_pool_status->hw_config & HWC_SIMULATION;
-}
-
-/*!
- * \brief Return Wishbone Clock divisor.
- * The processor runs at the Wishbone Clock rate which is MASTER_CLK_RATE / divisor.
- */
-inline static int
-hwconfig_wishbone_divisor(void)
-{
-  return buffer_pool_status->hw_config & HWC_WB_CLK_DIV_MASK;
-}
-
-///////////////////////////////////////////////////
-// Ethernet Core, Slave 6
-
-#define ETH_BASE 0xD000
-
-#include "eth_mac_regs.h"
-
-#define eth_mac ((eth_mac_regs_t *) ETH_BASE)
-
-////////////////////////////////////////////////////
-// Settings Bus, Slave #7, Not Byte Addressable!
-//
-// Output-only from processor point-of-view.
-// 1KB of address space (== 256 32-bit write-only regs)
-
-
-#define MISC_OUTPUT_BASE        0xD400
-#define	TX_PROTOCOL_ENGINE_BASE 0xD480
-#define	RX_PROTOCOL_ENGINE_BASE 0xD4C0
-#define BUFFER_POOL_CTRL_BASE   0xD500
-#define DSP_TX_BASE             0xD600
-#define DSP_RX_BASE             0xD680
-
-#define LAST_SETTING_REG        0xD7FC	// last valid setting register
-
-// --- buffer pool control regs ---
-
-typedef struct {
-  volatile uint32_t ctrl;
-} buffer_pool_ctrl_t;
-
-// buffer pool ports
-
-#define	PORT_SERDES	0	// serial/deserializer
-#define	PORT_DSP	1	// DSP tx or rx pipeline
-#define	PORT_ETH	2	// ethernet tx or rx
-#define	PORT_RAM	3	// RAM tx or rx
-
-// the buffer pool ctrl register fields
-
-#define BPC_BUFFER(n) (((n) & 0xf) << 28)
-#define   BPC_BUFFER_MASK      BPC_BUFFER(~0)
-#define   BPC_BUFFER_0	       BPC_BUFFER(0)
-#define   BPC_BUFFER_1	       BPC_BUFFER(1)
-#define   BPC_BUFFER_2	       BPC_BUFFER(2)
-#define   BPC_BUFFER_3	       BPC_BUFFER(3)
-#define   BPC_BUFFER_4	       BPC_BUFFER(4)
-#define   BPC_BUFFER_5	       BPC_BUFFER(5)
-#define   BPC_BUFFER_6	       BPC_BUFFER(6)
-#define   BPC_BUFFER_7	       BPC_BUFFER(7)
-#define	  BPC_BUFFER_NIL       BPC_BUFFER(0x8)	// disable
-
-#define BPC_PORT(n) (((n) & 0x7) << 25)
-#define   BPC_PORT_MASK        BPC_PORT(~0)
-#define   BPC_PORT_SERDES      BPC_PORT(PORT_SERDES)
-#define   BPC_PORT_DSP	       BPC_PORT(PORT_DSP)
-#define   BPC_PORT_ETH         BPC_PORT(PORT_ETH)
-#define   BPC_PORT_RAM         BPC_PORT(PORT_RAM)
-#define   BPC_PORT_NIL	       BPC_PORT(0x4)   	// disable
-
-#define	BPC_CLR	       	       (1 << 24)  // mutually excl commands
-#define	BPC_READ	       (1 << 23)
-#define BPC_WRITE              (1 << 22)
-
-#define BPC_STEP(step) (((step) & 0xf) << 18)
-#define   BPC_STEP_MASK	       BPC_STEP(~0)
-#define BPC_LAST_LINE(line) (((line) & 0x1ff) << 9)
-#define   BPC_LAST_LINE_MASK   BPC_LAST_LINE(~0)
-#define BPC_FIRST_LINE(line) (((line) & 0x1ff) << 0)
-#define   BPC_FIRST_LINE_MASK  BPC_FIRST_LINE(~0)
-
-#define buffer_pool_ctrl ((buffer_pool_ctrl_t *) BUFFER_POOL_CTRL_BASE)
-
-// --- misc outputs ---
-
-typedef struct {
-  volatile uint32_t	clk_ctrl;
-  volatile uint32_t	serdes_ctrl;
-  volatile uint32_t	adc_ctrl;
-  volatile uint32_t	leds;
-  volatile uint32_t	phy_ctrl;	// LSB is reset line to eth phy
-  volatile uint32_t	debug_mux_ctrl;
-  volatile uint32_t     ram_page;       // FIXME should go somewhere else...
-  volatile uint32_t     flush_icache;   // Flush the icache
-  volatile uint32_t     led_src;        // HW or SW control for LEDs
-} output_regs_t;
-
-#define SERDES_ENABLE 8
-#define SERDES_PRBSEN 4
-#define SERDES_LOOPEN 2
-#define SERDES_RXEN   1
-
-#define	ADC_CTRL_ON	0x0F
-#define	ADC_CTRL_OFF	0x00
-
-// crazy order that matches the labels on the case
-
-#define	LED_A		(1 << 4)
-#define	LED_B		(1 << 1)
-#define	LED_C		(1 << 3)
-#define	LED_D		(1 << 0)
-#define	LED_E		(1 << 2)
-//      LED_F		// controlled by CPLD
-#define	LED_RJ45	(1 << 5)
-
-#define output_regs ((output_regs_t *) MISC_OUTPUT_BASE)
-
-// --- dsp tx regs ---
-
-#define MIN_CIC_INTERP	1
-#define	MAX_CIC_INTERP  128
-
-typedef struct {
-  volatile int32_t	freq;
-  volatile uint32_t	scale_iq;	// {scale_i,scale_q}
-  volatile uint32_t     interp_rate;
-  volatile uint32_t     clear_state;	// clears out state machine, fifos,
-                                        //   NOT freq, scale, interp
-  /*!
-   * \brief output mux configuration.
-   *
-   * <pre>
-   *     3                   2                   1                       
-   *   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   *  +-------------------------------+-------+-------+-------+-------+
-   *  |                                               | DAC1  |  DAC0 |
-   *  +-------------------------------+-------+-------+-------+-------+
-   * 
-   *  There are N DUCs (1 now) with complex inputs and outputs.
-   *  There are two DACs.
-   * 
-   *  Each 4-bit DACx field specifies the source for the DAC
-   *  Each subfield is coded like this: 
-   * 
-   *     3 2 1 0
-   *    +-------+
-   *    |   N   |
-   *    +-------+
-   * 
-   *  N specifies which DUC output is connected to this DAC.
-   * 
-   *   N   which interp output
-   *  ---  -------------------
-   *   0   DUC 0 I
-   *   1   DUC 0 Q
-   *   2   DUC 1 I
-   *   3   DUC 1 Q
-   *   F   All Zeros
-   *   
-   * The default value is 0x10
-   * </pre>
-   */
-  volatile uint32_t	tx_mux;
-
-} dsp_tx_regs_t;
-  
-#define dsp_tx_regs ((dsp_tx_regs_t *) DSP_TX_BASE)
-
-// --- dsp rx regs ---
-
-#define T_NOW (-1)
-
-#define	MIN_CIC_DECIM	1
-#define	MAX_CIC_DECIM   128
-
-typedef struct {
-  volatile int32_t	freq;
-  volatile uint32_t	scale_iq;	// {scale_i,scale_q}
-  volatile uint32_t     decim_rate;
-  volatile uint32_t     rx_time;	// when to begin reception
-  volatile uint32_t     rx_command;	// {now, chain, num_lines(21), lines_per_frame(9)
-  volatile uint32_t     clear_state;    // clears out state machine, fifos,
-                                        //   cmd queue, NOT freq, scale, decim
-  volatile uint32_t     dcoffset_i;     // Bit 31 high sets fixed offset mode, using lower 14 bits,
-                                        // otherwise it is automatic 
-  volatile uint32_t     dcoffset_q;     // Bit 31 high sets fixed offset mode, using lower 14 bits
-
-  /*!
-   * \brief input mux configuration.
-   *
-   * This determines which ADC (or constant zero) is connected to 
-   * each DDC input.  There are N DDCs (1 now).  Each has two inputs.
-   *
-   * <pre>
-   * Mux value:
-   *
-   *    3                   2                   1                       
-   *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   * +-------+-------+-------+-------+-------+-------+-------+-------+
-   * |                                                       |Q0 |I0 |
-   * +-------+-------+-------+-------+-------+-------+-------+-------+
-   *
-   * Each 2-bit I field is either 00 (A/D A), 01 (A/D B) or 1X (const zero)
-   * Each 2-bit Q field is either 00 (A/D A), 01 (A/D B) or 1X (const zero)
-   *
-   * The default value is 0x4
-   * </pre>
-   */
-  volatile uint32_t     rx_mux;        // called adc_mux in dsp_core_rx.v
-
-  /*!
-   * \brief Streaming GPIO configuration
-   *
-   * This determines whether the LSBs of I and Q samples come from the DSP
-   * pipeline or from the io_rx GPIO pins.  To stream GPIO, one must first
-   * set the GPIO data direction register to have io_rx[15] and/or io_rx[14]
-   * configured as inputs.  The GPIO pins will be sampled at the time the
-   * remainder of the DSP sample is strobed into the RX sample FIFO.  There
-   * will be a decimation-dependent fixed time offset between the GPIO
-   * sample stream and the associated RF samples.
-   *
-   *    3                   2                   1                       
-   *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   * +-------+-------+-------+-------+-------+-------+-------+-------+
-   * |                           MBZ                             |Q|I|
-   * +-------+-------+-------+-------+-------+-------+-------+-------+
-   *
-   * I         0=LSB comes from DSP pipeline (default)
-   *           1=LSB comes from io_rx[15]
-   * 
-   * Q         0=LSB comes from DSP pipeline (default)
-   *           1=LSB comes from io_rx[14]
-   */
-  volatile uint32_t gpio_stream_enable;
-
-} dsp_rx_regs_t;
-  
-#define dsp_rx_regs ((dsp_rx_regs_t *) DSP_RX_BASE)
-
-#define MK_RX_CMD(num_lines, lines_per_frame, now, chain) \
-  (((num_lines) << 9) | ((lines_per_frame) & 0x1ff) \
-   | (((now) & 0x1) << 31) | (((chain) & 0x1) << 30))
-
-/* 
- * --- ethernet tx protocol engine regs (write only) ---
- *
- * These registers control the transmit portion of the ethernet
- * protocol engine (out of USRP2).  The protocol engine handles fifo
- * status and sequence number insertion in outgoing packets, and
- * automagically generates status packets when required to inform the
- * host of changes in fifo availability.
- *
- * All outgoing packets have their fifo_status field set to the number
- * of 32-bit lines of fifo available in the ethernet Rx fifo (see
- * usrp2_eth_packet.h).  Seqno's are set if FIXME, else 0.
- *
- * FIXME clean this up once we know how it's supposed to behave.
- */
-
-typedef struct {
-  volatile uint32_t  flags;	     // not yet fully defined (channel?)
-  volatile uint32_t  mac_dst0123;    // 4 bytes of destination mac addr
-  volatile uint32_t  mac_dst45src01; // 2 bytes of dest mac addr; 2 bytes of src mac addr
-  volatile uint32_t  mac_src2345;    // 4 bytes of destination mac addr
-  volatile uint32_t  seqno;	     // Write to init seqno.  It autoincs on match
-} tx_proto_engine_regs_t;
-
-#define tx_proto_engine ((tx_proto_engine_regs_t *) TX_PROTOCOL_ENGINE_BASE)
-
-/*
- * --- ethernet rx protocol engine regs (write only) ---
- *
- * These registers control the receive portion of the ethernet
- * protocol engine (into USRP2).  The protocol engine offloads common
- * packet inspection operations so that firmware has less to do on
- * "fast path" packets.
- *
- * The registers define conditions which must be matched for a packet
- * to be considered a "fast path" packet.  If a received packet
- * matches the src and dst mac address, ethertype, flags field, and
- * expected seqno number it is considered a "fast path" packet, and
- * the expected seqno is updated.  If the packet fails to satisfy any
- * of the above conditions it's a "slow path" packet, and the
- * corresponding SLOWPATH flag will be set buffer_status register.
- */
-
-typedef struct {
-  volatile uint32_t  flags;	     // not yet fully defined (channel?)
-  volatile uint32_t  mac_dst0123;    // 4 bytes of destination mac addr
-  volatile uint32_t  mac_dst45src01; // 2 bytes of dest mac addr; 2 bytes of src mac addr
-  volatile uint32_t  mac_src2345;    // 4 bytes of destination mac addr
-  volatile uint32_t  ethertype_pad;  // ethertype in high 16-bits
-} rx_proto_engine_regs_t;
-
-#define rx_proto_engine ((rx_proto_engine_regs_t *) RX_PROTOCOL_ENGINE_BASE)
-
-
-
-///////////////////////////////////////////////////
-// Simple Programmable Interrupt Controller, Slave 8
-
-#define PIC_BASE  0xD800
-
-// Interrupt request lines
-// Bit numbers (LSB == 0) that correpond to interrupts into PIC
-
-#define	IRQ_BUFFER	0	// buffer manager
-#define	IRQ_TIMER	1
-#define	IRQ_SPI		2
-#define	IRQ_I2C		3
-#define	IRQ_PHY		4	// ethernet PHY
-#define	IRQ_UNDERRUN	5
-#define	IRQ_OVERRUN	6
-#define	IRQ_PPS		7	// pulse per second
-#define	IRQ_UART_RX	8
-#define	IRQ_UART_TX	9
-#define	IRQ_SERDES	10
-#define	IRQ_CLKSTATUS	11
-
-#define IRQ_TO_MASK(x) (1 << (x))
-
-#define PIC_BUFFER_INT    IRQ_TO_MASK(IRQ_BUFFER)
-#define PIC_TIMER_INT     IRQ_TO_MASK(IRQ_TIMER)
-#define PIC_SPI_INT       IRQ_TO_MASK(IRQ_SPI)
-#define PIC_I2C_INT       IRQ_TO_MASK(IRQ_I2C)
-#define PIC_PHY_INT       IRQ_TO_MASK(IRQ_PHY)
-#define PIC_UNDERRUN_INT  IRQ_TO_MASK(IRQ_UNDERRUN)
-#define PIC_OVERRUN_INT   IRQ_TO_MASK(IRQ_OVERRUN)
-#define PIC_PPS_INT   	  IRQ_TO_MASK(IRQ_PPS)
-#define PIC_UART_RX_INT   IRQ_TO_MASK(IRQ_UART_RX)
-#define PIC_UART_TX_INT   IRQ_TO_MASK(IRQ_UART_TX)
-#define PIC_SERDES        IRQ_TO_MASK(IRQ_SERDES)
-#define PIC_CLKSTATUS     IRQ_TO_MASK(IRQ_CLKSTATUS)
-
-typedef struct {
-  volatile uint32_t edge_enable; // mask: 1 -> edge triggered, 0 -> level
-  volatile uint32_t polarity;	 // mask: 1 -> rising edge
-  volatile uint32_t mask;	 // mask: 1 -> disabled
-  volatile uint32_t pending;	 // mask: 1 -> pending; write 1's to clear pending ints
-} pic_regs_t;
-
-#define pic_regs ((pic_regs_t *) PIC_BASE)
-
-///////////////////////////////////////////////////
-// Timer, Slave 9
-
-#define TIMER_BASE  0xDC00
-
-typedef struct {
-  volatile uint32_t time;	// R: current, W: set time to interrupt
-} timer_regs_t;
-
-#define timer_regs ((timer_regs_t *) TIMER_BASE)
-
-///////////////////////////////////////////////////
-// UART, Slave 10
-
-#define UART_BASE  0xE000
-
-typedef struct {
-  //  All elements are 8 bits except for clkdiv (16), but we use uint32 to make 
-  //    the hardware for decoding easier
-  volatile uint32_t clkdiv;  // Set to 50e6 divided by baud rate (no x16 factor)
-  volatile uint32_t txlevel; // Number of spaces in the FIFO for writes
-  volatile uint32_t rxlevel; // Number of available elements in the FIFO for reads
-  volatile uint32_t txchar;  // Write characters to be sent here
-  volatile uint32_t rxchar;  // Read received characters here
-} uart_regs_t;
-
-#define uart_regs ((uart_regs_t *) UART_BASE)
-
-///////////////////////////////////////////////////
-// ATR Controller, Slave 11
-
-#define ATR_BASE  0xE400
-
-typedef struct {
-  volatile uint32_t	v[16];
-} atr_regs_t;
-
-#define	ATR_IDLE	0x0	// indicies into v
-#define ATR_TX		0x1
-#define	ATR_RX		0x2
-#define	ATR_FULL	0x3
-
-#define atr_regs ((atr_regs_t *) ATR_BASE)
-
-///////////////////////////////////////////////////
-// Time Sync Controller, Slave 12
-#define TIMESYNC_BASE  0xE800
-
-typedef struct {
-  /*!
-   * \brief Time sync configuration.
-   *
-   * <pre>
-   *
-   *    3                   2                   1                       
-   *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-   * +-----------------------------------------------------+-+-+-+-+-+
-   * |                                                     |T|G|X|I|S|
-   * +-----------------------------------------------------+-+-+-+-+-+
-   *
-   * S - Tick source (0 = free run, 1 = pps, default=0)
-   * I - Tick interrupt enable (not implemented)
-   * X - Use external sync source (default=1)
-   * G - PPS edge selection (0=negedge, 1=posedge, default=0)
-   * T - Trigger sync every pps edge (default=0)
-   *
-   * </pre>
-   */
-  volatile uint32_t tick_control;
-  volatile uint32_t tick_interval;
-  volatile uint32_t delta_time;
-  volatile uint32_t sync_on_next_pps;
-} timesync_regs_t;
-
-#define timesync_regs ((timesync_regs_t *) TIMESYNC_BASE)
-
-#define TSC_SOURCE_PPS        (1 << 0)
-//#define TSC_SOURCE_FREE_RUN (0 << 0)
-#define TSC_IENABLE           (1 << 1)
-#define TSC_EXTSYNC           (1 << 2)
-#define TSC_PPSEDGE_POS       (1 << 3)
-//#define TSC_PPSEDGE_NEG     (0 << 3)
-#define TSC_TRIGGER_EVERYPPS  (1 << 4)
-//#define TSC_TRIGGER_ONCE    (0 << 4)
-
-///////////////////////////////////////////////////
-// SD Card SPI interface, Slave 13
-//   All regs are 8 bits wide, but are accessed as if they are 32 bits
-
-#define SDSPI_BASE  0xEC00
-
-typedef struct {
-  volatile uint32_t status;  // Write a 1 or 0 for controlling CS
-  volatile uint32_t clkdiv;
-  volatile uint32_t send_dat;
-  volatile uint32_t receive_dat;
-} sdspi_regs_t;
-
-#define sdspi_regs ((sdspi_regs_t *) SDSPI_BASE)
-
-///////////////////////////////////////////////////
-// External RAM interface, Slave 14
-//   Pages are 1K.  Page is 10 bits, set by a control register
-//    output_regs->ram_page
-
-#define EXTRAM_BASE 0xF000
-#define extram ((volatile uint32_t *) EXTRAM_BASE)
-
-
-///////////////////////////////////////////////////
-
-#endif
-
diff --git a/usrp2/firmware/lib/memset_wa.c b/usrp2/firmware/lib/memset_wa.c
deleted file mode 100644
index da5da21ab..000000000
--- a/usrp2/firmware/lib/memset_wa.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "memset_wa.h"
-#include <stdint.h>
-#include <stdlib.h>
-
-/*
- * For setting non-byte-adressable memory, such as
- * the buffers.  dst and nbytes must all satisfy (x % 4 == 0)
- */
-void *
-memset_wa(void *dst, int c, size_t nbytes)
-{
-  if (((intptr_t) dst & 0x3)
-      || (nbytes & 0x3))
-    exit(1);			/* die! */
-
-  int *dp = (int *) dst;
-
-  c &= 0xff;
-  int v = (c << 24) | (c << 16) | (c << 8) | c;
-  unsigned  nw = nbytes/4;
-
-  unsigned i;
-  for (i = 0; i < nw; i++)
-    dp[i] = v;
-
-  return dst;
-}
diff --git a/usrp2/firmware/lib/memset_wa.h b/usrp2/firmware/lib/memset_wa.h
deleted file mode 100644
index 46d903d53..000000000
--- a/usrp2/firmware/lib/memset_wa.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_MEMSET_WA_H
-#define INCLUDED_MEMSET_WA_H
-
-#include <stdlib.h>
-
-void *memset_wa(void *s, int c, size_t n);
-
-
-#endif /* INCLUDED_MEMSET_WA_H */
diff --git a/usrp2/firmware/lib/microblaze.ld b/usrp2/firmware/lib/microblaze.ld
deleted file mode 100644
index ef816cf2e..000000000
--- a/usrp2/firmware/lib/microblaze.ld
+++ /dev/null
@@ -1,163 +0,0 @@
-OUTPUT_FORMAT("elf32-microblaze", "", "")
-/* SEARCH_DIR(/home/jwilliams/tmp/microblaze-toolchain-sources/release/lin/microblaze//lib);*/
-
-ENTRY(_start)
-
-MEMORY {
-	flatmem : ORIGIN = 0x0, LENGTH = 0x00008000	/* 32KB */
-}
-
-SECTIONS
-{
-  _TEXT_START_ADDR = DEFINED(_TEXT_START_ADDR) ? _TEXT_START_ADDR : 0x50;		
-  .vectors.reset 0x0 : { *(.vectors.reset) } > flatmem
-  .vectors.sw_exception 0x8 : { *(.vectors.sw_exception) } > flatmem
-  .vectors.interrupt 0x10 : { *(.vectors.interrupt) } > flatmem
-  .vectors.hw_exception 0x20 : { *(.vectors.hw_exception) } >flatmem
-  . = _TEXT_START_ADDR;
-   _ftext  =  .;
-  .text : {
-    *(.text)
-    *(.text.*)
-    *(.gnu.linkonce.t.*)
-  } > flatmem
-   _etext  =  .;
-  .init : { KEEP (*(.init))	} > flatmem =0
-  .fini : { KEEP (*(.fini))	} > flatmem =0
-  PROVIDE (__CTOR_LIST__ = .);
-  PROVIDE (___CTOR_LIST__ = .);
-  .ctors   : 
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } > flatmem
-  PROVIDE (__CTOR_END__ = .);
-  PROVIDE (___CTOR_END__ = .);
-  PROVIDE (__DTOR_LIST__ = .);
-  PROVIDE (___DTOR_LIST__ = .);
-   .dtors         :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } > flatmem
-  PROVIDE (__DTOR_END__ = .);
-  PROVIDE (___DTOR_END__ = .);
-   . = ALIGN(4);
-    _frodata = . ;
-  .rodata : {
-    *(.rodata)
-    *(.gnu.linkonce.r.*)
-    CONSTRUCTORS; /* Is this needed? */
-  } > flatmem
-   _erodata = .;
-  /* Alignments by 8 to ensure that _SDA2_BASE_ on a word boundary */
-  /* Note that .sdata2 and .sbss2 must be contiguous */
-  . = ALIGN(8);
-   _ssrw = .;
-  .sdata2 : {
-    *(.sdata2)
-    *(.gnu.linkonce.s2.*)
-  } > flatmem
-  . = ALIGN(4);
-  .sbss2 : {
-    PROVIDE (__sbss2_start = .);	
-    *(.sbss2)
-    *(.gnu.linkonce.sb2.*)
-    PROVIDE (__sbss2_end = .);
-  } > flatmem
-  . = ALIGN(8);
-   _essrw = .;
-   _ssrw_size = _essrw - _ssrw;
-   PROVIDE (_SDA2_BASE_ = _ssrw + (_ssrw_size / 2 ));
-   . = ALIGN(4);
-   _fdata = .;
-  .data : {
-    *(.data)
-    *(.gnu.linkonce.d.*)
-    CONSTRUCTORS; /* Is this needed? */
-  } > flatmem
-   _edata = . ;
-   /* Added to handle pic code */
-  .got : {  
-    *(.got)
-  } > flatmem
-  .got1 : {  
-    *(.got1)
-  } > flatmem
-  .got2 : {  
-    *(.got2)
-  } > flatmem
-  /* Added by Sathya to handle C++ exceptions */
-  .eh_frame : {  
-    *(.eh_frame)
-  } > flatmem
-  .jcr : {  
-    *(.jcr)
-  } > flatmem
-  .gcc_except_table : {  
-    *(.gcc_except_table)
-  } > flatmem
-  /* Alignments by 8 to ensure that _SDA_BASE_ on a word boundary */
-  /* Note that .sdata and .sbss must be contiguous */
-  . = ALIGN(8);
-   _ssro = .;
-  .sdata : {
-    *(.sdata)
-    *(.gnu.linkonce.s.*)
-  } > flatmem
-  . = ALIGN(4);
-  .sbss : {
-    PROVIDE (__sbss_start = .);	
-    *(.sbss)
-    *(.gnu.linkonce.sb.*)
-    PROVIDE (__sbss_end = .);
-  } > flatmem
-  . = ALIGN(8);
-   _essro = .;
-   _ssro_size = _essro - _ssro;
-  PROVIDE (_SDA_BASE_ = _ssro + (_ssro_size / 2 ));
-   . = ALIGN(4);
-   _fbss = .;
-  .bss : {
-    PROVIDE (__bss_start = .);	
-    *(.bss)
-    *(.gnu.linkonce.b.*)
-    *(COMMON)
-    . = ALIGN(4);  
-    PROVIDE (__bss_end = .);
-     _heap = .;
-     _HEAP_SIZE = DEFINED(_HEAP_SIZE) ? _HEAP_SIZE : 0x0;
-     _STACK_SIZE = DEFINED(_STACK_SIZE) ? _STACK_SIZE : 0x800;
-     . += _HEAP_SIZE;
-     _heap_end = .;
-     . += _STACK_SIZE;
-     . = ALIGN(8);
-     _stack = .;
-     _end = .;
-  } > flatmem
-  .tdata : {  
-    *(.tdata)
-    *(.gnu.linkonce.td.*)
-  } > flatmem
-  .tbss : {  
-    *(.tbss)
-    *(.gnu.linkonce.tb.*)
-  } > flatmem
-}
diff --git a/usrp2/firmware/lib/nonstdio.c b/usrp2/firmware/lib/nonstdio.c
deleted file mode 100644
index 1c991afee..000000000
--- a/usrp2/firmware/lib/nonstdio.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <nonstdio.h>
-
-static const char hex[16] = "0123456789ABCDEF";
-
-// %x
-void
-puthex4(unsigned long x)
-{
-  putchar(hex[x & 0xf]);
-}
-
-// %02x
-void 
-puthex8(unsigned long x)
-{
-  putchar(hex[(x >> 4) & 0xf]);
-  putchar(hex[x & 0xf]);
-}
-
-// %04x
-void 
-puthex16(unsigned long x)
-{
-  puthex8(x >> 8);
-  puthex8(x);
-}
-
-// %08x
-void 
-puthex32(unsigned long x)
-{
-  puthex16(x >> 16);
-  puthex16(x);
-}
-
-void 
-puthex4_nl(unsigned long x)
-{
-  puthex4(x);
-  newline();
-}
-
-void 
-puthex8_nl(unsigned long x)
-{
-  puthex8(x);
-  newline();
-}
-
-void 
-puthex16_nl(unsigned long x)
-{
-  puthex16(x);
-  newline();
-}
-
-void 
-puthex32_nl(unsigned long x)
-{
-  puthex32(x);
-  newline();
-}
diff --git a/usrp2/firmware/lib/nonstdio.h b/usrp2/firmware/lib/nonstdio.h
deleted file mode 100644
index 3fd9e39bb..000000000
--- a/usrp2/firmware/lib/nonstdio.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_NONSTDIO_H
-#define INCLUDED_NONSTDIO_H
-
-#include <stdio.h>
-#include <usrp2_types.h>
-#include <stddef.h>
-
-void putstr(const char *s);		// cf puts, no added newline
-void puthex4(unsigned long x);		// output 1 hex digit
-void puthex8(unsigned long x);		// output 2 hex digits
-void puthex16(unsigned long x);		// output 4 hex digits
-void puthex32(unsigned long x);		// output 8 hex digits
-void puthex4_nl(unsigned long x);	// ... followed by newline
-void puthex8_nl(unsigned long x);
-void puthex16_nl(unsigned long x);
-void puthex32_nl(unsigned long x);
-#define puthex puthex32
-#define puthex_nl puthex32_nl
-void newline();				// putchar('\n')
-
-void print_mac_addr(const unsigned char addr[6]);
-void print_fxpt_freq(u2_fxpt_freq_t v);
-void print_fxpt_gain(u2_fxpt_gain_t v);
-void print_uint64(uint64_t v);
-
-void print_buffer(uint32_t *buf, size_t n);
-
-#endif /* INCLUDED_NONSTDIO_H */
diff --git a/usrp2/firmware/lib/pic.c b/usrp2/firmware/lib/pic.c
deleted file mode 100644
index 592a07aef..000000000
--- a/usrp2/firmware/lib/pic.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "pic.h"
-#include "hal_io.h"
-#include "memory_map.h"
-
-
-#define NVECTORS 8
-
-/*
- * Our secondary interrupt vector.
- */
-irq_handler_t pic_vector[NVECTORS] = {
-  nop_handler,
-  nop_handler,
-  nop_handler,
-  nop_handler,
-  nop_handler,
-  nop_handler,
-  nop_handler,
-  nop_handler
-};
-
-
-void
-pic_init(void)
-{
-  // uP is level triggered
-
-  pic_regs->mask = ~0;				       // mask all interrupts
-  pic_regs->edge_enable = PIC_TIMER_INT | PIC_PHY_INT;
-  pic_regs->polarity = ~0 & ~PIC_PHY_INT;	       // rising edge
-  pic_regs->pending = ~0;			       // clear all pending ints
-}
-
-/*
- * This magic gets pic_interrupt_handler wired into the
- * system interrupt handler with the appropriate prologue and
- * epilogue.
- */
-void pic_interrupt_handler() __attribute__ ((interrupt_handler));
-
-void pic_interrupt_handler()
-{
-  // pending and not masked interrupts
-  int live = pic_regs->pending & ~pic_regs->mask;
-
-  // FIXME loop while there are interrupts to service.
-  //   That will reduce our overhead.
-
-  // handle the first one set
-  int i;
-  int mask;
-  for (i=0, mask=1; i < NVECTORS; i++, mask <<= 1){
-    if (mask & live){		// handle this one
-      // puthex_nl(i);
-      (*pic_vector[i])(i);
-      pic_regs->pending = mask;	// clear pending interrupt
-      return;
-    }
-  }
-}
-
-void
-pic_register_handler(unsigned irq, irq_handler_t handler)
-{
-  if (irq >= NVECTORS)
-    return;
-  pic_vector[irq] = handler;
-
-  pic_regs->mask &= ~IRQ_TO_MASK(irq);
-}
-
-void
-nop_handler(unsigned irq)
-{
-  // nop
-}
diff --git a/usrp2/firmware/lib/pic.h b/usrp2/firmware/lib/pic.h
deleted file mode 100644
index 68918f9ad..000000000
--- a/usrp2/firmware/lib/pic.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_PIC_H
-#define INCLUDED_PIC_H
-
-typedef void (*irq_handler_t)(unsigned irq);
-
-void pic_init(void);
-void pic_register_handler(unsigned irq, irq_handler_t handler);
-
-void nop_handler(unsigned irq);	// default handler does nothing
-
-// FIXME inline assembler
-int  pic_disable_interrupts();
-int  pic_enable_interrupts();
-void pic_restore_interrupts(int prev_status);
-
-
-#endif /* INCLUDED_PIC_H */
diff --git a/usrp2/firmware/lib/print_buffer.c b/usrp2/firmware/lib/print_buffer.c
deleted file mode 100644
index 9f9104bb5..000000000
--- a/usrp2/firmware/lib/print_buffer.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <nonstdio.h>
-
-void
-print_buffer(uint32_t *buf, size_t n)
-{
-  size_t i;
-  for (i = 0; i < n; i++){
-    if (i % 4 == 0)
-      puthex16(i * 4);
-
-    putchar(' ');
-    puthex32(buf[i]);
-    if (i % 4 == 3)
-      newline();
-  }
-
-  newline();
-}
-
diff --git a/usrp2/firmware/lib/print_fxpt.c b/usrp2/firmware/lib/print_fxpt.c
deleted file mode 100644
index 185bbc51b..000000000
--- a/usrp2/firmware/lib/print_fxpt.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <nonstdio.h>
-
-/*
- * print uint64_t
- */
-void
-print_uint64(uint64_t u)
-{
-  const char *_hex = "0123456789ABCDEF";
-  if (u >= 10)
-    print_uint64(u/10);
-  putchar(_hex[u%10]);
-}
-
-static void
-print_thousandths(int thousandths)
-{
-  putchar('.');
-  if (thousandths < 100)
-    putchar('0');
-  if (thousandths < 10)
-    putchar('0');
-  printf("%d", thousandths);
-}
-
-
-void 
-print_fxpt_freq(u2_fxpt_freq_t v)
-{
-  if (v < 0){
-    v = -v;
-    putchar('-');
-  }
-
-  int64_t int_part = v >> 20;
-  int32_t frac_part = v & ((1 << 20) - 1);
-  
-#if 0  
-  // would work, if we had it
-  printf("%lld.%03d", int_part, (frac_part * 1000) >> 20);
-#else
-  print_uint64(int_part);
-  print_thousandths((frac_part * 1000) >> 20);
-#endif
-}
-
-void
-print_fxpt_gain(u2_fxpt_gain_t v)
-{
-  if (v < 0){
-    v = -v;
-    putchar('-');
-  }
-
-  int32_t int_part = v >> 7;
-  int32_t frac_part = v & ((1 << 7) - 1);
-
-#if 0  
-  // would work, if we had it
-  printf("%d.%03d", int_part, (frac_part * 1000) >> 7);
-#else
-  printf("%d", int_part);
-  print_thousandths((frac_part * 1000) >> 7);
-#endif
-}
-
diff --git a/usrp2/firmware/lib/print_mac_addr.c b/usrp2/firmware/lib/print_mac_addr.c
deleted file mode 100644
index 838fd614a..000000000
--- a/usrp2/firmware/lib/print_mac_addr.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "nonstdio.h"
-
-void
-print_mac_addr(const unsigned char addr[6])
-{
-  puthex8(addr[0]); putchar(':');
-  puthex8(addr[1]); putchar(':');
-  puthex8(addr[2]); putchar(':');
-  puthex8(addr[3]); putchar(':');
-  puthex8(addr[4]); putchar(':');
-  puthex8(addr[5]);
-}
-
diff --git a/usrp2/firmware/lib/print_rmon_regs.c b/usrp2/firmware/lib/print_rmon_regs.c
deleted file mode 100644
index 6d9986909..000000000
--- a/usrp2/firmware/lib/print_rmon_regs.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "print_rmon_regs.h"
-#include "eth_mac.h"
-#include "nonstdio.h"
-
-void
-print_rmon_regs(void)
-{
-  int i;
-  for (i=0; i <= 0x10; i++){
-    putstr("RMON[0x");
-    puthex8(i);
-    putstr("] = ");
-    printf("%d\n", eth_mac_read_rmon(i));
-  }
-
-  for (i=0x20; i <= 0x30; i++){
-    putstr("RMON[0x");
-    puthex8(i);
-    putstr("] = ");
-    printf("%d\n", eth_mac_read_rmon(i));
-  }
-}
diff --git a/usrp2/firmware/lib/print_rmon_regs.h b/usrp2/firmware/lib/print_rmon_regs.h
deleted file mode 100644
index 44e52da84..000000000
--- a/usrp2/firmware/lib/print_rmon_regs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_PRINT_RMON_REGS_H
-#define INCLUDED_PRINT_RMON_REGS_H
-
-void print_rmon_regs(void);
-
-#endif /* INCLUDED_PRINT_RMON_REGS_H */
diff --git a/usrp2/firmware/lib/printf.c b/usrp2/firmware/lib/printf.c
deleted file mode 100644
index 45bd57cb9..000000000
--- a/usrp2/firmware/lib/printf.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Based on code from the SDCC z80 library ;)
- */
-
-#include <stdarg.h>
-#include <stdio.h>
-
-static void 
-_printn(unsigned u, unsigned base, char issigned,
-	void (*emitter)(char, void *), void *pData)
-{
-  const char *_hex = "0123456789ABCDEF";
-  if (issigned && ((int)u < 0)) {
-    (*emitter)('-', pData);
-    u = (unsigned)-((int)u);
-  }
-  if (u >= base)
-    _printn(u/base, base, 0, emitter, pData);
-  (*emitter)(_hex[u%base], pData);
-}
-
-static void 
-_printf(const char *format, void (*emitter)(char, void *),
-	void *pData, va_list va)
-{
-  while (*format) {
-    if (*format != '%')
-      (*emitter)(*format, pData);
-    else {
-      switch (*++format) {
-      case 0:			/* hit end of format string */
-	return;
-      case 'c':
-	{
-	  char c = (char)va_arg(va, int);
-	  (*emitter)(c, pData);
-	  break;
-	}
-      case 'u':
-	{
-	  unsigned u = va_arg(va, unsigned);
-	  _printn(u, 10, 0, emitter, pData);
-	  break;
-	}
-      case 'd':
-	{
-	  unsigned u = va_arg(va, unsigned);
-	  _printn(u, 10, 1, emitter, pData);
-	  break;
-	}
-      case 'x':
-      case 'p':
-	{
-	  unsigned u = va_arg(va, unsigned);
-	  _printn(u, 16, 0, emitter, pData);
-	  break;
-	}
-      case 's':
-	{
-	  char *s = va_arg(va, char *);
-	  while (*s) {
-	    (*emitter)(*s, pData);
-	    s++;
-	  }
-	  break;
-	}
-      }
-    }
-    format++;
-  }
-}
-
-static void 
-_char_emitter(char c, void *pData __attribute__((unused)))
-{
-  putchar(c);
-}
-
-int 
-printf(const char *format, ...)
-{
-  va_list va;
-  va_start(va, format);
-
-  _printf(format, _char_emitter, NULL, va);
-
-  va_end(va);
-
-  // wrong return value...
-  return 0;
-}
-
-
-#if 0
-
-// Totally dangerous.  Don't use
-static void 
-_buf_emitter(char c, void *pData)
-{
-  *((*((char **)pData)))++ = c;
-}
-
-int sprintf(char *pInto, const char *format, ...)
-{
-  va_list va;
-  va_start(va, format);
-
-  _printf(format, _buf_emitter, &pInto, va);
-  *pInto++ = '\0';
-
-  va_end(va);
-
-  // FIXME wrong return value
-  return 0;
-}
-#endif
diff --git a/usrp2/firmware/lib/printf.c.smaller b/usrp2/firmware/lib/printf.c.smaller
deleted file mode 100644
index 4d858648d..000000000
--- a/usrp2/firmware/lib/printf.c.smaller
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Based on code from the SDCC z80 library ;)
- */
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <hal_io.h>		/* FIXME refactor into stdio */
-
-#define PUTCHAR(x) hal_putc(x)
-
-
-static void 
-_printn(unsigned u, unsigned base, char issigned)
-{
-  const char *_hex = "0123456789ABCDEF";
-  if (issigned && ((int)u < 0)) {
-    PUTCHAR('-');
-    u = (unsigned)-((int)u);
-  }
-  if (u >= base)
-    _printn(u/base, base, 0);
-  PUTCHAR(_hex[u%base]);
-}
-
-static void 
-_printf(const char *format, va_list va)
-{
-  while (*format) {
-    if (*format != '%')
-      PUTCHAR(*format);
-    else {
-      switch (*++format) {
-      case 0:			/* hit end of format string */
-	return;
-      case 'c':
-	{
-	  char c = (char)va_arg(va, int);
-	  PUTCHAR(c);
-	  break;
-	}
-      case 'u':
-	{
-	  unsigned u = va_arg(va, unsigned);
-	  _printn(u, 10, 0);
-	  break;
-	}
-      case 'd':
-	{
-	  unsigned u = va_arg(va, unsigned);
-	  _printn(u, 10, 1);
-	  break;
-	}
-      case 'x':
-      case 'p':
-	{
-	  unsigned u = va_arg(va, unsigned);
-	  _printn(u, 16, 0);
-	  break;
-	}
-      case 's':
-	{
-	  char *s = va_arg(va, char *);
-	  while (*s) {
-	    PUTCHAR(*s);
-	    s++;
-	  }
-	  break;
-	}
-      }
-    }
-    format++;
-  }
-}
-
-#if 0
-static void 
-_char_emitter(char c, void *pData __attribute__((unused)))
-{
-  hal_putc(c);
-}
-#endif
-
-int 
-printf(const char *format, ...)
-{
-  va_list va;
-  va_start(va, format);
-
-  _printf(format, va);
-
-  // wrong return value...
-  return 0;
-}
-
-
-#if 0
-
-// Totally dangerous.  Don't use
-static void 
-_buf_emitter(char c, void *pData)
-{
-  *((*((char **)pData)))++ = c;
-}
-
-int sprintf(char *pInto, const char *format, ...)
-{
-  va_list va;
-  va_start(va, format);
-
-  _printf(format, _buf_emitter, &pInto, va);
-  *pInto++ = '\0';
-
-  // FIXME wrong return value
-  return 0;
-}
-#endif
diff --git a/usrp2/firmware/lib/sd.c b/usrp2/firmware/lib/sd.c
deleted file mode 100644
index d000b28ae..000000000
--- a/usrp2/firmware/lib/sd.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2008 Ettus Research LLC
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "sd.h"
-#include "memory_map.h"
-#include "stdint.h"
-#include "stdio.h"
-
-static inline void
-sd_packarg(unsigned char *argument,unsigned int value)
-{
-  argument[3] = (unsigned char)(value >> 24);
-  argument[2] = (unsigned char)(value >> 16);
-  argument[1] = (unsigned char)(value >> 8);
-  argument[0] = (unsigned char)(value);
-}
-
-int
-sd_init(void)
-{
-  unsigned char response[5];
-  unsigned char argument[4];
-  int i,j;
-
-  for(i=0;i<4;i++)
-    argument[i] = 0;
-
-  // Set clock to less than 400 kHz to start out
-  sdspi_regs->clkdiv = 128;
-
-  // Delay at least 74 cycles
-  sd_assert_cs();
-  for(i = 0; i < 100; i++)
-    sd_send_byte(SD_IDLE);
-  sd_deassert_cs();
-  
-  // Initialization Sequence -- CMD0 CMD55 ACMD41 CMD58
-  // Put card in idle state
-  if(sd_send_command(SD_CMD0,SD_CMD0_R,response,argument)==0)
-    return 0;  // Something went wrong in command
-
-  j = 0;
-  do {
-    j++;
-    if(sd_send_command(SD_CMD55,SD_CMD55_R,response,argument)==1)
-      sd_send_command(SD_ACMD41,SD_ACMD41_R,response,argument);
-    else
-      j = SD_IDLE_WAIT_MAX;
-  }
-  while(((response[0] & SD_MSK_IDLE) == SD_MSK_IDLE) && (j < SD_IDLE_WAIT_MAX));
-
-  if(j>= SD_IDLE_WAIT_MAX)  // IDLE timeout exceeded, card asleep
-    return 0;
-  
-  // CMD58 reads the SD card capabilities
-  if(sd_send_command(SD_CMD58,SD_CMD58_R,response,argument)==0)
-    return 0;  // CMD58 FAIL
-
-  if((response[2] & SD_MSK_OCR_33) != SD_MSK_OCR_33)
-    return 0;  // Card doesn't do 3.3V
-
-  //printf("OCR = %x %x %x %x\n",response[0],response[1],response[2],response[3]);
-
-  // Set blocklen here
-  sd_packarg(argument,SD_BLOCKLEN);
-  if(sd_send_command(SD_CMD16,SD_CMD16_R,response,argument)==0)
-    return 0;    // Set Blocklen failed
-  
-  // Reset back to high speed
-  sdspi_regs->clkdiv = 4;
-  //puts("finished init\n");
-  return 1;
-}
-
-int sd_send_command(unsigned char cmd,unsigned char response_type,
-		    unsigned char *response,unsigned char *argument)
-{
-  int i;
-  char response_length;
-  unsigned char tmp;
-
-  sd_assert_cs();
-  sd_send_byte((cmd & 0x3F) | 0x40);
-  for(i=3;i>=0;i--)
-    sd_send_byte(argument[i]);
-  sd_send_byte(SD_CRC);   // Always the same
-
-  response_length = 0;
-  switch(response_type)
-    {
-    case SD_R1:
-    case SD_R1B:
-      response_length = 1;
-      break;
-    case SD_R2:
-      response_length = 2;
-      break;
-    case SD_R3:
-      response_length = 5;
-      break;
-    default:
-      break;
-    }
-
-  // Wait for a response, which will have a 0 start bit
-  i = 0;
-  do
-    {
-      tmp = sd_rcv_byte();
-      i++;
-    }
-  while(((tmp & 0x80) != 0) && i < SD_CMD_TIMEOUT);
-
-  if(i>= SD_CMD_TIMEOUT)
-    {
-      sd_deassert_cs();
-      //puts("cmd send timeout\n");
-      return 0;
-    }
-
-  for(i=response_length-1; i>=0; i--)
-    {
-      response[i] = tmp;
-      tmp = sd_rcv_byte();
-    }
-  i = 0;
-  if(response_type == SD_R1B)
-    {
-      do
-	{
-	  i++;
-	  tmp = sd_rcv_byte();
-	}
-      while(tmp != SD_IDLE);
-      sd_send_byte(SD_IDLE);
-    }
-  
-  //puts("send cmd success\n");
-  sd_deassert_cs();
-  return 1;
-}
-
-int
-sd_read_block (unsigned int blockaddr, unsigned char *buf)
-{
-  unsigned char response[5];
-  unsigned char argument[4];
-  unsigned int i = 0;
-  unsigned char tmp;
-
-  blockaddr <<= SD_BLOCKLEN_NBITS;
-  sd_packarg(argument,blockaddr);
-  if(sd_send_command(SD_CMD17,SD_CMD17_R,response,argument)==0)
-    return 0;    //Failed READ;
-  if(response[0] != 0)
-    return 0;    //Misaligned READ
-
-  sd_assert_cs();
-  i = 0;
-  do
-    {
-      tmp = sd_rcv_byte();
-      i++;
-    }
-  while((tmp == 0xFF) && (i < SD_RD_TIMEOUT));
-  if((i>= SD_RD_TIMEOUT) ||((tmp & SD_MSK_TOK_DATAERROR) == 0))
-    {
-      sd_send_byte(SD_IDLE);  // Send a dummy before quitting
-      return 0;   // Data ERROR
-    }
-  for(i=0;i<SD_BLOCKLEN;i++)
-    buf[i] = sd_rcv_byte();
-  return 1;
-
-}
-
-int
-sd_write_block(unsigned int blockaddr, const unsigned char *buf)
-{
-  // FIXME not implemented yet
-  return 0;
-}
diff --git a/usrp2/firmware/lib/sd.h b/usrp2/firmware/lib/sd.h
deleted file mode 100644
index e2d0ae38e..000000000
--- a/usrp2/firmware/lib/sd.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2008 Ettus Research LLC
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_SD_H
-#define INCLUDED_SD_H
-
-#include "memory_map.h"
-
-#define SD_READY 1
-#define SD_IDLE_WAIT_MAX 100
-#define SD_CMD_TIMEOUT 100
-#define SD_RD_TIMEOUT 1000
-
-#define SD_CMD0 0
-#define SD_CMD1 1
-#define SD_CMD9 9
-#define SD_CMD10 10
-#define SD_CMD12 12
-#define SD_CMD13 13
-#define SD_CMD16 16
-#define SD_CMD17 17 
-#define SD_CMD18 18
-#define SD_CMD24 24
-#define SD_CMD25 25
-#define SD_CMD27 27
-#define SD_CMD28 28
-#define SD_CMD29 29
-#define SD_CMD30 30
-#define SD_CMD32 32
-#define SD_CMD33 33
-#define SD_CMD38 38
-#define SD_CMD55 55
-#define SD_CMD58 58
-#define SD_CMD59 59
-#define SD_ACMD41 41
-#define SD_IDLE 0xFF
-#define SD_CRC 0x95
-
-#define SD_R1 1
-#define SD_R1B 2
-#define SD_R2 3
-#define SD_R3 4
-
-#define SD_CMD0_R SD_R1
-#define SD_CMD16_R SD_R1
-#define SD_CMD17_R SD_R1
-#define SD_CMD55_R SD_R1
-#define SD_ACMD41_R SD_R1
-#define SD_CMD58_R SD_R3
-
-#define SD_BLOCKLEN 512
-#define SD_BLOCKLEN_NBITS 9
-
-#define SD_MSK_IDLE 0x01
-#define SD_MSK_OCR_33 0xC0
-#define SD_MSK_TOK_DATAERROR 0xE0
-
-
-int sd_init(void);
-
-static inline void
-sd_assert_cs(void)
-{
-  // Wait for idle before doing anything
-  while(sdspi_regs->status != SD_READY)
-    ;
-  sdspi_regs->status = 1;
-}
-
-static inline void
-sd_deassert_cs(void)
-{
-  // Wait for idle before doing anything
-  while(sdspi_regs->status != SD_READY)
-    ;
-  sdspi_regs->status = 0;
-}
-
-static inline char
-sd_rcv_byte(void)
-{
-  // Wait for idle before doing anything
-  while(sdspi_regs->status != SD_READY)
-    ;
-  sdspi_regs->send_dat = SD_IDLE;
-  while(sdspi_regs->status != SD_READY)
-    ;
-  return sdspi_regs-> receive_dat;
-}
-
-static inline void
-sd_send_byte(char dat)
-{
-  // Wait for idle before doing anything
-  while(sdspi_regs->status != SD_READY)
-    ;      // Wait for status = 1 (ready)
-  sdspi_regs->send_dat = dat;
-}
-
-
-int sd_send_command(unsigned char cmd,unsigned char response_type,
-		    unsigned char *response,unsigned char *argument);
-
-int sd_read_block (unsigned int blockaddr, unsigned char *buf);
-int sd_write_block(unsigned int blockaddr, const unsigned char *buf);
-
-#endif /* INCLUDED_SD_H */
diff --git a/usrp2/firmware/lib/spi.c b/usrp2/firmware/lib/spi.c
deleted file mode 100644
index 937397df6..000000000
--- a/usrp2/firmware/lib/spi.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "spi.h"
-#include "memory_map.h"
-
-void
-spi_init(void) 
-{
-  /*
-   * f_sclk = f_wb / ((div + 1) * 2)
-   */
-  spi_regs->div = 1;  // 0 = Div by 2 (25 MHz); 1 = Div-by-4 (12.5 MHz)
-}
-
-void
-spi_wait(void) 
-{
-  while (spi_regs->ctrl & SPI_CTRL_GO_BSY)
-    ;
-}
-
-uint32_t
-spi_transact(bool readback, int slave, uint32_t data, int length, uint32_t flags) 
-{
-  flags &= (SPI_CTRL_TXNEG | SPI_CTRL_RXNEG);
-  int ctrl = SPI_CTRL_ASS | (SPI_CTRL_CHAR_LEN_MASK & length) | flags;
-
-  spi_wait();
-
-  // Tell it which SPI slave device to access
-  spi_regs->ss = slave & 0xff;
-
-  // Data we will send
-  spi_regs->txrx0 = data;
-
-  // Run it -- write once and rewrite with GO set
-  spi_regs->ctrl = ctrl;
-  spi_regs->ctrl = ctrl | SPI_CTRL_GO_BSY;
-
-  if(readback) {
-    spi_wait();
-    return spi_regs->txrx0;
-  }
-  else
-    return 0;
-}
diff --git a/usrp2/firmware/lib/spi.h b/usrp2/firmware/lib/spi.h
deleted file mode 100644
index 0914d6c3b..000000000
--- a/usrp2/firmware/lib/spi.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2006,2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_SPI_H
-#define INCLUDED_SPI_H
-
-#include <memory_map.h>
-#include <bool.h>
-
-/*!
- * \brief One time call to initialize SPI
- */
-void spi_init(void);
-
-/*! 
- * \brief Wait for last SPI transaction to complete.
- * Unless you need to know it completed, it's not necessary to call this.
- */
-void spi_wait(void);
-
-#define SPI_TXONLY false	// readback: no
-#define SPI_TXRX   true		// readback: yes
-
-/*
- * Flags for spi_transact
- */
-#define SPIF_PUSH_RISE   0		// push tx data on rising edge of SCLK
-#define SPIF_PUSH_FALL   SPI_CTRL_TXNEG	// push tx data on falling edge of SCLK
-#define SPIF_LATCH_RISE  0		// latch rx data on rising edge of SCLK
-#define SPIF_LATCH_FALL  SPI_CTRL_RXNEG	// latch rx data on falling edge of SCLK
-
-
-uint32_t
-spi_transact(bool readback, int slave, uint32_t data, int length, uint32_t flags);
-
-
-#endif /* INCLUDED_SPI_H */
diff --git a/usrp2/firmware/lib/stdint.h b/usrp2/firmware/lib/stdint.h
deleted file mode 100644
index b5a8611a9..000000000
--- a/usrp2/firmware/lib/stdint.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_STDINT_H
-#define INCLUDED_STDINT_H
-
-typedef signed char	int8_t;
-typedef unsigned char	uint8_t;
-typedef short		int16_t;
-typedef unsigned short	uint16_t;
-typedef int		int32_t;
-typedef unsigned int	uint32_t;
-typedef long long int		int64_t;
-typedef unsigned long long int	uint64_t;
-
-typedef int		intptr_t;
-typedef unsigned int	uintptr_t;
-
-#endif /* INCLUDED_STDINT_H */
diff --git a/usrp2/firmware/lib/stdio.h b/usrp2/firmware/lib/stdio.h
deleted file mode 100644
index 12a7ed0bb..000000000
--- a/usrp2/firmware/lib/stdio.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_STDIO_H
-#define INCLUDED_STDIO_H
-
-// very trimmed down stdio.h  See also nonstdio.h
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-#ifndef EOF
-#define EOF (-1)
-#endif
-
-int putchar(int c);
-int puts(const char *s);
-int printf(const char *format, ...);
-
-int getchar(void);
-
-#endif /* INCLUDED_STDIO_H */
diff --git a/usrp2/firmware/lib/u2_init.c b/usrp2/firmware/lib/u2_init.c
deleted file mode 100644
index 9a1eb1651..000000000
--- a/usrp2/firmware/lib/u2_init.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "u2_init.h"
-#include "memory_map.h"
-#include "spi.h"
-#include "pic.h"
-#include "hal_io.h"
-#include "lsadc.h"
-#include "lsdac.h"
-#include "buffer_pool.h"
-#include "hal_uart.h"
-#include "i2c.h"
-#include "bool.h"
-#include "mdelay.h"
-#include "ad9777.h"
-#include "clocks.h"
-#include "db.h"
-#include "usrp2_i2c_addr.h"
-
-//#include "nonstdio.h"
-
-unsigned char u2_hw_rev_major;
-unsigned char u2_hw_rev_minor;
-
-static inline void
-get_hw_rev(void)
-{
-  bool ok = eeprom_read(I2C_ADDR_MBOARD, MBOARD_REV_LSB, &u2_hw_rev_minor, 1);
-  ok &= eeprom_read(I2C_ADDR_MBOARD, MBOARD_REV_MSB, &u2_hw_rev_major, 1);
-}
-
-/*
- * We ought to arrange for this to be called before main, but for now,
- * we require that the user's main call u2_init as the first thing...
- */
-bool
-u2_init(void)
-{
-  // Set GPIOs to inputs, disable GPIO streaming
-  hal_gpio_set_ddr(GPIO_TX_BANK, 0x0000, 0xffff);
-  hal_gpio_set_ddr(GPIO_RX_BANK, 0x0000, 0xffff);
-
-  hal_gpio_write(GPIO_TX_BANK, 0x0000, 0xffff);	// init s/w output value to zero
-  hal_gpio_write(GPIO_RX_BANK, 0x0000, 0xffff);
-
-  dsp_rx_regs->gpio_stream_enable = 0; // I, Q LSBs come from DSP
-
-  hal_io_init();
-
-  // init spi, so that we can switch over to the high-speed clock
-  spi_init();
-
-  // init i2c so we can read our rev
-  i2c_init();
-  get_hw_rev();
-
-  // set up the default clocks
-  clocks_init();
-
-  // clocks_enable_test_clk(true,1);
-
-  // Enable ADCs
-  output_regs->adc_ctrl = ADC_CTRL_ON;
-
-  // Set up AD9777 DAC
-  ad9777_write_reg(0, R0_1R);
-  ad9777_write_reg(1, R1_INTERP_4X | R1_REAL_MIX);
-  ad9777_write_reg(2, 0);
-  ad9777_write_reg(3, R3_PLL_DIV_1);
-  ad9777_write_reg(4, R4_PLL_ON | R4_CP_AUTO);
-  ad9777_write_reg(5, R5_I_FINE_GAIN(0));
-  ad9777_write_reg(6, R6_I_COARSE_GAIN(0xf));
-  ad9777_write_reg(7, 0);	// I dac offset
-  ad9777_write_reg(8, 0);
-  ad9777_write_reg(9,  R9_Q_FINE_GAIN(0));
-  ad9777_write_reg(10, R10_Q_COARSE_GAIN(0xf));
-  ad9777_write_reg(11, 0);	// Q dac offset
-  ad9777_write_reg(12, 0);
-  
-  // Initial values for tx and rx mux registers
-  dsp_tx_regs->tx_mux = 0x10;
-  dsp_rx_regs->rx_mux = 0x44444444;
-
-  // Set up serdes
-  output_regs->serdes_ctrl = (SERDES_ENABLE | SERDES_RXEN);
-
-  pic_init();	// progammable interrupt controller
-  bp_init();	// buffer pool
-  lsadc_init();	    // low-speed ADCs
-  lsdac_init();	    // low-speed DACs
-  db_init();	    // daughterboard init
-  
-  hal_enable_ints();
-
-  // flash all leds to let us know board is alive
-  hal_set_leds(0x0, 0x1f);
-  mdelay(100);
-  hal_set_leds(0x1f, 0x1f);
-  mdelay(100);
-  hal_set_leds(0x1, 0x1f);  // Leave the first one on
-
-#if 0
-  // test register readback
-  int rr, vv;
-  vv = ad9777_read_reg(0);
-  printf("ad9777 reg[0] = 0x%x\n", vv);
-  
-  for (rr = 0x04; rr <= 0x0d; rr++){
-    vv = ad9510_read_reg(rr);
-    printf("ad9510 reg[0x%x] = 0x%x\n", rr, vv);
-  }
-#endif
-  
-  return true;
-}
diff --git a/usrp2/firmware/lib/u2_init.h b/usrp2/firmware/lib/u2_init.h
deleted file mode 100644
index 91654dac8..000000000
--- a/usrp2/firmware/lib/u2_init.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_U2_INIT_H
-#define INCLUDED_U2_INIT_H
-
-extern unsigned char u2_hw_rev_major;
-extern unsigned char u2_hw_rev_minor;
-
-/*!
- * one-time init
- */
-int u2_init(void);
-
-#endif /* INCLUDED_U2_INIT_H */
diff --git a/usrp2/firmware/lib/usrp2_bytesex.h b/usrp2/firmware/lib/usrp2_bytesex.h
deleted file mode 100644
index 2b74f2a0b..000000000
--- a/usrp2/firmware/lib/usrp2_bytesex.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_USRP2_BYTESEX_H
-#define INCLUDED_USRP2_BYTESEX_H
-
-// The USRP2 speaks big-endian...
-// Use the standard include files or provide substitutions for
-// htons and friends
-
-#if defined(HAVE_ARPA_INET_H)
-#include <arpa/inet.h>
-#elif defined(HAVE_NETINET_IN_H)
-#include <netinet/in.h>
-#else
-#include <stdint.h>
-
-#ifdef WORDS_BIGENDIAN  // nothing to do...
-
-static inline uint32_t htonl(uint32_t x){ return x; }
-static inline uint16_t htons(uint16_t x){ return x; }
-static inline uint32_t ntohl(uint32_t x){ return x; }
-static inline uint16_t ntohs(uint16_t x){ return x; }
-
-#else
-
-#ifdef HAVE_BYTESWAP_H
-#include <byteswap.h>
-#else
-
-static inline uint16_t
-bswap_16 (uint16_t x)
-{
-  return ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8));
-}
-
-static inline uint32_t
-bswap_32 (uint32_t x)
-{
-  return ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) \
-        | (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24));
-}
-#endif
-
-static inline uint32_t htonl(uint32_t x){ return bswap_32(x); }
-static inline uint16_t htons(uint16_t x){ return bswap_16(x); }
-static inline uint32_t ntohl(uint32_t x){ return bswap_32(x); }
-static inline uint16_t ntohs(uint16_t x){ return bswap_16(x); }
-
-#endif
-#endif
-#endif /* INCLUDED_USRP2_BYTESEX_H */
diff --git a/usrp2/firmware/lib/wb16550.h b/usrp2/firmware/lib/wb16550.h
deleted file mode 100644
index 7522f4438..000000000
--- a/usrp2/firmware/lib/wb16550.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-// Wishbone National Semiconductor 16550A compatible UART 
-
-#ifndef INCLUDED_WB16550_H
-#define INCLUDED_WB16550_H
-
-#include <stdint.h>
-
-typedef struct {
-  volatile uint8_t data;     // 0 r/w: r: rx fifo, w: tx fifo (if DLAB: LSB of divisor)
-  volatile uint8_t ier;      // 1 r/w: Interrupt Enable Register (if DLAB: MSB of divisor)
-  volatile uint8_t iir_fcr;  // 2 r/w: r: Interrupt ID Register,
-                             //        w: Fifo Control Register
-  volatile uint8_t lcr;      // 3 r/w: Line Control Register
-  volatile uint8_t mcr;      // 4 w:   Modem Control Register
-  volatile uint8_t lsr;      // 5 r:   Line Status Register
-  volatile uint8_t msr;      // 6 r:   Modem Status Register
-
-} wb16550_reg_t;
-
-#define UART_IER_RDI		0x01  // Enable received data interrupt
-#define UART_IER_THRI		0x02  // Enable transmitter holding reg empty int.
-#define	UART_IER_RLSI		0x04  // Enable receiver line status interrupt
-#define UART_IER_MSI		0x08  // Enable modem status interrupt
-
-#define	UART_IIR_NO_INT		0x01  // No interrupts pending
-#define UART_IIR_ID_MASK	0x06  // Mask for interrupt ID
-#define	UART_IIR_MSI		0x00  // Modem status interrupt
-#define	UART_IIR_THRI		0x02  // Tx holding register empty int
-#define	UART_IIR_RDI		0x04  // Rx data available int
-#define UART_IIR_RLSI		0x06  // Receiver line status int
-
-#define	UART_FCR_ENABLE_FIFO	0x01  // ignore, always enabled
-#define UART_FCR_CLEAR_RCVR	0x02  // Clear the RCVR FIFO
-#define UART_FCR_CLEAR_XMIT	0x04  // Clear the XMIT FIFO
-#define UART_FCR_TRIGGER_MASK	0xC0  // Mask for FIFO trigger range
-#define	UART_FCR_TRIGGER_1	0x00  // Rx fifo trigger level:  1 byte
-#define	UART_FCR_TRIGGER_4	0x40  // Rx fifo trigger level:  4 bytes
-#define	UART_FCR_TRIGGER_8	0x80  // Rx fifo trigger level:  8 bytes
-#define	UART_FCR_TRIGGER_14	0xC0  // Rx fifo trigger level: 14 bytes
-
-#define UART_LCR_DLAB		0x80  // Divisor latch access bit 
-#define UART_LCR_SBC		0x40  // Set break control 
-#define UART_LCR_SPAR		0x20  // Stick parity
-#define UART_LCR_EPAR		0x10  // Even parity select 
-#define UART_LCR_PARITY		0x08  // Parity Enable 
-#define UART_LCR_STOP		0x04  // Stop bits: 0=1 bit, 1=2 bits 
-#define UART_LCR_WLEN5		0x00  // Wordlength: 5 bits 
-#define UART_LCR_WLEN6		0x01  // Wordlength: 6 bits 
-#define UART_LCR_WLEN7		0x02  // Wordlength: 7 bits 
-#define UART_LCR_WLEN8		0x03  // Wordlength: 8 bits 
-
-#define UART_MCR_LOOP		0x10  // Enable loopback test mode 
-#define UART_MCR_OUT2n		0x08  // Out2 complement (loopback mode)
-#define UART_MCR_OUT1n		0x04  // Out1 complement (loopback mode)
-#define UART_MCR_RTSn		0x02  // RTS complement 
-#define UART_MCR_DTRn		0x01  // DTR complement 
-
-#define UART_LSR_TEMT		0x40  // Transmitter empty 
-#define UART_LSR_THRE		0x20  // Transmit-hold-register empty 
-#define UART_LSR_BI		0x10  // Break interrupt indicator 
-#define UART_LSR_FE		0x08  // Frame error indicator 
-#define UART_LSR_PE		0x04  // Parity error indicator 
-#define UART_LSR_OE		0x02  // Overrun error indicator 
-#define UART_LSR_DR		0x01  // Receiver data ready 
-#define UART_LSR_BRK_ERROR_BITS	0x1E  // BI, FE, PE, OE bits 
-#define UART_LSR_ERROR		0x80  // At least 1 PE, FE or BI are in the fifo
-
-#define UART_MSR_DCD		0x80  // Data Carrier Detect 
-#define UART_MSR_RI		0x40  // Ring Indicator 
-#define UART_MSR_DSR		0x20  // Data Set Ready 
-#define UART_MSR_CTS		0x10  // Clear to Send 
-#define UART_MSR_DDCD		0x08  // Delta DCD 
-#define UART_MSR_TERI		0x04  // Trailing edge ring indicator 
-#define UART_MSR_DDSR		0x02  // Delta DSR 
-#define UART_MSR_DCTS		0x01  // Delta CTS 
-#define UART_MSR_ANY_DELTA	0x0F  // Any of the delta bits! 
-
-
-#endif  // INCLUDED_WB16550_H 
diff --git a/usrp2/firmware/u2_flash_tool b/usrp2/firmware/u2_flash_tool
deleted file mode 100755
index 2b66a4ac0..000000000
--- a/usrp2/firmware/u2_flash_tool
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-from optparse import OptionParser
-
-SECTOR_SIZE = 512                 # bytes
-MAX_FILE_SIZE =  1 * (2**20)      # maximum number of bytes we'll burn to a slot
-
-FPGA_OFFSET = 0                   # offset in flash to fpga image
-FIRMWARE_OFFSET = 1 * (2**20)     # offset in flash to firmware image
-
-def read_file_data(filename):
-    f = open(filename, "rb")
-    file_data = f.read(MAX_FILE_SIZE)
-    t = len(file_data) % SECTOR_SIZE
-    if t != 0:
-        file_data += (SECTOR_SIZE - t)*chr(0)  # pad to an even sector size w/ zeros
-    return file_data
-
-
-def write_flash(offset, filename, devname):
-    file_data = read_file_data(filename)
-    dev = open(devname, "wb")
-    dev.seek(offset, 0)                 # seek to absolute byte offset
-    dev.write(file_data)
-    dev.flush()
-    dev.close()
-    return True
-
-
-def verify_flash(offset, filename, devname):
-    file_data = read_file_data(filename)
-    dev = open(devname, "rb")
-    dev.seek(offset, 0)                 # seek to absolute byte offset
-    dev_data = dev.read(len(file_data))
-    if len(dev_data) != len(file_data):
-        sys.stderr.write("short read on device %s\n" % (devname,))
-        return False
-
-    if file_data == dev_data:
-        return True
-
-    # doesn't match
-    nwrong = 0
-    for i in range(len(file_data)):
-        if dev_data[i] != file_data[i]:
-            sys.stderr.write("mismatch at offset %7d.  Expected 0x%02x, got 0x%02x\n" % (
-                i, ord(file_data[i]), ord(dev_data[i])))
-            nwrong += 1
-            if nwrong > 16:
-                sys.stderr.write("> 16 errors, stopping comparison\n")
-                break
-    return False
-
-def read_flash(offset, filename, devname):
-    dev = open(devname, "rb")
-    dev.seek(offset, 0)                 # seek to absolute byte offset
-    dev_data = dev.read(MAX_FILE_SIZE)
-    dev.close()
-    open(filename, "wb").write(dev_data)
-
-    
-def main():
-    parser = OptionParser(usage="%prog: [options] filename")
-    parser.add_option("-w", "--write", action="store_const", const="write", dest="mode",
-                      help="write FILE to TARGET slot")
-    parser.add_option("-v", "--verify",  action="store_const", const="verify", dest="mode",
-                      help="verify FILE against TARGET slot")
-    parser.add_option("-r", "--read",  action="store_const", const="read", dest="mode",
-                      help="read TARGET slot, write to FILE")
-    parser.add_option("-t", "--target", type="choice", choices=("fpga", "s/w"), default="s/w",
-                      help="select TARGET slot from: fpga, s/w [default=%default]")
-    parser.add_option("", "--dev", default=None,
-                      help="specify flash device file, e.g., /dev/sdb.  Be careful!")
-    parser.set_defaults(target="s/w", mode=None)
-
-    (options, args) = parser.parse_args()
-    if len(args) != 1:
-        parser.print_help()
-        raise SystemExit
-
-    filename = args[0]
-
-    if options.mode is None:
-        sys.stderr.write("specify mode with -w, -v or -r\n")
-        parser.print_help()
-        raise SystemExit
-
-    if options.dev is None:
-        sys.stderr.write("specify the device file with --dev\n")
-        parser.print_help()
-        raise SystemExit
-
-    offset = { "fpga" : FPGA_OFFSET, "s/w" : FIRMWARE_OFFSET }[options.target]
-    
-    if options.mode == "write":
-        r = (write_flash(offset, filename, options.dev)
-             and verify_flash(offset, filename, options.dev))
-    elif options.mode == "verify":
-        r = verify_flash(offset, filename, options.dev)
-    elif options.mode == "read":
-        r = read_flash(offset, filename, options.dev)
-    else:
-        raise NotImplemented
-
-    if not r:
-        raise SystemExit, 1
-
-
-if __name__ == "__main__":
-    main()
-
-    
-
-
-    
diff --git a/usrp2/fpga/README b/usrp2/fpga/README
deleted file mode 100644
index 802b98476..000000000
--- a/usrp2/fpga/README
+++ /dev/null
@@ -1,3 +0,0 @@
-The FPGA directory that used to be here is now hosted at:
-
-git://ettus.sourcerepo.com/ettus/fpga.git
diff --git a/usrp2/host/.gitignore b/usrp2/host/.gitignore
deleted file mode 100644
index 605b6fe86..000000000
--- a/usrp2/host/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-/configure
-/Makefile.in
-/config.log
-/config.status
-/config.guess
-/stamp-h1
-/config.h
-/ltmain.sh
-/config.sub
-/config.h.in
-/libtool
-/autom4te.cache
-/missing
-/aclocal.m4
-/Makefile
-/install-sh
-/depcomp
-/usrp2*.tar.gz
-/py-compile
-/usrp2.pc
diff --git a/usrp2/host/Makefile.am b/usrp2/host/Makefile.am
deleted file mode 100644
index 13f7cb86a..000000000
--- a/usrp2/host/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = usrp2.pc
-
-EXTRA_DIST += \
-	usrp2.pc.in        
-
-SUBDIRS = include lib apps
diff --git a/usrp2/host/apps/.gitignore b/usrp2/host/apps/.gitignore
deleted file mode 100644
index 4b66ac0f9..000000000
--- a/usrp2/host/apps/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-/Makefile
-/Makefile.in
-/.libs
-/.deps
-/test_eth
-/test_usrp2
-/gen_const
-/find_usrps
-/cerr
-/*.sh
-/tx_samples
-/rx_streaming_samples
-/u2_burn_mac_addr
-/usrp2_burn_mac_addr
-/test_mimo_tx
-/gpio
diff --git a/usrp2/host/apps/Makefile.am b/usrp2/host/apps/Makefile.am
deleted file mode 100644
index 087ab9e31..000000000
--- a/usrp2/host/apps/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright 2007,2008,2010 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = \
-    $(USRP2_INCLUDES) \
-    $(GRUEL_INCLUDES) \
-    $(STD_DEFINES_AND_INCLUDES) \
-    $(CPPUNIT_INCLUDES)
-
-LDADD = \
-    $(USRP2_LA) \
-    $(GRUEL_LA)
-
-bin_PROGRAMS = \
-	find_usrps \
-	usrp2_burn_mac_addr
-
-noinst_PROGRAMS = \
-	gen_const \
-	rx_streaming_samples \
-	tx_samples \
-	test_mimo_tx \
-	gpio
-
-find_usrps_SOURCES = find_usrps.cc
-usrp2_burn_mac_addr_SOURCES = usrp2_burn_mac_addr.cc
-rx_streaming_samples_SOURCES = rx_streaming_samples.cc
-gen_const_SOURCES = gen_const.cc
-tx_samples_SOURCES = tx_samples.cc
-test_mimo_tx_SOURCES = test_mimo_tx.cc
-gpio_SOURCES = gpio.cc
diff --git a/usrp2/host/apps/bitrot/rx_samples.cc b/usrp2/host/apps/bitrot/rx_samples.cc
deleted file mode 100644
index c1c3b5917..000000000
--- a/usrp2/host/apps/bitrot/rx_samples.cc
+++ /dev/null
@@ -1,382 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "usrp2_basic.h"
-#include <iostream>
-#include <complex>
-#include <getopt.h>
-#include <string.h>
-#include "strtod_si.h"
-#include <signal.h>
-#include <stdexcept>
-#include "gri_if_stats.h"
-#include <gr_realtime.h>
-
-
-typedef std::complex<float> fcomplex;
-
-static volatile bool signaled = false;
-
-static void 
-sig_handler(int sig)
-{
-  signaled = true;
-}
-
-static void
-install_sig_handler(int signum,
-		    void (*new_handler)(int))
-{
-  struct sigaction new_action;
-  memset (&new_action, 0, sizeof (new_action));
-
-  new_action.sa_handler = new_handler;
-  sigemptyset (&new_action.sa_mask);
-  new_action.sa_flags = 0;
-
-  if (sigaction (signum, &new_action, 0) < 0){
-    perror ("sigaction (install new)");
-    throw std::runtime_error ("sigaction");
-  }
-}
-
-
-/*
- * Vectorize me!
- */
-void
-convert_samples_to_complex(size_t nsamples,
-			   uint32_t *i_samples,
-			   fcomplex *c_samples)
-{
-  uint32_t *p = i_samples;
-  for (size_t i = 0; i < nsamples; i++){
-    int16_t  si = ((int16_t) (p[i] >> 16));
-    int16_t  sq = ((int16_t) (p[i] & 0xffff));
-    c_samples[i] = fcomplex((float) si, (float) sq);
-  }
-}
-
-
-static void
-usage(const char *progname)
-{
-  const char *p = strrchr(progname, '/');	// drop leading directory path
-  if (p)
-    p++;
-
-  if (strncmp(p, "lt-", 3) == 0)		// drop lt- libtool prefix
-    p += 3;
-  
-  fprintf(stderr, "Usage: %s [options]\n\n", p);
-  fprintf(stderr, "Options:\n");
-  fprintf(stderr, "  -h                   show this message and exit\n");
-  fprintf(stderr, "  -e ETH_INTERFACE     specify ethernet interface [default=eth0]\n");
-  fprintf(stderr, "  -m MAC_ADDR          mac address of USRP2 HH:HH [default=first one found]\n");
-  fprintf(stderr, "  -o OUTPUT_FILE       set output filename [default=NONE]\n");
-  fprintf(stderr, "  -f FREQ              set frequency to FREQ [default=0]\n");
-  fprintf(stderr, "  -d DECIM             set decimation rate to DECIM [default=32]\n");
-  fprintf(stderr, "  -N NSAMPLES          total number of samples to receive [default=2.5e6]\n");
-  fprintf(stderr, "  -F SAMPLES_PER_FRAME number of samples in each frame [default=371]\n");
-  fprintf(stderr, "  -S SCALE             fpga scaling factor for I & Q [default=1024]\n");
-  fprintf(stderr, "  -M DONT_LOCK|LOCK_TO_SMA|LOCK_TO_MIMO   specify MIMO clock source\n");
-  fprintf(stderr, "  -P                   provide clock to MIMO connector\n");
-}
-
-struct pkt_info {
-  int		d_nsamples;
-  int		d_timestamp;
-  unsigned int	d_seqno;
-
-  pkt_info(int nsamples, int timestamp, int seqno)
-    : d_nsamples(nsamples),
-      d_timestamp(timestamp),
-      d_seqno(seqno) {}
-};
-
-int
-main(int argc, char **argv)
-{
-
-  // options and their defaults
-  const char *interface = "eth0";
-  const char *mac_addr_str = 0;
-  const char *output_filename = 0;
-  double freq = 0;
-  int32_t decim = 32;
-  int32_t nsamples = static_cast<int32_t>(2.5e6);
-  int32_t samples_per_frame = 371;
-  int32_t scale = 1024;
-  int	  mimo_config = MC_WE_DONT_LOCK;
-  bool	  provide_clock = false;
-
-  int    ch;
-  double tmp;
-  u2_mac_addr_t mac_addr;
-
-  setvbuf(stdout, 0, _IOFBF, 64 * 1024); // make stdout fully buffered
-
-  while ((ch = getopt(argc, argv, "he:m:o:f:d:N:F:S:M:P")) != EOF){
-    switch (ch){
-
-    case 'e':
-      interface = optarg;
-      break;
-      
-    case 'm':
-      mac_addr_str = optarg;
-      if (!usrp2_basic::parse_mac_addr(optarg, &mac_addr)){
-	std::cerr << "invalid mac addr: " << optarg << std::endl;
-	usage(argv[0]);
-	exit(1);
-      }
-      break;
-
-    case 'o':
-      output_filename = optarg;
-      break;
-      
-    case 'f':
-      if (!strtod_si(optarg, &freq)){
-	std::cerr << "invalid number: " << optarg << std::endl;
-	usage(argv[0]);
-	exit(1);
-      }
-      break;
-
-    case 'N':
-      if (!strtod_si(optarg, &tmp)){
-	std::cerr << "invalid number: " << optarg << std::endl;
-	usage(argv[0]);
-	exit(1);
-      }
-      nsamples = static_cast<int32_t>(tmp);
-      break;
-
-    case 'F':
-      samples_per_frame = strtol(optarg, 0, 0);
-      break;
-
-    case 'd':
-      decim = strtol(optarg, 0, 0);
-      break;
-
-    case 'S':
-      if (!strtod_si(optarg, &tmp)){
-	std::cerr << "invalid number: " << optarg << std::endl;
-	usage(argv[0]);
-	exit(1);
-      }
-      scale = static_cast<int32_t>(tmp);
-      break;
-      
-    case 'M':
-      if (strcmp(optarg, "DONT_LOCK") == 0)
-	mimo_config = MC_WE_DONT_LOCK;
-      else if (strcmp(optarg, "LOCK_TO_SMA") == 0)
-	mimo_config = MC_WE_LOCK_TO_SMA;
-      else if (strcmp(optarg, "LOCK_TO_MIMO") == 0)
-	mimo_config = MC_WE_LOCK_TO_MIMO;
-      else {
-	usage(argv[0]);
-	exit(1);
-      }
-      break;
-
-    case 'P':
-      provide_clock = true;
-      break;
-
-    case 'h':
-    default:
-      usage(argv[0]);
-      exit(1);
-    }
-  }
-  
-  if (argc - optind != 0){
-    usage(argv[0]);
-    exit(1);
-  }
-
-  FILE *of = 0;
-  if (output_filename)
-    of = fopen(output_filename, "wb");
-
-  usrp2_basic *u2 = new usrp2_basic();
-
-  if (!u2->open(interface)){
-    std::cerr << "couldn't open " << interface << std::endl;
-    return 0;
-  }
-
-
-  install_sig_handler(SIGINT, sig_handler);
-  if (1){
-    install_sig_handler(SIGALRM, sig_handler);
-    alarm(5);
-  }
-
-  
-  std::vector<op_id_reply_t> r = u2->find_usrps();
-
-  for (size_t i = 0; i < r.size(); i++){
-    std::cout << r[i] << std::endl;
-  }
-
-  if (r.size() == 0){
-    std::cerr << "No USRP2 found.\n";
-    return 1;
-  }
-
-  u2_mac_addr_t which = r[0].addr;	// pick the first one
-
-
-  gr_rt_status_t rt = gr_enable_realtime_scheduling();
-  if (rt != RT_OK)
-    std::cerr << "failed to enable realtime scheduling\n";
-
-  if (provide_clock)
-    mimo_config |= MC_PROVIDE_CLK_TO_MIMO;
-
-  u2->config_mimo(which, mimo_confg);
-  
-
-  gri_if_stats start, stop;
-  gri_get_if_stats(interface, &start);
-
-  if (!u2->start_rx(which, freq, decim, nsamples, samples_per_frame, scale, scale)){
-    std::cerr << "start_rx failed\n";
-    return 1;
-  }
-
-
-  std::vector<pkt_info> history;
-  history.reserve(64*1024);		// preallocate 64K entries
-
-  
-  long total_samples_recvd = 0;
-
-  while (!signaled && total_samples_recvd < nsamples){
-    u2_eth_samples_t	pkt;
-    // fcomplex		c_samples[U2_MAX_SAMPLES];
-    
-    // read samples
-    int n = u2->read_samples(which, &pkt);
-    if (n <= 0)
-      break;
-    
-    total_samples_recvd += n;
-
-    history.push_back(pkt_info(n, u2p_timestamp(&pkt.hdrs.fixed), pkt.hdrs.thdr.seqno));
-
-    // convert_samples_to_complex(n, pkt.samples, c_samples);
-    // size_t r = fwrite(c_samples, sizeof(fcomplex), n, of);
-
-    if (of){
-      fwrite(pkt.samples, sizeof(uint32_t), n, of);
-      fflush(of);
-    }
-  }
-
-
-  gri_get_if_stats(interface, &stop);
-
-  if (!u2->stop_rx(which)){
-    std::cerr << "stop_rx failed\n";
-    return 1;
-  }
-
-
-  long expected_rx_packets =
-    (nsamples + samples_per_frame - 1)/samples_per_frame;
-
-  long expected_rx_bytes   =
-    expected_rx_packets * sizeof(u2_eth_packet_t) + nsamples * 4;
-
-
-  long total_pkts_recvd = 0;
-  total_samples_recvd = 0;
-
-  int nbad_seqno = 0;
-
-  for (unsigned i = 0; i < history.size(); i++){
-    total_pkts_recvd++;
-    total_samples_recvd += history[i].d_nsamples;
-
-    bool bad_seqno = history[i].d_seqno != (i & 0xff);
-    if (bad_seqno)
-      nbad_seqno++;
-    
-    printf("%3d  %8d  %8ld  %8ld  %3d %s\n",
-	   history[i].d_nsamples,
-	   history[i].d_timestamp,
-	   total_pkts_recvd, total_samples_recvd,
-	   history[i].d_seqno,
-	   bad_seqno ? "BAD SEQNO" : ""
-	   );
-  }
-
-  if (nbad_seqno == 0)
-    printf("\nAll sequence numbers are correct\n");
-  else
-    printf("\n%d sequence numbers were INCORRECT\n", nbad_seqno);
-    
-
-  printf("\nUser space statistics:\n");
-  printf("  rx_samples:  %8ld",     total_samples_recvd);
-  printf("   expected  %8d  %s\n",
-	 nsamples,
-	 nsamples - total_samples_recvd == 0 ? "OK" : "NOT OK");
-  
-  printf("  rx_packets:  %8ld",     total_pkts_recvd);
-  printf("   expected  %8ld  %s\n",
-	 expected_rx_packets,
-	 expected_rx_packets - total_pkts_recvd == 0 ? "OK" : "NOT OK");
-  
-
-  fflush(stdout);
-
-  printf("\nKernel interface statistics:\n");
-
-  long long delta;
-  delta = stop.rx_bytes - start.rx_bytes;
-  printf("  rx_bytes:    %8Ld",     delta);
-  printf("   expected  %8ld  %s\n",
-	 expected_rx_bytes,
-	 expected_rx_bytes - delta == 0 ? "OK" : "NOT OK");
-
-  delta = stop.rx_packets - start.rx_packets;
-  printf("  rx_packets:  %8Ld",     delta);
-  printf("   expected  %8ld  %s\n",
-	 expected_rx_packets,
-	 expected_rx_packets - delta == 0 ? "OK" : "NOT OK");
-
-  printf("  rx_errs:     %8Ld\n",   stop.rx_errs - start.rx_errs);
-  printf("  rx_drop:     %8Ld\n",   stop.rx_drop - start.rx_drop);
-  printf("  tx_bytes:    %8Ld\n",   stop.tx_bytes - start.tx_bytes);
-  printf("  tx_packets:  %8Ld\n",   stop.tx_packets - start.tx_packets);
-  printf("  tx_errs:     %8Ld\n",   stop.tx_errs - start.tx_errs);
-  printf("  tx_drop:     %8Ld\n",   stop.tx_drop - start.tx_drop);
-
-
-  return 0;
-}
diff --git a/usrp2/host/apps/find_usrps.cc b/usrp2/host/apps/find_usrps.cc
deleted file mode 100644
index ff6b4ab79..000000000
--- a/usrp2/host/apps/find_usrps.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2/usrp2.h>
-#include <iostream>
-#include <cstdio>
-#include <getopt.h>
-
-static void
-usage(const char *progname)
-{
-  fprintf(stderr, "usage: %s [-e ethN]\n",
-	  progname);
-}
-
-int
-main(int argc, char **argv)
-{
-  int ch;
-  const char *interface = "eth0";
-
-  while ((ch = getopt(argc, argv, "he:")) != EOF){
-    switch (ch){
-    case 'e':
-      interface = optarg;
-      break;
-      
-    case 'h':
-    default:
-      usage(argv[0]);
-      exit(1);
-    }
-  }
-
-  if (argc - optind != 0){
-    usage(argv[0]);
-    exit(1);
-  }
-  
-  usrp2::props_vector_t r = usrp2::find(interface);
-
-  for (size_t i = 0; i < r.size(); i++){
-    std::cout << r[i] << std::endl;
-  }
-
-  if (r.size() == 0){
-    std::cerr << "No USRP2 found.\n";
-    return 1;
-  }
-
-  return 0;
-}
diff --git a/usrp2/host/apps/gen_2tone.py b/usrp2/host/apps/gen_2tone.py
deleted file mode 100755
index ec681d3e0..000000000
--- a/usrp2/host/apps/gen_2tone.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-from gnuradio import gr, eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys
-
-master_clock = 100e6
-
-class my_top_block(gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-f", "--freq1", type="eng_float", default=1e6,
-                          help="set waveform frequency to FREQ [default=%default]")
-        parser.add_option("-g", "--freq2", type="eng_float", default=1e6,
-                          help="set waveform frequency to FREQ [default=%default]")
-        parser.add_option ("-a", "--amplitude1", type="eng_float", default=16e3,
-                           help="set waveform amplitude to AMPLITUDE [default=%default]", metavar="AMPL")
-        parser.add_option ("-b", "--amplitude2", type="eng_float", default=16e3,
-                           help="set waveform amplitude to AMPLITUDE [default=%default]", metavar="AMPL")
-
-        parser.add_option("-i", "--interp", type="int", default=32,
-                          help="assume fgpa interpolation rate is INTERP [default=%default]")
-
-        (options, args) = parser.parse_args ()
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit, 1
-
-        
-        src0 = gr.sig_source_c(master_clock/options.interp,
-                               gr.GR_SIN_WAVE,
-                               options.freq1,
-                               options.amplitude1)
-        src1 = gr.sig_source_c(master_clock/options.interp,
-                               gr.GR_SIN_WAVE,
-                               options.freq2,
-                               options.amplitude2)
-
-	adder = gr.add_cc()
-
-        
-        c2s = gr.complex_to_interleaved_short()
-
-        stdout_sink = gr.file_descriptor_sink(gr.sizeof_short, 1)
-
-        self.connect(src0, (adder,0))
-        self.connect(src1, (adder,1))
-        self.connect(adder, c2s, stdout_sink)
-
-        
-if __name__ == '__main__':
-    try:
-        my_top_block().run()
-    except KeyboardInterrupt:
-        pass
diff --git a/usrp2/host/apps/gen_const.cc b/usrp2/host/apps/gen_const.cc
deleted file mode 100644
index d2c36ebba..000000000
--- a/usrp2/host/apps/gen_const.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-int
-main(int argc, char **argv)
-{
-  if (argc != 3){
-    fprintf(stderr, "usage: %s i-val q-val\n", argv[0]);
-    return 1;
-  }
-
-  int i_val = strtol(argv[1], 0, 0);
-  int q_val = strtol(argv[2], 0, 0);
-
-  static const int NSAMPLES = 16384;
-
-  uint32_t	sample[NSAMPLES];
-  sample[0] = ((i_val & 0xffff) << 16) | (q_val & 0xffff);
-  for (int i = 1; i < NSAMPLES; i++)
-    sample[i] = sample[0];
-
-  while(1){
-    write(1, sample, sizeof(sample));
-  }
-}
diff --git a/usrp2/host/apps/gen_sine.py b/usrp2/host/apps/gen_sine.py
deleted file mode 100755
index 6a44dd110..000000000
--- a/usrp2/host/apps/gen_sine.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2007 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-from gnuradio import gr, eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import sys
-
-master_clock = 100e6
-
-class my_top_block(gr.top_block):
-
-    def __init__(self):
-        gr.top_block.__init__(self)
-
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-f", "--freq", type="eng_float", default=1e6,
-                          help="set waveform frequency to FREQ [default=%default]")
-        parser.add_option ("-a", "--amplitude", type="eng_float", default=16e3,
-                           help="set waveform amplitude to AMPLITUDE [default=%default]", metavar="AMPL")
-
-        parser.add_option("-i", "--interp", type="int", default=32,
-                          help="assume fgpa interpolation rate is INTERP [default=%default]")
-
-        (options, args) = parser.parse_args ()
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit, 1
-
-        
-        src0 = gr.sig_source_c(master_clock/options.interp,
-                               gr.GR_SIN_WAVE,
-                               options.freq,
-                               options.amplitude)
-
-        
-        c2s = gr.complex_to_interleaved_short()
-
-        stdout_sink = gr.file_descriptor_sink(gr.sizeof_short, 1)
-
-        self.connect(src0, c2s, stdout_sink)
-
-        
-if __name__ == '__main__':
-    try:
-        my_top_block().run()
-    except KeyboardInterrupt:
-        pass
diff --git a/usrp2/host/apps/gpio.cc b/usrp2/host/apps/gpio.cc
deleted file mode 100644
index 2fee7e761..000000000
--- a/usrp2/host/apps/gpio.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2/usrp2.h>
-#include <iostream>
-#include <cstdio>
-
-int
-main(int argc, char **argv)
-{
-  usrp2::usrp2::sptr u2 = usrp2::usrp2::make("eth0");
-
-  // Set io_tx[15] as FPGA output
-  u2->set_gpio_ddr(usrp2::GPIO_TX_BANK, 0x8000, 0x8000);
-
-  // Set io_tx[15] under host sofware control
-  u2->set_gpio_sels(usrp2::GPIO_TX_BANK, "s...............");
-
-  // Write pins
-  uint16_t v = 0x8765;
-  u2->write_gpio(usrp2::GPIO_TX_BANK, v, 0x8000);
-
-  // Read back
-  v = 0;
-  u2->read_gpio(usrp2::GPIO_TX_BANK, &v);
-  printf("TX GPIO read: %04X\n", v);
-  return 0;
-}
diff --git a/usrp2/host/apps/rx_streaming_samples.cc b/usrp2/host/apps/rx_streaming_samples.cc
deleted file mode 100644
index 8479ae1b2..000000000
--- a/usrp2/host/apps/rx_streaming_samples.cc
+++ /dev/null
@@ -1,373 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2/usrp2.h>
-#include <usrp2/strtod_si.h>
-#include <usrp2/copiers.h>
-#include <usrp2/rx_nop_handler.h>
-#include <gruel/realtime.h>
-#include <sys/time.h>
-#include <iostream>
-#include <cstdio>
-#include <string.h>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <stdexcept>
-#include <signal.h>
-
-static volatile bool signaled = false;
-
-static void 
-sig_handler(int sig)
-{
-  signaled = true;
-}
-
-static void
-install_sig_handler(int signum,
-		    void (*new_handler)(int))
-{
-  struct sigaction new_action;
-  memset (&new_action, 0, sizeof (new_action));
-
-  new_action.sa_handler = new_handler;
-  sigemptyset (&new_action.sa_mask);
-  new_action.sa_flags = 0;
-
-  if (sigaction (signum, &new_action, 0) < 0){
-    perror ("sigaction (install new)");
-    throw std::runtime_error ("sigaction");
-  }
-}
-
-// ------------------------------------------------------------------------
-
-// FIXME make this a template
-
-class file_writer_16sc : public usrp2::rx_nop_handler
-{
-  FILE	       *d_fp;
-  std::string	d_filename;
-  
-public:
-
-  file_writer_16sc(const std::string &filename, uint64_t max_samples)
-    : usrp2::rx_nop_handler(max_samples), d_filename(filename)
-  {
-    d_fp = fopen(filename.c_str(), "wb");
-    if (d_fp == 0){
-      perror(filename.c_str());
-      throw std::invalid_argument(filename);
-    }
-  }
-
-  ~file_writer_16sc();
-
-  bool 
-  operator()(const uint32_t *items, size_t nitems, const usrp2::rx_metadata *metadata)
-  {
-    bool ok = rx_nop_handler::operator()(items, nitems, metadata);
-
-    size_t host_nitems = nitems;
-    std::complex<int16_t> host_items[host_nitems];
-
-    usrp2::copy_u2_16sc_to_host_16sc(nitems, items, host_items);
-
-    size_t n = 0;
-    while (n < host_nitems){
-      size_t r = fwrite(&host_items[n], sizeof(host_items[0]), host_nitems - n, d_fp);
-      n += r;
-      if (r == 0){	// out of space?
-        d_err = true;
-	perror(d_filename.c_str());
-	ok = false;
-	break;
-      }
-    }
-
-    return ok;
-  }
-};
-
-file_writer_16sc::~file_writer_16sc()
-{
-  fclose(d_fp);
-}
-
-// ------------------------------------------------------------------------
-
-class file_writer_32fc : public usrp2::rx_nop_handler
-{
-  FILE	       *d_fp;
-  std::string	d_filename;
-  
-public:
-
-  file_writer_32fc(const std::string &filename, uint64_t max_samples)
-    : usrp2::rx_nop_handler(max_samples), d_filename(filename)
-  {
-    d_fp = fopen(filename.c_str(), "wb");
-    if (d_fp == 0){
-      perror(filename.c_str());
-      throw std::invalid_argument(filename);
-    }
-  }
-
-  ~file_writer_32fc();
-
-  bool 
-  operator()(const uint32_t *items, size_t nitems, const usrp2::rx_metadata *metadata)
-  {
-    bool ok = rx_nop_handler::operator()(items, nitems, metadata);
-
-    size_t host_nitems = nitems;
-    std::complex<float> host_items[host_nitems];
-
-    usrp2::copy_u2_16sc_to_host_32fc(nitems, items, host_items);
-
-    size_t n = 0;
-    while (n < host_nitems){
-      size_t r = fwrite(&host_items[n], sizeof(host_items[0]), host_nitems - n, d_fp);
-      n += r;
-      if (r == 0){	// out of space?
-        d_err = true;
-	perror(d_filename.c_str());
-	ok = false;
-	break;
-      }
-    }
-
-    return ok;
-  }
-};
-
-file_writer_32fc::~file_writer_32fc()
-{
-  fclose(d_fp);
-}
-
-// ------------------------------------------------------------------------
-
-static void
-usage(const char *progname)
-{
-  const char *p = strrchr(progname, '/');	// drop leading directory path
-  if (p)
-    p++;
-
-  if (strncmp(p, "lt-", 3) == 0)		// drop lt- libtool prefix
-    p += 3;
-  
-  fprintf(stderr, "Usage: %s [options]\n\n", p);
-  fprintf(stderr, "Options:\n");
-  fprintf(stderr, "  -h                   show this message and exit\n");
-  fprintf(stderr, "  -e ETH_INTERFACE     specify ethernet interface [default=eth0]\n");
-  fprintf(stderr, "  -m MAC_ADDR          mac address of USRP2 HH:HH [default=first one found]\n");
-  fprintf(stderr, "  -f FREQUENCY         specify receive center frequency in Hz [default=0.0]\n");
-  fprintf(stderr, "  -d DECIM             specify receive decimation rate [default=5]\n");
-  fprintf(stderr, "  -g GAIN              specify receive daughterboard gain [default=0]\n");
-  fprintf(stderr, "  -N NSAMPLES          specify number of samples to receive [default=infinite]\n");
-  fprintf(stderr, "  -o OUTPUT_FILENAME   specify file to receive samples [default=none]\n");
-  fprintf(stderr, "  -s                   write complex<short> [default=complex<float>]\n");
-  fprintf(stderr, "  -v                   verbose output\n");
-}
-
-int
-main(int argc, char **argv)
-{
-  // options and their defaults
-  const char *interface = "eth0";
-  const char *mac_addr_str = "";
-  double rx_freq = 0.0;
-  int rx_decim = 5;
-  double rx_gain = 0.0;
-  uint64_t nsamples = 0;
-  bool output_shorts = false;
-  char *output_filename = 0;
-  bool verbose = false;
-
-  int ch;
-
-  while ((ch = getopt(argc, argv, "he:m:f:d:g:N:o:sv")) != EOF){
-    double tmp;
-    switch (ch){
-
-    case 'e':
-      interface = optarg;
-      break;
-      
-    case 'm':
-      mac_addr_str = optarg;
-      break;
-
-    case 'f':
-      if (!strtod_si(optarg, &rx_freq)) {
-        std::cerr << "invalid number: " << optarg << std::endl;
-	usage(argv[0]);
-	exit(1);
-      }
-      break;
-
-    case 'g':
-      if (!strtod_si(optarg, &rx_gain)) {
-        std::cerr << "invalid number: " << optarg << std::endl;
-	usage(argv[0]);
-	exit(1);
-      }
-      break;
-
-    case 'd':
-      rx_decim = strtol(optarg, 0, 0);
-      if (rx_decim < 4 or rx_decim > 512) { 
-        std::cerr << "invalid decimation rate: " << optarg << std::endl;
-	usage(argv[0]);
-	exit(1);
-      }
-      break;
-
-    case 'N':
-      if (!strtod_si(optarg, &tmp)) {
-        std::cerr << "invalid number: " << optarg << std::endl;
-	usage(argv[0]);
-	exit(1);
-      }
-      nsamples = static_cast<uint64_t>(tmp);
-      break;
-      
-    case 's':
-      output_shorts = true;
-      break;
-
-    case 'o':
-      output_filename = optarg;
-      break;
-      
-    case 'v':
-      verbose = true;
-      break;
-
-    case 'h':
-    default:
-      usage(argv[0]);
-      exit(1);
-    }
-  }
-
-
-  install_sig_handler(SIGINT, sig_handler);
-
-  usrp2::rx_nop_handler::sptr handler;
-
-  if (output_filename){
-    if (output_shorts)
-      handler = usrp2::rx_nop_handler::sptr(new file_writer_16sc(output_filename, nsamples));
-    else
-      handler = usrp2::rx_nop_handler::sptr(new file_writer_32fc(output_filename, nsamples));
-  }
-  else
-    handler = usrp2::rx_nop_handler::sptr(new usrp2::rx_nop_handler(nsamples));
-
-  gruel::rt_status_t rt = gruel::enable_realtime_scheduling();
-  if (rt != gruel::RT_OK)
-    std::cerr << "Failed to enable realtime scheduling" << std::endl;
-
-  usrp2::usrp2::sptr u2 = usrp2::usrp2::make(interface, mac_addr_str);
-  
-  // FIXME in case it was left running...
-  if (!u2->stop_rx_streaming()){
-    fprintf(stderr, "stop_rx_streaming failed\n");
-  }
-
-  if (!u2->set_rx_gain(rx_gain)){
-    fprintf(stderr, "set_rx_gain(%f) failed\n", rx_gain);
-    exit(1);
-  }
-
-  usrp2::tune_result tr;
-  if (!u2->set_rx_center_freq(rx_freq, &tr)){
-    fprintf(stderr, "set_rx_center_freq(%g) failed\n", rx_freq);
-    exit(1);
-  }
-
-  if (verbose){
-    printf("USRP2 MAC address: %s\n\n", u2->mac_addr().c_str());
-    printf("Daughterboard configuration:\n");
-    printf("  baseband_freq=%f\n", tr.baseband_freq);
-    printf("       ddc_freq=%f\n", tr.dxc_freq);
-    printf("  residual_freq=%f\n", tr.residual_freq);
-    printf("       inverted=%s\n\n", tr.spectrum_inverted ? "yes" : "no");
-  }
-  
-  if (!u2->set_rx_decim(rx_decim)) {
-    fprintf(stderr, "set_rx_decim(%d) failed\n", rx_decim);
-    exit(1);
-  }
-
-  if (verbose)
-    printf("USRP2 using decimation rate of %d\n", rx_decim);
-    
-  if (!u2->start_rx_streaming(0)){
-    fprintf(stderr, "start_rx_streaming failed\n");
-    exit(1);
-  }
-
-  if (verbose) {
-    if (nsamples > 0)
-        printf("Receiving %zd samples\n\n", nsamples);
-    else
-        printf("Receiving infinite samples\n\n");
-  }
-  
-  struct timeval start, end;
-  gettimeofday(&start, 0);
-
-  while (!signaled && 
-         !handler->has_errored_p() && 
-         !handler->has_finished_p()) {
-    bool ok = u2->rx_samples(0, handler.get());
-    if (!ok){
-      fprintf(stderr, "u2->rx_samples failed\n");
-      return 1;
-    }
-  }
-
-  gettimeofday(&end, 0);
-  long n_usecs = end.tv_usec-start.tv_usec;
-  long n_secs = end.tv_sec-start.tv_sec;
-  double elapsed = (double)n_secs + (double)n_usecs*1e-6;
-  double mbs = handler->nsamples()*sizeof(uint32_t)/elapsed/1e6;
-  double pps = handler->nframes()/elapsed;
-  
-  u2->stop_rx_streaming();
-
-  if (verbose){
-    printf("\nCopy handler called %li times.\n", handler->nframes());
-    printf("Copy handler called with %li bytes.\n\n", handler->nsamples()*sizeof(uint32_t));
-    printf("Elapsed time was %5.3f seconds.\n", elapsed);
-    printf("Packet rate was %1.0f pkts/sec.\n", pps);
-    printf("Approximate throughput was %5.2f MB/sec.\n", mbs);
-    printf("Total instances of overruns was %d.\n", u2->rx_overruns());
-    printf("Total missing frames was %d.\n", u2->rx_missing());
-  }
-
-  return 0;
-}
diff --git a/usrp2/host/apps/stdin_int32_fft.py b/usrp2/host/apps/stdin_int32_fft.py
deleted file mode 100755
index 1596fa00d..000000000
--- a/usrp2/host/apps/stdin_int32_fft.py
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2004,2005,2007,2008,2010 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.
-# 
-
-from gnuradio import gr, gru
-from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider
-from optparse import OptionParser
-import wx
-import sys
-import numpy
-
-
-class app_top_block(stdgui2.std_top_block):
-    def __init__(self, frame, panel, vbox, argv):
-        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
-
-        self.frame = frame
-        self.panel = panel
-        
-        parser = OptionParser(option_class=eng_option)
-        parser.add_option("-d", "--decim", type="int", default=16,
-                          help="set fgpa decimation rate to DECIM [default=%default]")
-        parser.add_option("-f", "--freq", type="eng_float", default=None,
-                          help="set frequency to FREQ", metavar="FREQ")
-        parser.add_option("-W", "--waterfall", action="store_true", default=False,
-                          help="Enable waterfall display")
-        parser.add_option("-S", "--oscilloscope", action="store_true", default=False,
-                          help="Enable oscilloscope display")
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            sys.exit(1)
-	self.options = options
-        self.options.gain = 1.0
-        self.show_debug_info = True
-        
-
-        input_rate = 100e6 / options.decim
-
-        self.src = gr.file_descriptor_source(gr.sizeof_short, 0, False);
-        self.s2c = gr.interleaved_short_to_complex()
-
-        if options.waterfall:
-            self.scope = \
-              waterfallsink2.waterfall_sink_c (panel, fft_size=1024, sample_rate=input_rate)
-        elif options.oscilloscope:
-            self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate)
-        else:
-            self.scope = fftsink2.fft_sink_c (panel, fft_size=1024, y_divs=12, sample_rate=input_rate,ref_level=110,fft_rate=20)
-
-        self.connect(self.src, self.s2c, self.scope)
-
-        self._build_gui(vbox)
-	self._setup_events()
-	
-        # set initial values
-
-        if options.freq is None:
-            # if no freq was specified, use the mid-point
-            options.freq = 0.0
-
-        if self.show_debug_info:
-            self.myform['decim'].set_value(self.options.decim)
-
-
-    def _set_status_msg(self, msg):
-        self.frame.GetStatusBar().SetStatusText(msg, 0)
-
-    def _build_gui(self, vbox):
-
-        def _form_set_freq(kv):
-            return self.set_freq(kv['freq'])
-            
-        vbox.Add(self.scope.win, 10, wx.EXPAND)
-        
-        # add control area at the bottom
-        self.myform = myform = form.form()
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0, 0)
-        myform['freq'] = form.float_field(
-            parent=self.panel, sizer=hbox, label="Center freq", weight=1,
-            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
-
-        hbox.Add((5,0), 0, 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        self._build_subpanel(vbox)
-
-    def _build_subpanel(self, vbox_arg):
-        # build a secondary information panel (sometimes hidden)
-
-        # FIXME figure out how to have this be a subpanel that is always
-        # created, but has its visibility controlled by foo.Show(True/False)
-        
-        def _form_set_decim(kv):
-            return self.set_decim(kv['decim'])
-
-        if not(self.show_debug_info):
-            return
-
-        panel = self.panel
-        vbox = vbox_arg
-        myform = self.myform
-
-        #panel = wx.Panel(self.panel, -1)
-        #vbox = wx.BoxSizer(wx.VERTICAL)
-
-        hbox = wx.BoxSizer(wx.HORIZONTAL)
-        hbox.Add((5,0), 0)
-
-        myform['decim'] = form.int_field(
-            parent=panel, sizer=hbox, label="Decim",
-            callback=myform.check_input_and_call(_form_set_decim, self._set_status_msg))
-
-        hbox.Add((5,0), 0)
-        vbox.Add(hbox, 0, wx.EXPAND)
-
-        
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital down converter.
-        """
-        
-        if True:
-            self.myform['freq'].set_value(target_freq)     # update displayed value
-	    if not self.options.waterfall and not self.options.oscilloscope:
-		self.scope.set_baseband_freq(target_freq)
-    	    return True
-
-        return False
-
-    def set_gain(self, gain):
-        self.myform['gain'].set_value(gain)     # update displayed value
-
-    def set_decim(self, decim):
-        input_rate = 100e6 / self.options.decim
-        self.scope.set_sample_rate(input_rate)
-        if self.show_debug_info:  # update displayed values
-            self.myform['decim'].set_value(self.u.decim_rate())
-        return ok
-
-    def _setup_events(self):
-	if not self.options.waterfall and not self.options.oscilloscope:
-	    self.scope.win.Bind(wx.EVT_LEFT_DCLICK, self.evt_left_dclick)
-	    
-    def evt_left_dclick(self, event):
-	(ux, uy) = self.scope.win.GetXY(event)
-	if event.CmdDown():
-	    # Re-center on maximum power
-	    points = self.scope.win._points
-	    if self.scope.win.peak_hold:
-		if self.scope.win.peak_vals is not None:
-		    ind = numpy.argmax(self.scope.win.peak_vals)
-		else:
-		    ind = int(points.shape()[0]/2)
-	    else:
-        	ind = numpy.argmax(points[:,1])
-            (freq, pwr) = points[ind]
-	    target_freq = freq/self.scope.win._scale_factor
-	    print ind, freq, pwr
-            self.set_freq(target_freq)            
-	else:
-	    # Re-center on clicked frequency
-	    target_freq = ux/self.scope.win._scale_factor
-	    self.set_freq(target_freq)
-	    
-	
-def main ():
-    app = stdgui2.stdapp(app_top_block, "USRP FFT", nstatus=1)
-    app.MainLoop()
-
-if __name__ == '__main__':
-    main ()
diff --git a/usrp2/host/apps/streaming_fft.py b/usrp2/host/apps/streaming_fft.py
deleted file mode 100755
index 4d341497a..000000000
--- a/usrp2/host/apps/streaming_fft.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-import os
-import os.path
-import sys
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-
-def main():
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("-d", "--decim", type="int", default=16,
-                      help="set fgpa decimation rate to DECIM [default=%default]")
-    parser.add_option("-f", "--freq", type="eng_float", default=0.0,
-                      help="set frequency to FREQ", metavar="FREQ")
-    parser.add_option("-g", "--gain", type="string", default=None,
-                      help="set gain to GAIN [default=%default]")
-    parser.add_option("-W", "--waterfall", action="store_true", default=False,
-                      help="Enable waterfall display")
-    parser.add_option("-S", "--oscilloscope", action="store_true", default=False,
-                      help="Enable oscilloscope display")
-    parser.add_option("-F", "--samples-per-frame", type="int", default=250,
-                      help="[default=%default]")
-    parser.add_option("-e", "--eth", default="eth0",
-                      help="specify ethernet interface [default=%default]")
-
-    (options, args) = parser.parse_args()
-    if len(args) != 0:
-        parser.print_help()
-        sys.exit(1)
-
-
-    path = os.path.dirname(sys.argv[0])
-    if path == '':
-        path = '.'
-    
-    
-    display_type = ''
-    if options.waterfall:
-        display_type = '-W'
-    if options.oscilloscope:
-        display_type = '-S'
-
-    gain_clause = ''
-    if options.gain:
-        gain_clause = '-g ' + options.gain
-
-    # FIXME: restore -F
-    cmd = "%s/rx_streaming_samples -s -e %s -f %g -d %d %s -o /proc/self/fd/1 | %s/stdin_int32_fft.py %s -f %g -d %d" % (
-        path, options.eth, options.freq, options.decim, gain_clause,
-        path, display_type, options.freq, options.decim)
-
-    print cmd
-    os.system(cmd)
-    
-
-if __name__ == '__main__':
-    main()
diff --git a/usrp2/host/apps/test.sh b/usrp2/host/apps/test.sh
deleted file mode 100755
index c533c3339..000000000
--- a/usrp2/host/apps/test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-sudo ./rx_streaming_samples -d 4 -v -N 100M
-
diff --git a/usrp2/host/apps/test_mimo_tx.cc b/usrp2/host/apps/test_mimo_tx.cc
deleted file mode 100644
index f52bfd582..000000000
--- a/usrp2/host/apps/test_mimo_tx.cc
+++ /dev/null
@@ -1,311 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This is a down and dirty test program that confirms that the we can
- * coherently transmit different signals to two USRP2s connected via a
- * mimo cable.  It ignores most of its command line arguments, and
- * requires that special purpose firmware be installed in the two
- * USRP2s.  The one connected to the ethernet must be running
- * mimo_tx.bin The other must be running mimo_tx_slave.bin.
- *
- * Don't use this as a model for how s/w should be written :-)
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <usrp2/usrp2.h>
-#include <usrp2/strtod_si.h>
-#include <iostream>
-#include <cstdio>
-#include <complex>
-#include <getopt.h>
-#include <gruel/realtime.h>
-#include <signal.h>
-#include <string.h>
-#include <stdexcept>
-#include <math.h>
-
-
-typedef std::complex<float> fcomplex;
-
-static volatile bool signaled = false;
-
-void 
-gen_and_send(usrp2::usrp2::sptr u2, int chan,
-	     double *ph, double ph_incr, int nsamples);
-
-
-static void 
-sig_handler(int sig)
-{
-  signaled = true;
-}
-
-static void
-install_sig_handler(int signum,
-		    void (*new_handler)(int))
-{
-  struct sigaction new_action;
-  memset (&new_action, 0, sizeof (new_action));
-
-  new_action.sa_handler = new_handler;
-  sigemptyset (&new_action.sa_mask);
-  new_action.sa_flags = 0;
-
-  if (sigaction (signum, &new_action, 0) < 0){
-    perror ("sigaction (install new)");
-    throw std::runtime_error ("sigaction");
-  }
-}
-
-
-static const char *
-prettify_progname(const char *progname)		// that's probably almost a word ;)
-{
-  const char *p = strrchr(progname, '/');	// drop leading directory path
-  if (p)
-    p++;
-
-  if (strncmp(p, "lt-", 3) == 0)		// drop lt- libtool prefix
-    p += 3;
-
-  return p;
-}
-
-static void
-usage(const char *progname)
-{
-  fprintf(stderr, "Usage: %s [options]\n\n", prettify_progname(progname));
-  fprintf(stderr, "Options:\n");
-  fprintf(stderr, "  -h                   show this message and exit\n");
-  fprintf(stderr, "  -e ETH_INTERFACE     specify ethernet interface [default=eth0]\n");
-  fprintf(stderr, "  -m MAC_ADDR          mac address of USRP2 HH:HH [default=first one found]\n");
-  fprintf(stderr, "  -I INPUT_FILE        set input filename [default=stdin]\n");
-  fprintf(stderr, "  -r                   repeat.  When EOF of input file is reached, seek to beginning\n");
-  fprintf(stderr, "  -f FREQ              set frequency to FREQ [default=0]\n");
-  fprintf(stderr, "  -i INTERP            set interpolation rate to INTERP [default=32]\n");
-  fprintf(stderr, "  -g gain              set tx gain\n");
-  fprintf(stderr, "  -S SCALE             fpga scaling factor for I & Q [default=256]\n");
-}
-
-#define GAIN_NOT_SET (-1000)
-#define	MAX_SAMPLES (371)
-
-int
-main(int argc, char **argv)
-{
-  const char *interface = "eth0";
-  const char *input_filename = 0;
-  bool repeat = false;
-  const char *mac_addr_str = "";
-  double freq = 0;
-  int32_t interp = 32;
-  int32_t samples_per_frame = MAX_SAMPLES;
-  int32_t scale = -1;
-  double gain = GAIN_NOT_SET;
-  
-  int    ch;
-  double tmp;
-
-
-  while ((ch = getopt(argc, argv, "he:m:I:rf:i:S:F:g:")) != EOF){
-    switch (ch){
-
-    case 'e':
-      interface = optarg;
-      break;
-      
-    case 'm':
-      mac_addr_str = optarg;
-#if 0
-      if (!usrp2_basic::parse_mac_addr(optarg, &mac_addr)){
-	std::cerr << "invalid mac addr: " << optarg << std::endl;
-	usage(argv[0]);
-	return 1;
-      }
-#endif
-      break;
-
-    case 'I':
-      input_filename = optarg;
-      break;
-      
-    case 'r':
-      repeat = true;
-      break;
-      
-    case 'f':
-      if (!strtod_si(optarg, &freq)){
-	std::cerr << "invalid number: " << optarg << std::endl;
-	usage(argv[0]);
-	return 1;
-      }
-      break;
-
-    case 'F':
-      samples_per_frame = strtol(optarg, 0, 0);
-      break;
-
-    case 'i':
-      interp = strtol(optarg, 0, 0);
-      break;
-
-    case 'S':
-      if (!strtod_si(optarg, &tmp)){
-	std::cerr << "invalid number: " << optarg << std::endl;
-	usage(argv[0]);
-	return 1;
-      }
-      scale = static_cast<int32_t>(tmp);
-      break;
-      
-    case 'h':
-    default:
-      usage(argv[0]);
-      return 1;
-    }
-  }
-
-  
-  if (argc - optind != 0){
-    usage(argv[0]);
-    return 1;
-  }
-  
-  if (samples_per_frame < 9 || samples_per_frame > MAX_SAMPLES){
-    std::cerr << prettify_progname(argv[0])
-	      << ": samples_per_frame is out of range.  "
-	      << "Must be in [9, " << MAX_SAMPLES << "].\n";
-    usage(argv[0]);
-    return 1;
-  }
-
-
-  FILE *fp = 0;
-  if (input_filename == 0)
-    fp = stdin;
-  else {
-    fp = fopen(input_filename, "rb");
-    if (fp == 0){
-      perror(input_filename);
-      return 1;
-    }
-  }
-
-  install_sig_handler(SIGINT, sig_handler);
-
-
-  gruel::rt_status_t rt = gruel::enable_realtime_scheduling();
-  if (rt != gruel::RT_OK)
-    std::cerr << "Failed to enable realtime scheduling" << std::endl;
-
-
-  usrp2::usrp2::sptr u2 = usrp2::usrp2::make(interface, mac_addr_str);
-  
-#if 0
-  if (gain != GAIN_NOT_SET){
-    if (!u2->set_tx_gain(gain)){
-      std::cerr << "set_tx_gain failed\n";
-      return 1;
-    }
-  }
-
-  usrp2::tune_result tr;
-  if (!u2->set_tx_center_freq(freq, &tr)){
-    fprintf(stderr, "set_tx_center_freq(%g) failed\n", freq);
-    return 1;
-  }
-
-  printf("Daughterboard configuration:\n");
-  printf("  baseband_freq=%f\n", tr.baseband_freq);
-  printf("       duc_freq=%f\n", tr.dxc_freq);
-  printf("  residual_freq=%f\n", tr.residual_freq);
-  printf("       inverted=%s\n\n", tr.spectrum_inverted ? "yes" : "no");
-
-  if (!u2->set_tx_interp(interp)){
-    fprintf(stderr, "set_tx_interp(%d) failed\n", interp);
-    return 1;
-  }
-
-  if (scale != -1){
-    if (!u2->set_tx_scale_iq(scale, scale)){
-      std::cerr << "set_tx_scale_iq failed\n";
-      return 1;
-    }
-  }
-#endif
-
-  double baseband_rate = 100e6 / 32;
-
-  double ph0 = 0;
-  double ph1 = 0;
-
-  double ph0_incr = 7.5e3/baseband_rate * 2 * M_PI;
-  double ph1_incr = 7.5e3/baseband_rate * 2 * M_PI;
-
-  while (!signaled){
-
-    gen_and_send(u2, 0, &ph0, ph0_incr, samples_per_frame);
-    gen_and_send(u2, 1, &ph1, ph1_incr, samples_per_frame);
-
-  }
-
-  return 0;
-}
-
-void
-gen_and_send(usrp2::usrp2::sptr u2, int chan,
-	     double *ph_ptr, double ph_incr, int nsamples)
-{
-  double ph = *ph_ptr;
-  
-  std::complex<float>	buf[MAX_SAMPLES];
-
-  usrp2::tx_metadata	md;
-  md.timestamp = -1;
-  md.start_of_burst = 1;
-  md.send_now = 1;
-
-  float ampl;
-
-  if (chan == 0)
-    ampl = 0.5;
-  else
-    ampl = 0.75;
-
-
-  for (int i = 0; i < nsamples; i++){
-#if 0
-    float s, c;
-    sincosf((float) ph, &s, &c);
-    buf[i] = std::complex<float>(s * ampl, c * ampl);
-    ph += ph_incr;
-#else
-    buf[i] = std::complex<float>(ampl, 0);
-#endif
-  }
-
-  if (!u2->tx_32fc(chan, buf, nsamples, &md)){
-    fprintf(stderr, "tx_32fc failed\n");
-  }
-
-  ph = fmod(ph, 2*M_PI);
-  *ph_ptr = ph;
-}
diff --git a/usrp2/host/apps/tx_samples.cc b/usrp2/host/apps/tx_samples.cc
deleted file mode 100644
index 3e41bbf8d..000000000
--- a/usrp2/host/apps/tx_samples.cc
+++ /dev/null
@@ -1,269 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <usrp2/usrp2.h>
-#include <usrp2/strtod_si.h>
-#include <iostream>
-#include <cstdio>
-#include <complex>
-#include <getopt.h>
-#include <gruel/realtime.h>
-#include <signal.h>
-#include <string.h>
-#include <stdexcept>
-
-
-typedef std::complex<float> fcomplex;
-
-static volatile bool signaled = false;
-
-static void 
-sig_handler(int sig)
-{
-  signaled = true;
-}
-
-static void
-install_sig_handler(int signum,
-		    void (*new_handler)(int))
-{
-  struct sigaction new_action;
-  memset (&new_action, 0, sizeof (new_action));
-
-  new_action.sa_handler = new_handler;
-  sigemptyset (&new_action.sa_mask);
-  new_action.sa_flags = 0;
-
-  if (sigaction (signum, &new_action, 0) < 0){
-    perror ("sigaction (install new)");
-    throw std::runtime_error ("sigaction");
-  }
-}
-
-
-static const char *
-prettify_progname(const char *progname)		// that's probably almost a word ;)
-{
-  const char *p = strrchr(progname, '/');	// drop leading directory path
-  if (p)
-    p++;
-
-  if (strncmp(p, "lt-", 3) == 0)		// drop lt- libtool prefix
-    p += 3;
-
-  return p;
-}
-
-static void
-usage(const char *progname)
-{
-  fprintf(stderr, "Usage: %s [options]\n\n", prettify_progname(progname));
-  fprintf(stderr, "Options:\n");
-  fprintf(stderr, "  -h                   show this message and exit\n");
-  fprintf(stderr, "  -e ETH_INTERFACE     specify ethernet interface [default=eth0]\n");
-  fprintf(stderr, "  -m MAC_ADDR          mac address of USRP2 HH:HH [default=first one found]\n");
-  fprintf(stderr, "  -I INPUT_FILE        set input filename [default=stdin]\n");
-  fprintf(stderr, "  -r                   repeat.  When EOF of input file is reached, seek to beginning\n");
-  fprintf(stderr, "  -f FREQ              set frequency to FREQ [default=0]\n");
-  fprintf(stderr, "  -i INTERP            set interpolation rate to INTERP [default=32]\n");
-  fprintf(stderr, "  -g gain              set tx gain\n");
-  fprintf(stderr, "  -S SCALE             fpga scaling factor for I & Q [default=256]\n");
-}
-
-#define GAIN_NOT_SET (-1000)
-#define	MAX_SAMPLES (371)
-
-int
-main(int argc, char **argv)
-{
-  const char *interface = "eth0";
-  const char *input_filename = 0;
-  bool repeat = false;
-  const char *mac_addr_str = "";
-  double freq = 0;
-  int32_t interp = 32;
-  int32_t samples_per_frame = MAX_SAMPLES;
-  int32_t scale = -1;
-  double gain = GAIN_NOT_SET;
-  
-  int    ch;
-  double tmp;
-
-
-  while ((ch = getopt(argc, argv, "he:m:I:rf:i:S:F:g:")) != EOF){
-    switch (ch){
-
-    case 'e':
-      interface = optarg;
-      break;
-      
-    case 'm':
-      mac_addr_str = optarg;
-#if 0
-      if (!usrp2_basic::parse_mac_addr(optarg, &mac_addr)){
-	std::cerr << "invalid mac addr: " << optarg << std::endl;
-	usage(argv[0]);
-	return 1;
-      }
-#endif
-      break;
-
-    case 'I':
-      input_filename = optarg;
-      break;
-      
-    case 'r':
-      repeat = true;
-      break;
-      
-    case 'f':
-      if (!strtod_si(optarg, &freq)){
-	std::cerr << "invalid number: " << optarg << std::endl;
-	usage(argv[0]);
-	return 1;
-      }
-      break;
-
-    case 'F':
-      samples_per_frame = strtol(optarg, 0, 0);
-      break;
-
-    case 'i':
-      interp = strtol(optarg, 0, 0);
-      break;
-
-    case 'g':
-      gain = strtod(optarg, 0);
-      break;
-
-    case 'S':
-      if (!strtod_si(optarg, &tmp)){
-	std::cerr << "invalid number: " << optarg << std::endl;
-	usage(argv[0]);
-	return 1;
-      }
-      scale = static_cast<int32_t>(tmp);
-      break;
-      
-    case 'h':
-    default:
-      usage(argv[0]);
-      return 1;
-    }
-  }
-
-  
-  if (argc - optind != 0){
-    usage(argv[0]);
-    return 1;
-  }
-  
-  if (samples_per_frame < 9 || samples_per_frame > MAX_SAMPLES){
-    std::cerr << prettify_progname(argv[0])
-	      << ": samples_per_frame is out of range.  "
-	      << "Must be in [9, " << MAX_SAMPLES << "].\n";
-    usage(argv[0]);
-    return 1;
-  }
-
-
-  FILE *fp = 0;
-  if (input_filename == 0)
-    fp = stdin;
-  else {
-    fp = fopen(input_filename, "rb");
-    if (fp == 0){
-      perror(input_filename);
-      return 1;
-    }
-  }
-
-  install_sig_handler(SIGINT, sig_handler);
-
-
-  gruel::rt_status_t rt = gruel::enable_realtime_scheduling();
-  if (rt != gruel::RT_OK)
-    std::cerr << "Failed to enable realtime scheduling" << std::endl;
-
-
-  usrp2::usrp2::sptr u2 = usrp2::usrp2::make(interface, mac_addr_str);
-  
-  if (gain != GAIN_NOT_SET){
-    if (!u2->set_tx_gain(gain)){
-      std::cerr << "set_tx_gain failed\n";
-      return 1;
-    }
-  }
-
-  usrp2::tune_result tr;
-  if (!u2->set_tx_center_freq(freq, &tr)){
-    fprintf(stderr, "set_tx_center_freq(%g) failed\n", freq);
-    return 1;
-  }
-
-  printf("Daughterboard configuration:\n");
-  printf("  baseband_freq=%f\n", tr.baseband_freq);
-  printf("       duc_freq=%f\n", tr.dxc_freq);
-  printf("  residual_freq=%f\n", tr.residual_freq);
-  printf("       inverted=%s\n\n", tr.spectrum_inverted ? "yes" : "no");
-
-  if (!u2->set_tx_interp(interp)){
-    fprintf(stderr, "set_tx_interp(%d) failed\n", interp);
-    return 1;
-  }
-
-  if (scale != -1){
-    if (!u2->set_tx_scale_iq(scale, scale)){
-      std::cerr << "set_tx_scale_iq failed\n";
-      return 1;
-    }
-  }
-
-  usrp2::tx_metadata	md;
-  md.timestamp = -1;
-  md.start_of_burst = 1;
-  md.send_now = 1;
-
-  while (!signaled){
-
-    std::complex<int16_t> samples[MAX_SAMPLES];
-
-    int r = fread(samples, sizeof(uint32_t), samples_per_frame, fp);
-
-    // fprintf(stderr, "fread -> %d\n", r);
-    
-    if (r == 0){
-      if (!repeat)
-	break;
-      if (fseek(fp, 0, SEEK_SET) == -1)
-	break;
-    }
-
-    // FIXME if r < 9, pad to 9 for minimum packet size constraint
-
-    if (!u2->tx_16sc(0, samples, r, &md)){
-      fprintf(stderr, "tx_complex_int16 failed\n");
-      break;
-    }
-  }
-
-  return 0;
-}
diff --git a/usrp2/host/apps/usrp2_burn_mac_addr.cc b/usrp2/host/apps/usrp2_burn_mac_addr.cc
deleted file mode 100644
index 6ee76c130..000000000
--- a/usrp2/host/apps/usrp2_burn_mac_addr.cc
+++ /dev/null
@@ -1,176 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <usrp2/usrp2.h>
-#include <iostream>
-#include <getopt.h>
-#include <string.h>
-#include <time.h>
-#include <stdio.h>
-#include <signal.h>
-#include <stdexcept>
-
-
-static volatile bool signaled = false;
-
-static void 
-sig_handler(int sig)
-{
-  signaled = true;
-}
-
-static void
-install_sig_handler(int signum,
-		    void (*new_handler)(int))
-{
-  struct sigaction new_action;
-  memset (&new_action, 0, sizeof (new_action));
-
-  new_action.sa_handler = new_handler;
-  sigemptyset (&new_action.sa_mask);
-  new_action.sa_flags = 0;
-
-  if (sigaction (signum, &new_action, 0) < 0){
-    perror ("sigaction (install new)");
-    throw std::runtime_error ("sigaction");
-  }
-}
-
-
-static void
-usage(const char *progname)
-{
-  fprintf(stderr, "usage: %s [-e ethN] [-m old_mac_addr] new_mac_addr\n",
-	  progname);
-  fprintf(stderr, "  old_mac_addr defaults to 00:50:c2:85:3f:ff\n");
-  fprintf(stderr, "  new_mac_address must be HH:HH or HH:HH:HH:HH:HH:HH\n");
-}
-
-static bool
-check_mac_addr_syntax(const std::string &s)
-{
-  unsigned char addr[6];
-
-  addr[0] = 0x00;		// Matt's IAB
-  addr[1] = 0x50;
-  addr[2] = 0xC2;
-  addr[3] = 0x85;
-  addr[4] = 0x30;
-  addr[5] = 0x00;
-    
-  int len = s.size();
-    
-  switch (len){
-      
-  case 5:
-    return sscanf(s.c_str(), "%hhx:%hhx", &addr[4], &addr[5]) == 2;
-      
-  case 17:
-    return sscanf(s.c_str(), "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-		  &addr[0], &addr[1], &addr[2],
-		  &addr[3], &addr[4], &addr[5]) == 6;
-  default:
-    return false;
-  }
-
-  return true;
-}
-
-
-int
-main(int argc, char **argv)
-{
-  int ch;
-  const char *interface = "eth0";
-  const char *old_mac_addr = "00:50:c2:85:3f:ff";
-  const char *new_mac_addr = 0;
-
-  while ((ch = getopt(argc, argv, "he:m:")) != EOF){
-    switch (ch){
-    case 'e':
-      interface = optarg;
-      break;
-      
-    case 'm':
-      old_mac_addr = optarg;
-      break;
-      
-    case 'h':
-    default:
-      usage(argv[0]);
-      exit(1);
-    }
-  }
-
-  if (argc - optind != 1){
-    usage(argv[0]);
-    exit(1);
-  }
-
-  new_mac_addr = argv[optind];
-
-  if (!check_mac_addr_syntax(old_mac_addr)){
-    fprintf(stderr, "invalid mac address: %s\n", old_mac_addr);
-    exit(1);
-  }
-  if (!check_mac_addr_syntax(new_mac_addr)){
-    fprintf(stderr, "invalid mac address: %s\n", new_mac_addr);
-    exit(1);
-  }
-  
-  install_sig_handler(SIGINT, sig_handler);
-
-  usrp2::usrp2::sptr u2;
-
-  try {
-    u2 = usrp2::usrp2::make(interface, old_mac_addr);
-  }
-  catch (std::exception const &e){
-    std::cerr << e.what() << std::endl;
-    return 1;
-  }
-
-  if (!u2->burn_mac_addr(new_mac_addr)){
-    std::cerr << "Failed to burn mac address: "
-	      << new_mac_addr << std::endl;
-    return 1;
-  }
-
-  u2.reset();	// close
-
-  // wait 250 ms
-  struct timespec ts;
-  ts.tv_sec = 0;
-  ts.tv_nsec = 250000000;
-  nanosleep(&ts, 0);
-
-  try {
-    u2 = usrp2::usrp2::make(interface, new_mac_addr);
-  }
-  catch (std::exception const &e){
-    std::cerr << "Failed to connect to USRP2 using new addr: "
-	      << new_mac_addr << std::endl;
-    std::cerr << e.what() << std::endl;
-    return 1;
-  }
-
-  return 0;
-}
diff --git a/usrp2/host/include/.gitignore b/usrp2/host/include/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/usrp2/host/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/usrp2/host/include/Makefile.am b/usrp2/host/include/Makefile.am
deleted file mode 100644
index e2f7282b1..000000000
--- a/usrp2/host/include/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = usrp2
diff --git a/usrp2/host/include/usrp2/.gitignore b/usrp2/host/include/usrp2/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/usrp2/host/include/usrp2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/usrp2/host/include/usrp2/Makefile.am b/usrp2/host/include/usrp2/Makefile.am
deleted file mode 100644
index 08fdcde33..000000000
--- a/usrp2/host/include/usrp2/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright 2008 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-include $(top_srcdir)/Makefile.common
-
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES)
-
-usrp2includedir = $(includedir)/usrp2
-
-usrp2include_HEADERS = \
-	copiers.h \
-	copy_handler.h \
-        data_handler.h \
-	metadata.h \
-	mimo_config.h \
-	rx_nop_handler.h \
-	rx_sample_handler.h \
-	strtod_si.h \
-	tune_result.h \
-	usrp2.h \
-	usrp2_cdefs.h
diff --git a/usrp2/host/include/usrp2/copiers.h b/usrp2/host/include/usrp2/copiers.h
deleted file mode 100644
index e98126f65..000000000
--- a/usrp2/host/include/usrp2/copiers.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_USRP2_COPIERS_H
-#define INCLUDED_USRP2_COPIERS_H
-
-#include <complex>
-#include <stdint.h>
-
-namespace usrp2 {
-
-  // FIXME we may want to rework this, but this will get us on the air
-
-  /*
-   * ----------------------------------------------------------------
-   * Copy and convert from USRP2 wire format to host format
-   * ----------------------------------------------------------------
-   */
-
-  void 
-  copy_u2_16sc_to_host_16sc(size_t nitems,
-			    const uint32_t *items,
-			    std::complex<int16_t> *host_items);
-
-  void 
-  copy_u2_16sc_to_host_32fc(size_t nitems,
-			    const uint32_t *items,
-			    std::complex<float> *host_items);
-
-  /*
-   * ----------------------------------------------------------------
-   * Copy and convert from host format to USRP2 wire format
-   * ----------------------------------------------------------------
-   */
-
-  void 
-  copy_host_16sc_to_u2_16sc(size_t nitems,
-			    const std::complex<int16_t> *host_items,
-			    uint32_t *items);
-
-  void 
-  copy_host_32fc_to_u2_16sc(size_t nitems,
-			    const std::complex<float> *host_items,
-			    uint32_t *items);
-}
-
-
-#endif /* INCLUDED_USRP2_COPIERS_H */
diff --git a/usrp2/host/include/usrp2/copy_handler.h b/usrp2/host/include/usrp2/copy_handler.h
deleted file mode 100644
index aef14cac8..000000000
--- a/usrp2/host/include/usrp2/copy_handler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_COPY_HANDLER_H
-#define INCLUDED_COPY_HANDLER_H
-
-#include <usrp2/data_handler.h>
-#include <boost/utility.hpp>
-
-namespace usrp2 {
-
-  class copy_handler : public data_handler, boost::noncopyable 
-  {
-    uint8_t *d_dest;      // next write pointer
-    size_t   d_space;     // space left in destination buffer
-    size_t   d_bytes;     // total bytes copied
-    size_t   d_times;     // number of times invoked
-
-  public:
-    copy_handler(void *dest, size_t len);
-    ~copy_handler();
- 
-    virtual data_handler::result operator()(const void *base, size_t len);
-
-    size_t bytes() const { return d_bytes; }
-    size_t times() const { return d_times; }
-
-    static const size_t MIN_COPY_LEN = 1484; // FIXME: calculate eth packet - thdr
-    bool full() const { return d_space < MIN_COPY_LEN; }
-  };
-    
-} // namespace usrp2
-
-#endif /* INCLUDED_COPY_HANDLER_H */
diff --git a/usrp2/host/include/usrp2/data_handler.h b/usrp2/host/include/usrp2/data_handler.h
deleted file mode 100644
index 7317b38af..000000000
--- a/usrp2/host/include/usrp2/data_handler.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_DATA_HANDLER_H
-#define INCLUDED_DATA_HANDLER_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-namespace usrp2 {
-
-  /*!
-   * \brief Abstract function object called to handle received data blocks.
-   */
-  class data_handler 
-  {
-  public:
-
-    enum result_bits {
-      RELEASE	= 0x0000,	//< OK to release data (opposite of KEEP)
-      KEEP	= 0x0001,	//< do not discard data
-      DONE	= 0x0002,    	//< do not call this object again
-    };
-    
-    typedef int result;		//< bitmask of result_bits
-
-    /*!
-     * \param base points to the beginning of the data
-     * \param len is the length in bytes of the data
-     * \returns bitmask composed of DONE, KEEP
-     */
-    virtual result operator()(const void *base, size_t len) = 0;
-    virtual ~data_handler();
-  };
-
-} // namespace usrp2
-
-#endif /* INCLUDED_DATA_HANDLER_H */
diff --git a/usrp2/host/include/usrp2/metadata.h b/usrp2/host/include/usrp2/metadata.h
deleted file mode 100644
index 8a95c3859..000000000
--- a/usrp2/host/include/usrp2/metadata.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_USRP2_METADATA_H
-#define INCLUDED_USRP2_METADATA_H
-
-#include <stdint.h>
-
-namespace usrp2 {
-
-  //! type of the timestamp returned from the USRP2 FPGA
-  typedef uint32_t	fpga_timestamp;
-
-  /*!
-   * \brief metadata associated with received frames
-   * \ingroup usrp2
-   */
-  struct rx_metadata {
-    uint32_t		word0;			//< debugging, extensions
-    fpga_timestamp	timestamp;		//< time that first sample of frame was received
-    unsigned int	start_of_burst : 1;	//< this frame is the start of a burst
-    unsigned int	end_of_burst   : 1;	//< this frame is the end of a burst
-    unsigned int	rx_overrun     : 1;	//< An Rx overrun occurred in the FPGA
-    // rssi
-    // agc_mode
-
-    rx_metadata() :
-      word0(0), timestamp(0), start_of_burst(0), end_of_burst(0), rx_overrun(0) {}
-  };
-
-  /*!
-   * \brief metadata associated with transmitted frames
-   * \ingroup usrp2
-   */
-  struct tx_metadata {
-    fpga_timestamp	timestamp;		//< time to transmit first sample of frame
-    unsigned int	send_now       : 1;	//< ignore timestamp, send now
-    unsigned int	start_of_burst : 1;	//< this frame is the start of a burst
-    unsigned int	end_of_burst   : 1;	//< this frame is the end of a burst
-    // ...
-
-    tx_metadata() :
-      timestamp(0), send_now(0), start_of_burst(0), end_of_burst(0) {}
-  };
-
-}; // usrp2
-
-#endif /* INCLUDED_USRP2_METADATA_H */
diff --git a/usrp2/host/include/usrp2/mimo_config.h b/usrp2/host/include/usrp2/mimo_config.h
deleted file mode 100644
index a1e038f74..000000000
--- a/usrp2/host/include/usrp2/mimo_config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- c -*- */
-/*
- * Copyright 2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_USRP2_MIMO_CONFIG_H
-#define INCLUDED_USRP2_MIMO_CONFIG_H
-
-// FIXME: This duplicates the firmware usrp2_mimo_config.h file
-
-namespace usrp2 {
-
-  static const int _MC_WE_LOCK		= 0x0001;
-  static const int _MC_MIMO_CLK_INPUT	= 0x0002;		// else SMA input
-  
-  /*
-   * Derived masks (use these):
-   *
-   * We get our input from 1 of three places:
-   *  Our free running oscilator, our SMA connector, or from the MIMO connector
-   */
-  static const int MC_WE_DONT_LOCK	= 0x0000;
-  static const int MC_WE_LOCK_TO_SMA	= (_MC_WE_LOCK | 0);
-  static const int MC_WE_LOCK_TO_MIMO	= (_MC_WE_LOCK | _MC_MIMO_CLK_INPUT);
-  
-  /*
-   * Independent of the source of the clock, we may or may not drive our
-   * clock onto the mimo connector.  Note that there are dedicated clock
-   * signals in each direction, so disaster doesn't occurs if we're
-   * unnecessarily providing clock.
-   */
-  static const int MC_PROVIDE_CLK_TO_MIMO = 0x0004;
-}
-
-#endif /* INCLUDED_USRP2_MIMO_CONFIG_H */
diff --git a/usrp2/host/include/usrp2/rx_nop_handler.h b/usrp2/host/include/usrp2/rx_nop_handler.h
deleted file mode 100644
index 68a254f31..000000000
--- a/usrp2/host/include/usrp2/rx_nop_handler.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_RX_NOP_HANDLER_H
-#define INCLUDED_RX_NOP_HANDLER_H
-
-#include <usrp2/rx_sample_handler.h>
-#include <boost/shared_ptr.hpp>
-
-/*!
- * \ingroup usrp2
- *
- * Base class for receive handlers that must copy into potentially limited
- * range destination buffers.
- *
- * Maintains counters for number of items copied, times invoked, and test
- * for whether maximum has been reached.
- *
- * Derived classes should override the () operator, but call this
- * parent class method at some point at the start of their own operations.
- */ 
-
-namespace usrp2 {
-
-  class rx_nop_handler : public rx_sample_handler
-  {
-    uint64_t	d_max_samples;
-    uint64_t    d_max_quantum;
-    uint64_t	d_nsamples;
-    uint64_t	d_nframes;
-    
-  protected:
-    bool        d_err;
-    
-  public:
-    
-    // Shared pointer to an instance of this class
-    typedef boost::shared_ptr<rx_nop_handler> sptr;
-
-    /*!
-     * Constructor
-     *
-     * \param max_samples  Maximum number of samples to copy. Use zero for no maximum.
-     * \param max_quantum  Maximum number of samples required to accept in one call.
-     *                     Use 0 to indicate no maximum.
-     */
-    rx_nop_handler(uint64_t max_samples, uint64_t max_quantum=0)
-      : d_max_samples(max_samples), d_max_quantum(max_quantum), 
-        d_nsamples(0), d_nframes(0), d_err(false) {}
-      
-    /*!
-     * Destructor.  Derived classes must implement their own, non-inline destructor.
-     */
-    virtual ~rx_nop_handler();
-      
-    /*!
-     * \brief Returns number of frames this copier was called with
-     */
-    uint64_t nframes() const { return d_nframes; }
-
-    /*!
-     * \brief Returns actual number of samples copied
-     */
-    uint64_t nsamples() const { return d_nsamples; }
-
-    /*!
-     * \brief Returns maximum number of samples that will be copied
-     */
-    uint64_t max_samples() const { return d_max_samples; }
-
-    /*!
-     * Returns true if an error has occurred. Derived classes must set d_err to true
-     * when an error occurs in the () operator
-     */
-    bool has_errored_p() const { return d_err; }
-
-    /*!
-     * \brief Returns true if this instance has reached the maximum number of samples
-     */
-    bool has_finished_p() const 
-    { return d_max_samples == 0 ? false : d_nsamples >= d_max_samples-d_max_quantum; }
-      
-
-    /*!
-     * Function operator invoked by USRP2 RX API. Derived classes must override this method
-     * but then invoke it at the start of their processing.  This operator will always be
-     * called at least once.
-     *
-     * \param items points to the first 32-bit word of uninterpreted sample data in the frame.
-     * \param nitems is the number of entries in the frame in units of uint32_t's.
-     * \param metadata is the additional per frame data provided by the USRP2 FPGA.
-     *
-     * \p items points to the raw sample data received off of the ethernet.  The data is
-     * packed into big-endian 32-bit unsigned ints for transport, but the actual format
-     * of the data is dependent on the current configuration of the USRP2.  The most common
-     * format is 16-bit I & Q, with I in the top of the 32-bit word.
-     *
-     * \returns true if the object wants to be called again with new data;
-     * false if no additional data is wanted.
-     */
-    virtual bool operator()(const uint32_t *items, size_t nitems, const rx_metadata *metadata)
-    {
-      // printf("W0: %08x  TS: %08x\n", metadata->word0, metadata->timestamp);
-      // printf("I0: %08x\n", items[0]);
-      
-      d_nsamples += nitems;
-      d_nframes++;
-      
-      return !has_finished_p();
-    }
-  };
-  
-} /* namespace usrp2 */
-
-#endif /* INCLUDED_RX_NOP_HANDLER */
diff --git a/usrp2/host/include/usrp2/rx_sample_handler.h b/usrp2/host/include/usrp2/rx_sample_handler.h
deleted file mode 100644
index a7fb7b641..000000000
--- a/usrp2/host/include/usrp2/rx_sample_handler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_USRP2_RX_SAMPLE_HANDLER_H
-#define INCLUDED_USRP2_RX_SAMPLE_HANDLER_H
-
-#include <usrp2/metadata.h>
-#include <stddef.h>
-
-
-namespace usrp2 {
-
-  /*!
-   * \brief Abstract function object called to handle received data blocks.
-   * \ingroup usrp2
-   *
-   * An object derived from this class is passed to usrp2::rx_samples
-   * to process the received frames of samples.
-   */
-  class rx_sample_handler {
-  public:
-    virtual ~rx_sample_handler();
-
-    /*!
-     * \param items points to the first 32-bit word of uninterpreted sample data in the frame.
-     * \param nitems is the number of entries in the frame in units of uint32_t's.
-     * \param metadata is the additional per frame data provided by the USRP2 FPGA.
-     *
-     * \p items points to the raw sample data received off of the ethernet.  The data is
-     * packed into big-endian 32-bit unsigned ints for transport, but the actual format
-     * of the data is dependent on the current configuration of the USRP2.  The most common
-     * format is 16-bit I & Q, with I in the top of the 32-bit word.
-     *
-     * This is the general purpose, low level interface and relies on other functions
-     * to handle all required endian-swapping and format conversion.  \sa FIXME.
-     *
-     * \returns true if the object wants to be called again with new data;
-     * false if no additional data is wanted.
-     */
-    virtual bool operator()(const uint32_t *items, size_t nitems, const rx_metadata *metadata) = 0;
-  };
-
-};
-
-#endif /* INCLUDED_RX_SAMPLE_HANDLER_H */
diff --git a/usrp2/host/include/usrp2/strtod_si.h b/usrp2/host/include/usrp2/strtod_si.h
deleted file mode 100644
index 0a0f5a62c..000000000
--- a/usrp2/host/include/usrp2/strtod_si.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_STRTOD_SI_H
-#define INCLUDED_STRTOD_SI_H
-
-#include "usrp2_cdefs.h"
-__U2_BEGIN_DECLS
-
-
-/*!
- * \brief convert string at s to double honoring any trailing SI suffixes
- *
- * \param[in]  s is the string to convert
- * \param[out] result is the converted value
- * \returns non-zero iff conversion was successful.
- */
-int strtod_si(const char *s, double *result);
-
-__U2_END_DECLS
-
-
-#endif /* INCLUDED_STRTOD_SI_H */
-
diff --git a/usrp2/host/include/usrp2/tune_result.h b/usrp2/host/include/usrp2/tune_result.h
deleted file mode 100644
index 9fe6539da..000000000
--- a/usrp2/host/include/usrp2/tune_result.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_USRP2_TUNE_RESULT_H
-#define INCLUDED_USRP2_TUNE_RESULT_H
-
-namespace usrp2 {
-
-  /*
-   * \ingroup usrp2
-   */
-  class tune_result
-  {
-  public:
-    // RF frequency that corresponds to DC in the IF
-    double baseband_freq;
-
-    // frequency programmed into the DDC/DUC
-    double dxc_freq;
-
-    // residual frequency (typically < 0.01 Hz)
-    double residual_freq;
-
-    // is the spectrum inverted?
-    bool spectrum_inverted;
-
-    tune_result(double baseband=0, double dxc=0, double residual=0, bool inverted=false)
-      : baseband_freq(baseband), dxc_freq(dxc),
-	residual_freq(residual), spectrum_inverted(inverted) {}
-  };
-
-} // namespace usrp2
-
-#endif /* INCLUDED_USRP2_TUNE_RESULT_H */
diff --git a/usrp2/host/include/usrp2/usrp2.h b/usrp2/host/include/usrp2/usrp2.h
deleted file mode 100644
index e29caa33d..000000000
--- a/usrp2/host/include/usrp2/usrp2.h
+++ /dev/null
@@ -1,632 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_USRP2_H
-#define INCLUDED_USRP2_H
-
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
-#include <boost/bind.hpp>
-#include <vector>
-#include <complex>
-#include <usrp2/rx_sample_handler.h>
-#include <usrp2/tune_result.h>
-#include <usrp2/mimo_config.h>
-
-/*
- * N.B., The interfaces described here are still in flux.
- *
- * We will keep all the code in the tree up-to-date with regard to changes
- * here, but reserve the right to change this on a whim.
- */
-
-namespace usrp2 {
-
-  /*!
-   * Structure to hold properties of USRP2 hardware devices.
-   *
-   */
-  struct props
-  {
-    std::string addr;
-    uint16_t hw_rev;
-    uint8_t fpga_md5sum[16];
-    uint8_t sw_md5sum[16];
-  };
-
-  typedef std::vector<props> props_vector_t;
-
-  /*!
-   * \brief Search the ethernet for all USRP2s or for a specific USRP2.
-   *
-   * \param ifc is the name of the OS ethernet interface (e.g., "eth0")
-   * \param mac_addr is the MAC address of the desired USRP2, or "" to search for all.
-   * mac_addr must be either a zero length string, "", or must be of the form
-   * "01:02:03:04:05:06" or "05:06".
-   *
-   * \returns a vector of properties, 1 entry for each matching USRP2 found.
-   */
-  props_vector_t find(const std::string &ifc, const std::string &mac_addr="");
-
-  class tune_result;
-
-  // FIXME: get from firmware include
-  static const int GPIO_TX_BANK = 0;
-  static const int GPIO_RX_BANK = 1;
-
-  /*!
-   * \brief standard C++ interface to USRP2
-   * \ingroup usrp2
-   */
-  class usrp2 : boost::noncopyable
-  {
-  public:
-    static const unsigned int MAX_CHAN = 30;
-
-    /*!
-     * Shared pointer to this class
-     */
-    typedef boost::shared_ptr<usrp2> sptr;
-
-    /*!
-     * Static function to return an instance of usrp2 as a shared pointer
-     *
-     * \param ifc   Network interface name, e.g., "eth0"
-     * \param addr  Network mac address, e.g., "01:23:45:67:89:ab", "89:ab" or "".
-     *              If \p addr is HH:HH, it's treated as if it were 00:50:c2:85:HH:HH
-     *              "" will autoselect a USRP2 if there is only a single one on the local ethernet.
-     * \param rx_bufsize is the length in bytes of the kernel networking buffer to allocate.
-     */
-    static sptr make(const std::string &ifc, const std::string &addr="", size_t rx_bufsize=0);
-
-    /*!
-     * Class destructor
-     */
-    ~usrp2();
-
-    /*!
-     * Returns the MAC address associated with this USRP
-     */
-    std::string mac_addr();
-
-    /*!
-     * Returns the GbE interface name associated with this USRP
-     */
-    std::string interface_name();
-
-    /*
-     * ----------------------------------------------------------------
-     * Rx configuration and control
-     * ----------------------------------------------------------------
-     */
-
-    /*!
-     * Set the rx antenna
-     */
-    bool set_rx_antenna(int ant);
-
-    /*!
-     * Set receiver gain
-     * \param gain in dB (more or less)
-     */
-    bool set_rx_gain(double gain);
-
-    //! return minimum Rx gain
-    double rx_gain_min();
-
-    //! return maximum Rx gain
-    double rx_gain_max();
-
-    //! return Rx gain db_per_step
-    double rx_gain_db_per_step();
-
-    /*!
-     * \brief Set receive daughterboard LO offset frequency
-     */
-    bool set_rx_lo_offset(double frequency);
-
-    /*!
-     * Set receiver center frequency
-     */
-    bool set_rx_center_freq(double frequency, tune_result *result);
-
-    //! return minimum Rx center frequency
-    double rx_freq_min();
-
-    //! return maximum Rx center frequency
-    double rx_freq_max();
-
-    /*!
-     * Set receiver sample rate decimation
-     */
-    bool set_rx_decim(int decimation_factor);
-
-    //! Return current decimation factor
-    int rx_decim();
-
-    /*!
-     * Set receiver IQ magnitude scaling
-     */
-    bool set_rx_scale_iq(int scale_i, int scale_q);
-
-    /*!
-     * Set received sample format
-     *
-     *    domain: complex or real
-     *      type: floating, fixed point, or raw
-     *     depth: bits per sample
-     *
-     * Sets format over the wire for samples from USRP2.
-     */
-    // bool set_rx_format(...);
-
-    /*!
-     * Start streaming receive mode.  USRP2 will send a continuous stream of
-     * DSP pipeline samples to host.  Call rx_samples(...) to access.
-     *
-     * \param channel          Stream channel number (0-30)
-     * \param items_per_frame  Number of 32-bit items per frame.
-     */
-    bool start_rx_streaming(unsigned int channel=0, unsigned int items_per_frame=0);
-
-    /*!
-     * Start streaming receive mode at specified timestamp. USRP2 will send a
-     * continuous stream of DSP pipeline samples to host. Call rx_samples(...)
-     * to access.
-     *
-     * \param channel          Stream channel number (0-30)
-     * \param items_per_frame  Number of 32-bit items per frame.
-     * \param time             Timestamp to start streaming at
-     */
-    bool start_rx_streaming_at(unsigned int channel=0, unsigned int items_per_frame=0, unsigned int time=0);
-
-    /*!
-     * Sync to PPS and start streaming receive mode at specified timestamp.
-     * Just like calling sync_to_pps() and start_rx_streaming_at().
-     *
-     * \param channel          Stream channel number (0-30)
-     * \param items_per_frame  Number of 32-bit items per frame.
-     * \param time             Timestamp to start streaming at
-     */
-    bool sync_and_start_rx_streaming_at(unsigned int channel=0, unsigned int items_per_frame=0, uint32_t time=0);
-
-    /*!
-     * Stop streaming receive mode.
-     */
-    bool stop_rx_streaming(unsigned int channel=0);
-
-    /*!
-     * \brief Receive data from the specified channel
-     * This method is used to receive all data: streaming or discrete.
-     */
-    bool rx_samples(unsigned int channel, rx_sample_handler *handler);
-
-    /*!
-     * Returns number of times receive overruns have occurred
-     */
-    unsigned int rx_overruns();
-
-    /*!
-     * Returns total number of missing frames from overruns.
-     */
-    unsigned int rx_missing();
-
-    /*
-     * ----------------------------------------------------------------
-     * Tx configuration and control
-     * ----------------------------------------------------------------
-     */
-
-    /*!
-     * Set the tx antenna
-     */
-    bool set_tx_antenna(int ant);
-
-    /*!
-     * Set transmitter gain
-     */
-    bool set_tx_gain(double gain);
-
-    //! return minimum Tx gain
-    double tx_gain_min();
-
-    //! return maximum Tx gain
-    double tx_gain_max();
-
-    //! return Tx gain db_per_step
-    double tx_gain_db_per_step();
-
-    /*
-     * \brief Set transmit daughterboard LO offset frequency
-     */
-    bool set_tx_lo_offset(double frequency);
-
-    /*!
-     * Set transmitter center frequency
-     */
-    bool set_tx_center_freq(double frequency, tune_result *result);
-
-    //! return minimum Tx center frequency
-    double tx_freq_min();
-
-    //! return maximum Tx center frequency
-    double tx_freq_max();
-
-    /*!
-     * Set transmitter sample rate interpolation
-     */
-    bool set_tx_interp(int interpolation_factor);
-
-    //! Return current interpolation factor
-    int tx_interp();
-
-    /*
-     * \brief Calculate default scale_iq for given interpolation rate
-     */
-    void default_tx_scale_iq(int interpolation_factor, int *scale_i, int *scale_q);
-
-    /*!
-     * Set transmit IQ magnitude scaling
-     */
-    bool set_tx_scale_iq(int scale_i, int scale_q);
-
-    /*!
-     * Set transmit sample format
-     *
-     *    domain: complex or real
-     *      type: floating, fixed point, or raw
-     *     depth: bits per sample
-     *
-     * Sets format over the wire for samples to USRP2.
-     */
-    // bool set_tx_format(...);
-
-    /*!
-     * \brief transmit complex<float> samples to USRP2
-     *
-     * \param channel specifies the channel to send them to
-     * \param samples are the samples to transmit.  They should be in the range [-1.0, +1.0]
-     * \param nsamples is the number of samples to transmit
-     * \param metadata provides the timestamp and flags
-     *
-     * The complex<float> samples are converted to the appropriate
-     * "on the wire" representation, depending on the current USRP2
-     * configuration.  Typically, this is big-endian 16-bit I & Q.
-     */
-    bool tx_32fc(unsigned int channel,
-		 const std::complex<float> *samples,
-		 size_t nsamples,
-		 const tx_metadata *metadata);
-
-    /*!
-     * \brief transmit complex<int16_t> samples to USRP2
-     *
-     * \param channel specifies the channel to send them to
-     * \param samples are the samples to transmit
-     * \param nsamples is the number of samples to transmit
-     * \param metadata provides the timestamp and flags
-     *
-     * The complex<int16_t> samples are converted to the appropriate
-     * "on the wire" representation, depending on the current USRP2
-     * configuration.  Typically, this is big-endian 16-bit I & Q.
-     */
-    bool tx_16sc(unsigned int channel,
-		 const std::complex<int16_t> *samples,
-		 size_t nsamples,
-		 const tx_metadata *metadata);
-
-    /*!
-     * \brief transmit raw uint32_t data items to USRP2
-     *
-     * The caller is responsible for ensuring that the items are
-     * formatted appropriately for the USRP2 and its configuration.
-     * This method is used primarily by the system itself.  Users
-     * should call tx_32fc or tx_16sc instead.
-     *
-     * \param channel specifies the channel to send them to
-     * \param items are the data items to transmit
-     * \param nitems is the number of items to transmit
-     * \param metadata provides the timestamp and flags
-     */
-    bool tx_raw(unsigned int channel,
-		const uint32_t *items,
-		size_t nitems,
-		const tx_metadata *metadata);
-
-    /*
-     * ----------------------------------------------------------------
-     *  miscellaneous methods
-     * ----------------------------------------------------------------
-     */
-
-    /*!
-     * \brief MIMO configuration
-     *
-     * \param flags from usrp2_mimo_config.h
-     *
-     * <pre>
-     *   one of these:
-     *
-     *     MC_WE_DONT_LOCK
-     *     MC_WE_LOCK_TO_SMA
-     *     MC_WE_LOCK_TO_MIMO
-     *
-     *   and optionally this:
-     *
-     *     MC_PROVIDE_CLK_TO_MIMO
-     * </pre>
-     */
-    bool config_mimo(int flags);
-
-
-    //! Get frequency of master oscillator in Hz
-    bool fpga_master_clock_freq(long *freq);
-
-    // Get Sampling rate of A/D converter in Hz
-    bool adc_rate(long *rate);
-
-    // Get Sampling rate of D/A converter in Hz
-    bool dac_rate(long *rate);
-
-    /*!
-     * \brief Get Tx daughterboard ID
-     *
-     * \param[out] dbid returns the daughterboard id.
-     *
-     * daughterboard id >= 0 if successful, -1 if no daugherboard installed,
-     * -2 if invalid EEPROM on daughterboard.
-     */
-    bool tx_daughterboard_id(int *dbid);
-
-    /*!
-     * \brief Get Rx daughterboard ID
-     *
-     * \param[out] dbid returns the daughterboard id.
-     *
-     * daughterboard id >= 0 if successful, -1 if no daugherboard installed,
-     * -2 if invalid EEPROM on daughterboard.
-     */
-    bool rx_daughterboard_id(int *dbid);
-
-    /*
-     * ----------------------------------------------------------------
-     *  Low level methods
-     * ----------------------------------------------------------------
-     */
-
-    /*!
-     * Burn new mac address into EEPROM on USRP2
-     *
-     * \param new_addr  Network mac address, e.g., "01:23:45:67:89:ab" or "89:ab".
-     *                  If \p addr is HH:HH, it's treated as if it were 00:50:c2:85:HH:HH
-     */
-    bool burn_mac_addr(const std::string &new_addr);
-
-    /*!
-     * Reset master time to 0 at next PPS edge
-     */
-    bool sync_to_pps();
-
-    /*!
-     * Reset master time to 0 at every PPS edge
-     */
-    bool sync_every_pps(bool enable);
-
-    /*!
-     * Read memory from Wishbone bus as 32-bit words.  Handles endian swapping if needed.
-     *
-     * \param addr      32-bit aligned address.  Only the lower 16-bits are significant.
-     * \param words     Number of 32-bit words
-     *
-     * \returns         Vector of 32-bit read values
-     *
-     * WARNING: Attempts to read memory from addresses that do not correspond to RAM or
-     * memory-mapped peripherals may cause the USRP2 to hang, requiring a power cycle.
-     *
-     */
-    std::vector<uint32_t> peek32(uint32_t addr, uint32_t words);
-
-    /*!
-     * Write memory to Wishbone bus as 32-bit words.  Handles endian swapping if needed.
-     *
-     * \param addr      32-bit aligned address.  Only the lower 16-bits are significant
-     * \param data      Vector of 32-bit values to write.
-     *
-     * \returns true iff successful
-     *
-     * WARNING: Attempts to read memory from addresses that do not correspond to RAM or
-     * memory-mapped peripherals may cause the USRP2 to hang, requiring a power cycle.
-     *
-     */
-    bool poke32(uint32_t addr, const std::vector<uint32_t> &data);
-
-    /*!
-     * Set daughterboard GPIO data direction register.
-     *
-     * \param bank      GPIO_TX_BANK or GPIO_RX_BANK
-     * \param value     16-bits, 0=FPGA input, 1=FPGA output
-     * \param mask      16-bits, 0=ignore, 1=set
-     *
-     * \returns true iff successful
-     *
-     * WARNING: Improper usage of this function may result in damage to the USRP2
-     *
-     */
-    bool set_gpio_ddr(int bank, uint16_t value, uint16_t mask);
-
-    /*!
-     * Set daughterboard GPIO output selection register.  For those GPIO pins that
-     * are configured as outputs in the DDR, this settings configures the source
-     * of the pin value.
-     *
-     * \param bank      GPIO_TX_BANK or GPIO_RX_BANK
-     * \param sels      Exactly 16 character MSB->LSB string. For each position:
-     *                    '.' = ignore this bit, i.e., leave current value
-     *                    'a' = Output ATR value
-     *                    's' = Output host software controlled value
-     *                    '0' = Output FPGA debug bus 0 value
-     *                    '1' = Output FPGA debug bus 1 value
-     *
-     * \returns true iff successful
-     *
-     * WARNING: Improper usage of this function may result in damage to the USRP2
-     *
-     */
-    bool set_gpio_sels(int bank, std::string sels);
-
-    /*!
-     * Set daughterboard GPIO pin values.
-     *
-     * \param bank     GPIO_TX_BANK or GPIO_RX_BANK
-     * \param value    16 bits, 0=low, 1=high
-     * \param mask     16 bits, 0=ignore, 1=set
-     *
-     * \returns true iff successful
-     *
-     * WARNING: Improper usage of this function may result in damage to the USRP2
-     *
-     */
-    bool write_gpio(int bank, uint16_t value, uint16_t mask);
-
-    /*!
-     * Read daughterboard GPIO pin values
-     *
-     * \param bank     GPIO_TX_BANK or GPIO_RX_BANK
-     * \param value    pointer to uint16_t to hold read results
-     *
-     * \returns true iff successful
-     *
-     */
-    bool read_gpio(int bank, uint16_t *value);
-
-    /*!
-     * Set GPIO streaming mode
-     *
-     * Individually enables streaming GPIO pins through LSBs of DSP
-     * samples.
-     *
-     * On receive, io_rx[15] replaces I[0], io_rx[14] replaces Q[0]
-     * On transmit, I[0] maps to io_tx[15], Q[0] maps to io_tx[14]
-     * (Transmit streaming is not yet implemented.)
-     *
-     * The selected GPIO pins must have been set as inputs or outputs
-     * and, for transmit, set to software control.
-     *
-     * When enabled, the replaced DSP sample LSBs become 0.
-     *
-     * \param bank     GPIO_TX_BANK or GPIO_RX_BANK
-     * \param enable   enable[0] controls I channel LSB
-     *                 enable[1] controls Q channel LSB
-     *
-     * \returns true iff successful
-     *
-     * WARNING: Improper usage of this function may result in damage to the USRP2
-     *
-     */
-    bool enable_gpio_streaming(int bank, int enable);
-
-#if 0	// not yet implemented
-    /*!
-     * \brief Write EEPROM on motherboard or any daughterboard.
-     * \param i2c_addr		I2C bus address of EEPROM
-     * \param eeprom_offset	byte offset in EEPROM to begin writing
-     * \param buf		the data to write
-     * \returns true iff sucessful
-     */
-    bool write_eeprom (int i2c_addr, int eeprom_offset, const std::string &buf);
-
-    /*!
-     * \brief Read EEPROM on motherboard or any daughterboard.
-     * \param i2c_addr		I2C bus address of EEPROM
-     * \param eeprom_offset	byte offset in EEPROM to begin reading
-     * \param len		number of bytes to read
-     * \returns the data read if successful, else a zero length string.
-     */
-    std::string read_eeprom (int i2c_addr, int eeprom_offset, int len);
-
-    /*!
-     * \brief Write to I2C peripheral
-     * \param i2c_addr		I2C bus address (7-bits)
-     * \param buf		the data to write
-     * \returns true iff successful
-     * Writes are limited to a maximum of of 64 bytes.
-     */
-    bool write_i2c (int i2c_addr, const std::string &buf);
-
-    /*!
-     * \brief Read from I2C peripheral
-     * \param i2c_addr		I2C bus address (7-bits)
-     * \param len		number of bytes to read
-     * \returns the data read if successful, else a zero length string.
-     * Reads are limited to a maximum of 64 bytes.
-     */
-    std::string read_i2c (int i2c_addr, int len);
-
-    /*!
-     * \brief Write data to SPI bus peripheral.
-     *
-     * \param optional_header	0,1 or 2 bytes to write before buf.
-     * \param enables		bitmask of peripherals to write. See usrp_spi_defs.h
-     * \param format		transaction format.  See usrp_spi_defs.h SPI_FMT_*
-     * \param buf		the data to write
-     * \returns true iff successful
-     * Writes are limited to a maximum of 64 bytes.
-     *
-     * If \p format specifies that optional_header bytes are present, they are
-     * written to the peripheral immediately prior to writing \p buf.
-     */
-    bool write_spi (int optional_header, int enables, int format, const std::string &buf);
-
-    /*
-     * \brief Read data from SPI bus peripheral.
-     *
-     * \param optional_header	0,1 or 2 bytes to write before buf.
-     * \param enables		bitmask of peripheral to read. See usrp_spi_defs.h
-     * \param format		transaction format.  See usrp_spi_defs.h SPI_FMT_*
-     * \param len		number of bytes to read.  Must be in [0,64].
-     * \returns the data read if sucessful, else a zero length string.
-     *
-     * Reads are limited to a maximum of 64 bytes.
-     *
-     * If \p format specifies that optional_header bytes are present, they
-     * are written to the peripheral first.  Then \p len bytes are read from
-     * the peripheral and returned.
-     */
-    std::string read_spi (int optional_header, int enables, int format, int len);
-#endif
-
-
-    class impl;		// implementation details
-
-  private:
-    // Static function to retrieve or create usrp2 instance
-    static sptr find_existing_or_make_new(const std::string &ifc, props *p, size_t rx_bufsize);
-
-    // Only class members can instantiate this class
-    usrp2(const std::string &ifc, props *p, size_t rx_bufsize);
-
-    // All private state is held in opaque pointer
-    std::auto_ptr<impl> d_impl;
-  };
-
-};
-
-std::ostream& operator<<(std::ostream &os, const usrp2::props &x);
-
-
-#endif /* INCLUDED_USRP2_H */
diff --git a/usrp2/host/include/usrp2/usrp2_cdefs.h b/usrp2/host/include/usrp2/usrp2_cdefs.h
deleted file mode 100644
index 71395cda8..000000000
--- a/usrp2/host/include/usrp2/usrp2_cdefs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_USRP2_CDEFS_H
-#define INCLUDED_USRP2_CDEFS_H
-
-/* C++ needs to know that types and declarations are C, not C++.  */
-#ifdef	__cplusplus
-# define __U2_BEGIN_DECLS	extern "C" {
-# define __U2_END_DECLS	}
-#else
-# define __U2_BEGIN_DECLS
-# define __U2_END_DECLS
-#endif
-
-#endif /* INCLUDED_USRP2_CDEFS_H */
diff --git a/usrp2/host/lib/Makefile.am b/usrp2/host/lib/Makefile.am
deleted file mode 100644
index 85bec4673..000000000
--- a/usrp2/host/lib/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright 2007,2008,2010 Free Software Foundation, Inc.
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = \
-    $(USRP2_INCLUDES) \
-    $(GRUEL_INCLUDES) \
-    $(STD_DEFINES_AND_INCLUDES) \
-    $(BOOST_CPPFLAGS) \
-    $(CPPUNIT_INCLUDES)
-
-bin_PROGRAMS = usrp2_socket_opener
-usrp2_socket_opener_SOURCES = usrp2_socket_opener.cc
-
-lib_LTLIBRARIES = \
-	libusrp2.la
-
-libusrp2_la_LDFLAGS = $(LTVERSIONFLAGS)
-
-libusrp2_la_SOURCES = \
-	control.cc \
-	copiers.cc \
-	copy_handler.cc \
-	data_handler.cc \
-	eth_buffer.cc \
-	ethernet.cc \
-	find.cc \
-	open_usrp2_socket.cc \
-	pktfilter.cc \
-	ring.cc \
-	rx_nop_handler.cc \
-	rx_sample_handler.cc \
-	strtod_si.c \
-	usrp2.cc \
-	usrp2_impl.cc
-
-libusrp2_la_LIBADD = \
-	$(GRUEL_LA) \
-	$(BOOST_LDFLAGS) $(BOOST_THREAD_LIB)
-
-# Private headers not needed for above the API development
-noinst_HEADERS = \
-	control.h \
-	eth_buffer.h \
-	eth_common.h \
-	ethernet.h \
-        open_usrp2_socket.h \
-	pktfilter.h \
-	ring.h \
-	usrp2_bytesex.h \
-	usrp2_impl.h
\ No newline at end of file
diff --git a/usrp2/host/lib/control.cc b/usrp2/host/lib/control.cc
deleted file mode 100644
index 3b5533eb8..000000000
--- a/usrp2/host/lib/control.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "control.h"
-#include <iostream>
-#include <gruel/thread.h>
-
-#include <boost/date_time/posix_time/posix_time.hpp>
-namespace pt = boost::posix_time;
-
-namespace usrp2 {
-
-  pending_reply::pending_reply(unsigned int rid, void *buffer, size_t len)
-    : d_rid(rid), d_buffer(buffer), d_len(len), d_mutex(), d_cond(),
-      d_complete(false)
-  {
-  }
-
-  pending_reply::~pending_reply()
-  {
-    notify_completion(); // Needed?
-  }
-
-  int
-  pending_reply::wait_for_completion(double secs)
-  {
-    gruel::scoped_lock l(d_mutex);
-
-    while (!d_complete) {
-      if (!d_cond.timed_wait(l, pt::milliseconds(long(secs*1e3))))
-	return 0; // timed out
-    }
-
-    return 1;
-  }
-
-  void
-  pending_reply::notify_completion()
-  {
-    gruel::scoped_lock l(d_mutex);
-    d_complete = true;
-    d_cond.notify_one();
-  }
-  
-} // namespace usrp2
-
diff --git a/usrp2/host/lib/control.h b/usrp2/host/lib/control.h
deleted file mode 100644
index 3515ba10f..000000000
--- a/usrp2/host/lib/control.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009,2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_CONTROL_H
-#define INCLUDED_CONTROL_H
-
-#include <gruel/thread.h>
-#include <usrp2_eth_packet.h>
-
-namespace usrp2 {
-
-  struct op_generic_cmd {
-    u2_eth_packet_t h;
-    op_generic_t    op;
-    op_generic_t    eop;
-  };
-
-  /*!
-   * OP_CONFIG_RX_V2 command packet
-   */
-  struct op_config_rx_v2_cmd
-  {
-    u2_eth_packet_t   h;
-    op_config_rx_v2_t op;
-    op_generic_t      eop;
-  };
-
-  struct op_start_rx_streaming_cmd
-  {
-    u2_eth_packet_t	    h;
-    op_start_rx_streaming_t op;
-    op_generic_t	    eop;
-  };
-
-  struct op_sync_and_start_rx_streaming_cmd
-  {
-    u2_eth_packet_t	    h;
-    op_generic_t            sync_op;
-    op_start_rx_streaming_t rx_op;
-    op_generic_t	    eop;
-  };
-
-  struct op_stop_rx_cmd {
-    u2_eth_packet_t h;
-    op_generic_t    op;
-    op_generic_t    eop;
-  };
-
-  struct op_config_tx_v2_cmd
-  {
-    u2_eth_packet_t   h;
-    op_config_tx_v2_t op;
-    op_generic_t      eop;
-  };
-
-  struct op_config_mimo_cmd
-  {
-    u2_eth_packet_t   h;
-    op_config_mimo_t  op;
-    op_generic_t      eop;
-  };
-
-  struct op_burn_mac_addr_cmd
-  {
-    u2_eth_packet_t    h;
-    op_burn_mac_addr_t op;
-    op_generic_t       eop;
-  };
-
-  struct op_dboard_info_cmd {
-    u2_eth_packet_t h;
-    op_generic_t    op;
-    op_generic_t    eop;
-  };
-
-  struct op_peek_cmd {
-    u2_eth_packet_t h;
-    op_peek_t       op;
-    op_generic_t    eop;
-  };
-
-  struct op_poke_cmd {
-    u2_eth_packet_t h;
-    op_poke_t       op;
-    // words to write go here
-    // eop must be dynamically written here
-  };
-
-  struct op_freq_cmd {
-    u2_eth_packet_t h;
-    op_freq_t       op;
-    op_generic_t    eop;
-  };
-
-  struct op_gpio_cmd {
-    u2_eth_packet_t h;
-    op_gpio_t       op;
-    op_generic_t    eop;
-  };
-
-  struct op_gpio_set_sels_cmd {
-    u2_eth_packet_t h;
-    op_gpio_set_sels_t op;
-    op_generic_t    eop;
-  };
-
-  /*!
-   * Control mechanism to allow API calls to block waiting for reply packets
-   */
-  class pending_reply
-  {
-  private:
-    unsigned int    d_rid;
-    void           *d_buffer;
-    size_t	    d_len;
-
-    // d_mutex is used with d_cond and also protects d_complete
-    gruel::mutex      d_mutex;
-    gruel::condition_variable d_cond;
-    bool	    d_complete;
-
-  public:
-    /*!
-     * Construct a pending reply from the reply ID, response packet
-     * buffer, and buffer length.
-     */
-    pending_reply(unsigned int rid, void *buffer, size_t len);
-
-    /*!
-     * Destructor. Signals creating thread.
-     */
-    ~pending_reply();
-
-    /*!
-     * Block, waiting for reply packet.
-     * Returns: 1 = ok, reply packet in buffer
-     *          0 = timeout
-     */
-    int wait_for_completion(double secs);
-
-    /*!
-     * Allows creating thread to resume after copying reply into buffer
-     */
-    void notify_completion();
-
-    /*!
-     * Retrieve pending reply ID
-     */
-    unsigned int rid() const { return d_rid; }
-
-    /*!
-     * Retrieve destination buffer address
-     */
-    void *buffer() const { return d_buffer; }
-
-    /*!
-     * Retrieve destination buffer length
-     */
-    size_t len() const { return d_len; }
-  };
-
-} // namespace usrp2
-
-#endif /* INCLUDED_CONTROL_H */
diff --git a/usrp2/host/lib/copiers.cc b/usrp2/host/lib/copiers.cc
deleted file mode 100644
index 52c66f616..000000000
--- a/usrp2/host/lib/copiers.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <usrp2/copiers.h>
-#include <gruel/inet.h>
-#include <gr_math.h>
-#include <math.h>
-#include <stdexcept>
-#include <assert.h>
-#include <string.h>
-
-// FIXME need gruel::not_implemented
-
-namespace usrp2 {
-
-  /*
-   * N.B., in all of these, uint32_t *items is NOT 32-bit aligned!
-   * FIXME Needs fix for non-x86 machines.
-   */
-
-  /*
-   * ----------------------------------------------------------------
-   * Copy and convert from USRP2 wire format to host format
-   * ----------------------------------------------------------------
-   */
-  void 
-  copy_u2_16sc_to_host_16sc(size_t nitems,
-			    const uint32_t *items,
-			    std::complex<int16_t> *host_items)
-  {
-#ifdef WORDS_BIGENDIAN
-
-    assert(sizeof(items[0]) == sizeof(host_items[0]));
-    memcpy(host_items, items, nitems * sizeof(items[0]));
-
-#else
-
-    // FIXME SIMD welcome here
-
-    for (size_t i = 0; i < nitems; i++){
-      uint32_t t = ntohx(items[i]);
-      //printf("%9d\n", items[i]);
-      host_items[i] = std::complex<int16_t>((t >> 16), t & 0xffff);
-    }
-
-#endif
-  }
-
-
-  /*
-   * endian swap if required and map [-32768, 32767] -> [1.0, +1.0)
-   */
-  void 
-  copy_u2_16sc_to_host_32fc(size_t nitems,
-			    const uint32_t *items,
-			    std::complex<float> *host_items)
-  {
-    for (size_t i = 0; i < nitems; i++){
-      uint32_t t = ntohx(items[i]);
-      int16_t re = (t >> 16) & 0xffff;
-      int16_t im = (t & 0xffff);
-      host_items[i] = std::complex<float>(re * 1.0/32768, im * 1.0/32768);
-    }
-  }
-
-  /*
-   * ----------------------------------------------------------------
-   * Copy and convert from host format to USRP2 wire format
-   * ----------------------------------------------------------------
-   */
-  void 
-  copy_host_16sc_to_u2_16sc(size_t nitems,
-			    const std::complex<int16_t> *host_items,
-			    uint32_t *items)
-  {
-#ifdef WORDS_BIGENDIAN
-
-    assert(sizeof(items[0]) == sizeof(host_items[0]));
-    memcpy(items, host_items, nitems * sizeof(items[0]));
-
-#else
-
-    // FIXME SIMD welcome here
-
-    for (size_t i = 0; i < nitems; i++){
-      items[i] = htonl((host_items[i].real() << 16) | (host_items[i].imag() & 0xffff));
-    }
-
-#endif
-  }
-
-
-  static inline int16_t
-  clip_and_scale(float x)
-  {
-    return static_cast<int16_t>(rintf(gr_branchless_clip(x, 1.0) * 32767.0));
-  }
-
-  void 
-  copy_host_32fc_to_u2_16sc(size_t nitems,
-			    const std::complex<float> *host_items,
-			    uint32_t *items)
-  {
-    for (size_t i = 0; i < nitems; i++){
-      int16_t re = clip_and_scale(host_items[i].real());
-      int16_t im = clip_and_scale(host_items[i].imag());
-      
-      items[i] = htonl((re << 16) | (im & 0xffff));
-    }
-  }
-
-}
diff --git a/usrp2/host/lib/copy_handler.cc b/usrp2/host/lib/copy_handler.cc
deleted file mode 100644
index 92759084b..000000000
--- a/usrp2/host/lib/copy_handler.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2/copy_handler.h>
-#include <iostream>
-#include <string.h>
-
-namespace usrp2 {
-  
-  copy_handler::copy_handler(void *dest, size_t len)
-    : d_dest((uint8_t *)dest), d_space(len), d_bytes(0), d_times(0)
-  {
-  }
-  
-  copy_handler::~copy_handler()
-  {
-    // NOP
-  }
-  
-  data_handler::result
-  copy_handler::operator()(const void *base, size_t len)
-  {
-    if (len > d_space)
-      return KEEP|DONE; // can't do anything, retry later
-    
-    memcpy(&d_dest[d_bytes], base, len);
-    d_space -= len;
-    d_bytes += len;
-    d_times++;
-
-    if (d_space < MIN_COPY_LEN)
-      return DONE; // don't call me anymore
-    
-    return 0;
-  }
-  
-} // namespace usrp2
-
diff --git a/usrp2/host/lib/eth_buffer.cc b/usrp2/host/lib/eth_buffer.cc
deleted file mode 100644
index e8ca05283..000000000
--- a/usrp2/host/lib/eth_buffer.cc
+++ /dev/null
@@ -1,279 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "eth_buffer.h"
-#include "ethernet.h"
-#include <usrp2/data_handler.h>
-#include <linux/if_packet.h>
-#include <sys/socket.h>
-#include <sys/mman.h>
-#include <sys/poll.h>
-#include <iostream>
-#include <cmath>
-#include <errno.h>
-#include <stdexcept>
-#include <string.h>
-#include <cstdio>
-
-
-#define ETH_BUFFER_DEBUG      0 // define to 0 or 1
-#if ETH_BUFFER_DEBUG
-#define DEBUG_LOG(x) ::write(2, (x), 1)
-#else
-#define DEBUG_LOG(X)
-#endif
-
-#define DEFAULT_MEM_SIZE   25e6 // ~0.25s @ 100 MB/s
-#define MAX_MEM_SIZE     1000e6 // ~10.00s @ 100 MB/s. 
-#define MAX_SLAB_SIZE    131072 // 128 KB (FIXME fish out of /proc/slabinfo)
-#define MAX_PKT_SIZE       1512 // we don't do jumbo frames
-
-namespace usrp2 {
-
-  eth_buffer::eth_buffer(size_t rx_bufsize)
-    : d_fd(0), d_using_tpring(false), d_buflen(0), d_buf(0), d_frame_nr(0),
-      d_frame_size(0), d_head(0), d_ring(0), d_ethernet(new ethernet())
-  {
-    if (rx_bufsize == 0)
-      d_buflen = (size_t)DEFAULT_MEM_SIZE;
-    else
-      d_buflen = std::min((size_t)MAX_MEM_SIZE, rx_bufsize);
-	
-    memset(d_mac, 0, sizeof(d_mac));
-  }
-
-  eth_buffer::~eth_buffer()
-  {
-    close();
-  }
-  
-  bool 
-  eth_buffer::open(const std::string &ifname, int protocol)
-  {
-    if (!d_ethernet->open(ifname, protocol)) {
-      std::cerr << "eth_buffer: unable to open interface " 
-		<< ifname << std::endl;
-      return false;
-    }
-
-    d_fd = d_ethernet->fd();
-    memcpy(d_mac, d_ethernet->mac(), sizeof(d_mac));
-    
-    struct tpacket_req req;
-    size_t page_size = getpagesize();
-
-    // Calculate minimum power-of-two aligned size for frames
-    req.tp_frame_size =
-      (unsigned int)rint(pow(2, ceil(log2(TPACKET_ALIGN(TPACKET_HDRLEN)+TPACKET_ALIGN(MAX_PKT_SIZE)))));
-    d_frame_size = req.tp_frame_size;
-
-    // Calculate minimum contiguous pages needed to enclose a frame
-    int npages = (page_size > req.tp_frame_size) ? 1 : ((req.tp_frame_size+page_size-1)/page_size);
-    req.tp_block_size = page_size << (int)ceil(log2(npages));
-
-    // Calculate number of blocks
-    req.tp_block_nr = (int)(d_buflen/req.tp_block_size);
-			       
-
-    // Recalculate buffer length
-    d_buflen = req.tp_block_nr*req.tp_block_size;
-
-    // Finally, calculate total number of frames.  Since frames, blocks,
-    // and pages are all power-of-two aligned, frames are contiguous
-    req.tp_frame_nr = d_buflen/req.tp_frame_size;
-    d_frame_nr = req.tp_frame_nr;
-
-#if 0
-    if (ETH_BUFFER_DEBUG)
-      std::cerr << "eth_buffer:" 
-		<< " frame_size=" << req.tp_frame_size
-		<< " block_size=" << req.tp_block_size
-                << " block_nr=" << req.tp_block_nr
-		<< " frame_nr=" << req.tp_frame_nr
-		<< " buflen=" << d_buflen
-		<< std::endl;
-#endif
-
-    // Try to get kernel shared memory buffer    
-    if (setsockopt(d_fd, SOL_PACKET, PACKET_RX_RING, (void *)&req, sizeof(req))) {
-      perror("eth_buffer: setsockopt");
-      d_using_tpring = false;
-      if (!(d_buf = (uint8_t *)malloc(d_buflen))) {
-        std::cerr << "eth_buffer: failed to allocate packet memory" << std::endl;
-	return false;
-      }
-      
-      std::cerr << "eth_buffer: using malloc'd memory for buffer" << std::endl;
-    }
-    else {
-      d_using_tpring = true;
-      void *p = mmap(0, d_buflen, PROT_READ|PROT_WRITE, MAP_SHARED, d_fd, 0);
-      if (p == MAP_FAILED){
-        perror("eth_buffer: mmap");
-	return false;
-      }
-      d_buf = (uint8_t *) p;
-
-      if (ETH_BUFFER_DEBUG)
-        std::cerr << "eth_buffer: using kernel shared mem for buffer" << std::endl;
-    }
-
-    // Initialize our pointers into the packet ring
-    d_ring = std::vector<uint8_t *>(req.tp_frame_nr);
-    for (unsigned int i=0; i < req.tp_frame_nr; i++) {
-      d_ring[i] = (uint8_t *)(d_buf+i*req.tp_frame_size);
-    }
-
-    // If not using kernel ring, instantiate select/read thread here
-
-    return true;
-  }
-
-  bool
-  eth_buffer::close()
-  {
-    // if we have background thread, stop it here
-
-    if(d_buf) {
-      if (!d_using_tpring)
-	free(d_buf);
-      else
-	munmap(d_buf, d_buflen);
-    }
-	
-    return d_ethernet->close();
-  }
-
-  bool 
-  eth_buffer::attach_pktfilter(pktfilter *pf)
-  {
-    return d_ethernet->attach_pktfilter(pf);
-  }
-
-  inline bool
-  eth_buffer::frame_available()
-  {
-    return (((tpacket_hdr *)d_ring[d_head])->tp_status != TP_STATUS_KERNEL);
-  }
-  
-  eth_buffer::result
-  eth_buffer::rx_frames(data_handler *f, int timeout_in_ms)
-  {
-    DEBUG_LOG("\n");
-      
-    while (!frame_available()) {
-      if (timeout_in_ms == 0) {
-        DEBUG_LOG("w");
-        return EB_WOULD_BLOCK;
-      }
-      
-      struct pollfd pfd;
-      pfd.fd = d_fd;
-      pfd.revents = 0;
-      pfd.events = POLLIN;
-
-      DEBUG_LOG("P");
-
-      int pres = poll(&pfd, 1, timeout_in_ms);
-      if (pres == -1) {
-        perror("poll");
-	return EB_ERROR;
-      }
-
-      if (pres == 0) {
-        DEBUG_LOG("t");
-	return EB_TIMED_OUT;
-      }
-    }
-
-    // Iterate through available packets
-    while (frame_available()) {
-      // Get start of ethernet frame and length
-      tpacket_hdr *hdr = (tpacket_hdr *)d_ring[d_head];
-      void *base = (uint8_t *)hdr+hdr->tp_mac;
-      size_t len = hdr->tp_len;
-      
-      // FYI, (base % 4 == 2) Not what we want given the current FPGA
-      // code.  This means that our uint32_t samples are not 4-byte
-      // aligned.  We'll have to deal with it downstream.
-
-      if (0)
-	fprintf(stderr, "eth_buffer: base = %p  tp_mac = %3d  tp_net = %3d\n",
-		base, hdr->tp_mac, hdr->tp_net);
-
-      // Invoke data handler
-      data_handler::result r = (*f)(base, len);
-      if (!(r & data_handler::KEEP))
-        hdr->tp_status = TP_STATUS_KERNEL; // mark it free
-
-      inc_head();
-
-      if (r & data_handler::DONE)
-        break;
-    }
-
-    DEBUG_LOG("|");
-    return EB_OK;
-  }
-
-  eth_buffer::result
-  eth_buffer::tx_frame(const void *base, size_t len, int flags)
-  {
-    DEBUG_LOG("T");
-
-    if (flags & EF_DONTWAIT)    // FIXME: implement flags
-      throw std::runtime_error("tx_frame: EF_DONTWAIT not implemented");
-
-    int res = d_ethernet->write_packet(base, len);
-    if (res < 0 || (unsigned int)res != len)
-      return EB_ERROR;
-
-    return EB_OK;
-  }
-
-  eth_buffer::result
-  eth_buffer::tx_framev(const eth_iovec *iov, int iovcnt, int flags)
-  {
-    DEBUG_LOG("T");
-
-    if (flags & EF_DONTWAIT)    // FIXME: implement flags
-      throw std::runtime_error("tx_frame: EF_DONTWAIT not implemented");
-
-    int res = d_ethernet->write_packetv(iov, iovcnt);
-    if (res < 0)
-      return EB_ERROR;
-
-    return EB_OK;
-  }
-
-  void
-  eth_buffer::release_frame(void *base)
-  {
-    // Get d_frame_size aligned header
-    tpacket_hdr *hdr = (tpacket_hdr *)((intptr_t)base & ~(d_frame_size-1));
-    hdr->tp_status = TP_STATUS_KERNEL; // mark it free
-  }
-  
-} // namespace usrp2
diff --git a/usrp2/host/lib/eth_buffer.h b/usrp2/host/lib/eth_buffer.h
deleted file mode 100644
index 8dee9a4a2..000000000
--- a/usrp2/host/lib/eth_buffer.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_USRP2_ETH_BUFFER_H
-#define INCLUDED_USRP2_ETH_BUFFER_H
-
-#include "pktfilter.h"
-#include <eth_common.h>
-#include <boost/utility.hpp>
-#include <vector>
-#include <memory>
-#include <stdint.h>
-
-namespace usrp2 {
-
-  class ethernet;
-  class data_handler;
-
-  /*!
-   * \brief high-performance interface to send and receive raw
-   * ethernet frames with out-of-order retirement of received frames.
-   *
-   * On many systems it should be possible to implement this on top of libpcap
-   *
-   * \internal
-   */
-  class eth_buffer : boost::noncopyable 
-  {
-    
-    int		  d_fd;		        // socket file descriptor
-    uint8_t	  d_mac[6];	        // our mac address
-    bool          d_using_tpring;       // using kernel mapped packet ring
-    size_t        d_buflen;             // length of our buffer
-    uint8_t      *d_buf;                // packet ring
-    unsigned int  d_frame_nr;           // max frames on ring
-    size_t        d_frame_size;         // frame storage size
-    unsigned int  d_head;               // pointer to next frame
-
-    std::vector<uint8_t *>  d_ring;     // pointers into buffer
-    std::auto_ptr<ethernet> d_ethernet; // our underlying interface
-  
-    bool frame_available();
-
-    void inc_head()
-    {
-      if (d_head + 1 >= d_frame_nr)
-	d_head = 0;
-      else
-	d_head = d_head + 1;
-    }
-
-
-  public:
-
-    enum result {
-      EB_OK,		//< everything's fine
-      EB_ERROR,		//< A non-recoverable error occurred
-      EB_WOULD_BLOCK,	//< A timeout of 0 was specified and nothing was ready
-      EB_TIMED_OUT,	//< The timeout expired before anything was ready
-    };
-
-    static const unsigned int MAX_PKTLEN = 1512;
-    static const unsigned int MIN_PKTLEN = 64;
-
-    /*!
-     * \param rx_bufsize is a hint as to the number of bytes of memory
-     * to allocate for received ethernet frames (0 -> reasonable default)
-     */
-    eth_buffer(size_t rx_bufsize = 0);
-    ~eth_buffer();
-    
-    /*!
-     * \brief open the specified interface
-     *
-     * \param ifname ethernet interface name, e.g., "eth0"
-     * \param protocol is the ethertype protocol number in network order.
-     *    Use 0 to receive all protocols.
-     */
-    bool open(const std::string &ifname, int protocol);
-
-    /*!
-     * \brief close the interface
-     */
-    bool close();
-
-    /*!
-     * \brief attach packet filter to socket to restrict which packets read sees.
-     * \param pf	the packet filter
-     */
-    bool attach_pktfilter(pktfilter *pf);
-
-    /*!
-     * \brief return 6 byte string containing our MAC address
-     */
-    const uint8_t *mac() const { return d_mac; }
-
-    /*!
-     * \brief Call \p f for each frame in the receive buffer.
-     * \param f is the frame data handler
-     * \param timeout (in ms) controls behavior when there are no frames to read
-     *
-     * If \p timeout is 0, rx_frames will not wait for frames if none are 
-     * available, and f will not be invoked.  If \p timeout is -1 (the 
-     * default), rx_frames will block indefinitely until frames are 
-     * available.  If \p timeout is positive, it indicates the number of
-     * milliseconds to wait for a frame to become available.  Once the
-     * timeout has expired, rx_frames will return, f never having been 
-     * invoked.
-     *
-     * \p f will be called on each ethernet frame that is available.
-     * \p f returns a bit mask with one of the following set or cleared:
-     * 
-     * data_handler::KEEP  - hold onto the frame and present it again during 
-     *                       the next call to rx_frames, otherwise discard it
-     *
-     * data_handler::DONE -  return from rx_frames now even though more frames
-     *                       might be available; otherwise continue if more 
-     *                       frames are ready.
-     *
-     * The idea of holding onto a frame for the next iteration allows
-     * the caller to scan the received packet stream for particular
-     * classes of frames (such as command replies) leaving the rest
-     * intact.  On the next call all kept frames, followed by any new
-     * frames received, will be presented in order to \p f.  
-     * See usrp2.cc for an example of the pattern.
-     *
-     * \returns EB_OK if at least one frame was received
-     * \returns EB_WOULD_BLOCK if \p timeout is 0 and the call would have blocked
-     * \returns EB_TIMED_OUT if timeout occurred
-     * \returns EB_ERROR if there was an unrecoverable error.
-     */
-    result rx_frames(data_handler *f, int timeout=-1);
-
-    /*
-     * \brief Release frame from buffer
-     *
-     * Call to release a frame previously held by a data_handler::KEEP.
-     * The pointer may be offset from the base of the frame up to its length.
-     */
-    void release_frame(void *p);
-
-    /*
-     * \brief Write an ethernet frame to the interface.
-     *
-     * \param base points to the beginning of the frame (the 14-byte ethernet header).
-     * \param len is the length of the frame in bytes.
-     * \param flags is 0 or the bitwise-or of values from eth_flags
-     *
-     * The frame must begin with a 14-byte ethernet header.
-     *
-     * \returns EB_OK if the frame was successfully enqueued.
-     * \returns EB_WOULD_BLOCK if flags contains EF_DONT_WAIT and the call would have blocked.
-     * \returns EB_ERROR if there was an unrecoverable error.
-     */
-    result tx_frame(const void *base, size_t len, int flags=0);
-
-    /*
-     * \brief Write an ethernet frame to the interface using scatter/gather.
-     *
-     * \param iov points to an array of iovec structs
-     * \param iovcnt is the number of entries
-     * \param flags is 0 or the bitwise-or of values from eth_flags
-     *
-     * The frame must begin with a 14-byte ethernet header.
-     *
-     * \returns EB_OK if the frame was successfully enqueued.
-     * \returns EB_WOULD_BLOCK if flags contains EF_DONT_WAIT and the call would have blocked.
-     * \returns EB_ERROR if there was an unrecoverable error.
-     */
-    result tx_framev(const eth_iovec *iov, int iovcnt, int flags=0);
-
-    /*
-     * \brief Returns maximum possible number of frames in buffer
-     */
-    unsigned int max_frames() const { return d_frame_nr; }
-
-  };
-
-};  // namespace usrp2
-
-#endif /* INCLUDED_USRP2_ETH_BUFFER_H */
diff --git a/usrp2/host/lib/eth_common.h b/usrp2/host/lib/eth_common.h
deleted file mode 100644
index 7c9feaa25..000000000
--- a/usrp2/host/lib/eth_common.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INCLUDED_USRP2_ETH_COMMON_H
-#define INCLUDED_USRP2_ETH_COMMON_H
-
-#include <sys/uio.h>			// FIXME autoconf this
-
-namespace usrp2 {
-  
-  enum eth_flags {
-    EF_DONTWAIT	= 0x0001,
-  };
-  
-  typedef struct iovec eth_iovec;	// FIXME autoconf this
-  
-}  // namespace usrp2
-
-
-#endif /* INCLUDED_USRP2_ETH_COMMON_H */
diff --git a/usrp2/host/lib/ethernet.cc b/usrp2/host/lib/ethernet.cc
deleted file mode 100644
index e51680b2e..000000000
--- a/usrp2/host/lib/ethernet.cc
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "eth_buffer.h"
-#include "ethernet.h"
-#include "pktfilter.h"
-#include <open_usrp2_socket.h>
-
-#include <cstdio>
-#include <iostream>
-#include <unistd.h>
-#include <fcntl.h>
-//#include <features.h>
-#include <errno.h>
-#include <string.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/ethernet.h>
-#include <netinet/in.h>
-
-#include <linux/types.h>
-#include <netpacket/packet.h>
-#include <linux/filter.h>	// packet filter
-
-namespace usrp2 {
-
-  static int
-  open_packet_socket (std::string ifname, int protocol)
-  {
-#if 0    
-    if (protocol == 0)
-      protocol = htons(ETH_P_ALL);
-    
-    int fd = socket (PF_PACKET, SOCK_RAW, protocol);
-#else
-    int fd = usrp2::open_usrp2_socket();
-#endif
-
-    if (fd == -1){
-      fprintf (stderr, "%s: socket: %s\n", ifname.c_str(), strerror (errno));
-      return -1;
-    }
-    
-    // get interface index
-    struct ifreq ifr;
-    memset (&ifr, 0, sizeof(ifr));
-    strncpy (ifr.ifr_name, ifname.c_str(), sizeof (ifr.ifr_name));
-    int res = ioctl (fd, SIOCGIFINDEX, &ifr);
-    if (res != 0){
-      ::close (fd);
-      fprintf (stderr, "%s: SIOCGIFINDEX: %s\n", ifname.c_str(), strerror(errno));
-      return -1;
-    }
-    int ifindex = ifr.ifr_ifindex;
-    
-    // bind to the specified interface
-    sockaddr_ll sa;
-    memset (&sa, 0, sizeof (sa));
-    sa.sll_family = AF_PACKET;
-    sa.sll_protocol = protocol;
-    sa.sll_ifindex = ifindex;
-    res = bind (fd, (struct sockaddr *)&sa, sizeof (sa));
-    if (res != 0){
-      ::close (fd);
-      fprintf (stderr, "%s: bind: %s\n", ifname.c_str(), strerror(errno));
-      return -1;
-    }
-    return fd;
-  }
-  
-  static void
-  extract_mac_addr (unsigned char *mac, const unsigned char *hwaddr)
-  {
-    int	i;
-    for (i = 0; i < 6; i++)
-      mac[i] = 0xff;
-    
-    i = 0;
-    for (int j = 0; j < 14; j++){
-      if (hwaddr[j] != 0xff){
-	mac[i++] = hwaddr[j];
-	if (i == 6)
-	  return;
-      }
-    }
-  }
-  
-  static bool
-  get_mac_addr (std::string ifname, int fd, unsigned char *mac)
-  {
-    struct ifreq ifr;
-    memset (&ifr, 0, sizeof(ifr));
-    strncpy (ifr.ifr_name, ifname.c_str(), sizeof (ifr.ifr_name));
-    int res = ioctl (fd, SIOCGIFHWADDR, &ifr);
-    if (res != 0){
-      fprintf (stderr, "%s: SIOCGIFHWADDR: %s\n", ifname.c_str(), strerror(errno));
-      return false;
-    }
-    else {
-      if (0){
-	for (unsigned i = 0; i < sizeof (ifr.ifr_hwaddr.sa_data); i++)
-	  fprintf (stderr, "%02x", ifr.ifr_hwaddr.sa_data[i]);
-	fprintf (stderr, "\n");
-      }
-    }
-    extract_mac_addr (mac, (unsigned char *)ifr.ifr_hwaddr.sa_data);
-    return true;
-  }
-  
-  ethernet::ethernet ()
-  {
-    d_fd = -1;
-    memset (d_mac, 0, sizeof (d_mac));
-  }
-  
-  ethernet::~ethernet ()
-  {
-    close ();
-  }
-  
-  bool
-  ethernet::open (std::string ifname, int protocol)
-  {
-    if (d_fd != -1){
-      fprintf (stderr, "ethernet: already open\n");
-      return false;
-    }
-    if ((d_fd = open_packet_socket (ifname, protocol)) == -1){
-      return false;
-    }
-    get_mac_addr (ifname, d_fd, d_mac);
-    return true;
-  }
-  
-  bool
-  ethernet::close ()
-  {
-    if (d_fd >= 0){
-      ::close (d_fd);
-      d_fd = -1;
-    }
-    return true;
-  }
-  
-  int
-  ethernet::read_packet (void *buf, int buflen)
-  {
-    int len = recvfrom (d_fd, buf, buflen, 0, (sockaddr *) 0, 0);
-    return len;
-  }
-  
-  int
-  ethernet::read_packet_dont_block (void *buf, int buflen)
-  {
-    int len = recvfrom (d_fd, buf, buflen, MSG_DONTWAIT, 0, 0);
-    if (len == -1 && errno == EAGAIN)
-      return 0;
-    
-    return len;
-  }
-  
-  int
-  ethernet::write_packet (const void *buf, int buflen)
-  {
-    int retval = send (d_fd, buf, buflen, 0);
-    if (retval < 0){
-      if (errno == EINTR)
-	return write_packet (buf, buflen);
-      
-      perror ("ethernet:write_packet: send");
-      return -1;
-    }
-    return retval;
-  }
-
-  int
-  ethernet::write_packetv(const eth_iovec *iov, size_t iovlen)
-  {
-    struct msghdr mh;
-    memset(&mh, 0, sizeof(mh));
-    mh.msg_iov = const_cast<eth_iovec*>(iov);
-    mh.msg_iovlen = iovlen;
-
-    int retval = sendmsg(d_fd, &mh, 0);
-    if (retval < 0){
-      if (errno == EINTR)
-	return write_packetv(iov, iovlen);
-      
-      perror("ethernet:write_packetv: send");
-      return -1;
-    }
-    return retval;
-  }
-  
-  bool
-  ethernet::attach_pktfilter (pktfilter *pf)
-  {
-    struct sock_fprog filter;
-    filter.len = pf->d_len;
-    filter.filter = pf->d_inst;
-    
-    int r = setsockopt (d_fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter, sizeof (filter));
-    if (r < 0){
-      perror ("ethernet:attach:  SO_ATTACH_FILTER");
-      return false;
-    }
-    return true;
-  }
-  
-} // namespace usrp2
diff --git a/usrp2/host/lib/ethernet.h b/usrp2/host/lib/ethernet.h
deleted file mode 100644
index 24624f441..000000000
--- a/usrp2/host/lib/ethernet.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_USRP2_ETHERNET_H
-#define INCLUDED_USRP2_ETHERNET_H
-
-#include <string>
-#include <vector>
-#include <eth_common.h>
-
-namespace usrp2 {
-
-  class pktfilter;
-  
-  /*!
-   * \brief Read and write ethernet frames.
-   *
-   * This provides a low level interface to hardware that communicates
-   * via raw (non-IP) ethernet frames.
-   */
-  class ethernet {
-    int	  d_fd;
-    uint8_t d_mac[6];
-    
-  public:
-    ethernet ();
-    ~ethernet ();
-    
-    static const int MAX_PKTLEN = 1512;
-    static const int MIN_PKTLEN = 64;
-    
-    /*!
-     * \param ifname ethernet interface name, e.g., "eth0"
-     * \param protocol is the ethertype protocol number in network order.
-     *    Use 0 to receive all protocols.
-     */
-    bool open (std::string ifname, int protocol);
-    
-    bool close ();
-    
-    /*!
-     * \brief attach packet filter to socket to restrict which packets read sees.
-     * \param pf	the packet filter
-     */
-    bool attach_pktfilter (pktfilter *pf);
-    
-    /*!
-     * \brief return 6 byte string containing our MAC address
-     */
-    const uint8_t *mac () const { return d_mac; }
-    
-    /*!
-     * \brief Return file descriptor associated with socket.
-     */
-    int fd () const { return d_fd; }
-    
-    /*!
-     * \brief Read packet from interface.
-     *
-     * \param buf		where to put the packet
-     * \param buflen	maximum length of packet in bytes (should be >= 1528)
-     *
-     * \returns number of bytes read or -1 if trouble.
-     *
-     * Returned packet includes 14-byte ethhdr
-     */
-    int read_packet (void *buf, int buflen);
-    
-    /*!
-     * \brief Read packet from interface, but don't block waiting
-     *
-     * \param buf		where to put the packet
-     * \param buflen	maximum length of packet in bytes (should be >= 1528)
-     *
-     * \returns number of bytes read, -1 if trouble or 0 if nothing available.
-     *
-     * Returned packet includes 14-byte ethhdr
-     */
-    int read_packet_dont_block (void *buf, int buflen);
-    
-    /*
-     * \brief Write ethernet packet to interface.
-     *
-     * \param buf		the packet to write
-     * \param buflen	length of packet in bytes
-     *
-     * \returns number of bytes written or -1 if trouble.
-     *
-     * Packet must begin with 14-byte ethhdr, but does not include the FCS.
-     */
-    int write_packet (const void *buf, int buflen);
-
-    /*
-     * \brief Write ethernet packet to interface.
-     *
-     * \param iov	scatter/gather array
-     * \param iovlen	number of elements in iov
-     *
-     * \returns number of bytes written or -1 if trouble.
-     *
-     * Packet must begin with 14-byte ethhdr, but does not include the FCS.
-     */
-    int write_packetv (const eth_iovec *iov, size_t iovlen);
-
-  };
-  
-} // namespace usrp2
-
-#endif /* INCLUDED_USRP2_ETHERNET_H */
diff --git a/usrp2/host/lib/find.cc b/usrp2/host/lib/find.cc
deleted file mode 100644
index d1df47fc5..000000000
--- a/usrp2/host/lib/find.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2_eth_packet.h>
-#include <usrp2/usrp2.h>
-#include <boost/scoped_ptr.hpp>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include "ethernet.h"
-#include "pktfilter.h"
-#include <string.h>
-#include <iostream>
-#include <stdexcept>
-#include <cstdio>
-
-#define FIND_DEBUG 0
-
-
-// FIXME move to gruel
-
-static struct timeval
-time_duration_to_timeval(boost::posix_time::time_duration delta)
-{
-  long total_us = delta.total_microseconds();
-  if (total_us < 0)
-    throw std::invalid_argument("duration_to_time: delta is negative");
-
-  struct timeval tv;
-  tv.tv_sec =  total_us / 1000000;
-  tv.tv_usec = total_us % 1000000;
-  return tv;
-}
-
-
-namespace usrp2 {
-
-  static props
-  reply_to_props(const op_id_reply_t *r)
-  {
-    const uint8_t *mac = (const uint8_t *)&r->addr;
-    char addr_buf[128];
-    snprintf(addr_buf, sizeof(addr_buf), "%02x:%02x:%02x:%02x:%02x:%02x",
-	     mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-      
-    props p;
-    p.addr = std::string(addr_buf);  
-    p.hw_rev = ntohs(r->hw_rev);
-    memcpy(p.fpga_md5sum, r->fpga_md5sum, sizeof(p.fpga_md5sum));
-    memcpy(p.sw_md5sum, r->sw_md5sum, sizeof(p.sw_md5sum));
-    return p;
-  }
-
-  static void
-  read_replies(ethernet *enet, struct timeval timeout,
-	       const std::string &target_addr, props_vector_t &result)
-  {
-    struct reply {
-      u2_eth_packet_t	h;
-      op_id_reply_t	op_id_reply;
-    };
-    
-    uint8_t pktbuf[ethernet::MAX_PKTLEN];
-    memset(pktbuf, 0, sizeof(pktbuf));
-
-    fd_set read_fds;
-    FD_ZERO(&read_fds);
-    FD_SET(enet->fd(), &read_fds);
-    
-    select(enet->fd()+1, &read_fds, 0, 0, &timeout);
-    while(1) {
-      memset(pktbuf, 0, sizeof(pktbuf));
-      int len = enet->read_packet_dont_block(pktbuf, sizeof(pktbuf));
-      if (len < 0){
-	perror("usrp2_basic: read_packet_dont_block");
-        return;
-      }
-      if (len == 0)
-	break;
-      
-      reply *rp = (reply *)pktbuf;
-      if (u2p_chan(&rp->h.fixed) != CONTROL_CHAN)  	// ignore
-	continue;
-      if (rp->op_id_reply.opcode != OP_ID_REPLY)	// ignore
-	continue;
-      
-      props p = reply_to_props(&rp->op_id_reply);
-      if (FIND_DEBUG)
-	std::cerr << "usrp2::find: response from " << p.addr << std::endl;
-      
-      if ((target_addr == "") || (target_addr == p.addr))
-	result.push_back(p);
-    }
-  }
-
-  props_vector_t
-  find(const std::string &ifc, const std::string &addr)
-  {
-    if (FIND_DEBUG) {
-      std::cerr << "usrp2::find: Searching interface " << ifc << " for "
-		<< (addr == "" ? "all USRP2s" : addr)
-		<< std::endl;
-    }
-    
-    props_vector_t result;
-    struct command {
-      u2_eth_packet_t	h;
-      op_generic_t	op_id;
-    };
-    
-    std::auto_ptr<ethernet> enet(new ethernet()); 
-    
-    if (!enet->open(ifc, htons(U2_ETHERTYPE)))
-      return result;
-    
-    std::auto_ptr<pktfilter> pf(pktfilter::make_ethertype_inbound(U2_ETHERTYPE, enet->mac()));
-    if (!enet->attach_pktfilter(pf.get()))
-      return result;
-    
-    static u2_mac_addr_t broadcast_mac_addr =
-      {{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }};
-    
-    uint8_t pktbuf[ethernet::MAX_PKTLEN];
-    memset(pktbuf, 0, sizeof(pktbuf));
-    
-    command *c = (command *)pktbuf;
-    c->h.ehdr.ethertype = htons(U2_ETHERTYPE);
-    c->h.ehdr.dst = broadcast_mac_addr;
-    memcpy(&c->h.ehdr.src, enet->mac(), 6);
-    c->h.thdr.flags = 0;
-    c->h.thdr.seqno = 0;
-    c->h.thdr.ack = 0;
-    u2p_set_word0(&c->h.fixed, 0, CONTROL_CHAN);
-    u2p_set_timestamp(&c->h.fixed, -1);
-    c->op_id.opcode = OP_ID;
-    c->op_id.len = sizeof(c->op_id);
-    int len = std::max((size_t) ethernet::MIN_PKTLEN, sizeof(command));
-    if (enet->write_packet(c, len) != len)
-      return result;
-    
-    if (FIND_DEBUG)
-      std::cerr << "usrp2::find: broadcast ID command" << std::endl;
-    
-    /*
-     * Gather all responses that occur within 50ms
-     */
-    boost::posix_time::ptime start(boost::posix_time::microsec_clock::universal_time());
-    boost::posix_time::ptime limit(start + boost::posix_time::milliseconds(50));
-    boost::posix_time::ptime now;
-
-    while (1){
-      now = boost::posix_time::microsec_clock::universal_time();
-      if (now >= limit)
-	break;
-
-      boost::posix_time::time_duration delta(limit - now);
-      struct timeval timeout = time_duration_to_timeval(delta);
-
-      read_replies(enet.get(), timeout, addr, result);
-    }
-    return result;
-  }
-  
-} // namespace usrp2
-
diff --git a/usrp2/host/lib/open_usrp2_socket.cc b/usrp2/host/lib/open_usrp2_socket.cc
deleted file mode 100644
index cd729205d..000000000
--- a/usrp2/host/lib/open_usrp2_socket.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <open_usrp2_socket.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string>
-
-static const char *helper = "usrp2_socket_opener";
-
-static ssize_t
-read_fd(int fd, void *ptr, size_t nbytes, int *recvfd)
-{
-  struct msghdr msg;
-  struct iovec iov[1];
-  ssize_t n;
-
-#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
-  union {
-    struct cmsghdr cm;
-    char     control[CMSG_SPACE(sizeof (int))];
-  } control_un;
-  struct cmsghdr  *cmptr;
-
-  msg.msg_control  = control_un.control;
-  msg.msg_controllen = sizeof(control_un.control);
-#else
-  int     newfd;
-
-  msg.msg_accrights = (char *) &newfd;
-  msg.msg_accrightslen = sizeof(int);
-#endif
-
-  msg.msg_name = NULL;
-  msg.msg_namelen = 0;
-
-  iov[0].iov_base = ptr;
-  iov[0].iov_len = nbytes;
-  msg.msg_iov = iov;
-  msg.msg_iovlen = 1;
-
-  if ((n = recvmsg(fd, &msg, 0)) <= 0)
-    return n;
-
-#ifdef  HAVE_STRUCT_MSGHDR_MSG_CONTROL
-  if ((cmptr = CMSG_FIRSTHDR(&msg)) != NULL
-      && cmptr->cmsg_len == CMSG_LEN(sizeof(int))){
-    if (cmptr->cmsg_level != SOL_SOCKET){
-      fprintf(stderr, "read_fd: control level != SOL_SOCKET\n");
-      return -1;
-    }
-    if (cmptr->cmsg_type != SCM_RIGHTS){
-      fprintf(stderr, "read_fd: control type != SCM_RIGHTS\n");
-      return -1;
-    }
-    *recvfd = *((int *) CMSG_DATA(cmptr));
-  } else
-    *recvfd = -1;           /* descriptor was not passed */
-#else
-  if (msg.msg_accrightslen == sizeof(int))
-    *recvfd = newfd;
-  else
-    *recvfd = -1;       /* descriptor was not passed */
-#endif
-
-  return n;
-}
-
-int
-usrp2::open_usrp2_socket()
-{
-  int     fd = -1, sockfd[2], status;
-  pid_t   childpid;
-  char    c, argsockfd[10];
-
-  if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sockfd) != 0){
-    perror("socketpair");
-    return -1;
-  }
-
-  if ((childpid = fork()) == 0) { /* child process */
-    close(sockfd[0]);
-    snprintf(argsockfd, sizeof(argsockfd), "%d", sockfd[1]);
-    execlp(helper, helper, argsockfd, (char *) NULL);
-    std::string msg("execlp: couldn't exec " + std::string(helper));
-    perror(msg.c_str());
-    close(sockfd[0]);
-    close(sockfd[1]);
-    return -1;
-  }
-
-  /* parent process - wait for the child to terminate */
-  close(sockfd[1]);           /* close the end we don't use */
-
-  waitpid(childpid, &status, 0);
-  if (!WIFEXITED(status)){
-    fprintf(stderr, "child did not terminate\n");
-    return -1;
-  }
-  if ((status = WEXITSTATUS(status)) == 0)
-    read_fd(sockfd[0], &c, 1, &fd);
-  else {
-    errno = status;         /* bogus: set errno value from child's status */
-    fd = -1;
-  }
-
-  close(sockfd[0]);
-  return (fd);
-}
diff --git a/usrp2/host/lib/open_usrp2_socket.h b/usrp2/host/lib/open_usrp2_socket.h
deleted file mode 100644
index d42440ea0..000000000
--- a/usrp2/host/lib/open_usrp2_socket.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef INCLUDED_OPEN_USRP2_SOCKET_H
-#define INCLUDED_OPEN_USRP2_SOCKET_H
-
-namespace usrp2 {
-
-  /*!
-   * Return the result of executing:
-   *
-   *   int fd = socket(PF_PACKET, SOCK_RAW, htons(0xBEEF));
-   *
-   * Doing it in a way that we don't need to be running as root.
-   */
-  int open_usrp2_socket();
-};
-
-
-#endif /* INCLUDED_OPEN_USRP2_SOCKET_H */
diff --git a/usrp2/host/lib/pktfilter.cc b/usrp2/host/lib/pktfilter.cc
deleted file mode 100644
index 1ccf90446..000000000
--- a/usrp2/host/lib/pktfilter.cc
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "pktfilter.h"
-#include <iostream>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <features.h>
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
-#include <netinet/in.h>
-#include <assert.h>
-#include <linux/types.h>
-#include <linux/filter.h>	// packet filter
-
-namespace usrp2 {
-  
-  /*
-   * This is all based on the Berkeley Packet Filter (BPF) as implemented on Linux.
-   *
-   * The BPF allows you to run an interpreted program (a filter) in the
-   * kernel that sorts through the packets looking for ones you are
-   * interested in.  This eliminates the overhead of passing all of the
-   * networking packets up into user space for filtering there.
-   *
-   * For documentation on this see
-   * /usr/src/linux/Documentation/networking/filter.txt, The BSD
-   * Berkeley Packet Filter manual page, and "The BSD Packet Filter: A
-   * New Architecture for User-level Packet Capture", by Steven McCanne
-   * and Van Jacobson.
-   */
-  
-  pktfilter::pktfilter ()
-    : d_len (0), d_inst (0)
-  {
-    // NOP
-  }
-  
-  pktfilter::~pktfilter ()
-  {
-    delete [] d_inst;
-  }
-  
-  inline static sock_filter
-  make_stmt (__u16 code, __u32 k)
-  {
-    sock_filter	f;
-    f.code = code;
-    f.jt = 0;
-    f.jf = 0;
-    f.k = k;
-    return f;
-  }
-  
-  inline static sock_filter
-  make_jump (__u16 code, __u32 k, __u8 jt, __u8 jf)
-  {
-    sock_filter	f;
-    f.code = code;
-    f.jt = jt;
-    f.jf = jf;
-    f.k = k;
-    return f;
-  }
-  
-  /*
-   * Return a filter that harvests packets with the specified ethertype.
-   */
-  pktfilter *
-  pktfilter::make_ethertype (unsigned short ethertype)
-  {
-    static const int MAX_LEN = 20;
-    sock_filter	*inst = new sock_filter [MAX_LEN];
-    pktfilter	*pf = new pktfilter ();
-    
-    // nothing quite like coding in assembly without the benefit of an assembler ;-)
-    
-    // ignore packets that don't have the right ethertype
-    
-    int i = 0;
-    inst[i++] = make_stmt (BPF_LD|BPF_H|BPF_ABS, 12);	// load ethertype
-    inst[i++] = make_jump (BPF_JMP|BPF_JEQ|BPF_K, ethertype, 1, 0);
-    inst[i++] = make_stmt (BPF_RET|BPF_K, 0);		// return 0 (ignore packet)
-    inst[i++] = make_stmt (BPF_RET|BPF_K, (unsigned) -1);	// return whole packet
-    
-    assert (i <= MAX_LEN);
-    
-    pf->d_inst = inst;
-    pf->d_len = i;
-    
-    return pf;
-  }
-  
-  /*
-   * Return a filter that harvests inbound packets with the specified ethertype.
-   * \param ethertype	the ethertype we're looking for
-   * \param our_mac 	our ethernet MAC address so we can avoid pkts we sent
-   */
-  pktfilter *
-  pktfilter::make_ethertype_inbound (unsigned short ethertype, const unsigned char *our_mac)
-  {
-    static const int MAX_LEN = 20;
-    sock_filter	*inst = new sock_filter [MAX_LEN];
-    pktfilter	*pf = new pktfilter ();
-    
-    __u16 smac_hi = (our_mac[0] << 8) | our_mac[1];
-    __u32 smac_lo = (our_mac[2] << 24) | (our_mac[3] << 16) | (our_mac[4] << 8) | our_mac[5];
-    
-    // nothing quite like coding in assembly without the benefit of an assembler ;-)
-    
-    // ignore packets that have a different ethertype
-    // and packets that have a source mac address == our_mac (packets we sent)
-    
-    int i = 0;
-    inst[i++] = make_stmt (BPF_LD|BPF_H|BPF_ABS, 12);	// load ethertype
-    inst[i++] = make_jump (BPF_JMP|BPF_JEQ|BPF_K, ethertype, 0, 5);
-    inst[i++] = make_stmt (BPF_LD|BPF_W|BPF_ABS, 8);	// load low 32-bit of src mac
-    inst[i++] = make_jump (BPF_JMP|BPF_JEQ|BPF_K, smac_lo, 0, 2);
-    inst[i++] = make_stmt (BPF_LD|BPF_H|BPF_ABS, 6);	// load high 16-bits of src mac
-    inst[i++] = make_jump (BPF_JMP|BPF_JEQ|BPF_K, smac_hi, 1, 0);
-    inst[i++] = make_stmt (BPF_RET|BPF_K, (unsigned) -1);	// return whole packet
-    inst[i++] = make_stmt (BPF_RET|BPF_K, 0);		// return 0 (ignore packet)
-    
-    assert (i <= MAX_LEN);
-    
-    pf->d_inst = inst;
-    pf->d_len = i;
-    
-    return pf;
-  }
-  /*
-   * Return a filter that harvests inbound packets with the specified ethertype and target USRP2 MAC address.
-   * \param ethertype	the ethertype we're looking for
-   * \param usrp_mac    our target USRP2 MAC address
-   */
-  pktfilter *
-  pktfilter::make_ethertype_inbound_target (unsigned short ethertype, const unsigned char *usrp_mac)
-  {
-    static const int MAX_LEN = 20;
-    sock_filter	*inst = new sock_filter [MAX_LEN];
-    pktfilter	*pf = new pktfilter ();
-
-    __u16 tmac_hi = (usrp_mac[0] << 8) | usrp_mac[1];
-    __u32 tmac_lo = (usrp_mac[2] << 24) | (usrp_mac[3] << 16) | (usrp_mac[4] << 8) | usrp_mac[5];
-    
-    // ignore packets that have a different ethertype
-    // and only return packets that have a source mac address == usrp_mac
-    
-    int i = 0;
-    inst[i++] = make_stmt (BPF_LD|BPF_H|BPF_ABS, 12);	// load ethertype
-    inst[i++] = make_jump (BPF_JMP|BPF_JEQ|BPF_K, ethertype, 0, 5);
-    inst[i++] = make_stmt (BPF_LD|BPF_W|BPF_ABS, 8);	// load low 32-bit of src mac
-    inst[i++] = make_jump (BPF_JMP|BPF_JEQ|BPF_K, tmac_lo, 0, 3);
-    inst[i++] = make_stmt (BPF_LD|BPF_H|BPF_ABS, 6);	// load high 16-bits of src mac
-    inst[i++] = make_jump (BPF_JMP|BPF_JEQ|BPF_K, tmac_hi, 0, 1);
-    inst[i++] = make_stmt (BPF_RET|BPF_K, (unsigned) -1);	// return whole packet
-    inst[i++] = make_stmt (BPF_RET|BPF_K, 0);		// return 0 (ignore packet)
-    
-    assert (i <= MAX_LEN);
-    
-    pf->d_inst = inst;
-    pf->d_len = i;
-    
-    return pf;
-  }
-  
-} // namespace usrp2
diff --git a/usrp2/host/lib/pktfilter.h b/usrp2/host/lib/pktfilter.h
deleted file mode 100644
index 09937ae34..000000000
--- a/usrp2/host/lib/pktfilter.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2007,2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_USRP2_PKTFILTER_H
-#define INCLUDED_USRP2_PKTFILTER_H
-
-struct sock_filter;
-
-namespace usrp2 {
-
-  /*
-   * \brief Compile programs for the Berkeley Packet Filter
-   */
-  class pktfilter {
-  public:
-    
-    unsigned		 d_len;		// # of instructions
-    struct sock_filter	*d_inst;	// the instructions
-    
-    pktfilter ();
-    ~pktfilter ();
-    
-    /*!
-     * \brief Return a filter that harvests packets with the specified ethertype.
-     * \param ethertype	the ethertype we're looking for.
-     */
-    static pktfilter *make_ethertype (unsigned short ethertype);
-    
-    /*!
-     * \brief Return a filter that harvests inbound packets with the specified ethertype.
-     * \param ethertype	the ethertype we're looking for
-     * \param our_mac 	our MAC address so we can avoid pkts we sent
-     */
-    static pktfilter *make_ethertype_inbound (unsigned short ethertype,
-					      const unsigned char *our_mac);
-
-    /*!
-     * \brief Return a filter that harvests inbound packets with the specified ethertype
-     *        and source MAC address
-     * \param ethertype	the ethertype we're looking for
-     * \param usrp_mac 	the source MAC address
-     */
-    static pktfilter *make_ethertype_inbound_target (unsigned short ethertype,
-						     const unsigned char *usrp_mac); 
-  };
-  
-} // namespace usrp2
-
-#endif /* INCLUDED_USRP2_PKTFILTER_H */
diff --git a/usrp2/host/lib/ring.cc b/usrp2/host/lib/ring.cc
deleted file mode 100644
index d0048418c..000000000
--- a/usrp2/host/lib/ring.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "ring.h"
-
-namespace usrp2 {
-
-  ring::ring(unsigned int entries)
-    : d_max(entries), d_read_ind(0), d_write_ind(0), d_ring(entries),
-      d_mutex(), d_not_empty()
-  {
-    for (unsigned int i = 0; i < entries; i++) {
-      d_ring[i].d_base = 0;
-      d_ring[i].d_len = 0;
-    }
-  }
-
-  void 
-  ring::wait_for_not_empty() 
-  { 
-    gruel::scoped_lock l(d_mutex);
-    while (empty()) 
-      d_not_empty.wait(l);
-  }
-
-  bool
-  ring::enqueue(void *p, size_t len)
-  {
-    gruel::scoped_lock l(d_mutex);
-    if (full())
-      return false;
-      
-    d_ring[d_write_ind].d_len = len;
-    d_ring[d_write_ind].d_base = p;
-
-    inc_write_ind();
-    d_not_empty.notify_one();
-    return true;
-  }
-
-  bool
-  ring::dequeue(void **p, size_t *len)
-  {
-    gruel::scoped_lock l(d_mutex);
-    if (empty())
-      return false;
-      
-    *p   = d_ring[d_read_ind].d_base;
-    *len = d_ring[d_read_ind].d_len;
-
-    inc_read_ind();
-    return true;
-  }
-  
-} // namespace usrp2
-
diff --git a/usrp2/host/lib/ring.h b/usrp2/host/lib/ring.h
deleted file mode 100644
index fd0ad0a9f..000000000
--- a/usrp2/host/lib/ring.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2010 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef INCLUDED_RING_H
-#define INCLUDED_RING_H
-
-#include <stddef.h>
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <gruel/thread.h>
-
-namespace usrp2 {
-
-  class ring;
-  typedef boost::shared_ptr<ring> ring_sptr;
-
-  class ring
-  {
-  private:
- 
-    size_t d_max;
-    size_t d_read_ind;
-    size_t d_write_ind;
-
-    struct ring_desc
-    {
-      void *d_base;
-      size_t d_len;
-    };
-    std::vector<ring_desc> d_ring;
-
-    gruel::mutex d_mutex;
-    gruel::condition_variable d_not_empty;
-
-    void inc_read_ind()
-    {
-      if (d_read_ind + 1 >= d_max)
-	d_read_ind = 0;
-      else
-	d_read_ind = d_read_ind + 1;
-    }
-
-    void inc_write_ind()
-    {
-      if (d_write_ind + 1 >= d_max)
-	d_write_ind = 0;
-      else
-	d_write_ind = d_write_ind + 1;
-    }
-        
-    bool empty() const { return d_read_ind == d_write_ind; }
-    bool full() const { return (d_write_ind+1)%d_max == d_read_ind; }
-
-  public:
-    
-    ring(unsigned int entries);
-
-    void wait_for_not_empty();
-
-    bool enqueue(void *p, size_t len);
-    bool dequeue(void **p, size_t *len);
-  };
-
-}  // namespace usrp2
-
-#endif /* INCLUDED_RING_H */
diff --git a/usrp2/host/lib/rx_nop_handler.cc b/usrp2/host/lib/rx_nop_handler.cc
deleted file mode 100644
index 96c9164a5..000000000
--- a/usrp2/host/lib/rx_nop_handler.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2/rx_nop_handler.h>
-
-namespace usrp2 {
-
-  rx_nop_handler::~rx_nop_handler()
-  {
-  }
-
-} // namespace usrp2
-
diff --git a/usrp2/host/lib/rx_sample_handler.cc b/usrp2/host/lib/rx_sample_handler.cc
deleted file mode 100644
index 4521025cb..000000000
--- a/usrp2/host/lib/rx_sample_handler.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <usrp2/rx_sample_handler.h>
-
-usrp2::rx_sample_handler::~rx_sample_handler()
-{
-  // nop
-}
diff --git a/usrp2/host/lib/strtod_si.c b/usrp2/host/lib/strtod_si.c
deleted file mode 100644
index 5e5deb2b6..000000000
--- a/usrp2/host/lib/strtod_si.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2007 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <usrp2/strtod_si.h>
-#include <stdlib.h>
-
-#define true  1
-#define false 0
-
-int
-strtod_si(const char *s, double *result)
-{
-  *result = 0;
-
-  char *endptr;
-  double r = strtod(s, &endptr);
-  if (s == endptr)
-    return false;
-
-  switch (*endptr){
-  case 'p': r *= 1e-12; break;
-  case 'n': r *= 1e-9;  break;
-  case 'u': r *= 1e-6;  break;
-  case 'm': r *= 1e-3;  break;
-  case 'k': r *= 1e3;   break;
-  case 'M': r *= 1e6;   break;
-  case 'G': r *= 1e9;   break;
-  case 'T': r *= 1e12;  break;
-  default:
-    // ignore. FIXME could be more robust
-    break;
-  }
-
-  *result = r;
-  return true;
-}
-
-
diff --git a/usrp2/host/lib/usrp2.cc b/usrp2/host/lib/usrp2.cc
deleted file mode 100644
index 0842482e4..000000000
--- a/usrp2/host/lib/usrp2.cc
+++ /dev/null
@@ -1,504 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2/usrp2.h>
-#include "usrp2_impl.h"
-#include <vector>
-#include <boost/thread.hpp>
-#include <boost/weak_ptr.hpp>
-#include <string>
-#include <stdexcept>
-#include <cstdio>
-
-namespace usrp2 {
-
-  // --- Table of weak pointers to usrps we know about ---
-
-  // (Could be cleaned up and turned into a template)
-
-  struct usrp_table_entry {
-    // inteface + normalized mac addr ("eth0:01:23:45:67:89:ab")
-    std::string	key;
-    boost::weak_ptr<usrp2>  value;
-
-    usrp_table_entry(const std::string &_key, boost::weak_ptr<usrp2> _value)
-      : key(_key), value(_value) {}
-  };
-
-  typedef std::vector<usrp_table_entry> usrp_table;
-
-  static boost::mutex s_table_mutex;
-  static usrp_table s_table;
-
-  usrp2::sptr
-  usrp2::find_existing_or_make_new(const std::string &ifc, props *pr, size_t rx_bufsize)
-  {
-    std::string key = ifc + ":" + pr->addr;
-
-    boost::mutex::scoped_lock	guard(s_table_mutex);
-
-    for (usrp_table::iterator p = s_table.begin(); p != s_table.end();){
-      if (p->value.expired())	// weak pointer is now dead
-	p = s_table.erase(p);	// erase it
-      else {
-	if (key == p->key)	// found it
-	  return usrp2::sptr(p->value);
-	else
-	  ++p;			// keep looking
-      }
-    }
-
-    // We don't have the USRP2 we're looking for
-
-    // create a new one and stick it in the table.
-    usrp2::sptr r(new usrp2(ifc, pr, rx_bufsize));
-    usrp_table_entry t(key, r);
-    s_table.push_back(t);
-
-    return r;
-  }
-
-  // --- end of table code ---
-
-  static bool
-  parse_mac_addr(const std::string &s, std::string &ns)
-  {
-    u2_mac_addr_t p;
-
-    p.addr[0] = 0x00;		// Matt's IAB
-    p.addr[1] = 0x50;
-    p.addr[2] = 0xC2;
-    p.addr[3] = 0x85;
-    p.addr[4] = 0x30;
-    p.addr[5] = 0x00;
-
-    int len = s.size();
-    switch (len) {
-
-    case 5:
-      if (sscanf(s.c_str(), "%hhx:%hhx", &p.addr[4], &p.addr[5]) != 2)
-	return false;
-      break;
-
-    case 17:
-      if (sscanf(s.c_str(), "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-		 &p.addr[0], &p.addr[1], &p.addr[2],
-		 &p.addr[3], &p.addr[4], &p.addr[5]) != 6)
-	return false;
-      break;
-
-    default:
-      return false;
-    }
-
-    char buf[128];
-    snprintf(buf, sizeof(buf),
-	     "%02x:%02x:%02x:%02x:%02x:%02x",
-	     p.addr[0],p.addr[1],p.addr[2],
-	     p.addr[3],p.addr[4],p.addr[5]);
-    ns = std::string(buf);
-    return true;
-  }
-
-  usrp2::sptr
-  usrp2::make(const std::string &ifc, const std::string &addr, size_t rx_bufsize)
-  {
-    std::string naddr = "";
-    if (addr != "" && !parse_mac_addr(addr, naddr))
-      throw std::runtime_error("Invalid MAC address");
-
-    props_vector_t u2s = find(ifc, naddr);
-    int n = u2s.size();
-
-    if (n == 0) {
-      if (addr == "")
-	throw std::runtime_error("No USRPs found on interface " + ifc);
-      else
-	throw std::runtime_error("No USRP found with addr " + addr + " on interface " + ifc);
-    }
-
-    if (n > 1)
-      throw std::runtime_error("Multiple USRPs found on interface; must select by MAC address.");
-
-    return find_existing_or_make_new(ifc, &u2s[0], rx_bufsize);
-  }
-
-  // Private constructor.  Sole function is to create an impl.
-  usrp2::usrp2(const std::string &ifc, props *p, size_t rx_bufsize)
-    : d_impl(new usrp2::impl(ifc, p, rx_bufsize))
-  {
-    // NOP
-  }
-
-  // Public class destructor.  d_impl will auto-delete.
-  usrp2::~usrp2()
-  {
-    // NOP
-  }
-
-  std::string
-  usrp2::mac_addr()
-  {
-    return d_impl->mac_addr();
-  }
-
-  std::string
-  usrp2::interface_name()
-  {
-    return d_impl->interface_name();
-  }
-
-  // Receive
-
-  bool
-  usrp2::set_rx_antenna(int ant){
-    return d_impl->set_rx_antenna(ant);
-  }
-
-  bool
-  usrp2::set_rx_gain(double gain)
-  {
-    return d_impl->set_rx_gain(gain);
-  }
-
-  double
-  usrp2::rx_gain_min()
-  {
-    return d_impl->rx_gain_min();
-  }
-
-  double
-  usrp2::rx_gain_max()
-  {
-    return d_impl->rx_gain_max();
-  }
-
-  double
-  usrp2::rx_gain_db_per_step()
-  {
-    return d_impl->rx_gain_db_per_step();
-  }
-
-  bool
-  usrp2::set_rx_lo_offset(double frequency)
-  {
-    return d_impl->set_rx_lo_offset(frequency);
-  }
-
-  bool
-  usrp2::set_rx_center_freq(double frequency, tune_result *result)
-  {
-    return d_impl->set_rx_center_freq(frequency, result);
-  }
-
-  double
-  usrp2::rx_freq_min()
-  {
-    return d_impl->rx_freq_min();
-  }
-
-  double
-  usrp2::rx_freq_max()
-  {
-    return d_impl->rx_freq_max();
-  }
-
-  bool
-  usrp2::set_rx_decim(int decimation_factor)
-  {
-    return d_impl->set_rx_decim(decimation_factor);
-  }
-
-  int
-  usrp2::rx_decim()
-  {
-    return d_impl->rx_decim();
-  }
-
-  bool
-  usrp2::set_rx_scale_iq(int scale_i, int scale_q)
-  {
-    return d_impl->set_rx_scale_iq(scale_i, scale_q);
-  }
-
-  bool
-  usrp2::start_rx_streaming(unsigned int channel, unsigned int items_per_frame)
-  {
-    return d_impl->start_rx_streaming(channel, items_per_frame);
-  }
-
-  bool
-  usrp2::start_rx_streaming_at(unsigned int channel, unsigned int items_per_frame, unsigned int time)
-  {
-    return d_impl->start_rx_streaming_at(channel, items_per_frame,time);
-  }
-
-  bool
-  usrp2::sync_and_start_rx_streaming_at(unsigned int channel, unsigned int items_per_frame, unsigned int time)
-  {
-    return d_impl->sync_and_start_rx_streaming_at(channel, items_per_frame, time);
-  }
-
-  bool
-  usrp2::rx_samples(unsigned int channel, rx_sample_handler *handler)
-  {
-    return d_impl->rx_samples(channel, handler);
-  }
-
-  bool
-  usrp2::stop_rx_streaming(unsigned int channel)
-  {
-    return d_impl->stop_rx_streaming(channel);
-  }
-
-  unsigned int
-  usrp2::rx_overruns()
-  {
-    return d_impl->rx_overruns();
-  }
-
-  unsigned int
-  usrp2::rx_missing()
-  {
-    return d_impl->rx_missing();
-  }
-
-  // Transmit
-
-  bool
-  usrp2::set_tx_antenna(int ant){
-    return d_impl->set_tx_antenna(ant);
-  }
-
-  bool
-  usrp2::set_tx_gain(double gain)
-  {
-    return d_impl->set_tx_gain(gain);
-  }
-
-  double
-  usrp2::tx_gain_min()
-  {
-    return d_impl->tx_gain_min();
-  }
-
-  double
-  usrp2::tx_gain_max()
-  {
-    return d_impl->tx_gain_max();
-  }
-
-  double
-  usrp2::tx_gain_db_per_step()
-  {
-    return d_impl->tx_gain_db_per_step();
-  }
-
-  bool
-  usrp2::set_tx_lo_offset(double frequency)
-  {
-    return d_impl->set_tx_lo_offset(frequency);
-  }
-
-  bool
-  usrp2::set_tx_center_freq(double frequency, tune_result *result)
-  {
-    return d_impl->set_tx_center_freq(frequency, result);
-  }
-
-  double
-  usrp2::tx_freq_min()
-  {
-    return d_impl->tx_freq_min();
-  }
-
-  double
-  usrp2::tx_freq_max()
-  {
-    return d_impl->tx_freq_max();
-  }
-
-
-  bool
-  usrp2::set_tx_interp(int interpolation_factor)
-  {
-    return d_impl->set_tx_interp(interpolation_factor);
-  }
-
-  int
-  usrp2::tx_interp()
-  {
-    return d_impl->tx_interp();
-  }
-
-  void
-  usrp2::default_tx_scale_iq(int interpolation_factor, int *scale_i, int *scale_q)
-  {
-    d_impl->default_tx_scale_iq(interpolation_factor, scale_i, scale_q);
-  }
-
-  bool
-  usrp2::set_tx_scale_iq(int scale_i, int scale_q)
-  {
-    return d_impl->set_tx_scale_iq(scale_i, scale_q);
-  }
-
-  bool
-  usrp2::tx_32fc(unsigned int channel,
-		 const std::complex<float> *samples,
-		 size_t nsamples,
-		 const tx_metadata *metadata)
-  {
-    return d_impl->tx_32fc(channel, samples, nsamples, metadata);
-  }
-
-  bool
-  usrp2::tx_16sc(unsigned int channel,
-		 const std::complex<int16_t> *samples,
-		 size_t nsamples,
-		 const tx_metadata *metadata)
-  {
-    return d_impl->tx_16sc(channel, samples, nsamples, metadata);
-  }
-
-  bool
-  usrp2::tx_raw(unsigned int channel,
-		const uint32_t *items,
-		size_t nitems,
-		const tx_metadata *metadata)
-  {
-    return d_impl->tx_raw(channel, items, nitems, metadata);
-  }
-
-  // miscellaneous methods
-
-  bool
-  usrp2::config_mimo(int flags)
-  {
-    return d_impl->config_mimo(flags);
-  }
-
-  bool
-  usrp2::fpga_master_clock_freq(long *freq)
-  {
-    return d_impl->fpga_master_clock_freq(freq);
-  }
-
-  bool
-  usrp2::adc_rate(long *rate)
-  {
-    return d_impl->adc_rate(rate);
-  }
-
-  bool
-  usrp2::dac_rate(long *rate)
-  {
-    return d_impl->dac_rate(rate);
-  }
-
-  bool
-  usrp2::tx_daughterboard_id(int *dbid)
-  {
-    return d_impl->tx_daughterboard_id(dbid);
-  }
-
-  bool
-  usrp2::rx_daughterboard_id(int *dbid)
-  {
-    return d_impl->rx_daughterboard_id(dbid);
-  }
-
-
-  // low level methods
-
-  bool
-  usrp2::burn_mac_addr(const std::string &new_addr)
-  {
-    return d_impl->burn_mac_addr(new_addr);
-  }
-
-  bool
-  usrp2::sync_to_pps()
-  {
-    return d_impl->sync_to_pps();
-  }
-
-  bool
-  usrp2::sync_every_pps(bool enable)
-  {
-    return d_impl->sync_every_pps(enable);
-  }
-
-  std::vector<uint32_t>
-  usrp2::peek32(uint32_t addr, uint32_t words)
-  {
-    return d_impl->peek32(addr, words);
-  }
-
-  bool
-  usrp2::poke32(uint32_t addr, const std::vector<uint32_t> &data)
-  {
-    return d_impl->poke32(addr, data);
-  }
-
-  bool
-  usrp2::set_gpio_ddr(int bank, uint16_t value, uint16_t mask)
-  {
-    return d_impl->set_gpio_ddr(bank, value, mask);
-  }
-
-  bool
-  usrp2::set_gpio_sels(int bank, std::string src)
-  {
-    return d_impl->set_gpio_sels(bank, src);
-  }
-
-  bool
-  usrp2::write_gpio(int bank, uint16_t value, uint16_t mask)
-  {
-    return d_impl->write_gpio(bank, value, mask);
-  }
-
-  bool
-  usrp2::read_gpio(int bank, uint16_t *value)
-  {
-    return d_impl->read_gpio(bank, value);
-  }
-
-  bool
-  usrp2::enable_gpio_streaming(int bank, int enable)
-  {
-    return d_impl->enable_gpio_streaming(bank, enable);
-  }
-
-} // namespace usrp2
-
-std::ostream& operator<<(std::ostream &os, const usrp2::props &x)
-{
-  os << x.addr;
-
-  char buf[128];
-  snprintf(buf, sizeof(buf)," hw_rev = 0x%04x", x.hw_rev);
-
-  os << buf;
-  return os;
-}
diff --git a/usrp2/host/lib/usrp2_bytesex.h b/usrp2/host/lib/usrp2_bytesex.h
deleted file mode 100644
index 4f63d0793..000000000
--- a/usrp2/host/lib/usrp2_bytesex.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <gruel/inet.h>
diff --git a/usrp2/host/lib/usrp2_impl.cc b/usrp2/host/lib/usrp2_impl.cc
deleted file mode 100644
index 333e2d1e7..000000000
--- a/usrp2/host/lib/usrp2_impl.cc
+++ /dev/null
@@ -1,1667 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009,2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <usrp2/usrp2.h>
-#include <usrp2/tune_result.h>
-#include <usrp2/copiers.h>
-#include <gruel/inet.h>
-#include <gruel/realtime.h>
-#include <boost/bind.hpp>
-#include <usrp2_types.h>
-#include "usrp2_impl.h"
-#include "eth_buffer.h"
-#include "pktfilter.h"
-#include "control.h"
-#include "ring.h"
-#include <stdexcept>
-#include <iostream>
-#include <stdio.h>
-#include <stddef.h>
-#include <assert.h>
-#include <string.h>
-
-#define USRP2_IMPL_DEBUG 0
-#if USRP2_IMPL_DEBUG
-#define DEBUG_LOG(x) ::write(2, x, 1)
-#else
-#define DEBUG_LOG(x)
-#endif
-
-static const int DEFAULT_RX_SCALE = 1024;
-
-namespace usrp2 {
-
-  static const double DEF_CMD_TIMEOUT = 0.1;
-
-  std::string
-  opcode_to_string(int opcode)
-  {
-    switch(opcode){
-    case OP_EOP: return "OP_EOP";
-    case OP_ID: return "OP_ID";
-    case OP_ID_REPLY: return "OP_ID_REPLY";
-    case OP_BURN_MAC_ADDR: return "OP_BURN_MAC_ADDR";
-    case OP_READ_TIME: return "OP_READ_TIME";
-    case OP_READ_TIME_REPLY: return "OP_READ_TIME_REPLY";
-    case OP_CONFIG_RX_V2: return "OP_CONFIG_RX_V2";
-    case OP_CONFIG_RX_REPLY_V2: return "OP_CONFIG_RX_REPLY_V2";
-    case OP_CONFIG_TX_V2: return "OP_CONFIG_TX_V2";
-    case OP_CONFIG_TX_REPLY_V2: return "OP_CONFIG_TX_REPLY_V2";
-    case OP_START_RX_STREAMING: return "OP_START_RX_STREAMING";
-    case OP_STOP_RX: return "OP_STOP_RX";
-    case OP_CONFIG_MIMO: return "OP_CONFIG_MIMO";
-    case OP_DBOARD_INFO: return "OP_DBOARD_INFO";
-    case OP_DBOARD_INFO_REPLY: return "OP_DBOARD_INFO_REPLY";
-    case OP_SYNC_TO_PPS: return "OP_SYNC_TO_PPS";
-    case OP_PEEK: return "OP_PEEK";
-    case OP_PEEK_REPLY: return "OP_PEEK_REPLY";
-    case OP_SET_TX_LO_OFFSET: return "OP_SET_TX_LO_OFFSET";
-    case OP_SET_TX_LO_OFFSET_REPLY: return "OP_SET_TX_LO_OFFSET_REPLY";
-    case OP_SET_RX_LO_OFFSET: return "OP_SET_RX_LO_OFFSET";
-    case OP_SET_RX_LO_OFFSET_REPLY: return "OP_SET_RX_LO_OFFSET_REPLY";
-    case OP_SYNC_EVERY_PPS: return "OP_SYNC_EVERY_PPS";
-    case OP_SYNC_EVERY_PPS_REPLY: return "OP_SYNC_EVERY_PPS_REPLY";
-
-    default:
-      char buf[64];
-      snprintf(buf, sizeof(buf), "<unknown opcode: %d>", opcode);
-      return buf;
-    }
-  }
-
-
-  /*!
-   * \param p points to fixed header
-   * \param payload_len_in_bytes is length of the fixed hdr and the payload
-   * \param[out] items is set to point to the first uint32 item in the payload
-   * \param[out] nitems is set to the number of uint32 items in the payload
-   * \param[out] md is filled in with the parsed metadata from the frame.
-   */
-  static bool
-  parse_rx_metadata(void *p, size_t payload_len_in_bytes,
-		    uint32_t **items, size_t *nitems_in_uint32s, rx_metadata *md)
-  {
-    if (payload_len_in_bytes < sizeof(u2_fixed_hdr_t))	// invalid format
-      return false;
-
-    // FIXME deal with the fact that (p % 4) == 2
-    //assert((((uintptr_t) p) % 4) == 0);		// must be 4-byte aligned
-
-    u2_fixed_hdr_t *fh = static_cast<u2_fixed_hdr_t *>(p);
-
-    // FIXME unaligned loads!
-    md->word0 = u2p_word0(fh);
-    md->timestamp = u2p_timestamp(fh);
-
-    // FIXME when we've got more info
-    // md->start_of_burst = (md->word0 & XXX) != 0;
-    // md->end_of_burst =   (md->word0 & XXX) != 0;
-    // md->rx_overrun =     (md->word0 & XXX) != 0;
-    md->start_of_burst = 0;
-    md->end_of_burst =   0;
-    md->rx_overrun =     0;
-
-    *items = (uint32_t *)(&fh[1]);
-    size_t nbytes = payload_len_in_bytes - sizeof(u2_fixed_hdr_t);
-    assert((nbytes % sizeof(uint32_t)) == 0);
-    *nitems_in_uint32s = nbytes / sizeof(uint32_t);
-
-    return true;
-  }
-
-
-  usrp2::impl::impl(const std::string &ifc, props *p, size_t rx_bufsize)
-    : d_eth_buf(new eth_buffer(rx_bufsize)), d_interface_name(ifc), d_pf(0),
-      d_bg_running(false), d_rx_seqno(-1), d_tx_seqno(0), d_next_rid(0),
-      d_num_rx_frames(0), d_num_rx_missing(0), d_num_rx_overruns(0), d_num_rx_bytes(0),
-      d_num_enqueued(0), d_enqueued_mutex(), d_bg_pending_cond(),
-      d_channel_rings(NCHANS), d_tx_interp(0), d_rx_decim(0), d_dont_enqueue(true)
-  {
-    if (!d_eth_buf->open(ifc, htons(U2_ETHERTYPE)))
-      throw std::runtime_error("Unable to register USRP2 protocol");
-
-    d_addr = p->addr;
-
-    // Create a packet filter for U2_ETHERTYPE packets sourced from target USRP2
-    u2_mac_addr_t usrp_mac;
-    parse_mac_addr(d_addr, &usrp_mac);
-    d_pf = pktfilter::make_ethertype_inbound_target(U2_ETHERTYPE, (const unsigned char*)&(usrp_mac.addr));
-    if (!d_pf || !d_eth_buf->attach_pktfilter(d_pf))
-      throw std::runtime_error("Unable to attach packet filter.");
-
-    if (USRP2_IMPL_DEBUG)
-      std::cerr << "usrp2 constructor: using USRP2 at " << d_addr << std::endl;
-
-    memset(d_pending_replies, 0, sizeof(d_pending_replies));
-
-    // Kick off receive thread
-    start_bg();
-
-    // In case the USRP2 was left streaming RX
-    // FIXME: only one channel right now
-    stop_rx_streaming(0);
-
-    if (!dboard_info())		// we're hosed
-      throw std::runtime_error("Unable to retrieve daughterboard info");
-
-    if (0){
-      int dbid;
-
-      tx_daughterboard_id(&dbid);
-      fprintf(stderr, "Tx dboard 0x%x\n", dbid);
-      fprintf(stderr, "  freq_min = %g\n", tx_freq_min());
-      fprintf(stderr, "  freq_max = %g\n", tx_freq_max());
-      fprintf(stderr, "  gain_min = %g\n", tx_gain_min());
-      fprintf(stderr, "  gain_max = %g\n", tx_gain_max());
-      fprintf(stderr, "  gain_db_per_step = %g\n", tx_gain_db_per_step());
-
-      rx_daughterboard_id(&dbid);
-      fprintf(stderr, "Rx dboard 0x%x\n", dbid);
-      fprintf(stderr, "  freq_min = %g\n", rx_freq_min());
-      fprintf(stderr, "  freq_max = %g\n", rx_freq_max());
-      fprintf(stderr, "  gain_min = %g\n", rx_gain_min());
-      fprintf(stderr, "  gain_max = %g\n", rx_gain_max());
-      fprintf(stderr, "  gain_db_per_step = %g\n", rx_gain_db_per_step());
-    }
-
-    // Ensure any custom values in hardware are cleared
-    if (!reset_db())
-      std::cerr << "usrp2::ctor reset_db failed\n";
-
-    // default gains to mid point
-    if (!set_tx_gain((tx_gain_min() + tx_gain_max()) / 2))
-      std::cerr << "usrp2::ctor set_tx_gain failed\n";
-
-    if (!set_rx_gain((rx_gain_min() + rx_gain_max()) / 2))
-      std::cerr << "usrp2::ctor set_rx_gain failed\n";
-
-    // default interp and decim
-    if (!set_tx_interp(12))
-      std::cerr << "usrp2::ctor set_tx_interp failed\n";
-
-    if (!set_rx_decim(12))
-      std::cerr << "usrp2::ctor set_rx_decim failed\n";
-
-    // set workable defaults for scaling
-    if (!set_rx_scale_iq(DEFAULT_RX_SCALE, DEFAULT_RX_SCALE))
-      std::cerr << "usrp2::ctor set_rx_scale_iq failed\n";
-  }
-
-  usrp2::impl::~impl()
-  {
-    stop_bg();
-    delete d_pf;
-    d_eth_buf->close();
-    delete d_eth_buf;
-
-    if (USRP2_IMPL_DEBUG) {
-      std::cerr << std::endl
-                << "usrp2 destructor: received " << d_num_rx_frames
-		<< " frames, with " << d_num_rx_missing << " lost ("
-		<< (d_num_rx_frames == 0 ? 0 : (int)(100.0*d_num_rx_missing/d_num_rx_frames))
-		<< "%), totaling " << d_num_rx_bytes
-		<< " bytes" << std::endl;
-    }
-  }
-
-  bool
-  usrp2::impl::parse_mac_addr(const std::string &s, u2_mac_addr_t *p)
-  {
-    p->addr[0] = 0x00;		// Matt's IAB
-    p->addr[1] = 0x50;
-    p->addr[2] = 0xC2;
-    p->addr[3] = 0x85;
-    p->addr[4] = 0x30;
-    p->addr[5] = 0x00;
-
-    int len = s.size();
-
-    switch (len){
-
-    case 5:
-      return sscanf(s.c_str(), "%hhx:%hhx", &p->addr[4], &p->addr[5]) == 2;
-
-    case 17:
-      return sscanf(s.c_str(), "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-		    &p->addr[0], &p->addr[1], &p->addr[2],
-		    &p->addr[3], &p->addr[4], &p->addr[5]) == 6;
-    default:
-      return false;
-    }
-  }
-
-  void
-  usrp2::impl::init_et_hdrs(u2_eth_packet_t *p, const std::string &dst)
-  {
-    p->ehdr.ethertype = htons(U2_ETHERTYPE);
-    parse_mac_addr(dst, &p->ehdr.dst);
-    memcpy(&p->ehdr.src, d_eth_buf->mac(), 6);
-    p->thdr.flags = 0; // FIXME transport header values?
-    p->thdr.seqno = d_tx_seqno++;
-    p->thdr.ack = 0;
-  }
-
-  void
-  usrp2::impl::init_etf_hdrs(u2_eth_packet_t *p, const std::string &dst,
-			     int word0_flags, int chan, uint32_t timestamp)
-  {
-    init_et_hdrs(p, dst);
-    u2p_set_word0(&p->fixed, word0_flags, chan);
-    u2p_set_timestamp(&p->fixed, timestamp);
-
-    if (chan == CONTROL_CHAN) { // no sequence numbers, back it out
-      p->thdr.seqno = 0;
-      d_tx_seqno--;
-    }
-  }
-
-  void
-  usrp2::impl::init_config_rx_v2_cmd(op_config_rx_v2_cmd *cmd)
-  {
-    memset(cmd, 0, sizeof(*cmd));
-    init_etf_hdrs(&cmd->h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd->op.opcode = OP_CONFIG_RX_V2;
-    cmd->op.len = sizeof(cmd->op);
-    cmd->op.rid = d_next_rid++;
-    cmd->eop.opcode = OP_EOP;
-    cmd->eop.len = sizeof(cmd->eop);
-  }
-
-  void
-  usrp2::impl::init_config_tx_v2_cmd(op_config_tx_v2_cmd *cmd)
-  {
-    memset(cmd, 0, sizeof(*cmd));
-    init_etf_hdrs(&cmd->h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd->op.opcode = OP_CONFIG_TX_V2;
-    cmd->op.len = sizeof(cmd->op);
-    cmd->op.rid = d_next_rid++;
-    cmd->eop.opcode = OP_EOP;
-    cmd->eop.len = sizeof(cmd->eop);
-  }
-
-
-  bool
-  usrp2::impl::transmit_cmd(void *cmd_, size_t len_)
-  {
-    const void *cmd = cmd_;
-    int len = len_;
-    unsigned char tmp[64];
-
-    if (len_ < 64){		// pad to minimum ethernet frame size
-      memset(tmp, 0, sizeof(tmp));
-      memcpy(tmp, cmd_, len_);
-      cmd = tmp;
-      len = sizeof(tmp);
-    }
-
-    return d_eth_buf->tx_frame(cmd, len) == eth_buffer::EB_OK;
-  }
-
-  bool
-  usrp2::impl::transmit_cmd_and_wait(void *cmd, size_t len, pending_reply *p, double secs)
-  {
-    d_pending_replies[p->rid()] = p;
-
-    if (!transmit_cmd(cmd, len)){
-      d_pending_replies[p->rid()] = 0;
-      return false;
-    }
-
-    int res = p->wait_for_completion(secs);
-    d_pending_replies[p->rid()] = 0;
-    return res == 1;
-  }
-
-  // ----------------------------------------------------------------
-  //        Background loop: received packet demuxing
-  // ----------------------------------------------------------------
-
-  void
-  usrp2::impl::start_bg()
-  {
-    d_rx_tg.create_thread(boost::bind(&usrp2::impl::bg_loop, this));
-  }
-
-  void
-  usrp2::impl::stop_bg()
-  {
-    d_bg_running = false;
-    d_bg_pending_cond.notify_one(); // FIXME: check if needed
-    d_rx_tg.join_all();
-  }
-
-  void
-  usrp2::impl::bg_loop()
-  {
-    gruel::enable_realtime_scheduling();
-
-    d_bg_running = true;
-    while(d_bg_running) {
-      DEBUG_LOG(":");
-      // Receive available frames from ethernet buffer.  Handler will
-      // process control frames, enqueue data packets in channel
-      // rings, and signal blocked API threads
-      int res = d_eth_buf->rx_frames(this, 100); // FIXME magic timeout
-      if (res == eth_buffer::EB_ERROR)
-	break;
-
-      // Wait for user API thread(s) to process all enqueued packets.
-      // The channel ring thread that decrements d_num_enqueued to zero
-      // will signal this thread to continue.
-      {
-        gruel::scoped_lock l(d_enqueued_mutex);
-        while(d_num_enqueued > 0 && d_bg_running)
-	  d_bg_pending_cond.wait(l);
-      }
-    }
-    d_bg_running = false;
-  }
-
-  //
-  // passed to eth_buffer::rx_frames
-  //
-  data_handler::result
-  usrp2::impl::operator()(const void *base, size_t len)
-  {
-    u2_eth_samples_t *pkt = (u2_eth_samples_t *)base;
-
-    // FIXME unaligned load!
-    int chan = u2p_chan(&pkt->hdrs.fixed);
-
-    if (chan == CONTROL_CHAN) {	        // control packets
-      DEBUG_LOG("c");
-      return handle_control_packet(base, len);
-    }
-    else {				// data packets
-
-      if (d_dont_enqueue)		// toss packet
-	return data_handler::RELEASE;
-
-      return handle_data_packet(base, len);
-    }
-
-    // not reached
-  }
-
-  data_handler::result
-  usrp2::impl::handle_control_packet(const void *base, size_t len)
-  {
-    // point to beginning of payload (subpackets)
-    unsigned char *p = (unsigned char *)base + sizeof(u2_eth_packet_t);
-
-    // FIXME (p % 4) == 2.  Not good.  Must watch for unaligned loads.
-
-    // FIXME iterate over payload, handling more than a single subpacket.
-
-    int opcode = p[0];
-    unsigned int oplen = p[1];
-    unsigned int rid = p[2];
-
-    pending_reply *rp = d_pending_replies[rid];
-    if (rp) {
-      unsigned int buflen = rp->len();
-      if (oplen != buflen) {
-	std::cerr << "usrp2: mismatched command reply length (expected: "
-		  << buflen << " got: " << oplen << "). "
-		  << "op = " << opcode_to_string(opcode) << std::endl;
-      }
-
-      // Copy reply into caller's buffer
-      memcpy(rp->buffer(), p, std::min(oplen, buflen));
-      rp->notify_completion();
-      d_pending_replies[rid] = 0;
-      return data_handler::RELEASE;
-    }
-
-    // TODO: handle unsolicited, USRP2 initiated, or late replies
-    DEBUG_LOG("l");
-    return data_handler::RELEASE;
-  }
-
-  data_handler::result
-  usrp2::impl::handle_data_packet(const void *base, size_t len)
-  {
-    u2_eth_samples_t *pkt = (u2_eth_samples_t *)base;
-    d_num_rx_frames++;
-    d_num_rx_bytes += len;
-
-    /* --- FIXME start of fake transport layer handler --- */
-
-    if (d_rx_seqno != -1) {
-      int expected_seqno = (d_rx_seqno + 1) & 0xFF;
-      int seqno = pkt->hdrs.thdr.seqno;
-
-      if (seqno != expected_seqno) {
-	::write(2, "S", 1); // missing sequence number
-	int missing = seqno - expected_seqno;
-	if (missing < 0)
-	  missing += 256;
-
-	d_num_rx_overruns++;
-	d_num_rx_missing += missing;
-      }
-    }
-
-    d_rx_seqno = pkt->hdrs.thdr.seqno;
-
-    /* --- end of fake transport layer handler --- */
-
-    // FIXME unaligned load!
-    unsigned int chan = u2p_chan(&pkt->hdrs.fixed);
-
-    {
-      gruel::scoped_lock l(d_channel_rings_mutex);
-
-      if (!d_channel_rings[chan]) {
-	DEBUG_LOG("!");
-	return data_handler::RELEASE; 	// discard packet, no channel handler
-      }
-
-      // Strip off ethernet header and transport header and enqueue the rest
-
-      size_t offset = offsetof(u2_eth_samples_t, hdrs.fixed);
-      if (d_channel_rings[chan]->enqueue(&pkt->hdrs.fixed, len-offset)) {
-	inc_enqueued();
-	DEBUG_LOG("+");
-	return data_handler::KEEP;	// channel ring runner will mark frame done
-      }
-      else {
-	DEBUG_LOG("!");
-	return data_handler::RELEASE;	// discard, no room in channel ring
-      }
-      return data_handler::RELEASE;
-    }
-  }
-
-
-  // ----------------------------------------------------------------
-  // 			       Receive
-  // ----------------------------------------------------------------
-
-  bool
-  usrp2::impl::set_rx_antenna(int ant){
-    op_config_mimo_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_RX_ANTENNA;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.op.flags = ant;
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    return ntohx(reply.ok) == 1;
-  }
-
-  bool
-  usrp2::impl::set_rx_gain(double gain)
-  {
-    op_config_rx_v2_cmd cmd;
-    op_config_rx_reply_v2_t reply;
-
-    init_config_rx_v2_cmd(&cmd);
-    cmd.op.valid = htons(CFGV_GAIN);
-    cmd.op.gain = htons(u2_double_to_fxpt_gain(gain));
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  bool
-  usrp2::impl::set_rx_lo_offset(double frequency)
-  {
-    op_freq_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_SET_RX_LO_OFFSET;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-
-    u2_fxpt_freq_t fxpt = u2_double_to_fxpt_freq(frequency);
-    cmd.op.freq_hi = htonl(u2_fxpt_freq_hi(fxpt));
-    cmd.op.freq_lo = htonl(u2_fxpt_freq_lo(fxpt));
-
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  bool
-  usrp2::impl::set_rx_center_freq(double frequency, tune_result *result)
-  {
-    op_config_rx_v2_cmd cmd;
-    op_config_rx_reply_v2_t reply;
-
-    init_config_rx_v2_cmd(&cmd);
-    cmd.op.valid = htons(CFGV_FREQ);
-    u2_fxpt_freq_t fxpt = u2_double_to_fxpt_freq(frequency);
-    cmd.op.freq_hi = htonl(u2_fxpt_freq_hi(fxpt));
-    cmd.op.freq_lo = htonl(u2_fxpt_freq_lo(fxpt));
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    if (result && success) {
-      result->baseband_freq =
-        u2_fxpt_freq_to_double(
-	  u2_fxpt_freq_from_hilo(ntohl(reply.baseband_freq_hi),
-				 ntohl(reply.baseband_freq_lo)));
-
-      result->dxc_freq =
-        u2_fxpt_freq_to_double(
-	  u2_fxpt_freq_from_hilo(ntohl(reply.ddc_freq_hi),
-				 ntohl(reply.ddc_freq_lo)));
-
-      result->residual_freq =
-        u2_fxpt_freq_to_double(
-	 u2_fxpt_freq_from_hilo(ntohl(reply.residual_freq_hi),
-				ntohl(reply.residual_freq_lo)));
-
-      result->spectrum_inverted = (bool)(ntohx(reply.inverted) == 1);
-    }
-
-    return success;
-  }
-
-  bool
-  usrp2::impl::set_rx_decim(int decimation_factor)
-  {
-    op_config_rx_v2_cmd cmd;
-    op_config_rx_reply_v2_t reply;
-
-    init_config_rx_v2_cmd(&cmd);
-    cmd.op.valid = htons(CFGV_INTERP_DECIM);
-    cmd.op.decim = htonl(decimation_factor);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    if (success)
-      d_rx_decim = decimation_factor;
-    return success;
-  }
-
-  bool
-  usrp2::impl::set_rx_scale_iq(int scale_i, int scale_q)
-  {
-    op_config_rx_v2_cmd cmd;
-    op_config_rx_reply_v2_t reply;
-
-    init_config_rx_v2_cmd(&cmd);
-    cmd.op.valid = htons(CFGV_SCALE_IQ);
-    cmd.op.scale_iq = htonl(((scale_i & 0xffff) << 16) | (scale_q & 0xffff));
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  bool
-  usrp2::impl::start_rx_streaming(unsigned int channel, unsigned int items_per_frame)
-  {
-    if (channel > MAX_CHAN) {
-      std::cerr << "usrp2: invalid channel number (" << channel
-		<< ")" << std::endl;
-      return false;
-    }
-
-    if (channel > 0) { // until firmware supports multiple streams
-      std::cerr << "usrp2: channel " << channel
-		<< " not implemented" << std::endl;
-      return false;
-    }
-
-    {
-      gruel::scoped_lock l(d_channel_rings_mutex);
-      if (d_channel_rings[channel]) {
-	std::cerr << "usrp2: channel " << channel
-		  << " already streaming" << std::endl;
-	return false;
-      }
-
-      if (items_per_frame == 0)
-	items_per_frame = U2_MAX_SAMPLES;		// minimize overhead
-
-      op_start_rx_streaming_cmd cmd;
-      op_generic_t reply;
-
-      memset(&cmd, 0, sizeof(cmd));
-      init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-      cmd.op.opcode = OP_START_RX_STREAMING;
-      cmd.op.len = sizeof(cmd.op);
-      cmd.op.rid = d_next_rid++;
-      cmd.op.items_per_frame = htonl(items_per_frame);
-      cmd.eop.opcode = OP_EOP;
-      cmd.eop.len = sizeof(cmd.eop);
-
-      d_dont_enqueue = false;
-      bool success = false;
-      pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-      success = transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT);
-      success = success && (ntohx(reply.ok) == 1);
-
-      if (success)
-	d_channel_rings[channel] = ring_sptr(new ring(d_eth_buf->max_frames()));
-      else
-	d_dont_enqueue = true;
-
-      //fprintf(stderr, "usrp2::start_rx_streaming: success = %d\n", success);
-      return success;
-    }
-  }
-
-  bool
-  usrp2::impl::start_rx_streaming_at(unsigned int channel, unsigned int items_per_frame, unsigned int time)
-  {
-    if (channel > MAX_CHAN) {
-      std::cerr << "usrp2: invalid channel number (" << channel
-		<< ")" << std::endl;
-      return false;
-    }
-
-    if (channel > 0) { // until firmware supports multiple streams
-      std::cerr << "usrp2: channel " << channel
-		<< " not implemented" << std::endl;
-      return false;
-    }
-
-    {
-      gruel::scoped_lock guard(d_channel_rings_mutex);
-      if (d_channel_rings[channel]) {
-	std::cerr << "usrp2: channel " << channel
-		  << " already streaming" << std::endl;
-	return false;
-      }
-
-      if (items_per_frame == 0)
-	items_per_frame = U2_MAX_SAMPLES;		// minimize overhead
-
-      op_start_rx_streaming_cmd cmd;
-      op_generic_t reply;
-
-      memset(&cmd, 0, sizeof(cmd));
-      init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, time);
-      cmd.op.opcode = OP_START_RX_STREAMING;
-      cmd.op.len = sizeof(cmd.op);
-      cmd.op.rid = d_next_rid++;
-      cmd.op.items_per_frame = htonl(items_per_frame);
-      cmd.eop.opcode = OP_EOP;
-      cmd.eop.len = sizeof(cmd.eop);
-
-      d_dont_enqueue = false;
-      bool success = false;
-      pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-      success = transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT);
-      success = success && (ntohx(reply.ok) == 1);
-
-      if (success)
-	d_channel_rings[channel] = ring_sptr(new ring(d_eth_buf->max_frames()));
-      else
-	d_dont_enqueue = true;
-
-      return success;
-    }
-  }
-
-  bool
-  usrp2::impl::sync_and_start_rx_streaming_at(unsigned int channel, unsigned int items_per_frame, unsigned int time)
-  {
-
-    if (channel > MAX_CHAN) {
-      std::cerr << "usrp2: invalid channel number (" << channel
-		<< ")" << std::endl;
-      return false;
-    }
-
-    if (channel > 0) { // until firmware supports multiple streams
-      std::cerr << "usrp2: channel " << channel
-		<< " not implemented" << std::endl;
-      return false;
-    }
-
-    {
-      gruel::scoped_lock guard(d_channel_rings_mutex);
-      if (d_channel_rings[channel]) {
-	std::cerr << "usrp2: channel " << channel
-		  << " already streaming" << std::endl;
-	return false;
-      }
-
-      if (items_per_frame == 0)
-	items_per_frame = U2_MAX_SAMPLES;		// minimize overhead
-
-      op_sync_and_start_rx_streaming_cmd cmd;
-      op_generic_t reply;
-
-      memset(&cmd, 0, sizeof(cmd));
-      init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, time);
-      cmd.sync_op.opcode = OP_SYNC_TO_PPS;
-      cmd.sync_op.len = sizeof(cmd.sync_op);
-      cmd.sync_op.rid = d_next_rid++;
-      cmd.rx_op.opcode = OP_START_RX_STREAMING;
-      cmd.rx_op.len = sizeof(cmd.rx_op);
-      cmd.rx_op.rid = d_next_rid++;
-      cmd.rx_op.items_per_frame = htonl(items_per_frame);
-      cmd.eop.opcode = OP_EOP;
-      cmd.eop.len = sizeof(cmd.eop);
-
-      d_dont_enqueue = false;
-      bool success = false;
-      pending_reply p(cmd.sync_op.rid, &reply, sizeof(reply));
-      success = transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT);
-      success = success && (ntohx(reply.ok) == 1);
-
-      if (success)
-	d_channel_rings[channel] = ring_sptr(new ring(d_eth_buf->max_frames()));
-      else
-	d_dont_enqueue = true;
-
-      return success;
-    }
-  }
-
-  bool
-  usrp2::impl::stop_rx_streaming(unsigned int channel)
-  {
-    if (channel > MAX_CHAN) {
-      std::cerr << "usrp2: invalid channel number (" << channel
-		<< ")" << std::endl;
-      return false;
-    }
-
-    if (channel > 0) { // until firmware supports multiple streams
-      std::cerr << "usrp2: channel " << channel
-		<< " not implemented" << std::endl;
-      return false;
-    }
-
-    d_dont_enqueue = true;	// no new samples
-    flush_rx_samples(channel);	// dump any we may already have
-
-    op_stop_rx_cmd cmd;
-    op_generic_t reply;
-
-    {
-      gruel::scoped_lock l(d_channel_rings_mutex);
-
-      memset(&cmd, 0, sizeof(cmd));
-      init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-      cmd.op.opcode = OP_STOP_RX;
-      cmd.op.len = sizeof(cmd.op);
-      cmd.op.rid = d_next_rid++;
-      cmd.eop.opcode = OP_EOP;
-      cmd.eop.len = sizeof(cmd.eop);
-
-      bool success = false;
-      pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-      success = transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT);
-      success = success && (ntohx(reply.ok) == 1);
-      d_channel_rings[channel].reset();
-      d_rx_seqno = -1;
-      //fprintf(stderr, "usrp2::stop_rx_streaming:  success = %d\n", success);
-      return success;
-    }
-  }
-
-  bool
-  usrp2::impl::rx_samples(unsigned int channel, rx_sample_handler *handler)
-  {
-    if (channel > MAX_CHAN) {
-      std::cerr << "usrp2: invalid channel (" << channel
-                << " )" << std::endl;
-      return false;
-    }
-
-    if (channel > 0) {
-      std::cerr << "usrp2: channel " << channel
-                << " not implemented" << std::endl;
-      return false;
-    }
-
-    ring_sptr rp = d_channel_rings[channel];
-    if (!rp){
-      std::cerr << "usrp2: channel " << channel
-                << " not receiving" << std::endl;
-      return false;
-    }
-
-    // Wait for frames available in channel ring
-    DEBUG_LOG("W");
-    rp->wait_for_not_empty();
-    DEBUG_LOG("s");
-
-    // Iterate through frames and present to user
-    void *p;
-    size_t frame_len_in_bytes;
-    while (rp->dequeue(&p, &frame_len_in_bytes)) {
-      uint32_t	       *items;			// points to beginning of data items
-      size_t 		nitems_in_uint32s;
-      rx_metadata	md;
-      if (!parse_rx_metadata(p, frame_len_in_bytes, &items, &nitems_in_uint32s, &md))
-	return false;
-
-      bool want_more = (*handler)(items, nitems_in_uint32s, &md);
-      d_eth_buf->release_frame(p);
-      DEBUG_LOG("-");
-      dec_enqueued();
-
-      if (!want_more)
-        break;
-    }
-    return true;
-  }
-
-  bool
-  usrp2::impl::flush_rx_samples(unsigned int channel)
-  {
-    if (channel > MAX_CHAN) {
-      std::cerr << "usrp2: invalid channel (" << channel
-                << " )" << std::endl;
-      return false;
-    }
-
-    if (channel > 0) {
-      std::cerr << "usrp2: channel " << channel
-                << " not implemented" << std::endl;
-      return false;
-    }
-
-    ring_sptr rp = d_channel_rings[channel];
-    if (!rp){
-      return false;
-    }
-
-    // Iterate through frames and drop them
-    void *p;
-    size_t frame_len_in_bytes;
-    while (rp->dequeue(&p, &frame_len_in_bytes)) {
-      d_eth_buf->release_frame(p);
-      dec_enqueued();
-    }
-    return true;
-  }
-
-  // ----------------------------------------------------------------
-  // 				Transmit
-  // ----------------------------------------------------------------
-
-  bool
-  usrp2::impl::set_tx_antenna(int ant){
-    op_config_mimo_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_TX_ANTENNA;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.op.flags = ant;
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    return ntohx(reply.ok) == 1;
-  }
-
-  bool
-  usrp2::impl::set_tx_gain(double gain)
-  {
-    op_config_tx_v2_cmd cmd;
-    op_config_tx_reply_v2_t reply;
-
-    init_config_tx_v2_cmd(&cmd);
-    cmd.op.valid = htons(CFGV_GAIN);
-    cmd.op.gain = htons(u2_double_to_fxpt_gain(gain));
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  bool
-  usrp2::impl::set_tx_lo_offset(double frequency)
-  {
-    op_freq_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_SET_TX_LO_OFFSET;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-
-    u2_fxpt_freq_t fxpt = u2_double_to_fxpt_freq(frequency);
-    cmd.op.freq_hi = htonl(u2_fxpt_freq_hi(fxpt));
-    cmd.op.freq_lo = htonl(u2_fxpt_freq_lo(fxpt));
-
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  bool
-  usrp2::impl::set_tx_center_freq(double frequency, tune_result *result)
-  {
-    op_config_tx_v2_cmd cmd;
-    op_config_tx_reply_v2_t reply;
-
-    init_config_tx_v2_cmd(&cmd);
-    cmd.op.valid = htons(CFGV_FREQ);
-    u2_fxpt_freq_t fxpt = u2_double_to_fxpt_freq(frequency);
-    cmd.op.freq_hi = htonl(u2_fxpt_freq_hi(fxpt));
-    cmd.op.freq_lo = htonl(u2_fxpt_freq_lo(fxpt));
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    if (result && success) {
-      result->baseband_freq =
-        u2_fxpt_freq_to_double(
-	  u2_fxpt_freq_from_hilo(ntohl(reply.baseband_freq_hi),
-				 ntohl(reply.baseband_freq_lo)));
-
-      result->dxc_freq =
-        u2_fxpt_freq_to_double(
-	  u2_fxpt_freq_from_hilo(ntohl(reply.duc_freq_hi),
-				 ntohl(reply.duc_freq_lo)));
-
-      result->residual_freq =
-        u2_fxpt_freq_to_double(
-	 u2_fxpt_freq_from_hilo(ntohl(reply.residual_freq_hi),
-				ntohl(reply.residual_freq_lo)));
-
-      result->spectrum_inverted = (bool)(ntohx(reply.inverted) == 1);
-    }
-
-    return success;
-  }
-
-  bool
-  usrp2::impl::set_tx_interp(int interpolation_factor)
-  {
-    op_config_tx_v2_cmd cmd;
-    op_config_tx_reply_v2_t reply;
-
-    init_config_tx_v2_cmd(&cmd);
-    cmd.op.valid = htons(CFGV_INTERP_DECIM);
-    cmd.op.interp = htonl(interpolation_factor);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    if (success) {
-      d_tx_interp = interpolation_factor;
-
-      // Auto-set TX scaling based on interpolation rate
-      int scale_i, scale_q;
-      default_tx_scale_iq(d_tx_interp, &scale_i, &scale_q);
-      return set_tx_scale_iq(scale_i, scale_q);
-    }
-
-    return success;
-  }
-
-  void
-  usrp2::impl::default_tx_scale_iq(int interpolation_factor, int *scale_i, int *scale_q)
-  {
-    // Calculate CIC interpolation (i.e., without halfband interpolators)
-    int i = interpolation_factor;
-    if (i > 128)
-      i = i >> 1;
-    if (i > 128)
-      i = i >> 1;
-
-    // Calculate dsp_core_tx gain absent scale multipliers
-    float gain = (1.65*i*i*i)/(4096*pow(2, ceil(log2(i*i*i))));
-
-    // Calculate closest multiplier constant to reverse gain
-    int scale = (int)rint(1.0/gain);
-    // fprintf(stderr, "if=%i i=%i gain=%f scale=%i\n", interpolation_factor, i, gain, scale);
-
-    // Both I and Q are identical in this case
-    if (scale_i)
-      *scale_i = scale;
-    if (scale_q)
-      *scale_q = scale;
-  }
-
-  bool
-  usrp2::impl::set_tx_scale_iq(int scale_i, int scale_q)
-  {
-    op_config_tx_v2_cmd cmd;
-    op_config_tx_reply_v2_t reply;
-
-    init_config_tx_v2_cmd(&cmd);
-    cmd.op.valid = htons(CFGV_SCALE_IQ);
-    cmd.op.scale_iq = htonl(((scale_i & 0xffff) << 16) | (scale_q & 0xffff));
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  bool
-  usrp2::impl::tx_32fc(unsigned int channel,
-		       const std::complex<float> *samples,
-		       size_t nsamples,
-		       const tx_metadata *metadata)
-  {
-    uint32_t items[nsamples];
-    copy_host_32fc_to_u2_16sc(nsamples, samples, items);
-    return tx_raw(channel, items, nsamples, metadata);
-  }
-
-  bool
-  usrp2::impl::tx_16sc(unsigned int channel,
-		       const std::complex<int16_t> *samples,
-		       size_t nsamples,
-		       const tx_metadata *metadata)
-  {
-#ifdef WORDS_BIGENDIAN
-
-    // Already binary equivalent to 16-bit I/Q on the wire.
-    // No conversion required.
-
-    assert(sizeof(samples[0]) == sizeof(uint32_t));
-    return tx_raw(channel, (const uint32_t *) samples, nsamples, metadata);
-
-#else
-
-    uint32_t items[nsamples];
-    copy_host_16sc_to_u2_16sc(nsamples, samples, items);
-    return tx_raw(channel, items, nsamples, metadata);
-
-#endif
-  }
-
-  bool
-  usrp2::impl::tx_raw(unsigned int channel,
-		      const uint32_t *items,
-		      size_t nitems,
-		      const tx_metadata *metadata)
-  {
-    if (nitems == 0)
-      return true;
-
-    // FIXME can't deal with nitems < U2_MIN_SAMPLES (will be fixed in VRT)
-    // FIXME need to check the MTU instead of assuming 1500 bytes
-
-    // fragment as necessary then fire away
-
-    size_t nframes = (nitems + U2_MAX_SAMPLES - 1) / U2_MAX_SAMPLES;
-    size_t last_frame = nframes - 1;
-    u2_eth_packet_t	hdrs;
-
-    size_t n = 0;
-    for (size_t fn = 0; fn < nframes; fn++){
-      uint32_t timestamp = 0;
-      uint32_t flags = 0;
-
-      if (fn == 0){
-	timestamp = metadata->timestamp;
-	if (metadata->send_now)
-	  flags |= U2P_TX_IMMEDIATE;
-	if (metadata->start_of_burst)
-	  flags |= U2P_TX_START_OF_BURST;
-      }
-      if (fn > 0){
-	flags |= U2P_TX_IMMEDIATE;
-      }
-      if (fn == last_frame){
-	if (metadata->end_of_burst)
-	  flags |= U2P_TX_END_OF_BURST;
-      }
-
-      init_etf_hdrs(&hdrs, d_addr, flags, channel, timestamp);
-
-      // Avoid short packet by splitting last two packets if reqd
-      size_t i;
-      if ((nitems - n) > U2_MAX_SAMPLES && (nitems - n) < (U2_MAX_SAMPLES + U2_MIN_SAMPLES))
-	i = (nitems - n) / 2;
-      else
-	i = std::min((size_t) U2_MAX_SAMPLES, nitems - n);
-
-      eth_iovec iov[2];
-      iov[0].iov_base = &hdrs;
-      iov[0].iov_len = sizeof(hdrs);
-      iov[1].iov_base = const_cast<uint32_t *>(&items[n]);
-      iov[1].iov_len = i * sizeof(uint32_t);
-
-      size_t total = iov[0].iov_len + iov[1].iov_len;
-      if (total < 64)
-	fprintf(stderr, "usrp2::tx_raw: FIXME: short packet: %zd items (%zd bytes)\n", i, total);
-
-      if (d_eth_buf->tx_framev(iov, 2) != eth_buffer::EB_OK){
-	return false;
-      }
-
-      n += i;
-    }
-
-    return true;
-  }
-
-  // ----------------------------------------------------------------
-  // 			   misc commands
-  // ----------------------------------------------------------------
-
-  bool
-  usrp2::impl::config_mimo(int flags)
-  {
-    op_config_mimo_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_CONFIG_MIMO;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.op.flags = flags;
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    return ntohx(reply.ok) == 1;
-  }
-
-  bool
-  usrp2::impl::fpga_master_clock_freq(long *freq)
-  {
-    *freq = 100000000L;		// 100 MHz
-    return true;
-  }
-
-  bool
-  usrp2::impl::adc_rate(long *rate)
-  {
-    return fpga_master_clock_freq(rate);
-  }
-
-  bool
-  usrp2::impl::dac_rate(long *rate)
-  {
-    return fpga_master_clock_freq(rate);
-  }
-
-  bool
-  usrp2::impl::tx_daughterboard_id(int *dbid)
-  {
-    *dbid = d_tx_db_info.dbid;
-    return true;
-  }
-
-  bool
-  usrp2::impl::rx_daughterboard_id(int *dbid)
-  {
-    *dbid = d_rx_db_info.dbid;
-    return true;
-  }
-
-
-  // ----------------------------------------------------------------
-  // 			low-level commands
-  // ----------------------------------------------------------------
-
-  bool
-  usrp2::impl::burn_mac_addr(const std::string &new_addr)
-  {
-    op_burn_mac_addr_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_BURN_MAC_ADDR;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    if (!parse_mac_addr(new_addr, &cmd.op.addr))
-      return false;
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, 4*DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  static void
-  fill_dboard_info(db_info *dst, const u2_db_info_t *src)
-  {
-    dst->dbid = ntohl(src->dbid);
-
-    dst->freq_min =
-      u2_fxpt_freq_to_double(u2_fxpt_freq_from_hilo(ntohl(src->freq_min_hi),
-						    ntohl(src->freq_min_lo)));
-    dst->freq_max =
-      u2_fxpt_freq_to_double(u2_fxpt_freq_from_hilo(ntohl(src->freq_max_hi),
-						    ntohl(src->freq_max_lo)));
-
-    dst->gain_min = u2_fxpt_gain_to_double(ntohs(src->gain_min));
-    dst->gain_max = u2_fxpt_gain_to_double(ntohs(src->gain_max));
-    dst->gain_step_size = u2_fxpt_gain_to_double(ntohs(src->gain_step_size));
-  }
-
-  bool
-  usrp2::impl::dboard_info()
-  {
-    op_dboard_info_cmd  	cmd;
-    op_dboard_info_reply_t	reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_DBOARD_INFO;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    if (success){
-      fill_dboard_info(&d_tx_db_info, &reply.tx_db_info);
-      fill_dboard_info(&d_rx_db_info, &reply.rx_db_info);
-    }
-    return success;
-  }
-
-
-  bool
-  usrp2::impl::sync_to_pps()
-  {
-    op_generic_cmd cmd;
-    op_generic_t   reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_SYNC_TO_PPS;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    return ntohx(reply.ok) == 1;
-  }
-
-  bool
-  usrp2::impl::sync_every_pps(bool enable)
-  {
-    op_generic_cmd cmd;
-    op_generic_t   reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_SYNC_EVERY_PPS;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.op.ok = enable ? 1 : 0;
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    return ntohx(reply.ok) == 1;
-  }
-
-  std::vector<uint32_t>
-  usrp2::impl::peek32(uint32_t addr, uint32_t words)
-  {
-    std::vector<uint32_t> result; // zero sized on error return
-    // fprintf(stderr, "usrp2::peek: addr=%08X words=%u\n", addr, words);
-
-    if (addr % 4 != 0) {
-      fprintf(stderr, "usrp2::peek: addr (=%08X) must be 32-bit word aligned\n", addr);
-      return result;
-    }
-
-    if (words == 0)
-      return result;
-
-    op_peek_cmd   cmd;
-    op_generic_t *reply;
-
-    int wlen = sizeof(uint32_t);
-    int rlen = sizeof(op_generic_t);
-    size_t bytes = words*wlen;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_PEEK;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    cmd.op.addr = htonl(addr);
-    cmd.op.bytes = htonl(bytes);
-
-    reply = (op_generic_t *)malloc(rlen+bytes);
-    pending_reply p(cmd.op.rid, reply, rlen+bytes);
-    if (transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT)) {
-      uint32_t nwords = (reply->len-rlen)/sizeof(uint32_t);
-      uint32_t *data = (uint32_t *)(reply+rlen/wlen);
-      for (unsigned int i = 0; i < nwords; i++)
-	result.push_back(ntohl(data[i]));
-    }
-
-    free(reply);
-    return result;
-  }
-
-  bool
-  usrp2::impl::poke32(uint32_t addr, const std::vector<uint32_t> &data)
-  {
-    if (addr % 4 != 0) {
-      fprintf(stderr, "usrp2::poke32: addr (=%08X) must be 32-bit word aligned\n", addr);
-      return false;
-    }
-
-    int plen = sizeof(op_poke_cmd);
-    int wlen = sizeof(uint32_t);
-    int max_words = (MAX_SUBPKT_LEN-plen)/wlen;
-    int words = data.size();
-
-    if (words > max_words) {
-      fprintf(stderr, "usrp2::poke32: write size (=%u) exceeds maximum of %u words\n",
-	      words, max_words);
-      return false;
-    }
-
-    //fprintf(stderr, "usrp2::poke32: addr=%08X words=%u\n", addr, words);
-
-    if (words == 0)
-      return true; // NOP
-
-    op_poke_cmd  *cmd;
-    op_generic_t *eop;
-
-    // Allocate, clear, and initialize command packet
-    int bytes = words*wlen;
-    int l = plen+bytes+sizeof(*eop); // op_poke_cmd+data+eop
-    cmd = (op_poke_cmd *)malloc(l);
-    //fprintf(stderr, "cmd=%p l=%i\n", cmd, l);
-    memset(cmd, 0, l);
-    init_etf_hdrs(&cmd->h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd->op.opcode = OP_POKE;
-    cmd->op.len = sizeof(cmd->op)+bytes;
-    cmd->op.rid = d_next_rid++;
-    cmd->op.addr = htonl(addr);
-
-    // Copy data from vector into packet space
-    uint32_t *dest = (uint32_t *)((uint8_t *)cmd+plen);
-    for (int i = 0; i < words; i++) {
-      //fprintf(stderr, "%03i@%p\n", i, dest);
-      *dest++ = htonl(data[i]);
-    }
-
-    // Write end-of-packet subpacket
-    eop = (op_generic_t *)dest;
-    eop->opcode = OP_EOP;
-    eop->len = sizeof(*eop);
-    //fprintf(stderr, "eop=%p len=%i\n", eop, eop->len);
-
-    // Send command to device and retrieve reply
-    bool ok = false;
-    op_generic_t reply;
-    pending_reply p(cmd->op.rid, &reply, sizeof(reply));
-    if (transmit_cmd_and_wait(cmd, l, &p, DEF_CMD_TIMEOUT))
-      ok = (ntohx(reply.ok) == 1);
-
-    free(cmd);
-    return ok;
-  }
-
-  bool
-  usrp2::impl::reset_db()
-  {
-    op_generic_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_RESET_DB;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  bool usrp2::impl::set_gpio_ddr(int bank, uint16_t value, uint16_t mask)
-  {
-    if (bank != GPIO_TX_BANK && bank != GPIO_RX_BANK) {
-      fprintf(stderr, "set_gpio_ddr: bank must be one of GPIO_RX_BANK or GPIO_TX_BANK\n");
-      return false;
-    }
-
-    op_gpio_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_GPIO_SET_DDR;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.op.bank = static_cast<uint8_t>(bank);
-    cmd.op.value = htons(value);
-    cmd.op.mask = htons(mask);
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  bool usrp2::impl::set_gpio_sels(int bank, std::string sels)
-  {
-    if (bank != GPIO_TX_BANK && bank != GPIO_RX_BANK) {
-      fprintf(stderr, "set_gpio_ddr: bank must be one of GPIO_RX_BANK or GPIO_TX_BANK\n");
-      return false;
-    }
-
-    if (sels.size() != 16) {
-      fprintf(stderr, "set_gpio_sels: sels must be exactly 16 bytes\n");
-      return false;
-    }
-
-    op_gpio_set_sels_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_GPIO_SET_SELS;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.op.bank = static_cast<uint8_t>(bank);
-    memcpy(&cmd.op.sels, sels.c_str(), 16);
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  bool usrp2::impl::write_gpio(int bank, uint16_t value, uint16_t mask)
-  {
-    if (bank != GPIO_TX_BANK && bank != GPIO_RX_BANK) {
-      fprintf(stderr, "set_gpio_ddr: bank must be one of GPIO_RX_BANK or GPIO_TX_BANK\n");
-      return false;
-    }
-
-    op_gpio_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_GPIO_WRITE;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.op.bank = static_cast<uint8_t>(bank);
-    cmd.op.value = htons(value);
-    cmd.op.mask = htons(mask);
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-  bool usrp2::impl::read_gpio(int bank, uint16_t *value)
-  {
-    if (bank != GPIO_TX_BANK && bank != GPIO_RX_BANK) {
-      fprintf(stderr, "set_gpio_ddr: bank must be one of GPIO_RX_BANK or GPIO_TX_BANK\n");
-      return false;
-    }
-
-    op_gpio_cmd cmd;
-    op_gpio_read_reply_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_GPIO_READ;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.op.bank = static_cast<uint8_t>(bank);
-    cmd.op.value = 0; // not used
-    cmd.op.mask = 0;  // not used
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    if (success && (value != NULL))
-      *value = ntohs(reply.value);
-
-    return success;
-  }
-
-  bool usrp2::impl::enable_gpio_streaming(int bank, int enable)
-  {
-    if (bank != GPIO_RX_BANK) {
-      fprintf(stderr, "enable_gpio_streaming: only RX streaming is currently implemented\n");
-      return false;
-    }
-
-    if ((enable & ~0x03) != 0) {
-      fprintf(stderr, "enable_gpio_streaming: invalid enable format\n");
-      return false;
-    }
-
-    op_gpio_cmd cmd;
-    op_generic_t reply;
-
-    memset(&cmd, 0, sizeof(cmd));
-    init_etf_hdrs(&cmd.h, d_addr, 0, CONTROL_CHAN, -1);
-    cmd.op.opcode = OP_GPIO_STREAM;
-    cmd.op.len = sizeof(cmd.op);
-    cmd.op.rid = d_next_rid++;
-    cmd.op.bank = static_cast<uint8_t>(bank);
-    cmd.op.value = htons((uint16_t)enable);
-    cmd.op.mask = 0;  // not used
-    cmd.eop.opcode = OP_EOP;
-    cmd.eop.len = sizeof(cmd.eop);
-
-    pending_reply p(cmd.op.rid, &reply, sizeof(reply));
-    if (!transmit_cmd_and_wait(&cmd, sizeof(cmd), &p, DEF_CMD_TIMEOUT))
-      return false;
-
-    bool success = (ntohx(reply.ok) == 1);
-    return success;
-  }
-
-} // namespace usrp2
diff --git a/usrp2/host/lib/usrp2_impl.h b/usrp2/host/lib/usrp2_impl.h
deleted file mode 100644
index eee26358e..000000000
--- a/usrp2/host/lib/usrp2_impl.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008,2009,2010 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef INCLUDED_USRP2_IMPL_H
-#define INCLUDED_USRP2_IMPL_H
-
-#include <usrp2/usrp2.h>
-#include <usrp2/data_handler.h>
-#include <usrp2_eth_packet.h>
-#include <gruel/thread.h>
-#include <boost/scoped_ptr.hpp>
-#include "control.h"
-#include "ring.h"
-#include <string>
-
-#define MAX_SUBPKT_LEN 252
-
-namespace usrp2 {
-
-  class eth_buffer;
-  class pktfilter;
-  class usrp2_thread;
-  class usrp2_tune_result;
-  class pending_reply;
-  class ring;
-
-  //! High-level d'board info
-  struct db_info {
-    int		dbid;
-    double	freq_min;		// Hz
-    double	freq_max;		// Hz
-    double	gain_min;		// dB
-    double	gain_max;		// dB
-    double	gain_step_size;		// dB
-
-    db_info() : dbid(-1), freq_min(0), freq_max(0),
-		gain_min(0), gain_max(0), gain_step_size(0) {}
-  };
-
-  class usrp2::impl : private data_handler
-  {
-    static const size_t NRIDS = 256;
-    static const size_t NCHANS = 32;
-
-    eth_buffer    *d_eth_buf;
-    std::string    d_interface_name;
-    pktfilter     *d_pf;
-    std::string    d_addr;       // FIXME: use u2_mac_addr_t instead
-
-    boost::thread_group d_rx_tg;
-    volatile bool  d_bg_running; // TODO: multistate if needed
-
-    int            d_rx_seqno;
-    int            d_tx_seqno;
-    int            d_next_rid;
-    unsigned int   d_num_rx_frames;
-    unsigned int   d_num_rx_missing;
-    unsigned int   d_num_rx_overruns;
-    unsigned int   d_num_rx_bytes;
-
-    unsigned int   d_num_enqueued;
-    gruel::mutex   d_enqueued_mutex;
-    gruel::condition_variable d_bg_pending_cond;
-
-    // all pending_replies are stack allocated, thus no possibility of leaking these
-    pending_reply *d_pending_replies[NRIDS]; // indexed by 8-bit reply id
-
-    std::vector<ring_sptr>   d_channel_rings; // indexed by 5-bit channel number
-    gruel::mutex   d_channel_rings_mutex;
-
-    db_info	   d_tx_db_info;
-    db_info	   d_rx_db_info;
-
-    int		   d_tx_interp;		// shadow tx interp
-    int		   d_rx_decim;		// shadow rx decim
-
-    bool	   d_dont_enqueue;
-
-    void inc_enqueued() {
-      gruel::scoped_lock l(d_enqueued_mutex);
-      d_num_enqueued++;
-    }
-
-    void dec_enqueued() {
-      gruel::scoped_lock l(d_enqueued_mutex);
-      if (--d_num_enqueued == 0)
-        d_bg_pending_cond.notify_one();
-    }
-
-    static bool parse_mac_addr(const std::string &s, u2_mac_addr_t *p);
-    void init_et_hdrs(u2_eth_packet_t *p, const std::string &dst);
-    void init_etf_hdrs(u2_eth_packet_t *p, const std::string &dst,
-		       int word0_flags, int chan, uint32_t timestamp);
-    void start_bg();
-    void stop_bg();
-    void init_config_rx_v2_cmd(op_config_rx_v2_cmd *cmd);
-    void init_config_tx_v2_cmd(op_config_tx_v2_cmd *cmd);
-    bool transmit_cmd_and_wait(void *cmd, size_t len, pending_reply *p, double secs=0.0);
-    bool transmit_cmd(void *cmd, size_t len);
-    virtual data_handler::result operator()(const void *base, size_t len);
-    data_handler::result handle_control_packet(const void *base, size_t len);
-    data_handler::result handle_data_packet(const void *base, size_t len);
-    bool dboard_info();
-    bool reset_db();
-
-  public:
-    impl(const std::string &ifc, props *p, size_t rx_bufsize);
-    ~impl();
-
-    std::string mac_addr() const { return d_addr; } // FIXME: convert from u2_mac_addr_t
-    std::string interface_name() const { return d_interface_name; }
-
-    // Rx
-
-    bool set_rx_antenna(int ant);
-    bool set_rx_gain(double gain);
-    double rx_gain_min() { return d_rx_db_info.gain_min; }
-    double rx_gain_max() { return d_rx_db_info.gain_max; }
-    double rx_gain_db_per_step() { return d_rx_db_info.gain_step_size; }
-    bool set_rx_lo_offset(double frequency);
-    bool set_rx_center_freq(double frequency, tune_result *result);
-    double rx_freq_min() { return d_rx_db_info.freq_min; }
-    double rx_freq_max() { return d_rx_db_info.freq_max; }
-    bool set_rx_decim(int decimation_factor);
-    int rx_decim() { return d_rx_decim; }
-    bool set_rx_scale_iq(int scale_i, int scale_q);
-    bool set_gpio_ddr(int bank, uint16_t value, uint16_t mask);
-    bool set_gpio_sels(int bank, std::string src);
-    bool enable_gpio_streaming(int bank, int enable);
-    bool write_gpio(int bank, uint16_t value, uint16_t mask);
-    bool read_gpio(int bank, uint16_t *value);
-    bool start_rx_streaming(unsigned int channel, unsigned int items_per_frame);
-    bool start_rx_streaming_at(unsigned int channel, unsigned int items_per_frame, unsigned int time);
-    bool sync_and_start_rx_streaming_at(unsigned int channel, unsigned int items_per_frame, unsigned int time);
-    bool rx_samples(unsigned int channel, rx_sample_handler *handler);
-    bool flush_rx_samples(unsigned int channel);
-    bool stop_rx_streaming(unsigned int channel);
-    unsigned int rx_overruns() const { return d_num_rx_overruns; }
-    unsigned int rx_missing() const { return d_num_rx_missing; }
-
-    // Tx
-
-    bool set_tx_antenna(int ant);
-    bool set_tx_gain(double gain);
-    double tx_gain_min() { return d_tx_db_info.gain_min; }
-    double tx_gain_max() { return d_tx_db_info.gain_max; }
-    double tx_gain_db_per_step() { return d_tx_db_info.gain_step_size; }
-    bool set_tx_lo_offset(double frequency);
-    bool set_tx_center_freq(double frequency, tune_result *result);
-    double tx_freq_min() { return d_tx_db_info.freq_min; }
-    double tx_freq_max() { return d_tx_db_info.freq_max; }
-    bool set_tx_interp(int interpolation_factor);
-    int tx_interp() { return d_tx_interp; }
-    void default_tx_scale_iq(int interpolation_factor, int *scale_i, int *scale_q);
-    bool set_tx_scale_iq(int scale_i, int scale_q);
-
-    bool tx_32fc(unsigned int channel,
-		 const std::complex<float> *samples,
-		 size_t nsamples,
-		 const tx_metadata *metadata);
-
-    bool tx_16sc(unsigned int channel,
-		 const std::complex<int16_t> *samples,
-		 size_t nsamples,
-		 const tx_metadata *metadata);
-
-    bool tx_raw(unsigned int channel,
-		const uint32_t *items,
-		size_t nitems,
-		const tx_metadata *metadata);
-
-    // misc
-
-    bool config_mimo(int flags);
-    bool fpga_master_clock_freq(long *freq);
-    bool adc_rate(long *rate);
-    bool dac_rate(long *rate);
-    bool tx_daughterboard_id(int *dbid);
-    bool rx_daughterboard_id(int *dbid);
-
-    // low level
-
-    bool burn_mac_addr(const std::string &new_addr);
-    bool sync_to_pps();
-    bool sync_every_pps(bool enable);
-    std::vector<uint32_t> peek32(uint32_t addr, uint32_t words);
-    bool poke32(uint32_t addr, const std::vector<uint32_t> &data);
-
-    // Receive thread, need to be public for boost::bind
-    void bg_loop();
-  };
-
-} // namespace usrp2
-
-#endif /* INCLUDED_USRP2_IMPL_H */
diff --git a/usrp2/host/lib/usrp2_socket_opener.cc b/usrp2/host/lib/usrp2_socket_opener.cc
deleted file mode 100644
index 27d3935e4..000000000
--- a/usrp2/host/lib/usrp2_socket_opener.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2008 Free Software Foundation, Inc.
- *
- * This program 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 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*!
- * setuid root program that opens a socket using (PF_PACKET, SOCK_RAW,
- * htons(0xBEEF)), and sends the resulting file descriptor by way of
- * of the file descriptor specified as the first command line argument.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#elif defined(HAVE_NETINET_IN_H)
-#include <netinet/in.h>
-#endif
-
-
-ssize_t
-write_fd(int fd, const void *ptr, size_t nbytes, int sendfd)
-{
-  struct msghdr msg;
-  struct iovec iov[1];
-
-#ifdef  HAVE_STRUCT_MSGHDR_MSG_CONTROL
-  union {
-    struct cmsghdr cm;
-    char    control[CMSG_SPACE(sizeof(int))];
-  } control_un;
-  struct cmsghdr *cmptr;
-
-  msg.msg_control = control_un.control;
-  msg.msg_controllen = sizeof(control_un.control);
-
-  cmptr = CMSG_FIRSTHDR(&msg);
-  cmptr->cmsg_len = CMSG_LEN(sizeof(int));
-  cmptr->cmsg_level = SOL_SOCKET;
-  cmptr->cmsg_type = SCM_RIGHTS;
-  *((int *) CMSG_DATA(cmptr)) = sendfd;
-#else
-  msg.msg_accrights = (char *) &sendfd;
-  msg.msg_accrightslen = sizeof(int);
-#endif
-
-  msg.msg_name = NULL;
-  msg.msg_namelen = 0;
-
-  iov[0].iov_base = const_cast<void *>(ptr);
-  iov[0].iov_len = nbytes;
-  msg.msg_iov = iov;
-  msg.msg_iovlen = 1;
-
-  return sendmsg(fd, &msg, 0);
-}
-
-bool
-reset_eids()
-{
-  if (setgid(getgid()) < 0){
-    perror("setguid");
-    return false;
-  }
-
-  if (setuid(getuid()) < 0){
-    perror("setuid");
-    return false;
-  }
-
-  return true;
-}
-
-
-static void
-usage()
-{
-  fprintf(stderr, "usage: usrp2_socket_opener file-descriptor\n");
-  exit(1);
-}
-
-int
-main(int argc, char **argv)
-{
-  if (argc != 2)
-    usage();
-
-  char *endptr;
-  int unix_domain_fd = strtol(argv[1], &endptr, 0);
-  if (*endptr != 0)
-    usage();
-
-  // FIXME get client credentials from unix_domain_fd using SCM_CREDENTIALS
-
-  // open the raw socket
-  int socket_fd = socket(PF_PACKET, SOCK_RAW, htons(0xBEEF));
-  if (socket_fd == -1){
-    perror("socket(PF_PACKET, SOCK_RAW, htons(0xBEEF))");
-    // printf("errno = %d\n", errno);
-    if (errno == EACCES || errno == ESPIPE){
-      fprintf(stderr, "usrp2_socket_opener must be setuid root to open the socket using SOCK_RAW.\n");
-      fprintf(stderr, "Running as root, please execute:  \n");
-      fprintf(stderr, "  # chown root:usrp usrp2_socket_opener\n");
-      fprintf(stderr, "  # chmod 04750 usrp2_socket_opener\n");
-    }
-    exit(2);
-  }
-
-  // drop privs
-  if (!reset_eids()){
-    fprintf(stderr, "Can't drop root permissions\n");
-    exit(3);
-  }
-
-  if (write_fd(unix_domain_fd, "", 1, socket_fd) != 1){
-    perror("write_fd");
-    exit(4);
-  }
-
-  return 0;
-}
diff --git a/usrp2/host/usrp2.pc.in b/usrp2/host/usrp2.pc.in
deleted file mode 100644
index 0c862a877..000000000
--- a/usrp2/host/usrp2.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: usrp2
-Description: Universal Software Radio Peripheral 2
-Requires: gruel
-Version: @LIBVER@
-Libs: -L${libdir} -lusrp2
-Cflags: -I${includedir} @DEFINES@
diff --git a/version.sh b/version.sh
index 05ffe83b4..f3f83a05b 100644
--- a/version.sh
+++ b/version.sh
@@ -1,4 +1,4 @@
 MAJOR_VERSION=3
-API_COMPAT=4
-MINOR_VERSION=2
+API_COMPAT=5
+MINOR_VERSION=0
 MAINT_VERSION=git
diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt
index 22c09b3f8..4b8fda059 100644
--- a/volk/CMakeLists.txt
+++ b/volk/CMakeLists.txt
@@ -18,71 +18,78 @@
 ########################################################################
 # Project setup
 ########################################################################
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-IF(NOT DEFINED CMAKE_BUILD_TYPE)
-    SET(CMAKE_BUILD_TYPE Release)
-ENDIF()
-SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose build type: None Debug Release RelWithDebInfo MinSizeRel")
-PROJECT(volk)
-ENABLE_LANGUAGE(CXX)
-ENABLE_LANGUAGE(C)
-ENABLE_TESTING()
-SET(VERSION 0.1)
-SET(LIBVER 0.0.0)
+cmake_minimum_required(VERSION 2.6)
+if(NOT DEFINED CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose build type: None Debug Release RelWithDebInfo MinSizeRel")
+project(volk)
+enable_language(CXX)
+enable_language(C)
+enable_testing()
+set(VERSION 0.1)
+set(LIBVER 0.0.0)
+
+set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-project
+set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project
 
 ########################################################################
 # Dependencies setup
 ########################################################################
-FIND_PACKAGE(PythonInterp)
-IF(NOT PYTHONINTERP_FOUND)
-    MESSAGE(FATAL_ERROR "Python interpreter required by the build system.")
-ENDIF(NOT PYTHONINTERP_FOUND)
+find_package(PythonInterp)
+if(NOT PYTHONINTERP_FOUND)
+    message(FATAL_ERROR "Python interpreter required by the build system.")
+endif(NOT PYTHONINTERP_FOUND)
 
 ########################################################################
 # Setup the package config file
 ########################################################################
 #set variables found in the pc.in file
-SET(prefix ${CMAKE_INSTALL_PREFIX})
-SET(exec_prefix "\${prefix}")
-SET(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
-SET(includedir "\${prefix}/include")
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix "\${prefix}")
+set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
+set(includedir "\${prefix}/include")
 
-CONFIGURE_FILE(
+configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/volk.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/volk.pc
 @ONLY)
 
-INSTALL(
+install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc
     DESTINATION lib${LIB_SUFFIX}/pkgconfig
+    COMPONENT "volk_devel"
 )
 
 ########################################################################
 # Install all headers in the include directories
 ########################################################################
-INSTALL(
+install(
     DIRECTORY ${CMAKE_SOURCE_DIR}/include/volk
-    DESTINATION include FILES_MATCHING PATTERN "*.h"
+    DESTINATION include COMPONENT "volk_devel"
+    FILES_MATCHING PATTERN "*.h"
 )
 
-INSTALL(FILES
+install(FILES
     ${CMAKE_BINARY_DIR}/include/volk/volk.h
     ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h
     ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h
     ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h
-DESTINATION include/volk)
+    DESTINATION include/volk
+    COMPONENT "volk_devel"
+)
 
 ########################################################################
 # Setup the library
 ########################################################################
-ADD_SUBDIRECTORY(lib)
+add_subdirectory(lib)
 
 ########################################################################
 # And the utility apps
 ########################################################################
-ADD_SUBDIRECTORY(apps)
+add_subdirectory(apps)
 
 ########################################################################
 # Print summary
 ########################################################################
-MESSAGE(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}")
diff --git a/volk/apps/CMakeLists.txt b/volk/apps/CMakeLists.txt
index a0bf7e900..f27bdc126 100644
--- a/volk/apps/CMakeLists.txt
+++ b/volk/apps/CMakeLists.txt
@@ -18,21 +18,28 @@
 ########################################################################
 # Setup profiler
 ########################################################################
-IF(MSVC)
-    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/msvc)
-ENDIF(MSVC)
+find_package(Boost)
 
-INCLUDE_DIRECTORIES(
+if(Boost_FOUND AND UNIX) #uses mkdir and $HOME
+
+if(MSVC)
+    include_directories(${CMAKE_SOURCE_DIR}/msvc)
+endif(MSVC)
+
+include_directories(
     ${CMAKE_SOURCE_DIR}/include
     ${CMAKE_BINARY_DIR}/include
     ${CMAKE_SOURCE_DIR}/lib
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${Boost_INCLUDE_DIRS}
 )
 
-ADD_EXECUTABLE(volk_profile
+add_executable(volk_profile
     ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc
     ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
 )
 
-TARGET_LINK_LIBRARIES(volk_profile volk ${Boost_LIBRARIES})
+target_link_libraries(volk_profile volk ${Boost_LIBRARIES})
+
+endif(Boost_FOUND AND UNIX)
diff --git a/volk/gen/archs.xml b/volk/gen/archs.xml
index f6822871f..960558b7c 100644
--- a/volk/gen/archs.xml
+++ b/volk/gen/archs.xml
@@ -29,6 +29,7 @@
   <val>1</val>
   <overrule>MD_SUBCPU</overrule>
   <overrule_val>x86</overrule_val>
+  <mutex>32</mutex>
 </arch>
 
 <arch name="3dnow" type="x86">
diff --git a/volk/gen/make_c.py b/volk/gen/make_c.py
index 19d679e71..0f9bcde34 100644
--- a/volk/gen/make_c.py
+++ b/volk/gen/make_c.py
@@ -52,7 +52,7 @@ struct volk_machine *get_machine(void) {
     if(machine != NULL) return machine;
     else {
         unsigned int max_score = 0;
-        int i;
+        unsigned int i;
         for(i=0; i<n_volk_machines; i++) {
             if(!(volk_machines[i]->caps & (~volk_get_lvarch()))) {
                 if(volk_machines[i]->caps > max_score) {
diff --git a/volk/gen/make_makefile_am.py b/volk/gen/make_makefile_am.py
index f843b4413..0dc088a80 100644
--- a/volk/gen/make_makefile_am.py
+++ b/volk/gen/make_makefile_am.py
@@ -25,8 +25,8 @@ def make_makefile_am(dom, machines, archflags_dict):
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \
-	-I$(top_srcdir)/include \
 	-I$(top_gendir)/include \
+	-I$(top_srcdir)/include \
 	-Dvolk_EXPORTS \
 	-fvisibility=hidden \
 	$(WITH_INCLUDES)
diff --git a/volk/gen/volk_register.py b/volk/gen/volk_register.py
index 75e5eeb87..cd874e470 100644
--- a/volk/gen/volk_register.py
+++ b/volk/gen/volk_register.py
@@ -3,6 +3,7 @@
 import sys
 import os
 import re
+import glob
 import string
 from xml.dom import minidom
 from volk_regexp import *
@@ -48,18 +49,13 @@ outfile_environment_h = open(os.path.join(gendir, "lib/volk_environment_init.h")
 outfile_makefile_am = open(os.path.join(gendir, "lib/Makefile.am"), "w")
 outfile_machines_h = open(os.path.join(gendir, "lib/volk_machines.h"), "w")
 outfile_machines_c = open(os.path.join(gendir, "lib/volk_machines.c"), "w")
-infile = open(os.path.join(srcdir, "include/volk/Makefile.am"), "r")
-
-
-mfile = infile.readlines();
+hdr_files = glob.glob(os.path.join(srcdir, "include/volk/*.h"))
 
 datatypes = [];
 functions = [];
 
-
-
-for line in mfile:
-    subline = re.search(".*_(a|u)\.h.*", line);
+for line in hdr_files:
+    subline = re.search(".*_(a|u)\.h.*", os.path.basename(line))
     if subline:
         subsubline = re.search("(?<=volk_).*", subline.group(0));
         if subsubline:
@@ -71,7 +67,7 @@ for line in mfile:
 
 datatypes = set(datatypes);
 
-for line in mfile:
+for line in hdr_files:
     for dt in datatypes:
         if dt in line:
             subline = re.search("(volk_" + dt +"_.*(a|u).*\.h)", line);
@@ -91,7 +87,7 @@ for arch in archs:
     if a_var:
         archs.remove(arch);
         
-        
+#strip out mutex archs        
 
 archflags_dict = {}
 for filearch in filearchs:
diff --git a/volk/include/volk/volk_32f_index_max_16u_a.h b/volk/include/volk/volk_32f_index_max_16u_a.h
index 3e0cf1d65..0c43a5081 100644
--- a/volk/include/volk/volk_32f_index_max_16u_a.h
+++ b/volk/include/volk/volk_32f_index_max_16u_a.h
@@ -129,7 +129,7 @@ static inline void volk_32f_index_max_16u_a_generic(unsigned int* target, const
     float max = src0[0];
     unsigned int index = 0;
     
-    int i = 1; 
+    unsigned int i = 1; 
     
     for(; i < num_points; ++i) {
       
diff --git a/volk/include/volk/volk_32f_x3_sum_of_poly_32f_a.h b/volk/include/volk/volk_32f_x3_sum_of_poly_32f_a.h
index 2ea8fa96d..153bb3a25 100644
--- a/volk/include/volk/volk_32f_x3_sum_of_poly_32f_a.h
+++ b/volk/include/volk/volk_32f_x3_sum_of_poly_32f_a.h
@@ -113,7 +113,7 @@ static inline void volk_32f_x3_sum_of_poly_32f_a_generic(float* target, float* s
   
 
 
-  int i = 0; 
+  unsigned int i = 0; 
   
   for(; i < num_bytes >> 2; ++i) {
     fst = src0[i];
diff --git a/volk/include/volk/volk_32fc_index_max_16u_a.h b/volk/include/volk/volk_32fc_index_max_16u_a.h
index 312e034e2..9566aa32e 100644
--- a/volk/include/volk/volk_32fc_index_max_16u_a.h
+++ b/volk/include/volk/volk_32fc_index_max_16u_a.h
@@ -194,7 +194,7 @@ static inline void volk_32fc_index_max_16u_a_generic(unsigned int* target, lv_32
   float max = 0.0;
   unsigned int index = 0;
   
-  int i = 0; 
+  unsigned int i = 0; 
   
   for(; i < num_bytes >> 3; ++i) {
 
diff --git a/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_a.h b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_a.h
index a6c21336d..655075528 100644
--- a/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_a.h
+++ b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_a.h
@@ -21,7 +21,7 @@ static inline void volk_32fc_x2_conjugate_dot_prod_32fc_a_generic(lv_32fc_t* res
   
   float sum0[2] = {0,0};
   float sum1[2] = {0,0};
-  int i = 0;
+  unsigned int i = 0;
 
   
   for(i = 0; i < n_2_ccomplex_blocks; ++i) {
diff --git a/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h
index 6b22d9f81..f11c93682 100644
--- a/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h
+++ b/volk/include/volk/volk_32fc_x2_conjugate_dot_prod_32fc_u.h
@@ -20,7 +20,7 @@ static inline void volk_32fc_x2_conjugate_dot_prod_32fc_u_generic(lv_32fc_t* res
   
   float sum0[2] = {0,0};
   float sum1[2] = {0,0};
-  int i = 0;
+  unsigned int i = 0;
 
   
   for(i = 0; i < n_2_ccomplex_blocks; ++i) {
diff --git a/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h b/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h
index 022a0a614..a865e0737 100644
--- a/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h
+++ b/volk/include/volk/volk_32fc_x2_dot_prod_32fc_a.h
@@ -22,7 +22,7 @@ static inline void volk_32fc_x2_dot_prod_32fc_a_generic(lv_32fc_t* result, const
   
   float sum0[2] = {0,0};
   float sum1[2] = {0,0};
-  int i = 0;
+  unsigned int i = 0;
 
   
   for(i = 0; i < n_2_ccomplex_blocks; ++i) {
diff --git a/volk/include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a.h b/volk/include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a.h
index be7a4ffe9..2d5f36b27 100644
--- a/volk/include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a.h
+++ b/volk/include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a.h
@@ -109,7 +109,7 @@ static inline void volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a_sse3(float* t
 static inline void volk_32fc_x2_s32f_square_dist_scalar_mult_32f_a_generic(float* target, lv_32fc_t* src0, lv_32fc_t* points, float scalar, unsigned int num_bytes) {
   lv_32fc_t diff;
   float sq_dist;
-  int i = 0; 
+  unsigned int i = 0; 
   
   for(; i < num_bytes >> 3; ++i) {
     diff = src0[0] - points[i];
diff --git a/volk/include/volk/volk_32fc_x2_square_dist_32f_a.h b/volk/include/volk/volk_32fc_x2_square_dist_32f_a.h
index c21d00491..6a4a08ca5 100644
--- a/volk/include/volk/volk_32fc_x2_square_dist_32f_a.h
+++ b/volk/include/volk/volk_32fc_x2_square_dist_32f_a.h
@@ -95,7 +95,7 @@ static inline void volk_32fc_x2_square_dist_32f_a_sse3(float* target, lv_32fc_t*
 static inline void volk_32fc_x2_square_dist_32f_a_generic(float* target, lv_32fc_t* src0, lv_32fc_t* points, unsigned int num_bytes) {
   lv_32fc_t diff;
   float sq_dist;
-  int i = 0; 
+  unsigned int i = 0; 
   
   for(; i < num_bytes >> 3; ++i) {
     diff = src0[0] - points[i];
diff --git a/volk/include/volk/volk_prefs.h b/volk/include/volk/volk_prefs.h
index 2a7f7e79f..83d9baf89 100644
--- a/volk/include/volk/volk_prefs.h
+++ b/volk/include/volk/volk_prefs.h
@@ -5,7 +5,7 @@
 
 __VOLK_DECL_BEGIN
 
-struct VOLK_API volk_arch_pref {
+struct volk_arch_pref {
     char name[128];
     char arch[32];
 };
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index 33a478265..e18d13677 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -21,51 +21,72 @@
 #  If the test passes append the arch to the available list.
 ########################################################################
 #extract the arch lines from the xml file using crazy python
-EXECUTE_PROCESS(
+execute_process(
     COMMAND ${PYTHON_EXECUTABLE} -c
     "from xml.dom import minidom; print ';'.join(map(lambda a: '%s %s'%(a.attributes['name'].value,a.getElementsByTagName('flag')[0].firstChild.data),minidom.parse('${CMAKE_SOURCE_DIR}/gen/archs.xml').getElementsByTagName('arch')))"
     OUTPUT_VARIABLE arch_lines OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+#get any mutually exclusive archs so we can exclude them
+#this is really for compilers which can do both 32- and 64-bit compilations.
+execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} -c
+    "from xml.dom import minidom; print ';'.join(map(lambda a: '%s %s'%(a.parentNode.attributes['name'].value,a.firstChild.data),minidom.parse('${CMAKE_SOURCE_DIR}/gen/archs.xml').getElementsByTagName('mutex')))"
+    OUTPUT_VARIABLE mutex_lines OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
 #This macro sets the ${arch}_flag variable,
 #and handles special cases for MSVC arch flags.
-MACRO(set_arch_flag name flag)
-    IF(MSVC AND ${name} STREQUAL "mmx")
-        SET(${name}_flag "/arch:SSE") #no /arch:MMX
-    ELSEIF(MSVC AND ${name} STREQUAL "sse")
-        SET(${name}_flag "/arch:SSE")
-    ELSEIF(MSVC AND ${name} STREQUAL "sse2")
-        SET(${name}_flag "/arch:SSE2")
-    ELSE()
-        SET(${name}_flag -${flag})
-    ENDIF()
-ENDMACRO(set_arch_flag)
-
-MACRO(handle_arch name flag)
+macro(set_arch_flag name flag)
+    if(MSVC AND ${name} STREQUAL "mmx")
+        set(${name}_flag "/arch:SSE") #no /arch:MMX
+    elseif(MSVC AND ${name} STREQUAL "sse")
+        set(${name}_flag "/arch:SSE")
+    elseif(MSVC AND ${name} STREQUAL "sse2")
+        set(${name}_flag "/arch:SSE2")
+    else()
+        set(${name}_flag -${flag})
+    endif()
+endmacro(set_arch_flag)
+
+macro(handle_arch name flag)
 
     #handle special case for none flag
-    IF(${flag} STREQUAL "none")
-        SET(have_${name} TRUE)
+    if(${flag} STREQUAL "none")
+        set(have_${name} TRUE)
 
     #otherwise test the flag against the compiler
-    ELSE()
-        INCLUDE(CheckCXXCompilerFlag)
+    else()
+        include(CheckCXXCompilerFlag)
         set_arch_flag(${name} ${flag})
         CHECK_CXX_COMPILER_FLAG(${${name}_flag} have_${name})
-    ENDIF()
+    endif()
 
-    IF(have_${name})
-        LIST(APPEND available_arches ${name})
-    ENDIF()
-ENDMACRO(handle_arch)
+    if(have_${name})
+        list(APPEND available_arches ${name})
+    endif()
+endmacro(handle_arch)
+
+macro(remove_mutex name mutex)
+    if(have_${name})
+        unset(have_${mutex})
+    endif()
+    list(REMOVE_ITEM available_arches ${mutex})
+endmacro(remove_mutex)
 
 #create a list of available arches
-FOREACH(arch_line ${arch_lines})
-    SEPARATE_ARGUMENTS(args UNIX_COMMAND "${arch_line}")
+foreach(arch_line ${arch_lines})
+    separate_arguments(args UNIX_COMMAND "${arch_line}")
     handle_arch(${args})
-ENDFOREACH(arch_line)
+endforeach(arch_line)
+
+#strip out mutex archs
+foreach(mutex_line ${mutex_lines})
+    separate_arguments(args UNIX_COMMAND "${mutex_line}")
+    remove_mutex(${args})
+endforeach(mutex_line)
 
-MESSAGE(STATUS "Available arches: ${available_arches}")
+message(STATUS "Available arches: ${available_arches}")
 
 ########################################################################
 # Parse the machines xml file:
@@ -73,61 +94,61 @@ MESSAGE(STATUS "Available arches: ${available_arches}")
 #  Build a list of supported machines and the machine definitions.
 ########################################################################
 #extract the machine lines from the xml file using crazy python
-EXECUTE_PROCESS(
+execute_process(
     COMMAND ${PYTHON_EXECUTABLE} -c
     "from xml.dom import minidom; print ';'.join(map(lambda a: '%s %s'%(a.attributes['name'].value,a.getElementsByTagName('archs')[0].firstChild.data),minidom.parse('${CMAKE_SOURCE_DIR}/gen/machines.xml').getElementsByTagName('machine')))"
     OUTPUT_VARIABLE machine_lines OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-MACRO(handle_machine1 name)
-    UNSET(machine_flags)
-    STRING(TOUPPER LV_MACHINE_${name} machine_def)
+macro(handle_machine1 name)
+    unset(machine_flags)
+    string(TOUPPER LV_MACHINE_${name} machine_def)
 
     #check if all the arches are supported
-    FOREACH(arch ${ARGN})
-        SET(is_match ${have_${arch}})
-        IF(NOT is_match)
-            SET(is_match FALSE)
-            BREAK()
-        ENDIF(NOT is_match)
-        SET(machine_flags "${machine_flags} ${${arch}_flag}")
-    ENDFOREACH(arch)
-
-    IF(is_match)
+    foreach(arch ${ARGN})
+        set(is_match ${have_${arch}})
+        if(NOT is_match)
+            set(is_match FALSE)
+            break()
+        endif(NOT is_match)
+        set(machine_flags "${machine_flags} ${${arch}_flag}")
+    endforeach(arch)
+
+    if(is_match)
         #this is a match, append the source and set its flags
-        SET(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${name}.c)
-        SET_SOURCE_FILES_PROPERTIES(${machine_source} PROPERTIES COMPILE_FLAGS ${machine_flags})
-        LIST(APPEND machine_sources ${machine_source})
-        LIST(APPEND machine_defs ${machine_def})
-        LIST(APPEND available_machines ${name})
-    ENDIF()
-ENDMACRO(handle_machine1)
-
-MACRO(handle_machine name)
-    SET(arches ${ARGN})
-    LIST(FIND arches "32|64" index)
-    IF(${index} EQUAL -1)
+        set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${name}.c)
+        set_source_files_properties(${machine_source} PROPERTIES COMPILE_FLAGS ${machine_flags})
+        list(APPEND machine_sources ${machine_source})
+        list(APPEND machine_defs ${machine_def})
+        list(APPEND available_machines ${name})
+    endif()
+endmacro(handle_machine1)
+
+macro(handle_machine name)
+    set(arches ${ARGN})
+    list(FIND arches "32|64" index)
+    if(${index} EQUAL -1)
         handle_machine1(${name} ${arches})
-    ELSE()
-        LIST(REMOVE_ITEM arches "32|64")
+    else()
+        list(REMOVE_ITEM arches "32|64")
         handle_machine1(${name}_32 32 ${arches})
         handle_machine1(${name}_64 64 ${arches})
-    ENDIF()
-ENDMACRO(handle_machine)
+    endif()
+endmacro(handle_machine)
 
 #setup the available machines
-FOREACH(machine_line ${machine_lines})
-    SEPARATE_ARGUMENTS(args UNIX_COMMAND "${machine_line}")
+foreach(machine_line ${machine_lines})
+    separate_arguments(args UNIX_COMMAND "${machine_line}")
     handle_machine(${args})
-ENDFOREACH(machine_line)
+endforeach(machine_line)
 
-MESSAGE(STATUS "Available machines: ${available_machines}")
+message(STATUS "Available machines: ${available_machines}")
 
 ########################################################################
 # Create rules to run the volk generator
 ########################################################################
 #list of the generated sources
-SET(volk_gen_sources
+set(volk_gen_sources
     ${CMAKE_BINARY_DIR}/include/volk/volk.h
     ${CMAKE_BINARY_DIR}/lib/volk.c
     ${CMAKE_BINARY_DIR}/lib/volk_init.h
@@ -143,14 +164,24 @@ SET(volk_gen_sources
 )
 
 #dependencies are all python, xml, and header implementation files
-FILE(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml)
-FILE(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py)
-FILE(GLOB h_files ${CMAKE_SOURCE_DIR}/include/volk/*.h)
+file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml)
+file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py)
+file(GLOB h_files ${CMAKE_SOURCE_DIR}/include/volk/*.h)
+
+#make sure we can use -B with python (introduced in 2.6)
+execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} -B -c ""
+    OUTPUT_QUIET ERROR_QUIET
+    RESULT_VARIABLE PYTHON_HAS_DASH_B_RESULT
+)
+if(PYTHON_HAS_DASH_B_RESULT EQUAL 0)
+    set(PYTHON_DASH_B "-B")
+endif()
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
     OUTPUT ${volk_gen_sources}
     DEPENDS ${xml_files} ${py_files} ${h_files}
-    COMMAND ${PYTHON_EXECUTABLE} -B
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
         ${CMAKE_SOURCE_DIR}/gen/volk_register.py
         ${CMAKE_BINARY_DIR}
 )
@@ -158,104 +189,105 @@ ADD_CUSTOM_COMMAND(
 ########################################################################
 # Handle orc support
 ########################################################################
-FIND_PACKAGE(PkgConfig)
-IF(PKG_CONFIG_FOUND)
-PKG_CHECK_MODULES(ORC "orc-0.4")
-ENDIF(PKG_CONFIG_FOUND)
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+PKG_CHECK_MODULES(ORC "orc-0.4 > 0.4.11")
+endif(PKG_CONFIG_FOUND)
 
-FIND_PROGRAM(ORCC_EXECUTABLE orcc)
+find_program(ORCC_EXECUTABLE orcc)
 
-IF(ORC_FOUND AND ORCC_EXECUTABLE)
+if(ORC_FOUND AND ORCC_EXECUTABLE)
     #setup orc library usage
-    INCLUDE_DIRECTORIES(${ORC_INCLUDE_DIRS})
-    LINK_DIRECTORIES(${ORC_LIBRARY_DIRS})
-    ADD_DEFINITIONS(-DLV_HAVE_ORC)
+    include_directories(${ORC_INCLUDE_DIRS})
+    link_directories(${ORC_LIBRARY_DIRS})
+    add_definitions(-DLV_HAVE_ORC)
 
     #setup orc functions
-    FILE(GLOB orc_files ${CMAKE_SOURCE_DIR}/orc/*.orc)
-    FOREACH(orc_file ${orc_files})
+    file(GLOB orc_files ${CMAKE_SOURCE_DIR}/orc/*.orc)
+    foreach(orc_file ${orc_files})
 
         #extract the name for the generated c source from the orc file
-        GET_FILENAME_COMPONENT(orc_file_name_we ${orc_file} NAME_WE)
-        SET(orcc_gen ${CMAKE_CURRENT_BINARY_DIR}/${orc_file_name_we}.c)
+        get_filename_component(orc_file_name_we ${orc_file} NAME_WE)
+        set(orcc_gen ${CMAKE_CURRENT_BINARY_DIR}/${orc_file_name_we}.c)
 
         #create a rule to generate the source and add to the list of sources
-        ADD_CUSTOM_COMMAND(
+        add_custom_command(
             COMMAND ${ORCC_EXECUTABLE} --implementation -o ${orcc_gen} ${orc_file}
             DEPENDS ${orc_file} OUTPUT ${orcc_gen}
         )
-        LIST(APPEND volk_sources ${orcc_gen})
+        list(APPEND volk_sources ${orcc_gen})
 
-    ENDFOREACH(orc_file)
-ELSE()
-    MESSAGE(STATUS "Did not find liborc and orcc, disabling orc support...")
-ENDIF()
+    endforeach(orc_file)
+else()
+    message(STATUS "Did not find liborc and orcc, disabling orc support...")
+endif()
 
 ########################################################################
 # Setup the volk sources list and library
 ########################################################################
-IF(NOT WIN32)
-    ADD_DEFINITIONS(-fvisibility=hidden)
-ENDIF()
+if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
+    #http://gcc.gnu.org/wiki/Visibility
+    add_definitions(-fvisibility=hidden)
+endif()
 
-INCLUDE_DIRECTORIES(
-    ${CMAKE_SOURCE_DIR}/include
+include_directories(
     ${CMAKE_BINARY_DIR}/include
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/include
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-LIST(APPEND volk_sources
+list(APPEND volk_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/volk_prefs.c
     ${CMAKE_CURRENT_SOURCE_DIR}/volk_rank_archs.c
     ${volk_gen_sources}
 )
 
 #set the machine definitions where applicable
-SET_SOURCE_FILES_PROPERTIES(
+set_source_files_properties(
     ${CMAKE_CURRENT_BINARY_DIR}/volk.c
     ${CMAKE_CURRENT_BINARY_DIR}/volk_machines.c
 PROPERTIES COMPILE_DEFINITIONS "${machine_defs}")
 
-IF(MSVC)
+if(MSVC)
     #add compatibility includes for stdint types
-    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/msvc)
+    include_directories(${CMAKE_SOURCE_DIR}/msvc)
     #compile the sources as C++ due to the lack of complex.h under MSVC
-    SET_SOURCE_FILES_PROPERTIES(${volk_sources} PROPERTIES LANGUAGE CXX)
-ENDIF(MSVC)
+    set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX)
+endif(MSVC)
 
 #create the volk runtime library
-ADD_LIBRARY(volk SHARED ${volk_sources})
-TARGET_LINK_LIBRARIES(volk ${ORC_LIBRARIES})
-SET_TARGET_PROPERTIES(volk PROPERTIES SOVERSION ${LIBVER})
-SET_TARGET_PROPERTIES(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")
-
-INSTALL(TARGETS volk
-    LIBRARY DESTINATION lib${LIB_SUFFIX} # .so file
-    ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
-    RUNTIME DESTINATION bin # .dll file
+add_library(volk SHARED ${volk_sources})
+target_link_libraries(volk ${ORC_LIBRARIES})
+set_target_properties(volk PROPERTIES SOVERSION ${LIBVER})
+set_target_properties(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")
+
+install(TARGETS volk
+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_runtime" # .so file
+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_devel"   # .lib file
+    RUNTIME DESTINATION bin              COMPONENT "volk_runtime" # .dll file
 )
 
 ########################################################################
 # Build the QA test application
 ########################################################################
-FIND_PACKAGE(Boost COMPONENTS unit_test_framework)
+find_package(Boost COMPONENTS unit_test_framework)
 
-IF(Boost_FOUND)
+if(Boost_FOUND)
 
-SET_SOURCE_FILES_PROPERTIES(
+set_source_files_properties(
     ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc PROPERTIES
     COMPILE_DEFINITIONS "BOOST_TEST_DYN_LINK;BOOST_TEST_MAIN"
 )
 
-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
 
-ADD_EXECUTABLE(test_all
+add_executable(test_all
     ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_utils.cc
 )
-TARGET_LINK_LIBRARIES(test_all volk ${Boost_LIBRARIES})
-ADD_TEST(qa_volk_test_all test_all)
+target_link_libraries(test_all volk ${Boost_LIBRARIES})
+#ADD_TEST(qa_volk_test_all test_all)
 
-ENDIF()
+endif()
diff --git a/volk/lib/qa_utils.cc b/volk/lib/qa_utils.cc
index 7f86dd78b..9bb515e9f 100644
--- a/volk/lib/qa_utils.cc
+++ b/volk/lib/qa_utils.cc
@@ -35,7 +35,7 @@ void load_random_data(void *data, volk_type_t type, unsigned int n) {
     } else {
         float int_max = float(uint64_t(2) << (type.size*8));
         if(type.is_signed) int_max /= 2.0;
-        for(int i=0; i<n; i++) {
+        for(unsigned int i=0; i<n; i++) {
             float scaled_rand = (((float) (rand() - (RAND_MAX/2))) / static_cast<float>((RAND_MAX/2))) * int_max;
             //man i really don't know how to do this in a more clever way, you have to cast down at some point
             switch(type.size) {
@@ -91,7 +91,7 @@ volk_type_t volk_type_from_string(std::string name) {
     }
     
     //get the data size
-    int last_size_pos = name.find_last_of("0123456789");
+    size_t last_size_pos = name.find_last_of("0123456789");
     if(last_size_pos < 0) throw std::string("no size spec in type ").append(name);
     //will throw if malformed
     int size = boost::lexical_cast<int>(name.substr(0, last_size_pos+1));
@@ -99,7 +99,7 @@ volk_type_t volk_type_from_string(std::string name) {
     assert(((size % 8) == 0) && (size <= 64) && (size != 0));
     type.size = size/8; //in bytes
     
-    for(int i=last_size_pos+1; i < name.size(); i++) {
+    for(size_t i=last_size_pos+1; i < name.size(); i++) {
         switch (name[i]) {
         case 'f':
             type.is_float = true;
@@ -202,7 +202,7 @@ template <class t>
 bool fcompare(t *in1, t *in2, unsigned int vlen, float tol) {
     bool fail = false;
     int print_max_errs = 10;
-    for(int i=0; i<vlen; i++) {
+    for(unsigned int i=0; i<vlen; i++) {
         if(((t *)(in1))[i] < 1e-30) continue; //this is a hack: below around here we'll start to get roundoff errors due to limited precision
         if(fabs(((t *)(in1))[i] - ((t *)(in2))[i])/(((t *)in1)[i]) > tol) {
             fail=true;
@@ -219,7 +219,7 @@ template <class t>
 bool icompare(t *in1, t *in2, unsigned int vlen, unsigned int tol) {
     bool fail = false;
     int print_max_errs = 10;
-    for(int i=0; i<vlen; i++) {
+    for(unsigned int i=0; i<vlen; i++) {
         if(abs(int(((t *)(in1))[i]) - int(((t *)(in2))[i])) > tol) {
             fail=true;
             if(print_max_errs-- > 0) {
@@ -270,7 +270,7 @@ bool run_volk_tests(struct volk_func_desc desc,
     
     //pull the input scalars into their own vector
     std::vector<volk_type_t> inputsc;
-    for(int i=0; i<inputsig.size(); i++) {
+    for(size_t i=0; i<inputsig.size(); i++) {
         if(inputsig[i].is_scalar) {
             inputsc.push_back(inputsig[i]);
             inputsig.erase(inputsig.begin() + i);
@@ -284,18 +284,18 @@ bool run_volk_tests(struct volk_func_desc desc,
         if(!sig.is_scalar) //we don't make buffers for scalars
           inbuffs.push_back(mem_pool.get_new(vlen*sig.size*(sig.is_complex ? 2 : 1)));
     }
-    for(int i=0; i<inbuffs.size(); i++) {
+    for(size_t i=0; i<inbuffs.size(); i++) {
         load_random_data(inbuffs[i], inputsig[i], vlen);
     }
     
     //ok let's make a vector of vector of void buffers, which holds the input/output vectors for each arch
     std::vector<std::vector<void *> > test_data;
-    for(int i=0; i<arch_list.size(); i++) {
+    for(size_t i=0; i<arch_list.size(); i++) {
         std::vector<void *> arch_buffs;
-        for(int j=0; j<outputsig.size(); j++) {
+        for(size_t j=0; j<outputsig.size(); j++) {
             arch_buffs.push_back(mem_pool.get_new(vlen*outputsig[j].size*(outputsig[j].is_complex ? 2 : 1)));
         }
-        for(int j=0; j<inputsig.size(); j++) {
+        for(size_t j=0; j<inputsig.size(); j++) {
             arch_buffs.push_back(inbuffs[j]);
         }
         test_data.push_back(arch_buffs);
@@ -308,7 +308,7 @@ bool run_volk_tests(struct volk_func_desc desc,
     //now run the test
     clock_t start, end;
     std::vector<double> profile_times;
-    for(int i = 0; i < arch_list.size(); i++) {
+    for(size_t i = 0; i < arch_list.size(); i++) {
         start = clock();
 
         switch(both_sigs.size()) {
@@ -350,8 +350,8 @@ bool run_volk_tests(struct volk_func_desc desc,
     
     //and now compare each output to the generic output
     //first we have to know which output is the generic one, they aren't in order...
-    int generic_offset=0;
-    for(int i=0; i<arch_list.size(); i++) 
+    size_t generic_offset=0;
+    for(size_t i=0; i<arch_list.size(); i++) 
         if(arch_list[i] == "generic") generic_offset=i;
 
     //now compare
@@ -360,10 +360,10 @@ bool run_volk_tests(struct volk_func_desc desc,
     bool fail = false;
     bool fail_global = false;
     std::vector<bool> arch_results;
-    for(int i=0; i<arch_list.size(); i++) {
+    for(size_t i=0; i<arch_list.size(); i++) {
         fail = false;
         if(i != generic_offset) {
-            for(int j=0; j<both_sigs.size(); j++) {
+            for(size_t j=0; j<both_sigs.size(); j++) {
                 if(both_sigs[j].is_float) {
                     if(both_sigs[j].size == 8) {
                         fail = fcompare((double *) test_data[generic_offset][j], (double *) test_data[i][j], vlen*(both_sigs[j].is_complex ? 2 : 1), tol);
@@ -417,7 +417,7 @@ bool run_volk_tests(struct volk_func_desc desc,
         
     double best_time = std::numeric_limits<double>::max();
     std::string best_arch = "generic";
-    for(int i=0; i < arch_list.size(); i++) {
+    for(size_t i=0; i < arch_list.size(); i++) {
         if((profile_times[i] < best_time) && arch_results[i]) {
             best_time = profile_times[i];
             best_arch = arch_list[i];
diff --git a/volk/lib/volk_prefs.c b/volk/lib/volk_prefs.c
index 9743c51d9..b29d5fd87 100644
--- a/volk/lib/volk_prefs.c
+++ b/volk/lib/volk_prefs.c
@@ -23,7 +23,7 @@ int load_preferences(struct volk_arch_pref **prefs) {
     //get the config path
     get_config_path(path);
     config_file = fopen(path, "r");
-    if(!config_file) return; //no prefs found
+    if(!config_file) return n_arch_prefs; //no prefs found
 
     while(fgets(line, 512, config_file) != NULL) {
         if(sscanf(line, "%s %s", function, arch) == 2 && !strncmp(function, "volk_", 5)) {
diff --git a/volk/lib/volk_rank_archs.c b/volk/lib/volk_rank_archs.c
index e10433fd0..4baa078bc 100644
--- a/volk/lib/volk_rank_archs.c
+++ b/volk/lib/volk_rank_archs.c
@@ -5,7 +5,7 @@
 #include <string.h>
 
 unsigned int get_index(const char *indices[], unsigned int n_archs, const char *arch_name) {
-    int i;
+    unsigned int i;
     for(i=0; i<n_archs; i++) {
         if(!strncmp(indices[i], arch_name, 20)) {
             return i;
@@ -17,10 +17,10 @@ unsigned int get_index(const char *indices[], unsigned int n_archs, const char *
 }
 
 unsigned int volk_rank_archs(const char *indices[], const int* arch_defs, unsigned int n_archs, const char* name, unsigned int arch) {
-  int i;
+  unsigned int i;
   unsigned int best_val = 0;
   static struct volk_arch_pref *volk_arch_prefs;
-  static int n_arch_prefs = 0;
+  static unsigned int n_arch_prefs = 0;
   static int prefs_loaded = 0;
   if(!prefs_loaded) {
       n_arch_prefs = load_preferences(&volk_arch_prefs);