pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33230 )

Change subject: rlcmac: l1ctl_prim: add 'start_rfn' field to cfg_{ul,dl}_tbf_req ......................................................................

rlcmac: l1ctl_prim: add 'start_rfn' field to cfg_{ul,dl}_tbf_req

Change-Id: I27a7a896fe3839fa4f9b8cd9500c4ab7867bbaa0 Related: OS#5500 --- M include/osmocom/gprs/rlcmac/rlcmac_prim.h M src/rlcmac/rlcmac_prim.c 2 files changed, 14 insertions(+), 0 deletions(-)

Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved

diff --git a/include/osmocom/gprs/rlcmac/rlcmac_prim.h b/include/osmocom/gprs/rlcmac/rlcmac_prim.h index acb0d75..d6f733e 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac_prim.h +++ b/include/osmocom/gprs/rlcmac/rlcmac_prim.h @@ -169,12 +169,14 @@ struct { uint8_t ul_tbf_nr; uint8_t ul_slotmask; + uint32_t start_fn; /* TBF starting time (absolute Fn), UINT32_MAX = Invalid */ uint8_t ul_usf[8]; /* USF for each PDCH indicated in the slotmask */ } cfg_ul_tbf_req; /* OSMO_GPRS_RLCMAC_L1CTL_CFG_DL_TBF | Req */ struct { uint8_t dl_tbf_nr; uint8_t dl_slotmask; + uint32_t start_fn; /* TBF starting time (absolute Fn), UINT32_MAX = Invalid */ uint8_t dl_tfi; /* DL TFI for all PDCHs indicated in the slotmask */ } cfg_dl_tbf_req; /* OSMO_GPRS_RLCMAC_L1CTL_PDCH_ESTABLISH | Req */ diff --git a/src/rlcmac/rlcmac_prim.c b/src/rlcmac/rlcmac_prim.c index 1ce7c9e..0e73ecd 100644 --- a/src/rlcmac/rlcmac_prim.c +++ b/src/rlcmac/rlcmac_prim.c @@ -314,6 +314,7 @@ rlcmac_prim = rlcmac_prim_l1ctl_alloc(OSMO_GPRS_RLCMAC_L1CTL_CFG_DL_TBF, PRIM_OP_REQUEST, 0); rlcmac_prim->l1ctl.cfg_dl_tbf_req.dl_tbf_nr = tbf_nr; rlcmac_prim->l1ctl.cfg_dl_tbf_req.dl_slotmask = slotmask; + rlcmac_prim->l1ctl.cfg_dl_tbf_req.start_fn = UINT32_MAX; /* invalid */ rlcmac_prim->l1ctl.cfg_dl_tbf_req.dl_tfi = dl_tfi; return rlcmac_prim; } @@ -325,6 +326,7 @@ rlcmac_prim = rlcmac_prim_l1ctl_alloc(OSMO_GPRS_RLCMAC_L1CTL_CFG_UL_TBF, PRIM_OP_REQUEST, 0); rlcmac_prim->l1ctl.cfg_ul_tbf_req.ul_tbf_nr = ul_tbf_nr; rlcmac_prim->l1ctl.cfg_ul_tbf_req.ul_slotmask = ul_slotmask; + rlcmac_prim->l1ctl.cfg_ul_tbf_req.start_fn = UINT32_MAX; /* invalid */ return rlcmac_prim; }