0,
};
-static const char *probe_names[] = {
- "P1",
- NULL,
-};
-
SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
static struct sr_dev_driver *di = &tondaj_sl_814_driver_info;
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 drv_context *drvc;
struct dev_context *devc;
struct sr_dev_inst *sdi;
- struct sr_hwopt *opt;
+ struct sr_config *src;
struct sr_probe *probe;
GSList *devices, *l;
const char *conn, *serialcomm;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
- if (!(opt = l->data)) {
+ if (!(src = l->data)) {
sr_err("Invalid option data, skipping.");
continue;
}
- switch (opt->hwopt) {
+ 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;
default:
- sr_err("Unknown option %d, skipping.", opt->hwopt);
+ sr_err("Unknown option %d, skipping.", src->key);
break;
}
}
- if (!conn) {
- sr_dbg("Couldn't determine connection options.");
+ if (!conn)
return NULL;
- }
if (!serialcomm)
serialcomm = SERIALCOMM;
if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm)))
return NULL;
- if (serial_open(devc->serial, O_RDWR|O_NONBLOCK) != SR_OK)
+ if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
return NULL;
sdi->priv = devc;
sdi->driver = di;
- probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, probe_names[0]);
+ probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1");
if (!probe) {
sr_err("Failed to create probe.");
return NULL;
devc = sdi->priv;
- if (serial_open(devc->serial, O_RDWR|O_NONBLOCK) != SR_OK)
+ if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
return SR_ERR;
sdi->status = SR_ST_ACTIVE;
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:
- sr_err("Unknown info_id: %d.", info_id);
return SR_ERR_ARG;
}
{
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
- struct sr_datafeed_meta_analog meta;
struct dev_context *devc;
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 500ms, or whenever some data comes in. */
sr_source_add(devc->serial->fd, G_IO_IN, 500,
tondaj_sl_814_receive_data, (void *)sdi);