Remove unnecessary extern option variable declarations.

[sigrok-cli.git] / sigrok-cli.h

diff --git a/sigrok-cli.h b/sigrok-cli.h
index 754c58b4d6f0f0affc2cd630469ddeabe04bc2ca..a3289c86edbcd0f196295ca4313dda8fa8127824 100644 (file)
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -44,7 +44,6 @@ GSList *device_scan(void);
 struct sr_channel_group *select_channel_group(struct sr_dev_inst *sdi);
 
 /* session.c */
-int setup_output_format(void);
 void datafeed_in(const struct sr_dev_inst *sdi,
                const struct sr_datafeed_packet *packet, void *cb_data);
 int opt_to_gvar(char *key, char *value, struct sr_config *src);
@@ -65,12 +64,13 @@ int setup_pd_binary(char *opt_pd_binary);
 void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data);
 void show_pd_meta(struct srd_proto_data *pdata, void *cb_data);
 void show_pd_binary(struct srd_proto_data *pdata, void *cb_data);
-void map_pd_probes(struct sr_dev_inst *sdi);
+void map_pd_channels(struct sr_dev_inst *sdi);
 #endif
 
 /* parsers.c */
 struct sr_channel *find_channel(GSList *channellist, const char *channelname);
 GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring);
+int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s);
 GHashTable *parse_generic_arg(const char *arg, gboolean sep_first);
 int canon_cmp(const char *str1, const char *str2);
 
@@ -78,4 +78,34 @@ int canon_cmp(const char *str1, const char *str2);
 void add_anykey(void);
 void clear_anykey(void);
 
+/* options.c */
+extern gboolean opt_version;
+extern gint opt_loglevel;
+extern gboolean opt_scan_devs;
+extern gboolean opt_wait_trigger;
+extern gchar *opt_input_file;
+extern gchar *opt_output_file;
+extern gchar *opt_drv;
+extern gchar *opt_config;
+extern gchar *opt_channels;
+extern gchar *opt_channel_group;
+extern gchar *opt_triggers;
+extern gchar *opt_pds;
+#ifdef HAVE_SRD
+extern gchar *opt_pd_stack;
+extern gchar *opt_pd_annotations;
+extern gchar *opt_pd_meta;
+extern gchar *opt_pd_binary;
+#endif
+extern gchar *opt_input_format;
+extern gchar *opt_output_format;
+extern gchar *opt_show;
+extern gchar *opt_time;
+extern gchar *opt_samples;
+extern gchar *opt_frames;
+extern gchar *opt_continuous;
+extern gchar *opt_set;
+int parse_options(int argc, char **argv);
+void show_help(void);
+
 #endif