Fix compile error when all of SiRF, Garmin, and TSIP are disables.

Also, fix gpsfake's ability to handle SiRF logs.

4 files changed, 13 insertions, 5 deletions

diff --git a/TODO b/TODO
index 2a846489..4025d0cc 100644
--- a/TODO
+++ b/TODO
@@ -4,6 +4,11 @@ will unfold thenm again.
 
 ** Bugs:
 
+*** Running the BU-303b-nofix test file through gpsfake produces a nan
+
+Running the BU-303b-nofix test file through gpsfake produces a nan in
+the GPGSA dump.
+
 *** No data from BU-303?
 
 Roeland Th. Jansen <roeland@linux-it.nl> was reporting no data from a
diff --git a/gpsd.h b/gpsd.h
index b0b1a640..12781972 100644
--- a/gpsd.h
+++ b/gpsd.h
@@ -114,7 +114,6 @@ struct gps_device_t {
     unsigned long satcounter;
 #endif /* SIRFII_ENABLE */
 #ifdef TSIP_ENABLE
-    unsigned int gps_week;	/* Current GPS week number */
     time_t last_request;	/* Last time request packets were sent */
 #endif /* TSIP_ENABLE */
 #ifdef GARMIN_ENABLE	/* private housekeeping stuff for the Garmin driver */
@@ -123,6 +122,9 @@ struct gps_device_t {
                            global context and save spave */
     long GarminBufferLen;                  /* current GarminBuffer Length */
 #endif /* GARMIN_ENABLE */
+#if defined(SIRFII_ENABLE) || defined(TSIP_ENABLE) || defined(GARMIN_ENABLE)
+    unsigned int gps_week;	/* Current GPS week number */
+#endif /*defined(SIRFII_ENABLE)||defined(TSIP_ENABLE)||defined(GARMIN_ENABLE)*/
 #ifdef ZODIAC_ENABLE	/* private housekeeping stuff for the Zodiac driver */
     unsigned short sn;		/* packet sequence number */
     /*
diff --git a/gpsd.spec.in b/gpsd.spec.in
index a19554bd..9518ba46 100644
--- a/gpsd.spec.in
+++ b/gpsd.spec.in
@@ -129,7 +129,8 @@ cp gps.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-packages
   library.  Packet-sniffing on a new device no longer holds up incoming
   data on already-connected ones.  There is now a super-raw mode (R=2) 
   that dumps a hex-encoding of every binary packet received to the 
-  client. Support for Trimble TSIP GPSes merged.
+  client; sirfmon uses it to operate through the daemon if one is running. 
+  Support for Trimble TSIP GPSes merged. gpsfake now works with SiRF logs.
 
 * Sat May 21 2005 Eric S. Raymond <esr@snark.thyrsus.com> - 2.25-1
 - Various signedness and scaling fixes and an OpenBSD port patch for the 
diff --git a/gpsfake b/gpsfake
index a85f13cc..9cacdf1c 100755
--- a/gpsfake
+++ b/gpsfake
@@ -64,13 +64,13 @@ try:
         leader = '$';
         legend = "gpsfake: line %d "
         textual = 1
-    elif logdata[0] == 0xa0:
+    elif logdata[0] == '\xa0':
         print "gpsfake: interpreting as SiRF-II binary packets"
-        leader = 0xa0
+        leader = '\xa0'
         legend = "gpsfake: packet %d"
         textual = 0
     else:
-        print "gpsfake: unknown log type, can't handle it!"
+        print "gpsfake: unknown log type (not NMEA or SiRF) can't handle it!"
         logdata = None
 
     if logdata: