]> sigrok.org Git - libsigrok.git/blobdiff - hardware/chronovu-la8/api.c
sr: remove obsolete SR_DI_INST
[libsigrok.git] / hardware / chronovu-la8 / api.c
index 5a4ddbbe2e97c1198629fbb4899ab7a06cd19bfe..f9320a00705e9a5177ed1ad571335f58329c9a48 100644 (file)
@@ -25,7 +25,8 @@
 #include "libsigrok-internal.h"
 #include "driver.h"
 
-static GSList *dev_insts = NULL;
+SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
+static struct sr_dev_driver *cdi = &chronovu_la8_driver_info;
 
 /*
  * The ChronoVu LA8 can have multiple PIDs. Older versions shipped with
@@ -37,14 +38,53 @@ static const uint16_t usb_pids[] = {
 };
 
 /* Function prototypes. */
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+               void *cb_data);
+
+static void clear_instances(void)
+{
+       GSList *l;
+       struct sr_dev_inst *sdi;
+       struct context *ctx;
+
+       /* Properly close all devices. */
+       for (l = cdi->instances; l; l = l->next) {
+               if (!(sdi = l->data)) {
+                       /* Log error, but continue cleaning up the rest. */
+                       sr_err("la8: %s: sdi was NULL, continuing", __func__);
+                       continue;
+               }
+               if (sdi->priv) {
+                       ctx = sdi->priv;
+                       ftdi_free(ctx->ftdic);
+                       g_free(ctx);
+               }
+               sr_dev_inst_free(sdi);
+       }
+       g_slist_free(cdi->instances);
+       cdi->instances = NULL;
+
+}
 
 static int hw_init(void)
 {
-       int ret;
+
+       /* Nothing to do. */
+
+       return SR_OK;
+}
+
+static GSList *hw_scan(GSList *options)
+{
        struct sr_dev_inst *sdi;
+       struct sr_probe *probe;
        struct context *ctx;
+       GSList *devices;
        unsigned int i;
+       int ret;
+
+       (void)options;
+       devices = NULL;
 
        /* Allocate memory for our private driver context. */
        if (!(ctx = g_try_malloc(sizeof(struct context)))) {
@@ -104,17 +144,25 @@ static int hw_init(void)
                sr_err("la8: %s: sr_dev_inst_new failed", __func__);
                goto err_close_ftdic;
        }
-
+       sdi->driver = cdi;
        sdi->priv = ctx;
 
-       dev_insts = g_slist_append(dev_insts, sdi);
+       for (i = 0; probe_names[i]; i++) {
+               if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE,
+                               probe_names[i])))
+                       return NULL;
+               sdi->probes = g_slist_append(sdi->probes, probe);
+       }
+
+       devices = g_slist_append(devices, sdi);
+       cdi->instances = g_slist_append(cdi->instances, sdi);
 
        sr_spew("la8: Device init successful.");
 
        /* Close device. We'll reopen it again when we need it. */
        (void) la8_close(ctx); /* Log, but ignore errors. */
 
-       return 1;
+       return devices;
 
 err_close_ftdic:
        (void) la8_close(ctx); /* Log, but ignore errors. */
@@ -126,19 +174,13 @@ err_free_ctx:
        g_free(ctx);
 err_free_nothing:
 
-       return 0;
+       return NULL;
 }
 
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-       int ret;
-       struct sr_dev_inst *sdi;
        struct context *ctx;
-
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-               sr_err("la8: %s: sdi was NULL", __func__);
-               return SR_ERR_BUG;
-       }
+       int ret;
 
        if (!(ctx = sdi->priv)) {
                sr_err("la8: %s: sdi->priv was NULL", __func__);
@@ -188,16 +230,10 @@ err_dev_open_close_ftdic:
        return SR_ERR;
 }
 
-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(dev_insts, dev_index))) {
-               sr_err("la8: %s: sdi was NULL", __func__);
-               return SR_ERR_BUG;
-       }
-
        if (!(ctx = sdi->priv)) {
                sr_err("la8: %s: sdi->priv was NULL", __func__);
                return SR_ERR_BUG;
@@ -223,122 +259,66 @@ static int hw_dev_close(int dev_index)
 
 static int hw_cleanup(void)
 {
-       GSList *l;
-       struct sr_dev_inst *sdi;
-       int ret = SR_OK;
 
-       /* Properly close all devices. */
-       for (l = dev_insts; l; l = l->next) {
-               if (!(sdi = l->data)) {
-                       /* Log error, but continue cleaning up the rest. */
-                       sr_err("la8: %s: sdi was NULL, continuing", __func__);
-                       ret = SR_ERR_BUG;
-                       continue;
-               }
-               sr_dev_inst_free(sdi); /* Returns void. */
-       }
-       g_slist_free(dev_insts); /* Returns void. */
-       dev_insts = NULL;
+       clear_instances();
 
-       return ret;
+       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;
-
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-               sr_err("la8: %s: sdi was NULL", __func__);
-               return NULL;
-       }
 
-       if (!(ctx = sdi->priv)) {
-               sr_err("la8: %s: sdi->priv was NULL", __func__);
-               return NULL;
-       }
-
-       sr_spew("la8: %s: dev_index %d, dev_info_id %d.", __func__,
-               dev_index, dev_info_id);
-
-       switch (dev_info_id) {
-       case SR_DI_INST:
-               info = sdi;
-               sr_spew("la8: %s: Returning sdi.", __func__);
+       switch (info_id) {
+       case SR_DI_HWCAPS:
+               *data = hwcaps;
                break;
        case SR_DI_NUM_PROBES:
-               info = GINT_TO_POINTER(NUM_PROBES);
+               *data = GINT_TO_POINTER(NUM_PROBES);
                sr_spew("la8: %s: Returning number of probes: %d.", __func__,
                        NUM_PROBES);
                break;
        case SR_DI_PROBE_NAMES:
-               info = probe_names;
+               *data = probe_names;
                sr_spew("la8: %s: Returning probenames.", __func__);
                break;
        case SR_DI_SAMPLERATES:
                fill_supported_samplerates_if_needed();
-               info = &samplerates;
+               *data = &samplerates;
                sr_spew("la8: %s: Returning samplerates.", __func__);
                break;
        case SR_DI_TRIGGER_TYPES:
-               info = TRIGGER_TYPES;
+               *data = (char *)TRIGGER_TYPES;
                sr_spew("la8: %s: Returning trigger types: %s.", __func__,
                        TRIGGER_TYPES);
                break;
        case SR_DI_CUR_SAMPLERATE:
-               info = &ctx->cur_samplerate;
-               sr_spew("la8: %s: Returning samplerate: %" PRIu64 "Hz.",
-                       __func__, ctx->cur_samplerate);
+               if (sdi) {
+                       ctx = sdi->priv;
+                       *data = &ctx->cur_samplerate;
+                       sr_spew("la8: %s: Returning samplerate: %" PRIu64 "Hz.",
+                               __func__, ctx->cur_samplerate);
+               } else
+                       return SR_ERR;
                break;
        default:
-               /* Unknown device info ID, return NULL. */
-               sr_err("la8: %s: Unknown device info ID", __func__);
-               info = NULL;
-               break;
-       }
-
-       return info;
-}
-
-static int hw_dev_status_get(int dev_index)
-{
-       struct sr_dev_inst *sdi;
-
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-               sr_err("la8: %s: sdi was NULL, device not found", __func__);
-               return SR_ST_NOT_FOUND;
+               return SR_ERR_ARG;
        }
 
-       sr_dbg("la8: Returning status: %d.", sdi->status);
-
-       return sdi->status;
-}
-
-static const int *hw_hwcap_get_all(void)
-{
-       sr_spew("la8: Returning list of device capabilities.");
-
-       return hwcaps;
+       return SR_OK;
 }
 
-static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+               const void *value)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-               sr_err("la8: %s: sdi was NULL", __func__);
-               return SR_ERR_BUG;
-       }
-
        if (!(ctx = sdi->priv)) {
                sr_err("la8: %s: sdi->priv was NULL", __func__);
                return SR_ERR_BUG;
        }
 
-       sr_spew("la8: %s: dev_index %d, hwcap %d", __func__, dev_index, hwcap);
-
        switch (hwcap) {
        case SR_HWCAP_SAMPLERATE:
                if (set_samplerate(sdi, *(const uint64_t *)value) == SR_ERR) {
@@ -407,7 +387,7 @@ static int receive_data(int fd, int revents, void *cb_data)
        /* Get one block of data. */
        if ((ret = la8_read_block(ctx)) < 0) {
                sr_err("la8: %s: la8_read_block error: %d", __func__, ret);
-               hw_dev_acquisition_stop(sdi->index, sdi);
+               hw_dev_acquisition_stop(sdi, sdi);
                return FALSE;
        }
 
@@ -423,15 +403,15 @@ static int receive_data(int fd, int revents, void *cb_data)
        for (i = 0; i < NUM_BLOCKS; i++)
                send_block_to_session_bus(ctx, i);
 
-       hw_dev_acquisition_stop(sdi->index, sdi);
+       hw_dev_acquisition_stop(sdi, sdi);
 
        // return FALSE; /* FIXME? */
        return TRUE;
 }
 
-static int hw_dev_acquisition_start(int dev_index, void *cb_data)
+static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+               void *cb_data)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_header header;
@@ -439,11 +419,6 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        uint8_t buf[4];
        int bytes_written;
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-               sr_err("la8: %s: sdi was NULL", __func__);
-               return SR_ERR_BUG;
-       }
-
        if (!(ctx = sdi->priv)) {
                sr_err("la8: %s: sdi->priv was NULL", __func__);
                return SR_ERR_BUG;
@@ -505,24 +480,19 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        ctx->trigger_found = 0;
 
        /* Hook up a dummy handler to receive data from the LA8. */
-       sr_source_add(-1, G_IO_IN, 0, receive_data, sdi);
+       sr_source_add(-1, G_IO_IN, 0, receive_data, (void *)sdi);
 
        return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+               void *cb_data)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
        struct sr_datafeed_packet packet;
 
        sr_dbg("la8: Stopping acquisition.");
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
-               sr_err("la8: %s: sdi was NULL", __func__);
-               return SR_ERR_BUG;
-       }
-
        if (!(ctx = sdi->priv)) {
                sr_err("la8: %s: sdi->priv was NULL", __func__);
                return SR_ERR_BUG;
@@ -542,12 +512,12 @@ SR_PRIV struct sr_dev_driver chronovu_la8_driver_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
+       .scan = hw_scan,
        .dev_open = hw_dev_open,
        .dev_close = hw_dev_close,
-       .dev_info_get = hw_dev_info_get,
-       .dev_status_get = hw_dev_status_get,
-       .hwcap_get_all = hw_hwcap_get_all,
+       .info_get = hw_info_get,
        .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,
+       .instances = NULL,
 };