X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=backend.c;h=2f51eedd02a595c6be9039470a1151d1890ae7f3;hb=refs%2Fheads%2Flibsigrok-0.3.x;hp=41c74c7c1c90446ef47f1861ebf7f3f5f78d3b98;hpb=04cb915716ecdc1ee26440b4c09bc2f2de183631;p=libsigrok.git diff --git a/backend.c b/backend.c index 41c74c7c..2f51eedd 100644 --- a/backend.c +++ b/backend.c @@ -23,6 +23,10 @@ #include "libsigrok.h" #include "libsigrok-internal.h" +/** @cond PRIVATE */ +#define LOG_PREFIX "backend" +/** @endcond */ + extern struct sr_session *session; /** @@ -96,7 +100,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 +108,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 +168,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 +282,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; @@ -363,7 +351,7 @@ 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; }