X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.h;h=7def7412fd62cbc8dd3bb4885da4c02f30d46173;hp=d0b5872ae88984f4b4ced8faa99b0a55ccd985b6;hb=56fc0d6dbca2d46ff2a79275ef6307c4e38bf6a1;hpb=551f570c7b6b572d83b93f961b13580d4839fff6

diff --git a/sigrok-cli.h b/sigrok-cli.h
index d0b5872..7def741 100644
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -28,14 +28,10 @@
 
 #define DEFAULT_OUTPUT_FORMAT_FILE "srzip"
 #define DEFAULT_OUTPUT_FORMAT_NOFILE "bits:width=64"
-#define SAVE_CHUNK_SIZE (512 * 1024)
 
 /* main.c */
 extern struct sr_context *sr_ctx;
 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);
@@ -48,28 +44,43 @@ int maybe_config_list(struct sr_dev_driver *driver,
 
 /* show.c */
 void show_version(void);
+void show_supported(void);
+void show_supported_wiki(void);
 void show_dev_list(void);
 void show_dev_detail(void);
 void show_pd_detail(void);
 void show_input(void);
 void show_output(void);
 void show_transform(void);
+void show_serial_ports(void);
 
 /* device.c */
 GSList *device_scan(void);
 struct sr_channel_group *select_channel_group(struct sr_dev_inst *sdi);
 
 /* session.c */
+struct df_arg_desc {
+	struct sr_session *session;
+	int do_props;
+	struct input_stream_props {
+		uint64_t samplerate;
+		GSList *channels;
+		const struct sr_channel *first_analog_channel;
+		size_t unitsize;
+		uint64_t sample_count_logic;
+		uint64_t sample_count_analog;
+		uint64_t frame_count;
+		uint64_t triggered;
+	} props;
+};
 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(struct sr_session *session, uint8_t *data,
-		uint64_t data_len, int unitsize);
 
 /* input.c */
-void load_input_file(void);
+void load_input_file(gboolean do_props);
 
 /* decode.c */
 #ifdef HAVE_SRD
@@ -99,8 +110,11 @@ void clear_anykey(void);
 
 /* options.c */
 extern gboolean opt_version;
+extern gboolean opt_list_supported;
+extern gboolean opt_list_supported_wiki;
 extern gint opt_loglevel;
 extern gboolean opt_scan_devs;
+extern gboolean opt_dont_scan;
 extern gboolean opt_wait_trigger;
 extern gchar *opt_input_file;
 extern gchar *opt_output_file;
@@ -114,6 +128,7 @@ extern gchar **opt_pds;
 extern gchar *opt_pd_annotations;
 extern gchar *opt_pd_meta;
 extern gchar *opt_pd_binary;
+extern gboolean opt_pd_samplenum;
 #endif
 extern gchar *opt_input_format;
 extern gchar *opt_output_format;
@@ -125,6 +140,7 @@ extern gchar *opt_frames;
 extern gboolean opt_continuous;
 extern gchar *opt_get;
 extern gboolean opt_set;
+extern gboolean opt_list_serial;
 int parse_options(int argc, char **argv);
 void show_help(void);