sysmocom
/
gpsdate
11
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Fix build against gpsd >= 3.20 #1

Merged
osmith merged 2 commits from osmith/gpsdate:osmith/wip into master 2022-12-15 09:23:20 +00:00
Conversation 0 Commits 2 Files Changed 3 +49 -5
3 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/gps-watchdog
/gpsdate
/*.o

19
gps-watchdog.c
View File

@ -55,8 +55,13 @@ static void callback(struct gps_data_t *gpsdata)
{
/* we received some data but gpsd itself believes the receiver
* to be offline */
#if GPSD_API_MAJOR_VERSION >= 9 && GPSD_API_MINOR_VERSION >= 0
if (gpsdata->online.tv_sec == 0)
return;
#else
if (gpsdata->online == 0)
return;
#endif
/* re-set the alarm to the timeout */
alarm(timeout);
@ -109,6 +114,18 @@ static int osmo_daemonize(void)
return 0;
}
static inline int compat_gps_read(struct gps_data_t *data)
{
/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */
#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0
return gps_read(data, NULL, 0);
#elif GPSD_API_MAJOR_VERSION >= 5
return gps_read(data);
#else
return gps_poll(data);
#endif
}
osmith marked this conversation as resolved Outdated
pespin commented 2022-12-14 18:16:27 +00:00
Outdated
Review
Copy Link

For this gps_read() function since we always call it with one "variable" param in then, the best is to do a shim. I recall doing that somewhere already in gpsdata or gpsd in the past, look around. Something like:

int compat_gps_read(one_param) {
#if GPSD_API_MAJOR_VERSION >= 7
return gps_read(gdata, NULL, 0);
#else
return gps_read(gdata);
#endif
}

and then use compat_gps_read in all places.

For this gps_read() function since we always call it with one "variable" param in then, the best is to do a shim. I recall doing that somewhere already in gpsdata or gpsd in the past, look around. Something like: int compat_gps_read(one_param) { #if GPSD_API_MAJOR_VERSION >= 7 return gps_read(gdata, NULL, 0); #else return gps_read(gdata); #endif } and then use compat_gps_read in all places.
osmith commented 2022-12-14 18:27:14 +00:00
Outdated
Review
Copy Link

Done, found it here:
https://gerrit.osmocom.org/c/osmocom-bb/+/11609

Done, found it here: https://gerrit.osmocom.org/c/osmocom-bb/+/11609
/* local copy, as the libgps official version ignores gps_read() result */
static int my_gps_mainloop(struct gps_data_t *gdata,
int timeout,
@ -120,7 +137,7 @@ static int my_gps_mainloop(struct gps_data_t *gdata,
if (!gps_waiting(gdata, timeout)) {
return -1;
} else {
rc = gps_read(gdata);
rc = compat_gps_read(gdata);
if (rc < 0)
return rc;
(*hook)(gdata);

32
gpsdate.c
View File

@ -55,13 +55,19 @@ static void callback(struct gps_data_t *gpsdata)
time_t time;
char *timestr, *lf;
int rc;
int status;
if (!(gpsdata->set & TIME_SET))
return;
#if GPSD_API_MAJOR_VERSION >= 9 && GPSD_API_MINOR_VERSION >= 0
tv.tv_sec = gpsdata->fix.time.tv_sec;
tv.tv_usec = gpsdata->fix.time.tv_nsec / 1000;
#else
tv.tv_sec = gpsdata->fix.time;
/* FIXME: use the fractional part for microseconds */
tv.tv_usec = 0;
#endif
time = tv.tv_sec;
timestr = ctime(&time);
@ -74,10 +80,16 @@ static void callback(struct gps_data_t *gpsdata)
if (lf)
*lf = '\0';
syslog(LOG_DEBUG, "%s: gpsdate->set=0x%08"PRIu64"x status=%u sats_used=%u\n",
timestr, gpsdata->set, gpsdata->status, gpsdata->satellites_used);
#if GPSD_API_MAJOR_VERSION >= 10 && GPSD_API_MINOR_VERSION >= 0
status = gpsdata->fix.status;
#else
status = gpsdata->status;
#endif
if (gpsdata->status == 0) {
syslog(LOG_DEBUG, "%s: gpsdate->set=0x%08"PRIu64"x status=%u sats_used=%u\n",
timestr, gpsdata->set, status, gpsdata->satellites_used);
if (status == 0) {
syslog(LOG_INFO, "%s: discarding; no fix yet\n", timestr);
return;
}
@ -149,6 +161,18 @@ static int osmo_daemonize(void)
return 0;
}
static inline int compat_gps_read(struct gps_data_t *data)
{
/* API break in gpsd 6bba8b329fc7687b15863d30471d5af402467802 */
#if GPSD_API_MAJOR_VERSION >= 7 && GPSD_API_MINOR_VERSION >= 0
return gps_read(data, NULL, 0);
#elif GPSD_API_MAJOR_VERSION >= 5
return gps_read(data);
#else
return gps_poll(data);
#endif
}
/* local copy, as the libgps official version ignores gps_read() result */
static int my_gps_mainloop(struct gps_data_t *gdata,
int timeout,
@ -160,7 +184,7 @@ static int my_gps_mainloop(struct gps_data_t *gdata,
if (!gps_waiting(gdata, timeout)) {
return -1;
} else {
rc = gps_read(gdata);
rc = compat_gps_read(gdata);
if (rc < 0)
return rc;
(*hook)(gdata);