X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=controller.c;h=3ebf5a9e4c77a4bb313a32f4f074910c9be21d7e;hp=ddac3baf16c7e18b904dfb4ce63818f43c19a681;hb=ed2306a6f29bc4d85f5f248c83fff252b22c60a5;hpb=4c1d067068fdb9e5f723b3548bddb64e0b06fc36

diff --git a/controller.c b/controller.c
index ddac3ba..3ebf5a9 100644
--- a/controller.c
+++ b/controller.c
@@ -494,11 +494,11 @@ SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from,
 }
 
 /**
- * Finds a decoder instance by its instance id, but only in the bottom
+ * Finds a decoder instance by its instance ID, but only in the bottom
  * level of instances -- instances already stacked on top of another one
  * will not be found.
  *
- * @param inst_id The instance id to be found.
+ * @param inst_id The instance ID to be found.
  *
  * @return Pointer to struct srd_decoder_inst, or NULL if not found.
  */
@@ -769,10 +769,10 @@ SRD_API int srd_session_feed(uint64_t start_samplenum, uint8_t *inbuf,
  * @param output_type The output type this callback will receive. Only one
  *                    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;
 
@@ -785,7 +785,7 @@ SRD_API int srd_register_callback(int output_type,
 
 	pd_cb->output_type = output_type;
 	pd_cb->cb = cb;
-	pd_cb->user_data = user_data;
+	pd_cb->cb_data = cb_data;
 	callbacks = g_slist_append(callbacks, pd_cb);
 
 	return SRD_OK;