<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22925">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm0808_utils: Move static function further up in file<br><br>It's a static internal function, so it makes sense to have it at start<br>of its related section.<br>It will be used by other functions in follow up patches.<br><br>Change-Id: I60f61f8f7bb6543feb068bdcee76d3b752565c95<br>---<br>M src/gsm/gsm0808_utils.c<br>1 file changed, 46 insertions(+), 46 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/22925/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c</span><br><span>index 292b248..e0f0c28 100644</span><br><span>--- a/src/gsm/gsm0808_utils.c</span><br><span>+++ b/src/gsm/gsm0808_utils.c</span><br><span>@@ -767,6 +767,52 @@</span><br><span> return (int)(elem - old_elem);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Store individual Cell Identifier information in a CGI, without clearing the remaining ones.</span><br><span style="color: hsl(120, 100%, 40%);">+ * This is useful to supplement one CGI with information from more than one Cell Identifier,</span><br><span style="color: hsl(120, 100%, 40%);">+ * which in turn is useful to match Cell Identifiers of differing kinds to each other.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Before first invocation, clear the *dst struct externally, this function does only write those members</span><br><span style="color: hsl(120, 100%, 40%);">+ * that are present in parameter u.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static void cell_id_to_cgi(struct osmo_cell_global_id *dst,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum CELL_IDENT discr, const union gsm0808_cell_id_u *u)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (discr) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_WHOLE_GLOBAL:</span><br><span style="color: hsl(120, 100%, 40%);">+ *dst = u->global;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_WHOLE_GLOBAL_PS:</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->lai = u->global_ps.rai.lac;</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->cell_identity = u->global_ps.cell_identity;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_LAC_AND_CI:</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->lai.lac = u->lac_and_ci.lac;</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->cell_identity = u->lac_and_ci.ci;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_CI:</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->cell_identity = u->ci;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_LAI_AND_LAC:</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->lai = u->lai_and_lac;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_LAC:</span><br><span style="color: hsl(120, 100%, 40%);">+ dst->lai.lac = u->lac;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_NO_CELL:</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_BSS:</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_UTRAN_PLMN_LAC_RNC:</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_UTRAN_RNC:</span><br><span style="color: hsl(120, 100%, 40%);">+ case CELL_IDENT_UTRAN_LAC_RNC:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* No values to set. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Return the size of the value part of a cell identifier of given type */</span><br><span> int gsm0808_cell_id_size(enum CELL_IDENT discr)</span><br><span> {</span><br><span>@@ -1619,52 +1665,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Store individual Cell Identifier information in a CGI, without clearing the remaining ones.</span><br><span style="color: hsl(0, 100%, 40%);">- * This is useful to supplement one CGI with information from more than one Cell Identifier,</span><br><span style="color: hsl(0, 100%, 40%);">- * which in turn is useful to match Cell Identifiers of differing kinds to each other.</span><br><span style="color: hsl(0, 100%, 40%);">- * Before first invocation, clear the *dst struct externally, this function does only write those members</span><br><span style="color: hsl(0, 100%, 40%);">- * that are present in parameter u.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-static void cell_id_to_cgi(struct osmo_cell_global_id *dst,</span><br><span style="color: hsl(0, 100%, 40%);">- enum CELL_IDENT discr, const union gsm0808_cell_id_u *u)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- switch (discr) {</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_WHOLE_GLOBAL:</span><br><span style="color: hsl(0, 100%, 40%);">- *dst = u->global;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_WHOLE_GLOBAL_PS:</span><br><span style="color: hsl(0, 100%, 40%);">- dst->lai = u->global_ps.rai.lac;</span><br><span style="color: hsl(0, 100%, 40%);">- dst->cell_identity = u->global_ps.cell_identity;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_LAC_AND_CI:</span><br><span style="color: hsl(0, 100%, 40%);">- dst->lai.lac = u->lac_and_ci.lac;</span><br><span style="color: hsl(0, 100%, 40%);">- dst->cell_identity = u->lac_and_ci.ci;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_CI:</span><br><span style="color: hsl(0, 100%, 40%);">- dst->cell_identity = u->ci;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_LAI_AND_LAC:</span><br><span style="color: hsl(0, 100%, 40%);">- dst->lai = u->lai_and_lac;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_LAC:</span><br><span style="color: hsl(0, 100%, 40%);">- dst->lai.lac = u->lac;</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_NO_CELL:</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_BSS:</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_UTRAN_PLMN_LAC_RNC:</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_UTRAN_RNC:</span><br><span style="color: hsl(0, 100%, 40%);">- case CELL_IDENT_UTRAN_LAC_RNC:</span><br><span style="color: hsl(0, 100%, 40%);">- /* No values to set. */</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*! Return true if the common information between the two Cell Identifiers match.</span><br><span> * For example, if a LAC+CI is compared to LAC, return true if the LAC are the same.</span><br><span> * Note that CELL_IDENT_NO_CELL will always return false.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22925">change 22925</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/libosmocore/+/22925"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I60f61f8f7bb6543feb068bdcee76d3b752565c95 </div>
<div style="display:none"> Gerrit-Change-Number: 22925 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>