X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fagilent-dmm%2Fapi.c;h=c7783bca399fb7387f3f825972b3eb178c21c13b;hb=61a429c963fb21c3d8cb8e9166d621526724b714;hp=60f271b24721f464fe4281688ac27fd72887bf0b;hpb=886a52b6fbffb0fd06849c928cf9fd31a0d4657b;p=libsigrok.git diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c index 60f271b2..c7783bca 100644 --- 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; @@ -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; @@ -153,8 +115,9 @@ static GSList *hw_scan(GSList *options) struct dev_context *devc; struct sr_hwopt *opt; struct sr_probe *probe; + struct sr_serial_dev_inst *serial; GSList *l, *devices; - int len, fd, i; + int len, i; const char *conn, *serialcomm; char *buf, **tokens; @@ -174,22 +137,19 @@ static GSList *hw_scan(GSList *options) break; } } - if (!conn || !serialcomm) + if (!conn) return NULL; + if (!serialcomm) + serialcomm = SERIALCOMM; - if ((fd = serial_open(conn, O_RDWR|O_NONBLOCK)) == -1) { - sr_err("Unable to open %s: %s.", conn, strerror(errno)); + if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) return NULL; - } - if (serial_set_paramstr(fd, serialcomm) != SR_OK) { - sr_err("Unable to set serial parameters: %s.", - strerror(errno)); + if (serial_open(serial, O_RDWR|O_NONBLOCK) != SR_OK) return NULL; - } - serial_flush(fd); - if (serial_write(fd, "*IDN?\r\n", 7) == -1) { + serial_flush(serial); + if (serial_write(serial, "*IDN?\r\n", 7) == -1) { sr_err("Unable to send identification string: %s.", strerror(errno)); return NULL; @@ -200,7 +160,7 @@ static GSList *hw_scan(GSList *options) sr_err("Serial buffer malloc failed."); return NULL; } - serial_readline2(fd, &buf, &len, 150); + serial_readline(serial, &buf, &len, 150); if (!len) return NULL; @@ -218,7 +178,7 @@ static GSList *hw_scan(GSList *options) return NULL; } devc->profile = &supported_agdmm[i]; - devc->serial = sr_serial_dev_inst_new(conn, -1); + devc->serial = serial; devc->cur_mq = -1; sdi->priv = devc; sdi->driver = di; @@ -233,7 +193,9 @@ static GSList *hw_scan(GSList *options) g_strfreev(tokens); g_free(buf); - serial_close(fd); + serial_close(serial); + if (!devices) + sr_serial_dev_inst_free(serial); return devices; } @@ -256,14 +218,9 @@ static int hw_dev_open(struct sr_dev_inst *sdi) return SR_ERR_BUG; } - devc->serial->fd = serial_open(devc->serial->port, O_RDWR | O_NONBLOCK); - if (devc->serial->fd == -1) { - sr_err("Couldn't open serial port '%s'.", - devc->serial->port); + if (serial_open(devc->serial, O_RDWR|O_NONBLOCK) != SR_OK) return SR_ERR; - } - serial_set_params(devc->serial->fd, devc->profile->serial_speed, 8, - SERIAL_PARITY_NONE, 1, 0); + sdi->status = SR_ST_ACTIVE; return SR_OK; @@ -279,8 +236,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi) } if (devc->serial && devc->serial->fd != -1) { - serial_close(devc->serial->fd); - devc->serial->fd = -1; + serial_close(devc->serial); sdi->status = SR_ST_INACTIVE; } @@ -397,8 +353,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;