X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.h;h=c07d6cb9ee494742460e0c335701a7f6aea377b7;hp=a3289c86edbcd0f196295ca4313dda8fa8127824;hb=24bd9719166584e3b4e6e6423d6d6bcbc1a88251;hpb=cd62e027c0a3a8d97a6689d042b92699d8b619f3

diff --git a/sigrok-cli.h b/sigrok-cli.h
index a3289c8..c07d6cb 100644
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -32,12 +32,26 @@
 
 /* main.c */
 int select_channels(struct sr_dev_inst *sdi);
+gboolean config_key_has_cap(struct sr_dev_driver *driver,
+		const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
+		uint32_t key, uint32_t capability);
+int maybe_config_get(struct sr_dev_driver *driver,
+		const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
+		uint32_t key, GVariant **gvar);
+int maybe_config_set(struct sr_dev_driver *driver,
+		const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
+		uint32_t key, GVariant *gvar);
+int maybe_config_list(struct sr_dev_driver *driver,
+		const struct sr_dev_inst *sdi, struct sr_channel_group *cg,
+		uint32_t key, GVariant **gvar);
 
 /* show.c */
 void show_version(void);
 void show_dev_list(void);
 void show_dev_detail(void);
 void show_pd_detail(void);
+void show_input(void);
+void show_output(void);
 
 /* device.c */
 GSList *device_scan(void);
@@ -49,7 +63,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 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);
@@ -70,12 +85,15 @@ 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);
+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);
+GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genargs);
 int canon_cmp(const char *str1, const char *str2);
+int parse_driver(char *arg, struct sr_dev_driver **driver, GSList **drvopts);
 
 /* anykey.c */
-void add_anykey(void);
+void add_anykey(struct sr_session *session);
 void clear_anykey(void);
 
 /* options.c */
@@ -104,6 +122,7 @@ extern gchar *opt_time;
 extern gchar *opt_samples;
 extern gchar *opt_frames;
 extern gchar *opt_continuous;
+extern gchar *opt_get;
 extern gchar *opt_set;
 int parse_options(int argc, char **argv);
 void show_help(void);