SR_PRIV struct sr_dev_driver chronovu_la_driver_info;
static struct sr_dev_driver *di = &chronovu_la_driver_info;
-static const int32_t hwcaps[] = {
+static const uint32_t devopts[] = {
SR_CONF_LOGIC_ANALYZER,
- SR_CONF_SAMPLERATE,
- SR_CONF_TRIGGER_MATCH,
- SR_CONF_LIMIT_MSEC, /* TODO: Not yet implemented. */
- SR_CONF_LIMIT_SAMPLES, /* TODO: Not yet implemented. */
+ SR_CONF_LIMIT_MSEC | SR_CONF_SET,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
};
static const int32_t trigger_matches[] = {
devc->cur_samplerate = devc->prof->max_samplerate;
/* Register the device with libsigrok. */
- sdi = sr_dev_inst_new(0, SR_ST_INITIALIZING,
- "ChronoVu", devc->prof->modelname, NULL);
- if (!sdi) {
- sr_err("Failed to create device instance.");
- ret = SR_ERR;
- goto err_free_final_buf;
- }
+ sdi = sr_dev_inst_new();
+ sdi->status = SR_ST_INITIALIZING;
+ sdi->vendor = g_strdup("ChronoVu");
+ sdi->model = g_strdup(devc->prof->modelname);
sdi->driver = di;
sdi->priv = devc;
*devices = g_slist_append(*devices, sdi);
drvc->instances = g_slist_append(drvc->instances, sdi);
- return SR_OK;
+ if (ret == SR_OK)
+ return SR_OK;
err_free_dev_inst:
sr_dev_inst_free(sdi);
-err_free_final_buf:
g_free(devc->final_buf);
err_free_devc:
g_free(devc);
struct dev_context *devc;
int ret;
- ret = SR_ERR;
-
if (!(devc = sdi->priv))
return SR_ERR_BUG;
sdi->status = SR_ST_ACTIVE;
- return SR_OK;
+ if (ret == SR_OK)
+ return SR_OK;
err_ftdi_free:
ftdi_free(devc->ftdic); /* Close device (if open), free FTDI context. */
return dev_clear();
}
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
struct dev_context *devc;
(void)cg;
- switch (id) {
+ switch (key) {
case SR_CONF_SAMPLERATE:
if (!sdi || !(devc = sdi->priv))
return SR_ERR_BUG;
return SR_OK;
}
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
struct dev_context *devc;
if (!(devc = sdi->priv))
return SR_ERR_BUG;
- switch (id) {
+ switch (key) {
case SR_CONF_SAMPLERATE:
if (cv_set_samplerate(sdi, g_variant_get_uint64(data)) < 0)
return SR_ERR;
return SR_OK;
}
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
GVariant *gvar, *grange[2];
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
break;
case SR_CONF_SAMPLERATE:
if (!sdi || !sdi->priv || !(devc = sdi->priv))