sr_dev_clear(): Always free sdi->priv (devc).

[libsigrok.git] / src / hardware / ftdi-la / api.c

diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c
index c3c3891fc500f16d662f30292ba5929c029316cc..6b545afb08be17cdb82d351198269077ad7d0758 100644 (file)
--- a/src/hardware/ftdi-la/api.c
+++ b/src/hardware/ftdi-la/api.c
@@ -82,7 +82,7 @@ static const struct ftdi_chip_desc *chip_descs[] = {
        &ft232r_desc,
 };
 
-static void scan_device(struct sr_dev_driver *di, struct ftdi_context *ftdic,
+static void scan_device(struct ftdi_context *ftdic,
        struct libusb_device *dev, GSList **devices)
 {
        struct libusb_device_descriptor usb_desc;
@@ -90,10 +90,8 @@ static void scan_device(struct sr_dev_driver *di, struct ftdi_context *ftdic,
        struct dev_context *devc;
        char *vendor, *model, *serial_num;
        struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
        int rv;
 
-       drvc = di->context;
        libusb_get_device_descriptor(dev, &usb_desc);
 
        desc = NULL;
@@ -116,16 +114,13 @@ static void scan_device(struct sr_dev_driver *di, struct ftdi_context *ftdic,
        /* Allocate memory for the incoming data. */
        devc->data_buf = g_malloc0(DATA_BUF_SIZE);
 
-       snprintf(devc->address, sizeof(devc->address), "d:%u/%u",
-               libusb_get_bus_number(dev), libusb_get_device_address(dev));
-
        devc->desc = desc;
 
        vendor = g_malloc(32);
        model = g_malloc(32);
        serial_num = g_malloc(32);
        rv = ftdi_usb_get_strings(ftdic, dev, vendor, 32,
-                            model, 32, serial_num, 32);
+                       model, 32, serial_num, 32);
        switch (rv) {
        case 0:
                break;
@@ -146,15 +141,15 @@ static void scan_device(struct sr_dev_driver *di, struct ftdi_context *ftdic,
        sdi->vendor = vendor;
        sdi->model = model;
        sdi->serial_num = serial_num;
-       sdi->driver = di;
        sdi->priv = devc;
+       sdi->connection_id = g_strdup_printf("d:%u/%u",
+               libusb_get_bus_number(dev), libusb_get_device_address(dev));
 
        for (char *const *chan = &(desc->channel_names[0]); *chan; chan++)
                sr_channel_new(sdi, chan - &(desc->channel_names[0]),
                                SR_CHANNEL_LOGIC, TRUE, *chan);
 
        *devices = g_slist_append(*devices, sdi);
-       drvc->instances = g_slist_append(drvc->instances, sdi);
        return;
 
 err_free_strings:
@@ -165,8 +160,7 @@ err_free_strings:
        g_free(devc);
 }
 
-static GSList *scan_all(struct ftdi_context *ftdic, struct sr_dev_driver *di,
-       GSList *options)
+static GSList *scan_all(struct ftdi_context *ftdic, GSList *options)
 {
        GSList *devices;
        struct ftdi_device_list *devlist = 0;
@@ -184,11 +178,9 @@ static GSList *scan_all(struct ftdi_context *ftdic, struct sr_dev_driver *di,
                return NULL;
        }
 
-       sr_dbg("Number of FTDI devices found: %d", ret);
-
        curdev = devlist;
        while (curdev) {
-               scan_device(di, ftdic, curdev->dev, &devices);
+               scan_device(ftdic, curdev->dev, &devices);
                curdev = curdev->next;
        }
 
@@ -210,7 +202,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        int i;
 
        drvc = di->context;
-       drvc->instances = NULL;
        conn = NULL;
        for (l = options; l; l = l->next) {
                src = l->data;
@@ -236,17 +227,17 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                                usb = l->data;
                                if (usb->bus == libusb_get_bus_number(devlist[i])
                                        && usb->address == libusb_get_device_address(devlist[i])) {
-                                       scan_device(di, ftdic, devlist[i], &devices);
+                                       scan_device(ftdic, devlist[i], &devices);
                                }
                        }
                }
                libusb_free_device_list(devlist, 1);
        } else
-               devices = scan_all(ftdic, di, options);
+               devices = scan_all(ftdic, options);
 
        ftdi_free(ftdic);
 
-       return devices;
+       return std_scan_complete(di, devices);
 }
 
 static void clear_helper(void *priv)
@@ -255,12 +246,11 @@ static void clear_helper(void *priv)
 
        devc = priv;
        g_free(devc->data_buf);
-       g_free(devc);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -274,7 +264,7 @@ static int dev_open(struct sr_dev_inst *sdi)
        if (!devc->ftdic)
                return SR_ERR;
 
-       ret = ftdi_usb_open_string(devc->ftdic, devc->address);
+       ret = ftdi_usb_open_string(devc->ftdic, sdi->connection_id);
        if (ret < 0) {
                /* Log errors, except for -3 ("device not found"). */
                if (ret != -3)
@@ -290,7 +280,6 @@ static int dev_open(struct sr_dev_inst *sdi)
                       ret, ftdi_get_error_string(devc->ftdic));
                goto err_dev_open_close_ftdic;
        }
-       sr_dbg("FTDI chip buffers purged successfully.");
 
        /* Reset the FTDI bitmode. */
        ret = ftdi_set_bitmode(devc->ftdic, 0x00, BITMODE_RESET);
@@ -299,7 +288,6 @@ static int dev_open(struct sr_dev_inst *sdi)
                       ret, ftdi_get_error_string(devc->ftdic));
                goto err_dev_open_close_ftdic;
        }
-       sr_dbg("FTDI chip bitmode reset successfully.");
 
        ret = ftdi_set_bitmode(devc->ftdic, 0x00, BITMODE_BITBANG);
        if (ret < 0) {
@@ -307,15 +295,15 @@ static int dev_open(struct sr_dev_inst *sdi)
                       ret, ftdi_get_error_string(devc->ftdic));
                goto err_dev_open_close_ftdic;
        }
-       sr_dbg("FTDI chip bitbang mode entered successfully.");
-
-       sdi->status = SR_ST_ACTIVE;
 
        return SR_OK;
+
 err_dev_open_close_ftdic:
        ftdi_usb_close(devc->ftdic);
+
 err_ftdi_free:
        ftdi_free(devc->ftdic);
+
        return SR_ERR;
 }
 
@@ -325,13 +313,12 @@ static int dev_close(struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
 
-       if (devc->ftdic) {
-               ftdi_usb_close(devc->ftdic);
-               ftdi_free(devc->ftdic);
-               devc->ftdic = NULL;
-       }
+       if (!devc->ftdic)
+               return SR_ERR_BUG;
 
-       sdi->status = SR_ST_INACTIVE;
+       ftdi_usb_close(devc->ftdic);
+       ftdi_free(devc->ftdic);
+       devc->ftdic = NULL;
 
        return SR_OK;
 }
@@ -376,9 +363,6 @@ static int config_set(uint32_t key, GVariant *data,
 
        (void)cg;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        ret = SR_OK;
@@ -446,9 +430,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        if (!devc->ftdic)
                return SR_ERR_BUG;
 
@@ -458,7 +439,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        devc->samples_sent = 0;
        devc->bytes_received = 0;
 
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        /* Hook up a dummy handler to receive data from the device. */
        sr_session_source_add(sdi->session, -1, G_IO_IN, 0,
@@ -469,13 +450,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
-       sr_dbg("Stopping acquisition.");
        sr_session_source_remove(sdi->session, -1);
 
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
 
        return SR_OK;
 }