Return SR_ERR_MALLOC upon allocation errors.

[libsigrok.git] / hardware / hantek-dso / api.c

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index bf0fd9569426b13f9d5038c3be09fbb263b1260f..8c7a9dce7e4e6738f713ced9ec849d0b791dfdd2 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -31,7 +31,6 @@
 #include <libusb.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include "config.h"
 #include "dso.h"
 
 
@@ -200,13 +199,16 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
        return sdi;
 }
 
-static int configure_probes(struct dev_context *devc, const GSList *probes)
+static int configure_probes(const struct sr_dev_inst *sdi)
 {
+       struct dev_context *devc;
        const struct sr_probe *probe;
        const GSList *l;
 
+       devc = sdi->priv;
+
        devc->ch1_enabled = devc->ch2_enabled = FALSE;
-       for (l = probes; l; l = l->next) {
+       for (l = sdi->probes; l; l = l->next) {
                probe = (struct sr_probe *)l->data;
                if (probe->index == 0)
                        devc->ch1_enabled = probe->enabled;
@@ -218,7 +220,7 @@ static int configure_probes(struct dev_context *devc, const GSList *probes)
 }
 
 /* Properly close and free all devices. */
-static void clear_instances(void)
+static int clear_instances(void)
 {
        struct sr_dev_inst *sdi;
        struct drv_context *drvc;
@@ -247,6 +249,7 @@ static void clear_instances(void)
        g_slist_free(drvc->instances);
        drvc->instances = NULL;
 
+       return SR_OK;
 }
 
 static int hw_init(void)
@@ -255,10 +258,10 @@ static int hw_init(void)
 
        if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
                sr_err("hantek-dso: driver context malloc failed.");
-               return SR_ERR;
+               return SR_ERR_MALLOC;
        }
 
-       if (libusb_init(&drvc->usb_context) != 0) {
+       if (libusb_init(NULL) != 0) {
                g_free(drvc);
                sr_err("hantek-dso: Failed to initialize USB.");
                return SR_ERR;
@@ -289,7 +292,7 @@ static GSList *hw_scan(GSList *options)
        clear_instances();
 
        /* Find all Hantek DSO devices and upload firmware to all of them. */
-       libusb_get_device_list(drvc->usb_context, &devlist);
+       libusb_get_device_list(NULL, &devlist);
        for (i = 0; devlist[i]; i++) {
                if ((ret = libusb_get_device_descriptor(devlist[i], &des))) {
                        sr_err("hantek-dso: failed to get device descriptor: %d", ret);
@@ -343,6 +346,15 @@ static GSList *hw_scan(GSList *options)
        return devices;
 }
 
+static GSList *hw_dev_list(void)
+{
+       struct drv_context *drvc;
+
+       drvc = hdi->priv;
+
+       return drvc->instances;
+}
+
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
@@ -405,9 +417,7 @@ static int hw_cleanup(void)
 
        clear_instances();
 
-       if (drvc->usb_context)
-               libusb_exit(drvc->usb_context);
-       drvc->usb_context = NULL;
+       libusb_exit(NULL);
 
        return SR_OK;
 }
@@ -477,9 +487,6 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
        case SR_HWCAP_LIMIT_FRAMES:
                devc->limit_frames = *(const uint64_t *)value;
                break;
-       case SR_HWCAP_PROBECONFIG:
-               ret = configure_probes(devc, (const GSList *)value);
-               break;
        case SR_HWCAP_TRIGGER_SLOPE:
                tmp_u64 = *(const int *)value;
                if (tmp_u64 != SLOPE_NEGATIVE && tmp_u64 != SLOPE_POSITIVE)
@@ -595,6 +602,7 @@ static void send_chunk(struct dev_context *devc, unsigned char *buf,
        analog.num_samples = num_samples;
        analog.mq = SR_MQ_VOLTAGE;
        analog.unit = SR_UNIT_VOLT;
+       /* TODO: Check malloc return value. */
        analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_probes);
        data_offset = 0;
        for (i = 0; i < analog.num_samples; i++) {
@@ -722,7 +730,6 @@ static int handle_event(int fd, int revents, void *cb_data)
        const struct sr_dev_inst *sdi;
        struct sr_datafeed_packet packet;
        struct timeval tv;
-       struct drv_context *drvc;
        struct dev_context *devc;
        const struct libusb_pollfd **lupfd;
        int num_probes, i;
@@ -733,7 +740,6 @@ static int handle_event(int fd, int revents, void *cb_data)
        (void)fd;
        (void)revents;
 
-       drvc = hdi->priv;
        sdi = cb_data;
        devc = sdi->priv;
        if (devc->dev_state == STOPPING) {
@@ -741,7 +747,7 @@ static int handle_event(int fd, int revents, void *cb_data)
                sr_dbg("hantek-dso: stopping acquisition");
                /* TODO: doesn't really cancel pending transfers so they might
                 * come in after SR_DF_END is sent. */
-               lupfd = libusb_get_pollfds(drvc->usb_context);
+               lupfd = libusb_get_pollfds(NULL);
                for (i = 0; lupfd[i]; i++)
                        sr_source_remove(lupfd[i]->fd);
                free(lupfd);
@@ -756,7 +762,7 @@ static int handle_event(int fd, int revents, void *cb_data)
 
        /* Always handle pending libusb events. */
        tv.tv_sec = tv.tv_usec = 0;
-       libusb_handle_events_timeout(drvc->usb_context, &tv);
+       libusb_handle_events_timeout(NULL, &tv);
 
        /* TODO: ugh */
        if (devc->dev_state == NEW_CAPTURE) {
@@ -799,6 +805,7 @@ static int handle_event(int fd, int revents, void *cb_data)
                devc->trigger_offset = trigger_offset;
 
                num_probes = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
+               /* TODO: Check malloc return value. */
                devc->framebuf = g_try_malloc(devc->framesize * num_probes * 2);
                devc->samp_buffered = devc->samp_received = 0;
 
@@ -836,17 +843,20 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        struct sr_datafeed_packet packet;
        struct sr_datafeed_header header;
        struct sr_datafeed_meta_analog meta;
-       struct drv_context *drvc;
        struct dev_context *devc;
        int i;
 
-       drvc = hdi->priv;
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR;
 
        devc = sdi->priv;
        devc->cb_data = cb_data;
 
+       if (configure_probes(sdi) != SR_OK) {
+               sr_err("hantek-dso: failed to configured probes");
+               return SR_ERR;
+       }
+
        if (dso_init(devc) != SR_OK)
                return SR_ERR;
 
@@ -854,7 +864,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                return SR_ERR;
 
        devc->dev_state = CAPTURE;
-       lupfd = libusb_get_pollfds(drvc->usb_context);
+       lupfd = libusb_get_pollfds(NULL);
        for (i = 0; lupfd[i]; i++)
                sr_source_add(lupfd[i]->fd, lupfd[i]->events, TICK, handle_event,
                                (void *)sdi);
@@ -899,6 +909,8 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
        .init = hw_init,
        .cleanup = hw_cleanup,
        .scan = hw_scan,
+       .dev_list = hw_dev_list,
+       .dev_clear = clear_instances,
        .dev_open = hw_dev_open,
        .dev_close = hw_dev_close,
        .info_get = hw_info_get,