Trim aoview_serial_set_callback args down to just port and callback

[fw/altos] / aoview / aoview.h

diff --git a/aoview/aoview.h b/aoview/aoview.h
index ac64833fb3e301d9ab1f27ec461da39166b207ca..4ed0ffaba51804005c83fd05a42ba7419c06f137 100644 (file)
--- a/aoview/aoview.h
+++ b/aoview/aoview.h
@@ -69,7 +69,8 @@ struct aodata {
        int     flight_pres;
        int     ground_pres;
        int     nsat;
-       int     locked;
+       int     gps_locked;
+       int     gps_connected;
        struct {
                int hour;
                int minute;
@@ -122,6 +123,7 @@ struct aostate {
        double  pad_lon_total;
        double  pad_alt_total;
        int     npad;
+       int     prev_npad;
 
        double  distance;
        double  bearing;
@@ -158,9 +160,7 @@ typedef void (*aoview_serial_callback)(gpointer user_data, struct aoview_serial
 
 void
 aoview_serial_set_callback(struct aoview_serial *serial,
-                          aoview_serial_callback func,
-                          gpointer data,
-                          GDestroyNotify notify);
+                          aoview_serial_callback func);
 
 void
 aoview_serial_printf(struct aoview_serial *serial, char *format, ...);
@@ -226,7 +226,7 @@ void
 aoview_table_start(void);
 
 void
-aoview_table_add_row(char *label, char *format, ...);
+aoview_table_add_row(int column, char *label, char *format, ...);
 
 void
 aoview_table_finish(void);