uhd: replaced std::vector<type> for buffer arguments in send/recv

Created new type ref_vector for representing a vector of pointers.
Can be created from std::vector or a pointer.

Removes the convenience constrcutors for send/recv, its not needed.

Removes malloc/free overhead when using send/recv with pointer.

7 files changed, 17 insertions, 17 deletions

diff --git a/host/lib/transport/vrt_packet_handler.hpp b/host/lib/transport/vrt_packet_handler.hpp
index 02f65000f..11c70dd07 100644
--- a/host/lib/transport/vrt_packet_handler.hpp
+++ b/host/lib/transport/vrt_packet_handler.hpp
@@ -148,7 +148,7 @@ template <typename T> UHD_INLINE T get_context_code(
      ******************************************************************/
     static UHD_INLINE size_t _recv1(
         recv_state &state,
-        const std::vector<void *> &buffs,
+        const uhd::device::recv_buffs_type &buffs,
         size_t offset_bytes,
         size_t total_samps,
         uhd::rx_metadata_t &metadata,
@@ -227,7 +227,7 @@ template <typename T> UHD_INLINE T get_context_code(
      ******************************************************************/
     static UHD_INLINE size_t recv(
         recv_state &state,
-        const std::vector<void *> &buffs,
+        const uhd::device::recv_buffs_type &buffs,
         const size_t total_num_samps,
         uhd::rx_metadata_t &metadata,
         uhd::device::recv_mode_t recv_mode,
@@ -328,7 +328,7 @@ template <typename T> UHD_INLINE T get_context_code(
      ******************************************************************/
     static UHD_INLINE size_t _send1(
         send_state &state,
-        const std::vector<const void *> &buffs,
+        const uhd::device::send_buffs_type &buffs,
         const size_t offset_bytes,
         const size_t num_samps,
         uhd::transport::vrt::if_packet_info_t &if_packet_info,
@@ -374,7 +374,7 @@ template <typename T> UHD_INLINE T get_context_code(
      ******************************************************************/
     static UHD_INLINE size_t send(
         send_state &state,
-        const std::vector<const void *> &buffs,
+        const uhd::device::send_buffs_type &buffs,
         const size_t total_num_samps,
         const uhd::tx_metadata_t &metadata,
         uhd::device::send_mode_t send_mode,
diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp
index 7953447d1..88cbab073 100644
--- a/host/lib/usrp/usrp1/io_impl.cpp
+++ b/host/lib/usrp/usrp1/io_impl.cpp
@@ -220,7 +220,7 @@ size_t usrp1_impl::get_max_send_samps_per_packet(void) const {
 }
 
 size_t usrp1_impl::send(
-    const std::vector<const void *> &buffs, size_t num_samps,
+    const send_buffs_type &buffs, size_t num_samps,
     const tx_metadata_t &metadata, const io_type_t &io_type,
     send_mode_t send_mode, double timeout
 ){
@@ -298,7 +298,7 @@ size_t usrp1_impl::get_max_recv_samps_per_packet(void) const {
 }
 
 size_t usrp1_impl::recv(
-    const std::vector<void *> &buffs, size_t num_samps,
+    const recv_buffs_type &buffs, size_t num_samps,
     rx_metadata_t &metadata, const io_type_t &io_type,
     recv_mode_t recv_mode, double timeout
 ){
diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp
index 28199ebe3..1d9f6709f 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.hpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.hpp
@@ -80,13 +80,13 @@ public:
     ~usrp1_impl(void);
 
     //the io interface
-    size_t send(const std::vector<const void *> &,
+    size_t send(const send_buffs_type &,
                 size_t,
                 const uhd::tx_metadata_t &,
                 const uhd::io_type_t &,
                 send_mode_t, double);
 
-    size_t recv(const std::vector<void *> &,
+    size_t recv(const recv_buffs_type &,
                 size_t, uhd::rx_metadata_t &,
                 const uhd::io_type_t &,
                 recv_mode_t, double);
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index 56c20934b..0376ebdae 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -297,7 +297,7 @@ size_t usrp2_impl::get_max_send_samps_per_packet(void) const{
 }
 
 size_t usrp2_impl::send(
-    const std::vector<const void *> &buffs, size_t num_samps,
+    const send_buffs_type &buffs, size_t num_samps,
     const tx_metadata_t &metadata, const io_type_t &io_type,
     send_mode_t send_mode, double timeout
 ){
@@ -459,7 +459,7 @@ static void handle_overflow(std::vector<usrp2_mboard_impl::sptr> &mboards, size_
 }
 
 size_t usrp2_impl::recv(
-    const std::vector<void *> &buffs, size_t num_samps,
+    const recv_buffs_type &buffs, size_t num_samps,
     rx_metadata_t &metadata, const io_type_t &io_type,
     recv_mode_t recv_mode, double timeout
 ){
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index ad95b2a4a..337f842d6 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -200,12 +200,12 @@ public:
 
     //the io interface
     size_t send(
-        const std::vector<const void *> &, size_t,
+        const send_buffs_type &, size_t,
         const uhd::tx_metadata_t &, const uhd::io_type_t &,
         uhd::device::send_mode_t, double
     );
     size_t recv(
-        const std::vector<void *> &, size_t,
+        const recv_buffs_type &, size_t,
         uhd::rx_metadata_t &, const uhd::io_type_t &,
         uhd::device::recv_mode_t, double
     );
diff --git a/host/lib/usrp/usrp_e100/io_impl.cpp b/host/lib/usrp/usrp_e100/io_impl.cpp
index c8b9e03d9..cf2410e4f 100644
--- a/host/lib/usrp/usrp_e100/io_impl.cpp
+++ b/host/lib/usrp/usrp_e100/io_impl.cpp
@@ -212,7 +212,7 @@ size_t usrp_e100_impl::get_max_send_samps_per_packet(void) const{
 }
 
 size_t usrp_e100_impl::send(
-    const std::vector<const void *> &buffs, size_t num_samps,
+    const send_buffs_type &buffs, size_t num_samps,
     const tx_metadata_t &metadata, const io_type_t &io_type,
     send_mode_t send_mode, double timeout
 ){
@@ -242,7 +242,7 @@ size_t usrp_e100_impl::get_max_recv_samps_per_packet(void) const{
 }
 
 size_t usrp_e100_impl::recv(
-    const std::vector<void *> &buffs, size_t num_samps,
+    const recv_buffs_type &buffs, size_t num_samps,
     rx_metadata_t &metadata, const io_type_t &io_type,
     recv_mode_t recv_mode, double timeout
 ){
diff --git a/host/lib/usrp/usrp_e100/usrp_e100_impl.hpp b/host/lib/usrp/usrp_e100/usrp_e100_impl.hpp
index df8e5dc9f..2dc401305 100644
--- a/host/lib/usrp/usrp_e100/usrp_e100_impl.hpp
+++ b/host/lib/usrp/usrp_e100/usrp_e100_impl.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010-2011 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -83,8 +83,8 @@ public:
     ~usrp_e100_impl(void);
 
     //the io interface
-    size_t send(const std::vector<const void *> &, size_t, const uhd::tx_metadata_t &, const uhd::io_type_t &, send_mode_t, double);
-    size_t recv(const std::vector<void *> &, size_t, uhd::rx_metadata_t &, const uhd::io_type_t &, recv_mode_t, double);
+    size_t send(const send_buffs_type &, size_t, const uhd::tx_metadata_t &, const uhd::io_type_t &, send_mode_t, double);
+    size_t recv(const recv_buffs_type &, size_t, uhd::rx_metadata_t &, const uhd::io_type_t &, recv_mode_t, double);
     bool recv_async_msg(uhd::async_metadata_t &, double);
     size_t get_max_send_samps_per_packet(void) const;
     size_t get_max_recv_samps_per_packet(void) const;