From 0e63acb97940a69b375ff2deea10d015d08fe093 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= Date: Wed, 19 Jun 2024 09:19:24 +0200 Subject: [PATCH] libusb-1.0: Fix the LibUSB.TransferCb declaration MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The target is part of the Transfer object, and is not passed as a parameter. Co-authored-by: Håvard Sørbø --- vapi/libusb-1.0.vapi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vapi/libusb-1.0.vapi b/vapi/libusb-1.0.vapi index 494c87ff5..ff9a6408a 100644 --- a/vapi/libusb-1.0.vapi +++ b/vapi/libusb-1.0.vapi @@ -516,7 +516,7 @@ namespace LibUSB { public TransferStatus status; } - [CCode (cname = "libusb_transfer_cb_fn")] + [CCode (cname = "libusb_transfer_cb_fn", has_target = false)] public delegate void TransferCb (Transfer transfer); [CCode (cname = "struct libusb_transfer", cprefix = "libusb_", free_function = "libusb_free_transfer")] @@ -530,8 +530,8 @@ namespace LibUSB { public TransferStatus status; public int length; public int actual_length; - [CCode (delegate_target_cname = "user_data")] public TransferCb @callback; + public void* user_data; [CCode (array_length_cname = "length")] public uint8[] buffer; public int num_iso_packets; @@ -550,10 +550,10 @@ namespace LibUSB { public unowned ControlSetup control_get_setup (); public static void fill_control_setup ([CCode (array_length = false)] uint8[] buffer, uint8 bmRequestType, uint8 bRequest, uint16 wValue, uint16 wIndex, uint16 wLength); - public void fill_control_transfer (DeviceHandle dev_handle, [CCode (array_length = false)] uint8[] buffer, TransferCb @callback, uint timeout); - public void fill_bulk_transfer (DeviceHandle dev_handle, uint8 endpoint, uint8[] buffer, TransferCb @callback, uint timeout); - public void fill_interrupt_transfer (DeviceHandle dev_handle, uint8 endpoint, uint8[] buffer, TransferCb @callback, uint timeout); - public void fill_iso_transfer (DeviceHandle dev_handle, uint8 endpoint, uint8[] buffer, int num_iso_packets, TransferCb @callback, uint timeout); + public void fill_control_transfer (DeviceHandle dev_handle, [CCode (array_length = false)] uint8[] buffer, TransferCb @callback, void* user_data, uint timeout); + public void fill_bulk_transfer (DeviceHandle dev_handle, uint8 endpoint, uint8[] buffer, TransferCb @callback, void* user_data, uint timeout); + public void fill_interrupt_transfer (DeviceHandle dev_handle, uint8 endpoint, uint8[] buffer, TransferCb @callback, void* user_data, uint timeout); + public void fill_iso_transfer (DeviceHandle dev_handle, uint8 endpoint, uint8[] buffer, int num_iso_packets, TransferCb @callback, void* user_data, uint timeout); public void set_iso_packet_lengths (uint length); [CCode (array_length = false)] public unowned uint8[] get_iso_packet_buffer (uint packet); -- 2.47.2