From owner-p4-projects@FreeBSD.ORG Wed Apr 22 06:46:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31C0C106566C; Wed, 22 Apr 2009 06:46:21 +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 E6186106566B for ; Wed, 22 Apr 2009 06:46:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D32A68FC1B for ; Wed, 22 Apr 2009 06:46:20 +0000 (UTC) (envelope-from hselasky@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 n3M6kKGL062316 for ; Wed, 22 Apr 2009 06:46:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3M6kKi9062312 for perforce@freebsd.org; Wed, 22 Apr 2009 06:46:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 22 Apr 2009 06:46:20 GMT Message-Id: <200904220646.n3M6kKi9062312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 160923 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: Wed, 22 Apr 2009 06:46:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=160923 Change 160923 by hselasky@hselasky_laptop001 on 2009/04/22 06:45:52 USB libraries: IFC Affected files ... .. //depot/projects/usb/src/lib/libusb/Makefile#3 integrate .. //depot/projects/usb/src/lib/libusb/libusb.3#5 integrate .. //depot/projects/usb/src/lib/libusb/libusb.h#3 delete .. //depot/projects/usb/src/lib/libusb/libusb20.c#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.h#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_compat10.c#3 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_compat10.h#3 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_desc.c#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_desc.h#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_int.h#2 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#2 integrate .. //depot/projects/usb/src/lib/libusb/usb.h#2 integrate .. //depot/projects/usb/src/lib/libusbhid/Makefile#4 integrate .. //depot/projects/usb/src/lib/libusbhid/data.c#3 integrate .. //depot/projects/usb/src/lib/libusbhid/descr.c#7 integrate .. //depot/projects/usb/src/lib/libusbhid/descr_compat.c#3 integrate .. //depot/projects/usb/src/lib/libusbhid/parse.c#3 integrate .. //depot/projects/usb/src/lib/libusbhid/usage.c#3 integrate .. //depot/projects/usb/src/lib/libusbhid/usbhid.3#6 integrate .. //depot/projects/usb/src/lib/libusbhid/usbhid.h#5 integrate .. //depot/projects/usb/src/lib/libusbhid/usbvar.h#4 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/Makefile#3 (text+ko) ==== @@ -10,6 +10,8 @@ SRCS= libusb20.c SRCS+= libusb20_desc.c SRCS+= libusb20_ugen20.c +SRCS+= libusb20_compat01.c +SRCS+= libusb20_compat10.c INCS+= libusb20.h INCS+= libusb20_desc.h MAN= libusb.3 @@ -21,13 +23,6 @@ # libusb 0.1 compat INCS+= usb.h -SRCS+= libusb20_compat01.c - -# libusb 1.0 compat -SRCS+= libusb10.c -SRCS+= libusb10_desc.c -INCS+= libusb.h -MAN+= libusb10.3 .include ==== //depot/projects/usb/src/lib/libusb/libusb.3#5 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.1 2009/03/10 15:49:43 thompsa Exp $ +.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.2 2009/04/05 18:30:24 thompsa Exp $ .\" -.Dd Mar 27, 2009 +.Dd April 5, 2009 .Dt LIBUSB 3 .Os .Sh NAME @@ -945,7 +945,6 @@ . /dev/usb .Sh SEE ALSO -.Xr libusb10 3 , .Xr usb2_core 4 , .Xr usbconfig 8 . ==== //depot/projects/usb/src/lib/libusb/libusb20.c#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20.h#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_compat10.c#3 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_compat10.h#3 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_desc.c#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_desc.h#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_int.h#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusb/usb.h#2 (text+ko) ==== ==== //depot/projects/usb/src/lib/libusbhid/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $ -# $FreeBSD: head/lib/libusbhid/Makefile 187994 2009-02-02 00:49:39Z alfred $ +# $FreeBSD: src/lib/libusbhid/Makefile,v 1.12 2009/02/02 00:49:39 alfred Exp $ LIB= usbhid MAN= usbhid.3 ==== //depot/projects/usb/src/lib/libusbhid/data.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/lib/libusbhid/data.c 113273 2003-04-09 01:52:49Z mdodd $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/data.c,v 1.6 2003/04/09 01:52:48 mdodd Exp $"); #include #include ==== //depot/projects/usb/src/lib/libusbhid/descr.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/lib/libusbhid/descr.c 189108 2009-02-27 15:30:42Z thompsa $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.11 2009/02/27 15:30:42 thompsa Exp $"); #include ==== //depot/projects/usb/src/lib/libusbhid/descr_compat.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #ifdef HID_COMPAT7 #include -__FBSDID("$FreeBSD: head/lib/libusbhid/descr_compat.c 188945 2009-02-23 18:36:54Z thompsa $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/descr_compat.c,v 1.2 2009/02/23 18:36:54 thompsa Exp $"); #include ==== //depot/projects/usb/src/lib/libusbhid/parse.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/lib/libusbhid/parse.c 125716 2004-02-11 21:09:13Z emax $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/parse.c,v 1.10 2004/02/11 21:09:13 emax Exp $"); #include #include ==== //depot/projects/usb/src/lib/libusbhid/usage.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/lib/libusbhid/usage.c 113273 2003-04-09 01:52:49Z mdodd $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/usage.c,v 1.8 2003/04/09 01:52:48 mdodd Exp $"); #include #include ==== //depot/projects/usb/src/lib/libusbhid/usbhid.3#6 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/lib/libusbhid/usbhid.3 187994 2009-02-02 00:49:39Z alfred $ +.\" $FreeBSD: src/lib/libusbhid/usbhid.3,v 1.19 2009/02/02 00:49:39 alfred Exp $ .\" .Dd January 27, 2009 .Dt USBHID 3 ==== //depot/projects/usb/src/lib/libusbhid/usbhid.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/lib/libusbhid/usbhid.h 187994 2009-02-02 00:49:39Z alfred $ + * $FreeBSD: src/lib/libusbhid/usbhid.h,v 1.12 2009/02/02 00:49:39 alfred Exp $ * */ ==== //depot/projects/usb/src/lib/libusbhid/usbvar.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/lib/libusbhid/usbvar.h 188945 2009-02-23 18:36:54Z thompsa $ + * $FreeBSD: src/lib/libusbhid/usbvar.h,v 1.4 2009/02/23 18:36:54 thompsa Exp $ * */