diff options
| author | Nick Foster <nick@ettus.com> | 2012-01-12 10:58:42 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-02-01 10:04:43 -0800 |
| commit | 81b4689cf5a16b71c85b4a0f94746d61091fa29f (patch) | |
| tree | f52063e198a4335e8e77aed58797f36a37ad4350 | |
| parent | d27125b9ab86e0d44db1317707aff7e9f9f8f32f (diff) | |
| download | uhd-81b4689cf5a16b71c85b4a0f94746d61091fa29f.tar.gz uhd-81b4689cf5a16b71c85b4a0f94746d61091fa29f.tar.bz2 uhd-81b4689cf5a16b71c85b4a0f94746d61091fa29f.zip | |
B100 host code changes to remove TX padding, remove RX padding, increase max allowed rate.
| -rw-r--r-- | host/lib/transport/usb_zero_copy_wrapper.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/b100/b100_impl.hpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/transport/usb_zero_copy_wrapper.cpp b/host/lib/transport/usb_zero_copy_wrapper.cpp index 227c4b392..74f07f956 100644 --- a/host/lib/transport/usb_zero_copy_wrapper.cpp +++ b/host/lib/transport/usb_zero_copy_wrapper.cpp @@ -72,7 +72,7 @@ public: void commit(size_t len){ if (_msb.get() == NULL) return; - _msb->commit(next_boundary(len, _boundary)); + _msb->commit(len); _queue.push_with_haste(this); _msb.reset(); } @@ -133,7 +133,7 @@ public: managed_recv_buffer::sptr recv_buff; //the buffer to be returned to the user recv_buff = wmrb->get_new(_last_recv_buff, mem, len); - _last_recv_offset = next_boundary(_last_recv_offset + len, _usb_frame_boundary); + _last_recv_offset = next_boundary(_last_recv_offset + len, 4); //check if this receive buffer has been exhausted if (_last_recv_offset >= _last_recv_buff->size()) { diff --git a/host/lib/usrp/b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp index 5e7794fe8..ec86e41a2 100644 --- a/host/lib/usrp/b100/b100_impl.hpp +++ b/host/lib/usrp/b100/b100_impl.hpp @@ -44,7 +44,7 @@ #include <uhd/transport/usb_zero_copy.hpp> #include <boost/weak_ptr.hpp> -static const double B100_LINK_RATE_BPS = 256e6/8; //pratical link rate (< 480 Mbps) +static const double B100_LINK_RATE_BPS = 256e6/5; //pratical link rate (< 480 Mbps) static const std::string B100_FW_FILE_NAME = "usrp_b100_fw.ihx"; static const std::string B100_FPGA_FILE_NAME = "usrp_b100_fpga.bin"; static const boost::uint16_t B100_FW_COMPAT_NUM = 0x02; |