X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fasix-sigma%2Fasix-sigma.c;h=52224271d32a689d6c1934d0eaa3cf827d711a9e;hb=refs%2Ftags%2Flibsigrok-0.2.1;hp=2ddbbea9bc684e272f7c5f5054eec17e25911694;hpb=3678cf73fea3c7903eb8887d8bb0dec61cb09e6e;p=libsigrok.git diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c index 2ddbbea9..52224271 100644 --- a/hardware/asix-sigma/asix-sigma.c +++ b/hardware/asix-sigma/asix-sigma.c @@ -383,20 +383,20 @@ static int bin2bitbang(const char *filename, static void clear_helper(void *priv) { struct dev_context *devc; - + devc = priv; ftdi_deinit(&devc->ftdic); } -static int clear_instances(void) +static int dev_clear(void) { return std_dev_clear(di, clear_helper); } static int init(struct sr_context *sr_ctx) { - return std_hw_init(sr_ctx, di, LOG_PREFIX); + return std_init(sr_ctx, di, LOG_PREFIX); } static GSList *scan(GSList *options) @@ -741,7 +741,7 @@ static int dev_close(struct sr_dev_inst *sdi) static int cleanup(void) { - return clear_instances(); + return dev_clear(); } static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) @@ -1398,7 +1398,7 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = { .cleanup = cleanup, .scan = scan, .dev_list = dev_list, - .dev_clear = clear_instances, + .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, .config_list = config_list,