diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-12-19 16:24:06 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:06:03 -0800 |
| commit | 27f2aa86ac2458e8dfaca5b50aeb31d7dd710257 (patch) | |
| tree | b2f1dae2f2ba00702092f512e1a86414e911e6cb /host/lib/usrp | |
| parent | 5adde5ab9c369e9c0389949c82804e9f23e39541 (diff) | |
| download | uhd-27f2aa86ac2458e8dfaca5b50aeb31d7dd710257.tar.gz uhd-27f2aa86ac2458e8dfaca5b50aeb31d7dd710257.tar.bz2 uhd-27f2aa86ac2458e8dfaca5b50aeb31d7dd710257.zip | |
n310: Move SID framing all the way to n310.py
MPM will now no longer keep a SID framer variable.
Reviewed-by: Trung Tran <trung.tran@ettus.com>
Reviewed-by: Brent Stapleton <brent.stapleton@ettus.com>
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_impl.cpp | 1 | ||||
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_impl.hpp | 3 | ||||
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_xport.cpp | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp index c44cc2040..911b57558 100644 --- a/host/lib/usrp/mpmd/mpmd_impl.cpp +++ b/host/lib/usrp/mpmd/mpmd_impl.cpp @@ -276,7 +276,6 @@ const std::string mpmd_impl::MPM_ECHO_CMD = "MPM-ECHO"; mpmd_impl::mpmd_impl(const device_addr_t& device_args) : usrp::device3_impl() , _device_args(device_args) - , _sid_framer(0) { UHD_LOGGER_INFO("MPMD") << "Initializing device with args: " << device_args.to_string(); diff --git a/host/lib/usrp/mpmd/mpmd_impl.hpp b/host/lib/usrp/mpmd/mpmd_impl.hpp index 7b81be0f6..fe98b0329 100644 --- a/host/lib/usrp/mpmd/mpmd_impl.hpp +++ b/host/lib/usrp/mpmd/mpmd_impl.hpp @@ -219,9 +219,6 @@ public: //! A counter for distributing local addresses to crossbars // No-one touches this except allocate_xbar_local_addr(), gotcha? size_t _xbar_local_addr_ctr = 2; - - // TODO make sure this can't wrap - size_t _sid_framer; }; }} /* namespace uhd::mpmd */ diff --git a/host/lib/usrp/mpmd/mpmd_xport.cpp b/host/lib/usrp/mpmd/mpmd_xport.cpp index c21da3839..43d5d6e2b 100644 --- a/host/lib/usrp/mpmd/mpmd_xport.cpp +++ b/host/lib/usrp/mpmd/mpmd_xport.cpp @@ -49,8 +49,7 @@ both_xports_t mpmd_impl::make_transport( identify_mboard_by_xbar_addr(dst_address.get_dst_addr()); const sid_t sid( - 0, - _sid_framer++, // FIXME make sure we only increment if actually valid + 0, 0, // Not actually an address, more of an 'ignore me' value dst_address.get_dst_addr(), dst_address.get_dst_endpoint() ); |