X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-bm86x%2Fapi.c;h=a9ac15b3b37ad9754a750459161468e003fb96c1;hb=43376f3324cddd257a0260b06d9db8180c35fdf3;hp=345532e734b6ef981a3fc8e9646e8b6ccd6b3045;hpb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;p=libsigrok.git diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c index 345532e7..a9ac15b3 100644 --- a/src/hardware/brymen-bm86x/api.c +++ b/src/hardware/brymen-bm86x/api.c @@ -33,8 +33,6 @@ static const uint32_t devopts[] = { SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, }; -SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info; - static GSList *scan(struct sr_dev_driver *di, GSList *options) { GSList *usb_devices, *devices, *l; @@ -46,7 +44,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) const char *conn; drvc = di->context; - drvc->instances = NULL; conn = BRYMEN_BC86X; for (l = options; l; l = l->next) { @@ -73,7 +70,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->model = g_strdup("BM869"); devc = g_malloc0(sizeof(struct dev_context)); sdi->priv = devc; - sdi->driver = di; sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P2"); @@ -82,11 +78,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sr_sw_limits_init(&devc->sw_limits); - drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); } - return devices; + return std_scan_complete(di, devices); } static int dev_open(struct sr_dev_inst *sdi) @@ -184,10 +179,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - if (!(devc = sdi->priv)) { - sr_err("sdi->priv was NULL."); - return SR_ERR_BUG; - } + devc = sdi->priv; return sr_sw_limits_config_set(&devc->sw_limits, key, data); } @@ -245,7 +237,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) return SR_OK; } -SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info = { +static struct sr_dev_driver brymen_bm86x_driver_info = { .name = "brymen-bm86x", .longname = "Brymen BM86X", .api_version = 1, @@ -263,3 +255,4 @@ SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(brymen_bm86x_driver_info);