August 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28896 ) Change subject: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo ...................................................................... abis_om2000: duplicate nmstate of bb_trxc mo to trx mo In OM2000 a separate bb_trxc MO does not exist to archive better compatibilty towards classic ABIS and its MOs. Let's mirror the nmstate of the BB_TRANSC MO to the RCARRIER MO in order to make it look like if it were present. Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Related: OS#5634 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 71 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 63b2a63..cf69ded 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -51,11 +51,13 @@ static inline void abis_om2000_fsm_transc_becomes_enabled(struct gsm_bts_trx *trx) { nm_obj_fsm_becomes_enabled_disabled(trx->bts, trx, NM_OC_RADIO_CARRIER, true); + nm_obj_fsm_becomes_enabled_disabled(trx->bts, &trx->bb_transc, NM_OC_BASEB_TRANSC, true); } static inline void abis_om2000_fsm_transc_becomes_disabled(struct gsm_bts_trx *trx) { nm_obj_fsm_becomes_enabled_disabled(trx->bts, trx, NM_OC_RADIO_CARRIER, false); + nm_obj_fsm_becomes_enabled_disabled(trx->bts, &trx->bb_transc, NM_OC_BASEB_TRANSC, false); } /* FIXME: move to libosmocore */ @@ -989,6 +991,30 @@ } } +/* The OM2000 -> 12.21 mapping we do doesn't have a separate bb_transc MO, + * for compatibility reasons we pretend to have it anyway. */ +static void update_bb_trxc_mo_state(struct gsm_bts *bts, struct abis_om2k_mo *mo, uint8_t mo_state) +{ + struct nm_statechg_signal_data nsd; + struct gsm_bts_trx *trx; + + trx = gsm_bts_trx_num(bts, mo->inst); + if (!trx) + return; + + memset(&nsd, 0, sizeof(nsd)); + + nsd.bts = bts; + nsd.obj = mo2obj(bts, mo); + nsd.old_state = trx->bb_transc.mo.nm_state; + nsd.new_state = trx->bb_transc.mo.nm_state; + nsd.om2k_mo = mo; + + nsd.new_state.availability = abis_nm_av_state_from_om2k_av_state(mo, mo_state); + trx->bb_transc.mo.nm_state.availability = nsd.new_state.availability; + osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd); +} + static void update_mo_state(struct gsm_bts *bts, struct abis_om2k_mo *mo, uint8_t mo_state) { struct gsm_nm_state *nm_state = mo2nm_state(bts, mo); @@ -1009,8 +1035,11 @@ /* Update current state before emitting signal: */ nm_state->availability = nsd.new_state.availability; - osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd); + + /* When the TRXC MO is updated, also update the BB TRXC accordingly. */ + if (mo->class == OM2K_MO_CLS_TRXC) + update_bb_trxc_mo_state(bts, mo, mo_state); } /* Derive an OML Operational state from an OM2000 OP state */ @@ -1026,6 +1055,29 @@ } } +/* (see comment in update_bb_trxc_mo_state() above) */ +static void update_bb_trxc_op_state(struct gsm_bts *bts, const struct abis_om2k_mo *mo, uint8_t op_state) +{ + struct nm_statechg_signal_data nsd; + struct gsm_bts_trx *trx; + + trx = gsm_bts_trx_num(bts, mo->inst); + if (!trx) + return; + + memset(&nsd, 0, sizeof(nsd)); + + nsd.bts = bts; + nsd.obj = mo2obj(bts, mo); + nsd.old_state = trx->bb_transc.mo.nm_state; + nsd.new_state = trx->bb_transc.mo.nm_state; + nsd.om2k_mo = mo; + + nsd.new_state.operational = abis_nm_op_state_from_om2k_op_state(op_state); + trx->bb_transc.mo.nm_state.operational = nsd.new_state.operational; + osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd); +} + static void update_op_state(struct gsm_bts *bts, const struct abis_om2k_mo *mo, uint8_t op_state) { struct gsm_nm_state *nm_state = mo2nm_state(bts, mo); @@ -1047,6 +1099,10 @@ /* Update current state before emitting signal: */ nm_state->operational = nsd.new_state.operational; osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd); + + /* When the TRXC MO is updated, also update the BB TRXC accordingly. */ + if (mo->class == OM2K_MO_CLS_TRXC) + update_bb_trxc_op_state(bts, mo, op_state); } static int abis_om2k_sendmsg(struct gsm_bts *bts, struct msgb *msg) @@ -2227,6 +2283,7 @@ { struct om2k_trx_fsm_priv *otfp = fi->priv; struct nm_statechg_signal_data nsd; + struct nm_statechg_signal_data nsd_bb_transc; struct gsm_bts_trx *trx = otfp->trx; memset(&nsd, 0, sizeof(nsd)); @@ -2242,6 +2299,19 @@ trx->mo.nm_state.administrative = nsd.new_state.administrative; osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd); + /* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO, + * for compatibility reasons we pretend to have it anyway and mirror the + * mo state of the TRXC on it. */ + memset(&nsd_bb_transc, 0, sizeof(nsd)); + nsd_bb_transc.bts = trx->bts; + nsd_bb_transc.obj = &trx->bb_transc; + nsd_bb_transc.old_state = trx->bb_transc.mo.nm_state; + nsd_bb_transc.new_state = trx->bb_transc.mo.nm_state; + nsd_bb_transc.om2k_mo = &trx->rbs2000.trxc.om2k_mo.addr; + nsd_bb_transc.new_state.administrative = NM_STATE_UNLOCKED; + trx->bb_transc.mo.nm_state.administrative = nsd_bb_transc.new_state.administrative; + osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd_bb_transc); + abis_om2000_fsm_transc_becomes_enabled(trx); if (fi->proc.parent) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Gerrit-Change-Number: 28896 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28896 ) Change subject: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Gerrit-Change-Number: 28896 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 20:09:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: om2k_trx_s_done_onenter() does not send signal

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28916 ) Change subject: abis_om2000: om2k_trx_s_done_onenter() does not send signal ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabf9f3a1a345c5d53d9a4d02fa2d6d13ddfd86ae Gerrit-Change-Number: 28916 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 20:08:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-pcu[master]: Makefile.am: generate missing .version file

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28959 ) Change subject: Makefile.am: generate missing .version file ...................................................................... Makefile.am: generate missing .version file Change-Id: Id0cd2debf9b2d120c6dec1e534eefc4fe0a4210f --- M .gitignore M Makefile.am 2 files changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index c8b1d06..20c6470 100644 --- a/.gitignore +++ b/.gitignore @@ -42,8 +42,11 @@ tests/testsuite tests/testsuite.log -# ignore debian files +# git-version-gen magic .tarball-version +.version + +# ignore debian files debian/autoreconf.after debian/autoreconf.before debian/files diff --git a/Makefile.am b/Makefile.am index 85e3c65..1f51db9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,10 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 SUBDIRS = include src doc tests contrib + +BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = \ + .version \ README.md \ contrib/osmo-pcu.spec.in \ debian \ @@ -12,3 +15,8 @@ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ + +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0cd2debf9b2d120c6dec1e534eefc4fe0a4210f Gerrit-Change-Number: 28959 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-pcu[master]: Makefile.am: add 'git-version-gen' to EXTRA_DIST

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28968 ) Change subject: Makefile.am: add 'git-version-gen' to EXTRA_DIST ...................................................................... Makefile.am: add 'git-version-gen' to EXTRA_DIST Change-Id: Idbf4bf70d83fbf697d4a094dbb47592deaea6114 --- M Makefile.am 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 1f51db9..69ce8ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,7 @@ README.md \ contrib/osmo-pcu.spec.in \ debian \ + git-version-gen \ osmoappdesc.py \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idbf4bf70d83fbf697d4a094dbb47592deaea6114 Gerrit-Change-Number: 28968 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-pcu[master]: {src,tests}/Makefile.am: $(COMMON_LA) is not definied

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28973 ) Change subject: {src,tests}/Makefile.am: $(COMMON_LA) is not definied ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4958b5d62645be6ed2a200a50a23c567c9a9f3c0 Gerrit-Change-Number: 28973 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 20:08:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-pcu[master]: Makefile.am: add 'git-version-gen' to EXTRA_DIST

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28968 ) Change subject: Makefile.am: add 'git-version-gen' to EXTRA_DIST ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idbf4bf70d83fbf697d4a094dbb47592deaea6114 Gerrit-Change-Number: 28968 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 20:07:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-pcu[master]: Makefile.am: generate missing .version file

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28959 ) Change subject: Makefile.am: generate missing .version file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0cd2debf9b2d120c6dec1e534eefc4fe0a4210f Gerrit-Change-Number: 28959 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 20:07:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: cosmetic: tlv.h: Fix trailing whistespace

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28987 ) Change subject: cosmetic: tlv.h: Fix trailing whistespace ...................................................................... cosmetic: tlv.h: Fix trailing whistespace Change-Id: Ief318882def539b35ef15c85566f69220e7edbfe --- M include/osmocom/gsm/tlv.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index 7e6dfb5..6d0008f 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -322,7 +322,7 @@ } /*! put (append) a TV field */ -static inline uint8_t *tv_put(uint8_t *buf, uint8_t tag, +static inline uint8_t *tv_put(uint8_t *buf, uint8_t tag, uint8_t val) { *buf++ = tag; @@ -344,7 +344,7 @@ * \param[in] tag Tag value * \param[in] val Value (in host byte order!) */ -static inline uint8_t *tv16_put(uint8_t *buf, uint8_t tag, +static inline uint8_t *tv16_put(uint8_t *buf, uint8_t tag, uint16_t val) { *buf++ = tag; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ief318882def539b35ef15c85566f69220e7edbfe Gerrit-Change-Number: 28987 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: tlv.h: Fix TLVP_PRESENT returning a pointer instead of a boolean

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28988 ) Change subject: tlv.h: Fix TLVP_PRESENT returning a pointer instead of a boolean ...................................................................... tlv.h: Fix TLVP_PRESENT returning a pointer instead of a boolean I was warned by gcc about comparing a pointer with an integer when using TLVP_PRESENT with something like: bool expect = ...; if (expect != TLV_PRESENT(...)) That's indeed dangerous because TLV_PRESENT is considered to return a boolean, as opposite to TLV_VAL. Change-Id: I45cc2745c695e30c37b10f592903ec3775a55492 --- M include/osmocom/gsm/tlv.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h index 6d0008f..fd6659c 100644 --- a/include/osmocom/gsm/tlv.h +++ b/include/osmocom/gsm/tlv.h @@ -543,7 +543,7 @@ int tlv_encode_ordered(struct msgb *msg, const struct tlv_definition *def, const struct tlv_parsed *tp, const uint8_t *tag_order, unsigned int tag_order_len); -#define TLVP_PRESENT(x, y) ((x)->lv[y].val) +#define TLVP_PRESENT(x, y) (!!((x)->lv[y].val)) #define TLVP_LEN(x, y) (x)->lv[y].len #define TLVP_VAL(x, y) (x)->lv[y].val -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I45cc2745c695e30c37b10f592903ec3775a55492 Gerrit-Change-Number: 28988 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022