Remove proto-RFNoC files

This commit removes all files and parts of files that are used by
proto-RFNoC only.

uhd: Fix include CMakeLists.txt, add missing files

host/CMakeLists.txt

@@ -301,8 +301,6 @@ link_directories(${Boost_LIBRARY_DIRS})
 ########################################################################
 # Additional settings for build environment
 ########################################################################
-# Note: RFNoC never gets fully disabled, but the public APIs do
-set(ENABLE_RFNOC ON CACHE BOOL "Export RFNoC includes and symbols")
 include(UHDGlobalDefs)
 include(UHDLog)
 
@@ -470,12 +468,7 @@ endforeach(Boost_Comp)
 if(ENABLE_USB)
     list(APPEND UHD_LINK_LIST_STATIC "usb-1.0")
 endif(ENABLE_USB)
-# UHDConfig.cmake also needs UHD_RFNOC_FOUND
-if(ENABLE_RFNOC)
-    set(UHD_RFNOC_FOUND "TRUE")
-else()
-    set(UHD_RFNOC_FOUND "FALSE")
-endif(ENABLE_RFNOC)
+set(UHD_RFNOC_FOUND "TRUE")
 
 configure_file(
     ${CMAKE_SOURCE_DIR}/cmake/Modules/UHDConfigVersion.cmake.in

host/cmake/Modules/UHDGlobalDefs.cmake

@@ -16,10 +16,5 @@ else()
     math(EXPR UHD_VERSION_ADDED "1000000 * ${UHD_VERSION_MAJOR} + 10000 * ${UHD_VERSION_API} + 100 * ${UHD_VERSION_ABI} + ${UHD_VERSION_PATCH}")
 endif(UHD_VERSION_DEVEL)
 
-## RFNoC
-if(ENABLE_RFNOC)
-    add_definitions(-DUHD_RFNOC_ENABLED)
-endif(ENABLE_RFNOC)
-
 ## make sure the code knows about config.h
 add_definitions(-DHAVE_CONFIG_H)

host/docs/CMakeLists.txt

@@ -37,9 +37,6 @@ if(ENABLE_MANUAL)
     set(DOXYGEN_FPGA_MANUAL_REFERENCE "<a href=\"http://files.ettus.com/manual/md_fpga.html\">Part III: FPGA Manual</a>")
     set(DOXYGEN_STRIP_EXTRA "")
     set(DOXYGEN_EXCLUDE_DIRS "")
-    if(NOT ENABLE_RFNOC)
-        set(DOXYGEN_EXCLUDE_DIRS "${DOXYGEN_EXCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include/uhd/rfnoc")
-    endif(NOT ENABLE_RFNOC)
     # Now, check if we have the FPGA sources as well.
     # If so, pull them in:
     if(HAS_FPGA_SUBMODULE)
@@ -73,7 +70,7 @@ if(ENABLE_DOXYGEN)
     file(GLOB_RECURSE header_files ${CMAKE_SOURCE_DIR}/include/*.hpp)
     file(GLOB_RECURSE h_files ${CMAKE_SOURCE_DIR}/include/*.h)
     list(APPEND header_files ${h_files})
-    set(DOXYGEN_DEPENDENCIES ${DOXYGEN_DEPENDENCIES} ${header_files} "${CMAKE_SOURCE_DIR}/lib/rfnoc/nocscript/gen_basic_funcs.py")
+    set(DOXYGEN_DEPENDENCIES ${DOXYGEN_DEPENDENCIES} ${header_files})
     if(ENABLE_DOXYGEN_FULL)
         set(DOXYGEN_INPUT_DIRS "${DOXYGEN_INPUT_DIRS} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/python")
     else(ENABLE_DOXYGEN_FULL)

host/docs/mainpage.dox.in

@@ -13,7 +13,6 @@ Follow these links to get to the section of the manual you wish to consult, or u
 \li \subpage page_devices "Part I: Devices & Usage Manual"
 \li \subpage page_uhd "Part II: UHD Development Manual"
 \li @DOXYGEN_FPGA_MANUAL_REFERENCE@
-\li \subpage page_rfnoc "Part IV: RFNoC Development Manual"
 
 ### Further Information
 

host/examples/CMakeLists.txt

@@ -28,19 +28,13 @@ set(example_sources
     latency_test.cpp
     gpio.cpp
     sync_to_gps.cpp
+    rfnoc_nullsource_ce_rx.cpp
+    rfnoc_rx_to_file.cpp
+    #rfnoc_radio_loopback.cpp
+    #benchmark_streamer.cpp
+    #replay_samples_from_file.cpp
 )
 
-if(ENABLE_RFNOC)
-    list(APPEND
-        example_sources
-        rfnoc_nullsource_ce_rx.cpp
-        rfnoc_rx_to_file.cpp
-        rfnoc_radio_loopback.cpp
-        replay_samples_from_file.cpp
-        benchmark_streamer.cpp
-    )
-endif(ENABLE_RFNOC)
-
 if(ENABLE_OCTOCLOCK)
     list(APPEND example_sources test_clock_synch.cpp)
 endif(ENABLE_OCTOCLOCK)

host/examples/benchmark_streamer.cpp

@@ -5,7 +5,6 @@
 //
 
 #include <uhd/convert.hpp>
-#include <uhd/device3.hpp>
 #include <uhd/rfnoc/block_ctrl.hpp>
 #include <uhd/rfnoc/ddc_block_ctrl.hpp>
 #include <uhd/rfnoc/duc_block_ctrl.hpp>

host/examples/rfnoc_nullsource_ce_rx.cpp

@@ -20,7 +20,6 @@
 // crossbar (provided it has stream-through capabilities)
 // and then streams the result to the host, writing it into a file.
 
-#include <uhd/device3.hpp>
 #include <uhd/exception.hpp>
 #include <uhd/rfnoc/block_control.hpp>
 #include <uhd/rfnoc/null_block_control.hpp>

host/examples/rfnoc_radio_loopback.cpp

@@ -8,7 +8,6 @@
 // Example UHD/RFNoC application: Connect an rx radio to a tx radio and
 // run a loopback.
 
-#include <uhd/device3.hpp>
 #include <uhd/rfnoc/radio_ctrl.hpp>
 #include <uhd/utils/math.hpp>
 #include <uhd/utils/safe_main.hpp>

host/include/uhd/CMakeLists.txt

@@ -1,13 +1,11 @@
 #
 # Copyright 2010-2011,2013-2015 Ettus Research LLC
 # Copyright 2018 Ettus Research, a National Instruments Company
+# Copyright 2019 Ettus Research, a National Instruments Brand
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
-# This is a temporary include - remove once rfnoc is replaced by erfnoc
-add_subdirectory(erfnoc)
-
 add_subdirectory(rfnoc)
 add_subdirectory(transport)
 add_subdirectory(types)
@@ -35,14 +33,6 @@ UHD_INSTALL(FILES
     COMPONENT headers
 )
 
-if(ENABLE_RFNOC)
-    UHD_INSTALL(FILES
-        device3.hpp
-        DESTINATION ${INCLUDE_DIR}/uhd
-        COMPONENT headers
-    )
-endif(ENABLE_RFNOC)
-
 if(ENABLE_C_API)
     UHD_INSTALL(FILES
         config.h

host/include/uhd/config.hpp

@@ -111,13 +111,6 @@ typedef ptrdiff_t ssize_t;
 #    endif // UHD_DLL_EXPORTS
 #endif // UHD_STATIC_LIB
 
-#ifdef UHD_RFNOC_ENABLED
-#    define UHD_RFNOC_API UHD_API
-#else
-#    define UHD_RFNOC_API
-#endif // UHD_RFNOC_ENABLED
-
-
 // Platform defines for conditional parts of headers:
 // Taken from boost/config/select_platform_config.hpp,
 // however, we define macros, not strings for platforms.