build: Portability fixes.

[libsigrok.git] / backend.c

diff --git a/backend.c b/backend.c
index 7f1fef889f68b5994c637b4de3f6ca99d145404e..f650fe1206edb36bcf0eb0b023b036c84b0902ab 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -23,9 +23,9 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+/** @cond PRIVATE */
 #define LOG_PREFIX "backend"
-
-extern struct sr_session *session;
+/** @endcond */
 
 /**
  * @mainpage libsigrok API
@@ -79,7 +79,8 @@ extern struct sr_session *session;
  *
  * Initializing and shutting down libsigrok.
  *
- * Before using any of the libsigrok functionality, sr_init() must
+ * Before using any of the libsigrok functionality (except
+ * sr_log_loglevel_set() and sr_log_opts_set()), sr_init() must
  * be called to initialize the library, which will return a struct sr_context
  * when the initialization was successful.
  *
@@ -280,26 +281,14 @@ static int sanity_check_all_output_modules(void)
                        errors++;
                }
                if (!outputs[i]->description) {
-                       sr_err("No description in module %d ('%s').", i, d);
-                       errors++;
-               }
-               if (outputs[i]->df_type < 10000 || outputs[i]->df_type > 10007) {
-                       sr_err("Invalid df_type %d in module %d ('%s').",
-                              outputs[i]->df_type, i, d);
+                       sr_err("No description in module '%s'.", d);
                        errors++;
                }
-
-               /* All modules must provide a data or recv API callback. */
-               if (!outputs[i]->data && !outputs[i]->receive) {
-                       sr_err("No data/receive in module %d ('%s').", i, d);
+               if (!outputs[i]->receive) {
+                       sr_err("No receive in module '%s'.", d);
                        errors++;
                }
 
-               /*
-                * Currently most API calls are optional (their function
-                * pointers can thus be NULL) in theory: init, event, cleanup.
-                */
-
                if (errors == 0)
                        continue;
 
@@ -369,7 +358,6 @@ SR_API int sr_init(struct sr_context **ctx)
 
        *ctx = context;
        context = NULL;
-       session = NULL;
        ret = SR_OK;
 
 done: