std: Add and use std_dev_clear() where possible.

[libsigrok.git] / src / hardware / saleae-logic-pro / api.c

diff --git a/src/hardware/saleae-logic-pro/api.c b/src/hardware/saleae-logic-pro/api.c
index 74bf7ccec57dc839fd09920b70d8a6f2e9d95088..ef4f49500fa8cb9738ac5d540bc7311ebc026f56 100644 (file)
--- a/src/hardware/saleae-logic-pro/api.c
+++ b/src/hardware/saleae-logic-pro/api.c
@@ -22,9 +22,9 @@
 #include <string.h>
 #include "protocol.h"
 
-#define BUF_COUNT (8)
-#define BUF_SIZE (16*1024)
-#define BUF_TIMEOUT (1000*1000)
+#define BUF_COUNT 8
+#define BUF_SIZE (16 * 1024)
+#define BUF_TIMEOUT (1000 * 1000)
 
 SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info;
 
@@ -180,11 +180,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return std_scan_complete(di, devices);
 }
 
-static int dev_clear(const struct sr_dev_driver *di)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
        struct sr_dev_driver *di = sdi->driver;
@@ -201,22 +196,16 @@ static int dev_open(struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       /* configure default samplerate */
+       /* Configure default samplerate. */
        if (devc->dig_samplerate == 0)
                devc->dig_samplerate = samplerates[3];
 
-       sdi->status = SR_ST_ACTIVE;
-
        return SR_OK;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-       struct sr_usb_dev_inst *usb = sdi->conn;
-
-       sr_usb_close(usb);
-
-       sdi->status = SR_ST_INACTIVE;
+       sr_usb_close(sdi->conn);
 
        return SR_OK;
 }
@@ -259,8 +248,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;
@@ -289,21 +276,15 @@ static int config_list(uint32_t key, GVariant **data,
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                                 scanopts,
-                                                 ARRAY_SIZE(scanopts),
-                                                 sizeof(uint32_t));
+                       scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
                break;
        case SR_CONF_DEVICE_OPTIONS:
                if (!sdi) {
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                                         drvopts,
-                                                         ARRAY_SIZE(drvopts),
-                                                         sizeof(uint32_t));
+                               drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
                } else {
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                                         devopts,
-                                                         ARRAY_SIZE(devopts),
-                                                         sizeof(uint32_t));
+                               devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
                }
                break;
        case SR_CONF_SAMPLERATE:
@@ -335,7 +316,7 @@ static int dev_acquisition_handle(int fd, int revents, void *cb_data)
 {
        struct sr_dev_inst *sdi = cb_data;
        struct drv_context *drvc = sdi->driver->context;
-       struct timeval tv = {};
+       struct timeval tv = ALL_ZERO;
 
        (void)fd;
        (void)revents;
@@ -354,9 +335,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        uint8_t *buf;
        unsigned int i, ret;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        ret = saleae_logic_pro_init(sdi);
        if (ret != SR_OK)
                return ret;
@@ -375,8 +353,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                buf = g_malloc(BUF_SIZE);
                transfer = libusb_alloc_transfer(0);
                libusb_fill_bulk_transfer(transfer, usb->devhdl,
-                                         2 | LIBUSB_ENDPOINT_IN, buf, BUF_SIZE,
-                                         saleae_logic_pro_receive_data, (void *)sdi, BUF_TIMEOUT);
+                       2 | LIBUSB_ENDPOINT_IN, buf, BUF_SIZE,
+                       saleae_logic_pro_receive_data, (void *)sdi, BUF_TIMEOUT);
                if ((ret = libusb_submit_transfer(transfer)) != 0) {
                        sr_err("Failed to submit transfer: %s.",
                               libusb_error_name(ret));
@@ -405,9 +383,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        struct dev_context *devc = sdi->priv;
        struct drv_context *drvc = sdi->driver->context;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        saleae_logic_pro_stop(sdi);
 
        std_session_send_df_end(sdi);
@@ -427,7 +402,7 @@ SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info = {
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
-       .dev_clear = dev_clear,
+       .dev_clear = std_dev_clear,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,