[M] Change in osmo-bts[master]: OML: Add Get Attributes for supported MOs for Radio Carrier Object Class

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35378?usp=email ) Change subject: OML: Add Get Attributes for supported MOs for Radio Carrier Object Class ...................................................................... OML: Add Get Attributes for supported MOs for Radio Carrier Object Class Two Get Attributes of Radio Carrier Object class that osmo-bts supports are added: * RF Max Power Reduction * ARFCN List Note: Only one ARFCN is reported, because synthesizer hopping is not supported. The NM_ATT_ARFCN_LIST in the Set Radio Carrier Attributes message currently allowes one ARFCN only. Related: OS#6172 Change-Id: I49ab516c38a986520f1d3f6e26ddd20ee16688ac --- M src/common/oml.c 1 file changed, 61 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/oml.c b/src/common/oml.c index 722b0e0..8085802 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -386,17 +386,48 @@ msgb_tv16_put(msg, NM_ATT_GSM_TIME, bts->gsm_time.fn % GSM_RFN_MODULUS); } +/* Add attribute 9.4.47 RF Max Power Reduction for radio carrier class */ +static inline void add_att_rf_maxpowr_r(struct msgb *msg, const struct gsm_bts_trx *trx) +{ + /* type + 8 bit value */ + msgb_tv_put(msg, NM_ATT_RF_MAXPOWR_R, trx->max_power_red / 2); +} + +/* Add attribute 9.4.5 ARFCN List for radio carrier class */ +static inline void add_att_arfcn_list(struct msgb *msg, const struct gsm_bts_trx *trx) +{ +#if 0 + /* type + length + values */ + msgb_tv16_put(msg, NM_ATT_ARFCN_LIST, trx->arfcn_num * 2); + for (int j = 0; j < trx->arfcn_num; j++) + msgb_put_u16(msg, trx->arfcn_list[j]); +#else + /* type + length + values */ + msgb_tv16_put(msg, NM_ATT_ARFCN_LIST, 2); + msgb_put_u16(msg, trx->arfcn); +#endif +} + /* send 3GPP TS 52.021 §8.11.2 Get Attribute Response */ static int oml_tx_attr_resp(const struct gsm_abis_mo *mo, const uint8_t *attr, uint16_t attr_len) { struct msgb *nmsg = oml_msgb_alloc(); unsigned int num_unsupported = 0; + struct gsm_bts_trx *trx = NULL; int rc; if (!nmsg) return -NM_NACK_CANT_PERFORM; + /* Set TRX, if object class is Radio Carrier or Baseband Transceiver. */ + switch (mo->obj_class) { + case NM_OC_RADIO_CARRIER: + case NM_OC_BASEB_TRANSC: + trx = gsm_bts_trx_num(mo->bts, mo->obj_inst.trx_nr); + break; + } + for (unsigned int i = 0; i < attr_len; i++) { switch (attr[i]) { case NM_ATT_OPER_STATE: @@ -496,6 +527,16 @@ goto unsupported; add_att_gsm_time(nmsg, mo->bts); break; + case NM_ATT_RF_MAXPOWR_R: + if (mo->obj_class != NM_OC_RADIO_CARRIER || !trx) + goto unsupported; + add_att_rf_maxpowr_r(nmsg, trx); + break; + case NM_ATT_ARFCN_LIST: + if (mo->obj_class != NM_OC_RADIO_CARRIER || !trx) + goto unsupported; + add_att_arfcn_list(nmsg, trx); + break; default: unsupported: LOGP(DOML, LOGL_ERROR, "%s: O&M Get Attributes [%u], %s is unsupported\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35378?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I49ab516c38a986520f1d3f6e26ddd20ee16688ac Gerrit-Change-Number: 35378 Gerrit-PatchSet: 3 Gerrit-Owner: jolly &lt;andreas(a)eversberg.eu&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged