diff options
author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-03-16 14:43:18 -0700 |
---|---|---|
committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-03-16 14:43:18 -0700 |
commit | 710f3dccddcd1096e3b14899d589b96da39c1dd8 (patch) | |
tree | 7e7f951d0d6200f628b36613e29629fef81533c7 /gr-uhd/include | |
parent | fcdac045ad64099949dbbefff25832a6dcef3187 (diff) | |
parent | 7e2d501a7b8cee26412605bc37cb3cc6f771bbc7 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/include')
-rw-r--r-- | gr-uhd/include/gr_uhd_usrp_sink.h | 9 | ||||
-rw-r--r-- | gr-uhd/include/gr_uhd_usrp_source.h | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h index ce76ec03b0..d6cbe2fdc7 100644 --- a/gr-uhd/include/gr_uhd_usrp_sink.h +++ b/gr-uhd/include/gr_uhd_usrp_sink.h @@ -448,6 +448,15 @@ public: * \return the multi usrp device object */ virtual uhd::usrp::multi_usrp::sptr get_device(void) = 0; + + /*! + * Perform write on the user configuration register bus. These only exist if + * the user has implemented custom setting registers in the device FPGA. + * \param addr 8-bit register address + * \param data 32-bit register value + * \param mboard which motherboard to set the user register + */ + virtual void set_user_register(const uint8_t addr, const uint32_t data, size_t mboard = 0) = 0; }; #endif /* INCLUDED_GR_UHD_USRP_SINK_H */ diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h index 8a799b397e..cf2186bc02 100644 --- a/gr-uhd/include/gr_uhd_usrp_source.h +++ b/gr-uhd/include/gr_uhd_usrp_source.h @@ -457,6 +457,15 @@ public: virtual uhd::usrp::multi_usrp::sptr get_device(void) = 0; /*! + * Perform write on the user configuration register bus. These only exist if + * the user has implemented custom setting registers in the device FPGA. + * \param addr 8-bit register address + * \param data 32-bit register value + * \param mboard which motherboard to set the user register + */ + virtual void set_user_register(const uint8_t addr, const uint32_t data, size_t mboard = 0) = 0; + + /*! * Convenience function for finite data acquisition. * This is not to be used with the scheduler; rather, * one can request samples from the USRP in python. |