From 13b0573369841c1e26834734699b0f34f35428eb Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 20 Feb 2011 14:09:15 +0100 Subject: [PATCH] Add sr_ prefix to datafeed_callback typedef. --- session.c | 4 ++-- sigrok-proto.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/session.c b/session.c index 2cafc0f0..2976ce75 100644 --- 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 f63156fa..8d1bbd7d 100644 --- 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);