X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=proto.h;h=bba7e3f36a33b37501855f7003ff405f20e08de1;hb=86bb3f4a865a7eed9f0537f01356231cf7d86012;hp=bed626989a36194dd36bfe0c3cbc3e6a2ffda56f;hpb=cbadb856d6d833f2822cf63e4884abb409da6172;p=libsigrok.git

diff --git a/proto.h b/proto.h
index bed62698..bba7e3f3 100644
--- a/proto.h
+++ b/proto.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,12 +68,12 @@ SR_API struct sr_dev_driver **sr_driver_list(void);
 SR_API int sr_driver_init(struct sr_context *ctx,
 		struct sr_dev_driver *driver);
 SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options);
-SR_API int sr_config_get(struct sr_dev_driver *driver, int key,
-		const void **data, const struct sr_dev_inst *sdi);
+SR_API int sr_config_get(const struct sr_dev_driver *driver, int key,
+		GVariant **data, const struct sr_dev_inst *sdi);
 SR_API int sr_config_set(const struct sr_dev_inst *sdi, int key,
-		const void *value);
-SR_API int sr_config_list(struct sr_dev_driver *driver, int key,
-		const void **data, const struct sr_dev_inst *sdi);
+		GVariant *data);
+SR_API int sr_config_list(const struct sr_dev_driver *driver, int key,
+		GVariant **data, const struct sr_dev_inst *sdi);
 SR_API const struct sr_config_info *sr_config_info_get(int key);
 SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname);
 
@@ -96,7 +96,6 @@ SR_API int sr_session_datafeed_callback_add(sr_datafeed_callback_t cb);
 /* Session control */
 SR_API int sr_session_start(void);
 SR_API int sr_session_run(void);
-SR_API int sr_session_halt(void);
 SR_API int sr_session_stop(void);
 SR_API int sr_session_save(const char *filename, const struct sr_dev_inst *sdi,
 		unsigned char *buf, int unitsize, int units);
@@ -129,8 +128,8 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size);
 SR_API uint64_t sr_parse_timestring(const char *timestring);
 SR_API gboolean sr_parse_boolstring(const char *boolstring);
-SR_API int sr_parse_period(const char *periodstr, struct sr_rational *r);
-SR_API int sr_parse_voltage(const char *voltstr, struct sr_rational *r);
+SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q);
+SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q);
 
 /*--- version.c -------------------------------------------------------------*/