X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-bm86x%2Fapi.c;h=79e658f534a23841988e19a82c5c0e07beb059d5;hb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;hp=87d2e5af0ce597102d975e5abf20c43d40672af8;hpb=9e60a31fb954493754770fe2192db74b947c6867;p=libsigrok.git diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c index 87d2e5af..79e658f5 100644 --- a/src/hardware/brymen-bm86x/api.c +++ b/src/hardware/brymen-bm86x/api.c @@ -33,14 +33,13 @@ static const uint32_t devopts[] = { }; SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info; -static struct sr_dev_driver *di = &brymen_bm86x_driver_info; -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); } -static GSList *scan(GSList *options) +static GSList *scan(struct sr_dev_driver *di, GSList *options) { GSList *usb_devices, *devices, *l; struct drv_context *drvc; @@ -92,13 +91,14 @@ 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; } static int dev_open(struct sr_dev_inst *sdi) { + struct sr_dev_driver *di = sdi->driver; struct drv_context *drvc = di->priv; struct sr_usb_dev_inst *usb; struct dev_context *devc; @@ -166,7 +166,7 @@ static int dev_close(struct sr_dev_inst *sdi) return ret; } -static int cleanup(void) +static int cleanup(const struct sr_dev_driver *di) { return std_dev_clear(di, NULL); }