1*4882a593SmuzhiyunFrom 2f9ee6079b20fb5d3884472825a40c5c65550fa2 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Nick Hainke <vincent@systemli.org> 3*4882a593SmuzhiyunDate: Sun, 30 May 2021 19:13:48 +0200 4*4882a593SmuzhiyunSubject: [PATCH] pud: adapt gpsdclient.c to new gpsd 3.21 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunAs mentioned: 7*4882a593Smuzhiyun"Move gps_data_t->status to gps_fix_t.status for better fix merging" 8*4882a593Smuzhiyunhttps://gitlab.com/gpsd/gpsd/-/commit/29991d6ffeb41ecfc8297db68bb68be0128c8514 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Nick Hainke <vincent@systemli.org> 11*4882a593SmuzhiyunUpstream: 79a28cdb4083b66c5d3a5f9c0d70dbdc86c0420c 12*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun lib/pud/src/gpsdclient.c | 4 ++++ 15*4882a593Smuzhiyun 1 file changed, 4 insertions(+) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/lib/pud/src/gpsdclient.c b/lib/pud/src/gpsdclient.c 18*4882a593Smuzhiyunindex 2a7a26ee..a2a9cee0 100644 19*4882a593Smuzhiyun--- a/lib/pud/src/gpsdclient.c 20*4882a593Smuzhiyun+++ b/lib/pud/src/gpsdclient.c 21*4882a593Smuzhiyun@@ -370,7 +370,11 @@ void nmeaInfoFromGpsd(struct gps_data_t *gpsdata, NmeaInfo *info, struct GpsdCon 22*4882a593Smuzhiyun ); 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun gpsdata->set &= ~STATUS_SET; /* always valid */ 25*4882a593Smuzhiyun+ #if GPSD_API_MAJOR_VERSION >= 10 26*4882a593Smuzhiyun+ if (gpsdata->fix.status == STATUS_NO_FIX) { 27*4882a593Smuzhiyun+ #else 28*4882a593Smuzhiyun if (gpsdata->status == STATUS_NO_FIX) { 29*4882a593Smuzhiyun+ #endif 30*4882a593Smuzhiyun nmeaInfoClear(info); 31*4882a593Smuzhiyun nmeaTimeSet(&info->utc, &info->present, NULL); 32*4882a593Smuzhiyun return; 33*4882a593Smuzhiyun-- 34*4882a593Smuzhiyun2.31.1 35*4882a593Smuzhiyun 36