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

Add sr_ prefix for 'struct session'.

This commit is contained in:
Uwe Hermann 2011-02-08 17:50:29 +01:00
parent 1afe89897c
commit 2872d21ebc
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
session.c
View File

@ -37,16 +37,16 @@ struct source {
}; };
/* There can only be one session at a time. */ /* There can only be one session at a time. */
struct session *session; struct sr_session *session;
int num_sources = 0; int num_sources = 0;
struct source *sources = NULL; struct source *sources = NULL;
int source_timeout = -1; int source_timeout = -1;
struct session *session_new(void) struct sr_session *session_new(void)
{ {
session = calloc(1, sizeof(struct session)); session = calloc(1, sizeof(struct sr_session));
return session; return session;
} }

4
session_file.c
View File

@ -26,7 +26,7 @@
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <sigrok.h> #include <sigrok.h>
extern struct session *session; extern struct sr_session *session;
extern struct sr_device_plugin session_driver; extern struct sr_device_plugin session_driver;
@ -37,7 +37,7 @@ int session_load(const char *filename)
struct zip *archive; struct zip *archive;
struct zip_file *zf; struct zip_file *zf;
struct zip_stat zs; struct zip_stat zs;
struct session *session; struct sr_session *session;
struct sr_device *device; struct sr_device *device;
struct sr_probe *probe; struct sr_probe *probe;
int ret, err, probenum, devcnt, i, j; int ret, err, probenum, devcnt, i, j;

2
sigrok-proto.h
View File

@ -98,7 +98,7 @@ typedef void (*datafeed_callback) (struct sr_device *device,
/* Session setup */ /* Session setup */
int session_load(const char *filename); int session_load(const char *filename);
struct session *session_new(void); struct sr_session *session_new(void);
void session_destroy(void); void session_destroy(void);
void session_device_clear(void); void session_device_clear(void);
int session_device_add(struct sr_device *device); int session_device_add(struct sr_device *device);

2
sigrok.h
View File

@ -340,7 +340,7 @@ struct sr_device_plugin {
void (*stop_acquisition) (int device_index, gpointer session_device_id); void (*stop_acquisition) (int device_index, gpointer session_device_id);
}; };
struct session { struct sr_session {
/* List of struct sr_device* */ /* List of struct sr_device* */
GSList *devices; GSList *devices;
/* List of struct analyzer* */ /* List of struct analyzer* */