<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/16473">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ecu_fr: Avoid using deprecated symbols<br><br>Avoid generating those annoying warnings during compilation:<br><br>ecu_fr.c: In function ‘ecu_fr_frame_in’:<br>ecu_fr.c:203:2: warning: ‘osmo_ecu_fr_reset’ is deprecated: Use generic ECU abstraction layer instead [-Wdeprecated-declarations]<br>  203 |  osmo_ecu_fr_reset(fr, frame);<br>      |  ^~~~~~~~~~~~~~~~~<br>ecu_fr.c:138:6: note: declared here<br>  138 | void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame)<br>      |      ^~~~~~~~~~~~~~~~~<br>ecu_fr.c: In function ‘ecu_fr_frame_out’:<br>ecu_fr.c:211:2: warning: ‘osmo_ecu_fr_conceal’ is deprecated: Use generic ECU abstraction layer instead [-Wdeprecated-declarations]<br>  211 |  if (osmo_ecu_fr_conceal(fr, frame_out) == 0)<br>      |  ^~<br>ecu_fr.c:172:5: note: declared here<br>  172 | int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame)<br>      |     ^~~~~~~~~~~~~~~~~~~<br><br>Change-Id: Idf84c2efbd3e71f07d3801feb8c5e48a1b4a136d<br>---<br>M src/codec/ecu_fr.c<br>1 file changed, 13 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/16473/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/codec/ecu_fr.c b/src/codec/ecu_fr.c</span><br><span>index 4545172..6e5aea8 100644</span><br><span>--- a/src/codec/ecu_fr.c</span><br><span>+++ b/src/codec/ecu_fr.c</span><br><span>@@ -130,11 +130,15 @@</span><br><span>  * \param[in] state The state object for the ECU</span><br><span>  * \param[out] frame The valid frame (GSM_FR_BYTES bytes in RTP payload format)</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame)</span><br><span style="color: hsl(120, 100%, 40%);">+static void _osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame)</span><br><span> {</span><br><span>  state->subsequent_lost_frame = false;</span><br><span>     memcpy(state->frame_backup, frame, GSM_FR_BYTES);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+   _osmo_ecu_fr_reset(state, frame);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> /*!</span><br><span>  * To be called when a bad frame is received.</span><br><span>@@ -144,7 +148,7 @@</span><br><span>  * \param[out] frame The buffer to fill with GSM_FR_BYTES of replacement frame</span><br><span>  * \returns 0 if the frame was sucessfully filled</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame)</span><br><span style="color: hsl(120, 100%, 40%);">+static int _osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame)</span><br><span> {</span><br><span>  int rc;</span><br><span> </span><br><span>@@ -164,6 +168,11 @@</span><br><span> </span><br><span>       return 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+/* legacy symbol */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+      return _osmo_ecu_fr_conceal(state, frame);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> /***********************************************************************</span><br><span>  * Integration with ECU core</span><br><span>@@ -191,7 +200,7 @@</span><br><span>  if (bfi)</span><br><span>             return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   osmo_ecu_fr_reset(fr, frame);</span><br><span style="color: hsl(120, 100%, 40%);">+ _osmo_ecu_fr_reset(fr, frame);</span><br><span>       return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -199,7 +208,7 @@</span><br><span> {</span><br><span>        struct osmo_ecu_fr_state *fr = (struct osmo_ecu_fr_state *) &st->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       if (osmo_ecu_fr_conceal(fr, frame_out) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+  if (_osmo_ecu_fr_conceal(fr, frame_out) == 0)</span><br><span>                return GSM_FR_BYTES;</span><br><span>         else</span><br><span>                 return -1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/16473">change 16473</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/+/16473"/><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: Idf84c2efbd3e71f07d3801feb8c5e48a1b4a136d </div>
<div style="display:none"> Gerrit-Change-Number: 16473 </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>