goto err_out_serial;
}
- devc = g_malloc0(sizeof(struct dev_context));
- sdi = g_malloc0(sizeof(struct sr_dev_inst));
-
+ devc = g_malloc0(sizeof(*devc));
sr_sw_limits_init(&devc->limits);
devc->profile = p;
+ sdi = g_malloc0(sizeof(*sdi));
+ sdi->priv = devc;
sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup("RDTech");
sdi->model = g_strdup(p->model_name);
sdi->version = NULL;
sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial;
- sdi->priv = devc;
- for (ch_idx = 0; (name = p->channels[ch_idx].name); ch_idx++)
+ for (ch_idx = 0; ch_idx < p->channel_count; ch_idx++) {
+ name = p->channels[ch_idx].name;
sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, name);
+ }
devices = g_slist_append(NULL, sdi);
serial_close(serial);
{
const char *conn;
const char *serialcomm;
- GSList *l;
- struct sr_config *src;
conn = NULL;
serialcomm = RDTECH_UM_SERIALCOMM;
- for (l = options; l; l = l->next) {
- src = l->data;
- switch (src->key) {
- case SR_CONF_CONN:
- conn = g_variant_get_string(src->data, NULL);
- break;
- case SR_CONF_SERIALCOMM:
- serialcomm = g_variant_get_string(src->data, NULL);
- break;
- }
- }
+ (void)sr_serial_extract_options(options, &conn, &serialcomm);
if (!conn)
return NULL;
serial_source_add(sdi->session, serial, G_IO_IN, 50,
rdtech_um_receive_data, (void *)sdi);
- return rdtech_um_poll(sdi);
+ return rdtech_um_poll(sdi, TRUE);
}
static struct sr_dev_driver rdtech_um_driver_info = {