cellular-infrastructure
/
osmo-pcu
mirror of https://gerrit.osmocom.org/osmo-pcu
9
0
Fork 1
Code Issues Releases Wiki Activity
osmo-pcu/src/rlc.cpp

560 lines
13 KiB
C++
Raw Normal View History

rlc: Start to move things out of the tbf into the rlc Add remarks of possible broken behavior inside the tbf routines. Move the preparation (and init) into the new rlc.cpp file.
2013-11-13 19:45:40 +00:00
/*
* Copyright (C) 2013 by Holger Hans Peter Freyther
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
tbf/rlc: Move the parsing of RBB to Decoding, move window marking out Move the parsing of the bitbmap out of the TBF code into Decoding. Move the updating of the V_B into the V_B class. Add some comments about handling the mod_sns, mod_sns_half parameters by using template code.
2013-11-24 16:05:48 +00:00
#include "bts.h"
#include "gprs_debug.h"
Update header includes Many files include unnecessary headers and don't include headers which are actually used. Because of that combined with the fact that OsmoPCU is a mixture of C and C++, it makes it hard to modularize code. Fix this (using iwyu [1] tool): * add missing headers * remove unused headers [1] https://include-what-you-use.org/ Related: OS#1539 Change-Id: I8c9f488a43b099c72b2d30d3245e7ba50872fc00
2018-01-26 12:31:42 +00:00
#include <rlc.h>
rlc: Start to move things out of the tbf into the rlc Add remarks of possible broken behavior inside the tbf routines. Move the preparation (and init) into the new rlc.cpp file.
2013-11-13 19:45:40 +00:00
Update header includes Many files include unnecessary headers and don't include headers which are actually used. Because of that combined with the fact that OsmoPCU is a mixture of C and C++, it makes it hard to modularize code. Fix this (using iwyu [1] tool): * add missing headers * remove unused headers [1] https://include-what-you-use.org/ Related: OS#1539 Change-Id: I8c9f488a43b099c72b2d30d3245e7ba50872fc00
2018-01-26 12:31:42 +00:00
#include <stdbool.h>
#include <string.h>
#include <sys/types.h>
edge: Add unified decoder methods for GPRS/EGPRS This commit adds new RLC block decoder functions that support both GPRS and EGPRS. The code path is selected based on the value of the GprsCodingScheme cs object. - rlc_parse_ul_data_header parses the header of an RLC data block including the E and FBI/TI flags (currently supported CS-1 - CS-4, MCS-1 - MCS-4). - rlc_copy_to_aligned_buffer copies an RLC data unit to a byte aligned buffer and returns the unit's length. - rlc_get_data_aligned is a convenience wrapper around rlc_copy_to_aligned_buffer that avoids copying if the data unit is already byte aligned. Sponsored-by: On-Waves ehf
2015-12-08 14:14:05 +00:00
rlc: Start to move things out of the tbf into the rlc Add remarks of possible broken behavior inside the tbf routines. Move the preparation (and init) into the new rlc.cpp file.
2013-11-13 19:45:40 +00:00
extern "C" {
#include <osmocom/core/utils.h>
Update header includes Many files include unnecessary headers and don't include headers which are actually used. Because of that combined with the fact that OsmoPCU is a mixture of C and C++, it makes it hard to modularize code. Fix this (using iwyu [1] tool): * add missing headers * remove unused headers [1] https://include-what-you-use.org/ Related: OS#1539 Change-Id: I8c9f488a43b099c72b2d30d3245e7ba50872fc00
2018-01-26 12:31:42 +00:00
#include <osmocom/core/bitvec.h>
#include <osmocom/core/logging.h>
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
#include "coding_scheme.h"
rlc: Start to move things out of the tbf into the rlc Add remarks of possible broken behavior inside the tbf routines. Move the preparation (and init) into the new rlc.cpp file.
2013-11-13 19:45:40 +00:00
}
rlc: Move prepare() function out of gprs_rlc_data struct Newer gcc 10.1.0 is erroring due to memset being applied on a complex type, so let's start by removing this only function outside of the struct. Change-Id: I20426557d9b3049ab275fadb92e10ea8a860a119
2020-05-18 09:02:39 +00:00
uint8_t *prepare(struct gprs_rlc_data *rlc, size_t block_data_len)
rlc: Start to move things out of the tbf into the rlc Add remarks of possible broken behavior inside the tbf routines. Move the preparation (and init) into the new rlc.cpp file.
2013-11-13 19:45:40 +00:00
{
/* todo.. only set it once if it turns out to be a bottleneck */
rlc: Move prepare() function out of gprs_rlc_data struct Newer gcc 10.1.0 is erroring due to memset being applied on a complex type, so let's start by removing this only function outside of the struct. Change-Id: I20426557d9b3049ab275fadb92e10ea8a860a119
2020-05-18 09:02:39 +00:00
memset(rlc->block, 0x0, sizeof(rlc->block));
memset(rlc->block, 0x2b, block_data_len);
rlc: Start to move things out of the tbf into the rlc Add remarks of possible broken behavior inside the tbf routines. Move the preparation (and init) into the new rlc.cpp file.
2013-11-13 19:45:40 +00:00
Add data structure for CPS calculation in DL Define new data structure with respect to TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1 for puncturing scheme values and initialize the variable introduced
2016-03-23 12:59:45 +00:00
/* Initial value of puncturing scheme */
rlc: Move prepare() function out of gprs_rlc_data struct Newer gcc 10.1.0 is erroring due to memset being applied on a complex type, so let's start by removing this only function outside of the struct. Change-Id: I20426557d9b3049ab275fadb92e10ea8a860a119
2020-05-18 09:02:39 +00:00
rlc->next_ps = EGPRS_PS_1;
Add data structure for CPS calculation in DL Define new data structure with respect to TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1 for puncturing scheme values and initialize the variable introduced
2016-03-23 12:59:45 +00:00
rlc: Move prepare() function out of gprs_rlc_data struct Newer gcc 10.1.0 is erroring due to memset being applied on a complex type, so let's start by removing this only function outside of the struct. Change-Id: I20426557d9b3049ab275fadb92e10ea8a860a119
2020-05-18 09:02:39 +00:00
return rlc->block;
rlc: Start to move things out of the tbf into the rlc Add remarks of possible broken behavior inside the tbf routines. Move the preparation (and init) into the new rlc.cpp file.
2013-11-13 19:45:40 +00:00
}
rlc: Move the ack state array into a separate class that can be tested
2013-11-23 15:06:54 +00:00
void gprs_rlc_v_b::reset()
{
for (size_t i = 0; i < ARRAY_SIZE(m_v_b); ++i)
mark_invalid(i);
}
rlc/tbf: Move the loop into the gprs_rlc_v_b class
2013-11-23 23:18:47 +00:00
tbf, ...: Make the fields in the dl/ul struct member variables There is no need for the union/struct anymore. Make the variable members of the UL/DL class. As a result gprs_rlc_dl_window gets a reset() method because memset(&dir.dl, 0, sizeof(dir.dl)) doesn't work anymore in reuse_tbf(). Ticket: SYS#389 Sponsored by: On-Waves ehf
2014-08-07 13:49:21 +00:00
void gprs_rlc_dl_window::reset()
{
m_v_s = 0;
m_v_a = 0;
m_v_b.reset();
}
DL window: constify resend_needed() function It doesn't change any state so mark it as const. Change-Id: I5d672bfd654198aebb187772de464c52b3209435
2017-12-13 17:25:36 +00:00
int gprs_rlc_dl_window::resend_needed() const
rlc/tbf: Move the loop into the gprs_rlc_v_b class
2013-11-23 23:18:47 +00:00
{
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
for (uint16_t bsn = v_a(); bsn != v_s(); bsn = mod_sns(bsn + 1)) {
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
if (m_v_b.is_nacked(bsn) || m_v_b.is_resend(bsn))
rlc/tbf: Move the loop into the gprs_rlc_v_b class
2013-11-23 23:18:47 +00:00
return bsn;
}
return -1;
}
tbf/rlc: Move the marking of frames for resend into the v_b
2013-11-23 23:38:54 +00:00
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
int gprs_rlc_dl_window::mark_for_resend()
tbf/rlc: Move the marking of frames for resend into the v_b
2013-11-23 23:38:54 +00:00
{
int resend = 0;
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
for (uint16_t bsn = v_a(); bsn != v_s(); bsn = mod_sns(bsn + 1)) {
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
if (m_v_b.is_unacked(bsn)) {
tbf/rlc: Move the marking of frames for resend into the v_b
2013-11-23 23:38:54 +00:00
/* mark to be re-send */
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
m_v_b.mark_resend(bsn);
tbf/rlc: Move the marking of frames for resend into the v_b
2013-11-23 23:38:54 +00:00
resend += 1;
}
}
return resend;
}
tbf/rlc: Move the parsing of RBB to Decoding, move window marking out Move the parsing of the bitbmap out of the TBF code into Decoding. Move the updating of the V_B into the V_B class. Add some comments about handling the mod_sns, mod_sns_half parameters by using template code.
2013-11-24 16:05:48 +00:00
Add compression support in EGPRS PUAN This adds compression of bitmap in PUAN. The compressed bitmap is used only if the number of bits in the bitmap does not fit in the message and there is a gain after compression. The algorithm is part of libosmocore and so there is dependency on the libosmocore for compilation. The algorithm is tested on integration setup by forcing compression. Change-Id: Id2eec4b5eb6da0ebd24054b541b09b700b9b40ba
2017-01-16 10:11:21 +00:00
/* Update the receive block bitmap */
uint16_t gprs_rlc_ul_window::update_egprs_rbb(uint8_t *rbb)
{
rlc: replace int with uint16_t The i value will only count forward and is limited to 11 bit. The integer is also converted when returning to uint16_t Change-Id: Ib8a9081bbcb8b4344498254c58941002d17f9381
2019-06-16 14:24:36 +00:00
uint16_t i;
Add compression support in EGPRS PUAN This adds compression of bitmap in PUAN. The compressed bitmap is used only if the number of bits in the bitmap does not fit in the message and there is a gain after compression. The algorithm is part of libosmocore and so there is dependency on the libosmocore for compilation. The algorithm is tested on integration setup by forcing compression. Change-Id: Id2eec4b5eb6da0ebd24054b541b09b700b9b40ba
2017-01-16 10:11:21 +00:00
uint16_t bsn;
uint16_t bitmask = 0x80;
int8_t pos = 0;
int8_t bit_pos = 0;
for (i = 0, bsn = (v_q()+1); ((bsn < (v_r())) && (i < ws())); i++,
bsn = this->mod_sns(bsn + 1)) {
if (m_v_n.is_received(bsn)) {
rbb[pos] = rbb[pos] | bitmask;
} else {
rbb[pos] = rbb[pos] & (~bitmask);
}
bitmask = bitmask >> 1;
bit_pos++;
bit_pos = bit_pos % 8;
if (bit_pos == 0) {
pos++;
bitmask = 0x80;
}
}
return i;
}
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
int gprs_rlc_dl_window::count_unacked()
tbf/rlc: Move the counting of unacked frames into the RLC V_B class Whenwe receive a final ack we assume that all the unacked frames have been acked now. Move the counting to V_B and now the caller can remove the BSN and the "lost" variable which has always been zero.
2013-11-24 16:34:17 +00:00
{
uint16_t unacked = 0;
uint16_t bsn;
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
for (bsn = v_a(); bsn != v_s(); bsn = mod_sns(bsn + 1)) {
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
if (!m_v_b.is_acked(bsn))
tbf/rlc: Move the counting of unacked frames into the RLC V_B class Whenwe receive a final ack we assume that all the unacked frames have been acked now. Move the counting to V_B and now the caller can remove the BSN and the "lost" variable which has always been zero.
2013-11-24 16:34:17 +00:00
unacked += 1;
}
return unacked;
}
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
static uint16_t bitnum_to_bsn(int bitnum, uint16_t ssn)
rlc: Make the update loop more understandable Add bitnum_to_bsn() as a convenience function to get the BSN, use it in the update handling and ignore rbb for values outside of our tx window.
2013-12-11 19:04:29 +00:00
{
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
return (ssn - 1 - bitnum);
rlc: Make the update loop more understandable Add bitnum_to_bsn() as a convenience function to get the BSN, use it in the update handling and ignore rbb for values outside of our tx window.
2013-12-11 19:04:29 +00:00
}
Unify BTS into a C usable structure Previous work on BTS class started to get stuff out of the C++ struct into a C struct (BTS -> struct gprs_glcmac_bts) so that some parts of it were accessible from C code. Doing so, however, ended up being messy too, since all code needs to be switching from one object to another, which actually refer to the same logical component. Let's instead rejoin the structures and make sure the struct is accessible and usable from both C and C++ code by rewriting all methods to be C compatible and converting 3 allocated suboject as pointers. This way BTS can internally still use those C++ objects while providing a clean APi to both C and C++ code. Change-Id: I7d12c896c5ded659ca9d3bff4cf3a3fc857db9dd
2021-01-14 15:48:38 +00:00
void gprs_rlc_dl_window::update(struct gprs_rlcmac_bts *bts, const struct bitvec *rbb,
edge: Add bitvec based DL window updating methods The current methods are based on the GRPS specific RBB and SSN values and formats which are not compatible with EGPRS. Add a second set of similar methods with the same semantics but which are based on a bitvec and the first BSN instead. The following methods are affected: - gprs_rlc_dl_window::update - gprs_rlcmac_dl_tbf::rcvd_dl_ack - gprs_rlcmac_dl_tbf::update_window Sponsored-by: On-Waves ehf
2016-02-05 16:07:12 +00:00
uint16_t first_bsn, uint16_t *lost,
uint16_t *received)
{
EGPRS: fix for EPDAN out of window Fix alignment of EPDAN outside the RLC transmit window, according to section 9.1.8.2.4 in 44.060 version 7.27.0 Release 7. The specification explains that a bit within the uncompressed bitmap whose corresponding BSN is not within the transmit window shall be ignored. Without this fix PCU was dropping the EPDAN message and not updating the status of BSNs which are inside the RLC window. This patch updates the status of the BSNs which are inside the window and ignores the remaining bits. Related: OS#1789 Change-Id: Id07d178970f168f5389016c1eea31eb6b82057b6
2016-11-02 10:18:00 +00:00
unsigned dist = distance();
unsigned num_blocks = rbb->cur_bit > dist
? dist : rbb->cur_bit;
edge: Add bitvec based DL window updating methods The current methods are based on the GRPS specific RBB and SSN values and formats which are not compatible with EGPRS. Add a second set of similar methods with the same semantics but which are based on a bitvec and the first BSN instead. The following methods are affected: - gprs_rlc_dl_window::update - gprs_rlcmac_dl_tbf::rcvd_dl_ack - gprs_rlcmac_dl_tbf::update_window Sponsored-by: On-Waves ehf
2016-02-05 16:07:12 +00:00
unsigned bsn;
/* first_bsn is in range V(A)..V(S) */
for (unsigned int bitpos = 0; bitpos < num_blocks; bitpos++) {
bool is_ack;
bsn = mod_sns(first_bsn + bitpos);
if (bsn == mod_sns(v_a() - 1))
break;
is_ack = bitvec_get_bit_pos(rbb, bitpos) == 1;
if (is_ack) {
LOGP(DRLCMACDL, LOGL_DEBUG, "- got ack for BSN=%d\n", bsn);
if (!m_v_b.is_acked(bsn))
*received += 1;
m_v_b.mark_acked(bsn);
} else {
LOGP(DRLCMACDL, LOGL_DEBUG, "- got NACK for BSN=%d\n", bsn);
m_v_b.mark_nacked(bsn);
Unify BTS into a C usable structure Previous work on BTS class started to get stuff out of the C++ struct into a C struct (BTS -> struct gprs_glcmac_bts) so that some parts of it were accessible from C code. Doing so, however, ended up being messy too, since all code needs to be switching from one object to another, which actually refer to the same logical component. Let's instead rejoin the structures and make sure the struct is accessible and usable from both C and C++ code by rewriting all methods to be C compatible and converting 3 allocated suboject as pointers. This way BTS can internally still use those C++ objects while providing a clean APi to both C and C++ code. Change-Id: I7d12c896c5ded659ca9d3bff4cf3a3fc857db9dd
2021-01-14 15:48:38 +00:00
bts_do_rate_ctr_inc(bts, CTR_RLC_NACKED);
edge: Add bitvec based DL window updating methods The current methods are based on the GRPS specific RBB and SSN values and formats which are not compatible with EGPRS. Add a second set of similar methods with the same semantics but which are based on a bitvec and the first BSN instead. The following methods are affected: - gprs_rlc_dl_window::update - gprs_rlcmac_dl_tbf::rcvd_dl_ack - gprs_rlcmac_dl_tbf::update_window Sponsored-by: On-Waves ehf
2016-02-05 16:07:12 +00:00
*lost += 1;
}
}
}
Unify BTS into a C usable structure Previous work on BTS class started to get stuff out of the C++ struct into a C struct (BTS -> struct gprs_glcmac_bts) so that some parts of it were accessible from C code. Doing so, however, ended up being messy too, since all code needs to be switching from one object to another, which actually refer to the same logical component. Let's instead rejoin the structures and make sure the struct is accessible and usable from both C and C++ code by rewriting all methods to be C compatible and converting 3 allocated suboject as pointers. This way BTS can internally still use those C++ objects while providing a clean APi to both C and C++ code. Change-Id: I7d12c896c5ded659ca9d3bff4cf3a3fc857db9dd
2021-01-14 15:48:38 +00:00
void gprs_rlc_dl_window::update(struct gprs_rlcmac_bts *bts, char *show_rbb, uint16_t ssn,
tbf/rlc: Move the parsing of RBB to Decoding, move window marking out Move the parsing of the bitbmap out of the TBF code into Decoding. Move the updating of the V_B into the V_B class. Add some comments about handling the mod_sns, mod_sns_half parameters by using template code.
2013-11-24 16:05:48 +00:00
uint16_t *lost, uint16_t *received)
{
/* SSN - 1 is in range V(A)..V(S)-1 */
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
for (int bitpos = 0; bitpos < ws(); bitpos++) {
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
uint16_t bsn = mod_sns(bitnum_to_bsn(bitpos, ssn));
rlc: Make the update loop more understandable Add bitnum_to_bsn() as a convenience function to get the BSN, use it in the update handling and ignore rbb for values outside of our tx window.
2013-12-11 19:04:29 +00:00
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
if (bsn == mod_sns(v_a() - 1))
rlc: Make the update loop more understandable Add bitnum_to_bsn() as a convenience function to get the BSN, use it in the update handling and ignore rbb for values outside of our tx window.
2013-12-11 19:04:29 +00:00
break;
tbf/rlc: Move the parsing of RBB to Decoding, move window marking out Move the parsing of the bitbmap out of the TBF code into Decoding. Move the updating of the V_B into the V_B class. Add some comments about handling the mod_sns, mod_sns_half parameters by using template code.
2013-11-24 16:05:48 +00:00
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
if (show_rbb[ws() - 1 - bitpos] == 'R') {
tbf/rlc: Move the parsing of RBB to Decoding, move window marking out Move the parsing of the bitbmap out of the TBF code into Decoding. Move the updating of the V_B into the V_B class. Add some comments about handling the mod_sns, mod_sns_half parameters by using template code.
2013-11-24 16:05:48 +00:00
LOGP(DRLCMACDL, LOGL_DEBUG, "- got ack for BSN=%d\n", bsn);
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
if (!m_v_b.is_acked(bsn))
tbf/rlc: Move the parsing of RBB to Decoding, move window marking out Move the parsing of the bitbmap out of the TBF code into Decoding. Move the updating of the V_B into the V_B class. Add some comments about handling the mod_sns, mod_sns_half parameters by using template code.
2013-11-24 16:05:48 +00:00
*received += 1;
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
m_v_b.mark_acked(bsn);
tbf/rlc: Move the parsing of RBB to Decoding, move window marking out Move the parsing of the bitbmap out of the TBF code into Decoding. Move the updating of the V_B into the V_B class. Add some comments about handling the mod_sns, mod_sns_half parameters by using template code.
2013-11-24 16:05:48 +00:00
} else {
LOGP(DRLCMACDL, LOGL_DEBUG, "- got NACK for BSN=%d\n", bsn);
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
m_v_b.mark_nacked(bsn);
Unify BTS into a C usable structure Previous work on BTS class started to get stuff out of the C++ struct into a C struct (BTS -> struct gprs_glcmac_bts) so that some parts of it were accessible from C code. Doing so, however, ended up being messy too, since all code needs to be switching from one object to another, which actually refer to the same logical component. Let's instead rejoin the structures and make sure the struct is accessible and usable from both C and C++ code by rewriting all methods to be C compatible and converting 3 allocated suboject as pointers. This way BTS can internally still use those C++ objects while providing a clean APi to both C and C++ code. Change-Id: I7d12c896c5ded659ca9d3bff4cf3a3fc857db9dd
2021-01-14 15:48:38 +00:00
bts_do_rate_ctr_inc(bts, CTR_RLC_NACKED);
tbf/rlc: Move the parsing of RBB to Decoding, move window marking out Move the parsing of the bitbmap out of the TBF code into Decoding. Move the updating of the V_B into the V_B class. Add some comments about handling the mod_sns, mod_sns_half parameters by using template code.
2013-11-24 16:05:48 +00:00
*lost += 1;
}
}
}
tbf/rlc: Move the moving of V(A) into the V_B code Move the code that moves the V_B to the first not acked frame. Return how many indexes the V_B was moved and update the V_A in the caller.
2013-11-24 16:13:10 +00:00
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
int gprs_rlc_dl_window::move_window()
tbf/rlc: Move the moving of V(A) into the V_B code Move the code that moves the V_B to the first not acked frame. Return how many indexes the V_B was moved and update the V_A in the caller.
2013-11-24 16:13:10 +00:00
{
int i;
uint16_t bsn;
int moved = 0;
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
for (i = 0, bsn = v_a(); bsn != v_s(); i++, bsn = mod_sns(bsn + 1)) {
rlc/tbf: Move v_b into DL window Move functions resend_needed(), mark_for_resend(), update(), move_window(), state(), count_unacked() out of v_b directly into the UL window and provide a function get_state in v_b to access the v_b elements.
2013-12-28 17:24:42 +00:00
if (m_v_b.is_acked(bsn)) {
m_v_b.mark_invalid(bsn);
tbf/rlc: Move the moving of V(A) into the V_B code Move the code that moves the V_B to the first not acked frame. Return how many indexes the V_B was moved and update the V_A in the caller.
2013-11-24 16:13:10 +00:00
moved += 1;
} else
break;
}
return moved;
}
tbf/rlc: Change the code and generate the entire state in the V_B
2013-11-24 16:20:35 +00:00
rlc: Rename state() to show_state() to better reflect its function show_state() is only used for debugging output to make the v(b) array human readable.
2014-01-15 11:45:56 +00:00
void gprs_rlc_dl_window::show_state(char *show_v_b)
tbf/rlc: Change the code and generate the entire state in the V_B
2013-11-24 16:20:35 +00:00
{
int i;
uint16_t bsn;
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
for (i = 0, bsn = v_a(); bsn != v_s(); i++, bsn = mod_sns(bsn + 1)) {
rlc: Make the RLC types only operate on the BSN The code has an internal optimization to only use window_size space. This means that the caller needed to know that only half of the size was used. Change the API to work on the BSN and do the mapping internally. The compiler should have plenty of opportunity to propagate the constant(s) but this has not been verified.
2013-11-26 20:43:58 +00:00
uint16_t index = bsn & mod_sns_half();
rlc: Use an enum for the state array instead of chars gprs_rlc_bsn_state is now used to hold the ACK state of sent/received rlc packets.
2013-12-28 20:16:13 +00:00
switch(m_v_b.get_state(index)) {
case GPRS_RLC_DL_BSN_INVALID:
show_v_b[i] = 'I';
break;
case GPRS_RLC_DL_BSN_ACKED:
show_v_b[i] = 'A';
break;
case GPRS_RLC_DL_BSN_RESEND:
show_v_b[i] = 'X';
break;
case GPRS_RLC_DL_BSN_NACKED:
show_v_b[i] = 'N';
break;
rlc: Rename state() to show_state() to better reflect its function show_state() is only used for debugging output to make the v(b) array human readable.
2014-01-15 11:45:56 +00:00
default:
show_v_b[i] = '?';
rlc: Use an enum for the state array instead of chars gprs_rlc_bsn_state is now used to hold the ACK state of sent/received rlc packets.
2013-12-28 20:16:13 +00:00
}
tbf/rlc: Change the code and generate the entire state in the V_B
2013-11-24 16:20:35 +00:00
}
show_v_b[i] = '\0';
}
rlc: Test the basic of the gprs_rlc_v_n code for remembering the state
2013-11-24 21:00:43 +00:00
void gprs_rlc_v_n::reset()
{
rlc: Use an enum for the state array instead of chars gprs_rlc_bsn_state is now used to hold the ACK state of sent/received rlc packets.
2013-12-28 20:16:13 +00:00
for (size_t i = 0; i < ARRAY_SIZE(m_v_n); ++i)
m_v_n[i] = GPRS_RLC_UL_BSN_INVALID;
rlc: Test the basic of the gprs_rlc_v_n code for remembering the state
2013-11-24 21:00:43 +00:00
}
rlc/tbf: Move the code to raise V(R) into the ul_window handling
2013-11-25 22:26:06 +00:00
rlc: Add unified gprs_rlc_window parent class Currently gprs_rlc_ul_window and gprs_rlc_dl_window are completely separate classes, containing several identical members and methods. This commit add a shared parent class containing WS and SNS handling. Sponsored-by: On-Waves ehf
2016-01-19 13:07:33 +00:00
void gprs_rlc_window::set_sns(uint16_t sns)
rlc: Make WS and SNS variable Currently the values for WS and SNS are fixed to 64 (WS) and 128 (SNS) which are the only values that can be used with GPRS. On the other hand, EGPRS requires an SNS of 2014 and a WS in the range of 64 to 1024. This commit adds member variables and setters to both window classes. By default, the GPRS values are being used. Sponsored-by: On-Waves ehf
2015-12-28 12:51:44 +00:00
{
OSMO_ASSERT(sns >= RLC_GPRS_SNS);
OSMO_ASSERT(sns <= RLC_MAX_SNS);
/* check for 2^n */
OSMO_ASSERT((sns & (-sns)) == sns);
m_sns = sns;
}
rlc: Add unified gprs_rlc_window parent class Currently gprs_rlc_ul_window and gprs_rlc_dl_window are completely separate classes, containing several identical members and methods. This commit add a shared parent class containing WS and SNS handling. Sponsored-by: On-Waves ehf
2016-01-19 13:07:33 +00:00
void gprs_rlc_window::set_ws(uint16_t ws)
rlc: Make WS and SNS variable Currently the values for WS and SNS are fixed to 64 (WS) and 128 (SNS) which are the only values that can be used with GPRS. On the other hand, EGPRS requires an SNS of 2014 and a WS in the range of 64 to 1024. This commit adds member variables and setters to both window classes. By default, the GPRS values are being used. Sponsored-by: On-Waves ehf
2015-12-28 12:51:44 +00:00
{
Add compression support in EGPRS PUAN This adds compression of bitmap in PUAN. The compressed bitmap is used only if the number of bits in the bitmap does not fit in the message and there is a gain after compression. The algorithm is part of libosmocore and so there is dependency on the libosmocore for compilation. The algorithm is tested on integration setup by forcing compression. Change-Id: Id2eec4b5eb6da0ebd24054b541b09b700b9b40ba
2017-01-16 10:11:21 +00:00
LOGP(DRLCMAC, LOGL_INFO, "ws(%d)\n",
ws);
rlc: Make WS and SNS variable Currently the values for WS and SNS are fixed to 64 (WS) and 128 (SNS) which are the only values that can be used with GPRS. On the other hand, EGPRS requires an SNS of 2014 and a WS in the range of 64 to 1024. This commit adds member variables and setters to both window classes. By default, the GPRS values are being used. Sponsored-by: On-Waves ehf
2015-12-28 12:51:44 +00:00
OSMO_ASSERT(ws >= RLC_GPRS_SNS/2);
OSMO_ASSERT(ws <= RLC_MAX_SNS/2);
m_ws = ws;
}
rlc: Manage the received block bitmap in the ul_window Added two methods to gprs_rlc_ul_window * ssn() returns the starting sequence number * update_rbb() returns an array of chars representing the state of the received block bitmap. Each element is either 'I'nvalid or 'R'eceived. The rbb is generated from v_n rbb[63] relates to BSN ssn-1 ... rbb[0] relates to BSN ssn-64
2013-11-27 16:08:35 +00:00
/* Update the receive block bitmap */
rlc/tbf: Move v_n into gprs_rlc_ul_window and adapt the tests v_n is part of the UL window handling so move it inside the ul_window
2013-12-28 12:59:24 +00:00
void gprs_rlc_ul_window::update_rbb(char *rbb)
rlc: Manage the received block bitmap in the ul_window Added two methods to gprs_rlc_ul_window * ssn() returns the starting sequence number * update_rbb() returns an array of chars representing the state of the received block bitmap. Each element is either 'I'nvalid or 'R'eceived. The rbb is generated from v_n rbb[63] relates to BSN ssn-1 ... rbb[0] relates to BSN ssn-64
2013-11-27 16:08:35 +00:00
{
int i;
for (i=0; i < ws(); i++) {
Fix GPRS PUAN encoding: wrong BSN status Earlier there was an incorrect encoding of BSN status in GPRS PUAN message. This was a bottle neck for GPRS performance testing for UL. Which has been fixed in this patch. Related: OS#1806 Change-Id: I98e586aa5cb9200cf03e092556304211d4d459aa
2016-08-30 07:38:28 +00:00
if (m_v_n.is_received((ssn()-1-i) & mod_sns()))
rlc: Manage the received block bitmap in the ul_window Added two methods to gprs_rlc_ul_window * ssn() returns the starting sequence number * update_rbb() returns an array of chars representing the state of the received block bitmap. Each element is either 'I'nvalid or 'R'eceived. The rbb is generated from v_n rbb[63] relates to BSN ssn-1 ... rbb[0] relates to BSN ssn-64
2013-11-27 16:08:35 +00:00
rbb[ws()-1-i] = 'R';
else
rbb[ws()-1-i] = 'I';
}
}
rlc/tbf: Move the code to raise V(R) into the ul_window handling
2013-11-25 22:26:06 +00:00
/* Raise V(R) to highest received sequence number not received. */
rlc/tbf: Move v_n into gprs_rlc_ul_window and adapt the tests v_n is part of the UL window handling so move it inside the ul_window
2013-12-28 12:59:24 +00:00
void gprs_rlc_ul_window::raise_v_r(const uint16_t bsn)
rlc/tbf: Move the code to raise V(R) into the ul_window handling
2013-11-25 22:26:06 +00:00
{
uint16_t offset_v_r;
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
offset_v_r = mod_sns(bsn + 1 - v_r());
rlc/tbf: Move the code to raise V(R) into the ul_window handling
2013-11-25 22:26:06 +00:00
/* Positive offset, so raise. */
if (offset_v_r < (sns() >> 1)) {
while (offset_v_r--) {
if (offset_v_r) /* all except the received block */
rlc/tbf: Move v_n into gprs_rlc_ul_window and adapt the tests v_n is part of the UL window handling so move it inside the ul_window
2013-12-28 12:59:24 +00:00
m_v_n.mark_missing(v_r());
rlc: Rename the simple raise_v_r method to avoid naming conflicts
2013-12-28 12:57:31 +00:00
raise_v_r_to(1);
rlc/tbf: Move the code to raise V(R) into the ul_window handling
2013-11-25 22:26:06 +00:00
}
LOGP(DRLCMACUL, LOGL_DEBUG, "- Raising V(R) to %d\n", v_r());
}
}
tbf/rlc: Move raising of V(Q) into the ul window code
2013-11-25 22:51:19 +00:00
/*
* Raise V(Q) if possible. This is looped until there is a gap
* (non received block) or the window is empty.
*/
rlc/tbf: Move v_n into gprs_rlc_ul_window and adapt the tests v_n is part of the UL window handling so move it inside the ul_window
2013-12-28 12:59:24 +00:00
uint16_t gprs_rlc_ul_window::raise_v_q()
tbf/rlc: Move raising of V(Q) into the ul window code
2013-11-25 22:51:19 +00:00
{
uint16_t count = 0;
while (v_q() != v_r()) {
rlc/tbf: Move v_n into gprs_rlc_ul_window and adapt the tests v_n is part of the UL window handling so move it inside the ul_window
2013-12-28 12:59:24 +00:00
if (!m_v_n.is_received(v_q()))
tbf/rlc: Move raising of V(Q) into the ul window code
2013-11-25 22:51:19 +00:00
break;
LOGP(DRLCMACUL, LOGL_DEBUG, "- Taking block %d out, raising "
rlc: Add and use mod_sns(bsn) method Currently there is only a mod_sns() method which is being used in expression like bsn_expr & win.mod_sns(). This only works, because it is known that mod_sns() is (sns() - 1) where sns() in turn is always 2^n. This is error prone, hard to read, and relies on window specifics that should be kept inside the respective module. This commit adds a mod_sns(uint bsn) method to gprs_rlc_ul_window and gprs_rlc_dl_window, that encapsulates and hides this optimized computation. Sponsored-by: On-Waves ehf
2015-12-23 15:29:07 +00:00
"V(Q) to %d\n", v_q(), mod_sns(v_q() + 1));
tbf/rlc: Move raising of V(Q) into the ul window code
2013-11-25 22:51:19 +00:00
raise_v_q(1);
count += 1;
}
return count;
}
rlc/tbf: Add function receive_bsn that updates v_r, v_q, v_n We don't need to expose the mecanics of updating the variables to the outside.
2013-12-28 13:41:00 +00:00
rlc: Do not raise_v_q in receive_bsn Currently gprs_rlc_ul_window::receive_bsn calls raise_v_q and returns the number of RLC data blocks that can be taken from the queue. This does not fit the EGPRS feature to put 2 independant data blocks in a single RLC block. This commit removes raise_v_q from receive_bsn, hence it must be called explicitely to get the number of processable data blocks. Sponsored-by: On-Waves ehf
2015-12-14 10:43:04 +00:00
void gprs_rlc_ul_window::receive_bsn(const uint16_t bsn)
rlc/tbf: Add function receive_bsn that updates v_r, v_q, v_n We don't need to expose the mecanics of updating the variables to the outside.
2013-12-28 13:41:00 +00:00
{
m_v_n.mark_received(bsn);
raise_v_r(bsn);
edge: Add is_received and invalidate_bsn to gprs_rlc_ul_window These methods will be needed for EGPRS decoding. The is_received method returns true iff a block with the given BSN has already been received in the current window. A call to invalidate_bsn marks the block as not received. Sponsored-by: On-Waves ehf
2015-12-14 10:54:29 +00:00
}
bool gprs_rlc_ul_window::invalidate_bsn(const uint16_t bsn)
{
bool was_valid = m_v_n.is_received(bsn);
m_v_n.mark_missing(bsn);
rlc/tbf: Add function receive_bsn that updates v_r, v_q, v_n We don't need to expose the mecanics of updating the variables to the outside.
2013-12-28 13:41:00 +00:00
edge: Add is_received and invalidate_bsn to gprs_rlc_ul_window These methods will be needed for EGPRS decoding. The is_received method returns true iff a block with the given BSN has already been received in the current window. A call to invalidate_bsn marks the block as not received. Sponsored-by: On-Waves ehf
2015-12-14 10:54:29 +00:00
return was_valid;
rlc/tbf: Add function receive_bsn that updates v_r, v_q, v_n We don't need to expose the mecanics of updating the variables to the outside.
2013-12-28 13:41:00 +00:00
}
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
static void gprs_rlc_data_header_init(struct gprs_rlc_data_info *rlc,
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
enum CodingScheme cs, bool with_padding, unsigned int header_bits,
Modify EGPRS DL TBF flow to support SPB Modify the EGPRS DL TBF flow to support Split block during Retx. This patch will also Upgrade the test suite with test cases to validate the EGPRS Downlink SPB for Retransmission Scenarios like MCS6->MCS3, MCS4->MCS1, MCS5->MCS2, MCS9->MCS3 MCS7->MCS2, MCS8->MCS3 have been simulated and Integration tested in NuRAN 1.0 hardware thoroughly. Change-Id: I242afdd8ae7622dec8593b26382ad66bad5b9516
2016-08-22 11:51:10 +00:00
const unsigned int spb)
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
{
unsigned int i;
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
unsigned int padding_bits = with_padding ? mcs_opt_padding_bits(cs) : 0;
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
rlc->cs = cs;
rlc: Fix memset(0) on object with no trivial copy-assignment As warned by gcc 8.1.0, the cs field is a class (GprsCodingScheme) and should not be memset. Change-Id: Id742f82aa856e696b5fb414991dfd0883d0ac7fe
2018-05-16 13:22:20 +00:00
rlc->r = 0;
rlc->si = 0;
rlc->tfi = 0;
rlc->cps = 0;
rlc->rsb = 0;
rlc->usf = 0;
rlc->es_p = 0;
rlc->rrbp = 0;
rlc->pr = 0;
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
rlc->num_data_blocks = num_data_blocks(mcs_header_type(cs));
rlc: Fix memset(0) on object with no trivial copy-assignment As warned by gcc 8.1.0, the cs field is a class (GprsCodingScheme) and should not be memset. Change-Id: Id742f82aa856e696b5fb414991dfd0883d0ac7fe
2018-05-16 13:22:20 +00:00
rlc->with_padding = with_padding;
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
OSMO_ASSERT(rlc->num_data_blocks <= ARRAY_SIZE(rlc->block_info));
for (i = 0; i < rlc->num_data_blocks; i++) {
rlc: Add with_padding argument to gprs_rlc_data_info_init_dl/ul The offsets of the data areas change when padding is used (see TS 44.060, 9.3.2.1 and Annex J for details). Extend the parameter lists to pass the with_padding flag and use that information to compute the correct offsets. Sponsored-by: On-Waves ehf
2016-02-03 17:28:04 +00:00
gprs_rlc_data_block_info_init(&rlc->block_info[i], cs,
Modify EGPRS DL TBF flow to support SPB Modify the EGPRS DL TBF flow to support Split block during Retx. This patch will also Upgrade the test suite with test cases to validate the EGPRS Downlink SPB for Retransmission Scenarios like MCS6->MCS3, MCS4->MCS1, MCS5->MCS2, MCS9->MCS3 MCS7->MCS2, MCS8->MCS3 have been simulated and Integration tested in NuRAN 1.0 hardware thoroughly. Change-Id: I242afdd8ae7622dec8593b26382ad66bad5b9516
2016-08-22 11:51:10 +00:00
with_padding, spb);
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
rlc->data_offs_bits[i] =
rlc: Add with_padding argument to gprs_rlc_data_info_init_dl/ul The offsets of the data areas change when padding is used (see TS 44.060, 9.3.2.1 and Annex J for details). Extend the parameter lists to pass the with_padding flag and use that information to compute the correct offsets. Sponsored-by: On-Waves ehf
2016-02-03 17:28:04 +00:00
header_bits + padding_bits +
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
(i+1) * num_data_block_header_bits(mcs_header_type(cs)) +
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
i * 8 * rlc->block_info[0].data_len;
}
}
void gprs_rlc_data_info_init_dl(struct gprs_rlc_data_info *rlc,
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
enum CodingScheme cs, bool with_padding, const unsigned int spb)
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
{
Fix mcs_is_valid(): UNKNOWN value is not a valid (M)CS Also add a few more asserts to make sure a valid CS/MCS is passed in some placed where we expect (M)CS to be set. Change-Id: I0a973e10cd9477f72d8bd47a06048414b33ae96a
2020-11-04 16:53:07 +00:00
OSMO_ASSERT(mcs_is_valid(cs));
rlc: Add with_padding argument to gprs_rlc_data_info_init_dl/ul The offsets of the data areas change when padding is used (see TS 44.060, 9.3.2.1 and Annex J for details). Extend the parameter lists to pass the with_padding flag and use that information to compute the correct offsets. Sponsored-by: On-Waves ehf
2016-02-03 17:28:04 +00:00
return gprs_rlc_data_header_init(rlc, cs, with_padding,
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
num_data_header_bits_DL(mcs_header_type(cs)), spb);
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
}
void gprs_rlc_data_info_init_ul(struct gprs_rlc_data_info *rlc,
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
enum CodingScheme cs, bool with_padding)
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
{
Fix mcs_is_valid(): UNKNOWN value is not a valid (M)CS Also add a few more asserts to make sure a valid CS/MCS is passed in some placed where we expect (M)CS to be set. Change-Id: I0a973e10cd9477f72d8bd47a06048414b33ae96a
2020-11-04 16:53:07 +00:00
OSMO_ASSERT(mcs_is_valid(cs));
Modify EGPRS DL TBF flow to support SPB Modify the EGPRS DL TBF flow to support Split block during Retx. This patch will also Upgrade the test suite with test cases to validate the EGPRS Downlink SPB for Retransmission Scenarios like MCS6->MCS3, MCS4->MCS1, MCS5->MCS2, MCS9->MCS3 MCS7->MCS2, MCS8->MCS3 have been simulated and Integration tested in NuRAN 1.0 hardware thoroughly. Change-Id: I242afdd8ae7622dec8593b26382ad66bad5b9516
2016-08-22 11:51:10 +00:00
/*
* last parameter is sent as 0 since common function used
* for both DL and UL
*/
rlc: Add with_padding argument to gprs_rlc_data_info_init_dl/ul The offsets of the data areas change when padding is used (see TS 44.060, 9.3.2.1 and Annex J for details). Extend the parameter lists to pass the with_padding flag and use that information to compute the correct offsets. Sponsored-by: On-Waves ehf
2016-02-03 17:28:04 +00:00
return gprs_rlc_data_header_init(rlc, cs, with_padding,
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
num_data_header_bits_UL(mcs_header_type(cs)), 0);
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
}
void gprs_rlc_data_block_info_init(struct gprs_rlc_data_block_info *rdbi,
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
enum CodingScheme cs, bool with_padding, const unsigned int spb)
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
{
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
unsigned int data_len = mcs_max_data_block_bytes(cs);
rlc: Add with_padding argument to gprs_rlc_data_info_init_dl/ul The offsets of the data areas change when padding is used (see TS 44.060, 9.3.2.1 and Annex J for details). Extend the parameter lists to pass the with_padding flag and use that information to compute the correct offsets. Sponsored-by: On-Waves ehf
2016-02-03 17:28:04 +00:00
if (with_padding)
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
data_len -= mcs_opt_padding_bits(cs) / 8;
rlc: Add with_padding argument to gprs_rlc_data_info_init_dl/ul The offsets of the data areas change when padding is used (see TS 44.060, 9.3.2.1 and Annex J for details). Extend the parameter lists to pass the with_padding flag and use that information to compute the correct offsets. Sponsored-by: On-Waves ehf
2016-02-03 17:28:04 +00:00
rdbi->data_len = data_len;
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
rdbi->bsn = 0;
rdbi->ti = 0;
rdbi->e = 1;
rdbi->cv = 15;
rdbi->pi = 0;
Modify EGPRS DL TBF flow to support SPB Modify the EGPRS DL TBF flow to support Split block during Retx. This patch will also Upgrade the test suite with test cases to validate the EGPRS Downlink SPB for Retransmission Scenarios like MCS6->MCS3, MCS4->MCS1, MCS5->MCS2, MCS9->MCS3 MCS7->MCS2, MCS8->MCS3 have been simulated and Integration tested in NuRAN 1.0 hardware thoroughly. Change-Id: I242afdd8ae7622dec8593b26382ad66bad5b9516
2016-08-22 11:51:10 +00:00
rdbi->spb = spb;
edge: Add init functions for gprs_rlc_data_info Add the functions gprs_rlc_data_info_init_dl/ul which initialise a gprs_rlc_data_info structure depending on the coding scheme. The fields num_data_blocks, data_offs_bits, cs, and the data_blocks are valid after this call. The other fields are set to 0. The data blocks are initialised to the correct data_len, e == 1 (no extension header field), cv == 15 (not a final block). The other data block fields are set to 0. The gprs_rlc_data_block_info can also be initialised separately by using the gprs_rlc_data_block_info_init function. Sponsored-by: On-Waves ehf
2016-01-11 10:15:45 +00:00
}
edge: Provide and use CS -> CPS conversion The MS' RLC receiver needs a valid CPS field to decode the block. Add the function gprs_rlc_mcs_cps to generate the CPS value based on coding scheme, puncturing, and padding. Sponsored-by: On-Waves ehf
2016-01-13 12:09:09 +00:00
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
unsigned int gprs_rlc_mcs_cps(enum CodingScheme cs,
Update CPS calculation with new data structures Update existing CPS calculation function to align with new data structure introduced
2016-03-23 12:59:46 +00:00
enum egprs_puncturing_values punct,
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
2017-12-21 11:11:33 +00:00
enum egprs_puncturing_values punct2, bool with_padding)
edge: Provide and use CS -> CPS conversion The MS' RLC receiver needs a valid CPS field to decode the block. Add the function gprs_rlc_mcs_cps to generate the CPS value based on coding scheme, puncturing, and padding. Sponsored-by: On-Waves ehf
2016-01-13 12:09:09 +00:00
{
dl tbf: initialize punct values and verify Solves a sanitizer issue where punct2 is unset when passed to gprs_rlc_mcs_cps() and thus takes a value not defined in the enum. Change-Id: I004cbbab15e6ffa2749f4b7f1df651517c2ae693
2017-02-08 15:49:20 +00:00
/* validate that punct and punct2 are as expected */
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
switch (cs) {
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS9:
case MCS8:
case MCS7:
dl tbf: initialize punct values and verify Solves a sanitizer issue where punct2 is unset when passed to gprs_rlc_mcs_cps() and thus takes a value not defined in the enum. Change-Id: I004cbbab15e6ffa2749f4b7f1df651517c2ae693
2017-02-08 15:49:20 +00:00
if (punct2 == EGPRS_PS_INVALID) {
LOGP(DRLCMACDL, LOGL_ERROR,
"Invalid punct2 value for coding scheme %d: %d\n",
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
cs, punct2);
dl tbf: initialize punct values and verify Solves a sanitizer issue where punct2 is unset when passed to gprs_rlc_mcs_cps() and thus takes a value not defined in the enum. Change-Id: I004cbbab15e6ffa2749f4b7f1df651517c2ae693
2017-02-08 15:49:20 +00:00
return -1;
}
/* fall through */
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS6:
case MCS5:
case MCS4:
case MCS3:
case MCS2:
case MCS1:
dl tbf: initialize punct values and verify Solves a sanitizer issue where punct2 is unset when passed to gprs_rlc_mcs_cps() and thus takes a value not defined in the enum. Change-Id: I004cbbab15e6ffa2749f4b7f1df651517c2ae693
2017-02-08 15:49:20 +00:00
if (punct == EGPRS_PS_INVALID) {
LOGP(DRLCMACDL, LOGL_ERROR,
"Invalid punct value for coding scheme %d: %d\n",
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
cs, punct);
dl tbf: initialize punct values and verify Solves a sanitizer issue where punct2 is unset when passed to gprs_rlc_mcs_cps() and thus takes a value not defined in the enum. Change-Id: I004cbbab15e6ffa2749f4b7f1df651517c2ae693
2017-02-08 15:49:20 +00:00
return -1;
}
break;
default:
return -1;
}
/* See 3GPP TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1 */
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
switch (cs) {
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS1: return 0b1011 +
Update CPS calculation with new data structures Update existing CPS calculation function to align with new data structure introduced
2016-03-23 12:59:46 +00:00
punct % EGPRS_MAX_PS_NUM_2;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS2: return 0b1001 +
Update CPS calculation with new data structures Update existing CPS calculation function to align with new data structure introduced
2016-03-23 12:59:46 +00:00
punct % EGPRS_MAX_PS_NUM_2;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS3: return (with_padding ? 0b0110 : 0b0011) +
Update CPS calculation with new data structures Update existing CPS calculation function to align with new data structure introduced
2016-03-23 12:59:46 +00:00
punct % EGPRS_MAX_PS_NUM_3;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS4: return 0b0000 +
Update CPS calculation with new data structures Update existing CPS calculation function to align with new data structure introduced
2016-03-23 12:59:46 +00:00
punct % EGPRS_MAX_PS_NUM_3;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS5: return 0b100 +
Update CPS calculation with new data structures Update existing CPS calculation function to align with new data structure introduced
2016-03-23 12:59:46 +00:00
punct % EGPRS_MAX_PS_NUM_2;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS6: return (with_padding ? 0b010 : 0b000) +
Update CPS calculation with new data structures Update existing CPS calculation function to align with new data structure introduced
2016-03-23 12:59:46 +00:00
punct % EGPRS_MAX_PS_NUM_2;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS7: return 0b10100 +
Update CPS calculation with new data structures Update existing CPS calculation function to align with new data structure introduced
2016-03-23 12:59:46 +00:00
3 * (punct % EGPRS_MAX_PS_NUM_3) +
punct2 % EGPRS_MAX_PS_NUM_3;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS8: return 0b01011 +
Update CPS calculation with new data structures Update existing CPS calculation function to align with new data structure introduced
2016-03-23 12:59:46 +00:00
3 * (punct % EGPRS_MAX_PS_NUM_3) +
punct2 % EGPRS_MAX_PS_NUM_3;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS9: return 0b00000 +
Update CPS calculation with new data structures Update existing CPS calculation function to align with new data structure introduced
2016-03-23 12:59:46 +00:00
4 * (punct % EGPRS_MAX_PS_NUM_3) +
punct2 % EGPRS_MAX_PS_NUM_3;
edge: Provide and use CS -> CPS conversion The MS' RLC receiver needs a valid CPS field to decode the block. Add the function gprs_rlc_mcs_cps to generate the CPS value based on coding scheme, puncturing, and padding. Sponsored-by: On-Waves ehf
2016-01-13 12:09:09 +00:00
default: ;
}
return -1;
}
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
void gprs_rlc_mcs_cps_decode(unsigned int cps,
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
enum CodingScheme cs, int *punct, int *punct2, int *with_padding)
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
{
*punct2 = -1;
*with_padding = 0;
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
switch (cs) {
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS1:
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
cps -= 0b1011; *punct = cps % 2; break;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS2:
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
cps -= 0b1001; *punct = cps % 2; break;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS3:
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
cps -= 0b0011; *punct = cps % 3; *with_padding = cps >= 3; break;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS4:
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
cps -= 0b0000; *punct = cps % 3; break;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS5:
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
cps -= 0b100; *punct = cps % 2; break;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS6:
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
cps -= 0b000; *punct = cps % 2; *with_padding = cps >= 2; break;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS7:
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
cps -= 0b10100; *punct = cps / 3; *punct2 = cps % 3; break;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS8:
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
cps -= 0b01011; *punct = cps / 3; *punct2 = cps % 3; break;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS9:
rlc: Add gprs_rlc_mcs_cps_decode To access EGPRS data blocks, the optional padding must be taken into account. Whether padding has been used must be dervied from the CPS field in the header of the RLC EGPRS data message. Add this function to decode the CPS value and extract that information. Sponsored-by: On-Waves ehf
2016-02-03 17:31:19 +00:00
cps -= 0b00000; *punct = cps / 4; *punct2 = cps % 3; break;
default: ;
}
}
Support puncturing scheme selection for EGPRS DL Adds support to find the puncturing scheme for retransmission with MCS change, retransmission with no MCS change, transmission case. Puncturing scheme selection for retransmission case with MCS change is aligned with TS 44.060 9.3.2.1. Puncturing scheme selection for retransmission without MCS change, fresh transmission is aligned with TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
2016-03-23 12:59:47 +00:00
/*
* Finds the PS value for retransmission with MCS change,
* retransmission with no MCS change, fresh transmission cases.
* The return value shall be used for current transmission only
* 44.060 9.3.2.1 defines the PS selection for MCS change case
* cs_current is the output of MCS selection algorithm for retx
* cs is coding scheme of previous transmission of RLC data block
*/
enum egprs_puncturing_values gprs_get_punct_scheme(
enum egprs_puncturing_values punct,
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
const enum CodingScheme &cs,
const enum CodingScheme &cs_current,
Modify EGPRS DL TBF flow to support SPB Modify the EGPRS DL TBF flow to support Split block during Retx. This patch will also Upgrade the test suite with test cases to validate the EGPRS Downlink SPB for Retransmission Scenarios like MCS6->MCS3, MCS4->MCS1, MCS5->MCS2, MCS9->MCS3 MCS7->MCS2, MCS8->MCS3 have been simulated and Integration tested in NuRAN 1.0 hardware thoroughly. Change-Id: I242afdd8ae7622dec8593b26382ad66bad5b9516
2016-08-22 11:51:10 +00:00
const enum egprs_rlcmac_dl_spb spb)
Support puncturing scheme selection for EGPRS DL Adds support to find the puncturing scheme for retransmission with MCS change, retransmission with no MCS change, transmission case. Puncturing scheme selection for retransmission case with MCS change is aligned with TS 44.060 9.3.2.1. Puncturing scheme selection for retransmission without MCS change, fresh transmission is aligned with TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
2016-03-23 12:59:47 +00:00
{
Modify EGPRS DL TBF flow to support SPB Modify the EGPRS DL TBF flow to support Split block during Retx. This patch will also Upgrade the test suite with test cases to validate the EGPRS Downlink SPB for Retransmission Scenarios like MCS6->MCS3, MCS4->MCS1, MCS5->MCS2, MCS9->MCS3 MCS7->MCS2, MCS8->MCS3 have been simulated and Integration tested in NuRAN 1.0 hardware thoroughly. Change-Id: I242afdd8ae7622dec8593b26382ad66bad5b9516
2016-08-22 11:51:10 +00:00
/*
* 10.4.8b of TS 44.060
* If it is second segment of the block
* dont change the puncturing scheme
*/
if (spb == EGPRS_RLCMAC_DL_SEC_SEG)
return punct;
Support puncturing scheme selection for EGPRS DL Adds support to find the puncturing scheme for retransmission with MCS change, retransmission with no MCS change, transmission case. Puncturing scheme selection for retransmission case with MCS change is aligned with TS 44.060 9.3.2.1. Puncturing scheme selection for retransmission without MCS change, fresh transmission is aligned with TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
2016-03-23 12:59:47 +00:00
/* TS 44.060 9.3.2.1.1 */
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
if ((cs == MCS9) &&
(cs_current == MCS6)) {
Support puncturing scheme selection for EGPRS DL Adds support to find the puncturing scheme for retransmission with MCS change, retransmission with no MCS change, transmission case. Puncturing scheme selection for retransmission case with MCS change is aligned with TS 44.060 9.3.2.1. Puncturing scheme selection for retransmission without MCS change, fresh transmission is aligned with TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
2016-03-23 12:59:47 +00:00
if ((punct == EGPRS_PS_1) || (punct == EGPRS_PS_3))
return EGPRS_PS_1;
else if (punct == EGPRS_PS_2)
return EGPRS_PS_2;
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
} else if ((cs == MCS6) &&
(cs_current == MCS9)) {
Support puncturing scheme selection for EGPRS DL Adds support to find the puncturing scheme for retransmission with MCS change, retransmission with no MCS change, transmission case. Puncturing scheme selection for retransmission case with MCS change is aligned with TS 44.060 9.3.2.1. Puncturing scheme selection for retransmission without MCS change, fresh transmission is aligned with TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
2016-03-23 12:59:47 +00:00
if (punct == EGPRS_PS_1)
return EGPRS_PS_3;
else if (punct == EGPRS_PS_2)
return EGPRS_PS_2;
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
} else if ((cs == MCS7) &&
(cs_current == MCS5))
Support puncturing scheme selection for EGPRS DL Adds support to find the puncturing scheme for retransmission with MCS change, retransmission with no MCS change, transmission case. Puncturing scheme selection for retransmission case with MCS change is aligned with TS 44.060 9.3.2.1. Puncturing scheme selection for retransmission without MCS change, fresh transmission is aligned with TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
2016-03-23 12:59:47 +00:00
return EGPRS_PS_1;
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
else if ((cs == MCS5) &&
(cs_current == MCS7))
Support puncturing scheme selection for EGPRS DL Adds support to find the puncturing scheme for retransmission with MCS change, retransmission with no MCS change, transmission case. Puncturing scheme selection for retransmission case with MCS change is aligned with TS 44.060 9.3.2.1. Puncturing scheme selection for retransmission without MCS change, fresh transmission is aligned with TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
2016-03-23 12:59:47 +00:00
return EGPRS_PS_2;
else if (cs != cs_current)
return EGPRS_PS_1;
/* TS 44.060 9.3.2.1.1 ends here */
/*
* Below else will handle fresh transmission, retransmission with no
* MCS change case
*/
else
return punct;
return EGPRS_PS_INVALID;
}
/*
* This function calculates puncturing scheme for retransmission of a RLC
* block with same MCS. The computed value shall be used for next transmission
* of the same RLC block
* TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
*/
void gprs_update_punct_scheme(enum egprs_puncturing_values *punct,
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
const enum CodingScheme &cs)
Support puncturing scheme selection for EGPRS DL Adds support to find the puncturing scheme for retransmission with MCS change, retransmission with no MCS change, transmission case. Puncturing scheme selection for retransmission case with MCS change is aligned with TS 44.060 9.3.2.1. Puncturing scheme selection for retransmission without MCS change, fresh transmission is aligned with TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
2016-03-23 12:59:47 +00:00
{
Get rid of class GprsCodingScheme We have same kind of object splitted into two layers, in coding_scheme and gprs_coding_scheme. Let's merge them together and get rid of the class, which is not really useful because it's only a set of functions operating on one enum value. This change also fixes gcc 10.1.0 error about memseting a complex type in rlc.h init(). Change-Id: Ie9ce2144ba9e8dbba9704d4e0000a2929e3e41df
2020-05-18 09:35:35 +00:00
switch (cs) {
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS1 :
case MCS2 :
case MCS5 :
case MCS6 :
Support puncturing scheme selection for EGPRS DL Adds support to find the puncturing scheme for retransmission with MCS change, retransmission with no MCS change, transmission case. Puncturing scheme selection for retransmission case with MCS change is aligned with TS 44.060 9.3.2.1. Puncturing scheme selection for retransmission without MCS change, fresh transmission is aligned with TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
2016-03-23 12:59:47 +00:00
*punct = ((enum egprs_puncturing_values)((*punct + 1) %
EGPRS_MAX_PS_NUM_2));
break;
MCS: move Coding Scheme enum outside of class definition Move generic MCS enum to C header file to simplify further modifications to GprsCodingScheme class in follow-up patches. This also allows us to use standard libosmocore value_sting functions in upcoming patches for IA Rest Octet encoding/decoding. Related: OS#3014 Change-Id: I993b49d9a82b8c7ad677d52d11003794aeabe117
2019-03-06 16:04:59 +00:00
case MCS3 :
case MCS4 :
case MCS7 :
case MCS8 :
case MCS9 :
Support puncturing scheme selection for EGPRS DL Adds support to find the puncturing scheme for retransmission with MCS change, retransmission with no MCS change, transmission case. Puncturing scheme selection for retransmission case with MCS change is aligned with TS 44.060 9.3.2.1. Puncturing scheme selection for retransmission without MCS change, fresh transmission is aligned with TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1
2016-03-23 12:59:47 +00:00
*punct = ((enum egprs_puncturing_values)((*punct + 1) %
EGPRS_MAX_PS_NUM_3));
break;
default:
break;
}
}