Use consistent API callback function names.

[libsigrok.git] / hardware / fx2lafw / fx2lafw.c

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index dbec30b754904e84244135a3bfb1a73e276501cd..278563a41472ebaa2c887a8db5ad18a4f852ef8d 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -122,8 +122,6 @@ static const uint64_t samplerates[] = {
 
 SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
 static struct sr_dev_driver *di = &fx2lafw_driver_info;
-static int hw_dev_close(struct sr_dev_inst *sdi);
-static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
 /**
  * Check the USB configuration to determine if this is an fx2lafw device.
@@ -334,12 +332,16 @@ static struct dev_context *fx2lafw_dev_new(void)
 {
        struct dev_context *devc;
 
-       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+       if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
                sr_err("Device context malloc failed.");
                return NULL;
        }
 
-       devc->trigger_stage = TRIGGER_FIRED;
+       devc->profile = NULL;
+       devc->fw_updated = 0;
+       devc->cur_samplerate = 0;
+       devc->limit_samples = 0;
+       devc->sample_wide = 0;
 
        return devc;
 }
@@ -349,12 +351,12 @@ static int clear_instances(void)
        return std_dev_clear(di, NULL);
 }
 
-static int hw_init(struct sr_context *sr_ctx)
+static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
+       return std_hw_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static GSList *hw_scan(GSList *options)
+static GSList *scan(GSList *options)
 {
        struct drv_context *drvc;
        struct dev_context *devc;
@@ -371,9 +373,6 @@ static GSList *hw_scan(GSList *options)
 
        drvc = di->priv;
 
-       /* This scan always invalidates any previous scans. */
-       clear_instances();
-
        conn = NULL;
        for (l = options; l; l = l->next) {
                src = l->data;
@@ -467,16 +466,17 @@ static GSList *hw_scan(GSList *options)
                }
        }
        libusb_free_device_list(devlist, 1);
+       g_slist_free_full(conn_devices, (GDestroyNotify)sr_usb_dev_inst_free);
 
        return devices;
 }
 
-static GSList *hw_dev_list(void)
+static GSList *dev_list(void)
 {
        return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int hw_dev_open(struct sr_dev_inst *sdi)
+static int dev_open(struct sr_dev_inst *sdi)
 {
        struct sr_usb_dev_inst *usb;
        struct dev_context *devc;
@@ -547,7 +547,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int hw_dev_close(struct sr_dev_inst *sdi)
+static int dev_close(struct sr_dev_inst *sdi)
 {
        struct sr_usb_dev_inst *usb;
 
@@ -565,7 +565,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int hw_cleanup(void)
+static int cleanup(void)
 {
        struct drv_context *drvc;
        int ret;
@@ -700,8 +700,6 @@ static void abort_acquisition(struct dev_context *devc)
 static void finish_acquisition(struct dev_context *devc)
 {
        struct sr_datafeed_packet packet;
-       struct drv_context *drvc = di->priv;
-       const struct libusb_pollfd **lupfd;
        int i;
 
        /* Terminate session. */
@@ -709,10 +707,9 @@ static void finish_acquisition(struct dev_context *devc)
        sr_session_send(devc->cb_data, &packet);
 
        /* Remove fds from polling. */
-       lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
-       for (i = 0; lupfd[i]; i++)
-               sr_source_remove(lupfd[i]->fd);
-       free(lupfd); /* NOT g_free()! */
+       for (i = 0; devc->usbfd[i] != -1; i++)
+               sr_source_remove(devc->usbfd[i]);
+       g_free(devc->usbfd);
 
        devc->num_transfers = 0;
        g_free(devc->transfers);
@@ -938,8 +935,7 @@ static unsigned int get_timeout(struct dev_context *devc)
        return timeout + timeout / 4; /* Leave a headroom of 25% percent. */
 }
 
-static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
-               void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
        struct dev_context *devc;
        struct drv_context *drvc;
@@ -958,9 +954,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        devc = sdi->priv;
        usb = sdi->conn;
 
-       if (devc->submitted_transfers != 0)
-               return SR_ERR;
-
+       /* Configures devc->trigger_* and devc->sample_wide */
        if (configure_probes(sdi) != SR_OK) {
                sr_err("Failed to configure probes.");
                return SR_ERR;
@@ -973,6 +967,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        timeout = get_timeout(devc);
        num_transfers = get_number_of_transfers(devc);
        size = get_buffer_size(devc);
+       devc->submitted_transfers = 0;
 
        devc->transfers = g_try_malloc0(sizeof(*devc->transfers) * num_transfers);
        if (!devc->transfers) {
@@ -981,7 +976,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        }
 
        devc->num_transfers = num_transfers;
-
        for (i = 0; i < num_transfers; i++) {
                if (!(buf = g_try_malloc(size))) {
                        sr_err("USB transfer buffer malloc failed.");
@@ -1004,13 +998,19 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        }
 
        lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
-       for (i = 0; lupfd[i]; i++)
+       for (i = 0; lupfd[i]; i++);
+       if (!(devc->usbfd = g_try_malloc(sizeof(struct libusb_pollfd) * (i + 1))))
+               return SR_ERR;
+       for (i = 0; lupfd[i]; i++) {
                sr_source_add(lupfd[i]->fd, lupfd[i]->events,
                              timeout, receive_data, NULL);
-       free(lupfd); /* NOT g_free()! */
+               devc->usbfd[i] = lupfd[i]->fd;
+       }
+       devc->usbfd[i] = -1;
+       free(lupfd);
 
        /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+       std_session_send_df_header(cb_data, LOG_PREFIX);
 
        if ((ret = command_start_acquisition (usb->devhdl,
                devc->cur_samplerate, devc->sample_wide)) != SR_OK) {
@@ -1021,8 +1021,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        (void)cb_data;
 
@@ -1035,17 +1034,17 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
        .name = "fx2lafw",
        .longname = "fx2lafw (generic driver for FX2 based LAs)",
        .api_version = 1,
-       .init = hw_init,
-       .cleanup = hw_cleanup,
-       .scan = hw_scan,
-       .dev_list = hw_dev_list,
+       .init = init,
+       .cleanup = cleanup,
+       .scan = scan,
+       .dev_list = dev_list,
        .dev_clear = clear_instances,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
-       .dev_open = hw_dev_open,
-       .dev_close = hw_dev_close,
-       .dev_acquisition_start = hw_dev_acquisition_start,
-       .dev_acquisition_stop = hw_dev_acquisition_stop,
+       .dev_open = dev_open,
+       .dev_close = dev_close,
+       .dev_acquisition_start = dev_acquisition_start,
+       .dev_acquisition_stop = dev_acquisition_stop,
        .priv = NULL,
 };