diff options
author | Josh Blum <josh@joshknows.com> | 2010-05-18 14:26:43 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-05-18 14:26:43 -0700 |
commit | 17c494b79a99d947a150cdbc582ba331aeb57786 (patch) | |
tree | ee1f4533f5baeffa1b0af3853b8fdfe19c3a69d8 /host/include | |
parent | eaa1508dcf6ff32496838f593ba4eb9eb1aee2ff (diff) | |
download | uhd-17c494b79a99d947a150cdbc582ba331aeb57786.tar.gz uhd-17c494b79a99d947a150cdbc582ba331aeb57786.tar.bz2 uhd-17c494b79a99d947a150cdbc582ba331aeb57786.zip |
Added tx timed samples example.
Added called to device to get max samples per packet.
Removed device props that gave max samples per packet.
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/uhd/device.hpp | 33 | ||||
-rw-r--r-- | host/include/uhd/usrp/device_props.hpp | 4 |
2 files changed, 24 insertions, 13 deletions
diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp index a76b34ee2..27b461184 100644 --- a/host/include/uhd/device.hpp +++ b/host/include/uhd/device.hpp @@ -87,6 +87,16 @@ public: }; /*! + * Recv modes for the device recv routine. + */ + enum recv_mode_t{ + //! Tells the recv routine to recv the entire buffer + RECV_MODE_FULL_BUFF = 0, + //! Tells the recv routine to return after one packet + RECV_MODE_ONE_PACKET = 1 + }; + + /*! * Send a buffer containing IF data with its metadata. * * Send handles fragmentation as follows: @@ -114,16 +124,6 @@ public: ) = 0; /*! - * Recv modes for the device recv routine. - */ - enum recv_mode_t{ - //! Tells the recv routine to recv the entire buffer - RECV_MODE_FULL_BUFF = 0, - //! Tells the recv routine to return after one packet - RECV_MODE_ONE_PACKET = 1 - }; - - /*! * Receive a buffer containing IF data and its metadata. * * Receive handles fragmentation as follows: @@ -161,6 +161,19 @@ public: const io_type_t &io_type, recv_mode_t recv_mode = RECV_MODE_ONE_PACKET ) = 0; + + /*! + * Get the maximum number of samples per packet on send. + * \return the number of samples + */ + virtual size_t get_max_send_samps_per_packet(void) const = 0; + + /*! + * Get the maximum number of samples per packet on recv. + * \return the number of samples + */ + virtual size_t get_max_recv_samps_per_packet(void) const = 0; + }; } //namespace uhd diff --git a/host/include/uhd/usrp/device_props.hpp b/host/include/uhd/usrp/device_props.hpp index b8f6f5cd4..983bcb672 100644 --- a/host/include/uhd/usrp/device_props.hpp +++ b/host/include/uhd/usrp/device_props.hpp @@ -31,9 +31,7 @@ namespace uhd{ namespace usrp{ enum device_prop_t{ DEVICE_PROP_NAME = 'n', //ro, std::string DEVICE_PROP_MBOARD = 'm', //ro, wax::obj - DEVICE_PROP_MBOARD_NAMES = 'M', //ro, prop_names_t - DEVICE_PROP_MAX_RX_SAMPLES = 'r', //ro, size_t - DEVICE_PROP_MAX_TX_SAMPLES = 't' //ro, size_t + DEVICE_PROP_MBOARD_NAMES = 'M' //ro, prop_names_t }; //////////////////////////////////////////////////////////////////////// |