summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gpspacket.c2
-rw-r--r--libgpsd_core.c2
-rw-r--r--packet.c42
-rw-r--r--packet_states.h6
4 files changed, 26 insertions, 26 deletions
diff --git a/gpspacket.c b/gpspacket.c
index 6cebc4c1..af31b25b 100644
--- a/gpspacket.c
+++ b/gpspacket.c
@@ -255,6 +255,6 @@ initgpspacket(void)
PyModule_AddIntConstant(m, "TSIP_PACKET", TSIP_PACKET);
PyModule_AddIntConstant(m, "EVERMORE_PACKET", EVERMORE_PACKET);
PyModule_AddIntConstant(m, "ITALK_PACKET", ITALK_PACKET);
- PyModule_AddIntConstant(m, "RTCM_PACKET", RTCM_PACKET);
+ PyModule_AddIntConstant(m, "RTCM2_PACKET", RTCM2_PACKET);
PyModule_AddIntConstant(m, "GARMIN_PACKET", GARMIN_PACKET);
}
diff --git a/libgpsd_core.c b/libgpsd_core.c
index f1ae2cfd..493fc039 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -333,7 +333,7 @@ char /*@observer@*/ *gpsd_id(/*@in@*/struct gps_device_t *session)
return(buf);
}
-#if defined(BINARY_ENABLE) || defined(RTCM_ENABLE) || defined(NTRIP_ENABLE)
+#if defined(BINARY_ENABLE) || defined(RTCM2_ENABLE) || defined(NTRIP_ENABLE)
/*
* Support for generic binary drivers. These functions dump NMEA for passing
* to the client in raw mode. They assume that (a) the public gps.h structure
diff --git a/packet.c b/packet.c
index 2654653f..837f97f5 100644
--- a/packet.c
+++ b/packet.c
@@ -116,7 +116,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'A') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -128,7 +128,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'E') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -162,10 +162,10 @@ static void nextstate(struct gps_packet_t *lexer,
#endif /* NAVCOM_ENABLE */
#ifdef RTCM104_ENABLE
if ((isgpsstat = rtcm2_decode(lexer, c)) == ISGPS_SYNC) {
- lexer->state = RTCM_SYNC_STATE;
+ lexer->state = RTCM2_SYNC_STATE;
break;
} else if (isgpsstat == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -261,7 +261,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'S') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -273,7 +273,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'T') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -285,7 +285,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'R') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -297,7 +297,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'A') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -309,7 +309,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'L') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -323,7 +323,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'A') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -335,7 +335,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'R') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -347,7 +347,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'T') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -359,7 +359,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'H') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -371,7 +371,7 @@ static void nextstate(struct gps_packet_t *lexer,
if (c == 'A') {
#ifdef RTCM104_ENABLE
if (rtcm2_decode(lexer, c) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
}
#endif /* RTCM104_ENABLE */
@@ -742,18 +742,18 @@ static void nextstate(struct gps_packet_t *lexer,
break;
#endif /* TSIP_ENABLE */
#ifdef RTCM104_ENABLE
- case RTCM_SYNC_STATE:
- case RTCM_SKIP_STATE:
+ case RTCM2_SYNC_STATE:
+ case RTCM2_SKIP_STATE:
if ((isgpsstat = rtcm2_decode(lexer, c)) == ISGPS_MESSAGE) {
- lexer->state = RTCM_RECOGNIZED;
+ lexer->state = RTCM2_RECOGNIZED;
break;
} else if (isgpsstat == ISGPS_NO_SYNC)
lexer->state = GROUND_STATE;
break;
- case RTCM_RECOGNIZED:
+ case RTCM2_RECOGNIZED:
if (rtcm2_decode(lexer, c) == ISGPS_SYNC) {
- lexer->state = RTCM_SYNC_STATE;
+ lexer->state = RTCM2_SYNC_STATE;
break;
} else
lexer->state = GROUND_STATE;
@@ -1192,13 +1192,13 @@ ssize_t packet_parse(struct gps_packet_t *lexer, size_t fix)
}
#endif /* NAVCOM_ENABLE */
#ifdef RTCM104_ENABLE
- else if (lexer->state == RTCM_RECOGNIZED) {
+ else if (lexer->state == RTCM2_RECOGNIZED) {
/*
* RTCM packets don't have checksums. The six bits of parity
* per word and the preamble better be good enough.
*/
packet_accept(lexer, RTCM2_PACKET);
- lexer->state = RTCM_SYNC_STATE;
+ lexer->state = RTCM2_SYNC_STATE;
packet_discard(lexer);
break;
}
diff --git a/packet_states.h b/packet_states.h
index b3a0af95..0070b42b 100644
--- a/packet_states.h
+++ b/packet_states.h
@@ -127,9 +127,9 @@
#endif /* TSIP_ENABLE GARMIN_ENABLE */
#ifdef RTCM104_ENABLE
- RTCM_SYNC_STATE, /* we have sync lock */
- RTCM_SKIP_STATE, /* we have sync lock, but this character is bad */
- RTCM_RECOGNIZED, /* we have an RTCM packet */
+ RTCM2_SYNC_STATE, /* we have sync lock */
+ RTCM2_SKIP_STATE, /* we have sync lock, but this character is bad */
+ RTCM2_RECOGNIZED, /* we have an RTCM packet */
#endif /* RTCM104_ENABLE */
/* end of packet_states.h */
View Lorry Controller Status