Add sr_ prefix to datafeed_callback typedef.

diff --git a/session.c b/session.c
index 2cafc0f02746846f261d0556f9aad37e35ad3991..2976ce75b10636be1ead596408ebb9d1e67bd046 100644 (file)
--- a/session.c
+++ b/session.c
@@ -102,7 +102,7 @@ void sr_session_datafeed_callback_clear(void)
        session->datafeed_callbacks = NULL;
 }
 
-void sr_session_datafeed_callback_add(datafeed_callback callback)
+void sr_session_datafeed_callback_add(sr_datafeed_callback callback)
 {
        session->datafeed_callbacks =
            g_slist_append(session->datafeed_callbacks, callback);
@@ -210,7 +210,7 @@ void sr_session_stop(void)
 void sr_session_bus(struct sr_device *device, struct sr_datafeed_packet *packet)
 {
        GSList *l;
-       datafeed_callback cb;
+       sr_datafeed_callback cb;
 
        /*
         * TODO: Send packet through PD pipe, and send the output of that to

diff --git a/sigrok-proto.h b/sigrok-proto.h
index f63156fa0b501af6d0549112f3d451a1531714c6..8d1bbd7d137ade17b4987b2bcd8975226f6d8e4c 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -91,8 +91,8 @@ void sr_source_add(int fd, int events, int timeout,
 
 /*--- session.c -------------------------------------------------------------*/
 
-typedef void (*datafeed_callback) (struct sr_device *device,
-                                struct sr_datafeed_packet *packet);
+typedef void (*sr_datafeed_callback) (struct sr_device *device,
+                                     struct sr_datafeed_packet *packet);
 
 /* Session setup */
 int sr_session_load(const char *filename);
@@ -107,7 +107,7 @@ void sr_session_pa_add(struct analyzer *pa);
 
 /* Datafeed setup */
 void sr_session_datafeed_callback_clear(void);
-void sr_session_datafeed_callback_add(datafeed_callback callback);
+void sr_session_datafeed_callback_add(sr_datafeed_callback callback);
 
 /* Session control */
 int sr_session_start(void);