summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-11-08 09:32:40 -0800
committerJosh Blum <josh@joshknows.com>2011-11-08 09:32:40 -0800
commit7749b0f0651733aa5962d5b577f483d37d125e24 (patch)
treeb1ba7fbce84d809142e1ca07bc6f2e17365ef0e7
parente219ad10a6e86cd4edc748f2218e01a9890e108c (diff)
downloaduhd-7749b0f0651733aa5962d5b577f483d37d125e24.tar.gz
uhd-7749b0f0651733aa5962d5b577f483d37d125e24.tar.bz2
uhd-7749b0f0651733aa5962d5b577f483d37d125e24.zip
uhd: useful tweaks from user
-rw-r--r--firmware/zpu/CMakeLists.txt1
-rw-r--r--host/lib/usrp/usrp2/usrp2_iface.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/firmware/zpu/CMakeLists.txt b/firmware/zpu/CMakeLists.txt
index d7cedbfb9..80fd074bd 100644
--- a/firmware/zpu/CMakeLists.txt
+++ b/firmware/zpu/CMakeLists.txt
@@ -21,6 +21,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
#force the compiler because the check wont use the special flag below
INCLUDE(CMakeForceCompiler)
+SET(CMAKE_SYSTEM_NAME Generic)
CMAKE_FORCE_C_COMPILER(zpu-elf-gcc GNU)
PROJECT(USRP_NXXX_FW C)
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp
index a26cedcc5..4830c10d9 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.cpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.cpp
@@ -119,7 +119,7 @@ public:
}
else{
_lock_task.reset(); //shutdown the task
- this->get_reg<boost::uint32_t, USRP2_REG_ACTION_FW_POKE32>(U2_FW_REG_LOCK_TIME, 0); //unlock
+ this->get_reg<boost::uint32_t, USRP2_REG_ACTION_FW_POKE32>(U2_FW_REG_LOCK_TIME, 0xfffffff0); //unlock
}
}