diff options
author | Josh Blum <josh@joshknows.com> | 2010-07-04 19:13:59 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-07-05 13:49:03 -0700 |
commit | 5e14653f241070791d46893e68e341357e040add (patch) | |
tree | 1b4e8da3e0fa3f2a53dd309d9f9ffddfd5c6f953 /host/include | |
parent | 11f2aa1ea0fd6c28a20c6d85f94e41a06b3a6770 (diff) | |
download | uhd-5e14653f241070791d46893e68e341357e040add.tar.gz uhd-5e14653f241070791d46893e68e341357e040add.tar.bz2 uhd-5e14653f241070791d46893e68e341357e040add.zip |
usrp2: bug fix for readback registers
added readback for time64
fixed bug for fragment flag in vrt packet handler
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/uhd/transport/zero_copy.hpp | 8 | ||||
-rw-r--r-- | host/include/uhd/usrp/mboard_props.hpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/host/include/uhd/transport/zero_copy.hpp b/host/include/uhd/transport/zero_copy.hpp index 2815e3189..da10bfbe2 100644 --- a/host/include/uhd/transport/zero_copy.hpp +++ b/host/include/uhd/transport/zero_copy.hpp @@ -47,7 +47,7 @@ namespace uhd{ namespace transport{ * Get the size of the underlying buffer. * \return the number of bytes */ - size_t size(void) const{ + inline size_t size(void) const{ return boost::asio::buffer_size(this->get()); } @@ -55,7 +55,7 @@ namespace uhd{ namespace transport{ * Get a pointer to the underlying buffer. * \return a pointer into memory */ - template <class T> T cast(void) const{ + template <class T> inline T cast(void) const{ return boost::asio::buffer_cast<T>(this->get()); } @@ -89,7 +89,7 @@ namespace uhd{ namespace transport{ * Get the size of the underlying buffer. * \return the number of bytes */ - size_t size(void) const{ + inline size_t size(void) const{ return boost::asio::buffer_size(this->get()); } @@ -97,7 +97,7 @@ namespace uhd{ namespace transport{ * Get a pointer to the underlying buffer. * \return a pointer into memory */ - template <class T> T cast(void) const{ + template <class T> inline T cast(void) const{ return boost::asio::buffer_cast<T>(this->get()); } diff --git a/host/include/uhd/usrp/mboard_props.hpp b/host/include/uhd/usrp/mboard_props.hpp index 7ff454472..a432ce50c 100644 --- a/host/include/uhd/usrp/mboard_props.hpp +++ b/host/include/uhd/usrp/mboard_props.hpp @@ -40,7 +40,7 @@ namespace uhd{ namespace usrp{ MBOARD_PROP_TX_DBOARD = 'v', //ro, wax::obj MBOARD_PROP_TX_DBOARD_NAMES = 'V', //ro, prop_names_t MBOARD_PROP_CLOCK_CONFIG = 'C', //rw, clock_config_t - MBOARD_PROP_TIME_NOW = 't', //wo, time_spec_t + MBOARD_PROP_TIME_NOW = 't', //rw, time_spec_t MBOARD_PROP_TIME_NEXT_PPS = 'T', //wo, time_spec_t MBOARD_PROP_STREAM_CMD = 's' //wo, stream_cmd_t }; |