<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20541">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm48_rest_octets: Add parser for SI4 rest octets<br><br>Introduces osmo_gsm48_rest_octets_si4_decode()<br><br>Change-Id: I9d6ed06731ae15fdcef1a1f397d6ac2b7b1ca980<br>Related: OS#3075<br>---<br>M include/osmocom/gsm/gsm48_rest_octets.h<br>M src/gsm/gsm48_rest_octets.c<br>M src/gsm/libosmogsm.map<br>3 files changed, 44 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/20541/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsm48_rest_octets.h b/include/osmocom/gsm/gsm48_rest_octets.h</span><br><span>index d3bb878..8f143be 100644</span><br><span>--- a/include/osmocom/gsm/gsm48_rest_octets.h</span><br><span>+++ b/include/osmocom/gsm/gsm48_rest_octets.h</span><br><span>@@ -125,3 +125,6 @@</span><br><span> </span><br><span> /* Parse SI3 Rest Octets */</span><br><span> void osmo_gsm48_rest_octets_si3_decode(struct osmo_gsm48_si_ro_info *si3, const uint8_t *data);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Parse SI4 Rest Octets */</span><br><span style="color: hsl(120, 100%, 40%);">+void osmo_gsm48_rest_octets_si4_decode(struct osmo_gsm48_si_ro_info *si4, const uint8_t *data, int len);</span><br><span>diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c</span><br><span>index 3c1b22a..938d0ba 100644</span><br><span>--- a/src/gsm/gsm48_rest_octets.c</span><br><span>+++ b/src/gsm/gsm48_rest_octets.c</span><br><span>@@ -1022,3 +1022,43 @@</span><br><span>   else</span><br><span>                 si3->si2quater_indicator = 0;</span><br><span> }</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%);">+void osmo_gsm48_rest_octets_si4_decode(struct osmo_gsm48_si_ro_info *si4, const uint8_t *data, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsm48_si_selection_params *sp = &si4->selection_params;</span><br><span style="color: hsl(120, 100%, 40%);">+    struct osmo_gsm48_si_power_offset *po = &si4->power_offset;</span><br><span style="color: hsl(120, 100%, 40%);">+    struct osmo_gsm48_si3_gprs_ind *gi = &si4->gprs_ind;</span><br><span style="color: hsl(120, 100%, 40%);">+   struct bitvec bv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   memset(&bv, 0, sizeof(bv));</span><br><span style="color: hsl(120, 100%, 40%);">+       bv.data = (uint8_t *) data;</span><br><span style="color: hsl(120, 100%, 40%);">+   bv.data_len = len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  memset(si4, 0, sizeof(*si4));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       /* Optional Selection Parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+   if (bitvec_get_bit_high(&bv) == H) {</span><br><span style="color: hsl(120, 100%, 40%);">+              sp->present = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+           sp->cbq = bitvec_get_uint(&bv, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+             sp->cell_resel_off = bitvec_get_uint(&bv, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+          sp->temp_offs = bitvec_get_uint(&bv, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+               sp->penalty_time = bitvec_get_uint(&bv, 5);</span><br><span style="color: hsl(120, 100%, 40%);">+    } else</span><br><span style="color: hsl(120, 100%, 40%);">+                sp->present = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Optional Power Offset */</span><br><span style="color: hsl(120, 100%, 40%);">+   if (bitvec_get_bit_high(&bv) == H) {</span><br><span style="color: hsl(120, 100%, 40%);">+              po->present = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+           po->power_offset = bitvec_get_uint(&bv, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+    } else</span><br><span style="color: hsl(120, 100%, 40%);">+                po->present = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* GPRS Indicator */</span><br><span style="color: hsl(120, 100%, 40%);">+  if (bitvec_get_bit_high(&bv) == H) {</span><br><span style="color: hsl(120, 100%, 40%);">+              gi->present = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+           gi->ra_colour = bitvec_get_uint(&bv, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+               gi->si13_position = bitvec_get_uint(&bv, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+   } else</span><br><span style="color: hsl(120, 100%, 40%);">+                gi->present = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 1fd212d..209fd97 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -322,6 +322,7 @@</span><br><span> osmo_gsm48_rest_octets_si4_encode;</span><br><span> osmo_gsm48_rest_octets_si13_encode;</span><br><span> osmo_gsm48_rest_octets_si3_decode;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gsm48_rest_octets_si4_decode;</span><br><span> gsm48_rr_msg_name;</span><br><span> gsm48_cc_state_name;</span><br><span> gsm48_construct_ra;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20541">change 20541</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/+/20541"/><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: I9d6ed06731ae15fdcef1a1f397d6ac2b7b1ca980 </div>
<div style="display:none"> Gerrit-Change-Number: 20541 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>