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

Add sr_ prefix to receive_data_callback typedef. 

Also, drop obsolete add_source() prototype from sigrok-cli.h.
This commit is contained in:
Uwe Hermann 2011-02-20 14:14:13 +01:00
parent 13b0573369
commit a887e3da97
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hwplugin.c
View File

@ -236,7 +236,7 @@ void sr_source_remove(int fd)
} }
void sr_source_add(int fd, int events, int timeout, 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); sr_session_source_add(fd, events, timeout, rcv_cb, user_data);
} }

4
session.c
View File

@ -32,7 +32,7 @@ struct source {
int fd; int fd;
int events; int events;
int timeout; int timeout;
receive_data_callback cb; sr_receive_data_callback cb;
void *user_data; 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, 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; struct source *new_sources, *s;

4
sigrok-proto.h
View File

@ -87,7 +87,7 @@ int sr_find_hwcap(int *capabilities, int hwcap);
struct sr_hwcap_option *sr_find_hwcap_option(int hwcap); struct sr_hwcap_option *sr_find_hwcap_option(int hwcap);
void sr_source_remove(int fd); void sr_source_remove(int fd);
void sr_source_add(int fd, int events, int timeout, 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 -------------------------------------------------------------*/ /*--- session.c -------------------------------------------------------------*/
@ -118,7 +118,7 @@ void sr_session_bus(struct sr_device *device,
struct sr_datafeed_packet *packet); struct sr_datafeed_packet *packet);
int sr_session_save(const char *filename); int sr_session_save(const char *filename);
void sr_session_source_add(int fd, int events, int timeout, 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); void sr_session_source_remove(int fd);
/*--- input/input.c ---------------------------------------------------------*/ /*--- input/input.c ---------------------------------------------------------*/

4
sigrok.h
View File

@ -74,7 +74,7 @@ extern "C" {
#define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a) #define ARRAY_AND_SIZE(a) (a), ARRAY_SIZE(a)
#endif #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() */ /* Data types used by hardware plugins for set_configuration() */
enum { enum {
@ -345,7 +345,7 @@ struct sr_session {
GSList *devices; GSList *devices;
/* List of struct analyzer* */ /* List of struct analyzer* */
GSList *analyzers; GSList *analyzers;
/* list of receive_data_callback */ /* list of sr_receive_data_callback */
GSList *datafeed_callbacks; GSList *datafeed_callbacks;
GTimeVal starttime; GTimeVal starttime;
gboolean running; gboolean running;