BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add sr_ prefix to datafeed_callback typedef.

This commit is contained in:
Uwe Hermann 2011-02-20 14:09:15 +01:00
parent e5551f657d
commit 13b0573369
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
session.c
View File

@ -102,7 +102,7 @@ void sr_session_datafeed_callback_clear(void)
session->datafeed_callbacks = NULL; 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 = session->datafeed_callbacks =
g_slist_append(session->datafeed_callbacks, callback); 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) void sr_session_bus(struct sr_device *device, struct sr_datafeed_packet *packet)
{ {
GSList *l; GSList *l;
datafeed_callback cb; sr_datafeed_callback cb;
/* /*
* TODO: Send packet through PD pipe, and send the output of that to * TODO: Send packet through PD pipe, and send the output of that to

6
sigrok-proto.h
View File

@ -91,8 +91,8 @@ void sr_source_add(int fd, int events, int timeout,
/*--- session.c -------------------------------------------------------------*/ /*--- session.c -------------------------------------------------------------*/
typedef void (*datafeed_callback) (struct sr_device *device, typedef void (*sr_datafeed_callback) (struct sr_device *device,
struct sr_datafeed_packet *packet); struct sr_datafeed_packet *packet);
/* Session setup */ /* Session setup */
int sr_session_load(const char *filename); int sr_session_load(const char *filename);
@ -107,7 +107,7 @@ void sr_session_pa_add(struct analyzer *pa);
/* Datafeed setup */ /* Datafeed setup */
void sr_session_datafeed_callback_clear(void); 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 */ /* Session control */
int sr_session_start(void); int sr_session_start(void);