Enrich the regression-test logs with more metainformation.

Add corresponding entries to the hardware table where we can.

23 files changed, 106 insertions, 28 deletions

diff --git a/Makefile.am b/Makefile.am
index 99589b22..c550ebdc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -326,30 +326,31 @@ libgps: libgps.c .libs/libgps.a
 	$(CC) $(CFLAGS) -o libgps -lm -DTESTMAIN $(LIBPTHREAD) -g libgps.c .libs/libgps.a
 
 # Report splint warnings
+SPLINTOPTS = -I/usr/include/dbus-1.0/
 splint:
 	@echo "Running splint on daemon and libraries..."
 	@echo "Expect 'gpsd.c:230:39: Line expects to suppress 1 error, found 0 errors'"
-	-splint -redef $(gpsd_c_sources) $(libgpsd_c_sources)
+	-splint $(SPLINTOPTS) -redef $(gpsd_c_sources) $(libgpsd_c_sources)
 	@echo "Running splint on xgps..."
-	-splint -exportlocal $(xgps_SOURCES)
+	-splint $(SPLINTOPTS) -exportlocal $(xgps_SOURCES)
 	@echo "Running splint on cgps..."
-	-splint -exportlocal $(cgps_SOURCES)
+	-splint $(SPLINTOPTS) -exportlocal $(cgps_SOURCES)
 	@echo "Running splint on xgpsspeed..."
-	-splint -exportlocal $(xgpsspeed_c_sources)
+	-splint $(SPLINTOPTS) -exportlocal $(xgpsspeed_c_sources)
 	@echo "Running splint on gpsctl..."
-	-splint $(gpsctl_SOURCES)
+	-splint $(SPLINTOPTS) $(gpsctl_SOURCES)
 	@echo "Running splint on sirfmon..."
-	-splint $(sirfmon_SOURCES)
+	-splint $(SPLINTOPTS) $(sirfmon_SOURCES)
 	@echo "Running splint on gpspipe..."
-	-splint $(gpspipe_SOURCES)
+	-splint $(SPLINTOPTS) $(gpspipe_SOURCES)
 	@echo "Running splint on rtcmdecode..."
-	-splint -exportlocal rtcmdecode.c
+	-splint $(SPLINTOPTS) -exportlocal rtcmdecode.c
 	@echo "Running splint on gpsflash..."
-	-splint $(gpsflash_SOURCES)
+	-splint $(SPLINTOPTS) $(gpsflash_SOURCES)
 	@echo "Running splint on bits_test test harness..."
-	-splint $(bits_test_SOURCES)
+	-splint $(SPLINTOPTS) $(bits_test_SOURCES)
 	@echo "Running splint on packet_test test harness..."
-	-splint $(packet_test_SOURCES)
+	-splint $(SPLINTOPTS) $(packet_test_SOURCES)
 
 version:
 	@echo $(VERSION)
diff --git a/serial.c b/serial.c
index 335cd52e..d07b7f3a 100644
--- a/serial.c
+++ b/serial.c
@@ -307,7 +307,8 @@ bool gpsd_next_hunt_setting(struct gps_device_t *session)
 	}
 	gpsd_set_speed(session, 
 		       rates[session->baudindex],
-		       session->gpsdata.parity, session->gpsdata.stopbits);
+		       (unsigned char)session->gpsdata.parity, 
+		       session->gpsdata.stopbits);
     }
 
     return true;	/* keep hunting */
diff --git a/test/README b/test/README
index 191abdfe..1e4d0288 100644
--- a/test/README
+++ b/test/README
@@ -5,9 +5,10 @@ regression-test loads for gpsfake -p.
 Structured headers are as follows:
 
 # Name: Product name
+# Chipset: chipset name and (if possible) firmware revision level.
 # Description: product description (optional)
-# Cycle time: Time to repeat a sentence in seconds
-# Start-of-cycle: sentence that begins cycle
+# Cycle time: time to repeat a sentence in seconds
+# Start-of-cycle: sentence that begins each cycle
 # Pause-noted: did submitter note the intercycle pause? (Y/N)
 # Well-behaved: Timestamps are constant across cycle (Y/N)
 # Submitted-by: who sent it
diff --git a/test/stable/eXplorist210.log b/test/stable/eXplorist210.log
index 4dc56900..e9541959 100644
--- a/test/stable/eXplorist210.log
+++ b/test/stable/eXplorist210.log
@@ -1,4 +1,5 @@
 # Name: Magellan eXplorist 210
+# Chipset: unknown
 # Cycle-time: 1-second
 # Start-of-cycle: $GPGLL
 # Pause-noted: Y
diff --git a/test/stable/garmin-geko201.log b/test/stable/garmin-geko201.log
index b9855eae..4d5172f7 100644
--- a/test/stable/garmin-geko201.log
+++ b/test/stable/garmin-geko201.log
@@ -1,4 +1,5 @@
 # Name: Garmin Geko 201
+# Chipset: Garmin proprietary
 # Cycle-time: 1-second
 # Start-of-cycle: GPRMC
 # Pause-noted: Y
diff --git a/test/stable/garmin17n.log b/test/stable/garmin17n.log
index 49ca0d2a..9534ab7d 100644
--- a/test/stable/garmin17n.log
+++ b/test/stable/garmin17n.log
@@ -1,4 +1,5 @@
 # Name: Garmin 17N
+# Chipset: 
 # Cycle-time: 1-second
 # Start-of-cycle: GPRMC
 # Pause-noted: Y
diff --git a/test/stable/garmin25lp.log b/test/stable/garmin25lp.log
index bc2e924f..03b0b201 100644
--- a/test/stable/garmin25lp.log
+++ b/test/stable/garmin25lp.log
@@ -1,4 +1,5 @@
 # Name: Garmin 25LP
+# Chipset: Garmin proprietary, emits NMEA 2.0
 # Cycle-time: 1-second
 # Start-of-cycle: GPRMC
 # Pause-noted: ?
diff --git a/test/stable/garmin48.log b/test/stable/garmin48.log
index 72ebcf4b..1024e8fa 100644
--- a/test/stable/garmin48.log
+++ b/test/stable/garmin48.log
@@ -1,4 +1,5 @@
 # Name: Garmin 48
+# Chipset: Garmin propritary
 # Description: a handheld from about 2000.
 # Cycle-time: 2 seconds
 # Start-of-cycle: GPRMC
diff --git a/test/stable/gps-360.log b/test/stable/gps-360.log
index ca7a0d4b..95f6a3c8 100644
--- a/test/stable/gps-360.log
+++ b/test/stable/gps-360.log
@@ -1,8 +1,9 @@
 # Name: Pharos GPS-360
-# Cycle time: Time to repeat a sentence in seconds
+# Chipset: SiRfII
+# Cycle time: 1sec
 # Start-of-cycle: GPGGA
 # Pause-noted: ?
-# Well-behaved: ?
+# Well-behaved: Y
 # Submitted-by: "Jeff Fisher" <guppy@techmonkeys.org>
 # Date: 27 July 2006
 # Location: Regina, Saskatchewan, Canada, 50N104W
diff --git a/test/stable/gpslim236.log b/test/stable/gpslim236.log
index b079b146..47ced560 100644
--- a/test/stable/gpslim236.log
+++ b/test/stable/gpslim236.log
@@ -1,4 +1,5 @@
 # Name: Holux GPSlim 236
+# Chipset: SiRF-III
 # Cycle time: 1 sec
 # Start-of-cycle: GGA
 # Pause-noted: ?
diff --git a/test/stable/haicom-305N.log b/test/stable/haicom-305N.log
index 44cd6809..278b9596 100644
--- a/test/stable/haicom-305N.log
+++ b/test/stable/haicom-305N.log
@@ -1,8 +1,9 @@
 # Name: Haicom HI-305N
+# Chipset: SiRF-UU
 # Cycle-time: 1 second
 # Start of Cycle: GPGSV I think
 # Pause-noted: Y
-# Well-behaved: not sure
+# Well-behaved: Y
 # Date: 8th of April 2007 around 1955 in GMT+10 timezone
 # Location: Around E153S27
 # Submitted by: "David Findlay" <david@davsoft.com.au>
diff --git a/test/stable/holux-gm-210.log b/test/stable/holux-gm-210.log
index 4d27b877..141b6c15 100644
--- a/test/stable/holux-gm-210.log
+++ b/test/stable/holux-gm-210.log
@@ -1,4 +1,5 @@
 # Name: Holux GM-210
+# Chipset: SiRF-II
 # Cycle-time: 1-second
 # Start-of-cycle: GPGGA
 # Pause-noted: ?
diff --git a/test/stable/pharos-360.log b/test/stable/pharos-360.log
index e12b1096..7e8516d2 100644
--- a/test/stable/pharos-360.log
+++ b/test/stable/pharos-360.log
@@ -1,4 +1,5 @@
 # Name: Pharos GPS-360
+# Chipset: Sirf-II
 # Cycle time: 1 second
 # Start-of-cycle: GGA
 # Pause-noted: N
diff --git a/test/stable/tn200-all.log b/test/stable/tn200-all.log
index 72555e0d..687f2a9c 100644
--- a/test/stable/tn200-all.log
+++ b/test/stable/tn200-all.log
@@ -1,4 +1,5 @@
 # Name: Rayming Tripnav TN-200
+# Chipset: SiRF-II
 # Cycle-time: 1-second
 # Start-of-cycle: GPGGA
 # Pause-noted: Y
diff --git a/test/stable/tn200.log b/test/stable/tn200.log
index 56d96be6..9e36254c 100644
--- a/test/stable/tn200.log
+++ b/test/stable/tn200.log
@@ -1,4 +1,5 @@
 # Name: Rayming Tripnav TN-200
+# Chipset: SiRF-II
 # Cycle-time: 1-second
 # Start-of-cycle: GPGGA
 # Pause-noted: Y
diff --git a/test/stable/tn204.log b/test/stable/tn204.log
index f9d662b2..99786071 100644
--- a/test/stable/tn204.log
+++ b/test/stable/tn204.log
@@ -1,10 +1,12 @@
 # Name: Rayming TripNav 204
+# Chipset: SiRF-II
 # Cycle-time: 1-second
 # Start-of-cycle: ?
 # Pause-noted: N
 # Well-behaved: N
 # Submitted-by: "Pascal F. Martin" <pascal.martin@cox.net>
 # Date: 18 Mar 2005
+#	No entry for this on outr hardware page.
 $GPRMC,230148,A,3348.605,N,11821.126,W,000.0,209.4,261002,013.8,E*6B
 $GPRMB,A,,,,,,,,,,,,V*71
 $GPGGA,230149,3348.605,N,11821.126,W,1,05,1.7,49.4,M,-32.4,M,,*4E
diff --git a/test/stable/trimble-lassen_iq-3dfix.log b/test/stable/trimble-lassen_iq-3dfix.log
index fa482a61..e824a998 100644
--- a/test/stable/trimble-lassen_iq-3dfix.log
+++ b/test/stable/trimble-lassen_iq-3dfix.log
diff --git a/test/stable/trimble-lassen_iq-playacar.log b/test/stable/trimble-lassen_iq-playacar.log
index f8a68443..a4c83652 100644
--- a/test/stable/trimble-lassen_iq-playacar.log
+++ b/test/stable/trimble-lassen_iq-playacar.log
diff --git a/test/stable/trimble-lassen_iq.log b/test/stable/trimble-lassen_iq.log
index fb84c99c..673bc860 100644
--- a/test/stable/trimble-lassen_iq.log
+++ b/test/stable/trimble-lassen_iq.log
diff --git a/test/stable/uBlox-lea-4h.log b/test/stable/uBlox-lea-4h.log
index 42e4f59b..f64fc4b8 100644
--- a/test/stable/uBlox-lea-4h.log
+++ b/test/stable/uBlox-lea-4h.log
@@ -1,4 +1,5 @@
 # Name: uBlox LEA-4H module

+# Chipset: ANTARIS
 # Description: uBlox LEA-4H module

 # Cycle-time: 1 Sec

 # Start-of-cycle: GPRMC

diff --git a/test/stable/uBlox-lea-4s.log b/test/stable/uBlox-lea-4s.log
index 267bbab5..0434bd65 100644
--- a/test/stable/uBlox-lea-4s.log
+++ b/test/stable/uBlox-lea-4s.log
@@ -1,4 +1,5 @@
 # Name: LEA-4S
+# Chipset: ANTARIS
 # Cycle-time: 1-second
 # Start-of-cycle: ?
 # Pause-noted: ?
diff --git a/www/faq.html b/www/faq.html
index 5ec49f5f..de88a789 100644
--- a/www/faq.html
+++ b/www/faq.html
@@ -143,6 +143,7 @@ Here is the beginning of one log file I already have:</p>
 
 <pre>
 # Name: Holux GM-210
+# Chipset: SiRF-II
 # Cycle-time: 1-second
 # Start-of-cycle: ?
 # Pause-noted: ?
@@ -165,6 +166,9 @@ $GPGGA,012521.563,4131.7353,N,09336.8150,W,0,00,50.0,280.2,M,-31.6,M,0.0,0000*76
 <p>The way to fill in the Name, Cycle-Time, Submitted-by, and Date
 headers should be pretty obvious.</p>
 
+<p>Chipset should include the name and (if possible) model and/or
+firmware revision  of the chipset in the GPS.</p>
+
 <p>Start-of-cycle should be the name of the NMEA sentence (or, in a
 packet protocol, the numeric type ID of the packet) that is emitted
 first in each cycle.</p>
diff --git a/www/hardware.html b/www/hardware.html
index 9cbc1875..f638ece4 100644
--- a/www/hardware.html
+++ b/www/hardware.html
@@ -106,8 +106,10 @@
 interface that advertises NMEA-0183 compliance.  Here are some notes
 on hardware we have tested.  Hyperlinks lead to technical information.
 The "Works with" column is the last <code>gpsd</code> version with
-which this GPS is known to have been successfully tested. Vendors are
-listed in alphabetical order.</p>
+which this GPS is known to have been successfully tested; A "*" in
+this column means we have a regression test load for the device that
+is checked before each release. Vendors are listed in alphabetical
+order.</p>
 
 <p>Please mail your success (or failure) reports to 
 <a
@@ -308,6 +310,22 @@ and Amaury Jacquot &lt;sxpert@esitcom.org&gt;.
 </tr>
 <!-- End Garmin GPS-16 -->
 
+<!-- Begin Garmin GPS-17N -->
+<tr>
+<td><a href='http://www.garmin.com/products/gps17/spec.html'>Garmin GPS-17N</a></td>
+<td>Good</td>
+<td>Garmin</td>
+<td>RS-232</td>
+<td>*</td>
+<td>2.0 or 3.0</td>
+<td>
+The 17N has been discontinued and replaced by the 17HVS.
+The interface was RS-232 but used a custom RJ-45 jack.
+Reported by Wojciech Kazubski &lt;wk&#x40;ire.pw.edu.pl&gt;.
+</td>
+</tr>
+<!-- End Garmin GPS-16 -->
+
 <!-- Begin Garmin GPS-18 USB -->
 <tr>
 <td><a href='http://www.garmin.com/manuals/GPS18_TechnicalSpecification.pdf'>Garmin GPS-18 USB</a></td>
@@ -337,13 +355,37 @@ GPS-18 LVC and GPS-18 LVC/5m have PPS outputs. WAAS is supported.</td>
 </tr>
 <!-- End Garmin GPS-18 Non-USB -->
 
+<!-- Begin Garmin GPS-25 Non-USB -->
+<tr>
+<td><a href='http://www8.garmin.com/products/gps25/spec.html'>GPS-25LP</a></td>
+<td>Good</td>
+<td>Garmin</td>
+<td>RS-232</td>
+<td>*</td>
+<td>2.0</td>
+<td>Discontinued embedded module.
+Reported by Daniele Giangrazi &t;daniele.giangrazi&#x40;elital.net&gt;</td>
+</tr>
+<!-- End Garmin GPS-25LO -->
+
+<!-- Begin Garmin 38 -->
+<tr>
+<td>Garmin 38</td>
+<td>Excellent</td>
+<td>Garmin</td>
+<td>RS-232</td>
+<td>*</td>
+<td>?</td>
+<td>Discontinued.  Reported by Pascal F. Martin &lt;pascal.martin&#x40;cox.net&gt;</tr>
+<!-- End Garmin 48 -->
+
 <!-- Begin Garmin 48 -->
 <tr>
 <td>Garmin 48</td>
 <td>Excellent</td>
 <td>Garmin</td>
 <td>RS-232</td>
-<td>2.3</td>
+<td>*</td>
 <td>2.0</td>
 <td>Garmin 12XL and 45 are nearly identical and should work as well. Details
 on Garmin's proprietary protocol can be found
@@ -385,7 +427,7 @@ He says it's "Software Version 3.70".
 <td>Good</td>
 <td>Garmin</td>
 <td>RS-232</td>
-<td>2.13</td>
+<td>*</td>
 <td>3.0</td>
 <td>Reported by Jose Luis Domingo Lopez &lt;jdomingo&#x40;24x7linux.com&gt;</td>
 </tr>
@@ -447,7 +489,7 @@ Reported by Michal Panczyk &lt;mpanczyk&#x40;gmail.com&gt;
 <!-- Begin GlobalSat BU-303 -->
 <tr>
 <td><a href='http://www.usglobalsat.com/item.asp?itemid=11&catid=13'>BU-303</a></td>
-<td>Excellent</d>
+<td>Excellent *</d>
 <td>SiRFstarII</td>
 <td>USB (PL2303)</td>
 <td>2.24</td>
@@ -483,7 +525,7 @@ Reported by Chris Kuethe &lt;chris.kuethe&#x40;gmail.com&gt;.</td>
 <td>Excellent</d>
 <td>SiRFstarII</td>
 <td>USB (FTDI FT232)</td>
-<td>2.16</td>
+<td>*</td>
 <td>2.2</td>
 <td> We tested a version with SiRF Firmware level 231ES. The <a
 href='http://ftdi-usb-sio.sourceforge.net/'>FTDI USB-to-serial chip</a> is
@@ -537,6 +579,19 @@ with XTrac Firmware.</td>
 </tr>
 <!-- End Haicom HI-303S -->
 
+<!-- Begin Haicom HI-305N -->
+<tr>
+<td><a href="http://www.haicom.com.tw/gps303s.shtml">HI-303S</a></td>
+<td>Good</td>
+<td>SiRF-UU</td>
+<td>CF</td>
+<td>*</td>
+<td>?</td>
+<td>Adaptors for RS-232, USB, and Bluetooth operation are available.
+Reported by David Findlay &lt;dave&#x40;davsoft.com.au&gt;</td>
+</tr>
+<!-- End Haicom HI-3035N -->
+
 <tr><td style='text-align:center;' colspan="7"><a href="http://www.holux.com.tw">Holux</a></td></tr>
 
 <!-- Begin Holux GM-210 -->
@@ -545,7 +600,7 @@ with XTrac Firmware.</td>
 <td>Good</td>
 <td>SiRFstarII</td>
 <td>RS232</td>
-<td>2.24</td>
+<td>*</td>
 <td>2.2</td>
 <td> Reported by  Patrick L. McGillan &lt;pmcgillan&#x40;pateri.com&gt;.</td>
 </tr>
@@ -571,7 +626,7 @@ through serial interface. Water resistant.</td>
 <td>Poor</td>
 <td>SiRFstarIII</td>
 <td>Bluetooth</td>
-<td>2.30</td>
+<td>*</td>
 <td>2.2</td>
 <td>
 Doesn't report altitude reliably.
@@ -789,7 +844,7 @@ tolerate port speed changes at all.
 <td>Good</td>
 <td>SiRFstarII</td>
 <td>USB (PL2303)</td>
-<td>2.23</td>
+<td>*</td>
 <td>2.3</td>
 <td>Reported by Robert Pouliot &lt;krynos&#x40;saturnus.com&gt;<br/>
 The Pharos comes with adaptors for SDIO, CF, USB and plain RS232. Usually
@@ -941,7 +996,7 @@ Reported by  Angus Ainslie &lt;angusa&#x40;deltatee.com&gt;.</td>
 <td>Good</td>
 <td>ANTARIS</td>
 <td>RS-232</td>
-<td>2.33</td>
+<td>*</td>
 <td>2.3</td>
 <td>
 Sends 'E' in second field of GSA record, not an NMEA value.
@@ -957,7 +1012,7 @@ Reported by Andreas Stricker &lt;andreas.stricker@fela.ch&gt;
 <td>Good</td>
 <td>ANTARIS</td>
 <td>1USB+2UART</td>
-<td>2.33</td>
+<td>*</td>
 <td>2.3</td>
 <td>
 Reported by Ali Utku Selen &lt;selenau&#x40;kentkart.com.tr&gt;