diff options
| author | Paul David <paul.david@ettus.com> | 2017-03-22 14:51:53 -0400 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-03-22 14:18:57 -0700 |
| commit | 51cbfdfd7e7c071914442005139894496ddf6039 (patch) | |
| tree | 6488caf6af83993a7fe8e27a1f94cf5a97f3e3fd | |
| parent | aff6165dc938fe072d4872b65be146e6d3f75bec (diff) | |
| download | uhd-51cbfdfd7e7c071914442005139894496ddf6039.tar.gz uhd-51cbfdfd7e7c071914442005139894496ddf6039.tar.bz2 uhd-51cbfdfd7e7c071914442005139894496ddf6039.zip | |
Firmware: fix failures due to fw_comm_protocol.h path
| -rw-r--r-- | firmware/usrp3/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | firmware/usrp3/n230/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | firmware/usrp3/n230/n230_eth_handlers.c | 2 | ||||
| -rw-r--r-- | firmware/usrp3/n230/n230_fw_comm_protocol.c (renamed from firmware/usrp3/lib/fw_comm_protocol.c) | 2 | ||||
| -rw-r--r-- | host/lib/usrp/n230/n230_fw_comm_protocol.h (renamed from host/lib/usrp/n230/fw_comm_protocol.h) | 6 | ||||
| -rw-r--r-- | host/lib/usrp/n230/n230_fw_ctrl_iface.cpp | 2 |
6 files changed, 12 insertions, 8 deletions
diff --git a/firmware/usrp3/lib/CMakeLists.txt b/firmware/usrp3/lib/CMakeLists.txt index 9d9ee3c6c..cd1a82c3f 100644 --- a/firmware/usrp3/lib/CMakeLists.txt +++ b/firmware/usrp3/lib/CMakeLists.txt @@ -30,7 +30,6 @@ add_library(usrp3fw STATIC print_addrs.c link_state_route_proto.c cron.c - fw_comm_protocol.c flash/spi_flash.c flash/spif_spsn_s25flxx.c ) diff --git a/firmware/usrp3/n230/CMakeLists.txt b/firmware/usrp3/n230/CMakeLists.txt index 6247477f0..5787fbb7d 100644 --- a/firmware/usrp3/n230/CMakeLists.txt +++ b/firmware/usrp3/n230/CMakeLists.txt @@ -19,7 +19,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/../../host/lib/usrp/n230) -list(APPEND n230_sources n230_eeprom.c n230_eth_handlers.c n230_init.c n230_main.c) +list(APPEND n230_sources + n230_eeprom.c + n230_fw_comm_protocol.c + n230_eth_handlers.c + n230_init.c + n230_main.c) ######################################################################## set(GEN_OUTPUTS_BIN_SIZE 0x7fff) diff --git a/firmware/usrp3/n230/n230_eth_handlers.c b/firmware/usrp3/n230/n230_eth_handlers.c index b291bb39f..f5c319681 100644 --- a/firmware/usrp3/n230/n230_eth_handlers.c +++ b/firmware/usrp3/n230/n230_eth_handlers.c @@ -22,7 +22,7 @@ #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_comm_protocol.h" #include "../../../host/lib/usrp/n230/n230_fw_defs.h" #include "../n230/n230_fw_host_iface.h" #include "../../../host/lib/usrp/n230/n230_eeprom.h" diff --git a/firmware/usrp3/lib/fw_comm_protocol.c b/firmware/usrp3/n230/n230_fw_comm_protocol.c index 0cc931a76..d6f6dff5a 100644 --- a/firmware/usrp3/lib/fw_comm_protocol.c +++ b/firmware/usrp3/n230/n230_fw_comm_protocol.c @@ -15,7 +15,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#include "../../../host/lib/usrp/common/fw_comm_protocol.h" +#include "../../../host/lib/usrp/n230/n230_fw_comm_protocol.h" #include <trace.h> #include <string.h> //memcmp diff --git a/host/lib/usrp/n230/fw_comm_protocol.h b/host/lib/usrp/n230/n230_fw_comm_protocol.h index 14adb33a9..b7c85f2ba 100644 --- a/host/lib/usrp/n230/fw_comm_protocol.h +++ b/host/lib/usrp/n230/n230_fw_comm_protocol.h @@ -15,8 +15,8 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#ifndef INCLUDED_FW_COMM_PROTOCOL -#define INCLUDED_FW_COMM_PROTOCOL +#ifndef INCLUDED_N230_FW_COMM_PROTOCOL +#define INCLUDED_N230_FW_COMM_PROTOCOL #include <stdint.h> #ifndef __cplusplus @@ -99,4 +99,4 @@ bool process_fw_comm_protocol_pkt( #endif //ifdef __cplusplus -#endif /* INCLUDED_FW_COMM_PROTOCOL */ +#endif /* INCLUDED_N230_FW_COMM_PROTOCOL */ diff --git a/host/lib/usrp/n230/n230_fw_ctrl_iface.cpp b/host/lib/usrp/n230/n230_fw_ctrl_iface.cpp index 07f9bb7d6..18c2c4cf8 100644 --- a/host/lib/usrp/n230/n230_fw_ctrl_iface.cpp +++ b/host/lib/usrp/n230/n230_fw_ctrl_iface.cpp @@ -22,7 +22,7 @@ #include <uhd/exception.hpp> #include <boost/format.hpp> #include <boost/asio.hpp> //used for htonl and ntohl -#include "fw_comm_protocol.h" +#include "n230_fw_comm_protocol.h" namespace uhd { namespace usrp { namespace n230 { |