diff options
| author | Max <msuraev@sysmocom.de> | 2019-03-05 14:59:03 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2019-03-19 18:27:49 +0100 |
| commit | 136ebccc5ebb86e32bf595288dbd29bd2068e2b1 (patch) | |
| tree | feef31ade7e64b3d77d0f9ffc036b61c513b3711 /src/gprs_coding_scheme.cpp | |
| parent | 51754b6f35d639e65385e9fdde70323037e37641 (diff) | |
MCS: use value_string for conversion
Change-Id: I212ebb892ab162821633974d5a6c7e315d308370
Diffstat (limited to 'src/gprs_coding_scheme.cpp')
| -rw-r--r-- | src/gprs_coding_scheme.cpp | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/src/gprs_coding_scheme.cpp b/src/gprs_coding_scheme.cpp index 0616a49c..53b3b073 100644 --- a/src/gprs_coding_scheme.cpp +++ b/src/gprs_coding_scheme.cpp @@ -81,39 +81,38 @@ static struct { } uplink, downlink; uint8_t data_bytes; uint8_t optional_padding_bits; - const char *name; enum HeaderType data_hdr; enum Family family; } mcs_info[NUM_SCHEMES] = { - {{0, 0}, {0, 0}, 0, 0, "UNKNOWN", + {{0, 0}, {0, 0}, 0, 0, HEADER_INVALID, FAMILY_INVALID}, - {{23, 0}, {23, 0}, 20, 0, "CS-1", + {{23, 0}, {23, 0}, 20, 0, HEADER_GPRS_DATA, FAMILY_INVALID}, - {{33, 7}, {33, 7}, 30, 0, "CS-2", + {{33, 7}, {33, 7}, 30, 0, HEADER_GPRS_DATA, FAMILY_INVALID}, - {{39, 3}, {39, 3}, 36, 0, "CS-3", + {{39, 3}, {39, 3}, 36, 0, HEADER_GPRS_DATA, FAMILY_INVALID}, - {{53, 7}, {53, 7}, 50, 0, "CS-4", + {{53, 7}, {53, 7}, 50, 0, HEADER_GPRS_DATA, FAMILY_INVALID}, - {{26, 1}, {26, 1}, 22, 0, "MCS-1", + {{26, 1}, {26, 1}, 22, 0, HEADER_EGPRS_DATA_TYPE_3, FAMILY_C}, - {{32, 1}, {32, 1}, 28, 0, "MCS-2", + {{32, 1}, {32, 1}, 28, 0, HEADER_EGPRS_DATA_TYPE_3, FAMILY_B}, - {{41, 1}, {41, 1}, 37, 48, "MCS-3", + {{41, 1}, {41, 1}, 37, 48, HEADER_EGPRS_DATA_TYPE_3, FAMILY_A}, - {{48, 1}, {48, 1}, 44, 0, "MCS-4", + {{48, 1}, {48, 1}, 44, 0, HEADER_EGPRS_DATA_TYPE_3, FAMILY_C}, - {{60, 7}, {59, 6}, 56, 0, "MCS-5", + {{60, 7}, {59, 6}, 56, 0, HEADER_EGPRS_DATA_TYPE_2, FAMILY_B}, - {{78, 7}, {77, 6}, 74, 48, "MCS-6", + {{78, 7}, {77, 6}, 74, 48, HEADER_EGPRS_DATA_TYPE_2, FAMILY_A}, - {{118, 2}, {117, 4}, 56, 0, "MCS-7", + {{118, 2}, {117, 4}, 56, 0, HEADER_EGPRS_DATA_TYPE_1, FAMILY_B}, - {{142, 2}, {141, 4}, 68, 0, "MCS-8", + {{142, 2}, {141, 4}, 68, 0, HEADER_EGPRS_DATA_TYPE_1, FAMILY_A}, - {{154, 2}, {153, 4}, 74, 0, "MCS-9", + {{154, 2}, {153, 4}, 74, 0, HEADER_EGPRS_DATA_TYPE_1, FAMILY_A}, }; @@ -194,11 +193,6 @@ uint8_t GprsCodingScheme::optionalPaddingBits() const return mcs_info[m_scheme].optional_padding_bits; } -const char *GprsCodingScheme::name() const -{ - return mcs_info[m_scheme].name; -} - enum HeaderType GprsCodingScheme::headerTypeData() const { return mcs_info[m_scheme].data_hdr; |