diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-02-03 18:22:34 +0100 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-02-08 00:45:39 +0100 |
| commit | 215e18c9d45cdaa43705ae7c8f8cb43c0db28225 (patch) | |
| tree | e83ea0a5c82e436f4b7da98f1f2e3e5da261eb4c /src/gprs_coding_scheme.cpp | |
| parent | 2305afd86c3d3541d01fee0dee408a4510f96d4e (diff) | |
cs: Add GprsCodingScheme::optionalPaddingBits
Return the amount of optional padding bits, which is 6*8 for
MCS-3 and MCS-6 and 0 for all other coding schemes. The padding
is needed the encode 68 byte data blocks (MCS-8) with these schemes.
See TS 44.060, 9.3.2.1 and Annex J for details.
Sponsored-by: On-Waves ehf
Diffstat (limited to 'src/gprs_coding_scheme.cpp')
| -rw-r--r-- | src/gprs_coding_scheme.cpp | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/gprs_coding_scheme.cpp b/src/gprs_coding_scheme.cpp index 4f1db1df..8601d4f5 100644 --- a/src/gprs_coding_scheme.cpp +++ b/src/gprs_coding_scheme.cpp @@ -28,39 +28,40 @@ static struct { unsigned int data_header_bits; } uplink, downlink; unsigned int data_bytes; + unsigned int optional_padding_bits; const char *name; GprsCodingScheme::HeaderType data_hdr; GprsCodingScheme::Family family; } mcs_info[GprsCodingScheme::NUM_SCHEMES] = { - {{0, 0}, {0, 0}, 0, "UNKNOWN", + {{0, 0}, {0, 0}, 0, 0, "UNKNOWN", GprsCodingScheme::HEADER_INVALID, GprsCodingScheme::FAMILY_INVALID}, - {{23, 0}, {23, 0}, 20, "CS-1", + {{23, 0}, {23, 0}, 20, 0, "CS-1", GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID}, - {{33, 7}, {33, 7}, 30, "CS-2", + {{33, 7}, {33, 7}, 30, 0, "CS-2", GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID}, - {{39, 3}, {39, 3}, 36, "CS-3", + {{39, 3}, {39, 3}, 36, 0, "CS-3", GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID}, - {{53, 7}, {53, 7}, 50, "CS-4", + {{53, 7}, {53, 7}, 50, 0, "CS-4", GprsCodingScheme::HEADER_GPRS_DATA, GprsCodingScheme::FAMILY_INVALID}, - {{26, 1}, {26, 1}, 22, "MCS-1", + {{26, 1}, {26, 1}, 22, 0, "MCS-1", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_C}, - {{32, 1}, {32, 1}, 28, "MCS-2", + {{32, 1}, {32, 1}, 28, 0, "MCS-2", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_B}, - {{41, 1}, {41, 1}, 37, "MCS-3", + {{41, 1}, {41, 1}, 37, 48, "MCS-3", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_A}, - {{48, 1}, {48, 1}, 44, "MCS-4", + {{48, 1}, {48, 1}, 44, 0, "MCS-4", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3, GprsCodingScheme::FAMILY_C}, - {{60, 7}, {59, 6}, 56, "MCS-5", + {{60, 7}, {59, 6}, 56, 0, "MCS-5", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, GprsCodingScheme::FAMILY_B}, - {{78, 7}, {77, 6}, 74, "MCS-6", + {{78, 7}, {77, 6}, 74, 48, "MCS-6", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2, GprsCodingScheme::FAMILY_A}, - {{118, 2}, {117, 4}, 56, "MCS-7", + {{118, 2}, {117, 4}, 56, 0, "MCS-7", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, GprsCodingScheme::FAMILY_B}, - {{142, 2}, {141, 4}, 68, "MCS-8", + {{142, 2}, {141, 4}, 68, 0, "MCS-8", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, GprsCodingScheme::FAMILY_A}, - {{154, 2}, {153, 4}, 74, "MCS-9", + {{154, 2}, {153, 4}, 74, 0, "MCS-9", GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1, GprsCodingScheme::FAMILY_A}, }; @@ -152,6 +153,11 @@ unsigned int GprsCodingScheme::maxDataBlockBytes() const return mcs_info[m_scheme].data_bytes; } +unsigned int GprsCodingScheme::optionalPaddingBits() const +{ + return mcs_info[m_scheme].optional_padding_bits; +} + unsigned int GprsCodingScheme::numDataBlocks() const { return hdr_type_info[headerTypeData()].num_blocks; |