<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9976">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_08_08: gsm0808_permitted_speech does not have value strings<br><br>enum gsm0808_permitted_speech does not have any value strings. Lets<br>add value strings to make debugging easier.<br><br>Change-Id: I5b5612a5df2758b0137a34c17f7c8c2b3f07c806<br>---<br>M include/osmocom/gsm/protocol/gsm_08_08.h<br>M src/gsm/gsm0808.c<br>M src/gsm/libosmogsm.map<br>3 files changed, 19 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h</span><br><span>index db5f7fa..bd5705f 100644</span><br><span>--- a/include/osmocom/gsm/protocol/gsm_08_08.h</span><br><span>+++ b/include/osmocom/gsm/protocol/gsm_08_08.h</span><br><span>@@ -430,6 +430,10 @@</span><br><span>  GSM0808_PERM_HR6        = 0x45, /*!< OHR AMR */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string gsm0808_permitted_speech_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *gsm0808_permitted_speech_name(enum gsm0808_permitted_speech val)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return get_value_string(gsm0808_permitted_speech_names, val); }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! 3GPP TS 48.008, 3.2.2.103 Speech Codec Type */</span><br><span> enum gsm0808_speech_codec_type {</span><br><span>  GSM0808_SCT_FR1 = 0x0, /*!< GSM FR */</span><br><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 625de81..a26addd 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -1153,6 +1153,20 @@</span><br><span>   { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string gsm0808_permitted_speech_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { GSM0808_PERM_FR1, "FR1" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { GSM0808_PERM_FR2, "FR2" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { GSM0808_PERM_FR3, "FR3" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { GSM0808_PERM_FR4, "FR4" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { GSM0808_PERM_FR5, "FR5" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { GSM0808_PERM_HR1, "HR1" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { GSM0808_PERM_HR2, "HR2" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { GSM0808_PERM_HR3, "HR3" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { GSM0808_PERM_HR4, "HR4" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { GSM0808_PERM_HR6, "HR6" },</span><br><span style="color: hsl(120, 100%, 40%);">+        { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const struct value_string gsm0808_cause_names[] = {</span><br><span>      { GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE, "RADIO INTERFACE MESSAGE FAILURE" },</span><br><span>      { GSM0808_CAUSE_RADIO_INTERFACE_FAILURE, "RADIO INTERFACE FAILURE" },</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 96779d2..5eed5b5 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -201,6 +201,7 @@</span><br><span> gsm0808_chan_type_to_speech_codec;</span><br><span> gsm0808_speech_codec_from_chan_type;</span><br><span> gsm0808_speech_codec_type_names;</span><br><span style="color: hsl(120, 100%, 40%);">+gsm0808_permitted_speech_names;</span><br><span> gsm0808_channel_type_name;</span><br><span> gsm0808_lcls_config_names;</span><br><span> gsm0808_lcls_control_names;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9976">change 9976</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/9976"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5b5612a5df2758b0137a34c17f7c8c2b3f07c806 </div>
<div style="display:none"> Gerrit-Change-Number: 9976 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-CC: Pau Espin Pedrol <pespin@sysmocom.de> </div>