diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-29 09:44:28 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-29 09:44:28 -0700 |
| commit | 83039bdc8b16ab6554e91bce2d0cdc7c89665062 (patch) | |
| tree | 9aeb7096a831500d7a95fa1fb1fef75678752201 /host/lib/usrp/usrp1/usrp1_ctrl.cpp | |
| parent | b70d4430d4a898fe99b54740a1c4821ed9a1077b (diff) | |
| parent | e4c6f42ff30aeaedf2d1eb426a221b85236fb74e (diff) | |
| download | uhd-83039bdc8b16ab6554e91bce2d0cdc7c89665062.tar.gz uhd-83039bdc8b16ab6554e91bce2d0cdc7c89665062.tar.bz2 uhd-83039bdc8b16ab6554e91bce2d0cdc7c89665062.zip | |
Merge branch 'libusb'
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_ctrl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_ctrl.cpp b/host/lib/usrp/usrp1/usrp1_ctrl.cpp index 76e8ce368..5d73e6dd9 100644 --- a/host/lib/usrp/usrp1/usrp1_ctrl.cpp +++ b/host/lib/usrp/usrp1/usrp1_ctrl.cpp @@ -209,9 +209,9 @@ public: } //type 0x01 is end else if (type == 0x01) { + usrp_set_firmware_hash(hash); //set hash before reset usrp_control_write(FX2_FIRMWARE_LOAD, 0xe600, 0, &reset_n, 1); - usrp_set_firmware_hash(hash); file.close(); //wait for things to settle @@ -267,8 +267,9 @@ public: return -1; } - ssize_t n; - while ((n = file.readsome((char *)buf, sizeof(buf))) > 0) { + while (not file.eof()) { + file.read((char *)buf, sizeof(buf)); + size_t n = file.gcount(); ret = usrp_control_write(VRQ_FPGA_LOAD, 0, FL_XFER, buf, n); if (ret != n) { |