20 files changed, 65 insertions, 65 deletions
diff --git a/host/lib/usrp/CMakeLists.txt b/host/lib/usrp/CMakeLists.txt
index bb7e83214..073b3c80b 100644
--- a/host/lib/usrp/CMakeLists.txt
+++ b/host/lib/usrp/CMakeLists.txt
@@ -35,4 +35,4 @@ LIBUHD_APPEND_SOURCES(
 INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/dboard/CMakeLists.txt)
 INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/usrp1/CMakeLists.txt)
 INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/CMakeLists.txt)
-INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/CMakeLists.txt)
+INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/CMakeLists.txt)
diff --git a/host/lib/usrp/usrp_e/CMakeLists.txt b/host/lib/usrp/usrp_e/CMakeLists.txt
deleted file mode 100644
index 6c5d281dd..000000000
--- a/host/lib/usrp/usrp_e/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# 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/>.
-#
-
-#This file will be included by cmake, use absolute paths!
-
-########################################################################
-# Conditionally configure the USRP-E support
-########################################################################
-MESSAGE(STATUS "Configuring usrp-e support...")
-
-INCLUDE(CheckIncludeFileCXX)
-CHECK_INCLUDE_FILE_CXX(linux/usrp_e.h HAVE_LINUX_USRP_E_H)
-
-SET(ENABLE_USRP_E TRUE)
-
-IF(DEFINED ENABLE_USRP_E)
-    IF(ENABLE_USRP_E)
-        MESSAGE(STATUS "USRP-E support enabled by configure flag")
-    ELSE(ENABLE_USRP_E)
-        MESSAGE(STATUS "USRP-E support disabled by configure flag")
-    ENDIF(ENABLE_USRP_E)
-ELSE(DEFINED ENABLE_USRP_E) #not defined: automatic enabling of component
-    SET(ENABLE_USRP_E ${HAVE_LINUX_USRP_E_H})
-ENDIF(DEFINED ENABLE_USRP_E)
-SET(ENABLE_USRP_E ${ENABLE_USRP_E} CACHE BOOL "enable USRP-E support")
-
-IF(ENABLE_USRP_E)
-    MESSAGE(STATUS "  Building usrp-e support.")
-    LIBUHD_APPEND_SOURCES(
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/clock_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/clock_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/codec_ctrl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/codec_ctrl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/codec_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/dboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/dboard_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/dsp_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/fpga-downloader.cc
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/io_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/mboard_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/usrp_e_impl.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/usrp_e_impl.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/usrp_e_iface.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/usrp_e_iface.hpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/usrp_e_mmap_zero_copy.cpp
-        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e/usrp_e_regs.hpp
-    )
-ELSE(ENABLE_USRP_E)
-    MESSAGE(STATUS "  Skipping usrp-e support.")
-ENDIF(ENABLE_USRP_E)
diff --git a/host/lib/usrp/usrp_e100/CMakeLists.txt b/host/lib/usrp/usrp_e100/CMakeLists.txt
new file mode 100644
index 000000000..17ef53152
--- /dev/null
+++ b/host/lib/usrp/usrp_e100/CMakeLists.txt
@@ -0,0 +1,64 @@
+#
+# 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/>.
+#
+
+#This file will be included by cmake, use absolute paths!
+
+########################################################################
+# Conditionally configure the USRP-E100 support
+########################################################################
+MESSAGE(STATUS "Configuring USRP-E100 support...")
+
+INCLUDE(CheckIncludeFileCXX)
+CHECK_INCLUDE_FILE_CXX(linux/usrp_e.h HAVE_LINUX_USRP_E_H)
+
+SET(ENABLE_USRP_E TRUE)
+
+IF(DEFINED ENABLE_USRP_E100)
+    IF(ENABLE_USRP_E100)
+        MESSAGE(STATUS "USRP-E100 support enabled by configure flag")
+    ELSE(ENABLE_USRP_E100)
+        MESSAGE(STATUS "USRP-E100 support disabled by configure flag")
+    ENDIF(ENABLE_USRP_E100)
+ELSE(DEFINED ENABLE_USRP_E100) #not defined: automatic enabling of component
+    SET(ENABLE_USRP_E100 ${HAVE_LINUX_USRP_E_H})
+ENDIF(DEFINED ENABLE_USRP_E100)
+SET(ENABLE_USRP_E100 ${ENABLE_USRP_E100} CACHE BOOL "enable USRP-E100 support")
+
+IF(ENABLE_USRP_E100)
+    MESSAGE(STATUS "  Building USRP-E100 support.")
+    LIBUHD_APPEND_SOURCES(
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/clock_ctrl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/clock_ctrl.hpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/codec_ctrl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/codec_ctrl.hpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/codec_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/dboard_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/dboard_iface.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/dsp_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/fpga-downloader.cc
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/io_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/mboard_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e_impl.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e_impl.hpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e_iface.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e_iface.hpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e_mmap_zero_copy.cpp
+        ${CMAKE_SOURCE_DIR}/lib/usrp/usrp_e100/usrp_e_regs.hpp
+    )
+ELSE(ENABLE_USRP_E100)
+    MESSAGE(STATUS "  Skipping USRP-E100 support.")
+ENDIF(ENABLE_USRP_E100)
diff --git a/host/lib/usrp/usrp_e/clock_ctrl.cpp b/host/lib/usrp/usrp_e100/clock_ctrl.cpp
index 9d4625305..9d4625305 100644
--- a/host/lib/usrp/usrp_e/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp_e100/clock_ctrl.cpp
diff --git a/host/lib/usrp/usrp_e/clock_ctrl.hpp b/host/lib/usrp/usrp_e100/clock_ctrl.hpp
index 3b5103ed1..3b5103ed1 100644
--- a/host/lib/usrp/usrp_e/clock_ctrl.hpp
+++ b/host/lib/usrp/usrp_e100/clock_ctrl.hpp
diff --git a/host/lib/usrp/usrp_e/codec_ctrl.cpp b/host/lib/usrp/usrp_e100/codec_ctrl.cpp
index a728d7e46..a728d7e46 100644
--- a/host/lib/usrp/usrp_e/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp_e100/codec_ctrl.cpp
diff --git a/host/lib/usrp/usrp_e/codec_ctrl.hpp b/host/lib/usrp/usrp_e100/codec_ctrl.hpp
index 87b6ff951..87b6ff951 100644
--- a/host/lib/usrp/usrp_e/codec_ctrl.hpp
+++ b/host/lib/usrp/usrp_e100/codec_ctrl.hpp
diff --git a/host/lib/usrp/usrp_e/codec_impl.cpp b/host/lib/usrp/usrp_e100/codec_impl.cpp
index 696fb37ec..696fb37ec 100644
--- a/host/lib/usrp/usrp_e/codec_impl.cpp
+++ b/host/lib/usrp/usrp_e100/codec_impl.cpp
diff --git a/host/lib/usrp/usrp_e/dboard_iface.cpp b/host/lib/usrp/usrp_e100/dboard_iface.cpp
index 6898df8df..6898df8df 100644
--- a/host/lib/usrp/usrp_e/dboard_iface.cpp
+++ b/host/lib/usrp/usrp_e100/dboard_iface.cpp
diff --git a/host/lib/usrp/usrp_e/dboard_impl.cpp b/host/lib/usrp/usrp_e100/dboard_impl.cpp
index f2840dcfc..f2840dcfc 100644
--- a/host/lib/usrp/usrp_e/dboard_impl.cpp
+++ b/host/lib/usrp/usrp_e100/dboard_impl.cpp
diff --git a/host/lib/usrp/usrp_e/dsp_impl.cpp b/host/lib/usrp/usrp_e100/dsp_impl.cpp
index 97f173c1a..97f173c1a 100644
--- a/host/lib/usrp/usrp_e/dsp_impl.cpp
+++ b/host/lib/usrp/usrp_e100/dsp_impl.cpp
diff --git a/host/lib/usrp/usrp_e/fpga-downloader.cc b/host/lib/usrp/usrp_e100/fpga-downloader.cc
index 4dc537919..4dc537919 100644
--- a/host/lib/usrp/usrp_e/fpga-downloader.cc
+++ b/host/lib/usrp/usrp_e100/fpga-downloader.cc
diff --git a/host/lib/usrp/usrp_e/io_impl.cpp b/host/lib/usrp/usrp_e100/io_impl.cpp
index e863944e8..e863944e8 100644
--- a/host/lib/usrp/usrp_e/io_impl.cpp
+++ b/host/lib/usrp/usrp_e100/io_impl.cpp
diff --git a/host/lib/usrp/usrp_e/mboard_impl.cpp b/host/lib/usrp/usrp_e100/mboard_impl.cpp
index f0118aa4b..f0118aa4b 100644
--- a/host/lib/usrp/usrp_e/mboard_impl.cpp
+++ b/host/lib/usrp/usrp_e100/mboard_impl.cpp
diff --git a/host/lib/usrp/usrp_e/usrp_e_iface.cpp b/host/lib/usrp/usrp_e100/usrp_e_iface.cpp
index f00e92946..f00e92946 100644
--- a/host/lib/usrp/usrp_e/usrp_e_iface.cpp
+++ b/host/lib/usrp/usrp_e100/usrp_e_iface.cpp
diff --git a/host/lib/usrp/usrp_e/usrp_e_iface.hpp b/host/lib/usrp/usrp_e100/usrp_e_iface.hpp
index 59aac43d9..59aac43d9 100644
--- a/host/lib/usrp/usrp_e/usrp_e_iface.hpp
+++ b/host/lib/usrp/usrp_e100/usrp_e_iface.hpp
diff --git a/host/lib/usrp/usrp_e/usrp_e_impl.cpp b/host/lib/usrp/usrp_e100/usrp_e_impl.cpp
index 70cc399fb..70cc399fb 100644
--- a/host/lib/usrp/usrp_e/usrp_e_impl.cpp
+++ b/host/lib/usrp/usrp_e100/usrp_e_impl.cpp
diff --git a/host/lib/usrp/usrp_e/usrp_e_impl.hpp b/host/lib/usrp/usrp_e100/usrp_e_impl.hpp
index b5f21810d..b5f21810d 100644
--- a/host/lib/usrp/usrp_e/usrp_e_impl.hpp
+++ b/host/lib/usrp/usrp_e100/usrp_e_impl.hpp
diff --git a/host/lib/usrp/usrp_e/usrp_e_mmap_zero_copy.cpp b/host/lib/usrp/usrp_e100/usrp_e_mmap_zero_copy.cpp
index 274bb043e..274bb043e 100644
--- a/host/lib/usrp/usrp_e/usrp_e_mmap_zero_copy.cpp
+++ b/host/lib/usrp/usrp_e100/usrp_e_mmap_zero_copy.cpp
diff --git a/host/lib/usrp/usrp_e/usrp_e_regs.hpp b/host/lib/usrp/usrp_e100/usrp_e_regs.hpp
index 8bfb08b6f..8bfb08b6f 100644
--- a/host/lib/usrp/usrp_e/usrp_e_regs.hpp
+++ b/host/lib/usrp/usrp_e100/usrp_e_regs.hpp