Add sr_ prefix for 'struct probe'.

diff --git a/device.c b/device.c
index f5674b4ca426a1b29bc5699259185becdbc6cb92..9e4254adc6df4165cee94d5239e291f9ac803163 100644 (file)
--- a/device.c
+++ b/device.c
@@ -129,7 +129,7 @@ void device_destroy(struct sr_device *device)
 
 void device_probe_clear(struct sr_device *device, int probenum)
 {
-       struct probe *p;
+       struct sr_probe *p;
 
        p = probe_find(device, probenum);
        if (!p)
@@ -148,12 +148,12 @@ void device_probe_clear(struct sr_device *device, int probenum)
 
 void device_probe_add(struct sr_device *device, char *name)
 {
-       struct probe *p;
+       struct sr_probe *p;
        char probename[16];
        int probenum;
 
        probenum = g_slist_length(device->probes) + 1;
-       p = g_malloc0(sizeof(struct probe));
+       p = g_malloc0(sizeof(struct sr_probe));
        p->index = probenum;
        p->enabled = TRUE;
        if (name) {
@@ -166,10 +166,10 @@ void device_probe_add(struct sr_device *device, char *name)
        device->probes = g_slist_append(device->probes, p);
 }
 
-struct probe *probe_find(struct sr_device *device, int probenum)
+struct sr_probe *probe_find(struct sr_device *device, int probenum)
 {
        GSList *l;
-       struct probe *p, *found_probe;
+       struct sr_probe *p, *found_probe;
 
        found_probe = NULL;
        for (l = device->probes; l; l = l->next) {
@@ -186,7 +186,7 @@ struct probe *probe_find(struct sr_device *device, int probenum)
 /* TODO: return SIGROK_ERR if probenum not found */
 void device_probe_name(struct sr_device *device, int probenum, char *name)
 {
-       struct probe *p;
+       struct sr_probe *p;
 
        p = probe_find(device, probenum);
        if (!p)
@@ -200,7 +200,7 @@ void device_probe_name(struct sr_device *device, int probenum, char *name)
 /* TODO: return SIGROK_ERR if probenum not found */
 void device_trigger_clear(struct sr_device *device)
 {
-       struct probe *p;
+       struct sr_probe *p;
        unsigned int pnum;
 
        if (!device->probes)
@@ -218,7 +218,7 @@ void device_trigger_clear(struct sr_device *device)
 /* TODO: return SIGROK_ERR if probenum not found */
 void device_trigger_set(struct sr_device *device, int probenum, char *trigger)
 {
-       struct probe *p;
+       struct sr_probe *p;
 
        p = probe_find(device, probenum);
        if (!p)

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 4673a39820cb3db991e930bcadaa963cf6d8f606..e86c1d28e57826b132e50a6f1e687a955f7658a9 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -594,7 +594,7 @@ static int set_samplerate(struct sr_device_instance *sdi,
 static int configure_probes(struct sr_device_instance *sdi, GSList *probes)
 {
        struct sigma *sigma = sdi->priv;
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        int trigger_set = 0;
        int probebit;
@@ -602,7 +602,7 @@ static int configure_probes(struct sr_device_instance *sdi, GSList *probes)
        memset(&sigma->trigger, 0, sizeof(struct sigma_trigger));
 
        for (l = probes; l; l = l->next) {
-               probe = (struct probe *)l->data;
+               probe = (struct sr_probe *)l->data;
                probebit = 1 << (probe->index - 1);
 
                if (!probe->enabled || !probe->trigger)

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index ec9fa4ed6c5bacd52f6508aa3f5ef625c4bef95c..4df5ef051ce37e9d63c3d3d2c6d6b4b7cc89401c 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -147,7 +147,7 @@ static int send_longcommand(int fd, uint8_t command, uint32_t data)
 
 static int configure_probes(GSList *probes)
 {
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        int probe_bit, stage, i;
        char *tc;
@@ -160,7 +160,7 @@ static int configure_probes(GSList *probes)
 
        num_stages = 0;
        for (l = probes; l; l = l->next) {
-               probe = (struct probe *)l->data;
+               probe = (struct sr_probe *)l->data;
                if (!probe->enabled)
                        continue;
 

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index a270e0b4850ca27a3aff4fa6404b9210085916de..b99523f820bc696ca8f80a68854a9d854f4375f3 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -243,7 +243,7 @@ static void close_device(struct sr_device_instance *sdi)
 
 static int configure_probes(GSList *probes)
 {
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        int probe_bit, stage, i;
        char *tc;
@@ -256,7 +256,7 @@ static int configure_probes(GSList *probes)
 
        stage = -1;
        for (l = probes; l; l = l->next) {
-               probe = (struct probe *)l->data;
+               probe = (struct sr_probe *)l->data;
                if (probe->enabled == FALSE)
                        continue;
                probe_bit = 1 << (probe->index - 1);

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index ba5fd522cb6e26b31f0ff2978fc40890111262cc..cb56a09f8873b859dd3717354dc26b3a4ace06bd 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -234,7 +234,7 @@ static void close_device(struct sr_device_instance *sdi)
 
 static int configure_probes(GSList *probes)
 {
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        int probe_bit, stage, i;
        char *tc;
@@ -247,7 +247,7 @@ static int configure_probes(GSList *probes)
 
        stage = -1;
        for (l = probes; l; l = l->next) {
-               probe = (struct probe *)l->data;
+               probe = (struct sr_probe *)l->data;
                if (probe->enabled == FALSE)
                        continue;
                probe_bit = 1 << (probe->index - 1);

diff --git a/output/output_analog.c b/output/output_analog.c
index f00bffa342f0ffd8f6175d1a735c0e11985b676d..7c5c622f94d92c886ea8955a42140487cc9fdaa6 100644 (file)
--- a/output/output_analog.c
+++ b/output/output_analog.c
@@ -92,7 +92,7 @@ static void flush_linebufs(struct context *ctx, char *outbuf)
 static int init(struct sr_output *o, int default_spl, enum outputmode mode)
 {
        struct context *ctx;
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        uint64_t samplerate;
        int num_probes;

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index 440e848c8c1d59bcb7e91b7733841a40797e81d6..99ab6d6be97f9a10a52dd54bc765109743a92aa9 100644 (file)
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -49,7 +49,7 @@ const char *gnuplot_header_comment = "\
 static int init(struct sr_output *o)
 {
        struct context *ctx;
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        uint64_t samplerate;
        unsigned int i;
@@ -194,7 +194,7 @@ static int data(struct sr_output *o, char *data_in, uint64_t length_in,
 static int analog_init(struct sr_output *o)
 {
        struct context *ctx;
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        uint64_t samplerate;
        unsigned int i;

diff --git a/output/output_ols.c b/output/output_ols.c
index 1c57aee8e7579ca5c64754529a4d4bdf9d771c1d..e199bb461e8670a144203a7b62c3311190a12c54 100644 (file)
--- a/output/output_ols.c
+++ b/output/output_ols.c
@@ -71,7 +71,7 @@ static void make_header(struct sr_output *o)
 static int init(struct sr_output *o)
 {
        struct context *ctx;
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        int num_enabled_probes;
 

diff --git a/output/output_vcd.c b/output/output_vcd.c
index f34eaa8c1a31c93c10c28de53badc3d155770866..332a67d0087bb81a86b65b5c3b7bdee3a68b82bd 100644 (file)
--- a/output/output_vcd.c
+++ b/output/output_vcd.c
@@ -52,7 +52,7 @@ $comment\n  Acquisition with %d/%d probes at %s\n$end\n";
 static int init(struct sr_output *o)
 {
        struct context *ctx;
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        int num_probes, i;
        char *samplerate_s, *frequency_s, *timestamp;

diff --git a/output/text/text.c b/output/text/text.c
index da41b7334e6ba50434c5bcaaaa431ed4018aabfe..f51a8f31d34c0b3952aa9f5178df6ba798765800 100644 (file)
--- a/output/text/text.c
+++ b/output/text/text.c
@@ -67,7 +67,7 @@ void flush_linebufs(struct context *ctx, char *outbuf)
 int init(struct sr_output *o, int default_spl, enum outputmode mode)
 {
        struct context *ctx;
-       struct probe *probe;
+       struct sr_probe *probe;
        GSList *l;
        uint64_t samplerate;
        int num_probes;

diff --git a/session_file.c b/session_file.c
index 8ed2c4016e7f768f1effb420e35f33325014bfd2..2a727c86f7d4c62def8428dcb53f2800a87aa702 100644 (file)
--- a/session_file.c
+++ b/session_file.c
@@ -39,7 +39,7 @@ int session_load(const char *filename)
        struct zip_stat zs;
        struct session *session;
        struct sr_device *device;
-       struct probe *probe;
+       struct sr_probe *probe;
        int ret, err, probenum, devcnt, i, j;
        uint64_t tmp_u64, total_probes, enabled_probes, p;
        char **sections, **keys, *metafile, *val, c;
@@ -141,7 +141,7 @@ int session_save(char *filename)
        GSList *l, *p, *d;
        FILE *meta;
        struct sr_device *device;
-       struct probe *probe;
+       struct sr_probe *probe;
        struct datastore *ds;
        struct zip *zipfile;
        struct zip_source *versrc, *metasrc, *logicsrc;

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 57b899df16ac36c894cec77773ce6e8601a88af8..c0d09da5b3858800b8507cce209fbd34a1ba8031 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -45,7 +45,7 @@ void device_destroy(struct sr_device *dev);
 
 void device_probe_clear(struct sr_device *device, int probenum);
 void device_probe_add(struct sr_device *device, char *name);
-struct probe *probe_find(struct sr_device *device, int probenum);
+struct sr_probe *probe_find(struct sr_device *device, int probenum);
 void device_probe_name(struct sr_device *device, int probenum, char *name);
 
 void device_trigger_clear(struct sr_device *device);

diff --git a/sigrok.h b/sigrok.h
index 983246bb81f7366a7c7a737ddffff916ce659cd4..9518041ce32fd0bce7d05a12050fd52b5d4e04b0 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -193,7 +193,7 @@ struct sr_device {
        struct sr_device_plugin *plugin;
        /* A plugin may handle multiple devices of the same type */
        int plugin_index;
-       /* List of struct probe* */
+       /* List of struct sr_probe* */
        GSList *probes;
        /* Data acquired by this device, if any */
        struct datastore *datastore;
@@ -204,7 +204,7 @@ enum {
        SR_PROBE_TYPE_ANALOG,
 };
 
-struct probe {
+struct sr_probe {
        int index;
        int type;
        gboolean enabled;

diff --git a/strutil.c b/strutil.c
index b8eb0f8e4b78c77ac34931f7caa3d2af173a0315..955adedbe5863041fea9cbe662b57f0527352346 100644 (file)
--- a/strutil.c
+++ b/strutil.c
@@ -99,7 +99,7 @@ char *sr_period_string(uint64_t frequency)
 char **sr_parse_triggerstring(struct sr_device *device, const char *triggerstring)
 {
        GSList *l;
-       struct probe *probe;
+       struct sr_probe *probe;
        int max_probes, probenum, i;
        char **tokens, **triggerlist, *trigger, *tc, *trigger_types;
        gboolean error;
@@ -117,7 +117,7 @@ char **sr_parse_triggerstring(struct sr_device *device, const char *triggerstrin
                        /* Named probe */
                        probenum = 0;
                        for (l = device->probes; l; l = l->next) {
-                               probe = (struct probe *)l->data;
+                               probe = (struct sr_probe *)l->data;
                                if (probe->enabled
                                    && !strncmp(probe->name, tokens[i],
                                                strlen(probe->name))) {