<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19506">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Constify the 'trx' argument of trx_get_hlayer1() everywhere<br><br>Change-Id: I44523d26f2f564932ea95c17b1041d0ca9cc2828<br>---<br>M src/common/pcu_sock.c<br>M src/osmo-bts-litecell15/l1_if.h<br>M src/osmo-bts-litecell15/oml.c<br>M src/osmo-bts-oc2g/l1_if.h<br>M src/osmo-bts-oc2g/oml.c<br>M src/osmo-bts-octphy/l1_oml.c<br>M src/osmo-bts-octphy/l1_oml.h<br>M src/osmo-bts-omldummy/bts_model.c<br>M src/osmo-bts-sysmo/l1_if.h<br>M src/osmo-bts-sysmo/oml.c<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-virtual/main.c<br>M tests/stubs.c<br>13 files changed, 20 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/19506/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index 5fa0e19..89fa01b 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -46,7 +46,7 @@</span><br><span> #include <osmo-bts/l1sap.h></span><br><span> #include <osmo-bts/oml.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx);</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx);</span><br><span> </span><br><span> extern struct gsm_network bts_gsmnet;</span><br><span> int pcu_direct = 0;</span><br><span>diff --git a/src/osmo-bts-litecell15/l1_if.h b/src/osmo-bts-litecell15/l1_if.h</span><br><span>index f5efa91..655e63f 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.h</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.h</span><br><span>@@ -133,14 +133,14 @@</span><br><span> int l1if_ms_pwr_ctrl(struct gsm_lchan *lchan, const int uplink_target,</span><br><span> const uint8_t ms_power, const float rxLevel);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline struct lc15l1_hdl *trx_lc15l1_hdl(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline struct lc15l1_hdl *trx_lc15l1_hdl(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span> OSMO_ASSERT(pinst);</span><br><span> return pinst->u.lc15.hdl;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline struct gsm_bts_trx *lc15l1_hdl_trx(struct lc15l1_hdl *fl1h)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline struct gsm_bts_trx *lc15l1_hdl_trx(const struct lc15l1_hdl *fl1h)</span><br><span> {</span><br><span> OSMO_ASSERT(fl1h->phy_inst);</span><br><span> return fl1h->phy_inst->trx;</span><br><span>diff --git a/src/osmo-bts-litecell15/oml.c b/src/osmo-bts-litecell15/oml.c</span><br><span>index 60fd1e7..f14f808 100644</span><br><span>--- a/src/osmo-bts-litecell15/oml.c</span><br><span>+++ b/src/osmo-bts-litecell15/oml.c</span><br><span>@@ -430,9 +430,9 @@</span><br><span> return l1if_gsm_req_compl(fl1h, msg, trx_init_compl_cb, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct lc15l1_hdl *fl1h = trx_lc15l1_hdl(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct lc15l1_hdl *fl1h = trx_lc15l1_hdl(trx);</span><br><span> </span><br><span> return fl1h->hLayer1;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-oc2g/l1_if.h b/src/osmo-bts-oc2g/l1_if.h</span><br><span>index e4b8feb..8e8a2ed 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_if.h</span><br><span>+++ b/src/osmo-bts-oc2g/l1_if.h</span><br><span>@@ -136,9 +136,9 @@</span><br><span> int l1if_ms_pwr_ctrl(struct gsm_lchan *lchan, const int uplink_target,</span><br><span> const uint8_t ms_power, const float rxLevel);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline struct oc2gl1_hdl *trx_oc2gl1_hdl(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline struct oc2gl1_hdl *trx_oc2gl1_hdl(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span> OSMO_ASSERT(pinst);</span><br><span> return pinst->u.oc2g.hdl;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c</span><br><span>index 89ee0ac..f9faacf 100644</span><br><span>--- a/src/osmo-bts-oc2g/oml.c</span><br><span>+++ b/src/osmo-bts-oc2g/oml.c</span><br><span>@@ -446,9 +446,9 @@</span><br><span> return l1if_gsm_req_compl(fl1h, msg, trx_init_compl_cb, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct oc2gl1_hdl *fl1h = trx_oc2gl1_hdl(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct oc2gl1_hdl *fl1h = trx_oc2gl1_hdl(trx);</span><br><span> </span><br><span> return fl1h->hLayer1;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c</span><br><span>index 8cc078e..300d618 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_oml.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_oml.c</span><br><span>@@ -1426,7 +1426,7 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t trx_get_hlayer1(struct gsm_bts_trx * trx)</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-octphy/l1_oml.h b/src/osmo-bts-octphy/l1_oml.h</span><br><span>index 4729df5..3c814c7 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_oml.h</span><br><span>+++ b/src/osmo-bts-octphy/l1_oml.h</span><br><span>@@ -10,7 +10,7 @@</span><br><span> </span><br><span> int l1if_set_ciphering(struct gsm_lchan *lchan, int dir_downlink);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx);</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx);</span><br><span> </span><br><span> int gsm_abis_mo_check_attr(const struct gsm_abis_mo *mo,</span><br><span> const uint8_t * attr_ids, unsigned int num_attr_ids);</span><br><span>diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c</span><br><span>index 1ff336e..3fd927d 100644</span><br><span>--- a/src/osmo-bts-omldummy/bts_model.c</span><br><span>+++ b/src/osmo-bts-omldummy/bts_model.c</span><br><span>@@ -169,7 +169,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_if.h b/src/osmo-bts-sysmo/l1_if.h</span><br><span>index 1b214be..8691eef 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_if.h</span><br><span>+++ b/src/osmo-bts-sysmo/l1_if.h</span><br><span>@@ -156,9 +156,9 @@</span><br><span> int bts_check_for_ciph_cmd(struct femtol1_hdl *fl1h,</span><br><span> struct msgb *msg, struct gsm_lchan *lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline struct femtol1_hdl *trx_femtol1_hdl(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline struct femtol1_hdl *trx_femtol1_hdl(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span> OSMO_ASSERT(pinst);</span><br><span> return pinst->u.sysmobts.hdl;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c</span><br><span>index 57eab12..472a7ae 100644</span><br><span>--- a/src/osmo-bts-sysmo/oml.c</span><br><span>+++ b/src/osmo-bts-sysmo/oml.c</span><br><span>@@ -426,9 +426,9 @@</span><br><span> return l1if_gsm_req_compl(fl1h, msg, trx_init_compl_cb, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx);</span><br><span> </span><br><span> return fl1h->hLayer1;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index d8cbbaa..e35f6fe 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -74,7 +74,7 @@</span><br><span> };</span><br><span> </span><br><span> /* dummy, since no direct dsp support */</span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c</span><br><span>index fb5d357..e5b7206 100644</span><br><span>--- a/src/osmo-bts-virtual/main.c</span><br><span>+++ b/src/osmo-bts-virtual/main.c</span><br><span>@@ -50,7 +50,7 @@</span><br><span> #include "l1_if.h"</span><br><span> </span><br><span> /* dummy, since no direct dsp support */</span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)</span><br><span> {</span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/tests/stubs.c b/tests/stubs.c</span><br><span>index 4663a44..b24dfc9 100644</span><br><span>--- a/tests/stubs.c</span><br><span>+++ b/tests/stubs.c</span><br><span>@@ -36,7 +36,7 @@</span><br><span> __attribute__((weak)) int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap)</span><br><span> { return 0; }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+uint32_t trx_get_hlayer1(const struct gsm_bts_trx *trx)</span><br><span> { return 0; }</span><br><span> </span><br><span> __attribute__((weak)) int bts_model_oml_estab(struct gsm_bts *bts)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19506">change 19506</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/19506"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I44523d26f2f564932ea95c17b1041d0ca9cc2828 </div>
<div style="display:none"> Gerrit-Change-Number: 19506 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>