Various cosmetics, whitespace, consistency fixes.

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

diff --git a/hardware/lascar-el-usb/protocol.c b/hardware/lascar-el-usb/protocol.c
index 5f1d5a2eafeda4a99b045b7d719c9a1e55996c51..3f9cbc88b65bdf3d5cdfdae31b144ae9fca18657 100644 (file)
--- a/hardware/lascar-el-usb/protocol.c
+++ b/hardware/lascar-el-usb/protocol.c
@@ -505,8 +505,6 @@ SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
                for (i = 0; devc->usbfd[i] != -1; i++)
                        sr_source_remove(devc->usbfd[i]);
 
-               sdi->driver->dev_close(sdi);
-
                packet.type = SR_DF_END;
                sr_session_send(cb_data, &packet);
        }
@@ -532,7 +530,7 @@ SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
        switch (transfer->status) {
        case LIBUSB_TRANSFER_NO_DEVICE:
                /* USB device was unplugged. */
-               hw_dev_acquisition_stop(sdi, sdi);
+               dev_acquisition_stop(sdi, sdi);
                return;
        case LIBUSB_TRANSFER_COMPLETED:
        case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */
@@ -551,7 +549,7 @@ SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
                                devc->rcvd_bytes, devc->log_size,
                                devc->rcvd_samples, devc->logged_samples);
                if (devc->rcvd_bytes >= devc->log_size)
-                       hw_dev_acquisition_stop(sdi, sdi);
+                       dev_acquisition_stop(sdi, sdi);
        }
 
        if (sdi->status == SR_ST_ACTIVE) {
@@ -561,7 +559,7 @@ SR_PRIV void lascar_el_usb_receive_transfer(struct libusb_transfer *transfer)
                               libusb_error_name(ret));
                        g_free(transfer->buffer);
                        libusb_free_transfer(transfer);
-                       hw_dev_acquisition_stop(sdi, sdi);
+                       dev_acquisition_stop(sdi, sdi);
                }
        } else {
                /* This was the last transfer we're going to receive, so
@@ -595,10 +593,13 @@ static int set_flags(unsigned char *configblock, int flags)
 SR_PRIV int lascar_is_logging(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       struct sr_usb_dev_inst *usb;
        int dummy, flags, ret;
 
        devc = sdi->priv;
-       if (lascar_get_config(devc->usb->devhdl, devc->config, &dummy) != SR_OK)
+       usb = sdi->conn;
+
+       if (lascar_get_config(usb->devhdl, devc->config, &dummy) != SR_OK)
                return -1;
 
        flags = get_flags(devc->config);
@@ -613,10 +614,13 @@ SR_PRIV int lascar_is_logging(const struct sr_dev_inst *sdi)
 SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       struct sr_usb_dev_inst *usb;
        int len, flags, ret;
 
        devc = sdi->priv;
-       if (lascar_get_config(devc->usb->devhdl, devc->config, &len) != SR_OK)
+       usb = sdi->conn;
+
+       if (lascar_get_config(usb->devhdl, devc->config, &len) != SR_OK)
                return SR_ERR;
 
        /* Turn on logging. */
@@ -627,7 +631,7 @@ SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi)
        /* Start logging in 0 seconds. */
        memset(devc->config + 24, 0, 4);
 
-       ret = lascar_save_config(devc->usb->devhdl, devc->config, len);
+       ret = lascar_save_config(usb->devhdl, devc->config, len);
        sr_info("Started internal logging.");
 
        return ret;
@@ -636,19 +640,21 @@ SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi)
 SR_PRIV int lascar_stop_logging(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       struct sr_usb_dev_inst *usb;
        int len, flags, ret;
 
        devc = sdi->priv;
-       if (lascar_get_config(devc->usb->devhdl, devc->config, &len) != SR_OK)
+       usb = sdi->conn;
+
+       if (lascar_get_config(usb->devhdl, devc->config, &len) != SR_OK)
                return SR_ERR;
 
        flags = get_flags(devc->config);
        flags &= ~0x0100;
        set_flags(devc->config, flags);
 
-       ret = lascar_save_config(devc->usb->devhdl, devc->config, len);
+       ret = lascar_save_config(usb->devhdl, devc->config, len);
        sr_info("Stopped internal logging.");
 
        return ret;
 }
-