From: Martin Ling Date: Mon, 21 Apr 2014 00:30:41 +0000 (+0100) Subject: SWIG: Rename libsigrok.i to lowlevel.i. X-Git-Tag: libsigrok-0.4.0~1255 X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=5a7e62211c4714ea2aac35baac10cf448373d4f5 SWIG: Rename libsigrok.i to lowlevel.i. --- diff --git a/bindings/python/sigrok/core/lowlevel.i b/bindings/python/sigrok/core/lowlevel.i index f50d4d0f..e2341abd 100644 --- a/bindings/python/sigrok/core/lowlevel.i +++ b/bindings/python/sigrok/core/lowlevel.i @@ -19,7 +19,7 @@ %module lowlevel -%include "../../../swig/libsigrok.i" +%include "../../../swig/lowlevel.i" %{ diff --git a/bindings/ruby/sigrok_lowlevel.i b/bindings/ruby/sigrok_lowlevel.i index 72a70a90..b068e9a0 100644 --- a/bindings/ruby/sigrok_lowlevel.i +++ b/bindings/ruby/sigrok_lowlevel.i @@ -20,5 +20,5 @@ %module sigrok_lowlevel -%include "../swig/libsigrok.i" +%include "../swig/lowlevel.i" diff --git a/bindings/swig/libsigrok.i b/bindings/swig/libsigrok.i deleted file mode 100644 index 8fe03f48..00000000 --- a/bindings/swig/libsigrok.i +++ /dev/null @@ -1,116 +0,0 @@ -/* - * This file is part of the libsigrok project. - * - * Copyright (C) 2013 Martin Ling - * - * 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -%include "cpointer.i" -%include "carrays.i" -%include "stdint.i" - -%{ -#include "libsigrok/libsigrok.h" -%} - -typedef void *gpointer; -typedef int gboolean; - -typedef struct _GSList GSList; - -struct _GSList -{ - gpointer data; - GSList *next; -}; - -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); - -typedef guint (*GHashFunc)(gconstpointer key); -typedef gboolean (*GEqualFunc)(gconstpointer a, gconstpointer b); -typedef void (*GDestroyNotify)(gpointer data); - -GHashTable *g_hash_table_new_full(GHashFunc hash_func, GEqualFunc key_equal_func, - GDestroyNotify key_destroy_func, GDestroyNotify value_destroy_func); -void g_hash_table_insert(GHashTable *hash_table, gpointer key, gpointer value); -void g_hash_table_destroy(GHashTable *hash_table); - -%callback("%s_ptr"); -guint g_str_hash(gconstpointer v); -gboolean g_str_equal(gconstpointer v1, gconstpointer v2);; -void g_free(gpointer mem); -%nocallback; - -gchar *g_strdup(const char *str); - -typedef struct _GString GString; - -struct _GString -{ - char *str; - gsize len; - gsize allocated_len; -}; - -gchar *g_string_free(GString *string, gboolean free_segment); - -%include "libsigrok/libsigrok.h" -#undef SR_API -#define SR_API -%ignore sr_config_info_name_get; -%include "libsigrok/proto.h" -%include "libsigrok/version.h" - -%array_class(float, float_array); -%pointer_functions(uint8_t *, uint8_ptr_ptr); -%pointer_functions(uint64_t, uint64_ptr); -%pointer_functions(GString *, gstring_ptr_ptr); -%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); -%array_functions(struct sr_input_format *, sr_input_format_ptr_array); -%array_functions(struct sr_output_format *, sr_output_format_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_channel *, void_ptr_to_sr_channel_ptr) -%pointer_cast(void *, struct sr_channel_group *, void_ptr_to_sr_channel_group_ptr) - -%extend sr_input_format { - int call_format_match(const char *filename) { - return $self->format_match(filename); - } - - int call_init(struct sr_input *in, const char *filename) { - return $self->init(in, filename); - } - - int call_loadfile(struct sr_input *in, const char *filename) { - return $self->loadfile(in, filename); - } -} diff --git a/bindings/swig/lowlevel.i b/bindings/swig/lowlevel.i new file mode 100644 index 00000000..8fe03f48 --- /dev/null +++ b/bindings/swig/lowlevel.i @@ -0,0 +1,116 @@ +/* + * This file is part of the libsigrok project. + * + * Copyright (C) 2013 Martin Ling + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +%include "cpointer.i" +%include "carrays.i" +%include "stdint.i" + +%{ +#include "libsigrok/libsigrok.h" +%} + +typedef void *gpointer; +typedef int gboolean; + +typedef struct _GSList GSList; + +struct _GSList +{ + gpointer data; + GSList *next; +}; + +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); + +typedef guint (*GHashFunc)(gconstpointer key); +typedef gboolean (*GEqualFunc)(gconstpointer a, gconstpointer b); +typedef void (*GDestroyNotify)(gpointer data); + +GHashTable *g_hash_table_new_full(GHashFunc hash_func, GEqualFunc key_equal_func, + GDestroyNotify key_destroy_func, GDestroyNotify value_destroy_func); +void g_hash_table_insert(GHashTable *hash_table, gpointer key, gpointer value); +void g_hash_table_destroy(GHashTable *hash_table); + +%callback("%s_ptr"); +guint g_str_hash(gconstpointer v); +gboolean g_str_equal(gconstpointer v1, gconstpointer v2);; +void g_free(gpointer mem); +%nocallback; + +gchar *g_strdup(const char *str); + +typedef struct _GString GString; + +struct _GString +{ + char *str; + gsize len; + gsize allocated_len; +}; + +gchar *g_string_free(GString *string, gboolean free_segment); + +%include "libsigrok/libsigrok.h" +#undef SR_API +#define SR_API +%ignore sr_config_info_name_get; +%include "libsigrok/proto.h" +%include "libsigrok/version.h" + +%array_class(float, float_array); +%pointer_functions(uint8_t *, uint8_ptr_ptr); +%pointer_functions(uint64_t, uint64_ptr); +%pointer_functions(GString *, gstring_ptr_ptr); +%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); +%array_functions(struct sr_input_format *, sr_input_format_ptr_array); +%array_functions(struct sr_output_format *, sr_output_format_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_channel *, void_ptr_to_sr_channel_ptr) +%pointer_cast(void *, struct sr_channel_group *, void_ptr_to_sr_channel_group_ptr) + +%extend sr_input_format { + int call_format_match(const char *filename) { + return $self->format_match(filename); + } + + int call_init(struct sr_input *in, const char *filename) { + return $self->init(in, filename); + } + + int call_loadfile(struct sr_input *in, const char *filename) { + return $self->loadfile(in, filename); + } +}