Add helper function for scan completion

[libsigrok.git] / src / hardware / pipistrello-ols / api.c

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index 86ad7f9f1817583df1fbc89f2640ce81fca841cd..91c7dc2f17a11c3a22b8e3e3ad258c69e2b11d2c 100644 (file)
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -75,17 +75,9 @@ static const uint64_t samplerates[] = {
        SR_HZ(1),
 };
 
-SR_PRIV struct sr_dev_driver p_ols_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;
-       struct drv_context *drvc;
        struct dev_context *devc;
        GSList *devices;
        int ret, i;
@@ -94,8 +86,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
        (void)options;
 
-       drvc = di->context;
-
        devices = NULL;
 
        /* Allocate memory for our private device context. */
@@ -184,10 +174,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                sr_dbg("Failed to set default samplerate (%"PRIu64").",
                                DEFAULT_SAMPLERATE);
 
-       drvc->instances = g_slist_append(drvc->instances, sdi);
        devices = g_slist_append(devices, sdi);
 
-       return devices;
+       return std_scan_complete(di, devices);
 
 err_close_ftdic:
        p_ols_close(devc);
@@ -200,11 +189,6 @@ err_free_ftdi_buf:
        return NULL;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)(di->context))->instances;
-}
-
 static void clear_helper(void *priv)
 {
        struct dev_context *devc;
@@ -716,10 +700,10 @@ SR_PRIV struct sr_dev_driver p_ols_driver_info = {
        .name = "p-ols",
        .longname = "Pipistrello OLS",
        .api_version = 1,
-       .init = init,
+       .init = std_init,
        .cleanup = std_cleanup,
        .scan = scan,
-       .dev_list = dev_list,
+       .dev_list = std_dev_list,
        .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,
@@ -730,3 +714,4 @@ SR_PRIV struct sr_dev_driver p_ols_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(p_ols_driver_info);