Minor cosmetics, cleanups.

[libsigrok.git] / src / hwdriver.c

diff --git a/src/hwdriver.c b/src/hwdriver.c
index b1e0c3e68730a10237545e0db042cd598eff27ad..d11bcccc44712c0b02bc820a7d4d7c1f11db0162 100644 (file)
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -31,7 +31,7 @@
 #define LOG_PREFIX "hwdriver"
 /** @endcond */
 
-extern SR_PRIV struct sr_dev_driver *drivers_list[];
+extern SR_PRIV struct sr_dev_driver **drivers_lists[];
 
 /**
  * @file
@@ -265,8 +265,21 @@ SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *value)
  */
 SR_API struct sr_dev_driver **sr_driver_list(void)
 {
+       static struct sr_dev_driver **combined_list = NULL;
+       struct sr_dev_driver ***lists, **drivers;
+       GArray *array;
 
-       return drivers_list;
+       if (combined_list)
+               return combined_list;
+
+       array = g_array_new(TRUE, FALSE, sizeof(struct sr_dev_driver *));
+       for (lists = drivers_lists; *lists; lists++)
+               for (drivers = *lists; *drivers; drivers++)
+                       g_array_append_val(array, *drivers);
+       combined_list = (struct sr_dev_driver **)array->data;
+       g_array_free(array, FALSE);
+
+       return combined_list;
 }
 
 /**
@@ -303,7 +316,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
        }
 
        sr_spew("Initializing driver '%s'.", driver->name);
-       if ((ret = driver->init(ctx)) < 0)
+       if ((ret = driver->init(driver, ctx)) < 0)
                sr_err("Failed to initialize the driver: %d.", ret);
 
        return ret;
@@ -397,7 +410,7 @@ SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
                        return NULL;
        }
 
-       l = driver->scan(options);
+       l = driver->scan(driver, options);
 
        sr_spew("Scan of '%s' found %d devices.", driver->name,
                g_slist_length(l));
@@ -415,7 +428,8 @@ SR_PRIV void sr_hw_cleanup_all(void)
        drivers = sr_driver_list();
        for (i = 0; drivers[i]; i++) {
                if (drivers[i]->cleanup)
-                       drivers[i]->cleanup();
+                       drivers[i]->cleanup(drivers[i]);
+               drivers[i]->priv = NULL;
        }
 }