SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
- SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,
SR_CONF_NUM_TIMEBASE | SR_CONF_GET,
SR_CONF_SAMPLERATE | SR_CONF_GET,
return NULL;
}
- sdi = sr_dev_inst_new();
+ sdi = g_malloc0(sizeof(struct sr_dev_inst));
sdi->status = SR_ST_ACTIVE;
sdi->vendor = g_strdup(model->series->vendor->name);
sdi->model = g_strdup(model->name);
sdi->driver = di;
sdi->inst_type = SR_INST_SCPI;
sdi->serial_num = g_strdup(hw_info->serial_number);
-
- if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
- return NULL;
-
+ devc = g_malloc0(sizeof(struct dev_context));
devc->limit_frames = 0;
devc->model = model;
devc->format = model->series->format;
return NULL;
ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, channel_name);
g_free(channel_name);
- if (!ch)
- return NULL;
sdi->channels = g_slist_append(sdi->channels, ch);
devc->digital_group->channels = g_slist_append(
devc->digital_group->channels, ch);
*data = g_variant_new_string(tmp_str);
break;
case SR_CONF_TRIGGER_SLOPE:
- if (!strcmp(devc->trigger_slope, "POS"))
+ if (!strncmp(devc->trigger_slope, "POS", 3))
tmp_str = "r";
- else if (!strcmp(devc->trigger_slope, "NEG"))
+ else if (!strncmp(devc->trigger_slope, "NEG", 3))
tmp_str = "f";
else
return SR_ERR_NA;