scpi-pps: don't break SCPI devices when scanning for HP-IB devices

[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 d0920c9b0921d42a4066bf33470ad6b0b9409232..50f17827fd8d1de73a06b9786d181eadfc27a3fb 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[] = {
@@ -67,6 +68,8 @@ static const struct korad_kaxxxxp_model models[] = {
                "KORAD KD3005P V2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
        {KORAD_KD3005P_V20_NOSP, "Korad", "KD3005P",
                "KORADKD3005PV2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
+       {KORAD_KD3005P_V21_NOSP, "Korad", "KD3005P",
+               "KORADKD3005PV2.1", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
        {RND_320_KD3005P, "RND", "KD3005P",
                "RND 320-KD3005P V4.2", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
        {RND_320_KA3005P, "RND", "KA3005P",
@@ -92,18 +95,23 @@ static const struct korad_kaxxxxp_model models[] = {
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
+       static const char *serno_prefix = " SN:";
+
        struct dev_context *devc;
        GSList *l;
        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;
-       unsigned int len;
+       int ret, i, model_id;
+       size_t len;
+       char *serno;
 
        conn = NULL;
        serialcomm = NULL;
+       force_detect = NULL;
 
        for (l = options; l; l = l->next) {
                src = l->data;
@@ -114,6 +122,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;
@@ -124,43 +135,64 @@ 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)
                return NULL;
 
-       /* Get the device model. */
+       /*
+        * Prepare a receive buffer for the identification response that
+        * is large enough to hold the longest known model name, and an
+        * optional serial number. Communicate the identification request.
+        */
        len = 0;
        for (i = 0; models[i].id; i++) {
-               if (strlen(models[i].id) > len)
+               if (len < strlen(models[i].id))
                        len = strlen(models[i].id);
        }
+       len += strlen(serno_prefix) + 12;
+       if (len > sizeof(reply) - 1)
+               len = sizeof(reply) - 1;
+       sr_dbg("Want max %zu bytes.", len);
 
-       /*
-        * Some models also include the serial number:
-        * RND 320-KD3005P V4.2 SN:59834414
-        */
-       len += 12;
-
-       memset(&reply, 0, sizeof(reply));
-       sr_dbg("Want max %d bytes.", len);
-       if ((korad_kaxxxxp_send_cmd(serial, "*IDN?") < 0))
+       ret = korad_kaxxxxp_send_cmd(serial, "*IDN?");
+       if (ret < 0)
                return NULL;
 
-       /* i is used here for debug purposes only. */
-       if ((i = korad_kaxxxxp_read_chars(serial, len, reply)) < 0)
+       ret = korad_kaxxxxp_read_chars(serial, len, reply);
+       if (ret < 0)
                return NULL;
-       sr_dbg("Received: %d, %s", i, reply);
-       model_id = -1;
+       sr_dbg("Received: %d, %s", ret, reply);
 
-       /* Truncate before serial number. */
-       char *sn = g_strrstr(reply, " SN:");
-       if (sn)
-               *sn = '\0';
+       /*
+        * Isolate the optional serial number at the response's end.
+        * Lookup the response's model ID in the list of known models.
+        */
+       serno = g_strrstr(reply, serno_prefix);
+       if (serno) {
+               *serno = '\0';
+               serno += strlen(serno_prefix);
+       }
 
+       model_id = -1;
        for (i = 0; models[i].id; i++) {
-               if (!g_strcmp0(models[i].id, reply))
+               if (g_strcmp0(models[i].id, reply) != 0)
+                       continue;
+               model_id = i;
+               break;
+       }
+       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);
@@ -173,6 +205,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup(models[model_id].vendor);
        sdi->model = g_strdup(models[model_id].name);
+       if (serno)
+               sdi->serial_num = g_strdup(serno);
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
        sdi->connection_id = g_strdup(conn);