[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email )
Change subject: pcuif_proto: drop support for PCUIF v10
..
pcuif_proto: drop support for PCUIF v10
We now use PCUIF v11 in the TTCN3 tests exclusively and also osmo-bts
and osmo-bsc only support PCUIF v11. There is no longer a need to
maintain a backward compatibility to PCUIF v10 in osmo-pcu.
Related: OS#5927
Change-Id: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8
---
M include/osmocom/pcu/pcuif_proto.h
M src/bts.cpp
M src/gprs_rlcmac.c
M src/pcu_l1_if.cpp
M tests/app_info/AppInfoTest.err
5 files changed, 34 insertions(+), 123 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/include/osmocom/pcu/pcuif_proto.h
b/include/osmocom/pcu/pcuif_proto.h
index 9df85d9..1133ca6 100644
--- a/include/osmocom/pcu/pcuif_proto.h
+++ b/include/osmocom/pcu/pcuif_proto.h
@@ -13,7 +13,6 @@
/* msg_type */
#define PCU_IF_MSG_DATA_REQ0x00/* send data to given channel */
-#define PCU_IF_MSG_DATA_CNF0x01/* confirm (e.g. transmission on PCH) */
#define PCU_IF_MSG_DATA_IND0x02/* receive data from given channel */
#define PCU_IF_MSG_SUSP_REQ0x03/* BTS forwards GPRS SUSP REQ to PCU */
#define PCU_IF_MSG_APP_INFO_REQ0x04/* 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_PCH0x03/* 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/bts.cpp b/src/bts.cpp
index 50c21a3..0fe8fbc 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -1033,10 +1033,7 @@
rip->burst_type);
bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF);
if (plen >= 0) {
- if (the_pcu->pcu_if_version >= 0x0b)
- pcu_l1if_tx_agch2(bts, bv, plen, false,
GSM_RESERVED_TMSI);
- else
- pcu_l1if_tx_agch(bts, bv, plen);
+ pcu_l1if_tx_agch2(bts, bv, plen, false, GSM_RESERVED_TMSI);
rc = 0;
} else {
rc = plen;
@@ -1050,12 +1047,8 @@
bv, rip->ra, rip->rfn, rip->burst_type,
(uint8_t)osmo_tdef_get(bts->T_defs_bts, 3142, OSMO_TDEF_S, -1));
bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_REJ);
- if (plen >= 0) {
- if (the_pcu->pcu_if_version >= 0x0b)
- pcu_l1if_tx_agch2(bts, bv, plen, false,
GSM_RESERVED_TMSI);
- else
- pcu_l1if_tx_agch(bts, bv, plen);
- }
+ if (plen >= 0)
+ pcu_l1if_tx_agch2(bts, bv, plen, false, GSM_RESERVED_TMSI);
bitvec_free(bv);
/* rc was already properly set before goto */
return rc;
@@ -1136,24 +1129,20 @@
if (plen >= 0) {
bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_DL_TBF);
- if (the_pcu->pcu_if_version >= 0x0b) {
- if (ms_imsi_is_valid(tbf->ms())) {
- pcu_l1if_tx_pch2(bts, immediate_assignment,
plen, true, tbf->imsi(), tbf->tlli());
- } else {
- /* During GMM ATTACH REQUEST, the IMSI is not
yet known to the PCU or SGSN. (It is
-* requested after the GMM ATTACH REQUEST with
the GMM IDENTITY REQUEST.) When the PCU
-* has to assign a DL TBF but the IMSI is not
known, then the IMMEDIATE ASSIGNMENT is
-* sent on the AGCH. The reason for this is
that without an IMSI we can not calculate
-+ the paging group, which would be necessary
for transmission on PCH. Since the IMSI
-* is usually only unknown during the GMM
ATTACH REQUEST, we may assume that the MS
-* is in non-DRX mode and hence it is listening
on all CCCH blocks, including AGCH.
-*
-* See also: 3gpp TS 44.060, section 5.5.1.5
-* 3gpp TS 45.002, section 6.5.3,
6.5.6 */
- pcu_l1if
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 23 Oct 2023 10:33:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter, fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 23 Oct 2023 10:19:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: fixeria, osmith, pespin.
dexter has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email )
Change subject: pcuif_proto: drop support for PCUIF v10
..
Patch Set 3:
(2 comments)
File include/osmocom/pcu/pcuif_proto.h:
https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/d7fef340_d6a631c3
PS1, Line 16: #define PCU_IF_MSG_DATA_CNF 0x01/* (deprecated) */
> What's the problem in having gaps? Those numbers are not used in the new
> version of the protocol, so […]
I really se no problem with with having gaps. (I tend to say that we should
leave it as it is now)
File src/pcu_l1_if.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/d94997b0_dfbcf972
PS2, Line 744: if (info_ind->version == 0x0a) {
> I think you need to remove this too?
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8
Gerrit-Change-Number: 34706
Gerrit-PatchSet: 3
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: osmith
Gerrit-Attention: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 23 Oct 2023 09:46:46 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Comment-In-Reply-To: fixeria
Comment-In-Reply-To: dexter
Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, fixeria, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+1 by pespin, Code-Review-1 by fixeria, Verified+1 by Jenkins Builder Change subject: pcuif_proto: drop support for PCUIF v10 .. pcuif_proto: drop support for PCUIF v10 We now use PCUIF v11 in the TTCN3 tests exclusively and also osmo-bts and osmo-bsc only support PCUIF v11. There is no longer a need to maintain a backward compatibility to PCUIF v10 in osmo-pcu. Related: OS#5927 Change-Id: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.cpp M src/gprs_rlcmac.c M src/pcu_l1_if.cpp M tests/app_info/AppInfoTest.err 5 files changed, 34 insertions(+), 123 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/06/34706/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 .. Patch Set 2: (1 comment) File include/osmocom/pcu/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/ed3fdff5_0d3fcdec PS1, Line 16: #define PCU_IF_MSG_DATA_CNF 0x01/* (deprecated) */ > I have no preference. Technically both solutions are correct. […] What's the problem in having gaps? Those numbers are not used in the new version of the protocol, so I don't see any problem. Get them removed, PCUIF is complex enough already, no need to keep them around. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 18 Oct 2023 10:18:36 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: fixeria, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 .. Patch Set 2: (1 comment) File include/osmocom/pcu/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/c1c0c7f6_2b7772ec PS1, Line 16: #define PCU_IF_MSG_DATA_CNF 0x01/* (deprecated) */ > It's actually a good question whether we want to remove deprecated message > types and SAPIs. […] I have no preference. Technically both solutions are correct. Which one should we take now? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 18 Oct 2023 07:43:20 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 .. Patch Set 2: (1 comment) File include/osmocom/pcu/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/381f9607_20a51c13 PS1, Line 16: #define PCU_IF_MSG_DATA_CNF 0x01/* (deprecated) */ > Done It's actually a good question whether we want to remove deprecated message types and SAPIs. They are not used anymore, but if you remove them there will be gaps. I would be fine with what @pma...@sysmocom.de did in the initial patchset revision: adding deprecation comments. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 18 Oct 2023 05:10:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email )
Change subject: pcuif_proto: drop support for PCUIF v10
..
Patch Set 2: Code-Review-1
(1 comment)
File src/pcu_l1_if.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/24f67b43_aae05489
PS2, Line 744: if (info_ind->version == 0x0a) {
I think you need to remove this too?
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8
Gerrit-Change-Number: 34706
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Wed, 18 Oct 2023 05:04:41 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 17 Oct 2023 14:04:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 16 Oct 2023 10:05:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review-1 by pespin, Verified-1 by Jenkins Builder Change subject: pcuif_proto: drop support for PCUIF v10 .. pcuif_proto: drop support for PCUIF v10 We now use PCUIF v11 in the TTCN3 tests exclusively and also osmo-bts and osmo-bsc only support PCUIF v11. There is no longer a need to maintain a backward compatibility to PCUIF v10 in osmo-pcu. Related: OS#5927 Change-Id: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.cpp M src/gprs_rlcmac.c M src/pcu_l1_if.cpp M tests/app_info/AppInfoTest.err 5 files changed, 33 insertions(+), 115 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/06/34706/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: fixeria, pespin.
dexter has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email )
Change subject: pcuif_proto: drop support for PCUIF v10
..
Patch Set 2:
(3 comments)
File include/osmocom/pcu/pcuif_proto.h:
https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/ff9c86c5_b09d493a
PS1, Line 16: #define PCU_IF_MSG_DATA_CNF 0x01/* (deprecated) */
> this does no longer exist in v11 afaiu
Done
https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/b70ecf4e_4462b783
PS1, Line 38: #define PCU_IF_SAPI_AGCH 0x02/* (deprecated) */
> this does no longer exist in v11 afaiu
Done
File src/bts.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/9a046484_88c4af05
PS1, Line 1050: if (plen >= 0) {
> {} can be removed.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8
Gerrit-Change-Number: 34706
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Mon, 16 Oct 2023 09:55:10 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email )
Change subject: pcuif_proto: drop support for PCUIF v10
..
Patch Set 1: Code-Review-1
(3 comments)
File include/osmocom/pcu/pcuif_proto.h:
https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/c8997896_26149ac4
PS1, Line 16: #define PCU_IF_MSG_DATA_CNF 0x01/* (deprecated) */
this does no longer exist in v11 afaiu
https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/1f9dc75d_ffced86c
PS1, Line 38: #define PCU_IF_SAPI_AGCH 0x02/* (deprecated) */
this does no longer exist in v11 afaiu
File src/bts.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/34706/comment/a2b36e1f_4c1c6350
PS1, Line 1050: if (plen >= 0) {
{} can be removed.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8
Gerrit-Change-Number: 34706
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Tue, 10 Oct 2023 14:34:43 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
Attention is currently required from: dexter, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email ) Change subject: pcuif_proto: drop support for PCUIF v10 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34706?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: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8 Gerrit-Change-Number: 34706 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 10 Oct 2023 13:53:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: pcuif_proto: drop support for PCUIF v10
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34706?usp=email )
Change subject: pcuif_proto: drop support for PCUIF v10
..
pcuif_proto: drop support for PCUIF v10
We now use PCUIF v11 in the TTCN3 tests exclusively and also osmo-bts
and osmo-bsc only support PCUIF v11. There is no longer a need to
maintain a backward compatibility to PCUIF v10 in osmo-pcu.
Related: OS#5927
Change-Id: I68a3f59d5c960ae3a4fbd74f9d4a894295cb9ed8
---
M include/osmocom/pcu/pcuif_proto.h
M src/bts.cpp
M src/gprs_rlcmac.c
M src/pcu_l1_if.cpp
4 files changed, 33 insertions(+), 111 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/06/34706/1
diff --git a/include/osmocom/pcu/pcuif_proto.h
b/include/osmocom/pcu/pcuif_proto.h
index 9df85d9..cfa422b 100644
--- a/include/osmocom/pcu/pcuif_proto.h
+++ b/include/osmocom/pcu/pcuif_proto.h
@@ -13,7 +13,7 @@
/* msg_type */
#define PCU_IF_MSG_DATA_REQ0x00/* send data to given channel */
-#define PCU_IF_MSG_DATA_CNF0x01/* confirm (e.g. transmission on PCH) */
+#define PCU_IF_MSG_DATA_CNF0x01/* (deprecated) */
#define PCU_IF_MSG_DATA_IND0x02/* receive data from given channel */
#define PCU_IF_MSG_SUSP_REQ0x03/* BTS forwards GPRS SUSP REQ to PCU */
#define PCU_IF_MSG_APP_INFO_REQ0x04/* BTS asks PCU to transmit APP
INFO via PACCH */
@@ -35,8 +35,8 @@
/* sapi */
#define PCU_IF_SAPI_RACH 0x01/* channel request on CCCH */
-#define PCU_IF_SAPI_AGCH 0x02/* assignment on AGCH */
-#define PCU_IF_SAPI_PCH0x03/* paging/assignment on PCH */
+#define PCU_IF_SAPI_AGCH 0x02/* (deprecated) */
+#define PCU_IF_SAPI_PCH0x03/* (deprecated) */
#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 +297,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/bts.cpp b/src/bts.cpp
index 50c21a3..6dffa2d 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -1033,10 +1033,7 @@
rip->burst_type);
bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF);
if (plen >= 0) {
- if (the_pcu->pcu_if_version >= 0x0b)
- pcu_l1if_tx_agch2(bts, bv, plen, false,
GSM_RESERVED_TMSI);
- else
- pcu_l1if_tx_agch(bts, bv, plen);
+ pcu_l1if_tx_agch2(bts, bv, plen, false, GSM_RESERVED_TMSI);
rc = 0;
} else {
rc = plen;
@@ -1051,10 +1048,7 @@
(uint8_t)osmo_tdef_get(bts->T_defs_bts, 3142, OSMO_TDEF_S, -1));
bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_REJ);
if (plen >= 0) {
- if (the_pcu->pcu_if_version >= 0x0b)
- pcu_l1if_tx_agch2(bts, bv, plen, false,
GSM_RESERVED_TMSI);
- else
- pcu_l1if_tx_agch(bts, bv, plen);
+ pcu_l1if_tx_agch2(bts, bv, plen, false, GSM_RESERVED_TMSI);
}
bitvec_free(bv);
/* rc was already properly set before goto */
@@ -1136,24 +1130,20 @@
if (plen >= 0) {
bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_DL_TBF);
- if (the_pcu->pcu_if_version >= 0x0b) {
- if (ms_imsi_is_valid(tbf->ms())) {
- pcu_l1if_tx_pch2(bts, immediate_assignment,
plen, true, tbf->imsi(), tbf->tlli());
- } else {
- /* During GMM ATTACH REQUEST, the IMSI is not
yet known to the PCU or SGSN. (It is
-* requested after the GMM ATTACH REQUEST with
the GMM IDENTITY REQUEST.) When the PCU
-* has to assign a DL TBF but the IMSI is not
known, then the IMMEDIATE ASSIGNMENT is
-* sent on the AGCH. The reason for this is
that without an IMSI we can not calculate
-+ the paging group, which would be necessary
for transmission on PCH. Since the IMSI
-* is usually only unknown during the GMM
ATTACH REQUEST, we may assume that the MS
-* is in non-DRX mode and hence it is listening
on all CCCH blocks, including AGCH.
-*
-* See also: 3gpp TS 44.060, section 5.5.1.5
-* 3gpp TS 45.002, section 6.5.3,
6.5.6 */
- pcu
