diff options
| author | Ashish Chaudhari <ashish.chaudhari@ettus.com> | 2016-01-15 10:16:48 -0800 |
|---|---|---|
| committer | Ashish Chaudhari <ashish.chaudhari@ettus.com> | 2016-01-15 10:16:48 -0800 |
| commit | 4e583460be6b107b9cc95be38b01266ba8c3198f (patch) | |
| tree | f3bdffb314278519415e79c4e73a0a4b3cb4a0ed | |
| parent | 42a3eeb62e07034873f823048cebcaff772da4c3 (diff) | |
| parent | 3ce4afc75422321ad5bce8503455a21a6a2db3a4 (diff) | |
| download | uhd-4e583460be6b107b9cc95be38b01266ba8c3198f.tar.gz uhd-4e583460be6b107b9cc95be38b01266ba8c3198f.tar.bz2 uhd-4e583460be6b107b9cc95be38b01266ba8c3198f.zip | |
Merge pull request #1001 from EttusResearch/n230/header_fix
n230: fixed header location
| -rw-r--r-- | firmware/usrp3/n230/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | firmware/usrp3/n230/n230_eeprom.c | 2 | ||||
| -rw-r--r-- | firmware/usrp3/n230/n230_eth_handlers.c | 2 | ||||
| -rw-r--r-- | firmware/usrp3/n230/n230_init.c | 2 | ||||
| -rw-r--r-- | host/lib/usrp/n230/n230_eeprom.h (renamed from firmware/usrp3/n230/n230_eeprom.h) | 0 | ||||
| -rw-r--r-- | host/lib/usrp/n230/n230_eeprom_manager.cpp | 4 |
6 files changed, 6 insertions, 6 deletions
diff --git a/firmware/usrp3/n230/CMakeLists.txt b/firmware/usrp3/n230/CMakeLists.txt index 327b68910..6247477f0 100644 --- a/firmware/usrp3/n230/CMakeLists.txt +++ b/firmware/usrp3/n230/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2010-2014 Ettus Research LLC +# Copyright 2010-2014,2016 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 diff --git a/firmware/usrp3/n230/n230_eeprom.c b/firmware/usrp3/n230/n230_eeprom.c index 767289efa..8f756d41f 100644 --- a/firmware/usrp3/n230/n230_eeprom.c +++ b/firmware/usrp3/n230/n230_eeprom.c @@ -15,7 +15,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#include "n230_eeprom.h" +#include "../../../host/lib/usrp/n230/n230_eeprom.h" #include <trace.h> #include <stddef.h> diff --git a/firmware/usrp3/n230/n230_eth_handlers.c b/firmware/usrp3/n230/n230_eth_handlers.c index e5b59c212..b291bb39f 100644 --- a/firmware/usrp3/n230/n230_eth_handlers.c +++ b/firmware/usrp3/n230/n230_eth_handlers.c @@ -25,7 +25,7 @@ #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 "../../../host/lib/usrp/n230/n230_eeprom.h" static n230_host_shared_mem_t* host_shared_mem_ptr; diff --git a/firmware/usrp3/n230/n230_init.c b/firmware/usrp3/n230/n230_init.c index 0054c1bbc..14f5ebd77 100644 --- a/firmware/usrp3/n230/n230_init.c +++ b/firmware/usrp3/n230/n230_init.c @@ -24,7 +24,7 @@ #include <u3_net_stack.h> #include <print_addrs.h> #include <trace.h> -#include "n230_eeprom.h" +#include "../../../host/lib/usrp/n230/n230_eeprom.h" #include "n230_init.h" #include "../../../host/lib/usrp/n230/n230_fw_defs.h" diff --git a/firmware/usrp3/n230/n230_eeprom.h b/host/lib/usrp/n230/n230_eeprom.h index b6c2a0c76..b6c2a0c76 100644 --- a/firmware/usrp3/n230/n230_eeprom.h +++ b/host/lib/usrp/n230/n230_eeprom.h diff --git a/host/lib/usrp/n230/n230_eeprom_manager.cpp b/host/lib/usrp/n230/n230_eeprom_manager.cpp index 40f501ef9..b19deb23a 100644 --- a/host/lib/usrp/n230/n230_eeprom_manager.cpp +++ b/host/lib/usrp/n230/n230_eeprom_manager.cpp @@ -1,5 +1,5 @@ // -// Copyright 2013-2014 Ettus Research LLC +// Copyright 2013-2014,2016 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 @@ -15,7 +15,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#include "../../../firmware/usrp3/n230/n230_eeprom.h" +#include "n230_eeprom.h" #include <uhd/utils/byteswap.hpp> #include <uhd/utils/msg.hpp> #include <uhd/exception.hpp> |