usrp3,n230: Moved all shared FW-Host headers to the host dir

15 files changed, 22 insertions, 18 deletions

diff --git a/firmware/usrp3/lib/fw_comm_protocol.c b/firmware/usrp3/lib/fw_comm_protocol.c
index bb0297e8d..0cc931a76 100644
--- a/firmware/usrp3/lib/fw_comm_protocol.c
+++ b/firmware/usrp3/lib/fw_comm_protocol.c
@@ -15,7 +15,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <fw_comm_protocol.h>
+#include "../../../host/lib/usrp/common/fw_comm_protocol.h"
+
 #include <trace.h>
 #include <string.h> //memcmp
 
diff --git a/firmware/usrp3/n230/n230_eeprom.c b/firmware/usrp3/n230/n230_eeprom.c
index 116f87985..767289efa 100644
--- a/firmware/usrp3/n230/n230_eeprom.c
+++ b/firmware/usrp3/n230/n230_eeprom.c
@@ -22,8 +22,9 @@
 #include <flash/spi_flash.h>
 #include <flash/spif_spsn_s25flxx.h>
 #include <string.h> //memcpy
-#include "n230_fw_defs.h"
-#include "n230_fw_host_iface.h"
+
+#include "../../../host/lib/usrp/n230/n230_fw_defs.h"
+#include "../../../host/lib/usrp/n230/n230_fw_host_iface.h"
 
 static const wb_spi_slave_t flash_spi_slave = {
     .base      = (void*) 0xB000,
diff --git a/firmware/usrp3/n230/n230_eth_handlers.c b/firmware/usrp3/n230/n230_eth_handlers.c
index 98b8bc326..bb07be51b 100644
--- a/firmware/usrp3/n230/n230_eth_handlers.c
+++ b/firmware/usrp3/n230/n230_eth_handlers.c
@@ -17,15 +17,15 @@
 
 #include "n230_eth_handlers.h"
 
-#include <fw_comm_protocol.h>
 #include <wb_utils.h>
 #include <string.h> //memcmp
 #include <u3_net_stack.h>
 #include <print_addrs.h>
 #include <trace.h>
+#include "../../../host/lib/usrp/common/fw_comm_protocol.h"
+#include "../../../host/lib/usrp/n230/n230_fw_defs.h"
 #include "../n230/n230_fw_host_iface.h"
 #include "n230_eeprom.h"
-#include "n230_fw_defs.h"
 
 static n230_host_shared_mem_t* host_shared_mem_ptr;
 
diff --git a/firmware/usrp3/n230/n230_eth_handlers.h b/firmware/usrp3/n230/n230_eth_handlers.h
index 86130e361..67afbb246 100644
--- a/firmware/usrp3/n230/n230_eth_handlers.h
+++ b/firmware/usrp3/n230/n230_eth_handlers.h
@@ -23,7 +23,7 @@
 #include <stdbool.h>
 #include <lwip/ip_addr.h>
 #include <wb_soft_reg.h>
-#include "../n230/n230_fw_host_iface.h"
+#include "../../../host/lib/usrp/n230/n230_fw_host_iface.h"
 
 /*!
  * Registrar for host firmware communications handler.
diff --git a/firmware/usrp3/n230/n230_init.c b/firmware/usrp3/n230/n230_init.c
index 4602f8338..0054c1bbc 100644
--- a/firmware/usrp3/n230/n230_init.c
+++ b/firmware/usrp3/n230/n230_init.c
@@ -25,8 +25,8 @@
 #include <print_addrs.h>
 #include <trace.h>
 #include "n230_eeprom.h"
-#include "n230_fw_defs.h"
 #include "n230_init.h"
+#include "../../../host/lib/usrp/n230/n230_fw_defs.h"
 
 static wb_pkt_iface64_config_t pkt_config;
 
diff --git a/firmware/usrp3/n230/n230_main.c b/firmware/usrp3/n230/n230_main.c
index ceb896514..a6c12e56d 100644
--- a/firmware/usrp3/n230/n230_main.c
+++ b/firmware/usrp3/n230/n230_main.c
@@ -19,9 +19,9 @@
 #include <wb_soft_reg.h>
 #include <u3_net_stack.h>
 #include <trace.h>
+#include "../../../host/lib/usrp/n230/n230_fw_defs.h"
+#include "../../../host/lib/usrp/n230/n230_fw_host_iface.h"
 #include "n230_eth_handlers.h"
-#include "n230_fw_defs.h"
-#include "n230_fw_host_iface.h"
 #include "n230_init.h"
 
 //The version hash should come from a cmake build variable
diff --git a/firmware/usrp3/include/fw_comm_protocol.h b/host/lib/usrp/common/fw_comm_protocol.h
index 14adb33a9..14adb33a9 100644
--- a/firmware/usrp3/include/fw_comm_protocol.h
+++ b/host/lib/usrp/common/fw_comm_protocol.h
diff --git a/host/lib/usrp/common/usrp3_fw_ctrl_iface.cpp b/host/lib/usrp/common/usrp3_fw_ctrl_iface.cpp
index d3f11b9ee..aefd84882 100644
--- a/host/lib/usrp/common/usrp3_fw_ctrl_iface.cpp
+++ b/host/lib/usrp/common/usrp3_fw_ctrl_iface.cpp
@@ -17,13 +17,13 @@
 
 #include "usrp3_fw_ctrl_iface.hpp"
 
-#include "../../../firmware/usrp3/include/fw_comm_protocol.h"
 #include <uhd/utils/byteswap.hpp>
 #include <uhd/utils/msg.hpp>
 #include <uhd/exception.hpp>
 #include <boost/format.hpp>
 #include <boost/asio.hpp> //used for htonl and ntohl
 #include <boost/foreach.hpp>
+#include "fw_comm_protocol.h"
 
 namespace uhd { namespace usrp { namespace usrp3 {
 
diff --git a/host/lib/usrp/n230/n230_cores.cpp b/host/lib/usrp/n230/n230_cores.cpp
index 14e99b692..58c702ec1 100644
--- a/host/lib/usrp/n230/n230_cores.cpp
+++ b/host/lib/usrp/n230/n230_cores.cpp
@@ -15,9 +15,9 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include "../../../firmware/usrp3/n230/n230_fw_defs.h"
 #include "n230_cores.hpp"
 #include "n230_fpga_defs.h"
+#include "n230_fw_defs.h"
 
 namespace uhd { namespace usrp { namespace n230 {
 
diff --git a/host/lib/usrp/n230/n230_eeprom_manager.hpp b/host/lib/usrp/n230/n230_eeprom_manager.hpp
index 612124d89..cc5aee9f3 100644
--- a/host/lib/usrp/n230/n230_eeprom_manager.hpp
+++ b/host/lib/usrp/n230/n230_eeprom_manager.hpp
@@ -18,11 +18,11 @@
 #ifndef INCLUDED_N230_EEPROM_MANAGER_HPP
 #define INCLUDED_N230_EEPROM_MANAGER_HPP
 
-#include "../../../firmware/usrp3/n230/n230_fw_host_iface.h"
 #include <boost/thread/mutex.hpp>
 #include <uhd/transport/udp_simple.hpp>
 #include <uhd/types/dict.hpp>
 #include <uhd/usrp/mboard_eeprom.hpp>
+#include "n230_fw_host_iface.h"
 
 namespace uhd { namespace usrp { namespace n230 {
 
diff --git a/firmware/usrp3/n230/n230_fw_defs.h b/host/lib/usrp/n230/n230_fw_defs.h
index fbdc67ebb..fbdc67ebb 100644
--- a/firmware/usrp3/n230/n230_fw_defs.h
+++ b/host/lib/usrp/n230/n230_fw_defs.h
diff --git a/firmware/usrp3/n230/n230_fw_host_iface.h b/host/lib/usrp/n230/n230_fw_host_iface.h
index dc82df2fc..dc82df2fc 100644
--- a/firmware/usrp3/n230/n230_fw_host_iface.h
+++ b/host/lib/usrp/n230/n230_fw_host_iface.h
diff --git a/host/lib/usrp/n230/n230_image_loader.cpp b/host/lib/usrp/n230/n230_image_loader.cpp
index 48b41c7a9..f8a6ba092 100644
--- a/host/lib/usrp/n230/n230_image_loader.cpp
+++ b/host/lib/usrp/n230/n230_image_loader.cpp
@@ -24,8 +24,9 @@
 #include <uhd/transport/udp_simple.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
+
+#include "n230_fw_host_iface.h"
 #include "n230_impl.hpp"
-#include "../../../firmware/usrp3/n230/n230_fw_host_iface.h"
 
 using namespace uhd;
 using namespace uhd::usrp;
diff --git a/host/lib/usrp/n230/n230_impl.cpp b/host/lib/usrp/n230/n230_impl.cpp
index 789c6ebd5..ab7fa6fe6 100644
--- a/host/lib/usrp/n230/n230_impl.cpp
+++ b/host/lib/usrp/n230/n230_impl.cpp
@@ -17,9 +17,6 @@
 
 #include "n230_impl.hpp"
 
-#include "../../../firmware/usrp3/n230/n230_fw_host_iface.h"
-#include "../../../firmware/usrp3/n230/n230_fw_defs.h"
-#include "../../../firmware/usrp3/include/fw_comm_protocol.h"
 #include "usrp3_fw_ctrl_iface.hpp"
 #include "validate_subdev_spec.hpp"
 #include <uhd/utils/static.hpp>
@@ -44,8 +41,12 @@
 #include <boost/asio/ip/address_v4.hpp>
 #include <boost/asio.hpp> //used for htonl and ntohl
 #include <boost/make_shared.hpp>
+
+#include "../common/fw_comm_protocol.h"
 #include "n230_defaults.h"
 #include "n230_fpga_defs.h"
+#include "n230_fw_defs.h"
+#include "n230_fw_host_iface.h"
 
 namespace uhd { namespace usrp { namespace n230 {
 
diff --git a/host/lib/usrp/n230/n230_resource_manager.cpp b/host/lib/usrp/n230/n230_resource_manager.cpp
index d3d272354..4db494302 100644
--- a/host/lib/usrp/n230/n230_resource_manager.cpp
+++ b/host/lib/usrp/n230/n230_resource_manager.cpp
@@ -17,8 +17,6 @@
 
 #include "n230_resource_manager.hpp"
 
-#include "../../../firmware/usrp3/n230/n230_fw_host_iface.h"
-#include "../../../firmware/usrp3/n230/n230_fw_defs.h"
 #include "usrp3_fw_ctrl_iface.hpp"
 #include <uhd/transport/if_addrs.hpp>
 #include <uhd/transport/udp_zero_copy.hpp>
@@ -32,6 +30,8 @@
 #include <boost/functional/hash.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/make_shared.hpp>
+#include "n230_fw_defs.h"
+#include "n230_fw_host_iface.h"
 
 #define IF_DATA_I_MASK  0xFFF00000
 #define IF_DATA_Q_MASK  0x0000FFF0