From: Geert Jordaens <geert.jordaens@telenet.be>
Date: Wed, 19 Jan 2011 20:19:13 +0000 (-0800)
Subject: libusb-1.0: Add TransferFlags, use Posix.timeval not GLib.TimeVal
X-Git-Tag: 0.11.5~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fkeep-around%2F0f9f2987450ebc95b1c6ed4f9225e1b410eaca3d;p=thirdparty%2Fvala.git

libusb-1.0: Add TransferFlags, use Posix.timeval not GLib.TimeVal
---

diff --git a/vapi/libusb-1.0.vapi b/vapi/libusb-1.0.vapi
index 828a5eb3b..2d61f1fe0 100644
--- a/vapi/libusb-1.0.vapi
+++ b/vapi/libusb-1.0.vapi
@@ -128,6 +128,13 @@ namespace LibUSB {
 		OTHER
 	}
 
+	[CCode (cname = "enum libusb_transfer_flags", cprefix = "LIBUSB_TRANSFER_")]
+	public enum TransferFlags {
+		SHORT_NOT_OK,
+		FREE_BUFFER,
+		FREE_TRANSFER
+	}
+
 	[CCode (cname = "struct libusb_device_descriptor")]
 	public struct DeviceDescriptor {
 		public uint8 bLength;
@@ -211,7 +218,7 @@ namespace LibUSB {
 		}
 
 		[CCode (cname = "libusb_open_device_with_vid_pid")]
-		public DeviceHandle.from_vid_pid (Context context, uint16 vendor_id, uint16 product_id);
+		public DeviceHandle.from_vid_pid (Context? context, uint16 vendor_id, uint16 product_id);
 		public unowned Device get_device ();
 		public int get_configuration (out int config);
 		public int set_configuration (int configuration);
@@ -261,10 +268,10 @@ namespace LibUSB {
 		public int event_handler_active ();
 		public void lock_event_waiters ();
 		public void unlock_event_waiters ();
-		public int wait_for_event (GLib.TimeVal tv);
-		public int handle_events_timeout (GLib.TimeVal tv);
+		public int wait_for_event (Posix.timeval tv);
+		public int handle_events_timeout (Posix.timeval tv);
 		public int handle_events ();
-		public int handle_events_locked (GLib.TimeVal tv);
+		public int handle_events_locked (Posix.timeval tv);
 		public int get_next_timeout (out Posix.timeval tv);
 		public void set_pollfd_notifiers (pollfd_added_cb added_cb, pollfd_removed_cb removed_cb, void* user_data);
 		[CCode (array_length = false)]