diff options
| author | Max <msuraev@sysmocom.de> | 2017-12-21 12:11:33 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2018-01-04 16:35:55 +0000 |
| commit | b3a17d6074b2575a599863766b9826a7bd3369b9 (patch) | |
| tree | b70ed9dfaa6159220ed07c762dc2e05993966495 /src/gprs_coding_scheme.h | |
| parent | a4f570fe7a9e511d04ba3aade4a144b4cb74deb8 (diff) | |
cosmetic: clarify coding scheme and puncturing
* use appropriate types for coding scheme parameters
* add comment regarding possible number of RLCMAC blocks
The code in create_dl_acked_block() has underlying assumption that
rlc.num_data_blocks can never be more than 2, which is true and is
enforced by appropriate asserts but is not obvious when looking at the
function code alone. It's equally hard for Coverity which leads to false
positives in scan.
Lets' make this assumption explicit by putting it into for(;;) condition
alongside with corresponding comment.
Fixes: CID143070
Change-Id: If599a6c8a6ef56d847604fcf41bb71decccd8a78
Diffstat (limited to 'src/gprs_coding_scheme.h')
| -rw-r--r-- | src/gprs_coding_scheme.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/gprs_coding_scheme.h b/src/gprs_coding_scheme.h index dfad240b..76cab0f2 100644 --- a/src/gprs_coding_scheme.h +++ b/src/gprs_coding_scheme.h @@ -70,7 +70,7 @@ public: operator bool() const {return m_scheme != UNKNOWN;} operator Scheme() const {return m_scheme;} - unsigned int to_num() const; + uint8_t to_num() const; GprsCodingScheme& operator =(Scheme s); bool operator == (Scheme s) const; @@ -91,20 +91,20 @@ public: void dec(); void decToSingleBlock(bool *needStuffing); - unsigned int sizeUL() const; - unsigned int sizeDL() const; - unsigned int usedSizeUL() const; - unsigned int usedSizeDL() const; - unsigned int maxBytesUL() const; - unsigned int maxBytesDL() const; - unsigned int spareBitsUL() const; - unsigned int spareBitsDL() const; - unsigned int maxDataBlockBytes() const; - unsigned int numDataBlocks() const; - unsigned int numDataHeaderBitsUL() const; - unsigned int numDataHeaderBitsDL() const; - unsigned int numDataBlockHeaderBits() const; - unsigned int optionalPaddingBits() const; + uint8_t sizeUL() const; + uint8_t sizeDL() const; + uint8_t usedSizeUL() const; + uint8_t usedSizeDL() const; + uint8_t maxBytesUL() const; + uint8_t maxBytesDL() const; + uint8_t spareBitsUL() const; + uint8_t spareBitsDL() const; + uint8_t maxDataBlockBytes() const; + uint8_t numDataBlocks() const; + uint8_t numDataHeaderBitsUL() const; + uint8_t numDataHeaderBitsDL() const; + uint8_t numDataBlockHeaderBits() const; + uint8_t optionalPaddingBits() const; const char *name() const; HeaderType headerTypeData() const; HeaderType headerTypeControl() const; @@ -127,7 +127,7 @@ private: enum Scheme m_scheme; }; -inline unsigned int GprsCodingScheme::to_num() const +inline uint8_t GprsCodingScheme::to_num() const { if (isGprs()) return (m_scheme - CS1) + 1; |