0,
};
-static const char *probe_names[] = {
- "Probe",
- NULL,
-};
-
extern const struct agdmm_job agdmm_jobs_u123x[];
extern const struct agdmm_recv agdmm_recvs_u123x[];
extern const struct agdmm_job agdmm_jobs_u125x[];
return SR_OK;
}
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
{
struct drv_context *drvc;
return SR_ERR_MALLOC;
}
+ drvc->sr_ctx = sr_ctx;
di->priv = drvc;
return SR_OK;
struct sr_dev_inst *sdi;
struct drv_context *drvc;
struct dev_context *devc;
- struct sr_hwopt *opt;
+ struct sr_config *src;
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;
devices = NULL;
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;
}
}
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 (!serialcomm)
- serialcomm = SERIALCOMM;
- 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;
sr_err("Serial buffer malloc failed.");
return NULL;
}
- serial_readline(fd, &buf, &len, 150);
+ serial_readline(serial, &buf, &len, 150);
if (!len)
return NULL;
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_paramstr(devc->serial->fd, SERIALCOMM);
+
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;
}
static int hw_info_get(int info_id, const void **data,
const struct sr_dev_inst *sdi)
{
-
(void)sdi;
switch (info_id) {
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;
}
{
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
- struct sr_datafeed_meta_analog meta;
struct dev_context *devc;
if (!(devc = sdi->priv)) {
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, 100, agdmm_receive_data, (void *)sdi);