diff options
author | Martin Anderseck <martin.anderseck@ni.com> | 2021-09-21 11:52:09 +0200 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-09-28 06:12:39 -0700 |
commit | 6382fc9836956352f1570cbb54d9a911f127f2a6 (patch) | |
tree | cd0d50db4453d13ee6a4485d7121d8205d77c468 /host/lib | |
parent | 6c8f24a9ca136c78fd73e94e937b3325a26a1fab (diff) | |
download | uhd-6382fc9836956352f1570cbb54d9a911f127f2a6.tar.gz uhd-6382fc9836956352f1570cbb54d9a911f127f2a6.tar.bz2 uhd-6382fc9836956352f1570cbb54d9a911f127f2a6.zip |
chdr: Rename var max_size_bytes to avoid confusion
The variable max_size_bytes has a different name in the source than in
the header and is not self-explanatory in both. Therefore when comparing
against it in the assertion in line 142 one could assume that a number
of bytes needs to be compared with a byte value. Change variable to
`buff_size` in source and header file to avoid confusion and add
documentation.
Diffstat (limited to 'host/lib')
-rw-r--r-- | host/lib/rfnoc/chdr_types.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/host/lib/rfnoc/chdr_types.cpp b/host/lib/rfnoc/chdr_types.cpp index 7975a0228..aea76dbc4 100644 --- a/host/lib/rfnoc/chdr_types.cpp +++ b/host/lib/rfnoc/chdr_types.cpp @@ -99,7 +99,7 @@ size_t ctrl_payload::serialize(uint64_t* buff, } void ctrl_payload::deserialize(const uint64_t* buff, - size_t max_size_bytes, + size_t buff_size, const std::function<uint64_t(uint64_t)>& conv_byte_order) { // We assume that buff has room to hold the entire packet @@ -140,7 +140,7 @@ void ctrl_payload::deserialize(const uint64_t* buff, } data_vtr[i] = get_field_u64<uint32_t>(data_word, LO_DATA_OFFSET, 32); } - UHD_ASSERT_THROW(ptr <= max_size_bytes); + UHD_ASSERT_THROW(ptr <= buff_size); } size_t ctrl_payload::get_length() const @@ -226,10 +226,10 @@ size_t strs_payload::serialize(uint64_t* buff, } void strs_payload::deserialize(const uint64_t* buff, - size_t num_elems, + size_t buff_size, const std::function<uint64_t(uint64_t)>& conv_byte_order) { - UHD_ASSERT_THROW(num_elems >= 4); + UHD_ASSERT_THROW(buff_size >= 4); // Read first word uint64_t word0 = conv_byte_order(buff[0]); @@ -313,10 +313,10 @@ size_t strc_payload::serialize(uint64_t* buff, } void strc_payload::deserialize(const uint64_t* buff, - size_t num_elems, + size_t buff_size, const std::function<uint64_t(uint64_t)>& conv_byte_order) { - UHD_ASSERT_THROW(num_elems >= 2); + UHD_ASSERT_THROW(buff_size >= 2); // Read first word uint64_t word0 = conv_byte_order(buff[0]); @@ -515,14 +515,14 @@ size_t mgmt_payload::serialize(uint64_t* buff, } void mgmt_payload::deserialize(const uint64_t* buff, - size_t num_elems, + size_t buff_size, const std::function<uint64_t(uint64_t)>& conv_byte_order) { - UHD_ASSERT_THROW(num_elems > 1); + UHD_ASSERT_THROW(buff_size > 1); // We use a list and copy just for ease of implementation // These transactions are not performance critical - std::list<uint64_t> src_list(buff, buff + (num_elems * (_padding_size + 1))); + std::list<uint64_t> src_list(buff, buff + (buff_size * (_padding_size + 1))); _hops.clear(); |