summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorChris Kuethe <chris.kuethe@gmail.com>2006-08-17 22:11:16 +0000
committerChris Kuethe <chris.kuethe@gmail.com>2006-08-17 22:11:16 +0000
commitaa006f20d82767f203f64a22b5c6921a431f3c8b (patch)
treef269befe860360f8997c55aeceddd090b7946627 /packet.c
parent4adfaf49d0c2ce3ad34c5a2f944aa7ca02fd2277 (diff)
downloadgpsd-aa006f20d82767f203f64a22b5c6921a431f3c8b.tar.gz
SiRF name cleanup.
1) the product line is called SiRFstar 2) I don't have any original SiRFstar receivers but my documentation says the protocol remained mostly the same between SS1, SS2 and SS3; it just got richer as time went by. At least with my SS2 and SS3 receivers, this holds true. 3) elsewhere in the code there are SIRF_THIS and SIRF_THAT, which implies (correctly) independence of chipset version.
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/packet.c b/packet.c
index 41e32848..2d64a9c2 100644
--- a/packet.c
+++ b/packet.c
@@ -87,12 +87,12 @@ static void nextstate(struct gps_device_t *session, unsigned char c)
break;
}
#endif
-#ifdef SIRFII_ENABLE
+#ifdef SIRF_ENABLE
if (c == 0xa0) {
session->packet_state = SIRF_LEADER_1;
break;
}
-#endif /* SIRFII_ENABLE */
+#endif /* SIRF_ENABLE */
#if defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE)
if (c == 0x10) {
session->packet_state = DLE_LEADER;
@@ -298,7 +298,7 @@ static void nextstate(struct gps_device_t *session, unsigned char c)
session->packet_state = GROUND_STATE;
break;
#endif /* NMEA_ENABLE */
-#ifdef SIRFII_ENABLE
+#ifdef SIRF_ENABLE
case SIRF_LEADER_1:
if (c == 0xa2)
session->packet_state = SIRF_LEADER_2;
@@ -338,7 +338,7 @@ static void nextstate(struct gps_device_t *session, unsigned char c)
else
session->packet_state = GROUND_STATE;
break;
-#endif /* SIRFII_ENABLE */
+#endif /* SIRF_ENABLE */
#if defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE)
case DLE_LEADER:
#ifdef EVERMORE_ENABLE
@@ -663,7 +663,7 @@ ssize_t packet_parse(struct gps_device_t *session, size_t newdata)
packet_discard(session);
break;
#endif /* NMEA_ENABLE */
-#ifdef SIRFII_ENABLE
+#ifdef SIRF_ENABLE
} else if (session->packet_state == SIRF_RECOGNIZED) {
unsigned char *trailer = session->inbufptr-4;
unsigned int checksum = (unsigned)((trailer[0] << 8) | trailer[1]);
@@ -677,7 +677,7 @@ ssize_t packet_parse(struct gps_device_t *session, size_t newdata)
session->packet_state = GROUND_STATE;
packet_discard(session);
break;
-#endif /* SIRFII_ENABLE */
+#endif /* SIRF_ENABLE */
#ifdef TSIP_ENABLE
} else if (session->packet_state == TSIP_RECOGNIZED) {
if ((session->inbufptr - session->inbuffer) >= 4)