diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
| commit | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (patch) | |
| tree | 159ffe0761f78dd87e2ecc97abea14494abab4ff /host/lib/usrp/common/fx2_ctrl.hpp | |
| parent | c66cb1bad0d881394f3519bd94f4693cceab4c64 (diff) | |
| parent | 99c2730bc9db270560671f2d7d173768465ed51f (diff) | |
| download | uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.gz uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.bz2 uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/common/fx2_ctrl.hpp')
| -rw-r--r-- | host/lib/usrp/common/fx2_ctrl.hpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/host/lib/usrp/common/fx2_ctrl.hpp b/host/lib/usrp/common/fx2_ctrl.hpp index 9f8cec296..40f91b9b6 100644 --- a/host/lib/usrp/common/fx2_ctrl.hpp +++ b/host/lib/usrp/common/fx2_ctrl.hpp @@ -87,11 +87,11 @@ public: * \param buff buffer to place data * \return number of bytes read or error */ - virtual int usrp_control_read(boost::uint8_t request, - boost::uint16_t value, - boost::uint16_t index, + virtual int usrp_control_read(uint8_t request, + uint16_t value, + uint16_t index, unsigned char *buff, - boost::uint16_t length) = 0; + uint16_t length) = 0; /*! * Submit an OUT transfer @@ -101,11 +101,11 @@ public: * \param buff buffer of data to be sent * \return number of bytes written or error */ - virtual int usrp_control_write(boost::uint8_t request, - boost::uint16_t value, - boost::uint16_t index, + virtual int usrp_control_write(uint8_t request, + uint16_t value, + uint16_t index, unsigned char *buff, - boost::uint16_t length) = 0; + uint16_t length) = 0; /*! * Perform an I2C write @@ -115,9 +115,9 @@ public: * \return number of bytes written or error */ - virtual int usrp_i2c_write(boost::uint16_t i2c_addr, + virtual int usrp_i2c_write(uint16_t i2c_addr, unsigned char *buf, - boost::uint16_t len) = 0; + uint16_t len) = 0; /*! * Perform an I2C read @@ -127,9 +127,9 @@ public: * \return number of bytes read or error */ - virtual int usrp_i2c_read(boost::uint16_t i2c_addr, + virtual int usrp_i2c_read(uint16_t i2c_addr, unsigned char *buf, - boost::uint16_t len) = 0; + uint16_t len) = 0; //! enable/disable the rx path virtual void usrp_rx_enable(bool on) = 0; |