<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12339">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Stefan Sperling: Looks good to me, but someone else must approve
Neels Hofmeyr: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sysmobts_mgr: Prepare code for gpsd < 2.96 support<br><br>API prior to that version allocates the pointer internally. Let's change<br>current code to always use a pointer and in current supported code (gpsd<br>>= 2.96) point it to a user-allocated struct.<br><br>Follow-up patch will introduce necessary ifdefs to support older gpsd.<br><br>Change-Id: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f<br>---<br>M src/osmo-bts-sysmo/misc/sysmobts_mgr.h<br>M src/osmo-bts-sysmo/misc/sysmobts_mgr_calib.c<br>2 files changed, 10 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h</span><br><span>index 88f4e24..b62707c 100644</span><br><span>--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr.h</span><br><span>+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr.h</span><br><span>@@ -96,7 +96,8 @@</span><br><span> /* gps structure to see if there is a fix */</span><br><span> int gps_open;</span><br><span> struct osmo_fd gpsfd;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gps_data_t gpsdata;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gps_data_t *gpsdata;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gps_data_t gpsdata_buf;</span><br><span> struct osmo_timer_list fix_timeout;</span><br><span> </span><br><span> /* Loop/Re-try control */</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 b0b5edd..c3e821e 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>@@ -86,14 +86,14 @@</span><br><span> osmo_timer_del(&mgr->calib.fix_timeout);</span><br><span> </span><br><span> osmo_fd_unregister(&mgr->calib.gpsfd);</span><br><span style="color: hsl(0, 100%, 40%);">- gps_close(&mgr->calib.gpsdata);</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&mgr->calib.gpsdata, 0, sizeof(mgr->calib.gpsdata));</span><br><span style="color: hsl(120, 100%, 40%);">+ gps_close(mgr->calib.gpsdata);</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(mgr->calib.gpsdata, 0, sizeof(*(mgr->calib.gpsdata)));</span><br><span> mgr->calib.gps_open = 0;</span><br><span> }</span><br><span> </span><br><span> static void mgr_gps_checkfix(struct sysmobts_mgr_instance *mgr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gps_data_t *data = &mgr->calib.gpsdata;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gps_data_t *data = mgr->calib.gpsdata;</span><br><span> </span><br><span> /* No 2D fix yet */</span><br><span> if (data->fix.mode < MODE_2D) {</span><br><span>@@ -119,7 +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%);">- rc = compat_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>@@ -143,7 +143,8 @@</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = gps_open("localhost", DEFAULT_GPSD_PORT, &mgr->calib.gpsdata);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgr->calib.gpsdata = &mgr->calib.gpsdata_buf;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gps_open("localhost", DEFAULT_GPSD_PORT, mgr->calib.gpsdata);</span><br><span> if (rc != 0) {</span><br><span> LOGP(DCALIB, LOGL_ERROR, "Failed to connect to GPS %d\n", rc);</span><br><span> calib_state_reset(mgr, CALIB_FAIL_GPS);</span><br><span>@@ -151,12 +152,12 @@</span><br><span> }</span><br><span> </span><br><span> mgr->calib.gps_open = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- gps_stream(&mgr->calib.gpsdata, WATCH_ENABLE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ gps_stream(mgr->calib.gpsdata, WATCH_ENABLE, NULL);</span><br><span> </span><br><span> mgr->calib.gpsfd.data = mgr;</span><br><span> mgr->calib.gpsfd.cb = mgr_gps_read;</span><br><span> mgr->calib.gpsfd.when = BSC_FD_READ | BSC_FD_EXCEPT;</span><br><span style="color: hsl(0, 100%, 40%);">- mgr->calib.gpsfd.fd = mgr->calib.gpsdata.gps_fd;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgr->calib.gpsfd.fd = mgr->calib.gpsdata->gps_fd;</span><br><span> if (osmo_fd_register(&mgr->calib.gpsfd) < 0) {</span><br><span> LOGP(DCALIB, LOGL_ERROR, "Failed to register GPSD fd\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/12339">change 12339</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/12339"/><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: Iaeb5ac527cc3e58168027021d0f60afa93d1fb6f </div>
<div style="display:none"> Gerrit-Change-Number: 12339 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>