CVS commit: src
Module Name:src Committed By: mbalmer Date: Sun Jul 13 08:37:13 UTC 2014 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile Added Files: src/share/man/man4: asus.4 Log Message: Add a man page for asus(4), written by Leonardo Taccari as part of PR/39932. To generate a diff of this commit: cvs rdiff -u -r1.1478 -r1.1479 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.614 -r1.615 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/asus.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1478 src/distrib/sets/lists/man/mi:1.1479 --- src/distrib/sets/lists/man/mi:1.1478 Tue Jul 8 05:55:34 2014 +++ src/distrib/sets/lists/man/mi Sun Jul 13 08:37:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1478 2014/07/08 05:55:34 spz Exp $ +# $NetBSD: mi,v 1.1479 2014/07/13 08:37:13 mbalmer Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -862,6 +862,7 @@ ./usr/share/man/cat4/arp.0 man-sys-catman .cat ./usr/share/man/cat4/artsata.0 man-sys-catman .cat ./usr/share/man/cat4/ast.0 man-sys-catman .cat +./usr/share/man/cat4/asus.0 man-sys-catman .cat ./usr/share/man/cat4/ata.0 man-sys-catman .cat ./usr/share/man/cat4/atabus.0 man-sys-catman .cat ./usr/share/man/cat4/atalk.0 man-sys-catman .cat @@ -3908,6 +3909,7 @@ ./usr/share/man/html4/arp.html man-sys-htmlman html ./usr/share/man/html4/artsata.html man-sys-htmlman html ./usr/share/man/html4/ast.html man-sys-htmlman html +./usr/share/man/html4/asus.html man-sys-htmlman html ./usr/share/man/html4/ata.html man-sys-htmlman html ./usr/share/man/html4/atabus.html man-sys-htmlman html ./usr/share/man/html4/atalk.html man-sys-htmlman html @@ -6717,6 +6719,7 @@ ./usr/share/man/man4/arp.4 man-sys-man .man ./usr/share/man/man4/artsata.4 man-sys-man .man ./usr/share/man/man4/ast.4 man-sys-man .man +./usr/share/man/man4/asus.4 man-sys-man .man ./usr/share/man/man4/ata.4 man-sys-man .man ./usr/share/man/man4/atabus.4 man-sys-man .man ./usr/share/man/man4/atalk.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.614 src/share/man/man4/Makefile:1.615 --- src/share/man/man4/Makefile:1.614 Sun May 18 11:46:23 2014 +++ src/share/man/man4/Makefile Sun Jul 13 08:37:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.614 2014/05/18 11:46:23 kardel Exp $ +# $NetBSD: Makefile,v 1.615 2014/07/13 08:37:13 mbalmer Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -6,7 +6,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a adc.4 admtemp.4 adv.4 adw.4 age.4 agp.4 agr.4 ahb.4 ahc.4 \ ahcisata.4 ahd.4 \ aibs.4 alc.4 ale.4 alipm.4 altmem.4 altq.4 amdpm.4 amdtemp.4 amhphy.4 \ - amr.4 aps.4 \ + amr.4 aps.4 asus.4 \ an.4 arcmsr.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \ ath.4 athn.4 atphy.4 atppc.4 attimer.4 atw.4 \ auacer.4 audio.4 audiocs.4 auich.4 \ Added files: Index: src/share/man/man4/asus.4 diff -u /dev/null src/share/man/man4/asus.4:1.1 --- /dev/null Sun Jul 13 08:37:13 2014 +++ src/share/man/man4/asus.4 Sun Jul 13 08:37:13 2014 @@ -0,0 +1,76 @@ +.\ $NetBSD: asus.4,v 1.1 2014/07/13 08:37:13 mbalmer Exp $ +.\ +.\ Copyright (c) 2008 The NetBSD Foundation, Inc. +.\ 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 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. +.\ +.Dd November 15, 2008 +.Dt ASUS 4 +.Os +.Sh NAME +.Nm asus +.Nd ASUS hotkeys +.Sh SYNOPSIS +.Cd asus* at acpi? +.Sh DESCRIPTION +The +.Nm +driver provides support for
CVS commit: src/share/man/man4
Module Name:src Committed By: mbalmer Date: Sun Jul 13 08:43:29 UTC 2014 Modified Files: src/share/man/man4: acpi.4 Log Message: Fix asus(4) entry. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/share/man/man4/acpi.4 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/man4/acpi.4 diff -u src/share/man/man4/acpi.4:1.75 src/share/man/man4/acpi.4:1.76 --- src/share/man/man4/acpi.4:1.75 Tue Apr 10 13:48:24 2012 +++ src/share/man/man4/acpi.4 Sun Jul 13 08:43:29 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpi.4,v 1.75 2012/04/10 13:48:24 jruoho Exp $ +.\ $NetBSD: acpi.4,v 1.76 2014/07/13 08:43:29 mbalmer Exp $ .\ .\ Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 10, 2012 +.Dd July 13, 2014 .Dt ACPI 4 .Os .Sh NAME @@ -266,7 +266,7 @@ support for Windows Management Instrumen watchdogs. .It Xr aibs 4 ASUSTeK voltage, temperature and fan sensors. -.It asus +.It asus 4 ASUS laptop hotkeys. .It Xr attimer 4 AT Timer.
CVS commit: src/share/man/man7
Module Name:src Committed By: mbalmer Date: Sun Jul 13 09:32:05 UTC 2014 Modified Files: src/share/man/man7: tests.atf.7 Log Message: Add a missing word; found by Maxime Villard, thanks! To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man7/tests.atf.7 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/man7/tests.atf.7 diff -u src/share/man/man7/tests.atf.7:1.5 src/share/man/man7/tests.atf.7:1.6 --- src/share/man/man7/tests.atf.7:1.5 Wed May 21 12:13:18 2014 +++ src/share/man/man7/tests.atf.7 Sun Jul 13 09:32:05 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: tests.atf.7,v 1.5 2014/05/21 12:13:18 wiz Exp $ +.\ $NetBSD: tests.atf.7,v 1.6 2014/07/13 09:32:05 mbalmer Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -25,7 +25,7 @@ .\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN .\ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 20, 2014 +.Dd July 13, 2014 .Dt TESTS 7 .Os .Sh NAME @@ -37,8 +37,8 @@ The test suite provides a collection of automated tests for two major purposes. On the one hand, the test suite aids .Em developers -in catching bugs and regressions in the code when they performing modifications -to the source tree. +in catching bugs and regressions in the code when they are performing +modifications to the source tree. On the other hand, the test suite allows .Em end users (and, in particular, system administrators) to verify that fresh installations
CVS commit: src/share/man/man9
Module Name:src Committed By: mbalmer Date: Sun Jul 13 11:03:26 UTC 2014 Modified Files: src/share/man/man9: cardbus.9 Log Message: Don't lie about the CardBus device database. Diff from Jukka Ruohonen. Fixes PR misc/39625. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man9/cardbus.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/cardbus.9 diff -u src/share/man/man9/cardbus.9:1.18 src/share/man/man9/cardbus.9:1.19 --- src/share/man/man9/cardbus.9:1.18 Mon Jan 6 14:57:10 2014 +++ src/share/man/man9/cardbus.9 Sun Jul 13 11:03:26 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: cardbus.9,v 1.18 2014/01/06 14:57:10 njoly Exp $ +.\ $NetBSD: cardbus.9,v 1.19 2014/07/13 11:03:26 mbalmer Exp $ .\ .\ Copyright (c) 2001 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 15, 2010 +.Dd July 13, 2014 .Dt CARDBUS 9 .Os .Sh NAME @@ -309,13 +309,9 @@ The CardBus subsystem itself is implemen .Pa sys/dev/cardbus/cardbus_map.c and .Pa sys/dev/cardbus/cardslot.c . -The database of known devices exists within the file -.Pa sys/dev/cardbus/cardbus_data.h -and is generated automatically from the file -.Pa sys/dev/cardbus/cardbusdevs . -New vendor and product identifiers should be added to this file. -The database can be regenerated using the Makefile -.Pa sys/dev/cardbus/Makefile.cardbusdevs . +The database for PCI devices is also used for known CardBus devices. +For more details see +.Xr pci 9 . .Sh SEE ALSO .Xr cardbus 4 , .Xr pcmcia 4 ,
CVS commit: src/share/man/man9
Module Name:src Committed By: mbalmer Date: Sun Jul 13 11:08:46 UTC 2014 Modified Files: src/share/man/man9: audio.9 Log Message: Fix a typo in a function name. Found by Nat Sloss, thanks. Fixes PR misc/46446. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/share/man/man9/audio.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/audio.9 diff -u src/share/man/man9/audio.9:1.43 src/share/man/man9/audio.9:1.44 --- src/share/man/man9/audio.9:1.43 Wed Nov 23 23:11:56 2011 +++ src/share/man/man9/audio.9 Sun Jul 13 11:08:46 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: audio.9,v 1.43 2011/11/23 23:11:56 jmcneill Exp $ +.\ $NetBSD: audio.9,v 1.44 2014/07/13 11:08:46 mbalmer Exp $ .\ .\ Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 23, 2011 +.Dd July 13, 2014 .Dt AUDIO 9 .Os .Sh NAME @@ -207,7 +207,7 @@ support 8bit mu-law, but 16bit slinear_l .Dv pfil-\*[Gt]append() with .Va pfil , -.Va mulaw_to_slinear16 , +.Va mulaw_to_linear16 , and audio_params_t representing [8000Hz, slinear_le, 16/16bit, 2ch]. If the driver needs multiple conversions, a conversion nearest to the hardware should be set to the head of
CVS commit: src/sys/miscfs/fdesc
Module Name:src
Committed By: hannken
Date: Sun Jul 13 11:23:01 UTC 2014
Modified Files:
src/sys/miscfs/fdesc: fdesc.h fdesc_vfsops.c fdesc_vnops.c
Log Message:
Change fdesc from hashlist to vcache.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/miscfs/fdesc/fdesc.h
cvs rdiff -u -r1.88 -r1.89 src/sys/miscfs/fdesc/fdesc_vfsops.c
cvs rdiff -u -r1.119 -r1.120 src/sys/miscfs/fdesc/fdesc_vnops.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/miscfs/fdesc/fdesc.h
diff -u src/sys/miscfs/fdesc/fdesc.h:1.21 src/sys/miscfs/fdesc/fdesc.h:1.22
--- src/sys/miscfs/fdesc/fdesc.h:1.21 Tue Sep 27 01:22:12 2011
+++ src/sys/miscfs/fdesc/fdesc.h Sun Jul 13 11:23:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc.h,v 1.21 2011/09/27 01:22:12 christos Exp $ */
+/* $NetBSD: fdesc.h,v 1.22 2014/07/13 11:23:01 hannken Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -56,11 +56,10 @@ typedef enum {
} fdntype;
struct fdescnode {
- LIST_ENTRY(fdescnode) fd_hash; /* Hash list */
struct vnode *fd_vnode; /* Back ptr to vnode */
fdntype fd_type; /* Type of this node */
unsigned fd_fd; /* Fd to be dup'ed */
- char *fd_link; /* Link to fd/n */
+ const char *fd_link; /* Link to fd/n */
int fd_ix; /* filesystem index */
};
Index: src/sys/miscfs/fdesc/fdesc_vfsops.c
diff -u src/sys/miscfs/fdesc/fdesc_vfsops.c:1.88 src/sys/miscfs/fdesc/fdesc_vfsops.c:1.89
--- src/sys/miscfs/fdesc/fdesc_vfsops.c:1.88 Sun Mar 23 15:21:16 2014
+++ src/sys/miscfs/fdesc/fdesc_vfsops.c Sun Jul 13 11:23:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vfsops.c,v 1.88 2014/03/23 15:21:16 hannken Exp $ */
+/* $NetBSD: fdesc_vfsops.c,v 1.89 2014/07/13 11:23:01 hannken Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fdesc_vfsops.c,v 1.88 2014/03/23 15:21:16 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: fdesc_vfsops.c,v 1.89 2014/07/13 11:23:01 hannken Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -78,7 +78,7 @@ int
fdesc_mount(struct mount *mp, const char *path, void *data, size_t *data_len)
{
struct lwp *l = curlwp;
- int error = 0;
+ int error = 0, ix;
struct vnode *rvp;
if (mp-mnt_flag MNT_GETARGS) {
@@ -91,12 +91,11 @@ fdesc_mount(struct mount *mp, const char
if (mp-mnt_flag MNT_UPDATE)
return (EOPNOTSUPP);
- error = fdesc_allocvp(Froot, FD_ROOT, mp, rvp);
+ ix = FD_ROOT;
+ error = vcache_get(mp, ix, sizeof(ix), rvp);
if (error)
- return (error);
+ return error;
- rvp-v_type = VDIR;
- rvp-v_vflag |= VV_ROOT;
mp-mnt_stat.f_namemax = FDESC_MAXNAMLEN;
mp-mnt_flag |= MNT_LOCAL;
mp-mnt_data = rvp;
@@ -104,7 +103,6 @@ fdesc_mount(struct mount *mp, const char
error = set_statvfs_info(path, UIO_USERSPACE, fdesc, UIO_SYSSPACE,
mp-mnt_op-vfs_name, mp, l);
- VOP_UNLOCK(rvp);
return error;
}
@@ -174,6 +172,66 @@ fdesc_vget(struct mount *mp, ino_t ino,
return (EOPNOTSUPP);
}
+int
+fdesc_loadvnode(struct mount *mp, struct vnode *vp,
+const void *key, size_t key_len, const void **new_key)
+{
+ int ix;
+ struct fdescnode *fd;
+
+ KASSERT(key_len == sizeof(ix));
+ memcpy(ix, key, key_len);
+
+ fd = kmem_alloc(sizeof(struct fdescnode), KM_SLEEP);
+ fd-fd_fd = -1;
+ fd-fd_link = NULL;
+ fd-fd_ix = ix;
+ fd-fd_vnode = vp;
+ vp-v_tag = VT_FDESC;
+ vp-v_op = fdesc_vnodeop_p;
+ vp-v_data = fd;
+ switch (ix) {
+ case FD_ROOT:
+ fd-fd_type = Froot;
+ vp-v_type = VDIR;
+ vp-v_vflag |= VV_ROOT;
+ break;
+ case FD_DEVFD:
+ fd-fd_type = Fdevfd;
+ vp-v_type = VDIR;
+ break;
+ case FD_CTTY:
+ fd-fd_type = Fctty;
+ vp-v_type = VNON;
+ break;
+ case FD_STDIN:
+ fd-fd_type = Flink;
+ fd-fd_link = fd/0;
+ vp-v_type = VLNK;
+ break;
+ case FD_STDOUT:
+ fd-fd_type = Flink;
+ fd-fd_link = fd/1;
+ vp-v_type = VLNK;
+ break;
+ case FD_STDERR:
+ fd-fd_type = Flink;
+ fd-fd_link = fd/2;
+ vp-v_type = VLNK;
+ break;
+ default:
+ KASSERT(ix = FD_DESC);
+ fd-fd_type = Fdesc;
+ fd-fd_fd = ix - FD_DESC;
+ vp-v_type = VNON;
+ break;
+ }
+ uvm_vnp_setsize(vp, 0);
+ *new_key = fd-fd_ix;
+
+ return 0;
+}
+
extern const struct vnodeopv_desc fdesc_vnodeop_opv_desc;
const struct vnodeopv_desc * const fdesc_vnodeopv_descs[] = {
@@ -192,6 +250,7 @@ struct vfsops fdesc_vfsops = {
.vfs_statvfs = genfs_statvfs,
.vfs_sync = fdesc_sync,
.vfs_vget = fdesc_vget,
+ .vfs_loadvnode = fdesc_loadvnode,
.vfs_fhtovp = (void *)eopnotsupp,
.vfs_vptofh = (void *)eopnotsupp,
.vfs_init = fdesc_init,
Index: src/sys/miscfs/fdesc/fdesc_vnops.c
diff -u src/sys/miscfs/fdesc/fdesc_vnops.c:1.119 src/sys/miscfs/fdesc/fdesc_vnops.c:1.120
--- src/sys/miscfs/fdesc/fdesc_vnops.c:1.119 Thu Mar 20 18:04:05 2014
+++ src/sys/miscfs/fdesc/fdesc_vnops.c Sun Jul 13 11:23:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vnops.c,v 1.119 2014/03/20 18:04:05 christos Exp $ */
+/* $NetBSD: fdesc_vnops.c,v 1.120 2014/07/13
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sun Jul 13 12:04:07 UTC 2014 Modified Files: src/share/man/man4: asus.4 Log Message: Use import date for Dd. Remove unnecessary quotes. End sentence with dot. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/asus.4 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/man4/asus.4 diff -u src/share/man/man4/asus.4:1.1 src/share/man/man4/asus.4:1.2 --- src/share/man/man4/asus.4:1.1 Sun Jul 13 08:37:13 2014 +++ src/share/man/man4/asus.4 Sun Jul 13 12:04:07 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: asus.4,v 1.1 2014/07/13 08:37:13 mbalmer Exp $ +.\ $NetBSD: asus.4,v 1.2 2014/07/13 12:04:07 wiz Exp $ .\ .\ Copyright (c) 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 15, 2008 +.Dd July 13, 2014 .Dt ASUS 4 .Os .Sh NAME @@ -66,11 +66,11 @@ driver appeared in The .Nm device driver was written by -.An Jared D. McNeill . +.An Jared D. McNeill . This man page was written by -.An Leonardo Taccari . +.An Leonardo Taccari . .Sh BUGS At the moment .Nm does not handle -Fn + F6 (Task manager) +Fn + F6 (Task manager).
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sun Jul 13 12:08:32 UTC 2014 Modified Files: src/share/man/man4: acpi.4 Log Message: Fix asus entry. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/share/man/man4/acpi.4 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/man4/acpi.4 diff -u src/share/man/man4/acpi.4:1.76 src/share/man/man4/acpi.4:1.77 --- src/share/man/man4/acpi.4:1.76 Sun Jul 13 08:43:29 2014 +++ src/share/man/man4/acpi.4 Sun Jul 13 12:08:32 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpi.4,v 1.76 2014/07/13 08:43:29 mbalmer Exp $ +.\ $NetBSD: acpi.4,v 1.77 2014/07/13 12:08:32 wiz Exp $ .\ .\ Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -266,7 +266,7 @@ support for Windows Management Instrumen watchdogs. .It Xr aibs 4 ASUSTeK voltage, temperature and fan sensors. -.It asus 4 +.It Xr asus 4 ASUS laptop hotkeys. .It Xr attimer 4 AT Timer.
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Sun Jul 13 12:15:45 UTC 2014 Modified Files: src/distrib/sets/lists/debug: ad.arm ad.mips ad.powerpc md.sparc64 Log Message: libisccfg.so.8.1 debug files for other compat architectures. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/debug/md.sparc64 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/debug/ad.arm diff -u src/distrib/sets/lists/debug/ad.arm:1.36 src/distrib/sets/lists/debug/ad.arm:1.37 --- src/distrib/sets/lists/debug/ad.arm:1.36 Wed Jun 18 17:50:15 2014 +++ src/distrib/sets/lists/debug/ad.arm Sun Jul 13 12:15:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.36 2014/06/18 17:50:15 christos Exp $ +# $NetBSD: ad.arm,v 1.37 2014/07/13 12:15:45 martin Exp $ ./usr/lib/libarm_g.acomp-c-debuglib debuglib ./usr/lib/libc_vfp_g.acomp-c-debuglib debuglib,softfloat ./usr/lib/libpmc_g.acomp-c-debuglib debuglib @@ -111,7 +111,8 @@ ./usr/libdata/debug/usr/lib/oabi/libisccc.so.6.0.debug comp-bind-debug debug,compat,obsolete ./usr/libdata/debug/usr/lib/oabi/libisccc.so.8.0.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/oabi/libisccfg.so.6.0.debug comp-bind-debug debug,compat,obsolete -./usr/libdata/debug/usr/lib/oabi/libisccfg.so.8.0.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/oabi/libisccfg.so.8.0.debug comp-bind-debug debug,compat,obsolete +./usr/libdata/debug/usr/lib/oabi/libisccfg.so.8.1.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/oabi/libiscsi.so.2.0.debug comp-iscsi-debug iscsi,debug,compat ./usr/libdata/debug/usr/lib/oabi/libisns.so.0.0.debug comp-isns-debug debug,compat ./usr/libdata/debug/usr/lib/oabi/libkadm5clnt.so.12.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete Index: src/distrib/sets/lists/debug/ad.mips diff -u src/distrib/sets/lists/debug/ad.mips:1.32 src/distrib/sets/lists/debug/ad.mips:1.33 --- src/distrib/sets/lists/debug/ad.mips:1.32 Wed Jun 18 17:50:15 2014 +++ src/distrib/sets/lists/debug/ad.mips Sun Jul 13 12:15:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.32 2014/06/18 17:50:15 christos Exp $ +# $NetBSD: ad.mips,v 1.33 2014/07/13 12:15:45 martin Exp $ ./usr/lib/64/libcrypto_g.a comp-c-debuglib compat,crypto,debuglib,arch64 ./usr/lib/64/libcrypto_idea_g.a comp-obsolete obsolete ./usr/lib/64/libcrypto_mdc2_g.a comp-obsolete obsolete @@ -116,7 +116,8 @@ ./usr/libdata/debug/usr/lib/64/libisccc.so.6.0.debug comp-bind-debug debug,compat,arch64,obsolete ./usr/libdata/debug/usr/lib/64/libisccc.so.8.0.debug comp-bind-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/64/libisccfg.so.6.0.debug comp-bind-debug debug,compat,arch64,obsolete -./usr/libdata/debug/usr/lib/64/libisccfg.so.8.0.debug comp-bind-debug debug,compat,arch64 +./usr/libdata/debug/usr/lib/64/libisccfg.so.8.0.debug comp-bind-debug debug,compat,arch64,obsolete +./usr/libdata/debug/usr/lib/64/libisccfg.so.8.1.debug comp-bind-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/64/libiscsi.so.2.0.debug comp-iscsi-debug iscsi,debug,compat,arch64 ./usr/libdata/debug/usr/lib/64/libisns.so.0.0.debug comp-isns-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/64/libkadm5clnt.so.12.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete,arch64 @@ -292,7 +293,8 @@ ./usr/libdata/debug/usr/lib/o32/libisccc.so.6.0.debug comp-bind-debug debug,compat,arch64,obsolete ./usr/libdata/debug/usr/lib/o32/libisccc.so.8.0.debug comp-bind-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/o32/libisccfg.so.6.0.debug comp-bind-debug debug,compat,arch64,obsolete -./usr/libdata/debug/usr/lib/o32/libisccfg.so.8.0.debug comp-bind-debug debug,compat,arch64 +./usr/libdata/debug/usr/lib/o32/libisccfg.so.8.0.debug comp-bind-debug debug,compat,arch64,obsolete +./usr/libdata/debug/usr/lib/o32/libisccfg.so.8.1.debug comp-bind-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/o32/libiscsi.so.2.0.debug comp-iscsi-debug iscsi,debug,compat,arch64 ./usr/libdata/debug/usr/lib/o32/libisns.so.0.0.debug comp-isns-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/o32/libkadm5clnt.so.12.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete,arch64 Index: src/distrib/sets/lists/debug/ad.powerpc diff -u src/distrib/sets/lists/debug/ad.powerpc:1.12 src/distrib/sets/lists/debug/ad.powerpc:1.13 --- src/distrib/sets/lists/debug/ad.powerpc:1.12 Wed Jul 9 11:45:45 2014 +++ src/distrib/sets/lists/debug/ad.powerpc Sun Jul 13 12:15:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.powerpc,v 1.12 2014/07/09 11:45:45 martin Exp $ +# $NetBSD: ad.powerpc,v 1.13 2014/07/13 12:15:45 martin Exp $ ./usr/lib/powerpc/libamu_g.a comp-c-debuglib
CVS commit: src
Module Name:src Committed By: mbalmer Date: Sun Jul 13 12:29:01 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi Added Files: src/share/wscons/keymaps: pckbd.bg.bds.cp1251 pckbd.bg.bds.iso8859-5 pckbd.bg.qwerty.cp1251 pckbd.bg.qwerty.iso8859-5 pckbd.bg.qwerty.koi8-r Log Message: Add the five bulgarian keymaps we got via PR misc/37713 from mark...@gmail.com. To generate a diff of this commit: cvs rdiff -u -r1.1072 -r1.1073 src/distrib/sets/lists/base/mi cvs rdiff -u -r0 -r1.1 src/share/wscons/keymaps/pckbd.bg.bds.cp1251 \ src/share/wscons/keymaps/pckbd.bg.bds.iso8859-5 \ src/share/wscons/keymaps/pckbd.bg.qwerty.cp1251 \ src/share/wscons/keymaps/pckbd.bg.qwerty.iso8859-5 \ src/share/wscons/keymaps/pckbd.bg.qwerty.koi8-r 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/base/mi diff -u src/distrib/sets/lists/base/mi:1.1072 src/distrib/sets/lists/base/mi:1.1073 --- src/distrib/sets/lists/base/mi:1.1072 Tue Jul 8 05:55:33 2014 +++ src/distrib/sets/lists/base/mi Sun Jul 13 12:29:01 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1072 2014/07/08 05:55:33 spz Exp $ +# $NetBSD: mi,v 1.1073 2014/07/13 12:29:01 mbalmer Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -4827,6 +4827,11 @@ ./usr/share/wscons/keymaps/mkbd.pt.iso8859-1 base-util-share share ./usr/share/wscons/keymaps/mkbd.pt.iso8859-2 base-obsolete obsolete ./usr/share/wscons/keymaps/pckbd.be.azerty base-util-share share +./usr/share/wscons/keymaps/pckbd.bg.bds.cp1251 base-util-share share +./usr/share/wscons/keymaps/pckbd.bg.bds.iso8859-5 base-util-share share +./usr/share/wscons/keymaps/pckbd.bg.qwerty.cp1251 base-util-share share +./usr/share/wscons/keymaps/pckbd.bg.qwerty.iso8859-5 base-util-share share +./usr/share/wscons/keymaps/pckbd.bg.qwerty.koi8-r base-util-share share ./usr/share/wscons/keymaps/pckbd.br.abnt2 base-util-share share ./usr/share/wscons/keymaps/pckbd.de_CH.iso8859-1 base-util-share share ./usr/share/wscons/keymaps/pckbd.de_CH.iso8859-2 base-obsolete obsolete Added files: Index: src/share/wscons/keymaps/pckbd.bg.bds.cp1251 diff -u /dev/null src/share/wscons/keymaps/pckbd.bg.bds.cp1251:1.1 --- /dev/null Sun Jul 13 12:29:01 2014 +++ src/share/wscons/keymaps/pckbd.bg.bds.cp1251 Sun Jul 13 12:29:01 2014 @@ -0,0 +1,111 @@ +# $NetBSD: pckbd.bg.bds.cp1251,v 1.1 2014/07/13 12:29:01 mbalmer Exp $ +# +# This is a BDS (typewriter) CP1251 keymap. Cyrillic input is toggled +# by pressing the AltGr key. +# From M. K. mark...@gmail.com per PR misc/37713. + +keycode 1 = Cmd_Debugger Escape +keycode 2 = 1 exclam 1 exclam +keycode 3 = 2 at 2 question +keycode 4 = 3 numbersign 3 plus +keycode 5 = 4 dollar 4 quotedbl +keycode 6 = 5 percent 5 percent +keycode 7 = 6 asciicircum 6 equal +keycode 8 = 7 ampersand 7 colon +keycode 9 = 8 asterisk 8 slash +keycode 10 = 9 parenleft 9 minus +keycode 11 = 0 parenright 0 onesuperior +keycode 12 = minus underscore minus I +keycode 13 = equal plus period V +keycode 14 = Cmd_ResetEmul Delete +keycode 15 = Tab +keycode 16 = q Q comma ucircumflex +keycode 17 = w W oacute Oacute +keycode 18 = e E aring Aring +keycode 19 = r R egrave Egrave +keycode 20 = t T oslash Ooblique +keycode 21 = y Y ugrave Ugrave +keycode 22 = u U ecircumflex Ecircumflex +keycode 23 = i I ntilde Ntilde +keycode 24 = o O adiaeresis Adiaeresis +keycode 25 = p P ccedilla Ccedilla +keycode 26 = bracketleft braceleft odiaeresis Odiaeresis +keycode 27 = bracketright braceright semicolon section +keycode 28 = Return +keycode 29 = Cmd1 Control_L +keycode 30 = a A udiaeresis Udiaeresis +keycode 31 = s S ydiaeresis ssharp +keycode 32 = d D agrave Agrave +keycode 33 = f F icircumflex Icircumflex +keycode 34 = g G ae AE +keycode 35 = h H atilde Atilde +keycode 36 = j J ograve Ograve +keycode 37 = k K iacute Iacute +keycode 38 = l L acircumflex Acircumflex +keycode 39 = semicolon colon igrave Igrave +keycode 40 = apostrophe quotedbl division multiply +keycode 41 = grave asciitilde +keycode 42 = Shift_L +keycode 43 = backslash bar parenleft parenright +keycode 44 = z Z thorn THORN +keycode 45 = x X eacute Eacute +keycode 46 = c C uacute Uacute +keycode 47 = v V yacute Yacute +keycode 48 = b B ocircumflex Ocircumflex +keycode 49 = n N otilde Otilde +keycode 50 = m M idiaeresis Idiaeresis +keycode 51 = comma less eth ETH +keycode 52 = period greater ediaeresis Ediaeresis +keycode 53 = slash question aacute Aacute +keycode 54 = Shift_R +keycode 55 = KP_Multiply +keycode 56 = Cmd2 Alt_L +keycode 57 = space +keycode 58 = Caps_Lock +keycode 59 = Cmd_Screen0 f1 F1 +keycode 60 = Cmd_Screen1 f2 F2 +keycode 61 = Cmd_Screen2 f3 F3 +keycode 62 = Cmd_Screen3 f4 F4 +keycode 63 = Cmd_Screen4 f5 F5 +keycode 64 = Cmd_Screen5 f6 F6 +keycode 65 = Cmd_Screen6 f7 F7 +keycode 66 = Cmd_Screen7 f8 F8 +keycode 67
CVS commit: src/share/man/man4
Module Name:src Committed By: mbalmer Date: Sun Jul 13 12:47:14 UTC 2014 Modified Files: src/share/man/man4: netintro.4 Log Message: Add a description of SIOCGIFALIAS. From Jens A Nilsson via PR misc/6880. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/share/man/man4/netintro.4 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/man4/netintro.4 diff -u src/share/man/man4/netintro.4:1.27 src/share/man/man4/netintro.4:1.28 --- src/share/man/man4/netintro.4:1.27 Sun Oct 6 08:27:00 2013 +++ src/share/man/man4/netintro.4 Sun Jul 13 12:47:13 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: netintro.4,v 1.27 2013/10/06 08:27:00 wiz Exp $ +.\ $NetBSD: netintro.4,v 1.28 2014/07/13 12:47:13 mbalmer Exp $ .\ .\ Copyright (c) 1983, 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)netintro.4 8.2 (Berkeley) 11/30/93 .\ -.Dd October 5, 2013 +.Dd July 13, 2014 .Dt NETINTRO 4 .Os .Sh NAME @@ -285,6 +285,12 @@ multiple masks or destination addresses, convention that specification of the default address means to delete the first address for the interface belonging to the address family in which the original socket was opened. +.It Dv SIOCGIFALIAS +This request provides means to get additional addresses together +with netmask and broadcast/destination from an interface. +It also uses the +.Ar ifaliasreq +structure. .El .Pp Request making use of the
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Sun Jul 13 13:53:59 UTC 2014 Modified Files: src/distrib/sets/lists/debug: ad.arm ad.mips ad.powerpc md.sparc64 Log Message: Add libirs debug info to a few more places To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/debug/md.sparc64 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/debug/ad.arm diff -u src/distrib/sets/lists/debug/ad.arm:1.37 src/distrib/sets/lists/debug/ad.arm:1.38 --- src/distrib/sets/lists/debug/ad.arm:1.37 Sun Jul 13 12:15:45 2014 +++ src/distrib/sets/lists/debug/ad.arm Sun Jul 13 13:53:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.37 2014/07/13 12:15:45 martin Exp $ +# $NetBSD: ad.arm,v 1.38 2014/07/13 13:53:59 martin Exp $ ./usr/lib/libarm_g.acomp-c-debuglib debuglib ./usr/lib/libc_vfp_g.acomp-c-debuglib debuglib,softfloat ./usr/lib/libpmc_g.acomp-c-debuglib debuglib @@ -113,6 +113,7 @@ ./usr/libdata/debug/usr/lib/oabi/libisccfg.so.6.0.debug comp-bind-debug debug,compat,obsolete ./usr/libdata/debug/usr/lib/oabi/libisccfg.so.8.0.debug comp-bind-debug debug,compat,obsolete ./usr/libdata/debug/usr/lib/oabi/libisccfg.so.8.1.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/oabi/libirs.so.8.0.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/oabi/libiscsi.so.2.0.debug comp-iscsi-debug iscsi,debug,compat ./usr/libdata/debug/usr/lib/oabi/libisns.so.0.0.debug comp-isns-debug debug,compat ./usr/libdata/debug/usr/lib/oabi/libkadm5clnt.so.12.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete Index: src/distrib/sets/lists/debug/ad.mips diff -u src/distrib/sets/lists/debug/ad.mips:1.33 src/distrib/sets/lists/debug/ad.mips:1.34 --- src/distrib/sets/lists/debug/ad.mips:1.33 Sun Jul 13 12:15:45 2014 +++ src/distrib/sets/lists/debug/ad.mips Sun Jul 13 13:53:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.33 2014/07/13 12:15:45 martin Exp $ +# $NetBSD: ad.mips,v 1.34 2014/07/13 13:53:59 martin Exp $ ./usr/lib/64/libcrypto_g.a comp-c-debuglib compat,crypto,debuglib,arch64 ./usr/lib/64/libcrypto_idea_g.a comp-obsolete obsolete ./usr/lib/64/libcrypto_mdc2_g.a comp-obsolete obsolete @@ -118,6 +118,7 @@ ./usr/libdata/debug/usr/lib/64/libisccfg.so.6.0.debug comp-bind-debug debug,compat,arch64,obsolete ./usr/libdata/debug/usr/lib/64/libisccfg.so.8.0.debug comp-bind-debug debug,compat,arch64,obsolete ./usr/libdata/debug/usr/lib/64/libisccfg.so.8.1.debug comp-bind-debug debug,compat,arch64 +./usr/libdata/debug/usr/lib/64/libirs.so.8.0.debug comp-bind-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/64/libiscsi.so.2.0.debug comp-iscsi-debug iscsi,debug,compat,arch64 ./usr/libdata/debug/usr/lib/64/libisns.so.0.0.debug comp-isns-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/64/libkadm5clnt.so.12.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete,arch64 @@ -295,6 +296,7 @@ ./usr/libdata/debug/usr/lib/o32/libisccfg.so.6.0.debug comp-bind-debug debug,compat,arch64,obsolete ./usr/libdata/debug/usr/lib/o32/libisccfg.so.8.0.debug comp-bind-debug debug,compat,arch64,obsolete ./usr/libdata/debug/usr/lib/o32/libisccfg.so.8.1.debug comp-bind-debug debug,compat,arch64 +./usr/libdata/debug/usr/lib/o32/libirs.so.8.0.debug comp-bind-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/o32/libiscsi.so.2.0.debug comp-iscsi-debug iscsi,debug,compat,arch64 ./usr/libdata/debug/usr/lib/o32/libisns.so.0.0.debug comp-isns-debug debug,compat,arch64 ./usr/libdata/debug/usr/lib/o32/libkadm5clnt.so.12.0.debug comp-compat-shlib compat,pic,kerberos,debug,obsolete,arch64 Index: src/distrib/sets/lists/debug/ad.powerpc diff -u src/distrib/sets/lists/debug/ad.powerpc:1.13 src/distrib/sets/lists/debug/ad.powerpc:1.14 --- src/distrib/sets/lists/debug/ad.powerpc:1.13 Sun Jul 13 12:15:45 2014 +++ src/distrib/sets/lists/debug/ad.powerpc Sun Jul 13 13:53:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.powerpc,v 1.13 2014/07/13 12:15:45 martin Exp $ +# $NetBSD: ad.powerpc,v 1.14 2014/07/13 13:53:59 martin Exp $ ./usr/lib/powerpc/libamu_g.a comp-c-debuglib compat,arch64,debuglib ./usr/lib/powerpc/libarchive_g.a comp-c-debuglib compat,arch64,debuglib ./usr/lib/powerpc/libasn1_g.a comp-c-debuglib compat,arch64,debuglib,kerberos @@ -190,6 +190,7 @@ ./usr/libdata/debug/usr/lib/powerpc/libisccc.so.8.0.debug comp-compat-shlib compat,arch64,debug,pic ./usr/libdata/debug/usr/lib/powerpc/libisccfg.so.8.0.debug comp-compat-shlib compat,arch64,debug,pic,obsolete ./usr/libdata/debug/usr/lib/powerpc/libisccfg.so.8.1.debug comp-compat-shlib compat,arch64,debug,pic +./usr/libdata/debug/usr/lib/powerpc/libirs.so.8.0.debug
CVS commit: xsrc/external/mit/MesaLib/dist/src/glsl
Module Name:xsrc
Committed By: riastradh
Date: Sun Jul 13 14:16:21 UTC 2014
Modified Files:
xsrc/external/mit/MesaLib/dist/src/glsl: ir.h
Log Message:
Remove bogus self-assigned loop field. From upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/MesaLib/dist/src/glsl/ir.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/glsl/ir.h
diff -u xsrc/external/mit/MesaLib/dist/src/glsl/ir.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/glsl/ir.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/glsl/ir.h:1.1.1.1 Wed Jul 9 19:38:35 2014
+++ xsrc/external/mit/MesaLib/dist/src/glsl/ir.h Sun Jul 13 14:16:21 2014
@@ -1129,7 +1129,6 @@ public:
{
this-ir_type = ir_type_loop_jump;
this-mode = mode;
- this-loop = loop;
}
virtual ir_loop_jump *clone(void *mem_ctx, struct hash_table *) const;
@@ -1153,9 +1152,6 @@ public:
/** Mode selector for the jump instruction. */
enum jump_mode mode;
-private:
- /** Loop containing this break instruction. */
- ir_loop *loop;
};
/**
CVS commit: src/external/bsd/bind/lib/libirs
Module Name:src
Committed By: christos
Date: Sun Jul 13 14:54:22 UTC 2014
Modified Files:
src/external/bsd/bind/lib/libirs: Makefile
Log Message:
Remove irs re-implementation of getaddrinfo, getnameinfo, gai_strerror
that libc provides. XXX: Perhaps it is better to just make irs a private
library since not many things use it, and it is so small after we removed
the stuff that is provided by libc.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/lib/libirs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/lib/libirs/Makefile
diff -u src/external/bsd/bind/lib/libirs/Makefile:1.1 src/external/bsd/bind/lib/libirs/Makefile:1.2
--- src/external/bsd/bind/lib/libirs/Makefile:1.1 Tue Jul 8 01:55:33 2014
+++ src/external/bsd/bind/lib/libirs/Makefile Sun Jul 13 10:54:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/07/08 05:55:33 spz Exp $
+# $NetBSD: Makefile,v 1.2 2014/07/13 14:54:22 christos Exp $
LIB=irs
#USE_SHLIBDIR= yes
@@ -14,8 +14,7 @@ DIST= ${IDIST}/lib/irs
.PATH.c: ${DIST}
-SRCS= context.c dnsconf.c gai_strerror.c getaddrinfo.c \
- getnameinfo.c resconf.c version.c
+SRCS= context.c dnsconf.c resconf.c version.c
.include bsd.lib.mk
CVS commit: src/external/bsd/dhcp
Module Name:src Committed By: christos Date: Sun Jul 13 14:56:56 UTC 2014 Modified Files: src/external/bsd/dhcp/dist/includes: config.h.in src/external/bsd/dhcp/include: config.h Log Message: remove WORDS_BIGENDIAN, nothing uses it. Pick up DHCPv6 from Makefile, so we only enable it for USE_INET6 like before. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/dhcp/dist/includes/config.h.in cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcp/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/dhcp/dist/includes/config.h.in diff -u src/external/bsd/dhcp/dist/includes/config.h.in:1.1.1.3 src/external/bsd/dhcp/dist/includes/config.h.in:1.2 --- src/external/bsd/dhcp/dist/includes/config.h.in:1.1.1.3 Sat Jul 12 07:57:52 2014 +++ src/external/bsd/dhcp/dist/includes/config.h.in Sun Jul 13 10:56:56 2014 @@ -179,18 +179,6 @@ /* Version number of package */ #undef VERSION -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif - /* Define to 1 if on MINIX. */ #undef _MINIX Index: src/external/bsd/dhcp/include/config.h diff -u src/external/bsd/dhcp/include/config.h:1.5 src/external/bsd/dhcp/include/config.h:1.6 --- src/external/bsd/dhcp/include/config.h:1.5 Sat Jul 12 16:03:19 2014 +++ src/external/bsd/dhcp/include/config.h Sun Jul 13 10:56:56 2014 @@ -15,8 +15,11 @@ #include sys/endian.h #define DHCP_BYTE_ORDER _BYTE_ORDER +#if 0 +/* From the Makefile */ /* Define to 1 to include DHCPv6 support. */ #define DHCPv6 1 +#endif /* Define to any value to chroot() prior to loading config. */ /* #undef EARLY_CHROOT */ @@ -181,18 +184,6 @@ /* Version number of package */ #define VERSION 4.3.0 -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif -#endif - /* Define to 1 if on MINIX. */ /* #undef _MINIX */
CVS commit: src/share/wscons/keymaps
Module Name:src Committed By: martin Date: Sun Jul 13 15:12:27 UTC 2014 Modified Files: src/share/wscons/keymaps: Makefile Log Message: Add the new files to unbreak the build (hi marc!) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/wscons/keymaps/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/wscons/keymaps/Makefile diff -u src/share/wscons/keymaps/Makefile:1.18 src/share/wscons/keymaps/Makefile:1.19 --- src/share/wscons/keymaps/Makefile:1.18 Mon Dec 6 18:26:29 2010 +++ src/share/wscons/keymaps/Makefile Sun Jul 13 15:12:27 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2010/12/06 18:26:29 phx Exp $ +# $NetBSD: Makefile,v 1.19 2014/07/13 15:12:27 martin Exp $ NOOBJ= # defined @@ -6,6 +6,9 @@ FILES= \ amikbd.pl.qwertz.iso8859-2 \ mkbd.pt.iso8859-1 \ pckbd.be.azerty pckbd.br.abnt2 \ + pckbd.bg.bds.cp1251 pckbd.bg.bds.iso8859-5 \ + pckbd.bg.qwerty.cp1251 pckbd.bg.qwerty.iso8859-5 \ + pckbd.bg.qwerty.koi8-r \ pckbd.de_CH.iso8859-1 \ pckbd.fr_CA.iso8859-1 \ pckbd.fr_CH.iso8859-1 \
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: christos
Date: Sun Jul 13 15:15:06 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c
Log Message:
print the error from bus_space_map.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.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/external/bsd/drm2/dist/drm/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.5 Wed May 21 10:03:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Sun Jul 13 11:15:06 2014
@@ -8969,14 +8969,14 @@ static void i915_disable_vga(struct drm_
vga_reg = VGACNTRL;
#ifdef __NetBSD__
-{
const bus_size_t vgabase = 0x3c0;
const bus_space_tag_t iot = dev-pdev-pd_pa.pa_iot;
bus_space_handle_t ioh;
+ int error;
- if (bus_space_map(iot, vgabase, 0x10, 0, ioh)) {
+ if ((error = bus_space_map(iot, vgabase, 0x10, 0, ioh)) != 0) {
aprint_error_dev(dev-pdev-pd_dev,
- unable to map VGA registers);
+ unable to map VGA registers (error %d)\n, error);
} else {
CTASSERT(vgabase = VGA_SR_INDEX);
CTASSERT(vgabase = VGA_SR_DATA);
@@ -8986,7 +8986,6 @@ static void i915_disable_vga(struct drm_
(sr1 | __BIT(5)));
bus_space_unmap(iot, ioh, 0x10);
}
-}
#else
vga_get_uninterruptible(dev-pdev, VGA_RSRC_LEGACY_IO);
outb(SR01, VGA_SR_INDEX);
CVS commit: src/sys/arch/luna68k/dev
Module Name:src
Committed By: tsutsui
Date: Sun Jul 13 16:00:32 UTC 2014
Modified Files:
src/sys/arch/luna68k/dev: lunafb.c
Log Message:
Setup Bt458 color palette to support ANSI color text on 8bpp framebuffer.
Mostly taken from OpenBSD/luna88k. Also sync some comments.
Tested on LUNA-II, and mlterm-fb with 8bpp wallpaper also works fine.
Thanks to Kenji Aoyama (OpenBSD/luna88k maintainer) for providing
his spare 8bpp board.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/luna68k/dev/lunafb.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/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.30 src/sys/arch/luna68k/dev/lunafb.c:1.31
--- src/sys/arch/luna68k/dev/lunafb.c:1.30 Mon Dec 30 13:14:48 2013
+++ src/sys/arch/luna68k/dev/lunafb.c Sun Jul 13 16:00:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.30 2013/12/30 13:14:48 tsutsui Exp $ */
+/* $NetBSD: lunafb.c,v 1.31 2014/07/13 16:00:32 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1.30 2013/12/30 13:14:48 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1.31 2014/07/13 16:00:32 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -377,15 +377,8 @@ omfb_getdevconfig(paddr_t paddr, struct
break;
default:
case 0x0f:
-#if 1
- /*
- * XXX
- * experiment resulted in WHITE on SKYBLUE after Xorg server
- * touches pallete. Disable 4bpp for now.
- */
bpp = 4; /* XXX check monochrome bit in DIPSW */
break;
-#endif
case 1:
bpp = 1;
break;
@@ -431,7 +424,11 @@ omfb_getdevconfig(paddr_t paddr, struct
} else if (hwplanemask == 0xff) {
struct bt458 *ndac = (struct bt458 *)OMFB_RAMDAC;
- /* Initialize the Bt458 */
+ /*
+ * Initialize the Bt458. When we write to control registers,
+ * the address is not incremented automatically. So we specify
+ * it ourselves for each control register.
+ */
ndac-bt_addr = 0x04;
ndac-bt_ctrl = 0xff; /* all planes will be read */
ndac-bt_addr = 0x05;
@@ -441,14 +438,15 @@ omfb_getdevconfig(paddr_t paddr, struct
ndac-bt_addr = 0x07;
ndac-bt_ctrl = 0x00; /* no test mode */
+ /*
+ * Set ANSI 16 colors. We only supports 4bpp console right
+ * now, repeat 16 colors in 256 colormap.
+ */
ndac-bt_addr = 0;
- ndac-bt_cmap = dc-dc_cmap.r[0] = 0;
- ndac-bt_cmap = dc-dc_cmap.g[0] = 0;
- ndac-bt_cmap = dc-dc_cmap.b[0] = 0;
- for (i = 1; i 256; i++) {
- ndac-bt_cmap = dc-dc_cmap.r[i] = 255;
- ndac-bt_cmap = dc-dc_cmap.g[i] = 255;
- ndac-bt_cmap = dc-dc_cmap.b[i] = 255;
+ for (i = 0; i 256; i++) {
+ ndac-bt_cmap = dc-dc_cmap.r[i] = ansicmap[i % 16].r;
+ ndac-bt_cmap = dc-dc_cmap.g[i] = ansicmap[i % 16].g;
+ ndac-bt_cmap = dc-dc_cmap.b[i] = ansicmap[i % 16].b;
}
}
@@ -477,7 +475,7 @@ omfb_getdevconfig(paddr_t paddr, struct
ri-ri_flg |= RI_NO_AUTO;
ri-ri_hw = dc;
- if (bpp == 4)
+ if (bpp == 4 || bpp == 8)
omrasops4_init(ri, 34, 80);
else
omrasops1_init(ri, 34, 80);
CVS commit: src/games/tetris
Module Name:src
Committed By: pgoyette
Date: Sun Jul 13 16:23:56 UTC 2014
Modified Files:
src/games/tetris: screen.c tetris.6 tetris.c tetris.h
Log Message:
Provide an option to restore traditional black-and-white mode.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/games/tetris/screen.c
cvs rdiff -u -r1.11 -r1.12 src/games/tetris/tetris.6
cvs rdiff -u -r1.25 -r1.26 src/games/tetris/tetris.c
cvs rdiff -u -r1.13 -r1.14 src/games/tetris/tetris.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/tetris/screen.c
diff -u src/games/tetris/screen.c:1.28 src/games/tetris/screen.c:1.29
--- src/games/tetris/screen.c:1.28 Wed Jun 11 16:47:39 2014
+++ src/games/tetris/screen.c Sun Jul 13 16:23:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: screen.c,v 1.28 2014/06/11 16:47:39 christos Exp $ */
+/* $NetBSD: screen.c,v 1.29 2014/07/13 16:23:55 pgoyette Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -98,6 +98,8 @@ static void
setcolor(int c)
{
char *buf;
+ if (nocolor == 1)
+ return;
if (set_a_foreground == NULL)
return;
Index: src/games/tetris/tetris.6
diff -u src/games/tetris/tetris.6:1.11 src/games/tetris/tetris.6:1.12
--- src/games/tetris/tetris.6:1.11 Thu Sep 15 02:09:42 2005
+++ src/games/tetris/tetris.6 Sun Jul 13 16:23:55 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: tetris.6,v 1.11 2005/09/15 02:09:42 wiz Exp $
+.\ $NetBSD: tetris.6,v 1.12 2014/07/13 16:23:55 pgoyette Exp $
.\
.\ Copyright (c) 1992, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -40,7 +40,7 @@
.Nd the game of tetris
.Sh SYNOPSIS
.Nm
-.Op Fl ps
+.Op Fl cps
.Op Fl k Ar keys
.Op Fl l Ar level
.Sh DESCRIPTION
@@ -73,6 +73,11 @@ quit
.Pp
The options are as follows:
.Bl -tag -width indent
+.It Fl c
+By default, shapes are displayed colorfully if the user's CRT supports color.
+The
+.Fl c
+option can be used to restore the traditional black-and-white behavior.
.It Fl k
The default control keys can be changed using the
.Fl k
Index: src/games/tetris/tetris.c
diff -u src/games/tetris/tetris.c:1.25 src/games/tetris/tetris.c:1.26
--- src/games/tetris/tetris.c:1.25 Wed Jun 11 16:47:39 2014
+++ src/games/tetris/tetris.c Sun Jul 13 16:23:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tetris.c,v 1.25 2014/06/11 16:47:39 christos Exp $ */
+/* $NetBSD: tetris.c,v 1.26 2014/07/13 16:23:55 pgoyette Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -73,6 +73,7 @@ gid_t gid, egid;
char key_msg[100];
int showpreview;
+int nocolor;
static void elide(void);
static void setup_board(void);
@@ -144,8 +145,11 @@ main(int argc, char *argv[])
keys = jkl pq;
- while ((ch = getopt(argc, argv, k:l:ps)) != -1)
+ while ((ch = getopt(argc, argv, ck:l:ps)) != -1)
switch(ch) {
+ case 'c':
+ nocolor = 1;
+ break;
case 'k':
if (strlen(keys = optarg) != 6)
usage();
Index: src/games/tetris/tetris.h
diff -u src/games/tetris/tetris.h:1.13 src/games/tetris/tetris.h:1.14
--- src/games/tetris/tetris.h:1.13 Wed Jun 11 16:47:39 2014
+++ src/games/tetris/tetris.h Sun Jul 13 16:23:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tetris.h,v 1.13 2014/06/11 16:47:39 christos Exp $ */
+/* $NetBSD: tetris.h,v 1.14 2014/07/13 16:23:55 pgoyette Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -168,6 +168,7 @@ extern gid_t gid, egid;
extern char key_msg[100];
extern int showpreview;
+extern int nocolor;
int fits_in(const struct shape *, int);
void place(const struct shape *, int, int);
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: joerg Date: Sun Jul 13 16:31:20 UTC 2014 Modified Files: src/sys/arch/arm/include: int_types.h Log Message: Clang expects __INTx_TYPE__ to be used with signed/unsigned modifier when defining (u)intx_t, GCC has a separate __UINTx_TYPE__. Newer Clang will also provide the latter, but expects the behavior of the former to remain. As ARM uses unsigned char by default, distinguish between Clang and non-Clang here to the right type for int8_t. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/include/int_types.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/arm/include/int_types.h diff -u src/sys/arch/arm/include/int_types.h:1.14 src/sys/arch/arm/include/int_types.h:1.15 --- src/sys/arch/arm/include/int_types.h:1.14 Mon Feb 24 16:57:57 2014 +++ src/sys/arch/arm/include/int_types.h Sun Jul 13 16:31:20 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.14 2014/02/24 16:57:57 christos Exp $ */ +/* $NetBSD: int_types.h,v 1.15 2014/07/13 16:31:20 joerg Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -68,7 +68,11 @@ # define __UINT64_TYPE__ unsigned __INT64_TYPE__ #endif +#ifdef __clang__ +typedef signed __INT8_TYPE__ __int8_t; +#else typedef __INT8_TYPE__ __int8_t; +#endif typedef __UINT8_TYPE__ __uint8_t; typedef __INT16_TYPE__ __int16_t; typedef __UINT16_TYPE__ __uint16_t;
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: joerg
Date: Sun Jul 13 16:35:49 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xauth: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
src/external/mit/xorg/lib/dri/libmesa: Makefile
src/external/mit/xorg/lib/dri/r600: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libOSMesa: Makefile
src/external/mit/xorg/lib/libdrm_radeon: Makefile
Log Message:
Disable more warnings for clang build to deal with xsrc changes.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xauth/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/dri/i965/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/dri/libmesa/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri/r600/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libOSMesa/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libdrm_radeon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xauth/Makefile
diff -u src/external/mit/xorg/bin/xauth/Makefile:1.4 src/external/mit/xorg/bin/xauth/Makefile:1.5
--- src/external/mit/xorg/bin/xauth/Makefile:1.4 Sat Apr 5 17:01:55 2014
+++ src/external/mit/xorg/bin/xauth/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/04/05 17:01:55 tron Exp $
+# $NetBSD: Makefile,v 1.5 2014/07/13 16:35:49 joerg Exp $
.include bsd.own.mk
@@ -9,6 +9,8 @@ CPPFLAGS+= -DRETSIGTYPE=void -DPACKAGE_
CPPFLAGS.gethost.c= ${X11FLAGS.CONNECTION}
CPPFLAGS.parsedpy.c= ${X11FLAGS.CONNECTION}
+CWARNFLAGS.clang= -Wno-empty-body
+
LDADD+= -lXau -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXAU} ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.15 src/external/mit/xorg/lib/dri/i965/Makefile:1.16
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.15 Wed Jul 9 20:22:55 2014
+++ src/external/mit/xorg/lib/dri/i965/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/07/09 20:22:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.16 2014/07/13 16:35:49 joerg Exp $
MODULE= i965
@@ -124,7 +124,7 @@ SRCS+= \
brw_fs_vector_splitting.cpp \
brw_shader.cpp
-CWARNFLAGS.clang+= -Wno-format -Wno-switch
+CWARNFLAGS.clang+= -Wno-format -Wno-switch -Wno-tautological-compare
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
Index: src/external/mit/xorg/lib/dri/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.12 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.13
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.12 Wed Jul 9 20:22:55 2014
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/07/09 20:22:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.13 2014/07/13 16:35:49 joerg Exp $
.include bsd.own.mk
@@ -34,6 +34,7 @@ LIBDIR= ${X11USRLIBDIR}/modules/dri
#LIBDPLIBS+= GL ${.CURDIR}/../../libGL
-CWARNFLAGS.clang+= -Wno-format -Wno-constant-conversion
+CWARNFLAGS.clang+= -Wno-format -Wno-constant-conversion \
+ -Wno-tautological-compare
.include bsd.lib.mk
Index: src/external/mit/xorg/lib/dri/r600/Makefile
diff -u src/external/mit/xorg/lib/dri/r600/Makefile:1.5 src/external/mit/xorg/lib/dri/r600/Makefile:1.6
--- src/external/mit/xorg/lib/dri/r600/Makefile:1.5 Wed Jul 9 20:22:55 2014
+++ src/external/mit/xorg/lib/dri/r600/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/07/09 20:22:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.6 2014/07/13 16:35:49 joerg Exp $
MODULE= r600
@@ -56,6 +56,6 @@ SRCS+= \
LIBDPLIBS+= drm_radeon ${.CURDIR}/../../libdrm_radeon
CWARNFLAGS.clang+= -Wno-constant-logical-operand -Wno-empty-body \
- -Wno-format
+ -Wno-format -Wno-tautological-compare
.include ${.CURDIR}/../dri.mk
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.13 src/external/mit/xorg/lib/libGLU/Makefile:1.14
--- src/external/mit/xorg/lib/libGLU/Makefile:1.13 Sat Jun 14 20:49:37 2014
+++ src/external/mit/xorg/lib/libGLU/Makefile Sun Jul 13 16:35:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/06/14 20:49:37 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2014/07/13 16:35:49 joerg Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@@ -97,4 +97,4 @@ COPTS.tobezier.cc+= -Wno-error
COPTS.sampleCompTop.cc+= -O0
.endif
-CWARNFLAGS.clang+= -Wno-parentheses
+CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-undefined-compare
Index: src/external/mit/xorg/lib/libOSMesa/Makefile
diff -u src/external/mit/xorg/lib/libOSMesa/Makefile:1.8
CVS commit: xsrc/external/mit/libX11/dist/src/xkb
Module Name:xsrc
Committed By: joerg
Date: Sun Jul 13 16:37:45 UTC 2014
Modified Files:
xsrc/external/mit/libX11/dist/src/xkb: XKBMAlloc.c
Log Message:
Fix compare to actually do the right thing.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c
diff -u xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.1.1.6 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2
--- xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.1.1.6 Sun Mar 16 22:43:47 2014
+++ xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c Sun Jul 13 16:37:45 2014
@@ -302,7 +302,7 @@ XkbAddKeyType(XkbDescPtr xkb,
}
}
}
-if ((!map) || (!map-types) || (!map-num_types XkbNumRequiredTypes)) {
+if ((!map) || (!map-types) || !(map-num_types XkbNumRequiredTypes)) {
tmp = XkbNumRequiredTypes + 1;
if (XkbAllocClientMap(xkb, XkbKeyTypesMask, tmp) != Success)
return NULL;
CVS commit: src/sys
Module Name:src
Committed By: dholland
Date: Sun Jul 13 17:12:23 UTC 2014
Modified Files:
src/sys/arch/arm/cortina: files.g2
src/sys/arch/sgimips/hpc: pi1ppc.c
src/sys/dev/ic: atppc.c
src/sys/dev/ppbus: ppbus_1284.c ppbus_base.c
src/sys/dev/scsipi: scsipi_base.c scsipiconf.h
src/sys/dev/spi: spivar.h
Log Message:
peripheral, not peripherial.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/cortina/files.g2
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sgimips/hpc/pi1ppc.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/ic/atppc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ppbus/ppbus_1284.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ppbus/ppbus_base.c
cvs rdiff -u -r1.159 -r1.160 src/sys/dev/scsipi/scsipi_base.c
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/scsipi/scsipiconf.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/spi/spivar.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/arm/cortina/files.g2
diff -u src/sys/arch/arm/cortina/files.g2:1.1 src/sys/arch/arm/cortina/files.g2:1.2
--- src/sys/arch/arm/cortina/files.g2:1.1 Tue Feb 19 16:07:23 2013
+++ src/sys/arch/arm/cortina/files.g2 Sun Jul 13 17:12:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.g2,v 1.1 2013/02/19 16:07:23 matt Exp $
+# $NetBSD: files.g2,v 1.2 2014/07/13 17:12:23 dholland Exp $
#
# Configuration info for Broadcom BCM5301X ARM Peripherals
#
@@ -22,7 +22,7 @@ defparam opt_cortina.hMEMSIZE
defflag opt_cortina.hG2_CONSOLE_EARLY
defflag opt_cortina.hG2ETH_COUNTERS
-# G2 Peripherial attach point
+# G2 Peripheral attach point
device g2periph { [channel=-1] } : bus_space_generic
attach g2periph at mainbus
file arch/arm/cortina/g2_periph.c g2periph needs-flag
Index: src/sys/arch/sgimips/hpc/pi1ppc.c
diff -u src/sys/arch/sgimips/hpc/pi1ppc.c:1.11 src/sys/arch/sgimips/hpc/pi1ppc.c:1.12
--- src/sys/arch/sgimips/hpc/pi1ppc.c:1.11 Fri Jul 1 18:53:47 2011
+++ src/sys/arch/sgimips/hpc/pi1ppc.c Sun Jul 13 17:12:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pi1ppc.c,v 1.11 2011/07/01 18:53:47 dyoung Exp $ */
+/* $NetBSD: pi1ppc.c,v 1.12 2014/07/13 17:12:23 dholland Exp $ */
/*
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pi1ppc.c,v 1.11 2011/07/01 18:53:47 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pi1ppc.c,v 1.12 2014/07/13 17:12:23 dholland Exp $);
#include opt_pi1ppc.h
@@ -1217,7 +1217,7 @@ pi1ppc_nibble_read(struct pi1ppc_softc *
ctr = ~HOSTBUSY;
pi1ppc_w_ctr(pi1ppc, ctr);
- /* Event 11 - wait ack from peripherial */
+ /* Event 11 - wait ack from peripheral */
if (pi1ppc-sc_use PI1PPC_USE_INTR)
pi1ppc-sc_inerr = pi1ppc_wait_interrupt(pi1ppc,
pi1ppc-sc_in_cv, PI1PPC_IRQ_nACK);
Index: src/sys/dev/ic/atppc.c
diff -u src/sys/dev/ic/atppc.c:1.31 src/sys/dev/ic/atppc.c:1.32
--- src/sys/dev/ic/atppc.c:1.31 Wed Jun 4 21:42:35 2014
+++ src/sys/dev/ic/atppc.c Sun Jul 13 17:12:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc.c,v 1.31 2014/06/04 21:42:35 wiz Exp $ */
+/* $NetBSD: atppc.c,v 1.32 2014/07/13 17:12:23 dholland Exp $ */
/*
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atppc.c,v 1.31 2014/06/04 21:42:35 wiz Exp $);
+__KERNEL_RCSID(0, $NetBSD: atppc.c,v 1.32 2014/07/13 17:12:23 dholland Exp $);
#include opt_atppc.h
@@ -1663,7 +1663,7 @@ atppc_nibble_read(struct atppc_softc *at
ctr = ~HOSTBUSY;
atppc_w_ctr(atppc, ctr);
- /* Event 11 - wait ack from peripherial */
+ /* Event 11 - wait ack from peripheral */
if (atppc-sc_use ATPPC_USE_INTR)
atppc-sc_inerr = atppc_wait_interrupt(atppc,
atppc-sc_in_cv, ATPPC_IRQ_nACK);
Index: src/sys/dev/ppbus/ppbus_1284.c
diff -u src/sys/dev/ppbus/ppbus_1284.c:1.12 src/sys/dev/ppbus/ppbus_1284.c:1.13
--- src/sys/dev/ppbus/ppbus_1284.c:1.12 Fri Apr 18 14:56:40 2008
+++ src/sys/dev/ppbus/ppbus_1284.c Sun Jul 13 17:12:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_1284.c,v 1.12 2008/04/18 14:56:40 cegger Exp $ */
+/* $NetBSD: ppbus_1284.c,v 1.13 2014/07/13 17:12:23 dholland Exp $ */
/*-
* Copyright (c) 1997 Nicolas Souchu
@@ -32,7 +32,7 @@
/* General purpose routines for the IEEE1284-1994 Standard */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ppbus_1284.c,v 1.12 2008/04/18 14:56:40 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: ppbus_1284.c,v 1.13 2014/07/13 17:12:23 dholland Exp $);
#include opt_ppbus_1284.h
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, $NetBSD: ppbus_1284.c
#include dev/ppbus/ppbus_var.h
-/* Wait for the peripherial up to 40ms */
+/* Wait for the peripheral up to 40ms */
static int
do_1284_wait(struct ppbus_softc * bus, char mask, char status)
{
Index: src/sys/dev/ppbus/ppbus_base.c
diff -u src/sys/dev/ppbus/ppbus_base.c:1.18 src/sys/dev/ppbus/ppbus_base.c:1.19
---
CVS commit: src/share/misc
Module Name:src Committed By: asau Date: Sun Jul 13 17:27:45 UTC 2014 Modified Files: src/share/misc: airport Log Message: Simferopol' is in Krym rather than in Adygeya, and it is in Russia. (Whether your government recognize it or not is another issue. If you want to visit it these days, you have to enter Russia. Following Ukrainians, even before the recent unrest and referendum it was strongly advised not to discuss this topic with locals there. At least it was advised not to call Krym a part of Ukraine.) Fix Kerch' entry as well. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.53 src/share/misc/airport:1.54 --- src/share/misc/airport:1.53 Sat Jul 12 15:19:47 2014 +++ src/share/misc/airport Sun Jul 13 17:27:45 2014 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.53 2014/07/12 15:19:47 mbalmer Exp $ +# $NetBSD: airport,v 1.54 2014/07/13 17:27:45 asau Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -3730,7 +3730,7 @@ KGX:Grayling Airport, AK, USA KGY:Kingaroy, Queensland, Australia KGZ:Glacier Creek Airport, AK, USA KHA:Khaneh, Iran -KHC:Kerch, Krym (Crimea), Ukraine +KHC:Kerch, Krym (Crimea), Russia KHE:Kherson, Mykolayiv, Ukraine KHG:Kashi, China KHH:Kaohsiung International, Taiwan @@ -7029,7 +7029,7 @@ SIL:Sila, Papua New Guinea SIM:Simbai, Papua New Guinea SIN:Singapore SIO:Smithton, Tasmania, Australia -SIP:Simferopol, Adygea, Ukraine +SIP:Simferopol, Krym (Crimea), Russia SIQ:Singkep (Dabo Airport), Indonesia SIR:Sion (Sitten), Switzerland SIS:Sishen, South Africa
CVS commit: src/games/tetris
Module Name:src
Committed By: pgoyette
Date: Sun Jul 13 17:38:38 UTC 2014
Modified Files:
src/games/tetris: tetris.6 tetris.c
Log Message:
At suggestion of christos@, use -b for bw rather than -c
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/games/tetris/tetris.6
cvs rdiff -u -r1.26 -r1.27 src/games/tetris/tetris.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/tetris/tetris.6
diff -u src/games/tetris/tetris.6:1.12 src/games/tetris/tetris.6:1.13
--- src/games/tetris/tetris.6:1.12 Sun Jul 13 16:23:55 2014
+++ src/games/tetris/tetris.6 Sun Jul 13 17:38:38 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: tetris.6,v 1.12 2014/07/13 16:23:55 pgoyette Exp $
+.\ $NetBSD: tetris.6,v 1.13 2014/07/13 17:38:38 pgoyette Exp $
.\
.\ Copyright (c) 1992, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\
.\ @(#)tetris.6 8.1 (Berkeley) 5/31/93
.\
-.Dd May 31, 1993
+.Dd July 13, 2013
.Dt TETRIS 6
.Os
.Sh NAME
@@ -40,7 +40,7 @@
.Nd the game of tetris
.Sh SYNOPSIS
.Nm
-.Op Fl cps
+.Op Fl bps
.Op Fl k Ar keys
.Op Fl l Ar level
.Sh DESCRIPTION
@@ -73,10 +73,10 @@ quit
.Pp
The options are as follows:
.Bl -tag -width indent
-.It Fl c
+.It Fl b
By default, shapes are displayed colorfully if the user's CRT supports color.
The
-.Fl c
+.Fl b
option can be used to restore the traditional black-and-white behavior.
.It Fl k
The default control keys can be changed using the
Index: src/games/tetris/tetris.c
diff -u src/games/tetris/tetris.c:1.26 src/games/tetris/tetris.c:1.27
--- src/games/tetris/tetris.c:1.26 Sun Jul 13 16:23:55 2014
+++ src/games/tetris/tetris.c Sun Jul 13 17:38:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tetris.c,v 1.26 2014/07/13 16:23:55 pgoyette Exp $ */
+/* $NetBSD: tetris.c,v 1.27 2014/07/13 17:38:38 pgoyette Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -145,9 +145,9 @@ main(int argc, char *argv[])
keys = jkl pq;
- while ((ch = getopt(argc, argv, ck:l:ps)) != -1)
+ while ((ch = getopt(argc, argv, bk:l:ps)) != -1)
switch(ch) {
- case 'c':
+ case 'b':
nocolor = 1;
break;
case 'k':
CVS commit: src/share/misc
Module Name:src Committed By: asau Date: Sun Jul 13 18:02:27 UTC 2014 Modified Files: src/share/misc: airport Log Message: Sukhum isn't in Georgia since 1993 (1990, 1992, 1993, 1994, 1999, or 2008 depending on what you count as break-up). In any case in recent twenty years it was easier to get there through Russia than through Georgia. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.54 src/share/misc/airport:1.55 --- src/share/misc/airport:1.54 Sun Jul 13 17:27:45 2014 +++ src/share/misc/airport Sun Jul 13 18:02:27 2014 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.54 2014/07/13 17:27:45 asau Exp $ +# $NetBSD: airport,v 1.55 2014/07/13 18:02:27 asau Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -7320,7 +7320,7 @@ SUE:Sturgeon Bay (Door County), WI, USA SUF:Lamezia Terme, Italy SUG:Surigao, Philippines SUH:Sur, Oman -SUI:Sokhumi, Abkhazia, Georgia +SUI:Sukhum, Abkhazia SUJ:Satu Mare, Romania SUK:Samchok, South Korea SUL:Sui, Pakistan
CVS commit: src/share/misc
Module Name:src Committed By: asau Date: Sun Jul 13 18:08:33 UTC 2014 Modified Files: src/share/misc: airport Log Message: Vinnitsa isn't even in South-Western Russia. Make it Ukraine. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.55 src/share/misc/airport:1.56 --- src/share/misc/airport:1.55 Sun Jul 13 18:02:27 2014 +++ src/share/misc/airport Sun Jul 13 18:08:33 2014 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.55 2014/07/13 18:02:27 asau Exp $ +# $NetBSD: airport,v 1.56 2014/07/13 18:08:33 asau Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -8172,7 +8172,7 @@ VIH:Rolla/Vichy (Rolla National Airport) VIJ:Virgin Gorda (Valley), British Virgin Islands VIK:Kavik, AK, USA VIL:Dakhla (Villa Cisneros), Western Sahara -VIN:Vinnytsya, Russia +VIN:Vinnytsya, Ukraine VIQ:Viqueque, Indonesia VIS:Visalia Municipal Airport, CA, USA VIT:Vitoria, Spain
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: martin Date: Sun Jul 13 18:28:13 UTC 2014 Modified Files: src/external/mit/xorg/lib: Makefile Log Message: whitespace cleanup To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/external/mit/xorg/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/Makefile diff -u src/external/mit/xorg/lib/Makefile:1.28 src/external/mit/xorg/lib/Makefile:1.29 --- src/external/mit/xorg/lib/Makefile:1.28 Mon Mar 17 07:25:34 2014 +++ src/external/mit/xorg/lib/Makefile Sun Jul 13 18:28:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2014/03/17 07:25:34 mrg Exp $ +# $NetBSD: Makefile,v 1.29 2014/07/13 18:28:13 martin Exp $ # build libraries for xorg @@ -34,5 +34,5 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib .WAIT \ libXdmGreet \ xcb-util - + .include bsd.subdir.mk
CVS commit: src/sys/net
Module Name:src
Committed By: alnsn
Date: Sun Jul 13 18:48:27 UTC 2014
Modified Files:
src/sys/net: bpfjit.c
Log Message:
Don't use BJ_TMP2REG for 32bit packet reads. Assign this register to (buf+X)
in BPF_LD+BPF_IND and save one instruction.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/net/bpfjit.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/net/bpfjit.c
diff -u src/sys/net/bpfjit.c:1.26 src/sys/net/bpfjit.c:1.27
--- src/sys/net/bpfjit.c:1.26 Sat Jul 12 20:14:18 2014
+++ src/sys/net/bpfjit.c Sun Jul 13 18:48:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bpfjit.c,v 1.26 2014/07/12 20:14:18 alnsn Exp $ */
+/* $NetBSD: bpfjit.c,v 1.27 2014/07/13 18:48:27 alnsn Exp $ */
/*-
* Copyright (c) 2011-2014 Alexander Nasonov.
@@ -31,9 +31,9 @@
#include sys/cdefs.h
#ifdef _KERNEL
-__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.26 2014/07/12 20:14:18 alnsn Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.27 2014/07/13 18:48:27 alnsn Exp $);
#else
-__RCSID($NetBSD: bpfjit.c,v 1.26 2014/07/12 20:14:18 alnsn Exp $);
+__RCSID($NetBSD: bpfjit.c,v 1.27 2014/07/13 18:48:27 alnsn Exp $);
#endif
#include sys/types.h
@@ -123,11 +123,12 @@ __RCSID($NetBSD: bpfjit.c,v 1.26 2014/0
* Optimization hints.
*/
typedef unsigned int bpfjit_hint_t;
-#define BJ_HINT_PKT 0x01 /* packet read */
-#define BJ_HINT_LDW 0x02 /* 32-bit load */
-#define BJ_HINT_COP 0x04 /* BPF_COP or BPF_COPX instruction */
+#define BJ_HINT_ABS 0x01 /* packet read at absolute offset */
+#define BJ_HINT_IND 0x02 /* packet read at variable offset */
+#define BJ_HINT_COP 0x04 /* BPF_COP or BPF_COPX instruction */
#define BJ_HINT_XREG 0x08 /* BJ_XREG is needed */
#define BJ_HINT_LDX 0x10 /* BPF_LDX instruction */
+#define BJ_HINT_PKT (BJ_HINT_ABS|BJ_HINT_IND) /* packet read */
/*
* Datatype for Array Bounds Check Elimination (ABC) pass.
@@ -256,7 +257,7 @@ nscratches(bpfjit_hint_t hints)
rv = 3; /* xcall with three arguments */
#endif
- if (hints (BJ_HINT_LDW|BJ_HINT_PKT))
+ if (hints BJ_HINT_IND)
rv = 3; /* uses BJ_TMP2REG */
if (hints BJ_HINT_COP)
@@ -354,44 +355,46 @@ append_jump(struct sljit_jump *jump, str
* Emit code for BPF_LD+BPF_B+BPF_ABSA - P[k:1].
*/
static int
-emit_read8(struct sljit_compiler *compiler, uint32_t k)
+emit_read8(struct sljit_compiler *compiler, sljit_si src, uint32_t k)
{
return sljit_emit_op1(compiler,
SLJIT_MOV_UB,
BJ_AREG, 0,
- SLJIT_MEM1(BJ_BUF), k);
+ SLJIT_MEM1(src), k);
}
/*
* Emit code for BPF_LD+BPF_H+BPF_ABSA - P[k:2].
*/
static int
-emit_read16(struct sljit_compiler *compiler, uint32_t k)
+emit_read16(struct sljit_compiler *compiler, sljit_si src, uint32_t k)
{
int status;
- /* tmp1 = buf[k]; */
+ BJ_ASSERT(k = UINT32_MAX - 1);
+
+ /* A = buf[k]; */
status = sljit_emit_op1(compiler,
SLJIT_MOV_UB,
- BJ_TMP1REG, 0,
- SLJIT_MEM1(BJ_BUF), k);
+ BJ_AREG, 0,
+ SLJIT_MEM1(src), k);
if (status != SLJIT_SUCCESS)
return status;
- /* A = buf[k+1]; */
+ /* tmp1 = buf[k+1]; */
status = sljit_emit_op1(compiler,
SLJIT_MOV_UB,
- BJ_AREG, 0,
- SLJIT_MEM1(BJ_BUF), k+1);
+ BJ_TMP1REG, 0,
+ SLJIT_MEM1(src), k+1);
if (status != SLJIT_SUCCESS)
return status;
- /* tmp1 = tmp1 8; */
+ /* A = A 8; */
status = sljit_emit_op2(compiler,
SLJIT_SHL,
- BJ_TMP1REG, 0,
- BJ_TMP1REG, 0,
+ BJ_AREG, 0,
+ BJ_AREG, 0,
SLJIT_IMM, 8);
if (status != SLJIT_SUCCESS)
return status;
@@ -409,40 +412,34 @@ emit_read16(struct sljit_compiler *compi
* Emit code for BPF_LD+BPF_W+BPF_ABSA - P[k:4].
*/
static int
-emit_read32(struct sljit_compiler *compiler, uint32_t k)
+emit_read32(struct sljit_compiler *compiler, sljit_si src, uint32_t k)
{
int status;
- /* tmp1 = buf[k]; */
- status = sljit_emit_op1(compiler,
- SLJIT_MOV_UB,
- BJ_TMP1REG, 0,
- SLJIT_MEM1(BJ_BUF), k);
- if (status != SLJIT_SUCCESS)
- return status;
+ BJ_ASSERT(k = UINT32_MAX - 3);
- /* tmp2 = buf[k+1]; */
+ /* A = buf[k]; */
status = sljit_emit_op1(compiler,
SLJIT_MOV_UB,
- BJ_TMP2REG, 0,
- SLJIT_MEM1(BJ_BUF), k+1);
+ BJ_AREG, 0,
+ SLJIT_MEM1(src), k);
if (status != SLJIT_SUCCESS)
return status;
- /* A = buf[k+3]; */
+ /* tmp1 = buf[k+1]; */
status = sljit_emit_op1(compiler,
SLJIT_MOV_UB,
- BJ_AREG, 0,
- SLJIT_MEM1(BJ_BUF), k+3);
+ BJ_TMP1REG, 0,
+ SLJIT_MEM1(src), k+1);
if (status != SLJIT_SUCCESS)
return status;
- /* tmp1 = tmp1 24; */
+ /* A = A 8; */
status = sljit_emit_op2(compiler,
SLJIT_SHL,
- BJ_TMP1REG, 0,
- BJ_TMP1REG, 0,
- SLJIT_IMM, 24);
+ BJ_AREG, 0,
+ BJ_AREG, 0,
+ SLJIT_IMM, 8);
if (status != SLJIT_SUCCESS)
return status;
@@ -459,33 +456,41 @@ emit_read32(struct sljit_compiler *compi
status =
CVS commit: src/external/bsd/dhcp/include
Module Name:src Committed By: spz Date: Sun Jul 13 19:37:23 UTC 2014 Modified Files: src/external/bsd/dhcp/include: config.h Log Message: make the comment at the DHCPv6 define less cryptic To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcp/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/dhcp/include/config.h diff -u src/external/bsd/dhcp/include/config.h:1.6 src/external/bsd/dhcp/include/config.h:1.7 --- src/external/bsd/dhcp/include/config.h:1.6 Sun Jul 13 14:56:56 2014 +++ src/external/bsd/dhcp/include/config.h Sun Jul 13 19:37:23 2014 @@ -16,7 +16,7 @@ #define DHCP_BYTE_ORDER _BYTE_ORDER #if 0 -/* From the Makefile */ +/* make it possible to obey USE_INET6=no, define it in the Makefile instead */ /* Define to 1 to include DHCPv6 support. */ #define DHCPv6 1 #endif
CVS commit: src/tests
Module Name:src
Committed By: alnsn
Date: Sun Jul 13 21:35:33 UTC 2014
Modified Files:
src/tests/lib/libbpfjit: t_cop.c
src/tests/net/bpfjit: t_cop.c
Log Message:
Add bpfjit_cop_copx and bpfjit_copx_cop tests.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libbpfjit/t_cop.c
cvs rdiff -u -r1.2 -r1.3 src/tests/net/bpfjit/t_cop.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/libbpfjit/t_cop.c
diff -u src/tests/lib/libbpfjit/t_cop.c:1.3 src/tests/lib/libbpfjit/t_cop.c:1.4
--- src/tests/lib/libbpfjit/t_cop.c:1.3 Tue Jul 8 21:13:01 2014
+++ src/tests/lib/libbpfjit/t_cop.c Sun Jul 13 21:35:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cop.c,v 1.3 2014/07/08 21:13:01 alnsn Exp $ */
+/* $NetBSD: t_cop.c,v 1.4 2014/07/13 21:35:33 alnsn Exp $ */
/*-
* Copyright (c) 2013-2014 Alexander Nasonov.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_cop.c,v 1.3 2014/07/08 21:13:01 alnsn Exp $);
+__RCSID($NetBSD: t_cop.c,v 1.4 2014/07/13 21:35:33 alnsn Exp $);
#include atf-c.h
#include stdint.h
@@ -296,6 +296,45 @@ ATF_TC_BODY(libbpfjit_cop_side_effect, t
bpfjit_free_code(code);
}
+ATF_TC(libbpfjit_cop_copx);
+ATF_TC_HEAD(libbpfjit_cop_copx, tc)
+{
+ atf_tc_set_md_var(tc, descr,
+ Test BPF_COP call followed by BPF_COPX call);
+}
+
+ATF_TC_BODY(libbpfjit_cop_copx, tc)
+{
+ static struct bpf_insn insns[] = {
+ BPF_STMT(BPF_LD+BPF_IMM, 1), /* A - 1*/
+ BPF_STMT(BPF_MISC+BPF_COP, 0), /* retA */
+ BPF_STMT(BPF_MISC+BPF_TAX, 0), /* X - A*/
+ BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0), /* A = P[0] */
+ BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1), /* A = A + X */
+ BPF_STMT(BPF_MISC+BPF_TAX, 0), /* X - A*/
+ BPF_STMT(BPF_MISC+BPF_COPX, 0), /* retNF */
+ BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1), /* A = A + X */
+ BPF_STMT(BPF_RET+BPF_A, 0)
+ };
+
+ bpfjit_func_t code;
+ uint8_t pkt[1] = { 2 };
+ bpf_args_t args = {
+ .pkt = pkt,
+ .buflen = sizeof(pkt),
+ .wirelen = sizeof(pkt),
+ };
+
+ size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+ code = bpfjit_generate_code(ctx, insns, insn_count);
+ ATF_REQUIRE(code != NULL);
+
+ ATF_CHECK(code(ctx, args) == 3 + ctx.nfuncs);
+
+ bpfjit_free_code(code);
+}
+
ATF_TC(libbpfjit_cop_invalid_index);
ATF_TC_HEAD(libbpfjit_cop_invalid_index, tc)
{
@@ -516,6 +555,46 @@ ATF_TC_BODY(libbpfjit_copx_side_effect,
bpfjit_free_code(code);
}
+ATF_TC(libbpfjit_copx_cop);
+ATF_TC_HEAD(libbpfjit_copx_cop, tc)
+{
+ atf_tc_set_md_var(tc, descr,
+ Test BPF_COPX call followed by BPF_COP call);
+}
+
+ATF_TC_BODY(libbpfjit_copx_cop, tc)
+{
+ static struct bpf_insn insns[] = {
+ BPF_STMT(BPF_LDX+BPF_IMM, 2),/* X - 2*/
+ BPF_STMT(BPF_MISC+BPF_COPX, 0), /* retWL */
+ BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1), /* A = A + X */
+ BPF_STMT(BPF_MISC+BPF_TAX, 0), /* X - A*/
+ BPF_STMT(BPF_LD+BPF_B+BPF_ABS, 0), /* A = P[0] */
+ BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1), /* A = A + X */
+ BPF_STMT(BPF_MISC+BPF_TAX, 0), /* X - A*/
+ BPF_STMT(BPF_MISC+BPF_COP, 3), /* retNF */
+ BPF_STMT(BPF_ALU+BPF_ADD+BPF_X, 1), /* A = A + X */
+ BPF_STMT(BPF_RET+BPF_A, 0)
+ };
+
+ bpfjit_func_t code;
+ uint8_t pkt[1] = { 2 };
+ bpf_args_t args = {
+ .pkt = pkt,
+ .buflen = sizeof(pkt),
+ .wirelen = sizeof(pkt),
+ };
+
+ size_t insn_count = sizeof(insns) / sizeof(insns[0]);
+
+ code = bpfjit_generate_code(ctx, insns, insn_count);
+ ATF_REQUIRE(code != NULL);
+
+ ATF_CHECK(code(ctx, args) == 5 + ctx.nfuncs);
+
+ bpfjit_free_code(code);
+}
+
ATF_TC(libbpfjit_copx_invalid_index);
ATF_TC_HEAD(libbpfjit_copx_invalid_index, tc)
{
@@ -552,12 +631,17 @@ ATF_TC_BODY(libbpfjit_copx_invalid_index
ATF_TP_ADD_TCS(tp)
{
+ /*
+ * For every new test please also add a similar test
+ * to ../../net/bpfjit/t_cop.c
+ */
ATF_TP_ADD_TC(tp, libbpfjit_cop_no_ctx);
ATF_TP_ADD_TC(tp, libbpfjit_cop_ret_A);
ATF_TP_ADD_TC(tp, libbpfjit_cop_ret_buflen);
ATF_TP_ADD_TC(tp, libbpfjit_cop_ret_wirelen);
ATF_TP_ADD_TC(tp, libbpfjit_cop_ret_nfuncs);
ATF_TP_ADD_TC(tp, libbpfjit_cop_side_effect);
+ ATF_TP_ADD_TC(tp, libbpfjit_cop_copx);
ATF_TP_ADD_TC(tp, libbpfjit_cop_invalid_index);
ATF_TP_ADD_TC(tp, libbpfjit_copx_no_ctx);
@@ -566,6 +650,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, libbpfjit_copx_ret_wirelen);
ATF_TP_ADD_TC(tp, libbpfjit_copx_ret_nfuncs);
ATF_TP_ADD_TC(tp, libbpfjit_copx_side_effect);
+ ATF_TP_ADD_TC(tp, libbpfjit_copx_cop);
ATF_TP_ADD_TC(tp, libbpfjit_copx_invalid_index);
return atf_no_error();
Index: src/tests/net/bpfjit/t_cop.c
diff -u src/tests/net/bpfjit/t_cop.c:1.2 src/tests/net/bpfjit/t_cop.c:1.3
--- src/tests/net/bpfjit/t_cop.c:1.2 Wed Jul 9 15:56:12 2014
+++ src/tests/net/bpfjit/t_cop.c Sun Jul 13 21:35:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cop.c,v 1.2 2014/07/09 15:56:12 alnsn Exp $ */
+/* $NetBSD:
CVS commit: src/sys/net
Module Name:src
Committed By: alnsn
Date: Sun Jul 13 21:54:46 UTC 2014
Modified Files:
src/sys/net: bpfjit.c
Log Message:
Refactor BPF_COPX code. New version doesn't load buf and buflen after copx call.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/net/bpfjit.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/net/bpfjit.c
diff -u src/sys/net/bpfjit.c:1.27 src/sys/net/bpfjit.c:1.28
--- src/sys/net/bpfjit.c:1.27 Sun Jul 13 18:48:27 2014
+++ src/sys/net/bpfjit.c Sun Jul 13 21:54:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bpfjit.c,v 1.27 2014/07/13 18:48:27 alnsn Exp $ */
+/* $NetBSD: bpfjit.c,v 1.28 2014/07/13 21:54:46 alnsn Exp $ */
/*-
* Copyright (c) 2011-2014 Alexander Nasonov.
@@ -31,9 +31,9 @@
#include sys/cdefs.h
#ifdef _KERNEL
-__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.27 2014/07/13 18:48:27 alnsn Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.28 2014/07/13 21:54:46 alnsn Exp $);
#else
-__RCSID($NetBSD: bpfjit.c,v 1.27 2014/07/13 18:48:27 alnsn Exp $);
+__RCSID($NetBSD: bpfjit.c,v 1.28 2014/07/13 21:54:46 alnsn Exp $);
#endif
#include sys/types.h
@@ -95,13 +95,6 @@ __RCSID($NetBSD: bpfjit.c,v 1.27 2014/0
#define BJ_XREG SLJIT_TEMPORARY_EREG1
#define BJ_TMP3REG SLJIT_TEMPORARY_EREG2
-/*
- * EREG registers can't be used for indirect calls, reuse BJ_BUF and
- * BJ_BUFLEN registers. They can be easily restored from BJ_ARGS.
- */
-#define BJ_COPF_PTR SLJIT_SAVED_REG1
-#define BJ_COPF_IDX SLJIT_SAVED_REG3
-
#ifdef _KERNEL
#define MAX_MEMWORDS BPF_MAX_MEMWORDS
#else
@@ -123,11 +116,12 @@ __RCSID($NetBSD: bpfjit.c,v 1.27 2014/0
* Optimization hints.
*/
typedef unsigned int bpfjit_hint_t;
-#define BJ_HINT_ABS 0x01 /* packet read at absolute offset */
-#define BJ_HINT_IND 0x02 /* packet read at variable offset */
-#define BJ_HINT_COP 0x04 /* BPF_COP or BPF_COPX instruction */
-#define BJ_HINT_XREG 0x08 /* BJ_XREG is needed */
-#define BJ_HINT_LDX 0x10 /* BPF_LDX instruction */
+#define BJ_HINT_ABS 0x01 /* packet read at absolute offset */
+#define BJ_HINT_IND 0x02 /* packet read at variable offset */
+#define BJ_HINT_COP 0x04 /* BPF_COP or BPF_COPX instruction */
+#define BJ_HINT_COPX 0x08 /* BPF_COPX instruction */
+#define BJ_HINT_XREG 0x10 /* BJ_XREG is needed*/
+#define BJ_HINT_LDX 0x20 /* BPF_LDX instruction */
#define BJ_HINT_PKT (BJ_HINT_ABS|BJ_HINT_IND) /* packet read */
/*
@@ -271,6 +265,9 @@ nscratches(bpfjit_hint_t hints)
rv = 5; /* uses BJ_TMP3REG */
#endif
+ if (hints BJ_HINT_COPX)
+ rv = 5; /* uses BJ_TMP3REG */
+
return rv;
}
@@ -649,26 +646,31 @@ emit_xcall(struct sljit_compiler *compil
* Emit code for BPF_COP and BPF_COPX instructions.
*/
static int
-emit_cop(struct sljit_compiler *compiler, const bpf_ctx_t *bc,
-const struct bpf_insn *pc, struct sljit_jump **ret0_jump)
+emit_cop(struct sljit_compiler *compiler,
+const bpf_ctx_t *bc, const struct bpf_insn *pc,
+struct sljit_jump ***ret0, size_t *ret0_size, size_t *ret0_maxsize)
{
-#if BJ_XREG == SLJIT_RETURN_REG || \
-BJ_XREG == SLJIT_SCRATCH_REG1 || \
-BJ_XREG == SLJIT_SCRATCH_REG2 || \
-BJ_XREG == SLJIT_SCRATCH_REG3 || \
-BJ_COPF_PTR == BJ_ARGS|| \
-BJ_COPF_IDX == BJ_ARGS
+#if BJ_XREG== SLJIT_RETURN_REG || \
+BJ_XREG== SLJIT_SCRATCH_REG1 || \
+BJ_XREG== SLJIT_SCRATCH_REG2 || \
+BJ_XREG== SLJIT_SCRATCH_REG3 || \
+BJ_TMP3REG == SLJIT_SCRATCH_REG1 || \
+BJ_TMP3REG == SLJIT_SCRATCH_REG2 || \
+BJ_TMP3REG == SLJIT_SCRATCH_REG3
#error Not supported assignment of registers.
#endif
struct sljit_jump *jump;
+ sljit_si call_reg;
+ sljit_sw call_off;
int status;
- jump = NULL;
-
BJ_ASSERT(bc != NULL bc-copfuncs != NULL);
- if (BPF_MISCOP(pc-code) == BPF_COPX) {
+ if (BPF_MISCOP(pc-code) == BPF_COP) {
+ call_reg = SLJIT_IMM;
+ call_off = SLJIT_FUNC_OFFSET(bc-copfuncs[pc-k]);
+ } else {
/* if (X = bc-nfuncs) return 0; */
jump = sljit_emit_cmp(compiler,
SLJIT_C_GREATER_EQUAL,
@@ -676,10 +678,46 @@ emit_cop(struct sljit_compiler *compiler
SLJIT_IMM, bc-nfuncs);
if (jump == NULL)
return SLJIT_ERR_ALLOC_FAILED;
- }
+ if (!append_jump(jump, ret0, ret0_size, ret0_maxsize))
+ return SLJIT_ERR_ALLOC_FAILED;
+
+ /* tmp1 = ctx; */
+ status = sljit_emit_op1(compiler,
+ SLJIT_MOV_P,
+ BJ_TMP1REG, 0,
+ SLJIT_MEM1(SLJIT_LOCALS_REG),
+ offsetof(struct bpfjit_stack, ctx));
+ if (status != SLJIT_SUCCESS)
+ return status;
+
+ /* tmp1 = ctx-copfuncs; */
+ status = sljit_emit_op1(compiler,
+ SLJIT_MOV_P,
+ BJ_TMP1REG, 0,
+ SLJIT_MEM1(BJ_TMP1REG),
+ offsetof(struct bpf_ctx, copfuncs));
+ if (status != SLJIT_SUCCESS)
+ return status;
+
+ /* tmp2 = X; */
+ status = sljit_emit_op1(compiler,
+ SLJIT_MOV,
+ BJ_TMP2REG, 0,
+ BJ_XREG, 0);
+
CVS commit: src
Module Name:src
Committed By: tls
Date: Sun Jul 13 22:06:56 UTC 2014
Modified Files:
src/etc/rc.d: named
src/external/bsd/bind/dist: configure configure.in
src/external/bsd/bind/include: config.h
Log Message:
Make named and the rest of BIND seed their RNG from /dev/urandom, not
/dev/random. Better would be to rip the enormous gonkulating RNG machinery out
of libisc entirely. Later.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/etc/rc.d/named
cvs rdiff -u -r1.1.1.13 -r1.2 src/external/bsd/bind/dist/configure
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/configure.in
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/bind/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/named
diff -u src/etc/rc.d/named:1.24 src/etc/rc.d/named:1.25
--- src/etc/rc.d/named:1.24 Tue Jul 8 07:04:07 2014
+++ src/etc/rc.d/named Sun Jul 13 22:06:56 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: named,v 1.24 2014/07/08 07:04:07 spz Exp $
+# $NetBSD: named,v 1.25 2014/07/13 22:06:56 tls Exp $
#
# PROVIDE: named
@@ -101,7 +101,7 @@ named_precmd()
;;
esac
- for i in null random; do
+ for i in null random urandom; do
if [ ! -c ${named_chrootdir}/dev/$i ]; then
rm -f ${named_chrootdir}/dev/$i
(cd /dev
Index: src/external/bsd/bind/dist/configure
diff -u src/external/bsd/bind/dist/configure:1.1.1.13 src/external/bsd/bind/dist/configure:1.2
--- src/external/bsd/bind/dist/configure:1.1.1.13 Tue Jul 8 04:44:59 2014
+++ src/external/bsd/bind/dist/configure Sun Jul 13 22:06:56 2014
@@ -14049,7 +14049,7 @@ $as_echo unspecified 6; }
devrandom=/dev/arandom
;;
*)
-devrandom=/dev/random
+devrandom=/dev/urandom
;;
esac
{ $as_echo $as_me:${as_lineno-$LINENO}: result: $devrandom 5
Index: src/external/bsd/bind/dist/configure.in
diff -u src/external/bsd/bind/dist/configure.in:1.4 src/external/bsd/bind/dist/configure.in:1.5
--- src/external/bsd/bind/dist/configure.in:1.4 Tue Jul 8 05:43:37 2014
+++ src/external/bsd/bind/dist/configure.in Sun Jul 13 22:06:56 2014
@@ -930,7 +930,7 @@ case $use_randomdev in
devrandom=/dev/arandom
;;
*)
-devrandom=/dev/random
+devrandom=/dev/urandom
;;
esac
AC_MSG_RESULT($devrandom)
Index: src/external/bsd/bind/include/config.h
diff -u src/external/bsd/bind/include/config.h:1.13 src/external/bsd/bind/include/config.h:1.14
--- src/external/bsd/bind/include/config.h:1.13 Tue Jul 8 05:55:33 2014
+++ src/external/bsd/bind/include/config.h Sun Jul 13 22:06:56 2014
@@ -132,7 +132,7 @@ int sigwait(const unsigned int *set, int
#endif /** SHUTUP_STDARG_CAST __GNUC__ */
/** define if the system has a random number generating device */
-#define PATH_RANDOMDEV /dev/random
+#define PATH_RANDOMDEV /dev/urandom
/** define if pthread_attr_getstacksize() is available */
#define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Sun Jul 13 22:32:49 UTC 2014 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: sun4v: add interrupt handling to sun4v trap table To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 src/sys/arch/sparc64/sparc64/locore.s 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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.362 src/sys/arch/sparc64/sparc64/locore.s:1.363 --- src/sys/arch/sparc64/sparc64/locore.s:1.362 Sun Jul 13 22:09:01 2014 +++ src/sys/arch/sparc64/sparc64/locore.s Sun Jul 13 22:32:49 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.362 2014/07/13 22:09:01 palle Exp $ */ +/* $NetBSD: locore.s,v 1.363 2014/07/13 22:32:49 palle Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -246,6 +246,9 @@ cputyp: .word CPU_SUN4U ! Default to sun /* hardware interrupts (can be linked or made `fast') */ #define HARDINT4U(lev) \ VTRAP(lev, _C_LABEL(sparc_interrupt)) +#ifdef SUN4V +#define HARDINT4V(lev) HARDINT4U(lev) +#endif /* software interrupts (may not be made direct, sorry---but you should not be using them trivially anyway) */ @@ -948,7 +951,23 @@ _C_LABEL(trapbase_sun4v): ! sun4v_trap_entry 49! 0x000-0x030 VTRAP(T_DATA_MMU_MISS, sun4v_dtsb_miss) ! 0x031 = data MMU miss - sun4v_trap_entry 78! 0x032-0x07f + sun4v_trap_entry 15! 0x032-0x040 + HARDINT4V(1) ! 0x041 = level 1 interrupt + HARDINT4V(2) ! 0x042 = level 2 interrupt + HARDINT4V(3) ! 0x043 = level 3 interrupt + HARDINT4V(4) ! 0x044 = level 4 interrupt + HARDINT4V(5) ! 0x045 = level 5 interrupt + HARDINT4V(6) ! 0x046 = level 6 interrupt + HARDINT4V(7) ! 0x047 = level 7 interrupt + HARDINT4V(8) ! 0x048 = level 8 interrupt + HARDINT4V(9) ! 0x049 = level 9 interrupt + HARDINT4V(10) ! 0x04a = level 10 interrupt + HARDINT4V(11) ! 0x04b = level 11 interrupt + HARDINT4V(12) ! 0x04c = level 12 interrupt + HARDINT4V(13) ! 0x04d = level 13 interrupt + HARDINT4V(14) ! 0x04e = level 14 interrupt + HARDINT4V(15) ! 0x04f = level 15 interrupt + sun4v_trap_entry 48! 0x050-0x07f SPILL64(uspill8_sun4v,ASI_AIUS) ! 0x080 spill_0_normal -- used to save user windows in user mode SPILL32(uspill4_sun4v,ASI_AIUS) ! 0x084 spill_1_normal SPILLBOTH(uspill8_sun4v,uspill4_sun4v,ASI_AIUS) ! 0x088 spill_2_normal
CVS commit: src/external/mit/xorg/lib/libGLU
Module Name:src Committed By: riz Date: Mon Jul 14 00:22:46 UTC 2014 Modified Files: src/external/mit/xorg/lib/libGLU: Makefile Log Message: clang doesn't like -Wno-tautological-undefined-compare, use -Wno-tautological-compare instead. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libGLU/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libGLU/Makefile diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.14 src/external/mit/xorg/lib/libGLU/Makefile:1.15 --- src/external/mit/xorg/lib/libGLU/Makefile:1.14 Sun Jul 13 16:35:49 2014 +++ src/external/mit/xorg/lib/libGLU/Makefile Mon Jul 14 00:22:46 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/07/13 16:35:49 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2014/07/14 00:22:46 riz Exp $ NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :( @@ -97,4 +97,4 @@ COPTS.tobezier.cc+= -Wno-error COPTS.sampleCompTop.cc+= -O0 .endif -CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-undefined-compare +CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-compare
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: ozaki-r
Date: Mon Jul 14 00:58:35 UTC 2014
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
Suppress debug output of xhci_device_intr_done
It's annoying because it is output even on keyboard inputs.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/xhci.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/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.16 src/sys/dev/usb/xhci.c:1.17
--- src/sys/dev/usb/xhci.c:1.16 Mon Mar 10 13:21:22 2014
+++ src/sys/dev/usb/xhci.c Mon Jul 14 00:58:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.16 2014/03/10 13:21:22 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.17 2014/07/14 00:58:35 ozaki-r Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.16 2014/03/10 13:21:22 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.17 2014/07/14 00:58:35 ozaki-r Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2820,14 +2820,16 @@ static void
xhci_device_intr_done(usbd_xfer_handle xfer)
{
struct xhci_softc * const sc = xfer-pipe-device-bus-hci_private;
- struct xhci_slot * const xs = xfer-pipe-device-hci_private;
- const u_int dci = xhci_ep_get_dci(xfer-pipe-endpoint-edesc);
+ struct xhci_slot * const xs __debugused = xfer-pipe-device-hci_private;
+ const u_int dci __debugused = xhci_ep_get_dci(xfer-pipe-endpoint-edesc);
const u_int endpt = xfer-pipe-endpoint-edesc-bEndpointAddress;
const bool isread = UE_GET_DIR(endpt) == UE_DIR_IN;
DPRINTF((%s\n, __func__));
+#ifdef DEBUG
device_printf(sc-sc_dev, %s %p slot %u dci %u\n, __func__, xfer,
xs-xs_idx, dci);
+#endif
KASSERT(sc-sc_bus.use_polling || mutex_owned(sc-sc_lock));
CVS commit: src/sys/dev/pci
Module Name:src Committed By: ozaki-r Date: Mon Jul 14 01:24:58 UTC 2014 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Remove a duplicated error message To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/sys/dev/pci/if_wm.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/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.276 src/sys/dev/pci/if_wm.c:1.277 --- src/sys/dev/pci/if_wm.c:1.276 Fri Jul 11 08:50:08 2014 +++ src/sys/dev/pci/if_wm.c Mon Jul 14 01:24:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.276 2014/07/11 08:50:08 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.277 2014/07/14 01:24:58 ozaki-r Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -76,7 +76,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.276 2014/07/11 08:50:08 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.277 2014/07/14 01:24:58 ozaki-r Exp $); #include sys/param.h #include sys/systm.h @@ -5881,8 +5881,6 @@ wm_read_mac_addr(struct wm_softc *sc, ui return 0; bad: - aprint_error_dev(sc-sc_dev, unable to read Ethernet address\n); - return -1; }
CVS commit: src/sys/net
Module Name:src
Committed By: ozaki-r
Date: Mon Jul 14 02:34:36 UTC 2014
Modified Files:
src/sys/net: bridgestp.c if.h if_bridge.c if_bridgevar.h
Log Message:
Make bridge MPSAFE
- Introduce BRIDGE_MPSAFE
- It's enabled only when NET_MPSAFE is defined
in if.h or the kernel config
- Add iflist and rtlist mutex locks
- Locking iflist is performance sensitive,
so it's not used when !BRIDGE_MPSAFE
- Add bif object reference counting
- It enables fine-grain locking for bridge member lists
by allowing to not hold a lock during touching a bif
- bridge_release_member is added to decrement the
reference count
- A condition variable is added to do bridge_delete_member
gracefully
- Add if_bridgeif to ifnet
- It's a shortcut to a bif object of a bridge member
- It reduces a bif lookup cost and so lock contention on iflist
- Make bridgestp MPSAFE too
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/net/bridgestp.c
cvs rdiff -u -r1.170 -r1.171 src/sys/net/if.h
cvs rdiff -u -r1.86 -r1.87 src/sys/net/if_bridge.c
cvs rdiff -u -r1.19 -r1.20 src/sys/net/if_bridgevar.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/bridgestp.c
diff -u src/sys/net/bridgestp.c:1.16 src/sys/net/bridgestp.c:1.17
--- src/sys/net/bridgestp.c:1.16 Wed Jun 18 01:19:19 2014
+++ src/sys/net/bridgestp.c Mon Jul 14 02:34:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bridgestp.c,v 1.16 2014/06/18 01:19:19 ozaki-r Exp $ */
+/* $NetBSD: bridgestp.c,v 1.17 2014/07/14 02:34:36 ozaki-r Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (ja...@thought.net)
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bridgestp.c,v 1.16 2014/06/18 01:19:19 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: bridgestp.c,v 1.17 2014/07/14 02:34:36 ozaki-r Exp $);
#include sys/param.h
#include sys/systm.h
@@ -221,6 +221,8 @@ bstp_send_config_bpdu(struct bridge_soft
struct bstp_cbpdu bpdu;
int s;
+ KASSERT(BRIDGE_LOCKED(sc));
+
ifp = bif-bif_ifp;
if ((ifp-if_flags IFF_RUNNING) == 0)
@@ -274,9 +276,11 @@ bstp_send_config_bpdu(struct bridge_soft
memcpy(mtod(m, char *) + sizeof(*eh), bpdu, sizeof(bpdu));
+ BRIDGE_UNLOCK(sc);
s = splnet();
bridge_enqueue(sc, ifp, m, 0);
splx(s);
+ BRIDGE_LOCK(sc);
}
static int
@@ -363,6 +367,8 @@ bstp_transmit_tcn(struct bridge_softc *s
struct mbuf *m;
int s;
+ KASSERT(BRIDGE_LOCKED(sc));
+
KASSERT(bif != NULL);
ifp = bif-bif_ifp;
if ((ifp-if_flags IFF_RUNNING) == 0)
@@ -390,9 +396,11 @@ bstp_transmit_tcn(struct bridge_softc *s
memcpy(mtod(m, char *) + sizeof(*eh), bpdu, sizeof(bpdu));
+ BRIDGE_UNLOCK(sc);
s = splnet();
bridge_enqueue(sc, ifp, m, 0);
splx(s);
+ BRIDGE_LOCK(sc);
}
static void
@@ -592,6 +600,10 @@ bstp_input(struct bridge_softc *sc, stru
struct bstp_tcn_unit tu;
uint16_t len;
+#ifdef BRIDGE_MPSAFE
+ KASSERT(bif-bif_refs 0);
+#endif
+
eh = mtod(m, struct ether_header *);
if ((bif-bif_flags IFBIF_STP) == 0)
@@ -621,7 +633,11 @@ bstp_input(struct bridge_softc *sc, stru
switch (tpdu.tbu_bpdutype) {
case BSTP_MSGTYPE_TCN:
tu.tu_message_type = tpdu.tbu_bpdutype;
+
+ BRIDGE_LOCK(sc);
bstp_received_tcn_bpdu(sc, bif, tu);
+ BRIDGE_UNLOCK(sc);
+
break;
case BSTP_MSGTYPE_CFG:
if (m-m_len sizeof(cpdu)
@@ -658,7 +674,11 @@ bstp_input(struct bridge_softc *sc, stru
(cpdu.cbu_flags BSTP_FLAG_TCA) ? 1 : 0;
cu.cu_topology_change =
(cpdu.cbu_flags BSTP_FLAG_TC) ? 1 : 0;
+
+ BRIDGE_LOCK(sc);
bstp_received_config_bpdu(sc, bif, cu);
+ BRIDGE_UNLOCK(sc);
+
break;
default:
goto out;
@@ -805,6 +825,9 @@ bstp_initialization(struct bridge_softc
struct bridge_iflist *bif, *mif;
mif = NULL;
+
+ BRIDGE_LOCK(sc);
+
LIST_FOREACH(bif, sc-sc_iflist, bif_next) {
if ((bif-bif_flags IFBIF_STP) == 0)
continue;
@@ -823,7 +846,9 @@ bstp_initialization(struct bridge_softc
continue;
}
}
+
if (mif == NULL) {
+ BRIDGE_UNLOCK(sc);
bstp_stop(sc);
return;
}
@@ -837,6 +862,8 @@ bstp_initialization(struct bridge_softc
(((uint64_t)(uint8_t)CLLADDR(mif-bif_ifp-if_sadl)[4]) 8) |
(((uint64_t)(uint8_t)CLLADDR(mif-bif_ifp-if_sadl)[5]) 0);
+ BRIDGE_UNLOCK(sc);
+
sc-sc_designated_root = sc-sc_bridge_id;
sc-sc_root_path_cost = 0;
sc-sc_root_port = NULL;
@@ -853,6 +880,8 @@ bstp_initialization(struct bridge_softc
callout_reset(sc-sc_bstpcallout, hz,
bstp_tick, sc);
+ BRIDGE_LOCK(sc);
+
LIST_FOREACH(bif, sc-sc_iflist, bif_next) {
if (bif-bif_flags IFBIF_STP)
bstp_enable_port(sc, bif);
@@ -863,6 +892,8 @@ bstp_initialization(struct bridge_softc
bstp_port_state_selection(sc);
bstp_config_bpdu_generation(sc);
bstp_timer_start(sc-sc_hello_timer, 0);
+
+ BRIDGE_UNLOCK(sc);
}
void
@@ -870,12 +901,14 @@ bstp_stop(struct bridge_softc *sc)
{
struct bridge_iflist *bif;
+
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Jul 14 05:00:18 UTC 2014
Modified Files:
src/sys/dev/pci: if_wm.c if_wmvar.h
Log Message:
Cleanup comments. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_wmvar.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.277 src/sys/dev/pci/if_wm.c:1.278
--- src/sys/dev/pci/if_wm.c:1.277 Mon Jul 14 01:24:58 2014
+++ src/sys/dev/pci/if_wm.c Mon Jul 14 05:00:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.277 2014/07/14 01:24:58 ozaki-r Exp $ */
+/* $NetBSD: if_wm.c,v 1.278 2014/07/14 05:00:18 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.277 2014/07/14 01:24:58 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.278 2014/07/14 05:00:18 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1631,7 +1631,7 @@ wm_attach(device_t parent, device_t self
case WM_T_82580:
case WM_T_82580ER:
case WM_T_I350:
- case WM_T_I354: /* ok? */
+ case WM_T_I354:
case WM_T_80003:
/* SPI */
wm_set_spiaddrbits(sc);
Index: src/sys/dev/pci/if_wmvar.h
diff -u src/sys/dev/pci/if_wmvar.h:1.18 src/sys/dev/pci/if_wmvar.h:1.19
--- src/sys/dev/pci/if_wmvar.h:1.18 Fri Jul 11 08:34:27 2014
+++ src/sys/dev/pci/if_wmvar.h Mon Jul 14 05:00:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmvar.h,v 1.18 2014/07/11 08:34:27 msaitoh Exp $ */
+/* $NetBSD: if_wmvar.h,v 1.19 2014/07/14 05:00:18 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -72,29 +72,29 @@
#define _DEV_PCI_IF_WMVAR_H_
/* sc_flags */
-#define WM_F_HAS_MII 0x0001 /* has MII */
-#define WM_F_LOCK_EECD 0x0002 /* Lock using with EECD register */
-#define WM_F_LOCK_SWSM 0x0004 /* Lock using with SWSM register */
-#define WM_F_LOCK_SWFW 0x0008 /* Lock using with SWFW register */
-#define WM_F_LOCK_EXTCNF 0x0010 /* Lock using with EXTCNF register */
-#define WM_F_EEPROM_EERDEEWR 0x0020 /* EEPROM access via EERD/EEWR */
-#define WM_F_EEPROM_SPI 0x0040 /* EEPROM is SPI */
-#define WM_F_EEPROM_FLASH 0x0080 /* EEPROM is FLASH */
-#define WM_F_EEPROM_FLASH_HW 0x0100 /* EEPROM is FLASH */
-#define WM_F_EEPROM_INVALID 0x0200 /* EEPROM not present (bad checksum) */
-#define WM_F_IOH_VALID 0x0400 /* I/O handle is valid */
-#define WM_F_BUS64 0x0800 /* bus is 64-bit */
-#define WM_F_PCIX 0x1000 /* bus is PCI-X */
-#define WM_F_CSA 0x2000 /* bus is CSA */
-#define WM_F_PCIE 0x4000 /* bus is PCI-Express */
-#define WM_F_SGMII 0x8000 /* use SGMII */
-#define WM_F_NEWQUEUE 0x0001 /* chips which has the new queue system */
+#define WM_F_HAS_MII 0x0001 /* has MII */
+#define WM_F_LOCK_EECD 0x0002 /* Lock using with EECD register */
+#define WM_F_LOCK_SWSM 0x0004 /* Lock using with SWSM register */
+#define WM_F_LOCK_SWFW 0x0008 /* Lock using with SWFW register */
+#define WM_F_LOCK_EXTCNF 0x0010 /* Lock using with EXTCNF reg. */
+#define WM_F_EEPROM_EERDEEWR 0x0020 /* EEPROM access via EERD/EEWR */
+#define WM_F_EEPROM_SPI 0x0040 /* EEPROM is SPI */
+#define WM_F_EEPROM_FLASH 0x0080 /* EEPROM is FLASH */
+#define WM_F_EEPROM_FLASH_HW 0x0100 /* EEPROM is FLASH */
+#define WM_F_EEPROM_INVALID 0x0200 /* EEPROM not present (bad cksum) */
+#define WM_F_IOH_VALID 0x0400 /* I/O handle is valid */
+#define WM_F_BUS64 0x0800 /* bus is 64-bit */
+#define WM_F_PCIX 0x1000 /* bus is PCI-X */
+#define WM_F_CSA 0x2000 /* bus is CSA */
+#define WM_F_PCIE 0x4000 /* bus is PCI-Express */
+#define WM_F_SGMII 0x8000 /* use SGMII */
+#define WM_F_NEWQUEUE 0x0001 /* use new queue system */
#define WM_F_ASF_FIRMWARE_PRES 0x0002
#define WM_F_ARC_SUBSYS_VALID 0x0004
#define WM_F_HAS_AMT 0x0008
#define WM_F_HAS_MANAGE 0x0010
#define WM_F_WOL 0x0020
-#define WM_F_EEE 0x0040 /* Energy Efficiency Ethernet */
+#define WM_F_EEE 0x0040 /* Energy Efficiency Ethernet */
typedef enum {
WM_T_unknown = 0,
