Construct driver array at runtime, from an array of per-file arrays.

[libsigrok.git] / src / hwdriver.c

diff --git a/src/hwdriver.c b/src/hwdriver.c
index b1e0c3e68730a10237545e0db042cd598eff27ad..21a80224dd60216a809bda635a0eba6028211db9 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,20 @@ 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;
+
+       if (!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 drivers_list;
+       return combined_list;
 }
 
 /**