diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-19 20:26:40 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-19 20:26:40 -0700 |
| commit | 6f9a5b8435dfaf0eff14a9bd7be467f657501a5b (patch) | |
| tree | 6bdb0f00dadb241a51f3625f3168ffa0c1d5cd77 /host | |
| parent | 9f16b409d36a06ba3c40ca1d68411b74cd5fbbbb (diff) | |
| download | uhd-6f9a5b8435dfaf0eff14a9bd7be467f657501a5b.tar.gz uhd-6f9a5b8435dfaf0eff14a9bd7be467f657501a5b.tar.bz2 uhd-6f9a5b8435dfaf0eff14a9bd7be467f657501a5b.zip | |
usrp1: disable pad to one for usrp1 (not needed)
This was messing up the pad to 512 bytes logic for empty flushes.
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/transport/super_send_packet_handler.hpp | 3 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/io_impl.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/host/lib/transport/super_send_packet_handler.hpp b/host/lib/transport/super_send_packet_handler.hpp index e377a1e74..a99adcb5f 100644 --- a/host/lib/transport/super_send_packet_handler.hpp +++ b/host/lib/transport/super_send_packet_handler.hpp @@ -22,6 +22,7 @@ #include <uhd/exception.hpp> #include <uhd/convert.hpp> #include <uhd/device.hpp> +#include <uhd/utils/msg.hpp> #include <uhd/utils/byteswap.hpp> #include <uhd/types/io_type.hpp> #include <uhd/types/otw_type.hpp> @@ -173,9 +174,11 @@ public: //////////////////////////////////////////////////////////////// //TODO remove this code when sample counts of zero are supported by hardware + #ifndef SSPH_DONT_PAD_TO_ONE if (nsamps_per_buff == 0) return send_one_packet( _zero_buffs, 1, if_packet_info, io_type, timeout ) & 0x0; + #endif return send_one_packet( buffs, diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp index 28399ce57..de325ea5d 100644 --- a/host/lib/usrp/usrp1/io_impl.cpp +++ b/host/lib/usrp/usrp1/io_impl.cpp @@ -18,6 +18,7 @@ #include "validate_subdev_spec.hpp" #define SRPH_DONT_CHECK_SEQUENCE #include "../../transport/super_recv_packet_handler.hpp" +#define SSPH_DONT_PAD_TO_ONE #include "../../transport/super_send_packet_handler.hpp" #include "usrp1_calc_mux.hpp" #include "fpga_regs_standard.h" |