From 236cf6a34cd9bae6c6863e719d592052c8dd95d3 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 12 Mar 2015 16:16:32 -0700 Subject: docs: Moved IMU image to correct location --- host/docs/e3x0_imu_demo.png | Bin 85901 -> 0 bytes host/docs/res/e3x0_imu_demo.png | Bin 0 -> 85901 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 host/docs/e3x0_imu_demo.png create mode 100644 host/docs/res/e3x0_imu_demo.png diff --git a/host/docs/e3x0_imu_demo.png b/host/docs/e3x0_imu_demo.png deleted file mode 100644 index cbf156224..000000000 Binary files a/host/docs/e3x0_imu_demo.png and /dev/null differ diff --git a/host/docs/res/e3x0_imu_demo.png b/host/docs/res/e3x0_imu_demo.png new file mode 100644 index 000000000..cbf156224 Binary files /dev/null and b/host/docs/res/e3x0_imu_demo.png differ -- cgit v1.2.3 From f97a3c6b3c1d3d50f088ccd8de03a945da6c9328 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 13 Mar 2015 14:31:52 -0700 Subject: b200: Fixed var name typo --- host/lib/usrp/b200/b200_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 304a3fc48..d53325c61 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -910,7 +910,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) -- cgit v1.2.3 From 6f51dcc43f0a99854f0ef790aade4979c82b5272 Mon Sep 17 00:00:00 2001 From: dcaswell Date: Thu, 5 Mar 2015 13:07:02 -0600 Subject: b200: Updated hashing algorithm for platform consistency Now identical between 32- and 64-bit platforms. --- host/lib/usrp/b200/b200_iface.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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){ -- cgit v1.2.3 From f9740c893bc4235aba347bc7fec867c7d9024b3f Mon Sep 17 00:00:00 2001 From: Ashish Chaudhari Date: Wed, 18 Mar 2015 09:15:24 -0700 Subject: imgs_downloader: Copy pkg to temp dir even if it is local --- host/utils/uhd_images_downloader.py.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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, -- cgit v1.2.3