summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2013-11-09 22:57:38 -0500
committerEric S. Raymond <esr@thyrsus.com>2013-11-09 22:57:38 -0500
commite030575a5248f6ad125af9e05fa0bc63ad811618 (patch)
treef077fb2dc31d8c661a3a4de6d870a0f665015ed0 /packet.c
parent2a3c19f2e8f2085575f222b39c747fb1f7204d0b (diff)
downloadgpsd-e030575a5248f6ad125af9e05fa0bc63ad811618.tar.gz
u-blox name cleanup. All regression tests pass, PPS is live.
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/packet.c b/packet.c
index f1600b31..9942da05 100644
--- a/packet.c
+++ b/packet.c
@@ -266,12 +266,12 @@ static void nextstate(struct gps_packet_t *lexer, unsigned char c)
break;
}
#endif /* ZODIAC_ENABLE */
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
if (c == 0xb5) {
lexer->state = UBX_LEADER_1;
break;
}
-#endif /* UBX_ENABLE */
+#endif /* UBLOX_ENABLE */
#ifdef ITRAX_ENABLE
if (c == '<') {
lexer->state = ITALK_LEADER_1;
@@ -510,7 +510,7 @@ static void nextstate(struct gps_packet_t *lexer, unsigned char c)
lexer->state = NMEA_DOLLAR;
else if (c == '!')
lexer->state = NMEA_BANG;
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
else if (c == 0xb5) /* LEA-5H can and will output NMEA and UBX back to back */
lexer->state = UBX_LEADER_1;
#endif
@@ -1014,7 +1014,7 @@ static void nextstate(struct gps_packet_t *lexer, unsigned char c)
lexer->state = ZODIAC_RECOGNIZED;
break;
#endif /* ZODIAC_ENABLE */
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
case UBX_LEADER_1:
if (c == 0x62)
lexer->state = UBX_LEADER_2;
@@ -1059,7 +1059,7 @@ static void nextstate(struct gps_packet_t *lexer, unsigned char c)
else
lexer->state = GROUND_STATE;
break;
-#endif /* UBX_ENABLE */
+#endif /* UBLOX_ENABLE */
#ifdef EVERMORE_ENABLE
case EVERMORE_LEADER_1:
if (c == STX)
@@ -1853,7 +1853,7 @@ void packet_parse(struct gps_packet_t *lexer)
break;
}
#endif /* ZODIAC_ENABLE */
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
else if (lexer->state == UBX_RECOGNIZED) {
/* UBX use a TCP like checksum */
int n, len;
@@ -1884,7 +1884,7 @@ void packet_parse(struct gps_packet_t *lexer)
packet_discard(lexer);
break;
}
-#endif /* UBX_ENABLE */
+#endif /* UBLOX_ENABLE */
#ifdef EVERMORE_ENABLE
else if (lexer->state == EVERMORE_RECOGNIZED) {
unsigned int n, crc, checksum, len;