#include <config.h>
#include "protocol.h"
-SR_PRIV struct sr_dev_driver chronovu_la_driver_info;
-static struct sr_dev_driver *di = &chronovu_la_driver_info;
-
static const uint32_t drvopts[] = {
SR_CONF_LOGIC_ANALYZER,
};
return std_dev_clear(di, clear_helper);
}
-static int add_device(int model, struct libusb_device_descriptor *des,
- const char *serial_num, const char *connection_id,
- libusb_device *usbdev, GSList **devices)
+static int add_device(struct sr_dev_driver *di, int model,
+ struct libusb_device_descriptor *des, const char *serial_num,
+ const char *connection_id, libusb_device *usbdev, GSList **devices)
{
int ret;
unsigned int i;
/* Register the device with libsigrok. */
sdi = g_malloc0(sizeof(struct sr_dev_inst));
- sdi->status = SR_ST_INITIALIZING;
+ sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup("ChronoVu");
sdi->model = g_strdup(devc->prof->modelname);
sdi->serial_num = g_strdup(serial_num);
libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), connection_id);
- if ((ret = add_device(model, &des, serial_num, connection_id,
+ if ((ret = add_device(di, model, &des, serial_num, connection_id,
devlist[i], &devices)) < 0) {
sr_dbg("Failed to add device: %d.", ret);
}
*data = g_variant_new_string(str);
break;
case SR_CONF_SAMPLERATE:
- if (!sdi || !(devc = sdi->priv))
+ if (!sdi)
return SR_ERR_BUG;
+ devc = sdi->priv;
*data = g_variant_new_uint64(devc->cur_samplerate);
break;
default:
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- if (!(devc = sdi->priv))
- return SR_ERR_BUG;
+ devc = sdi->priv;
switch (key) {
case SR_CONF_SAMPLERATE:
devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
break;
case SR_CONF_SAMPLERATE:
- if (!sdi || !sdi->priv || !(devc = sdi->priv))
+ if (!sdi)
return SR_ERR_BUG;
+ devc = sdi->priv;
cv_fill_samplerates_if_needed(sdi);
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
return SR_OK;
}
-SR_PRIV struct sr_dev_driver chronovu_la_driver_info = {
+static struct sr_dev_driver chronovu_la_driver_info = {
.name = "chronovu-la",
.longname = "ChronoVu LA8/LA16",
.api_version = 1,
.dev_acquisition_stop = dev_acquisition_stop,
.context = NULL,
};
+SR_REGISTER_DEV_DRIVER(chronovu_la_driver_info);