<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18773">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_data_shared: use bitvec API to allocate the feature vector<br><br>Change-Id: I19ecfc619c0dc2bfd14f054d17e222c4e16f6238<br>---<br>M include/osmo-bts/gsm_data_shared.h<br>M src/common/gsm_data_shared.c<br>M src/common/oml.c<br>3 files changed, 6 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h</span><br><span>index dc7d39f..f3855f7 100644</span><br><span>--- a/include/osmo-bts/gsm_data_shared.h</span><br><span>+++ b/include/osmo-bts/gsm_data_shared.h</span><br><span>@@ -523,8 +523,7 @@</span><br><span>  char sub_model[MAX_VERSION_LENGTH];</span><br><span> </span><br><span>      /* features of a given BTS set/reported via OML */</span><br><span style="color: hsl(0, 100%, 40%);">-      struct bitvec features;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t _features_data[MAX_BTS_FEATURES/8];</span><br><span style="color: hsl(120, 100%, 40%);">+   struct bitvec *features;</span><br><span> </span><br><span>         /* Connected PCU version (if any) */</span><br><span>         char pcu_version[MAX_VERSION_LENGTH];</span><br><span>@@ -744,13 +743,13 @@</span><br><span> static inline int gsm_bts_set_feature(struct gsm_bts *bts, enum gsm_bts_features feat)</span><br><span> {</span><br><span>         OSMO_ASSERT(_NUM_BTS_FEAT < MAX_BTS_FEATURES);</span><br><span style="color: hsl(0, 100%, 40%);">-       return bitvec_set_bit_pos(&bts->features, feat, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+    return bitvec_set_bit_pos(bts->features, feat, 1);</span><br><span> }</span><br><span> </span><br><span> static inline bool gsm_bts_has_feature(const struct gsm_bts *bts, enum gsm_bts_features feat)</span><br><span> {</span><br><span>         OSMO_ASSERT(_NUM_BTS_FEAT < MAX_BTS_FEATURES);</span><br><span style="color: hsl(0, 100%, 40%);">-       return bitvec_get_bit_pos(&bts->features, feat);</span><br><span style="color: hsl(120, 100%, 40%);">+       return bitvec_get_bit_pos(bts->features, feat);</span><br><span> }</span><br><span> </span><br><span> void gsm_abis_mo_reset(struct gsm_abis_mo *mo);</span><br><span>diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c</span><br><span>index c05f59d..e23b04b 100644</span><br><span>--- a/src/common/gsm_data_shared.c</span><br><span>+++ b/src/common/gsm_data_shared.c</span><br><span>@@ -322,8 +322,8 @@</span><br><span>    }</span><br><span>    bts->c0->ts[0].pchan = GSM_PCHAN_CCCH_SDCCH4;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->features.data = &bts->_features_data[0];</span><br><span style="color: hsl(0, 100%, 40%);">- bts->features.data_len = sizeof(bts->_features_data);</span><br><span style="color: hsl(120, 100%, 40%);">+   bts->features = bitvec_alloc(MAX_BTS_FEATURES / 8, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+   OSMO_ASSERT(bts->features != NULL);</span><br><span> </span><br><span>   return bts;</span><br><span> }</span><br><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 587a808..5610ab1 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -174,7 +174,7 @@</span><br><span> static inline void add_bts_feat(struct msgb *msg, const struct gsm_bts *bts)</span><br><span> {</span><br><span>     unsigned int len = OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT);</span><br><span style="color: hsl(0, 100%, 40%);">-  msgb_tl16v_put(msg, NM_ATT_MANUF_ID, len, bts->_features_data);</span><br><span style="color: hsl(120, 100%, 40%);">+    msgb_tl16v_put(msg, NM_ATT_MANUF_ID, len, bts->features->data);</span><br><span> }</span><br><span> </span><br><span> static inline void add_trx_attr(struct msgb *msg, const struct gsm_bts_trx *trx)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18773">change 18773</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/+/18773"/><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: I19ecfc619c0dc2bfd14f054d17e222c4e16f6238 </div>
<div style="display:none"> Gerrit-Change-Number: 18773 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>