summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers.c20
-rw-r--r--monitor_tnt.c2
2 files changed, 12 insertions, 10 deletions
diff --git a/drivers.c b/drivers.c
index 27583fe3..9c286aa6 100644
--- a/drivers.c
+++ b/drivers.c
@@ -46,15 +46,8 @@ gps_mask_t generic_parse_input(struct gps_device_t *session)
session->context->century = year - (year % 100);
}
return 0;
- } else if (session->packet.type != NMEA_PACKET) {
- for (dp = gpsd_drivers; *dp; dp++) {
- if (session->packet.type == (*dp)->packet_type) {
- (void)gpsd_switch_driver(session, (*dp)->type_name);
- return (*dp)->parse_packet(session);
- }
- }
- return 0;
- } else { /* session->packet.type == NMEA_PACKET) */
+#ifdef NMEA_ENABLE
+ } else if (session->packet.type == NMEA_PACKET) {
gps_mask_t st = 0;
char *sentence = (char *)session->packet.outbuffer;
@@ -82,6 +75,15 @@ gps_mask_t generic_parse_input(struct gps_device_t *session)
}
}
return st;
+#endif /* NMEA_ENABLE */
+ } else {
+ for (dp = gpsd_drivers; *dp; dp++) {
+ if (session->packet.type == (*dp)->packet_type) {
+ (void)gpsd_switch_driver(session, (*dp)->type_name);
+ return (*dp)->parse_packet(session);
+ }
+ }
+ return 0;
}
}
diff --git a/monitor_tnt.c b/monitor_tnt.c
index 490f3fd9..7af64b08 100644
--- a/monitor_tnt.c
+++ b/monitor_tnt.c
@@ -38,7 +38,7 @@ static void tnt_update(void)
{
/*
* We have to do our own field parsing because the way this
- * gets valled, nmea_parse() is never called on the sentence.
+ * gets called, nmea_parse() is never called on the sentence.
*/
(void)nmea_parse((char *)session.packet.outbuffer, &session);