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

[M] Change in osmo-pcu[master]: bts: get rid of fn parameter in bts_rcv_imm_ass_cnf

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34101 ) Change subject: bts: get rid of fn parameter in bts_rcv_imm_ass_cnf ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35bc99eaec5d0287ae3916bc668f0babaddfd6ce Gerrit-Change-Number: 34101 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 13:40:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in osmo-pcu[master]: pcuif_proto: rename tlli to msg_id

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34100 ) Change subject: pcuif_proto: rename tlli to msg_id ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4a25039dfe329e68879bc68936e49c4b190625e6 Gerrit-Change-Number: 34100 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 13:38:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmo-pcu[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34134 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If641b507dcb6b176109c99dce7cff2a7561364b0 Gerrit-Change-Number: 34134 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Aug 2023 13:37:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: get rid of _DT, _dt (Direct TLLI)

by dexter

dexter has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 ) Change subject: PCUIF_Types: get rid of _DT, _dt (Direct TLLI) ...................................................................... PCUIF_Types: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Depends: osmo-pcu.git If641b507dcb6b176109c99dce7cff2a7561364b0 Related: OS#5927 Change-Id: I15e754ce3ceed92a517586a073d3e3ed008b5eef --- M bts/BTS_Tests.ttcn M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn M pcu/PCUIF_Components.ttcn 4 files changed, 53 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/34138/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I15e754ce3ceed92a517586a073d3e3ed008b5eef Gerrit-Change-Number: 34138 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon: properly handle PDCH slotmask in UL/DL TBF CFG.Req

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34139 ) Change subject: trxcon: properly handle PDCH slotmask in UL/DL TBF CFG.Req ...................................................................... trxcon: properly handle PDCH slotmask in UL/DL TBF CFG.Req Change-Id: I4c2ff25217fba0b6b4704f023071b86ed9afb55c Related: OS#5500 --- M src/host/trxcon/src/trxcon_fsm.c 1 file changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/34139/1 diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index eabab3d..702d62c 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -536,6 +536,30 @@ trxcon->gprs = NULL; } +static void handle_tbf_cfg_req(struct trxcon_inst *trxcon) +{ + const struct l1gprs_state *gprs = trxcon->gprs; + struct l1sched_state *sched = trxcon->sched; + + for (unsigned int tn = 0; tn < ARRAY_SIZE(gprs->pdch); tn++) { + const struct l1gprs_pdch *pdch = &gprs->pdch[tn]; + + if ((pdch->ul_tbf_count + pdch->dl_tbf_count) > 0) { + if (sched->ts[tn] != NULL) /* already enabled */ + continue; + if (l1sched_configure_ts(sched, tn, GSM_PCHAN_PDCH) != 0) + continue; + OSMO_ASSERT(sched->ts[tn] != NULL); + + l1sched_activate_lchan(sched->ts[tn], L1SCHED_PDTCH); + l1sched_activate_lchan(sched->ts[tn], L1SCHED_PTCCH); + /* FIXME: set TSC for both lchans */ + } else { + l1sched_del_ts(sched, tn); + } + } +} + static void trxcon_st_packet_data_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { @@ -550,9 +574,11 @@ break; case TRXCON_EV_GPRS_UL_TBF_CFG_REQ: l1gprs_handle_ul_tbf_cfg_req(trxcon->gprs, (struct msgb *)data); + handle_tbf_cfg_req(trxcon); break; case TRXCON_EV_GPRS_DL_TBF_CFG_REQ: l1gprs_handle_dl_tbf_cfg_req(trxcon->gprs, (struct msgb *)data); + handle_tbf_cfg_req(trxcon); break; case TRXCON_EV_GPRS_UL_BLOCK_REQ: { -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4c2ff25217fba0b6b4704f023071b86ed9afb55c Gerrit-Change-Number: 34139 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... pcuif_proto: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Depends: osmo-pcu.git If641b507dcb6b176109c99dce7cff2a7561364b0 Related: OS#5927 Change-Id: I15e754ce3ceed92a517586a073d3e3ed008b5eef --- M bts/BTS_Tests.ttcn M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn M pcu/PCUIF_Components.ttcn 4 files changed, 53 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/34138/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index ad6ae5a..63a9a05 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5819,11 +5819,11 @@ /* three characters prefix: last 3 digits of IMSI as ASCII */ f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH, '313233'O & c_PCU_DATA); } else { - var PCUIF_pch_dt pch_dt; - pch_dt.msg_id := '01020304'O; - pch_dt.imsi := "00101000000000123"; - pch_dt.data := c_PCU_DATA; - f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)); + var PCUIF_pch pch; + pch.msg_id := '01020304'O; + pch.imsi := "00101000000000123"; + pch.data := c_PCU_DATA; + f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH_2, enc_PCUIF_pch(pch)); } T.start; diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index ad6eac4..30f19b4 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -155,11 +155,11 @@ pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH, prefix & imm_ass))); } else { - var PCUIF_pch_dt pch_dt; - pch_dt.msg_id := msg_id; - pch_dt.imsi := hex2str(imsi); - pch_dt.data := imm_ass; - pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)))); + var PCUIF_pch pch; + pch.msg_id := msg_id; + pch.imsi := hex2str(imsi); + pch.data := imm_ass; + pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH_2, enc_PCUIF_pch(pch)))); } /* Exit early when the caller is not interested in the confirmation message */ @@ -171,14 +171,14 @@ alt { [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF(bts_nr, 0, 0, PCU_IF_SAPI_PCH))) -> value sd { if (mp_pcuif_version >= 11) { - setverdict(fail, "expecting tr_PCUIF_DATA_CNF_DT in PCUIF v.11 or later"); + setverdict(fail, "expecting tr_PCUIF_DATA_CNF_2 in PCUIF v.11 or later"); mtc.stop; } else { log("IMM.ASS was sent on PCH at fn ", sd.data.u.data_cnf.fn); return sd.data.u.data_cnf.fn; } } - [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_DT(bts_nr, PCU_IF_SAPI_PCH_DT))) -> value sd { + [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_2(bts_nr, PCU_IF_SAPI_PCH_2))) -> value sd { if (mp_pcuif_version < 11) { setverdict(fail, "expecting tr_PCUIF_DATA_CNF in PCUIF v.10 or earlier"); mtc.stop; diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 2a86b54..8583504 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -30,7 +30,7 @@ PCU_IF_MSG_SUSP_REQ ('03'O), PCU_IF_MSG_APP_INFO_REQ ('04'O), PCU_IF_MSG_RTS_REQ ('10'O), - PCU_IF_MSG_DATA_CNF_DT ('11'O), + PCU_IF_MSG_DATA_CNF_2 ('11'O), PCU_IF_MSG_RACH_IND ('22'O), PCU_IF_MSG_INFO_IND ('32'O), PCU_IF_MSG_E1_CCU_IND ('33'O), @@ -54,7 +54,7 @@ PCU_IF_SAPI_PDTCH ('05'O), PCU_IF_SAPI_PRACH ('06'O), PCU_IF_SAPI_PTCCH ('07'O), - PCU_IF_SAPI_PCH_DT ('08'O) + PCU_IF_SAPI_PCH_2 ('08'O) } with { variant "FIELDLENGTH(8)" }; type record PCUIF_Flags { @@ -104,7 +104,7 @@ int16_t lqual_cb } with { variant (data) "FIELDLENGTH(162), ALIGN(left)" }; -type record PCUIF_data_cnf_dt { +type record PCUIF_data_cnf { PCUIF_Sapi sapi, OCT4 msg_id } with { variant "" }; @@ -304,8 +304,8 @@ }; /* Record to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The record is sent by the PCU to the BTS as a - * data request (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ -type record PCUIF_pch_dt { + * data request (data_req) under SAPI PCU_IF_SAPI_PCH_2. */ +type record PCUIF_pch { OCT4 msg_id, charstring imsi length(17), octetstring data length(23) @@ -315,15 +315,15 @@ variant (data) "FIELDLENGTH(23)" }; -external function enc_PCUIF_pch_dt(in PCUIF_pch_dt pdu) return octetstring +external function enc_PCUIF_pch(in PCUIF_pch pdu) return octetstring with { extension "prototype(convert) encode(RAW)" }; -external function dec_PCUIF_pch_dt(in octetstring stream) return PCUIF_pch_dt +external function dec_PCUIF_pch(in octetstring stream) return PCUIF_pch with { extension "prototype(convert) decode(RAW)" }; type union PCUIF_MsgUnion { PCUIF_data data_req, PCUIF_data data_cnf, - PCUIF_data_cnf_dt data_cnf_dt, + PCUIF_data_cnf data_cnf2, PCUIF_data data_ind, PCUIF_susp_req susp_req, PCUIF_rts_req rts_req, @@ -347,7 +347,7 @@ } with { variant (u) "CROSSTAG( data_req, msg_type = PCU_IF_MSG_DATA_REQ; data_cnf, msg_type = PCU_IF_MSG_DATA_CNF; - data_cnf_dt, msg_type = PCU_IF_MSG_DATA_CNF_DT; + data_cnf2, msg_type = PCU_IF_MSG_DATA_CNF_2; data_ind, msg_type = PCU_IF_MSG_DATA_IND; susp_req, msg_type = PCU_IF_MSG_SUSP_REQ; rts_req, msg_type = PCU_IF_MSG_RTS_REQ; @@ -682,27 +682,27 @@ } } -template (value) PCUIF_Message ts_PCUIF_DATA_CNF_DT(template (value) uint8_t bts_nr, - template (value) PCUIF_Sapi sapi, - template (value) OCT4 msg_id) := { - msg_type := PCU_IF_MSG_DATA_CNF_DT, +template (value) PCUIF_Message ts_PCUIF_DATA_CNF_2(template (value) uint8_t bts_nr, + template (value) PCUIF_Sapi sapi, + template (value) OCT4 msg_id) := { + msg_type := PCU_IF_MSG_DATA_CNF_2, bts_nr := bts_nr, spare := '0000'O, u := { - data_cnf_dt := { + data_cnf2 := { sapi := sapi, msg_id := msg_id } } } -template PCUIF_Message tr_PCUIF_DATA_CNF_DT(template uint8_t bts_nr, - template PCUIF_Sapi sapi := ?, - template OCT4 msg_id := ?) := { - msg_type := PCU_IF_MSG_DATA_CNF_DT, +template PCUIF_Message tr_PCUIF_DATA_CNF_2(template uint8_t bts_nr, + template PCUIF_Sapi sapi := ?, + template OCT4 msg_id := ?) := { + msg_type := PCU_IF_MSG_DATA_CNF_2, bts_nr := bts_nr, spare := ?, u := { - data_cnf_dt := { + data_cnf2 := { sapi := sapi, msg_id := msg_id } diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index a6c5bae..d7e2ed5 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -499,7 +499,7 @@ /* Wait until the PCU is connected */ PCUIF.receive(tr_RAW_PCU_EV(PCU_EV_CONNECT)); - var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_PCH_DT, PCU_IF_SAPI_AGCH); + var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_PCH_2, PCU_IF_SAPI_AGCH); alt { /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13) */ [] PCUIF.receive(tr_PCUIF_TXT_IND(bts_nr, PCU_VERSION, ?)) -> value pcu_msg { @@ -537,7 +537,7 @@ } [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := tr_ccch_sapi)) -> value pcu_msg { var octetstring data; - var PCUIF_pch_dt pch_dt; + var PCUIF_pch pch; /* On PCH the payload is prefixed with paging group (3 octets): skip it. * TODO: add an additional template parameter, so we can match it. */ if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_PCH) { @@ -548,11 +548,11 @@ pcu_msg_rr.bts_nr := bts_nr; pcu_msg_rr.raw := pcu_msg.u.data_req; - if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_PCH_DT) { - pch_dt := dec_PCUIF_pch_dt(pcu_msg_rr.raw.data); - pcu_msg_rr.msg_id := pch_dt.msg_id; - pcu_msg_rr.imsi := pch_dt.imsi; - pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch_dt.data); + if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_PCH_2) { + pch := dec_PCUIF_pch(pcu_msg_rr.raw.data); + pcu_msg_rr.msg_id := pch.msg_id; + pcu_msg_rr.imsi := pch.imsi; + pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch.data); } else { pcu_msg_rr.msg_id := omit; pcu_msg_rr.imsi := omit; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I15e754ce3ceed92a517586a073d3e3ed008b5eef Gerrit-Change-Number: 34138 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 to look at the new patch set (#2). Change subject: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt ...................................................................... PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt The record PCUIF_data_cnf_dt was added when the first experiments mit Ericsson RBS base stations were made. It is essentially a copy of record PCUIF_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Related: OS#5927 Change-Id: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d --- M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn 2 files changed, 29 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/34110/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d Gerrit-Change-Number: 34110 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years

1
0
0 0

[S] Change in osmo-bts[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34137 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... pcuif_proto: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Depends: osmo-pcu.git If641b507dcb6b176109c99dce7cff2a7561364b0 Change-Id: Icf85f60ae86fbe1f3b98e1457c0598bb09cb08c5 Related: OS#5927 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 32 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/37/34137/1 diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index b93822d..d584ba4 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -17,7 +17,7 @@ #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 */ #define PCU_IF_MSG_RTS_REQ 0x10 /* ready to send request */ -#define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (using message id) */ +#define PCU_IF_MSG_DATA_CNF_2 0x11 /* confirm (using message id) */ #define PCU_IF_MSG_RACH_IND 0x22 /* receive RACH */ #define PCU_IF_MSG_INFO_IND 0x32 /* retrieve BTS info */ #define PCU_IF_MSG_ACT_REQ 0x40 /* activate/deactivate PDCH */ @@ -35,7 +35,7 @@ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ -#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using message id) */ +#define PCU_IF_SAPI_PCH_2 0x08 /* assignment on PCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -88,7 +88,7 @@ } __attribute__ ((packed)); /* data confirmation with message id (instead of raw mac block) */ -struct gsm_pcu_if_data_cnf_dt { +struct gsm_pcu_if_data_cnf { uint8_t sapi; uint32_t msg_id; } __attribute__ ((packed)); @@ -222,8 +222,8 @@ } __attribute__ ((packed)); /* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The struct is sent as a data request - * (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ -struct gsm_pcu_if_pch_dt { + * (data_req) under SAPI PCU_IF_SAPI_PCH_2. */ +struct gsm_pcu_if_pch { /* message id as reference for confirmation */ uint32_t msg_id; /* IMSI (to derive paging group) */ @@ -241,7 +241,7 @@ union { struct gsm_pcu_if_data data_req; struct gsm_pcu_if_data data_cnf; - struct gsm_pcu_if_data_cnf_dt data_cnf_dt; + struct gsm_pcu_if_data_cnf data_cnf2; struct gsm_pcu_if_data data_ind; struct gsm_pcu_if_susp_req susp_req; struct gsm_pcu_if_rts_req rts_req; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 67958f6..2431e85 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -59,7 +59,7 @@ [PCU_IF_SAPI_PDTCH] = "PDTCH", [PCU_IF_SAPI_PRACH] = "PRACH", [PCU_IF_SAPI_PTCCH] = "PTCCH", - [PCU_IF_SAPI_PCH_DT] = "PCH_DT", + [PCU_IF_SAPI_PCH_2] = "PCH_2", }; /* @@ -629,12 +629,12 @@ LOGP(DPCU, LOGL_DEBUG, "Sending PCH confirm\n"); - msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_DT, bts->nr); + msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_2, bts->nr); if (!msg) return -ENOMEM; pcu_prim = (struct gsm_pcu_if *) msg->data; - pcu_prim->u.data_cnf_dt = (struct gsm_pcu_if_data_cnf_dt) { - .sapi = PCU_IF_SAPI_PCH_DT, + pcu_prim->u.data_cnf2 = (struct gsm_pcu_if_data_cnf) { + .sapi = PCU_IF_SAPI_PCH_2, .msg_id = msg_id, }; @@ -673,23 +673,23 @@ osmo_hexdump(data_req->data, data_req->len)); switch (data_req->sapi) { - case PCU_IF_SAPI_PCH_DT: + case PCU_IF_SAPI_PCH_2: { - const struct gsm_pcu_if_pch_dt *gsm_pcu_if_pch_dt; + const struct gsm_pcu_if_pch *gsm_pcu_if_pch; const struct gsm48_imm_ass *gsm48_imm_ass; bool confirm; - if (OSMO_UNLIKELY(data_req->len != sizeof(*gsm_pcu_if_pch_dt))) { + if (OSMO_UNLIKELY(data_req->len != sizeof(*gsm_pcu_if_pch))) { LOGP(DPCU, LOGL_ERROR, "Rx malformed DATA.req for PCH\n"); rc = -EINVAL; break; } - gsm_pcu_if_pch_dt = (struct gsm_pcu_if_pch_dt *)data_req->data; - gsm48_imm_ass = (struct gsm48_imm_ass *)gsm_pcu_if_pch_dt->data; + gsm_pcu_if_pch = (struct gsm_pcu_if_pch *)data_req->data; + gsm48_imm_ass = (struct gsm48_imm_ass *)gsm_pcu_if_pch->data; confirm = (gsm48_imm_ass->msg_type == GSM48_MT_RR_IMM_ASS); - rc = paging_add_macblock(bts->paging_state, gsm_pcu_if_pch_dt->msg_id, - gsm_pcu_if_pch_dt->imsi, confirm, gsm_pcu_if_pch_dt->data); + rc = paging_add_macblock(bts->paging_state, gsm_pcu_if_pch->msg_id, + gsm_pcu_if_pch->imsi, confirm, gsm_pcu_if_pch->data); break; } case PCU_IF_SAPI_AGCH: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icf85f60ae86fbe1f3b98e1457c0598bb09cb08c5 Gerrit-Change-Number: 34137 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-bsc[master]: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34135 ) Change subject: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt ...................................................................... pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt The struct gsm_pcu_if_data_cnf_dt was added when the first experiments mit Ericsson RBS base stations were made. It is essentially a copy of gsm_pcu_if_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Change-Id: I37845408edd96017b50559964c82b2cdc5e143a7 Related: OS#5927 --- M include/osmocom/bsc/pcuif_proto.h 1 file changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/35/34135/1 diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index 80e3b6d..d28aec0 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -97,15 +97,6 @@ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; uint32_t msg_id; - uint32_t fn; - uint16_t arfcn; - uint8_t trx_nr; - uint8_t ts_nr; - uint8_t block_nr; - int8_t rssi; - uint16_t ber10k; /* !< \brief BER in units of 0.01% */ - int16_t ta_offs_qbits; /* !< \brief Burst TA Offset in quarter bits */ - int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); struct gsm_pcu_if_rts_req { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I37845408edd96017b50559964c82b2cdc5e143a7 Gerrit-Change-Number: 34135 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34136 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... pcuif_proto: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Depends: osmo-pcu.git If641b507dcb6b176109c99dce7cff2a7561364b0 Change-Id: I628aaf19999a0004d0760d25ecd323cdbc0076f5 Related: OS#5927 --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 40 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/34136/1 diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index d28aec0..bf49b06 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -18,7 +18,7 @@ #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 */ #define PCU_IF_MSG_RTS_REQ 0x10 /* ready to send request */ -#define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (with direct tlli) */ +#define PCU_IF_MSG_DATA_CNF_2 0x11 /* confirm (using message id) */ #define PCU_IF_MSG_RACH_IND 0x22 /* receive RACH */ #define PCU_IF_MSG_INFO_IND 0x32 /* retrieve BTS info */ #define PCU_IF_MSG_E1_CCU_IND 0x33 /* retrieve E1 CCU comm. parameters */ @@ -41,7 +41,7 @@ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ -#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using message id) */ +#define PCU_IF_SAPI_PCH_2 0x08 /* assignment on PCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -94,7 +94,7 @@ } __attribute__ ((packed)); /* data confirmation with message id (instead of raw mac block) */ -struct gsm_pcu_if_data_cnf_dt { +struct gsm_pcu_if_data_cnf { uint8_t sapi; uint32_t msg_id; } __attribute__ ((packed)); @@ -263,8 +263,8 @@ } __attribute__ ((packed)); /* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The struct is sent as a data request - * (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ -struct gsm_pcu_if_pch_dt { + * (data_req) under SAPI PCU_IF_SAPI_PCH_2. */ +struct gsm_pcu_if_pch { /* message id as reference for confirmation */ uint32_t msg_id; /* IMSI (to derive paging group) */ @@ -282,7 +282,7 @@ union { struct gsm_pcu_if_data data_req; struct gsm_pcu_if_data data_cnf; - struct gsm_pcu_if_data_cnf_dt data_cnf_dt; + struct gsm_pcu_if_data_cnf data_cnf2; struct gsm_pcu_if_data data_ind; struct gsm_pcu_if_susp_req susp_req; struct gsm_pcu_if_rts_req rts_req; diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 5353081..6f48f0f 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -56,7 +56,7 @@ [PCU_IF_SAPI_PDTCH] = "PDTCH", [PCU_IF_SAPI_PRACH] = "PRACH", [PCU_IF_SAPI_PTCCH] = "PTCCH", - [PCU_IF_SAPI_PCH_DT] = "PCH_DT", + [PCU_IF_SAPI_PCH_2] = "PCH_2", }; bool pcu_connected(const struct gsm_network *net) @@ -440,18 +440,18 @@ { struct msgb *msg; struct gsm_pcu_if *pcu_prim; - struct gsm_pcu_if_data_cnf_dt *data_cnf_dt; + struct gsm_pcu_if_data_cnf *data_cnf; LOG_BTS(bts, DPCU, LOGL_INFO, "Sending PCH confirm with message id\n"); - msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_DT, bts->nr); + msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_2, bts->nr); if (!msg) return -ENOMEM; pcu_prim = (struct gsm_pcu_if *) msg->data; - data_cnf_dt = &pcu_prim->u.data_cnf_dt; + data_cnf = &pcu_prim->u.data_cnf2; - data_cnf_dt->sapi = PCU_IF_SAPI_PCH_DT; - data_cnf_dt->msg_id = msg_id; + data_cnf->sapi = PCU_IF_SAPI_PCH_2; + data_cnf->msg_id = msg_id; return pcu_sock_send(bts->network, msg); } @@ -460,9 +460,9 @@ * Encoding::write_paging_request) and extract the mobile identity * (P-TMSI) from it */ static int pcu_rx_rr_paging_pch(struct gsm_bts *bts, uint8_t paging_group, - const struct gsm_pcu_if_pch_dt *pch_dt) + const struct gsm_pcu_if_pch *pch) { - struct gsm48_paging1 *p1 = (struct gsm48_paging1 *) pch_dt->data; + struct gsm48_paging1 *p1 = (struct gsm48_paging1 *) pch->data; uint8_t chan_needed; struct osmo_mobile_identity mi; int rc; @@ -506,17 +506,17 @@ } static int pcu_rx_rr_imm_ass_pch(struct gsm_bts *bts, uint8_t paging_group, - const struct gsm_pcu_if_pch_dt *pch_dt) + const struct gsm_pcu_if_pch *pch) { LOG_BTS(bts, DPCU, LOGL_DEBUG, "PCU Sends immediate assignment via PCH (msg_id=0x%08x, IMSI=%s, Paging group=0x%02x)\n", - pch_dt->msg_id, pch_dt->imsi, paging_group); + pch->msg_id, pch->imsi, paging_group); /* NOTE: Sending an IMMEDIATE ASSIGNMENT via PCH became necessary with GPRS in order to be able to * assign downlink TBFs directly through the paging channel. However, this method never became part * of the RSL specs. This means that each BTS vendor has to come up with a proprietary method. At * the moment we only support Ericsson RBS here. */ if (is_ericsson_bts(bts)) - return rsl_ericsson_imm_assign_cmd(bts, pch_dt->msg_id, sizeof(pch_dt->data), pch_dt->data, paging_group); + return rsl_ericsson_imm_assign_cmd(bts, pch->msg_id, sizeof(pch->data), pch->data, paging_group); LOG_BTS(bts, DPCU, LOGL_ERROR, "BTS model does not support sending immediate assignment via PCH!\n"); return -ENOTSUP; @@ -527,7 +527,7 @@ { uint8_t pag_grp; int rc = 0; - struct gsm_pcu_if_pch_dt *pch_dt; + struct gsm_pcu_if_pch *pch; struct gsm48_imm_ass *gsm48_imm_ass; LOG_BTS(bts, DPCU, LOGL_DEBUG, "Data request received: sapi=%s arfcn=%d " @@ -540,20 +540,20 @@ if (rsl_imm_assign_cmd(bts, data_req->len, data_req->data)) rc = -EIO; break; - case PCU_IF_SAPI_PCH_DT: - if (data_req->len < sizeof(struct gsm_pcu_if_pch_dt)) { + case PCU_IF_SAPI_PCH_2: + if (data_req->len < sizeof(struct gsm_pcu_if_pch)) { LOG_BTS(bts, DPCU, LOGL_ERROR, "Received PCU data request with invalid/small length %d\n", data_req->len); break; } - pch_dt = (struct gsm_pcu_if_pch_dt *)data_req->data; - pag_grp = gsm0502_calc_paging_group(&bts->si_common.chan_desc, str_to_imsi(pch_dt->imsi)); + pch = (struct gsm_pcu_if_pch *)data_req->data; + pag_grp = gsm0502_calc_paging_group(&bts->si_common.chan_desc, str_to_imsi(pch->imsi)); - gsm48_imm_ass = (struct gsm48_imm_ass *)pch_dt->data; + gsm48_imm_ass = (struct gsm48_imm_ass *)pch->data; if (gsm48_imm_ass->msg_type == GSM48_MT_RR_IMM_ASS) - return pcu_rx_rr_imm_ass_pch(bts, pag_grp, pch_dt); - return pcu_rx_rr_paging_pch(bts, pag_grp, pch_dt); + return pcu_rx_rr_imm_ass_pch(bts, pag_grp, pch); + return pcu_rx_rr_paging_pch(bts, pag_grp, pch); default: LOG_BTS(bts, DPCU, LOGL_ERROR, "Received PCU data request with " "unsupported sapi %d\n", data_req->sapi); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I628aaf19999a0004d0760d25ecd323cdbc0076f5 Gerrit-Change-Number: 34136 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023