sr/drivers: change driver dev_open/dev_close calls to use sdi

[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 3bf6e847d96a8c915ddf3ef985c57c755b8e8567..088095acb96d9177d2d24ff0d3996ed6c93df382 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -447,6 +447,7 @@ static GSList *hw_scan(GSList *options)
        struct ftdi_device_list *devlist;
        char serial_txt[10];
        uint32_t serial;
+       int ret;
 
        (void)options;
        devices = NULL;
@@ -461,9 +462,12 @@ static GSList *hw_scan(GSList *options)
 
        /* Look for SIGMAs. */
 
-       if (ftdi_usb_find_all(&ctx->ftdic, &devlist,
-           USB_VENDOR, USB_PRODUCT) <= 0)
+       if ((ret = ftdi_usb_find_all(&ctx->ftdic, &devlist,
+           USB_VENDOR, USB_PRODUCT)) <= 0) {
+               if (ret < 0)
+                       sr_err("ftdi_usb_find_all(): %d", ret);
                goto free;
+       }
 
        /* Make sure it's a version 1 or 2 SIGMA. */
        ftdi_usb_get_strings(&ctx->ftdic, devlist->dev, NULL, 0, NULL, 0,
@@ -493,6 +497,7 @@ static GSList *hw_scan(GSList *options)
                sr_err("sigma: %s: sdi was NULL", __func__);
                goto free;
        }
+       sdi->driver = adi;
        devices = g_slist_append(devices, sdi);
        adi->instances = g_slist_append(adi->instances, sdi);
        sdi->priv = ctx;
@@ -503,7 +508,7 @@ static GSList *hw_scan(GSList *options)
        return devices;
 
 free:
-       ftdi_free(&ctx->ftdic);
+       ftdi_deinit(&ctx->ftdic);
        g_free(ctx);
        return NULL;
 }
@@ -602,15 +607,11 @@ static int upload_firmware(int firmware_idx, struct context *ctx)
        return SR_OK;
 }
 
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
        int ret;
 
-       if (!(sdi = sr_dev_inst_get(adi->instances, dev_index)))
-               return SR_ERR;
-
        ctx = sdi->priv;
 
        /* Make sure it's an ASIX SIGMA. */
@@ -628,7 +629,7 @@ static int hw_dev_open(int dev_index)
        return SR_OK;
 }
 
-static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
+static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate)
 {
        int i, ret;
        struct context *ctx = sdi->priv;
@@ -669,7 +670,7 @@ static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
  * The Sigma supports complex triggers using boolean expressions, but this
  * has not been implemented yet.
  */
-static int configure_probes(struct sr_dev_inst *sdi, const GSList *probes)
+static int configure_probes(const struct sr_dev_inst *sdi, const GSList *probes)
 {
        struct context *ctx = sdi->priv;
        const struct sr_probe *probe;
@@ -743,16 +744,10 @@ static int configure_probes(struct sr_dev_inst *sdi, const GSList *probes)
        return SR_OK;
 }
 
-static int hw_dev_close(int dev_index)
+static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
 
-       if (!(sdi = sr_dev_inst_get(adi->instances, dev_index))) {
-               sr_err("sigma: %s: sdi was NULL", __func__);
-               return SR_ERR_BUG;
-       }
-
        if (!(ctx = sdi->priv)) {
                sr_err("sigma: %s: sdi->priv was NULL", __func__);
                return SR_ERR_BUG;
@@ -775,41 +770,42 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static const void *hw_dev_info_get(int dev_index, int dev_info_id)
+static int hw_info_get(int info_id, const void **data,
+       const struct sr_dev_inst *sdi)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
-       const void *info = NULL;
-
-       if (!(sdi = sr_dev_inst_get(adi->instances, dev_index))) {
-               sr_err("sigma: %s: sdi was NULL", __func__);
-               return NULL;
-       }
-
-       ctx = sdi->priv;
 
-       switch (dev_info_id) {
+       switch (info_id) {
        case SR_DI_INST:
-               info = sdi;
+               *data = sdi;
+               break;
+       case SR_DI_HWCAPS:
+               *data = hwcaps;
                break;
        case SR_DI_NUM_PROBES:
-               info = GINT_TO_POINTER(NUM_PROBES);
+               *data = GINT_TO_POINTER(NUM_PROBES);
                break;
        case SR_DI_PROBE_NAMES:
-               info = probe_names;
+               *data = probe_names;
                break;
        case SR_DI_SAMPLERATES:
-               info = &samplerates;
+               *data = &samplerates;
                break;
        case SR_DI_TRIGGER_TYPES:
-               info = (char *)TRIGGER_TYPES;
+               *data = (char *)TRIGGER_TYPES;
                break;
        case SR_DI_CUR_SAMPLERATE:
-               info = &ctx->cur_samplerate;
+               if (sdi) {
+                       ctx = sdi->priv;
+                       *data = &ctx->cur_samplerate;
+               } else
+                       return SR_ERR;
                break;
+       default:
+               return SR_ERR_ARG;
        }
 
-       return info;
+       return SR_OK;
 }
 
 static int hw_dev_status_get(int dev_index)
@@ -823,20 +819,12 @@ static int hw_dev_status_get(int dev_index)
                return SR_ST_NOT_FOUND;
 }
 
-static const int *hw_hwcap_get_all(void)
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+               const void *value)
 {
-       return hwcaps;
-}
-
-static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
-{
-       struct sr_dev_inst *sdi;
        struct context *ctx;
        int ret;
 
-       if (!(sdi = sr_dev_inst_get(adi->instances, dev_index)))
-               return SR_ERR;
-
        ctx = sdi->priv;
 
        if (hwcap == SR_HWCAP_SAMPLERATE) {
@@ -1465,9 +1453,8 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = {
        .scan = hw_scan,
        .dev_open = hw_dev_open,
        .dev_close = hw_dev_close,
-       .dev_info_get = hw_dev_info_get,
+       .info_get = hw_info_get,
        .dev_status_get = hw_dev_status_get,
-//     .hwcap_get_all = hw_hwcap_get_all,
        .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,