July 2022 - gerrit-log - lists.osmocom.org

Change in osmocom-bb[master]: trxcon: trx_if_close(): power the transceiver off if needed

by fixeria

fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmocom-bb/+/28794 ) Change subject: trxcon: trx_if_close(): power the transceiver off if needed ...................................................................... trxcon: trx_if_close(): power the transceiver off if needed Change-Id: I9c5178907304b36ec3de0ee31b7f7a9ed2e31c16 --- M src/host/trxcon/src/trx_if.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/94/28794/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9c5178907304b36ec3de0ee31b7f7a9ed2e31c16 Gerrit-Change-Number: 28794 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trx_toolkit: simplify Transceiver.power_event_handler()

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28759 to look at the new patch set (#6). Change subject: trx_toolkit: simplify Transceiver.power_event_handler() ...................................................................... trx_toolkit: simplify Transceiver.power_event_handler() Change-Id: I283f7ced0309bf823ad78c90e8006b9e9474dee7 --- M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 7 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/28759/6 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I283f7ced0309bf823ad78c90e8006b9e9474dee7 Gerrit-Change-Number: 28759 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trx_toolkit: use **kwargs in Transceiver.__init__()

by fixeria

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/osmocom-bb/+/28760 to look at the new patch set (#6). Change subject: trx_toolkit: use **kwargs in Transceiver.__init__() ...................................................................... trx_toolkit: use **kwargs in Transceiver.__init__() Change-Id: I65e85a2dc99e81e96d1b31b6bda5010b044b041d --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 21 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/28760/6 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I65e85a2dc99e81e96d1b31b6bda5010b044b041d Gerrit-Change-Number: 28760 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trx_toolkit: do not auto power on/off child MS Transceivers

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28761 to look at the new patch set (#6). Change subject: trx_toolkit: do not auto power on/off child MS Transceivers ...................................................................... trx_toolkit: do not auto power on/off child MS Transceivers By default, powering on/off a parent transceiver (child_idx=0) will automatically power on/off its child transceivers (if any). This behavior is desirable for the BTS, but not for the MS Transceivers. Additional MS Transceivers are going to be used by ttcn3-bts-test for spawning multiple DCCH components in parallel. We don't want situations when one component powers off transceivers of the other DCCH components - they must be independent. Change-Id: I0cd6bac616273bed0e246ad48edc44fff484c589 --- M src/target/trx_toolkit/fake_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/61/28761/6 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0cd6bac616273bed0e246ad48edc44fff484c589 Gerrit-Change-Number: 28761 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: send pending TRXC messages in trx_if_flush_ctrl()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28793 ) Change subject: trxcon: send pending TRXC messages in trx_if_flush_ctrl() ...................................................................... trxcon: send pending TRXC messages in trx_if_flush_ctrl() Send all queued TRXC messages immediately without waiting for response. This way we don't loose anything when an L1CTL connection gets lost. Change-Id: I16d748b5194d381af0cd5ba9dbd4bfb33fc7d233 --- M src/host/trxcon/src/trx_if.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/28793/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 339173f..4b59cfd 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -759,8 +759,9 @@ /* Clear command queue */ while (!llist_empty(&trx->trx_ctrl_list)) { - tcm = llist_entry(trx->trx_ctrl_list.next, - struct trx_ctrl_msg, list); + tcm = llist_entry(trx->trx_ctrl_list.next, struct trx_ctrl_msg, list); + LOGPFSML(trx->fi, LOGL_NOTICE, "Sending control '%s'\n", tcm->cmd); + send(trx->trx_ofd_ctrl.fd, tcm->cmd, strlen(tcm->cmd) + 1, 0); llist_del(&tcm->list); talloc_free(tcm); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I16d748b5194d381af0cd5ba9dbd4bfb33fc7d233 Gerrit-Change-Number: 28793 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: fixup! trxcon: make l1sched logging configurable, use trxcon->fi as p...

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28792 ) Change subject: fixup! trxcon: make l1sched logging configurable, use trxcon->fi as prefix ...................................................................... fixup! trxcon: make l1sched logging configurable, use trxcon->fi as prefix Change-Id: I9efe808a2c96b1e16a76a488dbbb85f2f62f679a --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/include/osmocom/bb/l1sched/logging.h M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon.c 4 files changed, 23 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/28792/1 diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 1719ff8..3c28f45 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -350,10 +350,6 @@ struct l1sched_cfg { /*! Logging context (used as prefix for messages) */ const char *log_prefix; - /*! Logging category for common messages */ - int log_cat_common; - /*! Logging category for data messages */ - int log_cat_data; }; /*! One scheduler instance */ @@ -376,8 +372,8 @@ struct l1sched_ts *ts[TRX_TS_COUNT]; /*! BSIC value learned from SCH bursts */ uint8_t bsic; - /*! Scheduler configuration */ - struct l1sched_cfg cfg; + /*! Logging context (used as prefix for messages) */ + const char *log_prefix; /*! Some private data */ void *priv; }; @@ -387,6 +383,7 @@ enum gsm_phys_chan_config config, int tn); /* Scheduler management functions */ +void l1sched_logging_init(int log_cat_common, int log_cat_data); struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, uint32_t fn_advance, void *priv); void l1sched_reset(struct l1sched_state *sched, bool reset_clock); diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/logging.h b/src/host/trxcon/include/osmocom/bb/l1sched/logging.h index ac0818f..fb1c018 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/logging.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/logging.h @@ -1,9 +1,12 @@ #pragma once +extern int l1sched_log_cat_common; +extern int l1sched_log_cat_data; + /* Messages using l1sched_state as the context */ #define LOGP_SCHED_CAT(sched, cat, level, fmt, args...) \ - LOGP((sched)->cfg.log_cat_##cat, level, "%s" fmt, \ - (sched)->cfg.log_prefix, ## args) + LOGP(l1sched_log_cat_##cat, level, "%s" fmt, \ + (sched)->log_prefix, ## args) /* Common messages using l1sched_state as the context */ #define LOGP_SCHEDC(sched, level, fmt, args...) \ diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index 2c42c81..d44c1ba 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -35,6 +35,10 @@ #include <osmocom/bb/l1sched/l1sched.h> #include <osmocom/bb/l1sched/logging.h> +/* Logging categories to be used for common/data messages */ +int l1sched_log_cat_common = DLGLOBAL; +int l1sched_log_cat_data = DLGLOBAL; + static int l1sched_cfg_pchan_comb_req(struct l1sched_state *sched, uint8_t tn, enum gsm_phys_chan_config pchan) { @@ -150,6 +154,12 @@ l1sched_handle_burst_req(sched, &br[tn]); } +void l1sched_logging_init(int log_cat_common, int log_cat_data) +{ + l1sched_log_cat_common = log_cat_common; + l1sched_log_cat_data = log_cat_data; +} + struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, uint32_t fn_advance, void *priv) { @@ -164,11 +174,12 @@ .clock_cb = &sched_frame_clck_cb, .fn_counter_advance = fn_advance, .priv = priv, - .cfg = *cfg, }; - if (sched->cfg.log_prefix == NULL) - sched->cfg.log_prefix = ""; + if (cfg->log_prefix == NULL) + sched->log_prefix = talloc_asprintf(sched, "l1sched[0x%p]: ", sched); + else + sched->log_prefix = talloc_strdup(sched, cfg->log_prefix); return sched; } diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 374b8b2..86d4c49 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -349,8 +349,6 @@ /* Init scheduler */ const struct l1sched_cfg sched_cfg = { .log_prefix = trxcon->log_prefix, - .log_cat_common = DSCH, - .log_cat_data = DSCHD, }; trxcon->sched = l1sched_alloc(trxcon, &sched_cfg, app_data.trx_fn_advance, trxcon); @@ -539,6 +537,7 @@ /* Init logging system */ trx_log_init(tall_trxcon_ctx, app_data.debug_mask); + l1sched_logging_init(DSCH, DSCHD); /* Configure pretty logging */ log_set_print_extended_timestamp(osmo_stderr_target, 1); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9efe808a2c96b1e16a76a488dbbb85f2f62f679a Gerrit-Change-Number: 28792 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: trx_if_close(): power the transceiver off if needed

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28794 ) Change subject: trxcon: trx_if_close(): power the transceiver off if needed ...................................................................... trxcon: trx_if_close(): power the transceiver off if needed Change-Id: I9c5178907304b36ec3de0ee31b7f7a9ed2e31c16 --- M src/host/trxcon/src/trx_if.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/94/28794/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 4b59cfd..a91a6db 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -775,6 +775,10 @@ LOGPFSML(trx->fi, LOGL_NOTICE, "Shutdown transceiver interface\n"); + /* Power off if the transceiver is up */ + if (trx->powered_up) + trx_if_cmd_poweroff(trx); + /* Abort TRXC response timer (if pending) */ osmo_timer_del(&trx->trx_ctrl_timer); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9c5178907304b36ec3de0ee31b7f7a9ed2e31c16 Gerrit-Change-Number: 28794 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: use trxcon->fi as the context in L1CTL logging

by fixeria

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28756 to look at the new patch set (#6). Change subject: trxcon: use trxcon->fi as the context in L1CTL logging ...................................................................... trxcon: use trxcon->fi as the context in L1CTL logging Change-Id: I7b923cb21638e6afc38deb7766955b43e49b60bb Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/l1ctl_server.c M src/host/trxcon/src/trxcon.c 4 files changed, 123 insertions(+), 87 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/56/28756/6 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7b923cb21638e6afc38deb7766955b43e49b60bb Gerrit-Change-Number: 28756 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: pass fn_advance param via struct l1sched_cfg

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28745 to look at the new patch set (#5). Change subject: trxcon: pass fn_advance param via struct l1sched_cfg ...................................................................... trxcon: pass fn_advance param via struct l1sched_cfg Change-Id: I733761e46ffe03473f03f76f7612a548c9723d99 Related: OS#5599, OS#3761 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon.c 3 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/28745/5 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I733761e46ffe03473f03f76f7612a548c9723d99 Gerrit-Change-Number: 28745 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap_msg: Improve spec references for used IEs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28791 ) Change subject: sbcap_msg: Improve spec references for used IEs ...................................................................... sbcap_msg: Improve spec references for used IEs Change-Id: I55749aa84415e0af240c3cc46f2b274e1d24e403 --- M src/sbcap_msg.c 1 file changed, 43 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/91/28791/1 diff --git a/src/sbcap_msg.c b/src/sbcap_msg.c index 7dc3410..511036f 100644 --- a/src/sbcap_msg.c +++ b/src/sbcap_msg.c @@ -35,10 +35,13 @@ #include <osmocom/cbc/sbcap_link.h> #include <osmocom/cbc/debug.h> -/* 3GPP TS 36.413 9.2.1.53 */ +/* 3GPP TS 36.413 9.2.1.53, 3GPP TS 23.041 9.3.35 */ #define SBCAP_WARN_MSG_CONTENTS_IE_MAX_LEN 9600 #if 0 +/* Warning Area List + * 3GPP TS 36.413 9.2.1.46, 3GPP TS 23.041 9.3.30 + */ static void msgb_put_sbcap_cell_list(const struct cbc_message *cbcmsg, void *void_li) { static uint8_t ie_plm_id0[] = {0x05, 0xf5, 0x32}; @@ -78,7 +81,9 @@ } #endif -/* generate a SBc-AP WRITE-REPLACE WARNING REQUEST from our internal representation */ +/* generate a SBc-AP WRITE-REPLACE WARNING REQUEST from our internal representation. + * 3GPP TS 36.413 9.1.13.1 + */ SBcAP_SBC_AP_PDU_t *cbcmsg_to_sbcap(void *ctx, const struct cbc_message *cbcmsg) { const struct smscb_message *smscb = &cbcmsg->msg; @@ -100,7 +105,9 @@ A_SEQUENCE_OF(void) *as_pdu = (void *)&pdu->choice.initiatingMessage.value.choice.Write_Replace_Warning_Request.protocolIEs.list; - /* static const long asn_VAL_1_SBcAP_id_Message_Identifier = 5; */ + /* Message Identifier: + * 3GPP TS 36.413 9.2.1.44, 3GPP TS 23.041 9.4.1.3.6 + * static const long asn_VAL_1_SBcAP_id_Message_Identifier = 5; */ ie = sbcap_alloc_Write_Replace_Warning_Request_IE(5, SBcAP_Criticality_reject, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Message_Identifier); ie->value.choice.Message_Identifier.buf = MALLOC(sizeof(uint16_t)); @@ -109,7 +116,9 @@ osmo_store16be(smscb->message_id, ie->value.choice.Message_Identifier.buf); ASN_SEQUENCE_ADD(as_pdu, ie); - /* static const long asn_VAL_2_SBcAP_id_Serial_Number = 11; */ + /* Serial Number + * 3GPP TS 36.413 9.2.1.45, 3GPP TS 23.041 9.4.1.2.1 + * static const long asn_VAL_2_SBcAP_id_Serial_Number = 11; */ ie = sbcap_alloc_Write_Replace_Warning_Request_IE(11, SBcAP_Criticality_reject, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Serial_Number); ie->value.choice.Serial_Number.buf = MALLOC(sizeof(uint16_t)); @@ -123,7 +132,9 @@ break; /* Nothing to be done :*/ #if 0 case CBC_MSG_SCOPE_EUTRAN_CGI: - /* static const long asn_VAL_25_SBcAP_id_Warning_Area_List = 15; */ + /* Warning Area List + * 3GPP TS 36.413 9.2.1.46, 3GPP TS 23.041 9.3.30 + * static const long asn_VAL_25_SBcAP_id_Warning_Area_List = 15; */ ie = sbcap_alloc_Write_Replace_Warning_Request_IE(15, SBcAP_Criticality_ignore, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Warning_Area_List); ASN_SEQUENCE_ADD(as_pdu, ie); @@ -135,21 +146,26 @@ OSMO_ASSERT(0); } - /* static const long asn_VAL_5_SBcAP_id_Repetition_Period = 10; */ + /* Repetition Period + * 3GPP TS 36.413 9.2.1.48, 3GPP TS 23.041 9.3.8 + * static const long asn_VAL_5_SBcAP_id_Repetition_Period = 10; */ ie = sbcap_alloc_Write_Replace_Warning_Request_IE(10, SBcAP_Criticality_reject, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Repetition_Period); ie->value.choice.Repetition_Period = cbcmsg->rep_period; /*seconds */ ASN_SEQUENCE_ADD(as_pdu, ie); - /* static const long asn_VAL_7_SBcAP_id_Number_of_Broadcasts_Requested = 7; */ + /* Number of Broadcasts Requested + * 3GPP TS 36.413 9.2.1.49, 3GPP TS 23.041 9.3.9 + * static const long asn_VAL_7_SBcAP_id_Number_of_Broadcasts_Requested = 7; */ ie = sbcap_alloc_Write_Replace_Warning_Request_IE(7, SBcAP_Criticality_reject, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Number_of_Broadcasts_Requested); ie->value.choice.Number_of_Broadcasts_Requested = cbcmsg->num_bcast; ASN_SEQUENCE_ADD(as_pdu, ie); if (smscb->is_etws) { - /* Warning Type, 3GPP TS 36.413 sec 9.2.1.50: */ - /* static const long asn_VAL_8_SBcAP_id_Warning_Type = 18; */ + /* Warning Type + * 3GPP TS 36.413 sec 9.2.1.50, 3GPP TS 23.041 9.3.24 + * static const long asn_VAL_8_SBcAP_id_Warning_Type = 18; */ ie = sbcap_alloc_Write_Replace_Warning_Request_IE(18, SBcAP_Criticality_ignore, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Warning_Type); ie->value.choice.Warning_Type.buf = MALLOC(2); @@ -160,8 +176,9 @@ ie->value.choice.Warning_Type.buf[1] = (smscb->etws.popup_on_display) ? 0x80 : 0x0; ASN_SEQUENCE_ADD(as_pdu, ie); - /* Warning Security Information, 3GPP TS 36.413 sec 9.2.1.51: */ - /*static const long asn_VAL_9_SBcAP_id_Warning_Security_Information = 17 */ + /* Warning Security Information + * 3GPP TS 36.413 sec 9.2.1.51, 3GPP TS 23.041 9.3.25 + * static const long asn_VAL_9_SBcAP_id_Warning_Security_Information = 17 */ ie = sbcap_alloc_Write_Replace_Warning_Request_IE(17, SBcAP_Criticality_ignore, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Warning_Security_Information); ie->value.choice.Warning_Security_Information.buf = MALLOC(sizeof(smscb->etws.warning_sec_info)); @@ -171,7 +188,9 @@ ASN_SEQUENCE_ADD(as_pdu, ie); } else { - /* static const long asn_VAL_10_SBcAP_id_Data_Coding_Scheme = 3; */ + /* Data Coding Scheme + * 3GPP TS 36.413 9.2.1.52, 3GPP TS 23.041 9.4.1.2.3 + * static const long asn_VAL_10_SBcAP_id_Data_Coding_Scheme = 3; */ ie = sbcap_alloc_Write_Replace_Warning_Request_IE(3, SBcAP_Criticality_ignore, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Data_Coding_Scheme); ie->value.choice.Data_Coding_Scheme.buf = MALLOC(1); @@ -180,8 +199,9 @@ *ie->value.choice.Data_Coding_Scheme.buf = smscb->cbs.dcs; ASN_SEQUENCE_ADD(as_pdu, ie); - /* 3GPP TS 36.413 9.2.1.53 Warning Message Contents. Encoded as in S1AP. */ - /* static const long asn_VAL_11_SBcAP_id_Warning_Message_Content = 16; */ + /* Warning Message Contents + * 3GPP TS 36.413 9.2.1.53, 3GPP TS 23.041 9.3.35 + * static const long asn_VAL_11_SBcAP_id_Warning_Message_Content = 16; */ ie = sbcap_alloc_Write_Replace_Warning_Request_IE(16, SBcAP_Criticality_ignore, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Warning_Message_Content); ie->value.choice.Warning_Message_Content.buf = MALLOC(1 + smscb->cbs.num_pages * (SMSCB_RAW_PAGE_LEN+1)); @@ -228,7 +248,9 @@ A_SEQUENCE_OF(void) *as_pdu = (void *)&pdu->choice.initiatingMessage.value.choice.Stop_Warning_Request.protocolIEs.list; - /* static const long asn_VAL_1_SBcAP_id_Message_Identifier = 5; */ + /* Message Identifier: + * 3GPP TS 36.413 9.2.1.44, 3GPP TS 23.041 9.4.1.3.6 + * static const long asn_VAL_1_SBcAP_id_Message_Identifier = 5; */ ie = sbcap_alloc_Stop_Warning_Request_IE(5, SBcAP_Criticality_reject, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Message_Identifier); ie->value.choice.Message_Identifier.buf = MALLOC(sizeof(uint16_t)); @@ -237,7 +259,9 @@ osmo_store16be(smscb->message_id, ie->value.choice.Message_Identifier.buf); ASN_SEQUENCE_ADD(as_pdu, ie); - /* static const long asn_VAL_2_SBcAP_id_Serial_Number = 11; */ + /* Serial Number + * 3GPP TS 36.413 9.2.1.45, 3GPP TS 23.041 9.4.1.2.1 + * static const long asn_VAL_2_SBcAP_id_Serial_Number = 11; */ ie = sbcap_alloc_Stop_Warning_Request_IE(11, SBcAP_Criticality_reject, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Serial_Number); ie->value.choice.Serial_Number.buf = MALLOC(sizeof(uint16_t)); @@ -251,7 +275,9 @@ break; /* Nothing to be done :*/ #if 0 case CBC_MSG_SCOPE_EUTRAN_CGI: - /* static const long asn_VAL_25_SBcAP_id_Warning_Area_List = 15; */ + /* Warning Area List + * 3GPP TS 36.413 9.2.1.46, 3GPP TS 23.041 9.3.30 + * static const long asn_VAL_25_SBcAP_id_Warning_Area_List = 15; */ ie = sbcap_alloc_Stop_Warning_Request_IE(15, SBcAP_Criticality_ignore, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Warning_Area_List); ASN_SEQUENCE_ADD(as_pdu, ie); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I55749aa84415e0af240c3cc46f2b274e1d24e403 Gerrit-Change-Number: 28791 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022