Date: Wed, 12 Feb 2003 20:19:21 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 25075 for review Message-ID: <200302130419.h1D4JL7t024855@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=25075 Change 25075 by marcel@marcel_vaio on 2003/02/12 20:18:30 IFC @25073 Affected files ... .. //depot/projects/tty/lib/libc/alpha/gen/isinf.c#2 integrate .. //depot/projects/tty/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/gen/fpclassify.3#2 integrate .. //depot/projects/tty/lib/libc/gen/isgreater.3#1 branch .. //depot/projects/tty/lib/libc/gen/isinf.3#2 delete .. //depot/projects/tty/lib/libc/i386/gen/isinf.c#2 integrate .. //depot/projects/tty/lib/libc/ia64/gen/isinf.c#2 integrate .. //depot/projects/tty/lib/libc/powerpc/gen/isinf.c#2 integrate .. //depot/projects/tty/lib/libc/sparc64/gen/isinf.c#2 integrate .. //depot/projects/tty/lib/msun/src/math.h#3 integrate .. //depot/projects/tty/lib/msun/src/s_isnan.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_isnanf.c#2 integrate .. //depot/projects/tty/sbin/gpt/show.c#2 integrate .. //depot/projects/tty/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs.h#3 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs_data.h#3 integrate .. //depot/projects/tty/sys/geom/geom_disk.c#3 integrate .. //depot/projects/tty/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/tty/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/tty/sys/kern/subr_witness.c#3 integrate .. //depot/projects/tty/sys/net/bridge.c#3 integrate .. //depot/projects/tty/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/tty/tools/tools/tinderbox/Makefile#2 integrate .. //depot/projects/tty/tools/tools/tinderbox/tbmaster.pl#1 branch .. //depot/projects/tty/tools/tools/tinderbox/tinderbox.pl#3 integrate .. //depot/projects/tty/tools/tools/whereintheworld/whereintheworld.pl#2 integrate .. //depot/projects/tty/usr.bin/yacc/skeleton.c#3 integrate .. //depot/projects/tty/usr.sbin/syslogd/syslog.conf.5#2 integrate .. //depot/projects/tty/usr.sbin/syslogd/syslogd.c#2 integrate Differences ... ==== //depot/projects/tty/lib/libc/alpha/gen/isinf.c#2 (text+ko) ==== @@ -27,13 +27,18 @@ * $NetBSD: isinf.c,v 1.1 1995/02/10 17:50:23 cgd Exp $ */ +/* For binary compat; to be removed in FreeBSD 6.0. */ + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/isinf.c,v 1.4 2002/03/21 18:36:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/isinf.c,v 1.5 2003/02/12 20:03:40 mike Exp $"); #include <sys/types.h> #include <machine/ieee.h> #include <math.h> +#undef isnan +#undef isinf + int isnan(d) double d; ==== //depot/projects/tty/lib/libc/gen/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.102 2003/02/11 21:56:20 mike Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.103 2003/02/12 20:03:40 mike Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -48,7 +48,7 @@ getmntinfo.3 getnetgrent.3 getobjformat.3 getosreldate.3 \ getpagesize.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ getttyent.3 getusershell.3 getvfsbyname.3 getvfsent.3 \ - glob.3 initgroups.3 isinf.3 ldexp.3 lockf.3 makecontext.3 \ + glob.3 initgroups.3 isgreater.3 ldexp.3 lockf.3 makecontext.3 \ modf.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 \ nice.3 nlist.3 pause.3 popen.3 pselect.3 psignal.3 pwcache.3 \ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ @@ -72,6 +72,8 @@ err.3 vwarnx.3 err.3 warnc.3 err.3 warn.3 err.3 warnx.3 MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 exect.3 \ exec.3 execv.3 exec.3 execvp.3 +MLINKS+=fpclassify.3 isfinite.3 fpclassify.3 isinf.3 fpclassify.3 isnan.3 \ + fpclassify.3 isnormal.3 MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \ fts.3 fts_read.3 fts.3 fts_set.3 MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \ @@ -99,7 +101,9 @@ getvfsent.3 setvfsent.3 getvfsent.3 vfsisloadable.3 \ getvfsent.3 vfsload.3 MLINKS+=glob.3 globfree.3 -MLINKS+=isinf.3 isnan.3 isinf.3 isnanf.3 +MLINKS+=isgreater.3 isgreaterequal.3 isgreater.3 isless.3 \ + isgreater.3 islessequal.3 isgreater.3 islessgreater.3 \ + isgreater.3 isunordered.3 MLINKS+=makecontext.3 swapcontext.3 MLINKS+=popen.3 pclose.3 MLINKS+=psignal.3 strsignal.3 psignal.3 sys_siglist.3 psignal.3 sys_signame.3 ==== //depot/projects/tty/lib/libc/gen/fpclassify.3#2 (text+ko) ==== @@ -22,13 +22,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.1 2003/02/08 20:37:50 mike Exp $ +.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.2 2003/02/12 20:03:40 mike Exp $ .\" -.Dd February 8, 2003 +.Dd February 12, 2003 .Dt FPCLASSIFY 3 .Os .Sh NAME -.Nm fpclassify +.Nm fpclassify , isfinite , isinf , isnan , isnormal .Nd "classify a floating-point number" .Sh LIBRARY .Lb libc @@ -36,6 +36,14 @@ .In math.h .Ft int .Fn fpclassify "real-floating x" +.Ft int +.Fn isfinite "real-floating x" +.Ft int +.Fn isinf "real-floating x" +.Ft int +.Fn isnan "real-floating x" +.Ft int +.Fn isnormal "real-floating x" .Sh DESCRIPTION The .Fn fpclassify @@ -64,18 +72,58 @@ .Va x is zero (0 or -0). .El +.Pp +The +.Fn isfinite +macro returns a non-zero value if and only if its argument has +a finite (zero, subnormal, or normal) value. The +.Fn isinf , +.Fn isnan , +and +.Fn isnormal +macros return non-zero if and only if +.Va x +is an infinity, NaN, +or a non-zero normalized number, respectively. +.Pp +The symbol +.Fn isnanf +is provided as an alias to +.Fn isnan +for compatibility, and its use is deprecated. .Sh SEE ALSO -.Xr math 3 +.Xr isgreater 3 , +.Xr math 3 , +.Xr signbit 3 .Sh STANDARDS The -.Fn fpclassify -macro conforms to +.Fn fpclassify , +.Fn isfinite , +.Fn isinf , +.Fn isnan , +and +.Fn isnormal +macros conform to .St -isoC-99 . .Sh HISTORY The -.Fn fpclassify -macro was added in +.Fn fpclassify , +.Fn isfinite , +.Fn isinf , +.Fn isnan , +and +.Fn isnormal +macros were added in .Fx 5.1 . +.Bx 3 +introduced +.Fn isinf +and +.Fn isnan +functions, which accepted +.Ft double +arguments; these have been superseded by the macros +described above. .Sh BUGS By default, the DEC Alpha architecture does not support IEEE rounding. -See compiler documentation for additional details. +See the compiler documentation for additional details. ==== //depot/projects/tty/lib/libc/i386/gen/isinf.c#2 (text+ko) ==== @@ -31,11 +31,13 @@ * SUCH DAMAGE. */ +/* For binary compat; to be removed in FreeBSD 6.0. */ + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)isinf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/isinf.c,v 1.9 2002/03/23 02:05:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/isinf.c,v 1.10 2003/02/12 20:03:41 mike Exp $"); #include <sys/types.h> ==== //depot/projects/tty/lib/libc/ia64/gen/isinf.c#2 (text+ko) ==== @@ -27,13 +27,18 @@ * rights to redistribute these changes. */ +/* For binary compat; to be removed in FreeBSD 6.0. */ + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/isinf.c,v 1.3 2002/03/22 21:52:14 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/isinf.c,v 1.4 2003/02/12 20:03:41 mike Exp $"); #include <sys/types.h> #include <machine/ieee.h> #include <math.h> +#undef isnan +#undef isinf + int isnan(d) double d; ==== //depot/projects/tty/lib/libc/powerpc/gen/isinf.c#2 (text+ko) ==== @@ -28,13 +28,18 @@ * from: FreeBSD: src/lib/libc/alpha/gen/isinf.c,v 1.2 2000/05/10 */ +/* For binary compat; to be removed in FreeBSD 6.0. */ + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/isinf.c,v 1.1 2002/12/04 07:25:14 grehan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/powerpc/gen/isinf.c,v 1.2 2003/02/12 20:03:41 mike Exp $"); #include <sys/types.h> #include <machine/ieee.h> #include <math.h> +#undef isnan +#undef isinf + int isnan(double d) { ==== //depot/projects/tty/lib/libc/sparc64/gen/isinf.c#2 (text+ko) ==== @@ -28,13 +28,18 @@ * from: FreeBSD: src/lib/libc/alpha/gen/isinf.c,v 1.2 2000/05/10 */ +/* For binary compat; to be removed in FreeBSD 6.0. */ + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/isinf.c,v 1.3 2002/03/22 21:52:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/isinf.c,v 1.4 2003/02/12 20:03:41 mike Exp $"); #include <sys/types.h> #include <machine/ieee.h> #include <math.h> +#undef isnan +#undef isinf + int isnan(d) double d; ==== //depot/projects/tty/lib/msun/src/math.h#3 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.22 2003/02/11 21:56:21 mike Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.23 2003/02/12 20:03:41 mike Exp $ */ #ifndef _MATH_H_ @@ -41,15 +41,30 @@ #define NAN (__nan.__uf) /* Symbolic constants to classify floating point numbers. */ -#define FP_INFINITE 1 -#define FP_NAN 2 -#define FP_NORMAL 3 -#define FP_SUBNORMAL 4 -#define FP_ZERO 5 +#define FP_INFINITE 0x01 +#define FP_NAN 0x02 +#define FP_NORMAL 0x04 +#define FP_SUBNORMAL 0x08 +#define FP_ZERO 0x10 #define fpclassify(x) \ ((sizeof (x) == sizeof (float)) ? __fpclassifyf(x) \ : (sizeof (x) == sizeof (double)) ? __fpclassifyd(x) \ : __fpclassifyl(x)) + +#define isfinite(x) (fpclassify(x) & (FP_INFINITE|FP_NAN) == 0) +#define isinf(x) (fpclassify(x) == FP_INFINITE) +#define isnan(x) (fpclassify(x) == FP_NAN) +#define isnanf(x) isnan(x) +#define isnormal(x) (fpclassify(x) == FP_NORMAL) + +#define isgreater(x, y) (!isunordered((x), (y)) && (x) > (y)) +#define isgreaterequal(x, y) (!isunordered((x), (y)) && (x) >= (y)) +#define isless(x, y) (!isunordered((x), (y)) && (x) < (y)) +#define islessequal(x, y) (!isunordered((x), (y)) && (x) <= (y)) +#define islessgreater(x, y) (!isunordered((x), (y)) && \ + ((x) > (y) || (y) > (x))) +#define isunordered(x, y) (isnan(x) || isnan(y)) + #define signbit(x) __signbit(x) typedef __double_t double_t; @@ -145,10 +160,10 @@ /* * ANSI/POSIX */ -int __fpclassifyd(double); -int __fpclassifyf(float); -int __fpclassifyl(long double); -int __signbit(double); +int __fpclassifyd(double) __pure2; +int __fpclassifyf(float) __pure2; +int __fpclassifyl(long double) __pure2; +int __signbit(double) __pure2; double acos(double); double asin(double); @@ -187,8 +202,6 @@ int finite(double) __pure2; double gamma(double); double hypot(double, double); -int isinf(double) __pure2; -int isnan(double) __pure2; double j0(double); double j1(double); double jn(int, double); @@ -274,7 +287,6 @@ int finitef(float) __pure2; float gammaf(float); float hypotf(float, float) __pure2; -int isnanf(float) __pure2; float j0f(float); float j1f(float); float jnf(int, float); ==== //depot/projects/tty/lib/msun/src/s_isnan.c#2 (text+ko) ==== @@ -10,8 +10,10 @@ * ==================================================== */ +/* For binary compat; to be removed in FreeBSD 6.0. */ + #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_isnan.c,v 1.6 2002/05/28 17:51:46 alfred Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_isnan.c,v 1.7 2003/02/12 20:03:41 mike Exp $"; #endif /* @@ -22,6 +24,8 @@ #include "math.h" #include "math_private.h" +#undef isnan + int isnan(double x) { int32_t hx,lx; ==== //depot/projects/tty/lib/msun/src/s_isnanf.c#2 (text+ko) ==== @@ -13,8 +13,10 @@ * ==================================================== */ +/* For binary compat; to be removed in FreeBSD 6.0. */ + #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_isnanf.c,v 1.6 2002/05/28 17:51:46 alfred Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_isnanf.c,v 1.7 2003/02/12 20:03:41 mike Exp $"; #endif /* @@ -25,6 +27,8 @@ #include "math.h" #include "math_private.h" +#undef isnanf + int isnanf(float x) { int32_t ix; ==== //depot/projects/tty/sbin/gpt/show.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/sbin/gpt/show.c,v 1.5 2002/12/02 01:42:03 marcel Exp $ + * $FreeBSD: src/sbin/gpt/show.c,v 1.6 2003/02/13 01:00:26 peter Exp $ */ #include <sys/types.h> @@ -49,6 +49,33 @@ exit(1); } +static const char * +friendly(uuid_t *t) +{ + uuid_t efi_slice = GPT_ENT_TYPE_EFI; + uuid_t freebsd = GPT_ENT_TYPE_FREEBSD; + uuid_t swap = GPT_ENT_TYPE_FREEBSD_SWAP; + uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS; + uuid_t vinum = GPT_ENT_TYPE_FREEBSD_VINUM; + static char buf[80]; + char *s; + + if (memcmp(t, &efi_slice, sizeof(uuid_t)) == 0) + return "EFI System partition"; + else if (memcmp(t, &freebsd, sizeof(uuid_t)) == 0) + return "FreeBSD disklabel container"; + else if (memcmp(t, &swap, sizeof(uuid_t)) == 0) + return "FreeBSD swap partition"; + else if (memcmp(t, &ufs, sizeof(uuid_t)) == 0) + return "FreeBSD ufs partition"; + else if (memcmp(t, &vinum, sizeof(uuid_t)) == 0) + return "FreeBSD vinum partition"; + uuid_to_string(t, &s, NULL); + strlcpy(buf, s, sizeof buf); + free(s); + return buf; +} + static void show(int fd __unused) { @@ -56,7 +83,6 @@ map_t *m, *p; struct mbr *mbr; struct gpt_ent *ent; - char *s; unsigned int i; printf(" %*s", lbawidth, "start"); @@ -107,9 +133,7 @@ case MAP_TYPE_GPT_PART: printf("GPT part "); ent = m->map_data; - uuid_to_string(&ent->ent_type, &s, NULL); - printf("%s", s); - free(s); + printf("- %s", friendly(&ent->ent_type)); break; case MAP_TYPE_PMBR: printf("PMBR"); ==== //depot/projects/tty/sys/dev/usb/usb_quirks.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: usb_quirks.c,v 1.42 2003/01/02 04:19:00 imp Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.31 2003/01/02 04:22:44 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.32 2003/02/12 13:20:39 sanpei Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -91,6 +91,15 @@ { USB_VENDOR_HP, USB_PRODUCT_HP_810C, ANY, { UQ_BROKEN_BIDIR }}, { USB_VENDOR_HP, USB_PRODUCT_HP_830C, ANY, { UQ_BROKEN_BIDIR }}, { USB_VENDOR_HP, USB_PRODUCT_HP_1220C, ANY, { UQ_BROKEN_BIDIR }}, + /* YAMAHA router's ucdDevice is the version of farmware and often changes. */ + { USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA54I, + ANY, { UQ_ASSUME_CM_OVER_DATA }}, + { USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA55I, + ANY, { UQ_ASSUME_CM_OVER_DATA }}, + { USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65B, + ANY, { UQ_ASSUME_CM_OVER_DATA }}, + { USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65I, + ANY, { UQ_ASSUME_CM_OVER_DATA }}, { 0, 0, 0, { 0 } } }; ==== //depot/projects/tty/sys/dev/usb/usbdevs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.112 2003/02/11 00:15:01 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.113 2003/02/12 13:20:39 sanpei Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -1130,6 +1130,10 @@ /* Yamaha products */ product YAMAHA UX256 0x1000 UX256 MIDI I/F product YAMAHA UX96 0x1008 UX96 MIDI I/F +product YAMAHA RTA54I 0x4000 NetVolante RTA54i Broadband&ISDN Router +product YAMAHA RTA55I 0x4004 NetVolante RTA55i Broadband VoIP Router +product YAMAHA RTW65B 0x4001 NetVolante RTW65b Broadband Wireless Router +product YAMAHA RTW65I 0x4002 NetVolante RTW65i Broadband&ISDN Wireless Router /* Yano products */ product YANO U640MO 0x0101 U640MO-03 ==== //depot/projects/tty/sys/dev/usb/usbdevs.h#3 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.121 2003/02/11 00:16:56 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.122 2003/02/12 13:22:55 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.112 2003/02/11 00:15:01 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.113 2003/02/12 13:20:39 sanpei Exp */ /* @@ -1137,6 +1137,10 @@ /* Yamaha products */ #define USB_PRODUCT_YAMAHA_UX256 0x1000 /* UX256 MIDI I/F */ #define USB_PRODUCT_YAMAHA_UX96 0x1008 /* UX96 MIDI I/F */ +#define USB_PRODUCT_YAMAHA_RTA54I 0x4000 /* NetVolante RTA54i Broadband&ISDN Router */ +#define USB_PRODUCT_YAMAHA_RTA55I 0x4004 /* NetVolante RTA55i Broadband VoIP Router */ +#define USB_PRODUCT_YAMAHA_RTW65B 0x4001 /* NetVolante RTW65b Broadband Wireless Router */ +#define USB_PRODUCT_YAMAHA_RTW65I 0x4002 /* NetVolante RTW65i Broadband&ISDN Wireless Router */ /* Yano products */ #define USB_PRODUCT_YANO_U640MO 0x0101 /* U640MO-03 */ ==== //depot/projects/tty/sys/dev/usb/usbdevs_data.h#3 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.121 2003/02/11 00:16:56 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.122 2003/02/12 13:22:55 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.112 2003/02/11 00:15:01 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.113 2003/02/12 13:20:39 sanpei Exp */ /* @@ -2776,6 +2776,30 @@ "UX96 MIDI I/F", }, { + USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA54I, + 0, + "YAMAHA", + "NetVolante RTA54i Broadband&ISDN Router", + }, + { + USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTA55I, + 0, + "YAMAHA", + "NetVolante RTA55i Broadband VoIP Router", + }, + { + USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65B, + 0, + "YAMAHA", + "NetVolante RTW65b Broadband Wireless Router", + }, + { + USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_RTW65I, + 0, + "YAMAHA", + "NetVolante RTW65i Broadband&ISDN Wireless Router", + }, + { USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO, 0, "Yano", ==== //depot/projects/tty/sys/geom/geom_disk.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_disk.c,v 1.50 2003/02/11 21:23:34 phk Exp $ + * $FreeBSD: src/sys/geom/geom_disk.c,v 1.51 2003/02/12 16:30:46 tegge Exp $ */ #include "opt_geom.h" @@ -212,7 +212,7 @@ do { bp2->bio_offset += off; bp2->bio_length -= off; - bp2->bio_data -= off; + bp2->bio_data += off; if (bp2->bio_length > dp->d_maxsize) { /* * XXX: If we have a stripesize we should really ==== //depot/projects/tty/sys/i386/i386/pmap.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.385 2003/02/12 04:35:37 alc Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.387 2003/02/13 02:42:06 peter Exp $ */ /* @@ -259,6 +259,13 @@ { vm_offset_t newaddr = addr; +#ifdef I686_CPU_not /* Problem seems to have gone away */ + /* Deal with un-resolved Pentium4 issues */ + if (cpu_class == CPUCLASS_686 && + strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_id & 0xf00) == 0xf00) + return newaddr; +#endif #ifndef DISABLE_PSE if (cpu_feature & CPUID_PSE) newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1); @@ -370,6 +377,15 @@ if (cpu_feature & CPUID_PGE) pgeflag = PG_G; #endif +#ifdef I686_CPU_not /* Problem seems to have gone away */ + /* Deal with un-resolved Pentium4 issues */ + if (cpu_class == CPUCLASS_686 && + strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_id & 0xf00) == 0xf00) { + printf("Warning: Pentium 4 cpu: PG_G disabled (global flag)\n"); + pgeflag = 0; + } +#endif /* * Initialize the 4MB page size flag @@ -382,12 +398,24 @@ pdir4mb = 0; #ifndef DISABLE_PSE - if (cpu_feature & CPUID_PSE) { + if (cpu_feature & CPUID_PSE) + pseflag = PG_PS; +#endif +#ifdef I686_CPU_not /* Problem seems to have gone away */ + /* Deal with un-resolved Pentium4 issues */ + if (cpu_class == CPUCLASS_686 && + strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_id & 0xf00) == 0xf00) { + printf("Warning: Pentium 4 cpu: PG_PS disabled (4MB pages)\n"); + pseflag = 0; + } +#endif +#ifndef DISABLE_PSE + if (pseflag) { pd_entry_t ptditmp; /* * Note that we have enabled PSE mode */ - pseflag = PG_PS; ptditmp = *(PTmap + i386_btop(KERNBASE)); ptditmp &= ~(NBPDR - 1); ptditmp |= PG_V | PG_RW | PG_PS | PG_U | pgeflag; ==== //depot/projects/tty/sys/kern/kern_shutdown.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.139 2003/02/09 11:56:13 jeff Exp $ + * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.140 2003/02/13 01:33:59 peter Exp $ */ #include "opt_ddb.h" @@ -446,6 +446,7 @@ backtrace(void) { #ifdef DDB + printf("Stack backtrace:\n"); db_print_backtrace(); #else printf("Sorry, need DDB option to print backtrace"); @@ -512,7 +513,7 @@ #if defined(DDB) if (newpanic && trace_on_panic) - db_print_backtrace(); + backtrace(); if (debugger_on_panic) Debugger ("panic"); #ifdef RESTARTABLE_PANICS ==== //depot/projects/tty/sys/kern/subr_witness.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/subr_witness.c,v 1.135 2003/02/01 12:17:07 julian Exp $ + * $FreeBSD: src/sys/kern/subr_witness.c,v 1.136 2003/02/13 01:35:56 peter Exp $ */ /* @@ -170,6 +170,16 @@ #endif TUNABLE_INT("debug.witness_ddb", &witness_ddb); SYSCTL_INT(_debug, OID_AUTO, witness_ddb, CTLFLAG_RW, &witness_ddb, 0, ""); + +/* + * When DDB is enabled and witness_trace is set to 1, it will cause the system + * to print a stack trace: + * - a lock heirarchy violation occurs + * - locks are held when going to sleep. + */ +int witness_trace = 1; +TUNABLE_INT("debug.witness_trace", &witness_trace); +SYSCTL_INT(_debug, OID_AUTO, witness_trace, CTLFLAG_RW, &witness_trace, 0, ""); #endif /* DDB */ #ifdef WITNESS_SKIPSPIN @@ -717,8 +727,12 @@ out: #ifdef DDB - if (witness_ddb && go_into_ddb) - Debugger(__func__); + if (go_into_ddb) { + if (witness_trace) + backtrace(); + if (witness_ddb) + Debugger(__func__); + } #endif /* DDB */ w->w_file = file; w->w_line = line; ==== //depot/projects/tty/sys/net/bridge.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/bridge.c,v 1.65 2003/02/11 21:48:20 sam Exp $ + * $FreeBSD: src/sys/net/bridge.c,v 1.66 2003/02/12 19:34:34 peter Exp $ */ /* @@ -928,7 +928,7 @@ } ip = mtod(m0, struct ip *); } - } while (pfh = TAILQ_NEXT(pfh, pfil_link)); + } while ((pfh = TAILQ_NEXT(pfh, pfil_link)) != NULL); /* * If we get here, the firewall has passed the pkt, but the mbuf * pointer might have changed. Restore ip and the fields ntohs()'d. ==== //depot/projects/tty/sys/netinet/in_pcb.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.116 2003/01/30 05:43:08 sam Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.117 2003/02/12 23:55:07 hsu Exp $ */ #include "opt_ipsec.h" @@ -752,26 +752,26 @@ int s; s = splnet(); - INP_INFO_RLOCK(pcbinfo); + INP_INFO_WLOCK(pcbinfo); head = pcbinfo->listhead; for (inp = LIST_FIRST(head); inp != NULL; inp = ninp) { INP_LOCK(inp); ninp = LIST_NEXT(inp, inp_list); #ifdef INET6 if ((inp->inp_vflag & INP_IPV4) == 0) { - INP_UNLOCK(inp); + INP_UNLOCK(inp); continue; } #endif if (inp->inp_faddr.s_addr != faddr.s_addr || inp->inp_socket == NULL) { - INP_UNLOCK(inp); - continue; + INP_UNLOCK(inp); + continue; } - (*notify)(inp, errno); - INP_UNLOCK(inp); + if ((*notify)(inp, errno)) + INP_UNLOCK(inp); } - INP_INFO_RUNLOCK(pcbinfo); + INP_INFO_WUNLOCK(pcbinfo); splx(s); } ==== //depot/projects/tty/tools/tools/tinderbox/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/tools/tools/tinderbox/Makefile,v 1.1 2003/02/11 22:17:49 des Exp $ +# $FreeBSD: src/tools/tools/tinderbox/Makefile,v 1.2 2003/02/12 20:23:27 des Exp $ BINDIR ?= ${HOME}/bin BINOWN ?= ${USER} BINGRP ?= ${USER} -SCRIPTS = tinderbox.pl +SCRIPTS = tbmaster.pl tinderbox.pl .include <bsd.prog.mk> ==== //depot/projects/tty/tools/tools/tinderbox/tinderbox.pl#3 (text+ko) ==== @@ -26,7 +26,7 @@ # (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/tools/tools/tinderbox/tinderbox.pl,v 1.2 2003/02/12 09:13:36 des Exp $ +# $FreeBSD: src/tools/tools/tinderbox/tinderbox.pl,v 1.4 2003/02/12 20:29:05 des Exp $ # use strict; @@ -145,6 +145,8 @@ } closedir(DIR) or return warning("$dir: $!"); + message("rmdir $dir") + if ($verbose); return rmdir($dir); } @@ -155,8 +157,7 @@ if (!-d $dir && $dir =~ m|^(\S*)/([^\s/]+)$|) { make_dir($1) or return undef; - message("creating $dir") - if ($verbose); + message("mkdir $dir"); mkdir("$dir") or return undef; } @@ -166,8 +167,7 @@ sub cd($) { my $dir = shift; - message("cd $dir") - if ($verbose); + message("cd $dir"); chdir($dir) or error("$dir: $!"); } @@ -179,8 +179,7 @@ my $cmd = shift; # Command to run my @args = @_; # Arguments - message($cmd, @args) - if ($verbose); + message($cmd, @args); my $pid = fork(); if (!defined($pid)) { return warning("fork(): $!"); @@ -342,6 +341,7 @@ } $logfile = $1; logstage("logging to $logfile"); + unlink($logfile); open(STDOUT, '>', $logfile) or error("$logfile: $!"); open(STDERR, ">&STDOUT"); @@ -370,7 +370,7 @@ "-R", $verbose ? "-q" : "-Q", "-d$repository", - ); + ); if (-d "$sandbox/src") { push(@cvsargs, "update", "-Pd"); } else { ==== //depot/projects/tty/tools/tools/whereintheworld/whereintheworld.pl#2 (text+ko) ==== @@ -7,7 +7,7 @@ # Dag-Erling Smørgrav <des@freebsd.org> 09 January 2003 # # $Id: whereintheworld,v 1.3 2000/01/28 00:42:32 fenner Exp $ -# $FreeBSD: src/tools/tools/whereintheworld/whereintheworld.pl,v 1.3 2003/01/18 12:15:34 des Exp $ +# $FreeBSD: src/tools/tools/whereintheworld/whereintheworld.pl,v 1.4 2003/02/12 09:51:47 des Exp $ # use strict; @@ -34,6 +34,10 @@ $lastwasdash = 0; next; } + if ($line =~ /^TB /) { + print $line; + next; + } if ($line =~ /^=+>/) { @lines = (); } @@ -58,7 +62,7 @@ } } foreach $line (@lines) { - if (!$error && length($line) >= $width) { + if (!$error && $line !~ m/^TB / && length($line) >= $width) { substr($line, $width - 7) = " [...]\n"; } print $line; ==== //depot/projects/tty/usr.bin/yacc/skeleton.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.36 2003/02/08 17:23:22 davidc Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $"); #include "defs.h" @@ -59,11 +59,14 @@ const char *banner[] = { + "#include <stdlib.h>", "#ifndef lint", + "#ifdef __unused", + "__unused", + "#endif", "static char const ", - "yyrcsid[] = \"$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.36 2003/02/08 17:23:22 davidc Exp $\";", + "yyrcsid[] = \"$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $\";", "#endif", - "#include <stdlib.h>", "#define YYBYACC 1", "#define YYMAJOR 1", "#define YYMINOR 9", ==== //depot/projects/tty/usr.sbin/syslogd/syslog.conf.5#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)syslog.conf.5 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.31 2002/12/24 01:04:42 trhodes Exp $ +.\" $FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.32 2003/02/13 00:08:56 thomas Exp $ .\" .Dd June 9, 1993 .Dt SYSLOG.CONF 5 @@ -196,6 +196,15 @@ .Ql !-prog specification will match any message but the ones from that program. +Multiple programs may be listed, separated by commas: +.Ql !prog1,prog2 +matches messages from either program, while +.Ql !-prog1,prog2 +matches all messages but those from +.Ql prog1 +or +.Ql prog2 . +.Pp A .Em hostname >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302130419.h1D4JL7t024855>