CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Tue Nov 1 09:26:37 UTC 2011
Modified Files:
src/distrib/utils/sysinst: Makefile.inc
Log Message:
If we are not building SMALLPROG, there is no need to strip out INET6
support.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/distrib/utils/sysinst/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/Makefile.inc
diff -u src/distrib/utils/sysinst/Makefile.inc:1.56 src/distrib/utils/sysinst/Makefile.inc:1.57
--- src/distrib/utils/sysinst/Makefile.inc:1.56 Thu Aug 25 17:39:58 2011
+++ src/distrib/utils/sysinst/Makefile.inc Tue Nov 1 09:26:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.56 2011/08/25 17:39:58 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.57 2011/11/01 09:26:37 martin Exp $
#
# Makefile for sysinst
@@ -42,7 +42,7 @@ CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.C
-DREL=\${DISTRIBVER}\ -DMACH=\${MACHINE}\ \
-DMACH_${MACHINE} -DARCH_${MACHINE_ARCH}
-.if defined(SMALLPROG_INET6) (${USE_INET6} != no)
+.if (!defined(SMALLPROG) || defined(SMALLPROG_INET6)) (${USE_INET6} != no)
CPPFLAGS+=-DINET6
.endif
CVS commit: src/distrib/sparc64/instfs
Module Name:src
Committed By: martin
Date: Tue Nov 1 09:28:14 UTC 2011
Modified Files:
src/distrib/sparc64/instfs: Makefile
Log Message:
Enable INET6 in the installer
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/sparc64/instfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc64/instfs/Makefile
diff -u src/distrib/sparc64/instfs/Makefile:1.15 src/distrib/sparc64/instfs/Makefile:1.16
--- src/distrib/sparc64/instfs/Makefile:1.15 Sun Jul 10 08:51:24 2011
+++ src/distrib/sparc64/instfs/Makefile Tue Nov 1 09:28:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/07/10 08:51:24 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2011/11/01 09:28:14 martin Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -15,6 +15,11 @@ IMAGETAR_RELEASEDIR= installation/misc
MDSETTARGETS= INSTALL ${IMAGE} -
MDSET_RELEASEDIR= binary/kernel
+SMALLPROG_INET6=1
+.if ${USE_INET6} != no
+LISTS+= ${DISTRIBDIR}/common/list.inet6
+.endif
+
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
.include ${HACKSRC}/Makefile.inc
CVS commit: xsrc/xfree/xc
Module Name:xsrc
Committed By: chs
Date: Tue Nov 1 12:52:24 UTC 2011
Modified Files:
xsrc/xfree/xc/lib/X11: imRm.c
xsrc/xfree/xc/lib/Xaw: XawIm.c
xsrc/xfree/xc/lib/Xp: XpNotifyPdm.c
xsrc/xfree/xc/programs/Xserver/Xprint: attributes.c
xsrc/xfree/xc/programs/Xserver/dix: devices.c
xsrc/xfree/xc/programs/xtrap: xtrapin.c xtrapinfo.c xtrapout.c
xtrapproto.c xtrapreset.c xtrapstats.c
Log Message:
use 0 rather than NULL in integer contexts.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/xfree/xc/lib/X11/imRm.c
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/xfree/xc/lib/Xaw/XawIm.c
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/xfree/xc/lib/Xp/XpNotifyPdm.c
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/xfree/xc/programs/Xserver/Xprint/attributes.c
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/xfree/xc/programs/Xserver/dix/devices.c
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/xfree/xc/programs/xtrap/xtrapin.c \
xsrc/xfree/xc/programs/xtrap/xtrapinfo.c \
xsrc/xfree/xc/programs/xtrap/xtrapreset.c \
xsrc/xfree/xc/programs/xtrap/xtrapstats.c
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/xfree/xc/programs/xtrap/xtrapout.c
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/xfree/xc/programs/xtrap/xtrapproto.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/lib/X11/imRm.c
diff -u xsrc/xfree/xc/lib/X11/imRm.c:1.1.1.4 xsrc/xfree/xc/lib/X11/imRm.c:1.2
--- xsrc/xfree/xc/lib/X11/imRm.c:1.1.1.4 Fri Mar 5 14:24:13 2004
+++ xsrc/xfree/xc/lib/X11/imRm.c Tue Nov 1 12:52:23 2011
@@ -509,7 +509,7 @@ _XimDefaultArea(
if(XGetGeometry(im-core.display, (Drawable)ic-core.focus_window,
root_return, x_return, y_return, width_return,
height_return, border_width_return, depth_return)
- == (Status)NULL) {
+ == (Status)0) {
return True;
}
area.x = 0;
@@ -538,7 +538,7 @@ _XimDefaultColormap(
return True;
}
if(XGetWindowAttributes(im-core.display, ic-core.client_window,
- win_attr) == (Status)NULL) {
+ win_attr) == (Status)0) {
return True;
}
Index: xsrc/xfree/xc/lib/Xaw/XawIm.c
diff -u xsrc/xfree/xc/lib/Xaw/XawIm.c:1.1.1.5 xsrc/xfree/xc/lib/Xaw/XawIm.c:1.2
--- xsrc/xfree/xc/lib/Xaw/XawIm.c:1.1.1.5 Fri Mar 5 14:24:22 2004
+++ xsrc/xfree/xc/lib/Xaw/XawIm.c Tue Nov 1 12:52:24 2011
@@ -185,14 +185,14 @@ static VendorShellWidget SearchVendorShe
return(NULL);
}
-static XContext extContext = (XContext)NULL;
+static XContext extContext = (XContext)0;
static XawVendorShellExtPart *
SetExtPart(VendorShellWidget w, XawVendorShellExtWidget vew)
{
contextDataRec *contextData;
-if (extContext == (XContext)NULL) extContext = XUniqueContext();
+if (extContext == (XContext)0) extContext = XUniqueContext();
contextData = XtNew(contextDataRec);
contextData-parent = (Widget)w;
@@ -297,13 +297,13 @@ ConfigureCB(Widget w, XtPointer closure,
}
}
-static XContext errContext = (XContext)NULL;
+static XContext errContext = (XContext)0;
static Widget SetErrCnxt(Widget w, XIM xim)
{
contextErrDataRec *contextErrData;
-if (errContext == (XContext)NULL) errContext = XUniqueContext();
+if (errContext == (XContext)0) errContext = XUniqueContext();
contextErrData = XtNew(contextErrDataRec);
contextErrData-widget = w;
@@ -1404,12 +1404,12 @@ Destroy(Widget w, XawVendorShellExtPart
return;
XtFree( (char*) ve-im.resources );
-if (extContext != (XContext)NULL
+if (extContext != (XContext)0
!XFindContext (XtDisplay (w), (Window)w,
extContext, (XPointer*)contextData))
XtFree( (char*) contextData );
-if (errContext != (XContext)NULL
+if (errContext != (XContext)0
!XFindContext (XDisplayOfIM( ve-im.xim ), (Window) ve-im.xim,
errContext, (XPointer*) contextErrData))
XtFree( (char*) contextErrData );
Index: xsrc/xfree/xc/lib/Xp/XpNotifyPdm.c
diff -u xsrc/xfree/xc/lib/Xp/XpNotifyPdm.c:1.1.1.5 xsrc/xfree/xc/lib/Xp/XpNotifyPdm.c:1.2
--- xsrc/xfree/xc/lib/Xp/XpNotifyPdm.c:1.1.1.5 Fri Mar 5 14:24:27 2004
+++ xsrc/xfree/xc/lib/Xp/XpNotifyPdm.c Tue Nov 1 12:52:24 2011
@@ -228,7 +228,7 @@ XpGetPdmStartParams (
/*
* Error - cannot determine or establish a selection_display.
*/
- return( (Status) NULL );
+ return( (Status) 0 );
}
/*
@@ -265,7 +265,7 @@ XpGetPdmStartParams (
XCloseDisplay( *selection_display );
*selection_display = (Display *) NULL;
}
- return( (Status) NULL );
+ return( (Status) 0 );
}
status = XmbTextListToTextProperty( *selection_display, list, 6,
@@ -280,7 +280,7 @@ XpGetPdmStartParams (
XCloseDisplay( *selection_display );
*selection_display = (Display *) NULL;
}
- return( (Status) NULL );
+ return( (Status) 0 );
}
*type = text_prop.encoding;
@@ -894,4 +894,3 @@ XpNotifyPdm (
return( _xpstrdup( cdata ) );
}
}
-
Index:
CVS commit: src/regress/sys/net/ether_aton_r
Module Name:src
Committed By: ws
Date: Tue Nov 1 12:52:28 UTC 2011
Modified Files:
src/regress/sys/net/ether_aton_r: autogen
Log Message:
Replace ed usage with awk script.
Fixes PR toolchain/45532, generating the exact same output as previously.
Note that it doesn't address Tsutsui's additional check request.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/regress/sys/net/ether_aton_r/autogen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/regress/sys/net/ether_aton_r/autogen
diff -u src/regress/sys/net/ether_aton_r/autogen:1.1 src/regress/sys/net/ether_aton_r/autogen:1.2
--- src/regress/sys/net/ether_aton_r/autogen:1.1 Wed May 19 21:55:36 2010
+++ src/regress/sys/net/ether_aton_r/autogen Tue Nov 1 12:52:28 2011
@@ -1,26 +1,25 @@
#!/bin/sh
-cat __EOF $2
-
-#include ctype.h
-#include sys/types.h
-#include errno.h
-
-#define ETHER_ADDR_LEN 6
-
-int ether_aton_r(u_char *dest, size_t len, const char *str);
-
-__EOF
-
-ed $1 _EOF /dev/null 21
-1
-/^ether_aton_r/
--
--
-1,.d
-/^}$/
-+
-.,\$d
-W $2
-q
-_EOF
+awk '
+BEGIN {
+ print
+ print #include ctype.h
+ print #include sys/types.h
+ print #include errno.h
+ print
+ print #define ETHER_ADDR_LEN 6
+ print
+ print int ether_aton_r(u_char *dest, size_t len, const char *str);
+ print
+}
+/^ether_aton_r/ {
+ print prevline
+ out = 1
+}
+{
+ if (out) print
+ else prevline = $0
+}
+/^}$/ {
+ if (out) exit(0)
+}' $1 $2
CVS commit: src/share/man/man9
Module Name:src Committed By: yamt Date: Tue Nov 1 13:33:05 UTC 2011 Modified Files: src/share/man/man9: Makefile Added Files: src/share/man/man9: scanc.9 Log Message: document scanc To generate a diff of this commit: cvs rdiff -u -r1.355 -r1.356 src/share/man/man9/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man9/scanc.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.355 src/share/man/man9/Makefile:1.356 --- src/share/man/man9/Makefile:1.355 Mon Oct 24 07:31:31 2011 +++ src/share/man/man9/Makefile Tue Nov 1 13:33:05 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.355 2011/10/24 07:31:31 yamt Exp $ +# $NetBSD: Makefile,v 1.356 2011/11/01 13:33:05 yamt Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -43,6 +43,7 @@ MAN= accept_filter.9 accf_data.9 accf_ht preempt.9 proc_find.9 pserialize.9 putter.9 \ radio.9 ras.9 rasops.9 ratecheck.9 resettodr.9 rnd.9 roundup.9 \ rssadapt.9 rt_timer.9 rwlock.9 RUN_ONCE.9 STACK.9 \ + scanc.9 \ sched_4bsd.9 sched_m2.9 scsipi.9 \ secmodel.9 secmodel_bsd44.9 secmodel_overlay.9 secmodel_securelevel.9 \ secmodel_suser.9 SET.9 setbit.9 setjmp.9 shutdownhook_establish.9 \ Added files: Index: src/share/man/man9/scanc.9 diff -u /dev/null src/share/man/man9/scanc.9:1.1 --- /dev/null Tue Nov 1 13:33:05 2011 +++ src/share/man/man9/scanc.9 Tue Nov 1 13:33:05 2011 @@ -0,0 +1,64 @@ +.\ $NetBSD: scanc.9,v 1.1 2011/11/01 13:33:05 yamt Exp $ +.\ +.\ Copyright (c)2011 YAMAMOTO Takashi, +.\ 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. +.\ +.\ +.Dd November 1, 2011 +.Dt SCANC 9 +.Os +.\ +.Sh NAME +.Nm scanc +.Nd Scan characters +.\ +.Sh SYNOPSIS +.In lib/libkern/libkern.h +.\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +.Ft int +.Fn scanc \ +size_t size const u_char *cp const u_char table[] int mask +.\ +.Sh DESCRIPTION +The +.Fn scanc +function scans the byte string +.Fa cp , +whose length is +.Fa size . +A character in the string is used as an index in the 256-byte +.Fa table . +If a bitwise-AND of the byte from the table and +.Fa mask +isn't zero or the string is exausted, the scan stops. +.\ +.Sh RETURN VALUES +The +.Fn scanc +function returns the number of characters skipped. +.\ +.Sh HISTORY +The +.Fn scanc +function emulates a VAX instruction with the same name.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: yamt Date: Tue Nov 1 13:34:35 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: sort To generate a diff of this commit: cvs rdiff -u -r1.1699 -r1.1700 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1699 src/distrib/sets/lists/comp/mi:1.1700 --- src/distrib/sets/lists/comp/mi:1.1699 Fri Oct 28 07:23:16 2011 +++ src/distrib/sets/lists/comp/mi Tue Nov 1 13:34:33 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1699 2011/10/28 07:23:16 jruoho Exp $ +# $NetBSD: mi,v 1.1700 2011/11/01 13:34:33 yamt Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3259,10 +3259,10 @@ ./usr/lib/libsl.acomp-krb5-lib kerberos ./usr/lib/libsl_g.a-unknown- kerberos,debuglib ./usr/lib/libsl_p.acomp-krb5-proflib profile,kerberos +./usr/lib/libsm.acomp-obsolete obsolete ./usr/lib/libsqlite3.acomp-c-clib ./usr/lib/libsqlite3_g.a -unknown- debuglib ./usr/lib/libsqlite3_p.a comp-c-proflib profile -./usr/lib/libsm.acomp-obsolete obsolete ./usr/lib/libss.acomp-obsolete obsolete ./usr/lib/libss_g.a-unknown- obsolete ./usr/lib/libss_p.acomp-obsolete obsolete @@ -3492,8 +3492,8 @@ ./usr/libdata/debug/usr/bin/addr2line.debug comp-debug-debug binutils,debug ./usr/libdata/debug/usr/bin/apply.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/apropos.debug comp-man-debug debug -./usr/libdata/debug/usr/bin/arpaname.debug comp-bind-debug debug ./usr/libdata/debug/usr/bin/ar.debug comp-util-debug binutils,debug +./usr/libdata/debug/usr/bin/arpaname.debug comp-bind-debug debug ./usr/libdata/debug/usr/bin/as.debug comp-util-debug binutils,debug ./usr/libdata/debug/usr/bin/asa.debug comp-fortran-debug debug ./usr/libdata/debug/usr/bin/at.debug comp-cron-debug debug @@ -3504,8 +3504,8 @@ ./usr/libdata/debug/usr/bin/atf-run.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/bin/atf-sh.debug comp-atf-debug atf,debug ./usr/libdata/debug/usr/bin/atf-version.debug comp-atf-debug atf,debug -./usr/libdata/debug/usr/bin/audioctl.debug comp-audio-debug debug ./usr/libdata/debug/usr/bin/audiocfg.debug comp-audio-debug debug +./usr/libdata/debug/usr/bin/audioctl.debug comp-audio-debug debug ./usr/libdata/debug/usr/bin/audioplay.debug comp-audio-debug debug ./usr/libdata/debug/usr/bin/audiorecord.debug comp-audio-debug debug ./usr/libdata/debug/usr/bin/awk.debug comp-util-debug debug @@ -3550,7 +3550,6 @@ ./usr/libdata/debug/usr/bin/ctfmerge.debug comp-util-debug dtrace,debug ./usr/libdata/debug/usr/bin/cut.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/cvs.debug comp-cvs-debug cvs,debug -./usr/libdata/debug/usr/bin/elfedit.debug comp-util-debug binutils,debug ./usr/libdata/debug/usr/bin/db.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/dc.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/deroff.debug comp-util-debug debug @@ -3561,6 +3560,7 @@ ./usr/libdata/debug/usr/bin/dns-sd.debug comp-mdns-debug mdns,debug ./usr/libdata/debug/usr/bin/du.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/eject.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/elfedit.debug comp-util-debug binutils,debug ./usr/libdata/debug/usr/bin/env.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/eqn.debug comp-groff-debug groff,debug ./usr/libdata/debug/usr/bin/error.debug comp-util-debug debug @@ -4711,8 +4711,8 @@ ./usr/share/man/cat2/fsync.0 comp-c-catman .cat ./usr/share/man/cat2/fsync_range.0 comp-c-catman .cat ./usr/share/man/cat2/ftruncate.0 comp-c-catman .cat -./usr/share/man/cat2/futimes.0 comp-c-catman .cat ./usr/share/man/cat2/futimens.0 comp-c-catman .cat +./usr/share/man/cat2/futimes.0 comp-c-catman .cat ./usr/share/man/cat2/getcontext.0 comp-c-catman .cat ./usr/share/man/cat2/getdents.0 comp-c-catman .cat ./usr/share/man/cat2/getdirentries.0 comp-obsolete obsolete @@ -7710,9 +7710,9 @@ ./usr/share/man/cat3/libperfuse.0 comp-perfuse-catman .cat ./usr/share/man/cat3/libradius.0 comp-c-catman .cat ./usr/share/man/cat3/libsaslc.0 comp-c-catman crypto,.cat -./usr/share/man/cat3/libutil.0 comp-c-catman .cat ./usr/share/man/cat3/libusb.0 comp-obsolete obsolete ./usr/share/man/cat3/libusbhid.0 comp-c-catman .cat +./usr/share/man/cat3/libutil.0 comp-c-catman .cat ./usr/share/man/cat3/limits.0 comp-c-catman .cat ./usr/share/man/cat3/link_addr.0 comp-c-catman .cat ./usr/share/man/cat3/link_field.0 comp-c-catman .cat @@ -8125,9 +8125,6 @@ ./usr/share/man/cat3/post_form.0 comp-c-catman .cat ./usr/share/man/cat3/pow.0 comp-c-catman .cat ./usr/share/man/cat3/powf.0 comp-c-catman .cat -./usr/share/man/cat3/prefresh.0 comp-c-catman .cat
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: yamt Date: Tue Nov 1 13:35:39 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: add scanc To generate a diff of this commit: cvs rdiff -u -r1.1700 -r1.1701 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1700 src/distrib/sets/lists/comp/mi:1.1701 --- src/distrib/sets/lists/comp/mi:1.1700 Tue Nov 1 13:34:33 2011 +++ src/distrib/sets/lists/comp/mi Tue Nov 1 13:35:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1700 2011/11/01 13:34:33 yamt Exp $ +# $NetBSD: mi,v 1.1701 2011/11/01 13:35:38 yamt Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -10470,6 +10470,7 @@ ./usr/share/man/cat9/rw_tryupgrade.0 comp-sys-catman .cat ./usr/share/man/cat9/rw_write_held.0 comp-sys-catman .cat ./usr/share/man/cat9/rwlock.0 comp-sys-catman .cat +./usr/share/man/cat9/scanc.0 comp-sys-catman .cat ./usr/share/man/cat9/sched_4bsd.0 comp-sys-catman .cat ./usr/share/man/cat9/sched_lock_idle.0 comp-obsolete obsolete ./usr/share/man/cat9/sched_m2.0 comp-sys-catman .cat @@ -16554,6 +16555,7 @@ ./usr/share/man/html9/rw_tryupgrade.html comp-sys-htmlman html ./usr/share/man/html9/rw_write_held.html comp-sys-htmlman html ./usr/share/man/html9/rwlock.html comp-sys-htmlman html +./usr/share/man/html9/scanc.html comp-sys-htmlman html ./usr/share/man/html9/sched_4bsd.html comp-sys-htmlman html ./usr/share/man/html9/sched_m2.html comp-sys-htmlman html ./usr/share/man/html9/sched_psignal.html comp-obsolete obsolete @@ -22827,6 +22829,7 @@ ./usr/share/man/man9/rw_tryupgrade.9 comp-sys-man .man ./usr/share/man/man9/rw_write_held.9 comp-sys-man .man ./usr/share/man/man9/rwlock.9 comp-sys-man .man +./usr/share/man/man9/scanc.9 comp-sys-man .man ./usr/share/man/man9/sched_4bsd.9 comp-sys-man .man ./usr/share/man/man9/sched_lock_idle.9 comp-obsolete obsolete ./usr/share/man/man9/sched_m2.9 comp-sys-man .man
CVS commit: src/share/man/man9
Module Name:src Committed By: yamt Date: Tue Nov 1 13:36:15 UTC 2011 Modified Files: src/share/man/man9: Makefile Added Files: src/share/man/man9: skpc.9 Log Message: document skpc To generate a diff of this commit: cvs rdiff -u -r1.356 -r1.357 src/share/man/man9/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man9/skpc.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.356 src/share/man/man9/Makefile:1.357 --- src/share/man/man9/Makefile:1.356 Tue Nov 1 13:33:05 2011 +++ src/share/man/man9/Makefile Tue Nov 1 13:36:15 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.356 2011/11/01 13:33:05 yamt Exp $ +# $NetBSD: Makefile,v 1.357 2011/11/01 13:36:15 yamt Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -47,7 +47,7 @@ MAN= accept_filter.9 accf_data.9 accf_ht sched_4bsd.9 sched_m2.9 scsipi.9 \ secmodel.9 secmodel_bsd44.9 secmodel_overlay.9 secmodel_securelevel.9 \ secmodel_suser.9 SET.9 setbit.9 setjmp.9 shutdownhook_establish.9 \ - signal.9 sockopt.9 softintr.9 spl.9 splraiseipl.9 \ + signal.9 skpc.9 sockopt.9 softintr.9 spl.9 splraiseipl.9 \ store.9 suspendsched.9 \ sysctl.9 sysmon_envsys.9 sysmon_pswitch.9 sysmon_taskq.9 tc.9 \ tcp_congctl.9 timecounter.9 time_second.9 todr.9 tvtohz.9 \ Added files: Index: src/share/man/man9/skpc.9 diff -u /dev/null src/share/man/man9/skpc.9:1.1 --- /dev/null Tue Nov 1 13:36:15 2011 +++ src/share/man/man9/skpc.9 Tue Nov 1 13:36:15 2011 @@ -0,0 +1,62 @@ +.\ $NetBSD: skpc.9,v 1.1 2011/11/01 13:36:15 yamt Exp $ +.\ +.\ Copyright (c)2011 YAMAMOTO Takashi, +.\ 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. +.\ +.\ +.Dd November 1, 2011 +.Dt SKPC 9 +.Os +.\ +.Sh NAME +.Nm skpc +.Nd Skip a character in a byte string +.\ +.Sh SYNOPSIS +.In lib/libkern/libkern.h +.\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +.Ft int +.Fn skpc \ +u_char mask size_t size u_char *cp +.\ +.Sh DESCRIPTION +The +.Fn skpc +function scans the byte string +.Fa cp , +whose length is +.Fa size , +until it finds the first character which isn't equal to +.Fa mask +or the string is exhausted. +.\ +.Sh RETURN VALUES +The +.Fn skpc +function returns the number of characters skipped. +.\ +.Sh HISTORY +The +.Fn skpc +function emulates a VAX instruction with the same name.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: yamt Date: Tue Nov 1 13:37:32 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: add skpc To generate a diff of this commit: cvs rdiff -u -r1.1701 -r1.1702 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1701 src/distrib/sets/lists/comp/mi:1.1702 --- src/distrib/sets/lists/comp/mi:1.1701 Tue Nov 1 13:35:38 2011 +++ src/distrib/sets/lists/comp/mi Tue Nov 1 13:37:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1701 2011/11/01 13:35:38 yamt Exp $ +# $NetBSD: mi,v 1.1702 2011/11/01 13:37:32 yamt Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -10518,6 +10518,7 @@ ./usr/share/man/cat9/simple_lock_try.0 comp-sys-catman .cat ./usr/share/man/cat9/simple_lock_unlock.0 comp-obsolete obsolete ./usr/share/man/cat9/simple_unlock.0 comp-sys-catman .cat +./usr/share/man/cat9/skpc.0 comp-sys-catman .cat ./usr/share/man/cat9/sleep.0 comp-obsolete obsolete ./usr/share/man/cat9/snprintf.0 comp-sys-catman .cat ./usr/share/man/cat9/sockopt.0 comp-sys-catman .cat @@ -16597,6 +16598,7 @@ ./usr/share/man/html9/simple_lock_init.html comp-sys-htmlman html ./usr/share/man/html9/simple_lock_try.html comp-sys-htmlman html ./usr/share/man/html9/simple_unlock.html comp-sys-htmlman html +./usr/share/man/html9/skpc.html comp-sys-htmlman html ./usr/share/man/html9/snprintf.html comp-sys-htmlman html ./usr/share/man/html9/sockopt.html comp-sys-htmlman html ./usr/share/man/html9/sockopt_destroy.html comp-sys-htmlman html @@ -22877,6 +22879,7 @@ ./usr/share/man/man9/simple_lock_try.9 comp-sys-man .man ./usr/share/man/man9/simple_lock_unlock.9 comp-obsolete obsolete ./usr/share/man/man9/simple_unlock.9 comp-sys-man .man +./usr/share/man/man9/skpc.9 comp-sys-man .man ./usr/share/man/man9/sleep.9 comp-obsolete obsolete ./usr/share/man/man9/snprintf.9 comp-sys-man .man ./usr/share/man/man9/sockopt.9 comp-sys-man .man
CVS commit: src/regress/sys/net/ether_aton_r
Module Name:src
Committed By: christos
Date: Tue Nov 1 13:59:00 UTC 2011
Modified Files:
src/regress/sys/net/ether_aton_r: main.c
Log Message:
Test all digits.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/regress/sys/net/ether_aton_r/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/regress/sys/net/ether_aton_r/main.c
diff -u src/regress/sys/net/ether_aton_r/main.c:1.2 src/regress/sys/net/ether_aton_r/main.c:1.3
--- src/regress/sys/net/ether_aton_r/main.c:1.2 Wed May 19 17:59:34 2010
+++ src/regress/sys/net/ether_aton_r/main.c Tue Nov 1 09:59:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.2 2010/05/19 21:59:34 christos Exp $ */
+/* $NetBSD: main.c,v 1.3 2011/11/01 13:59:00 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: main.c,v 1.2 2010/05/19 21:59:34 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.3 2011/11/01 13:59:00 christos Exp $);
#include stdio.h
#include ctype.h
@@ -49,24 +49,25 @@ __RCSID($NetBSD: main.c,v 1.2 2010/05/1
int ether_aton_r(u_char *dest, size_t len, const char *str);
+static const struct {
+ u_char res[ETHER_ADDR_LEN];
+ const char *str;
+ int error;
+} tests[] = {
+ { { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }, 01:23:45:67:89:ab, 0 },
+ { { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, 0:1:22-3:14:05, 0 },
+ { { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, 000122031405, 0 },
+ { { 0x0a, 0x0B, 0xcc, 0xdD, 0xEE, 0x0f }, 0a0BccdDEE0f, 0 },
+#define ZERO { 0, 0, 0, 0, 0, 0 }
+ { ZERO, 0:1:2-3:04:05:06, ENAMETOOLONG },
+ { ZERO, 0:1:2-3:04:, ENOBUFS },
+ { ZERO, 0:1:2-3:04:x7, EINVAL },
+ { ZERO, 1:x-3:04:05:7, EINVAL },
+ { ZERO, NULL, 0 },
+};
int
main(int argc, char *argv[])
{
- static const struct {
- u_char res[ETHER_ADDR_LEN];
- const char *str;
- int error;
- } tests[] = {
-#define ZERO { 0, 0, 0, 0, 0, 0 }
- { { 0, 1, 0x22, 3, 0x14, 5 }, 0:1:22-3:14:05, 0 },
- { { 0, 1, 0x22, 3, 0x14, 5 }, 000122031405, 0 },
- { { 0xa, 0xB, 0xcc, 0xdD, 0xEE, 0xf }, 0a0BccdDEE0f, 0 },
- { ZERO, 0:1:2-3:04:05:06, ENAMETOOLONG },
- { ZERO, 0:1:2-3:04:, ENOBUFS },
- { ZERO, 0:1:2-3:04:x7, EINVAL },
- { ZERO, 1:x-3:04:05:7, EINVAL },
- { ZERO, NULL, 0 },
- };
u_char dest[ETHER_ADDR_LEN];
size_t t;
int e, r;
CVS commit: src/sys/kern
Module Name:src
Committed By: jym
Date: Tue Nov 1 15:39:37 UTC 2011
Modified Files:
src/sys/kern: kern_kthread.c
Log Message:
Avoid crashing when we do not explictly pass down a CPU when creating
a kthread(9) in the LSIDL (KTHREAD_IDLE) state.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/kern/kern_kthread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_kthread.c
diff -u src/sys/kern/kern_kthread.c:1.37 src/sys/kern/kern_kthread.c:1.38
--- src/sys/kern/kern_kthread.c:1.37 Sat Oct 29 20:11:08 2011
+++ src/sys/kern/kern_kthread.c Tue Nov 1 15:39:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_kthread.c,v 1.37 2011/10/29 20:11:08 jym Exp $ */
+/* $NetBSD: kern_kthread.c,v 1.38 2011/11/01 15:39:37 jym Exp $ */
/*-
* Copyright (c) 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_kthread.c,v 1.37 2011/10/29 20:11:08 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_kthread.c,v 1.38 2011/11/01 15:39:37 jym Exp $);
#include sys/param.h
#include sys/systm.h
@@ -140,8 +140,12 @@ kthread_create(pri_t pri, int flag, stru
l-l_stat = LSRUN;
sched_enqueue(l, false);
lwp_unlock(l);
- } else
- lwp_unlock_to(l, ci-ci_schedstate.spc_lwplock);
+ } else {
+ if (ci != NULL)
+ lwp_unlock_to(l, ci-ci_schedstate.spc_lwplock);
+ else
+ lwp_unlock(l);
+ }
mutex_exit(proc0.p_lock);
/* All done! */
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: phx
Date: Tue Nov 1 16:32:57 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/altboot: brdsetup.c dsk.c pciide.c
Log Message:
The Apollo family of IDE interface chips has both channels disabled by
default, so we have to enable them in a new chipfix function. Also move
the channel enable code for the 82C686B from encpcifix() to pciide.c.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sandpoint/stand/altboot/brdsetup.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sandpoint/stand/altboot/dsk.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sandpoint/stand/altboot/pciide.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/stand/altboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.19 src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.20
--- src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.19 Sun Oct 30 21:08:33 2011
+++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c Tue Nov 1 16:32:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.19 2011/10/30 21:08:33 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.20 2011/11/01 16:32:57 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -454,25 +454,20 @@ encpcifix(struct brdprop *brd)
/*
* IDE fixup
* - native mode (ide 0x09)
- * - use primary only (ide 0x40)
*/
+
/* ide: 0x09 - programming interface; 1000'SsPp */
val = pcicfgread(ide, 0x08) 0x00ff;
pcicfgwrite(ide, 0x08, val | (0x8f 8));
/* ide: 0x10-20 - leave them PCI memory space assigned */
-
- /* ide: 0x40 - use primary only */
- val = pcicfgread(ide, 0x40) ~ 03;
- val |= 02;
- pcicfgwrite(ide, 0x40, val);
#else
/*
* IDE fixup
* - compatiblity mode (ide 0x09)
- * - use primary only (ide 0x40)
* - remove PCI pin assignment (ide 0x3d)
*/
+
/* ide: 0x09 - programming interface; 1000'SsPp */
val = pcicfgread(ide, 0x08) 0x00ff;
val |= (0x8a 8);
@@ -480,22 +475,17 @@ encpcifix(struct brdprop *brd)
/* ide: 0x10-20 */
/*
- experiment shows writing ide: 0x09 changes these
- register behaviour. The pcicfgwrite() above writes
- 0x8a at ide: 0x09 to make sure legacy IDE. Then
- reading BAR0-3 is to return value 0s even though
- pcisetup() has written range assignments. Value
- overwrite makes no effect. Having 0x8f for native
- PCIIDE doesn't change register values and brings no
- weirdness.
+ * experiment shows writing ide: 0x09 changes these
+ * register behaviour. The pcicfgwrite() above writes
+ * 0x8a at ide: 0x09 to make sure legacy IDE. Then
+ * reading BAR0-3 is to return value 0s even though
+ * pcisetup() has written range assignments. Value
+ * overwrite makes no effect. Having 0x8f for native
+ * PCIIDE doesn't change register values and brings no
+ * weirdness.
*/
- /* ide: 0x40 - use primary only */
- val = pcicfgread(ide, 0x40) ~ 03;
- val |= 02;
- pcicfgwrite(ide, 0x40, val);
-
- /* ide: 0x3d/3c - turn off PCI pin */
+ /* ide: 0x3d/3c - turn off PCI pin */
val = pcicfgread(ide, 0x3c) 0x00ff;
pcicfgwrite(ide, 0x3c, val);
#endif
Index: src/sys/arch/sandpoint/stand/altboot/dsk.c
diff -u src/sys/arch/sandpoint/stand/altboot/dsk.c:1.9 src/sys/arch/sandpoint/stand/altboot/dsk.c:1.10
--- src/sys/arch/sandpoint/stand/altboot/dsk.c:1.9 Sun Oct 30 21:08:33 2011
+++ src/sys/arch/sandpoint/stand/altboot/dsk.c Tue Nov 1 16:32:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dsk.c,v 1.9 2011/10/30 21:08:33 phx Exp $ */
+/* $NetBSD: dsk.c,v 1.10 2011/11/01 16:32:57 phx Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -102,6 +102,8 @@ dskdv_init(void *self)
return 0;
found:
pci-drv = (*dv-init)(tag, NULL);
+ if (pci-drv == NULL)
+ return 0;
disk_scan(pci-drv);
return 1;
}
Index: src/sys/arch/sandpoint/stand/altboot/pciide.c
diff -u src/sys/arch/sandpoint/stand/altboot/pciide.c:1.7 src/sys/arch/sandpoint/stand/altboot/pciide.c:1.8
--- src/sys/arch/sandpoint/stand/altboot/pciide.c:1.7 Mon Apr 25 18:30:18 2011
+++ src/sys/arch/sandpoint/stand/altboot/pciide.c Tue Nov 1 16:32:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide.c,v 1.7 2011/04/25 18:30:18 phx Exp $ */
+/* $NetBSD: pciide.c,v 1.8 2011/11/01 16:32:57 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
#include globals.h
static int cmdidefix(struct dkdev_ata *);
+static int apoidefix(struct dkdev_ata *);
static uint32_t pciiobase = PCI_XIOBASE;
@@ -45,6 +46,7 @@ struct myops {
};
static struct myops defaultops = { NULL, NULL };
static struct myops cmdideops = { cmdidefix, NULL };
+static struct myops apoideops = { apoidefix, NULL };
static struct myops *myops;
int
@@ -57,9 +59,12 @@ pciide_match(unsigned tag, void *data)
case PCI_DEVICE(0x1095, 0x0680): /* SiI 0680 IDE */
myops = cmdideops;
return 1;
- case PCI_DEVICE(0x1283, 0x8211): /* ITE 8211 IDE */
+
CVS commit: src
Module Name:src
Committed By: joerg
Date: Tue Nov 1 21:16:30 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
src/tools: Makefile
Added Files:
src/tools/nbperf: Makefile
Log Message:
Hook up nbperf into the normal tool build.
To generate a diff of this commit:
cvs rdiff -u -r1.689 -r1.690 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.149 -r1.150 src/tools/Makefile
cvs rdiff -u -r0 -r1.3 src/tools/nbperf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.689 src/share/mk/bsd.own.mk:1.690
--- src/share/mk/bsd.own.mk:1.689 Mon Oct 31 14:20:11 2011
+++ src/share/mk/bsd.own.mk Tue Nov 1 21:16:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.689 2011/10/31 14:20:11 chs Exp $
+# $NetBSD: bsd.own.mk,v 1.690 2011/11/01 21:16:29 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -309,7 +309,7 @@ TOOL_MKTEMP= ${TOOLDIR}/bin/${_TOOL_PRE
TOOL_MKUBOOTIMAGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
TOOL_MSGC= MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc
TOOL_MTREE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
-TOOL_NBPERF= ${TOOLDIR}/bin/${_TOOL_PREFIX}nbperf
+TOOL_NBPERF= ${TOOLDIR}/bin/${_TOOL_PREFIX}perf
TOOL_PAX= ${TOOLDIR}/bin/${_TOOL_PREFIX}pax
TOOL_PIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}pic
TOOL_PIGZ= ${TOOLDIR}/bin/${_TOOL_PREFIX}pigz
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.149 src/tools/Makefile:1.150
--- src/tools/Makefile:1.149 Tue Oct 11 13:54:01 2011
+++ src/tools/Makefile Tue Nov 1 21:16:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.149 2011/10/11 13:54:01 joerg Exp $
+# $NetBSD: Makefile,v 1.150 2011/11/01 21:16:28 joerg Exp $
.include bsd.own.mk
@@ -48,7 +48,7 @@ SUBDIR= host-mkdep .WAIT compat .WAIT \
binstall .WAIT mktemp .WAIT sed .WAIT \
cap_mkdb crunchgen ctags genassym gencat hexdump join \
${LINT_BITS} \
- lorder makewhatis mkdep mtree rpcgen tic tsort \
+ lorder makewhatis mkdep mtree nbperf rpcgen tic tsort \
uudecode m4 \
.WAIT texinfo \
.WAIT yacc \
Added files:
Index: src/tools/nbperf/Makefile
diff -u /dev/null src/tools/nbperf/Makefile:1.3
--- /dev/null Tue Nov 1 21:16:30 2011
+++ src/tools/nbperf/Makefile Tue Nov 1 21:16:29 2011
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2011/11/01 21:16:29 joerg Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}perf
+HOST_SRCDIR= usr.bin/nbperf
+
+.include ${.CURDIR}/../Makefile.host
CVS commit: src/sys/arch/x86/include
Module Name:src
Committed By: joerg
Date: Tue Nov 1 21:21:33 UTC 2011
Modified Files:
src/sys/arch/x86/include: cpu.h
Log Message:
Reduce exposure of kernel internals for __KMEMUSER
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.39 src/sys/arch/x86/include/cpu.h:1.40
--- src/sys/arch/x86/include/cpu.h:1.39 Mon Oct 17 22:38:01 2011
+++ src/sys/arch/x86/include/cpu.h Tue Nov 1 21:21:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.39 2011/10/17 22:38:01 jmcneill Exp $ */
+/* $NetBSD: cpu.h,v 1.40 2011/11/01 21:21:32 joerg Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -274,6 +274,9 @@ struct cpu_info {
#define CPUF_PAUSE 0x4000 /* CPU is paused in DDB */
#define CPUF_GO 0x8000 /* CPU should start running */
+#endif /* _KERNEL || __KMEMUSER */
+
+#ifdef _KERNEL
/*
* We statically allocate the CPU info for the primary CPU (or,
* the only CPU on uniprocessors), and the primary CPU is the
@@ -454,8 +457,10 @@ void kgdb_port_init(void);
void x86_bus_space_init(void);
void x86_bus_space_mallocok(void);
-#include machine/psl.h /* Must be after struct cpu_info declaration */
+#endif /* _KERNEL */
+#if defined(_KERNEL) || defined(_KMEMUSER)
+#include machine/psl.h /* Must be after struct cpu_info declaration */
#endif /* _KERNEL || __KMEMUSER */
/*
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: uwe
Date: Tue Nov 1 21:37:08 UTC 2011
Modified Files:
src/external/gpl3/gdb/dist/gdb: shnbsd-tdep.c
Log Message:
Hook back into sh-tdep.c infrastructure for handling registers and
discard old code brought over from gdb6.
Add regmap for FPU regs. We don't support it now but it's irrelevant
here (though we effectively commit to using the same layout as Linux
and OpenBSD).
Define GDB_OSABI_NETBSD_CORE like sparc does to be forward compatible
with upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.8 src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.9
--- src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c:1.8 Mon Oct 31 23:30:27 2011
+++ src/external/gpl3/gdb/dist/gdb/shnbsd-tdep.c Tue Nov 1 21:37:08 2011
@@ -39,30 +39,65 @@
#include shnbsd-tdep.h
#include nbsd-tdep.h
-/* Convert an r0-r15 register number into an offset into a ptrace
+/* Convert a register number into an offset into a ptrace
register structure. */
-static const int regmap[] =
+static const struct sh_corefile_regmap gregs_table[] =
{
- (20 * 4), /* r0 */
- (19 * 4), /* r1 */
- (18 * 4), /* r2 */
- (17 * 4), /* r3 */
- (16 * 4), /* r4 */
- (15 * 4), /* r5 */
- (14 * 4), /* r6 */
- (13 * 4), /* r7 */
- (12 * 4), /* r8 */
- (11 * 4), /* r9 */
- (10 * 4), /* r10 */
- ( 9 * 4), /* r11 */
- ( 8 * 4), /* r12 */
- ( 7 * 4), /* r13 */
- ( 6 * 4), /* r14 */
- ( 5 * 4), /* r15 */
+ {R0_REGNUM, 20 * 4},
+ {R0_REGNUM + 1, 19 * 4},
+ {R0_REGNUM + 2, 18 * 4},
+ {R0_REGNUM + 3, 17 * 4},
+ {R0_REGNUM + 4, 16 * 4},
+ {R0_REGNUM + 5, 15 * 4},
+ {R0_REGNUM + 6, 14 * 4},
+ {R0_REGNUM + 7, 13 * 4},
+ {R0_REGNUM + 8, 12 * 4},
+ {R0_REGNUM + 9, 11 * 4},
+ {R0_REGNUM + 10, 10 * 4},
+ {R0_REGNUM + 11, 9 * 4},
+ {R0_REGNUM + 12, 8 * 4},
+ {R0_REGNUM + 13, 7 * 4},
+ {R0_REGNUM + 14, 6 * 4},
+ {R0_REGNUM + 15, 5 * 4},
+ {PC_REGNUM, 0 * 4},
+ {SR_REGNUM, 1 * 4},
+ {PR_REGNUM, 2 * 4},
+ {MACH_REGNUM, 3 * 4},
+ {MACL_REGNUM, 4 * 4},
+ {GBR_REGNUM, 21 * 4},
+ {-1 /* Terminator. */, 0}
+};
+
+
+#define REGSx16(base) \
+ {(base), 0}, \
+ {(base) + 1, 4}, \
+ {(base) + 2, 8}, \
+ {(base) + 3, 12}, \
+ {(base) + 4, 16}, \
+ {(base) + 5, 20}, \
+ {(base) + 6, 24}, \
+ {(base) + 7, 28}, \
+ {(base) + 8, 32}, \
+ {(base) + 9, 36}, \
+ {(base) + 10, 40}, \
+ {(base) + 11, 44}, \
+ {(base) + 12, 48}, \
+ {(base) + 13, 52}, \
+ {(base) + 14, 56}, \
+ {(base) + 15, 60}
+
+/* Convert an FPU register number into an offset into a ptrace
+ register structure. */
+static const struct sh_corefile_regmap fpregs_table[] =
+{
+ REGSx16 (FR0_REGNUM),
+ /* XXX: REGSx16(XF0_REGNUM) omitted. */
+ {FPSCR_REGNUM, 128},
+ {FPUL_REGNUM, 132},
+ {-1 /* Terminator. */, 0}
};
-/* Sizeof `struct reg' in machine/reg.h. */
-#define SHNBSD_SIZEOF_GREGS (22 * 4)
/* From machine/mcontext.h. */
static const int shnbsd_mc_reg_offset[] =
@@ -92,123 +127,8 @@ static const int shnbsd_mc_reg_offset[]
( 2 * 4), /* sr */
};
-/* Supply register REGNUM from the buffer specified by GREGS and LEN
- in the general-purpose register set REGSET to register cache
- REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */
-
-static void
-shnbsd_supply_gregset (const struct regset *regset,
- struct regcache *regcache,
- int regnum, const void *gregs, size_t len)
-{
- struct gdbarch *gdbarch = get_regcache_arch (regcache);
- const gdb_byte *regs = gregs;
- int i;
-
- gdb_assert (len = SHNBSD_SIZEOF_GREGS);
-
- if (regnum == gdbarch_pc_regnum (gdbarch) || regnum == -1)
-regcache_raw_supply (regcache, gdbarch_pc_regnum (gdbarch),
- regs + (0 * 4));
-
- if (regnum == SR_REGNUM || regnum == -1)
-regcache_raw_supply (regcache, SR_REGNUM, regs + (1 * 4));
-
- if (regnum == PR_REGNUM || regnum == -1)
-regcache_raw_supply (regcache, PR_REGNUM, regs + (2 * 4));
-
- if (regnum == MACH_REGNUM || regnum == -1)
-regcache_raw_supply (regcache, MACH_REGNUM, regs + (3 * 4));
-
- if (regnum == MACL_REGNUM || regnum == -1)
-regcache_raw_supply (regcache, MACL_REGNUM, regs + (4 * 4));
-
- for (i = R0_REGNUM; i = (R0_REGNUM + 15); i++)
-{
- if (regnum == i || regnum == -1)
- regcache_raw_supply (regcache, i, regs + regmap[i - R0_REGNUM]);
-}
-
- if (regnum == GBR_REGNUM || regnum == -1)
-regcache_raw_supply (regcache, GBR_REGNUM, regs + (21 * 4));
-}
-
-/* Collect register REGNUM in the general-purpose register set
- REGSET. from register cache REGCACHE into the buffer specified by
- GREGS and LEN. If REGNUM is -1, do this for all registers in
- REGSET. */
-
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: uwe
Date: Tue Nov 1 21:47:53 UTC 2011
Modified Files:
src/external/gpl3/gdb/dist/gdb: sh-tdep.c
Log Message:
sh_frame_cache always tries to read FPSCR. Since frame.c uses gdb
exceptions now, there's an unplesant side effect that when FPSCR is
unavailable, your last display will get disabled just in case, to
avoid infinite recursion. That happens directly in throw_exception,
so even catching that NOT_AVAILABLE_ERROR doesn't help.
Tweak the code a bit so that sh_analyze_prologue only reads FPSCR as
needed, when an FMOV instruction is encountered in the prologue.
XXX: I'm not sure if this is the right thing to do, but it seems
minimally intrusive.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/gdb/sh-tdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/sh-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/sh-tdep.c:1.1.1.1 src/external/gpl3/gdb/dist/gdb/sh-tdep.c:1.2
--- src/external/gpl3/gdb/dist/gdb/sh-tdep.c:1.1.1.1 Sat Sep 24 20:12:21 2011
+++ src/external/gpl3/gdb/dist/gdb/sh-tdep.c Tue Nov 1 21:47:53 2011
@@ -521,11 +521,14 @@ sh_breakpoint_from_pc (struct gdbarch *g
static CORE_ADDR
sh_analyze_prologue (struct gdbarch *gdbarch,
CORE_ADDR pc, CORE_ADDR current_pc,
- struct sh_frame_cache *cache, ULONGEST fpscr)
+ struct sh_frame_cache *cache,
+ struct frame_info *fpscr_frame)
{
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
ULONGEST inst;
CORE_ADDR opc;
+ ULONGEST fpscr = 0;
+ int have_fpscr = (fpscr_frame == NULL);
int offset;
int sav_offset = 0;
int r3_val = 0;
@@ -631,6 +634,12 @@ sh_analyze_prologue (struct gdbarch *gdb
}
else if (IS_FPUSH (inst))
{
+ if (!have_fpscr)
+ {
+ fpscr = get_frame_register_unsigned (fpscr_frame, FPSCR_REGNUM);
+ have_fpscr = 1;
+ }
+
if (fpscr FPSCR_SZ)
{
cache-sp_offset += 8;
@@ -745,7 +754,7 @@ sh_skip_prologue (struct gdbarch *gdbarc
return max (pc, start_pc);
cache.sp_offset = -4;
- pc = sh_analyze_prologue (gdbarch, start_pc, (CORE_ADDR) -1, cache, 0);
+ pc = sh_analyze_prologue (gdbarch, start_pc, (CORE_ADDR) -1, cache, NULL);
if (!cache.uses_fp)
return start_pc;
@@ -2563,11 +2572,7 @@ sh_frame_cache (struct frame_info *this_
cache-pc = get_frame_func (this_frame);
current_pc = get_frame_pc (this_frame);
if (cache-pc != 0)
-{
- ULONGEST fpscr;
- fpscr = get_frame_register_unsigned (this_frame, FPSCR_REGNUM);
- sh_analyze_prologue (gdbarch, cache-pc, current_pc, cache, fpscr);
-}
+sh_analyze_prologue (gdbarch, cache-pc, current_pc, cache, this_frame);
if (!cache-uses_fp)
{
CVS commit: src/usr.sbin/i2cscan
Module Name:src Committed By: pgoyette Date: Tue Nov 1 22:30:32 UTC 2011 Modified Files: src/usr.sbin/i2cscan: i2cscan.c Log Message: Update license to reflect actual source of this code which was extracted from a larger work. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/i2cscan/i2cscan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/i2cscan/i2cscan.c diff -u src/usr.sbin/i2cscan/i2cscan.c:1.2 src/usr.sbin/i2cscan/i2cscan.c:1.3 --- src/usr.sbin/i2cscan/i2cscan.c:1.2 Fri Oct 7 10:30:21 2011 +++ src/usr.sbin/i2cscan/i2cscan.c Tue Nov 1 22:30:32 2011 @@ -1,11 +1,11 @@ -/* $NetBSD: i2cscan.c,v 1.2 2011/10/07 10:30:21 joerg Exp $ */ +/* $NetBSD: i2cscan.c,v 1.3 2011/11/01 22:30:32 pgoyette Exp $ */ -/* - * Copyright (c) 2003 Wasabi Systems, Inc. - * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. * - * Written by Jason R. Thorpe for Wasabi Systems, Inc. + * This code is derived from software contributed to The NetBSD Foundation + * by Paul Goyette and Jared McNeill * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -15,18 +15,11 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed for the NetBSD Project by - * Wasabi Systems, Inc. - * 4. The name of Wasabi Systems, Inc. may not be used to endorse - *or promote products derived from this software without specific prior - *written permission. * - * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 WASABI SYSTEMS, INC + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION 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 @@ -37,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: i2cscan.c,v 1.2 2011/10/07 10:30:21 joerg Exp $); +__RCSID($NetBSD: i2cscan.c,v 1.3 2011/11/01 22:30:32 pgoyette Exp $); #include sys/types.h #include sys/ioctl.h
CVS commit: src/tests/lib/libc/net
Module Name:src
Committed By: pgoyette
Date: Tue Nov 1 22:36:53 UTC 2011
Modified Files:
src/tests/lib/libc/net: Makefile
Added Files:
src/tests/lib/libc/net: gen_ether_subr t_ether_aton.c
Log Message:
atf-ify ether_aton test
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/net/gen_ether_subr \
src/tests/lib/libc/net/t_ether_aton.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/net/Makefile
diff -u src/tests/lib/libc/net/Makefile:1.5 src/tests/lib/libc/net/Makefile:1.6
--- src/tests/lib/libc/net/Makefile:1.5 Fri Jul 15 06:41:29 2011
+++ src/tests/lib/libc/net/Makefile Tue Nov 1 22:36:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/15 06:41:29 jruoho Exp $
+# $NetBSD: Makefile,v 1.6 2011/11/01 22:36:53 pgoyette Exp $
.include bsd.own.mk
@@ -9,6 +9,12 @@ TESTS_SUBDIRS+= getaddrinfo
TESTSDIR= ${TESTSBASE}/lib/libc/net
TESTS_C+= t_getprotoent
+TESTS_C+= t_ether_aton
+
+SRCS.t_ether_aton= aton_ether_subr.c t_ether_aton.c
+
+aton_ether_subr.c: gen_ether_subr ${NETBSDSRCDIR}/sys/net/if_ethersubr.c
+ ${HOST_SH} ${.ALLSRC} ${.TARGET}
TESTS_SH+= t_nsdispatch
TESTS_SH+= t_protoent
@@ -22,4 +28,6 @@ PROGS+= h_servent
LDADD.h_nsd_recurse+= -lpthread
+CLEANFILES+= aton_ether_subr_.c
+
.include bsd.test.mk
Added files:
Index: src/tests/lib/libc/net/gen_ether_subr
diff -u /dev/null src/tests/lib/libc/net/gen_ether_subr:1.1
--- /dev/null Tue Nov 1 22:36:53 2011
+++ src/tests/lib/libc/net/gen_ether_subr Tue Nov 1 22:36:53 2011
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+awk '
+BEGIN {
+ print
+ print #include ctype.h
+ print #include sys/types.h
+ print #include errno.h
+ print
+ print #define ETHER_ADDR_LEN 6
+ print
+ print int ether_aton_r(u_char *dest, size_t len, const char *str);
+ print
+}
+/^ether_aton_r/ {
+ print prevline
+ out = 1
+}
+{
+ if (out) print
+ else prevline = $0
+}
+/^}$/ {
+ if (out) exit(0)
+}' $1 $2
Index: src/tests/lib/libc/net/t_ether_aton.c
diff -u /dev/null src/tests/lib/libc/net/t_ether_aton.c:1.1
--- /dev/null Tue Nov 1 22:36:53 2011
+++ src/tests/lib/libc/net/t_ether_aton.c Tue Nov 1 22:36:53 2011
@@ -0,0 +1,104 @@
+/* $NetBSD: t_ether_aton.c,v 1.1 2011/11/01 22:36:53 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ *This product includes software developed by the NetBSD
+ *Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *contributors may be used to endorse or promote products derived
+ *from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+#include sys/cdefs.h
+__RCSID($NetBSD: t_ether_aton.c,v 1.1 2011/11/01 22:36:53 pgoyette Exp $);
+
+#include atf-c.h
+#include stdio.h
+#include ctype.h
+#include sys/types.h
+#include err.h
+#include string.h
+#include errno.h
+
+#define ETHER_ADDR_LEN 6
+
+int ether_aton_r(u_char *dest, size_t len, const char *str);
+
+static const struct {
+ u_char res[ETHER_ADDR_LEN];
+ const char *str;
+ int error;
+} tests[] = {
+ { { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }, 01:23:45:67:89:ab, 0 },
+ { { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, 0:1:22-3:14:05, 0 },
+ { { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, 000122031405, 0 },
+ { {
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pgoyette Date: Tue Nov 1 22:37:42 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add t_ether_aton test To generate a diff of this commit: cvs rdiff -u -r1.412 -r1.413 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.412 src/distrib/sets/lists/tests/mi:1.413 --- src/distrib/sets/lists/tests/mi:1.412 Mon Oct 31 15:37:17 2011 +++ src/distrib/sets/lists/tests/mi Tue Nov 1 22:37:42 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.412 2011/10/31 15:37:17 christos Exp $ +# $NetBSD: mi,v 1.413 2011/11/01 22:37:42 pgoyette Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -414,6 +414,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/net/h_nsd_recurse.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/net/h_protoent.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/net/h_servent.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/net/t_ether_aton.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/net/t_getprotoent.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/regextests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/regex/t_exhaust.debug tests-lib-debug debug,atf @@ -2001,6 +2002,7 @@ ./usr/tests/lib/libc/net/h_nsd_recurse tests-lib-tests atf ./usr/tests/lib/libc/net/h_protoent tests-lib-tests atf ./usr/tests/lib/libc/net/h_servent tests-lib-tests atf +./usr/tests/lib/libc/net/t_ether_aton tests-lib-tests atf ./usr/tests/lib/libc/net/t_getprotoent tests-lib-tests atf ./usr/tests/lib/libc/net/t_nsdispatch tests-lib-tests atf ./usr/tests/lib/libc/net/t_protoent tests-lib-tests atf
CVS commit: src/regress/sys/net
Module Name:src Committed By: pgoyette Date: Tue Nov 1 23:07:34 UTC 2011 Modified Files: src/regress/sys/net: Makefile Removed Files: src/regress/sys/net/ether_aton_r: Makefile autogen main.c Log Message: ether_aton test has been atf-ified To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/regress/sys/net/Makefile cvs rdiff -u -r1.2 -r0 src/regress/sys/net/ether_aton_r/Makefile \ src/regress/sys/net/ether_aton_r/autogen cvs rdiff -u -r1.3 -r0 src/regress/sys/net/ether_aton_r/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/regress/sys/net/Makefile diff -u src/regress/sys/net/Makefile:1.2 src/regress/sys/net/Makefile:1.3 --- src/regress/sys/net/Makefile:1.2 Wed May 19 21:55:35 2010 +++ src/regress/sys/net/Makefile Tue Nov 1 23:07:34 2011 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2010/05/19 21:55:35 christos Exp $ +# $NetBSD: Makefile,v 1.3 2011/11/01 23:07:34 pgoyette Exp $ .include bsd.own.mk -SUBDIR= bpf ether_aton_r +SUBDIR= bpf .include bsd.subdir.mk
CVS commit: src/tools
Module Name:src Committed By: joerg Date: Tue Nov 1 23:11:56 UTC 2011 Modified Files: src/tools: Makefile Log Message: Remove an unnecessary .WAIT between llvm-tblgen and clang-tblgen. To generate a diff of this commit: cvs rdiff -u -r1.150 -r1.151 src/tools/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/Makefile diff -u src/tools/Makefile:1.150 src/tools/Makefile:1.151 --- src/tools/Makefile:1.150 Tue Nov 1 21:16:28 2011 +++ src/tools/Makefile Tue Nov 1 23:11:55 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.150 2011/11/01 21:16:28 joerg Exp $ +# $NetBSD: Makefile,v 1.151 2011/11/01 23:11:55 joerg Exp $ .include bsd.own.mk @@ -70,8 +70,7 @@ SUBDIR= host-mkdep .WAIT compat .WAIT \ SUBDIR+= \ llvm .WAIT \ llvm-lib/libLLVMSupport llvm-lib/libLLVMTableGen .WAIT \ - llvm-tblgen .WAIT \ - llvm-clang-tblgen .WAIT \ + llvm-tblgen llvm-clang-tblgen .WAIT \ llvm-include .WAIT \ llvm-lib .WAIT \ llvm-clang
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Tue Nov 1 23:17:59 UTC 2011 Modified Files: src/share/man/man9: skpc.9 Log Message: Casing. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/skpc.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/skpc.9 diff -u src/share/man/man9/skpc.9:1.1 src/share/man/man9/skpc.9:1.2 --- src/share/man/man9/skpc.9:1.1 Tue Nov 1 13:36:15 2011 +++ src/share/man/man9/skpc.9 Tue Nov 1 23:17:59 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: skpc.9,v 1.1 2011/11/01 13:36:15 yamt Exp $ +.\ $NetBSD: skpc.9,v 1.2 2011/11/01 23:17:59 wiz Exp $ .\ .\ Copyright (c)2011 YAMAMOTO Takashi, .\ All rights reserved. @@ -31,7 +31,7 @@ .\ .Sh NAME .Nm skpc -.Nd Skip a character in a byte string +.Nd skip a character in a byte string .\ .Sh SYNOPSIS .In lib/libkern/libkern.h
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Tue Nov 1 23:18:07 UTC 2011 Modified Files: src/share/man/man9: scanc.9 Log Message: Fix typo, try to improve Nd. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/scanc.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/scanc.9 diff -u src/share/man/man9/scanc.9:1.1 src/share/man/man9/scanc.9:1.2 --- src/share/man/man9/scanc.9:1.1 Tue Nov 1 13:33:05 2011 +++ src/share/man/man9/scanc.9 Tue Nov 1 23:18:07 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: scanc.9,v 1.1 2011/11/01 13:33:05 yamt Exp $ +.\ $NetBSD: scanc.9,v 1.2 2011/11/01 23:18:07 wiz Exp $ .\ .\ Copyright (c)2011 YAMAMOTO Takashi, .\ All rights reserved. @@ -31,7 +31,7 @@ .\ .Sh NAME .Nm scanc -.Nd Scan characters +.Nd use byte string as lookup table index .\ .Sh SYNOPSIS .In lib/libkern/libkern.h @@ -51,7 +51,7 @@ A character in the string is used as an .Fa table . If a bitwise-AND of the byte from the table and .Fa mask -isn't zero or the string is exausted, the scan stops. +isn't zero or the string is exhausted, the scan stops. .\ .Sh RETURN VALUES The
CVS commit: src/share/mk
Module Name:src
Committed By: uwe
Date: Wed Nov 2 00:10:09 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch sh3 to gdb7.
To generate a diff of this commit:
cvs rdiff -u -r1.690 -r1.691 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.690 src/share/mk/bsd.own.mk:1.691
--- src/share/mk/bsd.own.mk:1.690 Tue Nov 1 21:16:29 2011
+++ src/share/mk/bsd.own.mk Wed Nov 2 00:10:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.690 2011/11/01 21:16:29 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.691 2011/11/02 00:10:08 uwe Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -71,7 +71,6 @@ USE_COMPILERCRTSTUFF?= yes
.if ${MACHINE_ARCH} == alpha || \
${MACHINE_ARCH} == hppa || \
${MACHINE_CPU} == mips || \
-${MACHINE_CPU} == sh3 || \
${MACHINE_ARCH} == vax
HAVE_GDB?= 6
.else
CVS commit: src/sys/net
Module Name:src
Committed By: dyoung
Date: Wed Nov 2 01:17:59 UTC 2011
Modified Files:
src/sys/net: if_gre.c if_gre.h
Log Message:
For simplicity's sake, use pcq(9) instead of my own circular-queue
implementation. Saves 45 lines of code.
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/net/if_gre.c
cvs rdiff -u -r1.40 -r1.41 src/sys/net/if_gre.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_gre.c
diff -u src/sys/net/if_gre.c:1.148 src/sys/net/if_gre.c:1.149
--- src/sys/net/if_gre.c:1.148 Fri Oct 28 16:42:52 2011
+++ src/sys/net/if_gre.c Wed Nov 2 01:17:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.c,v 1.148 2011/10/28 16:42:52 dyoung Exp $ */
+/* $NetBSD: if_gre.c,v 1.149 2011/11/02 01:17:59 dyoung Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_gre.c,v 1.148 2011/10/28 16:42:52 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_gre.c,v 1.149 2011/11/02 01:17:59 dyoung Exp $);
#include opt_atalk.h
#include opt_gre.h
@@ -136,7 +136,6 @@ int gre_debug = 0;
#endif /* GRE_DEBUG */
int ip_gre_ttl = GRE_TTL;
-MALLOC_DEFINE(M_GRE_BUFQ, gre_bufq, gre mbuf queue);
static int gre_clone_create(struct if_clone *, int);
static int gre_clone_destroy(struct ifnet *);
@@ -163,60 +162,18 @@ static bool gre_fp_send(struct gre_softc
static bool gre_fp_recv(struct gre_softc *);
static void gre_fp_recvloop(void *);
-static int
-nearest_pow2(size_t len0)
-{
- size_t len, mid;
-
- if (len0 == 0)
- return 1;
-
- for (len = len0; (len (len - 1)) != 0; len = len - 1)
- ;
-
- mid = len | (len 1);
-
- /* avoid overflow */
- if ((len 1) len)
- return len;
- if (len0 = mid)
- return len 1;
- return len;
-}
-
-static struct gre_bufq *
+static void
gre_bufq_init(struct gre_bufq *bq, size_t len0)
{
- size_t len;
-
- len = nearest_pow2(len0);
-
memset(bq, 0, sizeof(*bq));
- bq-bq_buf = malloc(len * sizeof(struct mbuf *), M_GRE_BUFQ, M_WAITOK);
- bq-bq_len = len;
- bq-bq_lenmask = len - 1;
-
- return bq;
-}
-
-static bool
-gre_bufq_empty(struct gre_bufq *bq)
-{
- return bq-bq_prodidx == bq-bq_considx;
+ bq-bq_q = pcq_create(len0, KM_SLEEP);
+ KASSERT(bq-bq_q != NULL);
}
static struct mbuf *
gre_bufq_dequeue(struct gre_bufq *bq)
{
- struct mbuf *m;
-
- if (gre_bufq_empty(bq))
- return NULL;
-
- m = bq-bq_buf[bq-bq_considx];
- bq-bq_considx = (bq-bq_considx + 1) bq-bq_lenmask;
-
- return m;
+ return pcq_get(bq-bq_q);
}
static void
@@ -228,20 +185,22 @@ gre_bufq_purge(struct gre_bufq *bq)
m_freem(m);
}
+static void
+gre_bufq_destroy(struct gre_bufq *bq)
+{
+ gre_bufq_purge(bq);
+ pcq_destroy(bq-bq_q);
+}
+
static int
gre_bufq_enqueue(struct gre_bufq *bq, struct mbuf *m)
{
- int next;
-
- next = (bq-bq_prodidx + 1) bq-bq_lenmask;
+ KASSERT(bq-bq_q != NULL);
- if (next == bq-bq_considx) {
+ if (!pcq_put(bq-bq_q, m)) {
bq-bq_drops++;
return ENOBUFS;
}
-
- bq-bq_buf[bq-bq_prodidx] = m;
- bq-bq_prodidx = next;
return 0;
}
@@ -385,6 +344,7 @@ gre_clone_destroy(struct ifnet *ifp)
cv_destroy(sc-sc_condvar);
cv_destroy(sc-sc_fp_condvar);
mutex_destroy(sc-sc_mtx);
+ gre_bufq_destroy(sc-sc_snd);
gre_evcnt_detach(sc);
free(sc, M_DEVBUF);
Index: src/sys/net/if_gre.h
diff -u src/sys/net/if_gre.h:1.40 src/sys/net/if_gre.h:1.41
--- src/sys/net/if_gre.h:1.40 Tue Jun 1 22:13:30 2010
+++ src/sys/net/if_gre.h Wed Nov 2 01:17:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.h,v 1.40 2010/06/01 22:13:30 mjf Exp $ */
+/* $NetBSD: if_gre.h,v 1.41 2011/11/02 01:17:59 dyoung Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -44,6 +44,7 @@
#include sys/condvar.h
#include sys/malloc.h
#include sys/mallocvar.h
+#include sys/pcq.h
#ifdef _KERNEL
struct gre_soparm {
@@ -64,16 +65,10 @@ enum gre_state {
};
struct gre_bufq {
- volatile int bq_prodidx;
- volatile int bq_considx;
- size_t bq_len __aligned(CACHE_LINE_SIZE);
- size_t bq_lenmask;
+ pcq_t *bq_q;
volatile int bq_drops;
- struct mbuf **bq_buf;
};
-MALLOC_DECLARE(M_GRE_BUFQ);
-
enum gre_msg {
GRE_M_NONE = 0
, GRE_M_SETFP
CVS commit: src/lib/libm
Module Name:src
Committed By: christos
Date: Wed Nov 2 02:34:57 UTC 2011
Modified Files:
src/lib/libm/complex: cproj.c cprojf.c cprojl.c
src/lib/libm/noieee_src: mathimpl.h n_erf.c n_gamma.c n_j0.c n_j1.c
n_jn.c n_pow.c
Log Message:
Fix the vax build under gcc-4.5 which now detects that floating constants
don't fit or are effectively 0.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/complex/cproj.c \
src/lib/libm/complex/cprojf.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libm/complex/cprojl.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libm/noieee_src/mathimpl.h
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/noieee_src/n_erf.c \
src/lib/libm/noieee_src/n_pow.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/noieee_src/n_gamma.c \
src/lib/libm/noieee_src/n_j0.c src/lib/libm/noieee_src/n_j1.c \
src/lib/libm/noieee_src/n_jn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/complex/cproj.c
diff -u src/lib/libm/complex/cproj.c:1.4 src/lib/libm/complex/cproj.c:1.5
--- src/lib/libm/complex/cproj.c:1.4 Wed Mar 2 08:24:43 2011
+++ src/lib/libm/complex/cproj.c Tue Nov 1 22:34:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cproj.c,v 1.4 2011/03/02 13:24:43 christos Exp $ */
+/* $NetBSD: cproj.c,v 1.5 2011/11/02 02:34:56 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: cproj.c,v 1.4 2011/03/02 13:24:43 christos Exp $);
+__RCSID($NetBSD: cproj.c,v 1.5 2011/11/02 02:34:56 christos Exp $);
#include complex.h
#include math.h
@@ -50,9 +50,10 @@ cproj(double complex z)
{
double_complex w = { .z = z };
+ /*CONSTCOND*/
if (isinf(creal(z)) || isinf(cimag(z))) {
#ifdef __INFINITY
- REAL_PART(w) = __INFINITY;
+ REAL_PART(w) = HUGE_VAL;
#else
REAL_PART(w) = INFINITY;
#endif
Index: src/lib/libm/complex/cprojf.c
diff -u src/lib/libm/complex/cprojf.c:1.4 src/lib/libm/complex/cprojf.c:1.5
--- src/lib/libm/complex/cprojf.c:1.4 Wed Mar 2 08:24:43 2011
+++ src/lib/libm/complex/cprojf.c Tue Nov 1 22:34:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cprojf.c,v 1.4 2011/03/02 13:24:43 christos Exp $ */
+/* $NetBSD: cprojf.c,v 1.5 2011/11/02 02:34:56 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: cprojf.c,v 1.4 2011/03/02 13:24:43 christos Exp $);
+__RCSID($NetBSD: cprojf.c,v 1.5 2011/11/02 02:34:56 christos Exp $);
#include complex.h
#include math.h
@@ -51,9 +51,10 @@ cprojf(float complex z)
{
float_complex w = { .z = z };
+ /*CONSTCOND*/
if (isinf(crealf(z)) || isinf(cimagf(z))) {
#ifdef __INFINITY
- REAL_PART(w) = __INFINITY;
+ REAL_PART(w) = HUGE_VAL;
#else
REAL_PART(w) = INFINITY;
#endif
Index: src/lib/libm/complex/cprojl.c
diff -u src/lib/libm/complex/cprojl.c:1.5 src/lib/libm/complex/cprojl.c:1.6
--- src/lib/libm/complex/cprojl.c:1.5 Wed Mar 2 08:24:43 2011
+++ src/lib/libm/complex/cprojl.c Tue Nov 1 22:34:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cprojl.c,v 1.5 2011/03/02 13:24:43 christos Exp $ */
+/* $NetBSD: cprojl.c,v 1.6 2011/11/02 02:34:56 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: cprojl.c,v 1.5 2011/03/02 13:24:43 christos Exp $);
+__RCSID($NetBSD: cprojl.c,v 1.6 2011/11/02 02:34:56 christos Exp $);
#include complex.h
#include math.h
@@ -50,9 +50,10 @@ cprojl(long double complex z)
{
long_double_complex w = { .z = z };
+ /*CONSTCOND*/
if (isinf(creall(z)) || isinf(cimagl(z))) {
#ifdef __INFINITY
- REAL_PART(w) = __INFINITY;
+ REAL_PART(w) = HUGE_VAL;
#else
REAL_PART(w) = INFINITY;
#endif
Index: src/lib/libm/noieee_src/mathimpl.h
diff -u src/lib/libm/noieee_src/mathimpl.h:1.9 src/lib/libm/noieee_src/mathimpl.h:1.10
--- src/lib/libm/noieee_src/mathimpl.h:1.9 Thu May 1 11:33:15 2008
+++ src/lib/libm/noieee_src/mathimpl.h Tue Nov 1 22:34:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mathimpl.h,v 1.9 2008/05/01 15:33:15 christos Exp $ */
+/* $NetBSD: mathimpl.h,v 1.10 2011/11/02 02:34:56 christos Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -99,6 +99,17 @@
#endif /* defined(__vax__)||defined(tahoe) */
+#ifdef __vax__
+#include machine/float.h
+#define _TINY DBL_EPSILON
+#define _TINYER DBL_EPSILON
+#define _HUGE DBL_MAX
+#else
+#define _TINY 1e-300
+#define _TINYER 1e-308
+#define _HUGE 1e+300
+#endif
+
/*
* Functions internal to the math package, yet not static.
Index: src/lib/libm/noieee_src/n_erf.c
diff -u src/lib/libm/noieee_src/n_erf.c:1.7 src/lib/libm/noieee_src/n_erf.c:1.8
--- src/lib/libm/noieee_src/n_erf.c:1.7 Tue May 3 00:18:32 2005
+++ src/lib/libm/noieee_src/n_erf.c Tue Nov 1
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: nisimura Date: Wed Nov 2 04:10:33 UTC 2011 Modified Files: src/sys/arch/sandpoint/stand/altboot: pciide.c Log Message: VIA 82C586A/B 82C686A/B SouthBridges share PCI ID 0x1066-0571. They are distinguishable by looking at PCI-ISA bridge PCI ID and revision number. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sandpoint/stand/altboot/pciide.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sandpoint/stand/altboot/pciide.c diff -u src/sys/arch/sandpoint/stand/altboot/pciide.c:1.8 src/sys/arch/sandpoint/stand/altboot/pciide.c:1.9 --- src/sys/arch/sandpoint/stand/altboot/pciide.c:1.8 Tue Nov 1 16:32:57 2011 +++ src/sys/arch/sandpoint/stand/altboot/pciide.c Wed Nov 2 04:10:33 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pciide.c,v 1.8 2011/11/01 16:32:57 phx Exp $ */ +/* $NetBSD: pciide.c,v 1.9 2011/11/02 04:10:33 nisimura Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ pciide_match(unsigned tag, void *data) case PCI_DEVICE(0x1095, 0x0680): /* SiI 0680 IDE */ myops = cmdideops; return 1; - case PCI_DEVICE(0x1106, 0x0571): /* VIA 82C586A IDE */ + case PCI_DEVICE(0x1106, 0x0571): /* VIA 82C586A/B/686A/B IDE */ case PCI_DEVICE(0x1106, 0x1571): /* VIA 82C586 IDE */ case PCI_DEVICE(0x1106, 0x3164): /* VIA VT6410 RAID IDE */ myops = apoideops;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: macallan Date: Wed Nov 2 04:59:51 UTC 2011 Modified Files: src/sys/dev/usb: usbdevs Log Message: add entry for CY4636 LP RDK Bridge, used in Gdium To generate a diff of this commit: cvs rdiff -u -r1.598 -r1.599 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.598 src/sys/dev/usb/usbdevs:1.599 --- src/sys/dev/usb/usbdevs:1.598 Tue Oct 25 16:09:14 2011 +++ src/sys/dev/usb/usbdevs Wed Nov 2 04:59:51 2011 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.598 2011/10/25 16:09:14 aymeric Exp $ +$NetBSD: usbdevs,v 1.599 2011/11/02 04:59:51 macallan Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1077,6 +1077,7 @@ product CYPRESS KBDHUB 0x0101 Keyboard/ product CYPRESS FMRADIO 0x1002 FM Radio product CYPRESS USBRS232 0x5500 USB-RS232 Interface product CYPRESS HUB2 0x6560 USB2 Hub +product CYPRESS LPRDK 0xe001 CY4636 LP RDK Bridge /* Daisy Technology products */ product DAISY DMC 0x6901 PhotoClip USBMediaReader
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: macallan
Date: Wed Nov 2 05:00:11 UTC 2011
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.591 -r1.592 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.592 -r1.593 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.591 src/sys/dev/usb/usbdevs.h:1.592
--- src/sys/dev/usb/usbdevs.h:1.591 Tue Oct 25 16:10:19 2011
+++ src/sys/dev/usb/usbdevs.h Wed Nov 2 05:00:11 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.591 2011/10/25 16:10:19 aymeric Exp $ */
+/* $NetBSD: usbdevs.h,v 1.592 2011/11/02 05:00:11 macallan Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.597 2011/09/30 18:42:59 christos Exp
+ * NetBSD: usbdevs,v 1.598 2011/10/25 16:09:14 aymeric Exp
*/
/*
@@ -1084,6 +1084,7 @@
#define USB_PRODUCT_CYPRESS_FMRADIO 0x1002 /* FM Radio */
#define USB_PRODUCT_CYPRESS_USBRS232 0x5500 /* USB-RS232 Interface */
#define USB_PRODUCT_CYPRESS_HUB2 0x6560 /* USB2 Hub */
+#define USB_PRODUCT_CYPRESS_LPRDK 0xe001 /* CY4636 LP RDK Bridge */
/* Daisy Technology products */
#define USB_PRODUCT_DAISY_DMC 0x6901 /* PhotoClip USBMediaReader */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.592 src/sys/dev/usb/usbdevs_data.h:1.593
--- src/sys/dev/usb/usbdevs_data.h:1.592 Tue Oct 25 16:10:19 2011
+++ src/sys/dev/usb/usbdevs_data.h Wed Nov 2 05:00:11 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.592 2011/10/25 16:10:19 aymeric Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.593 2011/11/02 05:00:11 macallan Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.597 2011/09/30 18:42:59 christos Exp
+ * NetBSD: usbdevs,v 1.598 2011/10/25 16:09:14 aymeric Exp
*/
/*
@@ -3435,6 +3435,10 @@ const struct usb_product usb_products[]
USB2 Hub,
},
{
+ USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_LPRDK,
+ CY4636 LP RDK Bridge,
+ },
+ {
USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC,
PhotoClip USBMediaReader,
},
@@ -8563,4 +8567,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1633;
+const int usb_nproducts = 1634;
CVS commit: src/share/zoneinfo
Module Name:src Committed By: apb Date: Wed Nov 2 05:15:29 UTC 2011 Update of /cvsroot/src/share/zoneinfo In directory ivanova.netbsd.org:/tmp/cvs-serv1512 Log Message: Import tzdata2011n. There are three changes of note - most urgently, Cuba (America/Havana) has extended summer time by two weeks, now to end on Nov 13, rather than the (already past) Oct 30. Second, the Pridnestrovian Moldavian Republic (Europe/Tiraspol) decided not to split from the rest of Moldova after all, and consequently that zone has been removed (again) and reinstated in the backward file as a link to Europe/Chisinau. And third, the end date for Fiji's summer time this summer was moved forward from the earlier planned Feb 26, to Jan 22. Status: Vendor Tag: ADO Release Tags: TZDATA2011N U src/share/zoneinfo/antarctica U src/share/zoneinfo/africa C src/share/zoneinfo/australasia U src/share/zoneinfo/asia U src/share/zoneinfo/iso3166.tab U src/share/zoneinfo/backward U src/share/zoneinfo/etcetera U src/share/zoneinfo/europe U src/share/zoneinfo/factory U src/share/zoneinfo/yearistype.sh U src/share/zoneinfo/leapseconds U src/share/zoneinfo/northamerica U src/share/zoneinfo/pacificnew U src/share/zoneinfo/solar87 U src/share/zoneinfo/solar88 U src/share/zoneinfo/solar89 U src/share/zoneinfo/southamerica U src/share/zoneinfo/systemv U src/share/zoneinfo/zone.tab 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jADO:yesterday -jADO src/share/zoneinfo
CVS commit: src/share/zoneinfo
Module Name:src Committed By: apb Date: Wed Nov 2 05:21:46 UTC 2011 Modified Files: src/share/zoneinfo: australasia Log Message: Merge TZDATA2011N. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.22 src/share/zoneinfo/australasia:1.23 --- src/share/zoneinfo/australasia:1.22 Mon Oct 24 15:42:57 2011 +++ src/share/zoneinfo/australasia Wed Nov 2 05:21:46 2011 @@ -1,5 +1,5 @@ # pre -# @(#)australasia 8.28 +# @(#)australasia 8.29 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -308,6 +308,20 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 # advance at 2am to 3am on October 23, 2011 and one hour back at 3am to # 2am on February 26 next year. +# From Ken Rylander (2011-10-24) +# Another change to the Fiji DST end date. In the TZ database the end date for +# Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22. +# +# a href=http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=5017:amendments-to-daylight-savingscatid=71:press-releasesItemid=155; +# http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=5017:amendments-to-daylight-savingscatid=71:press-releasesItemid=155 +# /a +# states: +# +# The end of daylight saving scheduled initially for the 26th of February 2012 +# has been brought forward to the 22nd of January 2012. +# The commencement of daylight saving will remain unchanged and start +# on the 23rd of October, 2011. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Fiji 1998 1999 - Nov Sun=1 2:00 1:00 S Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - @@ -316,7 +330,7 @@ Rule Fiji 2010 only - Mar lastSun 3:00 0 Rule Fiji 2010 only - Oct 24 2:00 1:00 S Rule Fiji 2011 only - Mar Sun=1 3:00 0 - Rule Fiji 2011 only - Oct 23 2:00 1:00 S -Rule Fiji 2012 only - Feb 26 3:00 0 - +Rule Fiji 2012 only - Jan 22 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva 12:00 Fiji FJ%sT # Fiji Time
CVS commit: src/doc
Module Name:src Committed By: apb Date: Wed Nov 2 05:24:12 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: tzdata2011n has been released and imported. To generate a diff of this commit: cvs rdiff -u -r1.883 -r1.884 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.883 src/doc/3RDPARTY:1.884 --- src/doc/3RDPARTY:1.883 Fri Oct 28 07:20:03 2011 +++ src/doc/3RDPARTY Wed Nov 2 05:24:12 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.883 2011/10/28 07:20:03 tron Exp $ +# $NetBSD: 3RDPARTY,v 1.884 2011/11/02 05:24:12 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1099,8 +1099,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2011i / tzdata2011m -Current Vers: tzcode2011i / tzdata2011m +Version: tzcode2011i / tzdata2011n +Current Vers: tzcode2011i / tzdata2011n Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au Archive Site: ftp://elsie.nci.nih.gov/pub/
CVS commit: src/doc
Module Name:src Committed By: apb Date: Wed Nov 2 05:24:55 UTC 2011 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2011n. [apb 2002] To generate a diff of this commit: cvs rdiff -u -r1.1620 -r1.1621 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1620 src/doc/CHANGES:1.1621 --- src/doc/CHANGES:1.1620 Fri Oct 28 07:20:03 2011 +++ src/doc/CHANGES Wed Nov 2 05:24:55 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1620 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1621 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1151,3 +1151,4 @@ Changes from NetBSD 5.0 to NetBSD 6.0: powerpc: Switch to GDB 7.3.1. [mrg 20111024] efa(4): Add driver for ELBOX FastATA 1200. [rkujawa 20111028] postfix(1): Import version 2.8.6 [tron 20111028] + zoneinfo: Import tzdata2011n. [apb 2002]
