*/
#include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "config.h"
-#include "agilent-dmm.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
#include <errno.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "agilent-dmm.h"
static const int hwopts[] = {
SR_HWOPT_CONN,
NULL,
};
-extern const struct agdmm_job u123x_jobs[];
-extern const struct agdmm_recv u123x_recvs[];
+extern const struct agdmm_job agdmm_jobs_u123x[];
+extern const struct agdmm_recv agdmm_recvs_u123x[];
+extern const struct agdmm_job agdmm_jobs_u125x[];
+extern const struct agdmm_recv agdmm_recvs_u125x[];
static const struct agdmm_profile supported_agdmm[] = {
- { AGILENT_U1232A, "U1232A", 9600, u123x_jobs, u123x_recvs },
+ { 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 }
};
struct drv_context *drvc;
if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
- sr_err("agilent-dmm: driver context malloc failed.");
- return SR_ERR;
+ sr_err("Driver context malloc failed.");
+ return SR_ERR_MALLOC;
}
di->priv = drvc;
return SR_OK;
}
-static int serial_readline(int fd, char **buf, int *buflen, uint64_t timeout_ms)
+/* 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;
break;
}
if (*buflen)
- sr_dbg("agilent-dmm: received '%s'", *buf);
+ sr_dbg("Received '%s'.", *buf);
return SR_OK;
}
break;
}
}
- if (!conn) {
- sr_dbg("no serial port provided");
- return NULL;
- }
- if (!serialcomm) {
- sr_dbg("no serial communication parameters provided");
+ if (!conn || !serialcomm)
return NULL;
- }
if ((fd = serial_open(conn, O_RDWR|O_NONBLOCK)) == -1) {
- sr_err("agilent-dmm: unable to open %s: %s", conn, strerror(errno));
+ sr_err("Unable to open %s: %s.", conn, strerror(errno));
return NULL;
}
if (serial_set_paramstr(fd, serialcomm) != SR_OK) {
- sr_err("agilent-dmm: unable to set serial parameters: %s",
- strerror(errno));
+ sr_err("Unable to set serial parameters: %s.",
+ strerror(errno));
return NULL;
}
serial_flush(fd);
if (serial_write(fd, "*IDN?\r\n", 7) == -1) {
- sr_err("agilent-dmm: unable to send identification string: %s",
- strerror(errno));
+ sr_err("Unable to send identification string: %s.",
+ strerror(errno));
return NULL;
}
len = 128;
- buf = g_try_malloc(len);
- serial_readline(fd, &buf, &len, 150);
+ if (!(buf = g_try_malloc(len))) {
+ sr_err("Serial buffer malloc failed.");
+ return NULL;
+ }
+ serial_readline2(fd, &buf, &len, 150);
if (!len)
return NULL;
tokens[1], tokens[3])))
return NULL;
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
- sr_dbg("agilent-dmm: failed to malloc devc");
+ sr_err("Device context malloc failed.");
return NULL;
}
devc->profile = &supported_agdmm[i];
struct dev_context *devc;
if (!(devc = sdi->priv)) {
- sr_err("agilent-dmm: sdi->priv was NULL.");
+ sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
devc->serial->fd = serial_open(devc->serial->port, O_RDWR | O_NONBLOCK);
if (devc->serial->fd == -1) {
- sr_err("agilent-dmm: Couldn't open serial port '%s'.",
+ sr_err("Couldn't open serial port '%s'.",
devc->serial->port);
return SR_ERR;
}
struct dev_context *devc;
if (!(devc = sdi->priv)) {
- sr_err("agilent-dmm: sdi->priv was NULL.");
+ sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
return SR_ERR;
if (!(devc = sdi->priv)) {
- sr_err("agilent-dmm: sdi->priv was NULL.");
+ sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
case SR_HWCAP_LIMIT_MSEC:
/* TODO: not yet implemented */
if (*(const uint64_t *)value == 0) {
- sr_err("agilent-dmm: LIMIT_MSEC can't be 0.");
+ sr_err("LIMIT_MSEC can't be 0.");
return SR_ERR;
}
devc->limit_msec = *(const uint64_t *)value;
- sr_dbg("agilent-dmm: Setting time limit to %" PRIu64 "ms.",
+ sr_dbg("Setting time limit to %" PRIu64 "ms.",
devc->limit_msec);
break;
case SR_HWCAP_LIMIT_SAMPLES:
devc->limit_samples = *(const uint64_t *)value;
- sr_dbg("agilent-dmm: Setting sample limit to %" PRIu64 ".",
+ sr_dbg("Setting sample limit to %" PRIu64 ".",
devc->limit_samples);
break;
default:
- sr_err("agilent-dmm: Unknown capability: %d.", hwcap);
+ sr_err("Unknown capability: %d.", hwcap);
return SR_ERR;
break;
}
struct dev_context *devc;
if (!(devc = sdi->priv)) {
- sr_err("agilent-dmm: sdi->priv was NULL.");
+ sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
- sr_dbg("agilent-dmm: Starting acquisition.");
+ sr_dbg("Starting acquisition.");
devc->cb_data = cb_data;
/* Send header packet to the session bus. */
- sr_dbg("agilent-dmm: Sending SR_DF_HEADER.");
+ sr_dbg("Sending SR_DF_HEADER.");
packet.type = SR_DF_HEADER;
packet.payload = (uint8_t *)&header;
header.feed_version = 1;
sr_session_send(devc->cb_data, &packet);
/* Send metadata about the SR_DF_ANALOG packets to come. */
- sr_dbg("agilent-dmm: Sending SR_DF_META_ANALOG.");
+ sr_dbg("Sending SR_DF_META_ANALOG.");
packet.type = SR_DF_META_ANALOG;
packet.payload = &meta;
meta.num_probes = 1;
return SR_ERR;
if (!(devc = sdi->priv)) {
- sr_err("agilent-dmm: sdi->priv was NULL.");
+ sr_err("sdi->priv was NULL.");
return SR_ERR_BUG;
}
- sr_dbg("agilent-dmm: Stopping acquisition.");
+ sr_dbg("Stopping acquisition.");
sr_source_remove(devc->serial->fd);
hw_dev_close((struct sr_dev_inst *)sdi);
/* Send end packet to the session bus. */
- sr_dbg("agilent-dmm: Sending SR_DF_END.");
+ sr_dbg("Sending SR_DF_END.");
packet.type = SR_DF_END;
sr_session_send(cb_data, &packet);
projects / libsigrok.git / blobdiff