X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=controller.c;h=643cf46ee3ed12781c4d7bad928fda557fdc41aa;hb=f9d87f641e55cd643037d81d7221ddc169cdae6b;hp=e49212ceab8d49a310446cac782ff01827506cea;hpb=5154cadf4a143f6157a54aa4d2097dffe78c0f29;p=libsigrokdecode.git

diff --git a/controller.c b/controller.c
index e49212c..643cf46 100644
--- a/controller.c
+++ b/controller.c
@@ -767,12 +767,12 @@ SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf,
  * stack).
  *
  * @param output_type The output type this callback will receive. Only one
- * callback per output type can be registered.
+ *                    callback per output type can be registered.
  * @param cb The function to call.
- * @param user_data Unused.
+ * @param cb_data Unused.
  */
 SRD_API int srd_register_callback(int output_type,
-				  srd_pd_output_callback_t cb, void *user_data)
+				  srd_pd_output_callback_t cb, void *cb_data)
 {
 	struct srd_pd_callback *pd_cb;
 
@@ -784,8 +784,8 @@ SRD_API int srd_register_callback(int output_type,
 	}
 
 	pd_cb->output_type = output_type;
-	pd_cb->callback = cb;
-	pd_cb->user_data = user_data;
+	pd_cb->cb = cb;
+	pd_cb->cb_data = cb_data;
 	callbacks = g_slist_append(callbacks, pd_cb);
 
 	return SRD_OK;
@@ -801,7 +801,7 @@ SRD_PRIV void *srd_find_callback(int output_type)
 	for (l = callbacks; l; l = l->next) {
 		pd_cb = l->data;
 		if (pd_cb->output_type == output_type) {
-			cb = pd_cb->callback;
+			cb = pd_cb->cb;
 			break;
 		}
 	}