[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gpsd-commit-watch
Subject:    [Gpsd-commit-watch] r4018 - trunk
From:       esr at BerliOS <esr () mail ! berlios ! de>
Date:       2006-11-29 5:19:24
Message-ID: 200611290519.kAT5JOmU004720 () sheep ! berlios ! de
[Download RAW message or body]

Author: esr
Date: 2006-11-29 06:19:24 +0100 (Wed, 29 Nov 2006)
New Revision: 4018

Modified:
   trunk/gpsd.c
Log:
Stop trying to defer device activation, it breaks the
regression tests.  We'll figure tis one out after the
public release.


Modified: trunk/gpsd.c
===================================================================
--- trunk/gpsd.c	2006-11-29 05:15:35 UTC (rev 4017)
+++ trunk/gpsd.c	2006-11-29 05:19:24 UTC (rev 4018)
@@ -491,37 +491,16 @@
 found:
     gpsd_init(chp, &context, device_name);
     chp->gpsdata.raw_hook = raw_hook;
-#ifndef RTCM104_SERVICE
-    /* 
-     * This used to be a device_activate() call. But if all we ever
-     * look at is GPS devices, we only need to check accessibility
-     * here -- we don't need full device activation, and in particular
-     * we don't need to configure the device.
-     */
-    if (nowait){
-	if (gpsd_activate(chp, false) < 0)
-	    return NULL;
-	FD_SET(chp->gpsdata.gps_fd, &all_fds);
-	adjust_max_fd(chp->gpsdata.gps_fd, true);
-    } else {
-    	if (gpsd_open(chp) < 0)
-		return NULL;
-    	else
-		gpsd_close(chp);
-    }
-#else
     /*
-     * On the other hand, if we're supporting RTCM we *do* need to activate
-     * the device all the way so we'll sniff packets from it and discover 
-     * up front whether it's a GPS source or an RTCM source.  Otherwise clients
-     * trying to bind to a specific type won't know what source types are
-     * actually available.
+     * Bring the device all the way so we'll sniff packets from it and
+     * discover up front whether it's a GPS source or an RTCM source.
+     * Otherwise clients trying to bind to a specific type won't know
+     * what source types are actually available.
      */
     if (gpsd_activate(chp, false) < 0)
 	return NULL;
-	FD_SET(chp->gpsdata.gps_fd, &all_fds);
-	adjust_max_fd(chp->gpsdata.gps_fd, true);
-#endif /* RTCM104_SERVICE */
+    FD_SET(chp->gpsdata.gps_fd, &all_fds);
+    adjust_max_fd(chp->gpsdata.gps_fd, true);
     return chp;
 }
 /*@ +statictrans @*/

_______________________________________________
Gpsd-commit-watch mailing list
Gpsd-commit-watch@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/gpsd-commit-watch
[prev in list] [next in list] [prev in thread] [next in thread]