summaryrefslogtreecommitdiff
path: root/drivers.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2010-04-07 21:33:39 -0400
committerEric S. Raymond <esr@thyrsus.com>2010-04-07 21:33:39 -0400
commitef62188c1f9da52b3a62bd6eecfda440622de295 (patch)
treebeb422079d3ec72b8b87354969fd44bceb9b29f5 /drivers.c
parent9704ebb9b5d1510fcd0b4ee25c814570f2efaae5 (diff)
downloadgpsd-ef62188c1f9da52b3a62bd6eecfda440622de295.tar.gz
Some probes were wrongly conditionalized. Fix this.
Could only have affected people who tried to subset drivers in some odd ways.
Diffstat (limited to 'drivers.c')
-rw-r--r--drivers.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers.c b/drivers.c
index 89cb0d4e..ab84cdfa 100644
--- a/drivers.c
+++ b/drivers.c
@@ -139,13 +139,13 @@ static void nmea_event_hook(struct gps_device_t *session, event_t event)
* unless there is actual following data.
*/
switch (session->packet.counter) {
-#ifdef SIRF_ENABLE
+#ifdef NMEA_ENABLE
case 0:
/* probe for Garmin serial GPS -- expect $PGRMC followed by data*/
(void)nmea_send(session, "$PGRMCE");
break;
-#endif /* SIRF_ENABLE */
-#ifdef NMEA_ENABLE
+#endif /* NMEA_ENABLE */
+#ifdef SIRF_ENABLE
case 1:
/*
* We used to try to probe for SiRF by issuing "$PSRF105,1"
@@ -166,6 +166,8 @@ static void nmea_event_hook(struct gps_device_t *session, event_t event)
session->gpsdata.dev.stopbits);
session->back_to_nmea = true;
break;
+#endif /* SIRF_ENABLE */
+#ifdef NMEA_ENABLE
case 2:
/* probe for the FV-18 -- expect $PFEC,GPint followed by data */
(void)nmea_send(session, "$PFEC,GPint");