December 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-bsc[osmith/1.11.1]: Bump version: 1.11.0.3-240b2 → 1.11.1

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email ) Change subject: Bump version: 1.11.0.3-240b2 → 1.11.1 ...................................................................... Bump version: 1.11.0.3-240b2 → 1.11.1 Change-Id: Ifd79073966bd945ce8c330b5dd94f5406b887bc7 --- M debian/changelog 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve dexter: Looks good to me, approved; Verified fixeria: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index d8b5b2e..8bf0362 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-bsc (1.11.1) unstable; urgency=medium + + [ Philipp Maier ] + * pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY + * pcuif_proto: clean up last remains of old PCUIF v10 + * pcuif_proto: signal BTS model via PCUIF + + -- Oliver Smith <osmith(a)sysmocom.de> Tue, 12 Dec 2023 16:53:00 +0100 + osmo-bsc (1.11.0) unstable; urgency=medium [ Max ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Ifd79073966bd945ce8c330b5dd94f5406b887bc7 Gerrit-Change-Number: 35342 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in osmo-bsc[osmith/1.11.1]: pcuif_proto: signal BTS model via PCUIF

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35341?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF ...................................................................... pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: I4b58912ad7be3070829614853901aa19108ba2c0 (cherry picked from commit 647bc1e698dae798a25cbe757c53f5a1f2d3df3a) --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 39 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index 1133ca6..33036c3 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -8,7 +8,7 @@ #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x0b +#define PCU_IF_VERSION 0x0c #define TXT_MAX_LEN 128 /* msg_type */ @@ -63,6 +63,17 @@ #define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ #define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ +/* BTS model */ +enum gsm_pcuif_bts_model { + PCU_IF_BTS_MODEL_UNSPEC, + PCU_IF_BTS_MODEL_LC15, + PCU_IF_BTS_MODEL_OC2G, + PCU_IF_BTS_MODEL_OCTPHY, + PCU_IF_BTS_MODEL_SYSMO, + PCU_IF_BTS_MODEL_TRX, + PCU_IF_BTS_MODEL_RBS, +}; + #define PCU_IF_NUM_NSVC 2 #define PCU_IF_NUM_TRX 8 @@ -176,6 +187,7 @@ struct in_addr v4; struct in6_addr v6; } remote_ip[PCU_IF_NUM_NSVC]; + uint8_t bts_model; /* enum gsm_pcuif_bts_model */ } __attribute__ ((packed)); /* E1 CCU connection parameters */ diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 24f3c1c..d5fa5b9 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -300,6 +300,14 @@ info_ind_fill_trx(&info_ind->trx[trx->nr], trx); } + switch (bts->type) { + case GSM_BTS_TYPE_RBS2000: + info_ind->bts_model = PCU_IF_BTS_MODEL_RBS; + break; + default: + info_ind->bts_model = PCU_IF_BTS_MODEL_UNSPEC; + } + return pcu_sock_send(bts->network, msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35341?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I4b58912ad7be3070829614853901aa19108ba2c0 Gerrit-Change-Number: 35341 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in osmo-bsc[osmith/1.11.1]: pcuif_proto: clean up last remains of old PCUIF v10

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35340?usp=email ) Change subject: pcuif_proto: clean up last remains of old PCUIF v10 ...................................................................... pcuif_proto: clean up last remains of old PCUIF v10 There are still some remains that are related to the old PCUIF v10 protocol version. Let's clean those up. Related: OS#5927 Depends: osmo-pcu.git I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Change-Id: Iebb3a634fee680bdc3636a61f3ccaa1e97e54a64 (cherry picked from commit 801b55ee4ab57fadafc1e7211bb4b0de3e7668b7) --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 15 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index 9df85d9..1133ca6 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -13,7 +13,6 @@ /* msg_type */ #define PCU_IF_MSG_DATA_REQ 0x00 /* send data to given channel */ -#define PCU_IF_MSG_DATA_CNF 0x01 /* confirm (e.g. transmission on PCH) */ #define PCU_IF_MSG_DATA_IND 0x02 /* receive data from given channel */ #define PCU_IF_MSG_SUSP_REQ 0x03 /* BTS forwards GPRS SUSP REQ to PCU */ #define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to transmit APP INFO via PACCH */ @@ -35,8 +34,6 @@ /* sapi */ #define PCU_IF_SAPI_RACH 0x01 /* channel request on CCCH */ -#define PCU_IF_SAPI_AGCH 0x02 /* assignment on AGCH */ -#define PCU_IF_SAPI_PCH 0x03 /* paging/assignment on PCH */ #define PCU_IF_SAPI_BCCH 0x04 /* SI on BCCH */ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ @@ -297,7 +294,6 @@ union { struct gsm_pcu_if_data data_req; - struct gsm_pcu_if_data data_cnf; struct gsm_pcu_if_data_cnf data_cnf2; struct gsm_pcu_if_data data_ind; struct gsm_pcu_if_susp_req susp_req; diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index d279093..24f3c1c 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -50,8 +50,6 @@ static const char *sapi_string[] = { [PCU_IF_SAPI_RACH] = "RACH", - [PCU_IF_SAPI_AGCH] = "AGCH", - [PCU_IF_SAPI_PCH] = "PCH", [PCU_IF_SAPI_BCCH] = "BCCH", [PCU_IF_SAPI_PDTCH] = "PDTCH", [PCU_IF_SAPI_PRACH] = "PRACH", -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35340?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Iebb3a634fee680bdc3636a61f3ccaa1e97e54a64 Gerrit-Change-Number: 35340 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in osmo-bsc[osmith/1.11.1]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35339?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY ...................................................................... pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY The PCUIF flag PCU_IF_FLAG_SYSMO was originally used by osmo-bts-sysmo to signal to the PCU that the direct PHY access for the sysmo-bts DSP should be enabled. With time, support for other BTS models was added and the flag became a synonym for "direct PHY access", so it makes sense to rename it to "PCU_IF_FLAG_DIRECT_PHY" Related: OS#6191 Depends: osmo-pcu.git I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Change-Id: I23df067df99b76048667131905c4448d32d80640 (cherry picked from commit a3a225a16b4a38a9b0c0d34d095389f495d692a9) --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 20 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index cd2a298..9df85d9 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -46,7 +46,7 @@ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ -#define PCU_IF_FLAG_SYSMO (1 << 1)/* access PDCH of sysmoBTS directly */ +#define PCU_IF_FLAG_DIRECT_PHY (1 << 1)/* access PHY directly via dedicated hardware support */ #define PCU_IF_FLAG_CS1 (1 << 16) #define PCU_IF_FLAG_CS2 (1 << 17) #define PCU_IF_FLAG_CS3 (1 << 18) diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index dc2b8e9..d279093 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -200,7 +200,7 @@ info_ind = &pcu_prim->u.info_ind; info_ind->version = PCU_IF_VERSION; info_ind->flags |= PCU_IF_FLAG_ACTIVE; - info_ind->flags |= PCU_IF_FLAG_SYSMO; + info_ind->flags |= PCU_IF_FLAG_DIRECT_PHY; /* RAI */ info_ind->mcc = bts->network->plmn.mcc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35339?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: I23df067df99b76048667131905c4448d32d80640 Gerrit-Change-Number: 35339 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in osmo-pcu[master]: Bump version: 1.3.1.13-8a4c → 1.4.0

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email ) Change subject: Bump version: 1.3.1.13-8a4c → 1.4.0 ...................................................................... Bump version: 1.3.1.13-8a4c → 1.4.0 Change-Id: I5b4efbffc6cf056a1e6865d077da4c7870a7e375 --- M debian/changelog 1 file changed, 38 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved; Verified fixeria: Looks good to me, but someone else must approve; Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index df278a0..3e50d66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +osmo-pcu (1.4.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * tbf: Log poll timeout reason + + [ Vadim Yanitskiy ] + * pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp() + * bts: bts_tfi_find_free(): fix -Wmaybe-uninitialized (false positive) + + [ Oliver Smith ] + * systemd: remove RestartPreventExitStatus=1 + * Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()" + + [ Philipp Maier ] + * pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY + * pcuif_proto: drop support for PCUIF v10 + * pcu_l1_if: signal BTS model via PCUIF + * gprs_rlcmac_sched: fix condition for generating dummy blocks on idle + * bts: rename struct member gen_idle_blocks to gen_idle_blocks_C0 + + [ Andreas Eversberg ] + * Increase RR scheduler priority to 20, to avoid dropped bursts + * Use uniform log format for default config files + + [ Keith ] + * TBF status: Fix VTY output text + + -- Oliver Smith <osmith(a)sysmocom.de> Tue, 12 Dec 2023 16:58:16 +0100 + osmo-pcu (1.3.1) unstable; urgency=medium * tbf_dl_fsm: Fix assert hit due to EV_MAX_N3105 received in ST_RELEASING -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b4efbffc6cf056a1e6865d077da4c7870a7e375 Gerrit-Change-Number: 35337 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in osmo-pcu[master]: Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()"

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35336?usp=email ) Change subject: Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()" ...................................................................... Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()" In preparation for an 1.4.0 osmo-pcu release that should not require a new libosmocore, revert this patch. This reverts commit a155fe85de9151d26fdfad7a6593a95592ac9770. Change-Id: I714efdc9c9403d3ff74e18df1629e2de6876e9d7 --- M TODO-RELEASE M src/pdch_ul_controller.c 2 files changed, 32 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 73ad83b..cbfda24 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmocore > 1.9.0 added gsm0502_fncmp() diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c index 661957b..c0e26de 100644 --- a/src/pdch_ul_controller.c +++ b/src/pdch_ul_controller.c @@ -17,8 +17,6 @@ #include <unistd.h> #include <talloc.h> -#include <osmocom/gsm/gsm0502.h> - #include "pdch_ul_controller.h" #include "bts.h" #include "sba.h" @@ -45,6 +43,20 @@ { 0, NULL } }; +#define GSM_MAX_FN_THRESH (GSM_MAX_FN >> 1) +/* 0: equal, -1: fn1 BEFORE fn2, 1: fn1 AFTER fn2 */ +static inline int fn_cmp(uint32_t fn1, uint32_t fn2) +{ + if (fn1 == fn2) + return 0; + /* FN1 goes before FN2: */ + if ((fn1 < fn2 && (fn2 - fn1) < GSM_MAX_FN_THRESH) || + (fn1 > fn2 && (fn1 - fn2) > GSM_MAX_FN_THRESH)) + return -1; + /* FN1 goes after FN2: */ + return 1; +} + struct pdch_ulc *pdch_ulc_alloc(struct gprs_rlcmac_pdch *pdch, void *ctx) { struct pdch_ulc* ulc; @@ -66,7 +78,7 @@ while (node) { it = rb_entry(node, struct pdch_ulc_node, node); - res = gsm0502_fncmp(it->fn, fn); + res = fn_cmp(it->fn, fn); if (res > 0) /* it->fn AFTER fn */ node = node->rb_left; else if (res < 0) /* it->fn BEFORE fn */ @@ -155,7 +167,7 @@ for (node = rb_first(&ulc->tree_root); node; node = rb_next(node)) { it = container_of(node, struct pdch_ulc_node, node); - res = gsm0502_fncmp(it->fn, check_fn); + res = fn_cmp(it->fn, check_fn); if (res > 0) { /* it->fn AFTER check_fn */ /* Next reserved FN is passed check_fn, hence it means check_fn is free */ return check_fn; @@ -191,7 +203,7 @@ it = container_of(*n, struct pdch_ulc_node, node); parent = *n; - res = gsm0502_fncmp(item->fn, it->fn); + res = fn_cmp(item->fn, it->fn); if (res < 0) { /* item->fn "BEFORE" it->fn */ n = &((*n)->rb_left); } else if (res > 0) { /* item->fn "AFTER" it->fn */ @@ -293,7 +305,7 @@ struct rb_node *first; while ((first = rb_first(&ulc->tree_root))) { item = container_of(first, struct pdch_ulc_node, node); - res = gsm0502_fncmp(item->fn, fn); + res = fn_cmp(item->fn, fn); if (res > 0) /* item->fn AFTER fn */ break; if (res < 0) { /* item->fn BEFORE fn */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35336?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I714efdc9c9403d3ff74e18df1629e2de6876e9d7 Gerrit-Change-Number: 35336 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in osmo-pcu[master]: Revert "Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_...

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35338?usp=email ) Change subject: Revert "Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()"" ...................................................................... Revert "Revert "pdch_ul_controller: migrate from fn_cmp() to gsm0502_fncmp()"" Now that 1.4.0 is released, bring back the patch that was temporarily reverted to avoid the need for a new libosmocore. This reverts commit 16729ba72761fc981bcec6d3747d6f7dab4413ca. Change-Id: Idd113e328a693df2e8f2f5d172eaf5bf2bfcf009 --- M TODO-RELEASE M src/pdch_ul_controller.c 2 files changed, 21 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index cbfda24..73ad83b 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmocore > 1.9.0 added gsm0502_fncmp() diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c index c0e26de..661957b 100644 --- a/src/pdch_ul_controller.c +++ b/src/pdch_ul_controller.c @@ -17,6 +17,8 @@ #include <unistd.h> #include <talloc.h> +#include <osmocom/gsm/gsm0502.h> + #include "pdch_ul_controller.h" #include "bts.h" #include "sba.h" @@ -43,20 +45,6 @@ { 0, NULL } }; -#define GSM_MAX_FN_THRESH (GSM_MAX_FN >> 1) -/* 0: equal, -1: fn1 BEFORE fn2, 1: fn1 AFTER fn2 */ -static inline int fn_cmp(uint32_t fn1, uint32_t fn2) -{ - if (fn1 == fn2) - return 0; - /* FN1 goes before FN2: */ - if ((fn1 < fn2 && (fn2 - fn1) < GSM_MAX_FN_THRESH) || - (fn1 > fn2 && (fn1 - fn2) > GSM_MAX_FN_THRESH)) - return -1; - /* FN1 goes after FN2: */ - return 1; -} - struct pdch_ulc *pdch_ulc_alloc(struct gprs_rlcmac_pdch *pdch, void *ctx) { struct pdch_ulc* ulc; @@ -78,7 +66,7 @@ while (node) { it = rb_entry(node, struct pdch_ulc_node, node); - res = fn_cmp(it->fn, fn); + res = gsm0502_fncmp(it->fn, fn); if (res > 0) /* it->fn AFTER fn */ node = node->rb_left; else if (res < 0) /* it->fn BEFORE fn */ @@ -167,7 +155,7 @@ for (node = rb_first(&ulc->tree_root); node; node = rb_next(node)) { it = container_of(node, struct pdch_ulc_node, node); - res = fn_cmp(it->fn, check_fn); + res = gsm0502_fncmp(it->fn, check_fn); if (res > 0) { /* it->fn AFTER check_fn */ /* Next reserved FN is passed check_fn, hence it means check_fn is free */ return check_fn; @@ -203,7 +191,7 @@ it = container_of(*n, struct pdch_ulc_node, node); parent = *n; - res = fn_cmp(item->fn, it->fn); + res = gsm0502_fncmp(item->fn, it->fn); if (res < 0) { /* item->fn "BEFORE" it->fn */ n = &((*n)->rb_left); } else if (res > 0) { /* item->fn "AFTER" it->fn */ @@ -305,7 +293,7 @@ struct rb_node *first; while ((first = rb_first(&ulc->tree_root))) { item = container_of(first, struct pdch_ulc_node, node); - res = fn_cmp(item->fn, fn); + res = gsm0502_fncmp(item->fn, fn); if (res > 0) /* item->fn AFTER fn */ break; if (res < 0) { /* item->fn BEFORE fn */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35338?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idd113e328a693df2e8f2f5d172eaf5bf2bfcf009 Gerrit-Change-Number: 35338 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in osmo-pcu[master]: Bump version: 1.3.1.13-8a4c → 1.4.0

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email ) Change subject: Bump version: 1.3.1.13-8a4c → 1.4.0 ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b4efbffc6cf056a1e6865d077da4c7870a7e375 Gerrit-Change-Number: 35337 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Dec 2023 16:40:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-bsc[osmith/1.11.1]: Bump version: 1.11.0.3-240b2 → 1.11.1

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email ) Change subject: Bump version: 1.11.0.3-240b2 → 1.11.1 ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35342?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.11.1 Gerrit-Change-Id: Ifd79073966bd945ce8c330b5dd94f5406b887bc7 Gerrit-Change-Number: 35342 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Dec 2023 16:39:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-pcu[master]: Bump version: 1.3.1.13-8a4c → 1.4.0

by dexter

Attention is currently required from: osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email ) Change subject: Bump version: 1.3.1.13-8a4c → 1.4.0 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: I have tested this with an ericsson BTS, everything seems to work fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35337?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5b4efbffc6cf056a1e6865d077da4c7870a7e375 Gerrit-Change-Number: 35337 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Dec 2023 16:38:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023