build: Portability fixes.

[libsigrok.git] / backend.c

diff --git a/backend.c b/backend.c
index f290e579fb71d394d0ef7f98a421d8d363bfc826..f650fe1206edb36bcf0eb0b023b036c84b0902ab 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -23,7 +23,9 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-extern struct sr_session *session;
+/** @cond PRIVATE */
+#define LOG_PREFIX "backend"
+/** @endcond */
 
 /**
  * @mainpage libsigrok API
@@ -77,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.
  *
@@ -96,7 +99,7 @@ extern struct sr_session *session;
  *     struct sr_context *sr_ctx;
  *
  *     if ((ret = sr_init(&sr_ctx)) != SR_OK) {
- *             printf("Error initializing libsigrok (%s): %s.",
+ *             printf("Error initializing libsigrok (%s): %s.\n",
  *                    sr_strerror_name(ret), sr_strerror(ret));
  *             return 1;
  *     }
@@ -104,7 +107,7 @@ extern struct sr_session *session;
  *     // Use libsigrok functions here...
  *
  *     if ((ret = sr_exit(sr_ctx)) != SR_OK) {
- *             printf("Error shutting down libsigrok (%s): %s.",
+ *             printf("Error shutting down libsigrok (%s): %s.\n",
  *                    sr_strerror_name(ret), sr_strerror(ret));
  *             return 1;
  *     }
@@ -164,10 +167,6 @@ static int sanity_check_all_drivers(void)
                        sr_err("No dev_list in driver %d ('%s').", i, d);
                        errors++;
                }
-               if (!drivers[i]->dev_clear) {
-                       sr_err("No dev_clear in driver %d ('%s').", i, d);
-                       errors++;
-               }
                /* Note: config_get() is optional. */
                if (!drivers[i]->config_set) {
                        sr_err("No config_set in driver %d ('%s').", i, d);
@@ -282,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);
+                       sr_err("No description in module '%s'.", 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);
+               if (!outputs[i]->receive) {
+                       sr_err("No receive 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);
-                       errors++;
-               }
-
-               /*
-                * Currently most API calls are optional (their function
-                * pointers can thus be NULL) in theory: init, event, cleanup.
-                */
-
                if (errors == 0)
                        continue;
 
@@ -371,7 +358,6 @@ SR_API int sr_init(struct sr_context **ctx)
 
        *ctx = context;
        context = NULL;
-       session = NULL;
        ret = SR_OK;
 
 done: