X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fchronovu-la%2Fapi.c;h=c4cc2ab097e4a33b6d5ac110c7f0e3694911dc7c;hb=c1aae90038456a61d0f9313d34e6107c3440d3e7;hp=7d4aae042361fbb1c1a57e0633a7a8049f03fc69;hpb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;p=libsigrok.git diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c index 7d4aae04..c4cc2ab0 100644 --- a/src/hardware/chronovu-la/api.c +++ b/src/hardware/chronovu-la/api.c @@ -39,7 +39,7 @@ static const int32_t trigger_matches[] = { }; /* The ChronoVu LA8/LA16 can have multiple VID/PID pairs. */ -static struct { +static const struct { uint16_t vid; uint16_t pid; int model; @@ -83,7 +83,7 @@ static int add_device(int idx, int model, GSList **devices) ret = SR_OK; - drvc = di->priv; + drvc = di->context; /* Allocate memory for our private device context. */ devc = g_malloc0(sizeof(struct dev_context)); @@ -128,7 +128,7 @@ static int add_device(int idx, int model, GSList **devices) for (i = 0; i < devc->prof->num_channels; i++) sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, - cv_channel_names[i]); + cv_channel_names[i]); *devices = g_slist_append(*devices, sdi); drvc->instances = g_slist_append(drvc->instances, sdi); @@ -191,7 +191,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) static GSList *dev_list(const struct sr_dev_driver *di) { - return ((struct drv_context *)(di->priv))->instances; + return ((struct drv_context *)(di->context))->instances; } static int dev_open(struct sr_dev_inst *sdi) @@ -542,5 +542,5 @@ SR_PRIV struct sr_dev_driver chronovu_la_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };