CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: darran Date: Sun Feb 21 08:28:41 UTC 2010 Removed Files: src/external/cddl/osnet/sys/sys: file.h Log Message: DTrace: remove file.h - it shouldn't have been added and breaks zfs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/sys/sys/file.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sun Feb 21 09:02:19 UTC 2010 Modified Files: src/share/man/man4: isa.4 Log Message: New sentence, new line. Bump date for mentioning wbsio. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/share/man/man4/isa.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/include
Module Name:src Committed By: darran Date: Sun Feb 21 09:52:08 UTC 2010 Removed Files: src/external/cddl/osnet/include: assert.h Log Message: DTrace: remove assert.h - shouldn't have been checked in (breaks libdtrace build). To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/include/assert.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/sh
Module Name:src Committed By: christos Date: Sun Feb 21 09:54:57 UTC 2010 Modified Files: src/bin/sh: main.c Log Message: fix faulty logic in previous change. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/bin/sh/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/include
Module Name:src Committed By: darran Date: Sun Feb 21 10:21:07 UTC 2010 Removed Files: src/external/cddl/osnet/include: libshare.h Log Message: DTrace: remove extra libshare.h - shouldn't have added it and it breaks the libzfs build. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/external/cddl/osnet/include/libshare.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet
Module Name:src Committed By: darran Date: Sun Feb 21 11:00:02 UTC 2010 Modified Files: src/external/cddl/osnet/usr.bin/ctfconvert: Makefile src/external/cddl/osnet/usr.bin/ctfmerge: Makefile src/external/cddl/osnet/usr.sbin/dtrace: Makefile Log Message: DTrace: fix a problem with library references for libctf and libdtrace. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/usr.bin/ctfconvert/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/usr.sbin/dtrace/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: darran Date: Sun Feb 21 11:14:47 UTC 2010 Modified Files: src/sys/modules: Makefile Log Message: DTrace: add the dtrace module to the build. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/dtrace
Module Name:src Committed By: darran Date: Sun Feb 21 11:16:19 UTC 2010 Added Files: src/sys/modules/dtrace: Makefile src/sys/modules/dtrace/dtrace: Makefile Log Message: DTrace: add the dtrace module. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/dtrace/dtrace/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys
On Sun, Feb 21, 2010 at 05:31:31AM +, Mindaugas Rasiukevicius wrote: Quentin Garnier c...@cubidou.net wrote: On Sun, Feb 21, 2010 at 02:11:40AM +, Darran Hunt wrote: Module Name: src Committed By: darran Date: Sun Feb 21 02:11:40 UTC 2010 Modified Files: src/sys/arch/i386/i386: trap.c vector.S src/sys/kern: kern_lwp.c kern_proc.c kern_synch.c src/sys/sys: lwp.h proc.h Added Files: src/sys/sys: dtrace_bsd.h Log Message: Add the DTrace hooks to the kernel (KDTRACE_HOOKS config option). Please defflag that option in conf/files and use the resulting include file as necessary. I think these #ifdefs for KDTRACE_HOOKS should be removed and empty stubs provided for no-DTrace case. Code will get cleaner and perhaps more modular. It's a different debate. If KDTRACE_HOOKS stays, it has to be defflag'd. -- Quentin Garnier - c...@cubidou.net - c...@netbsd.org See the look on my face from staying too long in one place [...] every time the morning breaks I know I'm closer to falling KT Tunstall, Saving My Face, Drastic Fantastic, 2007. pgpuTwDwACT7N.pgp Description: PGP signature
CVS commit: src
Module Name:src Committed By: drochner Date: Sun Feb 21 13:17:51 UTC 2010 Modified Files: src/share/man/man4: options.4 src/share/man/man7: sysctl.7 src/sys/uvm: files.uvm uvm_map.c Log Message: rename the va0_disabled option and cpp conditional to disable as well, for consistency, and document option and sysctl flag To generate a diff of this commit: cvs rdiff -u -r1.382 -r1.383 src/share/man/man4/options.4 cvs rdiff -u -r1.30 -r1.31 src/share/man/man7/sysctl.7 cvs rdiff -u -r1.17 -r1.18 src/sys/uvm/files.uvm cvs rdiff -u -r1.289 -r1.290 src/sys/uvm/uvm_map.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/newfs_ext2fs
Module Name:src Committed By: wiz Date: Sun Feb 21 13:23:15 UTC 2010 Modified Files: src/sbin/newfs_ext2fs: newfs_ext2fs.8 Log Message: Fix string, noted by tsutsui. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sbin/newfs_ext2fs/newfs_ext2fs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: wiz Date: Sun Feb 21 13:26:46 UTC 2010 Modified Files: src/sbin/fsck_ext2fs: fsck_ext2fs.8 src/sbin/mount_ext2fs: mount_ext2fs.8 src/sbin/newfs: newfs.8 src/share/man/man4: options.4 Log Message: Call the file system ext2 consistently. Suggested by tsutsui. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sbin/fsck_ext2fs/fsck_ext2fs.8 cvs rdiff -u -r1.13 -r1.14 src/sbin/mount_ext2fs/mount_ext2fs.8 cvs rdiff -u -r1.76 -r1.77 src/sbin/newfs/newfs.8 cvs rdiff -u -r1.383 -r1.384 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/syspkg/sets
Module Name:src Committed By: wiz Date: Sun Feb 21 13:28:12 UTC 2010 Modified Files: src/distrib/syspkg/sets/base/base-ext2fs-root: COMMENT DESCR src/distrib/syspkg/sets/man/man-ext2fs-catman: COMMENT DESCR src/distrib/syspkg/sets/man/man-ext2fs-man: COMMENT DESCR Log Message: Consistently call the file system ext2. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/distrib/syspkg/sets/base/base-ext2fs-root/COMMENT \ src/distrib/syspkg/sets/base/base-ext2fs-root/DESCR cvs rdiff -u -r1.1.1.1 -r1.2 \ src/distrib/syspkg/sets/man/man-ext2fs-catman/COMMENT \ src/distrib/syspkg/sets/man/man-ext2fs-catman/DESCR cvs rdiff -u -r1.1.1.1 -r1.2 \ src/distrib/syspkg/sets/man/man-ext2fs-man/COMMENT \ src/distrib/syspkg/sets/man/man-ext2fs-man/DESCR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/sysinst/arch/cobalt
Module Name:src Committed By: wiz Date: Sun Feb 21 13:28:47 UTC 2010 Modified Files: src/distrib/utils/sysinst/arch/cobalt: msg.md.en Log Message: Consistently call the file system ext2. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/cobalt/msg.md.en Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man
Module Name:src Committed By: wiz Date: Sun Feb 21 13:33:03 UTC 2010 Modified Files: src/share/man/man8/man8.cobalt: boot.8 src/share/man/man9: vnode.9 Log Message: Consistently call the file system ext2. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man8/man8.cobalt/boot.8 cvs rdiff -u -r1.46 -r1.47 src/share/man/man9/vnode.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sbin/newfs_ext2fs
On Fri, Feb 19, 2010 at 02:28:03AM +0900, Izumi Tsutsui wrote: If you prefer using ext2 in docs, fsck_ext2fs(8), mount_ext2fs(8), newfs(8), and options(4) (and more?) should also be fixed. I've fixed these places and a few more. On the other hand, these ones must be `Linux Ext2' because they are API strings defined in sys/disklabel.h. Thanks! Fixed as well. Thomas
CVS commit: src/sys/ufs/ffs
Module Name:src Committed By: mlelstv Date: Sun Feb 21 13:55:58 UTC 2010 Modified Files: src/sys/ufs/ffs: ffs_alloc.c Log Message: For the UVM_PAGE_TRKOWN test do not require that the relevant pages must exist. To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/sys/ufs/ffs/ffs_alloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/i2o
Module Name:src Committed By: bouyer Date: Sun Feb 21 14:16:47 UTC 2010 Modified Files: src/sys/dev/i2o: iop.c Log Message: Fix bus_dmamap_sync(): it should be a BUS_DMASYNC_POSTWRITE after writing to DMA memory. Found by code inspection. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/dev/i2o/iop.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man
Module Name:src Committed By: wiz Date: Sun Feb 21 14:26:33 UTC 2010 Modified Files: src/share/man/man4: options.4 src/share/man/man7: sysctl.7 Log Message: Bump date for vm.user_va0_disable. To generate a diff of this commit: cvs rdiff -u -r1.384 -r1.385 src/share/man/man4/options.4 cvs rdiff -u -r1.31 -r1.32 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/i2o
On Sun, Feb 21, 2010 at 11:52:13PM +0900, Izumi Tsutsui wrote:
Modified Files:
src/sys/dev/i2o: iop.c
Log Message:
Fix bus_dmamap_sync(): it should be a BUS_DMASYNC_POSTWRITE after
writing to DMA memory.
Found by code inspection.
*sw = htole32(0);
bus_dmamap_sync(sc-sc_dmat, sc-sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
+ BUS_DMASYNC_POSTWRITE);
This looks wrong. POSTWRITE should be used after
xfer from host to device is complete.
It looks bus_dmamap_sync() before *sw = htole32(0) statement
should be POSTWRITE (for the previous xfer) instead.
Ops, you're right. I got it in the wrong order.
There's another place where it seems to be in the wrong order as well.
(POLL() macro with bus_dmamap_sync() seems also wrong..)
Hum, it looks correct to me. We are after the device wrote something
to RAM, so it's a POSTREAD operation, isn't it ?
Or do you mean it should be POSTREAD | POSTWRITE ? this would seems more
correct to me but it probably doesn't matters ...
Does the attached patch looks correct ?
--
Manuel Bouyer bou...@antioche.eu.org
NetBSD: 26 ans d'experience feront toujours la difference
--
Index: iop.c
===
RCS file: /cvsroot/src/sys/dev/i2o/iop.c,v
retrieving revision 1.79
diff -u -p -u -r1.79 iop.c
--- iop.c 21 Feb 2010 14:16:47 - 1.79
+++ iop.c 21 Feb 2010 16:21:47 -
@@ -990,17 +990,17 @@ iop_ofifo_init(struct iop_softc *sc)
mb[0] += 2 16;
bus_dmamap_sync(sc-sc_dmat, sc-sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_PREWRITE);
+ BUS_DMASYNC_POSTWRITE);
*sw = 0;
bus_dmamap_sync(sc-sc_dmat, sc-sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_POSTWRITE);
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
if ((rv = iop_post(sc, mb)) != 0)
return (rv);
POLL(5000,
(bus_dmamap_sync(sc-sc_dmat, sc-sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_POSTREAD),
+ BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD),
*sw == htole32(I2O_EXEC_OUTBOUND_INIT_COMPLETE)));
if (*sw != htole32(I2O_EXEC_OUTBOUND_INIT_COMPLETE)) {
@@ -1535,17 +1535,17 @@ iop_reset(struct iop_softc *sc)
mf.statushigh = (u_int32_t)((u_int64_t)pa 32);
bus_dmamap_sync(sc-sc_dmat, sc-sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_PREWRITE);
+ BUS_DMASYNC_POSTWRITE);
*sw = htole32(0);
bus_dmamap_sync(sc-sc_dmat, sc-sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_POSTWRITE);
+ BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
if ((rv = iop_post(sc, (u_int32_t *)mf)))
return (rv);
POLL(2500,
(bus_dmamap_sync(sc-sc_dmat, sc-sc_scr_dmamap, 0, sizeof(*sw),
- BUS_DMASYNC_POSTREAD), *sw != 0));
+ BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD), *sw != 0));
if (*sw != htole32(I2O_RESET_IN_PROGRESS)) {
aprint_error_dev(sc-sc_dv, reset rejected, status 0x%x\n,
le32toh(*sw));
CVS commit: src/sbin/fsck_lfs
Module Name:src Committed By: mlelstv Date: Sun Feb 21 16:24:21 UTC 2010 Modified Files: src/sbin/fsck_lfs: lfs.c Log Message: dev_bsize wasn't initialized. The actual value doesn't matter since the same value is used to compute byte offsets into the special file but a value of zero causes a division by zero. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sbin/fsck_lfs/lfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/i2o
(POLL() macro with bus_dmamap_sync() seems also wrong..)
Hum, it looks correct to me. We are after the device wrote something
to RAM, so it's a POSTREAD operation, isn't it ?
Strictly, if DMA is still on-going even after DMA'ed memory is polled,
we also have to call PREREAD sync every time.
for (xi = xxx; xi; xi--) {
uint32_t temp;
bus_dmamap_sync(..., POSTREAD|POSTWRITE);
temp = le32toh(*sw);
if (temp == I2O_EXEC_foo);
break;
bus_dmamap_sync(..., PREREAD);
}
---
Izumi Tsutsui
CVS commit: src/sys/arch/atari/conf
Module Name:src Committed By: tsutsui Date: Sun Feb 21 18:00:14 UTC 2010 Modified Files: src/sys/arch/atari/conf: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE SMALL030 Log Message: Regen from GENERIC.in rev 1.83: Add pseudo-device ksyms. Noticed by David Ross on port-atari. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.92 -r1.93 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.84 -r1.85 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.61 -r1.62 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.65 -r1.66 src/sys/arch/atari/conf/MILAN-PCIIDE cvs rdiff -u -r1.3 -r1.4 src/sys/arch/atari/conf/SMALL030 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/i2o
On Mon, Feb 22, 2010 at 02:06:54AM +0900, Izumi Tsutsui wrote:
(POLL() macro with bus_dmamap_sync() seems also wrong..)
Hum, it looks correct to me. We are after the device wrote something
to RAM, so it's a POSTREAD operation, isn't it ?
Strictly, if DMA is still on-going even after DMA'ed memory is polled,
we also have to call PREREAD sync every time.
for (xi = xxx; xi; xi--) {
uint32_t temp;
bus_dmamap_sync(..., POSTREAD|POSTWRITE);
temp = le32toh(*sw);
if (temp == I2O_EXEC_foo);
break;
bus_dmamap_sync(..., PREREAD);
}
I see. But this would require changing the macro; more work than what
I can do right now.
--
Manuel Bouyer bou...@antioche.eu.org
NetBSD: 26 ans d'experience feront toujours la difference
--
CVS commit: src/sys/dev/i2o
Module Name:src Committed By: bouyer Date: Sun Feb 21 18:50:11 UTC 2010 Modified Files: src/sys/dev/i2o: iop.c Log Message: Fix confusion about PRE/POST in previous; and another place that has the same issue. Also add a BUS_DMASYNC_POSTWRITE to the POLL operation. Problem pointed out by tsut...@. Still not perfect (a BUS_DMASYNC_PREREAD would be needed after the testing the condition in the POLL() macro), but closer. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/dev/i2o/iop.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/atari/floppies
Module Name:src Committed By: tsutsui Date: Sun Feb 21 20:04:59 UTC 2010 Modified Files: src/distrib/atari/floppies/install: list src/distrib/atari/floppies/prepare: list Log Message: Add dd(1) to install ramdisk binaries to wipe out existing disklabel etc. Per request from David Ross on port-atari. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/atari/floppies/install/list cvs rdiff -u -r1.6 -r1.7 src/distrib/atari/floppies/prepare/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/atari/floppies/common
Module Name:src Committed By: tsutsui Date: Sun Feb 21 20:06:19 UTC 2010 Modified Files: src/distrib/atari/floppies/common: Makefile.images Log Message: - explicitly specify -Os via DBG for libhack build - set WARNS=1 for sanity To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/distrib/atari/floppies/common/Makefile.images Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/atari/floppies
Module Name:src Committed By: tsutsui Date: Sun Feb 21 20:09:50 UTC 2010 Modified Files: src/distrib/atari/floppies/install: list src/distrib/atari/floppies/prepare: list Log Message: Use tiny limited distrib/utils/x_gzip. (no bzip2 and compress support) To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/distrib/atari/floppies/install/list cvs rdiff -u -r1.7 -r1.8 src/distrib/atari/floppies/prepare/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys
I've defflag'd KDTRACE_HOOKS - it will stay either way with or without stubs. Cheers, Darran. On 22/02/2010, at 1:56 AM, Quentin Garnier wrote: On Sun, Feb 21, 2010 at 05:31:31AM +, Mindaugas Rasiukevicius wrote: Quentin Garnier c...@cubidou.net wrote: On Sun, Feb 21, 2010 at 02:11:40AM +, Darran Hunt wrote: Module Name:src Committed By: darran Date: Sun Feb 21 02:11:40 UTC 2010 Modified Files: src/sys/arch/i386/i386: trap.c vector.S src/sys/kern: kern_lwp.c kern_proc.c kern_synch.c src/sys/sys: lwp.h proc.h Added Files: src/sys/sys: dtrace_bsd.h Log Message: Add the DTrace hooks to the kernel (KDTRACE_HOOKS config option). Please defflag that option in conf/files and use the resulting include file as necessary. I think these #ifdefs for KDTRACE_HOOKS should be removed and empty stubs provided for no-DTrace case. Code will get cleaner and perhaps more modular. It's a different debate. If KDTRACE_HOOKS stays, it has to be defflag'd. -- Quentin Garnier - c...@cubidou.net - c...@netbsd.org See the look on my face from staying too long in one place [...] every time the morning breaks I know I'm closer to falling KT Tunstall, Saving My Face, Drastic Fantastic, 2007.
CVS commit: src/gnu/usr.bin/groff/tmac
Module Name:src Committed By: wiz Date: Sun Feb 21 21:08:27 UTC 2010 Modified Files: src/gnu/usr.bin/groff/tmac: mdoc.local Log Message: Add FreeBSD-8.0. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/gnu/usr.bin/groff/tmac/mdoc.local Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/gnu/usr.bin/groff/tmac
Module Name:src Committed By: wiz Date: Sun Feb 21 21:08:27 UTC 2010 Modified Files: src/gnu/usr.bin/groff/tmac: mdoc.local Log Message: Add FreeBSD-8.0. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/gnu/usr.bin/groff/tmac/mdoc.local Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.55 src/gnu/usr.bin/groff/tmac/mdoc.local:1.56 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.55 Thu Feb 4 09:07:29 2010 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Sun Feb 21 21:08:27 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.55 2010/02/04 09:07:29 wiz Exp $ +.\ $NetBSD: mdoc.local,v 1.56 2010/02/21 21:08:27 wiz Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -63,6 +63,7 @@ .ds doc-operating-system-FreeBSD-6.1 6.1 .ds doc-operating-system-FreeBSD-6.3 6.3 .ds doc-operating-system-FreeBSD-7.0 7.0 +.ds doc-operating-system-FreeBSD-8.0 8.0 .\ Platforms not yet in groff distribution .ds doc-volume-as-amigappc amigappc .ds doc-volume-as-evbsh5evbsh5
CVS commit: src/gnu/usr.bin/groff/tmac
Module Name:src Committed By: wiz Date: Sun Feb 21 21:16:09 UTC 2010 Modified Files: src/gnu/usr.bin/groff/tmac: mdoc.local Log Message: Add more FreeBSD versions. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/gnu/usr.bin/groff/tmac/mdoc.local Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.56 src/gnu/usr.bin/groff/tmac/mdoc.local:1.57 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.56 Sun Feb 21 21:08:27 2010 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Sun Feb 21 21:16:09 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.56 2010/02/21 21:08:27 wiz Exp $ +.\ $NetBSD: mdoc.local,v 1.57 2010/02/21 21:16:09 wiz Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -60,9 +60,15 @@ .ds doc-operating-system-NetBSD-5.15.1 .ds doc-operating-system-NetBSD-6.06.0 .ds doc-operating-system-FreeBSD-4.11 4.11 +.ds doc-operating-system-FreeBSD-5.4 5.4 +.ds doc-operating-system-FreeBSD-5.5 5.5 .ds doc-operating-system-FreeBSD-6.1 6.1 +.ds doc-operating-system-FreeBSD-6.2 6.2 .ds doc-operating-system-FreeBSD-6.3 6.3 +.ds doc-operating-system-FreeBSD-6.4 6.4 .ds doc-operating-system-FreeBSD-7.0 7.0 +.ds doc-operating-system-FreeBSD-7.1 7.1 +.ds doc-operating-system-FreeBSD-7.2 7.2 .ds doc-operating-system-FreeBSD-8.0 8.0 .\ Platforms not yet in groff distribution .ds doc-volume-as-amigappc amigappc
CVS commit: src/gnu/usr.bin/groff/tmac
Module Name:src Committed By: wiz Date: Sun Feb 21 21:16:09 UTC 2010 Modified Files: src/gnu/usr.bin/groff/tmac: mdoc.local Log Message: Add more FreeBSD versions. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/gnu/usr.bin/groff/tmac/mdoc.local Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: mrg Date: Mon Feb 22 00:16:31 UTC 2010 Modified Files: src/sys/arch/sparc64/sparc64: autoconf.c cache.h cpu.c locore.s Log Message: - store the maximum [id]cache size / line size for each cpu - remove patch_kernel() since it isn't necessary and has been patching the wrong thing in general. - implement USIII versions of blast_icache(), dcache_flush_page() and cache_flush_phys(). use the newly recorded cache size/line sizes. - in winfixsave, flush the D$ with the right size index and ops. this kills one of the wrong tag-inval patches. - for blast_dcache(), use the newly recorded dcache_size/line_size. - for blast_icache(), use the newly recorded cache size/line sizes. for the USIII verison, disable the I$ while writing to ASI_ICACHE_TAG. these changes removed several hard coded cache sizes values, some very wrong kernel patching, and seem to make the current failure modes for USIII less common, but not gone. To generate a diff of this commit: cvs rdiff -u -r1.167 -r1.168 src/sys/arch/sparc64/sparc64/autoconf.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/sparc64/cache.h cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sparc64/sparc64/cpu.c cvs rdiff -u -r1.317 -r1.318 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.
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: pgoyette
Date: Mon Feb 22 03:50:56 UTC 2010
Modified Files:
src/sys/dev/i2c: files.i2c
Added Files:
src/sys/dev/i2c: smscmon.c smscmonvar.h
Log Message:
Import smcsmon(4) driver for SMSC LPC47M192 hardware monitor
From Takahiro HAYASHI in PR kern/40420
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/i2c/files.i2c
cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/smscmon.c src/sys/dev/i2c/smscmonvar.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/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.25 src/sys/dev/i2c/files.i2c:1.26
--- src/sys/dev/i2c/files.i2c:1.25 Thu May 14 13:22:26 2009
+++ src/sys/dev/i2c/files.i2c Mon Feb 22 03:50:56 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.25 2009/05/14 13:22:26 pgoyette Exp $
+# $NetBSD: files.i2c,v 1.26 2010/02/22 03:50:56 pgoyette Exp $
defflag opt_i2cbus.hI2C_SCAN
define i2cbus { }
@@ -115,3 +115,8 @@
device admtemp: sysmon_envsys
attach admtemp at iic
file dev/i2c/adm1021.c admtemp
+
+# SMSC LPC47M192 hardware monitor
+device smscmon: sysmon_envsys
+attach smscmon at iic
+file dev/i2c/smscmon.c smscmon
Added files:
Index: src/sys/dev/i2c/smscmon.c
diff -u /dev/null src/sys/dev/i2c/smscmon.c:1.1
--- /dev/null Mon Feb 22 03:50:56 2010
+++ src/sys/dev/i2c/smscmon.c Mon Feb 22 03:50:56 2010
@@ -0,0 +1,331 @@
+/* $NetBSD: smscmon.c,v 1.1 2010/02/22 03:50:56 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2009 Takahiro Hayashi
+ * 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.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: smscmon.c,v 1.1 2010/02/22 03:50:56 pgoyette Exp $);
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/device.h
+
+#include dev/i2c/i2cvar.h
+#include dev/sysmon/sysmonvar.h
+#include dev/i2c/smscmonvar.h
+
+/*
+ * A driver for SMSC LPC47M192 hardware monitor at SMBus.
+ * This driver supports 8 Voltage and 3 Temperature sensors.
+ * Fan RPM monitoring is not supported in this driver because
+ * they are seen on ISA bus.
+ *
+ * Datasheet available (as of Feb. 20, 2010) at
+ * http://pdf1.alldatasheet.com/datasheet-pdf/view/109752/SMSC/LPC47M192-NC.html
+ */
+
+static int smscmon_match(device_t, cfdata_t, void *);
+static void smscmon_attach(device_t, device_t, void *);
+static uint8_t smscmon_readreg(struct smscmon_sc *, int);
+static void smscmon_writereg(struct smscmon_sc *, int, int);
+static void smscmon_sensors_setup(struct smscmon_sc *, struct smscmon_sensor *);
+static void smscmon_refresh_volt(struct smscmon_sc *, envsys_data_t *);
+static void smscmon_refresh_temp(struct smscmon_sc *, envsys_data_t *);
+static void smscmon_refresh(struct sysmon_envsys *, envsys_data_t *);
+
+CFATTACH_DECL_NEW(smscmon, sizeof(struct smscmon_sc),
+smscmon_match, smscmon_attach, NULL, NULL);
+
+static struct smscmon_sensor smscmon_lpc47m192[] = {
+ {
+ .desc = +2.5V,
+ .type = ENVSYS_SVOLTS_DC,
+ .reg = 0x20,
+ .refresh = smscmon_refresh_volt,
+ .vmin = 13000,
+ .vmax = 332
+ },
+ {
+ .desc = Vccp,
+ .type = ENVSYS_SVOLTS_DC,
+ .reg = 0x21,
+ .refresh = smscmon_refresh_volt,
+ .vmin = 12000,
+ .vmax = 2988000
+ },
+ {
+ .desc = +3.3V,
+ .type = ENVSYS_SVOLTS_DC,
+ .reg = 0x22,
+ .refresh = smscmon_refresh_volt,
+ .vmin = 17000,
+ .vmax = 4383000
+ },
+ {
+ .desc = +5V,
+ .type = ENVSYS_SVOLTS_DC,
+ .reg = 0x23,
+ .refresh = smscmon_refresh_volt,
+ .vmin = 26000,
+ .vmax = 664
+ },
+ {
+ .desc = +12V,
+ .type = ENVSYS_SVOLTS_DC,
+ .reg = 0x24,
+ .refresh = smscmon_refresh_volt,
+ .vmin =62000,
+ .vmax = 15938000
+
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: pgoyette Date: Mon Feb 22 03:52:06 UTC 2010 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add smscmon(4) To generate a diff of this commit: cvs rdiff -u -r1.239 -r1.240 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: pgoyette Date: Mon Feb 22 03:54:25 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi Added Files: src/share/man/man4: smscmon.4 Log Message: Add man page for smscmon(4) To generate a diff of this commit: cvs rdiff -u -r1.1193 -r1.1194 src/distrib/sets/lists/man/mi cvs rdiff -u -r0 -r1.1 src/share/man/man4/smscmon.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.1193 src/distrib/sets/lists/man/mi:1.1194 --- src/distrib/sets/lists/man/mi:1.1193 Sun Feb 21 05:16:29 2010 +++ src/distrib/sets/lists/man/mi Mon Feb 22 03:54:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1193 2010/02/21 05:16:29 cnst Exp $ +# $NetBSD: mi,v 1.1194 2010/02/22 03:54:24 pgoyette Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1432,6 +1432,7 @@ ./usr/share/man/cat4/slip.0 man-sys-catman .cat ./usr/share/man/cat4/sm.0 man-sys-catman .cat ./usr/share/man/cat4/smsc.0 man-sys-catman .cat +./usr/share/man/cat4/smscmon.0 man-sys-catman .cat ./usr/share/man/cat4/smsh.0 man-sys-catman .cat ./usr/share/man/cat4/sn.0 man-sys-catman .cat ./usr/share/man/cat4/sony.0 man-sys-catman .cat @@ -4010,6 +4011,7 @@ ./usr/share/man/html4/slip.html man-sys-htmlman html ./usr/share/man/html4/sm.html man-sys-htmlman html ./usr/share/man/html4/smsc.html man-sys-htmlman html +./usr/share/man/html4/smscmon.html man-sys-htmlman html ./usr/share/man/html4/smsh.html man-sys-htmlman html ./usr/share/man/html4/sn.html man-sys-htmlman html ./usr/share/man/html4/sony.html man-sys-htmlman html @@ -6500,6 +6502,7 @@ ./usr/share/man/man4/slip.4 man-sys-man .man ./usr/share/man/man4/sm.4 man-sys-man .man ./usr/share/man/man4/smsc.4 man-sys-man .man +./usr/share/man/man4/smscmon.4 man-sys-man .man ./usr/share/man/man4/smsh.4 man-sys-man .man ./usr/share/man/man4/sn.4 man-sys-man .man ./usr/share/man/man4/sony.4 man-sys-man .man Added files: Index: src/share/man/man4/smscmon.4 diff -u /dev/null src/share/man/man4/smscmon.4:1.1 --- /dev/null Mon Feb 22 03:54:25 2010 +++ src/share/man/man4/smscmon.4 Mon Feb 22 03:54:24 2010 @@ -0,0 +1,71 @@ +.\ $NetBSD: smscmon.4,v 1.1 2010/02/22 03:54:24 pgoyette Exp $ +.\ +.\ Copyright (c) 2009 Takahiro Hayashi +.\ 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 February 21, 2010 +.Dt SMSCMON 4 +.Os +.Sh NAME +.Nm smscmon +.Nd Standard Microsystems Corporation LPC47M192 Super I/O +.Sh SYNOPSIS +.Cd smscmon0 at iic? addr 0x2c +.Cd smscmon0 at iic? addr 0x2d +.Sh DESCRIPTION +The +.Nm +driver provides support for the hardware monitoring portion of the +.Tn Standard Microsystems Corporation +LPC47M192 and LPC47M997 Super I/O chips to be used with the +.Xr envsys 4 +API. +.Pp +The chip supports 11 sensor inputs: +.Bl -column Sensor Units Typical -offset indent +.It Sy Sensor Ta Sy Units Ta Sy Typical Use +.It Li +2.5V Ta uV DC Ta 2.5V Supply +.It Li Vccp Ta uV DC Ta CPU Vcore +.It Li +3.3V Ta uV DC Ta 3.3V Supply +.It Li +5V Ta uV DC Ta %5 Supply +.It Li +12V Ta uV DC Ta 12V Supply +.It Li Vcc Ta uV DC Ta Chip's supply voltage +.It Li +1.5V Ta uV DC Ta 1.5V Supply +.It Li +1.8V Ta uV DC Ta 1.8V Supply +.It Li Remote Temp1 Ta uK Ta CPU temperature +.It Li Ambient Temp Ta uK Ta Local chip temperature +.It Li Remote Temp2 Ta uK +.El +.Sh SEE ALSO +.Xr envsys 4 , +.Xr envstat 8 +.Sh HISTORY +The +.Nm +device appeared in +.Nx 6.0 . +.Sh AUTHOR +The +.Nm +driver was written by Takahiro Hayashi.
CVS commit: [netbsd-5] src/sys/arch/xen/xen
Module Name:src
Committed By: snj
Date: Mon Feb 22 04:36:52 UTC 2010
Modified Files:
src/sys/arch/xen/xen [netbsd-5]: isa_machdep.c pciide_machdep.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1299):
sys/arch/xen/xen/isa_machdep.c: revision 1.23
sys/arch/xen/xen/pciide_machdep.c: revision 1.17
Enlarge temporary buffer, so that event counter's name is not truncated
for ioapic interrupts.
To generate a diff of this commit:
cvs rdiff -u -r1.12.6.1 -r1.12.6.2 src/sys/arch/xen/xen/isa_machdep.c
cvs rdiff -u -r1.11.6.1 -r1.11.6.2 src/sys/arch/xen/xen/pciide_machdep.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/xen/xen/isa_machdep.c
diff -u src/sys/arch/xen/xen/isa_machdep.c:1.12.6.1 src/sys/arch/xen/xen/isa_machdep.c:1.12.6.2
--- src/sys/arch/xen/xen/isa_machdep.c:1.12.6.1 Sun Oct 4 00:03:20 2009
+++ src/sys/arch/xen/xen/isa_machdep.c Mon Feb 22 04:36:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.12.6.1 2009/10/04 00:03:20 snj Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.12.6.2 2010/02/22 04:36:52 snj Exp $ */
/* NetBSD isa_machdep.c,v 1.11 2004/06/20 18:04:08 thorpej Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.12.6.1 2009/10/04 00:03:20 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.12.6.2 2010/02/22 04:36:52 snj Exp $);
#include sys/param.h
#include sys/systm.h
@@ -153,7 +153,7 @@
void *ih_arg;
{
int evtch;
- char evname[8];
+ char evname[16];
struct xen_intr_handle ih;
#if NIOAPIC 0
struct ioapic_softc *pic = NULL;
Index: src/sys/arch/xen/xen/pciide_machdep.c
diff -u src/sys/arch/xen/xen/pciide_machdep.c:1.11.6.1 src/sys/arch/xen/xen/pciide_machdep.c:1.11.6.2
--- src/sys/arch/xen/xen/pciide_machdep.c:1.11.6.1 Sun Oct 4 00:03:20 2009
+++ src/sys/arch/xen/xen/pciide_machdep.c Mon Feb 22 04:36:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.11.6.1 2009/10/04 00:03:20 snj Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.11.6.2 2010/02/22 04:36:52 snj Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pciide_machdep.c,v 1.11.6.1 2009/10/04 00:03:20 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: pciide_machdep.c,v 1.11.6.2 2010/02/22 04:36:52 snj Exp $);
#include sys/param.h
#include sys/systm.h
@@ -72,7 +72,7 @@
void *arg;
{
struct pintrhand *ih;
- char evname[8];
+ char evname[16];
struct xen_intr_handle xenih;
#if NIOAPIC 0
struct ioapic_softc *pic = NULL;
CVS commit: [netbsd-5] src/usr.sbin/repquota
Module Name:src
Committed By: snj
Date: Mon Feb 22 04:48:14 UTC 2010
Modified Files:
src/usr.sbin/repquota [netbsd-5]: repquota.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1309):
usr.sbin/repquota/repquota.c: revision 1.25
Make block fields one char wider; allows to sanely display quotas up to
99.9GB while still fitting 80 columns.
Something else needs to be found for the long term ...
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.4.1 src/usr.sbin/repquota/repquota.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/repquota/repquota.c
diff -u src/usr.sbin/repquota/repquota.c:1.23 src/usr.sbin/repquota/repquota.c:1.23.4.1
--- src/usr.sbin/repquota/repquota.c:1.23 Mon Jul 21 13:36:59 2008
+++ src/usr.sbin/repquota/repquota.c Mon Feb 22 04:48:14 2010
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = @(#)repquota.c 8.2 (Berkeley) 11/22/94;
#else
-__RCSID($NetBSD: repquota.c,v 1.23 2008/07/21 13:36:59 lukem Exp $);
+__RCSID($NetBSD: repquota.c,v 1.23.4.1 2010/02/22 04:48:14 snj Exp $);
#endif
#endif /* not lint */
@@ -216,7 +216,7 @@
fclose(qf);
printf(Block limits File limits\n);
printf(type == USRQUOTA ? User : Group);
- printf( usedsofthard grace usedsofthard grace\n);
+ printf(used soft hard grace usedsofthard grace\n);
for (id = 0; id = highid[type]; id++) {
fup = lookup(id, type);
if (fup == 0)
@@ -228,7 +228,7 @@
printf(%s , fup-fu_name);
else
printf(%-10s, fup-fu_name);
- printf(%c%c%8d%8d%8d%7s,
+ printf(%c%c%9d%9d%9d%7s,
fup-fu_dqblk.dqb_bsoftlimit
fup-fu_dqblk.dqb_curblocks =
fup-fu_dqblk.dqb_bsoftlimit ? '+' : '-',
CVS commit: [netbsd-5] src/usr.sbin/repquota
Module Name:src Committed By: snj Date: Mon Feb 22 04:48:14 UTC 2010 Modified Files: src/usr.sbin/repquota [netbsd-5]: repquota.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #1309): usr.sbin/repquota/repquota.c: revision 1.25 Make block fields one char wider; allows to sanely display quotas up to 99.9GB while still fitting 80 columns. Something else needs to be found for the long term ... To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.4.1 src/usr.sbin/repquota/repquota.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/distrib/hp700/ramdisk
Module Name:src Committed By: snj Date: Mon Feb 22 04:51:16 UTC 2010 Modified Files: src/distrib/hp700/ramdisk [netbsd-5]: list Log Message: Apply patch (requested by skrll in ticket #1311): Add dhclient to the hp700 install media. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.4.1 src/distrib/hp700/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/distrib/hp700/ramdisk
Module Name:src
Committed By: snj
Date: Mon Feb 22 04:51:16 UTC 2010
Modified Files:
src/distrib/hp700/ramdisk [netbsd-5]: list
Log Message:
Apply patch (requested by skrll in ticket #1311):
Add dhclient to the hp700 install media.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/distrib/hp700/ramdisk/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/hp700/ramdisk/list
diff -u src/distrib/hp700/ramdisk/list:1.7 src/distrib/hp700/ramdisk/list:1.7.4.1
--- src/distrib/hp700/ramdisk/list:1.7 Tue May 6 15:09:45 2008
+++ src/distrib/hp700/ramdisk/list Mon Feb 22 04:51:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.7 2008/05/06 15:09:45 skrll Exp $
+# $NetBSD: list,v 1.7.4.1 2010/02/22 04:51:16 snj Exp $
SRCDIRS bin sbin usr.bin usr.sbin
@@ -22,6 +22,7 @@
PROG bin/stty
PROG bin/sync
+PROG sbin/dhclient
PROG sbin/disklabel
PROG sbin/dmesg
PROG sbin/fsck
@@ -55,6 +56,7 @@
# init invokes the shell as -sh
ARGVLN sh -sh
+SPECIAL dhclient srcdir distrib/utils/x_dhclient
SPECIAL ed srcdir distrib/utils/x_ed
SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
@@ -78,6 +80,9 @@
# and the common installation tools
COPY ${CURDIR}/termcap.src usr/share/misc/termcap
+# various files that we need in /etc for the install
+COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
+
# and the disktab explanation file
COPY ${CURDIR}/disktab.preinstall etc/disktab.preinstall
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Mon Feb 22 04:55:03 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 1299, 1302, 1309, and 1311. To generate a diff of this commit: cvs rdiff -u -r1.1.2.198 -r1.1.2.199 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: ahoka Date: Mon Feb 22 05:55:10 UTC 2010 Modified Files: src/sys/dev/pci: files.pci src/sys/dev/splash: splash.c src/sys/dev/wsfb: genfb.c genfbvar.h Log Message: Restore splashscreen support with genfb. genfb patch from Pierre Pronchery, other small changes to make it compile by me. Closes PR kern/42605. XXX doesnt work in 8bit, probably a cmap issue To generate a diff of this commit: cvs rdiff -u -r1.324 -r1.325 src/sys/dev/pci/files.pci cvs rdiff -u -r1.7 -r1.8 src/sys/dev/splash/splash.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/wsfb/genfb.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/wsfb/genfbvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src
Committed By: ahoka
Date: Mon Feb 22 05:55:10 UTC 2010
Modified Files:
src/sys/dev/pci: files.pci
src/sys/dev/splash: splash.c
src/sys/dev/wsfb: genfb.c genfbvar.h
Log Message:
Restore splashscreen support with genfb.
genfb patch from Pierre Pronchery, other small changes to make it
compile by me.
Closes PR kern/42605.
XXX doesnt work in 8bit, probably a cmap issue
To generate a diff of this commit:
cvs rdiff -u -r1.324 -r1.325 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/splash/splash.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/wsfb/genfb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/wsfb/genfbvar.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.324 src/sys/dev/pci/files.pci:1.325
--- src/sys/dev/pci/files.pci:1.324 Thu Jan 7 09:25:19 2010
+++ src/sys/dev/pci/files.pci Mon Feb 22 05:55:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.324 2010/01/07 09:25:19 jdc Exp $
+# $NetBSD: files.pci,v 1.325 2010/02/22 05:55:10 ahoka Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -924,7 +924,7 @@
file dev/pci/sdhc_pci.c sdhc_pci
# generic framebuffer console driver, PCI frontend
-attach genfb at pci with genfb_pci
+attach genfb at pci with genfb_pci : splash
file dev/pci/genfb_pci.c genfb_pci
# NVIDIA nForce2/3/4 SMBus controller
Index: src/sys/dev/splash/splash.c
diff -u src/sys/dev/splash/splash.c:1.7 src/sys/dev/splash/splash.c:1.8
--- src/sys/dev/splash/splash.c:1.7 Tue May 12 14:45:43 2009
+++ src/sys/dev/splash/splash.c Mon Feb 22 05:55:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: splash.c,v 1.7 2009/05/12 14:45:43 cegger Exp $ */
+/* $NetBSD: splash.c,v 1.8 2010/02/22 05:55:10 ahoka Exp $ */
/*-
* Copyright (c) 2006 Jared D. McNeill jmcne...@invisible.ca
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: splash.c,v 1.7 2009/05/12 14:45:43 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: splash.c,v 1.8 2010/02/22 05:55:10 ahoka Exp $);
#include opt_splash.h
@@ -44,6 +44,7 @@
#define NSPLASH32 1
#include sys/param.h
+#include sys/device.h
#include sys/systm.h
#include sys/types.h
#include sys/kernel.h
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.28 src/sys/dev/wsfb/genfb.c:1.29
--- src/sys/dev/wsfb/genfb.c:1.28 Mon Aug 24 11:03:44 2009
+++ src/sys/dev/wsfb/genfb.c Mon Feb 22 05:55:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.28 2009/08/24 11:03:44 jmcneill Exp $ */
+/* $NetBSD: genfb.c,v 1.29 2010/02/22 05:55:10 ahoka Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.28 2009/08/24 11:03:44 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.29 2010/02/22 05:55:10 ahoka Exp $);
#include sys/param.h
#include sys/systm.h
@@ -49,6 +49,12 @@
#include dev/wsfb/genfbvar.h
+#ifdef GENFB_DISABLE_TEXT
+#include sys/reboot.h
+#define DISABLESPLASH (boothowto (RB_SINGLE | RB_USERCONF | RB_ASKNAME | \
+ AB_VERBOSE | AB_DEBUG) )
+#endif
+
#include opt_genfb.h
#include opt_wsfb.h
@@ -204,6 +210,15 @@
defattr);
sc-sc_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
+#ifdef SPLASHSCREEN
+/*
+ * If system isn't going to go multiuser, or user has requested to see
+ * boot text, don't render splash screen immediately
+ */
+ if (DISABLESPLASH)
+#endif
+ vcons_redraw_screen(sc-sc_console_screen);
+
sc-sc_defaultscreen_descr.textops = ri-ri_ops;
sc-sc_defaultscreen_descr.capabilities = ri-ri_caps;
sc-sc_defaultscreen_descr.nrows = ri-ri_rows;
@@ -217,16 +232,53 @@
j = 0;
for (i = 0; i min(1 sc-sc_depth, 256); i++) {
-
+#ifndef SPLASHSCREEN
sc-sc_cmap_red[i] = rasops_cmap[j];
sc-sc_cmap_green[i] = rasops_cmap[j + 1];
sc-sc_cmap_blue[i] = rasops_cmap[j + 2];
genfb_putpalreg(sc, i, rasops_cmap[j], rasops_cmap[j + 1],
rasops_cmap[j + 2]);
j += 3;
+#else
+ if(i = SPLASH_CMAP_OFFSET
+ i SPLASH_CMAP_OFFSET + SPLASH_CMAP_SIZE) {
+ sc-sc_cmap_red[i] = _splash_header_data_cmap[j][0];
+ sc-sc_cmap_green[i] = _splash_header_data_cmap[j][1];
+ sc-sc_cmap_blue[i] = _splash_header_data_cmap[j][2];
+ } else {
+ sc-sc_cmap_red[i] = rasops_cmap[j];
+ sc-sc_cmap_green[i] = rasops_cmap[j + 1];
+ sc-sc_cmap_blue[i] = rasops_cmap[j + 2];
+ genfb_putpalreg(sc, i, rasops_cmap[j],
+rasops_cmap[j + 1],
+rasops_cmap[j + 2]);
+ }
+ j += 3;
+#endif
}
+#ifdef SPLASHSCREEN
+ sc-sc_splash.si_depth = sc-sc_depth;
+ sc-sc_splash.si_bits = sc-sc_console_screen.scr_ri.ri_bits;
+ sc-sc_splash.si_hwbits = sc-sc_fbaddr;
+ sc-sc_splash.si_width = sc-sc_width;
+ sc-sc_splash.si_height = sc-sc_height;
+ sc-sc_splash.si_stride = sc-sc_stride;
+ sc-sc_splash.si_fillrect = NULL;
+ if
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: ahoka Date: Mon Feb 22 05:57:11 UTC 2010 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Mention splash need genfb or radeonfb To generate a diff of this commit: cvs rdiff -u -r1.969 -r1.970 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: ahoka Date: Mon Feb 22 05:59:04 UTC 2010 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add SPLASH example, like in i386. To generate a diff of this commit: cvs rdiff -u -r1.267 -r1.268 src/sys/arch/amd64/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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.267 src/sys/arch/amd64/conf/GENERIC:1.268 --- src/sys/arch/amd64/conf/GENERIC:1.267 Sun Feb 21 05:16:29 2010 +++ src/sys/arch/amd64/conf/GENERIC Mon Feb 22 05:59:04 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.267 2010/02/21 05:16:29 cnst Exp $ +# $NetBSD: GENERIC,v 1.268 2010/02/22 05:59:04 ahoka Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.267 $ +#ident GENERIC-$Revision: 1.268 $ maxusers 64 # estimated number of users @@ -242,6 +242,9 @@ options WSDISPLAY_SCROLLSUPPORT # enable VGA raster mode capable of displaying multilingual text on console #options VGA_RASTERCONSOLE +# enable splash screen support; requires genfb or radeonfb +#optionsSPLASHSCREEN +#optionsSPLASHSCREEN_PROGRESS # Kernel root file system and dump configuration. config netbsd root on ? type ?
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: ahoka Date: Mon Feb 22 05:59:04 UTC 2010 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add SPLASH example, like in i386. To generate a diff of this commit: cvs rdiff -u -r1.267 -r1.268 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: ahoka Date: Mon Feb 22 06:10:30 UTC 2010 Modified Files: src/share/man/man4: options.4 Log Message: Describe SPLASHSCREEN and SPLASHSCREEN_PROGRESS. To generate a diff of this commit: cvs rdiff -u -r1.385 -r1.386 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: ahoka Date: Mon Feb 22 06:10:30 UTC 2010 Modified Files: src/share/man/man4: options.4 Log Message: Describe SPLASHSCREEN and SPLASHSCREEN_PROGRESS. To generate a diff of this commit: cvs rdiff -u -r1.385 -r1.386 src/share/man/man4/options.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/options.4 diff -u src/share/man/man4/options.4:1.385 src/share/man/man4/options.4:1.386 --- src/share/man/man4/options.4:1.385 Sun Feb 21 14:26:33 2010 +++ src/share/man/man4/options.4 Mon Feb 22 06:10:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.385 2010/02/21 14:26:33 wiz Exp $ +.\ $NetBSD: options.4,v 1.386 2010/02/22 06:10:30 ahoka Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd February 21, 2010 +.Dd February 22, 2010 .Dt OPTIONS 4 .Os .Sh NAME @@ -2585,6 +2585,12 @@ See .Xr multiboot 8 for more information. +.It Cd options SPLASHSCREEN +Display a splash screen during boot. +.It Cd options SPLASHSCREEN_PROGRESS +Display a progress bar at the splash screen during boot. +This option requires +.Em SPLASHSCREEN. .El .Ss isa-specific Options Options specific to
Re: CVS commit: src/sys
can you please add comments on each uvm_fault_* functions you introduced? eg. what uvm_fault_lower1 does is not clear from its name at all. to me, it isn't clear what was the purpose of the mechanical splitting of these functions. I will clean up things put asserts comments after merge. Give me one week... Masao
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: darran Date: Mon Feb 22 06:42:15 UTC 2010 Modified Files: src/sys/arch/i386/i386: trap.c vector.S Log Message: DTrace: missed the opt_dtrace.h include for these. To generate a diff of this commit: cvs rdiff -u -r1.254 -r1.255 src/sys/arch/i386/i386/trap.c cvs rdiff -u -r1.52 -r1.53 src/sys/arch/i386/i386/vector.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: jnemeth Date: Mon Feb 22 07:48:43 UTC 2010 Modified Files: src/share/man/man4: Makefile Log Message: fix build breakage -- add new smscmon.4 man page To generate a diff of this commit: cvs rdiff -u -r1.505 -r1.506 src/share/man/man4/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: jnemeth Date: Mon Feb 22 07:52:52 UTC 2010 Modified Files: src/share/man/man4: Makefile Log Message: remove accidentally committed et.4/etphy.4 To generate a diff of this commit: cvs rdiff -u -r1.506 -r1.507 src/share/man/man4/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/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.506 src/share/man/man4/Makefile:1.507 --- src/share/man/man4/Makefile:1.506 Mon Feb 22 07:48:43 2010 +++ src/share/man/man4/Makefile Mon Feb 22 07:52:52 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.506 2010/02/22 07:48:43 jnemeth Exp $ +# $NetBSD: Makefile,v 1.507 2010/02/22 07:52:52 jnemeth Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \ @@ -22,7 +22,7 @@ ddb.4 ddc.4 de.4 dge.4 dk.4 dm.4 dmoverio.4 \ dmphy.4 dpt.4 dpti.4 drm.4 drum.4 \ eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 esis.4 \ - esa.4 esiop.4 esm.4 eso.4 et.4 etherip.4 etphy.4 exphy.4 \ + esa.4 esiop.4 esm.4 eso.4 etherip.4 exphy.4 \ fast_ipsec.4 fd.4 finsio.4 fpa.4 fms.4 fss.4 fxp.4 \ gcscaudio.4 gem.4 genfb.4 gentbi.4 geodeide.4 \ glxtphy.4 gpib.4 gpio.4 gpiolock.4 gpiosim.4 gre.4 gphyter.4 gsip.4 \ @@ -114,7 +114,7 @@ MAN+= fwohci.4 fwip.4 sbp.4 # machine-independent I2C devices -MAN+= dbcool.4 lmtemp.4 sdtemp.4 smscmon.4 spdmem.4 +MAN+= dbcool.4 lmtemp.4 sdtemp.4 smcsmon.4 spdmem.4 # machine-independent SPI devices MAN += m25p.4 tm121temp.4
CVS commit: src/share/man/man4
Module Name:src Committed By: jnemeth Date: Mon Feb 22 07:55:32 UTC 2010 Modified Files: src/share/man/man4: Makefile Log Message: smcsmon.4 - smscmon.4 To generate a diff of this commit: cvs rdiff -u -r1.507 -r1.508 src/share/man/man4/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/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.507 src/share/man/man4/Makefile:1.508 --- src/share/man/man4/Makefile:1.507 Mon Feb 22 07:52:52 2010 +++ src/share/man/man4/Makefile Mon Feb 22 07:55:32 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.507 2010/02/22 07:52:52 jnemeth Exp $ +# $NetBSD: Makefile,v 1.508 2010/02/22 07:55:32 jnemeth Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \ @@ -114,7 +114,7 @@ MAN+= fwohci.4 fwip.4 sbp.4 # machine-independent I2C devices -MAN+= dbcool.4 lmtemp.4 sdtemp.4 smcsmon.4 spdmem.4 +MAN+= dbcool.4 lmtemp.4 sdtemp.4 smscmon.4 spdmem.4 # machine-independent SPI devices MAN += m25p.4 tm121temp.4
CVS commit: src/share/man/man4
Module Name:src Committed By: jnemeth Date: Mon Feb 22 07:55:32 UTC 2010 Modified Files: src/share/man/man4: Makefile Log Message: smcsmon.4 - smscmon.4 To generate a diff of this commit: cvs rdiff -u -r1.507 -r1.508 src/share/man/man4/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
