diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-28 16:53:52 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-28 16:53:52 -0700 |
| commit | e4c6f42ff30aeaedf2d1eb426a221b85236fb74e (patch) | |
| tree | e3736b934263e84ca0a35e025703465990ad8f41 /host | |
| parent | 071c4d4226d9cbeb1f1f67139261b13205816d8a (diff) | |
| download | uhd-e4c6f42ff30aeaedf2d1eb426a221b85236fb74e.tar.gz uhd-e4c6f42ff30aeaedf2d1eb426a221b85236fb74e.tar.bz2 uhd-e4c6f42ff30aeaedf2d1eb426a221b85236fb74e.zip | |
usb: submit should return ssize_t, usrp1: set hash before reset after fw load
Diffstat (limited to 'host')
| -rw-r--r-- | host/include/uhd/transport/usb_control.hpp | 4 | ||||
| -rw-r--r-- | host/lib/transport/libusb1_control.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_ctrl.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/host/include/uhd/transport/usb_control.hpp b/host/include/uhd/transport/usb_control.hpp index 6137ecf84..f9829c3ec 100644 --- a/host/include/uhd/transport/usb_control.hpp +++ b/host/include/uhd/transport/usb_control.hpp @@ -50,9 +50,9 @@ public: * \param index 2-byte (wIndex) * \param buff buffer to hold send or receive data * \param length 2-byte (wLength) - * \return number of bytes submitted + * \return number of bytes submitted or error code */ - virtual size_t submit(boost::uint8_t request_type, + virtual ssize_t submit(boost::uint8_t request_type, boost::uint8_t request, boost::uint16_t value, boost::uint16_t index, diff --git a/host/lib/transport/libusb1_control.cpp b/host/lib/transport/libusb1_control.cpp index c989a788c..f903907d0 100644 --- a/host/lib/transport/libusb1_control.cpp +++ b/host/lib/transport/libusb1_control.cpp @@ -33,7 +33,7 @@ public: _handle->claim_interface(0 /* control interface */); } - size_t submit(boost::uint8_t request_type, + ssize_t submit(boost::uint8_t request_type, boost::uint8_t request, boost::uint16_t value, boost::uint16_t index, diff --git a/host/lib/usrp/usrp1/usrp1_ctrl.cpp b/host/lib/usrp/usrp1/usrp1_ctrl.cpp index 2e1bd85cd..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 |