Fix some bad naming. Number of TrueNorth channels is 0.

Add an NTRIP pointer to the references page.

5 files changed, 15 insertions, 10 deletions

diff --git a/gpsd.h b/gpsd.h
index 235dc5b2..c77d1f57 100644
--- a/gpsd.h
+++ b/gpsd.h
@@ -242,7 +242,7 @@ extern gps_mask_t sirf_parse(struct gps_device_t *, unsigned char *, size_t);
 extern gps_mask_t evermore_parse(struct gps_device_t *, unsigned char *, size_t);
 extern void packet_reset(struct gps_device_t *);
 extern void packet_pushback(struct gps_device_t *);
-extern ssize_t packet_parse(struct gps_device_t *, size_t);
+extern ssize_t packet_process(struct gps_device_t *, size_t);
 extern ssize_t packet_get(struct gps_device_t *);
 extern int packet_sniff(struct gps_device_t *);
 
diff --git a/packet.c b/packet.c
index 0d4ebe30..35b411c9 100644
--- a/packet.c
+++ b/packet.c
@@ -613,7 +613,7 @@ static void character_discard(struct gps_device_t *session)
 #define getword(i) (short)(session->inbuffer[2*(i)] | (session->inbuffer[2*(i)+1] << 8))
 
 
-ssize_t packet_parse(struct gps_device_t *session, size_t newdata)
+ssize_t packet_process(struct gps_device_t *session, size_t newdata)
 /* grab a packet; returns ether BAD_PACKET or the length */
 {
 #ifdef STATE_DEBUG
@@ -791,7 +791,7 @@ ssize_t packet_get(struct gps_device_t *session)
 	return BAD_PACKET;
     else if (newdata == 0 || (newdata < 0 && errno == EAGAIN))
 	return 0;
-    return packet_parse(session, (size_t)newdata);
+    return packet_process(session, (size_t)newdata);
 }
 
 void packet_reset(struct gps_device_t *session)
diff --git a/packet_test.c b/packet_test.c
index 494f044b..94ec9e6b 100644
--- a/packet_test.c
+++ b/packet_test.c
@@ -211,7 +211,7 @@ static int packet_test(struct map *mp)
     state.inbuflen = 0;
     /*@i@*/memcpy(state.inbufptr = state.inbuffer, mp->test, mp->testlen);
     /*@ -compdef -uniondef -usedef @*/
-    st = packet_parse(&state, mp->testlen);
+    st = packet_process(&state, mp->testlen);
     if (state.packet_type != mp->type)
 	printf("%s test FAILED (packet type %d wrong).\n", mp->legend, (int)st);
     else if (memcmp(mp->test + mp->garbage_offset, state.outbuffer, state.outbuflen)) {
diff --git a/truenorth.c b/truenorth.c
index be99d59c..047cde8b 100644
--- a/truenorth.c
+++ b/truenorth.c
@@ -157,7 +157,7 @@ static bool tnt_probe(struct gps_device_t *session)
 struct gps_type_t trueNorth = {
     .typename       = "True North",	/* full name of type */
     .trigger        = " TNT1500",
-    .channels       = 14,		/* not a consumer-grade GPS */
+    .channels       = 0,		/* not an actual GPS at all */
     .probe          = tnt_probe,	/* probe by sending ID query */
     .initializer    = tnt_initializer,	/* probe for True North Digital Compass */
     .get_packet     = packet_get,		/* how to get a packet */
diff --git a/www/references.html b/www/references.html
index c58ed40c..1cbe93a2 100644
--- a/www/references.html
+++ b/www/references.html
@@ -39,11 +39,12 @@
 trying to understand GPS technology.</p>
 
 <p>In the descriptions below, the adjective "evil" applied to the
-distribution terms of a standard or technical specfication means that
+distribution terms of a standard or technical specification means that
 (a) it is not available for free download, and (b) it cannot legally
-be redistributed.  The phrase "extremely evil" means that attack
-lawyers for the document publisher have been known to threaten people
-who quote it on the Web.</p>
+be redistributed.  The phrase "extremely evil" means that not only are
+the distribution terms evil, but that attack lawyers for the document
+publisher have been known to threaten people who quote it on the
+Web.</p>
 
 <h1>GPS standards</h1>
 
@@ -84,9 +85,13 @@ so we do have full details of the message format.</dd>
 <dt><a
 href='http://www.itu.int/rec/recommendation.asp?type=items&amp;lang=e&amp;parent=r-rec-m.823-2-199710-i'>ITU-R M.823-2</a></dt> 
 <dd>This specification documents some of the murky depths of
-rtcm-104, the specification used for broadcating differential-gps 
+rtcm-104, the specification used for broadcasting differential-gps 
 corrections. Unfortunately, its distribution terms are also evil.</dd>
 
+<dt><a href='http://igs.ifag.de/index_ntrip.htm'>Ntrip home page</a></dt>
+<dd>NTRIP is a protocol for shipping DGPS corrections that uses HTTP 
+as a transport layer. We don't support this yet, and may never.  The
+distribution terms for the NTRIP standard are evil.</dd>
 </dl>
 
 <h1>Vendor protocols</h1>