Add sr_ prefix to session_{add,remove}.

[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 427d7905982166c15b1e9a9b008a14f232808917..ce67cc00fe36ad8ea784f908b7c723ad869e52fc 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>
@@ -54,7 +56,7 @@ static uint64_t supported_samplerates[] = {
        0,
 };
 
-static struct samplerates samplerates = {
+static struct sr_samplerates samplerates = {
        KHZ(200),
        MHZ(200),
        0,
@@ -312,9 +314,9 @@ static int bin2bitbang(const char *filename,
        int c, ret, bit, v;
        uint32_t imm = 0x3f6df2ab;
 
-       f = fopen(filename, "r");
+       f = g_fopen(filename, "rb");
        if (!f) {
-               g_warning("fopen(\"%s\", \"r\")", 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)
@@ -875,7 +877,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                        packet.length = tosend * sizeof(uint16_t);
                        packet.unitsize = 2;
                        packet.payload = samples + sent;
-                       session_bus(sigma->session_id, &packet);
+                       sr_session_bus(sigma->session_id, &packet);
 
                        sent += tosend;
                }
@@ -919,7 +921,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                                packet.length = tosend * sizeof(uint16_t);
                                packet.unitsize = 2;
                                packet.payload = samples;
-                               session_bus(sigma->session_id, &packet);
+                               sr_session_bus(sigma->session_id, &packet);
 
                                sent += tosend;
                        }
@@ -929,7 +931,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                                packet.type = SR_DF_TRIGGER;
                                packet.length = 0;
                                packet.payload = 0;
-                               session_bus(sigma->session_id, &packet);
+                               sr_session_bus(sigma->session_id, &packet);
                        }
                }
 
@@ -941,7 +943,7 @@ static int decode_chunk_ts(uint8_t *buf, uint16_t *lastts,
                        packet.length = tosend * sizeof(uint16_t);
                        packet.unitsize = 2;
                        packet.payload = samples + sent;
-                       session_bus(sigma->session_id, &packet);
+                       sr_session_bus(sigma->session_id, &packet);
                }
 
                *lastsample = samples[n - 1];
@@ -988,7 +990,7 @@ static int receive_data(int fd, int revents, void *user_data)
                        /* End of samples. */
                        packet.type = SR_DF_END;
                        packet.length = 0;
-                       session_bus(sigma->session_id, &packet);
+                       sr_session_bus(sigma->session_id, &packet);
 
                        sigma->state.state = SIGMA_IDLE;
 
@@ -1304,10 +1306,10 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
        header.protocol_id = SR_PROTO_RAW;
        header.num_logic_probes = sigma->num_probes;
        header.num_analog_probes = 0;
-       session_bus(session_device_id, &packet);
+       sr_session_bus(session_device_id, &packet);
 
        /* Add capture source. */
-       source_add(0, G_IO_IN, 10, receive_data, sdi);
+       sr_source_add(0, G_IO_IN, 10, receive_data, sdi);
 
        sigma->state.state = SIGMA_CAPTURE;