X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fapi.c;h=6683e28325e6c9bad95392e3cd09c19a257b3b67;hb=e32862ebccac5ae063abc68d9ce13a66ad46bb97;hp=5a6ad00748cc9abcd3fa6a7620636a2018681b0a;hpb=c01bf34ca264b268fee2e71ab918c71d28dc3018;p=libsigrok.git diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c index 5a6ad007..6683e283 100644 --- a/src/hardware/arachnid-labs-re-load-pro/api.c +++ b/src/hardware/arachnid-labs-re-load-pro/api.c @@ -37,7 +37,7 @@ static const uint32_t drvopts[] = { }; static const uint32_t devopts[] = { - SR_CONF_CONTINUOUS | SR_CONF_SET, + SR_CONF_CONTINUOUS, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, }; @@ -56,13 +56,6 @@ static const uint32_t devopts_cg[] = { SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE | SR_CONF_GET, }; -SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info; - -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(sr_ctx, di, LOG_PREFIX); -} - static GSList *scan(struct sr_dev_driver *di, GSList *options) { struct sr_dev_inst *sdi; @@ -134,11 +127,11 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) } sdi = g_malloc0(sizeof(struct sr_dev_inst)); - sdi->status = SR_ST_ACTIVE; + sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup("Arachnid Labs"); sdi->model = g_strdup("Re:load Pro"); sdi->version = g_strdup(buf + 8); - sdi->driver = &arachnid_labs_re_load_pro_driver_info; + sdi->driver = di; sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; @@ -369,7 +362,7 @@ SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = { .name = "arachnid-labs-re-load-pro", .longname = "Arachnid Labs Re:load Pro", .api_version = 1, - .init = init, + .init = std_init, .cleanup = std_cleanup, .scan = scan, .dev_list = std_dev_list,