diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-01-20 14:33:11 +0100 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2016-02-02 17:06:36 +0100 |
| commit | 92d2b1a62bcf3267ab4ab0dc12d454a9aff0a2ba (patch) | |
| tree | cb0ac9f9b0326e56b90230584d0f64a508c9228a /src/decoding.cpp | |
| parent | d8662bf56775ec1f894da8694e3f1a05ceea71f5 (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
Diffstat (limited to 'src/decoding.cpp')
| -rw-r--r-- | src/decoding.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/decoding.cpp b/src/decoding.cpp index 72293a21..5a2ecf07 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> @@ -534,6 +532,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); @@ -571,10 +570,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); @@ -594,15 +590,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, |