1*4882a593SmuzhiyunFrom 665051a845464c0f95edb81432104dac39426f79 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Sat, 6 Nov 2021 15:50:58 +0100 4*4882a593SmuzhiyunSubject: [PATCH] lib/pud/src/gpsdclient.c: drop handling of 5*4882a593Smuzhiyun gpsdata->fix.status 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunHere is an extract of https://gpsd.gitlab.io/gpsd/gpsd_json.html: 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunThe optional "status" field (aka fix type), is a modifier (adjective) to 10*4882a593Smuzhiyunmode. It is not a replacement for, or superset of, the "mode" field. It 11*4882a593Smuzhiyunis almost, but not quite, the same as the NMEA 4.x xxGGA GPS Quality 12*4882a593SmuzhiyunIndicator Values. Many GNSS receivers do not supply it. Those that do 13*4882a593Smuzhiyuninterpret the specification in various incompatible ways. 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSo status field is optional and STATUS_NO_FIX has been explicitly 16*4882a593Smuzhiyunrenamed into STATUS_UNK to avoid confusion with MODE_NO_FIX (which is 17*4882a593Smuzhiyunalready handled by gpsdclient.c) so drop the if block to fix the build 18*4882a593Smuzhiyunfailure with gpsd >= 3.23.1. 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 21*4882a593Smuzhiyun[Upstream: https://github.com/OLSR/olsrd/commit/665051a845464c0f95edb81432104dac39426f79] 22*4882a593SmuzhiyunSigned-off-by: Peter Seiderer <ps.report@gmx.net> 23*4882a593Smuzhiyun--- 24*4882a593Smuzhiyun lib/pud/src/gpsdclient.c | 9 --------- 25*4882a593Smuzhiyun 1 file changed, 9 deletions(-) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyundiff --git a/lib/pud/src/gpsdclient.c b/lib/pud/src/gpsdclient.c 28*4882a593Smuzhiyunindex a2a9cee0..d448867d 100644 29*4882a593Smuzhiyun--- a/lib/pud/src/gpsdclient.c 30*4882a593Smuzhiyun+++ b/lib/pud/src/gpsdclient.c 31*4882a593Smuzhiyun@@ -370,15 +370,6 @@ void nmeaInfoFromGpsd(struct gps_data_t *gpsdata, NmeaInfo *info, struct GpsdCon 32*4882a593Smuzhiyun ); 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun gpsdata->set &= ~STATUS_SET; /* always valid */ 35*4882a593Smuzhiyun- #if GPSD_API_MAJOR_VERSION >= 10 36*4882a593Smuzhiyun- if (gpsdata->fix.status == STATUS_NO_FIX) { 37*4882a593Smuzhiyun- #else 38*4882a593Smuzhiyun- if (gpsdata->status == STATUS_NO_FIX) { 39*4882a593Smuzhiyun- #endif 40*4882a593Smuzhiyun- nmeaInfoClear(info); 41*4882a593Smuzhiyun- nmeaTimeSet(&info->utc, &info->present, NULL); 42*4882a593Smuzhiyun- return; 43*4882a593Smuzhiyun- } 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun if (!gpsdata->set) { 46*4882a593Smuzhiyun return; 47*4882a593Smuzhiyun-- 48*4882a593Smuzhiyun2.33.1 49*4882a593Smuzhiyun 50