fluke-dmm: use new serial API

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

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index 7dfb2c65dfe7dc2f5a6aca14ed9a3ab345f46740..0e2bc7d8a357b459342c3935d1eb790b14a326f0 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -51,14 +51,18 @@ extern const struct agdmm_recv agdmm_recvs_u123x[];
 extern const struct agdmm_job agdmm_jobs_u125x[];
 extern const struct agdmm_recv agdmm_recvs_u125x[];
 
+/* This works on all the Agilent U12xxA series, although the
+ * U127xA can apparently also run at 19200/8n1. */
+#define SERIALCOMM "9600/8n1"
+
 static const struct agdmm_profile supported_agdmm[] = {
-       { AGILENT_U1231A, "U1231A", 9600, agdmm_jobs_u123x, agdmm_recvs_u123x },
-       { AGILENT_U1232A, "U1232A", 9600, agdmm_jobs_u123x, agdmm_recvs_u123x },
-       { AGILENT_U1233A, "U1233A", 9600, agdmm_jobs_u123x, agdmm_recvs_u123x },
-       { AGILENT_U1251A, "U1251A", 9600, agdmm_jobs_u125x, agdmm_recvs_u125x },
-       { AGILENT_U1252A, "U1252A", 9600, agdmm_jobs_u125x, agdmm_recvs_u125x },
-       { AGILENT_U1253A, "U1253A", 9600, agdmm_jobs_u125x, agdmm_recvs_u125x },
-       { 0, NULL, 0, NULL, NULL }
+       { AGILENT_U1231A, "U1231A", agdmm_jobs_u123x, agdmm_recvs_u123x },
+       { AGILENT_U1232A, "U1232A", agdmm_jobs_u123x, agdmm_recvs_u123x },
+       { AGILENT_U1233A, "U1233A", agdmm_jobs_u123x, agdmm_recvs_u123x },
+       { AGILENT_U1251A, "U1251A", agdmm_jobs_u125x, agdmm_recvs_u125x },
+       { AGILENT_U1252A, "U1252A", agdmm_jobs_u125x, agdmm_recvs_u125x },
+       { AGILENT_U1253A, "U1253A", agdmm_jobs_u125x, agdmm_recvs_u125x },
+       { 0, NULL, NULL, NULL }
 };
 
 SR_PRIV struct sr_dev_driver agdmm_driver_info;
@@ -96,7 +100,7 @@ static int hw_init(void)
 
        if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
                sr_err("Driver context malloc failed.");
-               return SR_ERR;
+               return SR_ERR_MALLOC;
        }
 
        di->priv = drvc;
@@ -104,48 +108,6 @@ static int hw_init(void)
        return SR_OK;
 }
 
-/* TODO: Merge into serial_readline() from serial.c. */
-static int serial_readline2(int fd, char **buf, int *buflen, uint64_t timeout_ms)
-{
-       uint64_t start;
-       int maxlen, len;
-
-       timeout_ms *= 1000;
-       start = g_get_monotonic_time();
-
-       maxlen = *buflen;
-       *buflen = len = 0;
-       while(1) {
-               len = maxlen - *buflen - 1;
-               if (len < 1)
-                       break;
-               len = serial_read(fd, *buf + *buflen, len);
-               if (len > 0) {
-                       *buflen += len;
-                       *(*buf + *buflen) = '\0';
-                       if (*buflen > 0 && *(*buf + *buflen - 1) == '\n')
-                               /* End of line */
-                               break;
-               }
-               if (g_get_monotonic_time() - start > timeout_ms)
-                       /* Timeout */
-                       break;
-               g_usleep(2000);
-       }
-
-       /* Strip CRLF */
-       while (*buflen) {
-               if (*(*buf + *buflen - 1) == '\r' || *(*buf + *buflen - 1) == '\n')
-                       *(*buf + --*buflen) = '\0';
-               else
-                       break;
-       }
-       if (*buflen)
-               sr_dbg("Received '%s'.", *buf);
-
-       return SR_OK;
-}
-
 static GSList *hw_scan(GSList *options)
 {
        struct sr_dev_inst *sdi;
@@ -174,7 +136,7 @@ static GSList *hw_scan(GSList *options)
                        break;
                }
        }
-       if (!conn || !serialcomm)
+       if (!conn)
                return NULL;
 
        if ((fd = serial_open(conn, O_RDWR|O_NONBLOCK)) == -1) {
@@ -182,6 +144,8 @@ static GSList *hw_scan(GSList *options)
                return NULL;
        }
 
+       if (!serialcomm)
+               serialcomm = SERIALCOMM;
        if (serial_set_paramstr(fd, serialcomm) != SR_OK) {
                sr_err("Unable to set serial parameters: %s.",
                       strerror(errno));
@@ -196,8 +160,11 @@ static GSList *hw_scan(GSList *options)
        }
 
        len = 128;
-       buf = g_try_malloc(len);
-       serial_readline2(fd, &buf, &len, 150);
+       if (!(buf = g_try_malloc(len))) {
+               sr_err("Serial buffer malloc failed.");
+               return NULL;
+       }
+       serial_readline(fd, &buf, &len, 150);
        if (!len)
                return NULL;
 
@@ -211,7 +178,7 @@ static GSList *hw_scan(GSList *options)
                                        tokens[1], tokens[3])))
                                return NULL;
                        if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-                               sr_dbg("failed to malloc devc");
+                               sr_err("Device context malloc failed.");
                                return NULL;
                        }
                        devc->profile = &supported_agdmm[i];
@@ -259,8 +226,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
                       devc->serial->port);
                return SR_ERR;
        }
-       serial_set_params(devc->serial->fd, devc->profile->serial_speed, 8,
-                       SERIAL_PARITY_NONE, 1, 0);
+       serial_set_paramstr(devc->serial->fd, SERIALCOMM);
        sdi->status = SR_ST_ACTIVE;
 
        return SR_OK;
@@ -394,8 +360,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-               void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        struct sr_datafeed_packet packet;
        struct dev_context *devc;