Fix output module enumeration + code cleanup.

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

diff --git a/sigrok-cli.h b/sigrok-cli.h
index 52b673407f6e8cfb79f0aa3df7e5040ef0802c17..ac946a02fff0c1414d645719550aa70be0ea93fe 100644 (file)
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -38,19 +38,20 @@ void show_version(void);
 void show_dev_list(void);
 void show_dev_detail(void);
 void show_pd_detail(void);
+void show_output(void);
 
 /* device.c */
 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);
 int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args);
 void run_session(void);
-void save_chunk_logic(uint8_t *data, uint64_t data_len, int unitsize);
+void save_chunk_logic(struct sr_session *session, uint8_t *data,
+               uint64_t data_len, int unitsize);
 
 /* input.c */
 void load_input_file(void);
@@ -71,11 +72,43 @@ void map_pd_channels(struct sr_dev_inst *sdi);
 /* 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,
+               struct sr_trigger **trigger);
 GHashTable *parse_generic_arg(const char *arg, gboolean sep_first);
 int canon_cmp(const char *str1, const char *str2);
 
 /* anykey.c */
-void add_anykey(void);
+void add_anykey(struct sr_session *session);
 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