PERFORCE change 160819 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Sun Apr 19 16:33:05 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=160819
Change 160819 by hselasky at hselasky_laptop001 on 2009/04/19 16:32:31
Initial libusb v1.0 support patch from Sylvestre Gallon.
Affected files ...
.. //depot/projects/usb/src/lib/libusb/Makefile#2 edit
.. //depot/projects/usb/src/lib/libusb/libusb.3#4 edit
.. //depot/projects/usb/src/lib/libusb/libusb.h#1 add
.. //depot/projects/usb/src/lib/libusb/libusb10.c#1 add
.. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#1 add
.. //depot/projects/usb/src/lib/libusb/libusb20_compat10.c#2 edit
.. //depot/projects/usb/src/lib/libusb/libusb20_compat10.h#2 edit
Differences ...
==== //depot/projects/usb/src/lib/libusb/Makefile#2 (text+ko) ====
@@ -10,8 +10,6 @@
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
@@ -23,6 +21,13 @@
# 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 <bsd.lib.mk>
==== //depot/projects/usb/src/lib/libusb/libusb.3#4 (text+ko) ====
@@ -945,6 +945,7 @@
.
/dev/usb
.Sh SEE ALSO
+.Xr libusb10 3 ,
.Xr usb2_core 4 ,
.Xr usbconfig 8
.
==== //depot/projects/usb/src/lib/libusb/libusb20_compat10.c#2 (text+ko) ====
@@ -1,29 +1,0 @@
-/* $FreeBSD: src/lib/libusb/libusb20_compat10.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * This file contains the emulation layer for LibUSB v1.0 from sourceforge.
- */
==== //depot/projects/usb/src/lib/libusb/libusb20_compat10.h#2 (text+ko) ====
@@ -1,25 +1,0 @@
-/* $FreeBSD: src/lib/libusb/libusb20_compat10.h,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
More information about the p4-projects
mailing list