Switch from GPLv2 to GPLv2+

[fw/altos] / ao-tools / lib / cc.h

diff --git a/ao-tools/lib/cc.h b/ao-tools/lib/cc.h
index c434b102264847ecdbe66c6e81364ef1f79f8a55..cbeb705c895e4f6135aa6dea4980f4d7fb165a35 100644 (file)
--- a/ao-tools/lib/cc.h
+++ b/ao-tools/lib/cc.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -50,7 +51,7 @@ void
 cc_usbdevs_free(struct cc_usbdevs *usbdevs);
 
 struct cc_usbdevs *
-cc_usbdevs_scan(void);
+cc_usbdevs_scan(int non_tty);
 
 char *
 cc_usbdevs_find_by_arg(char *arg, char *default_product);
@@ -517,9 +518,18 @@ struct ao_log_gps {
 #define AO_LOG_GPS_ALT         'H'
 #define AO_LOG_GPS_SAT         'V'
 #define AO_LOG_GPS_DATE                'Y'
+#define AO_LOG_GPS_POS         'P'
 
 #define AO_LOG_CONFIG          'c'
 
+#define AO_GPS_NUM_SAT_MASK    (0xf << 0)
+#define AO_GPS_NUM_SAT_SHIFT   (0)
+
+#define AO_GPS_VALID           (1 << 4)
+#define AO_GPS_RUNNING         (1 << 5)
+#define AO_GPS_DATE_VALID      (1 << 6)
+#define AO_GPS_COURSE_VALID    (1 << 7)
+
 #define AO_LOG_FORMAT_UNKNOWN          0       /* unknown; altosui will have to guess */
 #define AO_LOG_FORMAT_FULL             1       /* 8 byte typed log records */
 #define AO_LOG_FORMAT_TINY             2       /* two byte state/baro records */