korad-kaxxxxp: add support for forced "detection" of a given model

[libsigrok.git] / src / hardware / korad-kaxxxxp / api.c

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index d5146261551d88a8ab8155452c1bed1119bf2239..798c6f3a5f9ba5363614a8f5898083eceefb674f 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -24,6 +24,7 @@
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
+       SR_CONF_FORCE_DETECT,
 };
 
 static const uint32_t drvopts[] = {
@@ -31,6 +32,7 @@ static const uint32_t drvopts[] = {
 };
 
 static const uint32_t devopts[] = {
+       SR_CONF_CONN | SR_CONF_GET,
        SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
@@ -96,6 +98,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        struct sr_dev_inst *sdi;
        struct sr_config *src;
        const char *conn, *serialcomm;
+       const char *force_detect;
        struct sr_serial_dev_inst *serial;
        char reply[50];
        int i, model_id;
@@ -103,6 +106,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        conn = NULL;
        serialcomm = NULL;
+       force_detect = NULL;
 
        for (l = options; l; l = l->next) {
                src = l->data;
@@ -113,6 +117,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                case SR_CONF_SERIALCOMM:
                        serialcomm = g_variant_get_string(src->data, NULL);
                        break;
+               case SR_CONF_FORCE_DETECT:
+                       force_detect = g_variant_get_string(src->data, NULL);
+                       break;
                default:
                        sr_err("Unknown option %d, skipping.", src->key);
                        break;
@@ -123,6 +130,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                return NULL;
        if (!serialcomm)
                serialcomm = "9600/8n1";
+       if (force_detect && !*force_detect)
+               force_detect = NULL;
 
        serial = sr_serial_dev_inst_new(conn, serialcomm);
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
@@ -161,6 +170,17 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                if (!g_strcmp0(models[i].id, reply))
                        model_id = i;
        }
+       if (model_id < 0 && force_detect) {
+               sr_warn("Found model ID '%s' is unknown, trying '%s' spec.",
+                       reply, force_detect);
+               for (i = 0; models[i].id; i++) {
+                       if (strcmp(models[i].id, force_detect) != 0)
+                               continue;
+                       sr_info("Found replacement, using it instead.");
+                       model_id = i;
+                       break;
+               }
+       }
        if (model_id < 0) {
                sr_err("Unknown model ID '%s' detected, aborting.", reply);
                return NULL;
@@ -174,6 +194,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->model = g_strdup(models[model_id].name);
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
+       sdi->connection_id = g_strdup(conn);
 
        sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V");
        sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "I");
@@ -222,6 +243,9 @@ static int config_get(uint32_t key, GVariant **data,
        case SR_CONF_LIMIT_SAMPLES:
        case SR_CONF_LIMIT_MSEC:
                return sr_sw_limits_config_get(&devc->limits, key, data);
+       case SR_CONF_CONN:
+               *data = g_variant_new_string(sdi->connection_id);
+               break;
        case SR_CONF_VOLTAGE:
                korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_VOLTAGE, devc);
                *data = g_variant_new_double(devc->voltage);