Use sr_dev_has_option() where appropriate.

[sigrok-cli.git] / sigrok-cli.h

diff --git a/sigrok-cli.h b/sigrok-cli.h
index 0ba8cfe72b1e86e8770ba7e45d6fea1f7271f3c8..e22ddc284bc28e03b082fea9e364374daa8a024d 100644 (file)
--- a/sigrok-cli.h
+++ b/sigrok-cli.h
@@ -17,18 +17,19 @@
  * 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);
+int num_real_devs(void);
 
 /* 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);
+GSList *parse_probestring(struct sr_dev_inst *sdi, const char *probestring);
+GHashTable *parse_generic_arg(const char *arg, gboolean sep_first);
+struct sr_dev *parse_devstring(const char *devstring);
 uint64_t sr_parse_timestring(const char *timestring);
+char *strcanon(const char *str);
+int canon_cmp(const char *str1, const char *str2);
 
 /* anykey.c */
 void add_anykey(void);