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

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 ) Change subject: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2 ...................................................................... PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2 When we receive a PCUIF_DATA_REQ, f_BTS_CT_handler will mangle the incoming message for us. The resulting BTS_CCCH_Block that is sent up to the component not only contains the PCUIF message, but will also have the already parsed MAC block attached. This currently only works for PCU_IF_SAPI_PCH and PCU_IF_SAPI_PCH_2 but not for PCU_IF_SAPI_AGCH_2. Let's add compatibility for PCU_IF_SAPI_AGCH_2. Related: OS#5927 Change-Id: Ife67bde444d957822a953391b80d01d49fff064b --- M pcu/PCUIF_Components.ttcn 1 file changed, 26 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/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index 5868625..a18c774 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -502,7 +502,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_2, PCU_IF_SAPI_AGCH); + var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_PCH_2, PCU_IF_SAPI_AGCH, PCU_IF_SAPI_AGCH_2); 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 { @@ -541,6 +541,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 pch; + var PCUIF_agch agch; /* 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) { @@ -557,6 +558,12 @@ pcu_msg_rr.imsi := pch.imsi; pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch.data); pcu_msg_rr.confirm := pch.confirm; + } else if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_AGCH_2) { + agch := dec_PCUIF_agch(pcu_msg_rr.raw.data); + pcu_msg_rr.imsi := omit; + pcu_msg_rr.msg_id := agch.msg_id; + pcu_msg_rr.rr_msg := dec_GsmRrMessage(agch.data); + pcu_msg_rr.confirm := agch.confirm; } else { pcu_msg_rr.msg_id := omit; pcu_msg_rr.imsi := omit; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 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: Ife67bde444d957822a953391b80d01d49fff064b Gerrit-Change-Number: 34068 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2

by laforge

Attention is currently required from: fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 ) Change subject: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 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: Ife67bde444d957822a953391b80d01d49fff064b Gerrit-Change-Number: 34068 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 13:41:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067 ) Change subject: BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067 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: Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458 Gerrit-Change-Number: 34067 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 13:41:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34209 ) Change subject: BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34209 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: I341bbd01e8132fab913d307bfb4b2fb873cdde3c Gerrit-Change-Number: 34209 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 13:41:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF: Add support for PCU_IF_SAPI_AGCH_2

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 ) Change subject: PCUIF: Add support for PCU_IF_SAPI_AGCH_2 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 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: I40e05a2e68cca77d3c2f41df9af8d35762488abf Gerrit-Change-Number: 34066 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 13:41:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: osmobts_sock: cosmetic, put a dot between "v" and version number

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34239 ) Change subject: osmobts_sock: cosmetic, put a dot between "v" and version number ...................................................................... osmobts_sock: cosmetic, put a dot between "v" and version number Change-Id: I7c70c4d4440fa9885e1efb80e6f2e4e821ac916f --- M src/osmobts_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/39/34239/1 diff --git a/src/osmobts_sock.c b/src/osmobts_sock.c index c77605f..343fae8 100644 --- a/src/osmobts_sock.c +++ b/src/osmobts_sock.c @@ -217,7 +217,7 @@ int pcu_l1if_open(void) { int rc; - LOGP(DL1IF, LOGL_INFO, "Opening OsmoPCU L1 interface v%u to OsmoBTS\n", PCU_IF_VERSION); + LOGP(DL1IF, LOGL_INFO, "Opening OsmoPCU L1 interface v.%u to OsmoBTS\n", PCU_IF_VERSION); memset(&pcu_sock_state, 0x00, sizeof(pcu_sock_state)); INIT_LLIST_HEAD(&pcu_sock_state.upqueue); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7c70c4d4440fa9885e1efb80e6f2e4e821ac916f Gerrit-Change-Number: 34239 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add simtrace

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34237 ) Change subject: jobs/master-builds: add simtrace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0980ceafa4d1187630b75b45b01b538c750021bb Gerrit-Change-Number: 34237 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 13:38:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/master-builds: add xgoldmon

by laforge

Attention is currently required from: osmith, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34236 ) Change subject: jobs/master-builds: add xgoldmon ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: FYI, I would expect tobias to merge the jenkins.sh script to upstream if it simplifies things. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ice5704eb12f3c3a777961bc18a55fac63df80fd6 Gerrit-Change-Number: 34236 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 13:38:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in libusrp[master]: linter: Don't check header files

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libusrp/+/34233 ) Change subject: linter: Don't check header files ...................................................................... linter: Don't check header files None of those follow osmocom coding style. Change-Id: I2276ca7aa2b246447aeebcaa5a8cb3049147c3c9 --- A .checkpatch.conf 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..edd1686 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1 @@ +--exclude .*h -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I2276ca7aa2b246447aeebcaa5a8cb3049147c3c9 Gerrit-Change-Number: 34233 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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

8 months, 3 weeks

1
0
0 0

[M] Change in libusrp[master]: Fix compilation with newer sdcc

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libusrp/+/34235 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Fix compilation with newer sdcc ...................................................................... Fix compilation with newer sdcc Since recent system upgrade which pulled in sdcc 4.3.0, build fails with following error: /git/libusrp/firmware/include/fx2regs.h:324: syntax error: token -> '+' ; column 26 It seems newer sdcc doesn't like having sums directly in there. Using parenthesis around the expression fixes the problem. Related: OS#6157 Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea --- M firmware/include/fx2regs.h M firmware/src/usrp2/usrp_rev2_regs.h 2 files changed, 92 insertions(+), 75 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/include/fx2regs.h b/firmware/include/fx2regs.h index 455b067..c097d17 100644 --- a/firmware/include/fx2regs.h +++ b/firmware/include/fx2regs.h @@ -321,7 +321,7 @@ __sfr __at 0x85 DPH1; __sfr __at 0x86 DPS; /* DPS */ - __sbit __at 0x86+0 SEL; + __sbit __at (0x86+0) SEL; __sfr __at 0x87 PCON; /* PCON */ //__sbit IDLE = 0x87+0; //__sbit STOP = 0x87+1; @@ -330,14 +330,14 @@ //__sbit SMOD0 = 0x87+7; __sfr __at 0x88 TCON; /* TCON */ - __sbit __at 0x88+0 IT0; - __sbit __at 0x88+1 IE0; - __sbit __at 0x88+2 IT1; - __sbit __at 0x88+3 IE1; - __sbit __at 0x88+4 TR0; - __sbit __at 0x88+5 TF0; - __sbit __at 0x88+6 TR1; - __sbit __at 0x88+7 TF1; + __sbit __at (0x88+0) IT0; + __sbit __at (0x88+1) IE0; + __sbit __at (0x88+2) IT1; + __sbit __at (0x88+3) IE1; + __sbit __at (0x88+4) TR0; + __sbit __at (0x88+5) TF0; + __sbit __at (0x88+6) TR1; + __sbit __at (0x88+7) TF1; __sfr __at 0x89 TMOD; /* TMOD */ //__sbit M00 = 0x89+0; @@ -373,14 +373,14 @@ __sfr __at 0x92 MPAGE; __sfr __at 0x98 SCON0; /* SCON0 */ - __sbit __at 0x98+0 RI; - __sbit __at 0x98+1 TI; - __sbit __at 0x98+2 RB8; - __sbit __at 0x98+3 TB8; - __sbit __at 0x98+4 REN; - __sbit __at 0x98+5 SM2; - __sbit __at 0x98+6 SM1; - __sbit __at 0x98+7 SM0; + __sbit __at (0x98+0) RI; + __sbit __at (0x98+1) TI; + __sbit __at (0x98+2) RB8; + __sbit __at (0x98+3) TB8; + __sbit __at (0x98+4) REN; + __sbit __at (0x98+5) SM2; + __sbit __at (0x98+6) SM1; + __sbit __at (0x98+7) SM0; __sfr __at 0x99 SBUF0; __sfr __at 0x9A APTR1H; @@ -398,14 +398,14 @@ __sfr __at 0xA8 IE; /* IE */ - __sbit __at 0xA8+0 EX0; - __sbit __at 0xA8+1 ET0; - __sbit __at 0xA8+2 EX1; - __sbit __at 0xA8+3 ET1; - __sbit __at 0xA8+4 ES0; - __sbit __at 0xA8+5 ET2; - __sbit __at 0xA8+6 ES1; - __sbit __at 0xA8+7 EA; + __sbit __at (0xA8+0) EX0; + __sbit __at (0xA8+1) ET0; + __sbit __at (0xA8+2) EX1; + __sbit __at (0xA8+3) ET1; + __sbit __at (0xA8+4) ES0; + __sbit __at (0xA8+5) ET2; + __sbit __at (0xA8+6) ES1; + __sbit __at (0xA8+7) EA; __sfr __at 0xAA EP2468STAT; /* EP2468STAT */ @@ -436,13 +436,13 @@ __sfr __at 0xB8 IP; /* IP */ - __sbit __at 0xB8+0 PX0; - __sbit __at 0xB8+1 PT0; - __sbit __at 0xB8+2 PX1; - __sbit __at 0xB8+3 PT1; - __sbit __at 0xB8+4 PS0; - __sbit __at 0xB8+5 PT2; - __sbit __at 0xB8+6 PS1; + __sbit __at (0xB8+0) PX0; + __sbit __at (0xB8+1) PT0; + __sbit __at (0xB8+2) PX1; + __sbit __at (0xB8+3) PT1; + __sbit __at (0xB8+4) PS0; + __sbit __at (0xB8+5) PT2; + __sbit __at (0xB8+6) PS1; __sfr __at 0xBA EP01STAT; __sfr __at 0xBB GPIFTRIG; @@ -453,61 +453,61 @@ __sfr __at 0xC0 SCON1; /* SCON1 */ - __sbit __at 0xC0+0 RI1; - __sbit __at 0xC0+1 TI1; - __sbit __at 0xC0+2 RB81; - __sbit __at 0xC0+3 TB81; - __sbit __at 0xC0+4 REN1; - __sbit __at 0xC0+5 SM21; - __sbit __at 0xC0+6 SM11; - __sbit __at 0xC0+7 SM01; + __sbit __at (0xC0+0) RI1; + __sbit __at (0xC0+1) TI1; + __sbit __at (0xC0+2) RB81; + __sbit __at (0xC0+3) TB81; + __sbit __at (0xC0+4) REN1; + __sbit __at (0xC0+5) SM21; + __sbit __at (0xC0+6) SM11; + __sbit __at (0xC0+7) SM01; __sfr __at 0xC1 SBUF1; __sfr __at 0xC8 T2CON; /* T2CON */ - __sbit __at 0xC8+0 CP_RL2; - __sbit __at 0xC8+1 C_T2; - __sbit __at 0xC8+2 TR2; - __sbit __at 0xC8+3 EXEN2; - __sbit __at 0xC8+4 TCLK; - __sbit __at 0xC8+5 RCLK; - __sbit __at 0xC8+6 EXF2; - __sbit __at 0xC8+7 TF2; + __sbit __at (0xC8+0) CP_RL2; + __sbit __at (0xC8+1) C_T2; + __sbit __at (0xC8+2) TR2; + __sbit __at (0xC8+3) EXEN2; + __sbit __at (0xC8+4) TCLK; + __sbit __at (0xC8+5) RCLK; + __sbit __at (0xC8+6) EXF2; + __sbit __at (0xC8+7) TF2; __sfr __at 0xCA RCAP2L; __sfr __at 0xCB RCAP2H; __sfr __at 0xCC TL2; __sfr __at 0xCD TH2; __sfr __at 0xD0 PSW; /* PSW */ - __sbit __at 0xD0+0 P; - __sbit __at 0xD0+1 FL; - __sbit __at 0xD0+2 OV; - __sbit __at 0xD0+3 RS0; - __sbit __at 0xD0+4 RS1; - __sbit __at 0xD0+5 F0; - __sbit __at 0xD0+6 AC; - __sbit __at 0xD0+7 CY; + __sbit __at (0xD0+0) P; + __sbit __at (0xD0+1) FL; + __sbit __at (0xD0+2) OV; + __sbit __at (0xD0+3) RS0; + __sbit __at (0xD0+4) RS1; + __sbit __at (0xD0+5) F0; + __sbit __at (0xD0+6) AC; + __sbit __at (0xD0+7) CY; __sfr __at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320 /* EICON */ - __sbit __at 0xD8+3 INT6; - __sbit __at 0xD8+4 RESI; - __sbit __at 0xD8+5 ERESI; - __sbit __at 0xD8+7 SMOD1; + __sbit __at (0xD8+3) INT6; + __sbit __at (0xD8+4) RESI; + __sbit __at (0xD8+5) ERESI; + __sbit __at (0xD8+7) SMOD1; __sfr __at 0xE0 ACC; __sfr __at 0xE8 EIE; // EIE Bit Values differ from Reg320 /* EIE */ - __sbit __at 0xE8+0 EIUSB; - __sbit __at 0xE8+1 EI2C; - __sbit __at 0xE8+2 EIEX4; - __sbit __at 0xE8+3 EIEX5; - __sbit __at 0xE8+4 EIEX6; + __sbit __at (0xE8+0) EIUSB; + __sbit __at (0xE8+1) EI2C; + __sbit __at (0xE8+2) EIEX4; + __sbit __at (0xE8+3) EIEX5; + __sbit __at (0xE8+4) EIEX6; __sfr __at 0xF0 B; __sfr __at 0xF8 EIP; // EIP Bit Values differ from Reg320 /* EIP */ - __sbit __at 0xF8+0 PUSB; - __sbit __at 0xF8+1 PI2C; - __sbit __at 0xF8+2 EIPX4; - __sbit __at 0xF8+3 EIPX5; - __sbit __at 0xF8+4 EIPX6; + __sbit __at (0xF8+0) PUSB; + __sbit __at (0xF8+1) PI2C; + __sbit __at (0xF8+2) EIPX4; + __sbit __at (0xF8+3) EIPX5; + __sbit __at (0xF8+4) EIPX6; /*----------------------------------------------------------------------------- Bit Masks diff --git a/firmware/src/usrp2/usrp_rev2_regs.h b/firmware/src/usrp2/usrp_rev2_regs.h index 4390f13..8e5ade2 100644 --- a/firmware/src/usrp2/usrp_rev2_regs.h +++ b/firmware/src/usrp2/usrp_rev2_regs.h @@ -47,9 +47,9 @@ #define bmPA_TX_UNDERRUN bmBIT7 // misc pin to FPGA (underflow) -__sbit __at 0x80+0 bitS_CLK; // 0x80 is the bit address of PORT A -__sbit __at 0x80+1 bitS_OUT; // out from FX2 point of view -__sbit __at 0x80+2 bitS_IN; // in from FX2 point of view +__sbit __at (0x80+0) bitS_CLK; // 0x80 is the bit address of PORT A +__sbit __at (0x80+1) bitS_OUT; // out from FX2 point of view +__sbit __at (0x80+2) bitS_IN; // in from FX2 point of view /* all outputs except S_DATA_FROM_PERIPH, FX2_2, FX2_3 */ @@ -85,8 +85,8 @@ #define bmPC_LED0 bmBIT6 // active low #define bmPC_LED1 bmBIT7 // active low -__sbit __at 0xA0+1 bitALTERA_DATA0; // 0xA0 is the bit address of PORT C -__sbit __at 0xA0+3 bitALTERA_DCLK; +__sbit __at (0xA0+1) bitALTERA_DATA0; // 0xA0 is the bit address of PORT C +__sbit __at (0xA0+3) bitALTERA_DCLK; #define bmALTERA_BITS (bmALTERA_DATA0 \ -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea Gerrit-Change-Number: 34235 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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

8 months, 3 weeks

1
0
0 0

[M] Change in libusrp[master]: cosmetic: fx2regs.h: Fix trailing whitespace

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libusrp/+/34234 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: cosmetic: fx2regs.h: Fix trailing whitespace ...................................................................... cosmetic: fx2regs.h: Fix trailing whitespace Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db --- M firmware/include/fx2regs.h 1 file changed, 31 insertions(+), 22 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/include/fx2regs.h b/firmware/include/fx2regs.h index dec5164..455b067 100644 --- a/firmware/include/fx2regs.h +++ b/firmware/include/fx2regs.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -45,18 +45,18 @@ // FX2 Related Register Assignments //----------------------------------------------------------------------------- -// The Ez-USB FX2 registers are defined here. We use FX2regs.h for register -// address allocation by using "#define ALLOCATE_EXTERN". -// When using "#define ALLOCATE_EXTERN", you get (for instance): +// The Ez-USB FX2 registers are defined here. We use FX2regs.h for register +// address allocation by using "#define ALLOCATE_EXTERN". +// When using "#define ALLOCATE_EXTERN", you get (for instance): // __xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40; -// Such lines are created from FX2.h by using the preprocessor. -// Incidently, these lines will not generate any space in the resulting hex -// file; they just bind the symbols to the addresses for compilation. -// You just need to put "#define ALLOCATE_EXTERN" in your main program file; -// i.e. fw.c or a stand-alone C source file. -// Without "#define ALLOCATE_EXTERN", you just get the external reference: +// Such lines are created from FX2.h by using the preprocessor. +// Incidently, these lines will not generate any space in the resulting hex +// file; they just bind the symbols to the addresses for compilation. +// You just need to put "#define ALLOCATE_EXTERN" in your main program file; +// i.e. fw.c or a stand-alone C source file. +// Without "#define ALLOCATE_EXTERN", you just get the external reference: // extern __xdata volatile BYTE OUT7BUF[64] ;// 0x7B40; -// This uses the concatenation operator "##" to insert a comment "//" +// This uses the concatenation operator "##" to insert a comment "//" // to cut off the end of the line, "_at_ 0x7B40;", which is not wanted. */ @@ -273,10 +273,10 @@ EXTERN __xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state EXTERN __xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state EXTERN __xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ; -EXTERN __xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe +EXTERN __xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe EXTERN __xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge EXTERN __xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe -EXTERN __xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift +EXTERN __xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift EXTERN __xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte EXTERN __xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte EXTERN __xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only @@ -308,8 +308,8 @@ /*----------------------------------------------------------------------------- Special Function Registers (SFRs) The byte registers and bits defined in the following list are based - on the Synopsis definition of the 8051 Special Function Registers for EZ-USB. - If you modify the register definitions below, please regenerate the file + on the Synopsis definition of the 8051 Special Function Registers for EZ-USB. + If you modify the register definitions below, please regenerate the file "ezregs.inc" which includes the same basic information for assembly inclusion. -----------------------------------------------------------------------------*/ @@ -385,9 +385,9 @@ __sfr __at 0x9A APTR1H; __sfr __at 0x9B APTR1L; -__sfr __at 0x9C AUTODAT1; +__sfr __at 0x9C AUTODAT1; __sfr __at 0x9D AUTOPTRH2; -__sfr __at 0x9E AUTOPTRL2; +__sfr __at 0x9E AUTOPTRL2; __sfr __at 0x9F AUTODAT2; __sfr __at 0xA0 IOC; __sfr __at 0xA1 INT2CLR; @@ -446,7 +446,7 @@ __sfr __at 0xBA EP01STAT; __sfr __at 0xBB GPIFTRIG; - + __sfr __at 0xBD GPIFSGLDATH; __sfr __at 0xBE GPIFSGLDATLX; __sfr __at 0xBF GPIFSGLDATLNOX; @@ -666,7 +666,7 @@ /* * Chip Revision Control Bits (REVCTL) - used to ebable/disable revision specific features - */ + */ #define bmNOAUTOARM bmBIT1 // these don't match the docs #define bmSKIPCOMMIT bmBIT0 // these don't match the docs -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db Gerrit-Change-Number: 34234 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 3 weeks

1
0
0 0

[S] Change in libusrp[master]: linter: Don't check header files

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/34233 ) Change subject: linter: Don't check header files ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I2276ca7aa2b246447aeebcaa5a8cb3049147c3c9 Gerrit-Change-Number: 34233 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-Comment-Date: Tue, 29 Aug 2023 12:05:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in libusrp[master]: linter: Don't check header files

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libusrp/+/34233 to look at the new patch set (#2). Change subject: linter: Don't check header files ...................................................................... linter: Don't check header files None of those follow osmocom coding style. Change-Id: I2276ca7aa2b246447aeebcaa5a8cb3049147c3c9 --- A .checkpatch.conf 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/33/34233/2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I2276ca7aa2b246447aeebcaa5a8cb3049147c3c9 Gerrit-Change-Number: 34233 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[M] Change in libusrp[master]: Fix compilation with newer sdcc

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libusrp/+/34235 to look at the new patch set (#2). Change subject: Fix compilation with newer sdcc ...................................................................... Fix compilation with newer sdcc Since recent system upgrade which pulled in sdcc 4.3.0, build fails with following error: /git/libusrp/firmware/include/fx2regs.h:324: syntax error: token -> '+' ; column 26 It seems newer sdcc doesn't like having sums directly in there. Using parenthesis around the expression fixes the problem. Related: OS#6157 Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea --- M firmware/include/fx2regs.h M firmware/src/usrp2/usrp_rev2_regs.h 2 files changed, 92 insertions(+), 75 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/35/34235/2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea Gerrit-Change-Number: 34235 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[M] Change in libusrp[master]: cosmetic: fx2regs.h: Fix trailing whitespace

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libusrp/+/34234 to look at the new patch set (#2). Change subject: cosmetic: fx2regs.h: Fix trailing whitespace ...................................................................... cosmetic: fx2regs.h: Fix trailing whitespace Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db --- M firmware/include/fx2regs.h 1 file changed, 31 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/34/34234/2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db Gerrit-Change-Number: 34234 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF: use confirm flag in struct gsm_pcu_if_pch

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 ) Change subject: PCUIF: use confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 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: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac Gerrit-Change-Number: 34194 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 12:01:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2

by pespin

Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 ) Change subject: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2 ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 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: Ife67bde444d957822a953391b80d01d49fff064b Gerrit-Change-Number: 34068 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 12:01:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34209 ) Change subject: BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34209 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: I341bbd01e8132fab913d307bfb4b2fb873cdde3c Gerrit-Change-Number: 34209 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: Tue, 29 Aug 2023 12:00:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF: Add support for PCU_IF_SAPI_AGCH_2

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 ) Change subject: PCUIF: Add support for PCU_IF_SAPI_AGCH_2 ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 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: I40e05a2e68cca77d3c2f41df9af8d35762488abf Gerrit-Change-Number: 34066 Gerrit-PatchSet: 3 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: Tue, 29 Aug 2023 12:00:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067 ) Change subject: BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067 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: Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458 Gerrit-Change-Number: 34067 Gerrit-PatchSet: 3 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: Tue, 29 Aug 2023 11:59:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in libusrp[master]: Fix compilation with newer sdcc

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/34235 ) Change subject: Fix compilation with newer sdcc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea Gerrit-Change-Number: 34235 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:42:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in libusrp[master]: linter: Don't check header files

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/34233 ) Change subject: linter: Don't check header files ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libusrp/+/34233/comment/66200e30_8f11530f PS1, Line 9: somocom coding style the famous somocom coding style :D -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I2276ca7aa2b246447aeebcaa5a8cb3049147c3c9 Gerrit-Change-Number: 34233 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:42:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Fix uninitialized values in vgcs_fsm.c, found by gcc 13.1.1.202...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34029 ) Change subject: ASCI: Fix uninitialized values in vgcs_fsm.c, found by gcc 13.1.1.20230714 ...................................................................... ASCI: Fix uninitialized values in vgcs_fsm.c, found by gcc 13.1.1.20230714 Change-Id: Iee4cc0fbf03e7ca4b53424f7f52ed9d599f96e49 --- M src/osmo-bsc/vgcs_fsm.c 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/vgcs_fsm.c b/src/osmo-bsc/vgcs_fsm.c index 6b78933..8969d4f 100644 --- a/src/osmo-bsc/vgcs_fsm.c +++ b/src/osmo-bsc/vgcs_fsm.c @@ -539,8 +539,10 @@ /* Create VGCS FSM. */ conn->vgcs_call.fi = osmo_fsm_inst_alloc(&vgcs_call_fsm, conn->network, conn, LOGL_DEBUG, NULL); - if (!conn->vgcs_call.fi) + if (!conn->vgcs_call.fi) { + cause = GSM0808_CAUSE_INCORRECT_VALUE; goto reject; + } /* Init list of cells that are used by the call. */ INIT_LLIST_HEAD(&conn->vgcs_call.chan_list); @@ -1080,7 +1082,7 @@ }; uint8_t cause; struct gsm_bts *bts; - struct gsm_lchan *lchan; + struct gsm_lchan *lchan = NULL; int rc; int i; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee4cc0fbf03e7ca4b53424f7f52ed9d599f96e49 Gerrit-Change-Number: 34029 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Fix uninitialized values in vgcs_fsm.c, found by gcc 13.1.1.202...

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34029 ) Change subject: ASCI: Fix uninitialized values in vgcs_fsm.c, found by gcc 13.1.1.20230714 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee4cc0fbf03e7ca4b53424f7f52ed9d599f96e49 Gerrit-Change-Number: 34029 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:28:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF: use confirm flag in struct gsm_pcu_if_pch

by osmith

Attention is currently required from: pespin, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 ) Change subject: PCUIF: use confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 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: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac Gerrit-Change-Number: 34194 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:25:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: GPRS_Components: remove excess new-line

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34208 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: GPRS_Components: remove excess new-line ...................................................................... GPRS_Components: remove excess new-line Change-Id: Id039755d0136276ec2fb8f6d370a4415a8d3e17e --- M pcu/GPRS_Components.ttcn 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 491a496..4b8ca5b 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -899,7 +899,6 @@ BTS.send(pcu_msg_cnf); } - private function f_ms_gtfi_tmpl(inout GprsMS ms) runs on MS_BTS_IFACE_CT return template (present) GlobalTfi { var template (present) GlobalTfi gtfi; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34208 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: Id039755d0136276ec2fb8f6d370a4415a8d3e17e Gerrit-Change-Number: 34208 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(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

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF: Add support for PCU_IF_SAPI_AGCH_2

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 to look at the new patch set (#3). Change subject: PCUIF: Add support for PCU_IF_SAPI_AGCH_2 ...................................................................... PCUIF: Add support for PCU_IF_SAPI_AGCH_2 In PCUIF v.11 it will be possible to get confirmations for IMMEDIATE ASSIGNMENT messages sent through the AGCH. Related: OS#5927 Change-Id: I40e05a2e68cca77d3c2f41df9af8d35762488abf --- M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn 2 files changed, 76 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/34066/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 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: I40e05a2e68cca77d3c2f41df9af8d35762488abf Gerrit-Change-Number: 34066 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF: use confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 ) Change subject: PCUIF: use confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 3: (1 comment) File pcu/PCUIF_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194/comment/81b4e409_0750… PS2, Line 173: confirm:= confirm > missing space Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 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: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac Gerrit-Change-Number: 34194 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:18:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PCUIF: Add support for PCU_IF_SAPI_AGCH_2

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 ) Change subject: PCUIF: Add support for PCU_IF_SAPI_AGCH_2 ...................................................................... Patch Set 3: (3 comments) File library/PCUIF_CodecPort.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066/comment/a32a9a5c_5d1a… PS2, Line 217: pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_AGCH_2, enc_PCUIF_agch(agch)))); > shouldn't tbis be enc_PCUIF_agch2? in this case not, there was no type record PCUIF_agch before. The same is the case for type record PCUIF_pch and enc_PCUIF_pch https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066/comment/33f12c75_994e… PS2, Line 220: /* Exit early when the caller is not interested in the confirmation message */ > I think you are mixing 2 things her: confirmation and wait_for_confirmation. […] Done File library/PCUIF_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066/comment/023c417c_9689… PS2, Line 326: * data request (data_req) under SAPI PCU_IF_SAPI_AGCH_2. */ > I wonder how do we properly enc/dec PCH and AGCH <v11 in here, since the records seem to apply to v1 […] There was no extra record around the data. For the AGCH its just the mac block as it is. For the PCH we were prepending the first three IMSI digits and the TLLI manually. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 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: I40e05a2e68cca77d3c2f41df9af8d35762488abf Gerrit-Change-Number: 34066 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:18:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF: use confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 to look at the new patch set (#3). Change subject: PCUIF: use confirm flag in struct gsm_pcu_if_pch ...................................................................... PCUIF: use confirm flag in struct gsm_pcu_if_pch In the recent PCUIF change of osmo-pcu (see Depends) a confirm flag is added to struct gsm_pcu_if_pch. This flag tells the receiving end (OsmoBSC or OsmoBTS) that the sending of the received MAC block has to be confirmed towards the PCU. OsmoBTS and OsmoPCU now rely on the conformation flag. Let's update the BTS_and PCU testsuites accordingly. Related: OS#5927 Depends: osmo-pcu.git Ia202862aafc1f0cb6601574ef61eb9155de11f04 Change-Id: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac --- M bts/BTS_Tests.ttcn M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn M pcu/PCUIF_Components.ttcn 4 files changed, 30 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/34194/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 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: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac Gerrit-Change-Number: 34194 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067 to look at the new patch set (#3). Change subject: BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch ...................................................................... BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch In PCUIF v.11 we support getting confirmations for IMMEDIATE ASSIGNMENT messages that are sent through the AGCH. Related: OS#5927 Change-Id: Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458 --- M bts/BTS_Tests.ttcn 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/34067/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067 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: Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458 Gerrit-Change-Number: 34067 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34209 to look at the new patch set (#2). Change subject: BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch ...................................................................... BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch The testcase TC_pcu_data_req_agch uses SAPI PCU_IF_SAPI_AGCH. Since we now have a function f_PCUIF_tx_mac_block_agch() to send MAC blocks over the AGCH using the recently introduced SAPI PCU_IF_SAPI_AGCH_2, lets use this function instead. Related: OS#5927 Change-Id: I341bbd01e8132fab913d307bfb4b2fb873cdde3c --- M bts/BTS_Tests.ttcn 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/34209/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34209 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: I341bbd01e8132fab913d307bfb4b2fb873cdde3c Gerrit-Change-Number: 34209 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-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067 ) Change subject: BTS_Tests: add new testcase TC_pcu_data_req_imm_ass_agch ...................................................................... Patch Set 3: (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067/comment/117f9cba_fea7… PS2, Line 5883: /* TODO: verify paging group */ > not sure what do you mean with paging group in AGCH? oh, thats a copy+paste artifact. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34067 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: Iec00d8144dfb2cd8bcee9093c96a3cc98aea6458 Gerrit-Change-Number: 34067 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:18:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2

by dexter

Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 ) Change subject: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2 ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068/comment/01dc4875_764b… PS2, Line 15: PCU_IF_SAPI_AGCH_DT > Did you mean `PCU_IF_SAPI_AGCH_2` here? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 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: Ife67bde444d957822a953391b80d01d49fff064b Gerrit-Change-Number: 34068 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:18:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2

by dexter

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 to look at the new patch set (#3). Change subject: PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2 ...................................................................... PCUIF_Components: add compatibility for PCU_IF_SAPI_AGCH_2 When we receive a PCUIF_DATA_REQ, f_BTS_CT_handler will mangle the incoming message for us. The resulting BTS_CCCH_Block that is sent up to the component not only contains the PCUIF message, but will also have the already parsed MAC block attached. This currently only works for PCU_IF_SAPI_PCH and PCU_IF_SAPI_PCH_2 but not for PCU_IF_SAPI_AGCH_2. Let's add compatibility for PCU_IF_SAPI_AGCH_2. Related: OS#5927 Change-Id: Ife67bde444d957822a953391b80d01d49fff064b --- M pcu/PCUIF_Components.ttcn 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/34068/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34068 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: Ife67bde444d957822a953391b80d01d49fff064b Gerrit-Change-Number: 34068 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/master-builds: add xgoldmon

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34236 ) Change subject: jobs/master-builds: add xgoldmon ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ice5704eb12f3c3a777961bc18a55fac63df80fd6 Gerrit-Change-Number: 34236 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:10:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add simtrace

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34237 ) Change subject: jobs/master-builds: add simtrace ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0980ceafa4d1187630b75b45b01b538c750021bb Gerrit-Change-Number: 34237 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:09:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add osmo-ir77

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34238 ) Change subject: jobs/master-builds: add osmo-ir77 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I45034e4ed9ed8ad5683ac2de24521649f138b41c Gerrit-Change-Number: 34238 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:08:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add osmo-ir77

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34238 ) Change subject: jobs/master-builds: add osmo-ir77 ...................................................................... jobs/master-builds: add osmo-ir77 Replace the legacy osmo-ir77 job (not done with jenkins-job-builder) with a new master-osmo-ir77 job that works just like the other master jobs: - build in docker - have build commands in contrib/jenkins.sh Depends: https://gitea.osmocom.org/satellite/osmo-ir77/pulls/1 Change-Id: I45034e4ed9ed8ad5683ac2de24521649f138b41c --- M jobs/master-builds.yml 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/38/34238/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 2e54b63..f57bc96 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -343,6 +343,10 @@ master-osmo-hnodeb, master-osmo-hnbgw + - osmo-ir77: + git_base_url: https://gitea.osmocom.org/satellite + email: jenkins-notifications(a)lists.osmocom.org 246tnt(a)gmail.com + - osmo-mgw: trigger: master-osmo-msc, master-osmo-bsc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I45034e4ed9ed8ad5683ac2de24521649f138b41c Gerrit-Change-Number: 34238 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add simtrace

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34237 ) Change subject: jobs/master-builds: add simtrace ...................................................................... jobs/master-builds: add simtrace Replace the legacy SIMtrace job (not done with jenkins-job-builder) with a new master-simtrace job that works just like the other master jobs: - build in docker - have build commands in contrib/jenkins.sh Set the same notification mails as for simtrace2. Depends: https://gitea.osmocom.org/sim-card/simtrace/pulls/1 Change-Id: I0980ceafa4d1187630b75b45b01b538c750021bb --- M jobs/master-builds.yml 1 file changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/37/34237/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 6a2926c..2e54b63 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -173,7 +173,7 @@ # master-osmo-bsc, master-osmo-bts, master-osmo-ggsn, master-osmo-gmr, master-osmo-hlr, # master-osmo-iuh, master-osmo-mgw, master-osmo-msc, master-osmo-pcap, master-osmo-pcu, # master-osmo-sgsn, master-osmo-sip-connector, master-osmo-tetra, master-osmo-hnodeb - # master-osmocom-bb, SIMtrace, master-xgoldmon + # master-osmocom-bb, master-simtrace, master-xgoldmon # Optimized: # libosmocore # -> master-libosmo-abis @@ -211,7 +211,7 @@ master-osmo-tetra, master-osmo-trx, master-osmocom-bb, - SIMtrace, + master-simtrace, master-xgoldmon - libsmpp34: @@ -447,6 +447,9 @@ ssh: - binaries_ftp.osmocom.org - docs_ftp.osmocom.org + - simtrace: + git_base_url: https://gitea.osmocom.org/sim-card + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - simtrace2: cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0980ceafa4d1187630b75b45b01b538c750021bb Gerrit-Change-Number: 34237 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/master-builds: add xgoldmon

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34236 ) Change subject: jobs/master-builds: add xgoldmon ...................................................................... jobs/master-builds: add xgoldmon Replace the legacy xgoldmon job (not done with jenkins-job-builder) with a new master-xgoldmon job that works more similar to other master jobs: - build in docker - have build commands in a jenkins.sh script Put the jenkins.sh script into osmo-ci, as the upstream repository is outside of Osmocom infrastructure. The motivation for this change is, that the current xgoldmon job is failing since libosmocore depends on liburing by default. This uncovered that the job is still running outside of docker, where the dependency has already been added. The following patches will modernize other jobs which have the same problem. Change-Id: Ice5704eb12f3c3a777961bc18a55fac63df80fd6 --- M jobs/master-builds.yml A scripts/xgoldmon-jenkins.sh 2 files changed, 54 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/36/34236/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 6837d78..6a2926c 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -173,7 +173,7 @@ # master-osmo-bsc, master-osmo-bts, master-osmo-ggsn, master-osmo-gmr, master-osmo-hlr, # master-osmo-iuh, master-osmo-mgw, master-osmo-msc, master-osmo-pcap, master-osmo-pcu, # master-osmo-sgsn, master-osmo-sip-connector, master-osmo-tetra, master-osmo-hnodeb - # master-osmocom-bb, SIMtrace, xgoldmon + # master-osmocom-bb, SIMtrace, master-xgoldmon # Optimized: # libosmocore # -> master-libosmo-abis @@ -212,7 +212,7 @@ master-osmo-trx, master-osmocom-bb, SIMtrace, - xgoldmon + master-xgoldmon - libsmpp34: trigger: master-osmo-msc, master-openbsc @@ -519,6 +519,12 @@ - dahdi-tools + - xgoldmon: + git_base_url: https://github.com/2b-as + cmd: | + git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b master + {docker_run_ccache} {docker_img} {timeout_cmd} /build/osmo-ci/scripts/xgoldmon-jenkins.sh + jobs: - 'master-{repos}' diff --git a/scripts/xgoldmon-jenkins.sh b/scripts/xgoldmon-jenkins.sh new file mode 100755 index 0000000..0635db4 --- /dev/null +++ b/scripts/xgoldmon-jenkins.sh @@ -0,0 +1,23 @@ +#!/bin/sh -ex +# Used by jobs/master-builds.yml for xgoldmon +TOPDIR=/build + +if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: missing scripts from osmo-ci.git in PATH!" + exit 2 +fi + +set -x + +osmo-clean-workspace.sh + +export deps="$TOPDIR/deps" +export inst="$deps/install" +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" + +mkdir -p deps +osmo-build-dep.sh libosmocore "" '--disable-doxygen' + +cd "$TOPDIR" +$MAKE -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ice5704eb12f3c3a777961bc18a55fac63df80fd6 Gerrit-Change-Number: 34236 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

[M] Change in libusrp[master]: Fix compilation with newer sdcc

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/34235 ) Change subject: Fix compilation with newer sdcc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea Gerrit-Change-Number: 34235 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 11:00:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in libusrp[master]: cosmetic: fx2regs.h: Fix trailing whitespace

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/34234 ) Change subject: cosmetic: fx2regs.h: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db Gerrit-Change-Number: 34234 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:59:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in libusrp[master]: linter: Don't check header files

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/34233 ) Change subject: linter: Don't check header files ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I2276ca7aa2b246447aeebcaa5a8cb3049147c3c9 Gerrit-Change-Number: 34233 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:59:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: ASCI: Fix uninitialized values in vgcs_fsm.c, found by gcc 13.1.1.202...

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34029 ) Change subject: ASCI: Fix uninitialized values in vgcs_fsm.c, found by gcc 13.1.1.20230714 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee4cc0fbf03e7ca4b53424f7f52ed9d599f96e49 Gerrit-Change-Number: 34029 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 29 Aug 2023 10:57:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: DIAMETER: Origin-State-Id in DWR and DWA messages is optional

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34230 ) Change subject: DIAMETER: Origin-State-Id in DWR and DWA messages is optional ...................................................................... DIAMETER: Origin-State-Id in DWR and DWA messages is optional Change-Id: I02e6f97a308f1752711aafed39c1d7534a382c70 --- M library/DIAMETER_Templates.ttcn 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 85725fc..63db7fc 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -1678,8 +1678,8 @@ ete_id := ete_id, avps := superset( tr_AVP_OriginHost(orig_host), - tr_AVP_OriginRealm(orig_realm), - tr_AVP_OriginStateId(state_id) + tr_AVP_OriginRealm(orig_realm) + /* tr_AVP_OriginStateId(state_id) is optional */ )); /* RFC 6733, section 5.5.2 "Device-Watchdog-Answer" */ @@ -1714,8 +1714,8 @@ avps := superset( tr_AVP_ResultCode(DIAMETER_SUCCESS), tr_AVP_OriginHost(orig_host), - tr_AVP_OriginRealm(orig_realm), - tr_AVP_OriginStateId(state_id) + tr_AVP_OriginRealm(orig_realm) + /* tr_AVP_OriginStateId(state_id) is optional */ )); function f_DIAMETER_get_avp(PDU_DIAMETER pdu, template (present) AVP_Code avp_code) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34230 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: I02e6f97a308f1752711aafed39c1d7534a382c70 Gerrit-Change-Number: 34230 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 ) Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 3 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: Tue, 29 Aug 2023 10:55:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

8 months, 3 weeks

1
0
0 0

[M] Change in libusrp[master]: cosmetic: fx2regs.h: Fix trailing whitespace

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/34234 ) Change subject: cosmetic: fx2regs.h: Fix trailing whitespace ...................................................................... cosmetic: fx2regs.h: Fix trailing whitespace Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db --- M firmware/include/fx2regs.h 1 file changed, 31 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/34/34234/1 diff --git a/firmware/include/fx2regs.h b/firmware/include/fx2regs.h index dec5164..455b067 100644 --- a/firmware/include/fx2regs.h +++ b/firmware/include/fx2regs.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2003 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -45,18 +45,18 @@ // FX2 Related Register Assignments //----------------------------------------------------------------------------- -// The Ez-USB FX2 registers are defined here. We use FX2regs.h for register -// address allocation by using "#define ALLOCATE_EXTERN". -// When using "#define ALLOCATE_EXTERN", you get (for instance): +// The Ez-USB FX2 registers are defined here. We use FX2regs.h for register +// address allocation by using "#define ALLOCATE_EXTERN". +// When using "#define ALLOCATE_EXTERN", you get (for instance): // __xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40; -// Such lines are created from FX2.h by using the preprocessor. -// Incidently, these lines will not generate any space in the resulting hex -// file; they just bind the symbols to the addresses for compilation. -// You just need to put "#define ALLOCATE_EXTERN" in your main program file; -// i.e. fw.c or a stand-alone C source file. -// Without "#define ALLOCATE_EXTERN", you just get the external reference: +// Such lines are created from FX2.h by using the preprocessor. +// Incidently, these lines will not generate any space in the resulting hex +// file; they just bind the symbols to the addresses for compilation. +// You just need to put "#define ALLOCATE_EXTERN" in your main program file; +// i.e. fw.c or a stand-alone C source file. +// Without "#define ALLOCATE_EXTERN", you just get the external reference: // extern __xdata volatile BYTE OUT7BUF[64] ;// 0x7B40; -// This uses the concatenation operator "##" to insert a comment "//" +// This uses the concatenation operator "##" to insert a comment "//" // to cut off the end of the line, "_at_ 0x7B40;", which is not wanted. */ @@ -273,10 +273,10 @@ EXTERN __xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state EXTERN __xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state EXTERN __xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ; -EXTERN __xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe +EXTERN __xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe EXTERN __xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge EXTERN __xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe -EXTERN __xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift +EXTERN __xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift EXTERN __xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte EXTERN __xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte EXTERN __xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only @@ -308,8 +308,8 @@ /*----------------------------------------------------------------------------- Special Function Registers (SFRs) The byte registers and bits defined in the following list are based - on the Synopsis definition of the 8051 Special Function Registers for EZ-USB. - If you modify the register definitions below, please regenerate the file + on the Synopsis definition of the 8051 Special Function Registers for EZ-USB. + If you modify the register definitions below, please regenerate the file "ezregs.inc" which includes the same basic information for assembly inclusion. -----------------------------------------------------------------------------*/ @@ -385,9 +385,9 @@ __sfr __at 0x9A APTR1H; __sfr __at 0x9B APTR1L; -__sfr __at 0x9C AUTODAT1; +__sfr __at 0x9C AUTODAT1; __sfr __at 0x9D AUTOPTRH2; -__sfr __at 0x9E AUTOPTRL2; +__sfr __at 0x9E AUTOPTRL2; __sfr __at 0x9F AUTODAT2; __sfr __at 0xA0 IOC; __sfr __at 0xA1 INT2CLR; @@ -446,7 +446,7 @@ __sfr __at 0xBA EP01STAT; __sfr __at 0xBB GPIFTRIG; - + __sfr __at 0xBD GPIFSGLDATH; __sfr __at 0xBE GPIFSGLDATLX; __sfr __at 0xBF GPIFSGLDATLNOX; @@ -666,7 +666,7 @@ /* * Chip Revision Control Bits (REVCTL) - used to ebable/disable revision specific features - */ + */ #define bmNOAUTOARM bmBIT1 // these don't match the docs #define bmSKIPCOMMIT bmBIT0 // these don't match the docs -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db Gerrit-Change-Number: 34234 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

[M] Change in libusrp[master]: Fix compilation with newer sdcc

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/34235 ) Change subject: Fix compilation with newer sdcc ...................................................................... Fix compilation with newer sdcc Since recent system upgrade which pulled in sdcc 4.3.0, build fails with following error: /git/libusrp/firmware/include/fx2regs.h:324: syntax error: token -> '+' ; column 26 It seems newer sdcc doesn't like having sums directly in there. Using parenthesis around the expression fixes the problem. Related: OS#6157 Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea --- M firmware/include/fx2regs.h M firmware/src/usrp2/usrp_rev2_regs.h 2 files changed, 92 insertions(+), 75 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/35/34235/1 diff --git a/firmware/include/fx2regs.h b/firmware/include/fx2regs.h index 455b067..c097d17 100644 --- a/firmware/include/fx2regs.h +++ b/firmware/include/fx2regs.h @@ -321,7 +321,7 @@ __sfr __at 0x85 DPH1; __sfr __at 0x86 DPS; /* DPS */ - __sbit __at 0x86+0 SEL; + __sbit __at (0x86+0) SEL; __sfr __at 0x87 PCON; /* PCON */ //__sbit IDLE = 0x87+0; //__sbit STOP = 0x87+1; @@ -330,14 +330,14 @@ //__sbit SMOD0 = 0x87+7; __sfr __at 0x88 TCON; /* TCON */ - __sbit __at 0x88+0 IT0; - __sbit __at 0x88+1 IE0; - __sbit __at 0x88+2 IT1; - __sbit __at 0x88+3 IE1; - __sbit __at 0x88+4 TR0; - __sbit __at 0x88+5 TF0; - __sbit __at 0x88+6 TR1; - __sbit __at 0x88+7 TF1; + __sbit __at (0x88+0) IT0; + __sbit __at (0x88+1) IE0; + __sbit __at (0x88+2) IT1; + __sbit __at (0x88+3) IE1; + __sbit __at (0x88+4) TR0; + __sbit __at (0x88+5) TF0; + __sbit __at (0x88+6) TR1; + __sbit __at (0x88+7) TF1; __sfr __at 0x89 TMOD; /* TMOD */ //__sbit M00 = 0x89+0; @@ -373,14 +373,14 @@ __sfr __at 0x92 MPAGE; __sfr __at 0x98 SCON0; /* SCON0 */ - __sbit __at 0x98+0 RI; - __sbit __at 0x98+1 TI; - __sbit __at 0x98+2 RB8; - __sbit __at 0x98+3 TB8; - __sbit __at 0x98+4 REN; - __sbit __at 0x98+5 SM2; - __sbit __at 0x98+6 SM1; - __sbit __at 0x98+7 SM0; + __sbit __at (0x98+0) RI; + __sbit __at (0x98+1) TI; + __sbit __at (0x98+2) RB8; + __sbit __at (0x98+3) TB8; + __sbit __at (0x98+4) REN; + __sbit __at (0x98+5) SM2; + __sbit __at (0x98+6) SM1; + __sbit __at (0x98+7) SM0; __sfr __at 0x99 SBUF0; __sfr __at 0x9A APTR1H; @@ -398,14 +398,14 @@ __sfr __at 0xA8 IE; /* IE */ - __sbit __at 0xA8+0 EX0; - __sbit __at 0xA8+1 ET0; - __sbit __at 0xA8+2 EX1; - __sbit __at 0xA8+3 ET1; - __sbit __at 0xA8+4 ES0; - __sbit __at 0xA8+5 ET2; - __sbit __at 0xA8+6 ES1; - __sbit __at 0xA8+7 EA; + __sbit __at (0xA8+0) EX0; + __sbit __at (0xA8+1) ET0; + __sbit __at (0xA8+2) EX1; + __sbit __at (0xA8+3) ET1; + __sbit __at (0xA8+4) ES0; + __sbit __at (0xA8+5) ET2; + __sbit __at (0xA8+6) ES1; + __sbit __at (0xA8+7) EA; __sfr __at 0xAA EP2468STAT; /* EP2468STAT */ @@ -436,13 +436,13 @@ __sfr __at 0xB8 IP; /* IP */ - __sbit __at 0xB8+0 PX0; - __sbit __at 0xB8+1 PT0; - __sbit __at 0xB8+2 PX1; - __sbit __at 0xB8+3 PT1; - __sbit __at 0xB8+4 PS0; - __sbit __at 0xB8+5 PT2; - __sbit __at 0xB8+6 PS1; + __sbit __at (0xB8+0) PX0; + __sbit __at (0xB8+1) PT0; + __sbit __at (0xB8+2) PX1; + __sbit __at (0xB8+3) PT1; + __sbit __at (0xB8+4) PS0; + __sbit __at (0xB8+5) PT2; + __sbit __at (0xB8+6) PS1; __sfr __at 0xBA EP01STAT; __sfr __at 0xBB GPIFTRIG; @@ -453,61 +453,61 @@ __sfr __at 0xC0 SCON1; /* SCON1 */ - __sbit __at 0xC0+0 RI1; - __sbit __at 0xC0+1 TI1; - __sbit __at 0xC0+2 RB81; - __sbit __at 0xC0+3 TB81; - __sbit __at 0xC0+4 REN1; - __sbit __at 0xC0+5 SM21; - __sbit __at 0xC0+6 SM11; - __sbit __at 0xC0+7 SM01; + __sbit __at (0xC0+0) RI1; + __sbit __at (0xC0+1) TI1; + __sbit __at (0xC0+2) RB81; + __sbit __at (0xC0+3) TB81; + __sbit __at (0xC0+4) REN1; + __sbit __at (0xC0+5) SM21; + __sbit __at (0xC0+6) SM11; + __sbit __at (0xC0+7) SM01; __sfr __at 0xC1 SBUF1; __sfr __at 0xC8 T2CON; /* T2CON */ - __sbit __at 0xC8+0 CP_RL2; - __sbit __at 0xC8+1 C_T2; - __sbit __at 0xC8+2 TR2; - __sbit __at 0xC8+3 EXEN2; - __sbit __at 0xC8+4 TCLK; - __sbit __at 0xC8+5 RCLK; - __sbit __at 0xC8+6 EXF2; - __sbit __at 0xC8+7 TF2; + __sbit __at (0xC8+0) CP_RL2; + __sbit __at (0xC8+1) C_T2; + __sbit __at (0xC8+2) TR2; + __sbit __at (0xC8+3) EXEN2; + __sbit __at (0xC8+4) TCLK; + __sbit __at (0xC8+5) RCLK; + __sbit __at (0xC8+6) EXF2; + __sbit __at (0xC8+7) TF2; __sfr __at 0xCA RCAP2L; __sfr __at 0xCB RCAP2H; __sfr __at 0xCC TL2; __sfr __at 0xCD TH2; __sfr __at 0xD0 PSW; /* PSW */ - __sbit __at 0xD0+0 P; - __sbit __at 0xD0+1 FL; - __sbit __at 0xD0+2 OV; - __sbit __at 0xD0+3 RS0; - __sbit __at 0xD0+4 RS1; - __sbit __at 0xD0+5 F0; - __sbit __at 0xD0+6 AC; - __sbit __at 0xD0+7 CY; + __sbit __at (0xD0+0) P; + __sbit __at (0xD0+1) FL; + __sbit __at (0xD0+2) OV; + __sbit __at (0xD0+3) RS0; + __sbit __at (0xD0+4) RS1; + __sbit __at (0xD0+5) F0; + __sbit __at (0xD0+6) AC; + __sbit __at (0xD0+7) CY; __sfr __at 0xD8 EICON; // Was WDCON in DS80C320 EICON; Bit Values differ from Reg320 /* EICON */ - __sbit __at 0xD8+3 INT6; - __sbit __at 0xD8+4 RESI; - __sbit __at 0xD8+5 ERESI; - __sbit __at 0xD8+7 SMOD1; + __sbit __at (0xD8+3) INT6; + __sbit __at (0xD8+4) RESI; + __sbit __at (0xD8+5) ERESI; + __sbit __at (0xD8+7) SMOD1; __sfr __at 0xE0 ACC; __sfr __at 0xE8 EIE; // EIE Bit Values differ from Reg320 /* EIE */ - __sbit __at 0xE8+0 EIUSB; - __sbit __at 0xE8+1 EI2C; - __sbit __at 0xE8+2 EIEX4; - __sbit __at 0xE8+3 EIEX5; - __sbit __at 0xE8+4 EIEX6; + __sbit __at (0xE8+0) EIUSB; + __sbit __at (0xE8+1) EI2C; + __sbit __at (0xE8+2) EIEX4; + __sbit __at (0xE8+3) EIEX5; + __sbit __at (0xE8+4) EIEX6; __sfr __at 0xF0 B; __sfr __at 0xF8 EIP; // EIP Bit Values differ from Reg320 /* EIP */ - __sbit __at 0xF8+0 PUSB; - __sbit __at 0xF8+1 PI2C; - __sbit __at 0xF8+2 EIPX4; - __sbit __at 0xF8+3 EIPX5; - __sbit __at 0xF8+4 EIPX6; + __sbit __at (0xF8+0) PUSB; + __sbit __at (0xF8+1) PI2C; + __sbit __at (0xF8+2) EIPX4; + __sbit __at (0xF8+3) EIPX5; + __sbit __at (0xF8+4) EIPX6; /*----------------------------------------------------------------------------- Bit Masks diff --git a/firmware/src/usrp2/usrp_rev2_regs.h b/firmware/src/usrp2/usrp_rev2_regs.h index 4390f13..8e5ade2 100644 --- a/firmware/src/usrp2/usrp_rev2_regs.h +++ b/firmware/src/usrp2/usrp_rev2_regs.h @@ -47,9 +47,9 @@ #define bmPA_TX_UNDERRUN bmBIT7 // misc pin to FPGA (underflow) -__sbit __at 0x80+0 bitS_CLK; // 0x80 is the bit address of PORT A -__sbit __at 0x80+1 bitS_OUT; // out from FX2 point of view -__sbit __at 0x80+2 bitS_IN; // in from FX2 point of view +__sbit __at (0x80+0) bitS_CLK; // 0x80 is the bit address of PORT A +__sbit __at (0x80+1) bitS_OUT; // out from FX2 point of view +__sbit __at (0x80+2) bitS_IN; // in from FX2 point of view /* all outputs except S_DATA_FROM_PERIPH, FX2_2, FX2_3 */ @@ -85,8 +85,8 @@ #define bmPC_LED0 bmBIT6 // active low #define bmPC_LED1 bmBIT7 // active low -__sbit __at 0xA0+1 bitALTERA_DATA0; // 0xA0 is the bit address of PORT C -__sbit __at 0xA0+3 bitALTERA_DCLK; +__sbit __at (0xA0+1) bitALTERA_DATA0; // 0xA0 is the bit address of PORT C +__sbit __at (0xA0+3) bitALTERA_DCLK; #define bmALTERA_BITS (bmALTERA_DATA0 \ -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea Gerrit-Change-Number: 34235 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

[S] Change in libusrp[master]: linter: Don't check header files

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/34233 ) Change subject: linter: Don't check header files ...................................................................... linter: Don't check header files None of those follow somocom coding style. Change-Id: I2276ca7aa2b246447aeebcaa5a8cb3049147c3c9 --- A .checkpatch.conf 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/33/34233/1 diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..edd1686 --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1 @@ +--exclude .*h -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/34233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I2276ca7aa2b246447aeebcaa5a8cb3049147c3c9 Gerrit-Change-Number: 34233 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

8 months, 3 weeks

1
0
0 0

2024

2023

2022

gerrit-log August 2023