diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-01-20 14:33:11 +0100 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-02-08 00:45:34 +0100 |
| commit | 2bef4dbd431150dddadd52221d7e238ca49ea4a3 (patch) | |
| tree | 9fe191c5ae2f3f68ac5db576360e6670f3bd1682 | |
| parent | 3fdcb2b84e1397f0a46bada134f5122357871e75 (diff) | |
edge: Enable CRBB decoding
Currently CRBB bitmaps are ignored if they are present.
This commit enables the decoding.
Note that this requires osmo_t4_decode in libosmocore.
Sponsored-by: On-Waves ehf
| -rw-r--r-- | src/decoding.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/decoding.cpp b/src/decoding.cpp index 7c20c488..0623bef2 100644 --- a/src/decoding.cpp +++ b/src/decoding.cpp @@ -23,9 +23,7 @@ extern "C" { #include <osmocom/core/utils.h> -#if WITH_CRBB_DECODING #include <osmocom/core/bitcomp.h> -#endif } #include <arpa/inet.h> @@ -522,6 +520,7 @@ int Decoding::decode_egprs_acknack_bits(const EGPRS_AckNack_Desc_t *desc, bool have_bitmap; int implicitly_acked_blocks; int ssn = desc->STARTING_SEQUENCE_NUMBER; + int rc; if (desc->FINAL_ACK_INDICATION) return handle_final_ack(bits, bsn_begin, bsn_end, window); @@ -561,10 +560,7 @@ int Decoding::decode_egprs_acknack_bits(const EGPRS_AckNack_Desc_t *desc, if (crbb_len > 0) { int old_len = bits->cur_bit; -#if WITH_CRBB_DECODING -#warning "Experimental CRBB decoding enabled" struct bitvec crbb; - int rc; crbb.data = (uint8_t *)desc->CRBB; crbb.data_len = sizeof(desc->CRBB); @@ -584,15 +580,7 @@ int Decoding::decode_egprs_acknack_bits(const EGPRS_AckNack_Desc_t *desc, * bitmap has stopped here */ goto aborted; } -#else - LOGP(DRLCMACUL, LOGL_ERROR, "ERROR: CRBB not supported, " - "please set window size to 64\n"); - /* We don't know the SSN offset for the URBB, return - * what we have so far and assume the bitmap has - * stopped here */ - goto aborted; -#endif LOGP(DRLCMACDL, LOGL_DEBUG, "CRBB len: %d, decoded len: %d, cc: %d, crbb: '%s'\n", desc->CRBB_LENGTH, bits->cur_bit - old_len, |