X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=proto.h;h=2ca1eaf91f4b7c6e9c30504eb69cb4cebb42d49c;hb=82b904b173f1443c4d6bdebdf1a7f0dda01c4982;hp=2110368d938cc3812868b060c427201c25ff6219;hpb=4d15e5c9077a543a452a976933286c705c2e7088;p=libsigrok.git

diff --git a/proto.h b/proto.h
index 2110368d..2ca1eaf9 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
@@ -52,8 +52,6 @@ SR_API int sr_dev_probe_enable(const struct sr_dev_inst *sdi, int probenum,
 SR_API int sr_dev_trigger_set(const struct sr_dev_inst *sdi, int probenum,
 		const char *trigger);
 SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key);
-SR_API int sr_config_set(const struct sr_dev_inst *sdi, int hwcap,
-		const void *value);
 SR_API GSList *sr_dev_inst_list(const struct sr_dev_driver *driver);
 SR_API int sr_dev_inst_clear(const struct sr_dev_driver *driver);
 
@@ -70,11 +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 id,
-		const void **data, const struct sr_dev_inst *sdi);
-SR_API int sr_config_list(struct sr_dev_driver *driver, int id,
-		const void **data, const struct sr_dev_inst *sdi);
-SR_API gboolean sr_driver_hwcap_exists(struct sr_dev_driver *driver, int hwcap);
+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,
+		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);
 
@@ -97,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);
@@ -124,14 +122,14 @@ SR_API struct sr_output_format **sr_output_list(void);
 SR_API char *sr_si_string_u64(uint64_t x, const char *unit);
 SR_API char *sr_samplerate_string(uint64_t samplerate);
 SR_API char *sr_period_string(uint64_t frequency);
-SR_API char *sr_voltage_string(struct sr_rational *voltage);
+SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q);
 SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 		const char *triggerstring);
 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 -------------------------------------------------------------*/