configure.ac: Bump libtool/library version from 1:1:0 to 1:2:0.

[libsigrok.git] / backend.c

diff --git a/backend.c b/backend.c
index cd1d1db2b06a878191b320d2f920be334c4066f7..0d1b47263f66ba14eb5eff371a1d7773ee9d0eca 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2012 Peter Stuge <peter@stuge.se>
@@ -23,6 +23,8 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+extern struct sr_session *session;
+
 /**
  * @mainpage libsigrok API
  *
@@ -287,8 +289,8 @@ static int sanity_check_all_output_modules(void)
                }
 
                /* All modules must provide a data or recv API callback. */
-               if (!outputs[i]->data && !outputs[i]->recv) {
-                       sr_err("No data/recv in module %d ('%s').", i, d);
+               if (!outputs[i]->data && !outputs[i]->receive) {
+                       sr_err("No data/receive in module %d ('%s').", i, d);
                        errors++;
                }
 
@@ -320,7 +322,7 @@ static int sanity_check_all_output_modules(void)
  *         the context will be free'd by sr_exit() as part of the libsigrok
  *         shutdown.
  *
- * @since 0.1.0 (but the API changed in 0.2.0)
+ * @since 0.2.0
  */
 SR_API int sr_init(struct sr_context **ctx)
 {
@@ -366,6 +368,7 @@ SR_API int sr_init(struct sr_context **ctx)
 
        *ctx = context;
        context = NULL;
+       session = NULL;
        ret = SR_OK;
 
 done:
@@ -381,7 +384,7 @@ done:
  *
  * @return SR_OK upon success, a (negative) error code otherwise.
  *
- * @since 0.1.0 (but the API changed in 0.2.0)
+ * @since 0.2.0
  */
 SR_API int sr_exit(struct sr_context *ctx)
 {