CVS commit: src/share/man/man8
Module Name:src Committed By: hubertf Date: Tue Oct 27 08:55:44 UTC 2009 Modified Files: src/share/man/man8: MAKEDEV.8 Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/share/man/man8/MAKEDEV.8 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/man8/MAKEDEV.8 diff -u src/share/man/man8/MAKEDEV.8:1.36 src/share/man/man8/MAKEDEV.8:1.37 --- src/share/man/man8/MAKEDEV.8:1.36 Sun Sep 6 17:25:55 2009 +++ src/share/man/man8/MAKEDEV.8 Tue Oct 27 08:55:44 2009 @@ -6,7 +6,7 @@ .\ *** DO NOT EDIT - any changes will be lost!!! .\ *** -- .\ -.\ $NetBSD: MAKEDEV.8,v 1.36 2009/09/06 17:25:55 sborrill Exp $ +.\ $NetBSD: MAKEDEV.8,v 1.37 2009/10/27 08:55:44 hubertf Exp $ .\ .\ Copyright (c) 2001, 2003, 2007, 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -35,7 +35,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 6, 2009 +.Dd October 27, 2009 .Dt MAKEDEV 8 .Os .Sh NAME @@ -713,6 +713,9 @@ . It Ar dpti# DPT/Adaptec I2O RAID management interface, see .Xr \dpti 4 +. It Ar drm# +Direct Rendering Manager interface, see +.Xr \drm 4 . It Ar fb# PMAX generic framebuffer pseudo-device . It Ar fd
CVS commit: src/share/man/man8
Module Name:src Committed By: hubertf Date: Tue Oct 27 08:58:04 UTC 2009 Removed Files: src/share/man/man8: MAKEDEV2manpage.awk Log Message: This was replaced by a shell script quite some time ago, purge. To generate a diff of this commit: cvs rdiff -u -r1.11 -r0 src/share/man/man8/MAKEDEV2manpage.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src
Committed By: tsutsui
Date: Tue Oct 27 14:20:21 UTC 2009
Modified Files:
src/tools/dbsym: Makefile
src/tools/mdsetimage: Makefile
Log Message:
Use HOST_SRCDIR=external/gpl3/binutils/usr.sbin/foo
in $(HAVE_BINUTILS)==219 case.
Fixes build failures on Cygwin. (new libbfd depends on libz)
BTW, should we revive old ones under src/usr.sbin for
native dbsym(8)/mdsetimage(8) binaries which don't need libbfd?
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tools/dbsym/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tools/mdsetimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/dbsym/Makefile
diff -u src/tools/dbsym/Makefile:1.5 src/tools/dbsym/Makefile:1.6
--- src/tools/dbsym/Makefile:1.5 Thu Dec 4 09:59:07 2003
+++ src/tools/dbsym/Makefile Tue Oct 27 14:20:21 2009
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2003/12/04 09:59:07 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2009/10/27 14:20:21 tsutsui Exp $
NOMAN= # defined
.include bsd.own.mk
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-dbsym
+
+.if $(HAVE_BINUTILS) == 219
+HOST_SRCDIR=external/gpl3/binutils/usr.sbin/dbsym
+.else
HOST_SRCDIR= gnu/usr.sbin/dbsym
+.endif
TOOLCHAINOBJ!= cd ${.CURDIR}/../binutils ${PRINTOBJDIR}
BFDDIR= ${TOOLCHAINOBJ}/build/bfd
Index: src/tools/mdsetimage/Makefile
diff -u src/tools/mdsetimage/Makefile:1.7 src/tools/mdsetimage/Makefile:1.8
--- src/tools/mdsetimage/Makefile:1.7 Thu Dec 4 09:59:07 2003
+++ src/tools/mdsetimage/Makefile Tue Oct 27 14:20:21 2009
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2003/12/04 09:59:07 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2009/10/27 14:20:21 tsutsui Exp $
NOMAN= # defined
.include bsd.own.mk
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-mdsetimage
+
+.if $(HAVE_BINUTILS) == 219
+HOST_SRCDIR= external/gpl3/binutils/usr.sbin/mdsetimage
+.else
HOST_SRCDIR= gnu/usr.sbin/mdsetimage
+.endif
TOOLCHAINOBJ!= cd ${.CURDIR}/../binutils ${PRINTOBJDIR}
BFDDIR= ${TOOLCHAINOBJ}/build/bfd
CVS commit: src/usr.sbin/paxctl
Module Name:src
Committed By: christos
Date: Tue Oct 27 16:27:47 UTC 2009
Modified Files:
src/usr.sbin/paxctl: paxctl.c
Log Message:
PR/42239: M. Levinson: paxctl(8) fails since binutils 2.19.1 upgrade
binutils-2.19.1 tries to create one note section for all adjacent loadable
note sections, instead of the old behavior where each note is in its own
section. The fix looks at the section headers instead of the program headers
for the note.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/paxctl/paxctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/paxctl/paxctl.c
diff -u src/usr.sbin/paxctl/paxctl.c:1.11 src/usr.sbin/paxctl/paxctl.c:1.12
--- src/usr.sbin/paxctl/paxctl.c:1.11 Sat May 2 12:19:36 2009
+++ src/usr.sbin/paxctl/paxctl.c Tue Oct 27 12:27:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: paxctl.c,v 1.11 2009/05/02 16:19:36 christos Exp $ */
+/* $NetBSD: paxctl.c,v 1.12 2009/10/27 16:27:47 christos Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat e...@netbsd.org
@@ -34,7 +34,7 @@
#include sys/cdefs.h
#ifndef lint
#ifdef __RCSID
-__RCSID($NetBSD: paxctl.c,v 1.11 2009/05/02 16:19:36 christos Exp $);
+__RCSID($NetBSD: paxctl.c,v 1.12 2009/10/27 16:27:47 christos Exp $);
#endif
#endif /* not lint */
@@ -172,9 +172,9 @@
Elf64_Ehdr h64;
} e;
union {
- Elf32_Phdr h32;
- Elf64_Phdr h64;
- } p;
+ Elf32_Shdr h32;
+ Elf64_Shdr h64;
+ } s;
union {
Elf32_Nhdr h32;
Elf64_Nhdr h64;
@@ -185,9 +185,9 @@
/*LINTED*/(sizeof(a) == 4 ? bswap32(a) : \
/*LINTED*/(sizeof(a) == 8 ? bswap64(a) : (abort(), (a)))
#define EH(field) (size == 32 ? SWAP(e.h32.field) : SWAP(e.h64.field))
-#define PH(field) (size == 32 ? SWAP(p.h32.field) : SWAP(p.h64.field))
+#define SH(field) (size == 32 ? SWAP(s.h32.field) : SWAP(s.h64.field))
#define NH(field) (size == 32 ? SWAP(n.h32.field) : SWAP(n.h64.field))
-#define PHSIZE (size == 32 ? sizeof(p.h32) : sizeof(p.h64))
+#define SHSIZE (size == 32 ? sizeof(s.h32) : sizeof(s.h64))
#define NHSIZE (size == 32 ? sizeof(n.h32) : sizeof(n.h64))
struct {
char name[ELF_NOTE_PAX_NAMESZ];
@@ -230,17 +230,17 @@
goto out;
}
- for (i = 0; i EH(e_phnum); i++) {
- if ((size_t)pread(fd, p, PHSIZE,
- (off_t)EH(e_phoff) + i * PHSIZE) != PHSIZE) {
- warn(Can't read program header data from `%s', name);
+ for (i = 0; i EH(e_shnum); i++) {
+ if ((size_t)pread(fd, s, SHSIZE,
+ (off_t)EH(e_shoff) + i * SHSIZE) != SHSIZE) {
+ warn(Can't read section header data from `%s', name);
goto out;
}
- if (PH(p_type) != PT_NOTE)
+ if (SH(sh_type) != SHT_NOTE)
continue;
- if (pread(fd, n, NHSIZE, (off_t)PH(p_offset)) != NHSIZE) {
+ if (pread(fd, n, NHSIZE, (off_t)SH(sh_offset)) != NHSIZE) {
warn(Can't read note header from `%s', name);
goto out;
}
@@ -248,7 +248,7 @@
NH(n_descsz) != ELF_NOTE_PAX_DESCSZ ||
NH(n_namesz) != ELF_NOTE_PAX_NAMESZ)
continue;
- if (pread(fd, pax_tag, sizeof(pax_tag), PH(p_offset) + NHSIZE)
+ if (pread(fd, pax_tag, sizeof(pax_tag), SH(sh_offset) + NHSIZE)
!= sizeof(pax_tag)) {
warn(Can't read pax_tag from `%s', name);
goto out;
@@ -289,13 +289,13 @@
}
if (pwrite(fd, pax_tag, sizeof(pax_tag),
- (off_t)PH(p_offset) + NHSIZE) != sizeof(pax_tag))
+ (off_t)SH(sh_offset) + NHSIZE) != sizeof(pax_tag))
warn(Can't modify flags on `%s', name);
break;
}
if (!ok) {
- warnx(Could not find an ELF PaX PT_NOTE section in `%s',
+ warnx(Could not find an ELF PaX SHT_NOTE section in `%s',
name);
goto out;
}
CVS commit: src/external/bsd/flex
Module Name:src Committed By: he Date: Tue Oct 27 17:51:19 UTC 2009 Modified Files: src/external/bsd/flex: Makefile Log Message: Descend into the man/ subdirectory, so that flex.info gets installed, and what gets installed matches up with the set lists. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/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/flex/Makefile diff -u src/external/bsd/flex/Makefile:1.1 src/external/bsd/flex/Makefile:1.2 --- src/external/bsd/flex/Makefile:1.1 Mon Oct 26 00:49:03 2009 +++ src/external/bsd/flex/Makefile Tue Oct 27 17:51:19 2009 @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.1 2009/10/26 00:49:03 christos Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/27 17:51:19 he Exp $ -SUBDIR= lib bin +SUBDIR= lib bin man .include bsd.subdir.mk
CVS commit: src/tools/m4/bootstrap
Module Name:src
Committed By: christos
Date: Tue Oct 27 18:50:32 UTC 2009
Added Files:
src/tools/m4/bootstrap: Makefile
Log Message:
Add a Makefile to rebuild the bootstrap files.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tools/m4/bootstrap/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tools/m4/bootstrap/Makefile
diff -u /dev/null src/tools/m4/bootstrap/Makefile:1.1
--- /dev/null Tue Oct 27 14:50:32 2009
+++ src/tools/m4/bootstrap/Makefile Tue Oct 27 14:50:31 2009
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2009/10/27 18:50:31 christos Exp $
+
+FILES=parser.h parser.c tokenizer.c
+
+all: ${FILES}
+
+.include bsd.own.mk
+
+DIST=${NETBSDSRCDIR}/usr.bin/m4
+
+parser.c parser.h: ${DIST}/parser.y
+ ${YACC} -d ${DIST}/parser.y
+ sed -e 's/\$$NetBSD: Makefile,v 1.1 2009/10/27 18:50:31 christos Exp $$]*\)\ \$$/NetBSD:\1/' y.tab.c parser.c
+ rm -f y.tab.c
+ mv y.tab.h parser.h
+
+tokenizer.c: ${DIST}/tokenizer.l
+ ${LEX} ${DIST}/tokenizer.l
+ sed -e 's/\$$NetBSD: Makefile,v 1.1 2009/10/27 18:50:31 christos Exp $$]*\)\ \$$/NetBSD:\1/' lex.yy.c ${.TARGET}
+ rm -f lex.yy.c
+
+clean::
+ rm -f ${FILES}
+
CVS commit: [netbsd-5] src/sys/netsmb
Module Name:src
Committed By: bouyer
Date: Tue Oct 27 20:31:15 UTC 2009
Modified Files:
src/sys/netsmb [netbsd-5]: smb_smb.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #1104):
sys/netsmb/smb_smb.c: revision 1.31
sys/netsmb/smb_smb.c: revision 1.32
Fix detection of SMB capabilities according to the CIFS spec:
1.) SMB_CAP_LARGE_FILES advertises support for 64-bit file offsets.
2.) SMB_CAP_LARGE_READX and SMB_CAP_LARGE_WRITEX advertise support for
large reads and writes (larger than 64KB).
The code previously only used SMB_CAP_LARGE_READX and SMB_CAP_LARGE_WRITEX
which is not correct and doesn't work for the Apple Time Capsule which
only supports SMB_CAP_LARGE_FILES. With these changes SMBFS can copy a
5GB to a Time Capsule and read it back without problems.
Thanks a lot to Allen Briggs for pointing out the broke assumptions
and explaining the CIFS spec to me. This fixes PR kern/42175.
Fix cut paste error spotted by Nicolas Joly.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.6.1 src/sys/netsmb/smb_smb.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/netsmb/smb_smb.c
diff -u src/sys/netsmb/smb_smb.c:1.29 src/sys/netsmb/smb_smb.c:1.29.6.1
--- src/sys/netsmb/smb_smb.c:1.29 Tue Jun 24 10:37:19 2008
+++ src/sys/netsmb/smb_smb.c Tue Oct 27 20:31:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_smb.c,v 1.29 2008/06/24 10:37:19 gmcgarry Exp $ */
+/* $NetBSD: smb_smb.c,v 1.29.6.1 2009/10/27 20:31:15 bouyer Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.29 2008/06/24 10:37:19 gmcgarry Exp $);
+__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.29.6.1 2009/10/27 20:31:15 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -594,6 +594,22 @@
u_int16_t residhi, residlo, off, doff;
u_int32_t resid;
+ if (!(SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_FILES)
+ uio-uio_offset = (1LL 32)) {
+ /* Cannot read at/beyond 4G */
+ return (EFBIG);
+ }
+
+ if (!(SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_READX)) {
+ size_t blksz;
+
+ blksz = SSTOVC(ssp)-vc_txmax - SMB_HDRLEN - 64;
+ if (blksz 0x)
+ blksz = 0x;
+
+ *len = min(blksz, *len);
+ }
+
error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_READ_ANDX, scred, rqp);
if (error)
return error;
@@ -674,8 +690,26 @@
u_int8_t wc;
u_int16_t resid;
+ if (!(SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_FILES)
+ uio-uio_offset = (1LL 32)) {
+ /* Cannot write at/beyond 4G */
+ return (EFBIG);
+ }
+
+ if (SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_WRITEX) {
+ *len = min(SSTOVC(ssp)-vc_wxmax, *len);
+ } else {
+ size_t blksz;
+
+ blksz = SSTOVC(ssp)-vc_txmax - SMB_HDRLEN - 64;
+ if (blksz 0x)
+ blksz = 0x;
+
+ *len = min(blksz, *len);
+ }
+
error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_WRITE_ANDX, scred, rqp);
- if (error)
+ if (error != 0)
return (error);
smb_rq_getrequest(rqp, mbp);
smb_rq_wstart(rqp);
@@ -687,7 +721,6 @@
mb_put_uint32le(mbp, 0); /* MBZ (timeout) */
mb_put_uint16le(mbp, 0); /* !write-thru */
mb_put_uint16le(mbp, 0);
- *len = min(SSTOVC(ssp)-vc_wxmax, *len);
mb_put_uint16le(mbp, *len 16);
mb_put_uint16le(mbp, *len);
mb_put_uint16le(mbp, 64); /* data offset from header start */
@@ -785,7 +818,8 @@
{
size_t tsize, len, resid;
int error = 0;
- int rx = (SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_READX);
+ bool rx = (SMB_CAPS(SSTOVC(ssp))
+ (SMB_CAP_LARGE_FILES|SMB_CAP_LARGE_READX)) != 0;
resid = 0; /* XXX gcc */
@@ -866,7 +900,8 @@
{
int error = 0;
size_t len, tsize, resid;
- int wx = (SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_WRITEX);
+ bool wx = (SMB_CAPS(SSTOVC(ssp))
+ (SMB_CAP_LARGE_FILES|SMB_CAP_LARGE_WRITEX)) != 0;
resid = 0; /* XXX gcc */
@@ -877,7 +912,7 @@
error = smb_smb_writex(ssp, fid, len, resid, uio, scred);
else
error = smb_smb_write(ssp, fid, len, resid, uio, scred);
- if (error)
+ if (error != 0)
break;
if (resid len) {
error = EIO;
CVS commit: [netbsd-5] src
Module Name:src Committed By: bouyer Date: Tue Oct 27 20:37:39 UTC 2009 Modified Files: src/distrib/sets/lists/base [netbsd-5]: md.amd64 md.sparc64 shl.mi src/lib/libpuffs [netbsd-5]: puffs.c puffs.h shlib_version Log Message: Pull up following revision(s) (requested by pooka in ticket #1105): lib/libpuffs/puffs.h: revision 1.112 lib/libpuffs/puffs.c: revision 1.100 distrib/sets/lists/base/md.amd64: patch distrib/sets/lists/base/md.sparc64: patch distrib/sets/lists/base/shl.mi: patch lib/libpuffs/shlib_version: patch Make it possible to supply parameters to puffs_init() later (but before puffs_mount()). To generate a diff of this commit: cvs rdiff -u -r1.25.2.4 -r1.25.2.5 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.23.2.4 -r1.23.2.5 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.450.2.3 -r1.450.2.4 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.92.4.3 -r1.92.4.4 src/lib/libpuffs/puffs.c cvs rdiff -u -r1.108.4.3 -r1.108.4.4 src/lib/libpuffs/puffs.h cvs rdiff -u -r1.1 -r1.1.24.1 src/lib/libpuffs/shlib_version 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/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.25.2.4 src/distrib/sets/lists/base/md.amd64:1.25.2.5 --- src/distrib/sets/lists/base/md.amd64:1.25.2.4 Tue Aug 4 18:32:07 2009 +++ src/distrib/sets/lists/base/md.amd64 Tue Oct 27 20:37:38 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.25.2.4 2009/08/04 18:32:07 snj Exp $ +# $NetBSD: md.amd64,v 1.25.2.5 2009/10/27 20:37:38 bouyer Exp $ ./@MODULEDIR@/adosfsbase-kernel-modules ./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules ./@MODULEDIR@/azaliabase-kernel-modules @@ -219,7 +219,7 @@ ./usr/lib/i386/libpthread_dbg.so.1 base-compat-shlib compat,pic ./usr/lib/i386/libpthread_dbg.so.1.0 base-compat-shlib compat,pic ./usr/lib/i386/libpuffs.so.0 base-compat-shlib compat,pic -./usr/lib/i386/libpuffs.so.0.0 base-compat-shlib compat,pic +./usr/lib/i386/libpuffs.so.0.1 base-compat-shlib compat,pic ./usr/lib/i386/libradius.so.2 base-compat-shlib compat,pic ./usr/lib/i386/libradius.so.2.0 base-compat-shlib compat,pic ./usr/lib/i386/libresolv.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.23.2.4 src/distrib/sets/lists/base/md.sparc64:1.23.2.5 --- src/distrib/sets/lists/base/md.sparc64:1.23.2.4 Tue Aug 4 18:32:08 2009 +++ src/distrib/sets/lists/base/md.sparc64 Tue Oct 27 20:37:38 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.23.2.4 2009/08/04 18:32:08 snj Exp $ +# $NetBSD: md.sparc64,v 1.23.2.5 2009/10/27 20:37:38 bouyer Exp $ ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin ./usr/lib/sparc base-compat-lib compat @@ -154,7 +154,7 @@ ./usr/lib/sparc/libpthread_dbg.so.1 base-compat-shlib compat,pic ./usr/lib/sparc/libpthread_dbg.so.1.0 base-compat-shlib compat,pic ./usr/lib/sparc/libpuffs.so.0 base-compat-shlib compat,pic -./usr/lib/sparc/libpuffs.so.0.0 base-compat-shlib compat,pic +./usr/lib/sparc/libpuffs.so.0.1 base-compat-shlib compat,pic ./usr/lib/sparc/libradius.so.2 base-compat-shlib compat,pic ./usr/lib/sparc/libradius.so.2.0 base-compat-shlib compat,pic ./usr/lib/sparc/libresolv.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.450.2.3 src/distrib/sets/lists/base/shl.mi:1.450.2.4 --- src/distrib/sets/lists/base/shl.mi:1.450.2.3 Tue Aug 4 18:32:08 2009 +++ src/distrib/sets/lists/base/shl.mi Tue Oct 27 20:37:38 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.450.2.3 2009/08/04 18:32:08 snj Exp $ +# $NetBSD: shl.mi,v 1.450.2.4 2009/10/27 20:37:38 bouyer Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -105,7 +105,7 @@ ./usr/lib/libprop.so.0.7 base-sys-shlib ./usr/lib/libpthread.so.0.10 base-sys-shlib ./usr/lib/libpthread_dbg.so.1.0 base-sys-shlib -./usr/lib/libpuffs.so.0.0 base-sys-shlib +./usr/lib/libpuffs.so.0.1 base-sys-shlib ./usr/lib/libradius.so.2.0 base-net-shlib ./usr/lib/librefuse.so.0.0 base-sys-shlib ./usr/lib/libresolv.so.1.1 base-net-shlib Index: src/lib/libpuffs/puffs.c diff -u src/lib/libpuffs/puffs.c:1.92.4.3 src/lib/libpuffs/puffs.c:1.92.4.4 --- src/lib/libpuffs/puffs.c:1.92.4.3 Sun Oct 18 12:46:07 2009 +++ src/lib/libpuffs/puffs.c Tue Oct 27 20:37:38 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: puffs.c,v 1.92.4.3 2009/10/18 12:46:07 sborrill Exp $ */ +/* $NetBSD: puffs.c,v 1.92.4.4 2009/10/27 20:37:38 bouyer Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. @@ -31,7 +31,7 @@ #include sys/cdefs.h #if !defined(lint) -__RCSID($NetBSD: puffs.c,v 1.92.4.3 2009/10/18 12:46:07 sborrill Exp $); +__RCSID($NetBSD: puffs.c,v
CVS commit: [netbsd-5]
Module Name:src
Committed By: bouyer
Date: Tue Oct 27 20:44:13 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-chips [netbsd-5]:
Makefile
xsrc/external/mit/xf86-video-chips/dist/src [netbsd-5]: ct_driver.c
ct_driver.h
Log Message:
Pull up following revision(s) (requested by macallan in ticket #1108):
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c: revision 1.4
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h: revision 1.2
external/mit/xorg/server/drivers/xf86-video-chips/Makefile: revision 1.5
make this work on shark again by enabling the VLB probe routines when HAVE_ISA
is defined. For now this disables the PCI probe routine but the only arch
where we actually need this is shark where we couldn't add a PCI CT65550
even if we wanted to.
Tested on shark and macppc
set -DHAVE_ISA on shark, with this accelerated Xorg works again on rev. 4
sharks.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 \
src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.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/mit/xorg/server/drivers/xf86-video-chips/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.4.8.1
--- src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile:1.4 Mon Sep 1 04:04:04 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-chips/Makefile Tue Oct 27 20:44:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/09/01 04:04:04 mrg Exp $
+# $NetBSD: Makefile,v 1.4.8.1 2009/10/27 20:44:13 bouyer Exp $
DRIVER= xf86-video-chips
DRIVER_NAME= chips_drv
@@ -8,6 +8,10 @@
SRCS+= ct_accelmm.c ct_accelhi.c
MAN= chips.4
+.if ${MACHINE} == shark
+CPPFLAGS+= -DHAVE_ISA
+.endif
+
CPPFLAGS.ct_driver.c= -DVERSION=${PACKAGE_MAJOR}
CPPFLAGS.ct_accelmm.c= -DCHIPS_MMIO -I${X11SRCDIR.${DRIVER}}/src
CPPFLAGS.ct_accelhi.c= -DCHIPS_MMIO -DCHIPS_HIQV -I${X11SRCDIR.${DRIVER}}/src
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.1.1.1.2.1 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.1.1.1.2.2
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.1.1.1.2.1 Thu Sep 17 03:33:48 2009
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Tue Oct 27 20:44:12 2009
@@ -109,7 +109,7 @@
#include micmap.h
#include fb.h
-
+#include xf86Priv.h
/* Needed for the 1 and 4 bpp framebuffers */
#ifdef HAVE_XF1BPP
@@ -137,10 +137,9 @@
/* Mandatory functions */
static const OptionInfoRec * CHIPSAvailableOptions(int chipid, int busid);
static void CHIPSIdentify(int flags);
-#ifdef XSERVER_LIBPCIACCESS
static Bool CHIPSPciProbe(DriverPtr drv, int entity_num,
struct pci_device *dev, intptr_t match_data);
-#else
+#ifdef HAVE_ISA
static Bool CHIPSProbe(DriverPtr drv, int flags);
#endif
static Bool CHIPSPreInit(ScrnInfoPtr pScrn, int flags);
@@ -329,7 +328,7 @@
0xB3D0, /* DR0xC address of cursor pattern */
};
-#if defined(__arm32__) defined(__NetBSD__)
+#if defined(__arm__) defined(__NetBSD__)
/*
* Built in TV output modes: These modes have been tested on NetBSD with
* CT65550 and StrongARM. They give what seems to be the best output for
@@ -505,10 +504,10 @@
CHIPS_VERSION,
CHIPS_DRIVER_NAME,
CHIPSIdentify,
-#ifdef XSERVER_LIBPCIACCESS
- NULL,
-#else
+#ifdef HAVE_ISA
CHIPSProbe,
+#else
+ NULL,
#endif
CHIPSAvailableOptions,
NULL,
@@ -555,28 +554,6 @@
{ -1, -1, RES_UNDEFINED}
};
-#ifdef HAVE_ISA
-static IsaChipsets CHIPSISAchipsets[] = {
-{ CHIPS_CT65520, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT65525, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT65530, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT65535, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT65540, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT65545, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT65546, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT65548, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT65550, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT65554, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT6, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT68554, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT69000, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT69030, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT64200, RES_EXCLUSIVE_VGA },
-{ CHIPS_CT64300, RES_EXCLUSIVE_VGA },
-{ -1, RES_UNDEFINED }
-};
-#endif
-
/* The options supported by the Chips and Technologies Driver */
typedef enum {
OPTION_LINEAR,
@@ -796,7 +773,6 @@
}
/* Mandatory */
-#ifdef XSERVER_LIBPCIACCESS
Bool
CHIPSPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev,
CVS commit: [netbsd-5] src/sys/fs/smbfs
Module Name:src
Committed By: bouyer
Date: Tue Oct 27 20:46:53 UTC 2009
Modified Files:
src/sys/fs/smbfs [netbsd-5]: smbfs_smb.c smbfs_subr.h
Log Message:
Pull up following revision(s) (requested by tron in ticket #1109):
sys/fs/smbfs/smbfs_smb.c: revision 1.41
sys/fs/smbfs/smbfs_subr.h: revision 1.20
Add support for 64 bit file offsets to smbfs_smb_setfsize(), largely
based on code taken from FreeBSD.
This stops truncation of files larger than 4GB by VOP_SETATTR() which e.g.
happened when copying large files rump_smbfs. Kudos to Antti Kantee
for diagnosing the problem in smbfs_smb_setfsize().
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.6.1 src/sys/fs/smbfs/smbfs_smb.c
cvs rdiff -u -r1.19 -r1.19.6.1 src/sys/fs/smbfs/smbfs_subr.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/fs/smbfs/smbfs_smb.c
diff -u src/sys/fs/smbfs/smbfs_smb.c:1.37 src/sys/fs/smbfs/smbfs_smb.c:1.37.6.1
--- src/sys/fs/smbfs/smbfs_smb.c:1.37 Tue Jun 24 10:23:48 2008
+++ src/sys/fs/smbfs/smbfs_smb.c Tue Oct 27 20:46:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_smb.c,v 1.37 2008/06/24 10:23:48 gmcgarry Exp $ */
+/* $NetBSD: smbfs_smb.c,v 1.37.6.1 2009/10/27 20:46:52 bouyer Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.37 2008/06/24 10:23:48 gmcgarry Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.37.6.1 2009/10/27 20:46:52 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -265,14 +265,50 @@
return 0;
}
+static int
+smbfs_smb_seteof(struct smbnode *np, int64_t newsize, struct smb_cred *scred)
+{
+ struct smb_t2rq *t2p;
+ struct smb_share *ssp = np-n_mount-sm_share;
+ struct mbchain *mbp;
+ int error;
+
+ error = smb_t2_alloc(SSTOCP(ssp), SMB_TRANS2_SET_FILE_INFORMATION,
+ scred, t2p);
+ if (error)
+ return error;
+ mbp = t2p-t2_tparam;
+ mb_init(mbp);
+ mb_put_mem(mbp, (void *)np-n_fid, 2, MB_MSYSTEM);
+ mb_put_uint16le(mbp, SMB_SET_FILE_END_OF_FILE_INFO);
+ mb_put_uint32le(mbp, 0);
+ mbp = t2p-t2_tdata;
+ mb_init(mbp);
+ mb_put_int64le(mbp, newsize);
+ mb_put_uint32le(mbp, 0); /* padding */
+ mb_put_uint16le(mbp, 0);
+ t2p-t2_maxpcount = 2;
+ t2p-t2_maxdcount = 0;
+ error = smb_t2_request(t2p);
+ smb_t2_done(t2p);
+ return error;
+}
+
int
-smbfs_smb_setfsize(struct smbnode *np, int newsize, struct smb_cred *scred)
+smbfs_smb_setfsize(struct smbnode *np, u_quad_t newsize,
+ struct smb_cred *scred)
{
struct smb_share *ssp = np-n_mount-sm_share;
struct smb_rq *rqp;
struct mbchain *mbp;
int error;
+ if (newsize = (1LL 32)) {
+ if (!(SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_FILES))
+ return EFBIG;
+ return smbfs_smb_seteof(np, (int64_t)newsize, scred);
+ }
+
error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_WRITE, scred, rqp);
if (error)
return error;
Index: src/sys/fs/smbfs/smbfs_subr.h
diff -u src/sys/fs/smbfs/smbfs_subr.h:1.19 src/sys/fs/smbfs/smbfs_subr.h:1.19.6.1
--- src/sys/fs/smbfs/smbfs_subr.h:1.19 Sat Jun 28 01:34:05 2008
+++ src/sys/fs/smbfs/smbfs_subr.h Tue Oct 27 20:46:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_subr.h,v 1.19 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: smbfs_subr.h,v 1.19.6.1 2009/10/27 20:46:52 bouyer Exp $ */
/*
* Copyright (c) 2000-2001, Boris Popov
@@ -135,7 +135,8 @@
off_t start, off_t end, struct smb_cred *scred);
int smbfs_smb_statvfs(struct smb_share *ssp, struct statvfs *sbp,
struct smb_cred *scred);
-int smbfs_smb_setfsize(struct smbnode *np, int newsize, struct smb_cred *scred);
+int smbfs_smb_setfsize(struct smbnode *np, u_quad_t newsize,
+ struct smb_cred *scred);
int smbfs_smb_setpattr(struct smbnode *np, u_int16_t attr,
struct timespec *mtime, struct smb_cred *scred);
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Tue Oct 27 20:47:35 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 1104, 1105, 1108, 1109. To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.124 src/doc/CHANGES-5.1:1.1.2.125 --- src/doc/CHANGES-5.1:1.1.2.124 Tue Oct 20 02:01:40 2009 +++ src/doc/CHANGES-5.1 Tue Oct 27 20:47:34 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.124 2009/10/20 02:01:40 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.125 2009/10/27 20:47:34 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14483,3 +14483,47 @@ Fix header to include. [joerg, ticket #1106] +sys/netsmb/smb_smb.c1.31, 1.32 + + Fix detection of SMB capabilities according to the CIFS spec: + 1.) SMB_CAP_LARGE_FILES advertises support for 64-bit file offsets. + 2.) SMB_CAP_LARGE_READX and SMB_CAP_LARGE_WRITEX advertise support for + large reads and writes (larger than 64KB). + The code previously only used SMB_CAP_LARGE_READX and + SMB_CAP_LARGE_WRITEX which is not correct and doesn't work for + the Apple Time Capsule which only supports SMB_CAP_LARGE_FILES. + This fixes PR kern/42175. + [tron, ticket #1104] + +lib/libpuffs/puffs.c1.100 +lib/libpuffs/puffs.h1.112 +lib/libpuffs/shlib_version patch +distrib/sets/lists/base/md.amd64 patch +distrib/sets/lists/base/md.sparc64 patch +distrib/sets/lists/base/shl.mi patch + + Make it possible to supply parameters to puffs_init() later (but + before puffs_mount()). + [pooka, ticket #1105] + +xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c 1.4 +xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h 1.2 +external/mit/xorg/server/drivers/xf86-video-chips/Makefile 1.5 + + make this work on shark again by enabling the VLB probe routines + when HAVE_ISA is defined. For now this disables the PCI probe + routine but the only arch where we actually need this is shark + where we couldn't add a PCI CT65550 even if we wanted to. + set -DHAVE_ISA on shark, with this accelerated Xorg works again on + rev. 4 sharks. + [macallan, ticket #1108] + +sys/fs/smbfs/smbfs_smb.c 1.41 +sys/fs/smbfs/smbfs_subr.h 1.20 + + Add support for 64 bit file offsets to smbfs_smb_setfsize(), largely + based on code taken from FreeBSD. + This stops truncation of files larger than 4GB by VOP_SETATTR() which + e.g. happened when copying large files rump_smbfs. + [tron, ticket #1109] +
CVS commit: [netbsd-5] src/sys/dev/pckbport
Module Name:src
Committed By: bouyer
Date: Tue Oct 27 21:39:21 UTC 2009
Modified Files:
src/sys/dev/pckbport [netbsd-5]: wskbdmap_mfii.c
Log Message:
Apply patch, requested by ahoka in ticket #:
sys/dev/pckbport/wskbdmap_mfii.c: patch
Add hungarian keyboard layout
To generate a diff of this commit:
cvs rdiff -u -r1.15.8.1 -r1.15.8.2 src/sys/dev/pckbport/wskbdmap_mfii.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/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.1 src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.2
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.15.8.1 Mon Feb 16 03:22:03 2009
+++ src/sys/dev/pckbport/wskbdmap_mfii.c Tue Oct 27 21:39:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_mfii.c,v 1.15.8.1 2009/02/16 03:22:03 snj Exp $ */
+/* $NetBSD: wskbdmap_mfii.c,v 1.15.8.2 2009/10/27 21:39:21 bouyer Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.15.8.1 2009/02/16 03:22:03 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: wskbdmap_mfii.c,v 1.15.8.2 2009/10/27 21:39:21 bouyer Exp $);
#include opt_wskbdmap.h
#include sys/types.h
@@ -443,6 +443,44 @@
KC(184), KS_Mode_switch, KS_Multi_key,
};
+static const keysym_t pckbd_keydesc_hu[] = {
+/* pos normal shifted altgr shift-altgr */
+KC(2), KS_1, KS_apostrophe, KS_asciitilde,
+KC(3), KS_2, KS_quotedbl, KS_dead_caron,
+KC(4), KS_3, KS_plus, KS_asciicircum,
+KC(5), KS_4, KS_exclam, KS_dead_breve,
+KC(6), KS_5, KS_percent, KS_dead_abovering,
+KC(7), KS_6, KS_slash, KS_dead_ogonek,
+KC(8), KS_7, KS_equal, KS_grave,
+KC(9), KS_8, KS_parenleft, KS_dead_dotaccent,
+KC(10), KS_9, KS_parenright, KS_dead_acute,
+KC(11), KS_odiaeresis, KS_Odiaeresis, KS_dead_hungarumlaut,
+KC(12), KS_udiaeresis, KS_Udiaeresis, KS_dead_diaeresis,
+KC(13), KS_oacute, KS_Oacute, KS_dead_cedilla,
+KC(16), KS_q, KS_Q, KS_backslash,
+KC(17), KS_w, KS_W, KS_bar,
+KC(21), KS_z,
+KC(26), KS_odoubleacute, KS_Odoubleacute,KS_division,
+KC(27), KS_uacute, KS_Uacute, KS_multiply,
+KC(33), KS_f, KS_F, KS_bracketleft,
+KC(34), KS_g, KS_G, KS_bracketright,
+KC(39), KS_eacute, KS_Eacute, KS_dollar,
+KC(40), KS_aacute, KS_Aacute, KS_ssharp,
+KC(41), KS_0, KS_section,
+KC(43), KS_udoubleacute, KS_Udoubleacute,KS_currency,
+KC(44), KS_y, KS_Y, KS_greater,
+KC(45), KS_x, KS_X, KS_numbersign,
+KC(46), KS_c, KS_C, KS_ampersand,
+KC(47), KS_v, KS_V, KS_at,
+KC(48), KS_b, KS_B, KS_braceleft,
+KC(49), KS_n, KS_N, KS_braceright,
+KC(51), KS_comma, KS_question, KS_semicolon,
+KC(52), KS_period, KS_colon,
+KC(53), KS_minus, KS_underscore, KS_asterisk,
+KC(86), KS_iacute, KS_Iacute, KS_less,
+KC(184), KS_Mode_switch, KS_Multi_key,
+};
+
static const keysym_t pckbd_keydesc_us_declk[] = {
/* pos normal shifted altgr shift-altgr */
KC(1), KS_grave, KS_asciitilde, /* replace escape */
@@ -632,6 +670,7 @@
KBD_MAP(KB_ES , KB_US, pckbd_keydesc_es),
KBD_MAP(KB_PT, KB_US, pckbd_keydesc_pt),
KBD_MAP(KB_GR, KB_US, pckbd_keydesc_gr),
+ KBD_MAP(KB_HU, KB_US, pckbd_keydesc_hu),
#endif /* WSKBD_USONLY */
/* placeholders */
CVS commit: [netbsd-5] src/sys/ufs/ext2fs
Module Name:src
Committed By: bouyer
Date: Tue Oct 27 21:41:07 UTC 2009
Modified Files:
src/sys/ufs/ext2fs [netbsd-5]: ext2fs_extern.h ext2fs_vfsops.c
ext2fs_vnops.c
Log Message:
Pull up following revision(s) (requested by pooka in ticket #1112):
sys/ufs/ext2fs/ext2fs_vnops.c: revision 1.91
sys/ufs/ext2fs/ext2fs_vfsops.c: revision 1.152
sys/ufs/ext2fs/ext2fs_extern.h: revision 1.42
update i_uid and i_gid after chown
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.39.6.1 src/sys/ufs/ext2fs/ext2fs_extern.h
cvs rdiff -u -r1.137.6.4 -r1.137.6.5 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.82.10.1 -r1.82.10.2 src/sys/ufs/ext2fs/ext2fs_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/ufs/ext2fs/ext2fs_extern.h
diff -u src/sys/ufs/ext2fs/ext2fs_extern.h:1.39 src/sys/ufs/ext2fs/ext2fs_extern.h:1.39.6.1
--- src/sys/ufs/ext2fs/ext2fs_extern.h:1.39 Sat Jun 28 01:34:05 2008
+++ src/sys/ufs/ext2fs/ext2fs_extern.h Tue Oct 27 21:41:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_extern.h,v 1.39 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: ext2fs_extern.h,v 1.39.6.1 2009/10/27 21:41:07 bouyer Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -143,6 +143,7 @@
int ext2fs_flushfiles(struct mount *, int);
int ext2fs_sbupdate(struct ufsmount *, int);
int ext2fs_cgupdate(struct ufsmount *, int);
+void ext2fs_set_inode_guid(struct inode *);
/* ext2fs_readwrite.c */
int ext2fs_read(void *);
Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.4 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.5
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.137.6.4 Fri Oct 16 05:51:03 2009
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Tue Oct 27 21:41:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.137.6.4 2009/10/16 05:51:03 snj Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.137.6.5 2009/10/27 21:41:07 bouyer Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -65,7 +65,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.137.6.4 2009/10/16 05:51:03 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.137.6.5 2009/10/27 21:41:07 bouyer Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -113,7 +113,6 @@
int ext2fs_sbupdate(struct ufsmount *, int);
static int ext2fs_checksb(struct ext2fs *, int);
-static void ext2fs_set_inode_guid(struct inode *);
static struct sysctllog *ext2fs_sysctl_log;
@@ -170,7 +169,7 @@
};
/* Fill in the inode uid/gid from ext2 halves. */
-static void
+void
ext2fs_set_inode_guid(struct inode *ip)
{
Index: src/sys/ufs/ext2fs/ext2fs_vnops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vnops.c:1.82.10.1 src/sys/ufs/ext2fs/ext2fs_vnops.c:1.82.10.2
--- src/sys/ufs/ext2fs/ext2fs_vnops.c:1.82.10.1 Sat Nov 29 23:10:19 2008
+++ src/sys/ufs/ext2fs/ext2fs_vnops.c Tue Oct 27 21:41:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vnops.c,v 1.82.10.1 2008/11/29 23:10:19 snj Exp $ */
+/* $NetBSD: ext2fs_vnops.c,v 1.82.10.2 2009/10/27 21:41:07 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_vnops.c,v 1.82.10.1 2008/11/29 23:10:19 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_vnops.c,v 1.82.10.2 2009/10/27 21:41:07 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -501,8 +501,10 @@
ip-i_e2fs_gid_high = 0;
ip-i_e2fs_uid_high = 0;
}
- if (ouid != uid || ogid != gid)
+ if (ouid != uid || ogid != gid) {
+ ext2fs_set_inode_guid(ip);
ip-i_flag |= IN_CHANGE;
+ }
if (ouid != uid kauth_authorize_generic(cred,
KAUTH_GENERIC_ISSUSER, NULL) != 0)
ip-i_e2fs_mode = ~ISUID;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Oct 27 21:47:23 UTC 2009
Modified Files:
src/sys/dev/pci: ifpci2.c
Log Message:
Fix endianess issues when accessing the B-channel fifos.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/ifpci2.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/ifpci2.c
diff -u src/sys/dev/pci/ifpci2.c:1.16 src/sys/dev/pci/ifpci2.c:1.17
--- src/sys/dev/pci/ifpci2.c:1.16 Tue May 12 08:23:01 2009
+++ src/sys/dev/pci/ifpci2.c Tue Oct 27 21:47:23 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpci2.c,v 1.16 2009/05/12 08:23:01 cegger Exp $ */
+/* $NetBSD: ifpci2.c,v 1.17 2009/10/27 21:47:23 martin Exp $ */
/*
* Copyright (c) 1999 Gary Jennejohn. All rights reserved.
*
@@ -36,14 +36,14 @@
* Fritz!Card PCI driver
*
*
- * $Id: ifpci2.c,v 1.16 2009/05/12 08:23:01 cegger Exp $
+ * $Id: ifpci2.c,v 1.17 2009/10/27 21:47:23 martin Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
*---*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ifpci2.c,v 1.16 2009/05/12 08:23:01 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: ifpci2.c,v 1.17 2009/10/27 21:47:23 martin Exp $);
#include sys/param.h
@@ -418,20 +418,19 @@
static void
hscx_read_fifo(int chan, void *buf, size_t len, struct isic_softc *sc)
{
- u_int32_t *ip;
- size_t cnt;
- int dataoff;
+ int dataoff;
dataoff = chan ? HSCX_FIFO2 : HSCX_FIFO1;
-
- ip = (u_int32_t *)buf;
- cnt = 0;
- /* what if len isn't a multiple of sizeof(int) and buf is */
- /* too small */
- while (cnt len)
- {
- *ip++ = bus_space_read_4(sc-sc_maps[0].t, sc-sc_maps[0].h, dataoff);
- cnt += 4;
+ bus_space_read_multi_stream_4(sc-sc_maps[0].t, sc-sc_maps[0].h,
+ dataoff, buf, len/4);
+ if (__predict_false((len3)0)) {
+ uint32_t tmp;
+
+ buf = ((unsigned char*)buf) + (len ~3u);
+ len = 3u;
+ tmp = bus_space_read_stream_4(sc-sc_maps[0].t,
+ sc-sc_maps[0].h, dataoff);
+ memcpy(buf, tmp, len);
}
}
@@ -463,7 +462,6 @@
static void
hscx_write_fifo(int chan, const void *buf, size_t len, struct isic_softc *sc)
{
- const u_int32_t *ip;
size_t cnt;
int dataoff;
l1_bchan_state_t *Bchan = sc-sc_chan[chan];
@@ -484,13 +482,17 @@
AVMA1PPSETCMDLONG(cnt);
hscx_write_reg(chan, cnt, sc);
- ip = (const u_int32_t *)buf;
- cnt = 0;
- while (cnt len)
- {
- bus_space_write_4(sc-sc_maps[0].t, sc-sc_maps[0].h, dataoff, *ip);
- ip++;
- cnt += 4;
+ bus_space_write_multi_stream_4(sc-sc_maps[0].t, sc-sc_maps[0].h,
+ dataoff, buf, (len+3)/4);
+ if (__predict_false((len3)0)) {
+ uint32_t tmp;
+
+ buf = (const unsigned char*)buf + (len ~3u);
+ len = 3u;
+ memset(tmp, 0, sizeof(tmp));
+ memcpy(tmp, buf, len);
+ bus_space_write_stream_4(sc-sc_maps[0].t, sc-sc_maps[0].h,
+ dataoff, tmp);
}
}
CVS commit: [netbsd-5] src/sys/fs/cd9660
Module Name:src
Committed By: bouyer
Date: Tue Oct 27 21:58:34 UTC 2009
Modified Files:
src/sys/fs/cd9660 [netbsd-5]: cd9660_vfsops.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1115):
sys/fs/cd9660/cd9660_vfsops.c: revision 1.68
Apply a similar fix for mount function from ffs_vfsops.c rev 1.186:
Change cd9660_mount, in MNT_UPDATE case, to check dev_t's for equality
instead of just vnode pointers. Fixes erroneous Invalid argument
errors from mount(8) with -u against cd9660 root in the presence of
mfs or tmpfs /dev prepared after initial mountroot.
Tested on QEMU running cobalt Restore CD.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.6.1 src/sys/fs/cd9660/cd9660_vfsops.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/fs/cd9660/cd9660_vfsops.c
diff -u src/sys/fs/cd9660/cd9660_vfsops.c:1.63 src/sys/fs/cd9660/cd9660_vfsops.c:1.63.6.1
--- src/sys/fs/cd9660/cd9660_vfsops.c:1.63 Sat Jun 28 01:34:05 2008
+++ src/sys/fs/cd9660/cd9660_vfsops.c Tue Oct 27 21:58:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_vfsops.c,v 1.63 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: cd9660_vfsops.c,v 1.63.6.1 2009/10/27 21:58:34 bouyer Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd9660_vfsops.c,v 1.63 2008/06/28 01:34:05 rumble Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd9660_vfsops.c,v 1.63.6.1 2009/10/27 21:58:34 bouyer Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -286,7 +286,8 @@
}
} else {
vrele(devvp);
- if (devvp != imp-im_devvp)
+ if (devvp != imp-im_devvp
+ devvp-v_rdev != imp-im_devvp-v_rdev)
return (EINVAL); /* needs translation */
}
return set_statvfs_info(path, UIO_USERSPACE, args-fspec, UIO_USERSPACE,
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd
Module Name:xsrc Committed By: elric Date: Tue Oct 27 23:17:13 UTC 2009 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb: sfbsimpleblt.c xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga: tgasimpleblt.c xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb: sfbsimpleblt.c xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga: tgasimpleblt.c Log Message: Assign my copyrights to TNF in exchange for a beer that christos@ bought me a while ago... To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbsimpleblt.c cvs rdiff -u -r1.1 -r1.2 \ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/tgasimpleblt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c:1.2 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c:1.1 Sun Jan 18 04:13:22 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c Tue Oct 27 23:17:12 2009 @@ -1,11 +1,15 @@ -/* $NetBSD: sfbsimpleblt.c,v 1.1 2004/01/18 04:13:22 rtr Exp $ */ +/* $NetBSD: sfbsimpleblt.c,v 1.2 2009/10/27 23:17:12 elric Exp $ */ /* * sfb simple rops */ /*- - * Copyright (c) 1995, 1996, 1998 Roland C. Dowdeswell. All rights reserved. + * Copyright (c) 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Roland C. Dowdeswell. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -15,22 +19,18 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by Roland C. Dowdeswell. - * 4. The name of the authors may not be used to endorse or promote products - * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS 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. */ #define PSZ 8 Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c:1.2 --- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c:1.1 Sun Jan 18 04:13:22 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c Tue Oct 27 23:17:12 2009 @@ -1,11 +1,15 @@ -/* $NetBSD: tgasimpleblt.c,v 1.1 2004/01/18 04:13:22 rtr Exp $ */ +/* $NetBSD: tgasimpleblt.c,v 1.2 2009/10/27 23:17:12 elric Exp $ */ /* * tga simple rops */ /*- - * Copyright (c) 1995, 1996, 1998 Roland C. Dowdeswell. All rights reserved. + * Copyright (c) 1998 The NetBSD Foundation, Inc. + * All
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Tue Oct 27 23:23:33 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: elric's ad clause is no more. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.82 src/distrib/notes/common/legal.common:1.83 --- src/distrib/notes/common/legal.common:1.82 Tue Oct 27 20:14:11 2009 +++ src/distrib/notes/common/legal.common Tue Oct 27 23:23:33 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.82 2009/10/27 20:14:11 snj Exp $ +.\ $NetBSD: legal.common,v 1.83 2009/10/27 23:23:33 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -371,8 +371,6 @@ .It This product includes software developed by Roger Hardiman .It -This product includes software developed by Roland C. Dowdeswell. -.It This product includes software developed by Rolf Grossmann. .It This product includes software developed by Ross Harvey
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Wed Oct 28 02:10:27 UTC 2009
Modified Files:
src/sys/dev/pci: files.pci
Added Files:
src/sys/dev/pci: pm2fb.c pm2reg.h
Log Message:
A driver for the Permedia 2 graphics processor, so far it's been tested only
on sparc64 with a Sun PGX32 / TechSource Raptor GFX 8P
So far it accelerates block copies, rectangle fills and the cursor, it
supports the usual wsdisplay / vcons stuff.
TODO:
- character drawing by hardware so we don't need to map the framebuffer
- DDC2 support
- mode setting
This driver still relies on the firmware to set up graphics modes etc. so it
won't work on x86 ( or non-OpenFirmware for that matter ) unless you use the
VESA BIOS to set up graphics and pass the right properties ( width, height
etc. ) to the driver. For the same reason it will work only if it's the
OpenFirmware console.
To generate a diff of this commit:
cvs rdiff -u -r1.322 -r1.323 src/sys/dev/pci/files.pci
cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/pm2fb.c src/sys/dev/pci/pm2reg.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/files.pci
diff -u src/sys/dev/pci/files.pci:1.322 src/sys/dev/pci/files.pci:1.323
--- src/sys/dev/pci/files.pci:1.322 Sat Sep 26 19:43:04 2009
+++ src/sys/dev/pci/files.pci Wed Oct 28 02:10:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.322 2009/09/26 19:43:04 snj Exp $
+# $NetBSD: files.pci,v 1.323 2009/10/28 02:10:27 macallan Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -988,3 +988,9 @@
# High Definition Audio
include dev/pci/hdaudio/files.hdaudio
+
+# Permedia 2 / Sun PGX32 / Raptor
+device pm2fb: wsemuldisplaydev, rasops8, vcons, videomode, iic, i2c_bitbang
+attach pm2fb at pci
+file dev/pci/pm2fb.c pm2fb
+defflag opt_pm2fb.h PM2FB_DEBUG
Added files:
Index: src/sys/dev/pci/pm2fb.c
diff -u /dev/null src/sys/dev/pci/pm2fb.c:1.1
--- /dev/null Wed Oct 28 02:10:27 2009
+++ src/sys/dev/pci/pm2fb.c Wed Oct 28 02:10:27 2009
@@ -0,0 +1,759 @@
+/* $NetBSD: pm2fb.c,v 1.1 2009/10/28 02:10:27 macallan Exp $ */
+
+/*
+ * Copyright (c) 2009 Michael Lorenz
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR 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.
+ */
+
+/*
+ * A console driver for Permedia 2 graphics controllers
+ * tested on sparc64 only so far
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: pm2fb.c,v 1.1 2009/10/28 02:10:27 macallan Exp $);
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/kernel.h
+#include sys/device.h
+#include sys/malloc.h
+#include sys/lwp.h
+#include sys/kauth.h
+
+#include uvm/uvm_extern.h
+
+#include dev/videomode/videomode.h
+
+#include dev/pci/pcivar.h
+#include dev/pci/pcireg.h
+#include dev/pci/pcidevs.h
+#include dev/pci/pciio.h
+#include dev/pci/pm2reg.h
+
+#include dev/wscons/wsdisplayvar.h
+#include dev/wscons/wsconsio.h
+#include dev/wsfont/wsfont.h
+#include dev/rasops/rasops.h
+#include dev/wscons/wsdisplay_vconsvar.h
+
+#include dev/i2c/i2cvar.h
+
+struct pm2fb_softc {
+ device_t sc_dev;
+
+ pci_chipset_tag_t sc_pc;
+ pcitag_t sc_pcitag;
+
+ bus_space_tag_t sc_memt;
+ bus_space_tag_t sc_iot;
+
+ bus_space_handle_t sc_fbh;
+ bus_space_handle_t sc_regh;
+ bus_addr_t sc_fb, sc_reg;
+ bus_size_t sc_fbsize, sc_regsize;
+
+ int sc_width, sc_height, sc_depth, sc_stride;
+ int sc_locked;
+ void *sc_fbaddr;
+ struct vcons_screen sc_console_screen;
+ struct wsscreen_descr sc_defaultscreen_descr;
+ const struct wsscreen_descr *sc_screens[1];
+ struct wsscreen_list sc_screenlist;
+ struct vcons_data vd;
+ int sc_mode;
+ u_char sc_cmap_red[256];
+ u_char sc_cmap_green[256];
+ u_char
CVS commit: src/share/man/man5
Module Name:src Committed By: snj Date: Wed Oct 28 02:31:44 UTC 2009 Modified Files: src/share/man/man5: daily.conf.5 Log Message: As Mikael Magnusson notes, run_fsck_flags does not take a YES or NO and it should be in the second listing of variables. While here, capitalize and make the description a little bit more explicit. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man5/daily.conf.5 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/man5/daily.conf.5 diff -u src/share/man/man5/daily.conf.5:1.23 src/share/man/man5/daily.conf.5:1.24 --- src/share/man/man5/daily.conf.5:1.23 Sat Aug 30 10:53:22 2008 +++ src/share/man/man5/daily.conf.5 Wed Oct 28 02:31:44 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: daily.conf.5,v 1.23 2008/08/30 10:53:22 bouyer Exp $ +.\ $NetBSD: daily.conf.5,v 1.24 2009/10/28 02:31:44 snj Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -122,10 +122,6 @@ with the .Fl n option. -.It Sy run_fsck_flags -extra options to be passed to -.Xr fsck 8 -when run. .It Sy run_rdist This runs .Xr rdist 1 @@ -157,6 +153,12 @@ .Ql procfs type filesystems and filesystems that are not .Ql local . +.It Sy run_fsck_flags +Extra options to be passed to +.Xr fsck 8 +if +.Sy run_fsck +is enabled. .It Sy send_empty_security If set, the report generated by the .Sy run_security
CVS commit: src/usr.bin/config
Module Name:src
Committed By: christos
Date: Wed Oct 28 02:42:20 UTC 2009
Modified Files:
src/usr.bin/config: scan.l
Log Message:
don't '#define yywrap() 1', use '%option noyywrap'. This is because the
#define is doomed to failure if --prefix is used.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/config/scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/scan.l
diff -u src/usr.bin/config/scan.l:1.12 src/usr.bin/config/scan.l:1.13
--- src/usr.bin/config/scan.l:1.12 Sat Apr 11 08:41:10 2009
+++ src/usr.bin/config/scan.l Tue Oct 27 22:42:20 2009
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.12 2009/04/11 12:41:10 lukem Exp $ */
+/* $NetBSD: scan.l,v 1.13 2009/10/28 02:42:20 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -105,10 +105,11 @@
static int getincludepath(void);
static int getcurifdef(void);
-#define yywrap() 1
%}
+%option noyywrap
+
PATH [A-Za-z_0-9]*[./][-A-Za-z_0-9./]*
QCHARS ([^\n]|\\\)+
WORD [A-Za-z_][-A-Za-z_0-9]*
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: macallan Date: Wed Oct 28 03:41:31 UTC 2009 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add radeonfb ( has been working for ages with my XVR-100 ) and pm2fb ( for PGX32 / TechSource Raptor GFX 8P ) We should probably enable cgthree as well since it grew wsdisplay support a while ago. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/arch/sparc64/conf/GENERIC 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/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.111 src/sys/arch/sparc64/conf/GENERIC:1.112 --- src/sys/arch/sparc64/conf/GENERIC:1.111 Fri Oct 2 15:09:16 2009 +++ src/sys/arch/sparc64/conf/GENERIC Wed Oct 28 03:41:30 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.111 2009/10/02 15:09:16 nakayama Exp $ +# $NetBSD: GENERIC,v 1.112 2009/10/28 03:41:30 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.111 $ +#ident GENERIC-$Revision: 1.112 $ maxusers 64 @@ -857,6 +857,12 @@ # On board vga on U5/U10 etc. machfb* at pci? +# Sun XVR-100 +radeonfb* at pci? + +# Sun PGX32 / TechSource Raptor GFX 8P +pm2fb* at pci? + # generic PCI framebuffers genfb* at pci?
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Wed Oct 28 04:25:13 UTC 2009
Modified Files:
src/sys/dev/pci: pm2fb.c pm2reg.h
Log Message:
fix occasionally wrong colours in rectangle fills
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/pm2fb.c src/sys/dev/pci/pm2reg.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/pm2fb.c
diff -u src/sys/dev/pci/pm2fb.c:1.1 src/sys/dev/pci/pm2fb.c:1.2
--- src/sys/dev/pci/pm2fb.c:1.1 Wed Oct 28 02:10:27 2009
+++ src/sys/dev/pci/pm2fb.c Wed Oct 28 04:25:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pm2fb.c,v 1.1 2009/10/28 02:10:27 macallan Exp $ */
+/* $NetBSD: pm2fb.c,v 1.2 2009/10/28 04:25:13 macallan Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pm2fb.c,v 1.1 2009/10/28 02:10:27 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: pm2fb.c,v 1.2 2009/10/28 04:25:13 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -600,16 +600,18 @@
{
pm2fb_wait(sc, 6);
+ bus_space_write_4(sc-sc_memt, sc-sc_regh, PM2_RE_DDA_MODE,
+ 0);
bus_space_write_4(sc-sc_memt, sc-sc_regh, PM2_RE_CONFIG,
PM2RECFG_WRITE_EN);
- bus_space_write_4(sc-sc_memt, sc-sc_regh, PM2_RE_CONST_COLOUR,
+ bus_space_write_4(sc-sc_memt, sc-sc_regh, PM2_RE_BLOCK_COLOUR,
colour);
bus_space_write_4(sc-sc_memt, sc-sc_regh, PM2_RE_RECT_START,
(y 16) | x);
bus_space_write_4(sc-sc_memt, sc-sc_regh, PM2_RE_RECT_SIZE,
(he 16) | wi);
bus_space_write_4(sc-sc_memt, sc-sc_regh, PM2_RE_RENDER,
- PM2RE_RECTANGLE);
+ PM2RE_RECTANGLE | PM2RE_INC_X | PM2RE_INC_Y | PM2RE_FASTFILL);
pm2fb_flush_engine(sc);
}
@@ -620,14 +622,14 @@
{
uint32_t dir = 0;
- pm2fb_wait(sc, 5);
-
if (yd = ys) {
dir |= PM2RE_INC_Y;
}
if (xd = xs) {
dir |= PM2RE_INC_X;
}
+ pm2fb_wait(sc, 6);
+ bus_space_write_4(sc-sc_memt, sc-sc_regh, PM2_RE_DDA_MODE, 0);
bus_space_write_4(sc-sc_memt, sc-sc_regh, PM2_RE_CONFIG,
PM2RECFG_READ_SRC | PM2RECFG_WRITE_EN | PM2RECFG_ROP_EN |
(rop 6));
Index: src/sys/dev/pci/pm2reg.h
diff -u src/sys/dev/pci/pm2reg.h:1.1 src/sys/dev/pci/pm2reg.h:1.2
--- src/sys/dev/pci/pm2reg.h:1.1 Wed Oct 28 02:10:27 2009
+++ src/sys/dev/pci/pm2reg.h Wed Oct 28 04:25:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pm2reg.h,v 1.1 2009/10/28 02:10:27 macallan Exp $ */
+/* $NetBSD: pm2reg.h,v 1.2 2009/10/28 04:25:13 macallan Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -130,4 +130,8 @@
#define PM2_RE_SYNC 0x8c40
#define PM2_RE_FILTER_MODE 0x8c00
#define PM2FLT_PASS_SYNC 0x0400
+#define PM2_RE_DDA_MODE 0x87e0
+#define PM2DDA_ENABLE 0x0001
+#define PM2DDA_GORAUD 0x0002 /* flat otherwise */
+#define PM2_RE_BLOCK_COLOUR 0x8ac8
#endif /* PM2_REG_H */
CVS commit: src/external/bsd/flex/dist
Module Name:src Committed By: christos Date: Wed Oct 28 05:04:02 UTC 2009 Modified Files: src/external/bsd/flex/dist: flex.skl initscan.c Log Message: deal with libc's namespace protection To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/flex.skl cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/dist/initscan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/flex.skl diff -u src/external/bsd/flex/dist/flex.skl:1.2 src/external/bsd/flex/dist/flex.skl:1.3 --- src/external/bsd/flex/dist/flex.skl:1.2 Mon Oct 26 21:44:01 2009 +++ src/external/bsd/flex/dist/flex.skl Wed Oct 28 01:04:02 2009 @@ -197,6 +197,9 @@ /* begin standard C headers. */ %if-c-only +#ifdef _LIBC +#include namespace.h +#endif #include stdio.h #include string.h #include errno.h @@ -215,6 +218,9 @@ %if-c++-only /* begin standard C++ headers. */ +#ifdef _LIBC +#include namespace.h +#endiif #include iostream #include errno.h #include cstdlib Index: src/external/bsd/flex/dist/initscan.c diff -u src/external/bsd/flex/dist/initscan.c:1.1 src/external/bsd/flex/dist/initscan.c:1.2 --- src/external/bsd/flex/dist/initscan.c:1.1 Mon Oct 26 00:27:15 2009 +++ src/external/bsd/flex/dist/initscan.c Wed Oct 28 01:04:02 2009 @@ -16,6 +16,9 @@ /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ +#ifdef _LIBC +#include namespace.h +#endif #include stdio.h #include string.h #include errno.h
