X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sigrok-cli.h;h=684aed99a8bd302da3ae8d88f6ff9e9be94ee867;hb=527dd7262e49dd051ff554401f9cb21c2c9006dd;hp=b5603c306d90d6d4f8e3d55e4ee73372cba952e6;hpb=cad0cba6bb76d7aab6304aef41a2dd304ddad974;p=sigrok-cli.git

diff --git a/sigrok-cli.h b/sigrok-cli.h
index b5603c3..684aed9 100644
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -56,7 +56,8 @@ void show_serial_ports(void);
 
 /* device.c */
 GSList *device_scan(void);
-struct sr_channel_group *lookup_channel_group(struct sr_dev_inst *sdi);
+struct sr_channel_group *lookup_channel_group(struct sr_dev_inst *sdi,
+	const char *cg_name);
 
 /* session.c */
 struct df_arg_desc {
@@ -76,6 +77,7 @@ struct df_arg_desc {
 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_array(struct sr_dev_inst *sdi, char **opts);
 int set_dev_options(struct sr_dev_inst *sdi, GHashTable *args);
 void run_session(void);
 
@@ -129,7 +131,7 @@ 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_configs;
 extern gchar *opt_channels;
 extern gchar *opt_channel_group;
 extern gchar *opt_triggers;
@@ -138,6 +140,7 @@ extern gchar **opt_pds;
 extern gchar *opt_pd_annotations;
 extern gchar *opt_pd_meta;
 extern gchar *opt_pd_binary;
+extern gboolean opt_pd_ann_class;
 extern gboolean opt_pd_samplenum;
 extern gboolean opt_pd_jsontrace;
 #endif
@@ -149,7 +152,7 @@ extern gchar *opt_time;
 extern gchar *opt_samples;
 extern gchar *opt_frames;
 extern gboolean opt_continuous;
-extern gchar *opt_get;
+extern gchar **opt_gets;
 extern gboolean opt_set;
 extern gboolean opt_list_serial;
 int parse_options(int argc, char **argv);