summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Orr <will@worrbase.com>2019-07-12 23:15:17 +0200
committerNathan Hjelm <hjelmn@google.com>2019-08-09 09:14:39 -0700
commit26eb7ff2188eb19535c0ad0cb2c8e3c588cf6c68 (patch)
treec1238ad327842cf85654ff755fc8a836773332ac
parentb8152378e02bee3373f2f134b6a13373d641221f (diff)
downloadlibusb-26eb7ff2188eb19535c0ad0cb2c8e3c588cf6c68.tar.gz
Use a designated initializer for openbsd backend
At some point `wrap_sys_device` was added to the `usbi_backend` struct, and OpenBSD's backend was never updated along with it. Use a designated initializer for this, so that we can avoid this class of error. Signed-off-by: Nathan Hjelm <hjelmn@google.com>
-rw-r--r--libusb/os/openbsd_usb.c78
1 files changed, 29 insertions, 49 deletions
diff --git a/libusb/os/openbsd_usb.c b/libusb/os/openbsd_usb.c
index f174e49..a39c0f2 100644
--- a/libusb/os/openbsd_usb.c
+++ b/libusb/os/openbsd_usb.c
@@ -90,55 +90,35 @@ static int _bus_open(int);
const struct usbi_os_backend usbi_backend = {
- "Synchronous OpenBSD backend",
- 0,
- NULL, /* init() */
- NULL, /* exit() */
- NULL, /* set_option() */
- obsd_get_device_list,
- NULL, /* hotplug_poll */
- obsd_open,
- obsd_close,
-
- obsd_get_device_descriptor,
- obsd_get_active_config_descriptor,
- obsd_get_config_descriptor,
- NULL, /* get_config_descriptor_by_value() */
-
- obsd_get_configuration,
- obsd_set_configuration,
-
- obsd_claim_interface,
- obsd_release_interface,
-
- obsd_set_interface_altsetting,
- obsd_clear_halt,
- obsd_reset_device,
-
- 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() */
-
- obsd_destroy_device,
-
- obsd_submit_transfer,
- obsd_cancel_transfer,
- obsd_clear_transfer_priv,
-
- NULL, /* handle_events() */
- obsd_handle_transfer_completion,
-
- obsd_clock_gettime,
- 0, /* context_priv_size */
- sizeof(struct device_priv),
- sizeof(struct handle_priv),
- 0, /* transfer_priv_size */
+ .name = "Synchronous OpenBSD backend",
+ .get_device_list = obsd_get_device_list,
+ .open = obsd_open,
+ .close = obsd_close,
+
+ .get_device_descriptor = obsd_get_device_descriptor,
+ .get_active_config_descriptor = obsd_get_active_config_descriptor,
+ .get_config_descriptor = obsd_get_config_descriptor,
+
+ .get_configuration = obsd_get_configuration,
+ .set_configuration = obsd_set_configuration,
+
+ .claim_interface = obsd_claim_interface,
+ .release_interface = obsd_release_interface,
+
+ .set_interface_altsetting = obsd_set_interface_altsetting,
+ .clear_halt = obsd_clear_halt,
+ .reset_device = obsd_reset_device,
+ .destroy_device = obsd_destroy_device,
+
+ .submit_transfer = obsd_submit_transfer,
+ .cancel_transfer = obsd_cancel_transfer,
+ .clear_transfer_priv = obsd_clear_transfer_priv,
+
+ .handle_transfer_completion = obsd_handle_transfer_completion,
+
+ .clock_gettime = obsd_clock_gettime,
+ .device_priv_size = sizeof(struct device_priv),
+ .device_handle_priv_size = sizeof(struct handle_priv),
};
#define DEVPATH "/dev/"