summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2005-07-26 19:33:51 +0000
committerEric S. Raymond <esr@thyrsus.com>2005-07-26 19:33:51 +0000
commit3a34fcc16b2c951d10892fa43d6921865fa1145c (patch)
tree8f05af00d1c024982b8399af92cf083b8c444f7b /packet.c
parent9a72ea292399172e6481a0215a220d56ec425e6f (diff)
downloadgpsd-3a34fcc16b2c951d10892fa43d6921865fa1145c.tar.gz
OK, this version both passes packet regression and gets partway
through the RTCM test.
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c60
1 files changed, 30 insertions, 30 deletions
diff --git a/packet.c b/packet.c
index 24b29f93..49fddec1 100644
--- a/packet.c
+++ b/packet.c
@@ -181,95 +181,95 @@ static void nextstate(struct gps_device_t *session, unsigned char c)
break;
#ifdef TRIPMATE_ENABLE
case ASTRAL_1:
+ if (c == 'S') {
#ifdef RTCM104_ENABLE
- (void)rtcm_decode(session, c);
+ (void)rtcm_decode(session, c);
#endif /* RTCM104_ENABLE */
- if (c == 'S')
session->packet_state = ASTRAL_2;
- else
+ } else
session->packet_state = GROUND_STATE;
break;
case ASTRAL_2:
+ if (c == 'T') {
#ifdef RTCM104_ENABLE
- (void)rtcm_decode(session, c);
+ (void)rtcm_decode(session, c);
#endif /* RTCM104_ENABLE */
- if (c == 'T')
session->packet_state = ASTRAL_3;
- else
+ } else
session->packet_state = GROUND_STATE;
break;
case ASTRAL_3:
+ if (c == 'R') {
#ifdef RTCM104_ENABLE
- (void)rtcm_decode(session, c);
+ (void)rtcm_decode(session, c);
#endif /* RTCM104_ENABLE */
- if (c == 'R')
session->packet_state = ASTRAL_5;
- else
+ } else
session->packet_state = GROUND_STATE;
break;
case ASTRAL_4:
+ if (c == 'A') {
#ifdef RTCM104_ENABLE
- (void)rtcm_decode(session, c);
+ (void)rtcm_decode(session, c);
#endif /* RTCM104_ENABLE */
- if (c == 'A')
session->packet_state = ASTRAL_2;
- else
+ } else
session->packet_state = GROUND_STATE;
break;
case ASTRAL_5:
+ if (c == 'L') {
#ifdef RTCM104_ENABLE
- (void)rtcm_decode(session, c);
+ (void)rtcm_decode(session, c);
#endif /* RTCM104_ENABLE */
- if (c == 'L')
session->packet_state = NMEA_RECOGNIZED;
- else
+ } else
session->packet_state = GROUND_STATE;
break;
#endif /* TRIPMATE_ENABLE */
#ifdef EARTHMATE_ENABLE
case EARTHA_1:
+ if (c == 'A') {
#ifdef RTCM104_ENABLE
- (void)rtcm_decode(session, c);
+ (void)rtcm_decode(session, c);
#endif /* RTCM104_ENABLE */
- if (c == 'A')
session->packet_state = EARTHA_2;
- else
+ } else
session->packet_state = GROUND_STATE;
break;
case EARTHA_2:
+ if (c == 'R') {
#ifdef RTCM104_ENABLE
- (void)rtcm_decode(session, c);
+ (void)rtcm_decode(session, c);
#endif /* RTCM104_ENABLE */
- if (c == 'R')
session->packet_state = EARTHA_3;
- else
+ } else
session->packet_state = GROUND_STATE;
break;
case EARTHA_3:
+ if (c == 'T') {
#ifdef RTCM104_ENABLE
- (void)rtcm_decode(session, c);
+ (void)rtcm_decode(session, c);
#endif /* RTCM104_ENABLE */
- if (c == 'T')
session->packet_state = EARTHA_4;
- else
+ } else
session->packet_state = GROUND_STATE;
break;
case EARTHA_4:
+ if (c == 'H') {
#ifdef RTCM104_ENABLE
- (void)rtcm_decode(session, c);
+ (void)rtcm_decode(session, c);
#endif /* RTCM104_ENABLE */
- if (c == 'H')
session->packet_state = EARTHA_5;
- else
+ } else
session->packet_state = GROUND_STATE;
break;
case EARTHA_5:
+ if (c == 'A') {
#ifdef RTCM104_ENABLE
- (void)rtcm_decode(session, c);
+ (void)rtcm_decode(session, c);
#endif /* RTCM104_ENABLE */
- if (c == 'A')
session->packet_state = NMEA_RECOGNIZED;
- else
+ } else
session->packet_state = GROUND_STATE;
break;
#endif /* EARTHMATE_ENABLE */