From owner-p4-projects@FreeBSD.ORG Tue May 12 13:00:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 823F51065672; Tue, 12 May 2009 13:00:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 410EB106566C for ; Tue, 12 May 2009 13:00:24 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2FBEB8FC20 for ; Tue, 12 May 2009 13:00:24 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4CD0O9R087754 for ; Tue, 12 May 2009 13:00:24 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4CD0Oql087752 for perforce@freebsd.org; Tue, 12 May 2009 13:00:24 GMT (envelope-from syl@FreeBSD.org) Date: Tue, 12 May 2009 13:00:24 GMT Message-Id: <200905121300.n4CD0Oql087752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 161971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 May 2009 13:00:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=161971 Change 161971 by syl@syl_atuin on 2009/05/12 12:59:45 Update libusb-1.0 to allow gammu to compile. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb.h#9 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#11 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb.h#9 (text+ko) ==== @@ -23,8 +23,8 @@ * SUCH DAMAGE. */ -#ifndef _LIBUSB_H_ -#define _LIBUSB_H_ +#ifndef __LIBUSB_H__ +#define __LIBUSB_H__ #include #include @@ -349,21 +349,25 @@ /* Device handling and enumeration */ -ssize_t libusb_get_device_list(libusb_context * ctx, libusb_device *** list); +ssize_t libusb_get_device_list(libusb_context * ctx, libusb_device *** list); void libusb_free_device_list(libusb_device ** list, int unref_devices); uint8_t libusb_get_bus_number(libusb_device * dev); uint8_t libusb_get_device_address(libusb_device * dev); int libusb_get_max_packet_size(libusb_device * dev, unsigned char endpoint); libusb_device *libusb_ref_device(libusb_device * dev); void libusb_unref_device(libusb_device * dev); -int libusb_open(libusb_device * dev, libusb_device_handle ** handle); +int libusb_open(libusb_device * dev, libusb_device_handle ** devh); libusb_device_handle *libusb_open_device_with_vid_pid(libusb_context * ctx, uint16_t vendor_id, uint16_t product_id); -void libusb_close(libusb_device_handle * dev_handle); -libusb_device *libusb_get_device(libusb_device_handle * dev_handle); -int libusb_get_configuration(libusb_device_handle * dev, int *config); -int libusb_set_configuration(libusb_device_handle * dev, int configuration); -int libusb_claim_interface(libusb_device_handle * dev, int interface_number); -int libusb_release_interface(libusb_device_handle * dev, int interface_number); +void libusb_close(libusb_device_handle * devh); +libusb_device *libusb_get_device(libusb_device_handle * devh); +int libusb_get_configuration(libusb_device_handle * devh, int *config); +int libusb_set_configuration(libusb_device_handle * devh, int configuration); +int libusb_claim_interface(libusb_device_handle * devh, int interface_number); +int libusb_release_interface(libusb_device_handle * devh, int interface_number); +int libusb_kernel_driver_active(libusb_device_handle * devh, int interface); +int libusb_detach_kernel_driver(libusb_device_handle * devh, int interface); +int libusb_attach_kernel_driver(libusb_device_handle * devh, int interface); +int libusb_set_interface_alt_setting(libusb_device_handle * devh, int interface_number, int alternate_setting); /* USB Descriptors */ @@ -401,9 +405,9 @@ /* Synchronous device I/O */ -int libusb_control_transfer(libusb_device_handle * dev_handle, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, uint16_t wLength, unsigned int timeout); -int libusb_bulk_transfer(struct libusb_device_handle *dev_handle, unsigned char endpoint, unsigned char *data, int length, int *transferred, unsigned int timeout); -int libusb_interrupt_transfer(struct libusb_device_handle *dev_handle, unsigned char endpoint, unsigned char *data, int length, int *transferred, unsigned int timeout); +int libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, unsigned char *data, uint16_t wLength, unsigned int timeout); +int libusb_bulk_transfer(struct libusb_device_handle *devh, unsigned char endpoint, unsigned char *data, int length, int *transferred, unsigned int timeout); +int libusb_interrupt_transfer(struct libusb_device_handle *devh, unsigned char endpoint, unsigned char *data, int length, int *transferred, unsigned int timeout); #if 0 { /* indent fix */ @@ -413,4 +417,4 @@ #endif -#endif /* _LIBUSB_H_ */ +#endif /* __LIBUSB_H__ */ ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#11 (text+ko) ====