drivers: use new sr_config struct

[libsigrok.git] / hardware / fluke-dmm / api.c

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index d6391fa08d71f4c14949ab20594d4818ead7c123..44c4651e1bca095dfaa507215b1772ffe021facf 100644 (file)
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -41,17 +41,23 @@ static const int hwcaps[] = {
        0,
 };
 
-static const char *probe_names[] = {
-       "Probe",
-       NULL,
-};
-
 SR_PRIV struct sr_dev_driver flukedmm_driver_info;
 static struct sr_dev_driver *di = &flukedmm_driver_info;
 
+static char *scan_conn[] = {
+       /* 287/289 */
+       "115200/8n1",
+       /* 187/189 */
+       "9600/8n1",
+       /* Scopemeter 190 series */
+       "1200/8n1",
+       NULL
+};
+
 static const struct flukedmm_profile supported_flukedmm[] = {
-       { FLUKE_187, "187", 100 },
-       { FLUKE_287, "287", 100 },
+       { FLUKE_187, "187", 100, 1000 },
+       { FLUKE_287, "287", 100, 1000 },
+       { FLUKE_190, "199B", 1000, 3500 },
 };
 
 
@@ -81,7 +87,7 @@ static int clear_instances(void)
        return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
        struct drv_context *drvc;
 
@@ -90,6 +96,7 @@ static int hw_init(void)
                return SR_ERR_MALLOC;
        }
 
+       drvc->sr_ctx = sr_ctx;
        di->priv = drvc;
 
        return SR_OK;
@@ -138,10 +145,15 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 
                /* If CMD_ACK was OK, ID string follows. */
                len = 128;
-               serial_readline(serial, &b, &len, 150);
+               serial_readline(serial, &b, &len, 850);
                if (len < 10)
                        continue;
-               tokens = g_strsplit(buf, ",", 3);
+               if (strcspn(buf, ",") < 15)
+                       /* Looks like it's comma-separated. */
+                       tokens = g_strsplit(buf, ",", 3);
+               else
+                       /* Fluke 199B, at least, uses semicolon. */
+                       tokens = g_strsplit(buf, ";", 3);
                if (!strncmp("FLUKE", tokens[0], 5)
                                && tokens[1] && tokens[2]) {
                        for (i = 0; supported_flukedmm[i].model; i++) {
@@ -169,6 +181,9 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
                        }
                }
                g_strfreev(tokens);
+               if (devices)
+                       /* Found one. */
+                       break;
        }
        serial_close(serial);
        if (!devices)
@@ -179,19 +194,20 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 
 static GSList *hw_scan(GSList *options)
 {
-       struct sr_hwopt *opt;
+       struct sr_config *src;
        GSList *l, *devices;
+       int i;
        const char *conn, *serialcomm;
 
        conn = serialcomm = NULL;
        for (l = options; l; l = l->next) {
-               opt = l->data;
-               switch (opt->hwopt) {
+               src = l->data;
+               switch (src->key) {
                case SR_HWOPT_CONN:
-                       conn = opt->value;
+                       conn = src->value;
                        break;
                case SR_HWOPT_SERIALCOMM:
-                       serialcomm = opt->value;
+                       serialcomm = src->value;
                        break;
                }
        }
@@ -202,11 +218,13 @@ static GSList *hw_scan(GSList *options)
                /* Use the provided comm specs. */
                devices = fluke_scan(conn, serialcomm);
        } else {
-               /* Try 115200, as used on 287/289. */
-               devices = fluke_scan(conn, "115200/8n1");
-               if (!devices)
-                       /* Fall back to 9600 for 187/189. */
-                       devices = fluke_scan(conn, "9600/8n1");
+               for (i = 0; scan_conn[i]; i++) {
+                       if ((devices = fluke_scan(conn, scan_conn[i])))
+                               break;
+                       /* The Scopemeter 199B, at least, requires this
+                        * after all the 115k/9.6k confusion. */
+                       g_usleep(5000);
+               }
        }
 
        return devices;
@@ -266,7 +284,6 @@ static int hw_cleanup(void)
 static int hw_info_get(int info_id, const void **data,
        const struct sr_dev_inst *sdi)
 {
-
        (void)sdi;
 
        switch (info_id) {
@@ -276,12 +293,6 @@ static int hw_info_get(int info_id, const void **data,
        case SR_DI_HWCAPS:
                *data = hwcaps;
                break;
-       case SR_DI_NUM_PROBES:
-               *data = GINT_TO_POINTER(1);
-               break;
-       case SR_DI_PROBE_NAMES:
-               *data = probe_names;
-               break;
        default:
                return SR_ERR_ARG;
        }
@@ -332,7 +343,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_header header;
-       struct sr_datafeed_meta_analog meta;
        struct dev_context *devc;
 
        if (!(devc = sdi->priv)) {
@@ -352,13 +362,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        gettimeofday(&header.starttime, NULL);
        sr_session_send(devc->cb_data, &packet);
 
-       /* Send metadata about the SR_DF_ANALOG packets to come. */
-       sr_dbg("Sending SR_DF_META_ANALOG.");
-       packet.type = SR_DF_META_ANALOG;
-       packet.payload = &meta;
-       meta.num_probes = 1;
-       sr_session_send(devc->cb_data, &packet);
-
        /* Poll every 100ms, or whenever some data comes in. */
        sr_source_add(devc->serial->fd, G_IO_IN, 50, fluke_receive_data, (void *)sdi);