*/
#include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.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,
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;
return SR_OK;
}
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
{
struct drv_context *drvc;
if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
sr_err("Driver context malloc failed.");
- return SR_ERR;
+ return SR_ERR_MALLOC;
}
+ drvc->sr_ctx = sr_ctx;
di->priv = drvc;
return SR_OK;
}
-static int serial_readline(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;
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;
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, SERIAL_RDWR | SERIAL_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;
}
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_readline(serial, &buf, &len, 150);
if (!len)
return NULL;
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];
- devc->serial = sr_serial_dev_inst_new(conn, -1);
+ devc->serial = serial;
devc->cur_mq = -1;
sdi->priv = devc;
sdi->driver = di;
g_strfreev(tokens);
g_free(buf);
- serial_close(fd);
+ serial_close(serial);
+ if (!devices)
+ sr_serial_dev_inst_free(serial);
return devices;
}
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, SERIAL_RDWR | SERIAL_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;
}
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;
}
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;
projects / libsigrok.git / blobdiff