Big simplification of GPSD_NG interface.

CONFIGCHAN is gone, WATCH now listens to everything and sets as
per-user policy bits things that used to be per-channel.

1 files changed, 2 insertions, 13 deletions

diff --git a/gps_json.h b/gps_json.h
index 86ae6cd5..662256f6 100644
--- a/gps_json.h
+++ b/gps_json.h
@@ -15,20 +15,9 @@ void json_tpv_dump(struct gps_data_t *, struct gps_fix_t *, char *, size_t);
 void json_sky_dump(struct gps_data_t *, char *, size_t);
 int json_tpv_read(const char *, struct gps_data_t *, const char **);
 int json_sky_read(const char *, struct gps_data_t *, const char **);
-int json_watch_read(int *, const char *, const char **);
-void json_watch_dump(int, char *, size_t);
-int json_configchan_read(struct chanconfig_t *, const char **, const char *, const char **);
-void json_configchan_dump(struct chanconfig_t *, char *, char *, size_t);
+int json_watch_read(struct policy_t *, const char *, const char **);
+void json_watch_dump(struct policy_t *, char *, size_t);
 int json_configdev_read(struct devconfig_t *, const char *, const char **);
 void json_configdev_dump(struct devconfig_t *, char *, size_t);
 
-#define NWATCHTYPES	5
-
-struct watchmap_t {
-    int mask;
-    gnss_type class;
-    char *string;
-};
-extern const struct watchmap_t watchmap[NWATCHTYPES];
-
 /* gps_json.h ends here */