CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Sun Apr 11 06:50:30 UTC 2010 Modified Files: src/share/man/man9: sysctl.9 Log Message: Document the CTLTYPEs. In addition, split some paragraphs to make the page less exhaustive to read. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/share/man/man9/sysctl.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/sysctl.9 diff -u src/share/man/man9/sysctl.9:1.14 src/share/man/man9/sysctl.9:1.15 --- src/share/man/man9/sysctl.9:1.14 Wed Apr 8 12:50:00 2009 +++ src/share/man/man9/sysctl.9 Sun Apr 11 06:50:30 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.9,v 1.14 2009/04/08 12:50:00 joerg Exp $ +.\" $NetBSD: sysctl.9,v 1.15 2010/04/11 06:50:30 jruoho Exp $ .\" .\" Copyright (c) 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 15, 2008 +.Dd April 11, 2010 .Dt SYSCTL 9 .Os .Sh NAME @@ -129,6 +129,7 @@ .Fn sysctl_lookup , or by any helper function will be done with effective superuser privileges). +.Pp The .Fa oldp and @@ -160,20 +161,21 @@ long, which is to be located in kernel space, in order to determine which function to call to handle the specific request. .Pp +The following algorithm is used by .Fn sysctl_dispatch -uses the following algorithm to determine the function to call: +to determine the function to call: .Pp -.Bl -bullet +.Bl -bullet -offset indent .It Scan the tree using -.Fn sysctl_locate +.Fn sysctl_locate . .It If the node returned has a .Dq helper -function, call it +function, call it. .It If the requested node was found but has no function, call -.Fn sysctl_lookup +.Fn sysctl_lookup . .It If the node was not found and .Fa name @@ -182,11 +184,11 @@ .Fn sysctl_create , or .Fn sysctl_destroy , -call the appropriate function +call the appropriate function. .It If none of these options applies and no other error was yet recorded, return -.Er EOPNOTSUPP +.Er EOPNOTSUPP . .Pp .El The @@ -237,8 +239,9 @@ .Dv NULL , the main tree will be used. .Pp +The .Fn sysctl_locate -scans a tree for the node most specific to a request. +function scans a tree for the node most specific to a request. If the pointer referenced by .Fa rnode is not @@ -281,6 +284,7 @@ .Dv CTL_DESTROY when destroying a node. +.Pp The .Fa newp and @@ -312,7 +316,9 @@ .Fa log argument is not .Dv NULL , -a sysctllog structure will be allocated and the pointer referenced +a +.Em sysctllog +structure will be allocated and the pointer referenced will be changed to address it. The same log may be used for any number of nodes, provided they are all inserted into the same tree. @@ -321,6 +327,7 @@ .Fn sysctl_teardown ) without the need for any record keeping on the caller's part. +.Pp The .Fa cflags argument is currently unused and must be zero. @@ -353,12 +360,22 @@ field, and the current value for .Dv SYSCTL_VERSION is added in. -Note: the -.Dv CTLFLAG_PERMANENT -flag can only be set from SYSCTL setup routines (see -.Sx SETUP FUNCTIONS ) -as called by -.Fn sysctl_init . +The following types are defined: +.Bl -tag -width ".Dv CTLTYPE_STRING" -offset indent +.It Dv CTLTYPE_NODE +A node intended to be a parent for other nodes. +.It Dv CTLTYPE_INT +A signed integer. +.It Dv CTLTYPE_STRING +A NUL-terminated string. +.It Dv CTLTYPE_QUAD +An unsigned 64-bit integer. +.It Dv CTLTYPE_STRUCT +A structure. +.It Dv CTLTYPE_BOOL +A boolean. +.El +.Pp The .Fa namep argument is copied into the @@ -371,7 +388,18 @@ will be copied if the .Dv CTLFLAG_OWNDESC flag is set, and will be used as the node's description. -Note: if +.Pp +Two additional remarks: +.Bl -enum -offset indent +.It +The +.Dv CTLFLAG_PERMANENT +flag can only be set from SYSCTL setup routines (see +.Sx SETUP FUNCTIONS ) +as called by +.Fn sysctl_init . +.It +If .Fn sysctl_destroyv attempts to delete a node that does not own its own description (and is not marked as permanent), but the deletion fails, the description @@ -380,6 +408,7 @@ will set the .Dv CTLFLAG_OWNDESC flag. +.El .Pp The .Fa func @@ -564,7 +593,9 @@ The SYSCTL lock must be held when calling this function. .Pp .Fn sysctl_teardown -unwinds a sysctllog and deletes the nodes in the opposite order in +unwinds a +.Em sysctllog +and deletes the nodes in the opposite order in which they were created. .Pp .Fn old_sysctl
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Sun Apr 11 06:36:25 UTC 2010 Modified Files: src/sys/fs/filecorefs: filecore_vfsops.c src/sys/fs/msdosfs: msdosfs_vfsops.c src/sys/miscfs/umapfs: umap_vfsops.c Log Message: Make module name match MOUNT_NAME. Inspired by PR kern/43110. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/fs/filecorefs/filecore_vfsops.c cvs rdiff -u -r1.81 -r1.82 src/sys/fs/msdosfs/msdosfs_vfsops.c cvs rdiff -u -r1.82 -r1.83 src/sys/miscfs/umapfs/umap_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/filecorefs/filecore_vfsops.c diff -u src/sys/fs/filecorefs/filecore_vfsops.c:1.61 src/sys/fs/filecorefs/filecore_vfsops.c:1.62 --- src/sys/fs/filecorefs/filecore_vfsops.c:1.61 Fri Jan 8 11:35:08 2010 +++ src/sys/fs/filecorefs/filecore_vfsops.c Sun Apr 11 06:36:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: filecore_vfsops.c,v 1.61 2010/01/08 11:35:08 pooka Exp $ */ +/* $NetBSD: filecore_vfsops.c,v 1.62 2010/04/11 06:36:25 pooka Exp $ */ /*- * Copyright (c) 1994 The Regents of the University of California. @@ -66,7 +66,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.61 2010/01/08 11:35:08 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.62 2010/04/11 06:36:25 pooka Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -96,7 +96,7 @@ #include #include -MODULE(MODULE_CLASS_VFS, filecorefs, NULL); +MODULE(MODULE_CLASS_VFS, filecore, NULL); MALLOC_JUSTDEFINE(M_FILECOREMNT, "filecore mount", "Filecore FS mount structures"); Index: src/sys/fs/msdosfs/msdosfs_vfsops.c diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.81 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.82 --- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.81 Fri Apr 9 08:09:18 2010 +++ src/sys/fs/msdosfs/msdosfs_vfsops.c Sun Apr 11 06:36:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_vfsops.c,v 1.81 2010/04/09 08:09:18 hannken Exp $ */ +/* $NetBSD: msdosfs_vfsops.c,v 1.82 2010/04/11 06:36:25 pooka Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -48,7 +48,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.81 2010/04/09 08:09:18 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.82 2010/04/11 06:36:25 pooka Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -85,7 +85,7 @@ #include #include -MODULE(MODULE_CLASS_VFS, msdosfs, NULL); +MODULE(MODULE_CLASS_VFS, msdos, NULL); #ifdef MSDOSFS_DEBUG #define DPRINTF(a) uprintf a Index: src/sys/miscfs/umapfs/umap_vfsops.c diff -u src/sys/miscfs/umapfs/umap_vfsops.c:1.82 src/sys/miscfs/umapfs/umap_vfsops.c:1.83 --- src/sys/miscfs/umapfs/umap_vfsops.c:1.82 Sat Mar 14 15:36:23 2009 +++ src/sys/miscfs/umapfs/umap_vfsops.c Sun Apr 11 06:36:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: umap_vfsops.c,v 1.82 2009/03/14 15:36:23 dsl Exp $ */ +/* $NetBSD: umap_vfsops.c,v 1.83 2010/04/11 06:36:25 pooka Exp $ */ /* * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: umap_vfsops.c,v 1.82 2009/03/14 15:36:23 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umap_vfsops.c,v 1.83 2010/04/11 06:36:25 pooka Exp $"); #include #include @@ -58,7 +58,7 @@ #include #include -MODULE(MODULE_CLASS_VFS, umapfs, "layerfs"); +MODULE(MODULE_CLASS_VFS, umap, "layerfs"); VFS_PROTOS(umapfs);
CVS commit: src
Module Name:src Committed By: pooka Date: Sun Apr 11 05:45:58 UTC 2010 Modified Files: src/distrib/sets/lists/base: shl.elf shl.mi src/distrib/sets/lists/comp: mi shl.mi src/sys/rump/fs/lib/libumapfs: Makefile src/tests/fs/umapfs: Makefile Log Message: Following nullfs, rename rumpfs_umapfs to rumpfs_umap to make the basename the same as the kernel module (this too was in-tree only for a little over a week with the old name). To generate a diff of this commit: cvs rdiff -u -r1.211 -r1.212 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.532 -r1.533 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1423 -r1.1424 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.113 -r1.114 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/libumapfs/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/fs/umapfs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.elf diff -u src/distrib/sets/lists/base/shl.elf:1.211 src/distrib/sets/lists/base/shl.elf:1.212 --- src/distrib/sets/lists/base/shl.elf:1.211 Sat Apr 10 21:32:59 2010 +++ src/distrib/sets/lists/base/shl.elf Sun Apr 11 05:45:57 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.211 2010/04/10 21:32:59 pooka Exp $ +# $NetBSD: shl.elf,v 1.212 2010/04/11 05:45:57 pooka Exp $ # # Note: Do not mark "old" major and major.minor shared libraries as # "obsolete"; just remove the entry, as third-party applications @@ -318,8 +318,10 @@ ./usr/lib/librumpfs_udf.so.0 base-rump-shlib ./usr/lib/librumpfs_ufs.so base-obsolete obsolete ./usr/lib/librumpfs_ufs.so.0 base-obsolete obsolete -./usr/lib/librumpfs_umapfs.so base-rump-shlib -./usr/lib/librumpfs_umapfs.so.0 base-rump-shlib +./usr/lib/librumpfs_umap.so base-rump-shlib +./usr/lib/librumpfs_umap.so.0 base-rump-shlib +./usr/lib/librumpfs_umapfs.so base-obsolete obsolete +./usr/lib/librumpfs_umapfs.so.0 base-obsolete obsolete ./usr/lib/librumpfs_union.so base-rump-shlib ./usr/lib/librumpfs_union.so.0 base-rump-shlib ./usr/lib/librumpvfs_fifofs.so base-rump-shlib Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.532 src/distrib/sets/lists/base/shl.mi:1.533 --- src/distrib/sets/lists/base/shl.mi:1.532 Sat Apr 10 21:33:00 2010 +++ src/distrib/sets/lists/base/shl.mi Sun Apr 11 05:45:57 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.532 2010/04/10 21:33:00 pooka Exp $ +# $NetBSD: shl.mi,v 1.533 2010/04/11 05:45:57 pooka Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -166,7 +166,8 @@ ./usr/lib/librumpfs_tmpfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_udf.so.0.0 base-rump-shlib ./usr/lib/librumpfs_ufs.so.0.0 base-obsolete obsolete -./usr/lib/librumpfs_umapfs.so.0.0 base-rump-shlib +./usr/lib/librumpfs_umap.so.0.0 base-rump-shlib +./usr/lib/librumpfs_umapfs.so.0.0 base-obsolete obsolete ./usr/lib/librumpfs_union.so.0.0 base-rump-shlib ./usr/lib/librumpvfs_fifofs.so.0.0 base-rump-shlib ./usr/lib/librumpvfs_layerfs.so.0.0 base-rump-shlib Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1423 src/distrib/sets/lists/comp/mi:1.1424 --- src/distrib/sets/lists/comp/mi:1.1423 Sat Apr 10 21:33:00 2010 +++ src/distrib/sets/lists/comp/mi Sun Apr 11 05:45:57 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1423 2010/04/10 21:33:00 pooka Exp $ +# $NetBSD: mi,v 1.1424 2010/04/11 05:45:57 pooka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2688,9 +2688,12 @@ ./usr/lib/librumpfs_ufs.a comp-obsolete obsolete ./usr/lib/librumpfs_ufs_g.a comp-obsolete obsolete ./usr/lib/librumpfs_ufs_p.a comp-obsolete obsolete -./usr/lib/librumpfs_umapfs.a comp-c-lib -./usr/lib/librumpfs_umapfs_g.a -unknown- debuglib -./usr/lib/librumpfs_umapfs_p.a comp-c-proflib profile +./usr/lib/librumpfs_umap.a comp-c-lib +./usr/lib/librumpfs_umap_g.a -unknown- debuglib +./usr/lib/librumpfs_umap_p.a comp-c-proflib profile +./usr/lib/librumpfs_umapfs.a comp-obsolete obsolete +./usr/lib/librumpfs_umapfs_g.a comp-obsolete obsolete +./usr/lib/librumpfs_umapfs_p.a comp-obsolete obsolete ./usr/lib/librumpfs_union.a comp-c-lib ./usr/lib/librumpfs_union_g.a -unknown- debuglib ./usr/lib/librumpfs_union_p.a comp-c-proflib profile Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.113 src/distrib/sets/lists/comp/shl.mi:1.114 --- src/distrib/sets/lists/comp/shl.mi:1.113 Sat Apr 10 21:33:00 2010 +++ src/distrib/sets/lists/comp/shl.mi Sun Apr 11 05:45:58 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.113 2010/04/10 21:33:00 pooka Exp $ +# $NetBSD: shl.mi,v 1.114 2010/04/11 05:45:58 pooka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -128,7 +128,8 @@ ./usr/
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Sun Apr 11 05:40:16 UTC 2010 Modified Files: src/share/man/man9: accf_data.9 accf_http.9 Log Message: Use .Nm. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/accf_data.9 cvs rdiff -u -r1.6 -r1.7 src/share/man/man9/accf_http.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/accf_data.9 diff -u src/share/man/man9/accf_data.9:1.3 src/share/man/man9/accf_data.9:1.4 --- src/share/man/man9/accf_data.9:1.3 Mon Mar 9 19:24:32 2009 +++ src/share/man/man9/accf_data.9 Sun Apr 11 05:40:16 2010 @@ -43,7 +43,9 @@ .Fn accept until data arrives on the connection. .Sh EXAMPLES -If the accf_data accept filter is present in the kernel configuration, +If the +.Nm +accept filter is present in the kernel configuration, this will enable the data accept filter on the socket .Fa sok . @@ -60,7 +62,8 @@ .Xr accf_http 9 .Sh HISTORY The accept filter mechanism and the -accf_data filter were introduced in +.Nm +filter were introduced in .Fx 4.0 . They were ported to .Nx Index: src/share/man/man9/accf_http.9 diff -u src/share/man/man9/accf_http.9:1.6 src/share/man/man9/accf_http.9:1.7 --- src/share/man/man9/accf_http.9:1.6 Tue Jul 14 21:40:02 2009 +++ src/share/man/man9/accf_http.9 Sun Apr 11 05:40:16 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: accf_http.9,v 1.6 2009/07/14 21:40:02 wiz Exp $ +.\" $NetBSD: accf_http.9,v 1.7 2010/04/11 05:40:16 jruoho Exp $ .\" .\" Copyright (c) 2000 Alfred Perlstein .\" @@ -90,7 +90,8 @@ .Xr accept_filter 9 .Sh HISTORY The accept filter mechanism and the -accf_http filter were introduced in +.Nm +filter were introduced in .Fx 4.0 . They were ported to .Nx
CVS commit: src
Module Name:src
Committed By: jakllsch
Date: Sun Apr 11 02:41:39 UTC 2010
Modified Files:
src/distrib/sets/lists/xfont: mi
src/external/mit/xorg/share/fonts: Makefile.dpi
src/external/mit/xorg/share/fonts/100dpi: Makefile
src/external/mit/xorg/share/fonts/75dpi: Makefile
Added Files:
src/external/mit/xorg/share/fonts/100dpi/font-adobe-symbol-100dpi:
Makefile
src/external/mit/xorg/share/fonts/75dpi/font-adobe-symbol-75dpi:
Makefile
Log Message:
Install 'symbol' from font-adobe-(75|100)dpi.
Should fix some symbols in xcalc.
To do: transform these and other currently-installed-only-as-bdf fonts
to pcf.gz.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xfont/mi
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/share/fonts/Makefile.dpi
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/share/fonts/100dpi/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/100dpi/font-adobe-symbol-100dpi/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/share/fonts/75dpi/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/share/fonts/75dpi/font-adobe-symbol-75dpi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xfont/mi
diff -u src/distrib/sets/lists/xfont/mi:1.38 src/distrib/sets/lists/xfont/mi:1.39
--- src/distrib/sets/lists/xfont/mi:1.38 Thu Jan 14 13:47:42 2010
+++ src/distrib/sets/lists/xfont/mi Sun Apr 11 02:41:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.38 2010/01/14 13:47:42 wiz Exp $
+# $NetBSD: mi,v 1.39 2010/04/11 02:41:38 jakllsch Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6141,6 +6141,12 @@
./usr/X11R7/lib/X11/fonts/100dpi/ncenR24-ISO8859-4.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/100dpi/ncenR24-ISO8859-9.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/100dpi/ncenR24.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb08.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb10.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb12.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb14.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb18.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/100dpi/symb24.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/100dpi/tech14.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/100dpi/techB14.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/100dpi/term14.bdf xfont share,xorg,x11fonts
@@ -8033,6 +8039,12 @@
./usr/X11R7/lib/X11/fonts/75dpi/ncenR24-ISO8859-4.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/ncenR24-ISO8859-9.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/ncenR24.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb08.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb10.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb12.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb14.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb18.bdf xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/75dpi/symb24.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/tech14.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/techB14.bdf xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/75dpi/term14.bdf xfont share,xorg,x11fonts
Index: src/external/mit/xorg/share/fonts/Makefile.dpi
diff -u src/external/mit/xorg/share/fonts/Makefile.dpi:1.1.1.1 src/external/mit/xorg/share/fonts/Makefile.dpi:1.2
--- src/external/mit/xorg/share/fonts/Makefile.dpi:1.1.1.1 Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/share/fonts/Makefile.dpi Sun Apr 11 02:41:38 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.dpi,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+# $NetBSD: Makefile.dpi,v 1.2 2010/04/11 02:41:38 jakllsch Exp $
# Files installed by both 75dpi and 100dpi packages.
@@ -41,6 +41,10 @@
.endfor
.endfor
+ADOBE_SYMBOL_SRCS= symb08 symb10 symb12 symb14 symb18 symb24
+.for _s in ${ADOBE_SYMBOL_SRCS}
+ADOBE_SYMBOL_FILES+= ${_s}.bdf
+.endfor
BH_SRCS= luBIS08 luBIS10 luBIS12 luBIS14 luBIS18 luBIS19 luBIS24 \
luBS08 luBS10 luBS12 luBS14 luBS18 luBS19 luBS24 \
Index: src/external/mit/xorg/share/fonts/100dpi/Makefile
diff -u src/external/mit/xorg/share/fonts/100dpi/Makefile:1.1.1.1 src/external/mit/xorg/share/fonts/100dpi/Makefile:1.2
--- src/external/mit/xorg/share/fonts/100dpi/Makefile:1.1.1.1 Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/share/fonts/100dpi/Makefile Sun Apr 11 02:41:39 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/04/11 02:41:39 jakllsch Exp $
-SUBDIR= font-adobe-100dpi font-adob
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: mrg
Date: Sun Apr 11 02:02:14 UTC 2010
Modified Files:
src/sys/dev/pci: if_iwn.c
Log Message:
avoid rbuf starvation. when grabbing a recieve buffer, if a local
4KB buffer isn't available, try to MEXTMALLOC() one. only if both
of these fail to we abort the recieve operation.
based on a patch from Sverre Froyen , thanks!
tested by myself, sverre and jeremy reed.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/if_iwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.38 src/sys/dev/pci/if_iwn.c:1.39
--- src/sys/dev/pci/if_iwn.c:1.38 Mon Apr 5 07:20:26 2010
+++ src/sys/dev/pci/if_iwn.c Sun Apr 11 02:02:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.38 2010/04/05 07:20:26 joerg Exp $ */
+/* $NetBSD: if_iwn.c,v 1.39 2010/04/11 02:02:14 mrg Exp $ */
/* $OpenBSD: if_iwn.c,v 1.49 2009/03/29 21:53:52 sthen Exp $ */
/*-
@@ -23,7 +23,7 @@
* 802.11 network adapters.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.38 2010/04/05 07:20:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.39 2010/04/11 02:02:14 mrg Exp $");
#include
@@ -1930,8 +1930,8 @@
}
/*
- * See comment in if_wpi.c:wpi_rx_intr() about locking
- * nb_free_entries here. In short: it's not required.
+ * Try to grab a local 4KB buffer. If it fails, try to
+ * MEXTMALLOC() next, and if that fails, give up.
*/
MGETHDR(m1, M_DONTWAIT, MT_DATA);
if (m1 == NULL) {
@@ -1939,17 +1939,21 @@
ifp->if_ierrors++;
return;
}
- if (sc->rxq.nb_free_entries <= 0) {
- ic->ic_stats.is_rx_nobuf++;
- ifp->if_ierrors++;
- m_freem(m1);
- return;
+ if ((rbuf = iwn_alloc_rbuf(sc)) == NULL) {
+ MEXTMALLOC(m1, IWN_RBUF_SIZE, M_DONTWAIT);
+ if (!(m1->m_flags & M_EXT)) {
+ ic->ic_stats.is_rx_nobuf++;
+ ifp->if_ierrors++;
+ m_freem(m1);
+ return;
+ }
+ } else {
+ /* Attach RX buffer to mbuf header. */
+ MEXTADD(m1, rbuf->vaddr, IWN_RBUF_SIZE, 0, iwn_free_rbuf,
+ rbuf);
+ m1->m_flags |= M_EXT_RW;
}
- rbuf = iwn_alloc_rbuf(sc);
- /* Attach RX buffer to mbuf header. */
- MEXTADD(m1, rbuf->vaddr, IWN_RBUF_SIZE, 0, iwn_free_rbuf,
- rbuf);
- m1->m_flags |= M_EXT_RW;
+
bus_dmamap_unload(sc->sc_dmat, data->map);
error = bus_dmamap_load(sc->sc_dmat, data->map, m1->m_ext.ext_buf,
CVS commit: src/sys/uvm
Module Name:src
Committed By: mrg
Date: Sun Apr 11 01:53:03 UTC 2010
Modified Files:
src/sys/uvm: uvm_meter.c
Log Message:
now that CTLTYPE_BOOL actually works, use it to export vm_page_zero_enable
as vm.idlezero in a way that actually works on big endian systems.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/uvm/uvm_meter.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/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.50 src/sys/uvm/uvm_meter.c:1.51
--- src/sys/uvm/uvm_meter.c:1.50 Wed Oct 21 21:12:07 2009
+++ src/sys/uvm/uvm_meter.c Sun Apr 11 01:53:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_meter.c,v 1.50 2009/10/21 21:12:07 rmind Exp $ */
+/* $NetBSD: uvm_meter.c,v 1.51 2010/04/11 01:53:03 mrg Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.50 2009/10/21 21:12:07 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.51 2010/04/11 01:53:03 mrg Exp $");
#include
#include
@@ -337,7 +337,7 @@
CTL_VM, VM_USPACE, CTL_EOL);
sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
- CTLTYPE_INT, "idlezero",
+ CTLTYPE_BOOL, "idlezero",
SYSCTL_DESCR("Whether try to zero pages in idle loop"),
NULL, 0, &vm_page_zero_enable, 0,
CTL_VM, CTL_CREATE, CTL_EOL);
CVS commit: src/sbin/sysctl
Module Name:src
Committed By: mrg
Date: Sun Apr 11 01:52:11 UTC 2010
Modified Files:
src/sbin/sysctl: sysctl.c
Log Message:
implement CTLTYPE_BOOL support. it was entirely missing. HI MATT!
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sbin/sysctl/sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.130 src/sbin/sysctl/sysctl.c:1.131
--- src/sbin/sysctl/sysctl.c:1.130 Wed Sep 30 04:30:50 2009
+++ src/sbin/sysctl/sysctl.c Sun Apr 11 01:52:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.130 2009/09/30 04:30:50 elad Exp $ */
+/* $NetBSD: sysctl.c,v 1.131 2010/04/11 01:52:10 mrg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#if 0
static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: sysctl.c,v 1.130 2009/09/30 04:30:50 elad Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.131 2010/04/11 01:52:10 mrg Exp $");
#endif
#endif /* not lint */
@@ -502,6 +502,8 @@
return "QUAD";
case CTLTYPE_STRUCT:
return "STRUCT";
+ case CTLTYPE_BOOL:
+ return "BOOL";
}
return "???";
@@ -712,6 +714,16 @@
display_number(pnode, gsname, &i, sizeof(i), DISPLAY_VALUE);
break;
}
+ case CTLTYPE_BOOL: {
+ bool b;
+ rc = sysctl(name, namelen, &b, &sz, NULL, 0);
+ if (rc == -1) {
+ sysctlerror(1);
+ break;
+ }
+ display_number(pnode, gsname, &b, sizeof(b), DISPLAY_VALUE);
+ break;
+ }
case CTLTYPE_STRING: {
unsigned char buf[1024], *tbuf;
tbuf = buf;
@@ -884,14 +896,13 @@
print_tree(&name[0], namelen, node, CTLTYPE_NODE, 1);
break;
case CTLTYPE_INT:
+ case CTLTYPE_BOOL:
+ case CTLTYPE_QUAD:
write_number(&name[0], namelen, node, value);
break;
case CTLTYPE_STRING:
write_string(&name[0], namelen, node, value);
break;
- case CTLTYPE_QUAD:
- write_number(&name[0], namelen, node, value);
- break;
case CTLTYPE_STRUCT:
/*
* XXX old behavior is to print. should we error instead?
@@ -932,6 +943,7 @@
u_int namelen, type;
u_quad_t uq;
quad_t q;
+ bool b;
if (!wflag) {
sysctlperror("Must specify -w to create nodes\n");
@@ -957,6 +969,7 @@
* misc stuff used when constructing
*/
i = 0;
+ b = false;
uq = 0;
key = NULL;
value = NULL;
@@ -1053,6 +1066,10 @@
sz = sizeof(int);
type = CTLTYPE_INT;
}
+ else if (strcmp(value, "bool") == 0) {
+sz = sizeof(bool);
+type = CTLTYPE_BOOL;
+ }
else if (strcmp(value, "string") == 0)
type = CTLTYPE_STRING;
else if (strcmp(value, "quad") == 0) {
@@ -1192,6 +1209,26 @@
if (sz == 0)
sz = sizeof(int);
break;
+ case CTLTYPE_BOOL:
+ errno = 0;
+ q = strtoll(data, &t, 0);
+ if (t == data || *t != '\0' || errno != 0 ||
+(q != 0 && q != 1)) {
+sysctlperror(
+"%s: '%s' is not a valid bool\n",
+nname, value);
+EXIT(1);
+ }
+ b = q == 1;
+ if (!(flags & CTLFLAG_OWNDATA)) {
+flags |= CTLFLAG_IMMEDIATE;
+node.sysctl_idata = b;
+ }
+ else
+node.sysctl_data = &b;
+ if (sz == 0)
+sz = sizeof(bool);
+ break;
case CTLTYPE_STRING:
flags |= CTLFLAG_OWNDATA;
node.sysctl_data = data;
@@ -1277,6 +1314,7 @@
*/
if (sz != 0) {
if ((type == CTLTYPE_INT && sz != sizeof(int)) ||
+ (type == CTLTYPE_BOOL && sz != sizeof(bool)) ||
(type == CTLTYPE_QUAD && sz != sizeof(u_quad_t)) ||
(type == CTLTYPE_NODE && sz != 0)) {
sysctlperror("%s: wrong size for type\n", nname);
@@ -1664,6 +1702,7 @@
u_int ii, io;
u_quad_t qi, qo;
size_t si, so;
+ bool bi, bo;
int rc;
void *i, *o;
char *t;
@@ -1673,6 +1712,7 @@
si = so = 0;
i = o = NULL;
+ bi = bo = false;
errno = 0;
qi = strtouq(value, &t, 0);
if (qi == UQUAD_MAX && errno == ERANGE) {
@@ -1697,6 +1737,13 @@
i = ⅈ
si = sizeof(ii);
break;
+ case CTLTYPE_BOOL:
+ bi = (bool)qi;
+ o = &bo;
+ so = sizeof(bo);
+ i = &bi;
+ si = sizeof(bi);
+ break;
case CTLTYPE_QUAD:
o = &qo;
so = sizeof(qo);
@@ -1716,6 +1763,10 @@
display_number(node, gsname, &io, sizeof(io), DISPLAY_OLD);
display_number(node, gsname, &ii, sizeof(ii), DISPLAY_NEW);
break;
+ case CTLTYPE_BOOL:
+ display_number(node, gsname, &bo, sizeof(bo), DISPLAY_OLD);
+ display_number(node, gsname, &bi, sizeof(bi), DISPLAY_NEW);
+ break;
case CTLTYPE_QUAD:
display_number(node, gsname, &qo, sizeof(qo), DISPLAY_OLD);
display_number(node, gsname, &qi, sizeof(qi), DISPLAY_NEW);
@@ -1764,6 +1815,7 @@
const void *data, size_t sz, int n)
{
u_quad_t q;
+ bool b;
int i;
if (qflag)
@@ -1800,6 +1852,15 @@
else
printf("%d", i);
break;
+ case CTLTYPE_BOOL:
+ memcpy(&b, data, sz);
+ if (xflag)
+ printf("0x%0*x", (int)sz * 2, b);
+ else if (node->sysctl_flags & CTLFLAG_HEX)
+ printf("%#x", b);
+ else
+ printf("%d", b);
+ break;
case CTLT
CVS commit: src/sys/kern
Module Name:src
Committed By: mrg
Date: Sun Apr 11 01:50:25 UTC 2010
Modified Files:
src/sys/kern: kern_sysctl.c
Log Message:
reject attempts to write CTLTYPE_BOOL nodes with a value other than 0 or 1.
To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/sys/kern/kern_sysctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.228 src/sys/kern/kern_sysctl.c:1.229
--- src/sys/kern/kern_sysctl.c:1.228 Wed Jan 13 01:53:38 2010
+++ src/sys/kern/kern_sysctl.c Sun Apr 11 01:50:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.228 2010/01/13 01:53:38 pooka Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.229 2010/04/11 01:50:25 mrg Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.228 2010/01/13 01:53:38 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.229 2010/04/11 01:50:25 mrg Exp $");
#include "opt_defcorename.h"
#include "ksyms.h"
@@ -1522,7 +1522,7 @@
sz = rnode->sysctl_size;
switch (SYSCTL_TYPE(rnode->sysctl_flags)) {
case CTLTYPE_BOOL: {
- u_char tmp;
+ bool tmp;
/*
* these data must be *exactly* the same size coming
* in. bool may only be true or false.
@@ -1530,6 +1530,8 @@
if (newlen != sz)
return (EINVAL);
error = sysctl_copyin(l, newp, &tmp, sz);
+ if (tmp != true && tmp != false)
+ return EINVAL;
if (error)
break;
*(bool *)d = tmp;
CVS commit: src
Module Name:src
Committed By: pgoyette
Date: Sun Apr 11 01:12:28 UTC 2010
Modified Files:
src/share/man/man9: sysmon_envsys.9
src/sys/dev/sysmon: sysmon_envsys.c sysmonvar.h
Log Message:
Use a typedef to define the prototype of the per-sensor callback.
Update manpage for the prototype, and fix a fubar'd Cross-reference.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/share/man/man9/sysmon_envsys.9
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/sysmon/sysmonvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/sysmon_envsys.9
diff -u src/share/man/man9/sysmon_envsys.9:1.39 src/share/man/man9/sysmon_envsys.9:1.40
--- src/share/man/man9/sysmon_envsys.9:1.39 Sat Apr 10 21:10:10 2010
+++ src/share/man/man9/sysmon_envsys.9 Sun Apr 11 01:12:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: sysmon_envsys.9,v 1.39 2010/04/10 21:10:10 wiz Exp $
+.\" $NetBSD: sysmon_envsys.9,v 1.40 2010/04/11 01:12:28 pgoyette Exp $
.\"
.\" Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -50,9 +50,7 @@
.Ft void
.Fn sysmon_envsys_sensor_event "struct sysmon_envsys *" "envsys_data_t *" "int"
.Ft void
-.Fn sysmon_envsys_foreach_sensor \
-"bool (*)(const struct sysmon_envsys *" "const envsys_data_t *" "void *)" \
-"void *" "bool"
+.Fn sysmon_envsys_foreach_sensor "sysmon_envsys_callback_t" "void *" "bool"
.Ft int
.Fn sysmon_envsys_update_limits "struct sysmon_envsys *" "envsys_data_t *"
.Sh DESCRIPTION
@@ -120,7 +118,7 @@
function can be used by other parts of the kernel to iterate over all
registered sensors.
This capability is used by the
-.X3 i386/apm 4
+.Xr i386/apm 4
driver to summarize the state of all battery sensors.
.Pp
Drivers can also call the
Index: src/sys/dev/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.106 src/sys/dev/sysmon/sysmon_envsys.c:1.107
--- src/sys/dev/sysmon/sysmon_envsys.c:1.106 Sat Apr 10 19:01:00 2010
+++ src/sys/dev/sysmon/sysmon_envsys.c Sun Apr 11 01:12:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.106 2010/04/10 19:01:00 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.107 2010/04/11 01:12:28 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.106 2010/04/10 19:01:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.107 2010/04/11 01:12:28 pgoyette Exp $");
#include
#include
@@ -2039,9 +2039,8 @@
* device's sensors are skipped.
*/
void
-sysmon_envsys_foreach_sensor(bool(*func)(const struct sysmon_envsys *,
- const envsys_data_t *, void*),
- void *arg, bool refresh)
+sysmon_envsys_foreach_sensor(sysmon_envsys_callback_t func, void *arg,
+ bool refresh)
{
struct sysmon_envsys *sme;
envsys_data_t *sensor;
Index: src/sys/dev/sysmon/sysmonvar.h
diff -u src/sys/dev/sysmon/sysmonvar.h:1.38 src/sys/dev/sysmon/sysmonvar.h:1.39
--- src/sys/dev/sysmon/sysmonvar.h:1.38 Thu Apr 1 12:16:14 2010
+++ src/sys/dev/sysmon/sysmonvar.h Sun Apr 11 01:12:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmonvar.h,v 1.38 2010/04/01 12:16:14 pgoyette Exp $ */
+/* $NetBSD: sysmonvar.h,v 1.39 2010/04/11 01:12:28 pgoyette Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -208,9 +208,10 @@
void sysmon_envsys_sensor_event(struct sysmon_envsys *, envsys_data_t *,
int);
-void sysmon_envsys_foreach_sensor(bool(*)(const struct sysmon_envsys *,
- const envsys_data_t *, void*),
- void *, bool);
+typedef bool (*sysmon_envsys_callback_t)(const struct sysmon_envsys *,
+ const envsys_data_t *, void*);
+
+void sysmon_envsys_foreach_sensor(sysmon_envsys_callback_t, void *, bool);
int sysmon_envsys_update_limits(struct sysmon_envsys *, envsys_data_t *);
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src
Committed By: jun
Date: Sat Apr 10 22:53:59 UTC 2010
Modified Files:
src/sys/arch/hpcmips/vr: vr.c
Log Message:
workaround for port-hpcmips/42934
"NetBSD/hpcmips can't boot after 5.99.23"
adviced by Naoki Fukaumi on twitter.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/hpcmips/vr/vr.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/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.55 src/sys/arch/hpcmips/vr/vr.c:1.56
--- src/sys/arch/hpcmips/vr/vr.c:1.55 Thu Jan 21 01:23:15 2010
+++ src/sys/arch/hpcmips/vr/vr.c Sat Apr 10 22:53:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.55 2010/01/21 01:23:15 pooka Exp $ */
+/* $NetBSD: vr.c,v 1.56 2010/04/10 22:53:59 jun Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.55 2010/01/21 01:23:15 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.56 2010/04/10 22:53:59 jun Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -344,8 +344,11 @@
for (; addr < end; addr += PAGE_SIZE) {
page = (char *)MIPS_PHYS_TO_KSEG1(addr);
+/*
+ XXX see port-hpcmips/42934
if (badaddr(page, 4))
goto bad;
+ */
/* stop memory probing at first memory image */
if (memcmp(page, (void *)MIPS_PHYS_TO_KSEG0(0), 128) == 0)
CVS commit: src
Module Name:src Committed By: pooka Date: Sat Apr 10 21:33:01 UTC 2010 Modified Files: src/distrib/sets/lists/base: shl.elf shl.mi src/distrib/sets/lists/comp: mi shl.mi src/sys/rump/fs/lib/libnullfs: Makefile src/tests/fs/nullfs: Makefile Log Message: Rename librumpfs_nullfs to librumpfs_null to make the basename the same as with the kernel module (and hence MOUNT_NULL). I added the old name to the obsolete list, but given that it was in-tree for only a bit over a week, I'll remove the entries in a few weeks. To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.211 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.531 -r1.532 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1422 -r1.1423 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.1 -r1.2 src/sys/rump/fs/lib/libnullfs/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/fs/nullfs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.elf diff -u src/distrib/sets/lists/base/shl.elf:1.210 src/distrib/sets/lists/base/shl.elf:1.211 --- src/distrib/sets/lists/base/shl.elf:1.210 Wed Mar 31 14:21:22 2010 +++ src/distrib/sets/lists/base/shl.elf Sat Apr 10 21:32:59 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.210 2010/03/31 14:21:22 pooka Exp $ +# $NetBSD: shl.elf,v 1.211 2010/04/10 21:32:59 pooka Exp $ # # Note: Do not mark "old" major and major.minor shared libraries as # "obsolete"; just remove the entry, as third-party applications @@ -302,8 +302,10 @@ ./usr/lib/librumpfs_nilfs.so.0 base-rump-shlib ./usr/lib/librumpfs_ntfs.so base-rump-shlib ./usr/lib/librumpfs_ntfs.so.0 base-rump-shlib -./usr/lib/librumpfs_nullfs.so base-rump-shlib -./usr/lib/librumpfs_nullfs.so.0 base-rump-shlib +./usr/lib/librumpfs_null.so base-rump-shlib +./usr/lib/librumpfs_null.so.0 base-rump-shlib +./usr/lib/librumpfs_nullfs.so base-obsolete obsolete +./usr/lib/librumpfs_nullfs.so.0 base-obsolete obsolete ./usr/lib/librumpfs_smbfs.so base-rump-shlib ./usr/lib/librumpfs_smbfs.so.0 base-rump-shlib ./usr/lib/librumpfs_syspuffs.so base-rump-shlib Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.531 src/distrib/sets/lists/base/shl.mi:1.532 --- src/distrib/sets/lists/base/shl.mi:1.531 Wed Mar 31 14:21:22 2010 +++ src/distrib/sets/lists/base/shl.mi Sat Apr 10 21:33:00 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.531 2010/03/31 14:21:22 pooka Exp $ +# $NetBSD: shl.mi,v 1.532 2010/04/10 21:33:00 pooka Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -158,7 +158,8 @@ ./usr/lib/librumpfs_nfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_nilfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_ntfs.so.0.0 base-rump-shlib -./usr/lib/librumpfs_nullfs.so.0.0 base-rump-shlib +./usr/lib/librumpfs_null.so.0.0 base-rump-shlib +./usr/lib/librumpfs_nullfs.so.0.0 base-obsolete obsolete ./usr/lib/librumpfs_smbfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_syspuffs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_sysvbfs.so.0.0 base-rump-shlib Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1422 src/distrib/sets/lists/comp/mi:1.1423 --- src/distrib/sets/lists/comp/mi:1.1422 Wed Mar 31 14:21:22 2010 +++ src/distrib/sets/lists/comp/mi Sat Apr 10 21:33:00 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1422 2010/03/31 14:21:22 pooka Exp $ +# $NetBSD: mi,v 1.1423 2010/04/10 21:33:00 pooka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2664,9 +2664,12 @@ ./usr/lib/librumpfs_ntfs.a comp-c-lib ./usr/lib/librumpfs_ntfs_g.a -unknown- debuglib ./usr/lib/librumpfs_ntfs_p.a comp-c-proflib profile -./usr/lib/librumpfs_nullfs.a comp-c-lib -./usr/lib/librumpfs_nullfs_g.a -unknown- debuglib -./usr/lib/librumpfs_nullfs_p.a comp-c-proflib profile +./usr/lib/librumpfs_null.a comp-c-lib +./usr/lib/librumpfs_null_g.a -unknown- debuglib +./usr/lib/librumpfs_null_p.a comp-c-proflib profile +./usr/lib/librumpfs_nullfs.a comp-obsolete obsolete +./usr/lib/librumpfs_nullfs_g.a comp-obsolete obsolete +./usr/lib/librumpfs_nullfs_p.a comp-obsolete obsolete ./usr/lib/librumpfs_smbfs.a comp-c-lib ./usr/lib/librumpfs_smbfs_g.a -unknown- debuglib ./usr/lib/librumpfs_smbfs_p.a comp-c-proflib profile Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.112 src/distrib/sets/lists/comp/shl.mi:1.113 --- src/distrib/sets/lists/comp/shl.mi:1.112 Wed Mar 31 14:21:23 2010 +++ src/distrib/sets/lists/comp/shl.mi Sat Apr 10 21:33:00 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.112 2010/03/31 14:21:23 pooka Exp $ +# $NetBSD: shl.mi,v 1.113 2010/04/10 21:33:00 pooka Exp $ # # Note: don't delete entries from here - mark the
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Apr 10 21:10:10 UTC 2010 Modified Files: src/share/man/man9: sysmon_envsys.9 Log Message: Mark up NULL with Dv. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/share/man/man9/sysmon_envsys.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/sysmon_envsys.9 diff -u src/share/man/man9/sysmon_envsys.9:1.38 src/share/man/man9/sysmon_envsys.9:1.39 --- src/share/man/man9/sysmon_envsys.9:1.38 Sat Apr 10 19:03:56 2010 +++ src/share/man/man9/sysmon_envsys.9 Sat Apr 10 21:10:10 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysmon_envsys.9,v 1.38 2010/04/10 19:03:56 pgoyette Exp $ +.\" $NetBSD: sysmon_envsys.9,v 1.39 2010/04/10 21:10:10 wiz Exp $ .\" .\" Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -223,7 +223,9 @@ The .Fa sme_set_limits callback can be invoked with the third argument (a pointer to the new -limits) set to a NULL pointer. +limits) set to a +.Dv NULL +pointer. Device drivers must recognize this as a request to restore the sensor limits to their original, boot-time values. .Pp
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: pooka Date: Sat Apr 10 20:52:15 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi Log Message: i386/vald: gone but not forgotten To generate a diff of this commit: cvs rdiff -u -r1.1202 -r1.1203 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1202 src/distrib/sets/lists/man/mi:1.1203 --- src/distrib/sets/lists/man/mi:1.1202 Sat Apr 10 17:55:25 2010 +++ src/distrib/sets/lists/man/mi Sat Apr 10 20:52:14 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1202 2010/04/10 17:55:25 jruoho Exp $ +# $NetBSD: mi,v 1.1203 2010/04/10 20:52:14 pooka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1074,6 +1074,7 @@ ./usr/share/man/cat4/i386/sony.0 man-obsolete obsolete ./usr/share/man/cat4/i386/speaker.0 man-obsolete obsolete ./usr/share/man/cat4/i386/spic.0 man-sys-catman .cat +./usr/share/man/cat4/i386/vald.0 man-obsolete obsolete ./usr/share/man/cat4/i386/vesafb.0 man-obsolete obsolete ./usr/share/man/cat4/i4b.0 man-obsolete obsolete ./usr/share/man/cat4/i4bctl.0 man-obsolete obsolete @@ -3707,6 +3708,7 @@ ./usr/share/man/html4/i386/pcibios.html man-sys-htmlman html ./usr/share/man/html4/i386/pnpbios.html man-sys-htmlman html ./usr/share/man/html4/i386/spic.html man-sys-htmlman html +./usr/share/man/html4/i386/vald.html man-obsolete obsolete ./usr/share/man/html4/i386/vesafb.html man-obsolete obsolete ./usr/share/man/html4/i915drm.html man-sys-htmlman html ./usr/share/man/html4/iavc.html man-sys-htmlman html @@ -6162,6 +6164,7 @@ ./usr/share/man/man4/i386/sony.4 man-obsolete obsolete ./usr/share/man/man4/i386/speaker.4 man-obsolete obsolete ./usr/share/man/man4/i386/spic.4 man-sys-man .man +./usr/share/man/man4/i386/vald.4 man-obsolete obsolete ./usr/share/man/man4/i386/vesafb.4 man-obsolete obsolete ./usr/share/man/man4/i4b.4 man-obsolete obsolete ./usr/share/man/man4/i4bctl.4 man-obsolete obsolete
CVS commit: src/share/man/man4
Module Name:src Committed By: njoly Date: Sat Apr 10 20:19:40 UTC 2010 Modified Files: src/share/man/man4: nfsmb.4 Log Message: Add missing double quote. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/nfsmb.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/nfsmb.4 diff -u src/share/man/man4/nfsmb.4:1.4 src/share/man/man4/nfsmb.4:1.5 --- src/share/man/man4/nfsmb.4:1.4 Fri Jan 8 12:52:49 2010 +++ src/share/man/man4/nfsmb.4 Sat Apr 10 20:19:40 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: nfsmb.4,v 1.4 2010/01/08 12:52:49 njoly Exp $ +.\" $NetBSD: nfsmb.4,v 1.5 2010/04/10 20:19:40 njoly Exp $ .\" .\" Copyright (c) 2007 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -37,7 +37,7 @@ .Sh SYNOPSIS .Cd "nfsmbc* at pci? dev ? function ?" .Cd "nfsmb* at nfsmbc?" -.Cd "iic* at nfsmb? +.Cd "iic* at nfsmb?" .Sh DESCRIPTION The .Nm nfsmbc
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Sat Apr 10 19:44:02 UTC 2010 Modified Files: src/sys/kern: vnode_if.c src/sys/rump/include/rump: rumpvnode_if.h src/sys/rump/librump/rumpvfs: rumpvnode_if.c src/sys/sys: vnode_if.h Log Message: regen: remove unused vdesc_transports To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/kern/vnode_if.c cvs rdiff -u -r1.4 -r1.5 src/sys/rump/include/rump/rumpvnode_if.h cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpvfs/rumpvnode_if.c cvs rdiff -u -r1.75 -r1.76 src/sys/sys/vnode_if.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/kern/vnode_if.c diff -u src/sys/kern/vnode_if.c:1.81 src/sys/kern/vnode_if.c:1.82 --- src/sys/kern/vnode_if.c:1.81 Tue Sep 29 11:54:52 2009 +++ src/sys/kern/vnode_if.c Sat Apr 10 19:44:02 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vnode_if.c,v 1.81 2009/09/29 11:54:52 pooka Exp $ */ +/* $NetBSD: vnode_if.c,v 1.82 2010/04/10 19:44:02 pooka Exp $ */ /* * Warning: DO NOT EDIT! This file is automatically generated! @@ -7,7 +7,7 @@ * Created from the file: * NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp * by the script: - * NetBSD: vnode_if.sh,v 1.52 2009/09/29 11:51:02 pooka Exp + * NetBSD: vnode_if.sh,v 1.54 2010/04/10 19:41:54 pooka Exp */ /* @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.81 2009/09/29 11:54:52 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.82 2010/04/10 19:44:02 pooka Exp $"); #include #include @@ -56,7 +56,6 @@ VDESC_NO_OFFSET, VDESC_NO_OFFSET, VDESC_NO_OFFSET, - NULL, }; @@ -73,7 +72,6 @@ VDESC_NO_OFFSET, VDESC_NO_OFFSET, VDESC_NO_OFFSET, - NULL, }; int VOP_BWRITE(struct buf *bp) @@ -104,7 +102,6 @@ VOPARG_OFFSETOF(struct vop_lookup_args, a_vpp), VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_lookup_args, a_cnp), - NULL, }; int VOP_LOOKUP(struct vnode *dvp, @@ -142,7 +139,6 @@ VOPARG_OFFSETOF(struct vop_create_args, a_vpp), VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_create_args, a_cnp), - NULL, }; int VOP_CREATE(struct vnode *dvp, @@ -182,7 +178,6 @@ VOPARG_OFFSETOF(struct vop_mknod_args, a_vpp), VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_mknod_args, a_cnp), - NULL, }; int VOP_MKNOD(struct vnode *dvp, @@ -222,7 +217,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_open_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_OPEN(struct vnode *vp, @@ -255,7 +249,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_close_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_CLOSE(struct vnode *vp, @@ -288,7 +281,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_access_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_ACCESS(struct vnode *vp, @@ -321,7 +313,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_getattr_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_GETATTR(struct vnode *vp, @@ -354,7 +345,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_setattr_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_SETATTR(struct vnode *vp, @@ -387,7 +377,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_read_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_READ(struct vnode *vp, @@ -422,7 +411,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_write_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_WRITE(struct vnode *vp, @@ -457,7 +445,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_ioctl_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_IOCTL(struct vnode *vp, @@ -494,7 +481,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_fcntl_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_FCNTL(struct vnode *vp, @@ -531,7 +517,6 @@ VDESC_NO_OFFSET, VDESC_NO_OFFSET, VDESC_NO_OFFSET, - NULL, }; int VOP_POLL(struct vnode *vp, @@ -562,7 +547,6 @@ VDESC_NO_OFFSET, VDESC_NO_OFFSET, VDESC_NO_OFFSET, - NULL, }; int VOP_KQFILTER(struct vnode *vp, @@ -593,7 +577,6 @@ VDESC_NO_OFFSET, VDESC_NO_OFFSET, VDESC_NO_OFFSET, - NULL, }; int VOP_REVOKE(struct vnode *vp, @@ -624,7 +607,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_mmap_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_MMAP(struct vnode *vp, @@ -657,7 +639,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_fsync_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_FSYNC(struct vnode *vp, @@ -694,7 +675,6 @@ VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_seek_args, a_cred), VDESC_NO_OFFSET, - NULL, }; int VOP_SEEK(struct vnode *vp, @@ -730,7 +710,6 @@ VDESC_NO_OFFSET, VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_remove_args, a_cnp), - NULL, }; int VOP_REMOVE(struct vnode *dvp, @@ -764,7 +743,6 @@ VDESC_NO_OFFSET, VDESC_NO_OFFSET, VOPARG_OFFSETOF(struct vop_link_args, a_cnp), - NULL, }; int VOP_LINK(struct vnode *dvp, @@ -800,7 +778,6 @@ VDESC_NO_OFFSET, VDESC_NO_OFFSET, VOPARG
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Sat Apr 10 19:41:55 UTC 2010
Modified Files:
src/sys/kern: vnode_if.sh
src/sys/sys: vnode.h
Log Message:
"Not yet" since 4.4BSD is quite a lot of "not yet", so remove
vdesc_transports from vnodeop_desc until we have a "not not yet"
situation.
Ride 5.99.27 bump (full build still in progress. i wanted to get
this in as soon as possible to most effectively ride the bump.)
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/kern/vnode_if.sh
cvs rdiff -u -r1.215 -r1.216 src/sys/sys/vnode.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/kern/vnode_if.sh
diff -u src/sys/kern/vnode_if.sh:1.53 src/sys/kern/vnode_if.sh:1.54
--- src/sys/kern/vnode_if.sh:1.53 Thu Oct 15 00:29:40 2009
+++ src/sys/kern/vnode_if.sh Sat Apr 10 19:41:54 2010
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
"
-SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.53 2009/10/15 00:29:40 pooka Exp $'
+SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.54 2010/04/10 19:41:54 pooka Exp $'
# Script to produce VFS front-end sugar.
#
@@ -306,7 +306,6 @@
VDESC_NO_OFFSET,
VDESC_NO_OFFSET,
VDESC_NO_OFFSET,
- NULL,
};
'
@@ -370,8 +369,7 @@
do_offset("kauth_cred_t");
# componentname
do_offset("struct componentname *");
- # transport layer information
- printf ("\tNULL,\n};\n");
+ printf ("};\n");
# Define function.
printf("int\n%s(", toupper(name));
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.215 src/sys/sys/vnode.h:1.216
--- src/sys/sys/vnode.h:1.215 Mon Mar 29 13:11:32 2010
+++ src/sys/sys/vnode.h Sat Apr 10 19:41:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.215 2010/03/29 13:11:32 pooka Exp $ */
+/* $NetBSD: vnode.h,v 1.216 2010/04/10 19:41:54 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -475,12 +475,6 @@
int vdesc_vpp_offset; /* return vpp location */
int vdesc_cred_offset; /* cred location, if any */
int vdesc_componentname_offset; /* if any */
- /*
- * Finally, we've got a list of private data (about each operation)
- * for each transport layer. (Support to manage this list is not
- * yet part of BSD.)
- */
- void * *vdesc_transports;
};
#ifdef _KERNEL
CVS commit: src/sys/sys
Module Name:src Committed By: pgoyette Date: Sat Apr 10 19:04:59 UTC 2010 Modified Files: src/sys/sys: param.h Log Message: Welcome to 5.99.27 To generate a diff of this commit: cvs rdiff -u -r1.361 -r1.362 src/sys/sys/param.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/sys/param.h diff -u src/sys/sys/param.h:1.361 src/sys/sys/param.h:1.362 --- src/sys/sys/param.h:1.361 Mon Apr 5 07:16:12 2010 +++ src/sys/sys/param.h Sat Apr 10 19:04:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.361 2010/04/05 07:16:12 he Exp $ */ +/* $NetBSD: param.h,v 1.362 2010/04/10 19:04:59 pgoyette Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 599002600 /* NetBSD 5.99.26 */ +#define __NetBSD_Version__ 599002700 /* NetBSD 5.99.27 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Sat Apr 10 19:03:56 UTC 2010 Modified Files: src/share/man/man9: sysmon_envsys.9 Log Message: Update for recent changes. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/share/man/man9/sysmon_envsys.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/sysmon_envsys.9 diff -u src/share/man/man9/sysmon_envsys.9:1.37 src/share/man/man9/sysmon_envsys.9:1.38 --- src/share/man/man9/sysmon_envsys.9:1.37 Fri Mar 19 08:37:16 2010 +++ src/share/man/man9/sysmon_envsys.9 Sat Apr 10 19:03:56 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysmon_envsys.9,v 1.37 2010/03/19 08:37:16 wiz Exp $ +.\" $NetBSD: sysmon_envsys.9,v 1.38 2010/04/10 19:03:56 pgoyette Exp $ .\" .\" Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 18, 2010 +.Dd April 10, 2010 .Dt SYSMON_ENVSYS 9 .Os .Sh NAME @@ -49,6 +49,12 @@ .Fn sysmon_envsys_sensor_detach "struct sysmon_envsys *" "envsys_data_t *" .Ft void .Fn sysmon_envsys_sensor_event "struct sysmon_envsys *" "envsys_data_t *" "int" +.Ft void +.Fn sysmon_envsys_foreach_sensor \ +"bool (*)(const struct sysmon_envsys *" "const envsys_data_t *" "void *)" \ +"void *" "bool" +.Ft int +.Fn sysmon_envsys_update_limits "struct sysmon_envsys *" "envsys_data_t *" .Sh DESCRIPTION .Pp .Nm @@ -110,6 +116,21 @@ function to deliver the event without waiting for the device to be polled. .Pp The +.Fn sysmon_envsys_foreach_sensor +function can be used by other parts of the kernel to iterate over all +registered sensors. +This capability is used by the +.X3 i386/apm 4 +driver to summarize the state of all battery sensors. +.Pp +Drivers can also call the +.Fn sysmon_envsys_update_limits +function when it is necessary to reinitialize a sensor's threshhold values. +This is used by the +.Xr acpibat 4 +driver when a new battery is inserted. +.Pp +The .Em sysmon_envsys structure is defined as follows (only the public members are shown): @@ -195,9 +216,21 @@ Pointer to a function that alerts the device driver whenever monitoring limits (or thresholds) are updated by the user. Setting this function allows the device driver to reprogram hardware -limits (if provided by the device), and gives the driver direct control -over setting the sensor's state based on hardware status. -If this member is not specified, the +limits (if provided by the device) when the user-specificied limits are +updated, and gives the driver direct control over setting the sensor's +state based on hardware status. +.Pp +The +.Fa sme_set_limits +callback can be invoked with the third argument (a pointer to the new +limits) set to a NULL pointer. +Device drivers must recognize this as a request to restore the sensor +limits to their original, boot-time values. +.Pp +If the +.Fa sme_set_limits +member is not specified, the device driver is not informed of changes to +the sensor's limit values, and the .Nm framework performs all limit checks in software. .El
CVS commit: src/sys
Module Name:src
Committed By: pgoyette
Date: Sat Apr 10 19:02:39 UTC 2010
Modified Files:
src/sys/arch/x86/x86: ipmi.c
src/sys/dev/i2c: dbcool.c dbcool_var.h sdtemp.c
Log Message:
Save initial, boot-time limit values, and restore them upon request
from sysmon_envsys(9).
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x86/x86/ipmi.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/i2c/dbcool_var.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/i2c/sdtemp.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/x86/x86/ipmi.c
diff -u src/sys/arch/x86/x86/ipmi.c:1.45 src/sys/arch/x86/x86/ipmi.c:1.46
--- src/sys/arch/x86/x86/ipmi.c:1.45 Mon Mar 22 23:21:29 2010
+++ src/sys/arch/x86/x86/ipmi.c Sat Apr 10 19:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.45 2010/03/22 23:21:29 dyoung Exp $ */
+/* $NetBSD: ipmi.c,v 1.46 2010/04/10 19:02:39 pgoyette Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.45 2010/03/22 23:21:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.46 2010/04/10 19:02:39 pgoyette Exp $");
#include
#include
@@ -84,8 +84,8 @@
char i_envdesc[64];
int i_envtype; /* envsys compatible type */
int i_envnum; /* envsys index */
- sysmon_envsys_lim_t i_limits;
- uint32_t i_props;
+ sysmon_envsys_lim_t i_limits, i_deflims;
+ uint32_t i_props, i_defprops;
SLIST_ENTRY(ipmi_sensor) i_list;
};
@@ -1359,6 +1359,10 @@
/* Find the ipmi_sensor corresponding to this edata */
SLIST_FOREACH(ipmi_s, &ipmi_sensor_list, i_list) {
if (ipmi_s->i_envnum == edata->sensor) {
+ if (limits == NULL) {
+limits = &ipmi_s->i_deflims;
+props = &ipmi_s->i_defprops;
+ }
*props |= PROP_DRIVER_LIMITS;
ipmi_s->i_limits = *limits;
ipmi_s->i_props = *props;
@@ -1381,6 +1385,10 @@
ipmi_get_sensor_limits(sc, ipmi_s, limits, props);
ipmi_s->i_limits = *limits;
ipmi_s->i_props = *props;
+ if (ipmi_s->i_defprops == 0) {
+ipmi_s->i_defprops = *props;
+ipmi_s->i_deflims = *limits;
+ }
return;
}
}
Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.23 src/sys/dev/i2c/dbcool.c:1.24
--- src/sys/dev/i2c/dbcool.c:1.23 Thu Apr 1 05:26:48 2010
+++ src/sys/dev/i2c/dbcool.c Sat Apr 10 19:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.23 2010/04/01 05:26:48 macallan Exp $ */
+/* $NetBSD: dbcool.c,v 1.24 2010/04/10 19:02:39 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.23 2010/04/01 05:26:48 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.24 2010/04/10 19:02:39 pgoyette Exp $");
#include
#include
@@ -1812,6 +1812,15 @@
(*props & PROP_CRITMAX) &&
(limits->sel_critmin >= limits->sel_critmax))
*props &= ~(PROP_CRITMIN | PROP_CRITMAX);
+
+ /*
+ * If this is the first time through, save these values
+ * in case user overrides them and then requests a reset.
+ */
+ if (sc->sc_defprops[index] == 0) {
+ sc->sc_defprops[index] = *props | PROP_DRIVER_LIMITS;
+ sc->sc_deflims[index] = *limits;
+ }
}
static void
@@ -1905,6 +1914,10 @@
int index = edata->sensor;
struct dbcool_softc *sc = sme->sme_cookie;
+ if (limits == NULL) {
+ limits = &sc->sc_deflims[index];
+ props = &sc->sc_defprops[index];
+ }
switch (edata->units) {
case ENVSYS_STEMP:
dbcool_set_temp_limits(sc, index, limits, props);
@@ -1944,12 +1957,16 @@
else if (limit > 127)
limit = 127;
}
- } else
+ sc->sc_dc.dc_writereg(&sc->sc_dc, reg->lo_lim_reg,
+ (uint8_t)limit);
+ } else if (*props & PROP_DRIVER_LIMITS) {
if (sc->sc_temp_offset)
limit = 0x00;
else
limit = 0x80;
- sc->sc_dc.dc_writereg(&sc->sc_dc, reg->lo_lim_reg, (uint8_t)limit);
+ sc->sc_dc.dc_writereg(&sc->sc_dc, reg->lo_lim_reg,
+ (uint8_t)limit);
+ }
if (*props & PROP_CRITMAX) {
limit = lims->sel_critmax - 27315;
@@ -1966,12 +1983,16 @@
else if (limit > 127)
limit = 127;
}
- } else
+ sc->sc_dc.dc_writereg(&sc->sc_dc, reg->hi_lim_reg,
+ (uint8_t)limit);
+ } else if (*props & PROP_DRIVER_LIMITS) {
if (sc->sc_temp_offset)
limit = 0xff;
else
limit = 0x7f;
- sc->sc_dc.dc_writereg(&sc->sc_dc, reg->hi_lim_reg, (uint8_t)limit);
+ sc->sc_dc.dc_writereg(&sc->sc_dc, reg->hi_lim_reg,
+ (uint8_t)limit);
+ }
}
static void
@@ -1995,9 +2016,9 @@
limit = 0xff;
else if (limit < 0)
limit = 0;
- } else
- limit = 0;
- sc->sc_dc.dc_writereg(&sc->sc_dc, reg->lo_lim_reg, limit);
+ sc->sc_dc.dc_writereg(&sc->sc_dc, reg->lo_lim_reg, limit);
+ } else if (*props & PROP_DRIVER_LIMITS)
+ sc->sc_dc.dc_writereg(&sc->sc_dc, reg->lo_lim_reg, 0);
if (*props & PROP_CRITMAX) {
limit = lims->sel_critm
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: pgoyette
Date: Sat Apr 10 19:01:01 UTC 2010
Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c sysmon_envsys_events.c
sysmon_envsysvar.h
Log Message:
When removing sensor properties with envstat -S, ensure that drivers
which could have modified hardware state are informed so that original
state can be restored.
Welcome to 5.99.27
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/sysmon/sysmon_envsys_events.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/sysmon/sysmon_envsysvar.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/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.105 src/sys/dev/sysmon/sysmon_envsys.c:1.106
--- src/sys/dev/sysmon/sysmon_envsys.c:1.105 Sat Apr 3 13:55:09 2010
+++ src/sys/dev/sysmon/sysmon_envsys.c Sat Apr 10 19:01:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.105 2010/04/03 13:55:09 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.106 2010/04/10 19:01:00 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.105 2010/04/03 13:55:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.106 2010/04/10 19:01:00 pgoyette Exp $");
#include
#include
@@ -1053,6 +1053,7 @@
prop_dictionary_t sdict;
envsys_data_t *edata = NULL;
char tmp[ENVSYS_DESCLEN];
+ sysmon_envsys_lim_t lims;
int ptype;
mutex_enter(&sme_global_mtx);
@@ -1090,10 +1091,6 @@
"maximum-capacity");
ptype = PENVSYS_EVENT_CAPACITY;
}
- if (ptype != 0)
-sme_event_unregister(sme, edata->desc, ptype);
-
- ptype = 0;
if (edata->upropset & PROP_WARNMAX) {
prop_dictionary_remove(sdict, "warning-max");
ptype = PENVSYS_EVENT_LIMITS;
@@ -1113,9 +1110,6 @@
prop_dictionary_remove(sdict, "critical-min");
ptype = PENVSYS_EVENT_LIMITS;
}
- if (ptype != 0)
-sme_event_unregister(sme, edata->desc, ptype);
-
if (edata->upropset & PROP_RFACT) {
(void)sme_sensor_upint32(sdict, "rfact", 0);
edata->rfact = 0;
@@ -1125,8 +1119,36 @@
(void)sme_sensor_upstring(sdict,
"description", edata->desc);
- if (edata->upropset)
-edata->upropset = 0;
+ if (ptype == 0)
+continue;
+
+ /*
+ * If there were any limit values removed, we
+ * need to revert to initial limits.
+ *
+ * First, tell the driver that we need it to
+ * restore any h/w limits which may have been
+ * changed to stored, boot-time values. Then
+ * we need to retrieve those limits and update
+ * the event data in the dictionary.
+ */
+ if (sme->sme_set_limits) {
+DPRINTF(("%s: reset limits for %s %s\n",
+ __func__, sme->sme_name, edata->desc));
+(*sme->sme_set_limits)(sme, edata, NULL, NULL);
+ }
+ if (sme->sme_get_limits) {
+DPRINTF(("%s: retrieve limits for %s %s\n",
+ __func__, sme->sme_name, edata->desc));
+lims = edata->limits;
+(*sme->sme_get_limits)(sme, edata, &lims,
+ &edata->upropset);
+ }
+ if (edata->upropset) {
+DPRINTF(("%s: install limits for %s %s\n",
+ __func__, sme->sme_name, edata->desc));
+sme_update_limits(sme, edata);
+ }
}
/*
Index: src/sys/dev/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.91 src/sys/dev/sysmon/sysmon_envsys_events.c:1.92
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.91 Thu Apr 1 12:16:14 2010
+++ src/sys/dev/sysmon/sysmon_envsys_events.c Sat Apr 10 19:01:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.91 2010/04/01 12:16:14 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.92 2010/04/10 19:01:01 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.91 2010/04/01 12:16:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.92 2010/04/10 19:01:01 pgoyette Exp $");
#include
#include
@@ -544,29 +544,45 @@
int
sysmon_envsys_update_limits(struct sysmon_envsys *sme, envsys_data_t *edata)
{
+ int err;
+
+ if (sme->sme_get_limits == NULL ||
+ (edata->flags & ENVSYS_FMONLIMITS) == 0)
+ return EINVAL;
+
+ sysmon_envsys_acquire(sme, false);
+ err = sme_update_limits(sme, edata);
+ sysmon_envsys_release(sme, false);
+
+ return err;
+}
+
+/*
+ * sme_update_limits
+ *
+ * + Internal version of sysmon_envsys_update_limits() to be used
+ * when the device has already been sysmon_envsys_acquire()d.
+ */
+
+int
+sme_update_limits(struct sysmon_envsys *sme, envsys_data_t *edata)
+{
prop_dictionary_t sdict = NULL;
prop_array_t array = NULL;
sysmon_envsys_lim_t lims;
sme_event_t *see;
uint32_t props = 0;
- if (sme->sme_get_limits == N
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Sat Apr 10 18:32:13 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_powerres.c dalb_acpi.c fdc_acpi.c vald_acpi.c
Log Message:
Remove unnecessary casts.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/acpi_powerres.c \
src/sys/dev/acpi/dalb_acpi.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/acpi/fdc_acpi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/vald_acpi.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/acpi/acpi_powerres.c
diff -u src/sys/dev/acpi/acpi_powerres.c:1.11 src/sys/dev/acpi/acpi_powerres.c:1.12
--- src/sys/dev/acpi/acpi_powerres.c:1.11 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/acpi_powerres.c Sat Apr 10 18:32:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_powerres.c,v 1.11 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: acpi_powerres.c,v 1.12 2010/04/10 18:32:13 jruoho Exp $ */
/*-
* Copyright (c) 2001 Michael Smith
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.11 2010/03/05 14:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.12 2010/04/10 18:32:13 jruoho Exp $");
#include
#include
@@ -367,7 +367,7 @@
status = acpi_eval_struct(pr0_handle, NULL, &reslist_buffer);
if (ACPI_FAILURE(status))
goto bad;
- reslist_object = (ACPI_OBJECT *)reslist_buffer.Pointer;
+ reslist_object = reslist_buffer.Pointer;
if ((reslist_object->Type != ACPI_TYPE_PACKAGE) ||
(reslist_object->Package.Count == 0)) {
goto bad;
@@ -388,7 +388,7 @@
acpi_name(reslist_handle)));
goto out;
}
- reslist_object = (ACPI_OBJECT *)reslist_buffer.Pointer;
+ reslist_object = reslist_buffer.Pointer;
if (reslist_object->Type != ACPI_TYPE_PACKAGE) {
ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "resource list is not ACPI_TYPE_PACKAGE (%u)\n",
reslist_object->Type));
Index: src/sys/dev/acpi/dalb_acpi.c
diff -u src/sys/dev/acpi/dalb_acpi.c:1.11 src/sys/dev/acpi/dalb_acpi.c:1.12
--- src/sys/dev/acpi/dalb_acpi.c:1.11 Fri Apr 9 15:45:59 2010
+++ src/sys/dev/acpi/dalb_acpi.c Sat Apr 10 18:32:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dalb_acpi.c,v 1.11 2010/04/09 15:45:59 jruoho Exp $ */
+/* $NetBSD: dalb_acpi.c,v 1.12 2010/04/10 18:32:13 jruoho Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.11 2010/04/09 15:45:59 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.12 2010/04/10 18:32:13 jruoho Exp $");
/*
* Direct Application Launch Button:
@@ -112,6 +112,7 @@
ACPI_BUFFER ret;
rv = acpi_eval_struct(sc->sc_node->ad_handle, "GHID", &ret);
+
if (ACPI_FAILURE(rv) || ret.Pointer == NULL) {
aprint_error_dev(dev,
"couldn't enable notify handler: (%s)\n",
@@ -119,7 +120,8 @@
return;
}
- obj = (ACPI_OBJECT *)ret.Pointer;
+ obj = ret.Pointer;
+
if (obj->Type != ACPI_TYPE_BUFFER) {
sc->sc_usageid = DALB_ID_INVALID;
aprint_debug_dev(dev, "invalid ACPI type: %u\n", obj->Type);
Index: src/sys/dev/acpi/fdc_acpi.c
diff -u src/sys/dev/acpi/fdc_acpi.c:1.38 src/sys/dev/acpi/fdc_acpi.c:1.39
--- src/sys/dev/acpi/fdc_acpi.c:1.38 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/fdc_acpi.c Sat Apr 10 18:32:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.38 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.39 2010/04/10 18:32:13 jruoho Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.38 2010/03/05 14:00:17 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.39 2010/04/10 18:32:13 jruoho Exp $");
#include
#include
@@ -236,7 +236,7 @@
#endif
return drives;
}
- fde = (ACPI_OBJECT *)abuf.Pointer;
+ fde = abuf.Pointer;
if (fde->Type != ACPI_TYPE_BUFFER) {
aprint_error_dev(sc->sc_dev, "expected BUFFER, got %u\n",
fde->Type);
@@ -302,7 +302,7 @@
sc->sc_knownfds[i] = &fdc_acpi_fdtypes[0];
continue;
}
- fdi = (ACPI_OBJECT *)abuf.Pointer;
+ fdi = abuf.Pointer;
if (fdi->Type != ACPI_TYPE_PACKAGE) {
aprint_error_dev(sc->sc_dev,
"expected PACKAGE, got %u\n", fdi->Type);
Index: src/sys/dev/acpi/vald_acpi.c
diff -u src/sys/dev/acpi/vald_acpi.c:1.1 src/sys/dev/acpi/vald_acpi.c:1.2
--- src/sys/dev/acpi/vald_acpi.c:1.1 Sat Apr 10 17:55:24 2010
+++ src/sys/dev/acpi/vald_acpi.c Sat Apr 10 18:32:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vald_acpi.c,v 1.1 2010/04/10 17:55:24 jruoho Exp $ */
+/* $NetBSD: vald_acpi.c,v 1.2 2010/04/10 18:32:13 jruoho Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.1 2010/04/10 17:55:24 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.2 2010/04/10 18:32:13 jruoho Exp $");
#include
#include
@@ -348,7 +348,7 @@
CVS commit: src/sys/miscfs/nullfs
Module Name:src
Committed By: jld
Date: Sat Apr 10 18:14:54 UTC 2010
Modified Files:
src/sys/miscfs/nullfs: null_vfsops.c
Log Message:
Change the nullfs module's actual name to "null", to match the name
it's installed under and the name of the filesystem.
Fixes PR kern/43110.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/miscfs/nullfs/null_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/miscfs/nullfs/null_vfsops.c
diff -u src/sys/miscfs/nullfs/null_vfsops.c:1.79 src/sys/miscfs/nullfs/null_vfsops.c:1.80
--- src/sys/miscfs/nullfs/null_vfsops.c:1.79 Sat Mar 14 15:36:22 2009
+++ src/sys/miscfs/nullfs/null_vfsops.c Sat Apr 10 18:14:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: null_vfsops.c,v 1.79 2009/03/14 15:36:22 dsl Exp $ */
+/* $NetBSD: null_vfsops.c,v 1.80 2010/04/10 18:14:54 jld Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.79 2009/03/14 15:36:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.80 2010/04/10 18:14:54 jld Exp $");
#include
#include
@@ -90,7 +90,7 @@
#include
#include
-MODULE(MODULE_CLASS_VFS, nullfs, "layerfs");
+MODULE(MODULE_CLASS_VFS, null, "layerfs");
VFS_PROTOS(nullfs);
@@ -286,7 +286,7 @@
};
static int
-nullfs_modcmd(modcmd_t cmd, void *arg)
+null_modcmd(modcmd_t cmd, void *arg)
{
int error;
CVS commit: src/sys/arch/atari/dev
Module Name:src
Committed By: tsutsui
Date: Sat Apr 10 18:02:05 UTC 2010
Modified Files:
src/sys/arch/atari/dev: atari5380.c dma.c
Log Message:
Always schedule callback functions via add_sicallback(),
which calls softint_schedule(9).
We cannot use BASEPRI() to check recursive calls any longer
since softint(9) has been reorganized to use kernel thread.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/atari/dev/atari5380.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/atari/dev/dma.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/atari/dev/atari5380.c
diff -u src/sys/arch/atari/dev/atari5380.c:1.53 src/sys/arch/atari/dev/atari5380.c:1.54
--- src/sys/arch/atari/dev/atari5380.c:1.53 Tue Oct 20 19:10:10 2009
+++ src/sys/arch/atari/dev/atari5380.c Sat Apr 10 18:02:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atari5380.c,v 1.53 2009/10/20 19:10:10 snj Exp $ */
+/* $NetBSD: atari5380.c,v 1.54 2010/04/10 18:02:05 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.53 2009/10/20 19:10:10 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.54 2010/04/10 18:02:05 tsutsui Exp $");
#include "opt_atariscsi.h"
@@ -1104,14 +1104,7 @@
{
if (GET_5380_REG(NCR5380_DMSTAT) & SC_IRQ_SET) {
scsi_idisable();
- if (!BASEPRI(sr))
- add_sicallback((si_farg)ncr_ctrl_intr,
- (void *)cur_softc, 0);
- else {
- spl1();
- ncr_ctrl_intr(cur_softc);
- spl0();
- }
+ add_sicallback((si_farg)ncr_ctrl_intr, (void *)cur_softc, 0);
}
}
@@ -1125,14 +1118,7 @@
if ((reqp = connected) && (reqp->dr_flag & DRIVER_IN_DMA)) {
scsi_idisable();
- if (!BASEPRI(sr))
- add_sicallback((si_farg)ncr_dma_intr,
- (void *)cur_softc, 0);
- else {
- spl1();
- ncr_dma_intr(cur_softc);
- spl0();
- }
+ add_sicallback((si_farg)ncr_dma_intr, (void *)cur_softc, 0);
}
}
Index: src/sys/arch/atari/dev/dma.c
diff -u src/sys/arch/atari/dev/dma.c:1.24 src/sys/arch/atari/dev/dma.c:1.25
--- src/sys/arch/atari/dev/dma.c:1.24 Tue Oct 20 19:10:10 2009
+++ src/sys/arch/atari/dev/dma.c Sat Apr 10 18:02:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dma.c,v 1.24 2009/10/20 19:10:10 snj Exp $ */
+/* $NetBSD: dma.c,v 1.25 2010/04/10 18:02:05 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -47,7 +47,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.24 2009/10/20 19:10:10 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.25 2010/04/10 18:02:05 tsutsui Exp $");
#include
#include
@@ -218,14 +218,7 @@
*/
int_func = dma_active.tqh_first->int_func;
softc= dma_active.tqh_first->softc;
-
- if(!BASEPRI(sr))
- add_sicallback((si_farg)int_func, softc, 0);
- else {
- spl1();
- (*int_func)(softc);
- spl0();
- }
+ add_sicallback((si_farg)int_func, softc, 0);
return 1;
}
return 0;
CVS commit: src
Module Name:src Committed By: jruoho Date: Sat Apr 10 17:55:26 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/share/man/man4/man4.i386: Makefile src/sys/arch/i386/conf: GENERIC files.i386 src/sys/dev/acpi: files.acpi Added Files: src/share/man/man4: vald.4 src/sys/dev/acpi: vald_acpi.c Removed Files: src/share/man/man4/man4.i386: vald.4 src/sys/arch/i386/acpi: vald_acpi.c Log Message: Move vald(4) to sys/dev/acpi. This is MI and should work also on amd64. ok jmcneill@ XXX:This is broken: it calls methods with absolute pathnames (almost guaranteed not to be portable across models), it accesses methods that are in the domain of other drivers, it walks the namespace on its own, it contains plenty of magic constants, it does not integrate with existing KPIs, etc. Summa summarum: this should be rewritten as a more generic toshiba_acpi(4). To generate a diff of this commit: cvs rdiff -u -r1.1201 -r1.1202 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.515 -r1.516 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/vald.4 cvs rdiff -u -r1.72 -r1.73 src/share/man/man4/man4.i386/Makefile cvs rdiff -u -r1.8 -r0 src/share/man/man4/man4.i386/vald.4 cvs rdiff -u -r1.33 -r0 src/sys/arch/i386/acpi/vald_acpi.c cvs rdiff -u -r1.978 -r1.979 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.353 -r1.354 src/sys/arch/i386/conf/files.i386 cvs rdiff -u -r1.70 -r1.71 src/sys/dev/acpi/files.acpi cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/vald_acpi.c 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.1201 src/distrib/sets/lists/man/mi:1.1202 --- src/distrib/sets/lists/man/mi:1.1201 Sat Apr 10 04:29:39 2010 +++ src/distrib/sets/lists/man/mi Sat Apr 10 17:55:25 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1201 2010/04/10 04:29:39 jruoho Exp $ +# $NetBSD: mi,v 1.1202 2010/04/10 17:55:25 jruoho Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1074,7 +1074,6 @@ ./usr/share/man/cat4/i386/sony.0 man-obsolete obsolete ./usr/share/man/cat4/i386/speaker.0 man-obsolete obsolete ./usr/share/man/cat4/i386/spic.0 man-sys-catman .cat -./usr/share/man/cat4/i386/vald.0 man-sys-catman .cat ./usr/share/man/cat4/i386/vesafb.0 man-obsolete obsolete ./usr/share/man/cat4/i4b.0 man-obsolete obsolete ./usr/share/man/cat4/i4bctl.0 man-obsolete obsolete @@ -1618,6 +1617,7 @@ ./usr/share/man/cat4/uvscom.0 man-sys-catman .cat ./usr/share/man/cat4/uyap.0 man-sys-catman .cat ./usr/share/man/cat4/uyurex.0 man-sys-catman .cat +./usr/share/man/cat4/vald.0 man-sys-catman .cat ./usr/share/man/cat4/vax/acc.0 man-sys-catman .cat ./usr/share/man/cat4/vax/ad.0 man-sys-catman .cat ./usr/share/man/cat4/vax/asc.0 man-sys-catman .cat @@ -3707,7 +3707,6 @@ ./usr/share/man/html4/i386/pcibios.html man-sys-htmlman html ./usr/share/man/html4/i386/pnpbios.html man-sys-htmlman html ./usr/share/man/html4/i386/spic.html man-sys-htmlman html -./usr/share/man/html4/i386/vald.html man-sys-htmlman html ./usr/share/man/html4/i386/vesafb.html man-obsolete obsolete ./usr/share/man/html4/i915drm.html man-sys-htmlman html ./usr/share/man/html4/iavc.html man-sys-htmlman html @@ -4197,6 +4196,7 @@ ./usr/share/man/html4/uvscom.html man-sys-htmlman html ./usr/share/man/html4/uyap.html man-sys-htmlman html ./usr/share/man/html4/uyurex.html man-sys-htmlman html +./usr/share/man/html4/vald.html man-sys-htmlman html ./usr/share/man/html4/vax/acc.html man-sys-htmlman html ./usr/share/man/html4/vax/ad.html man-sys-htmlman html ./usr/share/man/html4/vax/asc.html man-sys-htmlman html @@ -6162,7 +6162,6 @@ ./usr/share/man/man4/i386/sony.4 man-obsolete obsolete ./usr/share/man/man4/i386/speaker.4 man-obsolete obsolete ./usr/share/man/man4/i386/spic.4 man-sys-man .man -./usr/share/man/man4/i386/vald.4 man-sys-man .man ./usr/share/man/man4/i386/vesafb.4 man-obsolete obsolete ./usr/share/man/man4/i4b.4 man-obsolete obsolete ./usr/share/man/man4/i4bctl.4 man-obsolete obsolete @@ -6706,6 +6705,7 @@ ./usr/share/man/man4/uvscom.4 man-sys-man .man ./usr/share/man/man4/uyap.4 man-sys-man .man ./usr/share/man/man4/uyurex.4 man-sys-man .man +./usr/share/man/man4/vald.4 man-sys-man .man ./usr/share/man/man4/vax/acc.4 man-sys-man .man ./usr/share/man/man4/vax/ad.4 man-sys-man .man ./usr/share/man/man4/vax/asc.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.515 src/share/man/man4/Makefile:1.516 --- src/share/man/man4/Makefile:1.515 Thu Apr 8 18:20:46 2010 +++ src/share/man/man4/Makefile Sat Apr 10 17:55:25 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.515 201
CVS commit: src/sys/arch/atari/atari
Module Name:src
Committed By: tsutsui
Date: Sat Apr 10 17:40:36 UTC 2010
Modified Files:
src/sys/arch/atari/atari: autoconf.c
Log Message:
Comment out currently unused mbprint().
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/atari/atari/autoconf.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/atari/atari/autoconf.c
diff -u src/sys/arch/atari/atari/autoconf.c:1.58 src/sys/arch/atari/atari/autoconf.c:1.59
--- src/sys/arch/atari/atari/autoconf.c:1.58 Sat Apr 10 16:14:07 2010
+++ src/sys/arch/atari/atari/autoconf.c Sat Apr 10 17:40:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.58 2010/04/10 16:14:07 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.59 2010/04/10 17:40:36 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.58 2010/04/10 16:14:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.59 2010/04/10 17:40:36 tsutsui Exp $");
#include
#include
@@ -46,9 +46,11 @@
#include
static void findroot(void);
+int mbmatch(struct device *, struct cfdata *, void *);
void mbattach(struct device *, struct device *, void *);
+#if 0
int mbprint(void *, const char *);
-int mbmatch(struct device *, struct cfdata *, void *);
+#endif
int atari_realconfig;
#include
@@ -284,6 +286,7 @@
config_found(dp, __UNCONST("avmebus") , simple_devprint);
}
+#if 0
int
mbprint(void *auxp, const char *pnp)
{
@@ -292,3 +295,4 @@
aprint_normal("%s at %s", (char *)auxp, pnp);
return UNCONF;
}
+#endif
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Sat Apr 10 16:45:51 UTC 2010
Modified Files:
src/sys/dev/acpi: acpidevs acpidevs_data.h
Log Message:
Add NSC1100. From ThinkPad T43p.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/acpidevs
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/acpidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpidevs
diff -u src/sys/dev/acpi/acpidevs:1.17 src/sys/dev/acpi/acpidevs:1.18
--- src/sys/dev/acpi/acpidevs:1.17 Sat Apr 10 06:09:24 2010
+++ src/sys/dev/acpi/acpidevs Sat Apr 10 16:45:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: acpidevs,v 1.17 2010/04/10 06:09:24 jruoho Exp $
+# $NetBSD: acpidevs,v 1.18 2010/04/10 16:45:51 jruoho Exp $
#
# Extracted from:
# http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/devids.txt
@@ -350,6 +350,9 @@
# * Modems - PNPCxxx-Dxxx
PNPC000 Compaq 14400 Modem (TBD)
PNPC001 Compaq 2400/9600 Modem (TBD)
+# TPM chips
+IFX0102 Infineon Trusted Platform Module
+NSC1100 NSC Trusted Platform Module
# * ACPI specific devices *
ACPI0001 SMBus 1.0 Host Controller
ACPI0002 Smart Battery Subsystem
@@ -366,5 +369,4 @@
ACPI000D Power Meter
ACPI000E Wake Alarm Device
# Others
-IFX0102 Infineon Trusted Platform Module
-INT0800 Intel Firmware Hub Device
\ No newline at end of file
+INT0800 Intel Firmware Hub Device
Index: src/sys/dev/acpi/acpidevs_data.h
diff -u src/sys/dev/acpi/acpidevs_data.h:1.15 src/sys/dev/acpi/acpidevs_data.h:1.16
--- src/sys/dev/acpi/acpidevs_data.h:1.15 Sat Apr 10 06:10:13 2010
+++ src/sys/dev/acpi/acpidevs_data.h Sat Apr 10 16:45:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpidevs_data.h,v 1.15 2010/04/10 06:10:13 jruoho Exp $ */
+/* $NetBSD: acpidevs_data.h,v 1.16 2010/04/10 16:45:51 jruoho Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -1301,6 +1301,14 @@
"Compaq 2400/9600 Modem (TBD)",
},
{
+ "IFX0102",
+ "Infineon Trusted Platform Module",
+ },
+ {
+ "NSC1100",
+ "NSC Trusted Platform Module",
+ },
+ {
"ACPI0001",
"SMBus 1.0 Host Controller",
},
@@ -1357,10 +1365,6 @@
"Wake Alarm Device",
},
{
- "IFX0102",
- "Infineon Trusted Platform Module",
- },
- {
"INT0800",
"Intel Firmware Hub Device",
},
CVS commit: src/sys/arch/atari/atari
Module Name:src
Committed By: tsutsui
Date: Sat Apr 10 16:14:07 UTC 2010
Modified Files:
src/sys/arch/atari/atari: autoconf.c
Log Message:
Remove extern int atari_realconfig decls. It's in .
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/atari/atari/autoconf.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/atari/atari/autoconf.c
diff -u src/sys/arch/atari/atari/autoconf.c:1.57 src/sys/arch/atari/atari/autoconf.c:1.58
--- src/sys/arch/atari/atari/autoconf.c:1.57 Thu Apr 1 17:07:51 2010
+++ src/sys/arch/atari/atari/autoconf.c Sat Apr 10 16:14:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.57 2010/04/01 17:07:51 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.58 2010/04/10 16:14:07 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.57 2010/04/01 17:07:51 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.58 2010/04/10 16:14:07 tsutsui Exp $");
#include
#include
@@ -59,8 +59,7 @@
void
cpu_configure(void)
{
- extern int atari_realconfig;
-
+
atari_realconfig = 1;
init_sicallback();
@@ -98,7 +97,6 @@
struct device temp;
struct cfdata *cf;
const struct cfattach *ca;
- extern int atari_realconfig;
if (atari_realconfig)
return config_found(pdp, auxp, pfn) != NULL;
CVS commit: src/sys/arch/atari/atari
Module Name:src Committed By: tsutsui Date: Sat Apr 10 16:12:34 UTC 2010 Modified Files: src/sys/arch/atari/atari: device.h Log Message: Remove now unused getsoftc() macro. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/atari/atari/device.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/atari/atari/device.h diff -u src/sys/arch/atari/atari/device.h:1.4 src/sys/arch/atari/atari/device.h:1.5 --- src/sys/arch/atari/atari/device.h:1.4 Thu Mar 5 13:21:44 2009 +++ src/sys/arch/atari/atari/device.h Sat Apr 10 16:12:34 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: device.h,v 1.4 2009/03/05 13:21:44 tsutsui Exp $ */ +/* $NetBSD: device.h,v 1.5 2010/04/10 16:12:34 tsutsui Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -47,7 +47,4 @@ */ extern int atari_realconfig; - -#define getsoftc(cdnam, unit) device_lookup_private(&(cdnam), (unit)) - #endif /* _ATARI_DEVICE_H_ */
CVS commit: src/sys/arch/atari/dev
Module Name:src Committed By: tsutsui Date: Sat Apr 10 16:07:04 UTC 2010 Modified Files: src/sys/arch/atari/dev: ser.c Log Message: Make local functions static. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/atari/dev/ser.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/atari/dev/ser.c diff -u src/sys/arch/atari/dev/ser.c:1.50 src/sys/arch/atari/dev/ser.c:1.51 --- src/sys/arch/atari/dev/ser.c:1.50 Fri Apr 9 11:27:21 2010 +++ src/sys/arch/atari/dev/ser.c Sat Apr 10 16:07:04 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ser.c,v 1.50 2010/04/09 11:27:21 tsutsui Exp $ */ +/* $NetBSD: ser.c,v 1.51 2010/04/10 16:07:04 tsutsui Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -93,7 +93,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.50 2010/04/09 11:27:21 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.51 2010/04/10 16:07:04 tsutsui Exp $"); #include "opt_ddb.h" #include "opt_mbtype.h" @@ -212,19 +212,19 @@ */ #define SER_HW_CONSOLE 0x01 -void ser_break(struct ser_softc *, int); -void ser_hwiflow(struct ser_softc *, int); -void ser_iflush(struct ser_softc *); -void ser_loadchannelregs(struct ser_softc *); -void ser_modem(struct ser_softc *, int); -void serdiag(void *); -int serhwiflow(struct tty *, int); -void serinit(int); -void serinitcons(int); -int sermintr(void *); -int sertrintr(void *); -int serparam(struct tty *, struct termios *); -void serstart(struct tty *); +static void ser_break(struct ser_softc *, int); +static void ser_hwiflow(struct ser_softc *, int); +static void ser_iflush(struct ser_softc *); +static void ser_loadchannelregs(struct ser_softc *); +static void ser_modem(struct ser_softc *, int); +static void serdiag(void *); +static int serhwiflow(struct tty *, int); +static void serinit(int); +static void serinitcons(int); +static int sermintr(void *); +static int sertrintr(void *); +static int serparam(struct tty *, struct termios *); +static void serstart(struct tty *); struct consdev; void sercnprobe(struct consdev *);
CVS commit: src/dist/tcpdump
Module Name:src
Committed By: plunky
Date: Sat Apr 10 08:33:35 UTC 2010
Modified Files:
src/dist/tcpdump: tcpdump-stdinc.h
Log Message:
use static __inline__ as per latest upstream, fixes problem with
C99 vs GNUC semantics of extern __inline__
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/dist/tcpdump/tcpdump-stdinc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/tcpdump/tcpdump-stdinc.h
diff -u src/dist/tcpdump/tcpdump-stdinc.h:1.2 src/dist/tcpdump/tcpdump-stdinc.h:1.3
--- src/dist/tcpdump/tcpdump-stdinc.h:1.2 Tue Jul 24 11:53:50 2007
+++ src/dist/tcpdump/tcpdump-stdinc.h Sat Apr 10 08:33:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tcpdump-stdinc.h,v 1.2 2007/07/24 11:53:50 drochner Exp $ */
+/* $NetBSD: tcpdump-stdinc.h,v 1.3 2010/04/10 08:33:35 plunky Exp $ */
/*
* Copyright (c) 2002 - 2003
@@ -151,15 +151,15 @@
#undef htonl
#undef htons
- extern __inline__ unsigned long __ntohl (unsigned long x);
- extern __inline__ unsigned short __ntohs (unsigned short x);
+ static __inline__ unsigned long __ntohl (unsigned long x);
+ static __inline__ unsigned short __ntohs (unsigned short x);
#define ntohl(x) __ntohl(x)
#define ntohs(x) __ntohs(x)
#define htonl(x) __ntohl(x)
#define htons(x) __ntohs(x)
- extern __inline__ unsigned long __ntohl (unsigned long x)
+ static __inline__ unsigned long __ntohl (unsigned long x)
{
__asm__ ("xchgb %b0, %h0\n\t" /* swap lower bytes */
"rorl $16, %0\n\t"/* swap words*/
@@ -168,7 +168,7 @@
return (x);
}
- extern __inline__ unsigned short __ntohs (unsigned short x)
+ static __inline__ unsigned short __ntohs (unsigned short x)
{
__asm__ ("xchgb %b0, %h0" /* swap bytes */
: "=q" (x) : "0" (x));
CVS commit: src/usr.sbin/mailwrapper
Module Name:src Committed By: jruoho Date: Sat Apr 10 08:29:54 UTC 2010 Modified Files: src/usr.sbin/mailwrapper: mailer.conf.5 mailwrapper.8 Log Message: A general update. Remove (hopefully the last) references to sendmail(8), etc. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/mailwrapper/mailer.conf.5 cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/mailwrapper/mailwrapper.8 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/mailwrapper/mailer.conf.5 diff -u src/usr.sbin/mailwrapper/mailer.conf.5:1.13 src/usr.sbin/mailwrapper/mailer.conf.5:1.14 --- src/usr.sbin/mailwrapper/mailer.conf.5:1.13 Thu Jul 22 03:44:12 2004 +++ src/usr.sbin/mailwrapper/mailer.conf.5 Sat Apr 10 08:29:53 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: mailer.conf.5,v 1.13 2004/07/22 03:44:12 atatat Exp $ +.\" $NetBSD: mailer.conf.5,v 1.14 2010/04/10 08:29:53 jruoho Exp $ .\" .\" Copyright (c) 1998 .\" Perry E. Metzger. All rights reserved. @@ -29,7 +29,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 17, 2004 +.Dd April 10, 2010 .Dt MAILER.CONF 5 .Os .Sh NAME @@ -82,7 +82,7 @@ mark in the first column of any line. .Pp The default mailer is -.Xr sendmail 8 , +.Xr postfix 1 , which will also start by default (unless specifically disabled via an .Xr rc.conf 5 setting) so that locally generated mail can be delivered, if the @@ -90,55 +90,40 @@ setting in .Pa /etc/mailer.conf is set to -.Dq /usr/libexec/sendmail/sendmail . +.Dq /usr/libexec/postfix/sendmail . .Sh FILES /etc/mailer.conf .Sh EXAMPLES This example shows how to set up .Nm -to invoke the traditional -.Xr sendmail 8 -program: -.Bd -literal -offset indent -# Execute the "real" sendmail program located in -# /usr/libexec/sendmail/sendmail -sendmail /usr/libexec/sendmail/sendmail -send-mail /usr/libexec/sendmail/sendmail -mailq /usr/libexec/sendmail/sendmail -newaliases /usr/libexec/sendmail/sendmail -hoststat /usr/libexec/sendmail/sendmail -purgestat /usr/libexec/sendmail/sendmail -.Ed -.Pp -This example shows how to invoke the +to invoke the .Xr postfix 1 -MTA suite in place of -.Xr sendmail 8 : +program: .Bd -literal -offset indent -# Emulate sendmail using postfix -sendmail /usr/libexec/postfix/sendmail -send-mail /usr/libexec/postfix/sendmail -mailq /usr/libexec/postfix/sendmail -newaliases /usr/libexec/postfix/sendmail +sendmail/usr/libexec/postfix/sendmail +mailq /usr/libexec/postfix/sendmail +newaliases /usr/libexec/postfix/sendmail .Ed .Pp -This example shows the use of the mini-sendmail package from pkgsrc +This example shows the use of the mini-sendmail package from +.Em pkgsrc in place of -.Xr sendmail 8 : -Note the use of additional arguments. +.Xr postfix 1 : .Bd -literal -offset indent # Send outgoing mail to a smart relay using mini-sendmail sendmail /usr/pkg/sbin/mini-sendmail -srelayhost send-mail /usr/pkg/sbin/mini-sendmail -srelayhost .Ed +.Pp +Note the use of additional arguments. .Sh SEE ALSO .Xr mail 1 , .Xr mailq 1 , .Xr newaliases 1 , .Xr postfix 1 , -.Xr mailwrapper 8 , -.Xr sendmail 8 +.Xr mailwrapper 8 .Pp +.Pa pkgsrc/mail/sendmail , .Pa pkgsrc/mail/mini_sendmail .Sh HISTORY .Nm @@ -149,7 +134,8 @@ .Sh BUGS The entire reason this program exists is a crock. Instead, a command -for how to submit mail should be standardized, and all the "behave -differently if invoked with a different name" behavior of things like +for how to submit mail should be standardized, and all the +.Dq behave differently if invoked with a different name +behavior of things like .Xr mailq 1 should go away. Index: src/usr.sbin/mailwrapper/mailwrapper.8 diff -u src/usr.sbin/mailwrapper/mailwrapper.8:1.11 src/usr.sbin/mailwrapper/mailwrapper.8:1.12 --- src/usr.sbin/mailwrapper/mailwrapper.8:1.11 Fri Feb 8 01:38:50 2002 +++ src/usr.sbin/mailwrapper/mailwrapper.8 Sat Apr 10 08:29:54 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: mailwrapper.8,v 1.11 2002/02/08 01:38:50 ross Exp $ +.\" $NetBSD: mailwrapper.8,v 1.12 2010/04/10 08:29:54 jruoho Exp $ .\" .\" Copyright (c) 1998 .\" Perry E. Metzger. All rights reserved. @@ -30,84 +30,106 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" The following requests are required for all man pages. -.Dd December 16, 1998 +.Dd April 10, 2010 .Dt MAILWRAPPER 8 .Os .Sh NAME .Nm mailwrapper -.Nd invoke appropriate MTA software based on configuration file +.Nd invoke appropriate +.Tn MTA +software based on configuration file .Sh SYNOPSIS Special. See below. .Sh DESCRIPTION -At one time, the only Mail Transfer Agent (MTA) software easily available -was -.Xr sendmail 8 . -As a result of this, most Mail User Agents (MUAs) such as -.Xr mail 1 -had the path and calling conventions expected by -.Xr send
