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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">{oc2g,sysmo}-mgr-calib: Fix build against gpsd >= 3.18<br><br>Change-Id: I1f9176432b3a01bd5e8c179dc269e391df2d446f<br>---<br>M src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c<br>M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c<br>2 files changed, 22 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c</span><br><span>index 9616262..104d279 100644</span><br><span>--- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c</span><br><span>+++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c</span><br><span>@@ -69,6 +69,16 @@</span><br><span>         CALIB_SUCCESS,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static inline int compat_gps_read(struct gps_data_t *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */</span><br><span style="color: hsl(120, 100%, 40%);">+#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0</span><br><span style="color: hsl(120, 100%, 40%);">+ return gps_read(data, NULL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+        return gps_read(data);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int oc2gbts_par_get_uptime(void *ctx, int *ret)</span><br><span> {</span><br><span>   char *fpath;</span><br><span>@@ -173,7 +183,7 @@</span><br><span>   int rc;</span><br><span>      struct oc2gbts_mgr_instance *mgr = fd->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     rc = gps_read(&mgr->gps.gpsdata);</span><br><span style="color: hsl(120, 100%, 40%);">+      rc = compat_gps_read(&mgr->gps.gpsdata);</span><br><span>      if (rc == -1) {</span><br><span>              LOGP(DCALIB, LOGL_ERROR, "gpsd vanished during read.\n");</span><br><span>          calib_state_reset(mgr, CALIB_FAIL_GPSFIX);</span><br><span>diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c</span><br><span>index 62509f2..b0b5edd 100644</span><br><span>--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c</span><br><span>+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c</span><br><span>@@ -57,6 +57,16 @@</span><br><span>         CALIB_SUCESS,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static inline int compat_gps_read(struct gps_data_t *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */</span><br><span style="color: hsl(120, 100%, 40%);">+#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0</span><br><span style="color: hsl(120, 100%, 40%);">+        return gps_read(data, NULL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+        return gps_read(data);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void calib_loop_run(void *_data)</span><br><span> {</span><br><span>  int rc;</span><br><span>@@ -109,8 +119,7 @@</span><br><span> {</span><br><span>   int rc;</span><br><span>      struct sysmobts_mgr_instance *mgr = fd->data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        rc = gps_read(&mgr->calib.gpsdata);</span><br><span style="color: hsl(120, 100%, 40%);">+    rc = compat_gps_read(&mgr->calib.gpsdata);</span><br><span>    if (rc == -1) {</span><br><span>              LOGP(DCALIB, LOGL_ERROR, "gpsd vanished during read.\n");</span><br><span>          calib_state_reset(mgr, CALIB_FAIL_GPS);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11505">change 11505</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/11505"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1f9176432b3a01bd5e8c179dc269e391df2d446f </div>
<div style="display:none"> Gerrit-Change-Number: 11505 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>