X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=backend.c;h=03e5f64feda077ca503abdc7d82868f2c1bea8e4;hb=6884b52bdefb7ed7169d557e1125f5b36276e2bf;hp=f290e579fb71d394d0ef7f98a421d8d363bfc826;hpb=9d122af8f0c243278cc5edd79aae234aaa34984d;p=libsigrok.git

diff --git a/backend.c b/backend.c
index f290e579..03e5f64f 100644
--- a/backend.c
+++ b/backend.c
@@ -23,7 +23,11 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-extern struct sr_session *session;
+/** @cond PRIVATE */
+#define LOG_PREFIX "backend"
+/** @endcond */
+
+extern struct sr_session *sr_current_session;
 
 /**
  * @mainpage libsigrok API
@@ -77,7 +81,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 +101,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 +109,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 +169,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 +283,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 +360,7 @@ SR_API int sr_init(struct sr_context **ctx)
 
 	*ctx = context;
 	context = NULL;
-	session = NULL;
+	sr_current_session = NULL;
 	ret = SR_OK;
 
 done: