#include "libsigrok.h"
#include "libsigrok-internal.h"
+extern struct sr_session *session;
+
/**
* @mainpage libsigrok API
*
/**
* Sanity-check all libsigrok drivers.
*
- * @return SR_OK if all drivers are OK, SR_ERR if one or more have issues.
+ * @retval SR_OK All drivers are OK
+ * @retval SR_ERR One or more drivers have issues.
*/
static int sanity_check_all_drivers(void)
{
/**
* Sanity-check all libsigrok input modules.
*
- * @return SR_OK if all modules are OK, SR_ERR if one or more have issues.
+ * @retval SR_OK All modules are OK
+ * @retval SR_ERR One or more modules have issues.
*/
static int sanity_check_all_input_modules(void)
{
/**
* Sanity-check all libsigrok output modules.
*
- * @return SR_OK if all modules are OK, SR_ERR if one or more have issues.
+ * @retval SR_OK All modules are OK
+ * @retval SR_ERR One or more modules have issues.
*/
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++;
}
* 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)
{
#ifdef HAVE_LIBUSB_1_0
ret = libusb_init(&context->libusb_ctx);
if (LIBUSB_SUCCESS != ret) {
- sr_err("libusb_init() returned %s.\n", libusb_error_name(ret));
+ sr_err("libusb_init() returned %s.", libusb_error_name(ret));
ret = SR_ERR;
goto done;
}
*ctx = context;
context = NULL;
+ session = NULL;
ret = SR_OK;
done:
*
* @param ctx Pointer to a libsigrok context struct. Must not be NULL.
*
- * @return SR_OK upon success, a (negative) error code otherwise.
+ * @retval SR_OK Success
+ * @retval other Error code SR_ERR, ...
*
- * @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)
{