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

List:       gpsd-commit-watch
Subject:    [Gpsd-commit-watch] r4020 - trunk
From:       garyemiller () mail ! berlios ! de
Date:       2006-11-29 7:21:09
Message-ID: 200611290721.kAT7L9L9014315 () sheep ! berlios ! de
[Download RAW message or body]

Author: garyemiller
Date: 2006-11-29 08:21:06 +0100 (Wed, 29 Nov 2006)
New Revision: 4020

Modified:
   trunk/garmin.c
Log:
garmin_usb_configure() is NOT optional. No PVT, SAT or RMD data is sent from a USB \
Garmin until this data is sent to it.  After this patch Garmin USB is still broken.  \
garmin_usb_configure() is never being called?

Modified: trunk/garmin.c
===================================================================
--- trunk/garmin.c	2006-11-29 05:58:07 UTC (rev 4019)
+++ trunk/garmin.c	2006-11-29 07:21:06 UTC (rev 4020)
@@ -784,19 +784,19 @@
     }
 }
 
-#ifdef ALLOW_RECONFIGURE
 /*
- * garmin_configure()
+ * garmin_usb_configure()
  *
- * configure a garmin_gps device,
+ * configure a garmin_gps (USB) device,
  * session->gpsdata.gps_fd is assumed to already be open.
  *
  * the garmin_gps driver ignores all termios, baud rates, etc. so
  * any twiddling of that previously done is harmless.
  *
  */
-static void garmin_configure(struct gps_device_t *session, int unsigned seq)
+static void garmin_usb_configure(struct gps_device_t *session, int unsigned seq)
 {
+    gpsd_report(LOG_PROG + 1, "garmin_usb_configure()\n");
     if (seq == 0) {
 	// turn on PVT data 49
 	gpsd_report(LOG_PROG, "Set Garmin to send reports every 1 second\n");
@@ -812,7 +812,6 @@
 #endif
     }
 }
-#endif /* ALLOW_RECONFIGURE */
 
 static void garmin_close(struct gps_device_t *session UNUSED) 
 {
@@ -1133,7 +1132,7 @@
     .probe_detect   = garmin_detect,	/* how to detect at startup time */
     .probe_subtype  = garmin_probe_subtype,	/* get subtype info */
 #ifdef ALLOW_RECONFIGURE
-    .configurator   = garmin_configure,	/* eable what we need */
+    .configurator   = garmin_usb_configure,	/* eable what we need */
 #endif /* ALLOW_RECONFIGURE */
     .get_packet     = garmin_get_packet,/* how to grab a packet */
     .parse_packet   = garmin_usb_parse,	/* parse message packets */
@@ -1158,9 +1157,8 @@
     .probe_wakeup   = NULL,		/* no wakeup to be done before hunt */
     .probe_detect   = garmin_detect,	/* how to detect at startup time */
     .probe_subtype  = garmin_probe_subtype,	/* get subtype info */
-#ifdef ALLOW_RECONFIGURE
-    .configurator   = garmin_configure,	/* eable what we need */
-#endif /* ALLOW_RECONFIGURE */
+    /* this configurator is NOT optional */
+    .configurator   = garmin_usb_configure,	/* enable what we need */
     .get_packet     = packet_get,       /* how to grab a packet */
     .parse_packet   = garmin_ser_parse,	/* parse message packets */
     .rtcm_writer    = NULL,		/* don't send DGPS corrections */
@@ -1184,7 +1182,7 @@
     .probe_detect   = NULL,        	/* how to detect at startup time */
     .probe_subtype  = NULL,        	/* initialize the device */
 #ifdef ALLOW_RECONFIGURE
-    .configurator   = garmin_configure,	/* enable what we need */
+    .configurator   = NULL,	        /* enable what we need */
 #endif /* ALLOW_RECONFIGURE */
     .get_packet     = packet_get,       /* how to grab a packet */
     .parse_packet   = garmin_ser_parse,	/* parse message packets */

_______________________________________________
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]