X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=sigrok-cli.h;h=4d2f0f2ffba3fde4bb5c61475bb2ee5b646f369f;hp=0ba8cfe72b1e86e8770ba7e45d6fea1f7271f3c8;hb=1eb46be87ba64500504044da46d77e059193ccc4;hpb=43e5747a59ed92243c217f7e36da2ac35bbcd80d

diff --git a/sigrok-cli.h b/sigrok-cli.h
index 0ba8cfe..4d2f0f2 100644
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the sigrok-cli project.
  *
  * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
  *
@@ -17,18 +17,58 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_SIGROK_CLI_H
-#define SIGROK_SIGROK_CLI_H
+#ifndef SIGROK_CLI_SIGROK_CLI_H
+#define SIGROK_CLI_SIGROK_CLI_H
 
-/* sigrok-cli.c */
-int num_real_devices(void);
+#include "config.h"
+#ifdef HAVE_SRD
+/* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <libsigrokdecode/libsigrokdecode.h>
+#endif
+#include <libsigrok/libsigrok.h>
+
+#define DEFAULT_OUTPUT_FORMAT "bits:width=64"
+
+/* main.c */
+int select_probes(struct sr_dev_inst *sdi);
+
+/* show.c */
+void show_version(void);
+void show_dev_list(void);
+void show_dev_detail(void);
+void show_pd_detail(void);
+
+/* device.c */
+GSList *device_scan(void);
+struct sr_probe_group *select_probe_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);
+
+/* input.c */
+void load_input_file(void);
+
+/* decode.c */
+#ifdef HAVE_SRD
+int register_pds(const char *opt_pds, char *opt_pd_annotations);
+int setup_pd_stack(char *opt_pds, char *opt_pd_stack, char *opt_pd_annotations);
+int setup_pd_annotations(char *opt_pd_annotations);
+int setup_pd_meta(char *opt_pd_meta);
+int setup_pd_binary(char *opt_pd_binary);
+void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data);
+void show_pd_meta(struct srd_proto_data *pdata, void *cb_data);
+void show_pd_binary(struct srd_proto_data *pdata, void *cb_data);
+#endif
 
 /* parsers.c */
-char **parse_probestring(int max_probes, const char *probestring);
-char **sr_parse_triggerstring(struct sr_device *device, const char *triggerstring);
-GHashTable *parse_generic_arg(const char *arg);
-struct sr_device *parse_devicestring(const char *devicestring);
-uint64_t sr_parse_timestring(const char *timestring);
+GSList *parse_probestring(struct sr_dev_inst *sdi, const char *probestring);
+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);