PERFORCE change 142557 for review
John Birrell
jb at FreeBSD.org
Fri May 30 04:11:10 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142557
Change 142557 by jb at freebsd3 on 2008/05/30 04:10:34
IF7
Affected files ...
.. //depot/projects/dtrace7/src/include/string.h#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/Versions.def#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/string/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/string/Symbol.map#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/string/memchr.3#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/string/memrchr.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/puc/pucdata.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/sound/pcm/dsp.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/acpi/iasl/iasl.8#2 integrate
Differences ...
==== //depot/projects/dtrace7/src/include/string.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)string.h 8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/string.h,v 1.25 2005/11/24 08:30:44 ru Exp $
+ * $FreeBSD: src/include/string.h,v 1.25.2.1 2008/05/27 20:01:04 delphij Exp $
*/
#ifndef _STRING_H_
@@ -59,6 +59,7 @@
void *memccpy(void * __restrict, const void * __restrict, int, size_t);
#endif
void *memchr(const void *, int, size_t) __pure;
+void *memrchr(const void *, int, size_t) __pure;
int memcmp(const void *, const void *, size_t) __pure;
void *memcpy(void * __restrict, const void * __restrict, size_t);
#if __BSD_VISIBLE
==== //depot/projects/dtrace7/src/lib/libc/Versions.def#2 (text+ko) ====
@@ -1,9 +1,15 @@
-# $FreeBSD: src/lib/libc/Versions.def,v 1.3 2007/04/29 16:14:17 kan Exp $
+# $FreeBSD: src/lib/libc/Versions.def,v 1.3.2.1 2008/05/27 21:47:13 delphij Exp $
# This is our first version; it depends on no other.
+# This version was first added to 7.0-current.
FBSD_1.0 {
};
+# This version was first added to 8.0-current and MFC'ed to 7.0-stable
+# before 7.1-release
+FBSD_1.1 {
+} FBSD_1.0;
+
# This is our private namespace. Any global interfaces that are
# strictly for use only by other FreeBSD applications and libraries
# are listed here. We use a separate namespace so we can write
==== //depot/projects/dtrace7/src/lib/libc/string/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.37 2006/03/13 01:15:00 deischen Exp $
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.37.2.1 2008/05/27 20:01:04 delphij Exp $
.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
@@ -7,7 +7,7 @@
# machine-independent string sources
MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c fls.c flsl.c index.c memccpy.c \
- memchr.c memcmp.c \
+ memchr.c memrchr.c memcmp.c \
memcpy.c memmem.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c \
strcat.c strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c \
strerror.c strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c \
@@ -39,6 +39,7 @@
MLINKS+=ffs.3 fls.3
MLINKS+=ffs.3 flsl.3
MLINKS+=index.3 rindex.3
+MLINKS+=memchr.3 memrchr.3
MLINKS+=strcasecmp.3 strncasecmp.3
MLINKS+=strcat.3 strncat.3
MLINKS+=strchr.3 strrchr.3
==== //depot/projects/dtrace7/src/lib/libc/string/Symbol.map#2 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.2 2007/04/29 14:05:19 deischen Exp $
+ * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.2.2.1 2008/05/27 20:01:04 delphij Exp $
*/
FBSD_1.0 {
@@ -77,6 +77,10 @@
wmemset;
};
+FBSD_1.1 {
+ memrchr;
+};
+
FBSDprivate_1.0 {
__strtok_r;
};
==== //depot/projects/dtrace7/src/lib/libc/string/memchr.3#2 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)memchr.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.9 2007/01/09 00:28:12 imp Exp $
+.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.9.2.1 2008/05/27 20:01:04 delphij Exp $
.\"
-.Dd June 4, 1993
+.Dd April 9, 2008
.Dt MEMCHR 3
.Os
.Sh NAME
@@ -44,6 +44,8 @@
.In string.h
.Ft void *
.Fn memchr "const void *b" "int c" "size_t len"
+.Ft void *
+.Fn memrchr "const void *b" "int c" "size_t len"
.Sh DESCRIPTION
The
.Fn memchr
@@ -53,11 +55,22 @@
(converted to an unsigned char)
in string
.Fa b .
+.Pp
+The
+.Fn memrchr
+function behaves like
+.Fn memchr ,
+except that it locates the last occurrence of
+.Fa c
+in string
+.Fa b .
.Sh RETURN VALUES
The
.Fn memchr
-function
-returns a pointer to the byte located,
+and
+.Fn memrchr
+functions
+return a pointer to the byte located,
or NULL if no such byte exists within
.Fa len
bytes.
@@ -77,3 +90,15 @@
function
conforms to
.St -isoC .
+.Pp
+The
+.Fn memrchr
+function is a GNU extension and conforms to no standard.
+.Sh HISTORY
+The
+.Fn memrchr
+function first appeared in GNU libc 2.1.91, this implementation
+first appeared in
+.Fx 8.0 ,
+coming from
+.Ox 4.3 .
==== //depot/projects/dtrace7/src/sys/dev/iscsi/initiator/iscsi.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/iscsi/initiator/iscsi.c,v 1.1 2007/07/24 15:35:02 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/iscsi/initiator/iscsi.c,v 1.1.2.1 2008/05/27 18:27:51 antoine Exp $");
#include "opt_iscsi_initiator.h"
@@ -808,3 +808,4 @@
};
DECLARE_MODULE(iscsi, iscsi_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);
+MODULE_DEPEND(iscsi, cam, 1, 1, 1);
==== //depot/projects/dtrace7/src/sys/dev/puc/pucdata.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.59.2.1 2008/02/26 09:33:57 maxim Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.59.2.2 2008/05/28 03:45:16 marcel Exp $");
/*
* PCI "universal" communications card driver configuration data (used to
@@ -1116,7 +1116,7 @@
*res = (port == 1 || port == 3) ? 8 : 0;
return (0);
case PUC_CFG_GET_RID:
- *res = 0x10 + ((port > 3) ? port - 2 : port >> 1);
+ *res = 0x10 + ((port > 3) ? port - 2 : port >> 1) * 4;
return (0);
case PUC_CFG_GET_TYPE:
*res = PUC_TYPE_SERIAL;
==== //depot/projects/dtrace7/src/sys/dev/sound/pcm/dsp.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
#include <dev/sound/pcm/sound.h>
#include <sys/ctype.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.107 2007/07/04 12:33:11 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.107.2.1 2008/05/28 14:45:05 ariff Exp $");
static int dsp_mmap_allow_prot_exec = 0;
SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RW,
@@ -661,7 +661,14 @@
* process.
*/
(void)snd_clone_release(i_dev);
+
+ /*
+ * destroy_dev() might sleep, so release pcm lock
+ * here and rely on pcm cv serialization.
+ */
+ pcm_unlock(d);
(void)snd_clone_unref(i_dev);
+ pcm_lock(d);
}
PCM_RELEASE(d);
}
==== //depot/projects/dtrace7/src/usr.sbin/acpi/iasl/iasl.8#2 (text+ko) ====
@@ -25,9 +25,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/usr.sbin/acpi/iasl/iasl.8,v 1.2 2004/06/13 18:03:39 ru Exp $
+.\" $FreeBSD: src/usr.sbin/acpi/iasl/iasl.8,v 1.2.18.1 2008/05/28 09:19:56 rpaulo Exp $
.\"
-.Dd August 7, 2003
+.Dd May 20, 2008
.Dt IASL 8
.Os
.Sh NAME
@@ -35,7 +35,7 @@
.Nd Intel ACPI compiler/decompiler
.Sh SYNOPSIS
.Nm
-.Op Fl cefghl
+.Op Fl 2cefghl
.Op Fl b Ar type
.Op Fl d Ar file
.Op Fl dc Ar file
@@ -57,6 +57,7 @@
.Op Fl vr
.Op Fl vs
.Op Fl x Ar level
+.Op Fl w Ar level
.Ar input-file
.Sh DESCRIPTION
The
@@ -68,7 +69,7 @@
include:
.Bl -bullet -offset indent
.It
-Full support for the ACPI 2.0b Specification including ASL grammar
+Full support for the ACPI 3.0b Specification including ASL grammar
elements and operators.
.It
Extensive compiler syntax and semantic error checking, especially in
@@ -82,6 +83,8 @@
.El
.Sh OPTIONS
.Bl -tag -width indent
+.It Fl 2
+Emit ACPI 2.0 compatible ASL code.
.It Fl b Sm Cm p | t | b Sm
Create compiler debug/trace file
.Pq Pa *.txt .
@@ -154,6 +157,8 @@
Disable signon.
.It Fl x Ar level
Set debug level for trace output.
+.It Fl w Ar level
+Set warning level.
.El
.Sh SEE ALSO
.Xr acpi 4 ,
More information about the p4-projects
mailing list