X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fswig%2Flibsigrok.i;h=d18df516bcd6d236d84a8de611f8efe75bfdaea3;hb=5f9c4c8a34e6c1d122d36efd2e8263f0456541bd;hp=64b0fd2b0eacb31812ab1ba698ced39da94f59e7;hpb=d962ed92a118a8bc9d98e00f7a218a4cc9c71e69;p=libsigrok.git

diff --git a/bindings/swig/libsigrok.i b/bindings/swig/libsigrok.i
index 64b0fd2b..d18df516 100644
--- a/bindings/swig/libsigrok.i
+++ b/bindings/swig/libsigrok.i
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Martin Ling <martin-sigrok@earth.li>
  *
@@ -17,10 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-%module libsigrok
 %include "cpointer.i"
 %include "carrays.i"
-%include "cdata.i"
 %include "stdint.i"
 
 %{
@@ -39,6 +37,18 @@ struct _GSList
 
 void g_slist_free(GSList *list);
 
+GVariant *g_variant_new_uint64(uint64_t value);
+GVariant *g_variant_new_boolean(gboolean value);
+GVariant *g_variant_new_double(double value);
+GVariant *g_variant_new_string(char *value);
+GVariant *g_variant_new_tuple(GVariant *children[], unsigned long n_children);
+char *g_variant_get_type_string(GVariant *value);
+uint64_t g_variant_get_uint64(GVariant *value);
+gboolean g_variant_get_boolean(GVariant *value);
+double g_variant_get_double(GVariant *value);
+char *g_variant_get_string(GVariant *value, unsigned long *length);
+GVariant *g_variant_get_child_value(GVariant *value, unsigned long index);
+
 %include "libsigrok/libsigrok.h"
 #undef SR_API
 #define SR_API
@@ -46,7 +56,13 @@ void g_slist_free(GSList *list);
 %include "libsigrok/proto.h"
 %include "libsigrok/version.h"
 
+%array_class(float, float_array);
+%pointer_functions(GVariant *, gvariant_ptr_ptr);
+%array_functions(GVariant *, gvariant_ptr_array);
 %pointer_functions(struct sr_context *, sr_context_ptr_ptr);
 %array_functions(struct sr_dev_driver *, sr_dev_driver_ptr_array);
 %pointer_cast(gpointer, struct sr_dev_inst *, gpointer_to_sr_dev_inst_ptr);
 %pointer_cast(void *, struct sr_datafeed_logic *, void_ptr_to_sr_datafeed_logic_ptr)
+%pointer_cast(void *, struct sr_datafeed_analog *, void_ptr_to_sr_datafeed_analog_ptr)
+%pointer_cast(void *, struct sr_probe *, void_ptr_to_sr_probe_ptr)
+%pointer_cast(void *, struct sr_probe_group *, void_ptr_to_sr_probe_group_ptr)