Magic-number elimination.

1 files changed, 4 insertions, 12 deletions

diff --git a/driver_proto.c b/driver_proto.c
index e8ab4fbd..377f63d7 100644
--- a/driver_proto.c
+++ b/driver_proto.c
@@ -302,12 +302,12 @@ static gps_mask_t _proto__parse_input(struct gps_device_t *session)
 
     if (session->packet.type == _PROTO__PACKET){
 	st = _proto__dispatch(session, session->packet.outbuffer, session->packet.outbuflen);
-	session->gpsdata.driver_mode = 1;
+	session->gpsdata.driver_mode = MODE_BINARY;
 	return st;
 #ifdef NMEA_ENABLE
     } else if (session->packet.type == NMEA_PACKET) {
 	st = nmea_parse((char *)session->packet.outbuffer, session);
-	session->gpsdata.driver_mode = 0;
+	session->gpsdata.driver_mode = MODE_NMEA;
 	return st;
 #endif /* NMEA_ENABLE */
     } else
@@ -326,19 +326,11 @@ static void _proto__set_mode(struct gps_device_t *session, int mode)
 {
     if (mode == MODE_NMEA) {
 	// _proto__to_nmea(session->gpsdata.gps_fd,session->gpsdata.baudrate); /* send the mode switch control string */
-	session->gpsdata.driver_mode = 0;	/* NMEA */
+	session->gpsdata.driver_mode = MODE_NMEA;
 	(void)gpsd_switch_driver(session, "Generic NMEA");
     } else {
 	session->back_to_nmea = false;
-	session->gpsdata.driver_mode = 1;	/* binary */
-    }
-}
-
-{
-    if (mode == 0) {
-	set_mode(session, session->gpsdata.baudrate);
-	session->gpsdata.driver_mode = 0;
-	(void)gpsd_switch_driver(session, "Generic NMEA");
+	session->gpsdata.driver_mode = MODE_BINARY;
     }
 }