Introduce standard cleanup helper

[libsigrok.git] / src / hardware / lascar-el-usb / api.c

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index ce63bc672f68c2360e79875d174af62cfa357844..6244172098f4eed6bdabab0294e80cb93e702d11 100644 (file)
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -17,9 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -51,7 +52,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        GSList *usb_devices, *devices, *l;
        const char *conn;
 
-       drvc = di->priv;
+       drvc = di->context;
 
        conn = NULL;
        for (l = options; l; l = l->next) {
@@ -90,7 +91,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -100,7 +101,7 @@ static int dev_open(struct sr_dev_inst *sdi)
        struct sr_usb_dev_inst *usb;
        int ret;
 
-       if (!(drvc = di->priv)) {
+       if (!(drvc = di->context)) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -124,7 +125,7 @@ static int dev_close(struct sr_dev_inst *sdi)
        struct sr_dev_driver *di = sdi->driver;
        struct sr_usb_dev_inst *usb;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -143,21 +144,6 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       int ret;
-       struct drv_context *drvc;
-
-       if (!(drvc = di->priv))
-               /* Can get called on an unused driver, doesn't matter. */
-               return SR_OK;
-
-       ret = std_dev_clear(di, NULL);
-       g_free(drvc);
-
-       return ret;
-}
-
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
@@ -206,7 +192,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -252,7 +238,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return SR_OK;
 }
 
-static void mark_xfer(struct libusb_transfer *xfer)
+static void LIBUSB_CALL mark_xfer(struct libusb_transfer *xfer)
 {
 
        if (xfer->status == LIBUSB_TRANSFER_COMPLETED)
@@ -322,7 +308,7 @@ static int lascar_proc_config(const struct sr_dev_inst *sdi)
        return ret;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        struct sr_dev_driver *di = sdi->driver;
        struct sr_datafeed_packet packet;
@@ -340,36 +326,33 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
 
-       drvc = di->priv;
+       drvc = di->context;
        devc = sdi->priv;
        usb = sdi->conn;
-       devc->cb_data = cb_data;
 
        if (lascar_proc_config(sdi) != SR_OK)
                return SR_ERR;
 
        sr_dbg("Starting log retrieval.");
 
-       /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        interval = (devc->config[0x1c] | (devc->config[0x1d] << 8)) * 1000;
        packet.type = SR_DF_META;
        packet.payload = &meta;
        src = sr_config_new(SR_CONF_SAMPLE_INTERVAL, g_variant_new_uint64(interval));
        meta.config = g_slist_append(NULL, src);
-       sr_session_send(devc->cb_data, &packet);
+       sr_session_send(sdi, &packet);
        g_free(src);
 
        if (devc->logged_samples == 0) {
                /* This ensures the frontend knows the session is done. */
-               packet.type = SR_DF_END;
-               sr_session_send(devc->cb_data, &packet);
+               std_session_send_df_end(sdi, LOG_PREFIX);
                return SR_OK;
        }
 
@@ -415,7 +398,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
        }
        if (xfer_in->user_data != GINT_TO_POINTER(1) ||
-                       xfer_in->user_data != GINT_TO_POINTER(1)) {
+                       xfer_out->user_data != GINT_TO_POINTER(1)) {
                sr_dbg("no response to log transfer request");
                libusb_free_transfer(xfer_in);
                libusb_free_transfer(xfer_out);
@@ -433,9 +416,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        usb_source_add(sdi->session, drvc->sr_ctx, 100,
                        lascar_el_usb_handle_events, (void *)sdi);
 
-       buf = g_try_malloc(4096);
+       buf = g_malloc(4096);
        libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN,
-                       buf, 4096, lascar_el_usb_receive_transfer, cb_data, 100);
+                       buf, 4096, lascar_el_usb_receive_transfer,
+                       (struct sr_dev_inst *)sdi, 100);
        if ((ret = libusb_submit_transfer(xfer_in) != 0)) {
                sr_err("Unable to submit transfer: %s.", libusb_error_name(ret));
                libusb_free_transfer(xfer_in);
@@ -446,12 +430,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        return SR_OK;
 }
 
-SR_PRIV int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+SR_PRIV int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        struct sr_dev_driver *di = sdi->driver;
-       (void)cb_data;
 
-       if (!di->priv) {
+       if (!di->context) {
                sr_err("Driver was not initialized.");
                return SR_ERR;
        }
@@ -472,7 +455,7 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info = {
        .longname = "Lascar EL-USB",
        .api_version = 1,
        .init = init,
-       .cleanup = cleanup,
+       .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = dev_list,
        .dev_clear = NULL,
@@ -483,5 +466,5 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };