X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.h;h=37746e3b8b25c3a38d09ecbe0b2e5fa22c7a0cfc;hp=96d8128ea93493d1a048d8aed1ccaef38c74eb70;hb=9ed80f1d862aa90d47fde48e0e1e924d1ad5e4a3;hpb=6293db8aea090170eced25d6f92c348b013ea475

diff --git a/sigrok-cli.h b/sigrok-cli.h
index 96d8128..37746e3 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);
@@ -49,6 +45,7 @@ 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);
@@ -61,16 +58,28 @@ 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
@@ -101,8 +110,10 @@ 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;
@@ -116,6 +127,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;