demo: use driver struct-based device instance list

[libsigrok.git] / hardware / openbench-logic-sniffer / ols.c

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index f2706d11220e17006f4556f2887dffebd1445184..e98a230f59462780955bfbf7687aba5f15ec695b 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -100,8 +100,8 @@ static const struct sr_samplerates samplerates = {
        NULL,
 };
 
-/* List of struct sr_dev_inst. */
-static GSList *dev_insts = NULL;
+SR_PRIV struct sr_dev_driver ols_driver_info;
+static struct sr_dev_driver *odi = &ols_driver_info;
 
 static int send_shortcommand(int fd, uint8_t command)
 {
@@ -348,7 +348,15 @@ static struct sr_dev_inst *get_metadata(int fd)
        return sdi;
 }
 
-static int hw_init(const char *devinfo)
+static int hw_init(void)
+{
+
+       /* Nothing to do. */
+
+       return SR_OK;
+}
+
+static int hw_scan(void)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;
@@ -359,12 +367,8 @@ static int hw_init(const char *devinfo)
 
        final_devcnt = 0;
 
-       if (devinfo)
-               ports = g_slist_append(NULL, g_strdup(devinfo));
-       else
-               /* No specific device given, so scan all serial ports. */
-               ports = list_serial_ports();
-
+       /* Scan all serial ports. */
+       ports = list_serial_ports();
        num_ports = g_slist_length(ports);
 
        if (!(fds = g_try_malloc0(num_ports * sizeof(GPollFD)))) {
@@ -455,7 +459,9 @@ static int hw_init(const char *devinfo)
                        sdi->priv = ctx;
                }
                ctx->serial = sr_serial_dev_inst_new(dev_names[i], -1);
-               dev_insts = g_slist_append(dev_insts, sdi);
+               odi->instances = g_slist_append(odi->instances, sdi);
+               devices = g_slist_append(devices, sdi);
+
                final_devcnt++;
                serial_close(fds[i].fd);
                fds[i].fd = 0;
@@ -487,7 +493,7 @@ static int hw_dev_open(int dev_index)
        struct sr_dev_inst *sdi;
        struct context *ctx;
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+       if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
                return SR_ERR;
 
        ctx = sdi->priv;
@@ -506,7 +512,7 @@ static int hw_dev_close(int dev_index)
        struct sr_dev_inst *sdi;
        struct context *ctx;
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
+       if (!(sdi = sr_dev_inst_get(odi->instances, dev_index))) {
                sr_err("ols: %s: sdi was NULL", __func__);
                return SR_ERR_BUG;
        }
@@ -531,7 +537,7 @@ static int hw_cleanup(void)
        int ret = SR_OK;
 
        /* Properly close and free all devices. */
-       for (l = dev_insts; l; l = l->next) {
+       for (l = odi->instances; l; l = l->next) {
                if (!(sdi = l->data)) {
                        /* Log error, but continue cleaning up the rest. */
                        sr_err("ols: %s: sdi was NULL, continuing", __func__);
@@ -551,8 +557,8 @@ static int hw_cleanup(void)
                sr_serial_dev_inst_free(ctx->serial);
                sr_dev_inst_free(sdi);
        }
-       g_slist_free(dev_insts);
-       dev_insts = NULL;
+       g_slist_free(odi->instances);
+       odi->instances = NULL;
 
        return ret;
 }
@@ -596,7 +602,7 @@ static int hw_dev_status_get(int dev_index)
 {
        struct sr_dev_inst *sdi;
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+       if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
                return SR_ST_NOT_FOUND;
 
        return sdi->status;
@@ -646,7 +652,7 @@ static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
        int ret;
        const uint64_t *tmp_u64;
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+       if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
                return SR_ERR;
        ctx = sdi->priv;
 
@@ -704,7 +710,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 
        /* Find this device's ctx struct by its fd. */
        ctx = NULL;
-       for (l = dev_insts; l; l = l->next) {
+       for (l = odi->instances; l; l = l->next) {
                sdi = l->data;
                ctx = sdi->priv;
                if (ctx->serial->fd == fd) {
@@ -886,7 +892,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        int num_channels;
        int i;
 
-       if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+       if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
                return SR_ERR;
 
        ctx = sdi->priv;
@@ -1051,6 +1057,7 @@ SR_PRIV struct sr_dev_driver ols_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,
@@ -1059,4 +1066,5 @@ SR_PRIV struct sr_dev_driver ols_driver_info = {
        .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,
+       .instances = NULL,
 };