- gerrit-log - lists.osmocom.org

[L] Change in libosmocore[master]: soft_uart: implement modem status lines and flow control
by fixeria 03 Dec '23

03 Dec '23

Attention is currently required from: jolly, laforge, neels, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35172?usp=email ) Change subject: soft_uart: implement modem status lines and flow control ...................................................................... Patch Set 3: (5 comments) File include/osmocom/core/soft_uart.h: https://gerrit.osmocom.org/c/libosmocore/+/35172/comment/7f695941_4b5a2352 PS3, Line 100: gets > "gets passed" or "gets as an argument" -- I will clarify this. Done File src/core/soft_uart.c: https://gerrit.osmocom.org/c/libosmocore/+/35172/comment/2079f190_aa7eae88 PS2, Line 398: if (active) /* assert the given line */ > re: if assert and de-assert is terminology from the matching spec, then of course keep using those t […] @andreas@eversberg.eu just to confirm, am I using the terminology correctly in this patch? As we agreed in Jabber, in the example case of the RI (Ring Indicator), the modem asserts this line when it's ringing and de-asserts it when it's no more ringing. File src/core/soft_uart.c: https://gerrit.osmocom.org/c/libosmocore/+/35172/comment/4e00c693_ca74a4f5 PS3, Line 214: OSMO_SUART_STATUS_F_RTS_RTR > RX must continue. […] Done https://gerrit.osmocom.org/c/libosmocore/+/35172/comment/dd6fda1d_5deb226e PS3, Line 324: OSMO_SUART_STATUS_F_CTS > The current character needs to be finished before the transmitter can stop transmitting. Ack. Implemented in the new patchset, verified by unit tests. https://gerrit.osmocom.org/c/libosmocore/+/35172/comment/97d7cd7f_b60397f3 PS3, Line 399: else > If you de-assert DTR, you should reset the transmitter state. […] What you suggest looks as follows to me: * "If you de-assert DTR, you should reset the transmitter state" - if we can no longer receive, we de-assert the DTR (Data Terminal Ready) and for some reason reset the transmitter state (`suart->tx.flow_state`)? * "If you de-assert DSR, you should reset the receiver state" - if we can no longer transmit, we de-assert the DSR (Data Set Ready) and for some reason reset the receiver state (`suart->rx.flow_state`)? Could you elaborate on this please? I am trying to understand the idea here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35172?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I26b93ce76f2f6b6fbf017f2684312007db3c6d48 Gerrit-Change-Number: 35172 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 03 Dec 2023 21:39:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: soft_uart: implement modem status lines and flow control
by fixeria 03 Dec '23

03 Dec '23

Attention is currently required from: jolly, laforge, neels, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35172?usp=email ) Change subject: soft_uart: implement modem status lines and flow control ...................................................................... Patch Set 3: (3 comments) File include/osmocom/core/soft_uart.h: https://gerrit.osmocom.org/c/libosmocore/+/35172/comment/fd7a3d0e_d3e2e209 PS3, Line 54: OSMO_SUART_STATUS_F_CTS = (1 << 5), /*!< Clear To Send */ > (personally i prefer an enum storing just 0, 1, 2, 3, 4, 5, because it is easy to get from 5 to 1<<5 […] Yes, you already commented on this in another patch (already merged). As I said, I don't see a practical situation in which I would need to get the `x` value back from `(1 << x)`. If you have examples, let me know. https://gerrit.osmocom.org/c/libosmocore/+/35172/comment/d8e7e32d_f89679e9 PS3, Line 61: OSMO_SUART_FLOW_CTRL_M_NONE, > (apparently it's good practice to set the first item = 0 explicitly) It's the first time I am hearing about such a good practice :P If this was a protocol definition, I would go further and set each item explicitly. In the particular case we're discussing here, I can't see the practical benefits. https://gerrit.osmocom.org/c/libosmocore/+/35172/comment/396a5a8c_71906e06 PS3, Line 100: gets > wdym, "gets". […] "gets passed" or "gets as an argument" -- I will clarify this. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35172?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I26b93ce76f2f6b6fbf017f2684312007db3c6d48 Gerrit-Change-Number: 35172 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 03 Dec 2023 17:59:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-e1d[master]: [cosmetic] e1oip.h: Update TODO comment (we have RTT, frame loss stats)
by laforge 03 Dec '23

03 Dec '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/35201?usp=email ) Change subject: [cosmetic] e1oip.h: Update TODO comment (we have RTT, frame loss stats) ...................................................................... [cosmetic] e1oip.h: Update TODO comment (we have RTT, frame loss stats) Change-Id: I837676cb3905c0113307ebc400974c3d8cf3a3c7 --- M src/octoi/e1oip.h 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/01/35201/1 diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 9357d48..a17c257 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -48,6 +48,7 @@ struct rate_ctr_group *ctrs; struct osmo_stat_item_group *stats; + /* TODO: statistics (std deviation, alarms) */ /* configuration data */ struct { @@ -70,8 +71,6 @@ uint32_t next_fn32; /* next expected frame number */ bool primed_rx_tdm; /* Was RX RIFO primed */ } e1t; - - /* TODO: statistics (RTT, frame loss, std deviation, alarms */ }; /* get the rate of the given counter during the last second */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/35201?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I837676cb3905c0113307ebc400974c3d8cf3a3c7 Gerrit-Change-Number: 35201 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hnbgw[master]: systemd,manual: set LimitNOFILE=65536
by laforge 03 Dec '23

03 Dec '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35177?usp=email ) Change subject: systemd,manual: set LimitNOFILE=65536 ...................................................................... systemd,manual: set LimitNOFILE=65536 A typical OS imposed limit is 1024 open FD, which is too low when there are thousands of HNB. In systemd service file, set a super high limit of 65536. In osmo-hnbgw's user manual, add section 'Configure limits' describing this in detail. Related: OS#6256 Related: osmo-bsc I26c4058484b11ff1d035a919bf88824c3af14e71 Change-Id: I5333765199cf9e3e5a570f85b85d2b7423d34a4d --- M contrib/systemd/osmo-hnbgw.service M doc/manuals/chapters/running.adoc 2 files changed, 37 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/contrib/systemd/osmo-hnbgw.service b/contrib/systemd/osmo-hnbgw.service index ba41e24..2307bcc 100644 --- a/contrib/systemd/osmo-hnbgw.service +++ b/contrib/systemd/osmo-hnbgw.service @@ -6,6 +6,7 @@ [Service] Type=simple Restart=always +LimitNOFILE=65536 StateDirectory=osmocom WorkingDirectory=%S/osmocom ExecStart=/usr/bin/osmo-hnbgw -c /etc/osmocom/osmo-hnbgw.cfg diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 45d9b2f..08e1b87 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -76,6 +76,23 @@ configure a distinct point-code, see <<configure_iucs_iups>>. +=== Configure limits + +When connecting hundreds of HNB to OsmoHNBGW, it may be necessary to adjust the +operating system's limit on open file descriptors for the osmo-hnbgw process. A +typical default limit imposed by operating systems is 1024; this would be +exceeded by, for example, about 1024 HNB on Iuh, sockets for other interfaces +not considered yet. + +It should be ok to set an OS limit on open file descriptors as high as 65536 +for osmo-hnbgw, which practically rules out failure from running out of file +descriptors anywhere (<50,000 HNB). + +When using systemd, the file descriptor limit may be adjusted in the service +file by the `LimitNOFILE` setting ("Number of Open FILE descriptors"). +OsmoHNBGW ships a systemd service file with a high LimitNOFILE setting. + + === Configuring Primary Links [[configure_iucs_iups]] -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35177?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5333765199cf9e3e5a570f85b85d2b7423d34a4d Gerrit-Change-Number: 35177 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(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

1 0

[S] Change in osmo-hnbgw[master]: systemd,manual: set LimitNOFILE=65536
by laforge 03 Dec '23

03 Dec '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35177?usp=email ) Change subject: systemd,manual: set LimitNOFILE=65536 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35177?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5333765199cf9e3e5a570f85b85d2b7423d34a4d Gerrit-Change-Number: 35177 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 03 Dec 2023 02:20:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: systemd,manual: set LimitNOFILE=65536
by laforge 03 Dec '23

03 Dec '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35178?usp=email ) Change subject: systemd,manual: set LimitNOFILE=65536 ...................................................................... systemd,manual: set LimitNOFILE=65536 A typical OS imposed limit is 1024 open FD, which can bee too low when there are hundreds of concurrent voice calls. In systemd service file, set a super high limit of 65536. In osmo-mgw's user manual, add section 'Configure limits' describing this in detail. Related: OS#6256 Related: osmo-bsc I26c4058484b11ff1d035a919bf88824c3af14e71 Change-Id: I46512517bc3b5bb90cac7643e7ac73afba398d36 --- M contrib/systemd/osmo-mgw.service M doc/manuals/chapters/running.adoc 2 files changed, 37 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/systemd/osmo-mgw.service b/contrib/systemd/osmo-mgw.service index b187e1a..03f40ff 100644 --- a/contrib/systemd/osmo-mgw.service +++ b/contrib/systemd/osmo-mgw.service @@ -5,6 +5,7 @@ [Service] Type=simple +LimitNOFILE=65536 StateDirectory=osmocom WorkingDirectory=%S/osmocom Restart=always diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index c178e31..e3bab4d 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -23,3 +23,20 @@ Disable colors for logging to stderr. This has mostly been deprecated by VTY based logging configuration, see <<logging>> for more information. + + +=== Configure limits + +When servicing hundreds of media endpoints, it may be necessary to adjust the +operating system's limit on open file descriptors for the osmo-mgw process. A +typical default limit imposed by operating systems is 1024; this would be +exceeded by, for example, about 256 active voice calls with 4 RTP/RTPC ports +each, sockets for other interfaces not considered yet. + +It should be ok to set an OS limit on open file descriptors as high as 65536 +for osmo-mgw, which practically rules out failure from running out of file +descriptors anywhere (<16,000 active calls). + +When using systemd, the file descriptor limit may be adjusted in the service +file by the `LimitNOFILE` setting ("Number of Open FILE descriptors"). OsmoMGW +ships a systemd service file with a high LimitNOFILE setting. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35178?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I46512517bc3b5bb90cac7643e7ac73afba398d36 Gerrit-Change-Number: 35178 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(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

1 0

[S] Change in osmo-mgw[master]: systemd,manual: set LimitNOFILE=65536
by laforge 03 Dec '23

03 Dec '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35178?usp=email ) Change subject: systemd,manual: set LimitNOFILE=65536 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35178?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I46512517bc3b5bb90cac7643e7ac73afba398d36 Gerrit-Change-Number: 35178 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 03 Dec 2023 02:20:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: mobile: Fix PCS ARFCN handling: PCS can only be ARFCN 512..810
by laforge 03 Dec '23

03 Dec '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33532?usp=email ) Change subject: mobile: Fix PCS ARFCN handling: PCS can only be ARFCN 512..810 ...................................................................... mobile: Fix PCS ARFCN handling: PCS can only be ARFCN 512..810 While it is correct to use the band indicator from SI1 rest octets, it may only be applied for ARFCN values in the range 512..810. The function gsm_refer_pcs() is used to determine, if the cell (which 'talks' about ARFCNs) refers to them PCS or DCS channels. It returns true, if it refers to PCS, but this only means that ARFCNs in the range 512..810 are PCS channels, not all ARFCNs. The new function gsm_arfcn_refer_pcs() is used to add the PCS flag to an ARFCN, if the given cell refers to PCS and the given ARFCN is in the PCS range 512..810. Change-Id: Id99c8534bf853f4f24f99364790c1ac1df6cc007 Related: OS#6078 --- M src/host/layer23/include/osmocom/bb/common/sysinfo.h M src/host/layer23/src/common/sysinfo.c M src/host/layer23/src/mobile/gsm322.c M src/host/layer23/src/mobile/gsm48_rr.c 4 files changed, 71 insertions(+), 41 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified jolly: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/sysinfo.h b/src/host/layer23/include/osmocom/bb/common/sysinfo.h index 9efb248..c31cf9d 100644 --- a/src/host/layer23/include/osmocom/bb/common/sysinfo.h +++ b/src/host/layer23/include/osmocom/bb/common/sysinfo.h @@ -71,7 +71,7 @@ /* si1 rest */ uint8_t nch; uint8_t nch_position; - uint8_t band_ind; /* set for DCS */ + bool band_ind; /* set for DCS */ /* si3 rest */ uint8_t sp; @@ -181,7 +181,8 @@ }; char *gsm_print_arfcn(uint16_t arfcn); -uint8_t gsm_refer_pcs(uint16_t arfcn, const struct gsm48_sysinfo *s); +bool gsm_refer_pcs(uint16_t cell_arfcn, const struct gsm48_sysinfo *cell_s); +uint16_t gsm_arfcn_refer_pcs(uint16_t cell_arfcn, const struct gsm48_sysinfo *cell_s, uint16_t arfcn); int gsm48_sysinfo_dump(const struct gsm48_sysinfo *s, uint16_t arfcn, void (*print)(void *, const char *, ...), void *priv, uint8_t *freq_map); diff --git a/src/host/layer23/src/common/sysinfo.c b/src/host/layer23/src/common/sysinfo.c index f541c85..7fdc6ff 100644 --- a/src/host/layer23/src/common/sysinfo.c +++ b/src/host/layer23/src/common/sysinfo.c @@ -50,20 +50,35 @@ return text; } -/* check if the cell 'talks' about DCS (0) or PCS (1) */ -uint8_t gsm_refer_pcs(uint16_t arfcn, const struct gsm48_sysinfo *s) +/* Check if the cell 'talks' about DCS (false) or PCS (true) */ +bool gsm_refer_pcs(uint16_t cell_arfcn, const struct gsm48_sysinfo *cell_s) { /* If ARFCN is PCS band, the cell refers to PCS */ - if ((arfcn & ARFCN_PCS)) - return 1; + if ((cell_arfcn & ARFCN_PCS)) + return true; /* If no SI1 is available, we assume DCS. Be sure to call this * function only if SI 1 is available. */ - if (!s->si1) + if (!cell_s->si1) return 0; /* If band indicator indicates PCS band, the cell refers to PCSThe */ - return s->band_ind; + return cell_s->band_ind; +} + +/* Change the given ARFCN to PCS ARFCN, if it is in the PCS channel range and the cell refers to PCS band. */ +uint16_t gsm_arfcn_refer_pcs(uint16_t cell_arfcn, const struct gsm48_sysinfo *cell_s, uint16_t arfcn) +{ + /* If ARFCN is not one of the overlapping channel of PCS and DCS. */ + if (arfcn < 512 && arfcn > 810) + return arfcn; + + /* If the 'cell' does not refer to PCS. */ + if (!gsm_refer_pcs(cell_arfcn, cell_s)) + return arfcn; + + /* The ARFCN is PCS, because the ARFCN is in the PCS range and the cell refers to it. */ + return arfcn | ARFCN_PCS; } int gsm48_sysinfo_dump(const struct gsm48_sysinfo *s, uint16_t arfcn, @@ -541,10 +556,7 @@ s->nch_position = bitvec_get_uint(&bv, 5); } else s->nch = 0; - if (bitvec_get_bit_high(&bv) == H) - s->band_ind = 1; - else - s->band_ind = 0; + s->band_ind = (bitvec_get_bit_high(&bv) == H); return 0; } diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 35811d3..3d0cc77 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -2419,7 +2419,8 @@ struct gsm322_cellsel *cs = &ms->cellsel; struct gsm48_sysinfo *s; struct gsm322_ba_list *ba = NULL; - int i, refer_pcs; + int i; + bool refer_pcs; uint8_t freq[128+38]; if (!cs) { @@ -2472,7 +2473,8 @@ struct gsm48_sysinfo *s) { struct gsm322_ba_list *ba; - int i, refer_pcs; + int i; + bool refer_pcs; uint8_t freq[128+38]; /* find or create ba list */ @@ -3408,8 +3410,7 @@ } /* create temporary ba range with given frequency ranges */ -struct gsm322_ba_list *gsm322_cs_ba_range(struct osmocom_ms *ms, - uint32_t *range, uint8_t ranges, uint8_t refer_pcs) +static struct gsm322_ba_list *gsm322_cs_ba_range(struct osmocom_ms *ms, uint32_t *range, uint8_t ranges, bool refer_pcs) { static struct gsm322_ba_list ba; int lower, higher; @@ -4403,7 +4404,8 @@ uint8_t map[128]; uint16_t nc[32]; uint8_t changed = 0; - int refer_pcs, index; + bool refer_pcs; + int index; uint16_t arfcn; if (cs->ms->settings.no_neighbour) diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 97ba173..6ba57e3 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -2600,7 +2600,8 @@ && s->si5 && (!s->nb_ext_ind_si5 || s->si5bis)) { struct gsm48_rr_meas *rrmeas = &ms->rrlayer.meas; - int i, refer_pcs; + int i; + bool refer_pcs; int16_t arfcn; LOGP(DRR, LOGL_NOTICE, "Complete set of SI5* for BA(%d)\n", @@ -3385,8 +3386,7 @@ } else { cd.h = 0; gsm48_decode_chan_h0(&ia->chan_desc, &cd.tsc, &cd.arfcn); - if (gsm_refer_pcs(cs->arfcn, s)) - cd.arfcn |= ARFCN_PCS; + cd.arfcn = gsm_arfcn_refer_pcs(cs->arfcn, s, cd.arfcn); LOGP(DRR, LOGL_INFO, " (ta %d/%dm ra 0x%02x chan_nr 0x%02x " "ARFCN %s TS %u SS %u TSC %u)\n", ia->timing_advance, @@ -3504,8 +3504,7 @@ } else { cd1.h = 0; gsm48_decode_chan_h0(&ia->chan_desc1, &cd1.tsc, &cd1.arfcn); - if (gsm_refer_pcs(cs->arfcn, s)) - cd1.arfcn |= ARFCN_PCS; + cd1.arfcn = gsm_arfcn_refer_pcs(cs->arfcn, s, cd1.arfcn); LOGP(DRR, LOGL_INFO, " assignment 1 (ta %d/%dm ra 0x%02x " "chan_nr 0x%02x ARFCN %s TS %u SS %u TSC %u)\n", ia->timing_advance1, @@ -3533,8 +3532,7 @@ } else { cd2.h = 0; gsm48_decode_chan_h0(&ia->chan_desc2, &cd2.tsc, &cd2.arfcn); - if (gsm_refer_pcs(cs->arfcn, s)) - cd2.arfcn |= ARFCN_PCS; + cd2.arfcn = gsm_arfcn_refer_pcs(cs->arfcn, s, cd2.arfcn); LOGP(DRR, LOGL_INFO, " assignment 2 (ta %d/%dm ra 0x%02x " "chan_nr 0x%02x ARFCN %s TS %u SS %u TSC %u)\n", ia->timing_advance2, @@ -3998,8 +3996,8 @@ struct gsm322_cellsel *cs = &ms->cellsel; struct gsm48_sysinfo *s = cs->si; struct gsm_settings *set = &ms->settings; - int i, pcs, index; - uint16_t arfcn; + int i, index; + uint16_t arfcn, pcs; pcs = gsm_refer_pcs(cs->arfcn, s) ? ARFCN_PCS : 0; @@ -4102,7 +4100,9 @@ /* convert to band_arfcn and check for unsported frequency */ for (i = 0; i < *ma_len; i++) { - arfcn = ma[i] | pcs; + arfcn = ma[i]; + if (arfcn >= 512 && arfcn <= 810) + arfcn |= pcs; ma[i] = arfcn; index = arfcn2index(arfcn); if (!(set->freq_map[index >> 3] & (1 << (index & 7)))) { @@ -4490,8 +4490,7 @@ } else { cd.h = 0; gsm48_decode_chan_h0(&fr->chan_desc, &cd.tsc, &cd.arfcn); - if (gsm_refer_pcs(cs->arfcn, s)) - cd.arfcn |= ARFCN_PCS; + cd.arfcn = gsm_arfcn_refer_pcs(cs->arfcn, s, cd.arfcn); LOGP(DRR, LOGL_INFO, " (ARFCN %s TS %u SS %u TSC %u)\n", gsm_print_arfcn(cd.arfcn), ch_ts, ch_subch, cd.tsc); } @@ -4600,8 +4599,7 @@ } else { cd->h = 0; gsm48_decode_chan_h0(&cm->chan_desc, &cd->tsc, &cd->arfcn); - if (gsm_refer_pcs(cs->arfcn, s)) - cd->arfcn |= ARFCN_PCS; + cd->arfcn = gsm_arfcn_refer_pcs(cs->arfcn, s, cd->arfcn); LOGP(DRR, LOGL_INFO, " (chan_nr 0x%02x ARFCN %s TS %u SS %u " "TSC %u mode %u)\n", cm->chan_desc.chan_nr, gsm_print_arfcn(cd->arfcn), ch_ts, ch_subch, cd->tsc, @@ -4744,8 +4742,7 @@ } else { cdb->h = 0; gsm48_decode_chan_h0(ccd, &cdb->tsc, &cdb->arfcn); - if (gsm_refer_pcs(cs->arfcn, s)) - cdb->arfcn |= ARFCN_PCS; + cdb->arfcn = gsm_arfcn_refer_pcs(cs->arfcn, s, cdb->arfcn); LOGP(DRR, LOGL_INFO, " before: (chan_nr 0x%02x " "ARFCN %s TS %u SS %u TSC %u)\n", ccd->chan_nr, gsm_print_arfcn(cdb->arfcn), @@ -4772,8 +4769,7 @@ } else { cda->h = 0; gsm48_decode_chan_h0(&ac->chan_desc, &cda->tsc, &cda->arfcn); - if (gsm_refer_pcs(cs->arfcn, s)) - cda->arfcn |= ARFCN_PCS; + cda->arfcn = gsm_arfcn_refer_pcs(cs->arfcn, s, cda->arfcn); LOGP(DRR, LOGL_INFO, " after: (chan_nr 0x%02x ARFCN %s TS %u " "SS %u TSC %u)\n", ac->chan_desc.chan_nr, gsm_print_arfcn(cda->arfcn), ch_ts, ch_subch, cda->tsc); @@ -5149,8 +5145,7 @@ } else { cdb->h = 0; gsm48_decode_chan_h0(ccd, &cdb->tsc, &cdb->arfcn); - if (gsm_refer_pcs(cs->arfcn, s)) - cdb->arfcn |= ARFCN_PCS; + cdb->arfcn = gsm_arfcn_refer_pcs(cs->arfcn, s, cdb->arfcn); LOGP(DRR, LOGL_INFO, " before: (chan_nr 0x%02x " "ARFCN %s TS %u SS %u TSC %u)\n", ccd->chan_nr, gsm_print_arfcn(cdb->arfcn), @@ -5177,8 +5172,7 @@ } else { cda->h = 0; gsm48_decode_chan_h0(&ho->chan_desc, &cda->tsc, &cda->arfcn); - if (gsm_refer_pcs(cs->arfcn, s)) - cda->arfcn |= ARFCN_PCS; + cda->arfcn = gsm_arfcn_refer_pcs(cs->arfcn, s, cda->arfcn); LOGP(DRR, LOGL_INFO, " after: (chan_nr 0x%02x ARFCN %s TS %u " "SS %u TSC %u)\n", ho->chan_desc.chan_nr, gsm_print_arfcn(cda->arfcn), ch_ts, ch_subch, cda->tsc); @@ -5737,8 +5731,7 @@ } else { cd.h = 0; gsm48_decode_chan_h0(ch_desc, &cd.tsc, &cd.arfcn); - if (gsm_refer_pcs(cs->arfcn, s)) - cd.arfcn |= ARFCN_PCS; + cd.arfcn = gsm_arfcn_refer_pcs(cs->arfcn, s, cd.arfcn); LOGP(DRR, LOGL_INFO, " (chan_nr 0x%02x ARFCN %s TS %u SS %u TSC %u)\n", ch_desc->chan_nr, gsm_print_arfcn(cd.arfcn), ch_ts, ch_subch, cd.tsc); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33532?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id99c8534bf853f4f24f99364790c1ac1df6cc007 Gerrit-Change-Number: 33532 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: soft_uart: fix doxygen doc for osmo_soft_uart_tx_ubits()
by laforge 03 Dec '23

03 Dec '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35170?usp=email ) Change subject: soft_uart: fix doxygen doc for osmo_soft_uart_tx_ubits() ...................................................................... soft_uart: fix doxygen doc for osmo_soft_uart_tx_ubits() Change-Id: I648db45bbde39c6b3d839c744a56d01a562e4129 Related: OS#4396 --- M src/core/soft_uart.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index 5ddddb4..8d9142b 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -280,7 +280,7 @@ * \param[in] suart soft-UART instance to pull the bits from. * \param[out] ubits pointer to a buffer where to store pulled bits. * \param[in] n_ubits number of unpacked bits to be pulled. - * \returns number of unpacked bits pulled; negative on error. */ + * \returns 0 on success; negative on error. */ int osmo_soft_uart_tx_ubits(struct osmo_soft_uart *suart, ubit_t *ubits, size_t n_ubits) { const struct osmo_soft_uart_cfg *cfg = &suart->cfg; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35170?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I648db45bbde39c6b3d839c744a56d01a562e4129 Gerrit-Change-Number: 35170 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: soft_uart: add osmo_soft_uart_{get,set}_name()
by laforge 03 Dec '23

03 Dec '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35169?usp=email ) Change subject: soft_uart: add osmo_soft_uart_{get,set}_name() ...................................................................... soft_uart: add osmo_soft_uart_{get,set}_name() Change-Id: Iabf29f42d876035481011fa8e8a51c0590fe63b8 Related: OS#4396 --- M include/osmocom/core/soft_uart.h M src/core/libosmocore.map M src/core/soft_uart.c 3 files changed, 32 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h index 097d2ee..7b7c394 100644 --- a/include/osmocom/core/soft_uart.h +++ b/include/osmocom/core/soft_uart.h @@ -87,6 +87,10 @@ const struct osmo_soft_uart_cfg *cfg); void osmo_soft_uart_free(struct osmo_soft_uart *suart); int osmo_soft_uart_configure(struct osmo_soft_uart *suart, const struct osmo_soft_uart_cfg *cfg); + +const char *osmo_soft_uart_get_name(const struct osmo_soft_uart *suart); +void osmo_soft_uart_set_name(struct osmo_soft_uart *suart, const char *name); + int osmo_soft_uart_set_rx(struct osmo_soft_uart *suart, bool enable); int osmo_soft_uart_set_tx(struct osmo_soft_uart *suart, bool enable); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 3d6aa42..4ae5108 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -444,6 +444,8 @@ osmo_soft_uart_alloc; osmo_soft_uart_free; osmo_soft_uart_configure; +osmo_soft_uart_get_name; +osmo_soft_uart_set_name; osmo_soft_uart_set_rx; osmo_soft_uart_set_tx; osmo_soft_uart_rx_ubits; diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index 4fffaee..5ddddb4 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -396,6 +396,22 @@ return 0; } +/*! Get a name for the given soft-UART instance. + * \param[in] suart soft-UART instance to get the name from. + * \returns name of the given soft-UART instance. */ +const char *osmo_soft_uart_get_name(const struct osmo_soft_uart *suart) +{ + return suart->name; +} + +/*! Set a new name for the given soft-UART instance. + * \param[in] suart soft-UART instance to set the name for. + * \param[in] name the new name. */ +void osmo_soft_uart_set_name(struct osmo_soft_uart *suart, const char *name) +{ + osmo_talloc_replace_string(suart, (char **)&suart->name, name); +} + /*! Enable/disable receiver of the given soft-UART. * \param[in] suart soft-UART instance to be re-configured. * \param[in] enable enable/disable state of the receiver. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35169?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iabf29f42d876035481011fa8e8a51c0590fe63b8 Gerrit-Change-Number: 35169 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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

1 0

2026

2025

2024

2023

2022

gerrit-log