Add sr_ prefix to receive_data_callback typedef.

Also, drop obsolete add_source() prototype from sigrok-cli.h.

diff --git a/hwplugin.c b/hwplugin.c
index c90259c12b05debbccd523047fe7464727a3b712..e913a9afd754f88180108e00409c24e23424cd77 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -236,7 +236,7 @@ void sr_source_remove(int fd)
 }
 
 void sr_source_add(int fd, int events, int timeout,
-                  receive_data_callback rcv_cb, void *user_data)
+                  sr_receive_data_callback rcv_cb, void *user_data)
 {
        sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
 }

diff --git a/session.c b/session.c
index 2976ce75b10636be1ead596408ebb9d1e67bd046..65f7a8df2785bf03f53d03960010e62ed8ca47aa 100644 (file)
--- a/session.c
+++ b/session.c
@@ -32,7 +32,7 @@ struct source {
        int fd;
        int events;
        int timeout;
-       receive_data_callback cb;
+       sr_receive_data_callback cb;
        void *user_data;
 };
 
@@ -223,7 +223,7 @@ void sr_session_bus(struct sr_device *device, struct sr_datafeed_packet *packet)
 }
 
 void sr_session_source_add(int fd, int events, int timeout,
-               receive_data_callback callback, void *user_data)
+               sr_receive_data_callback callback, void *user_data)
 {
        struct source *new_sources, *s;
 

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 8d1bbd7d137ade17b4987b2bcd8975226f6d8e4c..4b4de45b8f69657ae73a380c1ddbd83b1549bca2 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -87,7 +87,7 @@ int sr_find_hwcap(int *capabilities, int hwcap);
 struct sr_hwcap_option *sr_find_hwcap_option(int hwcap);
 void sr_source_remove(int fd);
 void sr_source_add(int fd, int events, int timeout,
-                  receive_data_callback rcv_cb, void *user_data);
+                  sr_receive_data_callback rcv_cb, void *user_data);
 
 /*--- session.c -------------------------------------------------------------*/
 
@@ -118,7 +118,7 @@ void sr_session_bus(struct sr_device *device,
                    struct sr_datafeed_packet *packet);
 int sr_session_save(const char *filename);
 void sr_session_source_add(int fd, int events, int timeout,
-               receive_data_callback callback, void *user_data);
+               sr_receive_data_callback callback, void *user_data);
 void sr_session_source_remove(int fd);
 
 /*--- input/input.c ---------------------------------------------------------*/

diff --git a/sigrok.h b/sigrok.h
index e2bbecc59a24281af38471a7ce5ec7701dc5570d..7c0ed57242ac4eab7f501378f1435e2a5aead937 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -74,7 +74,7 @@ extern "C" {
 #define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
 #endif
 
-typedef int (*receive_data_callback) (int fd, int revents, void *user_data);
+typedef int (*sr_receive_data_callback) (int fd, int revents, void *user_data);
 
 /* Data types used by hardware plugins for set_configuration() */
 enum {
@@ -345,7 +345,7 @@ struct sr_session {
        GSList *devices;
        /* List of struct analyzer* */
        GSList *analyzers;
-       /* list of receive_data_callback */
+       /* list of sr_receive_data_callback */
        GSList *datafeed_callbacks;
        GTimeVal starttime;
        gboolean running;