Prep work for 16-channel receivers; silence a warning about PPS initialization.

5 files changed, 13 insertions, 15 deletions

diff --git a/TODO b/TODO
index 93c01862..afd38794 100644
--- a/TODO
+++ b/TODO
@@ -4,13 +4,12 @@ will unfold them again.
 
 ** Bugs:
 
-*** Various things are unhappy in the TSIP driverr
+*** EPH and EPV reports are zeroed too often in the TSIP driver 
 
-EPH and EPV reports are zeroed too often in the TSIP code.  There is
-some bad interaction between the policy code in libgpsd_core.c and the
-driver that we haven't figured out.
+There is some bad interaction between the policy code in
+libgpsd_core.c and the driver that we haven't figured out.
 
-*** PPS code is flaky
+*** PPS code is flaky, possibly due to a pthreads bug
 
 Some code attempting to terminate the PPS-monutoring thread when there
 is no DCD (e.g., on a USB device) seems to have tickled some kind of
@@ -85,7 +84,7 @@ Rob recommends:
 
 I have not yet reproduced this.
 
-*** Possible resource-leak bug, not yet reproduced or confirmed.
+*** Possible resource-leak bug, not yet reproduced or confirmed
 
 Wojciech Kazubski <wk@ire.pw.edu.pl> reports: when I connect to gpsd first
 time everything goes fine, and several clients can connect without
diff --git a/gpsd.spec.in b/gpsd.spec.in
index 516a0099..c152836e 100644
--- a/gpsd.spec.in
+++ b/gpsd.spec.in
@@ -122,7 +122,7 @@ cp gps.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-packages
 %{_libdir}/X11/app-defaults/xgpsspeed
 
 %changelog
-* Tue Jun 21 2005 Eric S. Raymond <esr@snark.thyrsus.com> - @VERSION@-1
+* Wed Jun 22 2005 Eric S. Raymond <esr@snark.thyrsus.com> - @VERSION@-1
 - Time DOP and total DOP are now passed on from GPSes that report
   them.  Ensure longitude has a leading zero when <100, for
   compatibility with gpsdrive.  Synchronous and thread hooks are now
diff --git a/gpsutils.c b/gpsutils.c
index fd58b835..dc9e68d1 100644
--- a/gpsutils.c
+++ b/gpsutils.c
@@ -9,6 +9,8 @@
 
 #include "gpsd.h"
 
+#define MONTHSPERYEAR	12		/* months per calendar year */
+
 void gps_clear_fix(/*@ out @*/struct gps_fix_t *fixp)
 /* stuff a fix structure with recognizable out-of-band values */
 {
@@ -71,12 +73,12 @@ time_t mkgmtime(register struct tm *t)
 {
     register int year;
     register time_t result;
-    static const int cumdays[12] =
+    static const int cumdays[MONTHSPERYEAR] =
     {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
 
     /*@ +matchanyintegral @*/
-    year = 1900 + t->tm_year + t->tm_mon / 12;
-    result = (year - 1970) * 365 + cumdays[t->tm_mon % 12];
+    year = 1900 + t->tm_year + t->tm_mon / MONTHSPERYEAR;
+    result = (year - 1970) * 365 + cumdays[t->tm_mon % MONTHSPERYEAR];
     result += (year - 1968) / 4;
     result -= (year - 1900) / 100;
     result += (year - 1600) / 400;
diff --git a/ntpshm.c b/ntpshm.c
index 115a8038..8e6a9acd 100644
--- a/ntpshm.c
+++ b/ntpshm.c
@@ -78,7 +78,7 @@ int ntpshm_init(struct gps_context_t *context, bool enablepps)
 # ifdef PPS_ENABLE
     context->shmTimePPS = enablepps;
 # endif /* PPS_ENABLE */
-    return 1;
+    return enablepps;
 }
 
 int ntpshm_alloc(struct gps_context_t *context)
@@ -101,7 +101,6 @@ int ntpshm_alloc(struct gps_context_t *context)
     return -1;
 }
 
-
 bool ntpshm_free(struct gps_context_t *context, int segment)
 /* free NTP SHM segment */
 {
diff --git a/sirfmon.c b/sirfmon.c
index 1f3396f2..6d7e850c 100644
--- a/sirfmon.c
+++ b/sirfmon.c
@@ -61,8 +61,6 @@ extern int netlib_connectsock(const char *, const char *, const char *);
 #define END1		0xb0
 #define END2		0xb3
 
-#define MAXCHANNELS	12
-
 #define RAD2DEG (180.0/PI)
 
 /* how many characters to look at when trying to find baud rate lock */
@@ -442,7 +440,7 @@ static void decode_sirf(unsigned char buf[], int len)
 	total               2 x 12 = 24 bytes
 	******************************************************************/
 	display(mid27win, 1, 14, "%d (%s)", getub(buf, 1), sbasvec[(int)getub(buf, 1)]);
-	for (i = j = 0; i < MAXCHANNELS; i++) {
+	for (i = j = 0; i < 12; i++) {
 	    if (/*@i1@*/getub(buf, 16+2*i) != '\0') {
 		(void)wprintw(mid27win, "%d=%d ", getub(buf, 16+2*i), getub(buf, 16+2*i+1));
 		j++;