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

[S] Change in ...osmo-python-tests[master]: scripts/osmotestconfig.py: Fix tests failing due to attempted copy on...
by neels 22 Jun '23

22 Jun '23

Attention is currently required from: arehbein, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/30980 ) Change subject: scripts/osmotestconfig.py: Fix tests failing due to attempted copy on socket files ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/30980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I3a3cc7ed135b60b97eb901cfc20fdcb924e4f664 Gerrit-Change-Number: 30980 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Jun 2023 21:26:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: layer23: use gsm0502_fn2ccch_block() from libosmogsm
by pespin 22 Jun '23

22 Jun '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33405 ) Change subject: layer23: use gsm0502_fn2ccch_block() from libosmogsm ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I652a2ab9ddb3cb5082cce911a5cdb4cf8abcf552 Gerrit-Change-Number: 33405 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Jun 2023 17:10:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: layer23: cosmetic: move <lapdm.h> to other libosmo* imports
by pespin 22 Jun '23

22 Jun '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33404 ) Change subject: layer23: cosmetic: move <lapdm.h> to other libosmo* imports ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id4d8df3f230729dc2c65e1bedea705e28feaa029 Gerrit-Change-Number: 33404 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Jun 2023 17:10:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: layer23: cosmetic: move <lapdm.h> to other libosmo* imports
by fixeria 22 Jun '23

22 Jun '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33404 ) Change subject: layer23: cosmetic: move <lapdm.h> to other libosmo* imports ...................................................................... layer23: cosmetic: move <lapdm.h> to other libosmo* imports Change-Id: Id4d8df3f230729dc2c65e1bedea705e28feaa029 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/04/33404/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 8e55b7b..55960e8 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -37,13 +37,13 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/gsm/rsl.h> +#include <osmocom/gsm/lapdm.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/l23_app.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/ms.h> #include <osmocom/bb/common/l1l2_interface.h> -#include <osmocom/gsm/lapdm.h> #include <osmocom/bb/common/logging.h> #define CB_FCCH -1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id4d8df3f230729dc2c65e1bedea705e28feaa029 Gerrit-Change-Number: 33404 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: layer23: use gsm0502_fn2ccch_block() from libosmogsm
by fixeria 22 Jun '23

22 Jun '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33405 ) Change subject: layer23: use gsm0502_fn2ccch_block() from libosmogsm ...................................................................... layer23: use gsm0502_fn2ccch_block() from libosmogsm Change-Id: I652a2ab9ddb3cb5082cce911a5cdb4cf8abcf552 Depends: libosmocore.git I8cbd31226754e95887358ed83a928e2f567f4cf3 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 12 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/05/33405/1 diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 55960e8..7f15c39 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -38,6 +38,7 @@ #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/gsm/rsl.h> #include <osmocom/gsm/lapdm.h> +#include <osmocom/gsm/gsm0502.h> #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/l23_app.h> @@ -46,35 +47,10 @@ #include <osmocom/bb/common/l1l2_interface.h> #include <osmocom/bb/common/logging.h> -#define CB_FCCH -1 -#define CB_SCH -2 -#define CB_BCCH -3 -#define CB_IDLE -4 - -/* according to TS 05.02 Clause 7 Table 3 of 9 an Figure 8a */ -static const int ccch_block_table[51] = { - CB_FCCH, CB_SCH,/* 0..1 */ - CB_BCCH, CB_BCCH, CB_BCCH, CB_BCCH, /* 2..5: BCCH */ - 0, 0, 0, 0, /* 6..9: B0 */ - CB_FCCH, CB_SCH,/* 10..11 */ - 1, 1, 1, 1, /* 12..15: B1 */ - 2, 2, 2, 2, /* 16..19: B2 */ - CB_FCCH, CB_SCH,/* 20..21 */ - 3, 3, 3, 3, /* 22..25: B3 */ - 4, 4, 4, 4, /* 26..29: B4 */ - CB_FCCH, CB_SCH,/* 30..31 */ - 5, 5, 5, 5, /* 32..35: B5 */ - 6, 6, 6, 6, /* 36..39: B6 */ - CB_FCCH, CB_SCH,/* 40..41 */ - 7, 7, 7, 7, /* 42..45: B7 */ - 8, 8, 8, 8, /* 46..49: B8 */ - -4 /* 50: Idle */ -}; - /* determine the CCCH block number based on the frame number */ static unsigned int fn2ccch_block(uint32_t fn) { - int rc = ccch_block_table[fn%51]; + int rc = gsm0502_fn2ccch_block(fn); /* if FN is negative, we were called for something that's not CCCH! */ OSMO_ASSERT(rc >= 0); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I652a2ab9ddb3cb5082cce911a5cdb4cf8abcf552 Gerrit-Change-Number: 33405 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: l1sap: use gsm0502_fn2ccch_block() from libosmogsm
by pespin 22 Jun '23

22 Jun '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33403 ) Change subject: l1sap: use gsm0502_fn2ccch_block() from libosmogsm ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7097ba87f42689d2336014da9173cadbdaa9fdab Gerrit-Change-Number: 33403 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Jun 2023 16:29:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: gsm: add gsm0502_fn2ccch_block()
by pespin 22 Jun '23

22 Jun '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33402 ) Change subject: gsm: add gsm0502_fn2ccch_block() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8cbd31226754e95887358ed83a928e2f567f4cf3 Gerrit-Change-Number: 33402 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Jun 2023 16:29:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: l1sap: use gsm0502_fn2ccch_block() from libosmogsm
by fixeria 22 Jun '23

22 Jun '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/33403 ) Change subject: l1sap: use gsm0502_fn2ccch_block() from libosmogsm ...................................................................... l1sap: use gsm0502_fn2ccch_block() from libosmogsm Keep the l1sap specific wrapper because we still want to assert(). Change-Id: I7097ba87f42689d2336014da9173cadbdaa9fdab Depends: libosmocore.git I8cbd31226754e95887358ed83a928e2f567f4cf3 --- M TODO-RELEASE M src/common/l1sap.c 2 files changed, 14 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/33403/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 47947da..3ab39bb 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -12,3 +12,4 @@ libosmocoding >1.8.0 gsm0503_tch_hr_encode() extended to accept TS 101 318 format; gsm0503_tch_hr_decode2() new function +libosmogsm >1.8.0 gsm0502_fn2ccch_block() new function diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 9d824e3..528a735 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -58,36 +58,10 @@ #include <osmo-bts/pcuif_proto.h> #include <osmo-bts/cbch.h> - -#define CB_FCCH -1 -#define CB_SCH -2 -#define CB_BCCH -3 -#define CB_IDLE -4 - -/* according to TS 05.02 Clause 7 Table 3 of 9 an Figure 8a */ -static const int ccch_block_table[51] = { - CB_FCCH, CB_SCH,/* 0..1 */ - CB_BCCH, CB_BCCH, CB_BCCH, CB_BCCH, /* 2..5: BCCH */ - 0, 0, 0, 0, /* 6..9: B0 */ - CB_FCCH, CB_SCH,/* 10..11 */ - 1, 1, 1, 1, /* 12..15: B1 */ - 2, 2, 2, 2, /* 16..19: B2 */ - CB_FCCH, CB_SCH,/* 20..21 */ - 3, 3, 3, 3, /* 22..25: B3 */ - 4, 4, 4, 4, /* 26..29: B4 */ - CB_FCCH, CB_SCH,/* 30..31 */ - 5, 5, 5, 5, /* 32..35: B5 */ - 6, 6, 6, 6, /* 36..39: B6 */ - CB_FCCH, CB_SCH,/* 40..41 */ - 7, 7, 7, 7, /* 42..45: B7 */ - 8, 8, 8, 8, /* 46..49: B8 */ - -4 /* 50: Idle */ -}; - /* determine the CCCH block number based on the frame number */ unsigned int l1sap_fn2ccch_block(uint32_t fn) { - int rc = ccch_block_table[fn%51]; + int rc = gsm0502_fn2ccch_block(fn); /* if FN is negative, we were called for something that's not CCCH! */ OSMO_ASSERT(rc >= 0); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7097ba87f42689d2336014da9173cadbdaa9fdab Gerrit-Change-Number: 33403 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: gsm: add gsm0502_fn2ccch_block()
by fixeria 22 Jun '23

22 Jun '23

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/33402 to look at the new patch set (#2). Change subject: gsm: add gsm0502_fn2ccch_block() ...................................................................... gsm: add gsm0502_fn2ccch_block() This API is useful for checking whether a Downlink CCCH block belongs to PCH or AGCH. We need this API in osmo-bts.git and osmocom-bb.git. Change-Id: I8cbd31226754e95887358ed83a928e2f567f4cf3 Related: OS#5500 --- M include/osmocom/gsm/gsm0502.h M src/gsm/gsm0502.c M src/gsm/libosmogsm.map 3 files changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/33402/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8cbd31226754e95887358ed83a928e2f567f4cf3 Gerrit-Change-Number: 33402 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmocore[master]: gsm: add gsm0502_fn2ccch_block()
by Jenkins Builder 22 Jun '23

22 Jun '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33402 ) Change subject: gsm: add gsm0502_fn2ccch_block() ...................................................................... Patch Set 1: (2 comments) File src/gsm/gsm0502.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8488): https://gerrit.osmocom.org/c/libosmocore/+/33402/comment/9d265596_4dbb2851 PS1, Line 284: 7, 7, 7, 7, /* 42..45: B7 */ please, no space before tabs Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8488): https://gerrit.osmocom.org/c/libosmocore/+/33402/comment/f3abfe41_6c6a1bc4 PS1, Line 285: 8, 8, 8, 8, /* 46..49: B8 */ please, no space before tabs -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8cbd31226754e95887358ed83a928e2f567f4cf3 Gerrit-Change-Number: 33402 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 22 Jun 2023 16:21:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0