Build: Set local include directories in Makefile.am

[libsigrok.git] / src / hardware / rigol-ds / api.c

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 27705f7ccdc86995e8102e212d38491213c1356d..8075a2e8ff8318d3a7b524765d144caae58850f5 100644 (file)
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -23,9 +23,10 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -343,7 +344,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
                                break;
                        sr_dbg("Found DS1000 firmware < 0.2.4, using raw data format.");
                        devc->format = FORMAT_RAW;
-               } while(0);
+               } while (0);
                g_strfreev(version);
        }
 
@@ -353,8 +354,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
                                        model->analog_channels);
 
        for (i = 0; i < model->analog_channels; i++) {
-               if (!(channel_name = g_strdup_printf("CH%d", i + 1)))
-                       return NULL;
+               channel_name = g_strdup_printf("CH%d", i + 1);
                ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_name);
 
                devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
@@ -369,8 +369,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
                devc->digital_group = g_malloc0(sizeof(struct sr_channel_group));
 
                for (i = 0; i < ARRAY_SIZE(devc->digital_channels); i++) {
-                       if (!(channel_name = g_strdup_printf("D%d", i)))
-                               return NULL;
+                       channel_name = g_strdup_printf("D%d", i);
                        ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name);
                        g_free(channel_name);
                        devc->digital_group->channels = g_slist_append(
@@ -388,16 +387,16 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
                        devc->num_timebases = &timebases[i] - devc->timebases + 1;
        }
 
-       for (i = 0; i < NUM_VDIV; i++)
-               if (!memcmp(&devc->model->series->min_vdiv, &vdivs[i], sizeof(uint64_t[2]))) {
+       for (i = 0; i < NUM_VDIV; i++) {
+               if (!memcmp(&devc->model->series->min_vdiv,
+                                       &vdivs[i], sizeof(uint64_t[2]))) {
                        devc->vdivs = &vdivs[i];
                        devc->num_vdivs = NUM_VDIV - i;
                }
+       }
 
-       if (!(devc->buffer = g_try_malloc(ACQ_BUFFER_SIZE)))
-               return NULL;
-       if (!(devc->data = g_try_malloc(ACQ_BUFFER_SIZE * sizeof(float))))
-               return NULL;
+       devc->buffer = g_malloc(ACQ_BUFFER_SIZE);
+       devc->data = g_malloc(ACQ_BUFFER_SIZE * sizeof(float));
 
        devc->data_source = DATA_SOURCE_LIVE;
 
@@ -408,12 +407,12 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-       return sr_scpi_scan(di->priv, options, probe_device);
+       return sr_scpi_scan(di->context, options, probe_device);
 }
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -815,7 +814,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
                return SR_OK;
-       } else if (key == SR_CONF_DEVICE_OPTIONS && cg == NULL) {
+       } else if (key == SR_CONF_DEVICE_OPTIONS && !cg) {
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
                return SR_OK;
@@ -1092,5 +1091,5 @@ SR_PRIV struct sr_dev_driver rigol_ds_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };