sr: s/err/ret/ for consistency.

[libsigrok.git] / hardware / zeroplus-logic-cube / zeroplus.c

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 27ce1dd9607c44d92c25b485327c4708d8f74360..c6131a51e601f0479c577c4bc88052ac6a050a30 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -176,7 +176,7 @@ static int opendev4(struct sr_dev_inst **sdi, libusb_device *dev,
 {
        struct context *ctx;
        unsigned int i;
-       int err;
+       int ret;
 
        /* Note: sdi is non-NULL, the caller already checked this. */
 
@@ -185,8 +185,8 @@ static int opendev4(struct sr_dev_inst **sdi, libusb_device *dev,
                return -1;
        }
 
-       if ((err = libusb_get_device_descriptor(dev, des))) {
-               sr_err("zp: failed to get device descriptor: %d", err);
+       if ((ret = libusb_get_device_descriptor(dev, des))) {
+               sr_err("zp: failed to get device descriptor: %d", ret);
                return -1;
        }
 
@@ -214,13 +214,13 @@ static int opendev4(struct sr_dev_inst **sdi, libusb_device *dev,
                }
 
                /* Found it. */
-               if (!(err = libusb_open(dev, &(ctx->usb->devhdl)))) {
+               if (!(ret = libusb_open(dev, &(ctx->usb->devhdl)))) {
                        (*sdi)->status = SR_ST_ACTIVE;
                        sr_info("zp: opened device %d on %d.%d interface %d",
                                (*sdi)->index, ctx->usb->bus,
                                ctx->usb->address, USB_INTERFACE);
                } else {
-                       sr_err("zp: failed to open device: %d", err);
+                       sr_err("zp: failed to open device: %d", ret);
                        *sdi = NULL;
                }
        }
@@ -233,7 +233,7 @@ static struct sr_dev_inst *zp_open_dev(int dev_index)
        struct sr_dev_inst *sdi;
        libusb_device **devlist;
        struct libusb_device_descriptor des;
-       int err, i;
+       int i;
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
                return NULL;
@@ -244,7 +244,7 @@ static struct sr_dev_inst *zp_open_dev(int dev_index)
                libusb_get_device_list(usb_context, &devlist);
                for (i = 0; devlist[i]; i++) {
                        /* TODO: Error handling. */
-                       err = opendev4(&sdi, devlist[i], &des);
+                       opendev4(&sdi, devlist[i], &des);
                }
        } else {
                /* Status must be SR_ST_ACTIVE, i.e. already in use... */
@@ -330,7 +330,7 @@ static int hw_init(const char *devinfo)
        struct sr_dev_inst *sdi;
        struct libusb_device_descriptor des;
        libusb_device **devlist;
-       int err, devcnt, i;
+       int ret, devcnt, i;
        struct context *ctx;
 
        /* Avoid compiler warnings. */
@@ -362,9 +362,9 @@ static int hw_init(const char *devinfo)
        libusb_get_device_list(usb_context, &devlist); /* TODO: Errors. */
 
        for (i = 0; devlist[i]; i++) {
-               err = libusb_get_device_descriptor(devlist[i], &des);
-               if (err != 0) {
-                       sr_err("zp: failed to get device descriptor: %d", err);
+               ret = libusb_get_device_descriptor(devlist[i], &des);
+               if (ret != 0) {
+                       sr_err("zp: failed to get device descriptor: %d", ret);
                        continue;
                }
 
@@ -402,7 +402,7 @@ static int hw_dev_open(int dev_index)
 {
        struct sr_dev_inst *sdi;
        struct context *ctx;
-       int err;
+       int ret;
 
        if (!(sdi = zp_open_dev(dev_index))) {
                sr_err("zp: unable to open device");
@@ -416,16 +416,16 @@ static int hw_dev_open(int dev_index)
                return SR_ERR_ARG;
        }
 
-       err = libusb_set_configuration(ctx->usb->devhdl, USB_CONFIGURATION);
-       if (err < 0) {
+       ret = libusb_set_configuration(ctx->usb->devhdl, USB_CONFIGURATION);
+       if (ret < 0) {
                sr_err("zp: Unable to set USB configuration %d: %d",
-                      USB_CONFIGURATION, err);
+                      USB_CONFIGURATION, ret);
                return SR_ERR;
        }
 
-       err = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
-       if (err != 0) {
-               sr_err("zp: Unable to claim interface: %d", err);
+       ret = libusb_claim_interface(ctx->usb->devhdl, USB_INTERFACE);
+       if (ret != 0) {
+               sr_err("zp: Unable to claim interface: %d", ret);
                return SR_ERR;
        }
 
@@ -613,7 +613,7 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value)
        }
 }
 
-static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 {
        struct sr_dev_inst *sdi;
        struct sr_datafeed_packet packet;
@@ -655,7 +655,7 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
        gettimeofday(&header.starttime, NULL);
        header.samplerate = ctx->cur_samplerate;
        header.num_logic_probes = ctx->num_channels;
-       sr_session_bus(session_data, &packet);
+       sr_session_send(cb_data, &packet);
 
        if (!(buf = g_try_malloc(PACKET_SIZE))) {
                sr_err("zp: %s: buf malloc failed", __func__);
@@ -676,27 +676,27 @@ static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
                logic.length = PACKET_SIZE;
                logic.unitsize = 4;
                logic.data = buf;
-               sr_session_bus(session_data, &packet);
+               sr_session_send(cb_data, &packet);
                samples_read += res / 4;
        }
        analyzer_read_stop(ctx->usb->devhdl);
        g_free(buf);
 
        packet.type = SR_DF_END;
-       sr_session_bus(session_data, &packet);
+       sr_session_send(cb_data, &packet);
 
        return SR_OK;
 }
 
-/* This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
+/* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
+static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
 {
        struct sr_datafeed_packet packet;
        struct sr_dev_inst *sdi;
        struct context *ctx;
 
        packet.type = SR_DF_END;
-       sr_session_bus(session_dev_id, &packet);
+       sr_session_send(cb_data, &packet);
 
        if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
                sr_err("zp: %s: sdi was NULL", __func__);
@@ -714,7 +714,7 @@ static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_plugin zeroplus_logic_cube_plugin_info = {
+SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
        .name = "zeroplus-logic-cube",
        .longname = "Zeroplus Logic Cube LAP-C series",
        .api_version = 1,