drivers: Use ARRAY_AND_SIZE where possible.

[libsigrok.git] / src / hardware / asix-sigma / api.c

diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c
index 5bcce1d9ac3ced56d068dece5803d5588d1b7745..c9b787e73ac8ac2976468cd81e3982a630931d08 100644 (file)
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -19,10 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * ASIX SIGMA/SIGMA2 logic analyzer driver
- */
-
 #include <config.h>
 #include "protocol.h"
 
@@ -50,17 +46,23 @@ static const uint32_t devopts[] = {
 #endif
 };
 
+#if ASIX_SIGMA_WITH_TRIGGER
 static const int32_t trigger_matches[] = {
        SR_TRIGGER_ZERO,
        SR_TRIGGER_ONE,
        SR_TRIGGER_RISING,
        SR_TRIGGER_FALLING,
 };
+#endif
 
+static void clear_helper(struct dev_context *devc)
+{
+       ftdi_deinit(&devc->ftdic);
+}
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, sigma_clear_helper);
+       return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
@@ -79,8 +81,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        ftdi_init(&devc->ftdic);
 
-       /* Look for SIGMAs. */
-
        if ((ret = ftdi_usb_find_all(&devc->ftdic, &devlist,
            USB_VENDOR, USB_PRODUCT)) <= 0) {
                if (ret < 0)
@@ -102,7 +102,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sr_info("Found ASIX SIGMA - Serial: %s", serial_txt);
 
        devc->cur_samplerate = samplerates[0];
-       devc->period_ps = 0;
        devc->limit_msec = 0;
        devc->limit_samples = 0;
        devc->cur_firmware = -1;
@@ -111,7 +110,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        devc->capture_ratio = 50;
        devc->use_triggers = 0;
 
-       /* Register SIGMA device. */
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
        sdi->status = SR_ST_INITIALIZING;
        sdi->vendor = g_strdup(USB_VENDOR_NAME);
@@ -122,7 +120,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        sdi->priv = devc;
 
-       /* We will open the device again when we need it. */
        ftdi_list_free(&devlist);
 
        return std_scan_complete(di, g_slist_append(NULL, sdi));
@@ -140,18 +137,13 @@ static int dev_open(struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
 
-       /* Make sure it's an ASIX SIGMA. */
        if ((ret = ftdi_usb_open_desc(&devc->ftdic,
-               USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) {
-
-               sr_err("ftdi_usb_open failed: %s",
-                      ftdi_get_error_string(&devc->ftdic));
-
-               return 0;
+                       USB_VENDOR, USB_PRODUCT, USB_DESCRIPTION, NULL)) < 0) {
+               sr_err("Failed to open device (%d): %s.",
+                      ret, ftdi_get_error_string(&devc->ftdic));
+               return SR_ERR;
        }
 
-       sdi->status = SR_ST_ACTIVE;
-
        return SR_OK;
 }
 
@@ -161,13 +153,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
 
-       /* TODO */
-       if (sdi->status == SR_ST_ACTIVE)
-               ftdi_usb_close(&devc->ftdic);
-
-       sdi->status = SR_ST_INACTIVE;
-
-       return SR_OK;
+       return (ftdi_usb_close(&devc->ftdic) == 0) ? SR_OK : SR_ERR;
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -212,9 +198,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        (void)cg;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        ret = SR_OK;
@@ -252,32 +235,15 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
-       GVariant *gvar;
-       GVariantBuilder gvb;
-
-       (void)cg;
-
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
-               if (!sdi)
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                       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));
-               break;
+               return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
        case SR_CONF_SAMPLERATE:
-               g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
-               gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates,
-                               samplerates_count, sizeof(samplerates[0]));
-               g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
-               *data = g_variant_builder_end(&gvb);
+               *data = std_gvar_samplerates(samplerates, samplerates_count);
                break;
 #if ASIX_SIGMA_WITH_TRIGGER
        case SR_CONF_TRIGGER_MATCH:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                               trigger_matches, ARRAY_SIZE(trigger_matches),
-                               sizeof(int32_t));
+               *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
                break;
 #endif
        default:
@@ -299,9 +265,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        uint8_t clock_bytes[sizeof(clockselect)];
        size_t clock_idx;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        if (sigma_convert_trigger(sdi) != SR_OK) {
@@ -389,7 +352,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                           (devc->capture_ratio * 255) / 100, devc);
 
        /* Start acqusition. */
-       gettimeofday(&devc->start_tv, 0);
+       devc->start_time = g_get_monotonic_time();
        regval =  WMR_TRGRES | WMR_SDRAMWRITEEN;
 #if ASIX_SIGMA_WITH_TRIGGER
        regval |= WMR_TRGEN;