X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fchronovu-la%2Fapi.c;h=379b0a4a7100ee7fdd142377433287403cbf6179;hb=329733d92c5004f0fe308eff26b9537fded2cdf3;hp=14f1066eaa8809a565f2744d7aa9780bcf31d88a;hpb=5e23fcab889c62864b92aa3ad6902ce3e9f5be49;p=libsigrok.git diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c index 14f1066e..379b0a4a 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; @@ -63,12 +63,12 @@ static void clear_helper(void *priv) g_free(devc->final_buf); } -static int dev_clear(void) +static int dev_clear(const struct sr_dev_driver *di) { return std_dev_clear(di, clear_helper); } -static int init(struct sr_context *sr_ctx) +static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) { return std_init(sr_ctx, di, LOG_PREFIX); } @@ -142,13 +142,14 @@ err_free_devc: return ret; } -static GSList *scan(GSList *options) +static GSList *scan(struct sr_dev_driver *di, GSList *options) { int ret; unsigned int i; GSList *devices; struct ftdi_context *ftdic; + (void)di; (void)options; devices = NULL; @@ -188,7 +189,7 @@ static GSList *scan(GSList *options) return devices; } -static GSList *dev_list(void) +static GSList *dev_list(const struct sr_dev_driver *di) { return ((struct drv_context *)(di->priv))->instances; } @@ -267,9 +268,9 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(void) +static int cleanup(const struct sr_dev_driver *di) { - return dev_clear(); + return dev_clear(di); } static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,