Use a designated initializer for openbsd backend
authorWilliam Orr <will@worrbase.com>
Fri, 12 Jul 2019 21:15:17 +0000 (23:15 +0200)
committerNathan Hjelm <hjelmn@google.com>
Fri, 9 Aug 2019 16:14:39 +0000 (09:14 -0700)
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>
libusb/os/openbsd_usb.c

index f174e49..a39c0f2 100644 (file)
@@ -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/"