srd: rename all instance to inst

[libsigrokdecode.git] / sigrokdecode.h

diff --git a/sigrokdecode.h b/sigrokdecode.h
index 69fc2ce72304675d69a8c19f443694c16418a800..4768b4c7a7e445730f0fa83dad4fd308846e4345 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -94,7 +94,7 @@ enum {
        SRD_OUTPUT_BINARY,
 };
 
-#define SRD_MAX_NUM_PROBES   64
+#define SRD_MAX_NUM_PROBES 64
 
 /* TODO: Documentation. */
 struct srd_decoder {
@@ -145,10 +145,10 @@ struct srd_probe {
        int order;
 };
 
-struct srd_decoder_instance {
+struct srd_decoder_inst {
        struct srd_decoder *decoder;
-       PyObject *py_instance;
-       char *instance_id;
+       PyObject *py_inst;
+       char *inst_id;
        GSList *pd_output;
        int dec_num_probes;
        int *dec_probemap;
@@ -161,7 +161,7 @@ struct srd_decoder_instance {
 struct srd_pd_output {
        int pdo_id;
        int output_type;
-       struct srd_decoder_instance *di;
+       struct srd_decoder_inst *di;
        char *proto_id;
 };
 
@@ -185,7 +185,7 @@ typedef struct {
 
 typedef struct {
        PyObject_HEAD
-       struct srd_decoder_instance *di;
+       struct srd_decoder_inst *di;
        uint64_t start_samplenum;
        unsigned int itercnt;
        uint8_t *inbuf;
@@ -198,30 +198,28 @@ typedef struct {
 SRD_API int srd_init(void);
 SRD_API int srd_exit(void);
 SRD_API int set_modulepath(void);
-SRD_API int srd_instance_set_options(struct srd_decoder_instance *di,
+SRD_API int srd_inst_set_options(struct srd_decoder_inst *di,
                                     GHashTable *options);
-SRD_API int srd_instance_set_probes(struct srd_decoder_instance *di,
+SRD_API int srd_inst_set_probes(struct srd_decoder_inst *di,
                                    GHashTable *probes);
-SRD_API struct srd_decoder_instance *srd_instance_new(const char *id,
+SRD_API struct srd_decoder_inst *srd_inst_new(const char *id,
                                                      GHashTable *options);
-SRD_API int srd_instance_stack(struct srd_decoder_instance *di_from,
-                              struct srd_decoder_instance *di_to);
-SRD_API struct srd_decoder_instance *srd_instance_find_by_id(char *instance_id);
-SRD_API struct srd_decoder_instance *srd_instance_find_by_obj(GSList *stack,
+SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from,
+                              struct srd_decoder_inst *di_to);
+SRD_API struct srd_decoder_inst *srd_inst_find_by_id(char *inst_id);
+SRD_API struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
                                                              PyObject *obj);
-SRD_API int srd_instance_start(struct srd_decoder_instance *di, PyObject *args);
-SRD_API int srd_instance_decode(uint64_t start_samplenum,
-                               struct srd_decoder_instance *dec,
+SRD_API int srd_inst_start(struct srd_decoder_inst *di, PyObject *args);
+SRD_API int srd_inst_decode(uint64_t start_samplenum,
+                               struct srd_decoder_inst *dec,
                                uint8_t *inbuf, uint64_t inbuflen);
-SRD_API void srd_instance_free(struct srd_decoder_instance *di);
-SRD_API void srd_instance_free_all(GSList *stack);
+SRD_API void srd_inst_free(struct srd_decoder_inst *di);
+SRD_API void srd_inst_free_all(GSList *stack);
 SRD_API int srd_session_start(int num_probes, int unitsize,
                              uint64_t samplerate);
 SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf,
                             uint64_t inbuflen);
-SRD_PRIV int pd_add(struct srd_decoder_instance *di, int output_type,
-                   char *output_id);
-SRD_API struct srd_decoder_instance *get_di_by_decobject(void *decobject);
+SRD_API struct srd_decoder_inst *get_di_by_decobject(void *decobject);
 typedef void (*srd_pd_output_callback_t)(struct srd_proto_data *pdata);
 SRD_API int srd_register_callback(int output_type, srd_pd_output_callback_t cb);
 SRD_API void *srd_find_callback(int output_type);
@@ -236,17 +234,6 @@ SRD_API int srd_load_all_decoders(void);
 SRD_API int srd_unload_all_decoders(void);
 SRD_API char *srd_decoder_doc(struct srd_decoder *dec);
 
-/*--- exception.c -----------------------------------------------------------*/
-
-SRD_PRIV void catch_exception(const char *format, ...);
-
-/*--- util.c ----------------------------------------------------------------*/
-
-SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr);
-SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr);
-SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr);
-SRD_PRIV int py_strlist_to_char(PyObject *py_strlist, char ***outstr);
-
 /*--- log.c -----------------------------------------------------------------*/
 
 typedef int (*srd_log_handler_t)(void *data, int loglevel, const char *format,