build: Portability fixes.

[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 26792a41aba82b7816ff0875af2f647f5291011e..bfd69484bf8b944e8db564bc82ccab03cdb33d93 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -27,6 +27,7 @@
 #include <glib/gstdio.h>
 #include <ftdi.h>
 #include <string.h>
+#include <unistd.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "asix-sigma.h"
@@ -725,7 +726,7 @@ static int convert_trigger(const struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
        memset(&devc->trigger, 0, sizeof(struct sigma_trigger));
-       if (!(trigger = sr_session_trigger_get()))
+       if (!(trigger = sr_session_trigger_get(sdi->session)))
                return SR_OK;
 
        trigger_set = 0;
@@ -1004,7 +1005,7 @@ static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster,
                 */
                if ((i == 1023) || (ts == (tsdiff - EVENTS_PER_CLUSTER))) {
                        logic.length = (i + 1) * logic.unitsize;
-                       sr_session_send(devc->cb_data, &packet);
+                       sr_session_send(sdi, &packet);
                }
        }
 
@@ -1032,14 +1033,14 @@ static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster,
                if (trigger_offset > 0) {
                        packet.type = SR_DF_LOGIC;
                        logic.length = trigger_offset * logic.unitsize;
-                       sr_session_send(devc->cb_data, &packet);
+                       sr_session_send(sdi, &packet);
                        events_in_cluster -= trigger_offset;
                }
 
                /* Only send trigger if explicitly enabled. */
                if (devc->use_triggers) {
                        packet.type = SR_DF_TRIGGER;
-                       sr_session_send(devc->cb_data, &packet);
+                       sr_session_send(sdi, &packet);
                }
        }
 
@@ -1047,7 +1048,7 @@ static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster,
                packet.type = SR_DF_LOGIC;
                logic.length = events_in_cluster * logic.unitsize;
                logic.data = samples + (trigger_offset * logic.unitsize);
-               sr_session_send(devc->cb_data, &packet);
+               sr_session_send(sdi, &packet);
        }
 
        ss->lastsample =
@@ -1068,10 +1069,9 @@ static void sigma_decode_dram_cluster(struct sigma_dram_cluster *dram_cluster,
 static int decode_chunk_ts(struct sigma_dram_line *dram_line,
                           uint16_t events_in_line,
                           uint32_t trigger_event,
-                          void *cb_data)
+                          struct sr_dev_inst *sdi)
 {
        struct sigma_dram_cluster *dram_cluster;
-       struct sr_dev_inst *sdi = cb_data;
        struct dev_context *devc = sdi->priv;
        unsigned int clusters_in_line =
                (events_in_line + (EVENTS_PER_CLUSTER - 1)) / EVENTS_PER_CLUSTER;
@@ -1113,7 +1113,7 @@ static int decode_chunk_ts(struct sigma_dram_line *dram_line,
 static int download_capture(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc = sdi->priv;
-       const int chunks_per_read = 32;
+       const uint32_t chunks_per_read = 32;
        struct sigma_dram_line *dram_line;
        int bufsz;
        uint32_t stoppos, triggerpos;
@@ -1509,10 +1509,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        devc->cb_data = cb_data;
 
        /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* Add capture source. */
-       sr_source_add(0, G_IO_IN, 10, receive_data, (void *)sdi);
+       sr_session_source_add(sdi->session, 0, G_IO_IN, 10, receive_data, (void *)sdi);
 
        devc->state.state = SIGMA_CAPTURE;
 
@@ -1528,7 +1528,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        devc = sdi->priv;
        devc->state.state = SIGMA_IDLE;
 
-       sr_source_remove(0);
+       sr_session_source_remove(sdi->session, 0);
 
        return SR_OK;
 }