X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=f1da9b507668a7bdad5c8eaa63ef58c9ef389b60;hp=b4ef69ddf3c1372f84fe809295e2decb4bccccff;hb=4f840ce965b1c30c5ab75afecc56193cbaf5c1b3;hpb=9e60a31fb954493754770fe2192db74b947c6867 diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c index b4ef69dd..f1da9b50 100644 --- a/src/hardware/baylibre-acme/api.c +++ b/src/hardware/baylibre-acme/api.c @@ -20,7 +20,6 @@ #include "protocol.h" SR_PRIV struct sr_dev_driver baylibre_acme_driver_info; -static struct sr_dev_driver *di = &baylibre_acme_driver_info; static const uint32_t devopts[] = { SR_CONF_CONTINUOUS | SR_CONF_SET, @@ -42,12 +41,12 @@ static const uint64_t samplerates[] = { SR_HZ(1), }; -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) { struct drv_context *drvc; struct dev_context *devc; @@ -131,12 +130,12 @@ err_out: return NULL; } -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_clear(void) +static int dev_clear(const struct sr_dev_driver *di) { return std_dev_clear(di, NULL); } @@ -161,9 +160,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) { - dev_clear(); + dev_clear(di); return SR_OK; }