From ad6f23480ecfbe10a34a78afde58fdac32d3e457 Mon Sep 17 00:00:00 2001 From: Chris Dickens Date: Sun, 29 May 2016 19:51:48 -0700 Subject: [PATCH] Misc: Fix usbi_os_backend structure initialization Backends not using named initializers were broken by the recent addition of commit a283c3b5a3dce8f6f33331b9aa1d95d41c8f241c. Signed-off-by: Chris Dickens --- libusb/os/haiku_usb_raw.cpp | 3 +++ libusb/os/netbsd_usb.c | 3 +++ libusb/os/openbsd_usb.c | 3 +++ libusb/os/wince_usb.c | 3 +++ libusb/os/windows_usbdk.c | 3 +++ libusb/os/windows_winusb.c | 3 +++ libusb/version_nano.h | 2 +- 7 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libusb/os/haiku_usb_raw.cpp b/libusb/os/haiku_usb_raw.cpp index 0f1f7ce..77adbd1 100644 --- a/libusb/os/haiku_usb_raw.cpp +++ b/libusb/os/haiku_usb_raw.cpp @@ -222,6 +222,9 @@ const struct usbi_os_backend haiku_usb_raw_backend = { /*.alloc_streams =*/ NULL, /*.free_streams =*/ NULL, + /*.dev_mem_alloc =*/ NULL, + /*.dev_mem_free =*/ NULL, + /*.kernel_driver_active =*/ NULL, /*.detach_kernel_driver =*/ NULL, /*.attach_kernel_driver =*/ NULL, diff --git a/libusb/os/netbsd_usb.c b/libusb/os/netbsd_usb.c index f3b274e..ad1ede7 100644 --- a/libusb/os/netbsd_usb.c +++ b/libusb/os/netbsd_usb.c @@ -114,6 +114,9 @@ const struct usbi_os_backend netbsd_backend = { NULL, /* alloc_streams */ NULL, /* free_streams */ + NULL, /* dev_mem_alloc() */ + NULL, /* dev_mem_free() */ + NULL, /* kernel_driver_active() */ NULL, /* detach_kernel_driver() */ NULL, /* attach_kernel_driver() */ diff --git a/libusb/os/openbsd_usb.c b/libusb/os/openbsd_usb.c index cee60db..c660257 100644 --- a/libusb/os/openbsd_usb.c +++ b/libusb/os/openbsd_usb.c @@ -117,6 +117,9 @@ const struct usbi_os_backend openbsd_backend = { NULL, /* alloc_streams */ NULL, /* free_streams */ + NULL, /* dev_mem_alloc() */ + NULL, /* dev_mem_free() */ + NULL, /* kernel_driver_active() */ NULL, /* detach_kernel_driver() */ NULL, /* attach_kernel_driver() */ diff --git a/libusb/os/wince_usb.c b/libusb/os/wince_usb.c index fc95e9c..85c584b 100644 --- a/libusb/os/wince_usb.c +++ b/libusb/os/wince_usb.c @@ -881,6 +881,9 @@ const struct usbi_os_backend wince_backend = { NULL, /* alloc_streams */ NULL, /* free_streams */ + NULL, /* dev_mem_alloc() */ + NULL, /* dev_mem_free() */ + wince_kernel_driver_active, wince_detach_kernel_driver, wince_attach_kernel_driver, diff --git a/libusb/os/windows_usbdk.c b/libusb/os/windows_usbdk.c index da12eda..7cc5793 100644 --- a/libusb/os/windows_usbdk.c +++ b/libusb/os/windows_usbdk.c @@ -877,6 +877,9 @@ const struct usbi_os_backend usbdk_backend = { NULL, NULL, + NULL, // dev_mem_alloc() + NULL, // dev_mem_free() + usbdk_kernel_driver_active, usbdk_detach_kernel_driver, usbdk_attach_kernel_driver, diff --git a/libusb/os/windows_winusb.c b/libusb/os/windows_winusb.c index 082e846..80e36fb 100644 --- a/libusb/os/windows_winusb.c +++ b/libusb/os/windows_winusb.c @@ -2067,6 +2067,9 @@ const struct usbi_os_backend windows_backend = { NULL, /* alloc_streams */ NULL, /* free_streams */ + NULL, /* dev_mem_alloc */ + NULL, /* dev_mem_free */ + windows_kernel_driver_active, windows_detach_kernel_driver, windows_attach_kernel_driver, diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 0e5bb8f..17cd90c 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11111 +#define LIBUSB_NANO 11112 -- 2.7.4