sr_driver_list() now takes a context pointer.

[libsigrok.git] / src / backend.c

diff --git a/src/backend.c b/src/backend.c
index 47f352bf720d897a8feb22e9a9d112cde8d6c113..b05e8d97a5bf7e817a33fbf741be642127d3b7c7 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -122,18 +122,24 @@
 /**
  * Sanity-check all libsigrok drivers.
  *
+ * @param[in] ctx Pointer to a libsigrok context struct. Must not be NULL.
+ *
  * @retval SR_OK All drivers are OK
  * @retval SR_ERR One or more drivers have issues.
+ * @retval SR_ERR_ARG Invalid argument.
  */
-static int sanity_check_all_drivers(void)
+static int sanity_check_all_drivers(const struct sr_context *ctx)
 {
        int i, errors, ret = SR_OK;
        struct sr_dev_driver **drivers;
        const char *d;
 
+       if (!ctx)
+               return SR_ERR_ARG;
+
        sr_spew("Sanity-checking all drivers.");
 
-       drivers = sr_driver_list();
+       drivers = sr_driver_list(ctx);
        for (i = 0; drivers[i]; i++) {
                errors = 0;
 
@@ -215,7 +221,7 @@ static int sanity_check_all_drivers(void)
 static int sanity_check_all_input_modules(void)
 {
        int i, errors, ret = SR_OK;
-       struct sr_input_format **inputs;
+       const struct sr_input_module **inputs;
        const char *d;
 
        sr_spew("Sanity-checking all input modules.");
@@ -230,20 +236,24 @@ static int sanity_check_all_input_modules(void)
                        sr_err("No ID in module %d ('%s').", i, d);
                        errors++;
                }
-               if (!inputs[i]->description) {
-                       sr_err("No description in module %d ('%s').", i, d);
+               if (!inputs[i]->name) {
+                       sr_err("No name in module %d ('%s').", i, d);
                        errors++;
                }
-               if (!inputs[i]->format_match) {
-                       sr_err("No format_match in module %d ('%s').", i, d);
+               if (!inputs[i]->desc) {
+                       sr_err("No description in module %d ('%s').", i, d);
                        errors++;
                }
                if (!inputs[i]->init) {
                        sr_err("No init in module %d ('%s').", i, d);
                        errors++;
                }
-               if (!inputs[i]->loadfile) {
-                       sr_err("No loadfile in module %d ('%s').", i, d);
+               if (!inputs[i]->receive) {
+                       sr_err("No receive in module %d ('%s').", i, d);
+                       errors++;
+               }
+               if (!inputs[i]->end) {
+                       sr_err("No end in module %d ('%s').", i, d);
                        errors++;
                }
 
@@ -302,6 +312,55 @@ static int sanity_check_all_output_modules(void)
        return ret;
 }
 
+/**
+ * Sanity-check all libsigrok transform modules.
+ *
+ * @retval SR_OK All modules are OK
+ * @retval SR_ERR One or more modules have issues.
+ */
+static int sanity_check_all_transform_modules(void)
+{
+       int i, errors, ret = SR_OK;
+       const struct sr_transform_module **transforms;
+       const char *d;
+
+       sr_spew("Sanity-checking all transform modules.");
+
+       transforms = sr_transform_list();
+       for (i = 0; transforms[i]; i++) {
+               errors = 0;
+
+               d = (transforms[i]->id) ? transforms[i]->id : "NULL";
+
+               if (!transforms[i]->id) {
+                       sr_err("No ID in module %d ('%s').", i, d);
+                       errors++;
+               }
+               if (!transforms[i]->name) {
+                       sr_err("No name in module %d ('%s').", i, d);
+                       errors++;
+               }
+               if (!transforms[i]->desc) {
+                       sr_err("No description in module '%s'.", d);
+                       errors++;
+               }
+               /* Note: options() is optional. */
+               /* Note: init() is optional. */
+               if (!transforms[i]->receive) {
+                       sr_err("No receive in module '%s'.", d);
+                       errors++;
+               }
+               /* Note: cleanup() is optional. */
+
+               if (errors == 0)
+                       continue;
+
+               ret = SR_ERR;
+       }
+
+       return ret;
+}
+
 /**
  * Initialize libsigrok.
  *
@@ -322,13 +381,25 @@ SR_API int sr_init(struct sr_context **ctx)
 {
        int ret = SR_ERR;
        struct sr_context *context;
+       struct sr_dev_driver ***lists, **drivers;
+       GArray *array;
 
        if (!ctx) {
                sr_err("%s(): libsigrok context was NULL.", __func__);
                return SR_ERR;
        }
 
-       if (sanity_check_all_drivers() < 0) {
+       context = g_malloc0(sizeof(struct sr_context));
+
+       /* Generate ctx->driver_list at runtime. */
+       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);
+       context->driver_list = (struct sr_dev_driver **)array->data;
+       g_array_free(array, FALSE);
+
+       if (sanity_check_all_drivers(context) < 0) {
                sr_err("Internal driver error(s), aborting.");
                return ret;
        }
@@ -343,12 +414,9 @@ SR_API int sr_init(struct sr_context **ctx)
                return ret;
        }
 
-       /* + 1 to handle when struct sr_context has no members. */
-       context = g_try_malloc0(sizeof(struct sr_context) + 1);
-
-       if (!context) {
-               ret = SR_ERR_MALLOC;
-               goto done;
+       if (sanity_check_all_transform_modules() < 0) {
+               sr_err("Internal transform module error(s), aborting.");
+               return ret;
        }
 
 #ifdef HAVE_LIBUSB_1_0
@@ -365,8 +433,7 @@ SR_API int sr_init(struct sr_context **ctx)
        ret = SR_OK;
 
 done:
-       if (context)
-               g_free(context);
+       g_free(context);
        return ret;
 }
 
@@ -387,12 +454,13 @@ SR_API int sr_exit(struct sr_context *ctx)
                return SR_ERR;
        }
 
-       sr_hw_cleanup_all();
+       sr_hw_cleanup_all(ctx);
 
 #ifdef HAVE_LIBUSB_1_0
        libusb_exit(ctx->libusb_ctx);
 #endif
 
+       g_free(sr_driver_list(ctx));
        g_free(ctx);
 
        return SR_OK;