Page MenuHomeFreeBSD
Files F160765943

D51224.id180293.diff
No OneTemporary
Actions

D51224.id180293.diff
View Options

diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
@@ -303,11 +303,6 @@
struct libusb_device_handle;
struct libusb_hotplug_callback_handle_struct;
-typedef struct libusb_context libusb_context;
-
-typedef void (*libusb_log_cb)(libusb_context *ctx, enum libusb_log_level,
- const char *str);
-
struct libusb_pollfd {
int fd;
short events;
@@ -330,6 +325,8 @@
};
typedef struct libusb_context libusb_context;
+typedef void (*libusb_log_cb)(libusb_context *ctx, enum libusb_log_level,
+ const char *str);
typedef struct libusb_device libusb_device;
typedef struct libusb_device_handle libusb_device_handle;
typedef struct libusb_pollfd libusb_pollfd;
diff --git a/lib/libusb/libusb.3 b/lib/libusb/libusb.3
--- a/lib/libusb/libusb.3
+++ b/lib/libusb/libusb.3
@@ -118,7 +118,7 @@
.Fa value .
.It Va LIBUSB_OPTION_USE_USBDK
use USBDK as a libusb backend (Windows only)
-.It Va LIBUSB_OPTION_NO_DEVICE_DISCOVER
+.It Va LIBUSB_OPTION_NO_DEVICE_DISCOVERY
disable the USB enumeration.
.It Va LIBUSB_OPTION_LOG_CB
customize default callback function with
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -208,6 +208,10 @@
ctx->devd_pipe = -1;
debug = getenv("LIBUSB_DEBUG");
+ ctx->log_cb = NULL;
+ ctx->no_discovery = false;
+ ctx->debug = LIBUSB_LOG_LEVEL_NONE;
+
if (debug != NULL) {
/*
* If LIBUSB_DEBUG is set, we'll honor that first and
@@ -227,24 +231,29 @@
*/
ctx->debug = 0;
}
- } else {
- /*
- * If the LIBUSB_OPTION_LOG_LEVEL is set, honor that.
- */
- for (int i = 0; i != num_options; i++) {
- if (option[i].option != LIBUSB_OPTION_LOG_LEVEL)
- continue;
+ }
- ctx->debug = (int)option[i].value.ival;
- if ((int64_t)ctx->debug == option[i].value.ival) {
- ctx->debug_fixed = 1;
- } else {
- free(ctx);
- return (LIBUSB_ERROR_INVALID_PARAM);
- }
- }
+ /*
+ * Set the default from default context then override by options
+ */
+ if (usbi_default_context) {
+ CTX_LOCK(usbi_default_context);
+ if (usbi_default_context->no_discovery)
+ libusb_set_option(ctx,
+ LIBUSB_OPTION_NO_DEVICE_DISCOVERY);
+ /* libusb_set_option will check if debug is fixed by the
+ environment variable. If it is fixed, the override will not
+ take effect */
+ libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL,
+ usbi_default_context->debug);
+ libusb_set_option(ctx, LIBUSB_OPTION_LOG_CB,
+ usbi_default_context->log_cb);
+ CTX_UNLOCK(usbi_default_context);
}
+ for (int i = 0; i < num_options; i++)
+ libusb_set_option(ctx, option[i].option, option[i].value);
+
TAILQ_INIT(&ctx->pollfds);
TAILQ_INIT(&ctx->tr_done);
TAILQ_INIT(&ctx->hotplug_cbh);
@@ -294,8 +303,6 @@
}
libusb10_add_pollfd(ctx, &ctx->ctx_poll, NULL, ctx->event, POLLIN);
- ctx->log_cb = NULL;
- ctx->no_discovery = false;
pthread_mutex_lock(&default_context_lock);
if (usbi_default_context == NULL) {

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 28, 3:02 PM (15 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34436932
Default Alt Text
D51224.id180293.diff (2 KB)

Event Timeline