Add sr_ prefix for 'struct probe'.

[libsigrok.git] / hardware / asix-sigma / asix-sigma.c

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index c89ed31f65cc2ee45943b105713715230db3b03d..e86c1d28e57826b132e50a6f1e687a955f7658a9 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -24,6 +24,8 @@
  */
 
 #include "config.h"
+#include <glib.h>
+#include <glib/gstdio.h>
 #include <ftdi.h>
 #include <string.h>
 #include <zlib.h>
@@ -312,9 +314,9 @@ static int bin2bitbang(const char *filename,
        int c, ret, bit, v;
        uint32_t imm = 0x3f6df2ab;
 
-       f = fopen(filename, "rb");
+       f = g_fopen(filename, "rb");
        if (!f) {
-               g_warning("fopen(\"%s\", \"rb\")", filename);
+               g_warning("g_fopen(\"%s\", \"rb\")", filename);
                return -1;
        }
 
@@ -592,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;
@@ -600,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)