diff options
Diffstat (limited to 'host')
| -rw-r--r-- | host/docs/res/e3x0_imu_demo.png (renamed from host/docs/e3x0_imu_demo.png) | bin | 85901 -> 85901 bytes | |||
| -rw-r--r-- | host/lib/usrp/b200/b200_iface.cpp | 8 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 2 | ||||
| -rw-r--r-- | host/utils/uhd_images_downloader.py.in | 7 |
4 files changed, 10 insertions, 7 deletions
diff --git a/host/docs/e3x0_imu_demo.png b/host/docs/res/e3x0_imu_demo.png Binary files differindex cbf156224..cbf156224 100644 --- a/host/docs/e3x0_imu_demo.png +++ b/host/docs/res/e3x0_imu_demo.png diff --git a/host/lib/usrp/b200/b200_iface.cpp b/host/lib/usrp/b200/b200_iface.cpp index 820090959..0f799e571 100644 --- a/host/lib/usrp/b200/b200_iface.cpp +++ b/host/lib/usrp/b200/b200_iface.cpp @@ -89,7 +89,7 @@ typedef boost::uint32_t hash_type; * Create a file hash * The hash will be used to identify the loaded firmware and fpga image * \param filename file used to generate hash value - * \return hash value in a size_t type + * \return hash value in a uint32_t type */ static hash_type generate_hash(const char *filename) { @@ -101,13 +101,15 @@ static hash_type generate_hash(const char *filename) throw uhd::io_error(std::string("cannot open input file ") + filename); } - size_t hash = 0; + hash_type hash = 0; char ch; long long count = 0; while (file.get(ch)) { count++; - boost::hash_combine(hash, ch); + //hash algorithm derived from boost hash_combine + //http://www.boost.org/doc/libs/1_35_0/doc/html/boost/hash_combine_id241013.html + hash ^= ch + 0x9e3779b9 + (hash<<6) + (hash>>2); } if (count == 0){ diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 647c64695..e0a5e2c2b 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -1025,7 +1025,7 @@ void b200_impl::update_gpio_state(void) | (_gpio_state.ref_sel << 0) ; - _local_ctrl->poke32(TOREG(RB32_CORE_MISC), misc_word); + _local_ctrl->poke32(TOREG(SR_CORE_MISC), misc_word); } void b200_impl::reset_codec_dcm(void) diff --git a/host/utils/uhd_images_downloader.py.in b/host/utils/uhd_images_downloader.py.in index 5b16c7bb5..3903edc8c 100644 --- a/host/utils/uhd_images_downloader.py.in +++ b/host/utils/uhd_images_downloader.py.in @@ -308,11 +308,12 @@ def main(): if options.verbose: print "Downloaded %d of %d bytes" % (downloaded_size, reported_size) else: - temp_images_dest = os.path.join(options.base_url, options.filename) - print "Copying images from: {0}".format(temp_images_dest) - if not os.path.isfile(temp_images_dest): + local_images_pkg = os.path.join(options.base_url, options.filename) + print "Copying images from: {0}".format(local_images_pkg) + if not os.path.isfile(local_images_pkg): print "[ERROR] No such file." return 1 + shutil.copyfile(local_images_pkg, temp_images_dest) (checksum_match, calculated_checksum) = downloader.validate_checksum( checksum_fn, temp_images_dest, |
