From ae53d0a5971121e03a07c469e39ff3cfa34a2111 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 11 Feb 2012 22:38:17 +0100 Subject: [PATCH] srd: Every callback should have a 'void *' parameter. This is required in various situations and for various lib users, especially so GUIs which might want to pass specific info via this mechanism. --- controller.c | 4 +++- sigrokdecode.h | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/controller.c b/controller.c index d4637f3..6e6e435 100644 --- a/controller.c +++ b/controller.c @@ -692,7 +692,8 @@ SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t * inbuf, return SRD_OK; } -SRD_API int srd_register_callback(int output_type, srd_pd_output_callback_t cb) +SRD_API int srd_register_callback(int output_type, + srd_pd_output_callback_t cb, void *data) { struct srd_pd_callback *pd_cb; @@ -705,6 +706,7 @@ SRD_API int srd_register_callback(int output_type, srd_pd_output_callback_t cb) pd_cb->output_type = output_type; pd_cb->callback = cb; + pd_cb->data = data; callbacks = g_slist_append(callbacks, pd_cb); return SRD_OK; diff --git a/sigrokdecode.h b/sigrokdecode.h index 4768b4c..18ab513 100644 --- a/sigrokdecode.h +++ b/sigrokdecode.h @@ -173,9 +173,13 @@ struct srd_proto_data { void *data; }; +typedef void (*srd_pd_output_callback_t)(struct srd_proto_data *pdata, + void *data); + struct srd_pd_callback { int output_type; - void (*callback)(struct srd_proto_data *); + srd_pd_output_callback_t callback; + void *data; }; /* custom python types */ @@ -220,8 +224,8 @@ SRD_API int srd_session_start(int num_probes, int unitsize, SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf, uint64_t inbuflen); 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 int srd_register_callback(int output_type, + srd_pd_output_callback_t cb, void *data); SRD_API void *srd_find_callback(int output_type); /*--- decoder.c -------------------------------------------------------------*/ -- 2.30.2