gpsd: Upgrade from 3.9 to 3.10 in the hope the TSIP is working better

Related: SYS#410
This commit is contained in:
Holger Hans Peter Freyther 2014-06-24 20:28:48 +02:00
parent bf0c0ad287
commit 2f367aec31
7 changed files with 54 additions and 59 deletions

View File

@ -25,25 +25,22 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
SConstruct | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/SConstruct b/SConstruct
index 9c0f751..8236abb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -560,12 +560,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size);
Index: gpsd-3.10/SConstruct
===================================================================
--- gpsd-3.10.orig/SConstruct
+++ gpsd-3.10/SConstruct
@@ -704,12 +704,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in
manbuilder = mangenerator = htmlbuilder = None
-if config.CheckXsltproc():
+if False and config.CheckXsltproc():
mangenerator = 'xsltproc'
build = "xsltproc --nonet %s $SOURCE >$TARGET"
htmlbuilder = build % docbook_html_uri
manbuilder = build % docbook_man_uri
-elif WhereIs("xmlto"):
+elif False and WhereIs("xmlto"):
mangenerator = 'xmlto'
htmlbuilder = "xmlto html-nochunks $SOURCE; mv `basename $TARGET` $TARGET"
manbuilder = "xmlto man $SOURCE; mv `basename $TARGET` $TARGET"
--
1.7.8.6
manbuilder = mangenerator = htmlbuilder = None
if env['manbuild']:
- if config.CheckXsltproc():
+ if False and config.CheckXsltproc():
mangenerator = 'xsltproc'
build = "xsltproc --nonet %s $SOURCE >$TARGET"
htmlbuilder = build % docbook_html_uri
manbuilder = build % docbook_man_uri
- elif WhereIs("xmlto"):
+ elif False and WhereIs("xmlto"):
mangenerator = 'xmlto'
xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` `dirname $TARGET`"
htmlbuilder = xmlto % "html-nochunks"

View File

@ -9,14 +9,14 @@ Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
SConstruct | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/SConstruct b/SConstruct
index a25e88a..a1bddb9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1277,7 +1277,10 @@ def Utility(target, source, action):
Index: gpsd-3.10/SConstruct
===================================================================
--- gpsd-3.10.orig/SConstruct
+++ gpsd-3.10/SConstruct
@@ -1414,7 +1414,10 @@ def Utility(target, source, action):
# Report splint warnings
# Note: test_bits.c is unsplintable because of the PRI64 macros.
# If you get preprocessor or fatal errors, add +showscan.
-splintopts = "-I/usr/include/libusb-1.0 +quiet"
+if not env['sysroot']:
+ splintopts = "-I/usr/include/libusb-1.0 +quiet"
@ -25,6 +25,3 @@ index a25e88a..a1bddb9 100644
# splint does not know about multi-arch, work around that
ma_status, ma = _getstatusoutput('dpkg-architecture -qDEB_HOST_MULTIARCH')
if ma_status == 0:
--
1.7.5.4

View File

@ -0,0 +1,28 @@
Index: gpsd-3.10/driver_tsip.c
===================================================================
--- gpsd-3.10.orig/driver_tsip.c
+++ gpsd-3.10/driver_tsip.c
@@ -1201,6 +1201,23 @@ void configuration_packets_generic(struc
/* Request Navigation Configuration */
putbyte(buf, 0, 0x03);
(void)tsip_write(session, 0xbb, buf, 1);
+
+ gpsd_report(session->context->debug,
+ LOG_PROG, "Configuring + Enabling 1PPS\n");
+ /* enable 1pps */
+ putbyte(buf, 0, 0x4a);
+ putbyte(buf, 1, 0x01);
+ (void)tsip_write(session, 0x8e, buf, 2);
+
+ /* request PPS only if at least one sat is visible */
+ putbyte(buf, 0, 0x4e);
+ putbyte(buf, 1, 0x03);
+ (void)tsip_write(session, 0x8e, buf, 2);
+
+ /* request PPS and TSIP to use UTC time, not GPS */
+ putbyte(buf, 0, 0xa2);
+ putbyte(buf, 1, 0x03);
+ (void)tsip_write(session, 0x8e, buf, 2);
}
void configuration_packets_accutime_gold(struct gps_device_t *session)

View File

@ -1,27 +0,0 @@
diff --git a/driver_tsip.c b/driver_tsip.c
index 3c99138..76cbc82 100644
--- a/driver_tsip.c
+++ b/driver_tsip.c
@@ -1016,6 +1016,22 @@ static void tsip_event_hook(struct gps_device_t *session, event_t event)
/* Request Navigation Configuration */
putbyte(buf, 0, 0x03);
(void)tsip_write(session, 0xbb, buf, 1);
+ gpsd_report(LOG_PROG, "Configuring + Enabling 1PPS\n");
+ /* enable 1pps */
+ putbyte(buf, 0, 0x4a);
+ putbyte(buf, 1, 0x01);
+ (void)tsip_write(session, 0x8e, buf, 2);
+
+ /* request PPS only if at least one sat is visible */
+ putbyte(buf, 0, 0x4e);
+ putbyte(buf, 1, 0x03);
+ (void)tsip_write(session, 0x8e, buf, 2);
+
+ /* request PPS and TSIP to use UTC time, not GPS */
+ putbyte(buf, 0, 0xa2);
+ putbyte(buf, 1, 0x03);
+ (void)tsip_write(session, 0x8e, buf, 2);
+
break;
}
}

View File

@ -17,8 +17,8 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
file://gpsd \
file://60-gpsd.rules \
"
SRC_URI[md5sum] = "53a88f24a0973d23427e82e9a8914f19"
SRC_URI[sha256sum] = "d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a"
SRC_URI[md5sum] = "fc5b03aae38b9b5b6880b31924d0ace3"
SRC_URI[sha256sum] = "706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320"
#inherit scons update-rc.d python-dir pythonnative
inherit scons update-rc.d