Consistently don't check sdi->priv in dev_acquisition_start().

[libsigrok.git] / src / hardware / arachnid-labs-re-load-pro / api.c

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index dde8166365333c51e3e067933fac377e7b24f2d1..1c351ffe675fb91fa8d621e32d1bb7c6c168dd59 100644 (file)
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -52,6 +52,8 @@ static const uint32_t devopts_cg[] = {
        SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET,
        SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET,
        SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE | SR_CONF_GET,
+       SR_CONF_UNDER_VOLTAGE_CONDITION | SR_CONF_GET,
+       SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE | SR_CONF_GET,
 };
 
 SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info;
@@ -75,6 +77,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        const char *conn, *serialcomm;
        char buf[100];
        char *bufptr;
+       double version;
 
        devices = NULL;
        drvc = di->context;
@@ -123,6 +126,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                return NULL;
        }
 
+       version = g_ascii_strtod(buf + 8, NULL);
+       if (version < 1.10) {
+               sr_info("Firmware >= 1.10 required (got %1.2f).", version);
+               serial_close(serial);
+               return NULL;
+       }
+
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
        sdi->status = SR_ST_ACTIVE;
        sdi->vendor = g_strdup("Arachnid Labs");
@@ -282,6 +292,12 @@ static int config_get(uint32_t key, GVariant **data,
        case SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE:
                *data = g_variant_new_boolean(devc->otp_active);
                break;
+       case SR_CONF_UNDER_VOLTAGE_CONDITION:
+               *data = g_variant_new_boolean(TRUE); /* Always on. */
+               break;
+       case SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE:
+               *data = g_variant_new_boolean(devc->uvc_active);
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -336,7 +352,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                return SR_ERR_DEV_CLOSED;
 
        devc = sdi->priv;
-
        serial = sdi->conn;
 
        /* Send the 'monitor <ms>' command (doesn't have a reply). */